diff --git a/.codecov.yml b/.codecov.yml
new file mode 100644
index 000000000..4592266d8
--- /dev/null
+++ b/.codecov.yml
@@ -0,0 +1,36 @@
+codecov:
+  branch: develop
+
+comment: off
+
+coverage:
+  status:
+    patch:
+      default: off
+      source:
+        target: 80%
+        flags: source
+      backend:
+        target: 80%
+        flags: backend
+    project:
+      default: off
+      source:
+        flags: source
+      backend:
+        flags: backend
+
+flags:
+  source:
+    paths:
+      - src/
+  backend:
+    paths:
+      - mod/
+      - include/
+  binary:
+    paths:
+      - bin/
+  tests:
+    paths:
+      - tests/
diff --git a/.gitattributes b/.gitattributes
index 4be1c9185..18ba9e075 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-# Disable LF normalization for all files
-* -text
\ No newline at end of file
+# Disable LF normalization for all files
+* -text
diff --git a/.gitignore b/.gitignore
index 9e6504184..db1c3c130 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,61 +1,71 @@
-favicon.*
-.htconfig.php
-.htpreconfig.php
-\#*
-include/jquery-1.4.2.min.js
-*.log
-*.out
-*.version*
-favicon.*
-home.html
-addon
-*.orig
-*~
-robots.txt
-
-#ignore documentation, it should be newly built
-doc/html
-
-#ignore reports, should be generted with every build
-report/
-
-#ignore config files from eclipse, we don't want IDE files in our repository
-.project
-.buildpath
-.externalToolBuilders
-.settings
-#ignore OSX .DS_Store files
-.DS_Store
-
-/nbproject/private/
-
-#ignore smarty cache
-/view/smarty3/compiled/
-
-#ignore cache folders
-/privacy_image_cache/
-/photo/
-/proxy/
-nbproject
-
-#ignore vagrant dir
-.vagrant/
-
-#ignore local folder
-/local/
-
-#ignore config files from Visual Studio
-/.vs/
-/php_friendica.phpproj
-/php_friendica.sln
-/php_friendica.phpproj.user
-
-#ignore things from transifex-client
-venv/
-
-#ignore Composer dependencies
-/vendor
-/view/asset
-
-#ignore config files from JetBrains
-/.idea
+favicon.*
+.htconfig.php
+.htpreconfig.php
+\#*
+*.log
+*.out
+*.version*
+home.html
+
+*~
+robots.txt
+
+#ignore local config
+/config/local.ini.php
+/config/addon.ini.php
+
+#ignore documentation, it should be newly built
+/doc/html
+
+#ignore reports, should be generated with every build
+report/
+
+#ignore config files from eclipse, we don't want IDE files in our repository
+.project
+.buildpath
+.externalToolBuilders
+.settings
+
+#ignore OSX .DS_Store files
+.DS_Store
+
+#ignore NetBeans IDE's private files (at least)
+/nbproject/private/
+
+#ignore smarty cache
+/view/smarty3/compiled/
+
+#ignore cache folders
+/privacy_image_cache/
+/photo/
+/proxy/
+nbproject
+
+#ignore vagrant dir
+.vagrant/
+
+#ignore local folder
+/local/
+
+#ignore config files from Visual Studio
+/.vs/
+/php_friendica.phpproj
+/php_friendica.sln
+/php_friendica.phpproj.user
+
+#ignore things from transifex-client
+venv/
+
+#ignore Composer dependencies
+/vendor
+/view/asset
+
+#ignore config files from JetBrains
+/.idea
+
+#ignore addons directory
+/addons
+/addon
+
+#ignore .htaccess
+.htaccess
diff --git a/.htaccess b/.htaccess-dist
similarity index 96%
rename from .htaccess
rename to .htaccess-dist
index 2348cdc38..a671cc680 100644
--- a/.htaccess
+++ b/.htaccess-dist
@@ -4,7 +4,7 @@ AddType audio/ogg .oga
 #AddHandler php53-cgi .php
 
 <FilesMatch "\.(out|log)$">
-  <IfModule authz_host_module> 
+  <IfModule authz_host_module>
     #Apache 2.4
     Require all denied
   </IfModule>
@@ -38,4 +38,3 @@ AddType audio/ogg .oga
   RewriteRule ^(.*)$ index.php?pagename=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
 
 </IfModule>
-
diff --git a/.travis.yml b/.travis.yml
index d68b7727e..bb8b11311 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,25 @@
 ---
 language: php
-## Friendica supports PHP version >= 5.6
+## Friendica supports PHP version >= 5.6.1
 php:
  - 5.6
  - 7.0
  - 7.1
  - 7.2
 
-install: composer install
+services:
+ - mysql
+ - redis-server
+ - memcached
+env:
+ - MYSQL_HOST=localhost MYSQL_PORT=3306 MYSQL_USERNAME=travis MYSQL_PASSWORD= MYSQL_DATABASE=test
+
+install:
+ - composer install
+before_script:
+ - cp config/local-sample.ini.php config/local.ini.php
+ - mysql -e 'CREATE DATABASE IF NOT EXISTS test;'
+ - mysql -utravis test < database.sql
+ - echo "extension=redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+ - echo "extension=memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+after_success: bash <(curl -s https://codecov.io/bash)
diff --git a/CHANGELOG b/CHANGELOG
index 6385d22bb..2f675fb6d 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]
diff --git a/INSTALL.txt b/INSTALL.txt
index 9340927f4..705eb8fed 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -32,7 +32,7 @@ link if your cert is self-signed).
 	- Apache with mod-rewrite enabled and "Options All" so you can use a
 local .htaccess file
 
-	- PHP 5.6+ (PHP 7 recommended for performance).
+	- PHP 5.6.1+ (PHP 7 recommended for performance).
 
 		- PHP *command line* access with register_argc_argv set to true in the
 php.ini file [or see 'poormancron' in section 8]
@@ -66,10 +66,39 @@ OR
 
 2b. Clone the friendica/friendica GitHub repository and import dependencies
 
-	git clone https://github.com/friendica/friendica [web server folder]
+	git clone https://github.com/friendica/friendica -b master [web server folder]
 	cd [web server folder]
 	php bin/composer.phar install
 
+Make sure the folder view/smarty3 exists and is writable by the webserver
+user, in this case `www-data`
+
+    mkdir view/smarty3
+    chown www-data:www-data view/smarty3
+    chmod 775 view/smarty3
+
+Get the addons by going into your website folder.
+
+    cd mywebsite
+
+Clone the addon repository (separately):
+
+    git clone https://github.com/friendica/friendica-addons.git -b master addon
+
+If you copy the directory tree to your webserver, make sure that you also
+copy .htaccess - as "dot" files are often hidden and aren't normally copied.
+
+If you want to use the development version of Friendica you can switch to
+the devel branch in the repository by running
+
+    git checkout develop
+    bin/composer.phar install
+    cd addon
+    git checkout develop
+
+please be aware that the develop branch may break your Friendica node at any
+time. If you encounter a bug, please let us know.
+
 3. Create an empty database and note the access details (hostname, username,
 password, database name).
 
@@ -77,8 +106,8 @@ password, database name).
     - Please check the additional notes if running on MySQ 5.7.17 or newer
 
 4. If you know in advance that it will be impossible for the web server to
-write or create files in your web directory, create an empty file called
-.htconfig.php and make it writable by the web server.
+write or create files in the config/ subfolder, create an empty file called
+local.ini.php and make it writable by the web server.
 
 5. Visit your website with a web browser and follow the instructions. Please
 note any error messages and correct these before continuing.
@@ -92,9 +121,9 @@ so in the host name setting for the database.
 
 6. *If* the automated installation fails for any reason, check the following:
 
-	- ".htconfig.php" exists
-		If not, edit htconfig.php and change system settings. Rename
-to .htconfig.php
+	- "config/local.ini.php" exists
+		If not, edit local-sample.ini.php and change system settings. Rename
+to local.ini.php
 	-  Database is populated.
 		If not, import the contents of "database.sql" with phpmyadmin
 or mysql command line
@@ -103,7 +132,7 @@ or mysql command line
 Registration errors should all be recoverable automatically.
 If you get any *critical* failure at this point, it generally indicates the
 database was not installed correctly. You might wish to move/rename
-.htconfig.php to another name and empty (called 'dropping') the database
+local.ini.php to another name and empty (called 'dropping') the database
 tables, so that you can start fresh.
 
 ****************************************************************************
@@ -148,7 +177,7 @@ Bad things will happen. Let there be a hardware failure, a corrupted
 database or whatever you can think of. So once the installation of your
 Friendica node is done, you should make yoursef a backup plan.
 
-The most important file is the `.htconfig.php` file in the base directory.
+The most important file is the `config/local.ini.php` file in the base directory.
 As it stores all your data, you should also have a recent dump of your
 Friendica database at hand, should you have to recover your node.
 
@@ -245,21 +274,21 @@ Windows).
 
 
 #####################################################################
-- If you are unable to write the file .htconfig.php during installation
+- If you are unable to write the file config/local.ini.php during installation
 due to permissions issues:
 #####################################################################
 
 	create an empty file with that name and give it world-write permission.
 For Linux:
 
-% touch .htconfig.php
-% chmod 777 .htconfig.php
+% touch config/local.ini.php
+% chmod 664 config/local.ini.php
 
 Retry the installation. As soon as the database has been created,
 
 ******* this is important *********
 
-% chmod 755 .htconfig.php
+% chmod 644 config/local.ini.php
 
 #####################################################################
 - Some configurations with "suhosin" security are configured without
@@ -298,11 +327,11 @@ After a while I noticed, that bin/worker.php calls further php script via
 proc_open. These scripts themselves also use proc_open and fail, because they
 are NOT called with -d suhosin.executor.func.blacklist=none.
 
-So the simple solution is to put the correct parameters into .htconfig.php:
- // Location of PHP command line processor
- $a->config['php_path'] = '/usr/bin/php -d suhosin.executor.func.blacklist=none
--d suhosin.executor.eval.blacklist=none';
+So the simple solution is to put the correct parameters into config/local.ini.php:
 
+[config]
+; Location of PHP command line processor
+php_path = "/usr/bin/php -d suhosin.executor.func.blacklist=none -d suhosin.executor.eval.blacklist=none"
 
 This is obvious as soon as you notice that the friendica-cron uses proc_open to
 execute php-scripts that also use proc_open, but it took me quite some time to
diff --git a/VERSION b/VERSION
index 41df8e6ae..40284ee69 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2018.05
+2018.08-rc
diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index 06d8488df..7ad28c96f 100755
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -33,8 +33,6 @@
  */
 
 use Friendica\App;
-use Friendica\BaseObject;
-use Friendica\Core\Config;
 use Friendica\Util\ExAuth;
 
 if (sizeof($_SERVER["argv"]) == 0) {
@@ -55,12 +53,8 @@ require_once "boot.php";
 require_once "include/dba.php";
 
 $a = new App(dirname(__DIR__));
-BaseObject::setApp($a);
 
-@include ".htconfig.php";
-dba::connect($db_host, $db_user, $db_pass, $db_data);
-unset($db_host, $db_user, $db_pass, $db_data);
-
-$oAuth = new ExAuth();
-
-$oAuth->readStdin();
+if ($a->mode === App::MODE_NORMAL) {
+	$oAuth = new ExAuth();
+	$oAuth->readStdin();
+}
\ No newline at end of file
diff --git a/bin/daemon.php b/bin/daemon.php
index 6b0e377a3..159b20e15 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -6,10 +6,48 @@
  *
  * This script was taken from http://php.net/manual/en/function.pcntl-fork.php
  */
-function shutdown() {
-	posix_kill(posix_getpid(), SIGHUP);
+
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\Worker;
+use Friendica\Database\DBA;
+
+// Get options
+$shortopts = 'f';
+$longopts = ['foreground'];
+$options = getopt($shortopts, $longopts);
+
+// Ensure that daemon.php is executed from the base path of the installation
+if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
+	$directory = dirname($_SERVER["argv"][0]);
+
+	if (substr($directory, 0, 1) != "/") {
+		$directory = $_SERVER["PWD"] . "/" . $directory;
+	}
+	$directory = realpath($directory . "/..");
+
+	chdir($directory);
 }
 
+require_once "boot.php";
+require_once "include/dba.php";
+
+$a = new App(dirname(__DIR__));
+
+if ($a->isInstallMode()) {
+	die("Friendica isn't properly installed yet.\n");
+}
+
+Config::load();
+
+if (empty(Config::get('system', 'pidfile'))) {
+	die('Please set system.pidfile in config/local.ini.php. For example:'."\n".
+		'[system]'."\n".
+		'pidfile = /path/to/daemon.pid'."\n");
+}
+
+$pidfile = Config::get('system', 'pidfile');
+
 if (in_array("start", $_SERVER["argv"])) {
 	$mode = "start";
 }
@@ -22,6 +60,8 @@ if (in_array("status", $_SERVER["argv"])) {
 	$mode = "status";
 }
 
+$foreground = array_key_exists('f', $options) || array_key_exists('foreground', $options);
+
 if (!isset($mode)) {
 	die("Please use either 'start', 'stop' or 'status'.\n");
 }
@@ -30,27 +70,15 @@ if (empty($_SERVER["argv"][0])) {
 	die("Unexpected script behaviour. This message should never occur.\n");
 }
 
-// Fetch the base directory
-$directory = dirname($_SERVER["argv"][0]);
+$pid = null;
 
-if (substr($directory, 0, 1) != "/") {
-	$directory = $_SERVER["PWD"]."/".$directory;
-}
-$directory = realpath($directory."/..");
-
-@include($directory."/.htconfig.php");
-
-if (!isset($pidfile)) {
-	die('Please specify a pid file in the variable $pidfile in the .htconfig.php. For example:'."\n".
-		'$pidfile = "/path/to/daemon.pid";'."\n");
+if (is_readable($pidfile)) {
+	$pid = intval(file_get_contents($pidfile));
 }
 
-if (in_array($mode, array("stop", "status"))) {
-	$pid = @file_get_contents($pidfile);
-
-	if (!$pid) {
-		die("Pidfile wasn't found. Is the daemon running?\n");
-	}
+if (empty($pid) && in_array($mode, ["stop", "status"])) {
+	Config::set('system', 'worker_daemon_mode', false);
+	die("Pidfile wasn't found. Is the daemon running?\n");
 }
 
 if ($mode == "status") {
@@ -60,6 +88,7 @@ if ($mode == "status") {
 
 	unlink($pidfile);
 
+	Config::set('system', 'worker_daemon_mode', false);
 	die("Daemon process $pid isn't running.\n");
 }
 
@@ -68,59 +97,102 @@ if ($mode == "stop") {
 
 	unlink($pidfile);
 
+	logger("Worker daemon process $pid was killed.", LOGGER_DEBUG);
+
+	Config::set('system', 'worker_daemon_mode', false);
 	die("Worker daemon process $pid was killed.\n");
 }
 
-echo "Starting worker daemon.\n";
-
-if (isset($a->config['php_path'])) {
-	$php = $a->config['php_path'];
-} else {
-	$php = "php";
+if (!empty($pid) && posix_kill($pid, 0)) {
+	die("Daemon process $pid is already running.\n");
 }
 
-// Switch over to daemon mode.
-if ($pid = pcntl_fork())
-	return;     // Parent
+logger('Starting worker daemon.', LOGGER_DEBUG);
 
-fclose(STDIN);  // Close all of the standard
-fclose(STDOUT); // file descriptors as we
-fclose(STDERR); // are running as a daemon.
+if (!$foreground) {
+	echo "Starting worker daemon.\n";
 
-register_shutdown_function('shutdown');
+	// Switch over to daemon mode.
+	if ($pid = pcntl_fork()) {
+		return;     // Parent
+	}
 
-if (posix_setsid() < 0)
-	return;
+	fclose(STDIN);  // Close all of the standard
 
-if ($pid = pcntl_fork())
-	return;     // Parent
+	// Enabling this seem to block a running php process with 100% CPU usage when there is an outpout
+	// fclose(STDOUT); // file descriptors as we
+	// fclose(STDERR); // are running as a daemon.
 
-$pid = getmypid();
-file_put_contents($pidfile, $pid);
+	DBA::disconnect();
+
+	register_shutdown_function('shutdown');
+
+	if (posix_setsid() < 0) {
+		return;
+	}
+
+	if ($pid = pcntl_fork()) {
+		return;     // Parent
+	}
+
+	$pid = getmypid();
+	file_put_contents($pidfile, $pid);
+
+	// We lose the database connection upon forking
+	$a->loadDatabase();
+}
+
+Config::set('system', 'worker_daemon_mode', true);
+
+// Just to be sure that this script really runs endlessly
+set_time_limit(0);
+
+$wait_interval = intval(Config::get('system', 'cron_interval', 5)) * 60;
+
+$do_cron = true;
+$last_cron = 0;
 
 // Now running as a daemon.
 while (true) {
-	// Just to be sure that this script really runs endlessly
-	set_time_limit(0);
-
-	// Call the worker
-	$cmdline = $php.' bin/worker.php';
-
-	$executed = false;
-
-	if (function_exists('proc_open')) {
-		$resource = proc_open($cmdline . ' &', array(), $foo, $directory);
-
-		if (is_resource($resource)) {
-			$executed = true;
-			proc_close($resource);
-		}
+	if (!$do_cron && ($last_cron + $wait_interval) < time()) {
+		logger('Forcing cron worker call.', LOGGER_DEBUG);
+		$do_cron = true;
 	}
 
-	if (!$executed) {
-		exec($cmdline.' spawn');
+	Worker::spawnWorker($do_cron);
+
+	if ($do_cron) {
+		// We force a reconnect of the database connection.
+		// This is done to ensure that the connection don't get lost over time.
+		DBA::reconnect();
+
+		$last_cron = time();
 	}
 
-	// Now sleep for 5 minutes
-	sleep(300);
+	logger("Sleeping", LOGGER_DEBUG);
+	$start = time();
+	do {
+		$seconds = (time() - $start);
+
+		// logarithmic wait time calculation.
+		// Background: After jobs had been started, they often fork many workers.
+		// To not waste too much time, the sleep period increases.
+		$arg = (($seconds + 1) / ($wait_interval / 9)) + 1;
+		$sleep = round(log10($arg) * 1000000, 0);
+		usleep($sleep);
+
+		$timeout = ($seconds >= $wait_interval);
+	} while (!$timeout && !Worker::IPCJobsExists());
+
+	if ($timeout) {
+		$do_cron = true;
+		logger("Woke up after $wait_interval seconds.", LOGGER_DEBUG);
+	} else {
+		$do_cron = false;
+		logger("Worker jobs are calling to be forked.", LOGGER_DEBUG);
+	}
+}
+
+function shutdown() {
+	posix_kill(posix_getpid(), SIGHUP);
 }
diff --git a/bin/dev/friendica-to-smarty-tpl.py b/bin/dev/friendica-to-smarty-tpl.py
index 8149051ca..017b8b77a 100755
--- a/bin/dev/friendica-to-smarty-tpl.py
+++ b/bin/dev/friendica-to-smarty-tpl.py
@@ -83,7 +83,7 @@ def fix_element(element):
 			element += ldelim + parts[first+1].rstrip('}') + rdelim
 		else:
 			# This takes care of elements where the filename is a path, e.g. {{ inc file.tpl }}
-			element += parts[first+1].rstrip('}') 
+			element += parts[first+1].rstrip('}')
 
 		element += '"'
 
@@ -205,7 +205,7 @@ try:
 except getopt.GetoptError:
 	help(sys.argv[0])
 	sys.exit(2)
-	
+
 
 if path == '':
 	path = raw_input('Path to template folder to convert: ')
@@ -220,7 +220,7 @@ if not os.path.exists(outpath):
 
 files = os.listdir(path)
 for a_file in files:
-	if a_file == 'htconfig.tpl':
+	if a_file == 'local.ini.tpl':
 		php_tpl = True
 	else:
 		php_tpl = False
diff --git a/bin/dev/vagrant_provision.sh b/bin/dev/vagrant_provision.sh
index fc3e266f2..0599efa0c 100755
--- a/bin/dev/vagrant_provision.sh
+++ b/bin/dev/vagrant_provision.sh
@@ -86,7 +86,8 @@ cd /var/www
 php bin/composer.phar install
 
 # initial config file for friendica in vagrant
-cp /vagrant/util/htconfig.vagrant.php /vagrant/.htconfig.php
+#cp /vagrant/util/htconfig.vagrant.php /vagrant/.htconfig.php
+cp /vagrant/util/local.ini.vagrant.php /vagrant/config/local.ini.php
 
 # create the friendica database
 echo "create database friendica DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci" | $MYSQL -u root -proot
diff --git a/bin/worker.php b/bin/worker.php
index b4b265283..ceab479ce 100755
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -6,10 +6,15 @@
  */
 
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Core\L10n;
+
+// Get options
+$shortopts = 'sn';
+$longopts = ['spawn', 'no_cron'];
+$options = getopt($shortopts, $longopts);
 
 // Ensure that worker.php is executed from the base path of the installation
 if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
@@ -24,17 +29,14 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 }
 
 require_once "boot.php";
-require_once "include/dba.php";
 
 $a = new App(dirname(__DIR__));
-BaseObject::setApp($a);
-
-require_once ".htconfig.php";
-dba::connect($db_host, $db_user, $db_pass, $db_data);
-unset($db_host, $db_user, $db_pass, $db_data);
 
 Config::load();
 
+$lang = L10n::getBrowserLanguage();
+L10n::loadTranslationTable($lang);
+
 // Check the database structure and possibly fixes it
 check_db(true);
 
@@ -47,14 +49,14 @@ $a->set_baseurl(Config::get('system', 'url'));
 
 Addon::loadHooks();
 
-$spawn = (($_SERVER["argc"] == 2) && ($_SERVER["argv"][1] == "spawn"));
+$spawn = array_key_exists('s', $options) || array_key_exists('spawn', $options);
 
 if ($spawn) {
 	Worker::spawnWorker();
 	killme();
 }
 
-$run_cron = (($_SERVER["argc"] <= 1) || ($_SERVER["argv"][1] != "no_cron"));
+$run_cron = !array_key_exists('n', $options) && !array_key_exists('no_cron', $options);
 
 Worker::processQueue($run_cron);
 
@@ -63,4 +65,3 @@ Worker::unclaimProcess();
 Worker::endProcess();
 
 killme();
-
diff --git a/boot.php b/boot.php
index 8f077b440..2236a4d5d 100644
--- a/boot.php
+++ b/boot.php
@@ -29,7 +29,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
@@ -39,9 +39,9 @@ require_once 'include/text.php';
 
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
-define('FRIENDICA_VERSION',      '2018.05');
+define('FRIENDICA_VERSION',      '2018.08-rc');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1266);
+define('DB_UPDATE_VERSION',      1283);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**
@@ -64,15 +64,13 @@ define('EOL',                    "<br />\r\n");
  * @brief Image storage quality.
  *
  * Lower numbers save space at cost of image detail.
- * For ease of upgrade, please do not change here. Change jpeg quality with
- * $a->config['system']['jpeg_quality'] = n;
- * in .htconfig.php, where n is netween 1 and 100, and with very poor results
- * below about 50
+ * For ease of upgrade, please do not change here. Set [system] jpegquality = n in config/local.ini.php,
+ * where n is between 1 and 100, and with very poor results below about 50
  */
 define('JPEG_QUALITY',            100);
 
 /**
- * $a->config['system']['png_quality'] from 0 (uncompressed) to 9
+ * [system] png_quality = n where is between 0 (uncompressed) to 9
  */
 define('PNG_QUALITY',             8);
 
@@ -83,9 +81,10 @@ define('PNG_QUALITY',             8);
  * this length (on the longest side, the other side will be scaled appropriately).
  * Modify this value using
  *
- *    $a->config['system']['max_image_length'] = n;
+ * [system]
+ * max_image_length = n;
  *
- * in .htconfig.php
+ * in config/local.ini.php
  *
  * If you don't want to set a maximum length, set to -1. The default value is
  * defined by 'MAX_IMAGE_LENGTH' below.
@@ -114,11 +113,12 @@ define('SSL_POLICY_SELFSIGN',     2);
  * log levels
  * @{
  */
-define('LOGGER_NORMAL',          0);
-define('LOGGER_TRACE',           1);
-define('LOGGER_DEBUG',           2);
-define('LOGGER_DATA',            3);
-define('LOGGER_ALL',             4);
+define('LOGGER_WARNING',         0);
+define('LOGGER_INFO',            1);
+define('LOGGER_TRACE',           2);
+define('LOGGER_DEBUG',           3);
+define('LOGGER_DATA',            4);
+define('LOGGER_ALL',             5);
 /* @}*/
 
 /**
@@ -152,19 +152,6 @@ define('REGISTER_OPEN',          2);
  * @}
 */
 
-/**
- * @name Contact_is
- *
- * Relationship types
- * @{
- */
-define('CONTACT_IS_FOLLOWER', 1);
-define('CONTACT_IS_SHARING',  2);
-define('CONTACT_IS_FRIEND',   3);
-/**
- *  @}
- */
-
 /**
  * @name Update
  *
@@ -177,55 +164,6 @@ define('UPDATE_FAILED',  1);
  * @}
  */
 
-/**
- * @name page/profile types
- *
- * PAGE_NORMAL is a typical personal profile account
- * PAGE_SOAPBOX automatically approves all friend requests as CONTACT_IS_SHARING, (readonly)
- * PAGE_COMMUNITY automatically approves all friend requests as CONTACT_IS_SHARING, but with
- *      write access to wall and comments (no email and not included in page owner's ACL lists)
- * PAGE_FREELOVE automatically approves all friend requests as full friends (CONTACT_IS_FRIEND).
- *
- * @{
- */
-define('PAGE_NORMAL',            0);
-define('PAGE_SOAPBOX',           1);
-define('PAGE_COMMUNITY',         2);
-define('PAGE_FREELOVE',          3);
-define('PAGE_BLOG',              4);
-define('PAGE_PRVGROUP',          5);
-/**
- * @}
- */
-
-/**
- * @name account types
- *
- * ACCOUNT_TYPE_PERSON - the account belongs to a person
- *	Associated page types: PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE
- *
- * ACCOUNT_TYPE_ORGANISATION - the account belongs to an organisation
- *	Associated page type: PAGE_SOAPBOX
- *
- * ACCOUNT_TYPE_NEWS - the account is a news reflector
- *	Associated page type: PAGE_SOAPBOX
- *
- * ACCOUNT_TYPE_COMMUNITY - the account is community forum
- *	Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
- *
- * ACCOUNT_TYPE_RELAY - the account is a relay
- *      This will only be assigned to contacts, not to user accounts
- * @{
- */
-define('ACCOUNT_TYPE_PERSON',      0);
-define('ACCOUNT_TYPE_ORGANISATION', 1);
-define('ACCOUNT_TYPE_NEWS',        2);
-define('ACCOUNT_TYPE_COMMUNITY',   3);
-define('ACCOUNT_TYPE_RELAY',       4);
-/**
- * @}
- */
-
 /**
  * @name CP
  *
@@ -241,84 +179,32 @@ define('CP_USERS_AND_GLOBAL',       2);
  * @}
  */
 
-/**
- * @name Protocols
- * @deprecated since version 3.6
- * @see Conversation
- *
- * Different protocols that we are storing
- * @{
- */
-define('PROTOCOL_UNKNOWN'        , Conversation::PROTOCOL_UNKNOWN);
-define('PROTOCOL_DFRN'           , Conversation::PROTOCOL_DFRN);
-define('PROTOCOL_DIASPORA'       , Conversation::PROTOCOL_DIASPORA);
-define('PROTOCOL_OSTATUS_SALMON' , Conversation::PROTOCOL_OSTATUS_SALMON);
-define('PROTOCOL_OSTATUS_FEED'   , Conversation::PROTOCOL_OSTATUS_FEED);    // Deprecated
-define('PROTOCOL_GS_CONVERSATION', Conversation::PROTOCOL_GS_CONVERSATION); // Deprecated
-define('PROTOCOL_SPLITTED_CONV'  , Conversation::PROTOCOL_SPLITTED_CONV);
-/**
- * @}
- */
-
-/**
- * @name Network constants
- * @deprecated since version 3.6
- * @see Protocol
- *
- * Network and protocol family types
- * @{
- */
-define('NETWORK_DFRN'     , Protocol::DFRN);      // Friendica, Mistpark, other DFRN implementations
-define('NETWORK_ZOT'      , Protocol::ZOT);       // Zot! - Currently unsupported
-define('NETWORK_OSTATUS'  , Protocol::OSTATUS);   // GNU-social, Pleroma, Mastodon, other OStatus implementations
-define('NETWORK_FEED'     , Protocol::FEED);      // RSS/Atom feeds with no known "post/notify" protocol
-define('NETWORK_DIASPORA' , Protocol::DIASPORA);  // Diaspora
-define('NETWORK_MAIL'     , Protocol::MAIL);      // IMAP/POP
-define('NETWORK_FACEBOOK' , Protocol::FACEBOOK);  // Facebook API
-define('NETWORK_LINKEDIN' , Protocol::LINKEDIN);  // LinkedIn
-define('NETWORK_XMPP'     , Protocol::XMPP);      // XMPP - Currently unsupported
-define('NETWORK_MYSPACE'  , Protocol::MYSPACE);   // MySpace - Currently unsupported
-define('NETWORK_GPLUS'    , Protocol::GPLUS);     // Google+
-define('NETWORK_PUMPIO'   , Protocol::PUMPIO);    // pump.io
-define('NETWORK_TWITTER'  , Protocol::TWITTER);   // Twitter
-define('NETWORK_DIASPORA2', Protocol::DIASPORA2); // Diaspora connector
-define('NETWORK_STATUSNET', Protocol::STATUSNET); // Statusnet connector
-define('NETWORK_APPNET'   , Protocol::APPNET);    // app.net - Dead protocol
-define('NETWORK_NEWS'     , Protocol::NEWS);      // Network News Transfer Protocol - Currently unsupported
-define('NETWORK_ICALENDAR', Protocol::ICALENDAR); // iCalendar - Currently unsupported
-define('NETWORK_PNUT'     , Protocol::PNUT);      // pnut.io - Currently unsupported
-define('NETWORK_PHANTOM'  , Protocol::PHANTOM);   // Place holder
-/**
- * @}
- */
-
 /**
  * These numbers are used in stored permissions
  * and existing allocations MUST NEVER BE CHANGED
  * OR RE-ASSIGNED! You may only add to them.
  */
 $netgroup_ids = [
-	NETWORK_DFRN     => (-1),
-	NETWORK_ZOT      => (-2),
-	NETWORK_OSTATUS  => (-3),
-	NETWORK_FEED     => (-4),
-	NETWORK_DIASPORA => (-5),
-	NETWORK_MAIL     => (-6),
-	NETWORK_FACEBOOK => (-8),
-	NETWORK_LINKEDIN => (-9),
-	NETWORK_XMPP     => (-10),
-	NETWORK_MYSPACE  => (-11),
-	NETWORK_GPLUS    => (-12),
-	NETWORK_PUMPIO   => (-13),
-	NETWORK_TWITTER  => (-14),
-	NETWORK_DIASPORA2 => (-15),
-	NETWORK_STATUSNET => (-16),
-	NETWORK_APPNET    => (-17),
-	NETWORK_NEWS      => (-18),
-	NETWORK_ICALENDAR => (-19),
-	NETWORK_PNUT      => (-20),
+	Protocol::DFRN     => (-1),
+	Protocol::ZOT      => (-2),
+	Protocol::OSTATUS  => (-3),
+	Protocol::FEED     => (-4),
+	Protocol::DIASPORA => (-5),
+	Protocol::MAIL     => (-6),
+	Protocol::FACEBOOK => (-8),
+	Protocol::LINKEDIN => (-9),
+	Protocol::XMPP     => (-10),
+	Protocol::MYSPACE  => (-11),
+	Protocol::GPLUS    => (-12),
+	Protocol::PUMPIO   => (-13),
+	Protocol::TWITTER  => (-14),
+	Protocol::DIASPORA2 => (-15),
+	Protocol::STATUSNET => (-16),
+	Protocol::NEWS      => (-18),
+	Protocol::ICALENDAR => (-19),
+	Protocol::PNUT      => (-20),
 
-	NETWORK_PHANTOM  => (-127),
+	Protocol::PHANTOM  => (-127),
 ];
 
 /**
@@ -451,8 +337,9 @@ define('ACTIVITY_OBJ_QUESTION', 'http://activityschema.org/object/question');
  * @{
  */
 define('GRAVITY_PARENT',       0);
-define('GRAVITY_LIKE',         3);
+define('GRAVITY_ACTIVITY',     3);
 define('GRAVITY_COMMENT',      6);
+define('GRAVITY_UNKNOWN',      9);
 /* @}*/
 
 /**
@@ -498,36 +385,6 @@ if (!defined("SIGTERM")) {
 if (!defined('CURLE_OPERATION_TIMEDOUT')) {
 	define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
 }
-/**
- * Reverse the effect of magic_quotes_gpc if it is enabled.
- * Please disable magic_quotes_gpc so we don't have to do this.
- * See http://php.net/manual/en/security.magicquotes.disabling.php
- */
-function startup()
-{
-	error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
-	set_time_limit(0);
-
-	// This has to be quite large to deal with embedded private photos
-	ini_set('pcre.backtrack_limit', 500000);
-
-	if (get_magic_quotes_gpc()) {
-		$process = [&$_GET, &$_POST, &$_COOKIE, &$_REQUEST];
-		while (list($key, $val) = each($process)) {
-			foreach ($val as $k => $v) {
-				unset($process[$key][$k]);
-				if (is_array($v)) {
-					$process[$key][stripslashes($k)] = $v;
-					$process[] = &$process[$key][stripslashes($k)];
-				} else {
-					$process[$key][stripslashes($k)] = stripslashes($v);
-				}
-			}
-		}
-		unset($process);
-	}
-}
 
 /**
  * @brief Retrieve the App structure
@@ -538,14 +395,7 @@ function startup()
  */
 function get_app()
 {
-	global $a;
-
-	if (empty($a)) {
-		$a = new App(dirname(__DIR__));
-		BaseObject::setApp($a);
-	}
-
-	return $a;
+	return BaseObject::getApp();
 }
 
 /**
@@ -706,7 +556,7 @@ function check_url(App $a)
 	// and www.example.com vs example.com.
 	// We will only change the url to an ip address if there is no existing setting
 
-	if (empty($url) || (!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname))) {
+	if (empty($url) || (!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname()))) {
 		Config::set('system', 'url', System::baseUrl());
 	}
 
@@ -740,10 +590,17 @@ function update_db()
 				return;
 			}
 
+			// run the pre_update_nnnn functions in update.php
+			for ($x = $stored + 1; $x <= $current; $x++) {
+				$r = run_update_function($x, 'pre_update');
+				if (!$r) {
+					break;
+				}
+			}
+
 			Config::set('database', 'dbupdate_' . DB_UPDATE_VERSION, time());
 
-			// run update routine
-			// it update the structure in one call
+			// update the structure in one call
 			$retval = DBStructure::update(false, true);
 			if ($retval) {
 				DBStructure::updateFail(
@@ -755,9 +612,9 @@ function update_db()
 				Config::set('database', 'dbupdate_' . DB_UPDATE_VERSION, 'success');
 			}
 
-			// run any left update_nnnn functions in update.php
+			// run the update_nnnn functions in update.php
 			for ($x = $stored + 1; $x <= $current; $x++) {
-				$r = run_update_function($x);
+				$r = run_update_function($x, 'update');
 				if (!$r) {
 					break;
 				}
@@ -768,9 +625,11 @@ function update_db()
 	return;
 }
 
-function run_update_function($x)
+function run_update_function($x, $prefix)
 {
-	if (function_exists('update_' . $x)) {
+	$funcname = $prefix . '_' . $x;
+
+	if (function_exists($funcname)) {
 		// There could be a lot of processes running or about to run.
 		// We want exactly one process to run the update command.
 		// So store the fact that we're taking responsibility
@@ -778,16 +637,14 @@ function run_update_function($x)
 		// If the update fails or times-out completely you may need to
 		// delete the config entry to try again.
 
-		$t = Config::get('database', 'update_' . $x);
+		$t = Config::get('database', $funcname);
 		if (!is_null($t)) {
 			return false;
 		}
-		Config::set('database', 'update_' . $x, time());
+		Config::set('database', $funcname, time());
 
 		// call the specific update
-
-		$func = 'update_' . $x;
-		$retval = $func();
+		$retval = $funcname();
 
 		if ($retval) {
 			//send the administrator an e-mail
@@ -797,13 +654,21 @@ function run_update_function($x)
 			);
 			return false;
 		} else {
-			Config::set('database', 'update_' . $x, 'success');
-			Config::set('system', 'build', $x);
+			Config::set('database', $funcname, 'success');
+
+			if ($prefix == 'update') {
+				Config::set('system', 'build', $x);
+			}
+
 			return true;
 		}
 	} else {
-		Config::set('database', 'update_' . $x, 'success');
-		Config::set('system', 'build', $x);
+		Config::set('database', $funcname, 'success');
+
+		if ($prefix == 'update') {
+			Config::set('system', 'build', $x);
+		}
+
 		return true;
 	}
 }
@@ -811,7 +676,7 @@ function run_update_function($x)
 /**
  * @brief Synchronise addons:
  *
- * $a->config['system']['addon'] contains a comma-separated list of names
+ * system.addon contains a comma-separated list of names
  * of addons which are used on this system.
  * Go through the database list of already installed addons, and if we have
  * an entry, but it isn't in the config list, call the uninstall procedure
@@ -824,7 +689,7 @@ function run_update_function($x)
 function check_addons(App $a)
 {
 	$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$installed = $r;
 	} else {
 		$installed = [];
@@ -864,28 +729,6 @@ function check_addons(App $a)
 	return;
 }
 
-function get_guid($size = 16, $prefix = '')
-{
-	if (is_bool($prefix) && !$prefix) {
-		$prefix = '';
-	} elseif ($prefix == '') {
-		$a = get_app();
-		$prefix = hash('crc32', $a->get_hostname());
-	}
-
-	while (strlen($prefix) < ($size - 13)) {
-		$prefix .= mt_rand();
-	}
-
-	if ($size >= 24) {
-		$prefix = substr($prefix, 0, $size - 22);
-		return str_replace('.', '', uniqid($prefix, true));
-	} else {
-		$prefix = substr($prefix, 0, max($size - 13, 0));
-		return uniqid($prefix);
-	}
-}
-
 /**
  * @brief Used to end the current process, after saving session state.
  * @deprecated
@@ -917,7 +760,7 @@ function goaway($path)
  */
 function local_user()
 {
-	if (x($_SESSION, 'authenticated') && x($_SESSION, 'uid')) {
+	if (!empty($_SESSION['authenticated']) && !empty($_SESSION['uid'])) {
 		return intval($_SESSION['uid']);
 	}
 	return false;
@@ -960,6 +803,11 @@ function remote_user()
 //	if (local_user()) {
 //		return false;
 //	}
+
+	if (empty($_SESSION)) {
+		return false;
+	}
+
 	if (x($_SESSION, 'authenticated') && x($_SESSION, 'visitor_id')) {
 		return intval($_SESSION['visitor_id']);
 	}
@@ -975,6 +823,10 @@ function remote_user()
  */
 function notice($s)
 {
+	if (empty($_SESSION)) {
+		return;
+	}
+
 	$a = get_app();
 	if (!x($_SESSION, 'sysmsg')) {
 		$_SESSION['sysmsg'] = [];
@@ -1007,17 +859,6 @@ function info($s)
 	}
 }
 
-/**
- * @brief Wrapper around config to limit the text length of an incoming message
- *
- * @return int
- */
-function get_max_import_size()
-{
-	$a = get_app();
-	return (x($a->config, 'max_import_size') ? $a->config['max_import_size'] : 0);
-}
-
 function feed_birthday($uid, $tz)
 {
 	/**
@@ -1042,13 +883,9 @@ function feed_birthday($uid, $tz)
 		$tz = 'UTC';
 	}
 
-	$p = q(
-		"SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
-		intval($uid)
-	);
-
-	if (DBM::is_result($p)) {
-		$tmp_dob = substr($p[0]['dob'], 5);
+	$profile = DBA::selectFirst('profile', ['dob'], ['is-default' => true, 'uid' => $uid]);
+	if (DBA::isResult($profile)) {
+		$tmp_dob = substr($profile['dob'], 5);
 		if (intval($tmp_dob)) {
 			$y = DateTimeFormat::timezoneNow($tz, 'Y');
 			$bd = $y . '-' . $tmp_dob . ' 00:00';
@@ -1073,13 +910,11 @@ function is_site_admin()
 {
 	$a = get_app();
 
-	$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
+	$admin_email = Config::get('config', 'admin_email');
 
-	//if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
-	if (local_user() && x($a->user, 'email') && x($a->config, 'admin_email') && in_array($a->user['email'], $adminlist)) {
-		return true;
-	}
-	return false;
+	$adminlist = explode(',', str_replace(' ', '', $admin_email));
+
+	return local_user() && $admin_email && in_array(defaults($a->user, 'email', ''), $adminlist);
 }
 
 /**
@@ -1155,7 +990,7 @@ function explode_querystring($query)
 function curPageURL()
 {
 	$pageURL = 'http';
-	if ($_SERVER["HTTPS"] == "on") {
+	if (!empty($_SERVER["HTTPS"]) && ($_SERVER["HTTPS"] == "on")) {
 		$pageURL .= "s";
 	}
 
@@ -1173,7 +1008,7 @@ function random_digits($digits)
 {
 	$rn = '';
 	for ($i = 0; $i < $digits; $i++) {
-		/// @TODO rand() is different to mt_rand() and maybe lesser "random"
+		/// @TODO Avoid rand/mt_rand, when it comes to cryptography, they are generating predictable (seedable) numbers.
 		$rn .= rand(0, 9);
 	}
 	return $rn;
@@ -1187,7 +1022,7 @@ function get_server()
 		$server = "https://dir.friendica.social";
 	}
 
-	return($server);
+	return $server;
 }
 
 function get_temppath()
@@ -1236,7 +1071,7 @@ function get_cachefile($file, $writemode = true)
 	$cache = get_itemcachepath();
 
 	if ((!$cache) || (!is_dir($cache))) {
-		return("");
+		return "";
 	}
 
 	$subfolder = $cache . "/" . substr($file, 0, 2);
@@ -1250,7 +1085,6 @@ function get_cachefile($file, $writemode = true)
 		}
 	}
 
-	/// @TODO no need to put braces here
 	return $cachepath;
 }
 
@@ -1357,7 +1191,6 @@ function get_spoolpath()
 	return "";
 }
 
-
 if (!function_exists('exif_imagetype')) {
 	function exif_imagetype($file)
 	{
@@ -1395,7 +1228,7 @@ function validate_include(&$file)
 	}
 
 	// Simply return flag
-	return ($valid);
+	return $valid;
 }
 
 function current_load()
diff --git a/composer.json b/composer.json
index b7cd645bd..c71777550 100644
--- a/composer.json
+++ b/composer.json
@@ -13,18 +13,17 @@
 		"issues": "https://github.com/friendica/friendica/issues"
 	},
 	"require": {
-		"php": ">5.6",
+		"php": ">=5.6.1",
 		"ext-xml": "*",
 		"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.*",
 		"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",
@@ -37,7 +36,8 @@
 		"npm-asset/jquery-datetimepicker": "^2.4.0",
 		"npm-asset/jgrowl": "^1.4",
 		"npm-asset/fullcalendar": "^3.0.1",
-		"npm-asset/cropperjs": "1.2.2"
+		"npm-asset/cropperjs": "1.2.2",
+		"npm-asset/imagesloaded": "4.1.4"
 	},
 	"repositories": [
 		{
@@ -47,7 +47,8 @@
 	],
 	"autoload": {
 		"psr-4": {
-			"Friendica\\": "src/"
+			"Friendica\\": "src/",
+			"Friendica\\Test\\": "tests/"
 		},
 		"psr-0": {
 			"": "library/"
@@ -68,5 +69,14 @@
 		"exclude": [
 			"log", "cache", "/photo", "/proxy"
 		]
+	},
+	"require-dev": {
+		"phpunit/dbunit": "^2.0",
+		"phpdocumentor/reflection-docblock": "^3.0.2",
+		"phpunit/php-token-stream": "^1.4.2",
+		"mikey179/vfsStream": "^1.6"
+	},
+	"scripts": {
+		"test": "phpunit"
 	}
 }
diff --git a/composer.lock b/composer.lock
index f294c16ef..b0ff745c6 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": "f97245142e60a521f048a667bec4e436",
+    "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",
@@ -770,6 +770,49 @@
             ],
             "time": "2018-01-03T13:39:39+00:00"
         },
+        {
+            "name": "npm-asset/ev-emitter",
+            "version": "1.1.1",
+            "dist": {
+                "type": "tar",
+                "url": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-1.1.1.tgz",
+                "reference": null,
+                "shasum": "8f18b0ce5c76a5d18017f71c0a795c65b9138f2a"
+            },
+            "type": "npm-asset-library",
+            "extra": {
+                "npm-asset-bugs": {
+                    "url": "https://github.com/metafizzy/ev-emitter/issues"
+                },
+                "npm-asset-main": "ev-emitter.js",
+                "npm-asset-directories": {
+                    "test": "test"
+                },
+                "npm-asset-repository": {
+                    "type": "git",
+                    "url": "git+https://github.com/metafizzy/ev-emitter.git"
+                },
+                "npm-asset-scripts": {
+                    "test": "mocha test/test"
+                }
+            },
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "David DeSandro"
+                }
+            ],
+            "description": "lil' event emitter",
+            "homepage": "https://github.com/metafizzy/ev-emitter#readme",
+            "keywords": [
+                "emitter",
+                "event",
+                "pubsub"
+            ],
+            "time": "2017-07-06T13:46:38+00:00"
+        },
         {
             "name": "npm-asset/fullcalendar",
             "version": "3.8.2",
@@ -882,6 +925,70 @@
             ],
             "time": "2018-01-30T23:49:01+00:00"
         },
+        {
+            "name": "npm-asset/imagesloaded",
+            "version": "4.1.4",
+            "dist": {
+                "type": "tar",
+                "url": "https://registry.npmjs.org/imagesloaded/-/imagesloaded-4.1.4.tgz",
+                "reference": null,
+                "shasum": "1376efcd162bb768c34c3727ac89cc04051f3cc7"
+            },
+            "require": {
+                "npm-asset/ev-emitter": ">=1.0.0,<2.0.0"
+            },
+            "require-dev": {
+                "npm-asset/chalk": ">=1.1.1,<2.0.0",
+                "npm-asset/cheerio": ">=0.19.0,<0.20.0",
+                "npm-asset/gulp": ">=3.9.0,<4.0.0",
+                "npm-asset/gulp-jshint": ">=1.11.2,<2.0.0",
+                "npm-asset/gulp-json-lint": ">=0.1.0,<0.2.0",
+                "npm-asset/gulp-rename": ">=1.2.2,<2.0.0",
+                "npm-asset/gulp-replace": ">=0.5.4,<0.6.0",
+                "npm-asset/gulp-requirejs-optimize": "dev-github:metafizzy/gulp-requirejs-optimize",
+                "npm-asset/gulp-uglify": ">=1.4.2,<2.0.0",
+                "npm-asset/gulp-util": ">=3.0.7,<4.0.0",
+                "npm-asset/highlight.js": ">=8.9.1,<9.0.0",
+                "npm-asset/marked": ">=0.3.5,<0.4.0",
+                "npm-asset/minimist": ">=1.2.0,<2.0.0",
+                "npm-asset/transfob": ">=1.0.0,<2.0.0"
+            },
+            "type": "npm-asset-library",
+            "extra": {
+                "npm-asset-bugs": {
+                    "url": "https://github.com/desandro/imagesloaded/issues"
+                },
+                "npm-asset-main": "imagesloaded.js",
+                "npm-asset-directories": {
+                    "test": "test"
+                },
+                "npm-asset-repository": {
+                    "type": "git",
+                    "url": "git://github.com/desandro/imagesloaded.git"
+                },
+                "npm-asset-scripts": {
+                    "test": "echo \"Error: no test specified\" && exit 1"
+                }
+            },
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "David DeSandro"
+                }
+            ],
+            "description": "JavaScript is all like _You images done yet or what?_",
+            "homepage": "https://github.com/desandro/imagesloaded",
+            "keywords": [
+                "dom",
+                "images",
+                "jquery-plugin",
+                "loaded",
+                "ui"
+            ],
+            "time": "2018-01-02T16:56:03+00:00"
+        },
         {
             "name": "npm-asset/jgrowl",
             "version": "1.4.6",
@@ -1562,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",
@@ -2090,17 +1999,1484 @@
             "time": "2016-12-14T21:57:25+00:00"
         }
     ],
-    "packages-dev": [],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14T21:17:01+00:00"
+        },
+        {
+            "name": "mikey179/vfsStream",
+            "version": "v1.6.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mikey179/vfsStream.git",
+                "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
+                "reference": "d5fec95f541d4d71c4823bb5e30cf9b9e5b96145",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "org\\bovigo\\vfs\\": "src/main/php"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Frank Kleine",
+                    "homepage": "http://frankkleine.de/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Virtual file system to mock the real file system in unit tests.",
+            "homepage": "http://vfs.bovigo.org/",
+            "time": "2017-08-01T08:02:14+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.0",
+                "doctrine/common": "^2.6",
+                "phpunit/phpunit": "^4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                },
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2017-10-19T19:58:43+00:00"
+        },
+        {
+            "name": "phar-io/version",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "time": "2017-03-05T17:38:23+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2017-09-11T18:02:19+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "3.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2",
+                "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0",
+                "phpdocumentor/reflection-common": "^1.0.0",
+                "phpdocumentor/type-resolver": "^0.4.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2017-11-10T14:09:06+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2017-07-14T14:27:02+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "1.7.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+                "sebastian/comparator": "^1.1|^2.0|^3.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5|^3.2",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2018-04-18T13:57:24+00:00"
+        },
+        {
+            "name": "phpunit/dbunit",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/dbunit.git",
+                "reference": "5c35d74549c21ba55d0ea74ba89d191a51f8cf25"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/5c35d74549c21ba55d0ea74ba89d191a51f8cf25",
+                "reference": "5c35d74549c21ba55d0ea74ba89d191a51f8cf25",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pdo": "*",
+                "ext-simplexml": "*",
+                "php": "^5.4 || ^7.0",
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0",
+                "symfony/yaml": "^2.1 || ^3.0"
+            },
+            "bin": [
+                "dbunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "DbUnit port for PHP/PHPUnit to support database interaction testing.",
+            "homepage": "https://github.com/sebastianbergmann/dbunit/",
+            "keywords": [
+                "database",
+                "testing",
+                "xunit"
+            ],
+            "time": "2016-12-02T14:39:14+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "4.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
+                "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-file-iterator": "^1.3",
+                "phpunit/php-text-template": "^1.2",
+                "phpunit/php-token-stream": "^1.4.2 || ^2.0",
+                "sebastian/code-unit-reverse-lookup": "^1.0",
+                "sebastian/environment": "^1.3.2 || ^2.0",
+                "sebastian/version": "^1.0 || ^2.0"
+            },
+            "require-dev": {
+                "ext-xdebug": "^2.1.4",
+                "phpunit/phpunit": "^5.7"
+            },
+            "suggest": {
+                "ext-xdebug": "^2.5.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2017-04-02T07:44:40+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2017-11-27T13:52:08+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2017-02-26T11:10:40+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16",
+                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2017-12-04T08:55:13+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "5.7.27",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
+                "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "myclabs/deep-copy": "~1.3",
+                "php": "^5.6 || ^7.0",
+                "phpspec/prophecy": "^1.6.2",
+                "phpunit/php-code-coverage": "^4.0.4",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "^1.0.6",
+                "phpunit/phpunit-mock-objects": "^3.2",
+                "sebastian/comparator": "^1.2.4",
+                "sebastian/diff": "^1.4.3",
+                "sebastian/environment": "^1.3.4 || ^2.0",
+                "sebastian/exporter": "~2.0",
+                "sebastian/global-state": "^1.1",
+                "sebastian/object-enumerator": "~2.0",
+                "sebastian/resource-operations": "~1.0",
+                "sebastian/version": "^1.0.6|^2.0.1",
+                "symfony/yaml": "~2.1|~3.0|~4.0"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "3.0.2"
+            },
+            "require-dev": {
+                "ext-pdo": "*"
+            },
+            "suggest": {
+                "ext-xdebug": "*",
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.7.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2018-02-01T05:50:59+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "3.4.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "a23b761686d50a560cc56233b9ecf49597cc9118"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118",
+                "reference": "a23b761686d50a560cc56233b9ecf49597cc9118",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-text-template": "^1.2",
+                "sebastian/exporter": "^1.2 || ^2.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2017-06-30T09:13:00+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2017-03-04T06:30:41+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2 || ~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2017-01-29T09:50:25+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2017-05-22T07:24:03+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-11-26T07:53:53+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+                "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~2.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2016-11-19T08:54:04+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12T03:26:01+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7",
+                "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6",
+                "sebastian/recursion-context": "~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "time": "2017-02-18T15:18:39+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+                "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2016-11-19T07:33:16+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2015-07-28T20:34:47+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-10-03T07:35:21+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v3.4.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/a42f9da85c7c38d59f5e53f076fe81a091f894d0",
+                "reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8"
+            },
+            "conflict": {
+                "symfony/console": "<3.4"
+            },
+            "require-dev": {
+                "symfony/console": "~3.4|~4.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-04-03T05:14:20+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
+                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6",
+                "sebastian/version": "^1.0.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2018-01-29T19:49:41+00:00"
+        }
+    ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "lightopenid/lightopenid": 20,
-        "pear/text_highlighter": 20
+        "lightopenid/lightopenid": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">5.6",
+        "php": ">=5.6.1",
         "ext-xml": "*"
     },
     "platform-dev": []
diff --git a/config/addon-sample.ini.php b/config/addon-sample.ini.php
new file mode 100644
index 000000000..2665412a5
--- /dev/null
+++ b/config/addon-sample.ini.php
@@ -0,0 +1,10 @@
+<?php return <<<INI
+
+; Copy this configuration file to addon.ini.php and edit it if you want to configure addons, see below example for the twitter addon
+
+;[twitter]
+;consumerkey = localhost
+;consumersecret = mysqlusername
+
+INI;
+// Keep this line
diff --git a/config/config.ini.php b/config/config.ini.php
new file mode 100644
index 000000000..827439984
--- /dev/null
+++ b/config/config.ini.php
@@ -0,0 +1,408 @@
+<?php return <<<INI
+
+; CONFIG.INI.PHP
+
+; This file declares the default values for the base config of Friendica.
+; These configuration values aren't accessible from the admin settings page and custom values must be set in config/local.ini.php
+
+; Please don't edit this file directly as its content may change in the upcoming versions.
+
+[database]
+
+; host (String)
+; Hostname or IP address of the database server.
+; Can contain the port number with the syntax "hostname:port".
+hostname =
+
+; user (String)
+; Database user name. Please don't use "root".
+username =
+
+; pass (String)
+; Database user password. Please don't use empty passwords.
+password =
+
+; base (String)
+; Database name.
+database =
+
+; charset (String)
+; Database connexion charset. Changing this value will likely corrupt special characters.
+charset = utf8mb4
+
+[config]
+
+; admin_email (Comma-separated list)
+; In order to perform system administration via the admin panel, this must precisely match the email address of the person logged in.
+admin_email =
+
+; admin_nickname (String)
+; Nickname of the main admin user, used if there are more than one admin user defined in config.admin_email.
+admin_nickname =
+
+; max_import_size (Integer)
+; Maximum body size of DFRN and Mail messages in characters. 0 is unlimited.
+max_import_size = 200000
+
+; php_path (String)
+; Location of PHP command line processor.
+php_path = php
+
+[system]
+
+; allowed_link_protocols (Array)
+; Allowed protocols in links URLs, add at your own risk. http is always allowed.
+allowed_link_protocols[0] = ftp
+allowed_link_protocols[1] = ftps
+allowed_link_protocols[2] = mailto
+allowed_link_protocols[3] = cid
+allowed_link_protocols[4] = gopher
+
+; always_show_preview (Boolean)
+; Only show small preview picures.
+always_show_preview = false
+
+; archival_days (Integer)
+; Number of days that we try to deliver content before we archive a contact.
+archival_days = 32
+
+; auth_cookie_lifetime (Integer)
+; Number of days that should pass without any activity before a user who chose "Remember me" when logging in is considered logged out.
+auth_cookie_lifetime = 7
+
+; block_local_dir (Boolean)
+; Deny public access to the local user directory.
+block_local_dir = false
+
+; cache_driver (database|memcache|memcached|redis)
+; Whether to use Memcache or Memcached or Redis to store temporary cache.
+cache_driver = database
+
+; config_adapter (jit|preload)
+; Allow to switch the configuration adapter to improve performances at the cost of memory consumption.
+config_adapter = jit
+
+; curl_range_bytes (Integer)
+; Maximum number of bytes that should be fetched. Default is 0, which mean "no limit".
+curl_range_bytes = 0
+
+; crawl_permit_period (Integer)
+; Period in seconds between allowed searches when the number of free searches is reached and "permit_crawling" is activated.
+crawl_permit_period = 60
+
+; db_log (Path)
+; Name of a logfile to log slow database queries.
+db_log =
+
+; db_log_index (Path)
+; Name of a logfile to log queries with bad indexes.
+db_log_index =
+
+; db_log_index_watch (Comma-separated list)
+; Watchlist of indexes to watch.
+db_log_index_watch =
+
+; db_log_index_blacklist (Comma-separated list)
+; Blacklist of indexes that shouldn't be watched.
+db_log_index_blacklist =
+
+; db_loglimit (Integer)
+; If a database call lasts longer than this value in seconds it is logged.
+; Inactive if system.db_log is empty.
+db_loglimit = 10
+
+; db_loglimit_index (Integer)
+; Number of index rows needed to be logged for indexes on the watchlist. 0 to disable.
+db_loglimit_index = 0
+
+; db_loglimit_index_high (Integer)
+; Number of index rows to be logged anyway (for any index). 0 to disable.
+db_loglimit_index_high = 0
+
+; dbclean_expire_conversation (Integer)
+; When DBClean is enabled, any entry in the conversation table will be deleted after this many days.
+; These data are normally needed only for debugging purposes and they are safe to delete.
+dbclean_expire_conversation = 90
+
+; diaspora_test (Boolean)
+; For development only. Disables the message transfer.
+diaspora_test = false
+
+; disable_email_validation (Boolean)
+; Disables the check if a mail address is in a valid format and can be resolved via DNS.
+disable_email_validation = false
+
+; disable_url_validation (Boolean)
+; Disables the DNS lookup of an URL.
+disable_url_validation = false
+
+; disable_password_exposed (Boolean)
+; Disable the exposition check against the remote haveibeenpwned API on password change.
+disable_password_exposed = false
+
+; dlogfile (Path)
+; location of the developer log file.
+dlogfile =
+
+; dlogip (String)
+; restricts develop log writes to requests originating from this IP address.
+dlogip =
+
+; free_crawls (Integer)
+; Number of "free" searches when system.permit_crawling is activated.
+free_crawls = 10
+
+; frontend_worker_timeout (Integer)
+; Value in minutes after we think that a frontend task was killed by the webserver.
+frontend_worker_timeout = 10
+
+; groupedit_image_limit (Integer)
+; Number of contacts at which the group editor should switch from display the profile pictures of the contacts to only display the names.
+; This can alternatively be set on a per account basis in the pconfig table.
+groupedit_image_limit = 400
+
+; hsts (Boolean)
+; Enables the sending of HTTP Strict Transport Security headers.
+hsts = false
+
+; ignore_cache (Boolean)
+; For development only. Disables the item cache.
+ignore_cache = false
+
+; instances_social_key (String)
+; Key to the API of https://instances.social which retrieves data about mastodon servers.
+; See https://instances.social/api/token to get an API key.
+instances_social_key =
+
+; ipv4_resolve (Boolean)
+; Resolve IPV4 addresses only. Don't resolve to IPV6.
+ipv4_resolve = false
+
+; invitation_only (Boolean)
+; If set true registration is only possible after a current member of the node has send an invitation.
+invitation_only = false
+
+; like_no_comment (Boolean)
+; Don't update the "commented" value of an item when it is liked.
+like_no_comment = false
+
+; local_block (Boolean)
+; Used in conjunction with "block_public".
+local_block = false
+
+; local_search (Boolean)
+; Blocks search for users who are not logged in to prevent crawlers from blocking your system.
+local_search = false
+
+; local_tags (Boolean)
+; If activated, all hashtags will point to the local server.
+local_tags = false
+
+; max_batch_queue (Integer)
+; Maximum number of batched queue items for a single contact before subsequent messages are discarded.
+max_batch_queue = 1000
+
+; max_connections (Integer)
+; The maximum number of database connections which can be in use before the worker process is deferred to its next interval.
+; When the system can't detect the maximum numbers of connection then this value can be used. Use 0 for auto-detection.
+max_connections = 0
+
+; max_connections_level (Integer 0-100)
+; The maximum percentage of connections that are allowed to let the worker start.
+max_connections_level = 75
+
+; max_contact_queue (Integer)
+; Maximum number of queue items for a single contact before subsequent messages are discarded.
+max_contact_queue = 500
+
+; max_image_length (Integer)
+; An alternate way of limiting picture upload sizes.
+; Specify the maximum pixel  length that pictures are allowed to be (for non-square pictures, it will apply to the longest side).
+; Pictures longer than this length will be resized to be this length (on the longest side, the other side will be scaled appropriately).
+; If you don't want to set a maximum length, set to -1.
+max_image_length = -1
+
+; max_processes_backend (Integer)
+; Maximum number of concurrent database processes for background tasks.
+max_processes_backend = 5
+
+; max_processes_frontend (Integer)
+; Maximum number of concurrent database processes for foreground tasks.
+max_processes_frontend = 20
+
+; maximagesize (Integer)
+; Maximum size in bytes of an uploaded photo.
+maximagesize = 800000
+
+; memcache_host (String)
+; Host name of the memcache daemon.
+memcache_host = 127.0.0.1
+
+; memcache_port (Integer)
+; Port number of the memcache daemon.
+memcache_port = 11211
+
+; memcached_hosts (Array)
+; Array of Memcached servers info "host, port(, weight)".
+memcached_hosts[0] = 127.0.0.1,11211
+
+; min_poll_interval (Integer)
+; minimal distance in minutes between two polls for a contact. Reasonable values are between 1 and 59.
+min_poll_interval = 1
+
+; no_count (Boolean)
+; Don't do count calculations (currently only when showing albums).
+no_count = false
+
+; no_oembed (Boolean)
+; Don't use OEmbed to fetch more information about a link.
+no_oembed = false
+
+; no_smilies (Boolean)
+; Don't show smilies.
+no_smilies = false
+
+; no_view_full_size (Boolean)
+; Don't add the link "View full size" under a resized image.
+no_view_full_size = false
+
+; optimize_items (Boolean)
+; Triggers an SQL command to optimize the item table before expiring items.
+optimize_items = false
+
+; paranoia (Boolean)
+; Log out users if their IP address changed.
+paranoia = false
+
+; permit_crawling (Boolean)
+; Restricts the search for not logged in users to one search per minute.
+permit_crawling = false
+
+; pidfile (Path)
+; Daemon pid file path. For example: pidfile = /path/to/daemon.pid
+pidfile =
+
+; png_quality (Integer)
+; Sets the ImageMagick compression level for PNG images. Values ranges from 0 (uncompressed) to 9 (most compressed).
+png_quality = 8
+
+; profiler (Boolean)
+; Enable internal timings to help optimize code. Needed for "rendertime" addon.
+profiler = false
+
+; proxy_cache_time (Integer)
+; Period in seconds after which the cache is cleared.
+proxy_cache_time = 86400
+
+; pushpoll_frequency (Integer)
+; Frequency of contact poll for subhub contact using the DFRM or OStatus network.
+; Available values:
+; - 5 = every month
+; - 4 = every week
+; - 3 = every day
+; - 2 = twice a day
+; - 1 = every hour
+; - 0 = every minute
+pushpoll_frequency = 3
+
+; queue_no_dead_check (Boolean)
+; Ignore if the target contact or server seems to be dead during queue delivery.
+queue_no_dead_check = false
+
+; redis_host (String)
+; Host name of the redis daemon.
+redis_host = 127.0.0.1
+
+; redis_port (String)
+; Port number of the redis daemon.
+redis_port = 6379
+
+; session_handler (database|cache|native)
+; Whether to use Cache to store session data or to use PHP native session storage.
+session_handler = database
+
+; remove_multiplicated_lines (Boolean)
+; If enabled, multiple linefeeds in items are stripped to a single one.
+remove_multiplicated_lines = false
+
+; sendmail_params (Boolean)
+; Normal sendmail command parameters will be added when the PHP mail() function is called for sending e-mails.
+; This ensures the Sender Email address setting is applied to the message envelope rather than the host's default address.
+; Set to false if your non-sendmail agent is incompatible, or to restore old behavior of using the host address.
+sendmail_params = true
+
+; show_global_community_hint (Boolean)
+; When the global community page is enabled, use this option to display a hint above the stream, that this is a collection of all public top-level postings that arrive on your node.
+show_global_community_hint = false
+
+; show_unsupported_addons (Boolean)
+; Show all addons including the unsupported ones.
+show_unsupported_addons = false
+
+; show_unsupported_themes (Boolean)
+; Show all themes including the unsupported ones.
+show_unsupported_themes = false
+
+; throttle_limit_day (Integer)
+; Maximum number of posts that a user can send per day with the API. 0 to disable daily throttling.
+throttle_limit_day = 0
+
+; throttle_limit_week (Integer)
+; Maximum number of posts that a user can send per week with the API. 0 to disable weekly throttling.
+throttle_limit_week = 0
+
+; throttle_limit_month (Integer)
+; Maximum number of posts that a user can send per month with the API. 0 to disable monthly throttling.
+throttle_limit_month = 0
+
+; urlpath (String)
+; If you are using a subdirectory of your domain you will need to put the relative path (from the root of your domain) here.
+; For instance if your URL is 'http://example.com/directory/subdirectory', set urlpath to 'directory/subdirectory'.
+urlpath =
+
+; worker_cooldown (Integer)
+; Cooldown period in seconds after each worker function call.
+worker_cooldown = 0
+
+; worker_debug (Boolean)
+; If enabled, it prints out the number of running processes split by priority.
+worker_debug = false
+
+; worker_fetch_limit (Integer)
+; Number of worker tasks that are fetched in a single query.
+worker_fetch_limit = 1
+
+; worker_load_exponent (Integer)
+; Default 3, which allows only 25% of the maximum worker queues when server load reaches around 37% of maximum load.
+; For a linear response where 25% of worker queues are allowed at 75% of maximum load, set this to 1.
+; Setting 0 would allow maximum worker queues at all times, which is not recommended.
+worker_load_exponent = 3
+
+; xrd_timeout (Integer)
+; Timeout in seconds for fetching the XRD links.
+xrd_timeout = 20
+
+[experimental]
+
+; exp_themes (Boolean)
+; Show experimental themes in user settings.
+exp_themes = false
+
+[theme]
+
+; hide_eventlist (Boolean)
+; Don't show the birthdays and events on the profile and network page.
+hide_eventlist = false
+
+[jabber]
+
+; debug (Boolean)
+; Enable debug level for the jabber account synchronisation.
+debug = false
+
+; lockpath (Path)
+; Must be writable by the ejabberd process. if set then it will prevent the running of multiple processes.
+lockpath =
+
+INI;
+// Keep this line
diff --git a/config/dbstructure.json b/config/dbstructure.json
new file mode 100644
index 000000000..c467ba6bc
--- /dev/null
+++ b/config/dbstructure.json
@@ -0,0 +1,1282 @@
+{
+	"addon": {
+		"comment": "registered addons",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": ""},
+			"name": {"type": "varchar(50)", "not null": "1", "default": "", "comment": "addon base (file)name"},
+			"version": {"type": "varchar(50)", "not null": "1", "default": "", "comment": "currently unused"},
+			"installed": {"type": "boolean", "not null": "1", "default": "0", "comment": "currently always 1"},
+			"hidden": {"type": "boolean", "not null": "1", "default": "0", "comment": "currently unused"},
+			"timestamp": {"type": "int unsigned", "not null": "1", "default": "0", "comment": "file timestamp to check for reloads"},
+			"plugin_admin": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 = has admin config, 0 = has no admin config"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"name": ["UNIQUE", "name"]
+		}
+	},
+	"attach": {
+		"comment": "file attachments",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "generated index"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
+			"hash": {"type": "varchar(64)", "not null": "1", "default": "", "comment": "hash"},
+			"filename": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "filename of original"},
+			"filetype": {"type": "varchar(64)", "not null": "1", "default": "", "comment": "mimetype"},
+			"filesize": {"type": "int unsigned", "not null": "1", "default": "0", "comment": "size in bytes"},
+			"data": {"type": "longblob", "not null": "1", "comment": "file data"},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "creation time"},
+			"edited": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "last edit time"},
+			"allow_cid": {"type": "mediumtext", "comment": "Access Control - list of allowed contact.id '<19><78>"},
+			"allow_gid": {"type": "mediumtext", "comment": "Access Control - list of allowed groups"},
+			"deny_cid": {"type": "mediumtext", "comment": "Access Control - list of denied contact.id"},
+			"deny_gid": {"type": "mediumtext", "comment": "Access Control - list of denied groups"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"]
+		}
+	},
+	"auth_codes": {
+		"comment": "OAuth usage",
+		"fields": {
+			"id": {"type": "varchar(40)", "not null": "1", "primary": "1", "comment": ""},
+			"client_id": {"type": "varchar(20)", "not null": "1", "default": "", "relation": {"clients": "client_id"}, "comment": ""},
+			"redirect_uri": {"type": "varchar(200)", "not null": "1", "default": "", "comment": ""},
+			"expires": {"type": "int", "not null": "1", "default": "0", "comment": ""},
+			"scope": {"type": "varchar(250)", "not null": "1", "default": "", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"]
+		}
+	},
+	"cache": {
+		"comment": "Stores temporary data",
+		"fields": {
+			"k": {"type": "varbinary(255)", "not null": "1", "primary": "1", "comment": "cache key"},
+			"v": {"type": "mediumtext", "comment": "cached serialized value"},
+			"expires": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime of cache expiration"},
+			"updated": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime of cache insertion"}
+		},
+		"indexes": {
+			"PRIMARY": ["k"],
+			"k_expires": ["k", "expires"]
+		}
+	},
+	"challenge": {
+		"comment": "",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"challenge": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"dfrn-id": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"expire": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""},
+			"type": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"last_update": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"]
+		}
+	},
+	"clients": {
+		"comment": "OAuth usage",
+		"fields": {
+			"client_id": {"type": "varchar(20)", "not null": "1", "primary": "1", "comment": ""},
+			"pw": {"type": "varchar(20)", "not null": "1", "default": "", "comment": ""},
+			"redirect_uri": {"type": "varchar(200)", "not null": "1", "default": "", "comment": ""},
+			"name": {"type": "text", "comment": ""},
+			"icon": {"type": "text", "comment": ""},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"}
+		},
+		"indexes": {
+			"PRIMARY": ["client_id"]
+		}
+	},
+	"config": {
+		"comment": "main configuration storage",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": ""},
+			"cat": {"type": "varbinary(50)", "not null": "1", "default": "", "comment": ""},
+			"k": {"type": "varbinary(50)", "not null": "1", "default": "", "comment": ""},
+			"v": {"type": "mediumtext", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"cat_k": ["UNIQUE", "cat", "k"]
+		}
+	},
+	"contact": {
+		"comment": "contact table",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"self": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 if the contact is the user him/her self"},
+			"remote_self": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"rel": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": "The kind of the relation between the user and the contact"},
+			"duplex": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"network": {"type": "char(4)", "not null": "1", "default": "", "comment": "Network protocol of the contact"},
+			"name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Name that this contact is known by"},
+			"nick": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Nick- and user name of the contact"},
+			"location": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"about": {"type": "text", "comment": ""},
+			"keywords": {"type": "text", "comment": "public keywords (interests) of the contact"},
+			"gender": {"type": "varchar(32)", "not null": "1", "default": "", "comment": ""},
+			"xmpp": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"attag": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"avatar": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"photo": {"type": "varchar(255)", "default": "", "comment": "Link to the profile photo of the contact"},
+			"thumb": {"type": "varchar(255)", "default": "", "comment": "Link to the profile photo (thumb size)"},
+			"micro": {"type": "varchar(255)", "default": "", "comment": "Link to the profile photo (micro size)"},
+			"site-pubkey": {"type": "text", "comment": ""},
+			"issued-id": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"dfrn-id": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"nurl": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"addr": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"alias": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"pubkey": {"type": "text", "comment": "RSA public key 4096 bit"},
+			"prvkey": {"type": "text", "comment": "RSA private key 4096 bit"},
+			"batch": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"request": {"type": "varchar(255)", "comment": ""},
+			"notify": {"type": "varchar(255)", "comment": ""},
+			"poll": {"type": "varchar(255)", "comment": ""},
+			"confirm": {"type": "varchar(255)", "comment": ""},
+			"poco": {"type": "varchar(255)", "comment": ""},
+			"aes_allow": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"ret-aes": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"usehub": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"subhub": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"hub-verify": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"last-update": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of the last try to update the contact info"},
+			"success_update": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of the last successful contact update"},
+			"failure_update": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of the last failed update"},
+			"name-date": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"uri-date": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"avatar-date": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"term-date": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"last-item": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "date of the last post"},
+			"priority": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"blocked": {"type": "boolean", "not null": "1", "default": "1", "comment": ""},
+			"readonly": {"type": "boolean", "not null": "1", "default": "0", "comment": "posts of the contact are readonly"},
+			"writable": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"forum": {"type": "boolean", "not null": "1", "default": "0", "comment": "contact is a forum"},
+			"prv": {"type": "boolean", "not null": "1", "default": "0", "comment": "contact is a private group"},
+			"contact-type": {"type": "tinyint", "not null": "1", "default": "0", "comment": ""},
+			"hidden": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"archive": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"pending": {"type": "boolean", "not null": "1", "default": "1", "comment": ""},
+			"rating": {"type": "tinyint", "not null": "1", "default": "0", "comment": ""},
+			"reason": {"type": "text", "comment": ""},
+			"closeness": {"type": "tinyint unsigned", "not null": "1", "default": "99", "comment": ""},
+			"info": {"type": "mediumtext", "comment": ""},
+			"profile-id": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""},
+			"bdyear": {"type": "varchar(4)", "not null": "1", "default": "", "comment": ""},
+			"bd": {"type": "date", "not null": "1", "default": "0001-01-01", "comment": ""},
+			"notify_new_posts": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"fetch_further_information": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"ffi_keyword_blacklist": {"type": "text", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uid_name": ["uid", "name(190)"],
+			"self_uid": ["self", "uid"],
+			"alias_uid": ["alias(32)", "uid"],
+			"pending_uid": ["pending", "uid"],
+			"blocked_uid": ["blocked", "uid"],
+			"uid_rel_network_poll": ["uid", "rel", "network", "poll(64)", "archive"],
+			"uid_network_batch": ["uid", "network", "batch(64)"],
+			"addr_uid": ["addr(32)", "uid"],
+			"nurl_uid": ["nurl(32)", "uid"],
+			"nick_uid": ["nick(32)", "uid"],
+			"dfrn-id": ["dfrn-id(64)"],
+			"issued-id": ["issued-id(64)"]
+		}
+	},
+	"conv": {
+		"comment": "private messages",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "A unique identifier for this conversation"},
+			"recips": {"type": "text", "comment": "sender_handle;recipient_handle"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
+			"creator": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "handle of creator"},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "creation timestamp"},
+			"updated": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "edited timestamp"},
+			"subject": {"type": "text", "comment": "subject of initial message"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uid": ["uid"]
+		}
+	},
+	"conversation": {
+		"comment": "Raw data and structure information for messages",
+		"fields": {
+			"item-uri": {"type": "varbinary(255)", "not null": "1", "primary": "1", "comment": "Original URI of the item - unrelated to the table with the same name"},
+			"reply-to-uri": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": "URI to which this item is a reply"},
+			"conversation-uri": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": "GNU Social conversation URI"},
+			"conversation-href": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": "GNU Social conversation link"},
+			"protocol": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": "The protocol of the item"},
+			"source": {"type": "mediumtext", "comment": "Original source"},
+			"received": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Receiving date"}
+		},
+		"indexes": {
+			"PRIMARY": ["item-uri"],
+			"conversation-uri": ["conversation-uri"],
+			"received": ["received"]
+		}
+	},
+	"event": {
+		"comment": "Events",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
+			"cid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "contact_id (ID of the contact in contact table)"},
+			"uri": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "creation time"},
+			"edited": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "last edit time"},
+			"start": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "event start time"},
+			"finish": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "event end time"},
+			"summary": {"type": "text", "comment": "short description or title of the event"},
+			"desc": {"type": "text", "comment": "event description"},
+			"location": {"type": "text", "comment": "event location"},
+			"type": {"type": "varchar(20)", "not null": "1", "default": "", "comment": "event or birthday"},
+			"nofinish": {"type": "boolean", "not null": "1", "default": "0", "comment": "if event does have no end this is 1"},
+			"adjust": {"type": "boolean", "not null": "1", "default": "1", "comment": "adjust to timezone of the recipient (0 or 1)"},
+			"ignore": {"type": "boolean", "not null": "1", "default": "0", "comment": "0 or 1"},
+			"allow_cid": {"type": "mediumtext", "comment": "Access Control - list of allowed contact.id '<19><78>'"},
+			"allow_gid": {"type": "mediumtext", "comment": "Access Control - list of allowed groups"},
+			"deny_cid": {"type": "mediumtext", "comment": "Access Control - list of denied contact.id"},
+			"deny_gid": {"type": "mediumtext", "comment": "Access Control - list of denied groups"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uid_start": ["uid", "start"]
+		}
+	},
+	"fcontact": {
+		"comment": "Diaspora compatible contacts - used in the Diaspora implementation",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "unique id"},
+			"url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"photo": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"request": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"nick": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"addr": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"batch": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"notify": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"poll": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"confirm": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"priority": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"network": {"type": "char(4)", "not null": "1", "default": "", "comment": ""},
+			"alias": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"pubkey": {"type": "text", "comment": ""},
+			"updated": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"addr": ["addr(32)"],
+			"url": ["UNIQUE", "url(190)"]
+		}
+	},
+	"fsuggest": {
+		"comment": "friend suggestion stuff",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": ""},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
+			"cid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": ""},
+			"name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"request": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"photo": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"note": {"type": "text", "comment": ""},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"]
+		}
+	},
+	"gcign": {
+		"comment": "contacts ignored by friend suggestions",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Local User id"},
+			"gcid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"gcontact": "id"}, "comment": "gcontact.id of ignored contact"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uid": ["uid"],
+			"gcid": ["gcid"]
+		}
+	},
+	"gcontact": {
+		"comment": "global contacts",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Name that this contact is known by"},
+			"nick": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Nick- and user name of the contact"},
+			"url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Link to the contacts profile page"},
+			"nurl": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"photo": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Link to the profile photo"},
+			"connect": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"updated": {"type": "datetime", "default": "0001-01-01 00:00:00", "comment": ""},
+			"last_contact": {"type": "datetime", "default": "0001-01-01 00:00:00", "comment": ""},
+			"last_failure": {"type": "datetime", "default": "0001-01-01 00:00:00", "comment": ""},
+			"location": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"about": {"type": "text", "comment": ""},
+			"keywords": {"type": "text", "comment": "puplic keywords (interests)"},
+			"gender": {"type": "varchar(32)", "not null": "1", "default": "", "comment": ""},
+			"birthday": {"type": "varchar(32)", "not null": "1", "default": "0001-01-01", "comment": ""},
+			"community": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 if contact is forum account"},
+			"contact-type": {"type": "tinyint", "not null": "1", "default": "-1", "comment": ""},
+			"hide": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 = should be hidden from search"},
+			"nsfw": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 = contact posts nsfw content"},
+			"network": {"type": "char(4)", "not null": "1", "default": "", "comment": "social network protocol"},
+			"addr": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"notify": {"type": "varchar(255)", "comment": ""},
+			"alias": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"generation": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"server_url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "baseurl of the contacts server"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"nurl": ["UNIQUE", "nurl(190)"],
+			"name": ["name(64)"],
+			"nick": ["nick(32)"],
+			"addr": ["addr(64)"],
+			"hide_network_updated": ["hide", "network", "updated"],
+			"updated": ["updated"]
+		}
+	},
+	"glink": {
+		"comment": "'friends of friends' linkages derived from poco",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"cid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": ""},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
+			"gcid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"gcontact": "id"}, "comment": ""},
+			"zcid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"gcontact": "id"}, "comment": ""},
+			"updated": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"cid_uid_gcid_zcid": ["UNIQUE", "cid", "uid", "gcid", "zcid"],
+			"gcid": ["gcid"]
+		}
+	},
+	"group": {
+		"comment": "privacy groups, group info",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
+			"visible": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 indicates the member list is not private"},
+			"deleted": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 indicates the group has been deleted"},
+			"name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "human readable name of group"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uid": ["uid"]
+		}
+	},
+	"group_member": {
+		"comment": "privacy groups, member info",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"gid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"group": "id"}, "comment": "groups.id of the associated group"},
+			"contact-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "contact.id of the member assigned to the associated group"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"contactid": ["contact-id"],
+			"gid_contactid": ["UNIQUE", "gid", "contact-id"]
+		}
+	},
+	"gserver": {
+		"comment": "Global servers",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"nurl": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"version": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"site_name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"info": {"type": "text", "comment": ""},
+			"register_policy": {"type": "tinyint", "not null": "1", "default": "0", "comment": ""},
+			"registered-users": {"type": "int unsigned", "not null": "1", "default": "0", "comment": "Number of registered users"},
+			"poco": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"noscrape": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"network": {"type": "char(4)", "not null": "1", "default": "", "comment": ""},
+			"platform": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"relay-subscribe": {"type": "boolean", "not null": "1", "default": "0", "comment": "Has the server subscribed to the relay system"},
+			"relay-scope": {"type": "varchar(10)", "not null": "1", "default": "", "comment": "The scope of messages that the server wants to get"},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"last_poco_query": {"type": "datetime", "default": "0001-01-01 00:00:00", "comment": ""},
+			"last_contact": {"type": "datetime", "default": "0001-01-01 00:00:00", "comment": ""},
+			"last_failure": {"type": "datetime", "default": "0001-01-01 00:00:00", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"nurl": ["UNIQUE", "nurl(190)"]
+		}
+	},
+	"gserver-tag": {
+		"comment": "Tags that the server has subscribed",
+		"fields": {
+			"gserver-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"gserver": "id"}, "primary": "1", "comment": "The id of the gserver"},
+			"tag": {"type": "varchar(100)", "not null": "1", "default": "", "primary": "1", "comment": "Tag that the server has subscribed"}
+		},
+		"indexes": {
+			"PRIMARY": ["gserver-id", "tag"],
+			"tag": ["tag"]
+		}
+	},
+	"hook": {
+		"comment": "addon hook registry",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"hook": {"type": "varbinary(100)", "not null": "1", "default": "", "comment": "name of hook"},
+			"file": {"type": "varbinary(200)", "not null": "1", "default": "", "comment": "relative filename of hook handler"},
+			"function": {"type": "varbinary(200)", "not null": "1", "default": "", "comment": "function name of hook handler"},
+			"priority": {"type": "smallint unsigned", "not null": "1", "default": "0", "comment": "not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"hook_file_function": ["UNIQUE", "hook", "file", "function"]
+		}
+	},
+	"intro": {
+		"comment": "",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
+			"fid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"fcontact": "id"}, "comment": ""},
+			"contact-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": ""},
+			"knowyou": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"duplex": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"note": {"type": "text", "comment": ""},
+			"hash": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"datetime": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"blocked": {"type": "boolean", "not null": "1", "default": "1", "comment": ""},
+			"ignore": {"type": "boolean", "not null": "1", "default": "0", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"]
+		}
+	},
+	"item": {
+		"comment": "Structure for all posts",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "relation": {"thread": "iid"}},
+			"guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "A unique identifier for this item"},
+			"uri": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"uri-id": {"type": "int unsigned", "relation": {"item-uri": "id"}, "comment": "Id of the item-uri table entry that contains the item uri"},
+			"uri-hash": {"type": "varchar(80)", "not null": "1", "default": "", "comment": "RIPEMD-128 hash from uri"},
+			"parent": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"item": "id"}, "comment": "item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item"},
+			"parent-uri": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "uri of the parent to this item"},
+			"parent-uri-id": {"type": "int unsigned", "relation": {"item-uri": "id"}, "comment": "Id of the item-uri table that contains the parent uri"},
+			"thr-parent": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri"},
+			"thr-parent-id": {"type": "int unsigned", "relation": {"item-uri": "id"}, "comment": "Id of the item-uri table that contains the thread parent uri"},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Creation timestamp."},
+			"edited": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of last edit (default is created)"},
+			"commented": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of last comment/reply to this item"},
+			"received": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime"},
+			"changed": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date that something in the conversation changed, indicating clients should fetch the conversation again"},
+			"gravity": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"network": {"type": "char(4)", "not null": "1", "default": "", "comment": "Network from where the item comes from"},
+			"owner-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "Link to the contact table with uid=0 of the owner of this item"},
+			"author-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "Link to the contact table with uid=0 of the author of this item"},
+			"icid": {"type": "int unsigned", "relation": {"item-content": "id"}, "comment": "Id of the item-content table entry that contains the whole item content"},
+			"iaid": {"type": "int unsigned", "relation": {"item-activity": "id"}, "comment": "Id of the item-activity table entry that contains the activity data"},
+			"extid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"post-type": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": "Post type (personal note, bookmark, ...)"},
+			"global": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"private": {"type": "boolean", "not null": "1", "default": "0", "comment": "distribution is restricted"},
+			"visible": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"moderated": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"deleted": {"type": "boolean", "not null": "1", "default": "0", "comment": "item has been deleted"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner id which owns this copy of the item"},
+			"contact-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "contact.id"},
+			"wall": {"type": "boolean", "not null": "1", "default": "0", "comment": "This item was posted to the wall of uid"},
+			"origin": {"type": "boolean", "not null": "1", "default": "0", "comment": "item originated at this site"},
+			"pubmail": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"starred": {"type": "boolean", "not null": "1", "default": "0", "comment": "item has been favourited"},
+			"unseen": {"type": "boolean", "not null": "1", "default": "1", "comment": "item has not been seen"},
+			"mention": {"type": "boolean", "not null": "1", "default": "0", "comment": "The owner of this item was mentioned in it"},
+			"forum_mode": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"psid": {"type": "int unsigned", "relation": {"permissionset": "id"}, "comment": "ID of the permission set of this post"},
+			"resource-id": {"type": "varchar(32)", "not null": "1", "default": "", "comment": "Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type"},
+			"event-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"event": "id"}, "comment": "Used to link to the event.id"},
+			"attach": {"type": "mediumtext", "comment": "JSON structure representing attachments to this item"},
+			"allow_cid": {"type": "mediumtext", "comment": "Deprecated"},
+			"allow_gid": {"type": "mediumtext", "comment": "Deprecated"},
+			"deny_cid": {"type": "mediumtext", "comment": "Deprecated"},
+			"deny_gid": {"type": "mediumtext", "comment": "Deprecated"},
+			"postopts": {"type": "text", "comment": "Deprecated"},
+			"inform": {"type": "mediumtext", "comment": "Deprecated"},
+			"type": {"type": "varchar(20)", "comment": "Deprecated"},
+			"bookmark": {"type": "boolean", "comment": "Deprecated"},
+			"file": {"type": "mediumtext", "comment": "Deprecated"},
+			"location": {"type": "varchar(255)", "comment": "Deprecated"},
+			"coord": {"type": "varchar(255)", "comment": "Deprecated"},
+			"tag": {"type": "mediumtext", "comment": "Deprecated"},
+			"plink": {"type": "varchar(255)", "comment": "Deprecated"},
+			"title": {"type": "varchar(255)", "comment": "Deprecated"},
+			"content-warning": {"type": "varchar(255)", "comment": "Deprecated"},
+			"body": {"type": "mediumtext", "comment": "Deprecated"},
+			"app": {"type": "varchar(255)", "comment": "Deprecated"},
+			"verb": {"type": "varchar(100)", "comment": "Deprecated"},
+			"object-type": {"type": "varchar(100)", "comment": "Deprecated"},
+			"object": {"type": "text", "comment": "Deprecated"},
+			"target-type": {"type": "varchar(100)", "comment": "Deprecated"},
+			"target": {"type": "text", "comment": "Deprecated"},
+			"author-name": {"type": "varchar(255)", "comment": "Deprecated"},
+			"author-link": {"type": "varchar(255)", "comment": "Deprecated"},
+			"author-avatar": {"type": "varchar(255)", "comment": "Deprecated"},
+			"owner-name": {"type": "varchar(255)", "comment": "Deprecated"},
+			"owner-link": {"type": "varchar(255)", "comment": "Deprecated"},
+			"owner-avatar": {"type": "varchar(255)", "comment": "Deprecated"},
+			"rendered-hash": {"type": "varchar(32)", "comment": "Deprecated"},
+			"rendered-html": {"type": "mediumtext", "comment": "Deprecated"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"guid": ["guid(191)"],
+			"uri": ["uri(191)"],
+			"parent": ["parent"],
+			"parent-uri": ["parent-uri(191)"],
+			"extid": ["extid(191)"],
+			"uid_id": ["uid", "id"],
+			"uid_contactid_id": ["uid", "contact-id", "id"],
+			"uid_created": ["uid", "created"],
+			"uid_commented": ["uid", "commented"],
+			"uid_unseen_contactid": ["uid", "unseen", "contact-id"],
+			"uid_network_received": ["uid", "network", "received"],
+			"uid_network_commented": ["uid", "network", "commented"],
+			"uid_thrparent": ["uid", "thr-parent(190)"],
+			"uid_parenturi": ["uid", "parent-uri(190)"],
+			"uid_contactid_created": ["uid", "contact-id", "created"],
+			"authorid_created": ["author-id", "created"],
+			"ownerid": ["owner-id"],
+			"uid_uri": ["uid", "uri(190)"],
+			"resource-id": ["resource-id"],
+			"deleted_changed": ["deleted", "changed"],
+			"uid_wall_changed": ["uid", "wall", "changed"],
+			"uid_eventid": ["uid", "event-id"],
+			"icid": ["icid"],
+			"iaid": ["iaid"],
+			"psid_wall": ["psid", "wall"]
+		}
+	},
+	"item-activity": {
+		"comment": "Activities for items",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "relation": {"thread": "iid"}},
+			"uri": {"type": "varchar(255)", "comment": ""},
+			"uri-id": {"type": "int unsigned", "relation": {"item-uri": "id"}, "comment": "Id of the item-uri table entry that contains the item uri"},
+			"uri-hash": {"type": "varchar(80)", "not null": "1", "default": "", "comment": "RIPEMD-128 hash from uri"},
+			"activity": {"type": "smallint unsigned", "not null": "1", "default": "0", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uri-hash": ["UNIQUE", "uri-hash"],
+			"uri": ["uri(191)"]
+		}
+	},
+	"item-content": {
+		"comment": "Content for all posts",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "relation": {"thread": "iid"}},
+			"uri": {"type": "varchar(255)", "comment": ""},
+			"uri-id": {"type": "int unsigned", "relation": {"item-uri": "id"}, "comment": "Id of the item-uri table entry that contains the item uri"},
+			"uri-plink-hash": {"type": "varchar(80)", "not null": "1", "default": "", "comment": "RIPEMD-128 hash from uri"},
+			"title": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "item title"},
+			"content-warning": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"body": {"type": "mediumtext", "comment": "item body content"},
+			"location": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "text location where this item originated"},
+			"coord": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "longitude/latitude pair representing location where this item originated"},
+			"language": {"type": "text", "comment": "Language information about this post"},
+			"app": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "application which generated this item"},
+			"rendered-hash": {"type": "varchar(32)", "not null": "1", "default": "", "comment": ""},
+			"rendered-html": {"type": "mediumtext", "comment": "item.body converted to html"},
+			"object-type": {"type": "varchar(100)", "not null": "1", "default": "", "comment": "ActivityStreams object type"},
+			"object": {"type": "text", "comment": "JSON encoded object structure unless it is an implied object (normal post)"},
+			"target-type": {"type": "varchar(100)", "not null": "1", "default": "", "comment": "ActivityStreams target type if applicable (URI)"},
+			"target": {"type": "text", "comment": "JSON encoded target structure if used"},
+			"plink": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "permalink or URL to a displayable copy of the message at its source"},
+			"verb": {"type": "varchar(100)", "not null": "1", "default": "", "comment": "ActivityStreams verb"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uri-plink-hash": ["UNIQUE", "uri-plink-hash"],
+			"uri": ["uri(191)"]
+		}
+	},
+	"item-delivery-data": {
+		"comment": "Delivery data for items",
+		"fields": {
+			"iid": {"type": "int unsigned", "not null": "1", "primary": "1", "relation": {"item": "id"}, "comment": "Item id"},
+			"postopts": {"type": "text", "comment": "External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery"},
+			"inform": {"type": "mediumtext", "comment": "Additional receivers of the linked item"}
+		},
+		"indexes": {
+			"PRIMARY": ["iid"]
+		}
+	},
+	"item-uri": {
+		"comment": "URI and GUID for items",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1"},
+			"uri": {"type": "varbinary(255)", "not null": "1", "comment": "URI of an item"},
+			"guid": {"type": "varbinary(255)", "comment": "A unique identifier for an item"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uri": ["UNIQUE", "uri"],
+			"guid": ["guid"]
+		}
+	},
+	"locks": {
+		"comment": "",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"name": {"type": "varchar(128)", "not null": "1", "default": "", "comment": ""},
+			"locked": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"pid": {"type": "int unsigned", "not null": "1", "default": "0", "comment": "Process ID"},
+			"expires": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime of cache expiration"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"name_expires": ["name", "expires"]
+		}
+	},
+	"mail": {
+		"comment": "private messages",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
+			"guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "A unique identifier for this private message"},
+			"from-name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "name of the sender"},
+			"from-photo": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "contact photo link of the sender"},
+			"from-url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "profile linke of the sender"},
+			"contact-id": {"type": "varchar(255)", "not null": "1", "default": "", "relation": {"contact": "id"}, "comment": "contact.id"},
+			"convid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"conv": "id"}, "comment": "conv.id"},
+			"title": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"body": {"type": "mediumtext", "comment": ""},
+			"seen": {"type": "boolean", "not null": "1", "default": "0", "comment": "if message visited it is 1"},
+			"reply": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"replied": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"unknown": {"type": "boolean", "not null": "1", "default": "0", "comment": "if sender not in the contact table this is 1"},
+			"uri": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"parent-uri": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "creation time of the private message"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uid_seen": ["uid", "seen"],
+			"convid": ["convid"],
+			"uri": ["uri(64)"],
+			"parent-uri": ["parent-uri(64)"],
+			"contactid": ["contact-id(32)"]
+		}
+	},
+	"mailacct": {
+		"comment": "Mail account data for fetching mails",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
+			"server": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"port": {"type": "smallint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"ssltype": {"type": "varchar(16)", "not null": "1", "default": "", "comment": ""},
+			"mailbox": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"user": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"pass": {"type": "text", "comment": ""},
+			"reply_to": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"action": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"movetofolder": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"pubmail": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"last_check": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"]
+		}
+	},
+	"manage": {
+		"comment": "table of accounts that can manage each other",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
+			"mid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uid_mid": ["UNIQUE", "uid", "mid"]
+		}
+	},
+	"notify": {
+		"comment": "notifications",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"hash": {"type": "varchar(64)", "not null": "1", "default": "", "comment": ""},
+			"type": {"type": "smallint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"photo": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"date": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"msg": {"type": "mediumtext", "comment": ""},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
+			"link": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"iid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"item": "id"}, "comment": "item.id"},
+			"parent": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"item": "id"}, "comment": ""},
+			"seen": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"verb": {"type": "varchar(100)", "not null": "1", "default": "", "comment": ""},
+			"otype": {"type": "varchar(10)", "not null": "1", "default": "", "comment": ""},
+			"name_cache": {"type": "tinytext", "comment": "Cached bbcode parsing of name"},
+			"msg_cache": {"type": "mediumtext", "comment": "Cached bbcode parsing of msg"}
+			},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"hash_uid": ["hash", "uid"],
+			"seen_uid_date": ["seen", "uid", "date"],
+			"uid_date": ["uid", "date"],
+			"uid_type_link": ["uid", "type", "link(190)"]
+		}
+	},
+	"notify-threads": {
+		"comment": "",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"notify-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"notify": "id"}, "comment": ""},
+			"master-parent-item": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"item": "id"}, "comment": ""},
+			"parent-item": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""},
+			"receiver-uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"]
+		}
+	},
+	"oembed": {
+		"comment": "cache for OEmbed queries",
+		"fields": {
+			"url": {"type": "varbinary(255)", "not null": "1", "primary": "1", "comment": "page url"},
+			"maxwidth": {"type": "mediumint unsigned", "not null": "1", "primary": "1", "comment": "Maximum width passed to Oembed"},
+			"content": {"type": "mediumtext", "comment": "OEmbed data of the page"},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime of creation"}
+		},
+		"indexes": {
+			"PRIMARY": ["url", "maxwidth"],
+			"created": ["created"]
+		}
+	},
+	"openwebauth-token": {
+		"comment": "Store OpenWebAuth token to verify contacts",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
+			"type": {"type": "varchar(32)", "not null": "1", "default": "", "comment": "Verify type"},
+			"token": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "A generated token"},
+			"meta": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime of creation"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"]
+		}
+	},
+	"parsed_url": {
+		"comment": "cache for 'parse_url' queries",
+		"fields": {
+			"url": {"type": "varbinary(255)", "not null": "1", "primary": "1", "comment": "page url"},
+			"guessing": {"type": "boolean", "not null": "1", "default": "0", "primary": "1", "comment": "is the 'guessing' mode active?"},
+			"oembed": {"type": "boolean", "not null": "1", "default": "0", "primary": "1", "comment": "is the data the result of oembed?"},
+			"content": {"type": "mediumtext", "comment": "page data"},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "datetime of creation"}
+		},
+		"indexes": {
+			"PRIMARY": ["url", "guessing", "oembed"],
+			"created": ["created"]
+		}
+	},
+	"participation": {
+		"comment": "Storage for participation messages from Diaspora",
+		"fields": {
+			"iid": {"type": "int unsigned", "not null": "1", "primary": "1", "relation": {"item": "id"}, "comment": ""},
+			"server": {"type": "varchar(60)", "not null": "1", "primary": "1", "comment": ""},
+			"cid": {"type": "int unsigned", "not null": "1", "relation": {"contact": "id"}, "comment": ""},
+			"fid": {"type": "int unsigned", "not null": "1", "relation": {"fcontact": "id"}, "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["iid", "server"]
+			}
+		},
+	"pconfig": {
+		"comment": "personal (per user) configuration storage",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": ""},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
+			"cat": {"type": "varbinary(50)", "not null": "1", "default": "", "comment": ""},
+			"k": {"type": "varbinary(100)", "not null": "1", "default": "", "comment": ""},
+			"v": {"type": "mediumtext", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uid_cat_k": ["UNIQUE", "uid", "cat", "k"]
+		}
+	},
+	"permissionset": {
+		"comment": "",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner id of this permission set"},
+			"allow_cid": {"type": "mediumtext", "comment": "Access Control - list of allowed contact.id '<19><78>'"},
+			"allow_gid": {"type": "mediumtext", "comment": "Access Control - list of allowed groups"},
+			"deny_cid": {"type": "mediumtext", "comment": "Access Control - list of denied contact.id"},
+			"deny_gid": {"type": "mediumtext", "comment": "Access Control - list of denied groups"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uid_allow_cid_allow_gid_deny_cid_deny_gid": ["allow_cid(50)", "allow_gid(30)", "deny_cid(50)", "deny_gid(30)"]
+		}
+	},
+	"photo": {
+		"comment": "photo storage",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
+			"contact-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "contact.id"},
+			"guid": {"type": "char(16)", "not null": "1", "default": "", "comment": "A unique identifier for this photo"},
+			"resource-id": {"type": "char(32)", "not null": "1", "default": "", "comment": ""},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "creation date"},
+			"edited": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "last edited date"},
+			"title": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"desc": {"type": "text", "comment": ""},
+			"album": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "The name of the album to which the photo belongs"},
+			"filename": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"type": {"type": "varchar(30)", "not null": "1", "default": "image/jpeg"},
+			"height": {"type": "smallint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"width": {"type": "smallint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"datasize": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""},
+			"data": {"type": "mediumblob", "not null": "1", "comment": ""},
+			"scale": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"profile": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"allow_cid": {"type": "mediumtext", "comment": "Access Control - list of allowed contact.id '<19><78>'"},
+			"allow_gid": {"type": "mediumtext", "comment": "Access Control - list of allowed groups"},
+			"deny_cid": {"type": "mediumtext", "comment": "Access Control - list of denied contact.id"},
+			"deny_gid": {"type": "mediumtext", "comment": "Access Control - list of denied groups"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"contactid": ["contact-id"],
+			"uid_contactid": ["uid", "contact-id"],
+			"uid_profile": ["uid", "profile"],
+			"uid_album_scale_created": ["uid", "album(32)", "scale", "created"],
+			"uid_album_resource-id_created": ["uid", "album(32)", "resource-id", "created"],
+			"resource-id": ["resource-id"]
+		}
+	},
+	"poll": {
+		"comment": "Currently unused table for storing poll results",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": ""},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
+			"q0": {"type": "text", "comment": ""},
+			"q1": {"type": "text", "comment": ""},
+			"q2": {"type": "text", "comment": ""},
+			"q3": {"type": "text", "comment": ""},
+			"q4": {"type": "text", "comment": ""},
+			"q5": {"type": "text", "comment": ""},
+			"q6": {"type": "text", "comment": ""},
+			"q7": {"type": "text", "comment": ""},
+			"q8": {"type": "text", "comment": ""},
+			"q9": {"type": "text", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uid": ["uid"]
+		}
+	},
+	"poll_result": {
+		"comment": "data for polls - currently unused",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"poll_id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"poll": "id"}},
+			"choice": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"poll_id": ["poll_id"]
+		}
+	},
+	"process": {
+		"comment": "Currently running system processes",
+		"fields": {
+			"pid": {"type": "int unsigned", "not null": "1", "primary": "1", "comment": ""},
+			"command": {"type": "varbinary(32)", "not null": "1", "default": "", "comment": ""},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["pid"],
+			"command": ["command"]
+		}
+	},
+	"profile": {
+		"comment": "user profiles data",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "Owner User id"},
+			"profile-name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Name of the profile"},
+			"is-default": {"type": "boolean", "not null": "1", "default": "0", "comment": "Mark this profile as default profile"},
+			"hide-friends": {"type": "boolean", "not null": "1", "default": "0", "comment": "Hide friend list from viewers of this profile"},
+			"name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"pdesc": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Title or description"},
+			"dob": {"type": "varchar(32)", "not null": "1", "default": "0000-00-00", "comment": "Day of birth"},
+			"address": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"locality": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"region": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"postal-code": {"type": "varchar(32)", "not null": "1", "default": "", "comment": ""},
+			"country-name": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"hometown": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"gender": {"type": "varchar(32)", "not null": "1", "default": "", "comment": ""},
+			"marital": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"with": {"type": "text", "comment": ""},
+			"howlong": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"sexual": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"politic": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"religion": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"pub_keywords": {"type": "text", "comment": ""},
+			"prv_keywords": {"type": "text", "comment": ""},
+			"likes": {"type": "text", "comment": ""},
+			"dislikes": {"type": "text", "comment": ""},
+			"about": {"type": "text", "comment": ""},
+			"summary": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"music": {"type": "text", "comment": ""},
+			"book": {"type": "text", "comment": ""},
+			"tv": {"type": "text", "comment": ""},
+			"film": {"type": "text", "comment": ""},
+			"interest": {"type": "text", "comment": ""},
+			"romance": {"type": "text", "comment": ""},
+			"work": {"type": "text", "comment": ""},
+			"education": {"type": "text", "comment": ""},
+			"contact": {"type": "text", "comment": ""},
+			"homepage": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"xmpp": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"photo": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"thumb": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"publish": {"type": "boolean", "not null": "1", "default": "0", "comment": "publish default profile in local directory"},
+			"net-publish": {"type": "boolean", "not null": "1", "default": "0", "comment": "publish profile in global directory"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uid_is-default": ["uid", "is-default"]
+		}
+	},
+	"profile_check": {
+		"comment": "DFRN remote auth use",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
+			"cid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "contact.id"},
+			"dfrn_id": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"sec": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"expire": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"]
+		}
+	},
+	"push_subscriber": {
+		"comment": "Used for OStatus: Contains feed subscribers",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
+			"callback_url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"topic": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"nickname": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"push": {"type": "tinyint", "not null": "1", "default": "0", "comment": "Retrial counter"},
+			"last_update": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of last successful trial"},
+			"next_try": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Next retrial date"},
+			"renewed": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of last subscription renewal"},
+			"secret": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"next_try": ["next_try"]
+		}
+	},
+	"queue": {
+		"comment": "Queue for messages that couldn't be delivered",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"cid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "Message receiver"},
+			"network": {"type": "char(4)", "not null": "1", "default": "", "comment": "Receiver's network"},
+			"guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Unique GUID of the message"},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date, when the message was created"},
+			"last": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Date of last trial"},
+			"next": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Next retrial date"},
+			"retrial": {"type": "tinyint", "not null": "1", "default": "0", "comment": "Retrial counter"},
+			"content": {"type": "mediumtext", "comment": ""},
+			"batch": {"type": "boolean", "not null": "1", "default": "0", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"last": ["last"],
+			"next": ["next"]
+		}
+	},
+	"register": {
+		"comment": "registrations requiring admin approval",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"hash": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
+			"password": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"language": {"type": "varchar(16)", "not null": "1", "default": "", "comment": ""},
+			"note": {"type": "text", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"]
+		}
+	},
+	"search": {
+		"comment": "",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
+			"term": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"uid": ["uid"]
+		}
+	},
+	"session": {
+		"comment": "web session storage",
+		"fields": {
+			"id": {"type": "bigint unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"sid": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": ""},
+			"data": {"type": "text", "comment": ""},
+			"expire": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"sid": ["sid(64)"],
+			"expire": ["expire"]
+		}
+	},
+	"sign": {
+		"comment": "Diaspora signatures",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"iid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"item": "id"}, "comment": "item.id"},
+			"signed_text": {"type": "mediumtext", "comment": ""},
+			"signature": {"type": "text", "comment": ""},
+			"signer": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"iid": ["UNIQUE", "iid"]
+		}
+	},
+	"term": {
+		"comment": "item taxonomy (categories, tags, etc.) table",
+		"fields": {
+			"tid": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": ""},
+			"oid": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"item": "id"}, "comment": ""},
+			"otype": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"type": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"term": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"url": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"guid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"received": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"global": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"}
+		},
+		"indexes": {
+			"PRIMARY": ["tid"],
+			"oid_otype_type_term": ["oid", "otype", "type", "term(32)"],
+			"uid_otype_type_term_global_created": ["uid", "otype", "type", "term(32)", "global", "created"],
+			"uid_otype_type_url": ["uid", "otype", "type", "url(64)"],
+			"guid": ["guid(64)"]
+		}
+	},
+	"thread": {
+		"comment": "Thread related data",
+		"fields": {
+			"iid": {"type": "int unsigned", "not null": "1", "default": "0", "primary": "1", "relation": {"item": "id"}, "comment": "sequential ID"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"},
+			"contact-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": ""},
+			"owner-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "Item owner"},
+			"author-id": {"type": "int unsigned", "not null": "1", "default": "0", "relation": {"contact": "id"}, "comment": "Item author"},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"edited": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"commented": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"received": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"changed": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""},
+			"wall": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"private": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"pubmail": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"moderated": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"visible": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"starred": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"ignored": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"post-type": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": "Post type (personal note, bookmark, ...)"},
+			"unseen": {"type": "boolean", "not null": "1", "default": "1", "comment": ""},
+			"deleted": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"origin": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"forum_mode": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"mention": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"network": {"type": "char(4)", "not null": "1", "default": "", "comment": ""},
+			"bookmark": {"type": "boolean", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["iid"],
+			"uid_network_commented": ["uid", "network", "commented"],
+			"uid_network_created": ["uid", "network", "created"],
+			"uid_contactid_commented": ["uid", "contact-id", "commented"],
+			"uid_contactid_created": ["uid", "contact-id", "created"],
+			"contactid": ["contact-id"],
+			"ownerid": ["owner-id"],
+			"authorid": ["author-id"],
+			"uid_created": ["uid", "created"],
+			"uid_commented": ["uid", "commented"],
+			"uid_wall_created": ["uid", "wall", "created"],
+			"private_wall_origin_commented": ["private", "wall", "origin", "commented"]
+		}
+	},
+	"tokens": {
+		"comment": "OAuth usage",
+		"fields": {
+			"id": {"type": "varchar(40)", "not null": "1", "primary": "1", "comment": ""},
+			"secret": {"type": "text", "comment": ""},
+			"client_id": {"type": "varchar(20)", "not null": "1", "default": "", "relation": {"clients": "client_id"}},
+			"expires": {"type": "int", "not null": "1", "default": "0", "comment": ""},
+			"scope": {"type": "varchar(200)", "not null": "1", "default": "", "comment": ""},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "User id"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"]
+		}
+	},
+	"user": {
+		"comment": "The local users",
+		"fields": {
+			"uid": {"type": "mediumint unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"parent-uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "relation": {"user": "uid"}, "comment": "The parent user that has full control about this user"},
+			"guid": {"type": "varchar(64)", "not null": "1", "default": "", "comment": "A unique identifier for this user"},
+			"username": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Name that this user is known by"},
+			"password": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "encrypted password"},
+			"legacy_password": {"type": "boolean", "not null": "1", "default": "0", "comment": "Is the password hash double-hashed?"},
+			"nickname": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "nick- and user name"},
+			"email": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "the users email address"},
+			"openid": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+			"timezone": {"type": "varchar(128)", "not null": "1", "default": "", "comment": "PHP-legal timezone"},
+			"language": {"type": "varchar(32)", "not null": "1", "default": "en", "comment": "default language"},
+			"register_date": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "timestamp of registration"},
+			"login_date": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "timestamp of last login"},
+			"default-location": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "Default for item.location"},
+			"allow_location": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 allows to display the location"},
+			"theme": {"type": "varchar(255)", "not null": "1", "default": "", "comment": "user theme preference"},
+			"pubkey": {"type": "text", "comment": "RSA public key 4096 bit"},
+			"prvkey": {"type": "text", "comment": "RSA private key 4096 bit"},
+			"spubkey": {"type": "text", "comment": ""},
+			"sprvkey": {"type": "text", "comment": ""},
+			"verified": {"type": "boolean", "not null": "1", "default": "0", "comment": "user is verified through email"},
+			"blocked": {"type": "boolean", "not null": "1", "default": "0", "comment": "1 for user is blocked"},
+			"blockwall": {"type": "boolean", "not null": "1", "default": "0", "comment": "Prohibit contacts to post to the profile page of the user"},
+			"hidewall": {"type": "boolean", "not null": "1", "default": "0", "comment": "Hide profile details from unkown viewers"},
+			"blocktags": {"type": "boolean", "not null": "1", "default": "0", "comment": "Prohibit contacts to tag the post of this user"},
+			"unkmail": {"type": "boolean", "not null": "1", "default": "0", "comment": "Permit unknown people to send private mails to this user"},
+			"cntunkmail": {"type": "int unsigned", "not null": "1", "default": "10", "comment": ""},
+			"notify-flags": {"type": "smallint unsigned", "not null": "1", "default": "65535", "comment": "email notification options"},
+			"page-flags": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": "page/profile type"},
+			"account-type": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": ""},
+			"prvnets": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"pwdreset": {"type": "varchar(255)", "comment": "Password reset request token"},
+			"pwdreset_time": {"type": "datetime", "comment": "Timestamp of the last password reset request"},
+			"maxreq": {"type": "int unsigned", "not null": "1", "default": "10", "comment": ""},
+			"expire": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""},
+			"account_removed": {"type": "boolean", "not null": "1", "default": "0", "comment": "if 1 the account is removed"},
+			"account_expired": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
+			"account_expires_on": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "timestamp when account expires and will be deleted"},
+			"expire_notification_sent": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "timestamp of last warning of account expiration"},
+			"def_gid": {"type": "int unsigned", "not null": "1", "default": "0", "comment": ""},
+			"allow_cid": {"type": "mediumtext", "comment": "default permission for this user"},
+			"allow_gid": {"type": "mediumtext", "comment": "default permission for this user"},
+			"deny_cid": {"type": "mediumtext", "comment": "default permission for this user"},
+			"deny_gid": {"type": "mediumtext", "comment": "default permission for this user"},
+			"openidserver": {"type": "text", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["uid"],
+			"nickname": ["nickname(32)"]
+		}
+	},
+	"userd": {
+		"comment": "Deleted usernames",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "sequential ID"},
+			"username": {"type": "varchar(255)", "not null": "1", "comment": ""}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"username": ["username(32)"]
+		}
+	},
+	"user-contact": {
+		"comment": "User specific public contact data",
+		"fields": {
+			"cid": {"type": "int unsigned", "not null": "1", "default": "0", "primary": "1", "relation": {"contact": "id"}, "comment": "Contact id of the linked public contact"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "primary": "1", "relation": {"user": "uid"}, "comment": "User id"},
+			"blocked": {"type": "boolean", "comment": "Contact is completely blocked for this user"},
+			"ignored": {"type": "boolean", "comment": "Posts from this contact are ignored"},
+			"collapsed": {"type": "boolean", "comment": "Posts from this contact are collapsed"}
+		},
+		"indexes": {
+			"PRIMARY": ["uid", "cid"]
+		}
+	},
+	"user-item": {
+		"comment": "User specific item data",
+		"fields": {
+			"iid": {"type": "int unsigned", "not null": "1", "default": "0", "primary": "1", "relation": {"item": "id"}, "comment": "Item id"},
+			"uid": {"type": "mediumint unsigned", "not null": "1", "default": "0", "primary": "1", "relation": {"user": "uid"}, "comment": "User id"},
+			"hidden": {"type": "boolean", "not null": "1", "default": "0", "comment": "Marker to hide an item from the user"},
+			"ignored": {"type": "boolean", "comment": "Ignore this thread if set"}
+		},
+		"indexes": {
+			"PRIMARY": ["uid", "iid"]
+		}
+	},
+	"worker-ipc": {
+		"comment": "Inter process communication between the frontend and the worker",
+		"fields": {
+			"key": {"type": "int", "not null": "1", "primary": "1", "comment": ""},
+			"jobs": {"type": "boolean", "comment": "Flag for outstanding jobs"}
+		},
+		"indexes": {
+			"PRIMARY": ["key"]
+		},
+		"engine": "MEMORY"
+	},
+	"workerqueue": {
+		"comment": "Background tasks queue entries",
+		"fields": {
+			"id": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "Auto incremented worker task id"},
+			"parameter": {"type": "mediumblob", "comment": "Task command"},
+			"priority": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": "Task priority"},
+			"created": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Creation date"},
+			"pid": {"type": "int unsigned", "not null": "1", "default": "0", "comment": "Process id of the worker"},
+			"executed": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Execution date"},
+			"done": {"type": "boolean", "not null": "1", "default": "0", "comment": "Marked 1 when the task was done - will be deleted later"}
+		},
+		"indexes": {
+			"PRIMARY": ["id"],
+			"pid": ["pid"],
+			"parameter": ["parameter(64)"],
+			"priority_created": ["priority", "created"],
+			"done_executed": ["done", "executed"]
+		}
+	}
+}
diff --git a/config/local-sample.ini.php b/config/local-sample.ini.php
new file mode 100644
index 000000000..359f3ee68
--- /dev/null
+++ b/config/local-sample.ini.php
@@ -0,0 +1,41 @@
+<?php return <<<INI
+
+; If automatic system installation fails:
+
+; Copy this file to local.ini.php
+
+; Why local.ini.php? Because it contains sensitive information which could
+; give somebody complete control of your database. Apache's default
+; configuration will interpret any .php file as a script and won't show the values
+
+; Then set the following for your MySQL installation
+
+[database]
+hostname = localhost
+username = mysqlusername
+password = mysqlpassword
+database = mysqldatabasename
+charset = utf8mb4
+
+
+; ****************************************************************
+; The configuration below will be overruled by the admin panel.
+; Changes made below will only have an effect if the database does
+; not contain any configuration for the friendica system.
+; ****************************************************************
+
+[config]
+admin_email =
+
+sitename = Friendica Social Network
+
+register_policy = REGISTER_OPEN
+register_text =
+
+[system]
+default_timezone = UTC
+
+language = en
+
+INI;
+// Keep this line
diff --git a/config/settings.ini.php b/config/settings.ini.php
new file mode 100644
index 000000000..353b1fa1f
--- /dev/null
+++ b/config/settings.ini.php
@@ -0,0 +1,108 @@
+<?php return <<<INI
+
+; SETTINGS.INI.PHP
+
+; This file declares the default values for the admin settings of Friendica.
+; These values will be overriden by the admin settings page.
+
+; Please don't edit this file directly as its content may change in the upcoming versions.
+
+[config]
+
+; info (String)
+; Plaintext description of this node, used in the /friendica module.
+info =
+
+; register_policy (Constant)
+; Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+; Be certain to create your own personal account before setting REGISTER_CLOSED.
+; REGISTER_APPROVE requires you set system.admin_email to the email address of an already registered person who can authorize and/or approve/deny the request.
+register_policy = REGISTER_CLOSED
+
+; register_text (String)
+; Will be displayed prominently on the registration page.
+register_text = ''
+
+; sitename (String)
+; Displayed server name.
+sitename = "Friendica Social Network"
+
+[system]
+
+; account_abandon_days (Integer)
+; Will not waste system resources polling external sites for abandonded accounts.
+; Enter 0 for no time limit.
+account_abandon_days = 0
+
+; addon (Comma-separated list)
+; Manual list of addons which are enabled on this system.
+addon =
+
+; allowed_themes (Comma-separated list)
+; Themes users can change to in their settings.
+allowed_themes = 'quattro,vier,duepuntozero,smoothly'
+
+; default_timezone (String)
+; Choose a default timezone. See https://secure.php.net/manual/en/timezones.php
+; It only applies to timestamps for anonymous viewers.
+default_timezone = UTC
+
+; directory (String)
+; URL of the global directory.
+directory = https://dir.friendica.social
+
+; forbidden_nicknames (Comma-separated list)
+; Prevents users from registering the specified nicknames on this node.
+; Default value comprises classic role names from RFC 2142.
+forbidden_nicknames = info, marketing, sales, support, abuse, noc, security, postmaster, hostmaster, usenet, news, webmaster, www, uucp, ftp, root, sysop
+
+; jpeg_quality (Integer)
+; Sets the ImageMagick quality level for JPEG images. Values ranges from 50 (awful) to 100 (near perfect).
+jpeg_quality = 100
+
+; language (String)
+; System default languague, inluding admin-created user default language.
+; Two-letters ISO 639-1 code.
+language = en
+
+; max_image_length (Integer)
+; An alternate way of limiting picture upload sizes.
+; Specify the maximum pixel  length that pictures are allowed to be (for non-square pictures, it will apply to the longest side).
+; Pictures longer than this length will be resized to be this length (on the longest side, the other side will be scaled appropriately).
+; If you don't want to set a maximum length, set to -1.
+max_image_length = -1
+
+; maximagesize (Integer)
+; Maximum size in bytes of an uploaded photo.
+maximagesize = 800000
+
+; no_regfullname (Boolean)
+; Allow pseudonyms (true) or enforce a space between firstname and lastname in Full name, as an antispam measure (false).
+no_regfullname = true
+
+; optimize_max_tablesize (Integer)
+; Maximum table size (in MB) for the automatic optimization.
+; -1 to disable automatic optimization.
+;  0 to use internal default (100MB)
+optimize_max_tablesize = -1
+
+; rino_encrypt (Integer)
+; Server-to-server private message encryption (RINO).
+; Encryption will only be provided if this setting is set to a non zero value on both servers.
+; Set to 0 to disable, 2 to enable, 1 is deprecated but wont need mcrypt.
+rino_encrypt = 2
+
+; theme (String)
+; System theme name.
+theme = vier
+
+; url (String)
+; The fully-qualified URL of this Friendica node.
+; Used by the worker in a non-HTTP execution environment.
+url =
+
+; Used in the admin settings to lock certain features
+[featurelock]
+
+INI;
+// Keep this line
diff --git a/database.sql b/database.sql
index ce5befc86..60d4b1c88 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
--- Friendica 2018.05 (The Tazmans Flax-lily)
--- DB_UPDATE_VERSION 1266
+-- Friendica 2018.08-dev (The Tazmans Flax-lily)
+-- DB_UPDATE_VERSION 1283
 -- ------------------------------------------
 
 
@@ -9,35 +9,35 @@
 --
 CREATE TABLE IF NOT EXISTS `addon` (
 	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`name` varchar(50) NOT NULL DEFAULT '' COMMENT '',
-	`version` varchar(50) NOT NULL DEFAULT '' COMMENT '',
-	`installed` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`hidden` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`timestamp` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`plugin_admin` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`name` varchar(50) NOT NULL DEFAULT '' COMMENT 'addon base (file)name',
+	`version` varchar(50) NOT NULL DEFAULT '' COMMENT 'currently unused',
+	`installed` boolean NOT NULL DEFAULT '0' COMMENT 'currently always 1',
+	`hidden` boolean NOT NULL DEFAULT '0' COMMENT 'currently unused',
+	`timestamp` int unsigned NOT NULL DEFAULT 0 COMMENT 'file timestamp to check for reloads',
+	`plugin_admin` boolean NOT NULL DEFAULT '0' COMMENT '1 = has admin config, 0 = has no admin config',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `name` (`name`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='registered addons';
 
 --
 -- TABLE attach
 --
 CREATE TABLE IF NOT EXISTS `attach` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`hash` varchar(64) NOT NULL DEFAULT '' COMMENT '',
-	`filename` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`filetype` varchar(64) NOT NULL DEFAULT '' COMMENT '',
-	`filesize` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`data` longblob NOT NULL COMMENT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`allow_cid` mediumtext COMMENT '',
-	`allow_gid` mediumtext COMMENT '',
-	`deny_cid` mediumtext COMMENT '',
-	`deny_gid` mediumtext COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'generated index',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
+	`hash` varchar(64) NOT NULL DEFAULT '' COMMENT 'hash',
+	`filename` varchar(255) NOT NULL DEFAULT '' COMMENT 'filename of original',
+	`filetype` varchar(64) NOT NULL DEFAULT '' COMMENT 'mimetype',
+	`filesize` int unsigned NOT NULL DEFAULT 0 COMMENT 'size in bytes',
+	`data` longblob NOT NULL COMMENT 'file data',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'creation time',
+	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'last edit time',
+	`allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>',
+	`allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups',
+	`deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id',
+	`deny_gid` mediumtext COMMENT 'Access Control - list of denied groups',
 	 PRIMARY KEY(`id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='file attachments';
 
 --
 -- TABLE auth_codes
@@ -49,7 +49,7 @@ CREATE TABLE IF NOT EXISTS `auth_codes` (
 	`expires` int NOT NULL DEFAULT 0 COMMENT '',
 	`scope` varchar(250) NOT NULL DEFAULT '' COMMENT '',
 	 PRIMARY KEY(`id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='OAuth usage';
 
 --
 -- TABLE cache
@@ -61,20 +61,20 @@ CREATE TABLE IF NOT EXISTS `cache` (
 	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of cache insertion',
 	 PRIMARY KEY(`k`),
 	 INDEX `k_expires` (`k`,`expires`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Stores temporary data';
 
 --
 -- TABLE challenge
 --
 CREATE TABLE IF NOT EXISTS `challenge` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`challenge` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`dfrn-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`expire` int unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`type` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`last_update` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	 PRIMARY KEY(`id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='';
 
 --
 -- TABLE clients
@@ -87,7 +87,7 @@ CREATE TABLE IF NOT EXISTS `clients` (
 	`icon` text COMMENT '',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
 	 PRIMARY KEY(`client_id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='OAuth usage';
 
 --
 -- TABLE config
@@ -99,32 +99,32 @@ CREATE TABLE IF NOT EXISTS `config` (
 	`v` mediumtext COMMENT '',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `cat_k` (`cat`,`k`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='main configuration storage';
 
 --
 -- TABLE contact
 --
 CREATE TABLE IF NOT EXISTS `contact` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`self` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`self` boolean NOT NULL DEFAULT '0' COMMENT '1 if the contact is the user him/her self',
 	`remote_self` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`rel` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`rel` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'The kind of the relation between the user and the contact',
 	`duplex` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`network` char(4) NOT NULL DEFAULT '' COMMENT '',
-	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`network` char(4) NOT NULL DEFAULT '' COMMENT 'Network protocol of the contact',
+	`name` varchar(255) NOT NULL DEFAULT '' COMMENT 'Name that this contact is known by',
+	`nick` varchar(255) NOT NULL DEFAULT '' COMMENT 'Nick- and user name of the contact',
 	`location` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`about` text COMMENT '',
-	`keywords` text COMMENT '',
+	`keywords` text COMMENT 'public keywords (interests) of the contact',
 	`gender` varchar(32) NOT NULL DEFAULT '' COMMENT '',
 	`xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`attag` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`photo` varchar(255) DEFAULT '' COMMENT '',
-	`thumb` varchar(255) DEFAULT '' COMMENT '',
-	`micro` varchar(255) DEFAULT '' COMMENT '',
+	`photo` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo of the contact',
+	`thumb` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo (thumb size)',
+	`micro` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo (micro size)',
 	`site-pubkey` text COMMENT '',
 	`issued-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`dfrn-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -132,8 +132,8 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`addr` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`alias` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`pubkey` text COMMENT '',
-	`prvkey` text COMMENT '',
+	`pubkey` text COMMENT 'RSA public key 4096 bit',
+	`prvkey` text COMMENT 'RSA private key 4096 bit',
 	`batch` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`request` varchar(255) COMMENT '',
 	`notify` varchar(255) COMMENT '',
@@ -145,20 +145,20 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`usehub` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`subhub` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`hub-verify` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`last-update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`success_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`failure_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`last-update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last try to update the contact info',
+	`success_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last successful contact update',
+	`failure_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last failed update',
 	`name-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	`uri-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	`avatar-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	`term-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`last-item` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`last-item` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'date of the last post',
 	`priority` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`blocked` boolean NOT NULL DEFAULT '1' COMMENT '',
-	`readonly` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`readonly` boolean NOT NULL DEFAULT '0' COMMENT 'posts of the contact are readonly',
 	`writable` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`forum` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`prv` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`forum` boolean NOT NULL DEFAULT '0' COMMENT 'contact is a forum',
+	`prv` boolean NOT NULL DEFAULT '0' COMMENT 'contact is a private group',
 	`contact-type` tinyint NOT NULL DEFAULT 0 COMMENT '',
 	`hidden` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`archive` boolean NOT NULL DEFAULT '0' COMMENT '',
@@ -186,74 +186,74 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	 INDEX `nick_uid` (`nick`(32),`uid`),
 	 INDEX `dfrn-id` (`dfrn-id`(64)),
 	 INDEX `issued-id` (`issued-id`(64))
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='contact table';
 
 --
 -- TABLE conv
 --
 CREATE TABLE IF NOT EXISTS `conv` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`recips` text COMMENT '',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`creator` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`subject` text COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this conversation',
+	`recips` text COMMENT 'sender_handle;recipient_handle',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
+	`creator` varchar(255) NOT NULL DEFAULT '' COMMENT 'handle of creator',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'creation timestamp',
+	`updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'edited timestamp',
+	`subject` text COMMENT 'subject of initial message',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='private messages';
 
 --
 -- TABLE conversation
 --
 CREATE TABLE IF NOT EXISTS `conversation` (
-	`item-uri` varbinary(255) NOT NULL COMMENT '',
-	`reply-to-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT '',
-	`conversation-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT '',
-	`conversation-href` varbinary(255) NOT NULL DEFAULT '' COMMENT '',
-	`protocol` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`source` mediumtext COMMENT '',
-	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`item-uri` varbinary(255) NOT NULL COMMENT 'Original URI of the item - unrelated to the table with the same name',
+	`reply-to-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'URI to which this item is a reply',
+	`conversation-uri` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation URI',
+	`conversation-href` varbinary(255) NOT NULL DEFAULT '' COMMENT 'GNU Social conversation link',
+	`protocol` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'The protocol of the item',
+	`source` mediumtext COMMENT 'Original source',
+	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Receiving date',
 	 PRIMARY KEY(`item-uri`),
 	 INDEX `conversation-uri` (`conversation-uri`),
 	 INDEX `received` (`received`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Raw data and structure information for messages';
 
 --
 -- TABLE event
 --
 CREATE TABLE IF NOT EXISTS `event` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`cid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
+	`cid` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact_id (ID of the contact in contact table)',
 	`uri` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`start` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`finish` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`summary` text COMMENT '',
-	`desc` text COMMENT '',
-	`location` text COMMENT '',
-	`type` varchar(20) NOT NULL DEFAULT '' COMMENT '',
-	`nofinish` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`adjust` boolean NOT NULL DEFAULT '1' COMMENT '',
-	`ignore` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`allow_cid` mediumtext COMMENT '',
-	`allow_gid` mediumtext COMMENT '',
-	`deny_cid` mediumtext COMMENT '',
-	`deny_gid` mediumtext COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'creation time',
+	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'last edit time',
+	`start` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'event start time',
+	`finish` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'event end time',
+	`summary` text COMMENT 'short description or title of the event',
+	`desc` text COMMENT 'event description',
+	`location` text COMMENT 'event location',
+	`type` varchar(20) NOT NULL DEFAULT '' COMMENT 'event or birthday',
+	`nofinish` boolean NOT NULL DEFAULT '0' COMMENT 'if event does have no end this is 1',
+	`adjust` boolean NOT NULL DEFAULT '1' COMMENT 'adjust to timezone of the recipient (0 or 1)',
+	`ignore` boolean NOT NULL DEFAULT '0' COMMENT '0 or 1',
+	`allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'',
+	`allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups',
+	`deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id',
+	`deny_gid` mediumtext COMMENT 'Access Control - list of denied groups',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid_start` (`uid`,`start`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Events';
 
 --
 -- TABLE fcontact
 --
 CREATE TABLE IF NOT EXISTS `fcontact` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'unique id',
 	`url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`photo` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -272,7 +272,7 @@ CREATE TABLE IF NOT EXISTS `fcontact` (
 	 PRIMARY KEY(`id`),
 	 INDEX `addr` (`addr`(32)),
 	 UNIQUE INDEX `url` (`url`(190))
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Diaspora compatible contacts - used in the Diaspora implementation';
 
 --
 -- TABLE fsuggest
@@ -288,30 +288,30 @@ CREATE TABLE IF NOT EXISTS `fsuggest` (
 	`note` text COMMENT '',
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='friend suggestion stuff';
 
 --
 -- TABLE gcign
 --
 CREATE TABLE IF NOT EXISTS `gcign` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`gcid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Local User id',
+	`gcid` int unsigned NOT NULL DEFAULT 0 COMMENT 'gcontact.id of ignored contact',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`),
 	 INDEX `gcid` (`gcid`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='contacts ignored by friend suggestions';
 
 --
 -- TABLE gcontact
 --
 CREATE TABLE IF NOT EXISTS `gcontact` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`nick` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`name` varchar(255) NOT NULL DEFAULT '' COMMENT 'Name that this contact is known by',
+	`nick` varchar(255) NOT NULL DEFAULT '' COMMENT 'Nick- and user name of the contact',
+	`url` varchar(255) NOT NULL DEFAULT '' COMMENT 'Link to the contacts profile page',
 	`nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`photo` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`photo` varchar(255) NOT NULL DEFAULT '' COMMENT 'Link to the profile photo',
 	`connect` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	`updated` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
@@ -319,19 +319,19 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
 	`last_failure` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	`location` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`about` text COMMENT '',
-	`keywords` text COMMENT '',
+	`keywords` text COMMENT 'puplic keywords (interests)',
 	`gender` varchar(32) NOT NULL DEFAULT '' COMMENT '',
 	`birthday` varchar(32) NOT NULL DEFAULT '0001-01-01' COMMENT '',
-	`community` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`community` boolean NOT NULL DEFAULT '0' COMMENT '1 if contact is forum account',
 	`contact-type` tinyint NOT NULL DEFAULT -1 COMMENT '',
-	`hide` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`nsfw` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`network` char(4) NOT NULL DEFAULT '' COMMENT '',
+	`hide` boolean NOT NULL DEFAULT '0' COMMENT '1 = should be hidden from search',
+	`nsfw` boolean NOT NULL DEFAULT '0' COMMENT '1 = contact posts nsfw content',
+	`network` char(4) NOT NULL DEFAULT '' COMMENT 'social network protocol',
 	`addr` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`notify` varchar(255) COMMENT '',
 	`alias` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`generation` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`server_url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`server_url` varchar(255) NOT NULL DEFAULT '' COMMENT 'baseurl of the contacts server',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `nurl` (`nurl`(190)),
 	 INDEX `name` (`name`(64)),
@@ -339,13 +339,13 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
 	 INDEX `addr` (`addr`(64)),
 	 INDEX `hide_network_updated` (`hide`,`network`,`updated`),
 	 INDEX `updated` (`updated`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='global contacts';
 
 --
 -- TABLE glink
 --
 CREATE TABLE IF NOT EXISTS `glink` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`cid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
 	`gcid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
@@ -354,45 +354,45 @@ CREATE TABLE IF NOT EXISTS `glink` (
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `cid_uid_gcid_zcid` (`cid`,`uid`,`gcid`,`zcid`),
 	 INDEX `gcid` (`gcid`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='\'friends of friends\' linkages derived from poco';
 
 --
 -- TABLE group
 --
 CREATE TABLE IF NOT EXISTS `group` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`visible` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`deleted` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
+	`visible` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the member list is not private',
+	`deleted` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the group has been deleted',
+	`name` varchar(255) NOT NULL DEFAULT '' COMMENT 'human readable name of group',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy groups, group info';
 
 --
 -- TABLE group_member
 --
 CREATE TABLE IF NOT EXISTS `group_member` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`gid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`gid` int unsigned NOT NULL DEFAULT 0 COMMENT 'groups.id of the associated group',
+	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id of the member assigned to the associated group',
 	 PRIMARY KEY(`id`),
 	 INDEX `contactid` (`contact-id`),
 	 UNIQUE INDEX `gid_contactid` (`gid`,`contact-id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy groups, member info';
 
 --
 -- TABLE gserver
 --
 CREATE TABLE IF NOT EXISTS `gserver` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`version` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`site_name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`info` text COMMENT '',
 	`register_policy` tinyint NOT NULL DEFAULT 0 COMMENT '',
-	`registered-users` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`registered-users` int unsigned NOT NULL DEFAULT 0 COMMENT 'Number of registered users',
 	`poco` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`noscrape` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`network` char(4) NOT NULL DEFAULT '' COMMENT '',
@@ -405,7 +405,7 @@ CREATE TABLE IF NOT EXISTS `gserver` (
 	`last_failure` datetime DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `nurl` (`nurl`(190))
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Global servers';
 
 --
 -- TABLE gserver-tag
@@ -415,26 +415,26 @@ CREATE TABLE IF NOT EXISTS `gserver-tag` (
 	`tag` varchar(100) NOT NULL DEFAULT '' COMMENT 'Tag that the server has subscribed',
 	 PRIMARY KEY(`gserver-id`,`tag`),
 	 INDEX `tag` (`tag`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Tags that the server has subscribed';
 
 --
 -- TABLE hook
 --
 CREATE TABLE IF NOT EXISTS `hook` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`hook` varbinary(100) NOT NULL DEFAULT '' COMMENT '',
-	`file` varbinary(200) NOT NULL DEFAULT '' COMMENT '',
-	`function` varbinary(200) NOT NULL DEFAULT '' COMMENT '',
-	`priority` smallint unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`hook` varbinary(100) NOT NULL DEFAULT '' COMMENT 'name of hook',
+	`file` varbinary(200) NOT NULL DEFAULT '' COMMENT 'relative filename of hook handler',
+	`function` varbinary(200) NOT NULL DEFAULT '' COMMENT 'function name of hook handler',
+	`priority` smallint unsigned NOT NULL DEFAULT 0 COMMENT 'not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `hook_file_function` (`hook`,`file`,`function`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='addon hook registry';
 
 --
 -- TABLE intro
 --
 CREATE TABLE IF NOT EXISTS `intro` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
 	`fid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
@@ -446,76 +446,83 @@ CREATE TABLE IF NOT EXISTS `intro` (
 	`blocked` boolean NOT NULL DEFAULT '1' COMMENT '',
 	`ignore` boolean NOT NULL DEFAULT '0' COMMENT '',
 	 PRIMARY KEY(`id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='';
 
 --
 -- TABLE item
 --
 CREATE TABLE IF NOT EXISTS `item` (
 	`id` int unsigned NOT NULL auto_increment,
-	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this item',
 	`uri` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`type` varchar(20) NOT NULL DEFAULT '' COMMENT '',
-	`wall` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`uri-hash` varchar(80) NOT NULL DEFAULT '' COMMENT 'RIPEMD-128 hash from uri',
+	`parent` int unsigned NOT NULL DEFAULT 0 COMMENT 'item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item',
+	`parent-uri` varchar(255) NOT NULL DEFAULT '' COMMENT 'uri of the parent to this item',
+	`parent-uri-id` int unsigned COMMENT 'Id of the item-uri table that contains the parent uri',
+	`thr-parent` varchar(255) NOT NULL DEFAULT '' COMMENT 'If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri',
+	`thr-parent-id` int unsigned COMMENT 'Id of the item-uri table that contains the thread parent uri',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation timestamp.',
+	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last edit (default is created)',
+	`commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last comment/reply to this item',
+	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime',
+	`changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date that something in the conversation changed, indicating clients should fetch the conversation again',
 	`gravity` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`parent` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`parent-uri` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`network` char(4) NOT NULL DEFAULT '' COMMENT 'Network from where the item comes from',
+	`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the owner of this item',
+	`author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Link to the contact table with uid=0 of the author of this item',
+	`icid` int unsigned COMMENT 'Id of the item-content table entry that contains the whole item content',
+	`iaid` int unsigned COMMENT 'Id of the item-activity table entry that contains the activity data',
 	`extid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`thr-parent` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`owner-name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`owner-link` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`owner-avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`author-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`author-name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`author-link` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`author-avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`title` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`body` mediumtext COMMENT '',
-	`app` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`verb` varchar(100) NOT NULL DEFAULT '' COMMENT '',
-	`object-type` varchar(100) NOT NULL DEFAULT '' COMMENT '',
-	`object` text COMMENT '',
-	`target-type` varchar(100) NOT NULL DEFAULT '' COMMENT '',
-	`target` text COMMENT '',
-	`postopts` text COMMENT '',
-	`plink` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT '',
-	`event-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`tag` mediumtext COMMENT '',
-	`attach` mediumtext COMMENT '',
-	`inform` mediumtext COMMENT '',
-	`file` mediumtext COMMENT '',
-	`location` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`coord` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`allow_cid` mediumtext COMMENT '',
-	`allow_gid` mediumtext COMMENT '',
-	`deny_cid` mediumtext COMMENT '',
-	`deny_gid` mediumtext COMMENT '',
-	`private` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`pubmail` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`moderated` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`visible` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`spam` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`starred` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`bookmark` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`unseen` boolean NOT NULL DEFAULT '1' COMMENT '',
-	`deleted` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`origin` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`forum_mode` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`mention` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`network` char(4) NOT NULL DEFAULT '' COMMENT '',
-	`rendered-hash` varchar(32) NOT NULL DEFAULT '' COMMENT '',
-	`rendered-html` mediumtext COMMENT '',
+	`post-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Post type (personal note, bookmark, ...)',
 	`global` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`private` boolean NOT NULL DEFAULT '0' COMMENT 'distribution is restricted',
+	`visible` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`moderated` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`deleted` boolean NOT NULL DEFAULT '0' COMMENT 'item has been deleted',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner id which owns this copy of the item',
+	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id',
+	`wall` boolean NOT NULL DEFAULT '0' COMMENT 'This item was posted to the wall of uid',
+	`origin` boolean NOT NULL DEFAULT '0' COMMENT 'item originated at this site',
+	`pubmail` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`starred` boolean NOT NULL DEFAULT '0' COMMENT 'item has been favourited',
+	`unseen` boolean NOT NULL DEFAULT '1' COMMENT 'item has not been seen',
+	`mention` boolean NOT NULL DEFAULT '0' COMMENT 'The owner of this item was mentioned in it',
+	`forum_mode` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`psid` int unsigned COMMENT 'ID of the permission set of this post',
+	`resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT 'Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type',
+	`event-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Used to link to the event.id',
+	`attach` mediumtext COMMENT 'JSON structure representing attachments to this item',
+	`allow_cid` mediumtext COMMENT 'Deprecated',
+	`allow_gid` mediumtext COMMENT 'Deprecated',
+	`deny_cid` mediumtext COMMENT 'Deprecated',
+	`deny_gid` mediumtext COMMENT 'Deprecated',
+	`postopts` text COMMENT 'Deprecated',
+	`inform` mediumtext COMMENT 'Deprecated',
+	`type` varchar(20) COMMENT 'Deprecated',
+	`bookmark` boolean COMMENT 'Deprecated',
+	`file` mediumtext COMMENT 'Deprecated',
+	`location` varchar(255) COMMENT 'Deprecated',
+	`coord` varchar(255) COMMENT 'Deprecated',
+	`tag` mediumtext COMMENT 'Deprecated',
+	`plink` varchar(255) COMMENT 'Deprecated',
+	`title` varchar(255) COMMENT 'Deprecated',
+	`content-warning` varchar(255) COMMENT 'Deprecated',
+	`body` mediumtext COMMENT 'Deprecated',
+	`app` varchar(255) COMMENT 'Deprecated',
+	`verb` varchar(100) COMMENT 'Deprecated',
+	`object-type` varchar(100) COMMENT 'Deprecated',
+	`object` text COMMENT 'Deprecated',
+	`target-type` varchar(100) COMMENT 'Deprecated',
+	`target` text COMMENT 'Deprecated',
+	`author-name` varchar(255) COMMENT 'Deprecated',
+	`author-link` varchar(255) COMMENT 'Deprecated',
+	`author-avatar` varchar(255) COMMENT 'Deprecated',
+	`owner-name` varchar(255) COMMENT 'Deprecated',
+	`owner-link` varchar(255) COMMENT 'Deprecated',
+	`owner-avatar` varchar(255) COMMENT 'Deprecated',
+	`rendered-hash` varchar(32) COMMENT 'Deprecated',
+	`rendered-html` mediumtext COMMENT 'Deprecated',
 	 PRIMARY KEY(`id`),
 	 INDEX `guid` (`guid`(191)),
 	 INDEX `uri` (`uri`(191)),
@@ -536,61 +543,125 @@ CREATE TABLE IF NOT EXISTS `item` (
 	 INDEX `ownerid` (`owner-id`),
 	 INDEX `uid_uri` (`uid`,`uri`(190)),
 	 INDEX `resource-id` (`resource-id`),
-	 INDEX `contactid_allowcid_allowpid_denycid_denygid` (`contact-id`,`allow_cid`(10),`allow_gid`(10),`deny_cid`(10),`deny_gid`(10)),
-	 INDEX `uid_type_changed` (`uid`,`type`,`changed`),
-	 INDEX `contactid_verb` (`contact-id`,`verb`),
 	 INDEX `deleted_changed` (`deleted`,`changed`),
 	 INDEX `uid_wall_changed` (`uid`,`wall`,`changed`),
 	 INDEX `uid_eventid` (`uid`,`event-id`),
-	 INDEX `uid_authorlink` (`uid`,`author-link`(190)),
-	 INDEX `uid_ownerlink` (`uid`,`owner-link`(190))
-) DEFAULT COLLATE utf8mb4_general_ci;
+	 INDEX `icid` (`icid`),
+	 INDEX `iaid` (`iaid`),
+	 INDEX `psid_wall` (`psid`,`wall`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Structure for all posts';
+
+--
+-- TABLE item-activity
+--
+CREATE TABLE IF NOT EXISTS `item-activity` (
+	`id` int unsigned NOT NULL auto_increment,
+	`uri` varchar(255) COMMENT '',
+	`uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`uri-hash` varchar(80) NOT NULL DEFAULT '' COMMENT 'RIPEMD-128 hash from uri',
+	`activity` smallint unsigned NOT NULL DEFAULT 0 COMMENT '',
+	 PRIMARY KEY(`id`),
+	 UNIQUE INDEX `uri-hash` (`uri-hash`),
+	 INDEX `uri` (`uri`(191))
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Activities for items';
+
+--
+-- TABLE item-content
+--
+CREATE TABLE IF NOT EXISTS `item-content` (
+	`id` int unsigned NOT NULL auto_increment,
+	`uri` varchar(255) COMMENT '',
+	`uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`uri-plink-hash` varchar(80) NOT NULL DEFAULT '' COMMENT 'RIPEMD-128 hash from uri',
+	`title` varchar(255) NOT NULL DEFAULT '' COMMENT 'item title',
+	`content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`body` mediumtext COMMENT 'item body content',
+	`location` varchar(255) NOT NULL DEFAULT '' COMMENT 'text location where this item originated',
+	`coord` varchar(255) NOT NULL DEFAULT '' COMMENT 'longitude/latitude pair representing location where this item originated',
+	`language` text COMMENT 'Language information about this post',
+	`app` varchar(255) NOT NULL DEFAULT '' COMMENT 'application which generated this item',
+	`rendered-hash` varchar(32) NOT NULL DEFAULT '' COMMENT '',
+	`rendered-html` mediumtext COMMENT 'item.body converted to html',
+	`object-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams object type',
+	`object` text COMMENT 'JSON encoded object structure unless it is an implied object (normal post)',
+	`target-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams target type if applicable (URI)',
+	`target` text COMMENT 'JSON encoded target structure if used',
+	`plink` varchar(255) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source',
+	`verb` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams verb',
+	 PRIMARY KEY(`id`),
+	 UNIQUE INDEX `uri-plink-hash` (`uri-plink-hash`),
+	 INDEX `uri` (`uri`(191))
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Content for all posts';
+
+--
+-- TABLE item-delivery-data
+--
+CREATE TABLE IF NOT EXISTS `item-delivery-data` (
+	`iid` int unsigned NOT NULL COMMENT 'Item id',
+	`postopts` text COMMENT 'External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery',
+	`inform` mediumtext COMMENT 'Additional receivers of the linked item',
+	 PRIMARY KEY(`iid`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Delivery data for items';
+
+--
+-- TABLE item-uri
+--
+CREATE TABLE IF NOT EXISTS `item-uri` (
+	`id` int unsigned NOT NULL auto_increment,
+	`uri` varbinary(255) NOT NULL COMMENT 'URI of an item',
+	`guid` varbinary(255) COMMENT 'A unique identifier for an item',
+	 PRIMARY KEY(`id`),
+	 UNIQUE INDEX `uri` (`uri`),
+	 INDEX `guid` (`guid`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='URI and GUID for items';
 
 --
 -- TABLE locks
 --
 CREATE TABLE IF NOT EXISTS `locks` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`name` varchar(128) NOT NULL DEFAULT '' COMMENT '',
 	`locked` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`pid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	 PRIMARY KEY(`id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+	`pid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Process ID',
+	`expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of cache expiration',
+	 PRIMARY KEY(`id`),
+	 INDEX `name_expires` (`name`,`expires`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='';
 
 --
 -- TABLE mail
 --
 CREATE TABLE IF NOT EXISTS `mail` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`from-name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`from-photo` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`from-url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`contact-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`convid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
+	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this private message',
+	`from-name` varchar(255) NOT NULL DEFAULT '' COMMENT 'name of the sender',
+	`from-photo` varchar(255) NOT NULL DEFAULT '' COMMENT 'contact photo link of the sender',
+	`from-url` varchar(255) NOT NULL DEFAULT '' COMMENT 'profile linke of the sender',
+	`contact-id` varchar(255) NOT NULL DEFAULT '' COMMENT 'contact.id',
+	`convid` int unsigned NOT NULL DEFAULT 0 COMMENT 'conv.id',
 	`title` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`body` mediumtext COMMENT '',
-	`seen` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`seen` boolean NOT NULL DEFAULT '0' COMMENT 'if message visited it is 1',
 	`reply` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`replied` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`unknown` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`unknown` boolean NOT NULL DEFAULT '0' COMMENT 'if sender not in the contact table this is 1',
 	`uri` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`parent-uri` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'creation time of the private message',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid_seen` (`uid`,`seen`),
 	 INDEX `convid` (`convid`),
 	 INDEX `uri` (`uri`(64)),
 	 INDEX `parent-uri` (`parent-uri`(64)),
 	 INDEX `contactid` (`contact-id`(32))
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='private messages';
 
 --
 -- TABLE mailacct
 --
 CREATE TABLE IF NOT EXISTS `mailacct` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
 	`server` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`port` smallint unsigned NOT NULL DEFAULT 0 COMMENT '',
@@ -604,24 +675,24 @@ CREATE TABLE IF NOT EXISTS `mailacct` (
 	`pubmail` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`last_check` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Mail account data for fetching mails';
 
 --
 -- TABLE manage
 --
 CREATE TABLE IF NOT EXISTS `manage` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
 	`mid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `uid_mid` (`uid`,`mid`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='table of accounts that can manage each other';
 
 --
 -- TABLE notify
 --
 CREATE TABLE IF NOT EXISTS `notify` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`hash` varchar(64) NOT NULL DEFAULT '' COMMENT '',
 	`type` smallint unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -629,58 +700,71 @@ CREATE TABLE IF NOT EXISTS `notify` (
 	`photo` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	`msg` mediumtext COMMENT '',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
 	`link` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`iid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`iid` int unsigned NOT NULL DEFAULT 0 COMMENT 'item.id',
 	`parent` int unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`seen` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`verb` varchar(100) NOT NULL DEFAULT '' COMMENT '',
 	`otype` varchar(10) NOT NULL DEFAULT '' COMMENT '',
-	`name_cache` tinytext COMMENT '',
-	`msg_cache` mediumtext COMMENT '',
+	`name_cache` tinytext COMMENT 'Cached bbcode parsing of name',
+	`msg_cache` mediumtext COMMENT 'Cached bbcode parsing of msg',
 	 PRIMARY KEY(`id`),
 	 INDEX `hash_uid` (`hash`,`uid`),
 	 INDEX `seen_uid_date` (`seen`,`uid`,`date`),
 	 INDEX `uid_date` (`uid`,`date`),
 	 INDEX `uid_type_link` (`uid`,`type`,`link`(190))
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='notifications';
 
 --
 -- TABLE notify-threads
 --
 CREATE TABLE IF NOT EXISTS `notify-threads` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`notify-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`master-parent-item` int unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`parent-item` int unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`receiver-uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
 	 PRIMARY KEY(`id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='';
 
 --
 -- TABLE oembed
 --
 CREATE TABLE IF NOT EXISTS `oembed` (
-	`url` varbinary(255) NOT NULL COMMENT '',
-	`maxwidth` mediumint unsigned NOT NULL COMMENT '',
-	`content` mediumtext COMMENT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`url` varbinary(255) NOT NULL COMMENT 'page url',
+	`maxwidth` mediumint unsigned NOT NULL COMMENT 'Maximum width passed to Oembed',
+	`content` mediumtext COMMENT 'OEmbed data of the page',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of creation',
 	 PRIMARY KEY(`url`,`maxwidth`),
 	 INDEX `created` (`created`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='cache for OEmbed queries';
+
+--
+-- TABLE openwebauth-token
+--
+CREATE TABLE IF NOT EXISTS `openwebauth-token` (
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
+	`type` varchar(32) NOT NULL DEFAULT '' COMMENT 'Verify type',
+	`token` varchar(255) NOT NULL DEFAULT '' COMMENT 'A generated token',
+	`meta` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of creation',
+	 PRIMARY KEY(`id`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Store OpenWebAuth token to verify contacts';
 
 --
 -- TABLE parsed_url
 --
 CREATE TABLE IF NOT EXISTS `parsed_url` (
-	`url` varbinary(255) NOT NULL COMMENT '',
-	`guessing` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`oembed` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`content` mediumtext COMMENT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`url` varbinary(255) NOT NULL COMMENT 'page url',
+	`guessing` boolean NOT NULL DEFAULT '0' COMMENT 'is the \'guessing\' mode active?',
+	`oembed` boolean NOT NULL DEFAULT '0' COMMENT 'is the data the result of oembed?',
+	`content` mediumtext COMMENT 'page data',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of creation',
 	 PRIMARY KEY(`url`,`guessing`,`oembed`),
 	 INDEX `created` (`created`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='cache for \'parse_url\' queries';
 
 --
 -- TABLE participation
@@ -691,7 +775,7 @@ CREATE TABLE IF NOT EXISTS `participation` (
 	`cid` int unsigned NOT NULL COMMENT '',
 	`fid` int unsigned NOT NULL COMMENT '',
 	 PRIMARY KEY(`iid`,`server`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Storage for participation messages from Diaspora';
 
 --
 -- TABLE pconfig
@@ -704,22 +788,36 @@ CREATE TABLE IF NOT EXISTS `pconfig` (
 	`v` mediumtext COMMENT '',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `uid_cat_k` (`uid`,`cat`,`k`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='personal (per user) configuration storage';
+
+--
+-- TABLE permissionset
+--
+CREATE TABLE IF NOT EXISTS `permissionset` (
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner id of this permission set',
+	`allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'',
+	`allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups',
+	`deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id',
+	`deny_gid` mediumtext COMMENT 'Access Control - list of denied groups',
+	 PRIMARY KEY(`id`),
+	 INDEX `uid_allow_cid_allow_gid_deny_cid_deny_gid` (`allow_cid`(50),`allow_gid`(30),`deny_cid`(50),`deny_gid`(30))
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='';
 
 --
 -- TABLE photo
 --
 CREATE TABLE IF NOT EXISTS `photo` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`guid` char(16) NOT NULL DEFAULT '' COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
+	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id',
+	`guid` char(16) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this photo',
 	`resource-id` char(32) NOT NULL DEFAULT '' COMMENT '',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'creation date',
+	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'last edited date',
 	`title` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`desc` text COMMENT '',
-	`album` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`album` varchar(255) NOT NULL DEFAULT '' COMMENT 'The name of the album to which the photo belongs',
 	`filename` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`type` varchar(30) NOT NULL DEFAULT 'image/jpeg',
 	`height` smallint unsigned NOT NULL DEFAULT 0 COMMENT '',
@@ -728,10 +826,10 @@ CREATE TABLE IF NOT EXISTS `photo` (
 	`data` mediumblob NOT NULL COMMENT '',
 	`scale` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`profile` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`allow_cid` mediumtext COMMENT '',
-	`allow_gid` mediumtext COMMENT '',
-	`deny_cid` mediumtext COMMENT '',
-	`deny_gid` mediumtext COMMENT '',
+	`allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'',
+	`allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups',
+	`deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id',
+	`deny_gid` mediumtext COMMENT 'Access Control - list of denied groups',
 	 PRIMARY KEY(`id`),
 	 INDEX `contactid` (`contact-id`),
 	 INDEX `uid_contactid` (`uid`,`contact-id`),
@@ -739,7 +837,7 @@ CREATE TABLE IF NOT EXISTS `photo` (
 	 INDEX `uid_album_scale_created` (`uid`,`album`(32),`scale`,`created`),
 	 INDEX `uid_album_resource-id_created` (`uid`,`album`(32),`resource-id`,`created`),
 	 INDEX `resource-id` (`resource-id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='photo storage';
 
 --
 -- TABLE poll
@@ -759,18 +857,18 @@ CREATE TABLE IF NOT EXISTS `poll` (
 	`q9` text COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Currently unused table for storing poll results';
 
 --
 -- TABLE poll_result
 --
 CREATE TABLE IF NOT EXISTS `poll_result` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`poll_id` int unsigned NOT NULL DEFAULT 0,
 	`choice` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `poll_id` (`poll_id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='data for polls - currently unused';
 
 --
 -- TABLE process
@@ -781,20 +879,20 @@ CREATE TABLE IF NOT EXISTS `process` (
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	 PRIMARY KEY(`pid`),
 	 INDEX `command` (`command`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Currently running system processes';
 
 --
 -- TABLE profile
 --
 CREATE TABLE IF NOT EXISTS `profile` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`profile-name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`is-default` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`hide-friends` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
+	`profile-name` varchar(255) NOT NULL DEFAULT '' COMMENT 'Name of the profile',
+	`is-default` boolean NOT NULL DEFAULT '0' COMMENT 'Mark this profile as default profile',
+	`hide-friends` boolean NOT NULL DEFAULT '0' COMMENT 'Hide friend list from viewers of this profile',
 	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`pdesc` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`dob` varchar(32) NOT NULL DEFAULT '0000-00-00' COMMENT '',
+	`pdesc` varchar(255) NOT NULL DEFAULT '' COMMENT 'Title or description',
+	`dob` varchar(32) NOT NULL DEFAULT '0000-00-00' COMMENT 'Day of birth',
 	`address` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`locality` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`region` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -827,30 +925,30 @@ CREATE TABLE IF NOT EXISTS `profile` (
 	`xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`photo` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`thumb` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`publish` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`net-publish` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`publish` boolean NOT NULL DEFAULT '0' COMMENT 'publish default profile in local directory',
+	`net-publish` boolean NOT NULL DEFAULT '0' COMMENT 'publish profile in global directory',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid_is-default` (`uid`,`is-default`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='user profiles data';
 
 --
 -- TABLE profile_check
 --
 CREATE TABLE IF NOT EXISTS `profile_check` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`cid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`cid` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id',
 	`dfrn_id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`sec` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`expire` int unsigned NOT NULL DEFAULT 0 COMMENT '',
 	 PRIMARY KEY(`id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='DFRN remote auth use';
 
 --
 -- TABLE push_subscriber
 --
 CREATE TABLE IF NOT EXISTS `push_subscriber` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
 	`callback_url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`topic` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -862,13 +960,13 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` (
 	`secret` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `next_try` (`next_try`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Used for OStatus: Contains feed subscribers';
 
 --
 -- TABLE queue
 --
 CREATE TABLE IF NOT EXISTS `queue` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`cid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Message receiver',
 	`network` char(4) NOT NULL DEFAULT '' COMMENT 'Receiver\'s network',
 	`guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'Unique GUID of the message',
@@ -881,13 +979,13 @@ CREATE TABLE IF NOT EXISTS `queue` (
 	 PRIMARY KEY(`id`),
 	 INDEX `last` (`last`),
 	 INDEX `next` (`next`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Queue for messages that couldn\'t be delivered';
 
 --
 -- TABLE register
 --
 CREATE TABLE IF NOT EXISTS `register` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`hash` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
@@ -895,44 +993,44 @@ CREATE TABLE IF NOT EXISTS `register` (
 	`language` varchar(16) NOT NULL DEFAULT '' COMMENT '',
 	`note` text COMMENT '',
 	 PRIMARY KEY(`id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='registrations requiring admin approval';
 
 --
 -- TABLE search
 --
 CREATE TABLE IF NOT EXISTS `search` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
 	`term` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='';
 
 --
 -- TABLE session
 --
 CREATE TABLE IF NOT EXISTS `session` (
-	`id` bigint unsigned NOT NULL auto_increment COMMENT '',
+	`id` bigint unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`sid` varbinary(255) NOT NULL DEFAULT '' COMMENT '',
 	`data` text COMMENT '',
 	`expire` int unsigned NOT NULL DEFAULT 0 COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `sid` (`sid`(64)),
 	 INDEX `expire` (`expire`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='web session storage';
 
 --
 -- TABLE sign
 --
 CREATE TABLE IF NOT EXISTS `sign` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
-	`iid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+	`iid` int unsigned NOT NULL DEFAULT 0 COMMENT 'item.id',
 	`signed_text` mediumtext COMMENT '',
 	`signature` text COMMENT '',
 	`signer` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	 PRIMARY KEY(`id`),
 	 UNIQUE INDEX `iid` (`iid`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Diaspora signatures';
 
 --
 -- TABLE term
@@ -948,24 +1046,23 @@ CREATE TABLE IF NOT EXISTS `term` (
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	`received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	`global` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`aid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
 	 PRIMARY KEY(`tid`),
 	 INDEX `oid_otype_type_term` (`oid`,`otype`,`type`,`term`(32)),
 	 INDEX `uid_otype_type_term_global_created` (`uid`,`otype`,`type`,`term`(32),`global`,`created`),
 	 INDEX `uid_otype_type_url` (`uid`,`otype`,`type`,`url`(64)),
 	 INDEX `guid` (`guid`(64))
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='item taxonomy (categories, tags, etc.) table';
 
 --
 -- TABLE thread
 --
 CREATE TABLE IF NOT EXISTS `thread` (
-	`iid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`iid` int unsigned NOT NULL DEFAULT 0 COMMENT 'sequential ID',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
 	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`author-id` int unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item owner',
+	`author-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item author',
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
 	`commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
@@ -976,16 +1073,16 @@ CREATE TABLE IF NOT EXISTS `thread` (
 	`pubmail` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`moderated` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`visible` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`spam` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`starred` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`ignored` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`bookmark` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`post-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Post type (personal note, bookmark, ...)',
 	`unseen` boolean NOT NULL DEFAULT '1' COMMENT '',
 	`deleted` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`origin` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`forum_mode` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`mention` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`network` char(4) NOT NULL DEFAULT '' COMMENT '',
+	`bookmark` boolean COMMENT '',
 	 PRIMARY KEY(`iid`),
 	 INDEX `uid_network_commented` (`uid`,`network`,`commented`),
 	 INDEX `uid_network_created` (`uid`,`network`,`created`),
@@ -998,7 +1095,7 @@ CREATE TABLE IF NOT EXISTS `thread` (
 	 INDEX `uid_commented` (`uid`,`commented`),
 	 INDEX `uid_wall_created` (`uid`,`wall`,`created`),
 	 INDEX `private_wall_origin_commented` (`private`,`wall`,`origin`,`commented`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Thread related data';
 
 --
 -- TABLE tokens
@@ -1011,70 +1108,82 @@ CREATE TABLE IF NOT EXISTS `tokens` (
 	`scope` varchar(200) NOT NULL DEFAULT '' COMMENT '',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
 	 PRIMARY KEY(`id`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='OAuth usage';
 
 --
 -- TABLE user
 --
 CREATE TABLE IF NOT EXISTS `user` (
-	`uid` mediumint unsigned NOT NULL auto_increment COMMENT '',
+	`uid` mediumint unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`parent-uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'The parent user that has full control about this user',
-	`guid` varchar(64) NOT NULL DEFAULT '' COMMENT '',
-	`username` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`password` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`guid` varchar(64) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this user',
+	`username` varchar(255) NOT NULL DEFAULT '' COMMENT 'Name that this user is known by',
+	`password` varchar(255) NOT NULL DEFAULT '' COMMENT 'encrypted password',
 	`legacy_password` boolean NOT NULL DEFAULT '0' COMMENT 'Is the password hash double-hashed?',
-	`nickname` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`email` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`nickname` varchar(255) NOT NULL DEFAULT '' COMMENT 'nick- and user name',
+	`email` varchar(255) NOT NULL DEFAULT '' COMMENT 'the users email address',
 	`openid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`timezone` varchar(128) NOT NULL DEFAULT '' COMMENT '',
-	`language` varchar(32) NOT NULL DEFAULT 'en' COMMENT '',
-	`register_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`login_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`default-location` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`allow_location` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`theme` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-	`pubkey` text COMMENT '',
-	`prvkey` text COMMENT '',
+	`timezone` varchar(128) NOT NULL DEFAULT '' COMMENT 'PHP-legal timezone',
+	`language` varchar(32) NOT NULL DEFAULT 'en' COMMENT 'default language',
+	`register_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'timestamp of registration',
+	`login_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'timestamp of last login',
+	`default-location` varchar(255) NOT NULL DEFAULT '' COMMENT 'Default for item.location',
+	`allow_location` boolean NOT NULL DEFAULT '0' COMMENT '1 allows to display the location',
+	`theme` varchar(255) NOT NULL DEFAULT '' COMMENT 'user theme preference',
+	`pubkey` text COMMENT 'RSA public key 4096 bit',
+	`prvkey` text COMMENT 'RSA private key 4096 bit',
 	`spubkey` text COMMENT '',
 	`sprvkey` text COMMENT '',
-	`verified` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`blocked` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`blockwall` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`hidewall` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`blocktags` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`unkmail` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`verified` boolean NOT NULL DEFAULT '0' COMMENT 'user is verified through email',
+	`blocked` boolean NOT NULL DEFAULT '0' COMMENT '1 for user is blocked',
+	`blockwall` boolean NOT NULL DEFAULT '0' COMMENT 'Prohibit contacts to post to the profile page of the user',
+	`hidewall` boolean NOT NULL DEFAULT '0' COMMENT 'Hide profile details from unkown viewers',
+	`blocktags` boolean NOT NULL DEFAULT '0' COMMENT 'Prohibit contacts to tag the post of this user',
+	`unkmail` boolean NOT NULL DEFAULT '0' COMMENT 'Permit unknown people to send private mails to this user',
 	`cntunkmail` int unsigned NOT NULL DEFAULT 10 COMMENT '',
-	`notify-flags` smallint unsigned NOT NULL DEFAULT 65535 COMMENT '',
-	`page-flags` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
+	`notify-flags` smallint unsigned NOT NULL DEFAULT 65535 COMMENT 'email notification options',
+	`page-flags` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'page/profile type',
 	`account-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`prvnets` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`pwdreset` varchar(255) COMMENT 'Password reset request token',
 	`pwdreset_time` datetime COMMENT 'Timestamp of the last password reset request',
 	`maxreq` int unsigned NOT NULL DEFAULT 10 COMMENT '',
 	`expire` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`account_removed` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`account_removed` boolean NOT NULL DEFAULT '0' COMMENT 'if 1 the account is removed',
 	`account_expired` boolean NOT NULL DEFAULT '0' COMMENT '',
-	`account_expires_on` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`expire_notification_sent` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+	`account_expires_on` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'timestamp when account expires and will be deleted',
+	`expire_notification_sent` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'timestamp of last warning of account expiration',
 	`def_gid` int unsigned NOT NULL DEFAULT 0 COMMENT '',
-	`allow_cid` mediumtext COMMENT '',
-	`allow_gid` mediumtext COMMENT '',
-	`deny_cid` mediumtext COMMENT '',
-	`deny_gid` mediumtext COMMENT '',
+	`allow_cid` mediumtext COMMENT 'default permission for this user',
+	`allow_gid` mediumtext COMMENT 'default permission for this user',
+	`deny_cid` mediumtext COMMENT 'default permission for this user',
+	`deny_gid` mediumtext COMMENT 'default permission for this user',
 	`openidserver` text COMMENT '',
 	 PRIMARY KEY(`uid`),
 	 INDEX `nickname` (`nickname`(32))
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='The local users';
 
 --
 -- TABLE userd
 --
 CREATE TABLE IF NOT EXISTS `userd` (
-	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`username` varchar(255) NOT NULL COMMENT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `username` (`username`(32))
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Deleted usernames';
+
+--
+-- TABLE user-contact
+--
+CREATE TABLE IF NOT EXISTS `user-contact` (
+	`cid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Contact id of the linked public contact',
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
+	`blocked` boolean COMMENT 'Contact is completely blocked for this user',
+	`ignored` boolean COMMENT 'Posts from this contact are ignored',
+	`collapsed` boolean COMMENT 'Posts from this contact are collapsed',
+	 PRIMARY KEY(`uid`,`cid`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User specific public contact data';
 
 --
 -- TABLE user-item
@@ -1082,9 +1191,19 @@ CREATE TABLE IF NOT EXISTS `userd` (
 CREATE TABLE IF NOT EXISTS `user-item` (
 	`iid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item id',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
-	`hidden` boolean NOT NULL DEFAULT '0' COMMENT 'Hidden marker',
+	`hidden` boolean NOT NULL DEFAULT '0' COMMENT 'Marker to hide an item from the user',
+	`ignored` boolean COMMENT 'Ignore this thread if set',
 	 PRIMARY KEY(`uid`,`iid`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User specific item data';
+
+--
+-- TABLE worker-ipc
+--
+CREATE TABLE IF NOT EXISTS `worker-ipc` (
+	`key` int NOT NULL COMMENT '',
+	`jobs` boolean COMMENT 'Flag for outstanding jobs',
+	 PRIMARY KEY(`key`)
+) ENGINE=MEMORY DEFAULT COLLATE utf8mb4_general_ci COMMENT='Inter process communication between the frontend and the worker';
 
 --
 -- TABLE workerqueue
@@ -1096,12 +1215,12 @@ CREATE TABLE IF NOT EXISTS `workerqueue` (
 	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation date',
 	`pid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Process id of the worker',
 	`executed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Execution date',
-	`done` boolean NOT NULL DEFAULT '0' COMMENT 'Marked when the task was done, will be deleted later',
+	`done` boolean NOT NULL DEFAULT '0' COMMENT 'Marked 1 when the task was done - will be deleted later',
 	 PRIMARY KEY(`id`),
 	 INDEX `pid` (`pid`),
 	 INDEX `parameter` (`parameter`(64)),
 	 INDEX `priority_created` (`priority`,`created`),
 	 INDEX `done_executed` (`done`,`executed`)
-) DEFAULT COLLATE utf8mb4_general_ci;
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Background tasks queue entries';
 
 
diff --git a/doc/Accesskeys.md b/doc/Accesskeys.md
index 7434fc049..8e889fa99 100644
--- a/doc/Accesskeys.md
+++ b/doc/Accesskeys.md
@@ -79,6 +79,7 @@ General
 ../settings
 ---------
 * o - Account
+* p - Profiles
 * t - Additional features
 * w - Social Networks
 * l - Addons
diff --git a/doc/Addons.md b/doc/Addons.md
index f7d93aac7..2465db730 100644
--- a/doc/Addons.md
+++ b/doc/Addons.md
@@ -25,22 +25,23 @@ Addons should contain a comment block with the four following parameters:
      * Author: John Q. Public <john@myfriendicasite.com>
      */
 
+Please also add a README or README.md file to the addon directory.
+It will be displayed in the admin panel and should include some further information in addition to the header information.
+
+## PHP addon hooks
+
 Register your addon hooks during installation.
 
     Addon::registerHook($hookname, $file, $function);
 
-$hookname is a string and corresponds to a known Friendica hook.
+$hookname is a string and corresponds to a known Friendica PHP hook.
 
 $file is a pathname relative to the top-level Friendica directory.
-This *should* be 'addon/addon_name/addon_name.php' in most cases.
+This *should* be 'addon/*addon_name*/*addon_name*.php' in most cases.
 
 $function is a string and is the name of the function which will be executed when the hook is called.
 
-Please also add a README or README.md file to the addon directory.
-It will be displayed in the admin panel and should include some further information in addition to the header information.
-
-Arguments
----
+### Arguments
 Your hook callback functions will be called with at least one and possibly two arguments
 
     function myhook_function(App $a, &$b) {
@@ -48,10 +49,10 @@ Your hook callback functions will be called with at least one and possibly two a
     }
 
 
-If you wish to make changes to the calling data, you must declare them as reference variables (with '&') during function declaration.
+If you wish to make changes to the calling data, you must declare them as reference variables (with `&`) during function declaration.
 
 #### $a
-$a is the Friendica 'App' class.
+$a is the Friendica `App` class.
 It contains a wealth of information about the current state of Friendica:
 
 * which module has been called,
@@ -59,15 +60,64 @@ It contains a wealth of information about the current state of Friendica:
 * the page contents at the point the hook was invoked,
 * profile and user information, etc.
 
-It is recommeded you call this '$a' to match its usage elsewhere.
+It is recommeded you call this `$a` to match its usage elsewhere.
 
 #### $b
 $b can be called anything you like.
 This is information specific to the hook currently being processed, and generally contains information that is being immediately processed or acted on that you can use, display, or alter.
-Remember to declare it with '&' if you wish to alter it.
+Remember to declare it with `&` if you wish to alter it.
 
-Modules
----
+## JavaScript addon hooks
+
+### PHP part
+
+Make sure your JavaScript addon file (addon/*addon_name*/*addon_name*.js) is listed in the document response.
+
+In your addon install function, add:
+
+```php
+Addon::registerHook('template_vars', __FILE__, '<addon_name>_template_vars');
+```
+
+In your addon uninstall function, add:
+
+```php
+Addon::unregisterHook('template_vars', __FILE__, '<addon_name>_template_vars');
+```
+
+Then, add your addon name to the *addon_hooks* template variable array:
+
+```php
+function <addon_name>_template_vars($a, &$arr)
+{
+	if (!array_key_exists('addon_hooks', $arr['vars']))
+	{
+		$arr['vars']['addon_hooks'] = array();
+	}
+	$arr['vars']['addon_hooks'][] = "<addon_name>";
+}
+```
+
+### JavaScript part
+
+Register your addon hooks in file `addon/*addon_name*/*addon_name*.js`.
+
+```js
+Addon_registerHook(type, hookfnstr);
+```
+
+*type* is the name of the hook and corresponds to a known Friendica JavaScript hook.
+*hookfnstr* is the name of your JavaScript function to execute.
+
+No arguments are provided to your JavaScript callback function. Example:
+
+```javascript
+function myhook_function() {
+
+}
+```
+
+## Modules
 
 Addons may also act as "modules" and intercept all page requests for a given URL path.
 In order for a addon to act as a module it needs to define a function "addon_name_module()" which takes no arguments and needs not do anything.
@@ -77,15 +127,16 @@ These are parsed into an array $a->argv, with a corresponding $a->argc indicatin
 So http://my.web.site/addon/arg1/arg2 would look for a module named "addon" and pass its module functions the $a App structure (which is available to many components).
 This will include:
 
-    $a->argc = 3
-    $a->argv = array(0 => 'addon', 1 => 'arg1', 2 => 'arg2');
+```php
+$a->argc = 3
+$a->argv = array(0 => 'addon', 1 => 'arg1', 2 => 'arg2');
+```
 
 Your module functions will often contain the function addon_name_content(App $a), which defines and returns the page body content.
 They may also contain addon_name_post(App $a) which is called before the _content function and typically handles the results of POST forms.
 You may also have addon_name_init(App $a) which is called very early on and often does module initialisation.
 
-Templates
----
+## Templates
 
 If your addon needs some template, you can use the Friendica template system.
 Friendica uses [smarty3](http://www.smarty.net/) as a template engine.
@@ -94,230 +145,256 @@ Put your tpl files in the *templates/* subfolder of your addon.
 
 In your code, like in the function addon_name_content(), load the template file and execute it passing needed values:
 
-    # load template file. first argument is the template name,
-    # second is the addon path relative to friendica top folder
-    $tpl = get_markup_template('mytemplate.tpl', 'addon/addon_name/');
+```php
+# load template file. first argument is the template name,
+# second is the addon path relative to friendica top folder
+$tpl = get_markup_template('mytemplate.tpl', 'addon/addon_name/');
 
-    # apply template. first argument is the loaded template,
-    # second an array of 'name'=>'values' to pass to template
-    $output = replace_macros($tpl,array(
-        'title' => 'My beautiful addon',
-    ));
+# apply template. first argument is the loaded template,
+# second an array of 'name' => 'values' to pass to template
+$output = replace_macros($tpl, array(
+	'title' => 'My beautiful addon',
+));
+```
 
 See also the wiki page [Quick Template Guide](https://github.com/friendica/friendica/wiki/Quick-Template-Guide).
 
-Current hooks
--------------
+## Current PHP hooks
 
-### 'authenticate'
-'authenticate' is called when a user attempts to login.
-$b is an array containing:
+### authenticate
+Called when a user attempts to login.
+`$b` is an array containing:
 
-    'username' => the supplied username
-    'password' => the supplied password
-    'authenticated' => set this to non-zero to authenticate the user.
-    'user_record' => successful authentication must also return a valid user record from the database
+- **username**: the supplied username
+- **password**: the supplied password
+- **authenticated**: set this to non-zero to authenticate the user.
+- **user_record**: successful authentication must also return a valid user record from the database
 
-### 'logged_in'
-'logged_in' is called after a user has successfully logged in.
-$b contains the $a->user array.
+### logged_in
+Called after a user has successfully logged in.
+`$b` contains the `$a->user` array.
 
-### 'display_item'
-'display_item' is called when formatting a post for display.
+### display_item
+Called when formatting a post for display.
 $b is an array:
 
-    'item' => The item (array) details pulled from the database
-    'output' => the (string) HTML representation of this item prior to adding it to the page
+- **item**: The item (array) details pulled from the database
+- **output**: the (string) HTML representation of this item prior to adding it to the page
 
-### 'post_local'
-* called when a status post or comment is entered on the local system
-* $b is the item array of the information to be stored in the database
-* Please note: body contents are bbcode - not HTML
+### post_local
+Called when a status post or comment is entered on the local system.
+`$b` is the item array of the information to be stored in the database.
+Please note: body contents are bbcode - not HTML.
 
-### 'post_local_end'
-* called when a local status post or comment has been stored on the local system
-* $b is the item array of the information which has just been stored in the database
-* Please note: body contents are bbcode - not HTML
+### post_local_end
+Called when a local status post or comment has been stored on the local system.
+`$b` is the item array of the information which has just been stored in the database.
+Please note: body contents are bbcode - not HTML
 
-### 'post_remote'
-* called when receiving a post from another source. This may also be used to post local activity or system generated messages.
-* $b is the item array of information to be stored in the database and the item body is bbcode.
+### post_remote
+Called when receiving a post from another source. This may also be used to post local activity or system generated messages.
+`$b` is the item array of information to be stored in the database and the item body is bbcode.
 
-### 'settings_form'
-* called when generating the HTML for the user Settings page
-* $b is the (string) HTML of the settings page before the final '</form>' tag.
+### settings_form
+Called when generating the HTML for the user Settings page.
+`$b` is the HTML string of the settings page before the final `</form>` tag.
 
-### 'settings_post'
-* called when the Settings pages are submitted
-* $b is the $_POST array
+### settings_post
+Called when the Settings pages are submitted.
+`$b` is the $_POST array.
 
-### 'addon_settings'
-* called when generating the HTML for the addon settings page
-* $b is the (string) HTML of the addon settings page before the final '</form>' tag.
+### addon_settings
+Called when generating the HTML for the addon settings page.
+`$b` is the (string) HTML of the addon settings page before the final `</form>` tag.
 
-### 'addon_settings_post'
-* called when the Addon Settings pages are submitted
-* $b is the $_POST array
+### addon_settings_post
+Called when the Addon Settings pages are submitted.
+`$b` is the $_POST array.
 
-### 'profile_post'
-* called when posting a profile page
-* $b is the $_POST array
+### profile_post
+Called when posting a profile page.
+`$b` is the $_POST array.
 
-### 'profile_edit'
-'profile_edit' is called prior to output of profile edit page.
-$b is an array containing:
+### profile_edit
+Called prior to output of profile edit page.
+`$b` is an array containing:
 
-    'profile' => profile (array) record from the database
-    'entry' => the (string) HTML of the generated entry
+- **profile**: profile (array) record from the database
+- **entry**: the (string) HTML of the generated entry
 
-### 'profile_advanced'
-* called when the HTML is generated for the 'Advanced profile', corresponding to the 'Profile' tab within a person's profile page
-* $b is the (string) HTML representation of the generated profile
-* The profile array details are in $a->profile.
+### profile_advanced
+Called when the HTML is generated for the Advanced profile, corresponding to the Profile tab within a person's profile page.
+`$b` is the HTML string representation of the generated profile.
+The profile array details are in `$a->profile`.
 
-### 'directory_item'
-'directory_item' is called from the Directory page when formatting an item for display.
+### directory_item
+Called from the Directory page when formatting an item for display.
+`$b` is an array:
+
+- **contact**: contact record array for the person from the database
+- **entry**: the HTML string of the generated entry
+
+### profile_sidebar_enter
+Called prior to generating the sidebar "short" profile for a page.
+`$b` is the person's profile array
+
+### profile_sidebar
+Called when generating the sidebar "short" profile for a page.
+`$b` is an array:
+
+- **profile**: profile record array for the person from the database
+- **entry**: the HTML string of the generated entry
+
+### contact_block_end
+Called when formatting the block of contacts/friends on a profile sidebar has completed.
+`$b` is an array:
+
+- **contacts**: array of contacts
+- **output**: the generated HTML string of the contact block
+
+### bbcode
+Called after conversion of bbcode to HTML.
+`$b` is an HTML string converted text.
+
+### html2bbcode
+Called after tag conversion of HTML to bbcode (e.g. remote message posting)
+`$b` is a string converted text
+
+### page_header
+Called after building the page navigation section.
+`$b` is a string HTML of nav region.
+
+### personal_xrd
+Called prior to output of personal XRD file.
+`$b` is an array:
+
+- **user**: the user record array for the person
+- **xml**: the complete XML string to be output
+
+### home_content
+Called prior to output home page content, shown to unlogged users.
+`$b` is the HTML sring of section region.
+
+### contact_edit
+Called when editing contact details on an individual from the Contacts page.
 $b is an array:
 
-    'contact' => contact (array) record for the person from the database
-    'entry' => the (string) HTML of the generated entry
+- **contact**: contact record (array) of target contact
+- **output**: the (string) generated HTML of the contact edit page
 
-### 'profile_sidebar_enter'
-* called prior to generating the sidebar "short" profile for a page
-* $b is the person's profile array
+### contact_edit_post
+Called when posting the contact edit page.
+`$b` is the `$_POST` array
 
-### 'profile_sidebar'
-'profile_sidebar is called when generating the sidebar "short" profile for a page.
-$b is an array:
+### init_1
+Called just after DB has been opened and before session start.
+No hook data.
 
-    'profile' => profile (array) record for the person from the database
-    'entry' => the (string) HTML of the generated entry
+### page_end
+Called after HTML content functions have completed.
+`$b` is (string) HTML of content div.
 
-### 'contact_block_end'
-is called when formatting the block of contacts/friends on a profile sidebar has completed.
-$b is an array:
+### avatar_lookup
+Called when looking up the avatar. `$b` is an array:
 
-    'contacts' => array of contacts
-    'output' => the (string) generated HTML of the contact block
+- **size**: the size of the avatar that will be looked up
+- **email**: email to look up the avatar for
+- **url**: the (string) generated URL of the avatar
 
-### 'bbcode'
-* called during conversion of bbcode to html
-* $b is a string converted text
+### emailer_send_prepare
+Called from `Emailer::send()` before building the mime message.
+`$b` is an array of params to `Emailer::send()`.
 
-### 'html2bbcode'
-* called during conversion of html to bbcode (e.g. remote message posting)
-* $b is a string converted text
+- **fromName**: name of the sender
+- **fromEmail**: email fo the sender
+- **replyTo**: replyTo address to direct responses
+- **toEmail**: destination email address
+- **messageSubject**: subject of the message
+- **htmlVersion**: html version of the message
+- **textVersion**: text only version of the message
+- **additionalMailHeader**: additions to the smtp mail header
 
-### 'page_header'
-* called after building the page navigation section
-* $b is a string HTML of nav region
+### emailer_send
+Called before calling PHP's `mail()`.
+`$b` is an array of params to `mail()`.
 
-### 'personal_xrd'
-'personal_xrd' is called prior to output of personal XRD file.
-$b is an array:
+- **to**
+- **subject**
+- **body**
+- **headers**
 
-    'user' => the user record for the person
-    'xml' => the complete XML to be output
+### load_config
+Called during `App` initialization to allow addons to load their own configuration file(s) with `App::loadConfigFile()`.
 
-### 'home_content'
-* called prior to output home page content, shown to unlogged users
-* $b is (string) HTML of section region
+### nav_info
+Called after the navigational menu is build in `include/nav.php`.
+`$b` is an array containing `$nav` from `include/nav.php`.
 
-### 'contact_edit'
-is called when editing contact details on an individual from the Contacts page.
-$b is an array:
-
-    'contact' => contact record (array) of target contact
-    'output' => the (string) generated HTML of the contact edit page
-
-### 'contact_edit_post'
-* called when posting the contact edit page.
-* $b is the $_POST array
-
-### 'init_1'
-* called just after DB has been opened and before session start
-* $b is not used or passed
-
-### 'page_end'
-* called after HTML content functions have completed
-* $b is (string) HTML of content div
-
-### 'avatar_lookup'
-'avatar_lookup' is called when looking up the avatar.
-$b is an array:
-
-    'size' => the size of the avatar that will be looked up
-    'email' => email to look up the avatar for
-    'url' => the (string) generated URL of the avatar
-
-### 'emailer_send_prepare'
-'emailer_send_prepare' called from Emailer::send() before building the mime message.
-$b is an array, params to Emailer::send()
-
-    'fromName' => name of the sender
-    'fromEmail' => email fo the sender
-    'replyTo' => replyTo address to direct responses
-    'toEmail' => destination email address
-    'messageSubject' => subject of the message
-    'htmlVersion' => html version of the message
-    'textVersion' => text only version of the message
-    'additionalMailHeader' => additions to the smtp mail header
-
-### 'emailer_send'
-is called before calling PHP's mail().
-$b is an array, params to mail()
-
-    'to'
-    'subject'
-    'body'
-    'headers'
-
-### 'nav_info'
-is called after the navigational menu is build in include/nav.php.
-$b is an array containing $nav from nav.php.
-
-### 'template_vars'
-is called before vars are passed to the template engine to render the page.
+### template_vars
+Called before vars are passed to the template engine to render the page.
 The registered function can add,change or remove variables passed to template.
-$b is an array with:
+`$b` is an array with:
 
-    'template' => filename of template
-    'vars' => array of vars passed to template
+- **template**: filename of template
+- **vars**: array of vars passed to the template
 
-### 'acl_lookup_end'
-is called after the other queries have passed.
-The registered function can add, change or remove the acl_lookup() variables.
+### acl_lookup_end
+Called after the other queries have passed.
+The registered function can add, change or remove the `acl_lookup()` variables.
 
-    'results' => array of the acl_lookup() vars
+- **results**: array of the acl_lookup() vars
 
-### 'prepare_body_init'
+### prepare_body_init
 Called at the start of prepare_body
 Hook data:
-    'item' => item array (input/output)
 
-### 'prepare_body_content_filter'
+- **item** (input/output): item array
+
+### prepare_body_content_filter
 Called before the HTML conversion in prepare_body. If the item matches a content filter rule set by an addon, it should
 just add the reason to the filter_reasons element of the hook data.
 Hook data:
-    'item' => item array (input)
-    'filter_reasons' => reasons array (input/output)
 
-### 'prepare_body'
-Called after the HTML conversion in prepare_body.
+- **item**: item array (input)
+- **filter_reasons** (input/output): reasons array
+
+### prepare_body
+Called after the HTML conversion in `prepare_body()`.
 Hook data:
-    'item' => item array (input)
-    'html' => converted item body (input/output)
-    'is_preview' => post preview flag (input)
-    'filter_reasons' => reasons array (input)
 
-### 'prepare_body_final'
-Called at the end of prepare_body.
+- **item** (input): item array
+- **html** (input/output): converted item body
+- **is_preview** (input): post preview flag
+- **filter_reasons** (input): reasons array
+
+### prepare_body_final
+Called at the end of `prepare_body()`.
 Hook data:
-    'item' => item array (input)
-    'html' => converted item body (input/output)
 
-Complete list of hook callbacks
----
+- **item**: item array (input)
+- **html**: converted item body (input/output)
+
+### put_item_in_cache
+Called after `prepare_text()` in `put_item_in_cache()`.
+Hook data:
+
+- **item** (input): item array
+- **rendered-html** (input/output): final item body HTML
+- **rendered-hash** (input/output): original item body hash
+
+### magic_auth_success
+Called when a magic-auth was successful.
+Hook data:
+
+    visitor => array with the contact record of the visitor
+    url => the query string
+
+## Current JavaScript hooks
+
+### postprocess_liveupdate
+Called at the end of the live update process (XmlHttpRequest)
+
+## Complete list of hook callbacks
 
 Here is a complete list of all hook callbacks with file locations (as of 01-Apr-2018). Please see the source for details of any hooks not documented above.
 
@@ -333,7 +410,7 @@ Here is a complete list of all hook callbacks with file locations (as of 01-Apr-
     Addon::callHooks($a->module.'_mod_content', $arr);
     Addon::callHooks($a->module.'_mod_aftercontent', $arr);
     Addon::callHooks('page_end', $a->page['content']);
-    
+
 ### include/api.php
 
     Addon::callHooks('logged_in', $a->user);
@@ -341,12 +418,12 @@ Here is a complete list of all hook callbacks with file locations (as of 01-Apr-
     Addon::callHooks('logged_in', $a->user);
 
 ### include/enotify.php
-    
+
     Addon::callHooks('enotify', $h);
     Addon::callHooks('enotify_store', $datarray);
     Addon::callHooks('enotify_mail', $datarray);
     Addon::callHooks('check_item_notification', $notification_data);
-    
+
 ### include/conversation.php
 
     Addon::callHooks('conversation_start', $cb);
@@ -364,6 +441,7 @@ Here is a complete list of all hook callbacks with file locations (as of 01-Apr-
 
     Addon::callHooks('contact_block_end', $arr);
     Addon::callHooks('poke_verbs', $arr);
+    Addon::callHooks('put_item_in_cache', $hook_data);
     Addon::callHooks('prepare_body_init', $item);
     Addon::callHooks('prepare_body_content_filter', $hook_data);
     Addon::callHooks('prepare_body', $hook_data);
@@ -405,7 +483,7 @@ Here is a complete list of all hook callbacks with file locations (as of 01-Apr-
 ### mod/friendica.php
 
     Addon::callHooks('about_hook', $o);
-    
+
 ### mod/subthread.php
 
     Addon::callHooks('post_local_end', $arr);
@@ -478,7 +556,7 @@ Here is a complete list of all hook callbacks with file locations (as of 01-Apr-
     Addon::callHooks('post_local', $datarray);
     Addon::callHooks('post_local_end', $datarray);
 
-### mod/editpost.php    
+### mod/editpost.php
 
     Addon::callHooks('jot_tool', $jotplugins);
 
@@ -490,6 +568,10 @@ Here is a complete list of all hook callbacks with file locations (as of 01-Apr-
 
     Addon::callHooks("template_vars", $arr);
 
+### src/App.php
+
+    Addon::callHooks('load_config');
+
 ### src/Model/Item.php
 
     Addon::callHooks('post_local', $item);
@@ -510,6 +592,7 @@ Here is a complete list of all hook callbacks with file locations (as of 01-Apr-
     Addon::callHooks('profile_sidebar', $arr);
     Addon::callHooks('profile_tabs', $arr);
     Addon::callHooks('zrl_init', $arr);
+    Addon::callHooks('magic_auth_success', $arr);
 
 ### src/Model/Event.php
 
@@ -546,11 +629,11 @@ Here is a complete list of all hook callbacks with file locations (as of 01-Apr-
     Addon::callHooks('sexpref_selector', $select);
     Addon::callHooks('marital_selector', $select);
 
-### src/Content/OEmbed.php    
+### src/Content/OEmbed.php
 
     Addon::callHooks('oembed_fetch_url', $embedurl, $j);
 
-### src/Content/Nav.php    
+### src/Content/Nav.php
 
     Addon::callHooks('page_header', $a->page['nav']);
     Addon::callHooks('nav_info', $nav);
@@ -563,7 +646,7 @@ Here is a complete list of all hook callbacks with file locations (as of 01-Apr-
 
     Addon::callHooks('notifier_end', $target_item);
 
-### src/Worker/Queue.php    
+### src/Worker/Queue.php
 
     Addon::callHooks('queue_predeliver', $r);
     Addon::callHooks('queue_deliver', $params);
@@ -573,7 +656,7 @@ Here is a complete list of all hook callbacks with file locations (as of 01-Apr-
     Addon::callHooks('authenticate', $addon_auth);
     Addon::callHooks('login_hook', $o);
 
-### src/Module/Logout.php    
+### src/Module/Logout.php
 
     Addon::callHooks("logging_out");
 
@@ -618,3 +701,7 @@ Here is a complete list of all hook callbacks with file locations (as of 01-Apr-
 
     Addon::callHooks('atom_feed_end', $atom);
     Addon::callHooks('atom_feed_end', $atom);
+
+### view/js/main.js
+
+    callAddonHooks("postprocess_liveupdate");
diff --git a/doc/Config.md b/doc/Config.md
new file mode 100644
index 000000000..788c1cd0b
--- /dev/null
+++ b/doc/Config.md
@@ -0,0 +1,231 @@
+Config values that can only be set in config/local.ini.php
+==========================================================
+
+* [Home](help)
+
+Friendica's configuration is done in two places: in INI configuration files and in the `config` database table.
+Database config values overwrite the same file config values.
+
+## File configuration
+
+WARNING: some characters `?{}|&~![()^"` should not be used in the keys or values. If one of those character is required put the value between double quotes (eg. password = "let&me&in")
+The configuration format for file configuration is an INI string returned from a PHP file.
+This prevents your webserver from displaying your private configuration it interprets the configuration files and displays nothing.
+
+A typical configuration file looks like this:
+
+```php
+<?php return <<<INI
+
+; Comment line
+
+[section1]
+key = value
+empty_key =
+
+[section2]
+array[] = value0
+array[] = value1
+array[] = value2
+
+INI;
+// Keep this line
+```
+
+### Configuration location
+
+The `config` directory holds key configuration files:
+
+- `config.ini.php` holds the default values for all the configuration keys that can only be set in `local.ini.php`.
+- `settings.ini.php` holds the default values for some configuration keys that are set through the admin settings page.
+- `local.ini.php` holds the current node custom configuration.
+- `addon.ini.php` is optional and holds the custom configuration for specific addons.
+
+Addons can define their own default configuration values in `addon/[addon]/config/[addon].ini.php` which is loaded when the addon is activated.
+
+#### Migrating from .htconfig.php to config/local.ini.php
+
+The legacy `.htconfig.php` configuration file is still supported, but is deprecated and will be removed in a subsequent Friendica release.
+
+The migration is pretty straightforward:
+If you had any addon-specific configuration in your `.htconfig.php`, just copy `config/addon-sample.ini.php` to `config/addon.ini.php` and move your configuration values.
+Afterwards, copy `config/local-sample.ini.php` to `config/local.ini.php`, move the remaining configuration values to it according to the following conversion chart, then rename your `.htconfig.php` to check your node is working as expected before deleting it.
+
+<style>
+table.config {
+    margin: 1em 0;
+    background-color: #f9f9f9;
+    border: 1px solid #aaa;
+    border-collapse: collapse;
+    color: #000;
+    width: 100%;
+}
+
+table.config > tr > th,
+table.config > tr > td,
+table.config > * > tr > th,
+table.config > * > tr > td {
+    border: 1px solid #aaa;
+    padding: 0.2em 0.4em
+}
+
+table.config > tr > th,
+table.config > * > tr > th {
+    background-color: #f2f2f2;
+    text-align: center;
+    width: 50%
+}
+</style>
+
+<table class="config">
+	<thead>
+		<tr>
+			<th>.htconfig.php</th>
+			<th>config/local.ini.php</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td><pre>
+$db_host = 'localhost';
+$db_user = 'mysqlusername';
+$db_pass = 'mysqlpassword';
+$db_data = 'mysqldatabasename';
+$a->config["system"]["db_charset"] = 'utf8mb4';
+</pre></td>
+			<td><pre>
+[database]
+hostname = localhost
+username = mysqlusername
+password = mysqlpassword
+database = mysqldatabasename
+charset = utf8mb4
+</pre></td>
+		</tr>
+
+		<tr>
+			<td><pre>
+$a->config["section"]["key"] = "value";
+</pre></td>
+			<td><pre>
+[section]
+key = value
+</pre></td>
+		</tr>
+
+		<tr>
+			<td><pre>
+$a->config["section"]["key"] = array(
+	"value1",
+	"value2",
+	"value3"
+);
+</pre></td>
+			<td><pre>
+[section]
+key[] = value1
+key[] = value2
+key[] = value3
+</pre></td>
+		</tr>
+
+		<tr>
+			<td><pre>
+$a->config["key"] = "value";
+</pre></td>
+			<td><pre>
+[config]
+key = value
+</pre></td>
+		</tr>
+
+		<tr>
+			<td><pre>
+$a->path = "value";
+</pre></td>
+			<td><pre>
+[system]
+urlpath = value
+</pre></td>
+		</tr>
+
+		<tr>
+			<td><pre>
+$default_timezone = "value";
+</pre></td>
+			<td><pre>
+[system]
+default_timezone = value
+</pre></td>
+		</tr>
+
+		<tr>
+			<td><pre>
+$pidfile = "value";
+</pre></td>
+			<td><pre>
+[system]
+pidfile = value
+</pre></td>
+		</tr>
+
+		<tr>
+			<td><pre>
+$lang = "value";
+</pre></td>
+			<td><pre>
+[system]
+language = value
+</pre></td>
+		</tr>
+
+	</tbody>
+</table>
+
+
+### Database Settings
+
+The configuration variables database.hostname, database.username, database.password, database.database and database.charset are holding your credentials for the database connection.
+If you need to specify a port to access the database, you can do so by appending ":portnumber" to the database.hostname variable.
+
+    [database]
+    hostname = your.mysqlhost.com:123456
+
+If all of the following environment variables are set, Friendica will use them instead of the previously configured variables for the db:
+
+    MYSQL_HOST
+    MYSQL_PORT
+    MYSQL_USERNAME
+    MYSQL_PASSWORD
+    MYSQL_DATABASE
+
+## Config values that can only be set in config/local.ini.php
+
+There are some config values that haven't found their way into the administration page.
+This has several reasons.
+Maybe they are part of a current development that isn't considered stable and will be added later in the administration page when it is considered safe.
+Or it triggers something that isn't expected to be of public interest.
+Or it is for testing purposes only.
+
+**Attention:** Please be warned that you shouldn't use one of these values without the knowledge what it could trigger.
+Especially don't do that with undocumented values.
+
+These configurations keys and their default value are listed in `config/config.ini.php` and should be ovewritten in `config/local.ini.php`.
+
+## Administrator Options
+
+Enabling the admin panel for an account, and thus making the account holder admin of the node, is done by setting the variable
+
+    [config]
+    admin_email = someone@example.com
+
+Where you have to match the email address used for the account with the one you enter to the config/local.ini.php file.
+If more then one account should be able to access the admin panel, separate the email addresses with a comma.
+
+    [config]
+    admin_email = someone@example.com,someoneelse@example.com
+
+If you want to have a more personalized closing line for the notification emails you can set a variable for the admin_name.
+
+    [config]
+    admin_name = Marvin
diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md
index 1e077902d..5deaf98ff 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.
diff --git a/doc/FAQ.md b/doc/FAQ.md
index 31d980a9a..1b84b5cd8 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -197,14 +197,14 @@ If you are searching for new themes, you can find them at [Friendica-Themes.com]
 <a name="adminaccount1"></a>
 ### I've changed my email address now the admin panel is gone?
 
-Have a look into your <tt>.htconfig.php</tt> and fix your email address there.
+Have a look into your <tt>config/local.ini.php</tt> and fix your email address there.
 
 <a name="adminaccount2"></a>
 ### Can there be more then one admin for a node?
 
 Yes.
 You just have to list more then one email address in the
-<tt>.htconfig.php</tt> file.
+<tt>config/local.ini.php</tt> file.
 The listed emails need to be separated by a comma.
 
 <a name="dbupdate">
diff --git a/doc/Home.md b/doc/Home.md
index 1d72a2600..a353bab0d 100644
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -32,7 +32,7 @@ Friendica Documentation and Resources
 * [Installing Connectors (Twitter/GNU Social)](help/Installing-Connectors)
 * [Install an ejabberd server (XMPP chat) with synchronized credentials](help/install-ejabberd)
 * [Using SSL with Friendica](help/SSL)
-* [Config values that can only be set in .htconfig.php](help/htconfig)
+* [Config values that can only be set in config/local.ini.php](help/Config)
 * [Improve Performance](help/Improve-Performance)
 * [Administration Tools](help/tools)
 
@@ -51,6 +51,7 @@ Friendica Documentation and Resources
 	* [Translate Friendica](help/translations)
 	* [Use Composer](help/Composer)
 	* [Move classes to `src`](help/Developer-How-To-Move-Classes-to-src)
+	* [Run tests](help/Tests)
 * Reference
 	* [Twitter/GNU Social API Functions](help/api)
 	* [Code (Doxygen generated - sets cookies)](doc/html/)
@@ -72,4 +73,3 @@ Friendica Documentation and Resources
 
 * [Site/Version Info](friendica)
 * [Friendica Credits](credits)
-
diff --git a/doc/Install.md b/doc/Install.md
index 2a80cf72a..3854c32bc 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -27,7 +27,7 @@ Requirements
 ---
 
 * Apache with mod-rewrite enabled and "Options All" so you can use a local .htaccess file
-* PHP 5.6+ (PHP 7 is recommended for performance)
+* PHP 5.6.1+ (PHP 7 is recommended for performance)
   * PHP *command line* access with register_argc_argv set to true in the php.ini file
   * Curl, GD, PDO, MySQLi, hash, xml, zip and OpenSSL extensions
   * The POSIX module of PHP needs to be activated (e.g. [RHEL, CentOS](http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7) have disabled it)
@@ -47,14 +47,15 @@ If you are able to do so, we recommend using git to clone the source repository
 This makes the software much easier to update.
 The Linux commands to clone the repository into a directory "mywebsite" would be
 
-    git clone https://github.com/friendica/friendica.git mywebsite
+    git clone https://github.com/friendica/friendica.git -b master mywebsite
     cd mywebsite
     bin/composer.phar install
 
-Make sure the folder *view/smarty3* exists and is writable by the webserver user
+Make sure the folder *view/smarty3* exists and is writable by the webserver user, in this case `www-data`
 
     mkdir view/smarty3
-    chmod 777 view/smarty3
+    chown www-data:www-data view/smarty3
+    chmod 775 view/smarty3
 
 Get the addons by going into your website folder.
 
@@ -62,10 +63,20 @@ Get the addons by going into your website folder.
 
 Clone the addon repository (separately):
 
-    git clone https://github.com/friendica/friendica-addons.git addon
+    git clone https://github.com/friendica/friendica-addons.git -b master addon
 
 If you copy the directory tree to your webserver, make sure that you also copy .htaccess - as "dot" files are often hidden and aren't normally copied.
 
+If you want to use the development version of Friendica you can switch to the devel branch in the repository by running
+
+    git checkout develop
+    bin/composer.phar install
+    cd addon
+    git checkout develop
+
+please be aware that the develop branch may break your Friendica node at any time.
+If you encounter a bug, please let us know.
+
 ### Create a database
 
 Create an empty database and note the access details (hostname, username, password, database name).
@@ -89,40 +100,124 @@ If you need to specify a port for the connection to the database, you can do so
 
 *If* the manual installation fails for any reason, check the following:
 
-* Does ".htconfig.php" exist? If not, edit htconfig.php and change the system settings. Rename to .htconfig.php
-* Is the database is populated? If not, import the contents of "database.sql" with phpmyadmin or the mysql command line.
+* Does "config/local.ini.php" exist? If not, edit config/local-sample.ini.php and change the system settings.
+* Rename to `config/local.ini.php`.
+* Is the database is populated? If not, import the contents of `database.sql` with phpmyadmin or the mysql command line.
 
 At this point visit your website again, and register your personal account.
 Registration errors should all be recoverable automatically.
 If you get any *critical* failure at this point, it generally indicates the database was not installed correctly.
-You might wish to move/rename .htconfig.php to another name and empty (called 'dropping') the database tables, so that you can start fresh.
+You might wish to move/rename `config/local.ini.php` to another name and empty (called 'dropping') the database tables, so that you can start fresh.
 
 ### Option B: Run the automatic install script
 
-Open the file htconfig.php in the main Friendica directory with a text editor.
-Remove the `die('...');` line and edit the lines to suit your installation (MySQL, language, theme etc.).
-Then save the file (do not rename it). 
+You have the following options to automatically install Friendica:
+-	creating a prepared config file (f.e. `prepared.ini.php`)
+-	using environment variables (f.e. `MYSQL_HOST`)
+-	using options (f.e. `--dbhost <host>`)
 
-Navigate to the main Friendica directory and execute the following command:
-
-    bin/console autoinstall
-
-Or if you wish to include all optional checks, execute this statement instead:
-
-    bin/console autoinstall -a
-
-At this point visit your website again, and register your personal account.
-
-*If* the automatic installation fails for any reason, check the following:
-
-* Does ".htconfig.php" already exist? If yes, the automatic installation won't start
-* Are the settings inside "htconfig.php" correct? If not, edit the file again.
-* Is the empty MySQL-database created? If not, create it.
+You can combine environment variables and options, but be aware that options are prioritized over environment variables. 
 
 For more information during the installation, you can use this command line option
 
     bin/console autoinstall -v
 
+If you wish to include all optional checks, use `-a` like this statement:
+
+    bin/console autoinstall -a
+    
+*If* the automatic installation fails for any reason, check the following:
+
+*	Does `config/local.ini.php` already exist? If yes, the automatic installation won't start
+*	Are the options in the `config/local.ini.php` correct? If not, edit them directly.
+*	Is the empty MySQL-database created? If not, create it.
+
+#### B.1: Config file
+
+You can use a prepared config file like [local-sample.ini.php](config/local-sample.ini.php).
+
+Navigate to the main Friendica directory and execute the following command:
+
+    bin/console autoinstall -f <prepared.ini.php>
+    
+#### B.2: Environment variables
+
+There are two types of environment variables.
+-	those you can use in normal mode too (Currently just **database credentials**)
+-	those you can only use during installation (because Friendica will normally ignore it)
+
+You can use the options during installation too and skip some of the environment variables.
+
+**Database credentials**
+
+if you don't use the option `--savedb` during installation, the DB credentials will **not** be saved in the `config/local.ini.php`.
+
+-	`MYSQL_HOST` The host of the mysql/mariadb database
+-	`MYSQL_PORT` The port of the mysql/mariadb database
+-	`MYSQL_USERNAME` The username of the mysql database login (used for mysql)
+-	`MYSQL_USER` The username of the mysql database login (used for mariadb)
+-	`MYSQL_PASSWORD` The password of the mysql/mariadb database login
+-	`MYSQL_DATABASE` The name of the mysql/mariadb database
+
+**Friendica settings**
+
+This variables wont be used at normal Friendica runtime.
+Instead, they get saved into `config/local.ini.php`. 
+
+-	`FRIENDICA_PHP_PATH` The path of the PHP binary
+-	`FRIENDICA_ADMIN_MAIL` The admin email address of Friendica (this email will be used for admin access)
+-	`FRIENDICA_TZ` The timezone of Friendica
+-	`FRIENDICA_LANG` The langauge of Friendica
+
+Navigate to the main Friendica directory and execute the following command:
+
+    bin/console autoinstall [--savedb]
+
+#### B.3: Execution options
+
+All options will be saved in the `config/local.ini.php` and are overruling the associated environment variables.
+
+-	`-H|--dbhost <host>` The host of the mysql/mariadb database (env `MYSQL_HOST`)
+-	`-p|--dbport <port>` The port of the mysql/mariadb database (env `MYSQL_PORT`)
+-	`-U|--dbuser <username>` The username of the mysql/mariadb database login (env `MYSQL_USER` or `MYSQL_USERNAME`)
+-	`-P|--dbpass <password>` The password of the mysql/mariadb database login (env `MYSQL_PASSWORD`)
+-	`-d|--dbdata <database>` The name of the mysql/mariadb database (env `MYSQL_DATABASE`)
+-	`-b|--phppath <path>` The path of the PHP binary (env `FRIENDICA_PHP_PATH`)
+-	`-A|--admin <mail>` The admin email address of Friendica (env `FRIENDICA_ADMIN_MAIL`)
+-	`-T|--tz <timezone>` The timezone of Friendica (env `FRIENDICA_TZ`)
+-	`-L|--land <language>` The language of Friendica (env `FRIENDICA_LANG`)
+
+Navigate to the main Friendica directory and execute the following command:
+
+    bin/console autoinstall [options]
+
+### Prepare .htaccess file
+
+Copy .htaccess-dist to .htaccess (be careful under Windows) to have working mod-rewrite again. If you have installed Friendica into a sub directory, like /friendica/ set this path in RewriteBase accordingly.
+
+Example:
+
+    cp .htacces-dist .htaccess
+
+*Note*: Do **not** rename the .htaccess-dist file as it is tracked by GIT and renaming will cause a dirty working directory.
+
+### Verify the "host-meta" page is working
+
+Friendica should respond automatically to important addresses under the /.well-known/ rewrite path.
+One critical URL would look like, for example, https://example.com/.well-known/host-meta
+It must be visible to the public and must respond with an XML file that is automatically customized to your site.
+
+If that URL is not working, it is possible that some other software is using the /.well-known/ path.
+Other symptoms may include an error message in the Admin settings that says "host-meta is not reachable on your system.
+This is a severe configuration issue that prevents server to server communication."
+Another common error related to host-meta is the "Invalid profile URL."
+
+Check for a .well-known directory that did not come with Friendica.
+The preferred configuration is to remove the directory, however this is not always possible.
+If there is any /.well-known/.htaccess file, it could interfere with this Friendica core requirement.
+You should remove any RewriteRules from that file, or remove that whole file if appropriate.
+It may be necessary to chmod the /.well-known/.htaccess file if you were not given write permissions by default.
+
 ### Set up the worker
 
 Set up a cron job or scheduled task to run the worker once every 5-10 minutes in order to perform background processing.
@@ -151,5 +246,5 @@ Bad things will happen.
 Let there be a hardware failure, a corrupted database or whatever you can think of.
 So once the installation of your Friendica node is done, you should make yourself a backup plan.
 
-The most important file is the `.htconfig.php` file in the base directory.
+The most important file is the `config/local.ini.php` file.
 As it stores all your data, you should also have a recent dump of your Friendica database at hand, should you have to recover your node.
diff --git a/doc/Installing-Connectors.md b/doc/Installing-Connectors.md
index 5ea34d473..f1eba5a6a 100644
--- a/doc/Installing-Connectors.md
+++ b/doc/Installing-Connectors.md
@@ -4,7 +4,7 @@ Installing Connectors (Twitter/GNU Social)
 * [Home](help)
 
 
-Friendica uses addons to provide connectivity to some networks, such as Twitter or App.net. 
+Friendica uses addons to provide connectivity to some networks, such as Twitter.
 
 There is also a addon to post through to an existing account on a GNU Social service.
 You only need this to post to an already existing GNU Social account, but not to communicate with GNU Social members in general.
@@ -19,7 +19,7 @@ Addons must be installed by the site administrator before they can be used.
 This is accomplished through the site administration panel.
 
 Each of the connectors also requires an "API key" from the service you wish to connect with.
-Some addons allow you to enter this information in the site administration pages, while others may require you to edit your configuration file (.htconfig.php).
+Some addons allow you to enter this information in the site administration pages, while others may require you to edit your configuration file (config/local.ini.php).
 The ways to obtain these keys vary between the services, but they all require an existing account on the target service.
 Once installed, these API keys can usually be shared by all site members.
 
@@ -39,10 +39,11 @@ You can get it from [Twitter](https://twitter.com/apps).
 Register your Friendica site as "Client" application with "Read & Write" access.
 We do not need "Twitter as login".
 When you've registered the app you get a key pair with an OAuth Consumer key and a secret key for your application/site.
-Add this key pair to your global .htconfig.php:
+Add this key pair to your config/local.ini.php:
 
-	$a->config['twitter']['consumerkey'] = 'your consumer_key here';
-	$a->config['twitter']['consumersecret'] = 'your consumer_secret here';
+	[twitter]
+	consumerkey = your consumer_key here
+	consumersecret = your consumer_secret here
 
 After this, your users can configure their Twitter account settings from "Settings -> Connector Settings".
 
@@ -67,8 +68,8 @@ When the addon is activated the user has to acquire the following in order to co
 
 To get the OAuth Consumer key pair the user has to
 
-1 ask her Friendica admin if a pair already exists or 
-2 has to register the Friendica server as a client application on the GNU Social server. 
+1 ask her Friendica admin if a pair already exists or
+2 has to register the Friendica server as a client application on the GNU Social server.
 
 This can be done from the account settings under "Settings -> Connections -> Register an OAuth client application -> Register a new application" on the GNU Social server.
 
@@ -83,6 +84,6 @@ During the registration of the OAuth client remember the following:
 After the required credentials for the application are stored in the configuration you have to actually connect your Friendica account with GNU Social.
 This is done from the Settings -> Connector Settings page.
 Follow the Sign in with GNU Social button, allow access and then copy the security code into the box provided.
-Friendica will then try to acquire the final OAuth credentials from the API. 
+Friendica will then try to acquire the final OAuth credentials from the API.
 
 If successful, the addon settings will allow you to select to post your public messages to your GNU Social account (have a look behind the little lock symbol beneath the status "editor" on your Home or Network pages).
diff --git a/doc/Move-Account.md b/doc/Move-Account.md
index c34a93e94..2193c42c4 100644
--- a/doc/Move-Account.md
+++ b/doc/Move-Account.md
@@ -1,31 +1,31 @@
-How to move your account between servers
-============
-
-* [Home](help)
-
-
-! **This is an experimental feature**
-
-* Go to "Settings" -> "[Export personal data](uexport)"
-* Click on "Export account" to save your account data.
-* **Save the file in a secure place!** It contains your details, your contacts, groups, and personal settings. It also contains your secret keys to authenticate yourself to your contacts.
-* Go to your new server, and open *http://newserver.com/uimport* (there is not a direct link to this page at the moment).
-* Do NOT create a new account prior to importing your old settings - uimport should be used *instead* of register.
-* Load your saved account file and click "Import".
-* After the move, the account on the old server will not work reliably anymore, and should be not used.
-
-
-Friendica contacts
----
-Friendica will recreate your account on the new server, with your contacts and groups.
-A message is sent to Friendica contacts, to inform them about your move:
-If your contacts are runnning on an updated server, your details on their side will be automatically updated.
-
-GNU Social contacts
----
-Contacts on GNU Social will be archived, as we can't inform them about your move.
-You should ask them to remove your contact from their lists and re-add you, and you should do the same with their contact.
-
-Diaspora contacts
----
-Newer Diaspora servers are able to process "account migration" messages.
+How to move your account between servers
+============
+
+* [Home](help)
+
+
+! **This is an experimental feature**
+
+* Go to "Settings" -> "[Export personal data](uexport)"
+* Click on "Export account" to save your account data.
+* **Save the file in a secure place!** It contains your details, your contacts, groups, and personal settings. It also contains your secret keys to authenticate yourself to your contacts.
+* Go to your new server, and open *http://newserver.com/uimport* (there is not a direct link to this page at the moment). Please consider that this is only possible on servers with open registration. On other systems only the administrator can add accounts with an uploaded file.
+* Do NOT create a new account prior to importing your old settings - uimport should be used *instead* of register.
+* Load your saved account file and click "Import".
+* After the move, the account on the old server will not work reliably anymore, and should be not used.
+
+
+Friendica contacts
+---
+Friendica will recreate your account on the new server, with your contacts and groups.
+A message is sent to Friendica contacts, to inform them about your move:
+If your contacts are runnning on an updated server, your details on their side will be automatically updated.
+
+GNU Social contacts
+---
+Contacts on GNU Social will be archived, as we can't inform them about your move.
+You should ask them to remove your contact from their lists and re-add you, and you should do the same with their contact.
+
+Diaspora contacts
+---
+Newer Diaspora servers are able to process "account migration" messages.
diff --git a/doc/Quick-Start-groupsandpages.md b/doc/Quick-Start-groupsandpages.md
index 652407d64..d4680f65f 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>
 
 
diff --git a/doc/Settings.md b/doc/Settings.md
index dbf57395f..dda2a9a58 100644
--- a/doc/Settings.md
+++ b/doc/Settings.md
@@ -69,7 +69,7 @@ You can chose between the following modes:
 ##### Invitation based registry
 
 Additionally to the setting in the admin panel, you can devide if registrations are only possible using an invitation code or not.
-To enable invitation based registration, you have to set the `invitation_only` setting in the [.htconfig.php](/help/htconfig) file.
+To enable invitation based registration, you have to set the `invitation_only` setting in the [config/local.ini.php](/help/Config) file.
 If you want to use this method, the registration policy has to be set to either *open* or *requires approval*.
 
 #### Check Full Names
@@ -162,6 +162,14 @@ It is disabled by default, as it causes additional load on the server and may be
 As admin of the node you can also set this flag directly in the database.
 Before doing so, you should be sure you know what you do and have a backup of the database.
 
+#### Explicit Content
+
+If you are running a node with explicit content, you can announce this with this option.
+When checked an information flag will be set in the published information about your node.
+(Should *Publish Server Information* be enabled.)
+
+Additionally a note will be displayed on the registration page for new users.
+
 ### Advanced
 
 #### Proxy Configuration Settings
@@ -317,7 +325,7 @@ You should set up some kind of [log rotation](https://en.wikipedia.org/wiki/Log_
 **Known Issues**: The filename ``friendica.log`` can cause problems depending on your server configuration (see [issue 2209](https://github.com/friendica/friendica/issues/2209)).
 
 By default PHP warnings and error messages are supressed.
-If you want to enable those, you have to activate them in the ``.htconfig.php`` file.
+If you want to enable those, you have to activate them in the ``config/local.ini.php`` file.
 Use the following settings to redirect PHP errors to a file.
 
 Config:
@@ -365,24 +373,27 @@ By default this will be the one account you create during the installation proce
 But you can expand the list of email addresses by any used email address you want.
 Registration of new accounts with a listed email address is not possible.
 
-    $a->config['admin_email'] = 'you@example.com, buddy@example.com';
+    [config]
+    admin_email = you@example.com, buddy@example.com
 
 ## PHP Path
 
 Some of Friendicas processes are running in the background.
 For this you need to specify the path to the PHP binary to be used.
 
-    $a->config['php_path'] = '{{$phpath}}';
+    [config]
+    php_path = {{$phpath}}
 
 ## Subdirectory configuration
 
 It is possible to install Friendica into a subdirectory of your webserver.
-We strongly discurage you from doing so, as this will break federation to other networks (e.g. Diaspora, GNU Socia, Hubzilla)
+We strongly discourage you from doing so, as this will break federation to other networks (e.g. Diaspora, GNU Socia, Hubzilla)
 Say you have a subdirectory for tests and put Friendica into a further subdirectory, the config would be:
 
-    $a->path = 'tests/friendica';
+    [system]
+    urlpath = tests/friendica
 
 ## Other exceptions
 
-Furthermore there are some experimental settings, you can read-up in the [Config values that can only be set in .htconfig.php](help/htconfig) section of the documentation.
+Furthermore there are some experimental settings, you can read-up in the [Config values that can only be set in config/local.ini.php](help/Config) section of the documentation.
 
diff --git a/doc/Tags-and-Mentions.md b/doc/Tags-and-Mentions.md
index 5b046228f..020214457 100644
--- a/doc/Tags-and-Mentions.md
+++ b/doc/Tags-and-Mentions.md
@@ -18,7 +18,7 @@ You can tag **persons who are in your social circle** by adding the "@"-sign in
 * @mike+151 - this form is used by the drop-down tag completion tool. It indicates the contact whose nickname is mike and whose contact identifier number is 151. The drop-down tool may be used to resolve people with duplicate nicknames. 
 
 You can tag a person on a different network or one that is **not in your social circle** by using the following notation:
-	
+
 * @mike@macgirvin.com - This is called a "remote mention" and can only be an email-style locator, not a web URL.
 
 Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts.
@@ -27,7 +27,7 @@ The exception is an ongoing conversation started from a contact of both you and
 This is a spam prevention measure.
 
 Remote mentions are delivered using the OStatus protocol.
-This protocol is used by Friendica and GNU Social and several other systems like Mastodon, but is not currently implemented in Diaspora. 
+This protocol is used by Friendica and GNU Social and several other systems like Mastodon, but is not currently implemented in Diaspora.
 As the OStatus protocol allows this Friendica user can be @-mentioned by users from platforms using this protocol in conversations if the "Enable OStatus support" is activated on the Friendica node.
 These @-mentions wont be blocked, even if there is no relationship between the sender and the receiver of the message.
 
@@ -52,5 +52,5 @@ The same rules apply as with names that spaces within tags are represented by th
 It is therefore not possible to create a tag whose target contains an underscore.
 
 Topical tags are also not linked if they are purely numeric, e.g. #1.
-If you wish to use a numerica hashtag, please add some descriptive text such as #2012-elections. 
+If you wish to use a numerica hashtag, please add some descriptive text such as #2012-elections.
 
diff --git a/doc/Tests.md b/doc/Tests.md
new file mode 100644
index 000000000..6acb4e783
--- /dev/null
+++ b/doc/Tests.md
@@ -0,0 +1,18 @@
+# Themes
+
+* [Home](help)
+
+You can run unit tests with [PHPUnit](https://phpunit.de/):
+
+```bash
+phpunit
+```
+
+Some tests require access to a MySQL database.
+You can specify the database credentials in environment variables:
+
+```bash
+USER=database_user PASS=database_password DB=database_name phpunit
+```
+
+**Warning**: This will empty all the tables! Never use this on a production database.
diff --git a/doc/Update.md b/doc/Update.md
index 9e9324da9..835dd3375 100644
--- a/doc/Update.md
+++ b/doc/Update.md
@@ -7,7 +7,7 @@ Updating Friendica
 
 If you installed Friendica in the ``path/to/friendica`` folder:
 1. Unpack the new Friendica archive in ``path/to/friendica_new``.
-2. Copy ``.htconfig.php``, ``photo/`` and ``proxy/`` from ``path/to/friendica`` to ``path/to/friendica_new``.
+2. Copy ``config/local.ini.php``, ``photo/`` and ``proxy/`` from ``path/to/friendica`` to ``path/to/friendica_new``.
 3. Rename the ``path/to/friendica`` folder to ``path/to/friendica_old``.
 4. Rename the ``path/to/friendica_new`` folder to ``path/to/friendica``.
 5. Check your site. Note: it may go into maintenance mode to update the database schema.
diff --git a/doc/Vagrant.md b/doc/Vagrant.md
index a224ebafc..6fd74240d 100644
--- a/doc/Vagrant.md
+++ b/doc/Vagrant.md
@@ -42,7 +42,7 @@ This will not delete the virtual machine.
 9. To ultimately delete the virtual machine run
 
         $> vagrant destroy
-        $> rm /vagrant/.htconfig.php
+        $> rm /vagrant/config/local.ini.php
 
 to make sure that you can start from scratch with another "vagrant up".
 
@@ -53,6 +53,6 @@ You will then have the following accounts to login:
   * friendica1, password friendica1
   * friendica2, password friendica2 and so on until friendica5
   * friendica1 is connected to all others. friendica1 has two groups: group1 with friendica2 and friendica4, group2 with friendica3 and friendica5.
-  * friendica2 and friendica3 are conntected. friendica4 and friendica5 are connected. 
+  * friendica2 and friendica3 are conntected. friendica4 and friendica5 are connected.
 
 For further documentation of vagrant, please see [the vagrant*docs*](https://docs.vagrantup.com/v2/).
diff --git a/doc/api.md b/doc/api.md
index 08fca74fa..07813b6a7 100644
--- a/doc/api.md
+++ b/doc/api.md
@@ -634,6 +634,73 @@ Friendica doesn't allow showing the friends of other users.
 * trim_user
 * contributor_details
 
+---
+
+### Return values for statuses/* api calls
+
+Returned status object is conform to GNU Social/Twitter api.
+
+Friendica adds some addictional fields:
+
+- owner: a user object, it's the owner of the item.
+- private: boolean, true if the item is marked as private
+- activities: map with activities related to the item. Every activity is a list of user objects.
+
+This properties are prefixed with "friendica_" in JSON responses and namespaced under "http://friendi.ca/schema/api/1/" in XML responses
+
+JSON:
+
+```json
+[
+	{
+		// ...
+		'friendica_owner' : {
+			// user object
+		},
+		'friendica_private' : true,
+		'friendica_activities': {
+			'like': [
+				{
+					// user object 
+				},
+				// ...
+			],
+			'dislike': [],
+			'attendyes': [],
+			'attendno': [],
+			'attendmaybe': []
+		}
+	},
+	// ...
+]
+```
+
+XML:
+
+```xml
+<statuses xmlns="http://api.twitter.com" xmlns:statusnet="http://status.net/schema/api/1/" xmlns:friendica="http://friendi.ca/schema/api/1/" xmlns:georss="http://www.georss.org/georss">
+  <status>
+	<!-- ... -->
+	<friendica:owner><!-- user object --></friendica:owner>
+	<friendica:private>true</friendica:private>
+	<friendica:activities>
+		<friendica:like>
+		<user>
+			<!-- user object -->
+		</user>
+		<!-- ... --->
+		</friendica:like>
+		<friendica:dislike/>
+		<friendica:attendyes/>
+		<friendica:attendno/>
+		<friendica:attendmaybe/>
+	</friendica:activities>	
+	</status>
+	<!-- ... -->
+</statuses>
+```
+
+
 ---
 
 ### statusnet/config (*)
diff --git a/doc/de/Addons.md b/doc/de/Addons.md
index 02be19e30..ce9af3778 100644
--- a/doc/de/Addons.md
+++ b/doc/de/Addons.md
@@ -203,7 +203,7 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
     Addon::callHooks($a->module.'_mod_content', $arr);
     Addon::callHooks($a->module.'_mod_aftercontent', $arr);
     Addon::callHooks('page_end', $a->page['content']);
-    
+
 ### include/api.php
 
     Addon::callHooks('logged_in', $a->user);
@@ -216,7 +216,7 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
     Addon::callHooks('enotify_store', $datarray);
     Addon::callHooks('enotify_mail', $datarray);
     Addon::callHooks('check_item_notification', $notification_data);
-    
+
 ### include/conversation.php
 
     Addon::callHooks('conversation_start', $cb);
@@ -234,6 +234,7 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
 
     Addon::callHooks('contact_block_end', $arr);
     Addon::callHooks('poke_verbs', $arr);
+    Addon::callHooks('put_item_in_cache', $hook_data);
     Addon::callHooks('prepare_body_init', $item);
     Addon::callHooks('prepare_body_content_filter', $hook_data);
     Addon::callHooks('prepare_body', $hook_data);
@@ -275,7 +276,7 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
 ### mod/friendica.php
 
     Addon::callHooks('about_hook', $o);
-    
+
 ### mod/subthread.php
 
     Addon::callHooks('post_local_end', $arr);
@@ -322,7 +323,7 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
 
 ### mod/contacts.php
 
-    Addon::callHooks('contact_edit_post', $_POST);    
+    Addon::callHooks('contact_edit_post', $_POST);
     Addon::callHooks('contact_edit', $arr);
 
 ### mod/tagger.php
diff --git a/doc/de/FAQ.md b/doc/de/FAQ.md
index b52aa3d39..fe8a9d128 100644
--- a/doc/de/FAQ.md
+++ b/doc/de/FAQ.md
@@ -85,9 +85,9 @@ Zum Konvertieren von Videos in das lizenfreie Videoformat WebM gibt es unter Win
 ### Ist es möglich, bei mehreren Profilen verschiedene Avatare (Nutzerbilder) zu haben?
 
 Ja.
-Auf Deiner ["Profile verwalten/editieren"-Seite](../profiles) wählst Du zunächst das gewünschte Profil aus. 
-Anschließend siehst Du eine Seite mit allen Infos zu diesem Profil. 
-Klicke nun oben auf den Link "Profilbild ändern" und lade im nächsten Fenster ein Bild von Deinem PC hoch. 
+Auf Deiner ["Profile verwalten/editieren"-Seite](../profiles) wählst Du zunächst das gewünschte Profil aus.
+Anschließend siehst Du eine Seite mit allen Infos zu diesem Profil.
+Klicke nun oben auf den Link "Profilbild ändern" und lade im nächsten Fenster ein Bild von Deinem PC hoch.
 Um Deine privaten Daten zu schützen, wird in Beiträgen nur das Bild aus Deinem öffentlichen Profil angezeigt.
 
 <a name="contacts"></a>
@@ -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:
@@ -199,7 +199,7 @@ Admin
 
 Ja, das ist möglich.
 Es ist allerdings nicht möglich, eine Datenbank durch zwei Domains zu nutzen.
-Solange Du Deine .htconfig.php allerdings so einrichtest, dass das System nicht versucht, eine Installation durchzuführen, kannst Du die richtige Config-Datei in include/$hostname/.htconfig.php hinterlegen.
+Solange Du Deine config/local.ini.php allerdings so einrichtest, dass das System nicht versucht, eine Installation durchzuführen, kannst Du die richtige Config-Datei in include/$hostname/config/local.ini.php hinterlegen.
 Alle Cache-Aspekte und der Zugriffsschutz können pro Instanz konfiguriert werden.
 
 <a name="sources"></a>
@@ -216,13 +216,13 @@ Wenn Du neue Themen suchst, findest Du sie auf [Friendica-Themes.com](http://fri
 <a name="adminaccount1"></a>
 ### Ich habe meine E-Mail Adresse geändern und jetzt ist das Admin Panel verschwunden?
 
-Bitte aktualisiere deine E-Mail Adresse in der <tt>.htconfig.php</tt> Datei.
+Bitte aktualisiere deine E-Mail Adresse in der <tt>config/local.ini.php</tt> Datei.
 
 <a name="adminaccount2"></a>
 ### Kann es mehr als einen Admin auf einer Friendica Instanz geben?
 
 Ja.
-Du kannst in der <tt>.htconfig.php</tt> Datei mehrere E-Mail Adressen auflisten.
+Du kannst in der <tt>config/local.ini.php</tt> Datei mehrere E-Mail Adressen auflisten.
 Die aufgelisteten Adressen werden mit Kommata von einander getrennt.
 
 <a name="dbupdate">
diff --git a/doc/de/Home.md b/doc/de/Home.md
index 8e4be6bfc..6c95476ed 100644
--- a/doc/de/Home.md
+++ b/doc/de/Home.md
@@ -34,7 +34,7 @@ Friendica - Dokumentation und Ressourcen
 * [Konnektoren (Connectors) installieren (Twitter/GNU Social)](help/Installing-Connectors)
 * [Installation eines ejabberd Servers (XMPP-Chat) mit synchronisierten Anmeldedaten](help/install-ejabberd) (EN)
 * [Betreibe deine Seite mit einem SSL-Zertifikat](help/SSL)
-* [Konfigurationswerte, die nur in der .htconfig.php gesetzt werden können](help/htconfig) (EN)
+* [Konfigurationswerte, die nur in der config/local.ini.php gesetzt werden können](help/Config) (EN)
 * [Performance verbessern](help/Improve-Performance)
 * [Administration Werkzeuge](help/tools) (EN)
 
@@ -56,11 +56,12 @@ Friendica - Dokumentation und Ressourcen
 * [Code-Referenz (mit doxygen generiert - setzt Cookies)](doc/html/)
 * [Twitter/GNU Social API Functions](help/api) (EN)
 * [Translation of Friendica](help/translations) (EN)
+* [Run tests](help/Tests) (EN)
 
 **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
@@ -72,4 +73,3 @@ Friendica - Dokumentation und Ressourcen
 
 * [Seite/Friendica-Version](friendica)
 * [Mitwirkenden bei Friendica](credits)
-
diff --git a/doc/de/Install.md b/doc/de/Install.md
index ff077351b..05a4e1e46 100644
--- a/doc/de/Install.md
+++ b/doc/de/Install.md
@@ -28,7 +28,7 @@ Requirements
 ---
 
 * Apache mit einer aktiverten mod-rewrite-Funktion und dem Eintrag "Options All", so dass du die lokale .htaccess-Datei nutzen kannst
-* PHP  5.6+ (PHP 7 ist aufgrund der Performance empfohlen)
+* PHP  5.6.1+ (PHP 7 ist aufgrund der Performance empfohlen)
   * PHP *Kommandozeilen*-Zugang mit register_argc_argv auf "true" gesetzt in der php.ini-Datei
   * Curl, GD, PDO, MySQLi, xml, zip und OpenSSL-Erweiterung
   * Das POSIX Modul muss aktiviert sein ([CentOS, RHEL](http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7) haben dies z.B. deaktiviert)
@@ -47,22 +47,22 @@ Wenn du die Möglichkeit hierzu hast, empfehlen wir dir "git" zu nutzen, um die
 Das macht die Aktualisierung wesentlich einfacher.
 Der Linux-Code, mit dem man die Dateien direkt in ein Verzeichnis wie "meinewebseite" kopiert, ist
 
-    git clone https://github.com/friendica/friendica.git mywebsite
+    git clone https://github.com/friendica/friendica.git -b master mywebsite
     cd mywebsite
     bin/composer.phar install
 
 Stelle sicher, dass der Ordner *view/smarty3* existiert and von dem Webserver-Benutzer beschreibbar ist
 
     mkdir view/smarty3
-    chmod 777 view/smarty3
+    chmod 775 view/smarty3
 
-Falls Addons installiert werden sollen: Gehe in den Friendica-Ordner 
+Falls Addons installiert werden sollen: Gehe in den Friendica-Ordner
 
     cd mywebsite
 
 Und die Addon Repository klonst:
 
-    git clone https://github.com/friendica/friendica-addons.git addon
+    git clone https://github.com/friendica/friendica-addons.git -b master addon
 
 Um das Addon-Verzeichnis aktuell zu halten, solltest du in diesem Pfad ein "git pull"-Befehl eintragen
 
@@ -71,6 +71,17 @@ Um das Addon-Verzeichnis aktuell zu halten, solltest du in diesem Pfad ein "git
 
 Wenn du den Verzeichnispfad auf deinen Webserver kopierst, dann stelle sicher, dass du auch die .htaccess kopierst, da "Punkt"-Dateien oft versteckt sind und normalerweise nicht direkt kopiert werden.
 
+Wenn du die Entwickler Version von Friendica verwenden möchtest kannst du auf den develop Branch im git Repository wechseln.
+Dies tust du mit den folgenden Befehlen
+
+    git checkout develop
+    bin/composer.phar install
+    cd addon
+    git checkout develop
+
+Die Entwickler Version kann nach einem fehlerhaften Commit vorübergehend Probleme haben oder gar nicht mehr funktionieren.
+Sollte dir so etwas passieren, lass es uns bitte wissen, damit der Fehler behoben werden kann.
+
 ### Erselle eine Datenbank
 
 Erstelle eine leere Datenbank und notiere alle Zugangsdaten (Adresse der Datenbank, Nutzername, Passwort, Datenbankname).
@@ -87,46 +98,105 @@ Starte MySQL dann neu und es sollte klappen.
 
 ### Option A: Der manuelle Installer
 
-Besuche deine Webseite mit deinem Browser und befolge die Anleitung. 
+Besuche deine Webseite mit deinem Browser und befolge die Anleitung.
 Bitte beachte jeden Fehler und korrigiere diese, bevor du fortfährst.
 
 Falls du einen Port für die Datenbankverbindung angeben musst, kannst du diesen in der Host-Eingabe Zeile angeben.
 
 *Wenn* die manuelle Installation aus irgendeinem Grund fehlschlägt, dann prüfe das Folgende:
-* ".htconfig.php" existiert ... wenn nicht, bearbeite die „htconfig.php“ und ändere die Systemeinstellungen. Benenne sie um in „.htconfig.php".
+* "config/local.ini.php" existiert ... wenn nicht, bearbeite die „config/local-sample.ini.php“ und ändere die Systemeinstellungen. Benenne sie um in „config/local.ini.php".
 * die Datenbank beinhaltet Daten. ... wenn nicht, importiere den Inhalt der Datei "database.sql" mit phpmyadmin oder per mysql-Kommandozeile.
 
 Besuche deine Seite an diesem Punkt wieder und registriere deinen persönlichen Account.
 Alle Registrierungsprobleme sollten automatisch behebbar sein.
 Wenn du irgendwelche **kritischen** Fehler zu diesen Zeitpunkt erhalten solltest, deutet das darauf hin, dass die Datenbank nicht korrekt installiert wurde.
-Du kannst bei Bedarf die Datei .htconfig.php verschieben/umbenennen und die Datenbank leeren (als „Dropping“ bezeichnet), so dass du mit einem sauberen System neu starten kannst.
+Du kannst bei Bedarf die Datei config/local.ini.php verschieben/umbenennen und die Datenbank leeren (als „Dropping“ bezeichnet), so dass du mit einem sauberen System neu starten kannst.
 
-### Option B: Starte das manuelle Installationsscript
+### Option B: Starte das automatische Installationsscript
 
-Öffne die Datei htconfig.php im Friendica-Hauptordner mit einem Text-Editor.
-Entferne die `die('...');` Zeile und bearbeite die Einstellungen so, das sie zu deinem System passen (MySQL, Sprache, Theme etc.).
-Dann speichere die Datei (jedoch nicht umbenennen).
+Es existieren folgende Varianten zur automatischen Installation von Friendica:
+-	Eine vorgefertigte Konfigurationsdatei erstellen (z.B. `prepared.ini.php`)
+-	Verwendung von Umgebungsvariablen (z.B. `MYSQL_HOST`)
+-	Verwendung von Optionen (z.B. `--dbhost <host>`)
 
-Gehe in den Friendica-Hauptordner und führe den Kommandozeilen Befehl aus:
-
-    bin/console autoinstall
-
-Oder falls du alle optionalen Checks ausfürehn lassen möchtest, benutze diese Option:
-
-    bin/console autoinstall -a
-
-*Wenn* die automatisierte Installation aus irgendeinem Grund fehlschlägt, dann prüfe das Folgende:
-* Existiert die `.htconfig.php`? Falls ja, wird die automatisierte Installation nicht gestartet.
-* Sind Einstellungen in der `.htconfig.php` korrekt? Falls nicht, bitte bearbeite diese Datei erneut.
-* Ist die leere MySQL-Datenbank erstellt? Falls nicht, erstelle diese.
+Umgebungsvariablen und Optionen können auch kombiniert werden.
+Dabei ist jedoch darauf zu achten, dass etwaige Optionen immer die zugehörigen Umgebungsvariablen überschreiben.
 
 Für mehr Informationen kannst du diese Option verwenden:
 
     bin/console autoinstall -v
 
+Falls du alle optionalen Checks ausfürehn lassen möchtest, benutze diese Option:
+
+    bin/console autoinstall -a
+
+*Wenn* die automatisierte Installation aus irgendeinem Grund fehlschlägt, dann prüfe das Folgende:
+*	Existiert die `config/local.ini.php`? Falls ja, wird die automatisierte Installation nicht gestartet.
+*	Sind Einstellungen in der `config/local.ini.php` korrekt? Falls nicht, bitte bearbeite diese Datei erneut.
+*	Ist die leere MySQL-Datenbank erstellt? Falls nicht, erstelle diese.
+
+#### B.1: Konfigurationsdatei
+
+Für diese Variante muss ein Konfigurationsdatei bereits vor der Installation fertig definiert sein (z.B. [local-sample.ini.php](config/local-sample.ini.php).
+
+Gehe im Anschluss in den Friendica-Hauptordner und führe den Kommandozeilen Befehl aus:
+
+    bin/console autoinstall -f <prepared.ini.php>
+
+#### B.2: Umgebungsvariablen
+
+Es existieren Zwei Arten von Umgebungsvariablen in Friendica:
+-	Jene, die auch im normalen Betrieb verwendet werden können (derzeit ausschließlich **Datenbank Einstellungen**)
+-	Jene, die nur während der Installation verwedent werden können (im normalen Betrieb werden sie ignoriert)
+
+Umgebungsvariablen können auch durch adäquate Optionen (z.B. `--dbhost <hostname>`)übersteuert werden.
+
+**Datenbank Einstellungen**
+
+Nur wenn die Option `--savedb` gesetzt ist, werden diese Umgebungsvariablen auch in `config/local.ini.php` gespeichert!
+
+-	`MYSQL_HOST` Der Host der MySQL/MariaDB Datenbank
+-	`MYSQL_PORT` Der Port der MySQL/MariaDB Datenbank
+-	`MYSQL_USERNAME` Der Benutzername des MySQL Datenbanklogins (MySql - Variante)
+-	`MYSQL_USER` Der Benutzername des MariaDB Datenbanklogins (MariaDB-Variante)
+-	`MYSQL_PASSWORD` Das Passwort der MySQL/MariaDB Datenbanklogins
+-	`MYSQL_DATABASE` Der Name der MySQL/MariaDB Datenbank
+
+**Friendica Einstellungen**
+
+Diese Umgebungsvariablen können nicht während des normalen Friendica Betriebs verwendet werden.
+Sie werden stattdessen direkt in `config/local.ini.php` gespeichert.
+
+-	`FRIENDICA_PHP_PATH` Der Pfad zur PHP-Datei
+-	`FRIENDICA_ADMIN_MAIL` Die Admin E-Mail Adresse dieses Friendica Knotens (wird auch für den Admin-Zugang benötigt)
+-	`FRIENDICA_TZ` Die Zeitzone von Friendica
+-	`FRIENDICA_LANG` Die Sprache von Friendica
+
+Gehe im Anschluss in den Friendica-Hauptordner und führe den Kommandozeilen Befehl aus:
+
+    bin/console autoinstall [--savedb]
+    
+#### B.3: Optionen
+
+Alle Optionen werden in `config/local.ini.php` gespeichert und überschreiben etwaige, zugehörige Umgebungsvariablen.
+
+-	`-H|--dbhost <host>` Der Host der MySQL/MariaDB Datenbank (env `MYSQL_HOST`)
+-	`-p|--dbport <port>` Der Port der MySQL/MariaDB Datenbank (env `MYSQL_PORT`)
+-	`-U|--dbuser <username>` Der Benutzername des MySQL/MariaDB Datenbanklogins (env `MYSQL_USER` or `MYSQL_USERNAME`)
+-	`-P|--dbpass <password>` Das Passwort der MySQL/MariaDB Datenbanklogins (env `MYSQL_PASSWORD`)
+-	`-d|--dbdata <database>` Der Name der MySQL/MariaDB Datenbank (env `MYSQL_DATABASE`)
+-	`-b|--phppath <path>` Der Pfad zur PHP-Datei (env `FRIENDICA_PHP_PATH`)
+-	`-A|--admin <mail>` Die Admin E-Mail Adresse dieses Friendica Knotens (env `FRIENDICA_ADMIN_MAIL`)
+-	`-T|--tz <timezone>` Die Zeitzone von Friendica (env `FRIENDICA_TZ`)
+-	`-L|--land <language>` Die Sprache von Friendica (env `FRIENDICA_LANG`)
+
+Gehe in den Friendica-Hauptordner und führe den Kommandozeilen Befehl aus:
+
+    bin/console autoinstall [options]
+
 ### Einen Worker einrichten
 
-Erstelle einen Cron job oder einen regelmäßigen Task, um den Poller alle 5-10 Minuten im Hintergrund ablaufen zu lassen. 
+Erstelle einen Cron job oder einen regelmäßigen Task, um den Poller alle 5-10 Minuten im Hintergrund ablaufen zu lassen.
 Beispiel:
 
     cd /base/directory; /path/to/php bin/worker.php
@@ -149,5 +219,5 @@ Es werden schlimme Dinge geschehen.
 Sei es nun ein Hardwareversagen oder eine kaputte Datenbank.
 Deshalb solltest du dir, nachdem die Installation deines Friendica Knotens abgeschlossen ist, einen Backup Plan erstellen.
 
-Die wichtigste Datei ist die `.htconfig.php` im Stammverzeichnis deiner Friendica Installation.
+Die wichtigste Datei ist die `config/local.ini.php` im Stammverzeichnis deiner Friendica Installation.
 Und da alle Daten in der Datenbank gespeichert werden, solltest du einen nicht all zu alten Dump der Friendica Datenbank zur Hand haben, solltest du deinen Knoten wieder herstellen müssen.
diff --git a/doc/de/Installing-Connectors.md b/doc/de/Installing-Connectors.md
index f9fe5b0f7..3fa46ab5a 100644
--- a/doc/de/Installing-Connectors.md
+++ b/doc/de/Installing-Connectors.md
@@ -1,25 +1,25 @@
-Konnektoren installieren (Twitter/GNU Social) 
+Konnektoren installieren (Twitter/GNU Social)
 ==================================================
 
 * [Zur Startseite der Hilfe](help)
 
 Friendica nutzt Erweiterung, um die Verbindung zu anderen Netzwerken wie Twitter oder App.net zu gewährleisten.
 
-Es gibt außerdem ein Erweiterung, um über einen bestehenden GNU Social-Account diesen Service zu nutzen. 
-Du brauchst dieses Erweiterung aber nicht, um mit GNU Social-Mitgliedern von Friendica aus zu kommunizieren - es sei denn, du wünschst es, über einen existierenden Account einen Beitrag zu schreiben. 
+Es gibt außerdem ein Erweiterung, um über einen bestehenden GNU Social-Account diesen Service zu nutzen.
+Du brauchst dieses Erweiterung aber nicht, um mit GNU Social-Mitgliedern von Friendica aus zu kommunizieren - es sei denn, du wünschst es, über einen existierenden Account einen Beitrag zu schreiben.
 
-Alle drei Erweiterung benötigen einen Account im gewünschten Netzwerk. 
+Alle drei Erweiterung benötigen einen Account im gewünschten Netzwerk.
 Zusätzlich musst du (bzw. der Administrator der Seite) einen API-Schlüssel holen, um einen authentifizierten Zugriff zu deinem Friendica-Server herstellen zu lassen.
 
 
 **Seitenkonfiguration**
 
-Erweiterung müssen vom Administrator installiert werden, bevor sie genutzt werden können. 
+Erweiterung müssen vom Administrator installiert werden, bevor sie genutzt werden können.
 Dieses kann über das Administrationsmenü erstellt werden.
 
-Jeder der Konnektoren benötigt zudem einen API-Schlüssel vom Service, der verbunden werden soll. 
-Einige Erweiterung erlaube es, diese Informationen auf den Administrationsseiten einzustellen, wohingegen andere eine direkte Bearbeitung der Konfigurationsdatei ".htconfig.php" erfordern. 
-Der Weg, um diese Schlüssel zu erhalten, variiert stark, jedoch brauchen fast alle einen bestehenden Account im gewünschten Service. 
+Jeder der Konnektoren benötigt zudem einen API-Schlüssel vom Service, der verbunden werden soll.
+Einige Erweiterung erlaube es, diese Informationen auf den Administrationsseiten einzustellen, wohingegen andere eine direkte Bearbeitung der Konfigurationsdatei "config/local.ini.php" erfordern.
+Der Weg, um diese Schlüssel zu erhalten, variiert stark, jedoch brauchen fast alle einen bestehenden Account im gewünschten Service.
 Einmal installiert, können diese Schlüssel von allen Seitennutzern genutzt werden.
 
 Im Folgenden findest du die Einstellungen für die verschiedenen Services (viele dieser Informationen kommen direkt aus den Quelldateien der Erweiterung):
@@ -37,11 +37,12 @@ Um dieses Erweiterung zu nutzen, benötigst du einen OAuth Consumer-Schlüsselpa
 
 Registriere deine Friendica-Seite als "Client"-Anwendung mit "Read&Write"-Zugriff. Wir benötigen "Twitter als Login" nicht. Sobald du deine Anwendung installiert hast, erhältst du das Schlüsselpaar für deine Seite.
 
-Trage dieses Schlüsselpaar in deine globale ".htconfig.php"-Datei ein.
+Trage dieses Schlüsselpaar in deine globale "config/local.ini.php"-Datei ein.
 
 ```
-$a->config['twitter']['consumerkey'] = 'your consumer_key here';
-$a->config['twitter']['consumersecret'] = 'your consumer_secret here';
+[twitter]
+consumerkey = your consumer_key here
+consumersecret = your consumer_secret here
 ```
 
 Anschließend kann der Nutzer deiner Seite die Twitter-Einstellungen selbst eintragen: "Einstellungen -> Connector Einstellungen".
@@ -63,10 +64,10 @@ Wenn das Addon aktiv ist, muss der Nutzer die folgenden Einstellungen vornehmen,
 
 Um das OAuth-Schlüsselpaar zu erhalten, muss der Nutzer
 
-(a) seinen Friendica-Admin fragen, ob bereits ein Schlüsselpaar existiert oder 
+(a) seinen Friendica-Admin fragen, ob bereits ein Schlüsselpaar existiert oder
 (b) einen Friendica-Server als Anwendung auf dem GNU Social-Server anmelden.
 
-Dies kann über Einstellungen --> Connections --> "Register an OAuth client application" -> "Register a new application" auf dem GNU Social-Server durchgeführt werden. 
+Dies kann über Einstellungen --> Connections --> "Register an OAuth client application" -> "Register a new application" auf dem GNU Social-Server durchgeführt werden.
 
 Während der Registrierung des OAuth-Clients ist Folgendes zu beachten:
 
@@ -76,9 +77,9 @@ Während der Registrierung des OAuth-Clients ist Folgendes zu beachten:
 * stelle Lese- und Schreibrechte ein
 * die Quell-URL sollte die URL deines Friendica-Servers sein
 
-Sobald die benötigten Daten gespeichert sind, musst du deinen Friendica-Account mit GNU Social verbinden. 
-Das kannst du über Einstellungen --> Connector-Einstellungen durchführen. 
-Folge dem "Einloggen mit GNU Social"-Button, erlaube den Zugriff und kopiere den Sicherheitscode in die entsprechende Box. 
+Sobald die benötigten Daten gespeichert sind, musst du deinen Friendica-Account mit GNU Social verbinden.
+Das kannst du über Einstellungen --> Connector-Einstellungen durchführen.
+Folge dem "Einloggen mit GNU Social"-Button, erlaube den Zugriff und kopiere den Sicherheitscode in die entsprechende Box.
 Friendica wird dann versuchen, die abschließende OAuth-Einstellungen über die API zu beziehen.
 
 Wenn es geklappt hat, kannst du in den Einstellungen festlegen, ob deine öffentlichen Nachrichten automatisch in deinem GNU Social-Account erscheinen soll (achte hierbei auf das kleine Schloss-Symbol im Status-Editor)
diff --git a/doc/de/Move-Account.md b/doc/de/Move-Account.md
index 1b0c7eb8f..79e7eae91 100644
--- a/doc/de/Move-Account.md
+++ b/doc/de/Move-Account.md
@@ -1,34 +1,38 @@
-Accounts Umziehen
-=================
-
-* [Zur Startseite der Hilfe](help)
-
-
-! **Dies ist ein experimentelles Feature**
-
-**Wie man einen Account von einem Server zu einem anderen umzieht.**
-
-Unter "Einstellungen" -> "[Persönliche Daten exportieren](uexport)" aufrufen.
-"Account exportieren" anklicken und die Daten speichern.
-Diese Datei enthält Details über dich, deine Kontakte, Gruppen und persönliche Einstellungen. 
-Außerdem enthält sie deinen geheimen Schlüssel mit dem du dich deinen Kontakten gegenüber ausweist.
-
-**Speichere diese Datei an einem sicheren Ort**!
-
-Rufe nun dem neuen Server die Seite *http://newserver.com/uimport* auf (es gibt derzeit keinen direkten Link auf diese Seite).
-
-Lege auf dem neuen Server auf keinen Fall einen gleichnamigen Account an!
-uimport muss anstelle des Registrierens verwendet werden.
-
-Wähle die gesicherte Account Datei aus und klicke "Importieren".
-
-Friendica wird nun deinen Account auf dem neuen Server wiederherstellen, mit all deinen Friendica Kontakten und Gruppen. 
-An deine Friendica Kontakte wird außerdem eine Nachricht gesendet um sie über deine neue Adresse zu informieren.
-Wenn deine Kontakte ihren Account auf einem aktuellen Server haben werden deine Kontaktdetails automatisch aktualisiert.
-
-Neuere Diaspora Server unterstützen ebenfalls eine Umzugsbenachrichtigung.
-
-Kontakte auf GNU Social werden archiviert, da wir ihnen keine Information über deinen Umzug zukommen lassen können.
-Du solltest sie persönlich anschreiben deinen Eintrag aus ihren Kontaktlisten zu entfernen und dich neu hinzuzufügen, anschließend solltest du da gleiche mit ihren Accounts tun.
-
-Nach dem Umzug wird dein Account auf dem alten Server nicht mehr zuverlässig funktionieren und sollte deshalb gelöscht werden.
+Accounts Umziehen
+=================
+
+* [Zur Startseite der Hilfe](help)
+
+
+! **Dies ist ein experimentelles Feature**
+
+**Wie man einen Account von einem Server zu einem anderen umzieht.**
+
+Unter "Einstellungen" -> "[Persönliche Daten exportieren](uexport)" aufrufen.
+"Account exportieren" anklicken und die Daten speichern.
+Diese Datei enthält Details über dich, deine Kontakte, Gruppen und persönliche Einstellungen. 
+Außerdem enthält sie deinen geheimen Schlüssel mit dem du dich deinen Kontakten gegenüber ausweist.
+
+**Speichere diese Datei an einem sicheren Ort**!
+
+Rufe nun dem neuen Server die Seite *http://newserver.com/uimport* auf (es gibt derzeit keinen direkten Link auf diese Seite).
+
+Bitte beachte, dass dies nur auf Servern möglich ist, an denen man sich offen anmelden kann.
+Bei Servern, bei denen der Administrator Accounts freigeben muss, ist das Hochladen nicht möglich.
+Hier kann dies nur der Administrator selber durchführen.
+
+Lege auf dem neuen Server auf keinen Fall einen gleichnamigen Account an!
+uimport muss anstelle des Registrierens verwendet werden.
+
+Wähle die gesicherte Account Datei aus und klicke "Importieren".
+
+Friendica wird nun deinen Account auf dem neuen Server wiederherstellen, mit all deinen Friendica Kontakten und Gruppen. 
+An deine Friendica Kontakte wird außerdem eine Nachricht gesendet um sie über deine neue Adresse zu informieren.
+Wenn deine Kontakte ihren Account auf einem aktuellen Server haben werden deine Kontaktdetails automatisch aktualisiert.
+
+Neuere Diaspora Server unterstützen ebenfalls eine Umzugsbenachrichtigung.
+
+Kontakte auf GNU Social werden archiviert, da wir ihnen keine Information über deinen Umzug zukommen lassen können.
+Du solltest sie persönlich anschreiben deinen Eintrag aus ihren Kontaktlisten zu entfernen und dich neu hinzuzufügen, anschließend solltest du da gleiche mit ihren Accounts tun.
+
+Nach dem Umzug wird dein Account auf dem alten Server nicht mehr zuverlässig funktionieren und sollte deshalb gelöscht werden.
diff --git a/doc/de/Settings.md b/doc/de/Settings.md
index 8a654e32c..4d84f873f 100644
--- a/doc/de/Settings.md
+++ b/doc/de/Settings.md
@@ -8,8 +8,8 @@ Auf der Startseite des Admin Panels werden die Informationen zu der Instanz zusa
 Die erste Zahl gibt die Anzahl von Nachrichten an, die nicht zugestellt werden konnten.
 Die Zustellung wird zu einem späteren Zeitpunkt noch einmal versucht.
 Unter dem Punkt "Warteschlange Inspizieren" kannst du einen schnellen Blick auf die zweite Warteschlange werfen.
-Die zweite Zahl steht für die Anzahl der Aufgaben, die die Worker noch vor sich haben. 
-Die Worker arbeiten Hintergrundprozesse ab. 
+Die zweite Zahl steht für die Anzahl der Aufgaben, die die Worker noch vor sich haben.
+Die Worker arbeiten Hintergrundprozesse ab.
 Die Aufgaben der Worker sind priorisiert und werden anhand dieser Prioritäten abgearbeitet.
 
 Desweiteren findest du eine Übersicht über die Accounts auf dem Friendica Knoten, die unter dem Punkt "Nutzer" moderiert werden können.
@@ -31,7 +31,7 @@ Da die meisten Konfigurationsoptionen einen Hilfstext im Admin Panel haben, kann
 
 #### Banner/Logo
 
-Hiermit legst du das Banner der Seite fest. Standardmäßig ist das Friendica-Logo und der Name festgelegt. 
+Hiermit legst du das Banner der Seite fest. Standardmäßig ist das Friendica-Logo und der Name festgelegt.
 Du kannst hierfür HTML/CSS nutzen, um den Inhalt zu gestalten und/oder die Position zu ändern, wenn es nicht bereits voreingestellt ist.
 
 #### Systensprache
@@ -63,33 +63,33 @@ Dabei kannst du zwischen den folgenden Optionen wählen:
 * **Bedarf der Zustimmung**: Jeder kann ein Nutzerkonto anlegen. Dieses muss allerdings durch den Admin freigeschaltet werden, bevor es verwendet werden kann.
 * **Geschlossen**: Es können keine weiteren Nutzerkonten angelegt werden.
 
-##### Einladungen 
+##### Einladungen
 
 Zusätzlich zu den oben genannten Möglichkeiten, kann die Registrierung eines neuen Nutzerkontos an eine Einladung durch einen bestehenden Nutzer gekoppelt werden.
-Hierzu muss in der [.htconfig.php](/help/htconfig) Datei die Option `invitation_only` aktiviert und als Registrierungsmethode entweder *Offen* oder *Bedarf der Zustimmung* gewählt werden.
+Hierzu muss in der [config/local.ini.php](/help/Config) Datei die Option `invitation_only` aktiviert und als Registrierungsmethode entweder *Offen* oder *Bedarf der Zustimmung* gewählt werden.
 
 #### Namen auf Vollständigkeit überprüfen
 
-Es kann vorkommen, dass viele Spammer versuchen, sich auf deiner Seite zu registrieren. 
-In Testphasen haben wir festgestellt, dass diese automatischen Registrierungen das Feld "Vollständiger Name" oft nur mit Namen ausfüllen, die kein Leerzeichen beinhalten. 
-Wenn du Leuten erlauben willst, sich nur mit einem Namen anzumelden, dann setze die Einstellung auf "true". 
+Es kann vorkommen, dass viele Spammer versuchen, sich auf deiner Seite zu registrieren.
+In Testphasen haben wir festgestellt, dass diese automatischen Registrierungen das Feld "Vollständiger Name" oft nur mit Namen ausfüllen, die kein Leerzeichen beinhalten.
+Wenn du Leuten erlauben willst, sich nur mit einem Namen anzumelden, dann setze die Einstellung auf "true".
 Die Standardeinstellung ist auf "false" gesetzt.
- 
+
 #### OpenID Unterstützung
 
-Standardmäßig wird OpenID für die Registrierung und für Logins genutzt. 
+Standardmäßig wird OpenID für die Registrierung und für Logins genutzt.
 Wenn du nicht willst, dass OpenID-Strukturen für dein System übernommen werden, dann setze "no_openid" auf "true".
 Standardmäßig ist hier "false" gesetzt.
 
 #### Unterbinde Mehrfachregistrierung
 
-Um mehrfache Seiten zu erstellen, muss sich eine Person mehrfach registrieren können. 
-Deine Seiteneinstellung kann Registrierungen komplett blockieren oder an Bedingungen knüpfen. 
-Standardmäßig können eingeloggte Nutzer weitere Accounts für die Seitenerstellung registrieren. 
-Hier ist weiterhin eine Bestätigung notwendig, wenn "REGISTER_APPROVE" ausgewählt ist. 
-Wenn du die Erstellung weiterer Accounts blockieren willst, dann setze die Einstellung "block_extended_register" auf "true". 
+Um mehrfache Seiten zu erstellen, muss sich eine Person mehrfach registrieren können.
+Deine Seiteneinstellung kann Registrierungen komplett blockieren oder an Bedingungen knüpfen.
+Standardmäßig können eingeloggte Nutzer weitere Accounts für die Seitenerstellung registrieren.
+Hier ist weiterhin eine Bestätigung notwendig, wenn "REGISTER_APPROVE" ausgewählt ist.
+Wenn du die Erstellung weiterer Accounts blockieren willst, dann setze die Einstellung "block_extended_register" auf "true".
 Standardmäßig ist hier "false" gesetzt.
- 
+
 ### Datei hochladen
 
 #### Maximale Bildgröße
@@ -100,26 +100,26 @@ Maximale Bild-Dateigröße in Byte. Standardmäßig ist 0 gesetzt, was bedeutet,
 
 #### URL des weltweiten Verzeichnisses
 
-Mit diesem Befehl wird die URL eingestellt, die zum Update des globalen Verzeichnisses genutzt wird. 
-Dieser Befehl ist in der Standardkonfiguration enthalten. 
-Der nicht dokumentierte Teil dieser Einstellung ist, dass das globale Verzeichnis gar nicht verfügbar ist, wenn diese Einstellung nicht gesetzt wird. 
+Mit diesem Befehl wird die URL eingestellt, die zum Update des globalen Verzeichnisses genutzt wird.
+Dieser Befehl ist in der Standardkonfiguration enthalten.
+Der nicht dokumentierte Teil dieser Einstellung ist, dass das globale Verzeichnis gar nicht verfügbar ist, wenn diese Einstellung nicht gesetzt wird.
 Dies erlaubt eine private Kommunikation, die komplett vom globalen Verzeichnis isoliert ist.
 
 #### Erzwinge Veröffentlichung
 
-Standardmäßig können Nutzer selbst auswählen, ob ihr Profil im Seitenverzeichnis erscheint. 
-Diese Einstellung zwingt alle Nutzer dazu, im Verzeichnis zu erscheinen. 
+Standardmäßig können Nutzer selbst auswählen, ob ihr Profil im Seitenverzeichnis erscheint.
+Diese Einstellung zwingt alle Nutzer dazu, im Verzeichnis zu erscheinen.
 Diese Einstellung kann vom Nutzer nicht deaktiviert werden. Die Standardeinstellung steht auf "false".
 
 #### Öffentlichen Zugriff blockieren
 
-Aktiviere diese Einstellung um den öffentlichen Zugriff auf alle Seiten zu sperren, solange man nicht eingeloggt ist. 
-Das blockiert die Ansicht von Profilen, Freunden, Fotos, vom Verzeichnis und den Suchseiten. 
-Ein Nebeneffekt ist, dass Einträge dieser Seite nicht im globalen Verzeichnis erscheinen. 
-Wir empfehlen, speziell diese Einstellung auszuschalten (die Einstellung ist an anderer Stelle auf dieser Seite erklärt). 
-Beachte: das ist speziell für Seiten, die beabsichtigen, von anderen Friendica-Netzwerken abgeschottet zu sein. 
-Unautorisierte Personen haben ebenfalls nicht die Möglichkeit, Freundschaftsanfragen von Seitennutzern zu beantworten. 
-Die Standardeinstellung ist deaktiviert. 
+Aktiviere diese Einstellung um den öffentlichen Zugriff auf alle Seiten zu sperren, solange man nicht eingeloggt ist.
+Das blockiert die Ansicht von Profilen, Freunden, Fotos, vom Verzeichnis und den Suchseiten.
+Ein Nebeneffekt ist, dass Einträge dieser Seite nicht im globalen Verzeichnis erscheinen.
+Wir empfehlen, speziell diese Einstellung auszuschalten (die Einstellung ist an anderer Stelle auf dieser Seite erklärt).
+Beachte: das ist speziell für Seiten, die beabsichtigen, von anderen Friendica-Netzwerken abgeschottet zu sein.
+Unautorisierte Personen haben ebenfalls nicht die Möglichkeit, Freundschaftsanfragen von Seitennutzern zu beantworten.
+Die Standardeinstellung ist deaktiviert.
 Verfügbar in Version 2.2 und höher.
 
 #### Für Besucher verfügbare Gemeinschaftsseiten
@@ -133,15 +133,15 @@ Angemeldete Nutzer des Knotens können grundsätzlich beide Seiten verwenden.
 
 #### Erlaubte Domains für Kontakte
 
-Kommagetrennte Liste von Domains, welche eine Freundschaft mit dieser Seite eingehen dürfen. 
+Kommagetrennte Liste von Domains, welche eine Freundschaft mit dieser Seite eingehen dürfen.
 Wildcards werden akzeptiert (Wildcard-Unterstützung unter Windows benötigt PHP5.3) Standardmäßig sind alle gültigen Domains erlaubt.
 
 Mit dieser Option kann man einfach geschlossene Netzwerke, z.B. im schulischen Bereich aufbauen, aus denen nicht mit dem Rest des Netzwerks kommuniziert werden soll.
 
 #### Erlaubte Domains für E-Mails
 
-Kommagetrennte Liste von Domains, welche bei der Registrierung als Part der Email-Adresse erlaubt sind. 
-Das grenzt Leute aus, die nicht Teil der Gruppe oder Organisation sind. 
+Kommagetrennte Liste von Domains, welche bei der Registrierung als Part der Email-Adresse erlaubt sind.
+Das grenzt Leute aus, die nicht Teil der Gruppe oder Organisation sind.
 Wildcards werden akzeptiert (Wildcard-Unterstützung unter Windows benötigt PHP5.3) Standardmäßig sind alle gültigen Email-Adressen erlaubt.
 
 #### Nutzern erlauben das remote_self Flag zu setzen
@@ -156,6 +156,14 @@ Außerdem könnte es durch Nutzer als Spam Verteiler missbraucht werden.
 Als Administrator der Friendica-Instanz kannst du diese Einstellungen ansonsten nur direkt in der Datenbank vornehmen.
 Bevor du das tust solltest du sicherstellen, dass du ein Backup der Datenbank hast und genau weißt was die Änderungen an der Datenbank bewirken, die du vornehmen willst.
 
+#### Explizite Inhalte
+
+Wenn Sie einen Knoten mit explizitem, nicht jugendfreien Inhalt betreiben, können Sie dies mit dieser Option ankündigen.
+Ist diese Option aktiviert, wird ein Informationsflag in den veröffentlichten Informationen zu Ihrem Knoten gesetzt.
+(Sollte *Server Informationen veröffentlichen* aktiviert sein.)
+
+Zusätzlich wird auf der Registrierungsseite für neue Benutzer ein Hinweis angezeigt.
+
 ### Erweitert
 
 #### Proxy Einstellungen
@@ -164,23 +172,23 @@ Wenn deine Seite eine Proxy-Einstellung nutzt, musst du diese Einstellungen vorn
 
 #### Netzwerk Wartezeit
 
-Legt fest, wie lange das Netzwerk warten soll, bevor ein Timeout eintritt. 
+Legt fest, wie lange das Netzwerk warten soll, bevor ein Timeout eintritt.
 Der Wert wird in Sekunden angegeben. Standardmäßig ist 60 eingestellt; 0 steht für "unbegrenzt" (nicht empfohlen).
 
 #### UTF-8 Reguläre Ausdrücke
 
-Während der Registrierung werden die Namen daraufhin geprüft, ob sie reguläre UTF-8-Ausdrücke nutzen. 
-Hierfür wird PHP benötigt, um mit einer speziellen Einstellung kompiliert zu werden, die UTF-8-Ausdrücke benutzt. 
+Während der Registrierung werden die Namen daraufhin geprüft, ob sie reguläre UTF-8-Ausdrücke nutzen.
+Hierfür wird PHP benötigt, um mit einer speziellen Einstellung kompiliert zu werden, die UTF-8-Ausdrücke benutzt.
 Wenn du absolut keine Möglichkeit hast, Accounts zu registrieren, setze diesen Wert auf ja.
 
 #### SSL Überprüfen
 
-Standardmäßig erlaubt Friendica SSL-Kommunikation von Seiten, die "selbst unterzeichnete" SSL-Zertifikate nutzen. 
-Um eine weitreichende Kompatibilität mit anderen Netzwerken und Browsern zu gewährleisten, empfehlen wir, selbst unterzeichnete Zertifikate **nicht** zu nutzen. 
-Aber wir halten dich nicht davon ab, solche zu nutzen. SSL verschlüsselt alle Daten zwischen den Webseiten (und für deinen Browser), was dir eine komplett verschlüsselte Kommunikation erlaubt. 
-Auch schützt es deine Login-Daten vor Datendiebstahl. Selbst unterzeichnete Zertifikate können kostenlos erstellt werden. 
-Diese Zertifikate können allerdings Opfer eines sogenannten ["man-in-the-middle"-Angriffs](http://de.wikipedia.org/wiki/Man-in-the-middle-Angriff) werden, und sind daher weniger bevorzugt. 
-Wenn du es wünscht, kannst du eine strikte Zertifikatabfrage einstellen. 
+Standardmäßig erlaubt Friendica SSL-Kommunikation von Seiten, die "selbst unterzeichnete" SSL-Zertifikate nutzen.
+Um eine weitreichende Kompatibilität mit anderen Netzwerken und Browsern zu gewährleisten, empfehlen wir, selbst unterzeichnete Zertifikate **nicht** zu nutzen.
+Aber wir halten dich nicht davon ab, solche zu nutzen. SSL verschlüsselt alle Daten zwischen den Webseiten (und für deinen Browser), was dir eine komplett verschlüsselte Kommunikation erlaubt.
+Auch schützt es deine Login-Daten vor Datendiebstahl. Selbst unterzeichnete Zertifikate können kostenlos erstellt werden.
+Diese Zertifikate können allerdings Opfer eines sogenannten ["man-in-the-middle"-Angriffs](http://de.wikipedia.org/wiki/Man-in-the-middle-Angriff) werden, und sind daher weniger bevorzugt.
+Wenn du es wünscht, kannst du eine strikte Zertifikatabfrage einstellen.
 Das führt dazu, dass du keinerlei Verbindung zu einer selbst unterzeichneten SSL-Seite erstellen kannst
 
 ### Automatisch ein Kontaktverzeichnis erstellen
@@ -305,7 +313,7 @@ Du solltest deshalb einen Dienst zur [log rotation](https://en.wikipedia.org/wik
 **Bekannte Probleme**: Der Dateiname `friendica.log` kann bei speziellen Server Konfigurationen zu Problemen führen (siehe [issue 2209](https://github.com/friendica/friendica/issues/2209)).
 
 Normalerweise werden Fehler- und Warnmeldungen von PHP unterdrückt.
-Wenn du sie aktivieren willst, musst du folgendes in der `.htconfig.php` Datei eintragen um die Meldungen in die Datei `php.out` zu speichern
+Wenn du sie aktivieren willst, musst du folgendes in der `config/local.ini.php` Datei eintragen um die Meldungen in die Datei `php.out` zu speichern
 
 	error_reporting(E_ERROR | E_WARNING | E_PARSE );
 	ini_set('error_log','php.out');
@@ -344,6 +352,14 @@ Mit den folgenden Einstellungen kannst du die Zugriffsdaten für den Datenbank S
     $db_pass = 'db_password';
     $db_data = 'database_name';
 
+Sollten alle der folgenden Environment-Variablen gesetzt sein, wird Friendica diese anstatt der vorher konfigurierten Werte nutzen.
+
+    MYSQL_HOST
+    MYSQL_PORT
+    MYSQL_USERNAME
+    MYSQL_PASSWORD
+    MYSQL_DATABASE
+
 ## Administratoren
 
 Du kannst einen, oder mehrere Accounts, zu Administratoren machen.
@@ -351,14 +367,16 @@ Normalerweise trifft dies auf den ersten Account zu, der nach der Installation a
 Die Liste der E-Mail Adressen kann aber einfach erweitert werden.
 Mit keiner der angegebenen E-Mail Adressen können weitere Accounts registriert werden.
 
-    $a->config['admin_email'] = 'you@example.com, buddy@example.com';
+    [config]
+    admin_email = you@example.com, buddy@example.com
 
 ## PHP Pfad
 
 Einige Prozesse von Friendica laufen im Hintergrund.
 Für diese Prozesse muss der Pfad zu der PHP Version gesetzt sein, die verwendet werden soll.
 
-    $a->config['php_path'] = '/pfad/zur/php-version';
+    [config]
+    php_path = {{$phpath}}
 
 ## Unterverzeichnis Konfiguration
 
@@ -366,9 +384,10 @@ Man kann Friendica in ein Unterverzeichnis des Webservers installieren.
 Wir raten allerdings dringen davon ab, da es die Interoperabilität mit anderen Netzwerken (z.B. Diaspora, GNU Social, Hubzilla) verhindert.
 Mal angenommen, du hast ein Unterverzeichnis tests und willst Friendica in ein weiteres Unterverzeichnis installieren, dann lautet die Konfiguration hierfür:
 
-    $a->path = 'tests/friendica';
+    [system]
+    urlpath = tests/friendica
 
 ## Weitere Ausnahmen
 
-Es gibt noch einige experimentelle Einstellungen, die nur in der ``.htconfig.php`` Datei konfiguriert werden können.
-Im [Konfigurationswerte, die nur in der .htconfig.php gesetzt werden können (EN)](help/htconfig) Artikel kannst du mehr darüber erfahren.
+Es gibt noch einige experimentelle Einstellungen, die nur in der ``config/local.ini.php`` Datei konfiguriert werden können.
+Im [Konfigurationswerte, die nur in der config/local.ini.php gesetzt werden können (EN)](help/Config) Artikel kannst du mehr darüber erfahren.
diff --git a/doc/htconfig.md b/doc/htconfig.md
deleted file mode 100644
index 6598fa142..000000000
--- a/doc/htconfig.md
+++ /dev/null
@@ -1,126 +0,0 @@
-Config values that can only be set in .htconfig.php
-===================================================
-
-* [Home](help)
-
-There are some config values that haven't found their way into the administration page.
-This has several reasons.
-Maybe they are part of a current development that isn't considered stable and will be added later in the administration page when it is considered safe.
-Or it triggers something that isn't expected to be of public interest.
-Or it is for testing purposes only.
-
-**Attention:** Please be warned that you shouldn't use one of these values without the knowledge what it could trigger.
-Especially don't do that with undocumented values.
-
-The header of the section describes the category, the value is the parameter.
-Example: To set the automatic database cleanup process add this line to your .htconfig.php:
-
-    $a->config['system']['always_show_preview'] = true;
-
-## jabber ##
-* **debug** (Boolean) - Enable debug level for the jabber account synchronisation.
-* **lockpath** - Must be writable by the ejabberd process. if set then it will prevent the running of multiple processes.
-
-## system ##
-
-* **allowed_link_protocols** (Array) - Allowed protocols in links URLs, add at your own risk. http is always allowed.
-* **always_show_preview** (Boolean) - Only show small preview picures. Default value is false.
-* **archival_days** (Integer) - Number of days that we try to deliver content before we archive a contact. Defaults to 32.
-* **auth_cookie_lifetime** (Integer) - Number of days that should pass without any activity before a user who chose "Remember me" when logging in is considered logged out. Defaults to 7.
-* **block_local_dir** (Boolean) - Blocks the access to the directory of the local users.
-* **config_adapter** (jit|preload) - Allow to switch the configuration adapter to improve performances at the cost of memory consumption. Default value is "jit"
-* **curl_range_bytes** - Maximum number of bytes that should be fetched. Default is 0, which mean "no limit".
-* **db_log** - Name of a logfile to log slow database queries
-* **db_loglimit** - If a database call lasts longer than this value it is logged
-* **db_log_index** - Name of a logfile to log queries with bad indexes
-* **db_log_index_watch** - Watchlist of indexes to watch
-* **db_loglimit_index** - Number of index rows needed to be logged for indexes on the watchlist
-* **db_loglimit_index_high** - Number of index rows to be logged anyway (for any index)
-* **db_log_index_blacklist** - Blacklist of indexes that shouldn't be watched
-* **diaspora_test** (Boolean) - For development only. Disables the message transfer.
-* **disable_email_validation** (Boolean) - Disables the check if a mail address is in a valid format and can be resolved via DNS.
-* **disable_url_validation** (Boolean) - Disables the DNS lookup of an URL.
-* **disable_password_exposed** (Boolean) - Disable the exposition check against the remote haveibeenpwned API on password change. Default value is false.
-* **dlogfile - location of the developer log file
-* **dlogip - restricts develop log writes to requests originating from this IP address
-* **frontend_worker_timeout** - Value in minutes after we think that a frontend task was killed by the webserver. Default value is 10.
-* **hsts** (Boolean) - Enables the sending of HTTP Strict Transport Security headers
-* **ignore_cache** (Boolean) - For development only. Disables the item cache.
-* **instances_social_key** - Key to the API of https://instances.social which retrieves data about mastodon servers. See https://instances.social/api/token to get an API key.
-* **ipv4_resolve** (Boolean) - Resolve IPV4 addresses only. Don't resolve to IPV6. Default value is false.
-* **invitation_only** (Boolean) -  If set true registration is only possible after a current member of the node has send an invitation. Default is false.
-* **like_no_comment** (Boolean) - Don't update the "commented" value of an item when it is liked.
-* **local_block** (Boolean) - Used in conjunction with "block_public".
-* **local_search** (Boolean) - Blocks search for users who are not logged in to prevent crawlers from blocking your system.
-* **local_tags** (Boolean) - If activated, all hashtags will point to the local server.
-* **max_connections** - The maximum number of database connections which can be in use before the worker process is deferred to it's next interval.  When the system can't detect the maximum numbers of connection then this value can be used.
-* **max_connections_level** - The maximum level of connections that are allowed to let the worker start. It is a percentage value. Default value is 75.
-* **max_contact_queue** - Default value is 500.
-* **max_batch_queue** - Default value is 1000.
-* **max_processes_backend** - Maximum number of concurrent database processes for background tasks. Default value is 5.
-* **max_processes_frontend** - Maximum number of concurrent database processes for foreground tasks. Default value is 20.
-* **min_poll_interval** - minimal distance in minutes between two polls for a contact. Default is 1. Reasonable values are between 1 and 59.
-* **session_handler** (database|cache|native) - Whether to use Cache to store session data or to use PHP native session storage. Default value is `database`.
-* **cache_driver** (database|memcache|memcached) - Whether to use Memcache or Memcached to store temporary cache. Default value is `database`.
-* **memcache_host** - Host name of the memcache daemon. Default is '127.0.0.1'.
-* **memcache_port** - Port number of the memcache daemon. Default is 11211.
-* **memcached_hosts** - Array of Memcached servers info `[host, port(, weight)]`. Default value is `[['127.0.0.1', 11211]]`.
-* **no_count** (Boolean) - Don't do count calculations (currently only when showing albums)
-* **no_oembed** (Boolean) - Don't use OEmbed to fetch more information about a link.
-* **no_smilies** (Boolean) - Don't show smilies.
-* **no_view_full_size** (Boolean) - Don't add the link "View full size" under a resized image.
-* **optimize_items** (Boolean) - Triggers an SQL command to optimize the item table before expiring items.
-* **ostatus_poll_timeframe** - Defines how old an item can be to try to complete the conversation with it.
-* **paranoia** (Boolean) - Log out users if their IP address changed.
-* **permit_crawling** (Boolean) - Restricts the search for not logged in users to one search per minute.
-* **queue_no_dead_check** (Boolean) - Ignore if the target contact or server seems to be dead during queue delivery.
-* **worker_debug** (Boolean) - If enabled, it prints out the number of running processes split by priority.
-* **worker_fetch_limit** - Number of worker tasks that are fetched in a single query. Default is 1.
-* **profiler** (Boolean) - Enable internal timings to help optimize code. Needed for "rendertime" addon. Default is false.
-* **free_crawls** - Number of "free" searches when "permit_crawling" is activated (Default value is 10)
-* **crawl_permit_period** - Period in seconds between allowed searches when the number of free searches is reached and "permit_crawling" is activated (Default value is 60)
-* **png_quality** - Default value is 8.
-* **proc_windows** (Boolean) - Should be enabled if Friendica is running under Windows.
-* **proxy_cache_time** - Time after which the cache is cleared. Default value is one day.
-* **pushpoll_frequency** -
-* **qsearch_limit** - Default value is 100.
-* **remove_multiplicated_lines** (Boolean) - If enabled, multiple linefeeds in items are stripped to a single one.
-* **show_unsupported_addons** (Boolean) - Show all addons including the unsupported ones.
-* **show_unsupported_themes** (Boolean) - Show all themes including the unsupported ones.
-* **show_global_community_hint** (Boolean) - When the global community page is enabled, use this option to display a hint above the stream, that this is a collection of all public top-level postings that arrive on your node.
-* **throttle_limit_day** - Maximum number of posts that a user can send per day with the API.
-* **throttle_limit_week** - Maximum number of posts that a user can send per week with the API.
-* **throttle_limit_month** - Maximum number of posts that a user can send per month with the API.
-* **wall-to-wall_share** (Boolean) - Displays forwarded posts like "wall-to-wall" posts.
-* **worker_cooldown** - Cooldown time after each worker function call. Default value is 0 seconds.
-* **xrd_timeout** - Timeout for fetching the XRD links. Default value is 20 seconds.
-
-## experimental ##
-
-* **exp_themes** (Boolean) - Show experimental themes as well.
-
-## theme ##
-
-* **hide_eventlist** (Boolean) - Don't show the birthdays and events on the profile and network page
-
-# Administrator Options #
-
-Enabling the admin panel for an account, and thus making the account holder admin of the node, is done by setting the variable
-
-    $a->config['admin_email'] = "someone@example.com";
-
-Where you have to match the email address used for the account with the one you enter to the .htconfig file.
-If more then one account should be able to access the admin panel, seperate the email addresses with a comma.
-
-    $a->config['admin_email'] = "someone@example.com,someonelese@example.com";
-
-If you want to have a more personalized closing line for the notification emails you can set a variable for the admin_name.
-
-    $a->config['admin_name'] = "Marvin";
-
-## Database Settings
-
-The configuration variables db_host, db_user, db_pass and db_data are holding your credentials for the database connection.
-If you need to specify a port to access the database, you can do so by appending ":portnumber" to the db_host variable.
-
-    $db_host = 'your.mysqlhost.com:123456';
diff --git a/doc/img/acl_win.png b/doc/img/acl_win.png
index 00ad76699..559493d44 100644
Binary files a/doc/img/acl_win.png and b/doc/img/acl_win.png differ
diff --git a/doc/img/camera.png b/doc/img/camera.png
index 1f8a92c34..89acdbde7 100644
Binary files a/doc/img/camera.png and b/doc/img/camera.png differ
diff --git a/doc/img/darkbubble.png b/doc/img/darkbubble.png
index 1ca0ba5fb..08c7a93ee 100644
Binary files a/doc/img/darkbubble.png and b/doc/img/darkbubble.png differ
diff --git a/doc/img/darkzero.png b/doc/img/darkzero.png
index 7c6aa177a..00dc3ee4f 100644
Binary files a/doc/img/darkzero.png and b/doc/img/darkzero.png differ
diff --git a/doc/img/diabook.png b/doc/img/diabook.png
index 5c55baaaf..1a1f8d915 100644
Binary files a/doc/img/diabook.png and b/doc/img/diabook.png differ
diff --git a/doc/img/dispy.png b/doc/img/dispy.png
index 57387a781..476fa3341 100644
Binary files a/doc/img/dispy.png and b/doc/img/dispy.png differ
diff --git a/doc/img/editor_darkbubble.png b/doc/img/editor_darkbubble.png
index 6bad6ef50..d76664866 100644
Binary files a/doc/img/editor_darkbubble.png and b/doc/img/editor_darkbubble.png differ
diff --git a/doc/img/editor_frio.png b/doc/img/editor_frio.png
index 8428b3438..cb5ad0bcc 100644
Binary files a/doc/img/editor_frio.png and b/doc/img/editor_frio.png differ
diff --git a/doc/img/editor_frost.png b/doc/img/editor_frost.png
index 39bf11e3e..d0ac5a412 100644
Binary files a/doc/img/editor_frost.png and b/doc/img/editor_frost.png differ
diff --git a/doc/img/editor_vier.png b/doc/img/editor_vier.png
index 67df8aed8..217f67ac6 100644
Binary files a/doc/img/editor_vier.png and b/doc/img/editor_vier.png differ
diff --git a/doc/img/editor_zero.png b/doc/img/editor_zero.png
index c1607396c..a1ee37b2d 100644
Binary files a/doc/img/editor_zero.png and b/doc/img/editor_zero.png differ
diff --git a/doc/img/friendica_editor.png b/doc/img/friendica_editor.png
index aebcf111b..79f0cb35d 100644
Binary files a/doc/img/friendica_editor.png and b/doc/img/friendica_editor.png differ
diff --git a/doc/img/friendica_rich_editor.png b/doc/img/friendica_rich_editor.png
index 4cd8beac9..170b8ec3b 100644
Binary files a/doc/img/friendica_rich_editor.png and b/doc/img/friendica_rich_editor.png differ
diff --git a/doc/img/frost.png b/doc/img/frost.png
index 011598b13..1b619a6ac 100644
Binary files a/doc/img/frost.png and b/doc/img/frost.png differ
diff --git a/doc/img/globe.png b/doc/img/globe.png
index ec1b7ff4a..7a563abcf 100644
Binary files a/doc/img/globe.png and b/doc/img/globe.png differ
diff --git a/doc/img/paper_clip.png b/doc/img/paper_clip.png
index 51c7cdf70..97aea40a4 100644
Binary files a/doc/img/paper_clip.png and b/doc/img/paper_clip.png differ
diff --git a/doc/img/post_categorize.png b/doc/img/post_categorize.png
index 54a311870..86aee535e 100644
Binary files a/doc/img/post_categorize.png and b/doc/img/post_categorize.png differ
diff --git a/doc/img/post_link.png b/doc/img/post_link.png
index b28fca3b9..cd7df78d2 100644
Binary files a/doc/img/post_link.png and b/doc/img/post_link.png differ
diff --git a/doc/img/post_mark.png b/doc/img/post_mark.png
index 6bee82f18..7781b8ca0 100644
Binary files a/doc/img/post_mark.png and b/doc/img/post_mark.png differ
diff --git a/doc/img/post_share.png b/doc/img/post_share.png
index f5821692e..a75ce2ad2 100644
Binary files a/doc/img/post_share.png and b/doc/img/post_share.png differ
diff --git a/doc/img/post_tag.png b/doc/img/post_tag.png
index dc9826c23..fa9fca679 100644
Binary files a/doc/img/post_tag.png and b/doc/img/post_tag.png differ
diff --git a/doc/img/post_thumbs_down.png b/doc/img/post_thumbs_down.png
index 818dcf504..01177796e 100644
Binary files a/doc/img/post_thumbs_down.png and b/doc/img/post_thumbs_down.png differ
diff --git a/doc/img/post_thumbs_up.png b/doc/img/post_thumbs_up.png
index a3562c386..aea54abc4 100644
Binary files a/doc/img/post_thumbs_up.png and b/doc/img/post_thumbs_up.png differ
diff --git a/doc/img/posts_define.png b/doc/img/posts_define.png
index 376a161c5..1d2cb087e 100644
Binary files a/doc/img/posts_define.png and b/doc/img/posts_define.png differ
diff --git a/doc/img/video.png b/doc/img/video.png
index 00561f1b3..3ee2d1257 100644
Binary files a/doc/img/video.png and b/doc/img/video.png differ
diff --git a/htconfig.php b/htconfig.php
deleted file mode 100644
index 0e838bd90..000000000
--- a/htconfig.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-// If automatic system installation fails:
-
-
-die('The configuration you did manually contains some mistakes. Please have a look at your .htconfig.php file.');
-// If you are doing the configuration manually, please remove the line above
-
-
-// Copy or rename this file to .htconfig.php
-
-// Why .htconfig.php? Because it contains sensitive information which could
-// give somebody complete control of your database. Apache's default
-// configuration denies access to and refuses to serve any file beginning
-// with .ht
-
-// Then set the following for your MySQL installation
-
-$db_host = 'your.mysqlhost.com';
-$db_user = 'mysqlusername';
-$db_pass = 'mysqlpassword';
-$db_data = 'mysqldatabasename';
-
-// Use environment variables for mysql if they are set beforehand
-if (!empty(getenv('MYSQL_HOST'))
-	&& !empty(getenv('MYSQL_PORT'))
-	&& (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
-	&& !empty(getenv('MYSQL_PASSWORD'))
-	&& !empty(getenv('MYSQL_DATABASE'))) {
-	$db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
-	if (!empty(getenv('MYSQL_USERNAME'))) {
-		$db_user = getenv('MYSQL_USERNAME');
-	} elseif (!empty(getenv('MYSQL_USER'))) {
-		$db_user = getenv('MYSQL_USER');
-	}
-	$db_pass = getenv('MYSQL_PASSWORD');
-	$db_data = getenv('MYSQL_DATABASE');
-}
-
-// Set the database connection charset to full Unicode (utf8mb4).
-// Changing this value will likely corrupt the special characters.
-// You have been warned.
-$a->config['system']['db_charset'] = "utf8mb4";
-
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-$default_timezone = 'America/Los_Angeles';
-
-// Default system language
-
-$a->config['system']['language'] = 'en';
-
-// What is your site name?
-
-$a->config['sitename'] = "Friendica Social Network";
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-// In order to perform system administration via the admin panel, admin_email
-// must precisely match the email address of the person logged in.
-
-$a->config['register_policy'] = REGISTER_OPEN;
-$a->config['register_text'] = '';
-$a->config['admin_email'] = '';
-
-// Maximum size of an imported message, 0 is unlimited
-
-$a->config['max_import_size'] = 200000;
-
-// maximum size of uploaded photos
-
-$a->config['system']['maximagesize'] = 800000;
-
-// Location of PHP command line processor
-
-$a->config['php_path'] = 'php';
-
-// Server-to-server private message encryption (RINO) is allowed by default.
-// set to 0 to disable, 1 to enable
-
-$a->config['system']['rino_encrypt'] = 1;
-
-// allowed themes (change this from admin panel after installation)
-
-$a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero,smoothly';
-
-// default system theme
-
-$a->config['system']['theme'] = 'vier';
-
-
-// By default allow pseudonyms
-
-$a->config['system']['no_regfullname'] = true;
-
-//Deny public access to the local directory
-//$a->config['system']['block_local_dir'] = false;
-
-// Location of the global directory
-$a->config['system']['directory'] = 'https://dir.friendica.social';
-
-// Allowed protocols in link URLs; HTTP protocols always are accepted
-$a->config['system']['allowed_link_protocols'] = ['ftp', 'ftps', 'mailto', 'cid', 'gopher'];
-
-// Authentication cookie lifetime, in days
-$a->config['system']['auth_cookie_lifetime'] = 7;
diff --git a/images/appnet.png b/images/appnet.png
index c51dbf8c4..d92199704 100644
Binary files a/images/appnet.png and b/images/appnet.png differ
diff --git a/images/blank.png b/images/blank.png
index 67d391966..e42e9f918 100644
Binary files a/images/blank.png and b/images/blank.png differ
diff --git a/images/blogger.png b/images/blogger.png
index 9b0b4e47b..070da9408 100644
Binary files a/images/blogger.png and b/images/blogger.png differ
diff --git a/images/content-types.png b/images/content-types.png
index e46eba610..c63e2007d 100644
Binary files a/images/content-types.png and b/images/content-types.png differ
diff --git a/images/default-profile-mm.jpg b/images/default-profile-mm.jpg
index 79c1a8530..4878c016d 100644
Binary files a/images/default-profile-mm.jpg and b/images/default-profile-mm.jpg differ
diff --git a/images/default-profile-sm.jpg b/images/default-profile-sm.jpg
index 348957fb4..ea0030ede 100644
Binary files a/images/default-profile-sm.jpg and b/images/default-profile-sm.jpg differ
diff --git a/images/default-profile.jpg b/images/default-profile.jpg
index 85fbca8cd..2e3696fb3 100644
Binary files a/images/default-profile.jpg and b/images/default-profile.jpg differ
diff --git a/images/diaspora-logo.png b/images/diaspora-logo.png
index b385d4bda..6bfe8559a 100644
Binary files a/images/diaspora-logo.png and b/images/diaspora-logo.png differ
diff --git a/images/dreamwidth.png b/images/dreamwidth.png
index fe39b962e..48aafc71e 100644
Binary files a/images/dreamwidth.png and b/images/dreamwidth.png differ
diff --git a/images/facebook.png b/images/facebook.png
index d8e598189..4a3248edc 100644
Binary files a/images/facebook.png and b/images/facebook.png differ
diff --git a/images/friendica-128.jpg b/images/friendica-128.jpg
index f7d86ae50..dc210584a 100644
Binary files a/images/friendica-128.jpg and b/images/friendica-128.jpg differ
diff --git a/images/friendica-256.jpg b/images/friendica-256.jpg
index 182810d62..cca2facf7 100644
Binary files a/images/friendica-256.jpg and b/images/friendica-256.jpg differ
diff --git a/images/gnusocial.png b/images/gnusocial.png
index be23e621b..e4b4e0458 100644
Binary files a/images/gnusocial.png and b/images/gnusocial.png differ
diff --git a/images/googleplus.png b/images/googleplus.png
index e51c3dd70..90ce8f352 100644
Binary files a/images/googleplus.png and b/images/googleplus.png differ
diff --git a/images/icons.png b/images/icons.png
index e255316e6..6a407a37a 100644
Binary files a/images/icons.png and b/images/icons.png differ
diff --git a/images/icons/10/add.png b/images/icons/10/add.png
index 296e8e500..d70b353bd 100644
Binary files a/images/icons/10/add.png and b/images/icons/10/add.png differ
diff --git a/images/icons/10/audio.png b/images/icons/10/audio.png
index cfc2fdcbd..77878583d 100644
Binary files a/images/icons/10/audio.png and b/images/icons/10/audio.png differ
diff --git a/images/icons/10/delete.png b/images/icons/10/delete.png
index e4bd85933..725c5db1c 100644
Binary files a/images/icons/10/delete.png and b/images/icons/10/delete.png differ
diff --git a/images/icons/10/edit.png b/images/icons/10/edit.png
index d939342a1..203da1807 100644
Binary files a/images/icons/10/edit.png and b/images/icons/10/edit.png differ
diff --git a/images/icons/10/gear.png b/images/icons/10/gear.png
index b1f2a8f52..796117ceb 100644
Binary files a/images/icons/10/gear.png and b/images/icons/10/gear.png differ
diff --git a/images/icons/10/menu.png b/images/icons/10/menu.png
index 7dbb779d0..f9dce5e27 100644
Binary files a/images/icons/10/menu.png and b/images/icons/10/menu.png differ
diff --git a/images/icons/10/play.png b/images/icons/10/play.png
index a9f99e4d1..6f949c180 100644
Binary files a/images/icons/10/play.png and b/images/icons/10/play.png differ
diff --git a/images/icons/10/plugin.png b/images/icons/10/plugin.png
index 6cfc40786..44b68e0b3 100644
Binary files a/images/icons/10/plugin.png and b/images/icons/10/plugin.png differ
diff --git a/images/icons/10/star.png b/images/icons/10/star.png
index cd8518a18..ba8a5dfc4 100644
Binary files a/images/icons/10/star.png and b/images/icons/10/star.png differ
diff --git a/images/icons/16/add.png b/images/icons/16/add.png
index 1ff064bb3..5e353d1a3 100644
Binary files a/images/icons/16/add.png and b/images/icons/16/add.png differ
diff --git a/images/icons/16/delete.png b/images/icons/16/delete.png
index 532346860..cc87e1afc 100644
Binary files a/images/icons/16/delete.png and b/images/icons/16/delete.png differ
diff --git a/images/icons/16/edit.png b/images/icons/16/edit.png
index bd845a767..d66b68f73 100644
Binary files a/images/icons/16/edit.png and b/images/icons/16/edit.png differ
diff --git a/images/icons/16/gear.png b/images/icons/16/gear.png
index 86cbe1eb8..d7f4c7f01 100644
Binary files a/images/icons/16/gear.png and b/images/icons/16/gear.png differ
diff --git a/images/icons/16/image.png b/images/icons/16/image.png
index c52b9730d..d8028872d 100644
Binary files a/images/icons/16/image.png and b/images/icons/16/image.png differ
diff --git a/images/icons/16/menu.png b/images/icons/16/menu.png
index a6b1cac47..585f98b2a 100644
Binary files a/images/icons/16/menu.png and b/images/icons/16/menu.png differ
diff --git a/images/icons/16/play.png b/images/icons/16/play.png
index 19ad05bf2..08d2c6b79 100644
Binary files a/images/icons/16/play.png and b/images/icons/16/play.png differ
diff --git a/images/icons/16/star.png b/images/icons/16/star.png
index ac620c43c..33dfc11c6 100644
Binary files a/images/icons/16/star.png and b/images/icons/16/star.png differ
diff --git a/images/icons/22/add.png b/images/icons/22/add.png
index 2079e725d..bd068c0ee 100644
Binary files a/images/icons/22/add.png and b/images/icons/22/add.png differ
diff --git a/images/icons/22/delete.png b/images/icons/22/delete.png
index d0f2acf13..b0e9b1a5a 100644
Binary files a/images/icons/22/delete.png and b/images/icons/22/delete.png differ
diff --git a/images/icons/22/edit.png b/images/icons/22/edit.png
index ad251b8ed..fc2a6aabf 100644
Binary files a/images/icons/22/edit.png and b/images/icons/22/edit.png differ
diff --git a/images/icons/22/gear.png b/images/icons/22/gear.png
index 9ccf5280b..751cb737c 100644
Binary files a/images/icons/22/gear.png and b/images/icons/22/gear.png differ
diff --git a/images/icons/22/image.png b/images/icons/22/image.png
index f00e3a290..f6a0982dc 100644
Binary files a/images/icons/22/image.png and b/images/icons/22/image.png differ
diff --git a/images/icons/22/menu.png b/images/icons/22/menu.png
index e3461da8b..a6d610a29 100644
Binary files a/images/icons/22/menu.png and b/images/icons/22/menu.png differ
diff --git a/images/icons/22/notify_on.png b/images/icons/22/notify_on.png
index 18002e15c..d4c93bf01 100644
Binary files a/images/icons/22/notify_on.png and b/images/icons/22/notify_on.png differ
diff --git a/images/icons/22/star.png b/images/icons/22/star.png
index 484e24794..9a7ea4184 100644
Binary files a/images/icons/22/star.png and b/images/icons/22/star.png differ
diff --git a/images/icons/48/add.png b/images/icons/48/add.png
index 753ac4b68..31e70ceab 100644
Binary files a/images/icons/48/add.png and b/images/icons/48/add.png differ
diff --git a/images/icons/48/audio.png b/images/icons/48/audio.png
index 23f49b54d..e1dcec7c8 100644
Binary files a/images/icons/48/audio.png and b/images/icons/48/audio.png differ
diff --git a/images/icons/48/delete.png b/images/icons/48/delete.png
index 2835638a9..e93b6155c 100644
Binary files a/images/icons/48/delete.png and b/images/icons/48/delete.png differ
diff --git a/images/icons/48/edit.png b/images/icons/48/edit.png
index 709fbb357..8623c6461 100644
Binary files a/images/icons/48/edit.png and b/images/icons/48/edit.png differ
diff --git a/images/icons/48/feed.png b/images/icons/48/feed.png
index 13d88f707..21f62b99e 100644
Binary files a/images/icons/48/feed.png and b/images/icons/48/feed.png differ
diff --git a/images/icons/48/gear.png b/images/icons/48/gear.png
index 8bb12e96e..08d66ea89 100644
Binary files a/images/icons/48/gear.png and b/images/icons/48/gear.png differ
diff --git a/images/icons/48/group.png b/images/icons/48/group.png
index 26238ac6a..7e4c38b06 100644
Binary files a/images/icons/48/group.png and b/images/icons/48/group.png differ
diff --git a/images/icons/48/image.png b/images/icons/48/image.png
index cc0c86872..885eb3001 100644
Binary files a/images/icons/48/image.png and b/images/icons/48/image.png differ
diff --git a/images/icons/48/lock.png b/images/icons/48/lock.png
index b9db282ac..dfc4b0ae6 100644
Binary files a/images/icons/48/lock.png and b/images/icons/48/lock.png differ
diff --git a/images/icons/48/menu.png b/images/icons/48/menu.png
index 376e60cab..50fe7d3bc 100644
Binary files a/images/icons/48/menu.png and b/images/icons/48/menu.png differ
diff --git a/images/icons/48/notify_on.png b/images/icons/48/notify_on.png
index 3275898c5..ac10a2a0e 100644
Binary files a/images/icons/48/notify_on.png and b/images/icons/48/notify_on.png differ
diff --git a/images/icons/48/play.png b/images/icons/48/play.png
index fce589370..479b61b1c 100644
Binary files a/images/icons/48/play.png and b/images/icons/48/play.png differ
diff --git a/images/icons/48/plugin.png b/images/icons/48/plugin.png
index c74c6bf46..6a6682e2f 100644
Binary files a/images/icons/48/plugin.png and b/images/icons/48/plugin.png differ
diff --git a/images/icons/48/star.png b/images/icons/48/star.png
index f53914efa..26130caa5 100644
Binary files a/images/icons/48/star.png and b/images/icons/48/star.png differ
diff --git a/images/icons/48/text.png b/images/icons/48/text.png
index 502394547..d59c1f244 100644
Binary files a/images/icons/48/text.png and b/images/icons/48/text.png differ
diff --git a/images/icons/48/user.png b/images/icons/48/user.png
index c42410cd1..1c9f1df8b 100644
Binary files a/images/icons/48/user.png and b/images/icons/48/user.png differ
diff --git a/images/icons/48/video.png b/images/icons/48/video.png
index dde02f600..ab7c83aec 100644
Binary files a/images/icons/48/video.png and b/images/icons/48/video.png differ
diff --git a/images/icons/48/zip.png b/images/icons/48/zip.png
index 08a9330c4..f8183e10f 100644
Binary files a/images/icons/48/zip.png and b/images/icons/48/zip.png differ
diff --git a/images/icons/add.png b/images/icons/add.png
index 78497fbc9..c1157ba7c 100644
Binary files a/images/icons/add.png and b/images/icons/add.png differ
diff --git a/images/icons/audio.png b/images/icons/audio.png
index 1e1561266..a8892f5f6 100644
Binary files a/images/icons/audio.png and b/images/icons/audio.png differ
diff --git a/images/icons/delete.png b/images/icons/delete.png
index f0cae5154..679f233eb 100644
Binary files a/images/icons/delete.png and b/images/icons/delete.png differ
diff --git a/images/icons/edit.png b/images/icons/edit.png
index aeaf835fe..102b08159 100644
Binary files a/images/icons/edit.png and b/images/icons/edit.png differ
diff --git a/images/icons/feed.png b/images/icons/feed.png
index 6894257e9..15af32e80 100644
Binary files a/images/icons/feed.png and b/images/icons/feed.png differ
diff --git a/images/icons/gear.png b/images/icons/gear.png
index 02847ef9d..20b9b4117 100644
Binary files a/images/icons/gear.png and b/images/icons/gear.png differ
diff --git a/images/icons/group.png b/images/icons/group.png
index de0dc7901..0b77349ca 100644
Binary files a/images/icons/group.png and b/images/icons/group.png differ
diff --git a/images/icons/image.png b/images/icons/image.png
index cec105bfd..e9bcb932d 100644
Binary files a/images/icons/image.png and b/images/icons/image.png differ
diff --git a/images/icons/info.png b/images/icons/info.png
index ea2b0ffa4..7c6d99e46 100644
Binary files a/images/icons/info.png and b/images/icons/info.png differ
diff --git a/images/icons/link.png b/images/icons/link.png
index 743bdf0f9..0a69a41fb 100644
Binary files a/images/icons/link.png and b/images/icons/link.png differ
diff --git a/images/icons/lock.png b/images/icons/lock.png
index 91a8f3ef2..3a840e7e0 100644
Binary files a/images/icons/lock.png and b/images/icons/lock.png differ
diff --git a/images/icons/menu.png b/images/icons/menu.png
index 56afc8541..7e39afb55 100644
Binary files a/images/icons/menu.png and b/images/icons/menu.png differ
diff --git a/images/icons/notice.png b/images/icons/notice.png
index b6017c8de..609994d9e 100644
Binary files a/images/icons/notice.png and b/images/icons/notice.png differ
diff --git a/images/icons/notify_off.png b/images/icons/notify_off.png
index e6eac16b8..a7f317aaf 100644
Binary files a/images/icons/notify_off.png and b/images/icons/notify_off.png differ
diff --git a/images/icons/notify_on.png b/images/icons/notify_on.png
index b9e07d24e..747f18a37 100644
Binary files a/images/icons/notify_on.png and b/images/icons/notify_on.png differ
diff --git a/images/icons/play.png b/images/icons/play.png
index 7c942072e..7049534f0 100644
Binary files a/images/icons/play.png and b/images/icons/play.png differ
diff --git a/images/icons/plugin.png b/images/icons/plugin.png
index 943be0d93..b35e64305 100644
Binary files a/images/icons/plugin.png and b/images/icons/plugin.png differ
diff --git a/images/icons/star.png b/images/icons/star.png
index 4a2236c9b..16238461a 100644
Binary files a/images/icons/star.png and b/images/icons/star.png differ
diff --git a/images/icons/text.png b/images/icons/text.png
index c20190ce2..1351b333a 100644
Binary files a/images/icons/text.png and b/images/icons/text.png differ
diff --git a/images/icons/unlock.png b/images/icons/unlock.png
index 4bf7e7eae..a83945b05 100644
Binary files a/images/icons/unlock.png and b/images/icons/unlock.png differ
diff --git a/images/icons/user.png b/images/icons/user.png
index f1132b1ae..9d87b367e 100644
Binary files a/images/icons/user.png and b/images/icons/user.png differ
diff --git a/images/icons/video.png b/images/icons/video.png
index 467a2123e..58d22d2b7 100644
Binary files a/images/icons/video.png and b/images/icons/video.png differ
diff --git a/images/icons/zip.png b/images/icons/zip.png
index df961dd49..c9a87e889 100644
Binary files a/images/icons/zip.png and b/images/icons/zip.png differ
diff --git a/images/libertree.png b/images/libertree.png
index ff6bcddf4..db3833cc3 100644
Binary files a/images/libertree.png and b/images/libertree.png differ
diff --git a/images/mail.png b/images/mail.png
index 2e47fd844..08d297898 100644
Binary files a/images/mail.png and b/images/mail.png differ
diff --git a/images/onoff.jpg b/images/onoff.jpg
index 7884912a7..caa268150 100644
Binary files a/images/onoff.jpg and b/images/onoff.jpg differ
diff --git a/images/person-175.jpg b/images/person-175.jpg
index 527a9d78b..b1deaf4d1 100644
Binary files a/images/person-175.jpg and b/images/person-175.jpg differ
diff --git a/images/person-48.jpg b/images/person-48.jpg
index 8984bb295..6d919cdd0 100644
Binary files a/images/person-48.jpg and b/images/person-48.jpg differ
diff --git a/images/person-80.jpg b/images/person-80.jpg
index 4e70a4dde..5733602f3 100644
Binary files a/images/person-80.jpg and b/images/person-80.jpg differ
diff --git a/images/plugin.png b/images/plugin.png
index 08b09e060..575057962 100644
Binary files a/images/plugin.png and b/images/plugin.png differ
diff --git a/images/screenshots/friendica-frio-brown-profile-1.png b/images/screenshots/friendica-frio-brown-profile-1.png
index edf001ea7..6c3806246 100644
Binary files a/images/screenshots/friendica-frio-brown-profile-1.png and b/images/screenshots/friendica-frio-brown-profile-1.png differ
diff --git a/images/screenshots/friendica-frio-brown-profile-2.png b/images/screenshots/friendica-frio-brown-profile-2.png
index 11faaa5a2..1141a4b76 100644
Binary files a/images/screenshots/friendica-frio-brown-profile-2.png and b/images/screenshots/friendica-frio-brown-profile-2.png differ
diff --git a/images/screenshots/friendica-frio-default-profile-1.png b/images/screenshots/friendica-frio-default-profile-1.png
index 89577647e..abe32ef9d 100644
Binary files a/images/screenshots/friendica-frio-default-profile-1.png and b/images/screenshots/friendica-frio-default-profile-1.png differ
diff --git a/images/screenshots/friendica-frio-green-profle-1.png b/images/screenshots/friendica-frio-green-profle-1.png
index 4c882639b..71b6e2993 100644
Binary files a/images/screenshots/friendica-frio-green-profle-1.png and b/images/screenshots/friendica-frio-green-profle-1.png differ
diff --git a/images/screenshots/friendica-frio-green-profle-2.png b/images/screenshots/friendica-frio-green-profle-2.png
index 13d958297..db8a2e9fd 100644
Binary files a/images/screenshots/friendica-frio-green-profle-2.png and b/images/screenshots/friendica-frio-green-profle-2.png differ
diff --git a/images/screenshots/friendica-frio-mobile-profle-1.png b/images/screenshots/friendica-frio-mobile-profle-1.png
index b596ca3a4..e51edccc8 100644
Binary files a/images/screenshots/friendica-frio-mobile-profle-1.png and b/images/screenshots/friendica-frio-mobile-profle-1.png differ
diff --git a/images/screenshots/friendica-frio-mobile-profle-2.png b/images/screenshots/friendica-frio-mobile-profle-2.png
index 0976472fd..f6eec0919 100644
Binary files a/images/screenshots/friendica-frio-mobile-profle-2.png and b/images/screenshots/friendica-frio-mobile-profle-2.png differ
diff --git a/images/screenshots/friendica-frio-red-profle-1.png b/images/screenshots/friendica-frio-red-profle-1.png
index c64188369..5a4961c77 100644
Binary files a/images/screenshots/friendica-frio-red-profle-1.png and b/images/screenshots/friendica-frio-red-profle-1.png differ
diff --git a/images/screenshots/friendica-frio-red-profle-2.png b/images/screenshots/friendica-frio-red-profle-2.png
index f4d24a4ee..324301737 100644
Binary files a/images/screenshots/friendica-frio-red-profle-2.png and b/images/screenshots/friendica-frio-red-profle-2.png differ
diff --git a/images/screenshots/friendica-frio-red-profle-3.png b/images/screenshots/friendica-frio-red-profle-3.png
index a0cb75051..2d4604c84 100644
Binary files a/images/screenshots/friendica-frio-red-profle-3.png and b/images/screenshots/friendica-frio-red-profle-3.png differ
diff --git a/images/search_18.png b/images/search_18.png
index 539739670..9fb2db7d5 100644
Binary files a/images/search_18.png and b/images/search_18.png differ
diff --git a/images/show_all_off.png b/images/show_all_off.png
index cc96d28f0..8ebccad2f 100644
Binary files a/images/show_all_off.png and b/images/show_all_off.png differ
diff --git a/images/tumblr.png b/images/tumblr.png
index 5c4e2e79d..651d14ee6 100644
Binary files a/images/tumblr.png and b/images/tumblr.png differ
diff --git a/images/twitter.png b/images/twitter.png
index 513c59899..c53d2a232 100644
Binary files a/images/twitter.png and b/images/twitter.png differ
diff --git a/images/wordpress.png b/images/wordpress.png
index da57a9a50..23a620b61 100644
Binary files a/images/wordpress.png and b/images/wordpress.png differ
diff --git a/include/api.php b/include/api.php
index a70c18f3c..5510eddb4 100644
--- a/include/api.php
+++ b/include/api.php
@@ -16,9 +16,10 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
@@ -39,6 +40,7 @@ use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\XML;
 
 require_once 'include/conversation.php';
@@ -46,7 +48,6 @@ require_once 'mod/share.php';
 require_once 'mod/item.php';
 require_once 'include/security.php';
 require_once 'mod/wall_upload.php';
-require_once 'mod/proxy.php';
 
 define('API_METHOD_ANY', '*');
 define('API_METHOD_GET', 'GET');
@@ -54,7 +55,7 @@ define('API_METHOD_POST', 'POST,PUT');
 define('API_METHOD_DELETE', 'POST,DELETE');
 
 $API = [];
-$called_api = null;
+$called_api = [];
 
 /**
  * It is not sufficient to use local_user() to check whether someone is allowed to use the API,
@@ -90,11 +91,15 @@ function api_source()
 	}
 
 	// Support for known clients that doesn't send a source name
-	if (strpos($_SERVER['HTTP_USER_AGENT'], "Twidere") !== false) {
-		return "Twidere";
-	}
+	if (!empty($_SERVER['HTTP_USER_AGENT'])) {
+		if(strpos($_SERVER['HTTP_USER_AGENT'], "Twidere") !== false) {
+			return "Twidere";
+		}
 
-	logger("Unrecognized user-agent ".$_SERVER['HTTP_USER_AGENT'], LOGGER_DEBUG);
+		logger("Unrecognized user-agent ".$_SERVER['HTTP_USER_AGENT'], LOGGER_DEBUG);
+	} else {
+		logger("Empty user-agent", LOGGER_DEBUG);
+	}
 
 	return "api";
 }
@@ -164,7 +169,8 @@ function api_login(App $a)
 	$oauth1 = new FKOAuth1();
 	// login with oauth
 	try {
-		list($consumer, $token) = $oauth1->verify_request(OAuthRequest::from_request());
+		$request = OAuthRequest::from_request();
+		list($consumer, $token) = $oauth1->verify_request($request);
 		if (!is_null($token)) {
 			$oauth1->loginUser($token->uid);
 			Addon::callHooks('logged_in', $a->user);
@@ -193,8 +199,8 @@ function api_login(App $a)
 		throw new UnauthorizedException("This API requires login");
 	}
 
-	$user = $_SERVER['PHP_AUTH_USER'];
-	$password = $_SERVER['PHP_AUTH_PW'];
+	$user = defaults($_SERVER, 'PHP_AUTH_USER', '');
+	$password = defaults($_SERVER, 'PHP_AUTH_PW', '');
 
 	// allow "user@server" login (but ignore 'server' part)
 	$at = strstr($user, "@", true);
@@ -224,11 +230,11 @@ function api_login(App $a)
 	} else {
 		$user_id = User::authenticate(trim($user), trim($password));
 		if ($user_id !== false) {
-			$record = dba::selectFirst('user', [], ['uid' => $user_id]);
+			$record = DBA::selectFirst('user', [], ['uid' => $user_id]);
 		}
 	}
 
-	if (!DBM::is_result($record)) {
+	if (!DBA::isResult($record)) {
 		logger('API_login failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
 		header('WWW-Authenticate: Basic realm="Friendica"');
 		//header('HTTP/1.0 401 Unauthorized');
@@ -258,7 +264,7 @@ function api_check_method($method)
 	if ($method == "*") {
 		return true;
 	}
-	return (strpos($method, $_SERVER['REQUEST_METHOD']) !== false);
+	return (stripos($method, defaults($_SERVER, 'REQUEST_METHOD', 'GET')) !== false);
 }
 
 /**
@@ -298,7 +304,7 @@ function api_call(App $a)
 				//unset($_SERVER['PHP_AUTH_USER']);
 
 				/// @TODO should be "true ==[=] $info['auth']", if you miss only one = character, you assign a variable (only with ==). Let's make all this even.
-				if ($info['auth'] === true && api_user() === false) {
+				if (!empty($info['auth']) && api_user() === false) {
 					api_login($a);
 				}
 
@@ -475,7 +481,7 @@ function api_rss_extra(App $a, $arr, $user_info)
 		'base'         => System::baseUrl(),
 		'updated'      => api_date(null),
 		'atom_updated' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
-		'language'     => $user_info['language'],
+		'language'     => $user_info['lang'],
 		'logo'         => System::baseUrl() . "/images/friendica-32.png",
 	];
 
@@ -492,9 +498,9 @@ function api_rss_extra(App $a, $arr, $user_info)
  */
 function api_unique_id_to_nurl($id)
 {
-	$r = dba::selectFirst('contact', ['nurl'], ['uid' => 0, 'id' => $id]);
+	$r = DBA::selectFirst('contact', ['nurl'], ['id' => $id]);
 
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		return $r["nurl"];
 	} else {
 		return false;
@@ -519,7 +525,7 @@ function api_get_user(App $a, $contact_id = null)
 
 	// Searching for contact URL
 	if (!is_null($contact_id) && (intval($contact_id) == 0)) {
-		$user = dbesc(normalise_link($contact_id));
+		$user = DBA::escape(normalise_link($contact_id));
 		$url = $user;
 		$extra_query = "AND `contact`.`nurl` = '%s' ";
 		if (api_user() !== false) {
@@ -529,10 +535,10 @@ function api_get_user(App $a, $contact_id = null)
 
 	// Searching for contact id with uid = 0
 	if (!is_null($contact_id) && (intval($contact_id) != 0)) {
-		$user = dbesc(api_unique_id_to_nurl(intval($contact_id)));
+		$user = DBA::escape(api_unique_id_to_nurl(intval($contact_id)));
 
 		if ($user == "") {
-			throw new BadRequestException("User not found.");
+			throw new BadRequestException("User ID ".$contact_id." not found.");
 		}
 
 		$url = $user;
@@ -543,10 +549,10 @@ function api_get_user(App $a, $contact_id = null)
 	}
 
 	if (is_null($user) && x($_GET, 'user_id')) {
-		$user = dbesc(api_unique_id_to_nurl($_GET['user_id']));
+		$user = DBA::escape(api_unique_id_to_nurl($_GET['user_id']));
 
 		if ($user == "") {
-			throw new BadRequestException("User not found.");
+			throw new BadRequestException("User ID ".$_GET['user_id']." not found.");
 		}
 
 		$url = $user;
@@ -556,7 +562,7 @@ function api_get_user(App $a, $contact_id = null)
 		}
 	}
 	if (is_null($user) && x($_GET, 'screen_name')) {
-		$user = dbesc($_GET['screen_name']);
+		$user = DBA::escape($_GET['screen_name']);
 		$extra_query = "AND `contact`.`nick` = '%s' ";
 		if (api_user() !== false) {
 			$extra_query .= "AND `contact`.`uid`=".intval(api_user());
@@ -564,18 +570,24 @@ function api_get_user(App $a, $contact_id = null)
 	}
 
 	if (is_null($user) && x($_GET, 'profileurl')) {
-		$user = dbesc(normalise_link($_GET['profileurl']));
+		$user = DBA::escape(normalise_link($_GET['profileurl']));
 		$extra_query = "AND `contact`.`nurl` = '%s' ";
 		if (api_user() !== false) {
 			$extra_query .= "AND `contact`.`uid`=".intval(api_user());
 		}
 	}
 
+	// $called_api is the API path exploded on / and is expected to have at least 2 elements
 	if (is_null($user) && ($a->argc > (count($called_api) - 1)) && (count($called_api) > 0)) {
 		$argid = count($called_api);
-		list($user, $null) = explode(".", $a->argv[$argid]);
+		if (!empty($a->argv[$argid])) {
+			$data = explode(".", $a->argv[$argid]);
+			if (count($data) > 1) {
+				list($user, $null) = $data;
+			}
+		}
 		if (is_numeric($user)) {
-			$user = dbesc(api_unique_id_to_nurl(intval($user)));
+			$user = DBA::escape(api_unique_id_to_nurl(intval($user)));
 
 			if ($user != "") {
 				$url = $user;
@@ -585,7 +597,7 @@ function api_get_user(App $a, $contact_id = null)
 				}
 			}
 		} else {
-			$user = dbesc($user);
+			$user = DBA::escape($user);
 			$extra_query = "AND `contact`.`nick` = '%s' ";
 			if (api_user() !== false) {
 				$extra_query .= "AND `contact`.`uid`=" . intval(api_user());
@@ -621,38 +633,38 @@ function api_get_user(App $a, $contact_id = null)
 	}
 
 	// if the contact wasn't found, fetch it from the contacts with uid = 0
-	if (!DBM::is_result($uinfo)) {
-		$r = [];
-
-		if ($url != "") {
-			$r = q("SELECT * FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' LIMIT 1", dbesc(normalise_link($url)));
+	if (!DBA::isResult($uinfo)) {
+		if ($url == "") {
+			throw new BadRequestException("User not found.");
 		}
 
-		if (DBM::is_result($r)) {
-			$network_name = ContactSelector::networkToName($r[0]['network'], $r[0]['url']);
+		$contact = DBA::selectFirst('contact', [], ['uid' => 0, 'nurl' => normalise_link($url)]);
+
+		if (DBA::isResult($contact)) {
+			$network_name = ContactSelector::networkToName($contact['network'], $contact['url']);
 
 			// If no nick where given, extract it from the address
-			if (($r[0]['nick'] == "") || ($r[0]['name'] == $r[0]['nick'])) {
-				$r[0]['nick'] = api_get_nick($r[0]["url"]);
+			if (($contact['nick'] == "") || ($contact['name'] == $contact['nick'])) {
+				$contact['nick'] = api_get_nick($contact["url"]);
 			}
 
 			$ret = [
-				'id' => $r[0]["id"],
-				'id_str' => (string) $r[0]["id"],
-				'name' => $r[0]["name"],
-				'screen_name' => (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']),
-				'location' => ($r[0]["location"] != "") ? $r[0]["location"] : $network_name,
-				'description' => $r[0]["about"],
-				'profile_image_url' => $r[0]["micro"],
-				'profile_image_url_https' => $r[0]["micro"],
-				'profile_image_url_profile_size' => $r[0]["thumb"],
-				'profile_image_url_large' => $r[0]["photo"],
-				'url' => $r[0]["url"],
+				'id' => $contact["id"],
+				'id_str' => (string) $contact["id"],
+				'name' => $contact["name"],
+				'screen_name' => (($contact['nick']) ? $contact['nick'] : $contact['name']),
+				'location' => ($contact["location"] != "") ? $contact["location"] : $network_name,
+				'description' => $contact["about"],
+				'profile_image_url' => $contact["micro"],
+				'profile_image_url_https' => $contact["micro"],
+				'profile_image_url_profile_size' => $contact["thumb"],
+				'profile_image_url_large' => $contact["photo"],
+				'url' => $contact["url"],
 				'protected' => false,
 				'followers_count' => 0,
 				'friends_count' => 0,
 				'listed_count' => 0,
-				'created_at' => api_date($r[0]["created"]),
+				'created_at' => api_date($contact["created"]),
 				'favourites_count' => 0,
 				'utc_offset' => 0,
 				'time_zone' => 'UTC',
@@ -667,85 +679,29 @@ function api_get_user(App $a, $contact_id = null)
 				'follow_request_sent' => false,
 				'statusnet_blocking' => false,
 				'notifications' => false,
-				'statusnet_profile_url' => $r[0]["url"],
+				'statusnet_profile_url' => $contact["url"],
 				'uid' => 0,
-				'cid' => Contact::getIdForURL($r[0]["url"], api_user(), true),
+				'cid' => Contact::getIdForURL($contact["url"], api_user(), true),
+				'pid' => Contact::getIdForURL($contact["url"], 0, true),
 				'self' => 0,
-				'network' => $r[0]["network"],
+				'network' => $contact["network"],
 			];
 
 			return $ret;
 		} else {
-			throw new BadRequestException("User not found.");
+			throw new BadRequestException("User ".$url." not found.");
 		}
 	}
 
 	if ($uinfo[0]['self']) {
 		if ($uinfo[0]['network'] == "") {
-			$uinfo[0]['network'] = NETWORK_DFRN;
+			$uinfo[0]['network'] = Protocol::DFRN;
 		}
 
-		$usr = q(
-			"SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
-			intval(api_user())
-		);
-		$profile = q(
-			"SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
-			intval(api_user())
-		);
-
-		/// @TODO old-lost code? (twice)
-		// Counting is deactivated by now, due to performance issues
-		// count public wall messages
-		//$r = q("SELECT COUNT(*) as `count` FROM `item` WHERE `uid` = %d AND `wall`",
-		//		intval($uinfo[0]['uid'])
-		//);
-		//$countitms = $r[0]['count'];
-		$countitms = 0;
-	} else {
-		// Counting is deactivated by now, due to performance issues
-		//$r = q("SELECT count(*) as `count` FROM `item`
-		//		WHERE  `contact-id` = %d",
-		//		intval($uinfo[0]['id'])
-		//);
-		//$countitms = $r[0]['count'];
-		$countitms = 0;
+		$usr = DBA::selectFirst('user', ['default-location'], ['uid' => api_user()]);
+		$profile = DBA::selectFirst('profile', ['about'], ['uid' => api_user(), 'is-default' => true]);
 	}
-
-		/// @TODO old-lost code? (twice)
-		/*
-		// Counting is deactivated by now, due to performance issues
-		// count friends
-		$r = q("SELECT count(*) as `count` FROM `contact`
-				WHERE  `uid` = %d AND `rel` IN ( %d, %d )
-				AND `self`=0 AND NOT `blocked` AND NOT `pending` AND `hidden`=0",
-				intval($uinfo[0]['uid']),
-				intval(CONTACT_IS_SHARING),
-				intval(CONTACT_IS_FRIEND)
-		);
-		$countfriends = $r[0]['count'];
-
-		$r = q("SELECT count(*) as `count` FROM `contact`
-				WHERE  `uid` = %d AND `rel` IN ( %d, %d )
-				AND `self`=0 AND NOT `blocked` AND NOT `pending` AND `hidden`=0",
-				intval($uinfo[0]['uid']),
-				intval(CONTACT_IS_FOLLOWER),
-				intval(CONTACT_IS_FRIEND)
-		);
-		$countfollowers = $r[0]['count'];
-
-		$r = q("SELECT count(*) as `count` FROM item where starred = 1 and uid = %d and deleted = 0",
-			intval($uinfo[0]['uid'])
-		);
-		$starred = $r[0]['count'];
-
-
-		if (! $uinfo[0]['self']) {
-			$countfriends = 0;
-			$countfollowers = 0;
-			$starred = 0;
-		}
-		*/
+	$countitems = 0;
 	$countfriends = 0;
 	$countfollowers = 0;
 	$starred = 0;
@@ -759,14 +715,14 @@ function api_get_user(App $a, $contact_id = null)
 
 	$pcontact_id  = Contact::getIdForURL($uinfo[0]['url'], 0, true);
 
-	if (!empty($profile[0]['about'])) {
-		$description = $profile[0]['about'];
+	if (!empty($profile['about'])) {
+		$description = $profile['about'];
 	} else {
 		$description = $uinfo[0]["about"];
 	}
 
-	if (!empty($usr[0]['default-location'])) {
-		$location = $usr[0]['default-location'];
+	if (!empty($usr['default-location'])) {
+		$location = $usr['default-location'];
 	} elseif (!empty($uinfo[0]["location"])) {
 		$location = $uinfo[0]["location"];
 	} else {
@@ -795,12 +751,12 @@ function api_get_user(App $a, $contact_id = null)
 		'time_zone' => 'UTC',
 		'geo_enabled' => false,
 		'verified' => true,
-		'statuses_count' => intval($countitms),
+		'statuses_count' => intval($countitems),
 		'lang' => '',
 		'contributors_enabled' => false,
 		'is_translator' => false,
 		'is_translation_enabled' => false,
-		'following' => (($uinfo[0]['rel'] == CONTACT_IS_FOLLOWER) || ($uinfo[0]['rel'] == CONTACT_IS_FRIEND)),
+		'following' => (($uinfo[0]['rel'] == Contact::FOLLOWER) || ($uinfo[0]['rel'] == Contact::FRIEND)),
 		'follow_request_sent' => false,
 		'statusnet_blocking' => false,
 		'notifications' => false,
@@ -809,15 +765,17 @@ function api_get_user(App $a, $contact_id = null)
 		'statusnet_profile_url' => $uinfo[0]['url'],
 		'uid' => intval($uinfo[0]['uid']),
 		'cid' => intval($uinfo[0]['cid']),
+		'pid' => Contact::getIdForURL($uinfo[0]["url"], 0, true),
 		'self' => $uinfo[0]['self'],
 		'network' => $uinfo[0]['network'],
 	];
 
 	// If this is a local user and it uses Frio, we can get its color preferences.
 	if ($ret['self']) {
-		$theme_info = dba::selectFirst('user', ['theme'], ['uid' => $ret['uid']]);
+		$theme_info = DBA::selectFirst('user', ['theme'], ['uid' => $ret['uid']]);
 		if ($theme_info['theme'] === 'frio') {
 			$schema = PConfig::get($ret['uid'], 'frio', 'schema');
+
 			if ($schema && ($schema != '---')) {
 				if (file_exists('view/theme/frio/schema/'.$schema.'.php')) {
 					$schemefile = 'view/theme/frio/schema/'.$schema.'.php';
@@ -828,13 +786,13 @@ function api_get_user(App $a, $contact_id = null)
 				$link_color = PConfig::get($ret['uid'], 'frio', 'link_color');
 				$bgcolor = PConfig::get($ret['uid'], 'frio', 'background_color');
 			}
-			if (!$nav_bg) {
+			if (empty($nav_bg)) {
 				$nav_bg = "#708fa0";
 			}
-			if (!$link_color) {
+			if (empty($link_color)) {
 				$link_color = "#6fdbe8";
 			}
-			if (!$bgcolor) {
+			if (empty($bgcolor)) {
 				$bgcolor = "#ededed";
 			}
 
@@ -856,16 +814,12 @@ function api_get_user(App $a, $contact_id = null)
  */
 function api_item_get_user(App $a, $item)
 {
-	$status_user = api_get_user($a, $item["author-link"]);
+	$status_user = api_get_user($a, defaults($item, 'author-id', null));
 
-	$status_user["protected"] = (($item["allow_cid"] != "") ||
-					($item["allow_gid"] != "") ||
-					($item["deny_cid"] != "") ||
-					($item["deny_gid"] != "") ||
-					$item["private"]);
+	$status_user["protected"] = defaults($item, 'private', 0);
 
-	if ($item['thr-parent'] == $item['uri']) {
-		$owner_user = api_get_user($a, $item["owner-link"]);
+	if (defaults($item, 'thr-parent', '') == defaults($item, 'uri', '')) {
+		$owner_user = api_get_user($a, defaults($item, 'author-id', null));
 	} else {
 		$owner_user = $status_user;
 	}
@@ -935,11 +889,10 @@ function api_reformat_xml(&$item, &$key)
  *
  * @return string The XML data
  */
-function api_create_xml($data, $root_element)
+function api_create_xml(array $data, $root_element)
 {
 	$childname = key($data);
 	$data2 = array_pop($data);
-	$key = key($data2);
 
 	$namespaces = ["" => "http://api.twitter.com",
 				"statusnet" => "http://status.net/schema/api/1/",
@@ -952,18 +905,19 @@ function api_create_xml($data, $root_element)
 	}
 
 	if (is_array($data2)) {
+		$key = key($data2);
 		api_walk_recursive($data2, "api_reformat_xml");
-	}
 
-	if ($key == "0") {
-		$data4 = [];
-		$i = 1;
+		if ($key == "0") {
+			$data4 = [];
+			$i = 1;
 
-		foreach ($data2 as $item) {
-			$data4[$i++.":".$childname] = $item;
+			foreach ($data2 as $item) {
+				$data4[$i++ . ":" . $childname] = $item;
+			}
+
+			$data2 = $data4;
 		}
-
-		$data2 = $data4;
 	}
 
 	$data3 = [$root_element => $data2];
@@ -1068,7 +1022,7 @@ function requestdata($k)
 }
 
 /**
- * Waitman Gobble Mod
+ * Deprecated function to upload media.
  *
  * @param string $type Return type (atom, rss, xml, json)
  *
@@ -1084,7 +1038,6 @@ function api_statuses_mediap($type)
 	}
 	$user_info = api_get_user($a);
 
-	$_REQUEST['type'] = 'wall';
 	$_REQUEST['profile_uid'] = api_user();
 	$_REQUEST['api_source'] = true;
 	$txt = requestdata('status');
@@ -1100,18 +1053,16 @@ function api_statuses_mediap($type)
 	}
 	$txt = HTML::toBBCode($txt);
 
-	$a->argv[1]=$user_info['screen_name']; //should be set to username?
+	$a->argv[1] = $user_info['screen_name']; //should be set to username?
 
-	// tell wall_upload function to return img info instead of echo
-	$_REQUEST['hush'] = 'yeah';
-	$bebop = wall_upload_post($a);
+	$picture = wall_upload_post($a, false);
 
 	// 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" . $bebop;
-	item_post($a);
+	$_REQUEST['body'] = $txt . "\n\n" . '[url=' . $picture["albumpage"] . '][img]' . $picture["preview"] . "[/img][/url]";
+	$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!
@@ -1127,7 +1078,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) {
@@ -1175,26 +1125,14 @@ function api_statuses_update($type)
 	}
 	$_REQUEST['profile_uid'] = api_user();
 
-	if ($parent) {
-		$_REQUEST['type'] = 'net-comment';
-	} else {
+	if (!$parent) {
 		// Check for throttling (maximum posts per day, week and month)
 		$throttle_day = Config::get('system', 'throttle_limit_day');
 		if ($throttle_day > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60);
 
-			$r = q(
-				"SELECT COUNT(*) AS `posts_day` FROM `item` WHERE `uid`=%d AND `wall`
-				AND `created` > '%s' AND `id` = `parent`",
-				intval(api_user()),
-				dbesc($datefrom)
-			);
-
-			if (DBM::is_result($r)) {
-				$posts_day = $r[0]["posts_day"];
-			} else {
-				$posts_day = 0;
-			}
+			$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);
@@ -1207,18 +1145,8 @@ function api_statuses_update($type)
 		if ($throttle_week > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7);
 
-			$r = q(
-				"SELECT COUNT(*) AS `posts_week` FROM `item` WHERE `uid`=%d AND `wall`
-				AND `created` > '%s' AND `id` = `parent`",
-				intval(api_user()),
-				dbesc($datefrom)
-			);
-
-			if (DBM::is_result($r)) {
-				$posts_week = $r[0]["posts_week"];
-			} else {
-				$posts_week = 0;
-			}
+			$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);
@@ -1231,18 +1159,8 @@ function api_statuses_update($type)
 		if ($throttle_month > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30);
 
-			$r = q(
-				"SELECT COUNT(*) AS `posts_month` FROM `item` WHERE `uid`=%d AND `wall`
-				AND `created` > '%s' AND `id` = `parent`",
-				intval(api_user()),
-				dbesc($datefrom)
-			);
-
-			if (DBM::is_result($r)) {
-				$posts_month = $r[0]["posts_month"];
-			} else {
-				$posts_month = 0;
-			}
+			$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);
@@ -1250,16 +1168,13 @@ function api_statuses_update($type)
 				throw new TooManyRequestsException(L10n::t("Monthly posting limit of %d post reached. The post was rejected.", "Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month));
 			}
 		}
-
-		$_REQUEST['type'] = 'wall';
 	}
 
 	if (x($_FILES, 'media')) {
 		// upload the image if we have one
-		$_REQUEST['hush'] = 'yeah'; //tell wall_upload function to return img info instead of echo
-		$media = wall_upload_post($a);
-		if (strlen($media) > 0) {
-			$_REQUEST['body'] .= "\n\n" . $media;
+		$picture = wall_upload_post($a, false);
+		if (is_array($picture)) {
+			$_REQUEST['body'] .= "\n\n" . '[url=' . $picture["albumpage"] . '][img]' . $picture["preview"] . "[/img][/url]";
 		}
 	}
 
@@ -1270,7 +1185,7 @@ function api_statuses_update($type)
 			intval(requestdata('media_ids')),
 			api_user()
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$phototypes = Image::supportedTypes();
 			$ext = $phototypes[$r[0]['type']];
 			$_REQUEST['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']';
@@ -1287,10 +1202,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
@@ -1347,7 +1262,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();
 
@@ -1356,31 +1271,22 @@ function api_status_show($type)
 	logger('api_status_show: user_info: '.print_r($user_info, true), LOGGER_DEBUG);
 
 	if ($type == "raw") {
-		$privacy_sql = "AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''";
+		$privacy_sql = "AND NOT `private`";
 	} else {
 		$privacy_sql = "";
 	}
 
-	// get last public wall message
-	$lastwall = q(
-		"SELECT `item`.*
-			FROM `item`
-			WHERE `item`.`contact-id` = %d AND `item`.`uid` = %d
-				AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s')))
-				AND `item`.`type` != 'activity' $privacy_sql
-			ORDER BY `item`.`id` DESC
-			LIMIT 1",
-		intval($user_info['cid']),
-		intval(api_user()),
-		dbesc($user_info['url']),
-		dbesc(normalise_link($user_info['url'])),
-		dbesc($user_info['url']),
-		dbesc(normalise_link($user_info['url']))
-	);
-
-	if (DBM::is_result($lastwall)) {
-		$lastwall = $lastwall[0];
+	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)) {
 		$in_reply_to = api_in_reply_to($lastwall);
 
 		$converted = api_convert_item($lastwall);
@@ -1405,19 +1311,19 @@ function api_status_show($type)
 			'in_reply_to_screen_name' => $in_reply_to['screen_name'],
 			'user' => $user_info,
 			$geo => null,
-			'coordinates' => "",
-			'place' => "",
-			'contributors' => "",
+			'coordinates' => '',
+			'place' => '',
+			'contributors' => '',
 			'is_quote_status' => false,
 			'retweet_count' => 0,
 			'favorite_count' => 0,
 			'favorited' => $lastwall['starred'] ? true : false,
 			'retweeted' => false,
 			'possibly_sensitive' => false,
-			'lang' => "",
+			'lang' => '',
 			'statusnet_html' => $converted["html"],
 			'statusnet_conversation_id' => $lastwall['parent'],
-			'external_url' => System::baseUrl() . "/display/" . $lastwall['guid'],
+			'external_url' => System::baseUrl() . '/display/' . $lastwall['guid'],
 		];
 
 		if (count($converted["attachments"]) > 0) {
@@ -1428,10 +1334,10 @@ function api_status_show($type)
 			$status_info["entities"] = $converted["entities"];
 		}
 
-		if (($lastwall['item_network'] != "") && ($status_info["source"] == 'web')) {
-			$status_info["source"] = ContactSelector::networkToName($lastwall['item_network'], $user_info['url']);
-		} elseif (($lastwall['item_network'] != "") && (ContactSelector::networkToName($lastwall['item_network'], $user_info['url']) != $status_info["source"])) {
-			$status_info["source"] = trim($status_info["source"].' ('.ContactSelector::networkToName($lastwall['item_network'], $user_info['url']).')');
+		if ($status_info["source"] == 'web') {
+			$status_info["source"] = ContactSelector::networkToName($lastwall['network'], $user_info['url']);
+		} elseif (ContactSelector::networkToName($lastwall['network'], $user_info['url']) != $status_info["source"]) {
+			$status_info["source"] = trim($status_info["source"].' ('.ContactSelector::networkToName($lastwall['network'], $user_info['url']).')');
 		}
 
 		// "uid" and "self" are only needed for some internal stuff, so remove it from here
@@ -1460,28 +1366,12 @@ function api_users_show($type)
 	$a = get_app();
 
 	$user_info = api_get_user($a);
-	$lastwall = q(
-		"SELECT `item`.*
-			FROM `item`
-			INNER JOIN `contact` ON `contact`.`id`=`item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-			WHERE `item`.`uid` = %d AND `verb` = '%s' AND `item`.`contact-id` = %d
-				AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s')))
-				AND `type`!='activity'
-				AND `item`.`allow_cid`='' AND `item`.`allow_gid`='' AND `item`.`deny_cid`='' AND `item`.`deny_gid`=''
-			ORDER BY `id` DESC
-			LIMIT 1",
-		intval(api_user()),
-		dbesc(ACTIVITY_POST),
-		intval($user_info['cid']),
-		dbesc($user_info['url']),
-		dbesc(normalise_link($user_info['url'])),
-		dbesc($user_info['url']),
-		dbesc(normalise_link($user_info['url']))
-	);
 
-	if (DBM::is_result($lastwall)) {
-		$lastwall = $lastwall[0];
+	$condition = ['owner-id' => $user_info['pid'], 'uid' => api_user(),
+		'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'private' => false];
+	$lastwall = Item::selectFirst(Item::ITEM_FIELDLIST, $condition, ['order' => ['id' => true]]);
 
+	if (DBA::isResult($lastwall)) {
 		$in_reply_to = api_in_reply_to($lastwall);
 
 		$converted = api_convert_item($lastwall);
@@ -1519,12 +1409,12 @@ function api_users_show($type)
 			$user_info["status"]["entities"] = $converted["entities"];
 		}
 
-		if (($lastwall['item_network'] != "") && ($user_info["status"]["source"] == 'web')) {
-			$user_info["status"]["source"] = ContactSelector::networkToName($lastwall['item_network'], $user_info['url']);
+		if ($user_info["status"]["source"] == 'web') {
+			$user_info["status"]["source"] = ContactSelector::networkToName($lastwall['network'], $user_info['url']);
 		}
 
-		if (($lastwall['item_network'] != "") && (ContactSelector::networkToName($lastwall['item_network'], $user_info['url']) != $user_info["status"]["source"])) {
-			$user_info["status"]["source"] = trim($user_info["status"]["source"] . ' (' . ContactSelector::networkToName($lastwall['item_network'], $user_info['url']) . ')');
+		if (ContactSelector::networkToName($lastwall['network'], $user_info['url']) != $user_info["status"]["source"]) {
+			$user_info["status"]["source"] = trim($user_info["status"]["source"] . ' (' . ContactSelector::networkToName($lastwall['network'], $user_info['url']) . ')');
 		}
 	}
 
@@ -1554,13 +1444,13 @@ function api_users_search($type)
 	$userlist = [];
 
 	if (x($_GET, 'q')) {
-		$r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", dbesc($_GET["q"]));
+		$r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", DBA::escape($_GET["q"]));
 
-		if (!DBM::is_result($r)) {
-			$r = q("SELECT `id` FROM `contact` WHERE `uid` = 0 AND `nick` = '%s'", dbesc($_GET["q"]));
+		if (!DBA::isResult($r)) {
+			$r = q("SELECT `id` FROM `contact` WHERE `uid` = 0 AND `nick` = '%s'", DBA::escape($_GET["q"]));
 		}
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$k = 0;
 			foreach ($r as $user) {
 				$user_info = api_get_user($a, $user["id"]);
@@ -1573,10 +1463,10 @@ function api_users_search($type)
 			}
 			$userlist = ["users" => $userlist];
 		} else {
-			throw new BadRequestException("User not found.");
+			throw new BadRequestException("User ".$_GET["q"]." not found.");
 		}
 	} else {
-		throw new BadRequestException("User not found.");
+		throw new BadRequestException("No user specified.");
 	}
 
 	return api_format_data("users", $type, $userlist);
@@ -1599,7 +1489,7 @@ function api_users_lookup($type)
 {
 	$users = [];
 
-	if (x($_REQUEST['user_id'])) {
+	if (!empty($_REQUEST['user_id'])) {
 		foreach (explode(',', $_REQUEST['user_id']) as $id) {
 			if (!empty($id)) {
 				$users[] = api_get_user(get_app(), $id);
@@ -1637,7 +1527,6 @@ function api_search($type)
 	}
 
 	$data = [];
-	$sql_extra = '';
 
 	if (!x($_REQUEST, 'q')) {
 		throw new BadRequestException("q parameter is required.");
@@ -1657,24 +1546,20 @@ function api_search($type)
 
 	$start = $page * $count;
 
+	$condition = ["`gravity` IN (?, ?) AND `item`.`id` > ?
+		AND (`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))
+		AND `item`.`body` LIKE CONCAT('%',?,'%')",
+		GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, api_user(), $_REQUEST['q']];
+
 	if ($max_id > 0) {
-		$sql_extra .= ' AND `item`.`id` <= ' . intval($max_id);
+		$condition[0] .= " AND `item`.`id` <= ?";
+		$condition[] = $max_id;
 	}
 
-	$r = dba::p(
-		"SELECT ".item_fieldlists()."
-		FROM `item` ".item_joins(api_user())."
-		WHERE ".item_condition()." AND (`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))
-		AND `item`.`body` LIKE CONCAT('%',?,'%')
-		$sql_extra
-		AND `item`.`id`>?
-		ORDER BY `item`.`id` DESC LIMIT ".intval($start)." ,".intval($count)." ",
-		api_user(),
-		$_REQUEST['q'],
-		$since_id
-	);
+	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-	$data['status'] = api_format_items(dba::inArray($r), $user_info);
+	$data['status'] = api_format_items(Item::inArray($statuses), $user_info);
 
 	return api_format_data("statuses", $type, $data);
 }
@@ -1724,47 +1609,36 @@ function api_statuses_home_timeline($type)
 
 	$start = $page * $count;
 
-	$sql_extra = '';
+	$condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `item`.`id` > ?",
+		api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
+
 	if ($max_id > 0) {
-		$sql_extra .= ' AND `item`.`id` <= ' . intval($max_id);
+		$condition[0] .= " AND `item`.`id` <= ?";
+		$condition[] = $max_id;
 	}
 	if ($exclude_replies > 0) {
-		$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
+		$condition[0] .= ' AND `item`.`parent` = `item`.`id`';
 	}
 	if ($conversation_id > 0) {
-		$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id);
+		$condition[0] .= " AND `item`.`parent` = ?";
+		$condition[] = $conversation_id;
 	}
 
-	$r = q(
-		"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-		`contact`.`id` AS `cid`
-		FROM `item`
-		STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-		WHERE `item`.`uid` = %d AND `verb` = '%s'
-		AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
-		$sql_extra
-		AND `item`.`id`>%d
-		ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
-		intval(api_user()),
-		dbesc(ACTIVITY_POST),
-		intval($since_id),
-		intval($start),
-		intval($count)
-	);
+	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-	$ret = api_format_items($r, $user_info, false, $type);
+	$items = Item::inArray($statuses);
+
+	$ret = api_format_items($items, $user_info, false, $type);
 
 	// Set all posts from the query above to seen
 	$idarray = [];
-	foreach ($r as $item) {
+	foreach ($items as $item) {
 		$idarray[] = intval($item["id"]);
 	}
 
 	if (!empty($idarray)) {
-		$unseen = dba::exists('item', ['unseen' => true, 'id' => $idarray]);
+		$unseen = Item::exists(['unseen' => true, 'id' => $idarray]);
 		if ($unseen) {
 			Item::update(['unseen' => false], ['unseen' => true, 'id' => $idarray]);
 		}
@@ -1819,61 +1693,35 @@ function api_statuses_public_timeline($type)
 	$sql_extra = '';
 
 	if ($exclude_replies && !$conversation_id) {
+		$condition = ["`gravity` IN (?, ?) AND `iid` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall`",
+			GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
+
 		if ($max_id > 0) {
-			$sql_extra = 'AND `thread`.`iid` <= ' . intval($max_id);
+			$condition[0] .= " AND `thread`.`iid` <= ?";
+			$condition[] = $max_id;
 		}
 
-		$r = dba::p(
-			"SELECT " . item_fieldlists() . "
-			FROM `thread`
-			STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
-			" . item_joins(api_user()) . "
-			STRAIGHT_JOIN `user` ON `user`.`uid` = `thread`.`uid`
-				AND NOT `user`.`hidewall`
-			AND `verb` = ?
-			AND NOT `thread`.`private`
-			AND `thread`.`wall`
-			AND `thread`.`visible`
-			AND NOT `thread`.`deleted`
-			AND NOT `thread`.`moderated`
-			AND `thread`.`iid` > ?
-			$sql_extra
-			ORDER BY `thread`.`iid` DESC
-			LIMIT " . intval($start) . ", " . intval($count),
-			ACTIVITY_POST,
-			$since_id
-		);
+		$params = ['order' => ['iid' => true], 'limit' => [$start, $count]];
+		$statuses = Item::selectThreadForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params);
 
-		$r = dba::inArray($r);
+		$r = Item::inArray($statuses);
 	} else {
+		$condition = ["`gravity` IN (?, ?) AND `id` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall` AND `item`.`origin`",
+			GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
+
 		if ($max_id > 0) {
-			$sql_extra = 'AND `item`.`id` <= ' . intval($max_id);
+			$condition[0] .= " AND `item`.`id` <= ?";
+			$condition[] = $max_id;
 		}
 		if ($conversation_id > 0) {
-			$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id);
+			$condition[0] .= " AND `item`.`parent` = ?";
+			$condition[] = $conversation_id;
 		}
 
-		$r = dba::p(
-			"SELECT " . item_fieldlists() . "
-			FROM `item`
-			" . item_joins(api_user()) . "
-			STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
-				AND NOT `user`.`hidewall`
-			AND `verb` = ?
-			AND NOT `item`.`private`
-			AND `item`.`wall`
-			AND `item`.`visible`
-			AND NOT `item`.`deleted`
-			AND NOT `item`.`moderated`
-			AND `item`.`id` > ?
-			$sql_extra
-			ORDER BY `item`.`id` DESC
-			LIMIT " . intval($start) . ", " . intval($count),
-			ACTIVITY_POST,
-			$since_id
-		);
+		$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
+		$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-		$r = dba::inArray($r);
+		$r = Item::inArray($statuses);
 	}
 
 	$ret = api_format_items($r, $user_info, false, $type);
@@ -1921,33 +1769,18 @@ function api_statuses_networkpublic_timeline($type)
 	}
 	$start = ($page - 1) * $count;
 
-	$sql_extra = '';
+	$condition = ["`uid` = 0 AND `gravity` IN (?, ?) AND `thread`.`iid` > ? AND NOT `private`",
+		GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
+
 	if ($max_id > 0) {
-		$sql_extra = 'AND `thread`.`iid` <= ' . intval($max_id);
+		$condition[0] .= " AND `thread`.`iid` <= ?";
+		$condition[] = $max_id;
 	}
 
-	$r = dba::p(
-		"SELECT " . item_fieldlists() . "
-		FROM `thread`
-		STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
-		" . item_joins(api_user()) . "
-		WHERE `thread`.`uid` = 0
-		AND `verb` = ?
-		AND NOT `thread`.`private`
-		AND `thread`.`visible`
-		AND NOT `thread`.`deleted`
-		AND NOT `thread`.`moderated`
-		AND `thread`.`iid` > ?
-		$sql_extra
-		ORDER BY `thread`.`iid` DESC
-		LIMIT " . intval($start) . ", " . intval($count),
-		ACTIVITY_POST,
-		$since_id
-	);
+	$params = ['order' => ['iid' => true], 'limit' => [$start, $count]];
+	$statuses = Item::selectThreadForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params);
 
-	$r = dba::inArray($r);
-
-	$ret = api_format_items($r, $user_info, false, $type);
+	$ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 
 	$data = ['status' => $ret];
 	switch ($type) {
@@ -1980,63 +1813,50 @@ function api_statuses_show($type)
 	}
 
 	// params
-	$id = intval($a->argv[3]);
+	$id = intval(defaults($a->argv, 3, 0));
 
 	if ($id == 0) {
-		$id = intval($_REQUEST["id"]);
+		$id = intval(defaults($_REQUEST, 'id', 0));
 	}
 
 	// Hotot workaround
 	if ($id == 0) {
-		$id = intval($a->argv[4]);
+		$id = intval(defaults($a->argv, 4, 0));
 	}
 
 	logger('API: api_statuses_show: ' . $id);
 
-	$conversation = (x($_REQUEST, 'conversation') ? 1 : 0);
-
-	$sql_extra = '';
-	if ($conversation) {
-		$sql_extra .= " AND `item`.`parent` = %d ORDER BY `id` ASC ";
-	} else {
-		$sql_extra .= " AND `item`.`id` = %d";
-	}
+	$conversation = !empty($_REQUEST['conversation']);
 
 	// try to fetch the item for the local user - or the public item, if there is no local one
-	$uri_item = dba::selectFirst('item', ['uri'], ['id' => $id]);
-	if (!DBM::is_result($uri_item)) {
+	$uri_item = Item::selectFirst(['uri'], ['id' => $id]);
+	if (!DBA::isResult($uri_item)) {
 		throw new BadRequestException("There is no status with this id.");
 	}
 
-	$item = dba::selectFirst('item', ['id'], ['uri' => $uri_item['uri'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
-	if (!DBM::is_result($item)) {
+	$item = Item::selectFirst(['id'], ['uri' => $uri_item['uri'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
+	if (!DBA::isResult($item)) {
 		throw new BadRequestException("There is no status with this id.");
 	}
 
 	$id = $item['id'];
 
-	$r = q(
-		"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-		`contact`.`id` AS `cid`
-		FROM `item`
-		INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-		WHERE `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
-		AND `item`.`uid` IN (0, %d) AND `item`.`verb` = '%s'
-		$sql_extra",
-		intval(api_user()),
-		dbesc(ACTIVITY_POST),
-		intval($id)
-	);
+	if ($conversation) {
+		$condition = ['parent' => $id, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]];
+		$params = ['order' => ['id' => true]];
+	} else {
+		$condition = ['id' => $id, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]];
+		$params = [];
+	}
+
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
 	/// @TODO How about copying this to above methods which don't check $r ?
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($statuses)) {
 		throw new BadRequestException("There is no status with this id.");
 	}
 
-	$ret = api_format_items($r, $user_info, false, $type);
+	$ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 
 	if ($conversation) {
 		$data = ['status' => $ret];
@@ -2066,73 +1886,57 @@ function api_conversation_show($type)
 	}
 
 	// params
-	$id = intval($a->argv[3]);
-	$count = (x($_REQUEST, 'count') ? $_REQUEST['count'] : 20);
-	$page = (x($_REQUEST, 'page') ? $_REQUEST['page'] - 1 : 0);
+	$id       = intval(defaults($a->argv , 3         , 0));
+	$since_id = intval(defaults($_REQUEST, 'since_id', 0));
+	$max_id   = intval(defaults($_REQUEST, 'max_id'  , 0));
+	$count    = intval(defaults($_REQUEST, 'count'   , 20));
+	$page     = intval(defaults($_REQUEST, 'page'    , 1)) - 1;
 	if ($page < 0) {
 		$page = 0;
 	}
-	$since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
-	$max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
 
-	$start = $page*$count;
+	$start = $page * $count;
 
 	if ($id == 0) {
-		$id = intval($_REQUEST["id"]);
+		$id = intval(defaults($_REQUEST, 'id', 0));
 	}
 
 	// Hotot workaround
 	if ($id == 0) {
-		$id = intval($a->argv[4]);
+		$id = intval(defaults($a->argv, 4, 0));
 	}
 
 	logger('API: api_conversation_show: '.$id);
 
 	// try to fetch the item for the local user - or the public item, if there is no local one
-	$item = dba::selectFirst('item', ['parent-uri'], ['id' => $id]);
-	if (!DBM::is_result($item)) {
+	$item = Item::selectFirst(['parent-uri'], ['id' => $id]);
+	if (!DBA::isResult($item)) {
 		throw new BadRequestException("There is no status with this id.");
 	}
 
-	$parent = dba::selectFirst('item', ['id'], ['uri' => $item['parent-uri'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
-	if (!DBM::is_result($parent)) {
+	$parent = Item::selectFirst(['id'], ['uri' => $item['parent-uri'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
+	if (!DBA::isResult($parent)) {
 		throw new BadRequestException("There is no status with this id.");
 	}
 
 	$id = $parent['id'];
 
-	$sql_extra = '';
+	$condition = ["`parent` = ? AND `uid` IN (0, ?) AND `gravity` IN (?, ?) AND `item`.`id` > ?",
+		$id, api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
 
 	if ($max_id > 0) {
-		$sql_extra = ' AND `item`.`id` <= ' . intval($max_id);
+		$condition[0] .= " AND `item`.`id` <= ?";
+		$condition[] = $max_id;
 	}
 
-	$r = q(
-		"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-		`contact`.`id` AS `cid`
-		FROM `item`
-		STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-		WHERE `item`.`parent` = %d AND `item`.`visible`
-		AND NOT `item`.`moderated` AND NOT `item`.`deleted`
-		AND `item`.`uid` IN (0, %d) AND `item`.`verb` = '%s'
-		AND `item`.`id`>%d $sql_extra
-		ORDER BY `item`.`id` DESC LIMIT %d ,%d",
-		intval($id),
-		intval(api_user()),
-		dbesc(ACTIVITY_POST),
-		intval($since_id),
-		intval($start),
-		intval($count)
-	);
+	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-	if (!DBM::is_result($r)) {
-		throw new BadRequestException("There is no status with this id.");
+	if (!DBA::isResult($statuses)) {
+		throw new BadRequestException("There is no status with id $id.");
 	}
 
-	$ret = api_format_items($r, $user_info, false, $type);
+	$ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 
 	$data = ['status' => $ret];
 	return api_format_data("statuses", $type, $data);
@@ -2162,62 +1966,48 @@ function api_statuses_repeat($type)
 	api_get_user($a);
 
 	// params
-	$id = intval($a->argv[3]);
+	$id = intval(defaults($a->argv, 3, 0));
 
 	if ($id == 0) {
-		$id = intval($_REQUEST["id"]);
+		$id = intval(defaults($_REQUEST, 'id', 0));
 	}
 
 	// Hotot workaround
 	if ($id == 0) {
-		$id = intval($a->argv[4]);
+		$id = intval(defaults($a->argv, 4, 0));
 	}
 
 	logger('API: api_statuses_repeat: '.$id);
 
-	$r = q(
-		"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`nick` as `reply_author`,
-		`contact`.`name`, `contact`.`photo` as `reply_photo`, `contact`.`url` as `reply_url`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-		`contact`.`id` AS `cid`
-		FROM `item`
-		INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-		WHERE `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
-		AND NOT `item`.`private` AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
-		AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
-		AND `item`.`id`=%d",
-		intval($id)
-	);
+	$fields = ['body', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
+	$item = Item::selectFirst($fields, ['id' => $id, 'private' => false]);
 
-	/// @TODO other style than above functions!
-	if (DBM::is_result($r) && $r[0]['body'] != "") {
-		if (strpos($r[0]['body'], "[/share]") !== false) {
-			$pos = strpos($r[0]['body'], "[share");
-			$post = substr($r[0]['body'], $pos);
+	if (DBA::isResult($item) && $item['body'] != "") {
+		if (strpos($item['body'], "[/share]") !== false) {
+			$pos = strpos($item['body'], "[share");
+			$post = substr($item['body'], $pos);
 		} else {
-			$post = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
+			$post = share_header($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
 
-			$post .= $r[0]['body'];
+			$post .= $item['body'];
 			$post .= "[/share]";
 		}
 		$_REQUEST['body'] = $post;
 		$_REQUEST['profile_uid'] = api_user();
-		$_REQUEST['type'] = 'wall';
 		$_REQUEST['api_source'] = true;
 
 		if (!x($_REQUEST, "source")) {
 			$_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).
-	$called_api = null;
-	return api_status_show($type);
+	// output the post that we just posted.
+	$called_api = [];
+	return api_status_show($type, $item_id);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -2241,15 +2031,15 @@ function api_statuses_destroy($type)
 	api_get_user($a);
 
 	// params
-	$id = intval($a->argv[3]);
+	$id = intval(defaults($a->argv, 3, 0));
 
 	if ($id == 0) {
-		$id = intval($_REQUEST["id"]);
+		$id = intval(defaults($_REQUEST, 'id', 0));
 	}
 
 	// Hotot workaround
 	if ($id == 0) {
-		$id = intval($a->argv[4]);
+		$id = intval(defaults($a->argv, 4, 0));
 	}
 
 	logger('API: api_statuses_destroy: '.$id);
@@ -2299,43 +2089,19 @@ function api_statuses_mentions($type)
 
 	$start = ($page - 1) * $count;
 
-	// Ugly code - should be changed
-	$myurl = System::baseUrl() . '/profile/'. $a->user['nickname'];
-	$myurl = substr($myurl, strpos($myurl, '://') + 3);
-	$myurl = str_replace('www.', '', $myurl);
-
-	$sql_extra = '';
+	$condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `item`.`id` > ? AND `author-id` != ?
+		AND `item`.`parent` IN (SELECT `iid` FROM `thread` WHERE `thread`.`uid` = ? AND `thread`.`mention` AND NOT `thread`.`ignored`)",
+		api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $user_info['pid'], api_user()];
 
 	if ($max_id > 0) {
-		$sql_extra .= ' AND `item`.`id` <= ' . intval($max_id);
+		$condition[0] .= " AND `item`.`id` <= ?";
+		$condition[] = $max_id;
 	}
 
-	$r = q(
-		"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-		`contact`.`id` AS `cid`
-		FROM `item` FORCE INDEX (`uid_id`)
-		STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-		WHERE `item`.`uid` = %d AND `verb` = '%s'
-		AND NOT (`item`.`author-link` IN ('https://%s', 'http://%s'))
-		AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
-		AND `item`.`parent` IN (SELECT `iid` FROM `thread` WHERE `uid` = %d AND `mention` AND !`ignored`)
-		$sql_extra
-		AND `item`.`id`>%d
-		ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
-		intval(api_user()),
-		dbesc(ACTIVITY_POST),
-		dbesc(protect_sprintf($myurl)),
-		dbesc(protect_sprintf($myurl)),
-		intval(api_user()),
-		intval($since_id),
-		intval($start),
-		intval($count)
-	);
+	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-	$ret = api_format_items($r, $user_info, false, $type);
+	$ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 
 	$data = ['status' => $ret];
 	switch ($type) {
@@ -2391,46 +2157,31 @@ function api_statuses_user_timeline($type)
 	}
 	$start = ($page - 1) * $count;
 
-	$sql_extra = '';
+	$condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `item`.`id` > ? AND `item`.`contact-id` = ?",
+		api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $user_info['cid']];
+
 	if ($user_info['self'] == 1) {
-		$sql_extra .= " AND `item`.`wall` = 1 ";
+		$condition[0] .= ' AND `item`.`wall` ';
 	}
 
 	if ($exclude_replies > 0) {
-		$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
+		$condition[0] .= ' AND `item`.`parent` = `item`.`id`';
 	}
 
 	if ($conversation_id > 0) {
-		$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id);
+		$condition[0] .= " AND `item`.`parent` = ?";
+		$condition[] = $conversation_id;
 	}
 
 	if ($max_id > 0) {
-		$sql_extra .= ' AND `item`.`id` <= ' . intval($max_id);
+		$condition[0] .= " AND `item`.`id` <= ?";
+		$condition[] = $max_id;
 	}
 
-	$r = q(
-		"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-		`contact`.`id` AS `cid`
-		FROM `item` FORCE INDEX (`uid_contactid_id`)
-		STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-		WHERE `item`.`uid` = %d AND `verb` = '%s'
-		AND `item`.`contact-id` = %d
-		AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
-		$sql_extra
-		AND `item`.`id` > %d
-		ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
-		intval(api_user()),
-		dbesc(ACTIVITY_POST),
-		intval($user_info['cid']),
-		intval($since_id),
-		intval($start),
-		intval($count)
-	);
+	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-	$ret = api_format_items($r, $user_info, true, $type);
+	$ret = api_format_items(Item::inArray($statuses), $user_info, true, $type);
 
 	$data = ['status' => $ret];
 	switch ($type) {
@@ -2465,7 +2216,7 @@ function api_favorites_create_destroy($type)
 	// for versioned api.
 	/// @TODO We need a better global soluton
 	$action_argv_id = 2;
-	if ($a->argv[1] == "1.1") {
+	if (count($a->argv) > 1 && $a->argv[1] == "1.1") {
 		$action_argv_id = 3;
 	}
 
@@ -2474,30 +2225,29 @@ function api_favorites_create_destroy($type)
 	}
 	$action = str_replace("." . $type, "", $a->argv[$action_argv_id]);
 	if ($a->argc == $action_argv_id + 2) {
-		$itemid = intval($a->argv[$action_argv_id + 1]);
+		$itemid = intval(defaults($a->argv, $action_argv_id + 1, 0));
 	} else {
-		///  @TODO use x() to check if _REQUEST contains 'id'
-		$itemid = intval($_REQUEST['id']);
+		$itemid = intval(defaults($_REQUEST, 'id', 0));
 	}
 
-	$item = q("SELECT * FROM `item` WHERE `id`=%d AND `uid`=%d LIMIT 1", $itemid, api_user());
+	$item = Item::selectFirstForUser(api_user(), [], ['id' => $itemid, 'uid' => api_user()]);
 
-	if (!DBM::is_result($item) || count($item) == 0) {
+	if (!DBA::isResult($item)) {
 		throw new BadRequestException("Invalid item.");
 	}
 
 	switch ($action) {
 		case "create":
-			$item[0]['starred'] = 1;
+			$item['starred'] = 1;
 			break;
 		case "destroy":
-			$item[0]['starred'] = 0;
+			$item['starred'] = 0;
 			break;
 		default:
 			throw new BadRequestException("Invalid action ".$action);
 	}
 
-	$r = Item::update(['starred' => $item[0]['starred']], ['id' => $itemid]);
+	$r = Item::update(['starred' => $item['starred']], ['id' => $itemid]);
 
 	if ($r === false) {
 		throw new InternalServerErrorException("DB error");
@@ -2505,7 +2255,7 @@ function api_favorites_create_destroy($type)
 
 
 	$user_info = api_get_user($a);
-	$rets = api_format_items($item, $user_info, false, $type);
+	$rets = api_format_items([$item], $user_info, false, $type);
 	$ret = $rets[0];
 
 	$data = ['status' => $ret];
@@ -2549,8 +2299,6 @@ function api_favorites($type)
 	if ($user_info['self'] == 0) {
 		$ret = [];
 	} else {
-		$sql_extra = "";
-
 		// params
 		$since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
 		$max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
@@ -2562,31 +2310,19 @@ function api_favorites($type)
 
 		$start = $page*$count;
 
+		$condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ? AND `starred`",
+			api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
+
+		$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
+
 		if ($max_id > 0) {
-			$sql_extra .= ' AND `item`.`id` <= ' . intval($max_id);
+			$condition[0] .= " AND `item`.`id` <= ?";
+			$condition[] = $max_id;
 		}
 
-		$r = q(
-			"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-			`contact`.`id` AS `cid`
-			FROM `item`, `contact`
-			WHERE `item`.`uid` = %d
-			AND `item`.`visible` = 1 AND `item`.`moderated` = 0 AND `item`.`deleted` = 0
-			AND `item`.`starred` = 1
-			AND `contact`.`id` = `item`.`contact-id`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-			$sql_extra
-			AND `item`.`id`>%d
-			ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
-			intval(api_user()),
-			intval($since_id),
-			intval($start),
-			intval($count)
-		);
+		$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-		$ret = api_format_items($r, $user_info, false, $type);
+		$ret = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 	}
 
 	$data = ['status' => $ret];
@@ -2614,25 +2350,33 @@ function api_format_messages($item, $recipient, $sender)
 {
 	// standard meta information
 	$ret = [
-			'id'                    => $item['id'],
-			'sender_id'             => $sender['id'] ,
-			'text'                  => "",
-			'recipient_id'          => $recipient['id'],
-			'created_at'            => api_date($item['created']),
-			'sender_screen_name'    => $sender['screen_name'],
-			'recipient_screen_name' => $recipient['screen_name'],
-			'sender'                => $sender,
-			'recipient'             => $recipient,
-			'title'                 => "",
-			'friendica_seen'        => $item['seen'],
-			'friendica_parent_uri'  => $item['parent-uri'],
+		'id'                    => $item['id'],
+		'sender_id'             => $sender['id'] ,
+		'text'                  => "",
+		'recipient_id'          => $recipient['id'],
+		'created_at'            => api_date(defaults($item, 'created', DateTimeFormat::utcNow())),
+		'sender_screen_name'    => $sender['screen_name'],
+		'recipient_screen_name' => $recipient['screen_name'],
+		'sender'                => $sender,
+		'recipient'             => $recipient,
+		'title'                 => "",
+		'friendica_seen'        => defaults($item, 'seen', 0),
+		'friendica_parent_uri'  => defaults($item, 'parent-uri', ''),
 	];
 
 	// "uid" and "self" are only needed for some internal stuff, so remove it from here
-	unset($ret["sender"]["uid"]);
-	unset($ret["sender"]["self"]);
-	unset($ret["recipient"]["uid"]);
-	unset($ret["recipient"]["self"]);
+	if (isset($ret['sender']['uid'])) {
+		unset($ret['sender']['uid']);
+	}
+	if (isset($ret['sender']['self'])) {
+		unset($ret['sender']['self']);
+	}
+	if (isset($ret['recipient']['uid'])) {
+		unset($ret['recipient']['uid']);
+	}
+	if (isset($ret['recipient']['self'])) {
+		unset($ret['recipient']['self']);
+	}
 
 	//don't send title to regular StatusNET requests to avoid confusing these apps
 	if (x($_GET, 'getText')) {
@@ -2679,8 +2423,8 @@ function api_convert_item($item)
 		$statustext = trim($statustitle."\n\n".$statusbody);
 	}
 
-	if (($item["network"] == NETWORK_FEED) && (strlen($statustext)> 1000)) {
-		$statustext = substr($statustext, 0, 1000)."... \n".$item["plink"];
+	if ((defaults($item, 'network', Protocol::PHANTOM) == Protocol::FEED) && (strlen($statustext)> 1000)) {
+		$statustext = substr($statustext, 0, 1000) . "... \n" . defaults($item, 'plink', '');
 	}
 
 	$statushtml = BBCode::convert(api_clean_attachments($body), false);
@@ -2714,7 +2458,7 @@ function api_convert_item($item)
 	}
 
 	// feeds without body should contain the link
-	if (($item['network'] == NETWORK_FEED) && (strlen($item['body']) == 0)) {
+	if ((defaults($item, 'network', Protocol::PHANTOM) == Protocol::FEED) && (strlen($item['body']) == 0)) {
 		$statushtml .= BBCode::convert($item['plink']);
 	}
 
@@ -2732,7 +2476,7 @@ function api_convert_item($item)
  *
  * @param string $body
  *
- * @return array|false
+ * @return array
  */
 function api_get_attachments(&$body)
 {
@@ -2743,7 +2487,7 @@ function api_get_attachments(&$body)
 	$ret = preg_match_all("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $text, $images);
 
 	if (!$ret) {
-		return false;
+		return [];
 	}
 
 	$attachments = [];
@@ -2756,7 +2500,7 @@ function api_get_attachments(&$body)
 		}
 	}
 
-	if (strstr($_SERVER['HTTP_USER_AGENT'], "AndStatus")) {
+	if (strstr(defaults($_SERVER, 'HTTP_USER_AGENT', ''), "AndStatus")) {
 		foreach ($images[0] as $orig) {
 			$body = str_replace($orig, "", $body);
 		}
@@ -2781,7 +2525,7 @@ function api_get_entitities(&$text, $bbcode)
 		preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images);
 
 		foreach ($images[1] as $image) {
-			$replace = proxy_url($image);
+			$replace = ProxyUtils::proxifyUrl($image);
 			$text = str_replace($image, $replace, $text);
 		}
 		return [];
@@ -2890,7 +2634,7 @@ function api_get_entitities(&$text, $bbcode)
 				// If image cache is activated, then use the following sizes:
 				// thumb  (150), small (340), medium (600) and large (1024)
 				if (!Config::get("system", "proxy_disabled")) {
-					$media_url = proxy_url($url);
+					$media_url = ProxyUtils::proxifyUrl($url);
 
 					$sizes = [];
 					$scale = Image::getScalingDimensions($image[0], $image[1], 150);
@@ -3000,20 +2744,16 @@ function api_format_items_activities(&$item, $type = "json")
 		'attendmaybe' => [],
 	];
 
-	$items = q(
-		'SELECT * FROM item
-			WHERE uid=%d AND `thr-parent`="%s" AND visible AND NOT deleted',
-		intval($item['uid']),
-		dbesc($item['uri'])
-	);
+	$condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri']];
+	$ret = Item::selectForUser($item['uid'], ['author-id', 'verb'], $condition);
 
-	foreach ($items as $i) {
+	while ($item = Item::fetch($ret)) {
 		// not used as result should be structured like other user data
 		//builtin_activity_puller($i, $activities);
 
 		// get user data and add it to the array of the activity
-		$user = api_get_user($a, $i['author-link']);
-		switch ($i['verb']) {
+		$user = api_get_user($a, $item['author-id']);
+		switch ($item['verb']) {
 			case ACTIVITY_LIKE:
 				$activities['like'][] = $user;
 				break;
@@ -3034,6 +2774,8 @@ function api_format_items_activities(&$item, $type = "json")
 		}
 	}
 
+	DBA::close($ret);
+
 	if ($type == "xml") {
 		$xml_activities = [];
 		foreach ($activities as $k => $v) {
@@ -3153,6 +2895,7 @@ function api_format_items($r, $user_info, $filter_user = false, $type = "json")
 			'favorited' => $item['starred'] ? true : false,
 			'user' =>  $status_user ,
 			'friendica_owner' => $owner_user,
+			'friendica_private' => $item['private'] == 1,
 			//'entities' => NULL,
 			'statusnet_html' => $converted["html"],
 			'statusnet_conversation_id' => $item['parent'],
@@ -3168,26 +2911,18 @@ function api_format_items($r, $user_info, $filter_user = false, $type = "json")
 			$status["entities"] = $converted["entities"];
 		}
 
-		if (($item['item_network'] != "") && ($status["source"] == 'web')) {
-			$status["source"] = ContactSelector::networkToName($item['item_network'], $user_info['url']);
-		} elseif (($item['item_network'] != "") && (ContactSelector::networkToName($item['item_network'], $user_info['url']) != $status["source"])) {
-			$status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['item_network'], $user_info['url']).')');
+		if ($status["source"] == 'web') {
+			$status["source"] = ContactSelector::networkToName($item['network'], $user_info['url']);
+		} elseif (ContactSelector::networkToName($item['network'], $user_info['url']) != $status["source"]) {
+			$status["source"] = trim($status["source"].' ('.ContactSelector::networkToName($item['network'], $user_info['url']).')');
 		}
 
-
-		// Retweets are only valid for top postings
-		// It doesn't work reliable with the link if its a feed
-		//$IsRetweet = ($item['owner-link'] != $item['author-link']);
-		//if ($IsRetweet)
-		//	$IsRetweet = (($item['owner-name'] != $item['author-name']) || ($item['owner-avatar'] != $item['author-avatar']));
-
-
 		if ($item["id"] == $item["parent"]) {
 			$retweeted_item = api_share_as_retweet($item);
 			if ($retweeted_item !== false) {
 				$retweeted_status = $status;
 				try {
-					$retweeted_status["user"] = api_get_user($a, $retweeted_item["author-link"]);
+					$retweeted_status["user"] = api_get_user($a, $retweeted_item["author-id"]);
 				} catch (BadRequestException $e) {
 					// user not found. should be found?
 					/// @todo check if the user should be always found
@@ -3320,7 +3055,7 @@ function api_lists_ownerships($type)
 	$user_info = api_get_user($a);
 	$uid = $user_info['uid'];
 
-	$groups = dba::select('group', [], ['deleted' => 0, 'uid' => $uid]);
+	$groups = DBA::select('group', [], ['deleted' => 0, 'uid' => $uid]);
 
 	// loop through all groups
 	$lists = [];
@@ -3384,39 +3119,25 @@ function api_lists_statuses($type)
 
 	$start = $page * $count;
 
-	$sql_extra = '';
+	$condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ? AND `group_member`.`gid` = ?",
+		api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $_REQUEST['list_id']];
+
 	if ($max_id > 0) {
-		$sql_extra .= ' AND `item`.`id` <= ' . intval($max_id);
+		$condition[0] .= " AND `item`.`id` <= ?";
+		$condition[] = $max_id;
 	}
 	if ($exclude_replies > 0) {
-		$sql_extra .= ' AND `item`.`parent` = `item`.`id`';
+		$condition[0] .= ' AND `item`.`parent` = `item`.`id`';
 	}
 	if ($conversation_id > 0) {
-		$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id);
+		$condition[0] .= " AND `item`.`parent` = ?";
+		$condition[] = $conversation_id;
 	}
 
-	$statuses = dba::p(
-		"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-		`contact`.`id` AS `cid`, `group_member`.`gid`
-		FROM `item`
-		STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-		STRAIGHT_JOIN `group_member` ON `group_member`.`contact-id` = `item`.`contact-id`
-		WHERE `item`.`uid` = ? AND `verb` = ?
-		AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
-		$sql_extra
-		AND `item`.`id`>?
-		AND `group_member`.`gid` = ?
-		ORDER BY `item`.`id` DESC LIMIT ".intval($start)." ,".intval($count),
-		api_user(),
-		ACTIVITY_POST,
-		$since_id,
-		$_REQUEST['list_id']
-	);
+	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
+	$statuses = Item::selectForUser(api_user(), [], $condition, $params);
 
-	$items = api_format_items(dba::inArray($statuses), $user_info, false, $type);
+	$items = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 
 	$data = ['status' => $items];
 	switch ($type) {
@@ -3473,9 +3194,9 @@ function api_statuses_f($qtype)
 
 	$sql_extra = '';
 	if ($qtype == 'friends') {
-		$sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_SHARING), intval(CONTACT_IS_FRIEND));
+		$sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(Contact::SHARING), intval(Contact::FRIEND));
 	} elseif ($qtype == 'followers') {
-		$sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FRIEND));
+		$sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(Contact::FOLLOWER), intval(Contact::FRIEND));
 	}
 
 	// friends and followers only for self
@@ -3622,18 +3343,15 @@ function api_statusnet_config($type)
 {
 	$a = get_app();
 
-	$name = $a->config['sitename'];
-	$server = $a->get_hostname();
-	$logo = System::baseUrl() . '/images/friendica-64.png';
-	$email = $a->config['admin_email'];
-	$closed = (($a->config['register_policy'] == REGISTER_CLOSED) ? 'true' : 'false');
-	$private = ((Config::get('system', 'block_public')) ? 'true' : 'false');
-	$textlimit = (string) (($a->config['max_import_size']) ? $a->config['max_import_size'] : 200000);
-	if ($a->config['api_import_size']) {
-		$textlimit = (string) $a->config['api_import_size'];
-	}
-	$ssl = ((Config::get('system', 'have_ssl')) ? 'true' : 'false');
-	$sslserver = (($ssl === 'true') ? str_replace('http:', 'https:', System::baseUrl()) : '');
+	$name      = Config::get('config', 'sitename');
+	$server    = $a->get_hostname();
+	$logo      = System::baseUrl() . '/images/friendica-64.png';
+	$email     = Config::get('config', 'admin_email');
+	$closed    = intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 'true' : 'false';
+	$private   = Config::get('system', 'block_public') ? 'true' : 'false';
+	$textlimit = (string) Config::get('config', 'api_import_size', Config::get('config', 'max_import_size', 200000));
+	$ssl       = Config::get('system', 'have_ssl') ? 'true' : 'false';
+	$sslserver = Config::get('system', 'have_ssl') ? str_replace('http:', 'https:', System::baseUrl()) : '';
 
 	$config = [
 		'site' => ['name' => $name,'server' => $server, 'theme' => 'default', 'path' => '',
@@ -3699,7 +3417,7 @@ function api_ff_ids($type)
 			WHERE `contact`.`uid` = %s AND NOT `contact`.`self`",
 		intval(api_user())
 	);
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		return;
 	}
 
@@ -3755,34 +3473,40 @@ api_register_func('api/followers/ids', 'api_followers_ids', true);
  */
 function api_direct_messages_new($type)
 {
-
 	$a = get_app();
 
 	if (api_user() === false) {
 		throw new ForbiddenException();
 	}
 
-	if (!x($_POST, "text") || (!x($_POST, "screen_name") && !x($_POST, "user_id"))) {
+	if (empty($_POST["text"]) || empty($_POST["screen_name"]) && empty($_POST["user_id"])) {
 		return;
 	}
 
 	$sender = api_get_user($a);
 
-	if ($_POST['screen_name']) {
+	$recipient = null;
+	if (!empty($_POST['screen_name'])) {
 		$r = q(
 			"SELECT `id`, `nurl`, `network` FROM `contact` WHERE `uid`=%d AND `nick`='%s'",
 			intval(api_user()),
-			dbesc($_POST['screen_name'])
+			DBA::escape($_POST['screen_name'])
 		);
 
-		// Selecting the id by priority, friendica first
-		api_best_nickname($r);
+		if (DBA::isResult($r)) {
+			// Selecting the id by priority, friendica first
+			api_best_nickname($r);
 
-		$recipient = api_get_user($a, $r[0]['nurl']);
+			$recipient = api_get_user($a, $r[0]['nurl']);
+		}
 	} else {
 		$recipient = api_get_user($a, $_POST['user_id']);
 	}
 
+	if (empty($recipient)) {
+		throw new NotFoundException('Recipient not found');
+	}
+
 	$replyto = '';
 	$sub     = '';
 	if (x($_REQUEST, 'replyto')) {
@@ -3863,7 +3587,7 @@ function api_direct_messages_destroy($type)
 	}
 
 	// add parent-uri to sql command if specified by calling app
-	$sql_extra = ($parenturi != "" ? " AND `parent-uri` = '" . dbesc($parenturi) . "'" : "");
+	$sql_extra = ($parenturi != "" ? " AND `parent-uri` = '" . DBA::escape($parenturi) . "'" : "");
 
 	// get data of the specified message id
 	$r = q(
@@ -3873,7 +3597,7 @@ function api_direct_messages_destroy($type)
 	);
 
 	// error message if specified id is not in database
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		if ($verbose == "true") {
 			$answer = ['result' => 'error', 'message' => 'message id not in database'];
 			return api_format_data("direct_messages_delete", $type, ['$result' => $answer]);
@@ -3916,24 +3640,21 @@ api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy',
 function api_direct_messages_box($type, $box, $verbose)
 {
 	$a = get_app();
-	$user_info = api_get_user($a);
-
-	if (api_user() === false || $user_info === false) {
+	if (api_user() === false) {
 		throw new ForbiddenException();
 	}
-
 	// params
-	$count = (x($_GET, 'count') ? $_GET['count'] : 20);
-	$page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
+	$count = defaults($_GET, 'count', 20);
+	$page = defaults($_REQUEST, 'page', 1) - 1;
 	if ($page < 0) {
 		$page = 0;
 	}
 
-	$since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
-	$max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
+	$since_id = defaults($_REQUEST, 'since_id', 0);
+	$max_id = defaults($_REQUEST, 'max_id', 0);
 
-	$user_id = (x($_REQUEST, 'user_id') ? $_REQUEST['user_id'] : "");
-	$screen_name = (x($_REQUEST, 'screen_name') ? $_REQUEST['screen_name'] : "");
+	$user_id = defaults($_REQUEST, 'user_id', '');
+	$screen_name = defaults($_REQUEST, 'screen_name', '');
 
 	//  caller user info
 	unset($_REQUEST["user_id"]);
@@ -3942,6 +3663,10 @@ function api_direct_messages_box($type, $box, $verbose)
 	unset($_REQUEST["screen_name"]);
 	unset($_GET["screen_name"]);
 
+	$user_info = api_get_user($a);
+	if ($user_info === false) {
+		throw new ForbiddenException();
+	}
 	$profile_url = $user_info["url"];
 
 	// pagination
@@ -3951,13 +3676,13 @@ function api_direct_messages_box($type, $box, $verbose)
 
 	// filters
 	if ($box=="sentbox") {
-		$sql_extra = "`mail`.`from-url`='" . dbesc($profile_url) . "'";
+		$sql_extra = "`mail`.`from-url`='" . DBA::escape($profile_url) . "'";
 	} elseif ($box == "conversation") {
-		$sql_extra = "`mail`.`parent-uri`='" . dbesc($_GET["uri"])  . "'";
+		$sql_extra = "`mail`.`parent-uri`='" . DBA::escape(defaults($_GET, 'uri', ''))  . "'";
 	} elseif ($box == "all") {
 		$sql_extra = "true";
 	} elseif ($box == "inbox") {
-		$sql_extra = "`mail`.`from-url`!='" . dbesc($profile_url) . "'";
+		$sql_extra = "`mail`.`from-url`!='" . DBA::escape($profile_url) . "'";
 	}
 
 	if ($max_id > 0) {
@@ -3967,7 +3692,7 @@ function api_direct_messages_box($type, $box, $verbose)
 	if ($user_id != "") {
 		$sql_extra .= ' AND `mail`.`contact-id` = ' . intval($user_id);
 	} elseif ($screen_name !="") {
-		$sql_extra .= " AND `contact`.`nick` = '" . dbesc($screen_name). "'";
+		$sql_extra .= " AND `contact`.`nick` = '" . DBA::escape($screen_name). "'";
 	}
 
 	$r = q(
@@ -3977,7 +3702,7 @@ function api_direct_messages_box($type, $box, $verbose)
 		intval($start),
 		intval($count)
 	);
-	if ($verbose == "true" && !DBM::is_result($r)) {
+	if ($verbose == "true" && !DBA::isResult($r)) {
 		$answer = ['result' => 'error', 'message' => 'no mails available'];
 		return api_format_data("direct_messages_all", $type, ['$result' => $answer]);
 	}
@@ -4130,29 +3855,26 @@ function api_fr_photoalbum_delete($type)
 	$r = q(
 		"SELECT DISTINCT `resource-id` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
 		intval(api_user()),
-		dbesc($album)
+		DBA::escape($album)
 	);
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		throw new BadRequestException("album not available");
 	}
 
 	// function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore
 	// to the user and the contacts of the users (drop_items() performs the federation of the deletion to other networks
 	foreach ($r as $rr) {
-		$photo_item = q(
-			"SELECT `id` FROM `item` WHERE `uid` = %d AND `resource-id` = '%s' AND `type` = 'photo'",
-			intval(local_user()),
-			dbesc($rr['resource-id'])
-		);
+		$condition = ['uid' => local_user(), 'resource-id' => $rr['resource-id'], 'type' => 'photo'];
+		$photo_item = Item::selectFirstForUser(local_user(), ['id'], $condition);
 
-		if (!DBM::is_result($photo_item)) {
+		if (!DBA::isResult($photo_item)) {
 			throw new InternalServerErrorException("problem with deleting items occured");
 		}
-		Item::deleteForUser(['id' => $photo_item[0]['id']], api_user());
+		Item::deleteForUser(['id' => $photo_item['id']], api_user());
 	}
 
 	// now let's delete all photos from the album
-	$result = dba::delete('photo', ['uid' => api_user(), 'album' => $album]);
+	$result = DBA::delete('photo', ['uid' => api_user(), 'album' => $album]);
 
 	// return success of deletion or error message
 	if ($result) {
@@ -4186,11 +3908,11 @@ function api_fr_photoalbum_update($type)
 		throw new BadRequestException("no new albumname specified");
 	}
 	// check if album is existing
-	if (!dba::exists('photo', ['uid' => api_user(), 'album' => $album])) {
+	if (!DBA::exists('photo', ['uid' => api_user(), 'album' => $album])) {
 		throw new BadRequestException("album not available");
 	}
 	// now let's update all photos to the albumname
-	$result = dba::update('photo', ['album' => $album_new], ['uid' => api_user(), 'album' => $album]);
+	$result = DBA::update('photo', ['album' => $album_new], ['uid' => api_user(), 'album' => $album]);
 
 	// return success of updating or error message
 	if ($result) {
@@ -4225,7 +3947,7 @@ function api_fr_photos_list($type)
 		'image/gif' => 'gif'
 	];
 	$data = ['photo'=>[]];
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
 			$photo = [];
 			$photo['id'] = $rr['resource-id'];
@@ -4294,10 +4016,10 @@ function api_fr_photo_create_update($type)
 		$r = q(
 			"SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' AND `album` = '%s'",
 			intval(api_user()),
-			dbesc($photo_id),
-			dbesc($album)
+			DBA::escape($photo_id),
+			DBA::escape($album)
 		);
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			throw new BadRequestException("photo not available");
 		}
 	}
@@ -4364,8 +4086,8 @@ function api_fr_photo_create_update($type)
 				$sql_extra,
 				DateTimeFormat::utcNow(),   // update edited timestamp
 				intval(api_user()),
-				dbesc($photo_id),
-				dbesc($album)
+				DBA::escape($photo_id),
+				DBA::escape($album)
 			);
 		} else {
 			$nothingtodo = true;
@@ -4395,7 +4117,6 @@ function api_fr_photo_create_update($type)
 	throw new InternalServerErrorException("unknown error - this error on uploading or updating a photo should never happen");
 }
 
-
 /**
  * @brief delete a single photo from the database through api
  *
@@ -4419,29 +4140,26 @@ function api_fr_photo_delete($type)
 	$r = q(
 		"SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'",
 		intval(api_user()),
-		dbesc($photo_id)
+		DBA::escape($photo_id)
 	);
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		throw new BadRequestException("photo not available");
 	}
 	// now we can perform on the deletion of the photo
-	$result = dba::delete('photo', ['uid' => api_user(), 'resource-id' => $photo_id]);
+	$result = DBA::delete('photo', ['uid' => api_user(), 'resource-id' => $photo_id]);
 
 	// return success of deletion or error message
 	if ($result) {
 		// retrieve the id of the parent element (the photo element)
-		$photo_item = q(
-			"SELECT `id` FROM `item` WHERE `uid` = %d AND `resource-id` = '%s' AND `type` = 'photo'",
-			intval(local_user()),
-			dbesc($photo_id)
-		);
+		$condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
+		$photo_item = Item::selectFirstForUser(local_user(), ['id'], $condition);
 
-		if (!DBM::is_result($photo_item)) {
+		if (!DBA::isResult($photo_item)) {
 			throw new InternalServerErrorException("problem with deleting items occured");
 		}
 		// function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore
 		// to the user and the contacts of the users (drop_items() do all the necessary magic to avoid orphans in database and federate deletion)
-		Item::deleteForUser(['id' => $photo_item[0]['id']], api_user());
+		Item::deleteForUser(['id' => $photo_item['id']], api_user());
 
 		$answer = ['result' => 'deleted', 'message' => 'photo with id `' . $photo_id . '` has been deleted from server.'];
 		return api_format_data("photo_delete", $type, ['$result' => $answer]);
@@ -4501,9 +4219,9 @@ function api_account_update_profile_image($type)
 
 	// check if specified profile id is valid
 	if ($profile_id != 0) {
-		$profile = dba::selectFirst('profile', ['is-default'], ['uid' => api_user(), 'id' => $profile_id]);
+		$profile = DBA::selectFirst('profile', ['is-default'], ['uid' => api_user(), 'id' => $profile_id]);
 		// error message if specified profile id is not in database
-		if (!DBM::is_result($profile)) {
+		if (!DBA::isResult($profile)) {
 			throw new BadRequestException("profile_id not available");
 		}
 		$is_default_profile = $profile['is-default'];
@@ -4534,20 +4252,20 @@ function api_account_update_profile_image($type)
 	} else {
 		throw new InternalServerErrorException('Unsupported filetype');
 	}
+
 	// change specified profile or all profiles to the new resource-id
 	if ($is_default_profile) {
 		$condition = ["`profile` AND `resource-id` != ? AND `uid` = ?", $data['photo']['id'], api_user()];
-		dba::update('photo', ['profile' => false], $condition);
+		DBA::update('photo', ['profile' => false], $condition);
 	} else {
 		$fields = ['photo' => System::baseUrl() . '/photo/' . $data['photo']['id'] . '-4.' . $filetype,
 			'thumb' => System::baseUrl() . '/photo/' . $data['photo']['id'] . '-5.' . $filetype];
-		dba::update('profile', $fields, ['id' => $_REQUEST['profile'], 'uid' => api_user()]);
+		DBA::update('profile', $fields, ['id' => $_REQUEST['profile'], 'uid' => api_user()]);
 	}
 
 	Contact::updateSelfFromUserID(api_user(), true);
 
 	// Update global directory in background
-	//$user = api_get_user(get_app());
 	$url = System::baseUrl() . '/profile/' . get_app()->user['nickname'];
 	if ($url && strlen(Config::get('system', 'directory'))) {
 		Worker::add(PRIORITY_LOW, "Directory", $url);
@@ -4587,16 +4305,16 @@ function api_account_update_profile($type)
 	$api_user = api_get_user(get_app());
 
 	if (!empty($_POST['name'])) {
-		dba::update('profile', ['name' => $_POST['name']], ['uid' => $local_user]);
-		dba::update('user', ['username' => $_POST['name']], ['uid' => $local_user]);
-		dba::update('contact', ['name' => $_POST['name']], ['uid' => $local_user, 'self' => 1]);
-		dba::update('contact', ['name' => $_POST['name']], ['id' => $api_user['id']]);
+		DBA::update('profile', ['name' => $_POST['name']], ['uid' => $local_user]);
+		DBA::update('user', ['username' => $_POST['name']], ['uid' => $local_user]);
+		DBA::update('contact', ['name' => $_POST['name']], ['uid' => $local_user, 'self' => 1]);
+		DBA::update('contact', ['name' => $_POST['name']], ['id' => $api_user['id']]);
 	}
 
 	if (isset($_POST['description'])) {
-		dba::update('profile', ['about' => $_POST['description']], ['uid' => $local_user]);
-		dba::update('contact', ['about' => $_POST['description']], ['uid' => $local_user, 'self' => 1]);
-		dba::update('contact', ['about' => $_POST['description']], ['id' => $api_user['id']]);
+		DBA::update('profile', ['about' => $_POST['description']], ['uid' => $local_user]);
+		DBA::update('contact', ['about' => $_POST['description']], ['uid' => $local_user, 'self' => 1]);
+		DBA::update('contact', ['about' => $_POST['description']], ['id' => $api_user['id']]);
 	}
 
 	Worker::add(PRIORITY_LOW, 'ProfileUpdate', $local_user);
@@ -4630,12 +4348,8 @@ function check_acl_input($acl_string)
 	foreach ($cid_array as $cid) {
 		$cid = str_replace("<", "", $cid);
 		$cid = str_replace(">", "", $cid);
-		$contact = q(
-			"SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d",
-			intval($cid),
-			intval(api_user())
-		);
-		$contact_not_found |= !DBM::is_result($contact);
+		$condition = ['id' => $cid, 'uid' => api_user()];
+		$contact_not_found |= !DBA::exists('contact', $condition);
 	}
 	return $contact_not_found;
 }
@@ -4689,7 +4403,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'];
 	}
@@ -4816,24 +4530,24 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $filetype, $visibility = false)
 {
 	// get data about the api authenticated user
-	$uri = item_new_uri(get_app()->get_hostname(), intval(api_user()));
-	$owner_record = q("SELECT * FROM `contact` WHERE `uid`= %d AND `self` LIMIT 1", intval(api_user()));
+	$uri = Item::newURI(intval(api_user()));
+	$owner_record = DBA::selectFirst('contact', [], ['uid' => api_user(), 'self' => true]);
 
 	$arr = [];
-	$arr['guid']          = get_guid(32);
+	$arr['guid']          = System::createGUID(32);
 	$arr['uid']           = intval(api_user());
 	$arr['uri']           = $uri;
 	$arr['parent-uri']    = $uri;
 	$arr['type']          = 'photo';
 	$arr['wall']          = 1;
 	$arr['resource-id']   = $hash;
-	$arr['contact-id']    = $owner_record[0]['id'];
-	$arr['owner-name']    = $owner_record[0]['name'];
-	$arr['owner-link']    = $owner_record[0]['url'];
-	$arr['owner-avatar']  = $owner_record[0]['thumb'];
-	$arr['author-name']   = $owner_record[0]['name'];
-	$arr['author-link']   = $owner_record[0]['url'];
-	$arr['author-avatar'] = $owner_record[0]['thumb'];
+	$arr['contact-id']    = $owner_record['id'];
+	$arr['owner-name']    = $owner_record['name'];
+	$arr['owner-link']    = $owner_record['url'];
+	$arr['owner-avatar']  = $owner_record['thumb'];
+	$arr['author-name']   = $owner_record['name'];
+	$arr['author-link']   = $owner_record['url'];
+	$arr['author-avatar'] = $owner_record['thumb'];
 	$arr['title']         = "";
 	$arr['allow_cid']     = $allow_cid;
 	$arr['allow_gid']     = $allow_gid;
@@ -4849,7 +4563,7 @@ function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $f
 			];
 
 	// adds link to the thumbnail scale photo
-	$arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record[0]['nick'] . '/image/' . $hash . ']'
+	$arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record['nick'] . '/image/' . $hash . ']'
 				. '[img]' . System::baseUrl() . '/photo/' . $hash . '-' . "2" . '.'. $typetoext[$filetype] . '[/img]'
 				. '[/url]';
 
@@ -4886,7 +4600,7 @@ function prepare_photo_data($type, $scale, $photo_id)
 			FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' %s GROUP BY `resource-id`",
 		$data_sql,
 		intval(local_user()),
-		dbesc($photo_id),
+		DBA::escape($photo_id),
 		$scale_sql
 	);
 
@@ -4897,7 +4611,7 @@ function prepare_photo_data($type, $scale, $photo_id)
 	];
 
 	// prepare output data for photo
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$data = ['photo' => $r[0]];
 		$data['photo']['id'] = $data['photo']['resource-id'];
 		if ($scale !== false) {
@@ -4929,32 +4643,19 @@ function prepare_photo_data($type, $scale, $photo_id)
 	}
 
 	// retrieve item element for getting activities (like, dislike etc.) related to photo
-	$item = q(
-		"SELECT * FROM `item` WHERE `uid` = %d AND `resource-id` = '%s' AND `type` = 'photo'",
-		intval(local_user()),
-		dbesc($photo_id)
-	);
-	$data['photo']['friendica_activities'] = api_format_items_activities($item[0], $type);
+	$condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
+	$item = Item::selectFirstForUser(local_user(), ['id'], $condition);
+
+	$data['photo']['friendica_activities'] = api_format_items_activities($item, $type);
 
 	// retrieve comments on photo
-	$r = q(
-		"SELECT `item`.*, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-		`contact`.`id` AS `cid`
-		FROM `item`
-		STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-		WHERE `item`.`parent` = %d AND `item`.`visible`
-		AND NOT `item`.`moderated` AND NOT `item`.`deleted`
-		AND `item`.`uid` = %d AND (`item`.`verb`='%s' OR `type`='photo')",
-		intval($item[0]['parent']),
-		intval(api_user()),
-		dbesc(ACTIVITY_POST)
-	);
+	$condition = ["`parent` = ? AND `uid` = ? AND (`gravity` IN (?, ?) OR `type`='photo')",
+		$item[0]['parent'], api_user(), GRAVITY_PARENT, GRAVITY_COMMENT];
+
+	$statuses = Item::selectForUser(api_user(), [], $condition);
 
 	// prepare output of comments
-	$commentData = api_format_items($r, $user_info, false, $type);
+	$commentData = api_format_items(Item::inArray($statuses), $user_info, false, $type);
 	$comments = [];
 	if ($type == "xml") {
 		$k = 0;
@@ -5003,9 +4704,9 @@ function api_friendica_remoteauth()
 
 	// traditional DFRN
 
-	$contact = dba::selectFirst('contact', [], ['uid' => api_user(), 'nurl' => $c_url]);
+	$contact = DBA::selectFirst('contact', [], ['uid' => api_user(), 'nurl' => $c_url]);
 
-	if (!DBM::is_result($contact) || ($contact['network'] !== NETWORK_DFRN)) {
+	if (!DBA::isResult($contact) || ($contact['network'] !== Protocol::DFRN)) {
 		throw new BadRequestException("Unknown contact");
 	}
 
@@ -5026,7 +4727,7 @@ function api_friendica_remoteauth()
 
 	$fields = ['uid' => api_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id,
 		'sec' => $sec, 'expire' => time() + 45];
-	dba::insert('profile_check', $fields);
+	DBA::insert('profile_check', $fields);
 
 	logger($contact['name'] . ' ' . $sec, LOGGER_DEBUG);
 	$dest = ($url ? '&destination_url=' . $url : '');
@@ -5153,20 +4854,20 @@ function api_get_nick($profile)
 
 	$r = q(
 		"SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
-		dbesc(normalise_link($profile))
+		DBA::escape(normalise_link($profile))
 	);
 
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$nick = $r[0]["nick"];
 	}
 
 	if (!$nick == "") {
 		$r = q(
 			"SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
-			dbesc(normalise_link($profile))
+			DBA::escape(normalise_link($profile))
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$nick = $r[0]["nick"];
 		}
 	}
@@ -5240,35 +4941,26 @@ function api_in_reply_to($item)
 	$in_reply_to['screen_name'] = null;
 
 	if (($item['thr-parent'] != $item['uri']) && (intval($item['parent']) != intval($item['id']))) {
-		$r = q(
-			"SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
-			intval($item['uid']),
-			dbesc($item['thr-parent'])
-		);
-
-		if (DBM::is_result($r)) {
-			$in_reply_to['status_id'] = intval($r[0]['id']);
+		$parent = Item::selectFirst(['id'], ['uid' => $item['uid'], 'uri' => $item['thr-parent']]);
+		if (DBA::isResult($parent)) {
+			$in_reply_to['status_id'] = intval($parent['id']);
 		} else {
 			$in_reply_to['status_id'] = intval($item['parent']);
 		}
 
 		$in_reply_to['status_id_str'] = (string) intval($in_reply_to['status_id']);
 
-		$r = q(
-			"SELECT `contact`.`nick`, `contact`.`name`, `contact`.`id`, `contact`.`url` FROM item
-			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`author-id`
-			WHERE `item`.`id` = %d LIMIT 1",
-			intval($in_reply_to['status_id'])
-		);
+		$fields = ['author-nick', 'author-name', 'author-id', 'author-link'];
+		$parent = Item::selectFirst($fields, ['id' => $in_reply_to['status_id']]);
 
-		if (DBM::is_result($r)) {
-			if ($r[0]['nick'] == "") {
-				$r[0]['nick'] = api_get_nick($r[0]["url"]);
+		if (DBA::isResult($parent)) {
+			if ($parent['author-nick'] == "") {
+				$parent['author-nick'] = api_get_nick($parent['author-link']);
 			}
 
-			$in_reply_to['screen_name'] = (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']);
-			$in_reply_to['user_id'] = intval($r[0]['id']);
-			$in_reply_to['user_id_str'] = (string) intval($r[0]['id']);
+			$in_reply_to['screen_name'] = (($parent['author-nick']) ? $parent['author-nick'] : $parent['author-name']);
+			$in_reply_to['user_id'] = intval($parent['author-id']);
+			$in_reply_to['user_id_str'] = (string) intval($parent['author-id']);
 		}
 
 		// There seems to be situation, where both fields are identical:
@@ -5289,27 +4981,27 @@ function api_in_reply_to($item)
 
 /**
  *
- * @param string $Text
+ * @param string $text
  *
  * @return string
  */
-function api_clean_plain_items($Text)
+function api_clean_plain_items($text)
 {
 	$include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false");
 
-	$Text = BBCode::cleanPictureLinks($Text);
+	$text = BBCode::cleanPictureLinks($text);
 	$URLSearchString = "^\[\]";
 
-	$Text = preg_replace("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
+	$text = preg_replace("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $text);
 
 	if ($include_entities == "true") {
-		$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url=$1]$1[/url]', $Text);
+		$text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url=$1]$1[/url]', $text);
 	}
 
 	// Simplify "attachment" element
-	$Text = api_clean_attachments($Text);
+	$text = api_clean_attachments($text);
 
-	return($Text);
+	return $text;
 }
 
 /**
@@ -5438,7 +5130,7 @@ function api_friendica_group_show($type)
 			intval($gid)
 		);
 		// error message if specified gid is not in database
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			throw new BadRequestException("gid not available");
 		}
 	} else {
@@ -5508,7 +5200,7 @@ function api_friendica_group_delete($type)
 		intval($gid)
 	);
 	// error message if specified gid is not in database
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		throw new BadRequestException('gid not available');
 	}
 
@@ -5517,10 +5209,10 @@ function api_friendica_group_delete($type)
 		"SELECT * FROM `group` WHERE `uid` = %d AND `id` = %d AND `name` = '%s'",
 		intval($uid),
 		intval($gid),
-		dbesc($name)
+		DBA::escape($name)
 	);
 	// error message if specified gid is not in database
-	if (!DBM::is_result($rname)) {
+	if (!DBA::isResult($rname)) {
 		throw new BadRequestException('wrong group name');
 	}
 
@@ -5563,7 +5255,7 @@ function api_lists_destroy($type)
 	}
 
 	// get data of the specified group id
-	$group = dba::selectFirst('group', [], ['uid' => $uid, 'id' => $gid]);
+	$group = DBA::selectFirst('group', [], ['uid' => $uid, 'id' => $gid]);
 	// error message if specified gid is not in database
 	if (!$group) {
 		throw new BadRequestException('gid not available');
@@ -5602,10 +5294,10 @@ function group_create($name, $uid, $users = [])
 	$rname = q(
 		"SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' AND `deleted` = 0",
 		intval($uid),
-		dbesc($name)
+		DBA::escape($name)
 	);
 	// error message if specified group name already exists
-	if (DBM::is_result($rname)) {
+	if (DBA::isResult($rname)) {
 		throw new BadRequestException('group name already exists');
 	}
 
@@ -5613,10 +5305,10 @@ function group_create($name, $uid, $users = [])
 	$rname = q(
 		"SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' AND `deleted` = 1",
 		intval($uid),
-		dbesc($name)
+		DBA::escape($name)
 	);
 	// error message if specified group name already exists
-	if (DBM::is_result($rname)) {
+	if (DBA::isResult($rname)) {
 		$reactivate_group = true;
 	}
 
@@ -5817,7 +5509,7 @@ function api_lists_update($type)
 	}
 
 	// get data of the specified group id
-	$group = dba::selectFirst('group', [], ['uid' => $uid, 'id' => $gid]);
+	$group = DBA::selectFirst('group', [], ['uid' => $uid, 'id' => $gid]);
 	// error message if specified gid is not in database
 	if (!$group) {
 		throw new BadRequestException('gid not available');
@@ -5903,8 +5595,10 @@ function api_friendica_notification($type)
 
 	if ($type == "xml") {
 		$xmlnotes = [];
-		foreach ($notes as $note) {
-			$xmlnotes[] = ["@attributes" => $note];
+		if (!empty($notes)) {
+			foreach ($notes as $note) {
+				$xmlnotes[] = ["@attributes" => $note];
+			}
 		}
 
 		$notes = $xmlnotes;
@@ -5944,14 +5638,10 @@ function api_friendica_notification_seen($type)
 	$nm->setSeen($note);
 	if ($note['otype']=='item') {
 		// would be really better with an ItemsManager and $im->getByID() :-P
-		$r = q(
-			"SELECT * FROM `item` WHERE `id`=%d AND `uid`=%d",
-			intval($note['iid']),
-			intval(local_user())
-		);
-		if ($r!==false) {
+		$item = Item::selectFirstForUser(api_user(), [], ['id' => $note['iid'], 'uid' => api_user()]);
+		if (DBA::isResult($item)) {
 			// we found the item, return it to the user
-			$ret = api_format_items($r, $user_info, false, $type);
+			$ret = api_format_items([$item], $user_info, false, $type);
 			$data = ['status' => $ret];
 			return api_format_data("status", $type, $data);
 		}
@@ -5989,13 +5679,13 @@ function api_friendica_direct_messages_setseen($type)
 	}
 
 	// error message if specified id is not in database
-	if (!dba::exists('mail', ['id' => $id, 'uid' => $uid])) {
+	if (!DBA::exists('mail', ['id' => $id, 'uid' => $uid])) {
 		$answer = ['result' => 'error', 'message' => 'message id not in database'];
 		return api_format_data("direct_messages_setseen", $type, ['$result' => $answer]);
 	}
 
 	// update seen indicator
-	$result = dba::update('mail', ['seen' => true], ['id' => $id]);
+	$result = DBA::update('mail', ['seen' => true], ['id' => $id]);
 
 	if ($result) {
 		// return success
@@ -6042,13 +5732,13 @@ function api_friendica_direct_messages_search($type, $box = "")
 	$r = q(
 		"SELECT `mail`.*, `contact`.`nurl` AS `contact-url` FROM `mail`,`contact` WHERE `mail`.`contact-id` = `contact`.`id` AND `mail`.`uid`=%d AND `body` LIKE '%s' ORDER BY `mail`.`id` DESC",
 		intval($uid),
-		dbesc('%'.$searchstring.'%')
+		DBA::escape('%'.$searchstring.'%')
 	);
 
 	$profile_url = $user_info["url"];
 
 	// message if nothing was found
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		$success = ['success' => false, 'search_results' => 'problem with query'];
 	} elseif (count($r) == 0) {
 		$success = ['success' => false, 'search_results' => 'nothing found'];
@@ -6106,7 +5796,7 @@ function api_friendica_profile_show($type)
 		);
 
 		// error message if specified gid is not in database
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			throw new BadRequestException("profile_id not available");
 		}
 	} else {
@@ -6126,7 +5816,7 @@ function api_friendica_profile_show($type)
 		$nurls = q(
 			"SELECT `id`, `nurl` FROM `contact` WHERE `uid`= %d AND `profile-id` = %d",
 			intval(api_user()),
-			intval($rr['profile_id'])
+			intval($rr['id'])
 		);
 
 		foreach ($nurls as $nurl) {
@@ -6144,11 +5834,11 @@ function api_friendica_profile_show($type)
 	}
 
 	// return settings, authenticated user and profiles data
-	$self = q("SELECT `nurl` FROM `contact` WHERE `uid`= %d AND `self` LIMIT 1", intval(api_user()));
+	$self = DBA::selectFirst('contact', ['nurl'], ['uid' => api_user(), 'self' => true]);
 
 	$result = ['multi_profiles' => $multi_profiles ? true : false,
 					'global_dir' => $directory,
-					'friendica_owner' => api_get_user($a, $self[0]['nurl']),
+					'friendica_owner' => api_get_user($a, $self['nurl']),
 					'profiles' => $profiles];
 	return api_format_data("friendica_profiles", $type, ['$result' => $result]);
 }
@@ -6165,7 +5855,7 @@ api_register_func('api/friendica/profile/show', 'api_friendica_profile_show', tr
  */
 function api_saved_searches_list($type)
 {
-	$terms = dba::select('search', ['id', 'term'], ['uid' => local_user()]);
+	$terms = DBA::select('search', ['id', 'term'], ['uid' => local_user()]);
 
 	$result = [];
 	while ($term = $terms->fetch()) {
@@ -6179,7 +5869,7 @@ function api_saved_searches_list($type)
 		];
 	}
 
-	dba::close($terms);
+	DBA::close($terms);
 
 	return api_format_data("terms", $type, ['terms' => $result]);
 }
diff --git a/include/conversation.php b/include/conversation.php
index 290d68bf3..e41b697b5 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -11,13 +11,17 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Model\Term;
 use Friendica\Object\Post;
 use Friendica\Object\Thread;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
@@ -109,14 +113,21 @@ function item_redir_and_replace_images($body, $images, $cid) {
 /**
  * Render actions localized
  */
-function localize_item(&$item) {
-
+function localize_item(&$item)
+{
 	$extracted = item_extract_images($item['body']);
 	if ($extracted['images']) {
 		$item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']);
 	}
 
-	/// @Separted ???
+	/*
+	heluecht 2018-06-19: from my point of view this whole code part is useless.
+	It just renders the body message of technical posts (Like, dislike, ...).
+	But: The body isn't visible at all. So we do this stuff just because we can.
+	Even if these messages were visible, this would only mean that something went wrong.
+	During the further steps of the database restructuring I would like to address this issue.
+	*/
+
 	$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
 	if (activity_match($item['verb'], ACTIVITY_LIKE)
 		|| activity_match($item['verb'], ACTIVITY_DISLIKE)
@@ -124,15 +135,11 @@ function localize_item(&$item) {
 		|| activity_match($item['verb'], ACTIVITY_ATTENDNO)
 		|| activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) {
 
-		/// @TODO may hurt performance
-		$r = q("SELECT * FROM `item`, `contact`
-			WHERE `item`.`contact-id`=`contact`.`id`
-			AND `item`.`uri`='%s'",
-			dbesc($item['parent-uri']));
-		if (!DBM::is_result($r)) {
+		$fields = ['author-link', 'author-name', 'verb', 'object-type', 'resource-id', 'body', 'plink'];
+		$obj = Item::selectFirst($fields, ['uri' => $item['parent-uri']]);
+		if (!DBA::isResult($obj)) {
 			return;
 		}
-		$obj = $r[0];
 
 		$author  = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
 		$objauthor =  '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
@@ -162,22 +169,19 @@ function localize_item(&$item) {
 
 		if (activity_match($item['verb'], ACTIVITY_LIKE)) {
 			$bodyverb = L10n::t('%1$s likes %2$s\'s %3$s');
-		}
-		elseif (activity_match($item['verb'], ACTIVITY_DISLIKE)) {
+		} elseif (activity_match($item['verb'], ACTIVITY_DISLIKE)) {
 			$bodyverb = L10n::t('%1$s doesn\'t like %2$s\'s %3$s');
-		}
-		elseif (activity_match($item['verb'], ACTIVITY_ATTEND)) {
+		} elseif (activity_match($item['verb'], ACTIVITY_ATTEND)) {
 			$bodyverb = L10n::t('%1$s attends %2$s\'s %3$s');
-		}
-		elseif (activity_match($item['verb'], ACTIVITY_ATTENDNO)) {
+		} elseif (activity_match($item['verb'], ACTIVITY_ATTENDNO)) {
 			$bodyverb = L10n::t('%1$s doesn\'t attend %2$s\'s %3$s');
-		}
-		elseif (activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) {
+		} elseif (activity_match($item['verb'], ACTIVITY_ATTENDMAYBE)) {
 			$bodyverb = L10n::t('%1$s attends maybe %2$s\'s %3$s');
 		}
-		$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
 
+		$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
 	}
+
 	if (activity_match($item['verb'], ACTIVITY_FRIEND)) {
 
 		if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return;
@@ -191,7 +195,8 @@ function localize_item(&$item) {
 		$links = XML::parseString($xmlhead."<links>".unxmlify($obj->link)."</links>");
 
 		$Bname = $obj->title;
-		$Blink = ""; $Bphoto = "";
+		$Blink = "";
+		$Bphoto = "";
 		foreach ($links->link as $l) {
 			$atts = $l->attributes();
 			switch ($atts['rel']) {
@@ -200,10 +205,10 @@ function localize_item(&$item) {
 			}
 		}
 
-		$A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]';
-		$B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]';
+		$A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
+		$B = '[url=' . Contact::magicLink($Blink) . ']' . $Bname . '[/url]';
 		if ($Bphoto != "") {
-			$Bphoto = '[url=' . Profile::zrl($Blink) . '][img]' . $Bphoto . '[/img][/url]';
+			$Bphoto = '[url=' . Contact::magicLink($Blink) . '][img]' . $Bphoto . '[/img][/url]';
 		}
 
 		$item['body'] = L10n::t('%1$s is now friends with %2$s', $A, $B)."\n\n\n".$Bphoto;
@@ -224,12 +229,12 @@ 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 = "";
+		$Blink = $obj->id;
 		$Bphoto = "";
-		foreach ($links->link as $l) {
+
+		foreach ($obj->link as $l) {
 			$atts = $l->attributes();
 			switch ($atts['rel']) {
 				case "alternate": $Blink = $atts['href'];
@@ -237,10 +242,10 @@ function localize_item(&$item) {
 			}
 		}
 
-		$A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]';
-		$B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]';
+		$A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
+		$B = '[url=' . Contact::magicLink($Blink) . ']' . $Bname . '[/url]';
 		if ($Bphoto != "") {
-			$Bphoto = '[url=' . Profile::zrl($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
+			$Bphoto = '[url=' . Contact::magicLink($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
 		}
 
 		/*
@@ -251,7 +256,7 @@ function localize_item(&$item) {
 
 		// now translate the verb
 		$poked_t = trim(sprintf($txt, "", ""));
-		$txt = str_replace( $poked_t, L10n::t($verb), $txt);
+		$txt = str_replace($poked_t, L10n::t($verb), $txt);
 
 		// then do the sprintf on the translation string
 
@@ -260,20 +265,20 @@ function localize_item(&$item) {
 	}
 
 	if (activity_match($item['verb'], ACTIVITY_TAG)) {
-		/// @TODO may hurt performance "joining" two tables + asterisk
-		$r = q("SELECT * FROM `item`, `contact`
-			WHERE `item`.`contact-id`=`contact`.`id`
-			AND `item`.`uri`='%s'",
-			dbesc($item['parent-uri']));
-
-		if (!DBM::is_result($r)) {
+		$fields = ['author-id', 'author-link', 'author-name', 'author-network',
+			'verb', 'object-type', 'resource-id', 'body', 'plink'];
+		$obj = Item::selectFirst($fields, ['uri' => $item['parent-uri']]);
+		if (!DBA::isResult($obj)) {
 			return;
 		}
 
-		$obj = $r[0];
+		$author_arr = ['uid' => 0, 'id' => $item['author-id'],
+			'network' => $item['author-network'], 'url' => $item['author-link']];
+		$author  = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $item['author-name'] . '[/url]';
 
-		$author  = '[url=' . Profile::zrl($item['author-link']) . ']' . $item['author-name'] . '[/url]';
-		$objauthor =  '[url=' . Profile::zrl($obj['author-link']) . ']' . $obj['author-name'] . '[/url]';
+		$author_arr = ['uid' => 0, 'id' => $obj['author-id'],
+			'network' => $obj['author-network'], 'url' => $obj['author-link']];
+		$objauthor  = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $obj['author-name'] . '[/url]';
 
 		switch ($obj['verb']) {
 			case ACTIVITY_POST:
@@ -301,11 +306,10 @@ function localize_item(&$item) {
 		$parsedobj = XML::parseString($xmlhead.$item['object']);
 
 		$tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content);
-		$item['body'] = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s', $author, $objauthor, $plink, $tag );
-
+		$item['body'] = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s', $author, $objauthor, $plink, $tag);
 	}
-	if (activity_match($item['verb'], ACTIVITY_FAVORITE)) {
 
+	if (activity_match($item['verb'], ACTIVITY_FAVORITE)) {
 		if ($item['object-type'] == "") {
 			return;
 		}
@@ -317,17 +321,13 @@ function localize_item(&$item) {
 
 		$obj = XML::parseString($xmlhead.$item['object']);
 		if (strlen($obj->id)) {
-			$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-					dbesc($obj->id),
-					intval($item['uid'])
-			);
-
-			if (DBM::is_result($r) && $r[0]['plink']) {
-				$target = $r[0];
+			$fields = ['author-link', 'author-name', 'plink'];
+			$target = Item::selectFirst($fields, ['uri' => $obj->id, 'uid' => $item['uid']]);
+			if (DBA::isResult($target) && $target['plink']) {
 				$Bname = $target['author-name'];
 				$Blink = $target['author-link'];
-				$A = '[url=' . Profile::zrl($Alink) . ']' . $Aname . '[/url]';
-				$B = '[url=' . Profile::zrl($Blink) . ']' . $Bname . '[/url]';
+				$A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
+				$B = '[url=' . Contact::magicLink($Blink) . ']' . $Bname . '[/url]';
 				$P = '[url=' . $target['plink'] . ']' . L10n::t('post/item') . '[/url]';
 				$item['body'] = L10n::t('%1$s marked %2$s\'s %3$s as favorite', $A, $B, $P)."\n";
 			}
@@ -337,7 +337,7 @@ function localize_item(&$item) {
 	if (preg_match_all('/@\[url=(.*?)\]/is', $item['body'], $matches, PREG_SET_ORDER)) {
 		foreach ($matches as $mtch) {
 			if (!strpos($mtch[1], 'zrl=')) {
-				$item['body'] = str_replace($mtch[0], '@[url=' . Profile::zrl($mtch[1]) . ']', $item['body']);
+				$item['body'] = str_replace($mtch[0], '@[url=' . Contact::magicLink($mtch[1]) . ']', $item['body']);
 			}
 		}
 	}
@@ -350,15 +350,11 @@ function localize_item(&$item) {
 	}
 
 	// add sparkle links to appropriate permalinks
+	$author = ['uid' => 0, 'id' => $item['author-id'],
+		'network' => $item['author-network'], 'url' => $item['author-link']];
 
-	$x = stristr($item['plink'],'/display/');
-	if ($x) {
-		$sparkle = false;
-		$y = best_link_url($item, $sparkle);
-
-		if (strstr($y, '/redir/')) {
-			$item['plink'] = $y . '?f=&url=' . $item['plink'];
-		}
+	if (!empty($item['plink'])) {
+		$item['plink'] = Contact::magicLinkbyContact($author, $item['plink']);
 	}
 }
 
@@ -394,102 +390,36 @@ function visible_activity($item) {
 		}
 	}
 
-	if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE) {
-		if (!($item['self'] && ($item['uid'] == local_user()))) {
-			return false;
-		}
+	// @TODO below if() block can be rewritten to a single line: $isVisible = allConditionsHere;
+	if (activity_match($item['verb'], ACTIVITY_FOLLOW) && $item['object-type'] === ACTIVITY_OBJ_NOTE && empty($item['self']) && $item['uid'] == local_user()) {
+		return false;
 	}
 
 	return true;
 }
 
-/**
- * @brief SQL query for items
- *
- * @param int $uid user id
- */
-function item_query($uid = 0) {
-	return "SELECT " . item_fieldlists() . " FROM `item` " .
-		item_joins($uid) . " WHERE " . item_condition();
-}
+function conv_get_blocklist()
+{
+	if (!local_user()) {
+		return [];
+	}
 
-/**
- * @brief List of all data fields that are needed for displaying items
- */
-function item_fieldlists() {
+	$str_blocked = PConfig::get(local_user(), 'system', 'blocked');
+	if (empty($str_blocked)) {
+		return [];
+	}
 
-/*
-These Fields are not added below (yet). They are here to for bug search.
-`item`.`type`,
-`item`.`extid`,
-`item`.`changed`,
-`item`.`moderated`,
-`item`.`target-type`,
-`item`.`target`,
-`item`.`resource-id`,
-`item`.`tag`,
-`item`.`inform`,
-`item`.`pubmail`,
-`item`.`visible`,
-`item`.`spam`,
-`item`.`bookmark`,
-`item`.`unseen`,
-`item`.`deleted`,
-`item`.`forum_mode`,
-`item`.`mention`,
-`item`.`global`,
-`item`.`shadow`,
-*/
+	$blocklist = [];
 
-	return "`item`.`author-id`, `item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
-		`item`.`owner-id`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
-		`item`.`contact-id`, `item`.`uid`, `item`.`id`, `item`.`parent`,
-		`item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`, `item`.`content-warning`,
-		`item`.`commented`, `item`.`created`, `item`.`edited`, `item`.`received`,
-		`item`.`verb`, `item`.`object-type`, `item`.`postopts`, `item`.`plink`,
-		`item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`, `item`.`origin`,
-		`item`.`title`,	`item`.`body`, `item`.`file`, `item`.`event-id`,
-		`item`.`location`, `item`.`coord`, `item`.`app`, `item`.`attach`,
-		`item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`,
-		`item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`,
-		`item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
+	foreach (explode(',', $str_blocked) as $entry) {
+		// The 4th parameter guarantees that there always will be a public contact entry
+		$cid = Contact::getIdForURL(trim($entry), 0, true, ['url' => trim($entry)]);
+		if (!empty($cid)) {
+			$blocklist[] = $cid;
+		}
+	}
 
-		`author`.`thumb` AS `author-thumb`, `owner`.`thumb` AS `owner-thumb`,
-
-		`contact`.`network`, `contact`.`url`, `contact`.`name`, `contact`.`writable`,
-		`contact`.`self`, `contact`.`id` AS `cid`, `contact`.`alias`,
-
-		`event`.`created` AS `event-created`, `event`.`edited` AS `event-edited`,
-		`event`.`start` AS `event-start`,`event`.`finish` AS `event-finish`,
-		`event`.`summary` AS `event-summary`,`event`.`desc` AS `event-desc`,
-		`event`.`location` AS `event-location`, `event`.`type` AS `event-type`,
-		`event`.`nofinish` AS `event-nofinish`,`event`.`adjust` AS `event-adjust`,
-		`event`.`ignore` AS `event-ignore`, `event`.`id` AS `event-id`";
-}
-
-/**
- * @brief SQL join for contacts that are needed for displaying items
- *
- * @param int $uid user id
- */
-function item_joins($uid = 0) {
-	return sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-		AND NOT `contact`.`blocked`
-		AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s)))
-		OR `contact`.`self` OR (`item`.`id` != `item`.`parent`) OR `contact`.`uid` = 0)
-		INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` AND NOT `author`.`blocked`
-		INNER JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id` AND NOT `owner`.`blocked`
-		LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = %d
-		LEFT JOIN `event` ON `event-id` = `event`.`id`",
-		CONTACT_IS_SHARING, CONTACT_IS_FRIEND, intval($uid)
-	);
-}
-
-/**
- * @brief SQL condition for items that are needed for displaying items
- */
-function item_condition() {
-	return "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`) ";
+	return $blocklist;
 }
 
 /**
@@ -502,26 +432,14 @@ function item_condition() {
  * that are based on unique features of the calling module.
  *
  */
-function conversation(App $a, $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0) {
-	require_once 'mod/proxy.php';
+function conversation(App $a, array $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0) {
 
-	$ssl_state = ((local_user()) ? true : false);
+	$ssl_state = (local_user() ? true : false);
 
 	$profile_owner = 0;
 	$live_update_div = '';
 
-	$arr_blocked = null;
-
-	if (local_user()) {
-		$str_blocked = PConfig::get(local_user(), 'system', 'blocked');
-		if ($str_blocked) {
-			$arr_blocked = explode(',', $str_blocked);
-			for ($x = 0; $x < count($arr_blocked); $x ++) {
-				$arr_blocked[$x] = trim($arr_blocked[$x]);
-			}
-		}
-
-	}
+	$blocklist = conv_get_blocklist();
 
 	$previewing = (($preview) ? ' preview ' : '');
 
@@ -545,7 +463,6 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 				. ((x($_GET, 'bmark'))  ? '&bmark='  . $_GET['bmark']  : '')
 				. ((x($_GET, 'liked'))  ? '&liked='  . $_GET['liked']  : '')
 				. ((x($_GET, 'conv'))   ? '&conv='   . $_GET['conv']   : '')
-				. ((x($_GET, 'spam'))   ? '&spam='   . $_GET['spam']   : '')
 				. ((x($_GET, 'nets'))   ? '&nets='   . $_GET['nets']   : '')
 				. ((x($_GET, 'cmin'))   ? '&cmin='   . $_GET['cmin']   : '')
 				. ((x($_GET, 'cmax'))   ? '&cmax='   . $_GET['cmax']   : '')
@@ -554,6 +471,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 				. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 		}
 	} elseif ($mode === 'profile') {
+		$items = conversation_add_children($items, false, $order, $uid);
 		$profile_owner = $a->profile['profile_uid'];
 
 		if (!$update) {
@@ -573,27 +491,41 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 			}
 		}
 	} elseif ($mode === 'notes') {
+		$items = conversation_add_children($items, false, $order, $uid);
 		$profile_owner = local_user();
+
 		if (!$update) {
 			$live_update_div = '<div id="live-notes"></div>' . "\r\n"
 				. "<script> var profile_uid = " . local_user()
 				. "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 		}
 	} elseif ($mode === 'display') {
+		$items = conversation_add_children($items, false, $order, $uid);
 		$profile_owner = $a->profile['uid'];
+
 		if (!$update) {
 			$live_update_div = '<div id="live-display"></div>' . "\r\n"
-				. "<script> var profile_uid = " . $_SESSION['uid'] . ";"
+				. "<script> var profile_uid = " . defaults($_SESSION, 'uid', 0) . ";"
 				. " var profile_page = 1; </script>";
 		}
 	} elseif ($mode === 'community') {
 		$items = conversation_add_children($items, true, $order, $uid);
 		$profile_owner = 0;
+
 		if (!$update) {
 			$live_update_div = '<div id="live-community"></div>' . "\r\n"
 				. "<script> var profile_uid = -1; var netargs = '" . substr($a->cmd, 10)
 				."/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 		}
+	} elseif ($mode === 'contacts') {
+		$items = conversation_add_children($items, true, $order, $uid);
+		$profile_owner = 0;
+
+		if (!$update) {
+			$live_update_div = '<div id="live-contacts"></div>' . "\r\n"
+				. "<script> var profile_uid = -1; var netargs = '" . substr($a->cmd, 9)
+				."/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+		}
 	} elseif ($mode === 'search') {
 		$live_update_div = '<div id="live-search"></div>' . "\r\n";
 	}
@@ -620,11 +552,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 
 	$page_template = get_markup_template("conversation.tpl");
 
-	if ($items && count($items)) {
-		if ($mode === 'community') {
+	if (!empty($items)) {
+		if (in_array($mode, ['community', 'contacts'])) {
 			$writable = true;
 		} else {
-			$writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
+			$writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
 		}
 
 		if (!local_user()) {
@@ -646,20 +578,10 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 					continue;
 				}
 
-				if ($arr_blocked) {
-					$blocked = false;
-					foreach ($arr_blocked as $b) {
-						if ($b && link_compare($item['author-link'], $b)) {
-							$blocked = true;
-							break;
-						}
-					}
-					if ($blocked) {
-						continue;
-					}
+				if (in_array($item['author-id'], $blocklist)) {
+					continue;
 				}
 
-
 				$threadsid++;
 
 				$owner_url   = '';
@@ -667,45 +589,23 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 				$sparkle     = '';
 
 				// prevent private email from leaking.
-				if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+				if ($item['network'] === Protocol::MAIL && local_user() != $item['uid']) {
 					continue;
 				}
 
-				$profile_name = (strlen($item['author-name']) ? $item['author-name'] : $item['name']);
-				if ($item['author-link'] && !$item['author-name']) {
+				$profile_name = $item['author-name'];
+				if (!empty($item['author-link']) && empty($item['author-name'])) {
 					$profile_name = $item['author-link'];
 				}
 
-				$tags = \Friendica\Model\Term::populateTagsFromItem($item);
+				$tags = Term::populateTagsFromItem($item);
 
-				$sp = false;
-				$profile_link = best_link_url($item, $sp);
-				if ($profile_link === 'mailbox') {
-					$profile_link = '';
-				}
+				$author = ['uid' => 0, 'id' => $item['author-id'],
+					'network' => $item['author-network'], 'url' => $item['author-link']];
+				$profile_link = Contact::magicLinkbyContact($author);
 
-				if ($sp) {
+				if (strpos($profile_link, 'redir/') === 0) {
 					$sparkle = ' sparkle';
-				} else {
-					$profile_link = Profile::zrl($profile_link);
-				}
-
-				if (!x($item, 'author-thumb') || ($item['author-thumb'] == "")) {
-					$author_contact = Contact::getDetailsByURL($item['author-link'], $profile_owner);
-					if ($author_contact["thumb"]) {
-						$item['author-thumb'] = $author_contact["thumb"];
-					} else {
-						$item['author-thumb'] = $item['author-avatar'];
-					}
-				}
-
-				if (!isset($item['owner-thumb']) || ($item['owner-thumb'] == "")) {
-					$owner_contact = Contact::getDetailsByURL($item['owner-link'], $profile_owner);
-					if ($owner_contact["thumb"]) {
-						$item['owner-thumb'] = $owner_contact["thumb"];
-					} else {
-						$item['owner-thumb'] = $item['owner-avatar'];
-					}
 				}
 
 				$locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => ''];
@@ -752,23 +652,19 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 				$location_e = $location;
 				$owner_name_e = $owner_name;
 
-				if ($item['item_network'] == "") {
-					$item['item_network'] = $item['network'];
-				}
-
 				$tmp_item = [
 					'template' => $tpl,
-					'id' => (($preview) ? 'P0' : $item['item_id']),
-					'guid' => (($preview) ? 'Q0' : $item['guid']),
-					'network' => $item['item_network'],
-					'network_name' => ContactSelector::networkToName($item['item_network'], $profile_link),
-					'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
+					'id' => ($preview ? 'P0' : $item['id']),
+					'guid' => ($preview ? 'Q0' : $item['guid']),
+					'network' => $item['network'],
+					'network_name' => ContactSelector::networkToName($item['network'], $profile_link),
+					'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
 					'profile_url' => $profile_link,
 					'item_photo_menu' => item_photo_menu($item),
 					'name' => $profile_name_e,
 					'sparkle' => $sparkle,
 					'lock' => $lock,
-					'thumb' => System::removedBaseUrl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)),
+					'thumb' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)),
 					'title' => $title_e,
 					'body' => $body_e,
 					'tags' => $tags_e,
@@ -787,7 +683,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 					'indent' => '',
 					'owner_name' => $owner_name_e,
 					'owner_url' => $owner_url,
-					'owner_photo' => System::removedBaseUrl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
+					'owner_photo' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
 					'plink' => get_plink($item),
 					'edpost' => false,
 					'isstarred' => $isstarred,
@@ -806,8 +702,8 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 				$arr = ['item' => $item, 'output' => $tmp_item];
 				Addon::callHooks('display_item', $arr);
 
-				$threads[$threadsid]['id'] = $item['item_id'];
-				$threads[$threadsid]['network'] = $item['item_network'];
+				$threads[$threadsid]['id'] = $item['id'];
+				$threads[$threadsid]['network'] = $item['network'];
 				$threads[$threadsid]['items'] = [$arr['output']];
 
 			}
@@ -823,24 +719,15 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 			 * But for now, this array respects the old style, just in case
 			 */
 			foreach ($items as $item) {
-				if ($arr_blocked) {
-					$blocked = false;
-					foreach ($arr_blocked as $b) {
-						if ($b && link_compare($item['author-link'], $b)) {
-							$blocked = true;
-							break;
-						}
-					}
-					if ($blocked) {
-						continue;
-					}
+				if (in_array($item['author-id'], $blocklist)) {
+					continue;
 				}
 
 				// Can we put this after the visibility check?
 				builtin_activity_puller($item, $conv_responses);
 
 				// Only add what is visible
-				if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+				if ($item['network'] === Protocol::MAIL && local_user() != $item['uid']) {
 					continue;
 				}
 
@@ -848,6 +735,8 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
 					continue;
 				}
 
+				/// @todo Check if this call is needed or not
+				$arr = ['item' => $item];
 				Addon::callHooks('display_item', $arr);
 
 				$item['pagedrop'] = $page_dropping;
@@ -890,26 +779,26 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
  *
  * @return array items with parents and comments
  */
-function conversation_add_children($parents, $block_authors, $order, $uid) {
+function conversation_add_children(array $parents, $block_authors, $order, $uid) {
 	$max_comments = Config::get('system', 'max_comments', 100);
 
+	$params = ['order' => ['uid', 'commented' => true]];
+
 	if ($max_comments > 0) {
-		$limit = ' LIMIT '.intval($max_comments + 1);
-	} else {
-		$limit = '';
+		$params['limit'] = $max_comments;
 	}
 
 	$items = [];
 
-	$block_sql = $block_authors ? "AND NOT `author`.`hidden` AND NOT `author`.`blocked`" : "";
-
 	foreach ($parents AS $parent) {
-		$thread_items = dba::p(item_query(local_user())."AND `item`.`parent-uri` = ?
-			AND `item`.`uid` IN (0, ?) $block_sql
-			ORDER BY `item`.`uid` ASC, `item`.`commented` DESC" . $limit,
-			$parent['uri'], local_user());
+		$condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) ",
+			$parent['uri'], local_user()];
+		if ($block_authors) {
+			$condition[0] .= "AND NOT `author`.`hidden`";
+		}
+		$thread_items = Item::selectForUser(local_user(), [], $condition, $params);
 
-		$comments = dba::inArray($thread_items);
+		$comments = Item::inArray($thread_items);
 
 		if (count($comments) != 0) {
 			$items = array_merge($items, $comments);
@@ -918,7 +807,7 @@ function conversation_add_children($parents, $block_authors, $order, $uid) {
 
 	foreach ($items as $index => $item) {
 		if ($item['uid'] == 0) {
-			$items[$index]['writable'] = in_array($item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
+			$items[$index]['writable'] = in_array($item['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
 		}
 	}
 
@@ -927,48 +816,6 @@ function conversation_add_children($parents, $block_authors, $order, $uid) {
 	return $items;
 }
 
-function best_link_url($item, &$sparkle, $url = '') {
-
-	$best_url = '';
-	$sparkle  = false;
-
-	$clean_url = normalise_link($item['author-link']);
-
-	if (local_user()) {
-		$condition = [
-			'network' => NETWORK_DFRN,
-			'uid' => local_user(),
-			'nurl' => normalise_link($clean_url),
-			'pending' => false
-		];
-		$contact = dba::selectFirst('contact', ['id'], $condition);
-		if (DBM::is_result($contact)) {
-			$best_url = 'redir/' . $contact['id'];
-			$sparkle = true;
-			if ($url != '') {
-				$hostname = get_app()->get_hostname();
-				if (!strstr($url, $hostname)) {
-					$best_url .= "?url=".$url;
-				} else {
-					$best_url = $url;
-				}
-			}
-		}
-	}
-	if (!$best_url) {
-		if ($url != '') {
-			$best_url = $url;
-		} elseif (strlen($item['author-link'])) {
-			$best_url = $item['author-link'];
-		} else {
-			$best_url = $item['url'];
-		}
-	}
-
-	return $best_url;
-}
-
-
 function item_photo_menu($item) {
 	$sub_link = '';
 	$poke_link = '';
@@ -982,18 +829,17 @@ function item_photo_menu($item) {
 		$sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;';
 	}
 
-	$sparkle = false;
-	$profile_link = best_link_url($item, $sparkle);
-	if ($profile_link === 'mailbox') {
-		$profile_link = '';
-	}
+	$author = ['uid' => 0, 'id' => $item['author-id'],
+		'network' => $item['author-network'], 'url' => $item['author-link']];
+	$profile_link = Contact::magicLinkbyContact($author);
+	$sparkle = (strpos($profile_link, 'redir/') === 0);
 
 	$cid = 0;
 	$network = '';
 	$rel = 0;
 	$condition = ['uid' => local_user(), 'nurl' => normalise_link($item['author-link'])];
-	$contact = dba::selectFirst('contact', ['id', 'network', 'rel'], $condition);
-	if (DBM::is_result($contact)) {
+	$contact = DBA::selectFirst('contact', ['id', 'network', 'rel'], $condition);
+	if (DBA::isResult($contact)) {
 		$cid = $contact['id'];
 		$network = $contact['network'];
 		$rel = $contact['rel'];
@@ -1003,8 +849,6 @@ function item_photo_menu($item) {
 		$status_link = $profile_link . '?url=status';
 		$photos_link = $profile_link . '?url=photos';
 		$profile_link = $profile_link . '?url=profile';
-	} else {
-		$profile_link = Profile::zrl($profile_link);
 	}
 
 	if ($cid && !$item['self']) {
@@ -1012,7 +856,7 @@ function item_photo_menu($item) {
 		$contact_url = 'contacts/' . $cid;
 		$posts_link = 'contacts/' . $cid . '/posts';
 
-		if (in_array($network, [NETWORK_DFRN, NETWORK_DIASPORA])) {
+		if (in_array($network, [Protocol::DFRN, Protocol::DIASPORA])) {
 			$pm_url = 'message/new/' . $cid;
 		}
 	}
@@ -1028,12 +872,12 @@ function item_photo_menu($item) {
 			L10n::t('Send PM') => $pm_url
 		];
 
-		if ($network == NETWORK_DFRN) {
+		if ($network == Protocol::DFRN) {
 			$menu[L10n::t("Poke")] = $poke_link;
 		}
 
-		if ((($cid == 0) || ($rel == CONTACT_IS_FOLLOWER)) &&
-			in_array($item['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) {
+		if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
+			in_array($item['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
 			$menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
 		}
 	} else {
@@ -1092,17 +936,16 @@ function builtin_activity_puller($item, &$conv_responses) {
 		}
 
 		if (activity_match($item['verb'], $verb) && ($item['id'] != $item['parent'])) {
-			$url = $item['author-link'];
-			if (local_user() && (local_user() == $item['uid']) && ($item['network'] === NETWORK_DFRN) && !$item['self'] && link_compare($item['author-link'], $item['url'])) {
-				$url = 'redir/' . $item['contact-id'];
+			$author = ['uid' => 0, 'id' => $item['author-id'],
+				'network' => $item['author-network'], 'url' => $item['author-link']];
+			$url = Contact::magicLinkbyContact($author);
+			if (strpos($url, 'redir/') === 0) {
 				$sparkle = ' class="sparkle" ';
-			} else {
-				$url = Profile::zrl($url);
 			}
 
 			$url = '<a href="'. $url . '"'. $sparkle .'>' . htmlentities($item['author-name']) . '</a>';
 
-			if (!$item['thr-parent']) {
+			if (!x($item, 'thr-parent')) {
 				$item['thr-parent'] = $item['parent-uri'];
 			}
 
@@ -1182,7 +1025,7 @@ function format_like($cnt, array $arr, $type, $id) {
 		}
 		if ($total >= MAX_LIKERS) {
 			$str = implode(', ', $arr);
-			$str .= L10n::t('and %d other people', $total - MAX_LIKERS );
+			$str .= L10n::t('and %d other people', $total - MAX_LIKERS);
 		}
 
 		$likers = $str;
@@ -1317,7 +1160,8 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
 		'$wait'         => L10n::t('Please wait'),
 		'$permset'      => L10n::t('Permission settings'),
 		'$shortpermset' => L10n::t('permissions'),
-		'$ptyp'         => $notes_cid ? 'note' : 'wall',
+		'$wall'         => $notes_cid ? 0 : 1,
+		'$posttype'     => $notes_cid ? Item::PT_PERSONAL_NOTE : Item::PT_ARTICLE,
 		'$content'      => defaults($x, 'content', ''),
 		'$post_id'      => defaults($x, 'post_id', ''),
 		'$baseurl'      => System::baseUrl(true),
@@ -1503,10 +1347,16 @@ function conv_sort(array $item_list, $order)
 		return $parents;
 	}
 
+	$blocklist = conv_get_blocklist();
+
 	$item_array = [];
 
 	// Dedupes the item list on the uri to prevent infinite loops
 	foreach ($item_list as $item) {
+		if (in_array($item['author-id'], $blocklist)) {
+			continue;
+		}
+
 		$item_array[$item['uri']] = $item;
 	}
 
@@ -1590,23 +1440,21 @@ function sort_thr_commented(array $a, array $b)
 	return strcmp($b['commented'], $a['commented']);
 }
 
-/// @TODO Add type-hint
-function render_location_dummy($item) {
-	if ($item['location'] != "") {
+function render_location_dummy(array $item) {
+	if (x($item, 'location') && !empty($item['location'])) {
 		return $item['location'];
 	}
 
-	if ($item['coord'] != "") {
+	if (x($item, 'coord') && !empty($item['coord'])) {
 		return $item['coord'];
 	}
 }
 
-/// @TODO Add type-hint
-function get_responses($conv_responses, $response_verbs, $ob, $item) {
+function get_responses(array $conv_responses, array $response_verbs, $ob, array $item) {
 	$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) {
diff --git a/include/dba.php b/include/dba.php
index e64575538..9e168eac7 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,1365 +1,40 @@
 <?php
 
-use Friendica\App;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Database\DBStructure;
-use Friendica\Util\DateTimeFormat;
-
-/**
- * @class MySQL database class
- *
- * This class is for the low level database stuff that does driver specific things.
- */
-
-class dba {
-	public static $connected = false;
-
-	private static $_server_info = '';
-	private static $db;
-	private static $driver;
-	private static $error = false;
-	private static $errorno = 0;
-	private static $affected_rows = 0;
-	private static $in_transaction = false;
-	private static $relation = [];
-
-	public static function connect($serveraddr, $user, $pass, $db) {
-		if (!is_null(self::$db)) {
-			return true;
-		}
-
-		$a = get_app();
-
-		$stamp1 = microtime(true);
-
-		$serveraddr = trim($serveraddr);
-
-		$serverdata = explode(':', $serveraddr);
-		$server = $serverdata[0];
-
-		if (count($serverdata) > 1) {
-			$port = trim($serverdata[1]);
-		}
-
-		$server = trim($server);
-		$user = trim($user);
-		$pass = trim($pass);
-		$db = trim($db);
-
-		if (!(strlen($server) && strlen($user))) {
-			return false;
-		}
-
-		if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
-			self::$driver = 'pdo';
-			$connect = "mysql:host=".$server.";dbname=".$db;
-
-			if (isset($port)) {
-				$connect .= ";port=".$port;
-			}
-
-			if (isset($a->config["system"]["db_charset"])) {
-				$connect .= ";charset=".$a->config["system"]["db_charset"];
-			}
-			try {
-				self::$db = @new PDO($connect, $user, $pass);
-				self::$connected = true;
-			} catch (PDOException $e) {
-			}
-		}
-
-		if (!self::$connected && class_exists('mysqli')) {
-			self::$driver = 'mysqli';
-			self::$db = @new mysqli($server, $user, $pass, $db, $port);
-			if (!mysqli_connect_errno()) {
-				self::$connected = true;
-
-				if (isset($a->config["system"]["db_charset"])) {
-					self::$db->set_charset($a->config["system"]["db_charset"]);
-				}
-			}
-		}
-
-		// No suitable SQL driver was found.
-		if (!self::$connected) {
-			self::$driver = null;
-			self::$db = null;
-		}
-		$a->save_timestamp($stamp1, "network");
-
-		return self::$connected;
-	}
-
-	/**
-	 * @brief Returns the MySQL server version string
-	 *
-	 * This function discriminate between the deprecated mysql API and the current
-	 * object-oriented mysqli API. Example of returned string: 5.5.46-0+deb8u1
-	 *
-	 * @return string
-	 */
-	public static function server_info() {
-		if (self::$_server_info == '') {
-			switch (self::$driver) {
-				case 'pdo':
-					self::$_server_info = self::$db->getAttribute(PDO::ATTR_SERVER_VERSION);
-					break;
-				case 'mysqli':
-					self::$_server_info = self::$db->server_info;
-					break;
-			}
-		}
-		return self::$_server_info;
-	}
-
-	/**
-	 * @brief Returns the selected database name
-	 *
-	 * @return string
-	 */
-	public static function database_name() {
-		$ret = self::p("SELECT DATABASE() AS `db`");
-                $data = self::inArray($ret);
-		return $data[0]['db'];
-	}
-
-	/**
-	 * @brief Analyze a database query and log this if some conditions are met.
-	 *
-	 * @param string $query The database query that will be analyzed
-	 */
-	private static function logIndex($query) {
-		$a = get_app();
-
-		if (empty($a->config["system"]["db_log_index"])) {
-			return;
-		}
-
-		// Don't explain an explain statement
-		if (strtolower(substr($query, 0, 7)) == "explain") {
-			return;
-		}
-
-		// Only do the explain on "select", "update" and "delete"
-		if (!in_array(strtolower(substr($query, 0, 6)), ["select", "update", "delete"])) {
-			return;
-		}
-
-		$r = self::p("EXPLAIN ".$query);
-		if (!DBM::is_result($r)) {
-			return;
-		}
-
-		$watchlist = explode(',', $a->config["system"]["db_log_index_watch"]);
-		$blacklist = explode(',', $a->config["system"]["db_log_index_blacklist"]);
-
-		while ($row = dba::fetch($r)) {
-			if ((intval($a->config["system"]["db_loglimit_index"]) > 0)) {
-				$log = (in_array($row['key'], $watchlist) &&
-					($row['rows'] >= intval($a->config["system"]["db_loglimit_index"])));
-			} else {
-				$log = false;
-			}
-
-			if ((intval($a->config["system"]["db_loglimit_index_high"]) > 0) && ($row['rows'] >= intval($a->config["system"]["db_loglimit_index_high"]))) {
-				$log = true;
-			}
-
-			if (in_array($row['key'], $blacklist) || ($row['key'] == "")) {
-				$log = false;
-			}
-
-			if ($log) {
-				$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-				@file_put_contents($a->config["system"]["db_log_index"], DateTimeFormat::utcNow()."\t".
-						$row['key']."\t".$row['rows']."\t".$row['Extra']."\t".
-						basename($backtrace[1]["file"])."\t".
-						$backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
-						substr($query, 0, 2000)."\n", FILE_APPEND);
-			}
-		}
-	}
-
-	public static function escape($str) {
-		switch (self::$driver) {
-			case 'pdo':
-				return substr(@self::$db->quote($str, PDO::PARAM_STR), 1, -1);
-			case 'mysqli':
-				return @self::$db->real_escape_string($str);
-		}
-	}
-
-	public static function connected() {
-		$connected = false;
-
-		switch (self::$driver) {
-			case 'pdo':
-				$r = dba::p("SELECT 1");
-				if (DBM::is_result($r)) {
-					$row = dba::inArray($r);
-					$connected = ($row[0]['1'] == '1');
-				}
-				break;
-			case 'mysqli':
-				$connected = self::$db->ping();
-				break;
-		}
-		return $connected;
-	}
-
-	/**
-	 * @brief Replaces ANY_VALUE() function by MIN() function,
-	 *  if the database server does not support ANY_VALUE().
-	 *
-	 * Considerations for Standard SQL, or MySQL with ONLY_FULL_GROUP_BY (default since 5.7.5).
-	 * ANY_VALUE() is available from MySQL 5.7.5 https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html
-	 * A standard fall-back is to use MIN().
-	 *
-	 * @param string $sql An SQL string without the values
-	 * @return string The input SQL string modified if necessary.
-	 */
-	public static function any_value_fallback($sql) {
-		$server_info = self::server_info();
-		if (version_compare($server_info, '5.7.5', '<') ||
-			(stripos($server_info, 'MariaDB') !== false)) {
-			$sql = str_ireplace('ANY_VALUE(', 'MIN(', $sql);
-		}
-		return $sql;
-	}
-
-	/**
-	 * @brief beautifies the query - useful for "SHOW PROCESSLIST"
-	 *
-	 * This is safe when we bind the parameters later.
-	 * The parameter values aren't part of the SQL.
-	 *
-	 * @param string $sql An SQL string without the values
-	 * @return string The input SQL string modified if necessary.
-	 */
-	public static function clean_query($sql) {
-		$search = ["\t", "\n", "\r", "  "];
-		$replace = [' ', ' ', ' ', ' '];
-		do {
-			$oldsql = $sql;
-			$sql = str_replace($search, $replace, $sql);
-		} while ($oldsql != $sql);
-
-		return $sql;
-	}
-
-
-	/**
-	 * @brief Replaces the ? placeholders with the parameters in the $args array
-	 *
-	 * @param string $sql SQL query
-	 * @param array $args The parameters that are to replace the ? placeholders
-	 * @return string The replaced SQL query
-	 */
-	private static function replaceParameters($sql, $args) {
-		$offset = 0;
-		foreach ($args AS $param => $value) {
-			if (is_int($args[$param]) || is_float($args[$param])) {
-				$replace = intval($args[$param]);
-			} else {
-				$replace = "'".self::escape($args[$param])."'";
-			}
-
-			$pos = strpos($sql, '?', $offset);
-			if ($pos !== false) {
-				$sql = substr_replace($sql, $replace, $pos, 1);
-			}
-			$offset = $pos + strlen($replace);
-		}
-		return $sql;
-	}
-
-	/**
-	 * @brief Convert parameter array to an universal form
-	 * @param array $args Parameter array
-	 * @return array universalized parameter array
-	 */
-	private static function getParam($args) {
-		unset($args[0]);
-
-		// When the second function parameter is an array then use this as the parameter array
-		if ((count($args) > 0) && (is_array($args[1]))) {
-			return $args[1];
-		} else {
-			return $args;
-		}
-	}
-
-	/**
-	 * @brief Executes a prepared statement that returns data
-	 * @usage Example: $r = p("SELECT * FROM `item` WHERE `guid` = ?", $guid);
-	 *
-	 * Please only use it with complicated queries.
-	 * For all regular queries please use dba::select or dba::exists
-	 *
-	 * @param string $sql SQL statement
-	 * @return bool|object statement object
-	 */
-	public static function p($sql) {
-		$a = get_app();
-
-		$stamp1 = microtime(true);
-
-		$params = self::getParam(func_get_args());
-
-		// Renumber the array keys to be sure that they fit
-		$i = 0;
-		$args = [];
-		foreach ($params AS $param) {
-			// Avoid problems with some MySQL servers and boolean values. See issue #3645
-			if (is_bool($param)) {
-				$param = (int)$param;
-			}
-			$args[++$i] = $param;
-		}
-
-		if (!self::$connected) {
-			return false;
-		}
-
-		if ((substr_count($sql, '?') != count($args)) && (count($args) > 0)) {
-			// Question: Should we continue or stop the query here?
-			logger('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), LOGGER_DEBUG);
-		}
-
-		$sql = self::clean_query($sql);
-		$sql = self::any_value_fallback($sql);
-
-		$orig_sql = $sql;
-
-		if (x($a->config,'system') && x($a->config['system'], 'db_callstack')) {
-			$sql = "/*".System::callstack()." */ ".$sql;
-		}
-
-		self::$error = '';
-		self::$errorno = 0;
-		self::$affected_rows = 0;
-
-		// We have to make some things different if this function is called from "e"
-		$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
-
-		if (isset($trace[1])) {
-			$called_from = $trace[1];
-		} else {
-			// We use just something that is defined to avoid warnings
-			$called_from = $trace[0];
-		}
-		// We are having an own error logging in the function "e"
-		$called_from_e = ($called_from['function'] == 'e');
-
-		switch (self::$driver) {
-			case 'pdo':
-				// If there are no arguments we use "query"
-				if (count($args) == 0) {
-					if (!$retval = self::$db->query($sql)) {
-						$errorInfo = self::$db->errorInfo();
-						self::$error = $errorInfo[2];
-						self::$errorno = $errorInfo[1];
-						$retval = false;
-						break;
-					}
-					self::$affected_rows = $retval->rowCount();
-					break;
-				}
-
-				if (!$stmt = self::$db->prepare($sql)) {
-					$errorInfo = self::$db->errorInfo();
-					self::$error = $errorInfo[2];
-					self::$errorno = $errorInfo[1];
-					$retval = false;
-					break;
-				}
-
-				foreach ($args AS $param => $value) {
-					$stmt->bindParam($param, $args[$param]);
-				}
-
-				if (!$stmt->execute()) {
-					$errorInfo = $stmt->errorInfo();
-					self::$error = $errorInfo[2];
-					self::$errorno = $errorInfo[1];
-					$retval = false;
-				} else {
-					$retval = $stmt;
-					self::$affected_rows = $retval->rowCount();
-				}
-				break;
-			case 'mysqli':
-				// There are SQL statements that cannot be executed with a prepared statement
-				$parts = explode(' ', $orig_sql);
-				$command = strtolower($parts[0]);
-				$can_be_prepared = in_array($command, ['select', 'update', 'insert', 'delete']);
-
-				// The fallback routine is called as well when there are no arguments
-				if (!$can_be_prepared || (count($args) == 0)) {
-					$retval = self::$db->query(self::replaceParameters($sql, $args));
-					if (self::$db->errno) {
-						self::$error = self::$db->error;
-						self::$errorno = self::$db->errno;
-						$retval = false;
-					} else {
-						if (isset($retval->num_rows)) {
-							self::$affected_rows = $retval->num_rows;
-						} else {
-							self::$affected_rows = self::$db->affected_rows;
-						}
-					}
-					break;
-				}
-
-				$stmt = self::$db->stmt_init();
-
-				if (!$stmt->prepare($sql)) {
-					self::$error = $stmt->error;
-					self::$errorno = $stmt->errno;
-					$retval = false;
-					break;
-				}
-
-				$params = '';
-				$values = [];
-				foreach ($args AS $param => $value) {
-					if (is_int($args[$param])) {
-						$params .= 'i';
-					} elseif (is_float($args[$param])) {
-						$params .= 'd';
-					} elseif (is_string($args[$param])) {
-						$params .= 's';
-					} else {
-						$params .= 'b';
-					}
-					$values[] = &$args[$param];
-				}
-
-				if (count($values) > 0) {
-					array_unshift($values, $params);
-					call_user_func_array([$stmt, 'bind_param'], $values);
-				}
-
-				if (!$stmt->execute()) {
-					self::$error = self::$db->error;
-					self::$errorno = self::$db->errno;
-					$retval = false;
-				} else {
-					$stmt->store_result();
-					$retval = $stmt;
-					self::$affected_rows = $retval->affected_rows;
-				}
-				break;
-		}
-
-		// We are having an own error logging in the function "e"
-		if ((self::$errorno != 0) && !$called_from_e) {
-			// We have to preserve the error code, somewhere in the logging it get lost
-			$error = self::$error;
-			$errorno = self::$errorno;
-
-			logger('DB Error '.self::$errorno.': '.self::$error."\n".
-				System::callstack(8)."\n".self::replaceParameters($sql, $params));
-
-			self::$error = $error;
-			self::$errorno = $errorno;
-		}
-
-		$a->save_timestamp($stamp1, 'database');
-
-		if (x($a->config,'system') && x($a->config['system'], 'db_log')) {
-
-			$stamp2 = microtime(true);
-			$duration = (float)($stamp2 - $stamp1);
-
-			if (($duration > $a->config["system"]["db_loglimit"])) {
-				$duration = round($duration, 3);
-				$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-
-				@file_put_contents($a->config["system"]["db_log"], DateTimeFormat::utcNow()."\t".$duration."\t".
-						basename($backtrace[1]["file"])."\t".
-						$backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
-						substr(self::replaceParameters($sql, $args), 0, 2000)."\n", FILE_APPEND);
-			}
-		}
-		return $retval;
-	}
-
-	/**
-	 * @brief Executes a prepared statement like UPDATE or INSERT that doesn't return data
-	 *
-	 * Please use dba::delete, dba::insert, dba::update, ... instead
-	 *
-	 * @param string $sql SQL statement
-	 * @return boolean Was the query successfull? False is returned only if an error occurred
-	 */
-	public static function e($sql) {
-		$a = get_app();
-
-		$stamp = microtime(true);
-
-		$params = self::getParam(func_get_args());
-
-		// In a case of a deadlock we are repeating the query 20 times
-		$timeout = 20;
-
-		do {
-			$stmt = self::p($sql, $params);
-
-			if (is_bool($stmt)) {
-				$retval = $stmt;
-			} elseif (is_object($stmt)) {
-				$retval = true;
-			} else {
-				$retval = false;
-			}
-
-			self::close($stmt);
-
-		} while ((self::$errorno == 1213) && (--$timeout > 0));
-
-		if (self::$errorno != 0) {
-			// We have to preserve the error code, somewhere in the logging it get lost
-			$error = self::$error;
-			$errorno = self::$errorno;
-
-			logger('DB Error '.self::$errorno.': '.self::$error."\n".
-				System::callstack(8)."\n".self::replaceParameters($sql, $params));
-
-			self::$error = $error;
-			self::$errorno = $errorno;
-		}
-
-		$a->save_timestamp($stamp, "database_write");
-
-		return $retval;
-	}
-
-	/**
-	 * @brief Check if data exists
-	 *
-	 * @param string $table Table name
-	 * @param array $condition array of fields for condition
-	 *
-	 * @return boolean Are there rows for that condition?
-	 */
-	public static function exists($table, $condition) {
-		if (empty($table)) {
-			return false;
-		}
-
-		$fields = [];
-
-		reset($condition);
-		$first_key = key($condition);
-		if (!is_int($first_key)) {
-			$fields = [$first_key];
-		}
-
-		$stmt = self::select($table, $fields, $condition, ['limit' => 1]);
-
-		if (is_bool($stmt)) {
-			$retval = $stmt;
-		} else {
-			$retval = (self::num_rows($stmt) > 0);
-		}
-
-		self::close($stmt);
-
-		return $retval;
-	}
-
-	/**
-	 * Fetches the first row
-	 *
-	 * Please use dba::selectFirst or dba::exists whenever this is possible.
-	 *
-	 * @brief Fetches the first row
-	 * @param string $sql SQL statement
-	 * @return array first row of query
-	 */
-	public static function fetch_first($sql) {
-		$params = self::getParam(func_get_args());
-
-		$stmt = self::p($sql, $params);
-
-		if (is_bool($stmt)) {
-			$retval = $stmt;
-		} else {
-			$retval = self::fetch($stmt);
-		}
-
-		self::close($stmt);
-
-		return $retval;
-	}
-
-	/**
-	 * @brief Returns the number of affected rows of the last statement
-	 *
-	 * @return int Number of rows
-	 */
-	public static function affected_rows() {
-		return self::$affected_rows;
-	}
-
-	/**
-	 * @brief Returns the number of columns of a statement
-	 *
-	 * @param object Statement object
-	 * @return int Number of columns
-	 */
-	public static function columnCount($stmt) {
-		if (!is_object($stmt)) {
-			return 0;
-		}
-		switch (self::$driver) {
-			case 'pdo':
-				return $stmt->columnCount();
-			case 'mysqli':
-				return $stmt->field_count;
-		}
-		return 0;
-	}
-	/**
-	 * @brief Returns the number of rows of a statement
-	 *
-	 * @param PDOStatement|mysqli_result|mysqli_stmt Statement object
-	 * @return int Number of rows
-	 */
-	public static function num_rows($stmt) {
-		if (!is_object($stmt)) {
-			return 0;
-		}
-		switch (self::$driver) {
-			case 'pdo':
-				return $stmt->rowCount();
-			case 'mysqli':
-				return $stmt->num_rows;
-		}
-		return 0;
-	}
-
-	/**
-	 * @brief Fetch a single row
-	 *
-	 * @param mixed $stmt statement object
-	 * @return array current row
-	 */
-	public static function fetch($stmt) {
-		$a = get_app();
-
-		$stamp1 = microtime(true);
-
-		$columns = [];
-
-		if (!is_object($stmt)) {
-			return false;
-		}
-
-		switch (self::$driver) {
-			case 'pdo':
-				$columns = $stmt->fetch(PDO::FETCH_ASSOC);
-				break;
-			case 'mysqli':
-				if (get_class($stmt) == 'mysqli_result') {
-					$columns = $stmt->fetch_assoc();
-					break;
-				}
-
-				// This code works, but is slow
-
-				// Bind the result to a result array
-				$cols = [];
-
-				$cols_num = [];
-				for ($x = 0; $x < $stmt->field_count; $x++) {
-					$cols[] = &$cols_num[$x];
-				}
-
-				call_user_func_array([$stmt, 'bind_result'], $cols);
-
-				if (!$stmt->fetch()) {
-					return false;
-				}
-
-				// The slow part:
-				// We need to get the field names for the array keys
-				// It seems that there is no better way to do this.
-				$result = $stmt->result_metadata();
-				$fields = $result->fetch_fields();
-
-				foreach ($cols_num AS $param => $col) {
-					$columns[$fields[$param]->name] = $col;
-				}
-		}
-
-		$a->save_timestamp($stamp1, 'database');
-
-		return $columns;
-	}
-
-	/**
-	 * @brief Insert a row into a table
-	 *
-	 * @param string $table Table name
-	 * @param array $param parameter array
-	 * @param bool $on_duplicate_update Do an update on a duplicate entry
-	 *
-	 * @return boolean was the insert successfull?
-	 */
-	public static function insert($table, $param, $on_duplicate_update = false) {
-
-		if (empty($table) || empty($param)) {
-			logger('Table and fields have to be set');
-			return false;
-		}
-
-		$sql = "INSERT INTO `".self::escape($table)."` (`".implode("`, `", array_keys($param))."`) VALUES (".
-			substr(str_repeat("?, ", count($param)), 0, -2).")";
-
-		if ($on_duplicate_update) {
-			$sql .= " ON DUPLICATE KEY UPDATE `".implode("` = ?, `", array_keys($param))."` = ?";
-
-			$values = array_values($param);
-			$param = array_merge_recursive($values, $values);
-		}
-
-		return self::e($sql, $param);
-	}
-
-	/**
-	 * @brief Fetch the id of the last insert command
-	 *
-	 * @return integer Last inserted id
-	 */
-	public static function lastInsertId() {
-		switch (self::$driver) {
-			case 'pdo':
-				$id = self::$db->lastInsertId();
-				break;
-			case 'mysqli':
-				$id = self::$db->insert_id;
-				break;
-		}
-		return $id;
-	}
-
-	/**
-	 * @brief Locks a table for exclusive write access
-	 *
-	 * This function can be extended in the future to accept a table array as well.
-	 *
-	 * @param string $table Table name
-	 *
-	 * @return boolean was the lock successful?
-	 */
-	public static function lock($table) {
-		// See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html
-		self::e("SET autocommit=0");
-		$success = self::e("LOCK TABLES `".self::escape($table)."` WRITE");
-		if (!$success) {
-			self::e("SET autocommit=1");
-		} else {
-			self::$in_transaction = true;
-		}
-		return $success;
-	}
-
-	/**
-	 * @brief Unlocks all locked tables
-	 *
-	 * @return boolean was the unlock successful?
-	 */
-	public static function unlock() {
-		// See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html
-		self::e("COMMIT");
-		$success = self::e("UNLOCK TABLES");
-		self::e("SET autocommit=1");
-		self::$in_transaction = false;
-		return $success;
-	}
-
-	/**
-	 * @brief Starts a transaction
-	 *
-	 * @return boolean Was the command executed successfully?
-	 */
-	public static function transaction() {
-		if (!self::e('COMMIT')) {
-			return false;
-		}
-		if (!self::e('START TRANSACTION')) {
-			return false;
-		}
-		self::$in_transaction = true;
-		return true;
-	}
-
-	/**
-	 * @brief Does a commit
-	 *
-	 * @return boolean Was the command executed successfully?
-	 */
-	public static function commit() {
-		if (!self::e('COMMIT')) {
-			return false;
-		}
-		self::$in_transaction = false;
-		return true;
-	}
-
-	/**
-	 * @brief Does a rollback
-	 *
-	 * @return boolean Was the command executed successfully?
-	 */
-	public static function rollback() {
-		if (!self::e('ROLLBACK')) {
-			return false;
-		}
-		self::$in_transaction = false;
-		return true;
-	}
-
-	/**
-	 * @brief Build the array with the table relations
-	 *
-	 * The array is build from the database definitions in DBStructure.php
-	 *
-	 * This process must only be started once, since the value is cached.
-	 */
-	private static function buildRelationData() {
-		$definition = DBStructure::definition();
-
-		foreach ($definition AS $table => $structure) {
-			foreach ($structure['fields'] AS $field => $field_struct) {
-				if (isset($field_struct['relation'])) {
-					foreach ($field_struct['relation'] AS $rel_table => $rel_field) {
-						self::$relation[$rel_table][$rel_field][$table][] = $field;
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @brief Delete a row from a table
-	 *
-	 * @param string  $table       Table name
-	 * @param array   $conditions  Field condition(s)
-	 * @param array   $options
-	 *                - cascade: If true we delete records in other tables that depend on the one we're deleting through
-	 *                           relations (default: true)
-	 * @param boolean $in_process  Internal use: Only do a commit after the last delete
-	 * @param array   $callstack   Internal use: prevent endless loops
-	 *
-	 * @return boolean|array was the delete successful? When $in_process is set: deletion data
-	 */
-	public static function delete($table, array $conditions, array $options = [], $in_process = false, array &$callstack = [])
-	{
-		if (empty($table) || empty($conditions)) {
-			logger('Table and conditions have to be set');
-			return false;
-		}
-
-		$commands = [];
-
-		// Create a key for the loop prevention
-		$key = $table . ':' . implode(':', array_keys($conditions)) . ':' . implode(':', $conditions);
-
-		// We quit when this key already exists in the callstack.
-		if (isset($callstack[$key])) {
-			return $commands;
-		}
-
-		$callstack[$key] = true;
-
-		$table = self::escape($table);
-
-		$commands[$key] = ['table' => $table, 'conditions' => $conditions];
-
-		$cascade = defaults($options, 'cascade', true);
-
-		// To speed up the whole process we cache the table relations
-		if ($cascade && count(self::$relation) == 0) {
-			self::buildRelationData();
-		}
-
-		// Is there a relation entry for the table?
-		if ($cascade && isset(self::$relation[$table])) {
-			// We only allow a simple "one field" relation.
-			$field = array_keys(self::$relation[$table])[0];
-			$rel_def = array_values(self::$relation[$table])[0];
-
-			// Create a key for preventing double queries
-			$qkey = $field . '-' . $table . ':' . implode(':', array_keys($conditions)) . ':' . implode(':', $conditions);
-
-			// When the search field is the relation field, we don't need to fetch the rows
-			// This is useful when the leading record is already deleted in the frontend but the rest is done in the backend
-			if ((count($conditions) == 1) && ($field == array_keys($conditions)[0])) {
-				foreach ($rel_def AS $rel_table => $rel_fields) {
-					foreach ($rel_fields AS $rel_field) {
-						$retval = self::delete($rel_table, [$rel_field => array_values($conditions)[0]], $options, true, $callstack);
-						$commands = array_merge($commands, $retval);
-					}
-				}
-				// We quit when this key already exists in the callstack.
-			} elseif (!isset($callstack[$qkey])) {
-
-				$callstack[$qkey] = true;
-
-				// Fetch all rows that are to be deleted
-				$data = self::select($table, [$field], $conditions);
-
-				while ($row = self::fetch($data)) {
-					// Now we accumulate the delete commands
-					$retval = self::delete($table, [$field => $row[$field]], $options, true, $callstack);
-					$commands = array_merge($commands, $retval);
-				}
-
-				self::close($data);
-
-				// Since we had split the delete command we don't need the original command anymore
-				unset($commands[$key]);
-			}
-		}
-
-		if (!$in_process) {
-			// Now we finalize the process
-			$do_transaction = !self::$in_transaction;
-
-			if ($do_transaction) {
-				self::transaction();
-			}
-
-			$compacted = [];
-			$counter = [];
-
-			foreach ($commands AS $command) {
-				$conditions = $command['conditions'];
-				reset($conditions);
-				$first_key = key($conditions);
-
-				$condition_string = self::buildCondition($conditions);
-
-				if ((count($command['conditions']) > 1) || is_int($first_key)) {
-					$sql = "DELETE FROM `" . $command['table'] . "`" . $condition_string;
-					logger(self::replaceParameters($sql, $conditions), LOGGER_DATA);
-
-					if (!self::e($sql, $conditions)) {
-						if ($do_transaction) {
-							self::rollback();
-						}
-						return false;
-					}
-				} else {
-					$key_table = $command['table'];
-					$key_condition = array_keys($command['conditions'])[0];
-					$value = array_values($command['conditions'])[0];
-
-					// Split the SQL queries in chunks of 100 values
-					// We do the $i stuff here to make the code better readable
-					$i = $counter[$key_table][$key_condition];
-					if (isset($compacted[$key_table][$key_condition][$i]) && count($compacted[$key_table][$key_condition][$i]) > 100) {
-						++$i;
-					}
-
-					$compacted[$key_table][$key_condition][$i][$value] = $value;
-					$counter[$key_table][$key_condition] = $i;
-				}
-			}
-			foreach ($compacted AS $table => $values) {
-				foreach ($values AS $field => $field_value_list) {
-					foreach ($field_value_list AS $field_values) {
-						$sql = "DELETE FROM `" . $table . "` WHERE `" . $field . "` IN (" .
-							substr(str_repeat("?, ", count($field_values)), 0, -2) . ");";
-
-						logger(self::replaceParameters($sql, $field_values), LOGGER_DATA);
-
-						if (!self::e($sql, $field_values)) {
-							if ($do_transaction) {
-								self::rollback();
-							}
-							return false;
-						}
-					}
-				}
-			}
-			if ($do_transaction) {
-				self::commit();
-			}
-			return true;
-		}
-
-		return $commands;
-	}
-
-	/**
-	 * @brief Updates rows
-	 *
-	 * Updates rows in the database. When $old_fields is set to an array,
-	 * the system will only do an update if the fields in that array changed.
-	 *
-	 * Attention:
-	 * Only the values in $old_fields are compared.
-	 * This is an intentional behaviour.
-	 *
-	 * Example:
-	 * We include the timestamp field in $fields but not in $old_fields.
-	 * Then the row will only get the new timestamp when the other fields had changed.
-	 *
-	 * When $old_fields is set to a boolean value the system will do this compare itself.
-	 * When $old_fields is set to "true" the system will do an insert if the row doesn't exists.
-	 *
-	 * Attention:
-	 * Only set $old_fields to a boolean value when you are sure that you will update a single row.
-	 * When you set $old_fields to "true" then $fields must contain all relevant fields!
-	 *
-	 * @param string $table Table name
-	 * @param array $fields contains the fields that are updated
-	 * @param array $condition condition array with the key values
-	 * @param array|boolean $old_fields array with the old field values that are about to be replaced (true = update on duplicate)
-	 *
-	 * @return boolean was the update successfull?
-	 */
-	public static function update($table, $fields, $condition, $old_fields = []) {
-
-		if (empty($table) || empty($fields) || empty($condition)) {
-			logger('Table, fields and condition have to be set');
-			return false;
-		}
-
-		$table = self::escape($table);
-
-		$condition_string = self::buildCondition($condition);
-
-		if (is_bool($old_fields)) {
-			$do_insert = $old_fields;
-
-			$old_fields = self::selectFirst($table, [], $condition);
-
-			if (is_bool($old_fields)) {
-				if ($do_insert) {
-					$values = array_merge($condition, $fields);
-					return self::insert($table, $values, $do_insert);
-				}
-				$old_fields = [];
-			}
-		}
-
-		$do_update = (count($old_fields) == 0);
-
-		foreach ($old_fields AS $fieldname => $content) {
-			if (isset($fields[$fieldname])) {
-				if ($fields[$fieldname] == $content) {
-					unset($fields[$fieldname]);
-				} else {
-					$do_update = true;
-				}
-			}
-		}
-
-		if (!$do_update || (count($fields) == 0)) {
-			return true;
-		}
-
-		$sql = "UPDATE `".$table."` SET `".
-			implode("` = ?, `", array_keys($fields))."` = ?".$condition_string;
-
-		$params1 = array_values($fields);
-		$params2 = array_values($condition);
-		$params = array_merge_recursive($params1, $params2);
-
-		return self::e($sql, $params);
-	}
-
-	/**
-	 * Retrieve a single record from a table and returns it in an associative array
-	 *
-	 * @brief Retrieve a single record from a table
-	 * @param string $table
-	 * @param array  $fields
-	 * @param array  $condition
-	 * @param array  $params
-	 * @return bool|array
-	 * @see dba::select
-	 */
-	public static function selectFirst($table, array $fields = [], array $condition = [], $params = [])
-	{
-		$params['limit'] = 1;
-		$result = self::select($table, $fields, $condition, $params);
-
-		if (is_bool($result)) {
-			return $result;
-		} else {
-			$row = self::fetch($result);
-			self::close($result);
-			return $row;
-		}
-	}
-
-	/**
-	 * @brief Select rows from a table
-	 *
-	 * @param string $table     Table name
-	 * @param array  $fields    Array of selected fields, empty for all
-	 * @param array  $condition Array of fields for condition
-	 * @param array  $params    Array of several parameters
-	 *
-	 * @return boolean|object
-	 *
-	 * Example:
-	 * $table = "item";
-	 * $fields = array("id", "uri", "uid", "network");
-	 *
-	 * $condition = array("uid" => 1, "network" => 'dspr');
-	 * or:
-	 * $condition = array("`uid` = ? AND `network` IN (?, ?)", 1, 'dfrn', 'dspr');
-	 *
-	 * $params = array("order" => array("id", "received" => true), "limit" => 10);
-	 *
-	 * $data = dba::select($table, $fields, $condition, $params);
-	 */
-	public static function select($table, array $fields = [], array $condition = [], array $params = [])
-	{
-		if ($table == '') {
-			return false;
-		}
-
-		$table = self::escape($table);
-
-		if (count($fields) > 0) {
-			$select_fields = "`" . implode("`, `", array_values($fields)) . "`";
-		} else {
-			$select_fields = "*";
-		}
-
-		$condition_string = self::buildCondition($condition);
-
-		$order_string = '';
-		if (isset($params['order'])) {
-			$order_string = " ORDER BY ";
-			foreach ($params['order'] AS $fields => $order) {
-				if (!is_int($fields)) {
-					$order_string .= "`" . $fields . "` " . ($order ? "DESC" : "ASC") . ", ";
-				} else {
-					$order_string .= "`" . $order . "`, ";
-				}
-			}
-			$order_string = substr($order_string, 0, -2);
-		}
-
-		$limit_string = '';
-		if (isset($params['limit']) && is_int($params['limit'])) {
-			$limit_string = " LIMIT " . $params['limit'];
-		}
-
-		if (isset($params['limit']) && is_array($params['limit'])) {
-			$limit_string = " LIMIT " . intval($params['limit'][0]) . ", " . intval($params['limit'][1]);
-		}
-
-		$sql = "SELECT " . $select_fields . " FROM `" . $table . "`" . $condition_string . $order_string . $limit_string;
-
-		$result = self::p($sql, $condition);
-
-		return $result;
-	}
-
-	/**
-	 * @brief Counts the rows from a table satisfying the provided condition
-	 *
-	 * @param string $table Table name
-	 * @param array $condition array of fields for condition
-	 *
-	 * @return int
-	 *
-	 * Example:
-	 * $table = "item";
-	 *
-	 * $condition = ["uid" => 1, "network" => 'dspr'];
-	 * or:
-	 * $condition = ["`uid` = ? AND `network` IN (?, ?)", 1, 'dfrn', 'dspr'];
-	 *
-	 * $count = dba::count($table, $condition);
-	 */
-	public static function count($table, array $condition = [])
-	{
-		if ($table == '') {
-			return false;
-		}
-
-		$condition_string = self::buildCondition($condition);
-
-		$sql = "SELECT COUNT(*) AS `count` FROM `".$table."`".$condition_string;
-
-		$row = self::fetch_first($sql, $condition);
-
-		return $row['count'];
-	}
-
-	/**
-	 * @brief Returns the SQL condition string built from the provided condition array
-	 *
-	 * This function operates with two modes.
-	 * - Supplied with a filed/value associative array, it builds simple strict
-	 *   equality conditions linked by AND.
-	 * - Supplied with a flat list, the first element is the condition string and
-	 *   the following arguments are the values to be interpolated
-	 *
-	 * $condition = ["uid" => 1, "network" => 'dspr'];
-	 * or:
-	 * $condition = ["`uid` = ? AND `network` IN (?, ?)", 1, 'dfrn', 'dspr'];
-	 *
-	 * In either case, the provided array is left with the parameters only
-	 *
-	 * @param array $condition
-	 * @return string
-	 */
-	private static function buildCondition(array &$condition = [])
-	{
-		$condition_string = '';
-		if (count($condition) > 0) {
-			reset($condition);
-			$first_key = key($condition);
-			if (is_int($first_key)) {
-				$condition_string = " WHERE ".array_shift($condition);
-			} else {
-				$new_values = [];
-				$condition_string = "";
-				foreach ($condition as $field => $value) {
-					if ($condition_string != "") {
-						$condition_string .= " AND ";
-					}
-					if (is_array($value)) {
-						$new_values = array_merge($new_values, array_values($value));
-						$placeholders = substr(str_repeat("?, ", count($value)), 0, -2);
-						$condition_string .= "`" . $field . "` IN (" . $placeholders . ")";
-					} else {
-						$new_values[$field] = $value;
-						$condition_string .= "`" . $field . "` = ?";
-					}
-				}
-				$condition_string = " WHERE " . $condition_string;
-				$condition = $new_values;
-			}
-		}
-
-		return $condition_string;
-	}
-
-	/**
-	 * @brief Fills an array with data from a query
-	 *
-	 * @param object $stmt statement object
-	 * @return array Data array
-	 */
-	public static function inArray($stmt, $do_close = true) {
-		if (is_bool($stmt)) {
-			return $stmt;
-		}
-
-		$data = [];
-		while ($row = self::fetch($stmt)) {
-			$data[] = $row;
-		}
-		if ($do_close) {
-			self::close($stmt);
-		}
-		return $data;
-	}
-
-	/**
-	 * @brief Returns the error number of the last query
-	 *
-	 * @return string Error number (0 if no error)
-	 */
-	public static function errorNo() {
-		return self::$errorno;
-	}
-
-	/**
-	 * @brief Returns the error message of the last query
-	 *
-	 * @return string Error message ('' if no error)
-	 */
-	public static function errorMessage() {
-		return self::$error;
-	}
-
-	/**
-	 * @brief Closes the current statement
-	 *
-	 * @param object $stmt statement object
-	 * @return boolean was the close successful?
-	 */
-	public static function close($stmt) {
-		$a = get_app();
-
-		$stamp1 = microtime(true);
-
-		if (!is_object($stmt)) {
-			return false;
-		}
-
-		switch (self::$driver) {
-			case 'pdo':
-				$ret = $stmt->closeCursor();
-				break;
-			case 'mysqli':
-				$stmt->free_result();
-				$ret = $stmt->close();
-				break;
-		}
-
-		$a->save_timestamp($stamp1, 'database');
-
-		return $ret;
-	}
-}
-
-function dbesc($str) {
-	if (dba::$connected) {
-		return(dba::escape($str));
-	} else {
-		return(str_replace("'","\\'",$str));
-	}
-}
+use Friendica\Database\DBA;
 
 /**
  * @brief execute SQL query with printf style args - deprecated
  *
- * Please use the dba:: functions instead:
- * dba::select, dba::exists, dba::insert
- * dba::delete, dba::update, dba::p, dba::e
+ * Please use the DBA:: functions instead:
+ * DBA::select, DBA::exists, DBA::insert
+ * DBA::delete, DBA::update, DBA::p, DBA::e
  *
  * @param $args Query parameters (1 to N parameters of different types)
  * @return array|bool Query array
+ * @deprecated
  */
 function q($sql) {
 	$args = func_get_args();
 	unset($args[0]);
 
-	if (!dba::$connected) {
+	if (!DBA::$connected) {
 		return false;
 	}
 
-	$sql = dba::clean_query($sql);
-	$sql = dba::any_value_fallback($sql);
+	$sql = DBA::cleanQuery($sql);
+	$sql = DBA::anyValueFallback($sql);
 
 	$stmt = @vsprintf($sql, $args);
 
-	$ret = dba::p($stmt);
+	$ret = DBA::p($stmt);
 
 	if (is_bool($ret)) {
 		return $ret;
 	}
 
-	$columns = dba::columnCount($ret);
+	$columns = DBA::columnCount($ret);
 
-	$data = dba::inArray($ret);
+	$data = DBA::toArray($ret);
 
 	if ((count($data) == 0) && ($columns == 0)) {
 		return true;
@@ -1367,7 +42,3 @@ function q($sql) {
 
 	return $data;
 }
-
-function dba_timer() {
-	return microtime(true);
-}
diff --git a/include/enotify.php b/include/enotify.php
index 39c74fdc6..70abce584 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -8,7 +8,9 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\Item;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
 
@@ -25,6 +27,25 @@ function notification($params)
 {
 	$a = get_app();
 
+	// Temporary logging for finding the origin
+	if (!isset($params['language']) || !isset($params['uid'])) {
+		logger('Missing parameters.' . System::callstack());
+	}
+
+	// Ensure that the important fields are set at any time
+	$fields = ['notify-flags', 'language', 'username', 'email'];
+	$user = DBA::selectFirst('user', $fields, ['uid' => $params['uid']]);
+
+	if (!DBA::isResult($user)) {
+		logger('Unknown user ' . $params['uid']);
+		return;
+	}
+
+	$params['notify_flags'] = defaults($params, 'notify_flags', $user['notify-flags']);
+	$params['language'] = defaults($params, 'language', $user['language']);
+	$params['to_name'] = defaults($params, 'to_name', $user['username']);
+	$params['to_email'] = defaults($params, 'to_email', $user['email']);
+
 	// from here on everything is in the recipients language
 	L10n::pushLang($params['language']);
 
@@ -32,11 +53,11 @@ function notification($params)
 	$product = FRIENDICA_PLATFORM;
 	$siteurl = System::baseUrl(true);
 	$thanks = L10n::t('Thank You,');
-	$sitename = $a->config['sitename'];
-	if (!x($a->config['admin_name'])) {
-		$site_admin = L10n::t('%s Administrator', $sitename);
+	$sitename = Config::get('config', 'sitename');
+	if (Config::get('config', 'admin_name')) {
+		$site_admin = L10n::t('%1$s, %2$s Administrator', Config::get('config', 'admin_name'), $sitename);
 	} else {
-		$site_admin = L10n::t('%1$s, %2$s Administrator', $a->config['admin_name'], $sitename);
+		$site_admin = L10n::t('%s Administrator', $sitename);
 	}
 
 	$sender_name = $sitename;
@@ -48,15 +69,17 @@ function notification($params)
 	$sender_email = $a->getSenderEmailAddress();
 
 	if ($params['type'] != SYSTEM_EMAIL) {
-		$user = dba::selectFirst('user', ['nickname', 'page-flags'],
+		$user = DBA::selectFirst('user', ['nickname', 'page-flags'],
 			['uid' => $params['uid']]);
 
 		// There is no need to create notifications for forum accounts
-		if (!DBM::is_result($user) || in_array($user["page-flags"], [PAGE_COMMUNITY, PAGE_PRVGROUP])) {
+		if (!DBA::isResult($user) || in_array($user["page-flags"], [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP])) {
 			return;
 		}
+		$nickname = $user["nickname"];
+	} else {
+		$nickname = '';
 	}
-	$nickname = $user["nickname"];
 
 	// with $params['show_in_notification_page'] == false, the notification isn't inserted into
 	// the database, and an email is sent if applicable.
@@ -91,7 +114,12 @@ function notification($params)
 		$parent_id = 0;
 	}
 
+	$epreamble = '';
+
 	if ($params['type'] == NOTIFY_MAIL) {
+		$itemlink = $siteurl.'/message/'.$params['item']['id'];
+		$params["link"] = $itemlink;
+
 		$subject = L10n::t('[Friendica:Notify] New mail received at %s', $sitename);
 
 		$preamble = L10n::t('%1$s sent you a new private message at %2$s.', $params['source_name'], $sitename);
@@ -100,26 +128,20 @@ function notification($params)
 		$sitelink = L10n::t('Please visit %s to view and/or reply to your private messages.');
 		$tsitelink = sprintf($sitelink, $siteurl.'/message/'.$params['item']['id']);
 		$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'/message/'.$params['item']['id'].'">'.$sitename.'</a>');
-		$itemlink = $siteurl.'/message/'.$params['item']['id'];
 	}
 
 	if ($params['type'] == NOTIFY_COMMENT) {
-		$thread = dba::selectFirst('thread', ['ignored'], ['iid' => $parent_id]);
-		if (DBM::is_result($thread) && $thread["ignored"]) {
+		$thread = Item::selectFirstThreadForUser($params['uid'] ,['ignored'], ['iid' => $parent_id]);
+		if (DBA::isResult($thread) && $thread["ignored"]) {
 			logger("Thread ".$parent_id." will be ignored", LOGGER_DEBUG);
 			return;
 		}
 
 		// Check to see if there was already a tag notify or comment notify for this post.
 		// If so don't create a second notification
-		$p = q("SELECT `id` FROM `notify` WHERE `type` IN (%d, %d, %d) AND `link` = '%s' AND `uid` = %d LIMIT 1",
-			intval(NOTIFY_TAGSELF),
-			intval(NOTIFY_COMMENT),
-			intval(NOTIFY_SHARE),
-			dbesc($params['link']),
-			intval($params['uid'])
-		);
-		if ($p && count($p)) {
+		$condition = ['type' => [NOTIFY_TAGSELF, NOTIFY_COMMENT, NOTIFY_SHARE],
+			'link' => $params['link'], 'uid' => $params['uid']];
+		if (DBA::exists('notify', $condition)) {
 			L10n::popLang();
 			return;
 		}
@@ -129,10 +151,11 @@ function notification($params)
 		$item = null;
 
 		if ($params['otype'] === 'item' && $parent_id) {
-			$item = dba::selectFirst('item', [], ['id' => $parent_id]);
+			$item = Item::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id]);
 		}
 
 		$item_post_type = item_post_type($item);
+		$itemlink = $item['plink'];
 
 		// "a post"
 		$dest_str = L10n::t('%1$s commented on [url=%2$s]a %3$s[/url]',
@@ -152,7 +175,7 @@ function notification($params)
 		}
 
 		// "your post"
-		if (DBM::is_result($item) && $item['owner-name'] == $item['author-name'] && $item['wall']) {
+		if (DBA::isResult($item) && $item['owner-id'] == $item['author-id'] && $item['wall']) {
 			$dest_str = L10n::t('%1$s commented on [url=%2$s]your %3$s[/url]',
 				'[url='.$params['source_link'].']'.$params['source_name'].'[/url]',
 				$itemlink,
@@ -241,6 +264,7 @@ function notification($params)
 	}
 
 	if ($params['type'] == NOTIFY_TAGSHARE) {
+		$itemlink =  $params['link'];
 		$subject = L10n::t('[Friendica:Notify] %s tagged your post', $params['source_name']);
 
 		$preamble = L10n::t('%1$s tagged your post at %2$s', $params['source_name'], $sitename);
@@ -252,10 +276,10 @@ function notification($params)
 		$sitelink = L10n::t('Please visit %s to view and/or reply to the conversation.');
 		$tsitelink = sprintf($sitelink, $siteurl);
 		$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
-		$itemlink =  $params['link'];
 	}
 
 	if ($params['type'] == NOTIFY_INTRO) {
+		$itemlink = $params['link'];
 		$subject = L10n::t('[Friendica:Notify] Introduction received');
 
 		$preamble = L10n::t('You\'ve received an introduction from \'%1$s\' at %2$s', $params['source_name'], $sitename);
@@ -269,7 +293,6 @@ function notification($params)
 		$sitelink = L10n::t('Please visit %s to approve or reject the introduction.');
 		$tsitelink = sprintf($sitelink, $siteurl);
 		$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
-		$itemlink =  $params['link'];
 
 		switch ($params['verb']) {
 			case ACTIVITY_FRIEND:
@@ -299,6 +322,7 @@ function notification($params)
 	}
 
 	if ($params['type'] == NOTIFY_SUGGEST) {
+		$itemlink =  $params['link'];
 		$subject = L10n::t('[Friendica:Notify] Friend suggestion received');
 
 		$preamble = L10n::t('You\'ve received a friend suggestion from \'%1$s\' at %2$s', $params['source_name'], $sitename);
@@ -315,11 +339,11 @@ function notification($params)
 		$sitelink = L10n::t('Please visit %s to approve or reject the suggestion.');
 		$tsitelink = sprintf($sitelink, $siteurl);
 		$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
-		$itemlink =  $params['link'];
 	}
 
 	if ($params['type'] == NOTIFY_CONFIRM) {
 		if ($params['verb'] == ACTIVITY_FRIEND) { // mutual connection
+			$itemlink =  $params['link'];
 			$subject = L10n::t('[Friendica:Notify] Connection accepted');
 
 			$preamble = L10n::t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
@@ -333,8 +357,8 @@ function notification($params)
 			$sitelink = L10n::t('Please visit %s if you wish to make any changes to this relationship.');
 			$tsitelink = sprintf($sitelink, $siteurl);
 			$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
-			$itemlink =  $params['link'];
 		} else { // ACTIVITY_FOLLOW
+			$itemlink =  $params['link'];
 			$subject = L10n::t('[Friendica:Notify] Connection accepted');
 
 			$preamble = L10n::t('\'%1$s\' has accepted your connection request at %2$s', $params['source_name'], $sitename);
@@ -350,13 +374,13 @@ function notification($params)
 			$sitelink = L10n::t('Please visit %s  if you wish to make any changes to this relationship.');
 			$tsitelink = sprintf($sitelink, $siteurl);
 			$hsitelink = sprintf($sitelink, '<a href="'.$siteurl.'">'.$sitename.'</a>');
-			$itemlink =  $params['link'];
 		}
 	}
 
 	if ($params['type'] == NOTIFY_SYSTEM) {
 		switch($params['event']) {
 			case "SYSTEM_REGISTER_REQUEST":
+				$itemlink =  $params['link'];
 				$subject = L10n::t('[Friendica System Notify]') . ' ' . L10n::t('registration request');
 
 				$preamble = L10n::t('You\'ve received a registration request from \'%1$s\' at %2$s', $params['source_name'], $sitename);
@@ -365,7 +389,7 @@ function notification($params)
 					'[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
 				);
 
-				$body = L10n::t('Full Name:	%1$s\nSite Location:	%2$s\nLogin Name:	%3$s ' . "\x28" . '%4$s' . "\x29",
+				$body = L10n::t("Full Name:	%s\nSite Location:	%s\nLogin Name:	%s (%s)",
 					$params['source_name'],
 					$siteurl, $params['source_mail'],
 					$params['source_nick']
@@ -374,7 +398,6 @@ function notification($params)
 				$sitelink = L10n::t('Please visit %s to approve or reject the request.');
 				$tsitelink = sprintf($sitelink, $params['link']);
 				$hsitelink = sprintf($sitelink, '<a href="'.$params['link'].'">'.$sitename.'</a><br><br>');
-				$itemlink =  $params['link'];
 				break;
 			case "SYSTEM_DB_UPDATE_FAIL":
 				break;
@@ -432,9 +455,7 @@ function notification($params)
 		do {
 			$dups = false;
 			$hash = random_string();
-			$r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1",
-				dbesc($hash));
-			if (DBM::is_result($r)) {
+			if (DBA::exists('notify', ['hash' => $hash])) {
 				$dups = true;
 			}
 		} while ($dups == true);
@@ -464,45 +485,26 @@ function notification($params)
 		}
 
 		// create notification entry in DB
-		q("INSERT INTO `notify` (`hash`, `name`, `url`, `photo`, `date`, `uid`, `link`, `iid`, `parent`, `type`, `verb`, `otype`, `name_cache`)
-			values('%s', '%s', '%s', '%s', '%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s')",
-			dbesc($datarray['hash']),
-			dbesc($datarray['name']),
-			dbesc($datarray['url']),
-			dbesc($datarray['photo']),
-			dbesc($datarray['date']),
-			intval($datarray['uid']),
-			dbesc($datarray['link']),
-			intval($datarray['iid']),
-			intval($datarray['parent']),
-			intval($datarray['type']),
-			dbesc($datarray['verb']),
-			dbesc($datarray['otype']),
-			dbesc($datarray["name_cache"])
-		);
+		$fields = ['hash' => $datarray['hash'], 'name' => $datarray['name'], 'url' => $datarray['url'],
+			'photo' => $datarray['photo'], 'date' => $datarray['date'], 'uid' => $datarray['uid'],
+			'link' => $datarray['link'], 'iid' => $datarray['iid'], 'parent' => $datarray['parent'],
+			'type' => $datarray['type'], 'verb' => $datarray['verb'], 'otype' => $datarray['otype'],
+			'name_cache' => $datarray["name_cache"]];
+		DBA::insert('notify', $fields);
 
-		$r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' AND `uid` = %d LIMIT 1",
-			dbesc($hash),
-			intval($params['uid'])
-		);
-		if ($r) {
-			$notify_id = $r[0]['id'];
-		} else {
-			L10n::popLang();
-			return False;
-		}
+		$notify_id = DBA::lastInsertId();
 
 		// we seem to have a lot of duplicate comment notifications due to race conditions, mostly from forums
 		// After we've stored everything, look again to see if there are any duplicates and if so remove them
 		$p = q("SELECT `id` FROM `notify` WHERE `type` IN (%d, %d) AND `link` = '%s' AND `uid` = %d ORDER BY `id`",
 			intval(NOTIFY_TAGSELF),
 			intval(NOTIFY_COMMENT),
-			dbesc($params['link']),
+			DBA::escape($params['link']),
 			intval($params['uid'])
 		);
 		if ($p && (count($p) > 1)) {
 			for ($d = 1; $d < count($p); $d ++) {
-				dba::delete('notify', ['id' => $p[$d]['id']]);
+				DBA::delete('notify', ['id' => $p[$d]['id']]);
 			}
 
 			// only continue on if we stored the first one
@@ -515,12 +517,10 @@ function notification($params)
 		$itemlink = System::baseUrl().'/notify/view/'.$notify_id;
 		$msg = replace_macros($epreamble, ['$itemlink' => $itemlink]);
 		$msg_cache = format_notification_message($datarray['name_cache'], strip_tags(BBCode::convert($msg)));
-		q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
-			dbesc($msg),
-			dbesc($msg_cache),
-			intval($notify_id),
-			intval($params['uid'])
-		);
+
+		$fields = ['msg' => $msg, 'msg_cache' => $msg_cache];
+		$condition = ['id' => $notify_id, 'uid' => $params['uid']];
+		DBA::update('notify', $fields, $condition);
 	}
 
 	// send email notification if notification preferences permit
@@ -534,21 +534,12 @@ function notification($params)
 			$id_for_parent = $params['parent']."@".$hostname;
 
 			// Is this the first email notification for this parent item and user?
-
-			$r = q("SELECT `id` FROM `notify-threads` WHERE `master-parent-item` = %d AND `receiver-uid` = %d LIMIT 1",
-				intval($params['parent']),
-				intval($params['uid']));
-
-			// If so, create the record of it and use a message-id smtp header.
-
-			if (!$r) {
+			if (!DBA::exists('notify-threads', ['master-parent-item' => $params['parent'], 'receiver-uid' => $params['uid']])) {
 				logger("notify_id:".intval($notify_id).", parent: ".intval($params['parent'])."uid: ".intval($params['uid']), LOGGER_DEBUG);
-				q("INSERT INTO `notify-threads` (`notify-id`, `master-parent-item`, `receiver-uid`, `parent-item`)
-					values(%d, %d, %d, %d)",
-					intval($notify_id),
-					intval($params['parent']),
-					intval($params['uid']),
-					0);
+
+				$fields = ['notify-id' => $notify_id, 'master-parent-item' => $params['parent'],
+					'receiver-uid' => $params['uid'], 'parent-item' => 0];
+				DBA::insert('notify-threads', $fields);
 
 				$additional_mail_header .= "Message-ID: <${id_for_parent}>\n";
 				$log_msg = "include/enotify: No previous notification found for this parent:\n".
@@ -557,15 +548,12 @@ function notification($params)
 			} else {
 				// If not, just "follow" the thread.
 				$additional_mail_header .= "References: <${id_for_parent}>\nIn-Reply-To: <${id_for_parent}>\n";
-				logger("There's already a notification for this parent:\n".print_r($r, true), LOGGER_DEBUG);
+				logger("There's already a notification for this parent.", LOGGER_DEBUG);
 			}
 		}
 
-		// textversion keeps linebreaks
-		$textversion = strip_tags(str_replace("<br>", "\n", html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r\\n", "\\r", "\\n"], "\n",
-			$body))),ENT_QUOTES, 'UTF-8')));
-		$htmlversion = html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r\\n", "\\r", "\\n\\n", "\\n"],
-			"<br />\n", $body))), ENT_QUOTES, 'UTF-8');
+		$textversion = BBCode::toPlaintext($body);
+		$htmlversion = BBCode::convert($body);
 
 		$datarray = [];
 		$datarray['banner'] = $banner;
@@ -574,12 +562,12 @@ function notification($params)
 		$datarray['sitename'] = $sitename;
 		$datarray['siteurl'] = $siteurl;
 		$datarray['type'] = $params['type'];
-		$datarray['parent'] = $params['parent'];
-		$datarray['source_name'] = $params['source_name'];
-		$datarray['source_link'] = $params['source_link'];
-		$datarray['source_photo'] = $params['source_photo'];
+		$datarray['parent'] = $parent_id;
+		$datarray['source_name'] = defaults($params, 'source_name', '');
+		$datarray['source_link'] = defaults($params, 'source_link', '');
+		$datarray['source_photo'] = defaults($params, 'source_photo', '');
 		$datarray['uid'] = $params['uid'];
-		$datarray['username'] = $params['to_name'];
+		$datarray['username'] = defaults($params, 'to_name', '');
 		$datarray['hsitelink'] = $hsitelink;
 		$datarray['tsitelink'] = $tsitelink;
 		$datarray['hitemlink'] = '<a href="'.$itemlink.'">'.$itemlink.'</a>';
@@ -609,7 +597,7 @@ function notification($params)
 			'$source_name'  => $datarray['source_name'],
 			'$source_link'  => $datarray['source_link'],
 			'$source_photo' => $datarray['source_photo'],
-			'$username'     => $datarray['to_name'],
+			'$username'     => $datarray['username'],
 			'$hsitelink'    => $datarray['hsitelink'],
 			'$hitemlink'    => $datarray['hitemlink'],
 			'$thanks'       => $datarray['thanks'],
@@ -630,7 +618,7 @@ function notification($params)
 			'$source_name'  => $datarray['source_name'],
 			'$source_link'  => $datarray['source_link'],
 			'$source_photo' => $datarray['source_photo'],
-			'$username'     => $datarray['to_name'],
+			'$username'     => $datarray['username'],
 			'$tsitelink'    => $datarray['tsitelink'],
 			'$titemlink'    => $datarray['titemlink'],
 			'$thanks'       => $datarray['thanks'],
@@ -665,13 +653,13 @@ function notification($params)
  */
 function check_user_notification($itemid) {
 	// fetch all users in the thread
-	$users = dba::p("SELECT DISTINCT(`contact`.`uid`) FROM `item`
+	$users = DBA::p("SELECT DISTINCT(`contact`.`uid`) FROM `item`
 			INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` != 0
 			WHERE `parent` IN (SELECT `parent` FROM `item` WHERE `id`=?)", $itemid);
-	while ($user = dba::fetch($users)) {
+	while ($user = DBA::fetch($users)) {
 		check_item_notification($itemid, $user['uid']);
 	}
-	dba::close($users);
+	DBA::close($users);
 }
 
 /**
@@ -679,7 +667,7 @@ function check_user_notification($itemid) {
  *
  * @param int $itemid ID of the item for which the check should be done
  * @param int $uid User ID
- * @param str $defaulttype (Optional) Forces a notification with this type.
+ * @param string $defaulttype (Optional) Forces a notification with this type.
  */
 function check_item_notification($itemid, $uid, $defaulttype = "") {
 	$notification_data = ["uid" => $uid, "profiles" => []];
@@ -687,14 +675,14 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 
 	$profiles = $notification_data["profiles"];
 
-	$fields = ['notify-flags', 'language', 'username', 'email', 'nickname'];
-	$user = dba::selectFirst('user', $fields, ['uid' => $uid]);
-	if (!DBM::is_result($user)) {
+	$fields = ['nickname'];
+	$user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
+	if (!DBA::isResult($user)) {
 		return false;
 	}
 
-	$owner = dba::selectFirst('contact', ['url'], ['self' => true, 'uid' => $uid]);
-	if (!DBM::is_result($owner)) {
+	$owner = DBA::selectFirst('contact', ['url'], ['self' => true, 'uid' => $uid]);
+	if (!DBA::isResult($owner)) {
 		return false;
 	}
 
@@ -726,54 +714,50 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 
 	$profiles = $profiles2;
 
-	$profile_list = "";
+	$ret = DBA::select('contact', ['id'], ['uid' => 0, 'nurl' => $profiles]);
 
-	foreach ($profiles AS $profile) {
-		if ($profile_list != "")
-			$profile_list .= "', '";
+	$contacts = [];
 
-		$profile_list .= dbesc($profile);
+	while ($contact = DBA::fetch($ret)) {
+		$contacts[] = $contact['id'];
 	}
 
-	$profile_list = "'".$profile_list."'";
+	DBA::close($ret);
 
 	// Only act if it is a "real" post
 	// We need the additional check for the "local_profile" because of mixed situations on connector networks
-	$item = q("SELECT `id`, `mention`, `tag`,`parent`, `title`, `body`, `author-name`, `author-link`, `author-avatar`, `guid`,
-			`parent-uri`, `uri`, `contact-id`
-			FROM `item` WHERE `id` = %d AND `verb` IN ('%s', '') AND `type` != 'activity' AND
-				NOT (`author-link` IN ($profile_list))  LIMIT 1",
-		intval($itemid), dbesc(ACTIVITY_POST));
-	if (!$item)
-		return false;
+	$fields = ['id', 'mention', 'tag', 'parent', 'title', 'body',
+		'author-link', 'author-name', 'author-avatar', 'author-id',
+		'guid', 'parent-uri', 'uri', 'contact-id', 'network'];
+	$condition = ['id' => $itemid, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]];
+	$item = Item::selectFirst($fields, $condition);
+	if (!DBA::isResult($item) || in_array($item['author-id'], $contacts)) {
+		return;
+	}
 
 	// Generate the notification array
 	$params = [];
 	$params["uid"] = $uid;
-	$params["notify_flags"] = $user["notify-flags"];
-	$params["language"] = $user["language"];
-	$params["to_name"] = $user["username"];
-	$params["to_email"] = $user["email"];
-	$params["item"] = $item[0];
-	$params["parent"] = $item[0]["parent"];
-	$params["link"] = System::baseUrl().'/display/'.urlencode($item[0]["guid"]);
+	$params["item"] = $item;
+	$params["parent"] = $item["parent"];
+	$params["link"] = System::baseUrl().'/display/'.urlencode($item["guid"]);
 	$params["otype"] = 'item';
-	$params["source_name"] = $item[0]["author-name"];
-	$params["source_link"] = $item[0]["author-link"];
-	$params["source_photo"] = $item[0]["author-avatar"];
+	$params["source_name"] = $item["author-name"];
+	$params["source_link"] = $item["author-link"];
+	$params["source_photo"] = $item["author-avatar"];
 
-	if ($item[0]["parent-uri"] === $item[0]["uri"]) {
+	if ($item["parent-uri"] === $item["uri"]) {
 		// Send a notification for every new post?
-		$send_notification = dba::exists('contact', ['id' => $item[0]['contact-id'], 'notify_new_posts' => true]);
+		$send_notification = DBA::exists('contact', ['id' => $item['contact-id'], 'notify_new_posts' => true]);
 
 		if (!$send_notification) {
 			$tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d",
 				intval(TERM_OBJ_POST), intval($itemid), intval(TERM_MENTION), intval($uid));
 
-			if (DBM::is_result($tags)) {
+			if (DBA::isResult($tags)) {
 				foreach ($tags AS $tag) {
 					$condition = ['nurl' => normalise_link($tag["url"]), 'uid' => $uid, 'notify_new_posts' => true];
-					$r = dba::exists('contact', $condition);
+					$r = DBA::exists('contact', $condition);
 					if ($r) {
 						$send_notification = true;
 					}
@@ -791,29 +775,35 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 	$tagged = false;
 
 	foreach ($profiles AS $profile) {
-		if (strpos($item[0]["tag"], "=".$profile."]") || strpos($item[0]["body"], "=".$profile."]"))
+		if (strpos($item["tag"], "=".$profile."]") || strpos($item["body"], "=".$profile."]"))
 			$tagged = true;
 	}
 
-	if ($item[0]["mention"] || $tagged || ($defaulttype == NOTIFY_TAGSELF)) {
+	if ($item["mention"] || $tagged || ($defaulttype == NOTIFY_TAGSELF)) {
 		$params["type"] = NOTIFY_TAGSELF;
 		$params["verb"] = ACTIVITY_TAG;
 	}
 
-	// Is it a post that the user had started or where he interacted?
-	$parent = q("SELECT `thread`.`iid` FROM `thread` INNER JOIN `item` ON `item`.`parent` = `thread`.`iid`
-			WHERE `thread`.`iid` = %d AND NOT `thread`.`ignored` AND
-				(`thread`.`mention` OR `item`.`author-link` IN ($profile_list))
-			LIMIT 1",
-			intval($item[0]["parent"]));
+	// Is it a post that the user had started?
+	$fields = ['ignored', 'mention'];
+	$thread = Item::selectFirstThreadForUser($params['uid'], $fields, ['iid' => $item["parent"]]);
 
-	if ($parent && !isset($params["type"])) {
+	if ($thread['mention'] && !$thread['ignored'] && !isset($params["type"])) {
 		$params["type"] = NOTIFY_COMMENT;
 		$params["verb"] = ACTIVITY_POST;
 	}
 
-	if (isset($params["type"]))
+	// And now we check for participation of one of our contacts in the thread
+	$condition = ['parent' => $item["parent"], 'author-id' => $contacts];
+
+	if (!$thread['ignored'] && !isset($params["type"]) && Item::exists($condition)) {
+		$params["type"] = NOTIFY_COMMENT;
+		$params["verb"] = ACTIVITY_POST;
+	}
+
+	if (isset($params["type"])) {
 		notification($params);
+	}
 }
 
 /**
diff --git a/include/items.php b/include/items.php
index 4533b6077..9fd557a77 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3,13 +3,15 @@
  * @file include/items.php
  */
 
+use Friendica\BaseObject;
 use Friendica\Content\Feature;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Feed;
@@ -23,9 +25,14 @@ require_once 'include/text.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
 
-function add_page_info_data($data, $no_photos = false) {
+function add_page_info_data(array $data, $no_photos = false)
+{
 	Addon::callHooks('page_info_data', $data);
 
+	if (empty($data['type'])) {
+		return '';
+	}
+
 	// It maybe is a rich content, but if it does have everything that a link has,
 	// then treat it that way
 	if (($data["type"] == "rich") && is_string($data["title"]) &&
@@ -33,6 +40,8 @@ function add_page_info_data($data, $no_photos = false) {
 		$data["type"] = "link";
 	}
 
+	$data["title"] = defaults($data, "title", "");
+
 	if ((($data["type"] != "link") && ($data["type"] != "video") && ($data["type"] != "photo")) || ($data["title"] == $data["url"])) {
 		return "";
 	}
@@ -47,23 +56,24 @@ function add_page_info_data($data, $no_photos = false) {
 
 	$text = "[attachment type='".$data["type"]."'";
 
-	if ($data["text"] == "") {
+	if (empty($data["text"])) {
 		$data["text"] = $data["title"];
 	}
 
-	if ($data["text"] == "") {
+	if (empty($data["text"])) {
 		$data["text"] = $data["url"];
 	}
 
-	if ($data["url"] != "") {
+	if (!empty($data["url"])) {
 		$text .= " url='".$data["url"]."'";
 	}
 
-	if ($data["title"] != "") {
+	if (!empty($data["title"])) {
 		$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)
@@ -80,7 +90,7 @@ function add_page_info_data($data, $no_photos = false) {
 	$hashtags = "";
 	if (isset($data["keywords"]) && count($data["keywords"])) {
 		$hashtags = "\n";
-		foreach ($data["keywords"] AS $keyword) {
+		foreach ($data["keywords"] as $keyword) {
 			/// @TODO make a positive list of allowed characters
 			$hashtag = str_replace([" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"],
 						["", "", "", "", "", "", "", "", "", "", "", ""], $keyword);
@@ -91,8 +101,8 @@ function add_page_info_data($data, $no_photos = false) {
 	return "\n".$text.$hashtags;
 }
 
-function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklist = "") {
-
+function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklist = "")
+{
 	$data = ParseUrl::getSiteinfoCached($url, true);
 
 	if ($photo != "") {
@@ -107,8 +117,10 @@ function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklis
 
 	if (($keyword_blacklist != "") && isset($data["keywords"])) {
 		$list = explode(", ", $keyword_blacklist);
-		foreach ($list AS $keyword) {
+
+		foreach ($list as $keyword) {
 			$keyword = trim($keyword);
+
 			$index = array_search($keyword, $data["keywords"]);
 			if ($index !== false) {
 				unset($data["keywords"][$index]);
@@ -119,12 +131,13 @@ function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklis
 	return $data;
 }
 
-function add_page_keywords($url, $photo = "", $keywords = false, $keyword_blacklist = "") {
+function add_page_keywords($url, $photo = "", $keywords = false, $keyword_blacklist = "")
+{
 	$data = query_page_info($url, $photo, $keywords, $keyword_blacklist);
 
 	$tags = "";
 	if (isset($data["keywords"]) && count($data["keywords"])) {
-		foreach ($data["keywords"] AS $keyword) {
+		foreach ($data["keywords"] as $keyword) {
 			$hashtag = str_replace([" ", "+", "/", ".", "#", "'"],
 				["", "", "", "", "", ""], $keyword);
 
@@ -139,16 +152,21 @@ function add_page_keywords($url, $photo = "", $keywords = false, $keyword_blackl
 	return $tags;
 }
 
-function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "") {
+function add_page_info($url, $no_photos = false, $photo = "", $keywords = false, $keyword_blacklist = "")
+{
 	$data = query_page_info($url, $photo, $keywords, $keyword_blacklist);
 
-	$text = add_page_info_data($data, $no_photos);
+	$text = '';
+
+	if (is_array($data)) {
+		$text = add_page_info_data($data, $no_photos);
+	}
 
 	return $text;
 }
 
-function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
-
+function add_page_info_to_body($body, $texturl = false, $no_photos = false)
+{
 	logger('add_page_info_to_body: fetch page info for body ' . $body, LOGGER_DEBUG);
 
 	$URLSearchString = "^\[\]";
@@ -225,11 +243,10 @@ function add_page_info_to_body($body, $texturl = false, $no_photos = false) {
  * model where comments can have sub-threads. That would require some massive sorting
  * to get all the feed items into a mostly linear ordering, and might still require
  * recursion.
- *
- * @TODO find proper type-hints
  */
-function consume_feed($xml, $importer, $contact, &$hub, $datedir = 0, $pass = 0) {
-	if ($contact['network'] === NETWORK_OSTATUS) {
+function consume_feed($xml, array $importer, array $contact, &$hub, $datedir = 0, $pass = 0)
+{
+	if ($contact['network'] === Protocol::OSTATUS) {
 		if ($pass < 2) {
 			// Test - remove before flight
 			//$tempfile = tempnam(get_temppath(), "ostatus2");
@@ -237,60 +254,56 @@ function consume_feed($xml, $importer, $contact, &$hub, $datedir = 0, $pass = 0)
 			logger("Consume OStatus messages ", LOGGER_DEBUG);
 			OStatus::import($xml, $importer, $contact, $hub);
 		}
+
 		return;
 	}
 
-	if ($contact['network'] === NETWORK_FEED) {
+	if ($contact['network'] === Protocol::FEED) {
 		if ($pass < 2) {
 			logger("Consume feeds", LOGGER_DEBUG);
 			Feed::import($xml, $importer, $contact, $hub);
 		}
+
 		return;
 	}
 
-	if ($contact['network'] === NETWORK_DFRN) {
+	if ($contact['network'] === Protocol::DFRN) {
 		logger("Consume DFRN messages", LOGGER_DEBUG);
-
-		$r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
-					`contact`.`pubkey` AS `cpubkey`,
-					`contact`.`prvkey` AS `cprvkey`,
-					`contact`.`thumb` AS `thumb`,
-					`contact`.`url` as `url`,
-					`contact`.`name` as `senderName`,
-					`user`.*
-			FROM `contact`
-			LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
-			WHERE `contact`.`id` = %d AND `user`.`uid` = %d",
-			dbesc($contact["id"]), dbesc($importer["uid"])
-		);
-		if (DBM::is_result($r)) {
+		$dfrn_importer = DFRN::getImporter($contact["id"], $importer["uid"]);
+		if (!empty($dfrn_importer)) {
 			logger("Now import the DFRN feed");
-			DFRN::import($xml, $r[0], true);
+			DFRN::import($xml, $dfrn_importer, true);
 			return;
 		}
 	}
 }
 
-function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
-
-	$a = get_app();
-
-	if (is_array($importer)) {
-		$r = q("SELECT `nickname` FROM `user` WHERE `uid` = %d LIMIT 1",
-			intval($importer['uid'])
-		);
-	}
-
+function subscribe_to_hub($url, array $importer, array $contact, $hubmode = 'subscribe')
+{
 	/*
 	 * Diaspora has different message-ids in feeds than they do
 	 * through the direct Diaspora protocol. If we try and use
 	 * the feed, we'll get duplicates. So don't.
 	 */
-	if ((!DBM::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) {
+	if ($contact['network'] === Protocol::DIASPORA) {
 		return;
 	}
 
-	$push_url = System::baseUrl() . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id'];
+	// Without an importer we don't have a user id - so we quit
+	if (empty($importer)) {
+		return;
+	}
+
+	$a = BaseObject::getApp();
+
+	$user = DBA::selectFirst('user', ['nickname'], ['uid' => $importer['uid']]);
+
+	// No user, no nickname, we quit
+	if (!DBA::isResult($user)) {
+		return;
+	}
+
+	$push_url = System::baseUrl() . '/pubsub/' . $user['nickname'] . '/' . $contact['id'];
 
 	// Use a single verify token, even if multiple hubs
 	$verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string());
@@ -300,7 +313,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 	logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: '  . $push_url . ' with verifier ' . $verify_token);
 
 	if (!strlen($contact['hub-verify']) || ($contact['hub-verify'] != $verify_token)) {
-		dba::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]);
+		DBA::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]);
 	}
 
 	Network::post($url, $params);
@@ -311,40 +324,39 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 
 }
 
-/// @TODO type-hint is array
-function drop_items($items) {
+function drop_items(array $items)
+{
 	$uid = 0;
 
 	if (!local_user() && !remote_user()) {
 		return;
 	}
 
-	if (count($items)) {
+	if (!empty($items)) {
 		foreach ($items as $item) {
 			$owner = Item::deleteForUser(['id' => $item], local_user());
-			if ($owner && !$uid)
+
+			if ($owner && !$uid) {
 				$uid = $owner;
+			}
 		}
 	}
 }
 
-function drop_item($id) {
-
-	$a = get_app();
+function drop_item($id)
+{
+	$a = BaseObject::getApp();
 
 	// locate item to be deleted
 
-	$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
-		intval($id)
-	);
+	$fields = ['id', 'uid', 'contact-id', 'deleted'];
+	$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
 
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($item)) {
 		notice(L10n::t('Item not found.') . EOL);
 		goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
 	}
 
-	$item = $r[0];
-
 	if ($item['deleted']) {
 		return 0;
 	}
@@ -353,7 +365,7 @@ function drop_item($id) {
 
 	// check if logged in user is either the author or owner of this item
 
-	if (is_array($_SESSION['remote'])) {
+	if (!empty($_SESSION['remote'])) {
 		foreach ($_SESSION['remote'] as $visitor) {
 			if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) {
 				$contact_id = $visitor['cid'];
@@ -363,13 +375,13 @@ function drop_item($id) {
 	}
 
 	if ((local_user() == $item['uid']) || $contact_id) {
-
 		// Check if we should do HTML-based delete confirmation
-		if ($_REQUEST['confirm']) {
+		if (!empty($_REQUEST['confirm'])) {
 			// <form> can't take arguments in its "action" parameter
 			// so add any arguments as hidden inputs
 			$query = explode_querystring($a->query_string);
 			$inputs = [];
+
 			foreach ($query['args'] as $arg) {
 				if (strpos($arg, 'confirm=') === false) {
 					$arg_parts = explode('=', $arg);
@@ -388,7 +400,7 @@ function drop_item($id) {
 			]);
 		}
 		// Now check how the user responded to the confirmation query
-		if ($_REQUEST['canceled']) {
+		if (!empty($_REQUEST['canceled'])) {
 			goaway(System::baseUrl() . '/' . $_SESSION['return_url']);
 		}
 
@@ -405,7 +417,8 @@ function drop_item($id) {
 }
 
 /* arrange the list in years */
-function list_post_dates($uid, $wall) {
+function list_post_dates($uid, $wall)
+{
 	$dnow = DateTimeFormat::localNow('Y-m-d');
 
 	$dthen = Item::firstPostDate($uid, $wall);
@@ -430,16 +443,19 @@ function list_post_dates($uid, $wall) {
 		$start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
 		$end_month = DateTimeFormat::utc($dend, 'Y-m-d');
 		$str = day_translate(DateTimeFormat::utc($dnow, 'F'));
-		if (!$ret[$dyear]) {
+
+		if (empty($ret[$dyear])) {
 			$ret[$dyear] = [];
 		}
+
 		$ret[$dyear][] = [$str, $end_month, $start_month];
 		$dnow = DateTimeFormat::utc($dnow . ' -1 month', 'Y-m-d');
 	}
 	return $ret;
 }
 
-function posted_date_widget($url, $uid, $wall) {
+function posted_date_widget($url, $uid, $wall)
+{
 	$o = '';
 
 	if (!Feature::isEnabled($uid, 'archives')) {
@@ -453,14 +469,11 @@ function posted_date_widget($url, $uid, $wall) {
 		return $o;
 	*/
 
-	$visible_years = PConfig::get($uid,'system','archive_visible_years');
-	if (!$visible_years) {
-		$visible_years = 5;
-	}
+	$visible_years = PConfig::get($uid, 'system', 'archive_visible_years', 5);
 
 	$ret = list_post_dates($uid, $wall);
 
-	if (!DBM::is_result($ret)) {
+	if (!DBA::isResult($ret)) {
 		return $o;
 	}
 
diff --git a/include/security.php b/include/security.php
index b13a507cf..2063bdd16 100644
--- a/include/security.php
+++ b/include/security.php
@@ -8,9 +8,11 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Model\PermissionSet;
 
 /**
  * @brief Calculate the hash that is needed for the "Friendica" cookie
@@ -41,7 +43,7 @@ function new_cookie($time, $user = [])
 	if ($user) {
 		$value = json_encode(["uid" => $user["uid"],
 			"hash" => cookie_hash($user),
-			"ip" => $_SERVER['REMOTE_ADDR']]);
+			"ip" => defaults($_SERVER, 'REMOTE_ADDR', '0.0.0.0')]);
 	} else {
 		$value = "";
 	}
@@ -70,7 +72,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	$_SESSION['page_flags'] = $user_record['page-flags'];
 	$_SESSION['my_url'] = System::baseUrl() . '/profile/' . $user_record['nickname'];
 	$_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
-	$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
+	$_SESSION['addr'] = defaults($_SERVER, 'REMOTE_ADDR', '0.0.0.0');
 
 	$a->user = $user_record;
 
@@ -99,11 +101,9 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	$master_record = $a->user;
 
 	if ((x($_SESSION, 'submanage')) && intval($_SESSION['submanage'])) {
-		$r = dba::fetch_first("SELECT * FROM `user` WHERE `uid` = ? LIMIT 1",
-			intval($_SESSION['submanage'])
-		);
-		if (DBM::is_result($r)) {
-			$master_record = $r;
+		$user = DBA::selectFirst('user', [], ['uid' => $_SESSION['submanage']]);
+		if (DBA::isResult($user)) {
+			$master_record = $user;
 		}
 	}
 
@@ -114,38 +114,38 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 				'nickname' => $master_record['nickname']]];
 
 		// Then add all the children
-		$r = dba::select('user', ['uid', 'username', 'nickname'],
+		$r = DBA::select('user', ['uid', 'username', 'nickname'],
 			['parent-uid' => $master_record['uid'], 'account_removed' => false]);
-		if (DBM::is_result($r)) {
-			$a->identities = array_merge($a->identities, dba::inArray($r));
+		if (DBA::isResult($r)) {
+			$a->identities = array_merge($a->identities, DBA::toArray($r));
 		}
 	} else {
 		// Just ensure that the array is always defined
 		$a->identities = [];
 
 		// First entry is our parent
-		$r = dba::select('user', ['uid', 'username', 'nickname'],
+		$r = DBA::select('user', ['uid', 'username', 'nickname'],
 			['uid' => $master_record['parent-uid'], 'account_removed' => false]);
-		if (DBM::is_result($r)) {
-			$a->identities = dba::inArray($r);
+		if (DBA::isResult($r)) {
+			$a->identities = DBA::toArray($r);
 		}
 
 		// Then add all siblings
-		$r = dba::select('user', ['uid', 'username', 'nickname'],
+		$r = DBA::select('user', ['uid', 'username', 'nickname'],
 			['parent-uid' => $master_record['parent-uid'], 'account_removed' => false]);
-		if (DBM::is_result($r)) {
-			$a->identities = array_merge($a->identities, dba::inArray($r));
+		if (DBA::isResult($r)) {
+			$a->identities = array_merge($a->identities, DBA::toArray($r));
 		}
 	}
 
-	$r = dba::p("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname`
+	$r = DBA::p("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname`
 		FROM `manage`
 		INNER JOIN `user` ON `manage`.`mid` = `user`.`uid`
 		WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = ?",
 		$master_record['uid']
 	);
-	if (DBM::is_result($r)) {
-		$a->identities = array_merge($a->identities, dba::inArray($r));
+	if (DBA::isResult($r)) {
+		$a->identities = array_merge($a->identities, DBA::toArray($r));
 	}
 
 	if ($login_initial) {
@@ -155,30 +155,32 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 		logger('auth_identities refresh: ' . print_r($a->identities, true), LOGGER_DEBUG);
 	}
 
-	$r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $_SESSION['uid']);
-	if (DBM::is_result($r)) {
-		$a->contact = $r;
-		$a->cid = $r['id'];
+	$contact = DBA::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => true]);
+	if (DBA::isResult($contact)) {
+		$a->contact = $contact;
+		$a->cid = $contact['id'];
 		$_SESSION['cid'] = $a->cid;
 	}
 
 	header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] . '"');
 
 	if ($login_initial || $login_refresh) {
-		dba::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]);
+		DBA::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]);
 
 		// Set the login date for all identities of the user
-		dba::update('user', ['login_date' => DateTimeFormat::utcNow()],
+		DBA::update('user', ['login_date' => DateTimeFormat::utcNow()],
 			['parent-uid' => $master_record['uid'], 'account_removed' => false]);
 	}
 
 	if ($login_initial) {
-		// If the user specified to remember the authentication, then set a cookie
-		// that expires after one week (the default is when the browser is closed).
-		// The cookie will be renewed automatically.
-		// The week ensures that sessions will expire after some inactivity.
-		if ($_SESSION['remember']) {
-			logger('Injecting cookie for remembered user ' . $_SESSION['remember_user']['nickname']);
+		/*
+		 * If the user specified to remember the authentication, then set a cookie
+		 * that expires after one week (the default is when the browser is closed).
+		 * The cookie will be renewed automatically.
+		 * The week ensures that sessions will expire after some inactivity.
+		 */
+		if (!empty($_SESSION['remember'])) {
+			logger('Injecting cookie for remembered user ' . $a->user['nickname']);
 			new_cookie(604800, $user_record);
 			unset($_SESSION['remember']);
 		}
@@ -206,6 +208,10 @@ function can_write_wall($owner)
 		return true;
 	}
 
+	if (local_user() && ($owner == 0)) {
+		return true;
+	}
+
 	if (remote_user()) {
 		// use remembered decision and avoid a DB lookup for each and every display item
 		// DO NOT use this function if there are going to be multiple owners
@@ -219,7 +225,7 @@ function can_write_wall($owner)
 		} else {
 			$cid = 0;
 
-			if (is_array($_SESSION['remote'])) {
+			if (!empty($_SESSION['remote'])) {
 				foreach ($_SESSION['remote'] as $visitor) {
 					if ($visitor['uid'] == $owner) {
 						$cid = $visitor['cid'];
@@ -237,12 +243,12 @@ function can_write_wall($owner)
 				AND `user`.`blockwall` = 0 AND `readonly` = 0  AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
 				intval($owner),
 				intval($cid),
-				intval(CONTACT_IS_SHARING),
-				intval(CONTACT_IS_FRIEND),
-				intval(PAGE_COMMUNITY)
+				intval(Contact::SHARING),
+				intval(Contact::FRIEND),
+				intval(Contact::PAGE_COMMUNITY)
 			);
 
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				$verified = 2;
 				return true;
 			} else {
@@ -254,6 +260,7 @@ function can_write_wall($owner)
 	return false;
 }
 
+/// @TODO $groups should be array
 function permissions_sql($owner_id, $remote_verified = false, $groups = null)
 {
 	$local_user = local_user();
@@ -275,6 +282,13 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null)
 	 */
 	if ($local_user && $local_user == $owner_id) {
 		$sql = '';
+	/**
+	 * Authenticated visitor. Unless pre-verified,
+	 * check that the contact belongs to this $owner_id
+	 * and load the groups the visitor belongs to.
+	 * If pre-verified, the caller is expected to have already
+	 * done this and passed the groups into this function.
+	 */
 	} elseif ($remote_user) {
 		/*
 		 * Authenticated visitor. Unless pre-verified,
@@ -285,11 +299,7 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null)
 		 */
 
 		if (!$remote_verified) {
-			$r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
-				intval($remote_user),
-				intval($owner_id)
-			);
-			if (DBM::is_result($r)) {
+			if (DBA::exists('contact', ['id' => $remote_user, 'uid' => $owner_id, 'blocked' => false])) {
 				$remote_verified = true;
 				$groups = Group::getIdsByContactId($remote_user);
 			}
@@ -298,9 +308,10 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null)
 		if ($remote_verified) {
 			$gs = '<<>>'; // should be impossible to match
 
-			if (is_array($groups) && count($groups)) {
-				foreach ($groups as $g)
+			if (is_array($groups)) {
+				foreach ($groups as $g) {
 					$gs .= '|<' . intval($g) . '>';
+				}
 			}
 
 			$sql = sprintf(
@@ -309,9 +320,9 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null)
 				  )
 				",
 				intval($remote_user),
-				dbesc($gs),
+				DBA::escape($gs),
 				intval($remote_user),
-				dbesc($gs)
+				DBA::escape($gs)
 			);
 		}
 	}
@@ -328,12 +339,7 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
 	 *
 	 * default permissions - anonymous user
 	 */
-	$sql = " AND `item`.allow_cid = ''
-			 AND `item`.allow_gid = ''
-			 AND `item`.deny_cid  = ''
-			 AND `item`.deny_gid  = ''
-			 AND `item`.private = 0
-	";
+	$sql = " AND NOT `item`.`private`";
 
 	// Profile owner - everything is visible
 	if ($local_user && ($local_user == $owner_id)) {
@@ -346,37 +352,15 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
 		 * If pre-verified, the caller is expected to have already
 		 * done this and passed the groups into this function.
 		 */
-		if (!$remote_verified) {
-			$r = q("SELECT id FROM contact WHERE id = %d AND uid = %d AND blocked = 0 LIMIT 1",
-				intval($remote_user),
-				intval($owner_id)
-			);
-			if (DBM::is_result($r)) {
-				$remote_verified = true;
-				$groups = Group::getIdsByContactId($remote_user);
-			}
+		$set = PermissionSet::get($owner_id, $remote_user, $groups);
+
+		if (!empty($set)) {
+			$sql_set = " OR (`item`.`private` IN (1,2) AND `item`.`wall` AND `item`.`psid` IN (" . implode(',', $set) . "))";
+		} else {
+			$sql_set = '';
 		}
-		if ($remote_verified) {
 
-			$gs = '<<>>'; // should be impossible to match
-
-			if (is_array($groups) && count($groups)) {
-				foreach ($groups as $g) {
-					$gs .= '|<' . intval($g) . '>';
-				}
-			}
-
-			$sql = sprintf(
-				" AND ( `item`.private = 0 OR ( `item`.private in (1,2) AND `item`.`wall` = 1
-				  AND ( NOT (`item`.deny_cid REGEXP '<%d>' OR `item`.deny_gid REGEXP '%s')
-				  AND ( `item`.allow_cid REGEXP '<%d>' OR `item`.allow_gid REGEXP '%s' OR ( `item`.allow_cid = '' AND `item`.allow_gid = '')))))
-				",
-				intval($remote_user),
-				dbesc($gs),
-				intval($remote_user),
-				dbesc($gs)
-			);
-		}
+		$sql = " AND (NOT `item`.`private`" . $sql_set . ")";
 	}
 
 	return $sql;
diff --git a/include/text.php b/include/text.php
index 6830f91e0..97baee7f6 100644
--- a/include/text.php
+++ b/include/text.php
@@ -12,17 +12,17 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Event;
 use Friendica\Model\Item;
-use Friendica\Model\Profile;
 use Friendica\Render\FriendicaSmarty;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
+use Friendica\Util\Proxy as ProxyUtils;
 
-require_once "mod/proxy.php";
 require_once "include/conversation.php";
 
 /**
@@ -152,7 +152,7 @@ function autoname($len) {
 				'nd','ng','nk','nt','rn','rp','rt'];
 
 	$noend = ['bl', 'br', 'cl','cr','dr','fl','fr','gl','gr',
-				'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh'];
+				'kh', 'kl','kr','mn','pl','pr','rh','tr','qu','wh','q'];
 
 	$start = mt_rand(0,2);
 	if ($start == 0) {
@@ -178,14 +178,13 @@ function autoname($len) {
 	$word = substr($word,0,$len);
 
 	foreach ($noend as $noe) {
-		if ((strlen($word) > 2) && (substr($word, -2) == $noe)) {
-			$word = substr($word, 0, -1);
+		$noelen = strlen($noe);
+		if ((strlen($word) > $noelen) && (substr($word, -$noelen) == $noe)) {
+			$word = autoname($len);
 			break;
 		}
 	}
-	if (substr($word, -1) == 'q') {
-		$word = substr($word, 0, -1);
-	}
+
 	return $word;
 }
 
@@ -453,7 +452,7 @@ function perms2str($p) {
 	if (is_array($p)) {
 		$tmp = $p;
 	} else {
-		$tmp = explode(',',$p);
+		$tmp = explode(',', $p);
 	}
 
 	if (is_array($tmp)) {
@@ -463,113 +462,6 @@ function perms2str($p) {
 	return $ret;
 }
 
-
-/**
- * generate a guaranteed unique (for this domain) item ID for ATOM
- * safe from birthday paradox
- *
- * @param string $hostname
- * @param int $uid
- * @return string
- */
-function item_new_uri($hostname, $uid, $guid = "") {
-
-	do {
-		if ($guid == "") {
-			$hash = get_guid(32);
-		} else {
-			$hash = $guid;
-			$guid = "";
-		}
-
-		$uri = "urn:X-dfrn:" . $hostname . ':' . $uid . ':' . $hash;
-
-		$dups = dba::exists('item', ['uri' => $uri]);
-	} while ($dups == true);
-
-	return $uri;
-}
-
-/**
- * @deprecated
- * wrapper to load a view template, checking for alternate
- * languages before falling back to the default
- *
- * @global string $lang
- * @global App $a
- * @param string $s view name
- * @return string
- */
-function load_view_file($s) {
-	global $lang, $a;
-	if (! isset($lang)) {
-		$lang = 'en';
-	}
-	$b = basename($s);
-	$d = dirname($s);
-	if (file_exists("$d/$lang/$b")) {
-		$stamp1 = microtime(true);
-		$content = file_get_contents("$d/$lang/$b");
-		$a->save_timestamp($stamp1, "file");
-		return $content;
-	}
-
-	$theme = $a->getCurrentTheme();
-
-	if (file_exists("$d/theme/$theme/$b")) {
-		$stamp1 = microtime(true);
-		$content = file_get_contents("$d/theme/$theme/$b");
-		$a->save_timestamp($stamp1, "file");
-		return $content;
-	}
-
-	$stamp1 = microtime(true);
-	$content = file_get_contents($s);
-	$a->save_timestamp($stamp1, "file");
-	return $content;
-}
-
-
-/**
- * load a view template, checking for alternate
- * languages before falling back to the default
- *
- * @global string $lang
- * @param string $s view path
- * @return string
- */
-function get_intltext_template($s) {
-	global $lang;
-
-	$a = get_app();
-	$engine = '';
-	if ($a->theme['template_engine'] === 'smarty3') {
-		$engine = "/smarty3";
-	}
-
-	if (! isset($lang)) {
-		$lang = 'en';
-	}
-
-	if (file_exists("view/lang/$lang$engine/$s")) {
-		$stamp1 = microtime(true);
-		$content = file_get_contents("view/lang/$lang$engine/$s");
-		$a->save_timestamp($stamp1, "file");
-		return $content;
-	} elseif (file_exists("view/lang/en$engine/$s")) {
-		$stamp1 = microtime(true);
-		$content = file_get_contents("view/lang/en$engine/$s");
-		$a->save_timestamp($stamp1, "file");
-		return $content;
-	} else {
-		$stamp1 = microtime(true);
-		$content = file_get_contents("view$engine/$s");
-		$a->save_timestamp($stamp1, "file");
-		return $content;
-	}
-}
-
-
 /**
  * load template $s
  *
@@ -621,36 +513,28 @@ $LOGGER_LEVELS = [];
  * @brief Logs the given message at the given log level
  *
  * log levels:
- * LOGGER_NORMAL (default)
+ * LOGGER_WARNING
+ * LOGGER_INFO (default)
  * LOGGER_TRACE
  * LOGGER_DEBUG
  * LOGGER_DATA
  * LOGGER_ALL
  *
- * @global App $a
  * @global array $LOGGER_LEVELS
  * @param string $msg
  * @param int $level
  */
-function logger($msg, $level = 0) {
+function logger($msg, $level = LOGGER_INFO) {
 	$a = get_app();
 	global $LOGGER_LEVELS;
 
-	// turn off logger in install mode
-	if (
-		$a->mode == App::MODE_INSTALL
-		|| !dba::$connected
-	) {
-		return;
-	}
-
-	$debugging = Config::get('system','debugging');
-	$logfile   = Config::get('system','logfile');
-	$loglevel = intval(Config::get('system','loglevel'));
+	$debugging = Config::get('system', 'debugging');
+	$logfile   = Config::get('system', 'logfile');
+	$loglevel = intval(Config::get('system', 'loglevel'));
 
 	if (
-		! $debugging
-		|| ! $logfile
+		!$debugging
+		|| !$logfile
 		|| $level > $loglevel
 	) {
 		return;
@@ -671,13 +555,20 @@ function logger($msg, $level = 0) {
 	}
 
 	$callers = debug_backtrace();
+
+	if (count($callers) > 1) {
+		$function = $callers[1]['function'];
+	} else {
+		$function = '';
+	}
+
 	$logline = sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n",
 			DateTimeFormat::utcNow(DateTimeFormat::ATOM),
 			$process_id,
 			$LOGGER_LEVELS[$level],
 			basename($callers[0]['file']),
 			$callers[0]['line'],
-			$callers[1]['function'],
+			$function,
 			$msg
 		);
 
@@ -693,31 +584,22 @@ function logger($msg, $level = 0) {
  * personally without background noise
  *
  * log levels:
- * LOGGER_NORMAL (default)
+ * LOGGER_WARNING
+ * LOGGER_INFO (default)
  * LOGGER_TRACE
  * LOGGER_DEBUG
  * LOGGER_DATA
  * LOGGER_ALL
  *
- * @global App $a
  * @global array $LOGGER_LEVELS
  * @param string $msg
  * @param int $level
  */
-
-function dlogger($msg, $level = 0) {
+function dlogger($msg, $level = LOGGER_INFO) {
 	$a = get_app();
 
-	// turn off logger in install mode
-	if (
-		$a->mode == App::MODE_INSTALL
-		|| !dba::$connected
-	) {
-		return;
-	}
-
 	$logfile = Config::get('system', 'dlogfile');
-	if (! $logfile) {
+	if (!$logfile) {
 		return;
 	}
 
@@ -737,7 +619,7 @@ function dlogger($msg, $level = 0) {
 	$process_id = session_id();
 
 	if ($process_id == '') {
-		$process_id = get_app()->process_id;
+		$process_id = $a->process_id;
 	}
 
 	$callers = debug_backtrace();
@@ -874,11 +756,11 @@ function contact_block() {
 				AND NOT `pending` AND NOT `hidden` AND NOT `archive`
 				AND `network` IN ('%s', '%s', '%s')",
 			intval($a->profile['uid']),
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_OSTATUS),
-			dbesc(NETWORK_DIASPORA)
+			DBA::escape(Protocol::DFRN),
+			DBA::escape(Protocol::OSTATUS),
+			DBA::escape(Protocol::DIASPORA)
 	);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$total = intval($r[0]['total']);
 	}
 	if (!$total) {
@@ -892,20 +774,20 @@ function contact_block() {
 					AND `network` IN ('%s', '%s', '%s')
 				ORDER BY RAND() LIMIT %d",
 				intval($a->profile['uid']),
-				dbesc(NETWORK_DFRN),
-				dbesc(NETWORK_OSTATUS),
-				dbesc(NETWORK_DIASPORA),
+				DBA::escape(Protocol::DFRN),
+				DBA::escape(Protocol::OSTATUS),
+				DBA::escape(Protocol::DIASPORA),
 				intval($shown)
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$contacts = [];
 			foreach ($r AS $contact) {
 				$contacts[] = $contact["id"];
 			}
 			$r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)",
-				dbesc(implode(",", $contacts)));
+				DBA::escape(implode(",", $contacts)));
 
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				$contacts = L10n::tt('%d Contact', '%d Contacts', $total);
 				$micropro = [];
 				foreach ($r as $rr) {
@@ -962,13 +844,9 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
 	$redir = false;
 
 	if ($redirect) {
-		$redirect_url = 'redir/' . $contact['id'];
-		if (local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === NETWORK_DFRN)) {
-			$redir = true;
-			$url = $redirect_url;
+		$url = Contact::magicLink($contact['url']);
+		if (strpos($url, 'redir/') === 0) {
 			$sparkle = ' sparkle';
-		} else {
-			$url = Profile::zrl($url);
 		}
 	}
 
@@ -981,7 +859,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
 		'$click' => defaults($contact, 'click', ''),
 		'$class' => $class,
 		'$url' => $url,
-		'$photo' => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB),
+		'$photo' => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
 		'$name' => $contact['name'],
 		'title' => $contact['name'] . ' [' . $contact['addr'] . ']',
 		'$parkle' => $sparkle,
@@ -1016,7 +894,7 @@ function search($s, $id = 'search-box', $url = 'search', $save = false, $aside =
 			'$action_url' => $url,
 			'$search_label' => L10n::t('Search'),
 			'$save_label' => $save_label,
-			'$savedsearch' => Feature::isEnabled(local_user(),'savedsearch'),
+			'$savedsearch' => local_user() && Feature::isEnabled(local_user(),'savedsearch'),
 			'$search_hint' => L10n::t('@name, !forum, #tags, content'),
 			'$mode' => $mode
 		];
@@ -1162,7 +1040,7 @@ function redir_private_images($a, &$item)
 				continue;
 			}
 
-			if ((local_user() == $item['uid']) && ($item['private'] != 0) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) {
+			if ((local_user() == $item['uid']) && ($item['private'] == 1) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == Protocol::DFRN)) {
 				$img_url = 'redir?f=1&quiet=1&url=' . urlencode($mtch[1]) . '&conurl=' . urlencode($item['author-link']);
 				$item['body'] = str_replace($mtch[0], '[img]' . $img_url . '[/img]', $item['body']);
 			}
@@ -1188,7 +1066,7 @@ function put_item_in_cache(&$item, $update = false)
 	$rendered_html = defaults($item, 'rendered-html', '');
 
 	if ($rendered_hash == ''
-		|| $item["rendered-html"] == ""
+		|| $rendered_html == ""
 		|| $rendered_hash != hash("md5", $item["body"])
 		|| Config::get("system", "ignore_cache")
 	) {
@@ -1198,6 +1076,12 @@ function put_item_in_cache(&$item, $update = false)
 		$item["rendered-html"] = prepare_text($item["body"]);
 		$item["rendered-hash"] = hash("md5", $item["body"]);
 
+		$hook_data = ['item' => $item, 'rendered-html' => $item['rendered-html'], 'rendered-hash' => $item['rendered-hash']];
+		Addon::callHooks('put_item_in_cache', $hook_data);
+		$item['rendered-html'] = $hook_data['rendered-html'];
+		$item['rendered-hash'] = $hook_data['rendered-hash'];
+		unset($hook_data);
+
 		// Force an update if the generated values differ from the existing ones
 		if ($rendered_hash != $item["rendered-hash"]) {
 			$update = true;
@@ -1208,9 +1092,9 @@ function put_item_in_cache(&$item, $update = false)
 			$update = true;
 		}
 
-		if ($update && ($item["id"] > 0)) {
-			dba::update('item', ['rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]],
-					['id' => $item["id"]], false);
+		if ($update && !empty($item["id"])) {
+			Item::update(['rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]],
+					['id' => $item["id"]]);
 		}
 	}
 
@@ -1285,9 +1169,7 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
 	$s = $hook_data['html'];
 	unset($hook_data);
 
-	$s = apply_content_filter($s, $filter_reasons);
-
-	if (! $attach) {
+	if (!$attach) {
 		// Replace the blockquotes with quotes that are used in mails.
 		$mailquote = '<blockquote type="cite" class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">';
 		$s = str_replace(['<blockquote>', '<blockquote class="spoiler">', '<blockquote class="author">'], [$mailquote, $mailquote, $mailquote], $s);
@@ -1301,11 +1183,7 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
 	foreach ($matches as $mtch) {
 		$mime = $mtch[3];
 
-		if ((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN)) {
-			$the_url = 'redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
-		} else {
-			$the_url = $mtch[1];
-		}
+		$the_url = Contact::magicLinkById($item['author-id'], $mtch[1]);
 
 		if (strpos($mime, 'video') !== false) {
 			if (!$vhead) {
@@ -1318,7 +1196,8 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
 				]);
 			}
 
-			$id = end(explode('/', $the_url));
+			$url_parts = explode('/', $the_url);
+			$id = end($url_parts);
 			$as .= replace_macros(get_markup_template('video_top.tpl'), [
 				'$video' => [
 					'id'     => $id,
@@ -1394,6 +1273,8 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
 		$s = preg_replace('|(<img[^>]+src="[^"]+/photo/[0-9a-f]+)-[0-9]|', "$1-" . $ps, $s);
 	}
 
+	$s = apply_content_filter($s, $filter_reasons);
+
 	$hook_data = ['item' => $item, 'html' => $s];
 	Addon::callHooks('prepare_body_final', $hook_data);
 
@@ -1578,26 +1459,6 @@ function return_bytes($size_str) {
 	}
 }
 
-
-/**
- * @return string
- */
-function generate_user_guid() {
-	$found = true;
-	do {
-		$guid = get_guid(32);
-		$x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
-			dbesc($guid)
-		);
-		if (! DBM::is_result($x)) {
-			$found = false;
-		}
-	} while ($found == true);
-
-	return $guid;
-}
-
-
 /**
  * @param string $s
  * @param boolean $strip_padding
@@ -1631,7 +1492,7 @@ function base64url_decode($s) {
  *  // Uncomment if you find you need it.
  *
  *	$l = strlen($s);
- *	if (! strpos($s,'=')) {
+ *	if (!strpos($s,'=')) {
  *		$m = $l % 4;
  *		if ($m == 2)
  *			$s .= '==';
@@ -1661,10 +1522,11 @@ function bb_translate_video($s) {
 	$r = preg_match_all("/\[video\](.*?)\[\/video\]/ism",$s,$matches,PREG_SET_ORDER);
 	if ($r) {
 		foreach ($matches as $mtch) {
-			if ((stristr($mtch[1],'youtube')) || (stristr($mtch[1],'youtu.be')))
-				$s = str_replace($mtch[0],'[youtube]' . $mtch[1] . '[/youtube]',$s);
-			elseif (stristr($mtch[1],'vimeo'))
-				$s = str_replace($mtch[0],'[vimeo]' . $mtch[1] . '[/vimeo]',$s);
+			if ((stristr($mtch[1], 'youtube')) || (stristr($mtch[1], 'youtu.be'))) {
+				$s = str_replace($mtch[0], '[youtube]' . $mtch[1] . '[/youtube]', $s);
+			} elseif (stristr($mtch[1], 'vimeo')) {
+				$s = str_replace($mtch[0], '[vimeo]' . $mtch[1] . '[/vimeo]', $s);
+			}
 		}
 	}
 	return $s;
@@ -1745,11 +1607,11 @@ function reltoabs($text, $base) {
  * @return string
  */
 function item_post_type($item) {
-	if (intval($item['event-id'])) {
+	if (!empty($item['event-id'])) {
 		return L10n::t('event');
-	} elseif (strlen($item['resource-id'])) {
+	} elseif (!empty($item['resource-id'])) {
 		return L10n::t('photo');
-	} elseif (strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) {
+	} elseif (!empty($item['verb']) && $item['verb'] !== ACTIVITY_POST) {
 		return L10n::t('activity');
 	} elseif ($item['id'] != $item['parent']) {
 		return L10n::t('comment');
@@ -1778,11 +1640,11 @@ function file_tag_file_query($table,$s,$type = 'file') {
 	} else {
 		$str = preg_quote('<' . str_replace('%', '%%', file_tag_encode($s)) . '>');
 	}
-	return " AND " . (($table) ? dbesc($table) . '.' : '') . "file regexp '" . dbesc($str) . "' ";
+	return " AND " . (($table) ? DBA::escape($table) . '.' : '') . "file regexp '" . DBA::escape($str) . "' ";
 }
 
 // ex. given music,video return <music><video> or [music][video]
-function file_tag_list_to_file($list,$type = 'file') {
+function file_tag_list_to_file($list, $type = 'file') {
 	$tag_list = '';
 	if (strlen($list)) {
 		$list_array = explode(",",$list);
@@ -1804,7 +1666,7 @@ function file_tag_list_to_file($list,$type = 'file') {
 }
 
 // ex. given <music><video>[friends], return music,video or friends
-function file_tag_file_to_list($file,$type = 'file') {
+function file_tag_file_to_list($file, $type = 'file') {
 	$matches = false;
 	$list = '';
 	if ($type == 'file') {
@@ -1830,8 +1692,7 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
 
 	if (!intval($uid)) {
 		return false;
-	}
-	if ($file_old == $file_new) {
+	} elseif ($file_old == $file_new) {
 		return true;
 	}
 
@@ -1854,8 +1715,9 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
 		$check_new_tags = explode(",",file_tag_file_to_list($file_new,$type));
 
 		foreach ($check_new_tags as $tag) {
-			if (! stristr($saved,$lbracket . file_tag_encode($tag) . $rbracket))
+			if (!stristr($saved,$lbracket . file_tag_encode($tag) . $rbracket)) {
 				$new_tags[] = $tag;
+			}
 		}
 
 		$filetags_updated .= file_tag_list_to_file(implode(",",$new_tags),$type);
@@ -1865,18 +1727,19 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
 		$check_deleted_tags = explode(",",file_tag_file_to_list($file_old,$type));
 
 		foreach ($check_deleted_tags as $tag) {
-			if (! stristr($file_new,$lbracket . file_tag_encode($tag) . $rbracket))
+			if (!stristr($file_new,$lbracket . file_tag_encode($tag) . $rbracket)) {
 				$deleted_tags[] = $tag;
+			}
 		}
 
 		foreach ($deleted_tags as $key => $tag) {
 			$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
-				dbesc($tag),
+				DBA::escape($tag),
 				intval(TERM_OBJ_POST),
 				intval($termtype),
 				intval($uid));
 
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				unset($deleted_tags[$key]);
 			} else {
 				$filetags_updated = str_replace($lbracket . file_tag_encode($tag) . $rbracket,'',$filetags_updated);
@@ -1893,20 +1756,17 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
 	return true;
 }
 
-function file_tag_save_file($uid, $item, $file)
+function file_tag_save_file($uid, $item_id, $file)
 {
-	if (! intval($uid)) {
+	if (!intval($uid)) {
 		return false;
 	}
 
-	$r = q("SELECT `file` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		intval($item),
-		intval($uid)
-	);
-	if (DBM::is_result($r)) {
-		if (!stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) {
-			$fields = ['file' => $r[0]['file'] . '[' . file_tag_encode($file) . ']'];
-			Item::update($fields, ['id' => $item]);
+	$item = Item::selectFirst(['file'], ['id' => $item_id, 'uid' => $uid]);
+	if (DBA::isResult($item)) {
+		if (!stristr($item['file'],'[' . file_tag_encode($file) . ']')) {
+			$fields = ['file' => $item['file'] . '[' . file_tag_encode($file) . ']'];
+			Item::update($fields, ['id' => $item_id]);
 		}
 		$saved = PConfig::get($uid, 'system', 'filetags');
 		if (!strlen($saved) || !stristr($saved, '[' . file_tag_encode($file) . ']')) {
@@ -1917,9 +1777,9 @@ function file_tag_save_file($uid, $item, $file)
 	return true;
 }
 
-function file_tag_unsave_file($uid, $item, $file, $cat = false)
+function file_tag_unsave_file($uid, $item_id, $file, $cat = false)
 {
-	if (! intval($uid)) {
+	if (!intval($uid)) {
 		return false;
 	}
 
@@ -1931,24 +1791,21 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false)
 		$termtype = TERM_FILE;
 	}
 
-	$r = q("SELECT `file` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		intval($item),
-		intval($uid)
-	);
-	if (! DBM::is_result($r)) {
+	$item = Item::selectFirst(['file'], ['id' => $item_id, 'uid' => $uid]);
+	if (!DBA::isResult($item)) {
 		return false;
 	}
 
-	$fields = ['file' => str_replace($pattern,'',$r[0]['file'])];
-	Item::update($fields, ['id' => $item]);
+	$fields = ['file' => str_replace($pattern,'',$item['file'])];
+	Item::update($fields, ['id' => $item_id]);
 
 	$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
-		dbesc($file),
+		DBA::escape($file),
 		intval(TERM_OBJ_POST),
 		intval($termtype),
 		intval($uid)
 	);
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		$saved = PConfig::get($uid, 'system', 'filetags');
 		PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
 	}
@@ -1980,17 +1837,22 @@ function protect_sprintf($s) {
 	return str_replace('%', '%%', $s);
 }
 
-
+/// @TODO Rewrite this
 function is_a_date_arg($s) {
 	$i = intval($s);
+
 	if ($i > 1900) {
 		$y = date('Y');
+
 		if ($i <= $y + 1 && strpos($s, '-') == 4) {
-			$m = intval(substr($s,5));
-			if ($m > 0 && $m <= 12)
+			$m = intval(substr($s, 5));
+
+			if ($m > 0 && $m <= 12) {
 				return true;
+			}
 		}
 	}
+
 	return false;
 }
 
@@ -1999,6 +1861,7 @@ function is_a_date_arg($s) {
  */
 function deindent($text, $chr = "[\t ]", $count = NULL) {
 	$lines = explode("\n", $text);
+
 	if (is_null($count)) {
 		$m = [];
 		$k = 0;
@@ -2008,6 +1871,7 @@ function deindent($text, $chr = "[\t ]", $count = NULL) {
 		preg_match("|^" . $chr . "*|", $lines[$k], $m);
 		$count = strlen($m[0]);
 	}
+
 	for ($k = 0; $k < count($lines); $k++) {
 		$lines[$k] = preg_replace("|^" . $chr . "{" . $count . "}|", "", $lines[$k]);
 	}
@@ -2047,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/index.php b/index.php
index aeda99982..8b0bd4725 100644
--- a/index.php
+++ b/index.php
@@ -9,7 +9,6 @@
  */
 
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Content\Nav;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -18,51 +17,38 @@ use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Profile;
 use Friendica\Module\Login;
 
 require_once 'boot.php';
 
 $a = new App(__DIR__);
-BaseObject::setApp($a);
 
 // We assume that the index.php is called by a frontend process
 // The value is set to "true" by default in boot.php
 $a->backend = false;
 
-// Only load config if found, don't suppress errors
-if (!$a->mode == App::MODE_INSTALL) {
-	include ".htconfig.php";
-}
-
 /**
  * Try to open the database;
  */
 
 require_once "include/dba.php";
 
-if (!$a->mode == App::MODE_INSTALL) {
-	$result = dba::connect($db_host, $db_user, $db_pass, $db_data);
-	unset($db_host, $db_user, $db_pass, $db_data);
+// Missing DB connection: ERROR
+if ($a->mode & App::MODE_LOCALCONFIGPRESENT && !($a->mode & App::MODE_DBAVAILABLE)) {
+	System::httpExit(500, ['title' => 'Error 500 - Internal Server Error', 'description' => 'Apologies but the website is unavailable at the moment.']);
+}
 
-	if (!$result) {
-		System::unavailable();
-	}
+// Max Load Average reached: ERROR
+if ($a->isMaxProcessesReached() || $a->isMaxLoadReached()) {
+	header('Retry-After: 120');
+	header('Refresh: 120; url=' . System::baseUrl() . "/" . $a->query_string);
 
-	/**
-	 * Load configs from db. Overwrite configs from .htconfig.php
-	 */
-
-	Config::load();
-
-	if ($a->max_processes_reached() || $a->maxload_reached()) {
-		header($_SERVER["SERVER_PROTOCOL"] . ' 503 Service Temporarily Unavailable');
-		header('Retry-After: 120');
-		header('Refresh: 120; url=' . System::baseUrl() . "/" . $a->query_string);
-		die("System is currently unavailable. Please try again later");
-	}
+	System::httpExit(503, ['title' => 'Error 503 - Service Temporarily Unavailable', 'description' => 'System is currently overloaded. Please try again later.']);
+}
 
+if (!$a->isInstallMode()) {
 	if (Config::get('system', 'force_ssl') && ($a->get_scheme() == "http")
 		&& (intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL)
 		&& (substr(System::baseUrl(), 0, 8) == "https://")
@@ -76,8 +62,6 @@ if (!$a->mode == App::MODE_INSTALL) {
 	Session::init();
 	Addon::loadHooks();
 	Addon::callHooks('init_1');
-
-	$a->checkMaintenanceMode();
 }
 
 $lang = L10n::getBrowserLanguage();
@@ -108,38 +92,50 @@ if (!$a->is_backend()) {
  * We have to do it here because the session was just now opened.
  */
 if (x($_SESSION, 'authenticated') && !x($_SESSION, 'language')) {
-	// we haven't loaded user data yet, but we need user language
-	$user = dba::selectFirst('user', ['language'], ['uid' => $_SESSION['uid']]);
 	$_SESSION['language'] = $lang;
-	if (DBM::is_result($user)) {
-		$_SESSION['language'] = $user['language'];
+	// we haven't loaded user data yet, but we need user language
+	if (!empty($_SESSION['uid'])) {
+		$user = DBA::selectFirst('user', ['language'], ['uid' => $_SESSION['uid']]);
+		if (DBA::isResult($user)) {
+			$_SESSION['language'] = $user['language'];
+		}
 	}
 }
 
-if ((x($_SESSION, 'language')) && ($_SESSION['language'] !== $lang)) {
+if (x($_SESSION, 'language') && ($_SESSION['language'] !== $lang)) {
 	$lang = $_SESSION['language'];
 	L10n::loadTranslationTable($lang);
 }
 
-if ((x($_GET, 'zrl')) && $a->mode == App::MODE_NORMAL) {
-	// Only continue when the given profile link seems valid
-	// Valid profile links contain a path with "/profile/" and no query parameters
-	if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "")
-		&& strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")
-	) {
-		$_SESSION['my_url'] = $_GET['zrl'];
-		$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is', '', $a->query_string);
-		Profile::zrlInit($a);
-	} else {
-		// Someone came with an invalid parameter, maybe as a DDoS attempt
-		// We simply stop processing here
-		logger("Invalid ZRL parameter ".$_GET['zrl'], LOGGER_DEBUG);
-		header('HTTP/1.1 403 Forbidden');
-		echo "<h1>403 Forbidden</h1>";
-		killme();
+if (!empty($_GET['zrl']) && $a->mode == App::MODE_NORMAL) {
+	$a->query_string = Profile::stripZrls($a->query_string);
+	if (!local_user()) {
+		// Only continue when the given profile link seems valid
+		// Valid profile links contain a path with "/profile/" and no query parameters
+		if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") &&
+			strstr(parse_url($_GET['zrl'], PHP_URL_PATH), "/profile/")) {
+			if (defaults($_SESSION, "visitor_home", "") != $_GET["zrl"]) {
+				$_SESSION['my_url'] = $_GET['zrl'];
+				$_SESSION['authenticated'] = 0;
+			}
+			Profile::zrlInit($a);
+		} else {
+			// Someone came with an invalid parameter, maybe as a DDoS attempt
+			// We simply stop processing here
+			logger("Invalid ZRL parameter " . $_GET['zrl'], LOGGER_DEBUG);
+			header('HTTP/1.1 403 Forbidden');
+			echo "<h1>403 Forbidden</h1>";
+			killme();
+		}
 	}
 }
 
+if ((x($_GET,'owt')) && $a->mode == App::MODE_NORMAL) {
+	$token = $_GET['owt'];
+	$a->query_string = Profile::stripQueryParam($a->query_string, 'owt');
+	Profile::openWebAuthInit($token);
+}
+
 /**
  * For Mozilla auth manager - still needs sorting, and this might conflict with LRDD header.
  * Apache/PHP lumps the Link: headers into one - and other services might not be able to parse it
@@ -173,9 +169,9 @@ $_SESSION['last_updated'] = defaults($_SESSION, 'last_updated', []);
 
 // in install mode, any url loads install module
 // but we need "view" module for stylesheet
-if ($a->mode == App::MODE_INSTALL && $a->module!="view") {
+if ($a->isInstallMode() && $a->module!="view") {
 	$a->module = 'install';
-} elseif ($a->mode == App::MODE_MAINTENANCE && $a->module!="view") {
+} elseif (!($a->mode & App::MODE_MAINTENANCEDISABLED) && $a->module != "view") {
 	$a->module = 'maintenance';
 } else {
 	check_url($a);
diff --git a/library/asn1.php b/library/asn1.php
index ac14a5b16..cda96b6c8 100644
--- a/library/asn1.php
+++ b/library/asn1.php
@@ -156,7 +156,7 @@ class ASN_BASE {
 				if (($length & ASN_LONG_LEN)==ASN_LONG_LEN){
 					$tempLength = 0;
 					for ($x=0; $x<($length & (ASN_LONG_LEN-1)); $x++){
-						$tempLength = ord($string[$p++]) + ($tempLength * 256);
+						$tempLength = @ord($string[$p++]) + ($tempLength * 256);
 					}
 					$length = $tempLength;
 				}
diff --git a/mod/acl.php b/mod/acl.php
index 817a02655..f9589598d 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -6,11 +6,13 @@ use Friendica\App;
 use Friendica\Content\Widget;
 use Friendica\Core\ACL;
 use Friendica\Core\Addon;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\Item;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/dba.php';
-require_once 'mod/proxy.php';
 
 function acl_content(App $a)
 {
@@ -35,8 +37,8 @@ function acl_content(App $a)
 	logger("Searching for ".$search." - type ".$type." conversation ".$conv_id, LOGGER_DEBUG);
 
 	if ($search != '') {
-		$sql_extra = "AND `name` LIKE '%%" . dbesc($search) . "%%'";
-		$sql_extra2 = "AND (`attag` LIKE '%%" . dbesc($search) . "%%' OR `name` LIKE '%%" . dbesc($search) . "%%' OR `nick` LIKE '%%" . dbesc($search) . "%%')";
+		$sql_extra = "AND `name` LIKE '%%" . DBA::escape($search) . "%%'";
+		$sql_extra2 = "AND (`attag` LIKE '%%" . DBA::escape($search) . "%%' OR `name` LIKE '%%" . DBA::escape($search) . "%%' OR `nick` LIKE '%%" . DBA::escape($search) . "%%')";
 	} else {
 		/// @TODO Avoid these needless else blocks by putting variable-initialization atop of if()
 		$sql_extra = $sql_extra2 = '';
@@ -83,8 +85,8 @@ function acl_content(App $a)
 				AND `success_update` >= `failure_update`
 				AND `network` IN ('%s', '%s') $sql_extra2",
 			intval(local_user()),
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_DIASPORA)
+			DBA::escape(Protocol::DFRN),
+			DBA::escape(Protocol::DIASPORA)
 		);
 		$contact_count = (int) $r[0]['c'];
 	} elseif ($type == 'a') {
@@ -142,8 +144,8 @@ function acl_content(App $a)
 				$sql_extra2
 				ORDER BY `name` ASC ",
 			intval(local_user()),
-			dbesc(NETWORK_OSTATUS),
-			dbesc(NETWORK_STATUSNET)
+			DBA::escape(Protocol::OSTATUS),
+			DBA::escape(Protocol::STATUSNET)
 		);
 	} elseif ($type == 'c') {
 		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
@@ -152,7 +154,7 @@ function acl_content(App $a)
 				$sql_extra2
 				ORDER BY `name` ASC ",
 			intval(local_user()),
-			dbesc(NETWORK_STATUSNET)
+			DBA::escape(Protocol::STATUSNET)
 		);
 	} elseif ($type == 'f') {
 		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
@@ -162,7 +164,7 @@ function acl_content(App $a)
 				$sql_extra2
 				ORDER BY `name` ASC ",
 			intval(local_user()),
-			dbesc(NETWORK_STATUSNET)
+			DBA::escape(Protocol::STATUSNET)
 		);
 	} elseif ($type == 'm') {
 		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr` FROM `contact`
@@ -171,8 +173,8 @@ function acl_content(App $a)
 				$sql_extra2
 				ORDER BY `name` ASC ",
 			intval(local_user()),
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_DIASPORA)
+			DBA::escape(Protocol::DFRN),
+			DBA::escape(Protocol::DIASPORA)
 		);
 	} elseif ($type == 'a') {
 		$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag`, `addr`, `forum`, `prv` FROM `contact`
@@ -191,7 +193,7 @@ function acl_content(App $a)
 		$contacts = [];
 		foreach ($r as $g) {
 			$contacts[] = [
-				'photo'   => proxy_url($g['photo'], false, PROXY_SIZE_MICRO),
+				'photo'   => ProxyUtils::proxifyUrl($g['photo'], false, ProxyUtils::SIZE_MICRO),
 				'name'    => $g['name'],
 				'nick'    => defaults($g, 'addr', $g['url']),
 				'network' => $g['network'],
@@ -208,12 +210,12 @@ function acl_content(App $a)
 		exit;
 	}
 
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$forums = [];
 		foreach ($r as $g) {
 			$entry = [
 				'type'    => 'c',
-				'photo'   => proxy_url($g['micro'], false, PROXY_SIZE_MICRO),
+				'photo'   => ProxyUtils::proxifyUrl($g['micro'], false, ProxyUtils::SIZE_MICRO),
 				'name'    => htmlentities($g['name']),
 				'id'      => intval($g['id']),
 				'network' => $g['network'],
@@ -240,8 +242,8 @@ function acl_content(App $a)
 
 	if ($conv_id) {
 		// In multi threaded posts the conv_id is not the parent of the whole thread
-		$parent_item = dba::selectFirst('item', ['parent'], ['id' => $conv_id]);
-		if (DBM::is_result($parent_item)) {
+		$parent_item = Item::selectFirst(['parent'], ['id' => $conv_id]);
+		if (DBA::isResult($parent_item)) {
 			$conv_id = $parent_item['parent'];
 		}
 
@@ -250,39 +252,39 @@ function acl_content(App $a)
 		 * but first get known contacts url to filter them out
 		 */
 		$known_contacts = array_map(function ($i) {
-			return dbesc($i['link']);
+			return $i['link'];
 		}, $contacts);
 
 		$unknown_contacts = [];
-		$r = q("SELECT `author-link`
-				FROM `item` WHERE `parent` = %d
-					AND (`author-name` LIKE '%%%s%%' OR `author-link` LIKE '%%%s%%')
-					AND `author-link` NOT IN ('%s')
-				GROUP BY `author-link`, `author-avatar`, `author-name`
-				ORDER BY `author-name` ASC
-				",
-			intval($conv_id),
-			dbesc($search),
-			dbesc($search),
-			implode("', '", $known_contacts)
-		);
-		if (DBM::is_result($r)) {
-			foreach ($r as $row) {
-				$contact = Contact::getDetailsByURL($row['author-link']);
 
-				if (count($contact) > 0) {
-					$unknown_contacts[] = [
-						'type'    => 'c',
-						'photo'   => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
-						'name'    => htmlentities($contact['name']),
-						'id'      => intval($contact['cid']),
-						'network' => $contact['network'],
-						'link'    => $contact['url'],
-						'nick'    => htmlentities(defaults($contact, 'nick', $contact['addr'])),
-						'addr'    => htmlentities(defaults($contact, 'addr', $contact['url'])),
-						'forum'   => $contact['forum']
-					];
-				}
+		$condition = ["`parent` = ?", $conv_id];
+		$params = ['order' => ['author-name' => true]];
+		$authors = Item::selectForUser(local_user(), ['author-link'], $condition, $params);
+		$item_authors = [];
+		while ($author = Item::fetch($authors)) {
+			$item_authors[$author['author-link']] = $author['author-link'];
+		}
+		DBA::close($authors);
+
+		foreach ($item_authors as $author) {
+			if (in_array($author, $known_contacts)) {
+				continue;
+			}
+
+			$contact = Contact::getDetailsByURL($author);
+
+			if (count($contact) > 0) {
+				$unknown_contacts[] = [
+					'type'    => 'c',
+					'photo'   => ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO),
+					'name'    => htmlentities($contact['name']),
+					'id'      => intval($contact['cid']),
+					'network' => $contact['network'],
+					'link'    => $contact['url'],
+					'nick'    => htmlentities(defaults($contact, 'nick', $contact['addr'])),
+					'addr'    => htmlentities(defaults($contact, 'addr', $contact['url'])),
+					'forum'   => $contact['forum']
+				];
 			}
 		}
 
diff --git a/mod/admin.php b/mod/admin.php
index 3d7c553ff..d4fcc533f 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -14,15 +14,17 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Module\Login;
 use Friendica\Module\Tos;
+use Friendica\Util\Arrays;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
+use Friendica\Util\Network;
 
 require_once 'include/enotify.php';
 require_once 'include/text.php';
@@ -65,7 +67,7 @@ function admin_post(App $a)
 			case 'addons':
 				if ($a->argc > 2 &&
 					is_file("addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php")) {
-					@include_once("addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php");
+					include_once "addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php";
 					if (function_exists($a->argv[2] . '_addon_admin_post')) {
 						$func = $a->argv[2] . '_addon_admin_post';
 						$func($a);
@@ -189,7 +191,8 @@ function admin_content(App $a)
 			'tos'          => ["admin/tos/"         , L10n::t("Terms of Service")     , "tos"] ]],
 		'database' => [ L10n::t('Database'), [
 			'dbsync'       => ["admin/dbsync/"      , L10n::t('DB updates')           , "dbsync"],
-			'queue'        => ["admin/queue/"       , L10n::t('Inspect Queue')        , "queue"], ]],
+			'queue'        => ["admin/queue/"       , L10n::t('Inspect Queue')        , "queue"],
+			'workerqueue'  => ["admin/workerqueue/" , L10n::t('Inspect worker Queue') , "workerqueue"] ]],
 		'tools' => [ L10n::t('Tools'), [
 			'contactblock' => ["admin/contactblock/", L10n::t('Contact Blocklist')    , "contactblock"],
 			'blocklist'    => ["admin/blocklist/"   , L10n::t('Server Blocklist')     , "blocklist"],
@@ -258,6 +261,9 @@ function admin_content(App $a)
 			case 'queue':
 				$o = admin_page_queue($a);
 				break;
+			case 'workerqueue':
+				$o = admin_page_workerqueue($a);
+				break;
 			case 'federation':
 				$o = admin_page_federation($a);
 				break;
@@ -467,14 +473,14 @@ function admin_page_contactblock(App $a)
 {
 	$condition = ['uid' => 0, 'blocked' => true];
 
-	$total = dba::count('contact', $condition);
+	$total = DBA::count('contact', $condition);
 
 	$a->set_pager_total($total);
 	$a->set_pager_itemspage(30);
 
-	$statement = dba::select('contact', [], $condition, ['limit' => [$a->pager['start'], $a->pager['itemspage']]]);
+	$statement = DBA::select('contact', [], $condition, ['limit' => [$a->pager['start'], $a->pager['itemspage']]]);
 
-	$contacts = dba::inArray($statement);
+	$contacts = DBA::toArray($statement);
 
 	$t = get_markup_template('admin/contactblock.tpl');
 	$o = replace_macros($t, [
@@ -729,7 +735,7 @@ function admin_page_federation(App $a)
  * @brief Admin Inspect Queue Page
  *
  * Generates a page for the admin to have a look into the current queue of
- * postings that are not deliverabke. Shown are the name and url of the
+ * postings that are not deliverable. Shown are the name and url of the
  * recipient, the delivery network and the dates when the posting was generated
  * and the last time tried to deliver the posting.
  *
@@ -741,10 +747,18 @@ function admin_page_federation(App $a)
 function admin_page_queue(App $a)
 {
 	// get content from the queue table
-	$r = q("SELECT `c`.`name`, `c`.`nurl`, `q`.`id`, `q`.`network`, `q`.`created`, `q`.`last`
-			FROM `queue` AS `q`, `contact` AS `c`
-			WHERE `c`.`id` = `q`.`cid`
-			ORDER BY `q`.`cid`, `q`.`created`;");
+	$entries = DBA::p("SELECT `contact`.`name`, `contact`.`nurl`,
+                `queue`.`id`, `queue`.`network`, `queue`.`created`, `queue`.`last`
+                FROM `queue` INNER JOIN `contact` ON `contact`.`id` = `queue`.`cid`
+                ORDER BY `queue`.`cid`, `queue`.`created`");
+
+	$r = [];
+	while ($entry = DBA::fetch($entries)) {
+		$entry['created'] = DateTimeFormat::local($entry['created']);
+		$entry['last'] = DateTimeFormat::local($entry['last']);
+		$r[] = $entry;
+	}
+	DBA::close($entries);
 
 	$t = get_markup_template('admin/queue.tpl');
 	return replace_macros($t, [
@@ -762,6 +776,45 @@ function admin_page_queue(App $a)
 	]);
 }
 
+/**
+ * @brief Admin Inspect Worker Queue Page
+ *
+ * Generates a page for the admin to have a look into the current queue of
+ * worker jobs. Shown are the parameters for the job and its priority.
+ *
+ * The returned string holds the content of the page.
+ *
+ * @param App $a
+ * @return string
+ */
+function admin_page_workerqueue(App $a)
+{
+	// get jobs from the workerqueue table
+	$entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], ['done' => 0], ['order'=> ['priority']]);
+
+	$r = [];
+	while ($entry = DBA::fetch($entries)) {
+		// fix GH-5469. ref: src/Core/Worker.php:217
+		$entry['parameter'] = Arrays::recursiveImplode(json_decode($entry['parameter'], true), ': ');
+		$entry['created'] = DateTimeFormat::local($entry['created']);
+		$r[] = $entry;
+	}
+	DBA::close($entries);
+
+	$t = get_markup_template('admin/workerqueue.tpl');
+	return replace_macros($t, [
+		'$title' => L10n::t('Administration'),
+		'$page' => L10n::t('Inspect Worker Queue'),
+		'$count' => count($r),
+		'$id_header' => L10n::t('ID'),
+		'$param_header' => L10n::t('Job Parameters'),
+		'$created_header' => L10n::t('Created'),
+		'$prio_header' => L10n::t('Priority'),
+		'$info' => L10n::t('This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.'),
+		'$entries' => $r,
+	]);
+}
+
 /**
  * @brief Admin Summary Page
  *
@@ -776,10 +829,10 @@ function admin_page_queue(App $a)
 function admin_page_summary(App $a)
 {
 	// are there MyISAM tables in the DB? If so, trigger a warning message
-	$r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1", dbesc(dba::database_name()));
+	$r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1", DBA::escape(DBA::databaseName()));
 	$showwarning = false;
 	$warningtext = [];
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$showwarning = true;
 		$warningtext[] = L10n::t('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 />', 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
 	}
@@ -801,7 +854,7 @@ function admin_page_summary(App $a)
 		$warningtext[] = L10n::t('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.');
 	}
 
-	$last_worker_call = Config::get('system', 'last_poller_execution', false);
+	$last_worker_call = Config::get('system', 'last_worker_execution', false);
 	if (!$last_worker_call) {
 		$showwarning = true;
 		$warningtext[] = L10n::t('The worker was never executed. Please check your database structure!');
@@ -810,6 +863,20 @@ function admin_page_summary(App $a)
 		$warningtext[] = L10n::t('The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings.', $last_worker_call);
 	}
 
+	// Legacy config file warning
+	if (file_exists('.htconfig.php')) {
+		$showwarning = true;
+		$warningtext[] = L10n::t('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->get_baseurl() . '/help/Config');
+	}
+
+	// Check server vitality
+	if (!admin_page_server_vital()) {
+		$showwarning = true;
+		$well_known = $a->get_baseurl() . '/.well-known/host-meta';
+		$warningtext[] = L10n::t('<a href="%s">%s</a> is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See <a href="%s">the installation page</a> for help.',
+			$well_known, $well_known, $a->get_baseurl() . '/help/Install');
+	}
+
 	$r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`");
 	$accounts = [
 		[L10n::t('Normal Account'), 0],
@@ -903,10 +970,8 @@ function admin_page_site_post(App $a)
 
 		function update_table($table_name, $fields, $old_url, $new_url)
 		{
-			global $a;
-
-			$dbold = dbesc($old_url);
-			$dbnew = dbesc($new_url);
+			$dbold = DBA::escape($old_url);
+			$dbnew = DBA::escape($new_url);
 
 			$upd = [];
 			foreach ($fields as $f) {
@@ -916,8 +981,9 @@ function admin_page_site_post(App $a)
 			$upds = implode(", ", $upd);
 
 			$r = q("UPDATE %s SET %s;", $table_name, $upds);
-			if (!DBM::is_result($r)) {
-				notice("Failed updating '$table_name': " . dba::errorMessage());
+
+			if (!DBA::isResult($r)) {
+				notice("Failed updating '$table_name': " . DBA::errorMessage());
 				goaway('admin/site');
 			}
 		}
@@ -927,7 +993,7 @@ function admin_page_site_post(App $a)
 		update_table("term", ['url'], $old_url, $new_url);
 		update_table("contact", ['photo', 'thumb', 'micro', 'url', 'nurl', 'alias', 'request', 'notify', 'poll', 'confirm', 'poco', 'avatar'], $old_url, $new_url);
 		update_table("gcontact", ['url', 'nurl', 'photo', 'server_url', 'notify', 'alias'], $old_url, $new_url);
-		update_table("item", ['owner-link', 'owner-avatar', 'author-link', 'author-avatar', 'body', 'plink', 'tag'], $old_url, $new_url);
+		update_table("item", ['owner-link', 'author-link', 'body', 'plink', 'tag'], $old_url, $new_url);
 
 		// update profile addresses in the format "user@server.tld"
 		update_table("contact", ['addr'], $old_host, $new_host);
@@ -974,6 +1040,7 @@ function admin_page_site_post(App $a)
 
 	$allowed_sites		=	((x($_POST,'allowed_sites'))		? notags(trim($_POST['allowed_sites']))		: '');
 	$allowed_email		=	((x($_POST,'allowed_email'))		? notags(trim($_POST['allowed_email']))		: '');
+	$forbidden_nicknames	=	((x($_POST,'forbidden_nicknames'))	? strtolower(notags(trim($_POST['forbidden_nicknames'])))		: '');
 	$no_oembed_rich_content = x($_POST,'no_oembed_rich_content');
 	$allowed_oembed		=	((x($_POST,'allowed_oembed'))		? notags(trim($_POST['allowed_oembed']))		: '');
 	$block_public		=	((x($_POST,'block_public'))		? True						: False);
@@ -984,6 +1051,7 @@ function admin_page_site_post(App $a)
 	$private_addons			=	((x($_POST,'private_addons'))		? True					: False);
 	$disable_embedded		=	((x($_POST,'disable_embedded'))		? True					: False);
 	$allow_users_remote_self	=	((x($_POST,'allow_users_remote_self'))	? True					: False);
+	$explicit_content	=	((x($_POST,'explicit_content'))	? True					: False);
 
 	$no_multi_reg		=	((x($_POST,'no_multi_reg'))		? True						: False);
 	$no_openid		=	!((x($_POST,'no_openid'))		? True						: False);
@@ -1028,7 +1096,7 @@ function admin_page_site_post(App $a)
 	$rino			=	((x($_POST,'rino'))			? intval($_POST['rino'])			: 0);
 	$check_new_version_url	=	((x($_POST, 'check_new_version_url'))	?	notags(trim($_POST['check_new_version_url']))	: 'none');
 
-	$worker_queues		=	((x($_POST,'worker_queues'))		? intval($_POST['worker_queues'])		: 4);
+	$worker_queues		=	((x($_POST,'worker_queues'))		? intval($_POST['worker_queues'])		: 10);
 	$worker_dont_fork	=	((x($_POST,'worker_dont_fork'))		? True						: False);
 	$worker_fastlane	=	((x($_POST,'worker_fastlane'))		? True						: False);
 	$worker_frontend	=	((x($_POST,'worker_frontend'))		? True						: False);
@@ -1142,6 +1210,7 @@ function admin_page_site_post(App $a)
 	Config::set('config', 'register_text', $register_text);
 	Config::set('system', 'allowed_sites', $allowed_sites);
 	Config::set('system', 'allowed_email', $allowed_email);
+	Config::set('system', 'forbidden_nicknames', $forbidden_nicknames);
 	Config::set('system', 'no_oembed_rich_content', $no_oembed_rich_content);
 	Config::set('system', 'allowed_oembed', $allowed_oembed);
 	Config::set('system', 'block_public', $block_public);
@@ -1150,6 +1219,7 @@ function admin_page_site_post(App $a)
 	Config::set('system', 'enotify_no_content', $enotify_no_content);
 	Config::set('system', 'disable_embedded', $disable_embedded);
 	Config::set('system', 'allow_users_remote_self', $allow_users_remote_self);
+	Config::set('system', 'explicit_content', $explicit_content);
 	Config::set('system', 'check_new_version_url', $check_new_version_url);
 
 	Config::set('system', 'block_extended_register', $no_multi_reg);
@@ -1297,15 +1367,18 @@ function admin_page_site(App $a)
 	$user_names = [];
 	$user_names['---'] = L10n::t('Multi user instance');
 	$users = q("SELECT `username`, `nickname` FROM `user`");
+
 	foreach ($users as $user) {
 		$user_names[$user['nickname']] = $user['username'];
 	}
 
 	/* Banner */
 	$banner = Config::get('system', 'banner');
+
 	if ($banner == false) {
 		$banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
 	}
+
 	$banner = htmlspecialchars($banner);
 	$info = Config::get('config', 'info');
 	$info = htmlspecialchars($info);
@@ -1335,8 +1408,8 @@ function admin_page_site(App $a)
 		"develop" => L10n::t("check the development version")
 	];
 
-	if ($a->config['hostname'] == "") {
-		$a->config['hostname'] = $a->get_hostname();
+	if (empty(Config::get('config', 'hostname'))) {
+		Config::set('config', 'hostname', $a->get_hostname());
 	}
 	$diaspora_able = ($a->get_path() == "");
 
@@ -1363,9 +1436,9 @@ function admin_page_site(App $a)
 		'$relocate' => L10n::t('Relocate - WARNING: advanced function. Could make this server unreachable.'),
 		'$baseurl' => System::baseUrl(true),
 		// name, label, value, help string, extra data...
-		'$sitename' 		=> ['sitename', L10n::t("Site name"), $a->config['sitename'],''],
-		'$hostname' 		=> ['hostname', L10n::t("Host name"), $a->config['hostname'], ""],
-		'$sender_email'		=> ['sender_email', L10n::t("Sender Email"), $a->config['sender_email'], L10n::t("The email address your server shall use to send notification emails from."), "", "", "email"],
+		'$sitename' 		=> ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'),''],
+		'$hostname' 		=> ['hostname', L10n::t("Host name"), Config::get('config', 'hostname'), ""],
+		'$sender_email'		=> ['sender_email', L10n::t("Sender Email"), Config::get('config', 'sender_email'), L10n::t("The email address your server shall use to send notification emails from."), "", "", "email"],
 		'$banner'		=> ['banner', L10n::t("Banner/Logo"), $banner, ""],
 		'$shortcut_icon'	=> ['shortcut_icon', L10n::t("Shortcut icon"), Config::get('system','shortcut_icon'),  L10n::t("Link to an icon that will be used for browsers.")],
 		'$touch_icon'		=> ['touch_icon', L10n::t("Touch icon"), Config::get('system','touch_icon'),  L10n::t("Link to an icon that will be used for tablets and mobiles.")],
@@ -1381,9 +1454,10 @@ function admin_page_site(App $a)
 		'$maximagelength'	=> ['maximagelength', L10n::t("Maximum image length"), Config::get('system','max_image_length'), L10n::t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")],
 		'$jpegimagequality'	=> ['jpegimagequality', L10n::t("JPEG image quality"), Config::get('system','jpeg_quality'), L10n::t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")],
 
-		'$register_policy'	=> ['register_policy', L10n::t("Register policy"), $a->config['register_policy'], "", $register_choices],
+		'$register_policy'	=> ['register_policy', L10n::t("Register policy"), Config::get('config', 'register_policy'), "", $register_choices],
 		'$daily_registrations'	=> ['max_daily_registrations', L10n::t("Maximum Daily Registrations"), Config::get('system', 'max_daily_registrations'), L10n::t("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.")],
-		'$register_text'	=> ['register_text', L10n::t("Register text"), $a->config['register_text'], L10n::t("Will be displayed prominently on the registration page. You can use BBCode here.")],
+		'$register_text'	=> ['register_text', L10n::t("Register text"), Config::get('config', 'register_text'), L10n::t("Will be displayed prominently on the registration page. You can use BBCode here.")],
+		'$forbidden_nicknames' => ['forbidden_nicknames', L10n::t('Forbidden Nicknames'), Config::get('system', 'forbidden_nicknames'), L10n::t('Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142.')],
 		'$abandon_days'		=> ['abandon_days', L10n::t('Accounts abandoned after x days'), Config::get('system','account_abandon_days'), L10n::t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')],
 		'$allowed_sites'	=> ['allowed_sites', L10n::t("Allowed friend domains"), Config::get('system','allowed_sites'), L10n::t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")],
 		'$allowed_email'	=> ['allowed_email', L10n::t("Allowed email domains"), Config::get('system','allowed_email'), L10n::t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")],
@@ -1396,6 +1470,7 @@ function admin_page_site(App $a)
 		'$enotify_no_content'	=> ['enotify_no_content', L10n::t("Don't include post content in email notifications"), Config::get('system','enotify_no_content'), L10n::t("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.")],
 		'$private_addons'	=> ['private_addons', L10n::t("Disallow public access to addons listed in the apps menu."), Config::get('config','private_addons'), L10n::t("Checking this box will restrict addons listed in the apps menu to members only.")],
 		'$disable_embedded'	=> ['disable_embedded', L10n::t("Don't embed private images in posts"), Config::get('system','disable_embedded'), L10n::t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")],
+		'$explicit_content' => ['explicit_content', L10n::t('Explicit Content'), Config::get('system', 'explicit_content', False), L10n::t('Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page.')],
 		'$allow_users_remote_self' => ['allow_users_remote_self', L10n::t('Allow Users to set remote_self'), Config::get('system','allow_users_remote_self'), L10n::t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')],
 		'$no_multi_reg'		=> ['no_multi_reg', L10n::t("Block multiple registrations"),  Config::get('system','block_extended_register'), L10n::t("Disallow users to register additional accounts for use as pages.")],
 		'$no_openid'		=> ['no_openid', L10n::t("OpenID support"), !Config::get('system','no_openid'), L10n::t("OpenID support for registration and logins.")],
@@ -1444,7 +1519,7 @@ function admin_page_site(App $a)
 
 		'$rino' 		=> ['rino', L10n::t("RINO Encryption"), intval(Config::get('system','rino_encrypt')), L10n::t("Encryption layer between nodes."), [0 => L10n::t("Disabled"), 1 => L10n::t("Enabled")]],
 
-		'$worker_queues' 	=> ['worker_queues', L10n::t("Maximum number of parallel workers"), Config::get('system','worker_queues'), L10n::t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")],
+		'$worker_queues' 	=> ['worker_queues', L10n::t("Maximum number of parallel workers"), Config::get('system','worker_queues'), L10n::t("On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.", 5, 20, 10)],
 		'$worker_dont_fork'	=> ['worker_dont_fork', L10n::t("Don't use 'proc_open' with the worker"), Config::get('system','worker_dont_fork'), L10n::t("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.")],
 		'$worker_fastlane'	=> ['worker_fastlane', L10n::t("Enable fastlane"), Config::get('system','worker_fastlane'), L10n::t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")],
 		'$worker_frontend'	=> ['worker_frontend', L10n::t('Enable frontend worker'), Config::get('system','frontend_worker'), L10n::t('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.', System::baseUrl())],
@@ -1456,7 +1531,8 @@ function admin_page_site(App $a)
 		'$relay_server_tags' 	=> ['relay_server_tags', L10n::t("Server tags"), Config::get('system','relay_server_tags'), L10n::t("Comma separated list of tags for the 'tags' subscription.")],
 		'$relay_user_tags' 	=> ['relay_user_tags', L10n::t("Allow user tags"), Config::get('system', 'relay_user_tags', true), L10n::t("If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'.")],
 
-		'$form_security_token'	=> get_form_security_token("admin_site")
+		'$form_security_token'	=> get_form_security_token("admin_site"),
+		'$relocate_button'      => L10n::t('Start Relocation'),
 	]);
 }
 
@@ -1501,9 +1577,12 @@ function admin_page_dbsync(App $a)
 
 	if ($a->argc > 2 && intval($a->argv[2])) {
 		require_once 'update.php';
+
 		$func = 'update_' . intval($a->argv[2]);
+
 		if (function_exists($func)) {
 			$retval = $func();
+
 			if ($retval === UPDATE_FAILED) {
 				$o .= L10n::t("Executing %s failed with error: %s", $func, $retval);
 			} elseif ($retval === UPDATE_SUCCESS) {
@@ -1516,12 +1595,14 @@ function admin_page_dbsync(App $a)
 			$o .= L10n::t('There was no additional update function %s that needed to be called.', $func) . "<br />";
 			Config::set('database', $func, 'success');
 		}
+
 		return $o;
 	}
 
 	$failed = [];
 	$r = q("SELECT `k`, `v` FROM `config` WHERE `cat` = 'database' ");
-	if (DBM::is_result($r)) {
+
+	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
 			$upd = intval(substr($rr['k'], 7));
 			if ($upd < 1139 || $rr['v'] === 'success') {
@@ -1530,6 +1611,7 @@ function admin_page_dbsync(App $a)
 			$failed[] = $upd;
 		}
 	}
+
 	if (!count($failed)) {
 		$o = replace_macros(get_markup_template('structure_check.tpl'), [
 			'$base' => System::baseUrl(true),
@@ -1612,15 +1694,18 @@ function admin_page_users_post(App $a)
 
 			Thank you and welcome to %4$s.'));
 
-		$preamble = sprintf($preamble, $user['username'], $a->config['sitename']);
-		$body = sprintf($body, System::baseUrl(), $user['email'], $result['password'], $a->config['sitename']);
+		$preamble = sprintf($preamble, $user['username'], Config::get('config', 'sitename'));
+		$body = sprintf($body, System::baseUrl(), $user['email'], $result['password'], Config::get('config', 'sitename'));
 
 		notification([
-			'type' => SYSTEM_EMAIL,
+			'type'     => SYSTEM_EMAIL,
+			'language' => $user['language'],
+			'to_name'  => $user['username'],
 			'to_email' => $user['email'],
-			'subject' => L10n::t('Registration details for %s', $a->config['sitename']),
+			'uid'      => $user['uid'],
+			'subject'  => L10n::t('Registration details for %s', Config::get('config', 'sitename')),
 			'preamble' => $preamble,
-			'body' => $body]);
+			'body'     => $body]);
 	}
 
 	if (x($_POST, 'page_users_block')) {
@@ -1669,8 +1754,8 @@ function admin_page_users(App $a)
 {
 	if ($a->argc > 2) {
 		$uid = $a->argv[3];
-		$user = dba::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]);
-		if (!DBM::is_result($user)) {
+		$user = DBA::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]);
+		if (!DBA::isResult($user)) {
 			notice('User not found' . EOL);
 			goaway('admin/users');
 			return ''; // NOTREACHED
@@ -1743,39 +1828,38 @@ function admin_page_users(App $a)
 				ORDER BY $sql_order $sql_order_direction LIMIT %d, %d", intval($a->pager['start']), intval($a->pager['itemspage'])
 	);
 
-	$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
+	$adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
 	$_setup_users = function ($e) use ($adminlist) {
 		$page_types = [
-			PAGE_NORMAL => L10n::t('Normal Account Page'),
-			PAGE_SOAPBOX => L10n::t('Soapbox Page'),
-			PAGE_COMMUNITY => L10n::t('Public Forum'),
-			PAGE_FREELOVE => L10n::t('Automatic Friend Page'),
-			PAGE_PRVGROUP => L10n::t('Private Forum')
+			Contact::PAGE_NORMAL    => L10n::t('Normal Account Page'),
+			Contact::PAGE_SOAPBOX   => L10n::t('Soapbox Page'),
+			Contact::PAGE_COMMUNITY => L10n::t('Public Forum'),
+			Contact::PAGE_FREELOVE  => L10n::t('Automatic Friend Page'),
+			Contact::PAGE_PRVGROUP  => L10n::t('Private Forum')
 		];
 		$account_types = [
-			ACCOUNT_TYPE_PERSON => L10n::t('Personal Page'),
-			ACCOUNT_TYPE_ORGANISATION => L10n::t('Organisation Page'),
-			ACCOUNT_TYPE_NEWS => L10n::t('News Page'),
-			ACCOUNT_TYPE_COMMUNITY => L10n::t('Community Forum')
+			Contact::ACCOUNT_TYPE_PERSON       => L10n::t('Personal Page'),
+			Contact::ACCOUNT_TYPE_ORGANISATION => L10n::t('Organisation Page'),
+			Contact::ACCOUNT_TYPE_NEWS         => L10n::t('News Page'),
+			Contact::ACCOUNT_TYPE_COMMUNITY    => L10n::t('Community Forum')
 		];
 
-
-
-		$e['page-flags-raw'] = $e['page-flags'];
+		$e['page_flags_raw'] = $e['page-flags'];
 		$e['page-flags'] = $page_types[$e['page-flags']];
 
-		$e['account-type-raw'] = ($e['page_flags_raw']==0) ? $e['account-type'] : -1;
-		$e['account-type'] = ($e['page_flags_raw']==0) ? $account_types[$e['account-type']] : "";
+		$e['account_type_raw'] = ($e['page_flags_raw'] == 0) ? $e['account-type'] : -1;
+		$e['account-type'] = ($e['page_flags_raw'] == 0) ? $account_types[$e['account-type']] : "";
 
 		$e['register_date'] = Temporal::getRelativeDate($e['register_date']);
 		$e['login_date'] = Temporal::getRelativeDate($e['login_date']);
 		$e['lastitem_date'] = Temporal::getRelativeDate($e['lastitem_date']);
-		//$e['is_admin'] = ($e['email'] === $a->config['admin_email']);
 		$e['is_admin'] = in_array($e['email'], $adminlist);
 		$e['is_deletable'] = (intval($e['uid']) != local_user());
 		$e['deleted'] = ($e['account_removed'] ? Temporal::getRelativeDate($e['account_expires_on']) : False);
+
 		return $e;
 	};
+
 	$users = array_map($_setup_users, $users);
 
 
@@ -1821,6 +1905,7 @@ function admin_page_users(App $a)
 		'$deny' => L10n::t('Deny'),
 		'$delete' => L10n::t('Delete'),
 		'$block' => L10n::t('Block'),
+		'$blocked' => L10n::t('User blocked'),
 		'$unblock' => L10n::t('Unblock'),
 		'$siteadmin' => L10n::t('Site admin'),
 		'$accountexpired' => L10n::t('Account expired'),
@@ -1916,12 +2001,12 @@ function admin_page_addons(App $a)
 
 		$admin_form = "";
 		if (in_array($addon, $a->addons_admin)) {
-			@require_once("addon/$addon/$addon.php");
+			require_once "addon/$addon/$addon.php";
 			$func = $addon . '_addon_admin';
 			$func($a, $admin_form);
 		}
 
-		$t = get_markup_template('admin/plugins_details.tpl');
+		$t = get_markup_template('admin/addon_details.tpl');
 
 		return replace_macros($t, [
 			'$title' => L10n::t('Administration'),
@@ -2157,6 +2242,7 @@ function admin_page_themes(App $a)
 		}
 
 		$readme = null;
+
 		if (is_file("view/theme/$theme/README.md")) {
 			$readme = Markdown::convert(file_get_contents("view/theme/$theme/README.md"), false);
 		} elseif (is_file("view/theme/$theme/README")) {
@@ -2191,7 +2277,7 @@ function admin_page_themes(App $a)
 			$screenshot = null;
 		}
 
-		$t = get_markup_template('admin/plugins_details.tpl');
+		$t = get_markup_template('admin/addon_details.tpl');
 		return replace_macros($t, [
 			'$title' => L10n::t('Administration'),
 			'$page' => L10n::t('Themes'),
@@ -2295,11 +2381,12 @@ function admin_page_logs_post(App $a)
 function admin_page_logs(App $a)
 {
 	$log_choices = [
-		LOGGER_NORMAL	=> 'Normal',
-		LOGGER_TRACE	=> 'Trace',
-		LOGGER_DEBUG	=> 'Debug',
-		LOGGER_DATA	=> 'Data',
-		LOGGER_ALL	=> 'All'
+		LOGGER_WARNING => 'Warning',
+		LOGGER_INFO    => 'Info',
+		LOGGER_TRACE   => 'Trace',
+		LOGGER_DEBUG   => 'Debug',
+		LOGGER_DATA    => 'Data',
+		LOGGER_ALL     => 'All'
 	];
 
 	if (ini_get('log_errors')) {
@@ -2323,7 +2410,7 @@ function admin_page_logs(App $a)
 		'$loglevel' => ['loglevel', L10n::t("Log level"), Config::get('system', 'loglevel'), "", $log_choices],
 		'$form_security_token' => get_form_security_token("admin_logs"),
 		'$phpheader' => L10n::t("PHP logging"),
-		'$phphint' => L10n::t("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."),
+		'$phphint' => L10n::t("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."),
 		'$phplogcode' => "error_reporting(E_ERROR | E_WARNING | E_PARSE);\nini_set('error_log','php.out');\nini_set('log_errors','1');\nini_set('display_errors', '1');",
 		'$phplogenabled' => $phplogenabled,
 	]);
@@ -2466,3 +2553,10 @@ function admin_page_features(App $a)
 		return $o;
 	}
 }
+
+function admin_page_server_vital()
+{
+	// Fetch the host-meta to check if this really is a vital server
+	$serverret = Network::curl(System::baseUrl() . '/.well-known/host-meta');
+	return $serverret["success"];
+}
diff --git a/mod/allfriends.php b/mod/allfriends.php
index bf852419d..7623a9cd0 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -2,14 +2,16 @@
 /**
  * @file mod/allfriends.php
  */
+
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/dba.php';
 require_once 'mod/contacts.php';
@@ -33,9 +35,9 @@ function allfriends_content(App $a)
 
 	$uid = $a->user['uid'];
 
-	$contact = dba::selectFirst('contact', ['name', 'url', 'photo'], ['id' => $cid, 'uid' => local_user()]);
+	$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['id' => $cid, 'uid' => local_user()]);
 
-	if (!DBM::is_result($contact)) {
+	if (!DBA::isResult($contact)) {
 		return;
 	}
 
@@ -47,7 +49,7 @@ function allfriends_content(App $a)
 	$a->set_pager_total($total);
 
 	$r = GContact::allFriends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		$o .= L10n::t('No friends to display.');
 		return $o;
 	}
@@ -70,7 +72,7 @@ function allfriends_content(App $a)
 		} else {
 			$connlnk = System::baseUrl() . '/follow/?url=' . $rr['url'];
 			$photo_menu = [
-				'profile' => [L10n::t("View Profile"), Profile::zrl($rr['url'])],
+				'profile' => [L10n::t("View Profile"), Contact::magicLink($rr['url'])],
 				'follow' => [L10n::t("Connect/Follow"), $connlnk]
 			];
 		}
@@ -79,7 +81,7 @@ function allfriends_content(App $a)
 			'url'          => $rr['url'],
 			'itemurl'      => defaults($contact_details, 'addr', $rr['url']),
 			'name'         => htmlentities($contact_details['name']),
-			'thumb'        => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
+			'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
 			'img_hover'    => htmlentities($contact_details['name']),
 			'details'      => $contact_details['location'],
 			'tags'         => $contact_details['keywords'],
@@ -94,7 +96,7 @@ function allfriends_content(App $a)
 		$entries[] = $entry;
 	}
 
-	$tab_str = contacts_tab($a, $cid, 3);
+	$tab_str = contacts_tab($a, $contact, 4);
 
 	$tpl = get_markup_template('viewcontact_template.tpl');
 
diff --git a/mod/api.php b/mod/api.php
index e9e913012..e97846165 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -5,7 +5,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Module\Login;
 
 require_once 'include/api.php';
@@ -20,9 +20,9 @@ function oauth_get_client($request)
 	$r = q("SELECT `clients`.*
 			FROM `clients`, `tokens`
 			WHERE `clients`.`client_id`=`tokens`.`client_id`
-			AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", dbesc($token));
+			AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'", DBA::escape($token));
 
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		return null;
 	}
 
diff --git a/mod/attach.php b/mod/attach.php
index fd428286a..99f0fc460 100644
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -2,9 +2,10 @@
 /**
  * @file mod/attach.php
  */
+
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 require_once 'include/security.php';
@@ -20,8 +21,8 @@ function attach_init(App $a)
 
 	// Check for existence, which will also provide us the owner uid
 
-	$r = dba::selectFirst('attach', [], ['id' => $item_id]);
-	if (!DBM::is_result($r)) {
+	$r = DBA::selectFirst('attach', [], ['id' => $item_id]);
+	if (!DBA::isResult($r)) {
 		notice(L10n::t('Item was not found.'). EOL);
 		return;
 	}
@@ -31,10 +32,10 @@ function attach_init(App $a)
 	// Now we'll see if we can access the attachment
 
 	$r = q("SELECT * FROM `attach` WHERE `id` = '%d' $sql_extra LIMIT 1",
-		dbesc($item_id)
+		DBA::escape($item_id)
 	);
 
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
diff --git a/mod/babel.php b/mod/babel.php
index 3352366bd..e5ae96be7 100644
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -6,9 +6,11 @@
 use Friendica\Content\Text;
 use Friendica\Core\L10n;
 
-function visible_lf($s)
+function visible_whitespace($s)
 {
-	return str_replace("\n", '<br />', $s);
+	$s = str_replace(' ', '&nbsp;', $s);
+
+	return str_replace(["\r\n", "\n", "\r"], '<br />', $s);
 }
 
 function babel_content()
@@ -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,13 @@ function babel_content()
 				$bbcode = Text\HTML::toBBCode($html);
 				$results[] = [
 					'title' => L10n::t('HTML::toBBCode'),
-					'content' => visible_lf($bbcode)
+					'content' => visible_whitespace($bbcode)
+				];
+
+				$markdown = Text\HTML::toMarkdown($html);
+				$results[] = [
+					'title' => L10n::t('HTML::toMarkdown'),
+					'content' => visible_whitespace($markdown)
 				];
 
 				$text = Text\HTML::toPlaintext($html);
@@ -111,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'],
diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index 9ae3e28f0..e1ae9aa64 100644
--- a/mod/bookmarklet.php
+++ b/mod/bookmarklet.php
@@ -5,6 +5,7 @@
 
 use Friendica\App;
 use Friendica\Core\ACL;
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Module\Login;
@@ -21,14 +22,18 @@ function bookmarklet_content(App $a)
 {
 	if (!local_user()) {
 		$o = '<h2>' . L10n::t('Login') . '</h2>';
-		$o .= Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? false : true);
+		$o .= Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? false : true);
 		return $o;
 	}
 
-	$referer = normalise_link($_SERVER["HTTP_REFERER"]);
+	$referer = normalise_link(defaults($_SERVER, 'HTTP_REFERER', ''));
 	$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 = [
@@ -42,7 +47,7 @@ function bookmarklet_content(App $a)
 			'bang' => '',
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
-			'title' => trim($_REQUEST["title"], "*"),
+			'title' => trim(defaults($_REQUEST, 'title', ''), "*"),
 			'content' => $content
 		];
 		$o = status_editor($a, $x, 0, false);
diff --git a/mod/cal.php b/mod/cal.php
index bf73408f4..bdedaaacf 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -13,7 +13,7 @@ use Friendica\Content\Widget;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Event;
 use Friendica\Model\Group;
@@ -28,52 +28,54 @@ function cal_init(App $a)
 		DFRN::autoRedir($a, $a->argv[1]);
 	}
 
-	if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
-		return;
+	if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
+		System::httpExit(403, ['title' => L10n::t('Access denied.')]);
+	}
+
+	if ($a->argc < 2) {
+		System::httpExit(403, ['title' => L10n::t('Access denied.')]);
 	}
 
 	Nav::setSelected('events');
 
-	if ($a->argc > 1) {
-		$nick = $a->argv[1];
-		$user = dba::selectFirst('user', [], ['nickname' => $nick, 'blocked' => false]);
-		if (!DBM::is_result($user)) {
-			return;
-		}
-
-		$a->data['user'] = $user;
-		$a->profile_uid = $user['uid'];
-
-		// if it's a json request abort here becaus we don't
-		// need the widget data
-		if ($a->argv[2] === 'json') {
-			return;
-		}
-
-		$profile = Profile::getByNickname($nick, $a->profile_uid);
-
-		$account_type = Contact::getAccountType($profile);
-
-		$tpl = get_markup_template("vcard-widget.tpl");
-
-		$vcard_widget = replace_macros($tpl, [
-			'$name' => $profile['name'],
-			'$photo' => $profile['photo'],
-			'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
-			'$account_type' => $account_type,
-			'$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
-		]);
-
-		$cal_widget = Widget\CalendarExport::getHTML();
-
-		if (!x($a->page, 'aside')) {
-			$a->page['aside'] = '';
-		}
-
-		$a->page['aside'] .= $vcard_widget;
-		$a->page['aside'] .= $cal_widget;
+	$nick = $a->argv[1];
+	$user = DBA::selectFirst('user', [], ['nickname' => $nick, 'blocked' => false]);
+	if (!DBA::isResult($user)) {
+		System::httpExit(404, ['title' => L10n::t('Page not found.')]);
 	}
 
+	$a->data['user'] = $user;
+	$a->profile_uid = $user['uid'];
+
+	// if it's a json request abort here becaus we don't
+	// need the widget data
+	if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) {
+		return;
+	}
+
+	$profile = Profile::getByNickname($nick, $a->profile_uid);
+
+	$account_type = Contact::getAccountType($profile);
+
+	$tpl = get_markup_template("vcard-widget.tpl");
+
+	$vcard_widget = replace_macros($tpl, [
+		'$name' => $profile['name'],
+		'$photo' => $profile['photo'],
+		'$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
+		'$account_type' => $account_type,
+		'$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
+	]);
+
+	$cal_widget = Widget\CalendarExport::getHTML();
+
+	if (!x($a->page, 'aside')) {
+		$a->page['aside'] = '';
+	}
+
+	$a->page['aside'] .= $vcard_widget;
+	$a->page['aside'] .= $cal_widget;
+
 	return;
 }
 
@@ -100,7 +102,7 @@ function cal_content(App $a)
 	$mode = 'view';
 	$y = 0;
 	$m = 0;
-	$ignored = ((x($_REQUEST, 'ignored')) ? intval($_REQUEST['ignored']) : 0);
+	$ignored = (x($_REQUEST, 'ignored') ? intval($_REQUEST['ignored']) : 0);
 
 	$format = 'ical';
 	if ($a->argc == 4 && $a->argv[2] == 'export') {
@@ -131,14 +133,14 @@ function cal_content(App $a)
 			intval($contact_id),
 			intval($a->profile['profile_uid'])
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$remote_contact = true;
 		}
 	}
 
 	$is_owner = local_user() == $a->profile['profile_uid'];
 
-	if ($a->profile['hidewall'] && (!$is_owner) && (!$remote_contact)) {
+	if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
 		notice(L10n::t('Access to this profile has been restricted.') . EOL);
 		return;
 	}
@@ -194,7 +196,7 @@ function cal_content(App $a)
 		$finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
 
 
-		if ($a->argv[2] === 'json') {
+		if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) {
 			if (x($_GET, 'start')) {
 				$start = $_GET['start'];
 			}
@@ -222,14 +224,14 @@ function cal_content(App $a)
 
 		// get events by id or by date
 		if ($event_params['event_id']) {
-			$r = Event::getListById($owner_uid, $event_params['event-id'], $sql_extra);
+			$r = Event::getListById($owner_uid, $event_params['event_id'], $sql_extra);
 		} else {
 			$r = Event::getListByDate($owner_uid, $event_params, $sql_extra);
 		}
 
 		$links = [];
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$r = Event::sortByDate($r);
 			foreach ($r as $rr) {
 				$j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
@@ -242,7 +244,7 @@ function cal_content(App $a)
 		// transform the event in a usable array
 		$events = Event::prepareListForTemplate($r);
 
-		if ($a->argv[2] === 'json') {
+		if (!empty($a->argv[2]) && ($a->argv[2] === 'json')) {
 			echo json_encode($events);
 			killme();
 		}
@@ -293,14 +295,14 @@ function cal_content(App $a)
 	}
 
 	if ($mode == 'export') {
-		if (!(intval($owner_uid))) {
+		if (!intval($owner_uid)) {
 			notice(L10n::t('User not found'));
 			return;
 		}
 
 		// Test permissions
 		// Respect the export feature setting for all other /cal pages if it's not the own profile
-		if (((local_user() !== intval($owner_uid))) && !Feature::isEnabled($owner_uid, "export_calendar")) {
+		if ((local_user() !== intval($owner_uid)) && !Feature::isEnabled($owner_uid, "export_calendar")) {
 			notice(L10n::t('Permission denied.') . EOL);
 			goaway('cal/' . $nick);
 		}
diff --git a/mod/common.php b/mod/common.php
index f45bbb017..afe78ce46 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -2,13 +2,15 @@
 /**
  * @file include/common.php
  */
+
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/dba.php';
 require_once 'mod/contacts.php';
@@ -36,16 +38,16 @@ function common_content(App $a)
 	}
 
 	if ($cmd === 'loc' && $cid) {
-		$contact = dba::selectFirst('contact', ['name', 'url', 'photo'], ['id' => $cid, 'uid' => $uid]);
+		$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['id' => $cid, 'uid' => $uid]);
 
-		if (DBM::is_result($contact)) {
+		if (DBA::isResult($contact)) {
 			$a->page['aside'] = "";
 			Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
 		}
 	} else {
-		$contact = dba::selectFirst('contact', ['name', 'url', 'photo'], ['self' => true, 'uid' => $uid]);
+		$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
 
-		if (DBM::is_result($contact)) {
+		if (DBA::isResult($contact)) {
 			$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [
 				'$name' => htmlentities($contact['name']),
 				'$photo' => $contact['photo'],
@@ -59,17 +61,17 @@ function common_content(App $a)
 		}
 	}
 
-	if (!DBM::is_result($contact)) {
+	if (!DBA::isResult($contact)) {
 		return;
 	}
 
 	if (!$cid && Profile::getMyURL()) {
-		$contact = dba::selectFirst('contact', ['id'], ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $uid]);
-		if (DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $uid]);
+		if (DBA::isResult($contact)) {
 			$cid = $contact['id'];
 		} else {
-			$gcontact = dba::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
-			if (DBM::is_result($gcontact)) {
+			$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
+			if (DBA::isResult($gcontact)) {
 				$zcid = $gcontact['id'];
 			}
 		}
@@ -98,7 +100,7 @@ function common_content(App $a)
 		$r = GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
 	}
 
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		return $o;
 	}
 
@@ -119,7 +121,7 @@ function common_content(App $a)
 			'url'          => $rr['url'],
 			'itemurl'      => defaults($contact_details, 'addr', $rr['url']),
 			'name'         => $contact_details['name'],
-			'thumb'        => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
+			'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
 			'img_hover'    => htmlentities($contact_details['name']),
 			'details'      => $contact_details['location'],
 			'tags'         => $contact_details['keywords'],
@@ -135,7 +137,7 @@ function common_content(App $a)
 	$title = '';
 	$tab_str = '';
 	if ($cmd === 'loc' && $cid && local_user() == $uid) {
-		$tab_str = contacts_tab($a, $cid, 4);
+		$tab_str = contacts_tab($a, $contact, 4);
 	} else {
 		$title = L10n::t('Common Friends');
 	}
diff --git a/mod/community.php b/mod/community.php
index 59be7487b..9c9fb4390 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -9,7 +9,8 @@ use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 
 function community_init(App $a)
 {
@@ -35,6 +36,25 @@ function community_content(App $a, $update = 0)
 		return;
 	}
 
+	$accounttype = null;
+
+	if ($a->argc > 2) {
+		switch ($a->argv[2]) {
+			case 'person':
+				$accounttype = Contact::ACCOUNT_TYPE_PERSON;
+				break;
+			case 'organisation':
+				$accounttype = Contact::ACCOUNT_TYPE_ORGANISATION;
+				break;
+			case 'news':
+				$accounttype = Contact::ACCOUNT_TYPE_NEWS;
+				break;
+			case 'community':
+				$accounttype = Contact::ACCOUNT_TYPE_COMMUNITY;
+				break;
+		}
+	}
+
 	if ($a->argc > 1) {
 		$content = $a->argv[1];
 	} else {
@@ -135,9 +155,9 @@ function community_content(App $a, $update = 0)
 
 	$a->set_pager_itemspage($itemspage_network);
 
-	$r = community_getitems($a->pager['start'], $a->pager['itemspage'], $content);
+	$r = community_getitems($a->pager['start'], $a->pager['itemspage'], $content, $accounttype);
 
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		info(L10n::t('No results.') . EOL);
 		return $o;
 	}
@@ -164,7 +184,7 @@ function community_content(App $a, $update = 0)
 				}
 			}
 			if (count($s) < $a->pager['itemspage']) {
-				$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage'], $content);
+				$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage'], $content, $accounttype);
 			}
 		} while ((count($s) < $a->pager['itemspage']) && ( ++$count < 50) && (count($r) > 0));
 	} else {
@@ -186,24 +206,41 @@ function community_content(App $a, $update = 0)
 	]);
 }
 
-function community_getitems($start, $itemspage, $content)
+function community_getitems($start, $itemspage, $content, $accounttype)
 {
 	if ($content == 'local') {
-		$r = dba::p("SELECT `item`.`uri`, `item`.`author-link` FROM `thread`
+		if (!is_null($accounttype)) {
+			$sql_accounttype = " AND `user`.`account-type` = ?";
+			$values = [$accounttype, $start, $itemspage];
+		} else {
+			$sql_accounttype = "";
+			$values = [$start, $itemspage];
+		}
+
+		$r = DBA::p("SELECT `item`.`uri`, `author`.`url` AS `author-link` FROM `thread`
 			INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
 			INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+			INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
 			WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
-			AND NOT `thread`.`private` AND `thread`.`wall` AND `thread`.`origin`
-			ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage)
-		);
-		return dba::inArray($r);
+			AND NOT `thread`.`private` AND `thread`.`wall` AND `thread`.`origin` $sql_accounttype
+			ORDER BY `thread`.`commented` DESC LIMIT ?, ?", $values);
+		return DBA::toArray($r);
 	} elseif ($content == 'global') {
-		$r = dba::p("SELECT `uri` FROM `thread`
+		if (!is_null($accounttype)) {
+			$sql_accounttype = " AND `owner`.`contact-type` = ?";
+			$values = [$accounttype, $start, $itemspage];
+		} else {
+			$sql_accounttype = "";
+			$values = [$start, $itemspage];
+		}
+
+		$r = DBA::p("SELECT `uri` FROM `thread`
 				INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-		                INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
-				WHERE `thread`.`uid` = 0 AND NOT `author`.`hidden` AND NOT `author`.`blocked`
-				ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage));
-		return dba::inArray($r);
+				INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
+				INNER JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`
+				WHERE `thread`.`uid` = 0 AND NOT `author`.`hidden` AND NOT `author`.`blocked` $sql_accounttype
+				ORDER BY `thread`.`commented` DESC LIMIT ?, ?", $values);
+		return DBA::toArray($r);
 	}
 
 	// Should never happen
diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index 388725c00..bf34c59d7 100644
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
@@ -1,7 +1,7 @@
 <?php
 
 use Friendica\App;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 
@@ -17,7 +17,7 @@ function contactgroup_content(App $a)
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$change = intval($a->argv[2]);
 		}
 	}
@@ -27,7 +27,7 @@ function contactgroup_content(App $a)
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			killme();
 		}
 
diff --git a/mod/contacts.php b/mod/contacts.php
index cd9021c17..1604f0b66 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -10,17 +10,18 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
-
-require_once 'mod/proxy.php';
+use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Core\ACL;
 
 function contacts_init(App $a)
 {
@@ -39,14 +40,23 @@ function contacts_init(App $a)
 
 	$contact_id = null;
 	$contact = null;
-	if ((($a->argc == 2) && intval($a->argv[1])) || (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) {
+	if ((($a->argc == 2) && intval($a->argv[1])) || (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations']))) {
 		$contact_id = intval($a->argv[1]);
-		$contact = dba::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
+		$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
+
+		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 (DBM::is_result($contact)) {
+	if (DBA::isResult($contact)) {
 		if ($contact['self']) {
-			if (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts")) {
+			if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
 				goaway('profile/' . $contact['nick']);
 			} else {
 				goaway('profile/' . $contact['nick'] . '?tab=profile');
@@ -55,7 +65,7 @@ function contacts_init(App $a)
 
 		$a->data['contact'] = $contact;
 
-		if (($a->data['contact']['network'] != "") && ($a->data['contact']['network'] != NETWORK_DFRN)) {
+		if (($a->data['contact']['network'] != "") && ($a->data['contact']['network'] != Protocol::DFRN)) {
 			$networkname = format_network_name($a->data['contact']['network'], $a->data['contact']['url']);
 		} else {
 			$networkname = '';
@@ -65,7 +75,7 @@ function contacts_init(App $a)
 		$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [
 			'$name' => htmlentities($a->data['contact']['name']),
 			'$photo' => $a->data['contact']['photo'],
-			'$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/" . $a->data['contact']['id'] : $a->data['contact']['url'],
+			'$url' => Contact::MagicLink($a->data['contact']['url']),
 			'$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
 			'$network_name' => $networkname,
 			'$network' => L10n::t('Network:'),
@@ -87,7 +97,11 @@ function contacts_init(App $a)
 		$findpeople_widget = Widget::findPeople();
 	}
 
-	$groups_widget = Group::sidebarWidget('contacts', 'group', 'full', 0, $contact_id);
+	if ($contact['uid'] != 0) {
+		$groups_widget = Group::sidebarWidget('contacts', 'group', 'full', 'everyone', $contact_id);
+	} else {
+		$groups_widget = null;
+	}
 
 	$a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"), [
 		'$vcard_widget' => $vcard_widget,
@@ -113,11 +127,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())
@@ -131,16 +146,12 @@ function contacts_batch_actions(App $a)
 			$count_actions++;
 		}
 		if (x($_POST, 'contacts_batch_block')) {
-			$r = _contact_block($contact_id, $orig_record);
-			if ($r) {
-				$count_actions++;
-			}
+			_contact_block($contact_id);
+			$count_actions++;
 		}
 		if (x($_POST, 'contacts_batch_ignore')) {
-			$r = _contact_ignore($contact_id, $orig_record);
-			if ($r) {
-				$count_actions++;
-			}
+			_contact_ignore($contact_id);
+			$count_actions++;
 		}
 		if (x($_POST, 'contacts_batch_archive')) {
 			$r = _contact_archive($contact_id, $orig_record);
@@ -180,7 +191,7 @@ function contacts_post(App $a)
 		return;
 	}
 
-	if (!dba::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
+	if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
 		notice(L10n::t('Could not access contact record.') . EOL);
 		goaway('contacts');
 		return; // NOTREACHED
@@ -188,9 +199,9 @@ function contacts_post(App $a)
 
 	Addon::callHooks('contact_edit_post', $_POST);
 
-	$profile_id = intval($_POST['profile-assign']);
+	$profile_id = intval(defaults($_POST, 'profile-assign', 0));
 	if ($profile_id) {
-		if (!dba::exists('profile', ['id' => $profile_id, 'uid' => local_user()])) {
+		if (!DBA::exists('profile', ['id' => $profile_id, 'uid' => local_user()])) {
 			notice(L10n::t('Could not locate selected profile.') . EOL);
 			return;
 		}
@@ -200,11 +211,11 @@ function contacts_post(App $a)
 
 	$notify = intval($_POST['notify']);
 
-	$fetch_further_information = intval($_POST['fetch_further_information']);
+	$fetch_further_information = intval(defaults($_POST, 'fetch_further_information', 0));
 
-	$ffi_keyword_blacklist = escape_tags(trim($_POST['ffi_keyword_blacklist']));
+	$ffi_keyword_blacklist = escape_tags(trim(defaults($_POST, 'ffi_keyword_blacklist', '')));
 
-	$priority = intval($_POST['poll']);
+	$priority = intval(defaults($_POST, 'poll', 0));
 	if ($priority > 5 || $priority < 0) {
 		$priority = 0;
 	}
@@ -216,22 +227,22 @@ function contacts_post(App $a)
 		`ffi_keyword_blacklist` = '%s' WHERE `id` = %d AND `uid` = %d",
 		intval($profile_id),
 		intval($priority),
-		dbesc($info),
+		DBA::escape($info),
 		intval($hidden),
 		intval($notify),
 		intval($fetch_further_information),
-		dbesc($ffi_keyword_blacklist),
+		DBA::escape($ffi_keyword_blacklist),
 		intval($contact_id),
 		intval(local_user())
 	);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		info(L10n::t('Contact updated.') . EOL);
 	} else {
 		notice(L10n::t('Failed to update contact record.') . EOL);
 	}
 
-	$contact = dba::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
-	if (DBM::is_result($contact)) {
+	$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
+	if (DBA::isResult($contact)) {
 		$a->data['contact'] = $contact;
 	}
 
@@ -242,14 +253,14 @@ function contacts_post(App $a)
 
 function _contact_update($contact_id)
 {
-	$contact = dba::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
-	if (!DBM::is_result($contact)) {
+	$contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
+	if (!DBA::isResult($contact)) {
 		return;
 	}
 
 	$uid = $contact["uid"];
 
-	if ($contact["network"] == NETWORK_OSTATUS) {
+	if ($contact["network"] == Protocol::OSTATUS) {
 		$result = Contact::createFromProbe($uid, $contact["url"], false, $contact["network"]);
 
 		if ($result['success']) {
@@ -263,8 +274,8 @@ function _contact_update($contact_id)
 
 function _contact_update_profile($contact_id)
 {
-	$contact = dba::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
-	if (!DBM::is_result($contact)) {
+	$contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
+	if (!DBA::isResult($contact)) {
 		return;
 	}
 
@@ -273,7 +284,7 @@ function _contact_update_profile($contact_id)
 	$data = Probe::uri($contact["url"], "", 0, false);
 
 	// "Feed" or "Unknown" is mostly a sign of communication problems
-	if ((in_array($data["network"], [NETWORK_FEED, NETWORK_PHANTOM])) && ($data["network"] != $contact["network"])) {
+	if ((in_array($data["network"], [Protocol::FEED, Protocol::PHANTOM])) && ($data["network"] != $contact["network"])) {
 		return;
 	}
 
@@ -281,7 +292,7 @@ function _contact_update_profile($contact_id)
 		"poco", "network", "alias"];
 	$update = [];
 
-	if ($data["network"] == NETWORK_OSTATUS) {
+	if ($data["network"] == Protocol::OSTATUS) {
 		$result = Contact::createFromProbe($uid, $data["url"], false);
 
 		if ($result['success']) {
@@ -308,7 +319,7 @@ function _contact_update_profile($contact_id)
 			$query .= ", ";
 		}
 
-		$query .= "`" . $key . "` = '" . dbesc($value) . "'";
+		$query .= "`" . $key . "` = '" . DBA::escape($value) . "'";
 	}
 
 	if ($query == "") {
@@ -327,26 +338,16 @@ function _contact_update_profile($contact_id)
 	GContact::updateFromProbe($data["url"]);
 }
 
-function _contact_block($contact_id, $orig_record)
+function _contact_block($contact_id)
 {
-	$blocked = (($orig_record['blocked']) ? 0 : 1);
-	$r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d",
-		intval($blocked),
-		intval($contact_id),
-		intval(local_user())
-	);
-	return DBM::is_result($r);
+	$blocked = !Contact::isBlockedByUser($contact_id, local_user());
+	Contact::setBlockedForUser($contact_id, local_user(), $blocked);
 }
 
-function _contact_ignore($contact_id, $orig_record)
+function _contact_ignore($contact_id)
 {
-	$readonly = (($orig_record['readonly']) ? 0 : 1);
-	$r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d",
-		intval($readonly),
-		intval($contact_id),
-		intval(local_user())
-	);
-	return DBM::is_result($r);
+	$ignored = !Contact::isIgnoredByUser($contact_id, local_user());
+	Contact::setIgnoredForUser($contact_id, local_user(), $ignored);
 }
 
 function _contact_archive($contact_id, $orig_record)
@@ -357,7 +358,7 @@ function _contact_archive($contact_id, $orig_record)
 		intval($contact_id),
 		intval(local_user())
 	);
-	return DBM::is_result($r);
+	return DBA::isResult($r);
 }
 
 function _contact_drop($orig_record)
@@ -368,15 +369,15 @@ function _contact_drop($orig_record)
 		WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
 		intval($a->user['uid'])
 	);
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		return;
 	}
 
-	Contact::terminateFriendship($r[0], $orig_record);
+	Contact::terminateFriendship($r[0], $orig_record, true);
 	Contact::remove($orig_record['id']);
 }
 
-function contacts_content(App $a)
+function contacts_content(App $a, $update = 0)
 {
 	$sort_type = 0;
 	$o = '';
@@ -395,48 +396,46 @@ function contacts_content(App $a)
 
 		$cmd = $a->argv[2];
 
-		$orig_record = dba::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'self' => false]);
-		if (!DBM::is_result($orig_record)) {
+		$orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false]);
+		if (!DBA::isResult($orig_record)) {
 			notice(L10n::t('Could not access contact record.') . EOL);
 			goaway('contacts');
 			return; // NOTREACHED
 		}
 
-		if ($cmd === 'update') {
+		if ($cmd === 'update' && ($orig_record['uid'] != 0)) {
 			_contact_update($contact_id);
 			goaway('contacts/' . $contact_id);
 			// NOTREACHED
 		}
 
-		if ($cmd === 'updateprofile') {
+		if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
 			_contact_update_profile($contact_id);
 			goaway('crepair/' . $contact_id);
 			// NOTREACHED
 		}
 
 		if ($cmd === 'block') {
-			$r = _contact_block($contact_id, $orig_record);
-			if ($r) {
-				$blocked = (($orig_record['blocked']) ? 0 : 1);
-				info((($blocked) ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL);
-			}
+			_contact_block($contact_id);
+
+			$blocked = Contact::isBlockedByUser($contact_id, local_user());
+			info(($blocked ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL);
 
 			goaway('contacts/' . $contact_id);
 			return; // NOTREACHED
 		}
 
 		if ($cmd === 'ignore') {
-			$r = _contact_ignore($contact_id, $orig_record);
-			if ($r) {
-				$readonly = (($orig_record['readonly']) ? 0 : 1);
-				info((($readonly) ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL);
-			}
+			_contact_ignore($contact_id);
+
+			$ignored = Contact::isIgnoredByUser($contact_id, local_user());
+			info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL);
 
 			goaway('contacts/' . $contact_id);
 			return; // NOTREACHED
 		}
 
-		if ($cmd === 'archive') {
+		if ($cmd === 'archive' && ($orig_record['uid'] != 0)) {
 			$r = _contact_archive($contact_id, $orig_record);
 			if ($r) {
 				$archived = (($orig_record['archive']) ? 0 : 1);
@@ -447,7 +446,7 @@ function contacts_content(App $a)
 			return; // NOTREACHED
 		}
 
-		if ($cmd === 'drop') {
+		if ($cmd === 'drop' && ($orig_record['uid'] != 0)) {
 			// Check if we should do HTML-based delete confirmation
 			if (x($_REQUEST, 'confirm')) {
 				// <form> can't take arguments in its "action" parameter
@@ -496,6 +495,9 @@ function contacts_content(App $a)
 		if ($cmd === 'posts') {
 			return contact_posts($a, $contact_id);
 		}
+		if ($cmd === 'conversations') {
+			return contact_conversations($a, $contact_id, $update);
+		}
 	}
 
 	$_SESSION['return_url'] = $a->query_string;
@@ -511,36 +513,45 @@ function contacts_content(App $a)
 			'$baseurl' => System::baseUrl(true),
 		]);
 
+		$contact['blocked'] = Contact::isBlockedByUser($contact['id'], local_user());
+		$contact['readonly'] = Contact::isIgnoredByUser($contact['id'], local_user());
+
 		$dir_icon = '';
 		$relation_text = '';
 		switch ($contact['rel']) {
-			case CONTACT_IS_FRIEND:
+			case Contact::FRIEND:
 				$dir_icon = 'images/lrarrow.gif';
 				$relation_text = L10n::t('You are mutual friends with %s');
 				break;
-			case CONTACT_IS_FOLLOWER;
+
+			case Contact::FOLLOWER;
 				$dir_icon = 'images/larrow.gif';
 				$relation_text = L10n::t('You are sharing with %s');
 				break;
-			case CONTACT_IS_SHARING;
+
+			case Contact::SHARING;
 				$dir_icon = 'images/rarrow.gif';
 				$relation_text = L10n::t('%s is sharing with you');
 				break;
+
 			default:
 				break;
 		}
 
-		if (!in_array($contact['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) {
+		if ($contact['uid'] == 0) {
+			$relation_text = '';
+		}
+
+		if (!in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
 			$relation_text = "";
 		}
 
 		$relation_text = sprintf($relation_text, htmlentities($contact['name']));
 
-		if (($contact['network'] === NETWORK_DFRN) && ($contact['rel'])) {
-			$url = "redir/{$contact['id']}";
+		$url = Contact::magicLink($contact['url']);
+		if (strpos($url, 'redir/') === 0) {
 			$sparkle = ' class="sparkle" ';
 		} else {
-			$url = $contact['url'];
 			$sparkle = '';
 		}
 
@@ -551,19 +562,19 @@ function contacts_content(App $a)
 		if ($contact['last-update'] > NULL_DATE) {
 			$last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? L10n::t("\x28Update was successful\x29") : L10n::t("\x28Update was not successful\x29"));
 		}
-		$lblsuggest = (($contact['network'] === NETWORK_DFRN) ? L10n::t('Suggest friends') : '');
+		$lblsuggest = (($contact['network'] === Protocol::DFRN) ? L10n::t('Suggest friends') : '');
 
-		$poll_enabled = in_array($contact['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL]);
+		$poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
 
 		$nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact["url"]));
 
 		// tabs
-		$tab_str = contacts_tab($a, $contact_id, 2);
+		$tab_str = contacts_tab($a, $contact, 3);
 
 		$lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < DateTimeFormat::utcNow()) ? L10n::t('Communications lost with this contact!') : '');
 
 		$fetch_further_information = null;
-		if ($contact['network'] == NETWORK_FEED) {
+		if ($contact['network'] == Protocol::FEED) {
 			$fetch_further_information = [
 				'fetch_further_information',
 				L10n::t('Fetch further information for feeds'),
@@ -578,39 +589,49 @@ function contacts_content(App $a)
 		}
 
 		$poll_interval = null;
-		if (in_array($contact['network'], [NETWORK_FEED, NETWORK_MAIL])) {
+		if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
 			$poll_interval = ContactSelector::pollInterval($contact['priority'], (!$poll_enabled));
 		}
 
 		$profile_select = null;
-		if ($contact['network'] == NETWORK_DFRN) {
-			$profile_select = ContactSelector::profileAssign($contact['profile-id'], (($contact['network'] !== NETWORK_DFRN) ? true : false));
+		if ($contact['network'] == Protocol::DFRN) {
+			$profile_select = ContactSelector::profileAssign($contact['profile-id'], (($contact['network'] !== Protocol::DFRN) ? true : false));
 		}
 
 		/// @todo Only show the following link with DFRN when the remote version supports it
 		$follow = '';
 		$follow_text = '';
-		if (in_array($contact['network'], [NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_DFRN])) {
-			if ($contact['rel'] == CONTACT_IS_FOLLOWER) {
-				$follow = System::baseUrl(true) . "/follow?url=" . urlencode($contact["url"]);
-				$follow_text = L10n::t("Connect/Follow");
-			} elseif ($contact['rel'] == CONTACT_IS_FRIEND) {
+		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");
 		}
 
 		// Load contactact related actions like hide, suggest, delete and others
 		$contact_actions = contact_actions($contact);
 
+		if ($contact['uid'] != 0) {
+			$lbl_vis1 = L10n::t('Profile Visibility');
+			$lbl_info1 = L10n::t('Contact Information / Notes');
+			$contact_settings_label = L10n::t('Contact Settings');
+		} else {
+			$lbl_vis1 = null;
+			$lbl_info1 = null;
+			$contact_settings_label = null;
+		}
+
 		$tpl = get_markup_template("contact_edit.tpl");
 		$o .= replace_macros($tpl, [
 			'$header' => L10n::t("Contact"),
 			'$tab_str' => $tab_str,
 			'$submit' => L10n::t('Submit'),
-			'$lbl_vis1' => L10n::t('Profile Visibility'),
+			'$lbl_vis1' => $lbl_vis1,
 			'$lbl_vis2' => L10n::t('Please choose the profile you would like to display to %s when viewing your profile securely.', $contact['name']),
-			'$lbl_info1' => L10n::t('Contact Information / Notes'),
+			'$lbl_info1' => $lbl_info1,
 			'$lbl_info2' => L10n::t('Their personal note'),
 			'$reason' => trim(notags($contact['reason'])),
 			'$infedit' => L10n::t('Edit contact notes'),
@@ -636,7 +657,7 @@ function contacts_content(App $a)
 			'$contact_id' => $contact['id'],
 			'$block_text' => (($contact['blocked']) ? L10n::t('Unblock') : L10n::t('Block') ),
 			'$ignore_text' => (($contact['readonly']) ? L10n::t('Unignore') : L10n::t('Ignore') ),
-			'$insecure' => (($contact['network'] !== NETWORK_DFRN && $contact['network'] !== NETWORK_MAIL && $contact['network'] !== NETWORK_FACEBOOK && $contact['network'] !== NETWORK_DIASPORA) ? $insecure : ''),
+			'$insecure' => (($contact['network'] !== Protocol::DFRN && $contact['network'] !== Protocol::MAIL && $contact['network'] !== Protocol::DIASPORA) ? $insecure : ''),
 			'$info' => $contact['info'],
 			'$cinfo' => ['info', '', $contact['info'], ''],
 			'$blocked' => (($contact['blocked']) ? L10n::t('Currently blocked') : ''),
@@ -667,7 +688,7 @@ function contacts_content(App $a)
 			'$contact_action_button' => L10n::t("Actions"),
 			'$contact_actions' => $contact_actions,
 			'$contact_status' => L10n::t("Status"),
-			'$contact_settings_label' => L10n::t('Contact Settings'),
+			'$contact_settings_label' => $contact_settings_label,
 			'$contact_profile_label' => L10n::t("Profile"),
 		]);
 
@@ -703,6 +724,8 @@ function contacts_content(App $a)
 		$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']))   : '';
 
@@ -774,21 +797,21 @@ function contacts_content(App $a)
 	if ($search) {
 		$searching = true;
 		$search_hdr = $search;
-		$search_txt = dbesc(protect_sprintf(preg_quote($search)));
+		$search_txt = DBA::escape(protect_sprintf(preg_quote($search)));
 		$sql_extra .= " AND (name REGEXP '$search_txt' OR url REGEXP '$search_txt'  OR nick REGEXP '$search_txt') ";
 	}
 
 	if ($nets) {
-		$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
+		$sql_extra .= sprintf(" AND network = '%s' ", DBA::escape($nets));
 	}
 
-	$sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ", intval($sort_type)) : '');
+	$sql_extra2 = ((($sort_type > 0) && ($sort_type <= Contact::FRIEND)) ? sprintf(" AND `rel` = %d ", intval($sort_type)) : '');
 
 	$r = q("SELECT COUNT(*) AS `total` FROM `contact`
 		WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
 		intval($_SESSION['uid'])
 	);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$a->set_pager_total($r[0]['total']);
 		$total = $r[0]['total'];
 	}
@@ -802,8 +825,10 @@ function contacts_content(App $a)
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
+			$rr['blocked'] = Contact::isBlockedByUser($rr['id'], local_user());
+			$rr['readonly'] = Contact::isIgnoredByUser($rr['id'], local_user());
 			$contacts[] = _contact_detail_for_template($rr);
 		}
 	}
@@ -842,27 +867,35 @@ function contacts_content(App $a)
  * Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends'
  *
  * @param App $a
- * @param int $contact_id The ID of the contact
+ * @param array $contact The contact array
  * @param int $active_tab 1 if tab should be marked as active
  *
  * @return string
  */
-function contacts_tab($a, $contact_id, $active_tab)
+function contacts_tab($a, $contact, $active_tab)
 {
 	// tabs
 	$tabs = [
 		[
 			'label' => L10n::t('Status'),
-			'url'   => "contacts/" . $contact_id . "/posts",
+			'url'   => "contacts/" . $contact['id'] . "/conversations",
 			'sel'   => (($active_tab == 1) ? 'active' : ''),
-			'title' => L10n::t('Status Messages and Posts'),
+			'title' => L10n::t('Conversations started by this contact'),
 			'id'    => 'status-tab',
 			'accesskey' => 'm',
 		],
 		[
-			'label' => L10n::t('Profile'),
-			'url'   => "contacts/" . $contact_id,
+			'label' => L10n::t('Posts and Comments'),
+			'url'   => "contacts/" . $contact['id'] . "/posts",
 			'sel'   => (($active_tab == 2) ? 'active' : ''),
+			'title' => L10n::t('Status Messages and Posts'),
+			'id'    => 'posts-tab',
+			'accesskey' => 'p',
+		],
+		[
+			'label' => L10n::t('Profile'),
+			'url'   => "contacts/" . $contact['id'],
+			'sel'   => (($active_tab == 3) ? 'active' : ''),
 			'title' => L10n::t('Profile Details'),
 			'id'    => 'profile-tab',
 			'accesskey' => 'o',
@@ -870,35 +903,37 @@ function contacts_tab($a, $contact_id, $active_tab)
 	];
 
 	// Show this tab only if there is visible friend list
-	$x = GContact::countAllFriends(local_user(), $contact_id);
+	$x = GContact::countAllFriends(local_user(), $contact['id']);
 	if ($x) {
 		$tabs[] = ['label' => L10n::t('Contacts'),
-			'url'   => "allfriends/" . $contact_id,
-			'sel'   => (($active_tab == 3) ? 'active' : ''),
+			'url'   => "allfriends/" . $contact['id'],
+			'sel'   => (($active_tab == 4) ? 'active' : ''),
 			'title' => L10n::t('View all contacts'),
 			'id'    => 'allfriends-tab',
 			'accesskey' => 't'];
 	}
 
 	// Show this tab only if there is visible common friend list
-	$common = GContact::countCommonFriends(local_user(), $contact_id);
+	$common = GContact::countCommonFriends(local_user(), $contact['id']);
 	if ($common) {
 		$tabs[] = ['label' => L10n::t('Common Friends'),
-			'url'   => "common/loc/" . local_user() . "/" . $contact_id,
-			'sel'   => (($active_tab == 4) ? 'active' : ''),
+			'url'   => "common/loc/" . local_user() . "/" . $contact['id'],
+			'sel'   => (($active_tab == 5) ? 'active' : ''),
 			'title' => L10n::t('View all common friends'),
 			'id'    => 'common-loc-tab',
 			'accesskey' => 'd'
 		];
 	}
 
-	$tabs[] = ['label' => L10n::t('Advanced'),
-		'url'   => 'crepair/' . $contact_id,
-		'sel'   => (($active_tab == 5) ? 'active' : ''),
-		'title' => L10n::t('Advanced Contact Settings'),
-		'id'    => 'advanced-tab',
-		'accesskey' => 'r'
-	];
+	if (!empty($contact['uid'])) {
+		$tabs[] = ['label' => L10n::t('Advanced'),
+			'url'   => 'crepair/' . $contact['id'],
+			'sel'   => (($active_tab == 6) ? 'active' : ''),
+			'title' => L10n::t('Advanced Contact Settings'),
+			'id'    => 'advanced-tab',
+			'accesskey' => 'r'
+		];
+	}
 
 	$tab_tpl = get_markup_template('common_tabs.tpl');
 	$tab_str = replace_macros($tab_tpl, ['$tabs' => $tabs]);
@@ -906,45 +941,106 @@ function contacts_tab($a, $contact_id, $active_tab)
 	return $tab_str;
 }
 
-function contact_posts($a, $contact_id)
+function contact_conversations(App $a, $contact_id, $update)
 {
-	$o = contacts_tab($a, $contact_id, 1);
+	$o = '';
 
-	$contact = dba::selectFirst('contact', ['url'], ['id' => $contact_id]);
-	if (DBM::is_result($contact)) {
+	if (!$update) {
+		// We need the editor here to be able to reshare an item.
+		if (local_user()) {
+			$x = [
+				'is_owner' => true,
+				'allow_location' => $a->user['allow_location'],
+				'default_location' => $a->user['default-location'],
+				'nickname' => $a->user['nickname'],
+				'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
+				'acl' => ACL::getFullSelectorHTML($a->user, true),
+				'bang' => '',
+				'visitor' => 'block',
+				'profile_uid' => local_user(),
+			];
+			$o = status_editor($a, $x, 0, true);
+		}
+	}
+
+	$contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id]);
+
+	if (!$update) {
+		$o .= contacts_tab($a, $contact, 1);
+	}
+
+	if (DBA::isResult($contact)) {
 		$a->page['aside'] = "";
-		Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
+
+		$profiledata = Contact::getDetailsByURL($contact["url"]);
+
+		if (local_user()) {
+			if (in_array($profiledata["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+				$profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
+			}
+		}
+
+		Profile::load($a, "", 0, $profiledata, true);
+		$o .= Contact::getPostsFromUrl($contact["url"], true, $update);
+	}
+
+	return $o;
+}
+
+function contact_posts(App $a, $contact_id)
+{
+	$contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id]);
+
+	$o = contacts_tab($a, $contact, 2);
+
+	if (DBA::isResult($contact)) {
+		$a->page['aside'] = "";
+
+		$profiledata = Contact::getDetailsByURL($contact["url"]);
+
+		if (local_user()) {
+			if (in_array($profiledata["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+				$profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
+			}
+		}
+
+		Profile::load($a, "", 0, $profiledata, true);
 		$o .= Contact::getPostsFromUrl($contact["url"]);
 	}
 
 	return $o;
 }
 
-function _contact_detail_for_template($rr)
+function _contact_detail_for_template(array $rr)
 {
 	$dir_icon = '';
 	$alt_text = '';
+
 	switch ($rr['rel']) {
-		case CONTACT_IS_FRIEND:
+		case Contact::FRIEND:
 			$dir_icon = 'images/lrarrow.gif';
 			$alt_text = L10n::t('Mutual Friendship');
 			break;
-		case CONTACT_IS_FOLLOWER;
+
+		case Contact::FOLLOWER;
 			$dir_icon = 'images/larrow.gif';
 			$alt_text = L10n::t('is a fan of yours');
 			break;
-		case CONTACT_IS_SHARING;
+
+		case Contact::SHARING;
 			$dir_icon = 'images/rarrow.gif';
 			$alt_text = L10n::t('you are a fan of');
 			break;
+
 		default:
 			break;
 	}
-	if (($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) {
-		$url = "redir/{$rr['id']}";
+
+	$url = Contact::magicLink($rr['url']);
+
+	if (strpos($url, 'redir/') === 0) {
 		$sparkle = ' class="sparkle" ';
 	} else {
-		$url = $rr['url'];
 		$sparkle = '';
 	}
 
@@ -962,7 +1058,7 @@ function _contact_detail_for_template($rr)
 		'id' => $rr['id'],
 		'alt_text' => $alt_text,
 		'dir_icon' => $dir_icon,
-		'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
+		'thumb' => ProxyUtils::proxifyUrl($rr['thumb'], false, ProxyUtils::SIZE_THUMB),
 		'name' => htmlentities($rr['name']),
 		'username' => htmlentities($rr['name']),
 		'account_type' => Contact::getAccountType($rr),
@@ -970,6 +1066,7 @@ function _contact_detail_for_template($rr)
 		'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']),
 		'url' => $url,
 		'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
+		'nick' => htmlentities($rr['nick']),
 	];
 }
 
@@ -983,11 +1080,11 @@ function _contact_detail_for_template($rr)
  */
 function contact_actions($contact)
 {
-	$poll_enabled = in_array($contact['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL]);
+	$poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
 	$contact_actions = [];
 
 	// Provide friend suggestion only for Friendica contacts
-	if ($contact['network'] === NETWORK_DFRN) {
+	if ($contact['network'] === Protocol::DFRN) {
 		$contact_actions['suggest'] = [
 			'label' => L10n::t('Suggest friends'),
 			'url'   => 'fsuggest/' . $contact['id'],
@@ -1023,21 +1120,23 @@ function contact_actions($contact)
 		'id'    => 'toggle-ignore',
 	];
 
-	$contact_actions['archive'] = [
-		'label' => (intval($contact['archive']) ? L10n::t('Unarchive') : L10n::t('Archive') ),
-		'url'   => 'contacts/' . $contact['id'] . '/archive',
-		'title' => L10n::t('Toggle Archive status'),
-		'sel'   => (intval($contact['archive']) ? 'active' : ''),
-		'id'    => 'toggle-archive',
-	];
+	if ($contact['uid'] != 0) {
+		$contact_actions['archive'] = [
+			'label' => (intval($contact['archive']) ? L10n::t('Unarchive') : L10n::t('Archive') ),
+			'url'   => 'contacts/' . $contact['id'] . '/archive',
+			'title' => L10n::t('Toggle Archive status'),
+			'sel'   => (intval($contact['archive']) ? 'active' : ''),
+			'id'    => 'toggle-archive',
+		];
 
-	$contact_actions['delete'] = [
-		'label' => L10n::t('Delete'),
-		'url'   => 'contacts/' . $contact['id'] . '/drop',
-		'title' => L10n::t('Delete contact'),
-		'sel'   => '',
-		'id'    => 'delete',
-	];
+		$contact_actions['delete'] = [
+			'label' => L10n::t('Delete'),
+			'url'   => 'contacts/' . $contact['id'] . '/drop',
+			'title' => L10n::t('Delete contact'),
+			'sel'   => '',
+			'id'    => 'delete',
+		];
+	}
 
 	return $contact_actions;
 }
diff --git a/mod/crepair.php b/mod/crepair.php
index 29b00b4e3..076c611db 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -2,10 +2,12 @@
 /**
  * @file mod/crepair.php
  */
+
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 
@@ -19,14 +21,14 @@ function crepair_init(App $a)
 
 	$contact = null;
 	if (($a->argc == 2) && intval($a->argv[1])) {
-		$contact = dba::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]);
+		$contact = DBA::selectFirst('contact', [], ['uid' => local_user(), 'id' => $a->argv[1]]);
 	}
 
 	if (!x($a->page, 'aside')) {
 		$a->page['aside'] = '';
 	}
 
-	if (DBM::is_result($contact)) {
+	if (DBA::isResult($contact)) {
 		$a->data['contact'] = $contact;
 		Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
 	}
@@ -42,10 +44,10 @@ function crepair_post(App $a)
 
 	$contact = null;
 	if ($cid) {
-		$contact = dba::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
+		$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
 	}
 
-	if (!DBM::is_result($contact)) {
+	if (!DBA::isResult($contact)) {
 		return;
 	}
 
@@ -63,15 +65,15 @@ function crepair_post(App $a)
 
 	$r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `url` = '%s', `nurl` = '%s', `request` = '%s', `confirm` = '%s', `notify` = '%s', `poll` = '%s', `attag` = '%s' , `remote_self` = %d
 		WHERE `id` = %d AND `uid` = %d",
-		dbesc($name),
-		dbesc($nick),
-		dbesc($url),
-		dbesc($nurl),
-		dbesc($request),
-		dbesc($confirm),
-		dbesc($notify),
-		dbesc($poll),
-		dbesc($attag),
+		DBA::escape($name),
+		DBA::escape($nick),
+		DBA::escape($url),
+		DBA::escape($nurl),
+		DBA::escape($request),
+		DBA::escape($confirm),
+		DBA::escape($notify),
+		DBA::escape($poll),
+		DBA::escape($attag),
 		intval($remote_self),
 		intval($contact['id']),
 		local_user()
@@ -101,12 +103,12 @@ function crepair_content(App $a)
 
 	$cid = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-		$contact = null;
+	$contact = null;
 	if ($cid) {
-		$contact = dba::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
+		$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]);
 	}
 
-	if (!DBM::is_result($contact)) {
+	if (!DBA::isResult($contact)) {
 		notice(L10n::t('Contact not found.') . EOL);
 		return;
 	}
@@ -121,19 +123,19 @@ function crepair_content(App $a)
 	// Disable remote self for everything except feeds.
 	// There is an issue when you repeat an item from maybe twitter and you got comments from friendica and twitter
 	// Problem is, you couldn't reply to both networks.
-	if (!in_array($contact['network'], [NETWORK_FEED, NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_TWITTER])) {
+	if (!in_array($contact['network'], [Protocol::FEED, Protocol::DFRN, Protocol::DIASPORA, Protocol::TWITTER])) {
 		$allow_remote_self = false;
 	}
 
-	if ($contact['network'] == NETWORK_FEED) {
+	if ($contact['network'] == Protocol::FEED) {
 		$remote_self_options = ['0' => L10n::t('No mirroring'), '1' => L10n::t('Mirror as forwarded posting'), '2' => L10n::t('Mirror as my own posting')];
 	} else {
 		$remote_self_options = ['0' => L10n::t('No mirroring'), '2' => L10n::t('Mirror as my own posting')];
 	}
 
-	$update_profile = in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]);
+	$update_profile = in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]);
 
-	$tab_str = contacts_tab($a, $contact['id'], 5);
+	$tab_str = contacts_tab($a, $contact, 5);
 
 	$tpl = get_markup_template('crepair.tpl');
 	$o = replace_macros($tpl, [
diff --git a/mod/delegate.php b/mod/delegate.php
index 510fc0ec8..ed4f85437 100644
--- a/mod/delegate.php
+++ b/mod/delegate.php
@@ -2,10 +2,12 @@
 /**
  * @file mod/delegate.php
  */
+
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\User;
 
 require_once 'mod/settings.php';
@@ -32,8 +34,8 @@ function delegate_post(App $a)
 	$parent_password = defaults($_POST, 'parent_password', '');
 
 	if ($parent_uid != 0) {
-		$user = dba::selectFirst('user', ['nickname'], ['uid' => $parent_uid]);
-		if (!DBM::is_result($user)) {
+		$user = DBA::selectFirst('user', ['nickname'], ['uid' => $parent_uid]);
+		if (!DBA::isResult($user)) {
 			notice(L10n::t('Parent user not found.') . EOL);
 			return;
 		}
@@ -45,7 +47,7 @@ function delegate_post(App $a)
 		}
 	}
 
-	dba::update('user', ['parent-uid' => $parent_uid], ['uid' => local_user()]);
+	DBA::update('user', ['parent-uid' => $parent_uid], ['uid' => local_user()]);
 }
 
 function delegate_content(App $a)
@@ -63,14 +65,14 @@ function delegate_content(App $a)
 
 		$user_id = $a->argv[2];
 
-		$user = dba::selectFirst('user', ['nickname'], ['uid' => $user_id]);
-		if (DBM::is_result($user)) {
+		$user = DBA::selectFirst('user', ['nickname'], ['uid' => $user_id]);
+		if (DBA::isResult($user)) {
 			$condition = [
 				'uid' => local_user(),
 				'nurl' => normalise_link(System::baseUrl() . '/profile/' . $user['nickname'])
 			];
-			if (dba::exists('contact', $condition)) {
-				dba::insert('manage', ['uid' => $user_id, 'mid' => local_user()]);
+			if (DBA::exists('contact', $condition)) {
+				DBA::insert('manage', ['uid' => $user_id, 'mid' => local_user()]);
 			}
 		}
 		goaway(System::baseUrl() . '/delegate');
@@ -82,7 +84,7 @@ function delegate_content(App $a)
 			goaway(System::baseUrl() . '/delegate');
 		}
 
-		dba::delete('manage', ['uid' => $a->argv[2], 'mid' => local_user()]);
+		DBA::delete('manage', ['uid' => $a->argv[2], 'mid' => local_user()]);
 		goaway(System::baseUrl() . '/delegate');
 	}
 
@@ -91,7 +93,7 @@ function delegate_content(App $a)
 	$r = q("SELECT * FROM `user` WHERE `uid` IN (SELECT `uid` FROM `manage` WHERE `mid` = %d)",
 		intval(local_user())
 	);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$delegates = $r;
 	}
 
@@ -109,21 +111,21 @@ function delegate_content(App $a)
 		AND SUBSTRING_INDEX(`nurl`, '/', 3) = '%s'
 		AND `uid` = %d
 		AND `network` = '%s' ",
-		dbesc(normalise_link(System::baseUrl())),
+		DBA::escape(normalise_link(System::baseUrl())),
 		intval(local_user()),
-		dbesc(NETWORK_DFRN)
+		DBA::escape(Protocol::DFRN)
 	);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$nicknames = [];
 		foreach ($r as $rr) {
-			$nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'";
+			$nicknames[] = "'" . DBA::escape(basename($rr['nurl'])) . "'";
 		}
 
 		$nicks = implode(',', $nicknames);
 
 		// get user records for all potential page delegates who are not already delegates or managers
 		$r = q("SELECT `uid`, `username`, `nickname` FROM `user` WHERE `nickname` IN ($nicks)");
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r as $rr) {
 				if (!in_array($rr['uid'], $uids)) {
 					$potentials[] = $rr;
@@ -134,19 +136,19 @@ function delegate_content(App $a)
 
 	settings_init($a);
 
-	$user = dba::selectFirst('user', ['parent-uid', 'email'], ['uid' => local_user()]);
+	$user = DBA::selectFirst('user', ['parent-uid', 'email'], ['uid' => local_user()]);
 
 	$parent_user = null;
 
-	if (DBM::is_result($user)) {
-		if (!dba::exists('user', ['parent-uid' => local_user()])) {
+	if (DBA::isResult($user)) {
+		if (!DBA::exists('user', ['parent-uid' => local_user()])) {
 			$parent_uid = $user['parent-uid'];
 			$parents = [0 => L10n::t('No parent user')];
 
 			$fields = ['uid', 'username', 'nickname'];
 			$condition = ['email' => $user['email'], 'verified' => true, 'blocked' => false, 'parent-uid' => 0];
-			$parent_users = dba::select('user', $fields, $condition);
-			while ($parent = dba::fetch($parent_users)) {
+			$parent_users = DBA::select('user', $fields, $condition);
+			while ($parent = DBA::fetch($parent_users)) {
 				if ($parent['uid'] != local_user()) {
 					$parents[$parent['uid']] = sprintf('%s (%s)', $parent['username'], $parent['nickname']);
 				}
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 0bcf13785..41b5e0ef5 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -20,13 +20,11 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
-use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
@@ -69,8 +67,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			return;
 		}
 
-		$user = dba::selectFirst('user', [], ['uid' => $uid]);
-		if (!DBM::is_result($user)) {
+		$user = DBA::selectFirst('user', [], ['uid' => $uid]);
+		if (!DBA::isResult($user)) {
 			notice(L10n::t('Profile not found.') . EOL);
 			return;
 		}
@@ -120,11 +118,11 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			AND `uid` = %d
 			AND `duplex` = 0
 			LIMIT 1",
-			dbesc($dfrn_id),
+			DBA::escape($dfrn_id),
 			intval($cid),
 			intval($uid)
 		);
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			logger('Contact not found in DB.');
 			notice(L10n::t('Contact not found.') . EOL);
 			notice(L10n::t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL);
@@ -139,13 +137,13 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 		$dfrn_confirm = $contact['confirm'];
 		$aes_allow    = $contact['aes_allow'];
 
-		$network = ((strlen($contact['issued-id'])) ? NETWORK_DFRN : NETWORK_OSTATUS);
+		$network = ((strlen($contact['issued-id'])) ? Protocol::DFRN : Protocol::OSTATUS);
 
 		if ($contact['network']) {
 			$network = $contact['network'];
 		}
 
-		if ($network === NETWORK_DFRN) {
+		if ($network === Protocol::DFRN) {
 			/*
 			 * Generate a key pair for all further communications with this person.
 			 * We have a keypair for every contact, and a site key for unknown people.
@@ -160,7 +158,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 
 			// Save the private key. Send them the public key.
 			q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d",
-				dbesc($private_key),
+				DBA::escape($private_key),
 				intval($contact_id),
 				intval($uid)
 			);
@@ -204,11 +202,11 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 				$params['duplex'] = 1;
 			}
 
-			if ($user['page-flags'] == PAGE_COMMUNITY) {
+			if ($user['page-flags'] == Contact::PAGE_COMMUNITY) {
 				$params['page'] = 1;
 			}
 
-			if ($user['page-flags'] == PAGE_PRVGROUP) {
+			if ($user['page-flags'] == Contact::PAGE_PRVGROUP) {
 				$params['page'] = 2;
 			}
 
@@ -249,6 +247,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 
 			if (stristr($res, "<status") === false) {
 				// wrong xml! stop here!
+				logger('Unexpected response posting to ' . $dfrn_confirm);
 				notice(L10n::t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res) . EOL);
 				return;
 			}
@@ -264,7 +263,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 					// birthday paradox - generate new dfrn-id and fall through.
 					$new_dfrn_id = random_string();
 					q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d",
-						dbesc($new_dfrn_id),
+						DBA::escape($new_dfrn_id),
 						intval($contact_id),
 						intval($uid)
 					);
@@ -282,13 +281,13 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			}
 
 			if (($status == 0) && $intro_id) {
-				$intro = dba::selectFirst('intro', ['note'], ['id' => $intro_id]);
-				if (DBM::is_result($intro)) {
-					dba::update('contact', ['reason' => $intro['note']], ['id' => $contact_id]);
+				$intro = DBA::selectFirst('intro', ['note'], ['id' => $intro_id]);
+				if (DBA::isResult($intro)) {
+					DBA::update('contact', ['reason' => $intro['note']], ['id' => $contact_id]);
 				}
 
 				// Success. Delete the notification.
-				dba::delete('intro', ['id' => $intro_id]);
+				DBA::delete('intro', ['id' => $intro_id]);
 			}
 
 			if ($status != 0) {
@@ -307,13 +306,14 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 
 		logger('dfrn_confirm: confirm - imported photos');
 
-		if ($network === NETWORK_DFRN) {
-			$new_relation = CONTACT_IS_FOLLOWER;
-			if (($relation == CONTACT_IS_SHARING) || ($duplex)) {
-				$new_relation = CONTACT_IS_FRIEND;
+		if ($network === Protocol::DFRN) {
+			$new_relation = Contact::FOLLOWER;
+
+			if (($relation == Contact::SHARING) || ($duplex)) {
+				$new_relation = Contact::FRIEND;
 			}
 
-			if (($relation == CONTACT_IS_SHARING) && ($duplex)) {
+			if (($relation == Contact::SHARING) && ($duplex)) {
 				$duplex = 0;
 			}
 
@@ -327,16 +327,16 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 				`network` = '%s' WHERE `id` = %d
 			",
 				intval($new_relation),
-				dbesc(DateTimeFormat::utcNow()),
-				dbesc(DateTimeFormat::utcNow()),
+				DBA::escape(DateTimeFormat::utcNow()),
+				DBA::escape(DateTimeFormat::utcNow()),
 				intval($duplex),
 				intval($hidden),
-				dbesc(NETWORK_DFRN),
+				DBA::escape(Protocol::DFRN),
 				intval($contact_id)
 			);
 		} else {
-			// $network !== NETWORK_DFRN
-			$network = defaults($contact, 'network', NETWORK_OSTATUS);
+			// $network !== Protocol::DFRN
+			$network = defaults($contact, 'network', Protocol::OSTATUS);
 
 			$arr = Probe::uri($contact['url']);
 
@@ -348,19 +348,19 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			$new_relation = $contact['rel'];
 			$writable = $contact['writable'];
 
-			if ($network === NETWORK_DIASPORA) {
+			if ($network === Protocol::DIASPORA) {
 				if ($duplex) {
-					$new_relation = CONTACT_IS_FRIEND;
+					$new_relation = Contact::FRIEND;
 				} else {
-					$new_relation = CONTACT_IS_FOLLOWER;
+					$new_relation = Contact::FOLLOWER;
 				}
 
-				if ($new_relation != CONTACT_IS_FOLLOWER) {
+				if ($new_relation != Contact::FOLLOWER) {
 					$writable = 1;
 				}
 			}
 
-			dba::delete('intro', ['id' => $intro_id]);
+			DBA::delete('intro', ['id' => $intro_id]);
 
 			$r = q("UPDATE `contact` SET `name-date` = '%s',
 				`uri-date` = '%s',
@@ -375,12 +375,12 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 				`rel` = %d
 				WHERE `id` = %d
 			",
-				dbesc(DateTimeFormat::utcNow()),
-				dbesc(DateTimeFormat::utcNow()),
-				dbesc($addr),
-				dbesc($notify),
-				dbesc($poll),
-				dbesc($network),
+				DBA::escape(DateTimeFormat::utcNow()),
+				DBA::escape(DateTimeFormat::utcNow()),
+				DBA::escape($addr),
+				DBA::escape($notify),
+				DBA::escape($poll),
+				DBA::escape($network),
 				intval($writable),
 				intval($hidden),
 				intval($new_relation),
@@ -388,14 +388,14 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			);
 		}
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			notice(L10n::t('Unable to set contact photo.') . EOL);
 		}
 
 		// reload contact info
-		$contact = dba::selectFirst('contact', [], ['id' => $contact_id]);
-		if ((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
-			if (DBM::is_result($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
+		$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
+		if ((isset($new_relation) && $new_relation == Contact::FRIEND)) {
+			if (DBA::isResult($contact) && ($contact['network'] === Protocol::DIASPORA)) {
 				$ret = Diaspora::sendShare($user, $contact);
 				logger('share returns: ' . $ret);
 			}
@@ -445,8 +445,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 		}
 
 		// Find our user's account
-		$user = dba::selectFirst('user', [], ['nickname' => $node]);
-		if (!DBM::is_result($user)) {
+		$user = DBA::selectFirst('user', [], ['nickname' => $node]);
+		if (!DBA::isResult($user)) {
 			$message = L10n::t('No user record found for \'%s\' ', $node);
 			System::xmlExit(3, $message); // failure
 			// NOTREACHED
@@ -473,16 +473,16 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			// NOTREACHED
 		}
 
-		$contact = dba::selectFirst('contact', [], ['url' => $decrypted_source_url, 'uid' => $local_uid]);
-		if (!DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', [], ['url' => $decrypted_source_url, 'uid' => $local_uid]);
+		if (!DBA::isResult($contact)) {
 			if (strstr($decrypted_source_url, 'http:')) {
 				$newurl = str_replace('http:', 'https:', $decrypted_source_url);
 			} else {
 				$newurl = str_replace('https:', 'http:', $decrypted_source_url);
 			}
 
-			$contact = dba::selectFirst('contact', [], ['url' => $newurl, 'uid' => $local_uid]);
-			if (!DBM::is_result($contact)) {
+			$contact = DBA::selectFirst('contact', [], ['url' => $newurl, 'uid' => $local_uid]);
+			if (!DBA::isResult($contact)) {
 				// this is either a bogus confirmation (?) or we deleted the original introduction.
 				$message = L10n::t('Contact record was not found for you on our site.');
 				System::xmlExit(3, $message);
@@ -513,18 +513,18 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			$dfrn_pubkey = $public_key;
 		}
 
-		if (dba::exists('contact', ['dfrn-id' => $decrypted_dfrn_id])) {
+		if (DBA::exists('contact', ['dfrn-id' => $decrypted_dfrn_id])) {
 			$message = L10n::t('The ID provided by your system is a duplicate on our system. It should work if you try again.');
 			System::xmlExit(1, $message); // Birthday paradox - duplicate dfrn-id
 			// NOTREACHED
 		}
 
 		$r = q("UPDATE `contact` SET `dfrn-id` = '%s', `pubkey` = '%s' WHERE `id` = %d",
-			dbesc($decrypted_dfrn_id),
-			dbesc($dfrn_pubkey),
+			DBA::escape($decrypted_dfrn_id),
+			DBA::escape($dfrn_pubkey),
 			intval($dfrn_record)
 		);
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			$message = L10n::t('Unable to set your contact credentials on our system.');
 			System::xmlExit(3, $message);
 		}
@@ -539,8 +539,8 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 		}
 
 		// We're good but now we have to scrape the profile photo and send notifications.
-		$contact = dba::selectFirst('contact', ['photo'], ['id' => $dfrn_record]);
-		if (DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', ['photo'], ['id' => $dfrn_record]);
+		if (DBA::isResult($contact)) {
 			$photo = $contact['photo'];
 		} else {
 			$photo = System::baseUrl() . '/images/person-175.jpg';
@@ -550,12 +550,13 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 
 		logger('dfrn_confirm: request - photos imported');
 
-		$new_relation = CONTACT_IS_SHARING;
-		if (($relation == CONTACT_IS_FOLLOWER) || ($duplex)) {
-			$new_relation = CONTACT_IS_FRIEND;
+		$new_relation = Contact::SHARING;
+
+		if (($relation == Contact::FOLLOWER) || ($duplex)) {
+			$new_relation = Contact::FRIEND;
 		}
 
-		if (($relation == CONTACT_IS_FOLLOWER) && ($duplex)) {
+		if (($relation == Contact::FOLLOWER) && ($duplex)) {
 			$duplex = 0;
 		}
 
@@ -571,15 +572,15 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			`network` = '%s' WHERE `id` = %d
 		",
 			intval($new_relation),
-			dbesc(DateTimeFormat::utcNow()),
-			dbesc(DateTimeFormat::utcNow()),
+			DBA::escape(DateTimeFormat::utcNow()),
+			DBA::escape(DateTimeFormat::utcNow()),
 			intval($duplex),
 			intval($forum),
 			intval($prv),
-			dbesc(NETWORK_DFRN),
+			DBA::escape(Protocol::DFRN),
 			intval($dfrn_record)
 		);
-		if (!DBM::is_result($r)) {	// indicates schema is messed up or total db failure
+		if (!DBA::isResult($r)) {	// indicates schema is messed up or total db failure
 			$message = L10n::t('Unable to update your contact profile details on our system');
 			System::xmlExit(3, $message);
 		}
@@ -597,11 +598,11 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 			LIMIT 1",
 			intval($dfrn_record)
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$combined = $r[0];
 
 			if ($combined['notify-flags'] & NOTIFY_CONFIRM) {
-				$mutual = ($new_relation == CONTACT_IS_FRIEND);
+				$mutual = ($new_relation == Contact::FRIEND);
 				notification([
 					'type'         => NOTIFY_CONFIRM,
 					'notify_flags' => $combined['notify-flags'],
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 10a0a792a..8a53ac09b 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -9,7 +9,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
@@ -26,8 +26,8 @@ function dfrn_notify_post(App $a) {
 		if (is_object($data)) {
 			$nick = defaults($a->argv, 1, '');
 
-			$user = dba::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
-			if (!DBM::is_result($user)) {
+			$user = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
+			if (!DBA::isResult($user)) {
 				System::httpExit(500);
 			}
 			dfrn_dispatch_private($user, $postdata);
@@ -62,65 +62,49 @@ function dfrn_notify_post(App $a) {
 		$dfrn_id = substr($dfrn_id, 2);
 	}
 
-	if (!dba::exists('challenge', ['dfrn-id' => $dfrn_id, 'challenge' => $challenge])) {
+	if (!DBA::exists('challenge', ['dfrn-id' => $dfrn_id, 'challenge' => $challenge])) {
 		logger('could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
 		System::xmlExit(3, 'Could not match challenge');
 	}
 
-	dba::delete('challenge', ['dfrn-id' => $dfrn_id, 'challenge' => $challenge]);
+	DBA::delete('challenge', ['dfrn-id' => $dfrn_id, 'challenge' => $challenge]);
+
+	$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
+	if (!DBA::isResult($user)) {
+		logger('User not found for nickname ' . $a->argv[1]);
+		System::xmlExit(3, 'User not found');
+	}
 
 	// find the local user who owns this relationship.
-
-	$sql_extra = '';
+	$condition = [];
 	switch ($direction) {
 		case (-1):
-			$sql_extra = sprintf(" AND ( `issued-id` = '%s' OR `dfrn-id` = '%s' ) ", dbesc($dfrn_id), dbesc($dfrn_id));
+			$condition = ["(`issued-id` = ? OR `dfrn-id` = ?) AND `uid` = ?", $dfrn_id, $dfrn_id, $user['uid']];
 			break;
 		case 0:
-			$sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+			$condition = ['issued-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 			break;
 		case 1:
-			$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+			$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 			break;
 		default:
 			System::xmlExit(3, 'Invalid direction');
 			break; // NOTREACHED
 	}
 
-	/*
-	 * be careful - $importer will contain both the contact information for the contact
-	 * sending us the post, and also the user information for the person receiving it.
-	 * since they are mixed together, it is easy to get them confused.
-	 */
-
-	$r = q("SELECT	`contact`.*, `contact`.`uid` AS `importer_uid`,
-					`contact`.`pubkey` AS `cpubkey`,
-					`contact`.`prvkey` AS `cprvkey`,
-					`contact`.`thumb` AS `thumb`,
-					`contact`.`url` as `url`,
-					`contact`.`name` as `senderName`,
-					`user`.*
-			FROM `contact`
-			LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
-			WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-				AND `user`.`nickname` = '%s' AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $sql_extra LIMIT 1",
-		dbesc($a->argv[1])
-	);
-
-	if (!DBM::is_result($r)) {
+	$contact = DBA::selectFirst('contact', ['id'], $condition);
+	if (!DBA::isResult($contact)) {
 		logger('contact not found for dfrn_id ' . $dfrn_id);
 		System::xmlExit(3, 'Contact not found');
-		//NOTREACHED
 	}
 
 	// $importer in this case contains the contact record for the remote contact joined with the user record of our user.
-
-	$importer = $r[0];
+	$importer = DFRN::getImporter($contact['id'], $user['uid']);
 
 	if ((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $forum) || ($importer['prv'] != $prv)) {
 		$fields = ['writable' => ($writable == (-1)) ? $importer['writable'] : $writable,
 			'forum' => $forum, 'prv' => $prv];
-		dba::update('contact', $fields, ['id' => $importer['id']]);
+		DBA::update('contact', $fields, ['id' => $importer['id']]);
 
 		if ($writable != (-1)) {
 			$importer['writable'] = $writable;
@@ -198,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;
@@ -211,16 +195,10 @@ function dfrn_dispatch_public($postdata)
 		System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
 	}
 
-	// We now have some contact, so we fetch it
-	$importer = dba::fetch_first("SELECT *, `name` as `senderName`
-					FROM `contact`
-					WHERE NOT `blocked` AND `id` = ? LIMIT 1",
-					$contact['id']);
-
-	$importer['importer_uid']  = 0;
+	$importer = DFRN::getImporter($contact['id']);
 
 	// This should never fail
-	if (!DBM::is_result($importer)) {
+	if (empty($importer)) {
 		logger('Contact not found for address ' . $msg['author']);
 		System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
 	}
@@ -250,21 +228,14 @@ function dfrn_dispatch_private($user, $postdata)
 		}
 	}
 
-	// We now have some contact, so we fetch it
-	$importer = dba::fetch_first("SELECT *, `name` as `senderName`
-					FROM `contact`
-					WHERE NOT `blocked` AND `id` = ? LIMIT 1",
-					$cid);
+	$importer = DFRN::getImporter($cid, $user['uid']);
 
 	// This should never fail
-	if (!DBM::is_result($importer)) {
+	if (empty($importer)) {
 		logger('Contact not found for address ' . $msg['author']);
 		System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
 	}
 
-	// Set the user id. This is important if this is a public contact
-	$importer['importer_uid']  = $user['uid'];
-
 	logger('Importing post from ' . $msg['author'] . ' to ' . $user['nickname'] . ' with the private envelope.', LOGGER_DEBUG);
 
 	// Now we should be able to import it
@@ -299,52 +270,61 @@ function dfrn_notify_content(App $a) {
 
 		$status = 0;
 
-		dba::delete('challenge', ["`expire` < ?", time()]);
+		DBA::delete('challenge', ["`expire` < ?", time()]);
 
 		$fields = ['challenge' => $hash, 'dfrn-id' => $dfrn_id, 'expire' => time() + 90,
 			'type' => $type, 'last_update' => $last_update];
-		dba::insert('challenge', $fields);
+		DBA::insert('challenge', $fields);
 
 		logger('challenge=' . $hash, LOGGER_DATA);
 
-		$sql_extra = '';
-		switch($direction) {
+		$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
+		if (!DBA::isResult($user)) {
+			logger('User not found for nickname ' . $a->argv[1]);
+			killme();
+		}
+
+		$condition = [];
+		switch ($direction) {
 			case (-1):
-				$sql_extra = sprintf(" AND (`issued-id` = '%s' OR `dfrn-id` = '%s') ", dbesc($dfrn_id), dbesc($dfrn_id));
+				$condition = ["(`issued-id` = ? OR `dfrn-id` = ?) AND `uid` = ?", $dfrn_id, $dfrn_id, $user['uid']];
 				$my_id = $dfrn_id;
 				break;
 			case 0:
-				$sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+				$condition = ['issued-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 				$my_id = '1:' . $dfrn_id;
 				break;
 			case 1:
-				$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+				$condition = ['dfrn-id' => $dfrn_id, 'duplex' => true, 'uid' => $user['uid']];
 				$my_id = '0:' . $dfrn_id;
 				break;
 			default:
 				$status = 1;
-				break; // NOTREACHED
+				break;
 		}
 
-		$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`page-flags` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
-				WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `user`.`nickname` = '%s'
-				AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $sql_extra LIMIT 1",
-				dbesc($a->argv[1])
-		);
-
-		if (!DBM::is_result($r)) {
-			$status = 1;
+		$contact = DBA::selectFirst('contact', ['id'], $condition);
+		if (!DBA::isResult($contact)) {
+			logger('contact not found for dfrn_id ' . $dfrn_id);
+			System::xmlExit(3, 'Contact not found');
 		}
 
-		logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DATA);
+		// $importer in this case contains the contact record for the remote contact joined with the user record of our user.
+		$importer = DFRN::getImporter($contact['id'], $user['uid']);
+		if (empty($importer)) {
+			logger('No importer data found for user ' . $a->argv[1] . ' and contact ' . $dfrn_id);
+			killme();
+		}
+
+		logger("Remote rino version: ".$rino_remote." for ".$importer["url"], LOGGER_DATA);
 
 		$challenge    = '';
 		$encrypted_id = '';
 		$id_str       = $my_id . '.' . mt_rand(1000,9999);
 
-		$prv_key = trim($r[0]['prvkey']);
-		$pub_key = trim($r[0]['pubkey']);
-		$dplx    = intval($r[0]['duplex']);
+		$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))) {
 			openssl_private_encrypt($hash, $challenge, $prv_key);
@@ -372,7 +352,7 @@ function dfrn_notify_content(App $a) {
 			$rino = $rino_remote;
 		}
 
-		if (($r[0]['rel'] && ($r[0]['rel'] != CONTACT_IS_SHARING)) || ($r[0]['page-flags'] == PAGE_COMMUNITY)) {
+		if (($importer['rel'] && ($importer['rel'] != Contact::SHARING)) || ($importer['page-flags'] == Contact::PAGE_COMMUNITY)) {
 			$perm = 'rw';
 		} else {
 			$perm = 'r';
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 5074c0dce..54539ee03 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -3,11 +3,12 @@
 /**
  * @file mod/dfrn_poll.php
  */
+
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Module\Login;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
@@ -31,7 +32,8 @@ function dfrn_poll_init(App $a)
 	$quiet			 = x($_GET, 'quiet');
 
 	// Possibly it is an OStatus compatible server that requests a user feed
-	if (($a->argc > 1) && ($dfrn_id == '') && !strstr($_SERVER["HTTP_USER_AGENT"], 'Friendica')) {
+	$user_agent = defaults($_SERVER, 'HTTP_USER_AGENT', '');
+	if (($a->argc > 1) && ($dfrn_id == '') && !strstr($user_agent, 'Friendica')) {
 		$nickname = $a->argv[1];
 		header("Content-type: application/atom+xml");
 		echo OStatus::feed($nickname, $last_update, 10);
@@ -55,7 +57,7 @@ function dfrn_poll_init(App $a)
 		$user = '';
 		if ($a->argc > 1) {
 			$r = q("SELECT `hidewall`,`nickname` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
-				dbesc($a->argv[1])
+				DBA::escape($a->argv[1])
 			);
 			if (!$r) {
 				System::httpExit(404);
@@ -76,15 +78,15 @@ function dfrn_poll_init(App $a)
 		$sql_extra = '';
 		switch ($direction) {
 			case -1:
-				$sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id), dbesc($dfrn_id));
+				$sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", DBA::escape($dfrn_id), DBA::escape($dfrn_id));
 				$my_id = $dfrn_id;
 				break;
 			case 0:
-				$sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+				$sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
 				$my_id = '1:' . $dfrn_id;
 				break;
 			case 1:
-				$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+				$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
 				$my_id = '0:' . $dfrn_id;
 				break;
 			default:
@@ -96,10 +98,10 @@ function dfrn_poll_init(App $a)
 			FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
 			WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 			AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
-			dbesc($a->argv[1])
+			DBA::escape($a->argv[1])
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$s = Network::fetchUrl($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
 
 			logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
@@ -119,6 +121,7 @@ function dfrn_poll_init(App $a)
 					$_SESSION['visitor_home'] = $r[0]['url'];
 					$_SESSION['visitor_handle'] = $r[0]['addr'];
 					$_SESSION['visitor_visiting'] = $r[0]['uid'];
+					$_SESSION['my_url'] = $r[0]['url'];
 					if (!$quiet) {
 						info(L10n::t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
 					}
@@ -127,8 +130,8 @@ function dfrn_poll_init(App $a)
 					$session_id = session_id();
 					$expire = time() + 86400;
 					q("UPDATE `session` SET `expire` = '%s' WHERE `sid` = '%s'",
-						dbesc($expire),
-						dbesc($session_id)
+						DBA::escape($expire),
+						DBA::escape($session_id)
 					);
 				}
 			}
@@ -140,11 +143,11 @@ function dfrn_poll_init(App $a)
 
 	if ($type === 'profile-check' && $dfrn_version < 2.2) {
 		if ((strlen($challenge)) && (strlen($sec))) {
-			dba::delete('profile_check', ["`expire` < ?", time()]);
+			DBA::delete('profile_check', ["`expire` < ?", time()]);
 			$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
-				dbesc($sec)
+				DBA::escape($sec)
 			);
-			if (!DBM::is_result($r)) {
+			if (!DBA::isResult($r)) {
 				System::xmlExit(3, 'No ticket');
 				// NOTREACHED
 			}
@@ -157,7 +160,7 @@ function dfrn_poll_init(App $a)
 			$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 				intval($r[0]['cid'])
 			);
-			if (!DBM::is_result($c)) {
+			if (!DBA::isResult($c)) {
 				System::xmlExit(3, 'No profile');
 			}
 
@@ -205,10 +208,10 @@ function dfrn_poll_init(App $a)
 					break;
 			}
 
-			dba::delete('profile_check', ["`expire` < ?", time()]);
+			DBA::delete('profile_check', ["`expire` < ?", time()]);
 			$r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC",
-				dbesc($dfrn_id));
-			if (DBM::is_result($r)) {
+				DBA::escape($dfrn_id));
+			if (DBA::isResult($r)) {
 				System::xmlExit(1);
 				return; // NOTREACHED
 			}
@@ -232,11 +235,11 @@ function dfrn_poll_post(App $a)
 		if (strlen($challenge) && strlen($sec)) {
 			logger('dfrn_poll: POST: profile-check');
 
-			dba::delete('profile_check', ["`expire` < ?", time()]);
+			DBA::delete('profile_check', ["`expire` < ?", time()]);
 			$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
-				dbesc($sec)
+				DBA::escape($sec)
 			);
-			if (!DBM::is_result($r)) {
+			if (!DBA::isResult($r)) {
 				System::xmlExit(3, 'No ticket');
 				// NOTREACHED
 			}
@@ -249,7 +252,7 @@ function dfrn_poll_post(App $a)
 			$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 				intval($r[0]['cid'])
 			);
-			if (!DBM::is_result($c)) {
+			if (!DBA::isResult($c)) {
 				System::xmlExit(3, 'No profile');
 			}
 
@@ -294,31 +297,31 @@ function dfrn_poll_post(App $a)
 	}
 
 	$r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1",
-		dbesc($dfrn_id),
-		dbesc($challenge)
+		DBA::escape($dfrn_id),
+		DBA::escape($challenge)
 	);
 
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		killme();
 	}
 
 	$type = $r[0]['type'];
 	$last_update = $r[0]['last_update'];
 
-	dba::delete('challenge', ['dfrn-id' => $dfrn_id, 'challenge' => $challenge]);
+	DBA::delete('challenge', ['dfrn-id' => $dfrn_id, 'challenge' => $challenge]);
 
 	$sql_extra = '';
 	switch ($direction) {
 		case -1:
-			$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
+			$sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id));
 			$my_id = $dfrn_id;
 			break;
 		case 0:
-			$sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+			$sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
 			$my_id = '1:' . $dfrn_id;
 			break;
 		case 1:
-			$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+			$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
 			$my_id = '0:' . $dfrn_id;
 			break;
 		default:
@@ -327,7 +330,7 @@ function dfrn_poll_post(App $a)
 	}
 
 	$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		killme();
 	}
 
@@ -337,13 +340,13 @@ function dfrn_poll_post(App $a)
 
 	if ($type === 'reputation' && strlen($url)) {
 		$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
-			dbesc($url),
+			DBA::escape($url),
 			intval($owner_uid)
 		);
 		$reputation = 0;
 		$text = '';
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$reputation = $r[0]['rating'];
 			$text = $r[0]['reason'];
 
@@ -410,16 +413,16 @@ function dfrn_poll_content(App $a)
 
 		$status = 0;
 
-		dba::delete('challenge', ["`expire` < ?", time()]);
+		DBA::delete('challenge', ["`expire` < ?", time()]);
 
 		if ($type !== 'profile') {
 			$r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
 				VALUES( '%s', '%s', '%s', '%s', '%s' ) ",
-				dbesc($hash),
-				dbesc($dfrn_id),
+				DBA::escape($hash),
+				DBA::escape($dfrn_id),
 				intval(time() + 60 ),
-				dbesc($type),
-				dbesc($last_update)
+				DBA::escape($type),
+				DBA::escape($last_update)
 			);
 		}
 
@@ -427,19 +430,19 @@ function dfrn_poll_content(App $a)
 		switch ($direction) {
 			case -1:
 				if ($type === 'profile') {
-					$sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id), dbesc($dfrn_id));
+					$sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", DBA::escape($dfrn_id), DBA::escape($dfrn_id));
 				} else {
-					$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
+					$sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id));
 				}
 
 				$my_id = $dfrn_id;
 				break;
 			case 0:
-				$sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+				$sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
 				$my_id = '1:' . $dfrn_id;
 				break;
 			case 1:
-				$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+				$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
 				$my_id = '0:' . $dfrn_id;
 				break;
 			default:
@@ -453,9 +456,9 @@ function dfrn_poll_content(App $a)
 			FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
 			WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 			AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
-			dbesc($nickname)
+			DBA::escape($nickname)
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$challenge = '';
 			$encrypted_id = '';
 			$id_str = $my_id . '.' . mt_rand(1000, 9999);
@@ -477,6 +480,12 @@ function dfrn_poll_content(App $a)
 		}
 
 		if (($type === 'profile') && (strlen($sec))) {
+			// heluecht: I don't know why we don't fail immediately when the user or contact hadn't been found.
+			// Since it doesn't make sense to continue from this point on, we now fail here. This should be safe.
+			if (!DBA::isResult($r)) {
+				System::httpExit(404, ["title" => L10n::t('Page not found.')]);
+			}
+
 			// URL reply
 			if ($dfrn_version < 2.2) {
 				$s = Network::fetchUrl($r[0]['poll']
@@ -496,7 +505,7 @@ function dfrn_poll_content(App $a)
 				]);
 			}
 
-			$profile = ((DBM::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
+			$profile = ((DBA::isResult($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
 
 			switch ($destination_url) {
 				case 'profile':
@@ -535,6 +544,7 @@ function dfrn_poll_content(App $a)
 					$_SESSION['visitor_id'] = $r[0]['id'];
 					$_SESSION['visitor_home'] = $r[0]['url'];
 					$_SESSION['visitor_visiting'] = $r[0]['uid'];
+					$_SESSION['my_url'] = $r[0]['url'];
 					if (!$quiet) {
 						info(L10n::t('%1$s welcomes %2$s', $r[0]['username'], $r[0]['name']) . EOL);
 					}
@@ -543,8 +553,8 @@ function dfrn_poll_content(App $a)
 					$session_id = session_id();
 					$expire = time() + 86400;
 					q("UPDATE `session` SET `expire` = '%s' WHERE `sid` = '%s'",
-						dbesc($expire),
-						dbesc($session_id)
+						DBA::escape($expire),
+						DBA::escape($session_id)
 					);
 				}
 
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index ae6017d14..25fe69066 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -15,9 +15,9 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Profile;
@@ -85,10 +85,10 @@ function dfrn_request_post(App $a)
 				// Lookup the contact based on their URL (which is the only unique thing we have at the moment)
 				$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1",
 					intval(local_user()),
-					dbesc(normalise_link($dfrn_url))
+					DBA::escape(normalise_link($dfrn_url))
 				);
 
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					if (strlen($r[0]['dfrn-id'])) {
 						// We don't need to be here. It has already happened.
 						notice(L10n::t("This introduction has already been accepted.") . EOL);
@@ -130,16 +130,16 @@ function dfrn_request_post(App $a)
 					$photo = $parms["photo"];
 
 					// Escape the entire array
-					DBM::esc_array($parms);
+					DBA::escapeArray($parms);
 
 					// Create a contact record on our site for the other person
 					$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`,
-						`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`)
-						VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
+						`request`, `confirm`, `notify`, `poll`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`)
+						VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
 						intval(local_user()),
 						DateTimeFormat::utcNow(),
-						dbesc($dfrn_url),
-						dbesc(normalise_link($dfrn_url)),
+						DBA::escape($dfrn_url),
+						DBA::escape(normalise_link($dfrn_url)),
 						$parms['addr'],
 						$parms['fn'],
 						$parms['nick'],
@@ -149,8 +149,7 @@ function dfrn_request_post(App $a)
 						$parms['dfrn-confirm'],
 						$parms['dfrn-notify'],
 						$parms['dfrn-poll'],
-						$parms['dfrn-poco'],
-						dbesc(NETWORK_DFRN),
+						DBA::escape(Protocol::DFRN),
 						intval($aes_allow),
 						intval($hidden),
 						intval($blocked),
@@ -164,10 +163,10 @@ function dfrn_request_post(App $a)
 
 				$r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1",
 					intval(local_user()),
-					dbesc($dfrn_url),
+					DBA::escape($dfrn_url),
 					$parms['key'] // this was already escaped
 				);
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					Group::addMember(User::getDefaultGroup(local_user(), $r[0]["network"]), $r[0]['id']);
 
 					if (isset($photo)) {
@@ -189,7 +188,6 @@ function dfrn_request_post(App $a)
 				}
 
 				// (ignore reply, nothing we can do it failed)
-				// Old: goaway(Profile::zrl($dfrn_url));
 				goaway($forwardurl);
 				return; // NOTREACHED
 			}
@@ -241,10 +239,10 @@ function dfrn_request_post(App $a)
 		// Block friend request spam
 		if ($maxreq) {
 			$r = q("SELECT * FROM `intro` WHERE `datetime` > '%s' AND `uid` = %d",
-				dbesc(DateTimeFormat::utc('now - 24 hours')),
+				DBA::escape(DateTimeFormat::utc('now - 24 hours')),
 				intval($uid)
 			);
-			if (DBM::is_result($r) && count($r) > $maxreq) {
+			if (DBA::isResult($r) && count($r) > $maxreq) {
 				notice(L10n::t('%s has received too many connection requests today.', $a->profile['name']) . EOL);
 				notice(L10n::t('Spam protection measures have been invoked.') . EOL);
 				notice(L10n::t('Friends are advised to please try again in 24 hours.') . EOL);
@@ -260,12 +258,12 @@ function dfrn_request_post(App $a)
 			WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0
 			AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE "
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r as $rr) {
 				if (!$rr['rel']) {
-					dba::delete('contact', ['id' => $rr['cid'], 'self' => false]);
+					DBA::delete('contact', ['id' => $rr['cid'], 'self' => false]);
 				}
-				dba::delete('intro', ['id' => $rr['iid']]);
+				DBA::delete('intro', ['id' => $rr['iid']]);
 			}
 		}
 
@@ -290,28 +288,28 @@ function dfrn_request_post(App $a)
 			// Every time we detect the remote subscription we define this as OStatus.
 			// We do this even if it is not OStatus.
 			// we only need to pass this through another section of the code.
-			if ($network != NETWORK_DIASPORA) {
-				$network = NETWORK_OSTATUS;
+			if ($network != Protocol::DIASPORA) {
+				$network = Protocol::OSTATUS;
 			}
 
 			$url = substr($url, 5);
 		} else {
-			$network = NETWORK_DFRN;
+			$network = Protocol::DFRN;
 		}
 
 		logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);
 
-		if ($network === NETWORK_DFRN) {
+		if ($network === Protocol::DFRN) {
 			$ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
 				intval($uid),
-				dbesc($url)
+				DBA::escape($url)
 			);
 
-			if (DBM::is_result($ret)) {
+			if (DBA::isResult($ret)) {
 				if (strlen($ret[0]['issued-id'])) {
 					notice(L10n::t('You have already introduced yourself here.') . EOL);
 					return;
-				} elseif ($ret[0]['rel'] == CONTACT_IS_FRIEND) {
+				} elseif ($ret[0]['rel'] == Contact::FRIEND) {
 					notice(L10n::t('Apparently you are already friends with %s.', $a->profile['name']) . EOL);
 					return;
 				} else {
@@ -326,7 +324,7 @@ function dfrn_request_post(App $a)
 				// There is a contact record but no issued-id, so this
 				// is a reciprocal introduction from a known contact
 				$r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d",
-					dbesc($issued_id),
+					DBA::escape($issued_id),
 					intval($contact_record['id'])
 				);
 			} else {
@@ -373,14 +371,14 @@ function dfrn_request_post(App $a)
 				$parms['issued-id'] = $issued_id;
 				$photo = $parms["photo"];
 
-				DBM::esc_array($parms);
+				DBA::escapeArray($parms);
 				$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
-					`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `blocked`, `pending` )
-					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+					`request`, `confirm`, `notify`, `poll`, `network`, `blocked`, `pending` )
+					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
 					intval($uid),
-					dbesc(DateTimeFormat::utcNow()),
+					DBA::escape(DateTimeFormat::utcNow()),
 					$parms['url'],
-					dbesc(normalise_link($url)),
+					DBA::escape(normalise_link($url)),
 					$parms['addr'],
 					$parms['fn'],
 					$parms['nick'],
@@ -391,8 +389,7 @@ function dfrn_request_post(App $a)
 					$parms['dfrn-confirm'],
 					$parms['dfrn-notify'],
 					$parms['dfrn-poll'],
-					$parms['dfrn-poco'],
-					dbesc(NETWORK_DFRN),
+					DBA::escape(Protocol::DFRN),
 					intval($blocked),
 					intval($pending)
 				);
@@ -405,7 +402,7 @@ function dfrn_request_post(App $a)
 						$parms['url'],
 						$parms['issued-id']
 					);
-					if (DBM::is_result($r)) {
+					if (DBA::isResult($r)) {
 						$contact_record = $r[0];
 						Contact::updateAvatar($photo, $uid, $contact_record["id"], true);
 					}
@@ -424,9 +421,9 @@ function dfrn_request_post(App $a)
 					intval($uid),
 					intval($contact_record['id']),
 					((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
-					dbesc(notags(trim($_POST['dfrn-request-message']))),
-					dbesc($hash),
-					dbesc(DateTimeFormat::utcNow())
+					DBA::escape(notags(trim(defaults($_POST, 'dfrn-request-message', '')))),
+					DBA::escape($hash),
+					DBA::escape(DateTimeFormat::utcNow())
 				);
 			}
 
@@ -445,15 +442,15 @@ function dfrn_request_post(App $a)
 				. (($aes_allow) ? "&aes_allow=1" : "")
 			);
 			// NOTREACHED
-			// END $network === NETWORK_DFRN
-		} elseif (($network != NETWORK_PHANTOM) && ($url != "")) {
+			// END $network === Protocol::DFRN
+		} elseif (($network != Protocol::PHANTOM) && ($url != "")) {
 
 			/* Substitute our user's feed URL into $url template
 			 * Send the subscriber home to subscribe
 			 */
 			// Diaspora needs the uri in the format user@domain.tld
 			// Diaspora will support the remote subscription in a future version
-			if ($network == NETWORK_DIASPORA) {
+			if ($network == Protocol::DIASPORA) {
 				$uri = $nickname . '@' . $a->get_hostname();
 
 				if ($a->get_path()) {
@@ -468,7 +465,7 @@ function dfrn_request_post(App $a)
 			$url = str_replace('{uri}', $uri, $url);
 			goaway($url);
 			// NOTREACHED
-			// END $network != NETWORK_PHANTOM
+			// END $network != Protocol::PHANTOM
 		} else {
 			notice(L10n::t("Remote subscription can't be done for your network. Please subscribe directly on your system.") . EOL);
 			return;
@@ -536,10 +533,10 @@ function dfrn_request_content(App $a)
 		// We could just unblock it, but first we have to jump through a few hoops to
 		// send an email, or even to find out if we need to send an email.
 		$intro = q("SELECT * FROM `intro` WHERE `hash` = '%s' LIMIT 1",
-			dbesc($_GET['confirm_key'])
+			DBA::escape($_GET['confirm_key'])
 		);
 
-		if (DBM::is_result($intro)) {
+		if (DBA::isResult($intro)) {
 			$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
 				WHERE `contact`.`id` = %d LIMIT 1",
 				intval($intro[0]['contact-id'])
@@ -547,8 +544,8 @@ function dfrn_request_content(App $a)
 
 			$auto_confirm = false;
 
-			if (DBM::is_result($r)) {
-				if ($r[0]['page-flags'] != PAGE_NORMAL && $r[0]['page-flags'] != PAGE_PRVGROUP) {
+			if (DBA::isResult($r)) {
+				if ($r[0]['page-flags'] != Contact::PAGE_NORMAL && $r[0]['page-flags'] != Contact::PAGE_PRVGROUP) {
 					$auto_confirm = true;
 				}
 
@@ -576,7 +573,7 @@ function dfrn_request_content(App $a)
 						'node'     => $r[0]['nickname'],
 						'dfrn_id'  => $r[0]['issued-id'],
 						'intro_id' => $intro[0]['id'],
-						'duplex'   => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
+						'duplex'   => (($r[0]['page-flags'] == Contact::PAGE_FREELOVE) ? 1 : 0),
 					];
 					dfrn_confirm_post($a, $handsfree);
 				}
@@ -588,7 +585,7 @@ function dfrn_request_content(App $a)
 				// in dfrn_confirm_post()
 
 				$r = q("UPDATE `intro` SET `blocked` = 0 WHERE `hash` = '%s'",
-					dbesc($_GET['confirm_key'])
+					DBA::escape($_GET['confirm_key'])
 				);
 			}
 		}
@@ -612,7 +609,7 @@ function dfrn_request_content(App $a)
 		} elseif (x($_GET, 'address') && ($_GET['address'] != "")) {
 			$myaddr = $_GET['address'];
 		} elseif (local_user()) {
-			if (strlen($a->path)) {
+			if (strlen($a->urlpath)) {
 				$myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
 			} else {
 				$myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
@@ -628,7 +625,7 @@ function dfrn_request_content(App $a)
 		 * because nobody is going to read the comments and
 		 * it doesn't matter if they know you or not.
 		 */
-		if ($a->profile['page-flags'] == PAGE_NORMAL) {
+		if ($a->profile['page-flags'] == Contact::PAGE_NORMAL) {
 			$tpl = get_markup_template('dfrn_request.tpl');
 		} else {
 			$tpl = get_markup_template('auto_request.tpl');
diff --git a/mod/directory.php b/mod/directory.php
index 1179b6c53..411024dc1 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -2,15 +2,17 @@
 /**
  * @file mod/directory.php
  */
+
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Widget;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Util\Proxy as ProxyUtils;
 
 function directory_init(App $a)
 {
@@ -34,8 +36,6 @@ function directory_post(App $a)
 
 function directory_content(App $a)
 {
-	require_once("mod/proxy.php");
-
 	if ((Config::get('system', 'block_public') && !local_user() && !remote_user())
 		|| (Config::get('system', 'block_local_dir') && !local_user() && !remote_user())
 	) {
@@ -59,7 +59,7 @@ function directory_content(App $a)
 	}
 
 	if ($search) {
-		$search = dbesc($search);
+		$search = DBA::escape($search);
 
 		$sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR
 				(`user`.`nickname` LIKE '%$search%') OR
@@ -76,15 +76,17 @@ function directory_content(App $a)
 				(`profile`.`education` LIKE '%$search%') OR
 				(`profile`.`pub_keywords` LIKE '%$search%') OR
 				(`profile`.`prv_keywords` LIKE '%$search%'))";
+	} else {
+		$sql_extra = '';
 	}
 
 	$publish = (Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 " );
 
 
-	$cnt = dba::fetch_first("SELECT COUNT(*) AS `total` FROM `profile`
+	$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
 				LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
-				WHERE `is-default` $publish AND NOT `user`.`blocked` $sql_extra");
-	if (DBM::is_result($cnt)) {
+				WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` $sql_extra");
+	if (DBA::isResult($cnt)) {
 		$a->set_pager_total($cnt['total']);
 	}
 
@@ -92,20 +94,21 @@ function directory_content(App $a)
 
 	$limit = intval($a->pager['start'])."," . intval($a->pager['itemspage']);
 
-	$r = dba::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
+	$r = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
 			`contact`.`addr`, `contact`.`url` AS profile_url FROM `profile`
 			LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
 			LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-			WHERE `is-default` $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit
+			WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
+			$sql_extra $order LIMIT $limit"
 	);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		if (in_array('small', $a->argv)) {
 			$photo = 'thumb';
 		} else {
 			$photo = 'photo';
 		}
 
-		while ($rr = dba::fetch($r)) {
+		while ($rr = DBA::fetch($r)) {
 			$itemurl= '';
 
 			$itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
@@ -146,6 +149,8 @@ function directory_content(App $a)
 				|| (x($profile, 'country-name') == 1)
 			) {
 				$location = L10n::t('Location:');
+			} else {
+				$location = '';
 			}
 
 			$gender   = ((x($profile, 'gender')   == 1) ? L10n::t('Gender:')   : false);
@@ -156,14 +161,14 @@ function directory_content(App $a)
 			$location_e = $location;
 
 			$photo_menu = [
-				'profile' => [L10n::t("View Profile"), Profile::zrl($profile_link)]
+				'profile' => [L10n::t("View Profile"), Contact::magicLink($profile_link)]
 			];
 
 			$entry = [
 				'id'           => $rr['id'],
 				'url'          => $profile_link,
 				'itemurl'      => $itemurl,
-				'thumb'        => proxy_url($rr[$photo], false, PROXY_SIZE_THUMB),
+				'thumb'        => ProxyUtils::proxifyUrl($rr[$photo], false, ProxyUtils::SIZE_THUMB),
 				'img_hover'    => $rr['name'],
 				'name'         => $rr['name'],
 				'details'      => $details,
@@ -193,7 +198,7 @@ function directory_content(App $a)
 
 			$entries[] = $arr['entry'];
 		}
-		dba::close($r);
+		DBA::close($r);
 
 		$tpl = get_markup_template('directory_header.tpl');
 
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 14ceb6dae..332fe90f6 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -2,20 +2,22 @@
 /**
  * @file mod/dirfind.php
  */
+
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Widget;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
-use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\Network;
-use Friendica\Database\DBM;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'mod/contacts.php';
 
@@ -42,7 +44,9 @@ 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 = '';
 
 	if (strpos($search,'@') === 0) {
 		$search = substr($search,1);
@@ -50,7 +54,7 @@ function dirfind_content(App $a, $prefix = "") {
 		if ((valid_email($search) && Network::isEmailDomainValid($search)) ||
 			(substr(normalise_link($search), 0, 7) == "http://")) {
 			$user_data = Probe::uri($search);
-			$discover_user = (in_array($user_data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA]));
+			$discover_user = (in_array($user_data["network"], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA]));
 		}
 	}
 
@@ -81,6 +85,7 @@ function dirfind_content(App $a, $prefix = "") {
 
 			$contact = Contact::getDetailsByURL($user_data["url"], local_user());
 			$objresult->cid = $contact["cid"];
+			$objresult->pcid = $contact["zid"];
 
 			$j->results[] = $objresult;
 
@@ -99,28 +104,28 @@ function dirfind_content(App $a, $prefix = "") {
 			$startrec = (($a->pager['page']) * $perpage) - $perpage;
 
 			if (Config::get('system','diaspora_enabled')) {
-				$diaspora = NETWORK_DIASPORA;
+				$diaspora = Protocol::DIASPORA;
 			} else {
-				$diaspora = NETWORK_DFRN;
+				$diaspora = Protocol::DFRN;
 			}
 
 			if (!Config::get('system','ostatus_disabled')) {
-				$ostatus = NETWORK_OSTATUS;
+				$ostatus = Protocol::OSTATUS;
 			} else {
-				$ostatus = NETWORK_DFRN;
+				$ostatus = Protocol::DFRN;
 			}
 
 			$search2 = "%".$search."%";
 
-			/// @TODO These 2 SELECTs are not checked on validity with DBM::is_result()
+			/// @TODO These 2 SELECTs are not checked on validity with DBA::isResult()
 			$count = q("SELECT count(*) AS `total` FROM `gcontact`
 					WHERE NOT `hide` AND `network` IN ('%s', '%s', '%s') AND
 						((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) AND
 						(`url` LIKE '%s' OR `name` LIKE '%s' OR `location` LIKE '%s' OR
 						`addr` LIKE '%s' OR `about` LIKE '%s' OR `keywords` LIKE '%s') $extra_sql",
-					dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
-					dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)),
-					dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)));
+					DBA::escape(Protocol::DFRN), DBA::escape($ostatus), DBA::escape($diaspora),
+					DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)),
+					DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)));
 
 			$results = q("SELECT `nurl`
 					FROM `gcontact`
@@ -130,9 +135,9 @@ function dirfind_content(App $a, $prefix = "") {
 						`addr` LIKE '%s' OR `about` LIKE '%s' OR `keywords` LIKE '%s') $extra_sql
 						GROUP BY `nurl`
 						ORDER BY `updated` DESC LIMIT %d, %d",
-					dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
-					dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)),
-					dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)),
+					DBA::escape(Protocol::DFRN), DBA::escape($ostatus), DBA::escape($diaspora),
+					DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)),
+					DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)),
 					intval($startrec), intval($perpage));
 			$j = new stdClass();
 			$j->total = $count[0]["total"];
@@ -159,6 +164,7 @@ function dirfind_content(App $a, $prefix = "") {
 
 				$objresult = new stdClass();
 				$objresult->cid = $result["cid"];
+				$objresult->pcid = $result["zid"];
 				$objresult->name = $result["name"];
 				$objresult->addr = $result["addr"];
 				$objresult->url = $result["url"];
@@ -186,7 +192,7 @@ function dirfind_content(App $a, $prefix = "") {
 			$a->set_pager_itemspage($j->items_page);
 		}
 
-		if (count($j->results)) {
+		if (!empty($j->results)) {
 
 			$id = 0;
 
@@ -202,8 +208,8 @@ function dirfind_content(App $a, $prefix = "") {
 				if ($jj->cid > 0) {
 					$connlnk = "";
 					$conntxt = "";
-					$contact = dba::selectFirst('contact', [], ['id' => $jj->cid]);
-					if (DBM::is_result($contact)) {
+					$contact = DBA::selectFirst('contact', [], ['id' => $jj->cid]);
+					if (DBA::isResult($contact)) {
 						$photo_menu = Contact::photoMenu($contact);
 						$details = _contact_detail_for_template($contact);
 						$alt_text = $details['alt_text'];
@@ -211,22 +217,28 @@ function dirfind_content(App $a, $prefix = "") {
 						$photo_menu = [];
 					}
 				} else {
-					$connlnk = System::baseUrl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
+					$connlnk = System::baseUrl().'/follow/?url='.(!empty($jj->connect) ? $jj->connect : $jj->url);
 					$conntxt = L10n::t('Connect');
-					$photo_menu = [
-						'profile' => [L10n::t("View Profile"), Profile::zrl($jj->url)],
-						'follow' => [L10n::t("Connect/Follow"), $connlnk]
-					];
+
+					$contact = DBA::selectFirst('contact', [], ['id' => $jj->pcid]);
+					if (DBA::isResult($contact)) {
+						$photo_menu = Contact::photoMenu($contact);
+					} else {
+						$photo_menu = [];
+					}
+
+					$photo_menu['profile'] = [L10n::t("View Profile"), Contact::magicLink($jj->url)];
+					$photo_menu['follow'] = [L10n::t("Connect/Follow"), $connlnk];
 				}
 
 				$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 
 				$entry = [
 					'alt_text' => $alt_text,
-					'url' => Profile::magicLink($jj->url),
+					'url' => Contact::magicLink($jj->url),
 					'itemurl' => $itemurl,
 					'name' => htmlentities($jj->name),
-					'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+					'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB),
 					'img_hover' => $jj->tags,
 					'conntxt' => $conntxt,
 					'connlnk' => $connlnk,
diff --git a/mod/display.php b/mod/display.php
index 6286569a5..907bf8ebb 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -11,9 +11,10 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
 
@@ -40,91 +41,80 @@ function display_init(App $a)
 		}
 	}
 
-	$r = false;
+	$item = null;
+
+	$fields = ['id', 'parent', 'author-id', 'body', 'uid'];
 
 	// If there is only one parameter, then check if this parameter could be a guid
 	if ($a->argc == 2) {
 		$nick = "";
-		$r = false;
 
 		// Does the local user have this item?
 		if (local_user()) {
-			$r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
-						`author-avatar`, `network`, `body`, `uid`, `owner-link`
-				FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
-					AND `guid` = ? AND `uid` = ? LIMIT 1", $a->argv[1], local_user());
-			if (DBM::is_result($r)) {
+			$item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => local_user()]);
+			if (DBA::isResult($item)) {
 				$nick = $a->user["nickname"];
 			}
 		}
 
 		// Is it an item with uid=0?
-		if (!DBM::is_result($r)) {
-			$r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
-						`author-avatar`, `network`, `body`, `uid`, `owner-link`
-				FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
-					AND NOT `private` AND `uid` = 0
-					AND `guid` = ? LIMIT 1", $a->argv[1]);
-		}
-
-		if (!DBM::is_result($r)) {
-			$a->error = 404;
-			notice(L10n::t('Item not found.') . EOL);
-			return;
+		if (!DBA::isResult($item)) {
+			$item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => [0, 2], 'uid' => 0]);
 		}
 	} elseif (($a->argc == 3) && ($nick == 'feed-item')) {
-		$r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
-					`author-avatar`, `network`, `body`, `uid`, `owner-link`
-			FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
-				AND NOT `private` AND `uid` = 0
-				AND `id` = ? LIMIT 1", $a->argv[2]);
+		$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => [0, 2], 'uid' => 0]);
 	}
 
-	if (DBM::is_result($r)) {
-		if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
-			logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG);
-			displayShowFeed($r["id"], false);
-		}
+	if (!DBA::isResult($item)) {
+		$a->error = 404;
+		notice(L10n::t('Item not found.') . EOL);
+		return;
+	}
 
-		if ($r["id"] != $r["parent"]) {
-			$r = dba::fetch_first("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
-				WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-					AND `id` = ?", $r["parent"]);
-		}
+	if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
+		logger('Directly serving XML for id '.$item["id"], LOGGER_DEBUG);
+		displayShowFeed($item["id"], false);
+	}
 
-		$profiledata = display_fetchauthor($a, $r);
+	if ($item["id"] != $item["parent"]) {
+		$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]);
+	}
 
-		if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) {
-			$nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($profiledata["url"]));
+	$profiledata = display_fetchauthor($a, $item);
 
-			if (($nickname != $a->user["nickname"])) {
-				$r = dba::fetch_first("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
-					INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
-					WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
-					$nickname
-				);
-				if (DBM::is_result($r)) {
-					$profiledata = $r;
-				}
-				$profiledata["network"] = NETWORK_DFRN;
-			} else {
-				$profiledata = [];
+	if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) {
+		$nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($profiledata["url"]));
+
+		if (($nickname != $a->user["nickname"])) {
+			$profile = DBA::fetchFirst("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+				INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
+				WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
+				$nickname
+			);
+			if (DBA::isResult($profile)) {
+				$profiledata = $profile;
 			}
+			$profiledata["network"] = Protocol::DFRN;
+		} else {
+			$profiledata = [];
 		}
 	}
 
 	Profile::load($a, $nick, 0, $profiledata);
 }
 
-function display_fetchauthor($a, $item) {
+function display_fetchauthor($a, $item)
+{
+	$author = DBA::selectFirst('contact', ['name', 'nick', 'photo', 'network', 'url'], ['id' => $item['author-id']]);
+
 	$profiledata = [];
-	$profiledata["uid"] = -1;
-	$profiledata["nickname"] = $item["author-name"];
-	$profiledata["name"] = $item["author-name"];
-	$profiledata["picdate"] = "";
-	$profiledata["photo"] = $item["author-avatar"];
-	$profiledata["url"] = $item["author-link"];
-	$profiledata["network"] = $item["network"];
+	$profiledata['uid'] = -1;
+	$profiledata['nickname'] = $author['nick'];
+	$profiledata['name'] = $author['name'];
+	$profiledata['picdate'] = '';
+	$profiledata['photo'] = $author['photo'];
+	$profiledata['url'] = $author['url'];
+	$profiledata['network'] = $author['network'];
 
 	// Check for a repeated message
 	$skip = false;
@@ -150,29 +140,29 @@ function display_fetchauthor($a, $item) {
 	if (!$skip) {
 		$author = "";
 		preg_match("/author='(.*?)'/ism", $attributes, $matches);
-		if ($matches[1] != "") {
+		if (!empty($matches[1])) {
 			$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
 		}
 		preg_match('/author="(.*?)"/ism', $attributes, $matches);
-		if ($matches[1] != "") {
+		if (!empty($matches[1])) {
 			$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
 		}
 		$profile = "";
 		preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-		if ($matches[1] != "") {
+		if (!empty($matches[1])) {
 			$profiledata["url"] = $matches[1];
 		}
 		preg_match('/profile="(.*?)"/ism', $attributes, $matches);
-		if ($matches[1] != "") {
+		if (!empty($matches[1])) {
 			$profiledata["url"] = $matches[1];
 		}
 		$avatar = "";
 		preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
-		if ($matches[1] != "") {
+		if (!empty($matches[1])) {
 			$profiledata["photo"] = $matches[1];
 		}
 		preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
-		if ($matches[1] != "") {
+		if (!empty($matches[1])) {
 			$profiledata["photo"] = $matches[1];
 		}
 		$profiledata["nickname"] = $profiledata["name"];
@@ -187,10 +177,10 @@ function display_fetchauthor($a, $item) {
 	$profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
 
 	if (local_user()) {
-		if (in_array($profiledata["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
+		if (in_array($profiledata["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
 			$profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
 		}
-	} elseif ($profiledata["network"] == NETWORK_DFRN) {
+	} elseif ($profiledata["network"] == Protocol::DFRN) {
 		$connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);
 		$profiledata["remoteconnect"] = $connect;
 	}
@@ -198,7 +188,8 @@ function display_fetchauthor($a, $item) {
 	return($profiledata);
 }
 
-function display_content(App $a, $update = false, $update_uid = 0) {
+function display_content(App $a, $update = false, $update_uid = 0)
+{
 	if (Config::get('system','block_public') && !local_user() && !remote_user()) {
 		notice(L10n::t('Public access denied.') . EOL);
 		return;
@@ -211,7 +202,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 
 	if ($update) {
 		$item_id = $_REQUEST['item_id'];
-		$item = dba::selectFirst('item', ['uid', 'parent', 'parent-uri'], ['id' => $item_id]);
+		$item = Item::selectFirst(['uid', 'parent', 'parent-uri'], ['id' => $item_id]);
 		if ($item['uid'] != 0) {
 			$a->profile = ['uid' => intval($item['uid']), 'profile_uid' => intval($item['uid'])];
 		} else {
@@ -221,30 +212,29 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 		$item_parent_uri = $item['parent-uri'];
 	} else {
 		$item_id = (($a->argc > 2) ? $a->argv[2] : 0);
+		$item_parent = $item_id;
 
 		if ($a->argc == 2) {
 			$item_parent = 0;
+			$fields = ['id', 'parent', 'parent-uri'];
 
 			if (local_user()) {
-				$r = dba::fetch_first("SELECT `id`, `parent`, `parent-uri` FROM `item`
-					WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-						AND `guid` = ? AND `uid` = ?", $a->argv[1], local_user());
-				if (DBM::is_result($r)) {
-					$item_id = $r["id"];
-					$item_parent = $r["parent"];
-					$item_parent_uri = $r['parent-uri'];
+				$condition = ['guid' => $a->argv[1], 'uid' => local_user()];
+				$item = Item::selectFirstForUser(local_user(), $fields, $condition);
+				if (DBA::isResult($item)) {
+					$item_id = $item["id"];
+					$item_parent = $item["parent"];
+					$item_parent_uri = $item['parent-uri'];
 				}
 			}
 
 			if ($item_parent == 0) {
-				$r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent`, `item`.`parent-uri` FROM `item`
-					WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-						AND NOT `item`.`private` AND `item`.`uid` = 0
-						AND `item`.`guid` = ?", $a->argv[1]);
-				if (DBM::is_result($r)) {
-					$item_id = $r["id"];
-					$item_parent = $r["parent"];
-					$item_parent_uri = $r['parent-uri'];
+				$condition = ['private' => [0, 2], 'guid' => $a->argv[1], 'uid' => 0];
+				$item = Item::selectFirstForUser(local_user(), $fields, $condition);
+				if (DBA::isResult($item)) {
+					$item_id = $item["id"];
+					$item_parent = $item["parent"];
+					$item_parent_uri = $item['parent-uri'];
 				}
 			}
 		}
@@ -257,7 +247,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 	}
 
 	// We are displaying an "alternate" link if that post was public. See issue 2864
-	$is_public = dba::exists('item', ['id' => $item_id, 'private' => false]);
+	$is_public = Item::exists(['id' => $item_id, 'private' => [0, 2]]);
 	if ($is_public) {
 		// For the atom feed the nickname doesn't matter at all, we only need the item id.
 		$alternate = System::baseUrl().'/display/feed-item/'.$item_id.'.atom';
@@ -274,7 +264,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 	$groups = [];
 
 	$contact = null;
-	$remote_contact = false;
+	$is_remote_contact = false;
 
 	$contact_id = 0;
 
@@ -289,30 +279,27 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 
 	if ($contact_id) {
 		$groups = Group::getIdsByContactId($contact_id);
-		$r = dba::fetch_first("SELECT * FROM `contact` WHERE `id` = ? AND `uid` = ? LIMIT 1",
-			$contact_id,
-			$a->profile['uid']
-		);
-		if (DBM::is_result($r)) {
-			$contact = $r;
-			$remote_contact = true;
+		$remote_contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => $a->profile['uid']]);
+		if (DBA::isResult($remote_contact)) {
+			$contact = $remote_contact;
+			$is_remote_contact = true;
 		}
 	}
 
-	if (!$remote_contact) {
+	if (!$is_remote_contact) {
 		if (local_user()) {
 			$contact_id = $_SESSION['cid'];
 			$contact = $a->contact;
 		}
 	}
 
-	$r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $a->profile['uid']);
-	if (DBM::is_result($r)) {
-		$a->page_contact = $r;
+	$page_contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]);
+	if (DBA::isResult($page_contact)) {
+		$a->page_contact = $page_contact;
 	}
 	$is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false);
 
-	if (x($a->profile, 'hidewall') && !$is_owner && !$remote_contact) {
+	if (x($a->profile, 'hidewall') && !$is_owner && !$is_remote_contact) {
 		notice(L10n::t('Access to this profile has been restricted.') . EOL);
 		return;
 	}
@@ -333,11 +320,11 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 		$o .= status_editor($a, $x, 0, true);
 	}
 
-	$sql_extra = item_permissions_sql($a->profile['uid'], $remote_contact, $groups);
+	$sql_extra = item_permissions_sql($a->profile['uid'], $is_remote_contact, $groups);
 
 	if (local_user() && (local_user() == $a->profile['uid'])) {
 		$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
-		$unseen = dba::exists('item', $condition);
+		$unseen = Item::exists($condition);
 	} else {
 		$unseen = false;
 	}
@@ -346,37 +333,34 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 		return '';
 	}
 
-	$r = dba::p(item_query(local_user())."AND `item`.`parent-uri` = (SELECT `parent-uri` FROM `item` WHERE `id` = ?)
-		AND `item`.`uid` IN (0, ?) $sql_extra
-		ORDER BY `item`.`uid` ASC, `parent` DESC, `gravity` ASC, `id` ASC",
-		$item_id, local_user()
-	);
+	$condition = ["`id` = ? AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, local_user()];
+	$fields = ['parent-uri', 'body', 'title', 'author-name', 'author-avatar', 'plink'];
+	$item = Item::selectFirstForUser(local_user(), $fields, $condition);
 
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($item)) {
 		notice(L10n::t('Item not found.') . EOL);
 		return $o;
 	}
 
-	$s = dba::inArray($r);
+	$item['uri'] = $item['parent-uri'];
 
 	if ($unseen) {
 		$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
-		dba::update('item', ['unseen' => false], $condition);
+		Item::update(['unseen' => false], $condition);
 	}
 
-	$items = conv_sort($s, "`commented`");
-
 	if (!$update) {
 		$o .= "<script> var netargs = '?f=&item_id=" . $item_id . "'; </script>";
 	}
-	$o .= conversation($a, $items, 'display', $update_uid, false, 'commented', local_user());
+
+	$o .= conversation($a, [$item], 'display', $update_uid, false, 'commented', local_user());
 
 	// Preparing the meta header
-	$description = trim(HTML::toPlaintext(BBCode::convert($s[0]["body"], false), 0, true));
-	$title = trim(HTML::toPlaintext(BBCode::convert($s[0]["title"], false), 0, true));
-	$author_name = $s[0]["author-name"];
+	$description = trim(HTML::toPlaintext(BBCode::convert($item["body"], false), 0, true));
+	$title = trim(HTML::toPlaintext(BBCode::convert($item["title"], false), 0, true));
+	$author_name = $item["author-name"];
 
-	$image = $a->remove_baseurl($s[0]["author-thumb"]);
+	$image = $a->remove_baseurl($item["author-avatar"]);
 
 	if ($title == "") {
 		$title = $author_name;
@@ -408,7 +392,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 	$a->page['htmlhead'] .= '<meta name="twitter:title" content="'.$title.'" />'."\n";
 	$a->page['htmlhead'] .= '<meta name="twitter:description" content="'.$description.'" />'."\n";
 	$a->page['htmlhead'] .= '<meta name="twitter:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
-	$a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$s[0]["plink"].'" />'."\n";
+	$a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$item["plink"].'" />'."\n";
 
 	// Dublin Core
 	$a->page['htmlhead'] .= '<meta name="DC.title" content="'.$title.'" />'."\n";
@@ -418,7 +402,7 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 	$a->page['htmlhead'] .= '<meta property="og:type" content="website" />'."\n";
 	$a->page['htmlhead'] .= '<meta property="og:title" content="'.$title.'" />'."\n";
 	$a->page['htmlhead'] .= '<meta property="og:image" content="'.System::baseUrl().'/'.$image.'" />'."\n";
-	$a->page['htmlhead'] .= '<meta property="og:url" content="'.$s[0]["plink"].'" />'."\n";
+	$a->page['htmlhead'] .= '<meta property="og:url" content="'.$item["plink"].'" />'."\n";
 	$a->page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
 	$a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$author_name.'" />'."\n";
 	// article:tag
@@ -426,7 +410,8 @@ function display_content(App $a, $update = false, $update_uid = 0) {
 	return $o;
 }
 
-function displayShowFeed($item_id, $conversation) {
+function displayShowFeed($item_id, $conversation)
+{
 	$xml = DFRN::itemFeed($item_id, $conversation);
 	if ($xml == '') {
 		System::httpExit(500);
diff --git a/mod/editpost.php b/mod/editpost.php
index aa2c29684..258585ef1 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -8,37 +8,38 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
-
-function editpost_content(App $a) {
+use Friendica\Model\Item;
+use Friendica\Database\DBA;
 
+function editpost_content(App $a)
+{
 	$o = '';
 
-	if (! local_user()) {
+	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
 	$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-	if (! $post_id) {
+	if (!$post_id) {
 		notice(L10n::t('Item not found') . EOL);
 		return;
 	}
 
-	$itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		intval($post_id),
-		intval(local_user())
-	);
+	$fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+		'type', 'body', 'title', 'file', 'wall', 'post-type'];
 
-	if (! DBM::is_result($itm)) {
+	$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
+
+	if (!DBA::isResult($item)) {
 		notice(L10n::t('Item not found') . EOL);
 		return;
 	}
 
 	$geotag = '';
 
-	$o .= replace_macros(get_markup_template("section_title.tpl"),[
+	$o .= replace_macros(get_markup_template("section_title.tpl"), [
 		'$title' => L10n::t('Edit post')
 	]);
 
@@ -61,7 +62,7 @@ function editpost_content(App $a) {
 
 	$tpl = get_markup_template("jot.tpl");
 
-	if (strlen($itm['allow_cid']) || strlen($itm['allow_gid']) || strlen($itm['deny_cid']) || strlen($itm['deny_gid'])) {
+	if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
 		$lockstate = 'lock';
 	} else {
 		$lockstate = 'unlock';
@@ -70,40 +71,29 @@ function editpost_content(App $a) {
 	$jotplugins = '';
 	$jotnets = '';
 
-	$mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1);
+	$mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1);
 
 	$mail_enabled = false;
 	$pubmail_enabled = false;
 
-	if(! $mail_disabled) {
+	if (!$mail_disabled) {
 		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
 			intval(local_user())
 		);
-		if (DBM::is_result($r)) {
+
+		if (DBA::isResult($r)) {
 			$mail_enabled = true;
-			if(intval($r[0]['pubmail']))
+
+			if (intval($r[0]['pubmail'])) {
 				$pubmail_enabled = true;
+			}
 		}
 	}
 
-	// I don't think there's any need for the $jotnets when editing the post,
-	// and including them makes it difficult for the JS-free theme, so let's
-	// disable them
-/*	if($mail_enabled) {
-       $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
-		$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
-          	. L10n::t("Post to Email") . '</div>';
-	}*/
-
-
-
 	Addon::callHooks('jot_tool', $jotplugins);
 	//Addon::callHooks('jot_networks', $jotnets);
 
-
-	//$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
-
-	$o .= replace_macros($tpl,[
+	$o .= replace_macros($tpl, [
 		'$is_edit' => true,
 		'$return_path' => $_SESSION['return_url'],
 		'$action' => 'item',
@@ -124,8 +114,9 @@ function editpost_content(App $a) {
 		'$shortnoloc' => L10n::t('clear location'),
 		'$wait' => L10n::t('Please wait'),
 		'$permset' => L10n::t('Permission settings'),
-		'$ptyp' => $itm[0]['type'],
-		'$content' => undo_post_tagging($itm[0]['body']),
+		'$wall' => $item['wall'],
+		'$posttype' => $item['post-type'],
+		'$content' => undo_post_tagging($item['body']),
 		'$post_id' => $post_id,
 		'$baseurl' => System::baseUrl(),
 		'$defloc' => $a->user['default-location'],
@@ -134,9 +125,9 @@ function editpost_content(App $a) {
 		'$emailcc' => L10n::t('CC: email addresses'),
 		'$public' => L10n::t('Public post'),
 		'$jotnets' => $jotnets,
-		'$title' => htmlspecialchars($itm[0]['title']),
+		'$title' => htmlspecialchars($item['title']),
 		'$placeholdertitle' => L10n::t('Set title'),
-		'$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
+		'$category' => file_tag_file_to_list($item['file'], 'category'),
 		'$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t("Categories \x28comma-separated list\x29") : ''),
 		'$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
 		'$lockstate' => $lockstate,
diff --git a/mod/events.php b/mod/events.php
index 87c358a99..38b632cf4 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -11,7 +11,7 @@ use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Event;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
@@ -20,8 +20,9 @@ use Friendica\Util\Temporal;
 
 require_once 'include/items.php';
 
-function events_init(App $a) {
-	if (! local_user()) {
+function events_init(App $a)
+{
+	if (!local_user()) {
 		return;
 	}
 
@@ -35,8 +36,6 @@ function events_init(App $a) {
 		$a->page['aside'] = '';
 	}
 
-	$a->data['user'] = $_SESSION['user'];
-
 	$cal_widget = CalendarExport::getHTML();
 
 	$a->page['aside'] .= $cal_widget;
@@ -44,23 +43,24 @@ function events_init(App $a) {
 	return;
 }
 
-function events_post(App $a) {
+function events_post(App $a)
+{
 
 	logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA);
 
-	if (! local_user()) {
+	if (!local_user()) {
 		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($_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;
@@ -78,12 +78,12 @@ function events_post(App $a) {
 
 	if ($adjust) {
 		$start = DateTimeFormat::convert($start, 'UTC', date_default_timezone_get());
-		if (! $nofinish) {
+		if (!$nofinish) {
 			$finish = DateTimeFormat::convert($finish, 'UTC', date_default_timezone_get());
 		}
 	} else {
 		$start = DateTimeFormat::utc($start);
-		if (! $nofinish) {
+		if (!$nofinish) {
 			$finish = DateTimeFormat::utc($finish);
 		}
 	}
@@ -93,9 +93,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;
@@ -110,7 +110,7 @@ function events_post(App $a) {
 		goaway($onerror_url);
 	}
 
-	if ((! $summary) || ($start === NULL_DATE)) {
+	if (!$summary || ($start === NULL_DATE)) {
 		notice(L10n::t('Event title and start time are required.') . EOL);
 		if (intval($_REQUEST['preview'])) {
 			echo L10n::t('Event title and start time are required.');
@@ -119,12 +119,13 @@ 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())
 	);
-	if (count($c)) {
+
+	if (DBA::isResult($c)) {
 		$self = $c[0]['id'];
 	} else {
 		$self = 0;
@@ -132,13 +133,13 @@ function events_post(App $a) {
 
 
 	if ($share) {
-		$str_group_allow   = perms2str($_POST['group_allow']);
-		$str_contact_allow = perms2str($_POST['contact_allow']);
-		$str_group_deny    = perms2str($_POST['group_deny']);
-		$str_contact_deny  = perms2str($_POST['contact_deny']);
+		$str_group_allow   = !empty($_POST['group_allow'])   ? perms2str($_POST['group_allow'])   : '';
+		$str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
+		$str_group_deny    = !empty($_POST['group_deny'])    ? perms2str($_POST['group_deny'])    : '';
+		$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
@@ -181,16 +182,16 @@ function events_post(App $a) {
 
 	$item_id = Event::store($datarray);
 
-	if (! $cid) {
+	if (!$cid) {
 		Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
 	}
 
 	goaway($_SESSION['return_url']);
 }
 
-function events_content(App $a) {
-
-	if (! local_user()) {
+function events_content(App $a)
+{
+	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
@@ -245,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') {
@@ -273,13 +274,12 @@ 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) {
+		if (!$y) {
 			$y = intval($thisyear);
 		}
-		if (! $m) {
+		if (!$m) {
 			$m = intval($thismonth);
 		}
 
@@ -313,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'];
 			}
 		}
@@ -346,11 +346,11 @@ function events_content(App $a) {
 
 		$links = [];
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$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;
 				}
 			}
@@ -359,17 +359,17 @@ function events_content(App $a) {
 		$events = [];
 
 		// transform the event in a usable array
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$r = Event::sortByDate($r);
 			$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");
@@ -379,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;
@@ -404,7 +404,7 @@ function events_content(App $a) {
 			'$list'  => L10n::t('list'),
 		]);
 
-		if (x($_GET, 'id')) {
+		if (!empty($_GET['id'])) {
 			echo $o;
 			killme();
 		}
@@ -417,70 +417,80 @@ function events_content(App $a) {
 			intval($event_id),
 			intval(local_user())
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$orig_event = $r[0];
 		}
 	}
 
 	// Passed parameters overrides anything found in the DB
 	if (in_array($mode, ['edit', 'new', 'copy'])) {
-		if (!x($orig_event)) {$orig_event = [];}
+		if (empty($orig_event)) {
+			$orig_event = [];
+		}
+
 		// 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 (!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)) {
-			$tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
+		if (!empty($orig_event)) {
+			$tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC');
 		}
 
 		$syear  = DateTimeFormat::convert($sdt, $tz, 'UTC', 'Y');
 		$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);
 
-		if ($mode === 'new' || $mode === 'copy') {
-			$acl = (($cid) ? '' : ACL::getFullSelectorHTML(((x($orig_event)) ? $orig_event : $a->user)));
+		if (!$cid && in_array($mode, ['new', 'copy'])) {
+			$acl = ACL::getFullSelectorHTML($a->user, false, $orig_event);
+		} else {
+			$acl = '';
 		}
 
 		// If we copy an old event, we need to remove the ID and URI
@@ -492,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,
@@ -506,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:'),
@@ -531,7 +561,6 @@ function events_content(App $a) {
 			'$basic' => L10n::t('Basic'),
 			'$advanced' => L10n::t('Advanced'),
 			'$permissions' => L10n::t('Permissions'),
-
 		]);
 
 		return $o;
@@ -539,16 +568,14 @@ function events_content(App $a) {
 
 	// Remove an event from the calendar and its related items
 	if ($mode === 'drop' && $event_id) {
-		$del = 0;
-
 		$ev = Event::getListById(local_user(), $event_id);
 
 		// Delete only real events (no birthdays)
-		if (DBM::is_result($ev) && $ev[0]['type'] == 'event') {
-			$del = Item::deleteForUser(['id' => $ev[0]['itemid']], local_user());
+		if (DBA::isResult($ev) && $ev[0]['type'] == 'event') {
+			Item::deleteForUser(['id' => $ev[0]['itemid']], local_user());
 		}
 
-		if ($del == 0) {
+		if (Item::exists(['id' => $ev[0]['itemid']])) {
 			notice(L10n::t('Failed to remove event') . EOL);
 		} else {
 			info(L10n::t('Event removed') . EOL);
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 631888d7e..3839bcc1c 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -8,6 +8,7 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Object\Image;
 
 /**
@@ -39,8 +40,8 @@ function fbrowser_content(App $a)
 			if ($a->argc==2) {
 				$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' ",
 					intval(local_user()),
-					dbesc('Contact Photos'),
-					dbesc(L10n::t('Contact Photos'))
+					DBA::escape('Contact Photos'),
+					DBA::escape(L10n::t('Contact Photos'))
 				);
 
 				function _map_folder1($el)
@@ -54,7 +55,7 @@ function fbrowser_content(App $a)
 			$album = "";
 			if ($a->argc==3) {
 				$album = hex2bin($a->argv[2]);
-				$sql_extra = sprintf("AND `album` = '%s' ", dbesc($album));
+				$sql_extra = sprintf("AND `album` = '%s' ", DBA::escape($album));
 				$sql_extra2 = "";
 				$path[]=[$a->argv[2], $album];
 			}
@@ -64,8 +65,8 @@ function fbrowser_content(App $a)
 					FROM `photo` WHERE `uid` = %d $sql_extra AND `album` != '%s' AND `album` != '%s'
 					GROUP BY `resource-id` $sql_extra2",
 				intval(local_user()),
-				dbesc('Contact Photos'),
-				dbesc(L10n::t('Contact Photos'))
+				DBA::escape('Contact Photos'),
+				DBA::escape(L10n::t('Contact Photos'))
 			);
 
 			function _map_files1($rr)
@@ -77,7 +78,7 @@ function fbrowser_content(App $a)
 
 				// Take the largest picture that is smaller or equal 640 pixels
 				$p = q("SELECT `scale` FROM `photo` WHERE `resource-id` = '%s' AND `height` <= 640 AND `width` <= 640 ORDER BY `resource-id`, `scale` LIMIT 1",
-					dbesc($rr['resource-id']));
+					DBA::escape($rr['resource-id']));
 				if ($p) {
 					$scale = $p[0]["scale"];
 				} else {
diff --git a/mod/feedtest.php b/mod/feedtest.php
index 9217b85d5..d9a9abb91 100644
--- a/mod/feedtest.php
+++ b/mod/feedtest.php
@@ -6,6 +6,7 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Protocol\Feed;
 use Friendica\Util\Network;
@@ -25,11 +26,11 @@ function feedtest_content(App $a)
 	if (!empty($_REQUEST['url'])) {
 		$url = $_REQUEST['url'];
 
-		$importer = dba::selectFirst('user', [], ['uid' => local_user()]);
+		$importer = DBA::selectFirst('user', [], ['uid' => local_user()]);
 
 		$contact_id = Contact::getIdForURL($url, local_user(), true);
 
-		$contact = dba::selectFirst('contact', [], ['id' => $contact_id]);
+		$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
 
 		$ret = Network::curl($contact['poll']);
 		$xml = $ret['body'];
diff --git a/mod/fetch.php b/mod/fetch.php
index 6892990c2..4e7d8c751 100644
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -5,9 +5,13 @@ This file is part of the Diaspora protocol. It is used for fetching single publi
 
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Protocol\Diaspora;
+use Friendica\Model\Item;
+use Friendica\Model\User;
 use Friendica\Util\XML;
+use Friendica\Database\DBA;
 
 function fetch_init(App $a)
 {
@@ -20,24 +24,15 @@ function fetch_init(App $a)
 	$guid = $a->argv[2];
 
 	// Fetch the item
-	$item = q(
-		"SELECT `uid`, `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app`, `location`, `coord`
-			FROM `item` WHERE `wall` AND NOT `private` AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
-		dbesc($guid),
-		NETWORK_DFRN,
-		NETWORK_DIASPORA
-	);
-	if (!$item) {
-		$r = q(
-			"SELECT `author-link`
-			FROM `item` WHERE `uid` = 0 AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
-			dbesc($guid),
-			NETWORK_DFRN,
-			NETWORK_DIASPORA
-		);
-
-		if ($r) {
-			$parts = parse_url($r[0]["author-link"]);
+	$fields = ['uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'app', 'location', 'coord', 'network',
+		'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)) {
+		$condition = ['guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
+		$item = Item::selectFirst(['author-link'], $condition);
+		if (DBA::isResult($item)) {
+			$parts = parse_url($item["author-link"]);
 			$host = $parts["scheme"]."://".$parts["host"];
 
 			if (normalise_link($host) != normalise_link(System::baseUrl())) {
@@ -54,20 +49,13 @@ function fetch_init(App $a)
 	}
 
 	// Fetch some data from the author (We could combine both queries - but I think this is more readable)
-	$r = q(
-		"SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
-		INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
-		WHERE `user`.`uid` = %d",
-		intval($item[0]["uid"])
-	);
-
-	if (!$r) {
+	$user = User::getOwnerDataById($item["uid"]);
+	if (!$user) {
 		header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
 		killme();
 	}
-	$user = $r[0];
 
-	$status = Diaspora::buildStatus($item[0], $user);
+	$status = Diaspora::buildStatus($item, $user);
 	$xml = Diaspora::buildPostXml($status["type"], $status["message"]);
 
 	// Send the envelope
diff --git a/mod/filer.php b/mod/filer.php
index 190b6f78a..9b0017322 100644
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -15,7 +15,7 @@ function filer_content(App $a)
 		killme();
 	}
 
-	$term = unxmlify(trim($_GET['term']));
+	$term = unxmlify(trim(defaults($_GET, 'term', '')));
 	$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
 	logger('filer: tag ' . $term . ' item ' . $item_id);
diff --git a/mod/follow.php b/mod/follow.php
index 1292d24e3..627ab5203 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -5,21 +5,21 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Util\Proxy as ProxyUtils;
 
 function follow_post(App $a)
 {
 	if (!local_user()) {
-		notice(L10n::t('Permission denied.'));
-		goaway($_SESSION['return_url']);
-		// NOTREACHED
+		System::httpExit(403, ['title' => L10n::t('Access denied.')]);
 	}
 
-	if ($_REQUEST['cancel']) {
+	if (isset($_REQUEST['cancel'])) {
 		goaway($_SESSION['return_url']);
 	}
 
@@ -65,8 +65,8 @@ function follow_content(App $a)
 	$r = q("SELECT `pending` FROM `contact` WHERE `uid` = %d AND ((`rel` != %d) OR (`network` = '%s')) AND
 		(`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s') AND
 		`network` != '%s' LIMIT 1",
-		intval(local_user()), dbesc(CONTACT_IS_FOLLOWER), dbesc(NETWORK_DFRN), dbesc(normalise_link($url)),
-		dbesc(normalise_link($url)), dbesc($url), dbesc(NETWORK_STATUSNET));
+		intval(local_user()), DBA::escape(Contact::FOLLOWER), DBA::escape(Protocol::DFRN), DBA::escape(normalise_link($url)),
+		DBA::escape(normalise_link($url)), DBA::escape($url), DBA::escape(Protocol::STATUSNET));
 
 	if ($r) {
 		if ($r[0]['pending']) {
@@ -79,32 +79,32 @@ function follow_content(App $a)
 
 	$ret = Probe::uri($url);
 
-	if (($ret['network'] == NETWORK_DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
+	if (($ret['network'] == Protocol::DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
 		notice(L10n::t("Diaspora support isn't enabled. Contact can't be added."));
 		$submit = '';
 		//goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
 
-	if (($ret['network'] == NETWORK_OSTATUS) && Config::get('system', 'ostatus_disabled')) {
+	if (($ret['network'] == Protocol::OSTATUS) && Config::get('system', 'ostatus_disabled')) {
 		notice(L10n::t("OStatus support is disabled. Contact can't be added."));
 		$submit = '';
 		//goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
 
-	if ($ret['network'] == NETWORK_PHANTOM) {
+	if ($ret['network'] == Protocol::PHANTOM) {
 		notice(L10n::t("The network type couldn't be detected. Contact can't be added."));
 		$submit = '';
 		//goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
 
-	if ($ret['network'] == NETWORK_MAIL) {
+	if ($ret['network'] == Protocol::MAIL) {
 		$ret['url'] = $ret['addr'];
 	}
 
-	if (($ret['network'] === NETWORK_DFRN) && !DBM::is_result($r)) {
+	if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($r)) {
 		$request = $ret['request'];
 		$tpl = get_markup_template('dfrn_request.tpl');
 	} else {
@@ -135,7 +135,7 @@ function follow_content(App $a)
 		$gcontact_id = $r[0]['id'];
 	}
 
-	if ($ret['network'] === NETWORK_DIASPORA) {
+	if ($ret['network'] === Protocol::DIASPORA) {
 		$r[0]['location'] = '';
 		$r[0]['about'] = '';
 	}
@@ -144,7 +144,7 @@ function follow_content(App $a)
 
 	$o = replace_macros($tpl, [
 		'$header'        => htmlentities($header),
-		//'$photo' => proxy_url($ret['photo'], false, PROXY_SIZE_SMALL),
+		//'$photo'         => ProxyUtils::proxifyUrl($ret['photo'], false, ProxyUtils::SIZE_SMALL),
 		'$desc'          => '',
 		'$pls_answer'    => L10n::t('Please answer the following:'),
 		'$does_know_you' => ['knowyou', L10n::t('Does %s know you?', $ret['name']), false, '', [L10n::t('No'), L10n::t('Yes')]],
@@ -166,10 +166,13 @@ function follow_content(App $a)
 		'$url_label'     => L10n::t('Profile URL'),
 		'$myaddr'        => $myaddr,
 		'$request'       => $request,
-		/*'$location'      => Friendica\Content\Text\BBCode::::convert($r[0]['location']),
+		/*
+		 * @TODO commented out?
+		'$location'      => Friendica\Content\Text\BBCode::::convert($r[0]['location']),
 		'$location_label'=> L10n::t('Location:'),
 		'$about'         => Friendica\Content\Text\BBCode::::convert($r[0]['about'], false, false),
-		'$about_label'   => L10n::t('About:'),*/
+		'$about_label'   => L10n::t('About:'),
+		*/
 		'$keywords'      => $r[0]['keywords'],
 		'$keywords_label'=> L10n::t('Tags:')
 	]);
diff --git a/mod/friendica.php b/mod/friendica.php
index 1929150f2..f2cb5c50b 100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -2,26 +2,27 @@
 /**
  * @file mod/friendica.php
  */
+
 use Friendica\App;
 use Friendica\Core\Addon;
-use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
 
 function friendica_init(App $a)
 {
-	if ($a->argv[1] == "json") {
+	if (!empty($a->argv[1]) && ($a->argv[1] == "json")) {
 		$register_policy = ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'];
 
 		$sql_extra = '';
 		if (x($a->config, 'admin_nickname')) {
-			$sql_extra = sprintf(" AND `nickname` = '%s' ", dbesc($a->config['admin_nickname']));
+			$sql_extra = sprintf(" AND `nickname` = '%s' ", DBA::escape(Config::get('config', 'admin_nickname')));
 		}
-		if (isset($a->config['admin_email']) && $a->config['admin_email']!='') {
-			$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
+		if (!empty(Config::get('config', 'admin_email'))) {
+			$adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
 
-			$r = q("SELECT `username`, `nickname` FROM `user` WHERE `email` = '%s' $sql_extra", dbesc($adminlist[0]));
+			$r = q("SELECT `username`, `nickname` FROM `user` WHERE `email` = '%s' $sql_extra", DBA::escape($adminlist[0]));
 			$admin = [
 				'name' => $r[0]['username'],
 				'profile'=> System::baseUrl() . '/profile/' . $r[0]['nickname'],
@@ -33,7 +34,7 @@ function friendica_init(App $a)
 		$visible_addons = [];
 		if (is_array($a->addons) && count($a->addons)) {
 			$r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				foreach ($r as $rr) {
 					$visible_addons[] = $rr['name'];
 				}
@@ -42,7 +43,7 @@ function friendica_init(App $a)
 
 		Config::load('feature_lock');
 		$locked_features = [];
-		if (is_array($a->config['feature_lock']) && count($a->config['feature_lock'])) {
+		if (!empty($a->config['feature_lock']) && count($a->config['feature_lock'])) {
 			foreach ($a->config['feature_lock'] as $k => $v) {
 				if ($k === 'config_loaded') {
 					continue;
@@ -55,13 +56,13 @@ function friendica_init(App $a)
 		$data = [
 			'version'         => FRIENDICA_VERSION,
 			'url'             => System::baseUrl(),
-			'addons'         => $visible_addons,
+			'addons'          => $visible_addons,
 			'locked_features' => $locked_features,
-			'register_policy' =>  $register_policy[$a->config['register_policy']],
+			'register_policy' => $register_policy[intval(Config::get('config', 'register_policy'))],
 			'admin'           => $admin,
-			'site_name'       => $a->config['sitename'],
+			'site_name'       => Config::get('config', 'sitename'),
 			'platform'        => FRIENDICA_PLATFORM,
-			'info'            => ((x($a->config, 'info')) ? $a->config['info'] : ''),
+			'info'            => Config::get('config', 'info'),
 			'no_scrape_url'   => System::baseUrl().'/noscrape'
 		];
 
@@ -74,8 +75,9 @@ function friendica_content(App $a)
 {
 	$o = '<h1>Friendica</h1>' . PHP_EOL;
 	$o .= '<p>';
-	$o .= L10n::t('This is Friendica, version') . ' <strong>' . FRIENDICA_VERSION . '</strong> ';
-	$o .= L10n::t('running at web location') . ' ' . System::baseUrl();
+	$o .= L10n::t('This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s.',
+		'<strong>' . FRIENDICA_VERSION . '</strong>', System::baseUrl(), '<strong>' . DB_UPDATE_VERSION . '</strong>',
+		'<strong>' . Config::get("system", "post_update_version") . '</strong>');
 	$o .= '</p>' . PHP_EOL;
 
 	$o .= '<p>';
@@ -92,7 +94,7 @@ function friendica_content(App $a)
 	$visible_addons = [];
 	if (is_array($a->addons) && count($a->addons)) {
 		$r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r as $rr) {
 				$visible_addons[] = $rr['name'];
 			}
diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 4f432d840..8fc0f07de 100644
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -7,7 +7,7 @@ use Friendica\App;
 use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
 function fsuggest_post(App $a)
@@ -26,7 +26,7 @@ function fsuggest_post(App $a)
 		intval($contact_id),
 		intval(local_user())
 	);
-	if (! DBM::is_result($r)) {
+	if (! DBA::isResult($r)) {
 		notice(L10n::t('Contact not found.') . EOL);
 		return;
 	}
@@ -43,26 +43,26 @@ function fsuggest_post(App $a)
 			intval($new_contact),
 			intval(local_user())
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$x = q("INSERT INTO `fsuggest` ( `uid`,`cid`,`name`,`url`,`request`,`photo`,`note`,`created`)
 				VALUES ( %d, %d, '%s','%s','%s','%s','%s','%s')",
 				intval(local_user()),
 				intval($contact_id),
-				dbesc($r[0]['name']),
-				dbesc($r[0]['url']),
-				dbesc($r[0]['request']),
-				dbesc($r[0]['photo']),
-				dbesc($hash),
-				dbesc(DateTimeFormat::utcNow())
+				DBA::escape($r[0]['name']),
+				DBA::escape($r[0]['url']),
+				DBA::escape($r[0]['request']),
+				DBA::escape($r[0]['photo']),
+				DBA::escape($hash),
+				DBA::escape(DateTimeFormat::utcNow())
 			);
 			$r = q("SELECT `id` FROM `fsuggest` WHERE `note` = '%s' AND `uid` = %d LIMIT 1",
-				dbesc($hash),
+				DBA::escape($hash),
 				intval(local_user())
 			);
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				$fsuggest_id = $r[0]['id'];
 				q("UPDATE `fsuggest` SET `note` = '%s' WHERE `id` = %d AND `uid` = %d",
-					dbesc($note),
+					DBA::escape($note),
 					intval($fsuggest_id),
 					intval(local_user())
 				);
@@ -92,7 +92,7 @@ function fsuggest_content(App $a)
 		intval($contact_id),
 		intval(local_user())
 	);
-	if (! DBM::is_result($r)) {
+	if (! DBA::isResult($r)) {
 		notice(L10n::t('Contact not found.') . EOL);
 		return;
 	}
diff --git a/mod/group.php b/mod/group.php
index 726616a90..8f65eb643 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -10,19 +10,19 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 
 function group_init(App $a) {
 	if (local_user()) {
-		$a->page['aside'] = Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? intval($a->argv[1]) : 0));
+		$a->page['aside'] = Group::sidebarWidget('contacts', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
 	}
 }
 
 function group_post(App $a) {
 
-	if (! local_user()) {
+	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
@@ -45,23 +45,23 @@ function group_post(App $a) {
 		return; // NOTREACHED
 	}
 
-	if (($a->argc == 2) && (intval($a->argv[1]))) {
+	if (($a->argc == 2) && intval($a->argv[1])) {
 		check_form_security_token_redirectOnErr('/group', 'group_edit');
 
 		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			notice(L10n::t('Group not found.') . EOL);
 			goaway(System::baseUrl() . '/contacts');
 			return; // NOTREACHED
 		}
 		$group = $r[0];
 		$groupname = notags(trim($_POST['groupname']));
-		if ((strlen($groupname))  && ($groupname != $group['name'])) {
+		if (strlen($groupname) && ($groupname != $group['name'])) {
 			$r = q("UPDATE `group` SET `name` = '%s' WHERE `uid` = %d AND `id` = %d",
-				dbesc($groupname),
+				DBA::escape($groupname),
 				intval(local_user()),
 				intval($group['id'])
 			);
@@ -79,13 +79,17 @@ function group_post(App $a) {
 function group_content(App $a) {
 	$change = false;
 
-	if (! local_user()) {
+	if (!local_user()) {
 		notice(L10n::t('Permission denied') . EOL);
 		return;
 	}
 
-	// Switch to text mode interface if we have more than 'n' contacts or group members
+	// With no group number provided we jump to the unassigned contacts as a starting point
+	if ($a->argc == 1) {
+		goaway('group/none');
+	}
 
+	// Switch to text mode interface if we have more than 'n' contacts or group members
 	$switchtotext = PConfig::get(local_user(), 'system', 'groupedit_image_limit');
 	if (is_null($switchtotext)) {
 		$switchtotext = Config::get('system', 'groupedit_image_limit', 400);
@@ -94,7 +98,8 @@ function group_content(App $a) {
 	$tpl = get_markup_template('group_edit.tpl');
 
 	$context = [
-			'$submit' => L10n::t('Save Group'),
+		'$submit' => L10n::t('Save Group'),
+		'$submit_filter' => L10n::t('Filter'),
 	];
 
 	if (($a->argc == 2) && ($a->argv[1] === 'new')) {
@@ -108,6 +113,31 @@ function group_content(App $a) {
 
 	}
 
+	$nogroup = false;
+
+	if (($a->argc == 2) && ($a->argv[1] === 'none')) {
+		require_once 'mod/contacts.php';
+
+		$id = -1;
+		$nogroup = true;
+		$group = [
+			'id' => $id,
+			'name' => L10n::t('Contacts not in any group'),
+		];
+
+		$members = [];
+		$preselected = [];
+		$entry = [];
+
+		$context = $context + [
+			'$title' => $group['name'],
+			'$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
+			'$gid' => $id,
+			'$editable' => 0,
+		];
+	}
+
+
 	if (($a->argc == 3) && ($a->argv[1] === 'drop')) {
 		check_form_security_token_redirectOnErr('/group', 'group_drop', 't');
 
@@ -119,7 +149,7 @@ function group_content(App $a) {
 
 			$result = null;
 
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				$result = Group::removeByName(local_user(), $r[0]['name']);
 			}
 
@@ -140,12 +170,12 @@ function group_content(App $a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$change = intval($a->argv[2]);
 		}
 	}
 
-	if (($a->argc > 1) && (intval($a->argv[1]))) {
+	if (($a->argc > 1) && intval($a->argv[1])) {
 		require_once 'mod/contacts.php';
 
 		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
@@ -153,7 +183,7 @@ function group_content(App $a) {
 			intval(local_user())
 		);
 
-		if (! DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			notice(L10n::t('Group not found.') . EOL);
 			goaway(System::baseUrl() . '/contacts');
 		}
@@ -195,17 +225,18 @@ function group_content(App $a) {
 
 
 		$context = $context + [
-			'$title' => L10n::t('Group Editor'),
+			'$title' => $group['name'],
 			'$gname' => ['groupname', L10n::t('Group Name: '), $group['name'], ''],
 			'$gid' => $group['id'],
 			'$drop' => $drop_txt,
 			'$form_security_token' => get_form_security_token('group_edit'),
-			'$edit_name' => L10n::t('Edit Group Name')
+			'$edit_name' => L10n::t('Edit Group Name'),
+			'$editable' => 1,
 		];
 
 	}
 
-	if (! isset($group)) {
+	if (!isset($group)) {
 		return;
 	}
 
@@ -238,23 +269,32 @@ function group_content(App $a) {
 		}
 	}
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
-		intval(local_user())
-	);
+	if ($nogroup) {
+		$r = Contact::getUngroupedList(local_user());
+	} else {
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
+			intval(local_user())
+		);
+		$context['$desc'] = L10n::t('Click on a contact to add or remove.');
+	}
 
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		// Format the data of the contacts who aren't in the contact group
 		foreach ($r as $member) {
-			if (! in_array($member['id'], $preselected)) {
+			if (!in_array($member['id'], $preselected)) {
 				$entry = _contact_detail_for_template($member);
 				$entry['label'] = 'contacts';
-				$entry['photo_menu'] = '';
-				$entry['change_member'] = [
-					'title'     => L10n::t("Add contact to group"),
-					'gid'       => $group['id'],
-					'cid'       => $member['id'],
-					'sec_token' => $sec_token
-				];
+				if (!$nogroup)
+					$entry['photo_menu'] = [];
+
+				if (!$nogroup) {
+					$entry['change_member'] = [
+						'title'     => L10n::t("Add contact to group"),
+						'gid'       => $group['id'],
+						'cid'       => $member['id'],
+						'sec_token' => $sec_token
+					];
+				}
 
 				$groupeditor['contacts'][] = $entry;
 			}
@@ -262,7 +302,6 @@ function group_content(App $a) {
 	}
 
 	$context['$groupeditor'] = $groupeditor;
-	$context['$desc'] = L10n::t('Click on a contact to add or remove.');
 
 	// If there are to many contacts we could provide an alternative view mode
 	$total = count($groupeditor['members']) + count($groupeditor['contacts']);
diff --git a/mod/hcard.php b/mod/hcard.php
index 07c551ebd..0c046da54 100644
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -6,6 +6,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
+use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 
 function hcard_init(App $a)
@@ -28,7 +29,7 @@ function hcard_init(App $a)
 
 	Profile::load($a, $which, $profile);
 
-	if ((x($a->profile, 'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
+	if ((x($a->profile, 'page-flags')) && ($a->profile['page-flags'] == Contact::PAGE_COMMUNITY)) {
 		$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
 	}
 	if (x($a->profile, 'openidserver')) {
@@ -49,7 +50,7 @@ function hcard_init(App $a)
 
 	$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
 	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
-	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
+	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->urlpath) ? '/' . $a->urlpath : ''));
 	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
 	header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
diff --git a/mod/help.php b/mod/help.php
index 981fe97f7..5db74c15e 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -2,44 +2,45 @@
 /**
  * @file mod/help.php
  */
+
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Text\Markdown;
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 
-if (!function_exists('load_doc_file')) {
-
-	function load_doc_file($s) {
-		global $lang;
-		if (!isset($lang))
-			$lang = 'en';
-		$b = basename($s);
-		$d = dirname($s);
-		if (file_exists("$d/$lang/$b"))
-			return file_get_contents("$d/$lang/$b");
-		if (file_exists($s))
-			return file_get_contents($s);
-		return '';
+function load_doc_file($s)
+{
+	$lang = Config::get('system', 'language');
+	$b = basename($s);
+	$d = dirname($s);
+	if (file_exists("$d/$lang/$b")) {
+		return file_get_contents("$d/$lang/$b");
 	}
 
+	if (file_exists($s)) {
+		return file_get_contents($s);
+	}
+
+	return '';
 }
 
-function help_content(App $a) {
-
+function help_content(App $a)
+{
 	Nav::setSelected('help');
 
-	global $lang;
-
 	$text = '';
 
 	if ($a->argc > 1) {
 		$path = '';
 		// looping through the argv keys bigger than 0 to build
 		// a path relative to /help
-		for($x = 1; $x < argc(); $x ++) {
-			if(strlen($path))
+		for ($x = 1; $x < argc(); $x ++) {
+			if (strlen($path)) {
 				$path .= '/';
+			}
+
 			$path .= argv($x);
 		}
 		$title = basename($path);
@@ -47,6 +48,7 @@ function help_content(App $a) {
 		$text = load_doc_file('doc/' . $path . '.md');
 		$a->page['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', notags($title));
 	}
+
 	$home = load_doc_file('doc/Home.md');
 	if (!$text) {
 		$text = $home;
@@ -60,8 +62,8 @@ function help_content(App $a) {
 		header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . L10n::t('Not Found'));
 		$tpl = get_markup_template("404.tpl");
 		return replace_macros($tpl, [
-					'$message' => L10n::t('Page not found.')
-				]);
+			'$message' => L10n::t('Page not found.')
+		]);
 	}
 
 	$html = Markdown::convert($text, false);
@@ -69,34 +71,46 @@ function help_content(App $a) {
 	if ($filename !== "Home") {
 		// create TOC but not for home
 		$lines = explode("\n", $html);
-		$toc="<h2>TOC</h2><ul id='toc'>";
-		$lastlevel=1;
-		$idnum = [0,0,0,0,0,0,0];
-		foreach($lines as &$line){
-			if (substr($line,0,2)=="<h") {
-				$level = substr($line,2,1);
-				if ($level!="r") {
+		$toc = "<h2>TOC</h2><ul id='toc'>";
+		$lastlevel = 1;
+		$idnum = [0, 0, 0, 0, 0, 0, 0];
+		foreach ($lines as &$line) {
+			if (substr($line, 0, 2) == "<h") {
+				$level = substr($line, 2, 1);
+				if ($level != "r") {
 					$level = intval($level);
-					if ($level<$lastlevel) {
-						for($k=$level;$k<$lastlevel; $k++) $toc.="</ul>";
-						for($k=$level+1;$k<count($idnum);$k++) $idnum[$k]=0;
+					if ($level < $lastlevel) {
+						for ($k = $level; $k < $lastlevel; $k++) {
+							$toc .= "</ul>";
+						}
+
+						for ($k = $level + 1; $k < count($idnum); $k++) {
+							$idnum[$k] = 0;
+						}
 					}
-					if ($level>$lastlevel) $toc.="<ul>";
-					$idnum[$level]++;
-					$id = implode("_", array_slice($idnum,1,$level));
-					$href = System::baseUrl()."/help/{$filename}#{$id}";
-					$toc .= "<li><a href='{$href}'>".strip_tags($line)."</a></li>";
-					$line = "<a name='{$id}'></a>".$line;
+
+					if ($level > $lastlevel) {
+						$toc .= "<ul>";
+					}
+
+					$idnum[$level] ++;
+					$id = implode("_", array_slice($idnum, 1, $level));
+					$href = System::baseUrl() . "/help/{$filename}#{$id}";
+					$toc .= "<li><a href='{$href}'>" . strip_tags($line) . "</a></li>";
+					$line = "<a name='{$id}'></a>" . $line;
 					$lastlevel = $level;
 				}
 			}
 		}
-		for($k=0;$k<$lastlevel; $k++) $toc.="</ul>";
-		$html = implode("\n",$lines);
+
+		for ($k = 0; $k < $lastlevel; $k++) {
+			$toc .= "</ul>";
+		}
+
+		$html = implode("\n", $lines);
 
 		$a->page['aside'] = '<div class="help-aside-wrapper widget"><div id="toc-wrapper">' . $toc . '</div>' . $a->page['aside'] . '</div>';
 	}
 
 	return $html;
-
 }
diff --git a/mod/home.php b/mod/home.php
index 206a1827e..d28bf3cb4 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -36,7 +36,7 @@ function home_content(App $a) {
 	}
 
 	$customhome = false;
-	$defaultheader = '<h1>'.((x($a->config,'sitename')) ? L10n::t("Welcome to %s", $a->config['sitename']) : "").'</h1>';
+	$defaultheader = '<h1>' . (Config::get('config', 'sitename') ? L10n::t('Welcome to %s', Config::get('config', 'sitename')) : '') . '</h1>';
 
 	$homefilepath = $a->basepath . "/home.html";
 	$cssfilepath = $a->basepath . "/home.css";
@@ -45,9 +45,9 @@ function home_content(App $a) {
 		if (file_exists($cssfilepath)) {
 			$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.System::baseUrl().'/home.css'.'" media="all" />';
 		}
-	} 
+	}
 
-	$login = Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
+	$login = Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 0 : 1);
 
 	$content = '';
 	Addon::callHooks("home_content",$content);
diff --git a/mod/hovercard.php b/mod/hovercard.php
index 01d9feb1e..8b51eb00a 100644
--- a/mod/hovercard.php
+++ b/mod/hovercard.php
@@ -7,12 +7,14 @@
  * Author: Rabuzarus <https://github.com/rabuzarus>
  * License: GNU AFFERO GENERAL PUBLIC LICENSE (Version 3)
  */
+
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
-use Friendica\Model\Profile;
+use Friendica\Util\Proxy as ProxyUtils;
 
 function hovercard_init(App $a)
 {
@@ -44,19 +46,41 @@ function hovercard_content()
 	// the contact. So we strip out the contact id from the internal url and look in the contact table for
 	// the real url (nurl)
 	$cid = 0;
-	if (local_user() && strpos($profileurl, 'redir/') === 0) {
+	if (strpos($profileurl, 'redir/') === 0) {
 		$cid = intval(substr($profileurl, 6));
-		$remote_contact = dba::selectFirst('contact', ['nurl'], ['id' => $cid]);
+		$remote_contact = DBA::selectFirst('contact', ['nurl'], ['id' => $cid]);
 		$profileurl = defaults($remote_contact, 'nurl', '');
 	}
 
 	$contact = [];
 	// if it's the url containing https it should be converted to http
 	$nurl = normalise_link(GContact::cleanContactUrl($profileurl));
-	if ($nurl) {
-		// Search for contact data
+	if (!$nurl) {
+		return;
+	}
+
+	// Search for contact data
+	// Look if the local user has got the contact
+	if (local_user()) {
+		$contact = Contact::getDetailsByURL($nurl, local_user());
+	}
+
+	// If not then check the global user
+	if (!count($contact)) {
 		$contact = Contact::getDetailsByURL($nurl);
 	}
+
+	// Feeds url could have been destroyed through "cleanContactUrl", so we now use the original url
+	if (!count($contact) && local_user()) {
+		$nurl = normalise_link($profileurl);
+		$contact = Contact::getDetailsByURL($nurl, local_user());
+	}
+
+	if (!count($contact)) {
+		$nurl = normalise_link($profileurl);
+		$contact = Contact::getDetailsByURL($nurl);
+	}
+
 	if (!count($contact)) {
 		return;
 	}
@@ -64,6 +88,8 @@ function hovercard_content()
 	// Get the photo_menu - the menu if possible contact actions
 	if (local_user()) {
 		$actions = Contact::photoMenu($contact);
+	} else {
+		$actions = [];
 	}
 
 	// Move the contact data to the profile array so we can deliver it to
@@ -71,8 +97,8 @@ function hovercard_content()
 		'name'     => $contact['name'],
 		'nick'     => $contact['nick'],
 		'addr'     => defaults($contact, 'addr', $contact['url']),
-		'thumb'    => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB),
-		'url'      => $cid ? ('redir/' . $cid) : Profile::zrl($contact['url']),
+		'thumb'    => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
+		'url'      => Contact::magicLink($contact['url']),
 		'nurl'     => $contact['nurl'], // We additionally store the nurl as identifier
 		'location' => $contact['location'],
 		'gender'   => $contact['gender'],
diff --git a/mod/ignored.php b/mod/ignored.php
index 9931a556a..8502874ce 100644
--- a/mod/ignored.php
+++ b/mod/ignored.php
@@ -2,46 +2,46 @@
 
 use Friendica\App;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
 
-function ignored_init(App $a) {
-
-	$ignored = 0;
-
-	if (! local_user()) {
+function ignored_init(App $a)
+{
+	if (!local_user()) {
 		killme();
 	}
+
 	if ($a->argc > 1) {
 		$message_id = intval($a->argv[1]);
 	}
-	if (! $message_id) {
+
+	if (!$message_id) {
 		killme();
 	}
 
-	$r = q("SELECT `ignored` FROM `thread` WHERE `uid` = %d AND `iid` = %d LIMIT 1",
-		intval(local_user()),
-		intval($message_id)
-	);
-	if (! DBM::is_result($r)) {
+	$thread = Item::selectFirstThreadForUser(local_user(), ['uid', 'ignored'], ['iid' => $message_id]);
+	if (!DBA::isResult($thread)) {
 		killme();
 	}
 
-	if (! intval($r[0]['ignored'])) {
-		$ignored = 1;
-	}
+	// Numeric values are needed for the json output further below
+	$ignored = ($thread['ignored'] ? 0 : 1);
 
-	$r = q("UPDATE `thread` SET `ignored` = %d WHERE `uid` = %d and `iid` = %d",
-		intval($ignored),
-		intval(local_user()),
-		intval($message_id)
-	);
+	if ($thread['uid'] != 0) {
+		DBA::update('thread', ['ignored' => $ignored], ['iid' => $message_id]);
+	} else {
+		DBA::update('user-item', ['ignored' => $ignored], ['iid' => $message_id, 'uid' => local_user()], true);
+	}
 
 	// See if we've been passed a return path to redirect to
-	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
+	$return_path = defaults($_REQUEST, 'return', '');
 	if ($return_path) {
 		$rand = '_=' . time();
-		if(strpos($return_path, '?')) $rand = "&$rand";
-		else $rand = "?$rand";
+		if (strpos($return_path, '?')) {
+			$rand = "&$rand";
+		} else {
+			$rand = "?$rand";
+		}
 
 		goaway(System::baseUrl() . "/" . $return_path . $rand);
 	}
diff --git a/mod/install.php b/mod/install.php
index 4596f9a25..d2d322b3b 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -4,10 +4,10 @@
  */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Install;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Util\Temporal;
 
 $install_wizard_pass = 1;
@@ -22,10 +22,9 @@ function install_init(App $a) {
 
 	// We overwrite current theme css, because during install we could not have a working mod_rewrite
 	// so we could not have a css at all. Here we set a static css file for the install procedure pages
-	$a->config['system']['theme'] = "../install";
-	$a->theme['stylesheet'] = System::baseUrl()."/view/install/style.css";
 
-	Install::setInstallMode();
+	$a->setConfigValue('system', 'value', '../install');
+	$a->theme['stylesheet'] = System::baseUrl()."/view/install/style.css";
 
 	global $install_wizard_pass;
 	if (x($_POST, 'pass')) {
@@ -51,7 +50,7 @@ function install_post(App $a) {
 			$phpath = notags(trim($_POST['phpath']));
 
 			require_once("include/dba.php");
-			if (!dba::connect($dbhost, $dbuser, $dbpass, $dbdata)) {
+			if (!DBA::connect($dbhost, $dbuser, $dbpass, $dbdata)) {
 				$a->data['db_conn_failed'] = true;
 			}
 
@@ -67,12 +66,24 @@ function install_post(App $a) {
 			$timezone = notags(trim($_POST['timezone']));
 			$language = notags(trim($_POST['language']));
 			$adminmail = notags(trim($_POST['adminmail']));
-			$rino = 1;
 
 			// connect to db
-			dba::connect($dbhost, $dbuser, $dbpass, $dbdata);
+			DBA::connect($dbhost, $dbuser, $dbpass, $dbdata);
 
-			Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail, $rino);
+			$errors = Install::createConfig($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail);
+
+			if ($errors) {
+				$a->data['db_failed'] = $errors;
+				return;
+			}
+
+			$errors = Install::installDatabaseStructure();
+
+			if ($errors) {
+				$a->data['db_failed'] = $errors;
+			} else {
+				$a->data['db_installed'] = true;
+			}
 
 			return;
 		break;
@@ -111,9 +122,9 @@ function install_content(App $a) {
 		$db_return_text .= $txt;
 	}
 
-	if (dba::$connected) {
+	if (DBA::$connected) {
 		$r = q("SELECT COUNT(*) as `total` FROM `user`");
-		if (DBM::is_result($r) && $r[0]['total']) {
+		if (DBA::isResult($r) && $r[0]['total']) {
 			$tpl = get_markup_template('install.tpl');
 			return replace_macros($tpl, [
 				'$title' => $install_title,
@@ -140,9 +151,7 @@ function install_content(App $a) {
 	switch ($install_wizard_pass) {
 		case 1: { // System check
 
-			if (x($_POST, 'phpath')) {
-				$phpath = notags(trim($_POST['phpath']));
-			}
+			$phpath = defaults($_POST, 'phpath', 'php');
 
 			list($checks, $checkspassed) = Install::check($phpath);
 
@@ -163,13 +172,12 @@ function install_content(App $a) {
 
 		case 2: { // Database config
 
-			$dbhost = ((x($_POST, 'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
-			$dbuser = notags(trim($_POST['dbuser']));
-			$dbpass = notags(trim($_POST['dbpass']));
-			$dbdata = notags(trim($_POST['dbdata']));
-			$phpath = notags(trim($_POST['phpath']));
-
-			$adminmail = notags(trim($_POST['adminmail']));
+			$dbhost    = notags(trim(defaults($_POST, 'dbhost'   , 'localhost')));
+			$dbuser    = notags(trim(defaults($_POST, 'dbuser'   , ''         )));
+			$dbpass    = notags(trim(defaults($_POST, 'dbpass'   , ''         )));
+			$dbdata    = notags(trim(defaults($_POST, 'dbdata'   , ''         )));
+			$phpath    = notags(trim(defaults($_POST, 'phpath'   , ''         )));
+			$adminmail = notags(trim(defaults($_POST, 'adminmail', ''         )));
 
 			$tpl = get_markup_template('install_db.tpl');
 			$o .= replace_macros($tpl, [
@@ -187,8 +195,6 @@ function install_content(App $a) {
 				'$dbdata' => ['dbdata', L10n::t('Database Name'), $dbdata, '', 'required'],
 				'$adminmail' => ['adminmail', L10n::t('Site administrator email address'), $adminmail, L10n::t('Your account email address must match this in order to use the web admin panel.'), 'required', 'autofocus', 'email'],
 
-
-
 				'$lbl_10' => L10n::t('Please select a default timezone for your website'),
 
 				'$baseurl' => System::baseUrl(),
@@ -196,7 +202,6 @@ function install_content(App $a) {
 				'$phpath' => $phpath,
 
 				'$submit' => L10n::t('Submit'),
-
 			]);
 			return $o;
 		}; break;
@@ -245,7 +250,7 @@ function install_content(App $a) {
 
 function manual_config(App $a) {
 	$data = htmlentities($a->data['txt'],ENT_COMPAT, 'UTF-8');
-	$o = L10n::t('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.');
+	$o = L10n::t('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.');
 	$o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
 	return $o;
 }
diff --git a/mod/invite.php b/mod/invite.php
index 813dbf704..2a98d19ff 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -11,6 +11,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Protocol\Email;
 use Friendica\Util\DateTimeFormat;
 
@@ -61,8 +62,8 @@ function invite_post(App $a)
 			$nmessage = str_replace('$invite_code', $code, $message);
 
 			$r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ",
-				dbesc($code),
-				dbesc(DateTimeFormat::utcNow())
+				DBA::escape($code),
+				DBA::escape(DateTimeFormat::utcNow())
 			);
 
 			if (! is_site_admin()) {
@@ -126,14 +127,14 @@ function invite_content(App $a) {
 
 	$dirloc = Config::get('system', 'directory');
 	if (strlen($dirloc)) {
-		if ($a->config['register_policy'] == REGISTER_CLOSED) {
+		if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
 			$linktxt = L10n::t('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.', $dirloc . '/servers');
 		} else {
 			$linktxt = L10n::t('To accept this invitation, please visit and register at %s or any other public Friendica website.', System::baseUrl())
 			. "\r\n" . "\r\n" . L10n::t('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.', $dirloc . '/servers');
 		}
 	} else { // there is no global directory URL defined
-		if ($a->config['register_policy'] == REGISTER_CLOSED) {
+		if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
 			$o = L10n::t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
 			return $o;
 		} else {
diff --git a/mod/item.php b/mod/item.php
index 823350874..213a99078 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -17,13 +17,16 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\Item;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
@@ -36,14 +39,14 @@ require_once 'include/items.php';
 
 function item_post(App $a) {
 	if (!local_user() && !remote_user()) {
-		return;
+		return 0;
 	}
 
 	require_once 'include/security.php';
 
 	$uid = local_user();
 
-	if (x($_REQUEST, 'dropitems')) {
+	if (!empty($_REQUEST['dropitems'])) {
 		$arr_drop = explode(',', $_REQUEST['dropitems']);
 		drop_items($arr_drop);
 		$json = ['success' => 1];
@@ -53,11 +56,11 @@ function item_post(App $a) {
 
 	Addon::callHooks('post_local_start', $_REQUEST);
 
-	logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
+	logger('postvars ' . print_r($_REQUEST, true), LOGGER_DATA);
 
 	$api_source = defaults($_REQUEST, 'api_source', false);
 
-	$message_id = ((x($_REQUEST, 'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : '');
+	$message_id = ((!empty($_REQUEST['message_id']) && $api_source) ? strip_tags($_REQUEST['message_id']) : '');
 
 	$return_path = defaults($_REQUEST, 'return', '');
 	$preview = intval(defaults($_REQUEST, 'preview', 0));
@@ -67,8 +70,8 @@ function item_post(App $a) {
 	 * Note that we have to ignore previews, otherwise nothing will post
 	 * after it's been previewed
 	 */
-	if (!$preview && x($_REQUEST, 'post_id_random')) {
-		if (x($_SESSION, 'post-random') && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
+	if (!$preview && !empty($_REQUEST['post_id_random'])) {
+		if (!empty($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
 			logger("item post: duplicate post", LOGGER_DEBUG);
 			item_post_return(System::baseUrl(), $api_source, $return_path);
 		} else {
@@ -90,29 +93,29 @@ function item_post(App $a) {
 
 	$objecttype = null;
 	$profile_uid = defaults($_REQUEST, 'profile_uid', local_user());
+	$posttype = defaults($_REQUEST, 'post_type', Item::PT_ARTICLE);
 
 	if ($thr_parent || $thr_parent_uri) {
 		if ($thr_parent) {
-			$parent_item = dba::selectFirst('item', [], ['id' => $thr_parent]);
+			$parent_item = Item::selectFirst([], ['id' => $thr_parent]);
 		} elseif ($thr_parent_uri) {
-			$parent_item = dba::selectFirst('item', [], ['uri' => $thr_parent_uri, 'uid' => $profile_uid]);
+			$parent_item = Item::selectFirst([], ['uri' => $thr_parent_uri, 'uid' => $profile_uid]);
 		}
 
 		// if this isn't the real parent of the conversation, find it
-		if (DBM::is_result($parent_item)) {
-
+		if (DBA::isResult($parent_item)) {
 			// The URI and the contact is taken from the direct parent which needn't to be the top parent
 			$thr_parent_uri = $parent_item['uri'];
 			$thr_parent_contact = Contact::getDetailsByURL($parent_item["author-link"]);
 
 			if ($parent_item['id'] != $parent_item['parent']) {
-				$parent_item = dba::selectFirst('item', [], ['id' => $parent_item['parent']]);
+				$parent_item = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $parent_item['parent']]);
 			}
 		}
 
-		if (!DBM::is_result($parent_item)) {
+		if (!DBA::isResult($parent_item)) {
 			notice(L10n::t('Unable to locate original post.') . EOL);
-			if (x($_REQUEST, 'return')) {
+			if (!empty($_REQUEST['return'])) {
 				goaway($return_path);
 			}
 			killme();
@@ -124,10 +127,6 @@ function item_post(App $a) {
 		$parent_contact = Contact::getDetailsByURL($parent_item["author-link"]);
 
 		$objecttype = ACTIVITY_OBJ_COMMENT;
-
-		if (!x($_REQUEST, 'type')) {
-			$_REQUEST['type'] = 'net-comment';
-		}
 	}
 
 	if ($parent) {
@@ -139,6 +138,13 @@ function item_post(App $a) {
 	$extid       = strip_tags(defaults($_REQUEST, 'extid', ''));
 	$object      = defaults($_REQUEST, 'object', '');
 
+	// Don't use "defaults" here. It would turn 0 to 1
+	if (!isset($_REQUEST['wall'])) {
+		$wall = 1;
+	} else {
+		$wall = $_REQUEST['wall'];
+	}
+
 	// Ensure that the user id in a thread always stay the same
 	if (!is_null($parent_user) && in_array($parent_user, [local_user(), 0])) {
 		$profile_uid = $parent_user;
@@ -146,39 +152,45 @@ function item_post(App $a) {
 
 	// Check for multiple posts with the same message id (when the post was created via API)
 	if (($message_id != '') && ($profile_uid != 0)) {
-		if (dba::exists('item', ['uri' => $message_id, 'uid' => $profile_uid])) {
+		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;
 		}
 	}
 
 	// Allow commenting if it is an answer to a public post
-	$allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
+	$allow_comment = local_user() && ($profile_uid == 0) && $parent && in_array($parent_item['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
 
 	// Now check that valid personal details have been provided
 	if (!can_write_wall($profile_uid) && !$allow_comment) {
 		notice(L10n::t('Permission denied.') . EOL) ;
-		if (x($_REQUEST, 'return')) {
+
+		if (!empty($_REQUEST['return'])) {
 			goaway($return_path);
 		}
+
 		killme();
 	}
 
-
-	// is this an edited post?
-
+	// Init post instance
 	$orig_post = null;
 
-	if ($post_id) {
-		$orig_post = dba::selectFirst('item', [], ['id' => $post_id]);
+	// is this an edited post?
+	if ($post_id > 0) {
+		$orig_post = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
 	}
 
-	$user = dba::selectFirst('user', [], ['uid' => $profile_uid]);
-	if (!DBM::is_result($user) && !$parent) {
-		return;
+	$user = DBA::selectFirst('user', [], ['uid' => $profile_uid]);
+
+	if (!DBA::isResult($user) && !$parent) {
+		return 0;
 	}
 
-	if ($orig_post) {
+	$categories = '';
+	$postopts = '';
+	$emailcc = '';
+
+	if (!empty($orig_post)) {
 		$str_group_allow   = $orig_post['allow_gid'];
 		$str_contact_allow = $orig_post['allow_cid'];
 		$str_group_deny    = $orig_post['deny_gid'];
@@ -187,7 +199,6 @@ function item_post(App $a) {
 		$coord             = $orig_post['coord'];
 		$verb              = $orig_post['verb'];
 		$objecttype        = $orig_post['object-type'];
-		$emailcc           = $orig_post['emailcc'];
 		$app               = $orig_post['app'];
 		$categories        = $orig_post['file'];
 		$title             = notags(trim($_REQUEST['title']));
@@ -205,7 +216,6 @@ function item_post(App $a) {
 		 * use the user default permissions - as they won't have
 		 * been supplied via a form.
 		 */
-		/// @TODO use x($_REQUEST, 'foo') here
 		if ($api_source
 			&& !array_key_exists('contact_allow', $_REQUEST)
 			&& !array_key_exists('group_allow', $_REQUEST)
@@ -217,20 +227,20 @@ function item_post(App $a) {
 			$str_contact_deny  = $user['deny_cid'];
 		} else {
 			// use the posted permissions
-			$str_group_allow   = perms2str($_REQUEST['group_allow']);
-			$str_contact_allow = perms2str($_REQUEST['contact_allow']);
-			$str_group_deny    = perms2str($_REQUEST['group_deny']);
-			$str_contact_deny  = perms2str($_REQUEST['contact_deny']);
+			$str_group_allow   = perms2str(defaults($_REQUEST, 'group_allow', ''));
+			$str_contact_allow = perms2str(defaults($_REQUEST, 'contact_allow', ''));
+			$str_group_deny    = perms2str(defaults($_REQUEST, 'group_deny', ''));
+			$str_contact_deny  = perms2str(defaults($_REQUEST, 'contact_deny', ''));
 		}
 
-		$title             = notags(trim($_REQUEST['title']));
-		$location          = notags(trim($_REQUEST['location']));
-		$coord             = notags(trim($_REQUEST['coord']));
-		$verb              = notags(trim($_REQUEST['verb']));
-		$emailcc           = notags(trim($_REQUEST['emailcc']));
-		$body              = escape_tags(trim($_REQUEST['body']));
-		$network           = notags(trim(defaults($_REQUEST, 'network', NETWORK_DFRN)));
-		$guid              = get_guid(32);
+		$title             =      notags(trim(defaults($_REQUEST, 'title'   , '')));
+		$location          =      notags(trim(defaults($_REQUEST, 'location', '')));
+		$coord             =      notags(trim(defaults($_REQUEST, 'coord'   , '')));
+		$verb              =      notags(trim(defaults($_REQUEST, 'verb'    , '')));
+		$emailcc           =      notags(trim(defaults($_REQUEST, 'emailcc' , '')));
+		$body              = escape_tags(trim(defaults($_REQUEST, 'body'    , '')));
+		$network           =      notags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN)));
+		$guid              =      System::createGUID(32);
 
 		$postopts = defaults($_REQUEST, 'postopts', '');
 
@@ -243,10 +253,9 @@ function item_post(App $a) {
 		// If this is a comment, set the permissions from the parent.
 
 		if ($parent_item) {
-
 			// for non native networks use the network of the original post as network of the item
-			if (($parent_item['network'] != NETWORK_DIASPORA)
-				&& ($parent_item['network'] != NETWORK_OSTATUS)
+			if (($parent_item['network'] != Protocol::DIASPORA)
+				&& ($parent_item['network'] != Protocol::OSTATUS)
 				&& ($network == "")) {
 				$network = $parent_item['network'];
 			}
@@ -256,6 +265,8 @@ function item_post(App $a) {
 			$str_contact_deny  = $parent_item['deny_cid'];
 			$str_group_deny    = $parent_item['deny_gid'];
 			$private           = $parent_item['private'];
+
+			$wall              = $parent_item['wall'];
 		}
 
 		$pubmail_enabled = defaults($_REQUEST, 'pubmail_enable', false) && !$private;
@@ -263,7 +274,7 @@ function item_post(App $a) {
 		// if using the API, we won't see pubmail_enable - figure out if it should be set
 		if ($api_source && $profile_uid && $profile_uid == local_user() && !$private) {
 			if (function_exists('imap_open') && !Config::get('system', 'imap_disabled')) {
-				$pubmail_enabled = dba::exists('mailacct', ["`uid` = ? AND `server` != ? AND `pubmail`", local_user(), '']);
+				$pubmail_enabled = DBA::exists('mailacct', ["`uid` = ? AND `server` != ? AND `pubmail`", local_user(), '']);
 			}
 		}
 
@@ -272,22 +283,22 @@ function item_post(App $a) {
 				killme();
 			}
 			info(L10n::t('Empty post discarded.') . EOL);
-			if (x($_REQUEST, 'return')) {
+			if (!empty($_REQUEST['return'])) {
 				goaway($return_path);
 			}
 			killme();
 		}
 	}
 
-	if (strlen($categories)) {
+	if (!empty($categories)) {
 		// get the "fileas" tags for this post
 		$filedas = file_tag_file_to_list($categories, 'file');
 	}
 	// save old and new categories, so we can determine what needs to be deleted from pconfig
 	$categories_old = $categories;
-	$categories = file_tag_list_to_file(trim($_REQUEST['category']), 'category');
+	$categories = file_tag_list_to_file(trim(defaults($_REQUEST, 'category', '')), 'category');
 	$categories_new = $categories;
-	if (strlen($filedas)) {
+	if (!empty($filedas)) {
 		// append the fileas stuff to the new categories list
 		$categories .= file_tag_list_to_file($filedas, 'file');
 	}
@@ -300,9 +311,9 @@ function item_post(App $a) {
 
 	if (local_user() && ((local_user() == $profile_uid) || $allow_comment)) {
 		$self = true;
-		$author = dba::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
+		$author = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
 	} elseif (remote_user()) {
-		if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
+		if (!empty($_SESSION['remote']) && is_array($_SESSION['remote'])) {
 			foreach ($_SESSION['remote'] as $v) {
 				if ($v['uid'] == $profile_uid) {
 					$contact_id = $v['cid'];
@@ -311,11 +322,11 @@ function item_post(App $a) {
 			}
 		}
 		if ($contact_id) {
-			$author = dba::selectFirst('contact', [], ['id' => $contact_id]);
+			$author = DBA::selectFirst('contact', [], ['id' => $contact_id]);
 		}
 	}
 
-	if (DBM::is_result($author)) {
+	if (DBA::isResult($author)) {
 		$contact_id = $author['id'];
 	}
 
@@ -323,17 +334,7 @@ function item_post(App $a) {
 	if ($profile_uid == local_user() || $allow_comment) {
 		$contact_record = $author;
 	} else {
-		$contact_record = dba::selectFirst('contact', [], ['uid' => $profile_uid, 'self' => true]);
-	}
-
-	$post_type = notags(trim($_REQUEST['type']));
-
-	if ($post_type === 'net-comment' && $parent_item !== null) {
-		if ($parent_item['wall'] == 1) {
-			$post_type = 'wall-comment';
-		} else {
-			$post_type = 'remote-comment';
-		}
+		$contact_record = DBA::selectFirst('contact', [], ['uid' => $profile_uid, 'self' => true]);
 	}
 
 	// Look for any tags and linkify them
@@ -344,14 +345,14 @@ function item_post(App $a) {
 
 	// Add a tag if the parent contact is from OStatus (This will notify them during delivery)
 	if ($parent) {
-		if ($thr_parent_contact['network'] == NETWORK_OSTATUS) {
+		if ($thr_parent_contact['network'] == Protocol::OSTATUS) {
 			$contact = '@[url=' . $thr_parent_contact['url'] . ']' . $thr_parent_contact['nick'] . '[/url]';
 			if (!stripos(implode($tags), '[url=' . $thr_parent_contact['url'] . ']')) {
 				$tags[] = $contact;
 			}
 		}
 
-		if ($parent_contact['network'] == NETWORK_OSTATUS) {
+		if ($parent_contact['network'] == Protocol::OSTATUS) {
 			$contact = '@[url=' . $parent_contact['url'] . ']' . $parent_contact['nick'] . '[/url]';
 			if (!stripos(implode($tags), '[url=' . $parent_contact['url'] . ']')) {
 				$tags[] = $contact;
@@ -394,12 +395,12 @@ function item_post(App $a) {
 				$tagged[] = $tag;
 			}
 			// When the forum is private or the forum is addressed with a "!" make the post private
-			if (is_array($success['contact']) && ($success['contact']['prv'] || ($tag_type == '!'))) {
+			if (is_array($success['contact']) && (!empty($success['contact']['prv']) || ($tag_type == '!'))) {
 				$private_forum = $success['contact']['prv'];
 				$only_to_forum = ($tag_type == '!');
 				$private_id = $success['contact']['id'];
 				$forum_contact = $success['contact'];
-			} elseif (is_array($success['contact']) && $success['contact']['forum'] &&
+			} elseif (is_array($success['contact']) && !empty($success['contact']['forum']) &&
 				($str_contact_allow == '<' . $success['contact']['id'] . '>')) {
 				$private_forum = false;
 				$only_to_forum = true;
@@ -426,6 +427,7 @@ function item_post(App $a) {
 		$contact_id = $private_id;
 		$contact_record = $forum_contact;
 		$_REQUEST['origin'] = false;
+		$wall = 0;
 	}
 
 	/*
@@ -462,14 +464,14 @@ function item_post(App $a) {
 
 				$condition = ['allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
 						'resource-id' => $image_uri, 'uid' => $profile_uid];
-				if (!dba::exists('photo', $condition)) {
+				if (!DBA::exists('photo', $condition)) {
 					continue;
 				}
 
 				$fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow,
 						'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny];
 				$condition = ['resource-id' => $image_uri, 'uid' => $profile_uid, 'album' => L10n::t('Wall Photos')];
-				dba::update('photo', $fields, $condition);
+				DBA::update('photo', $fields, $condition);
 			}
 		}
 	}
@@ -490,25 +492,25 @@ function item_post(App $a) {
 
 				$condition = ['allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
 						'id' => $attach];
-				if (!dba::exists('attach', $condition)) {
+				if (!DBA::exists('attach', $condition)) {
 					continue;
 				}
 
 				$fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow,
 						'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny];
 				$condition = ['id' => $attach];
-				dba::update('attach', $fields, $condition);
+				DBA::update('attach', $fields, $condition);
 			}
 		}
 	}
 
 	// embedded bookmark or attachment in post? set bookmark flag
 
-	$bookmark = 0;
 	$data = BBCode::getAttachmentData($body);
-	if (preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) || isset($data["type"])) {
+	if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $body, $match, PREG_SET_ORDER) || isset($data["type"]))
+		&& ($posttype != Item::PT_PERSONAL_NOTE)) {
+		$posttype = Item::PT_PAGE;
 		$objecttype = ACTIVITY_OBJ_BOOKMARK;
-		$bookmark = 1;
 	}
 
 	$body = bb_translate_video($body);
@@ -540,8 +542,8 @@ function item_post(App $a) {
 	if (preg_match_all('/(\[attachment\]([0-9]+)\[\/attachment\])/',$body,$match)) {
 		foreach ($match[2] as $mtch) {
 			$fields = ['id', 'filename', 'filesize', 'filetype'];
-			$attachment = dba::selectFirst('attach', $fields, ['id' => $mtch]);
-			if (DBM::is_result($attachment)) {
+			$attachment = DBA::selectFirst('attach', $fields, ['id' => $mtch]);
+			if (DBA::isResult($attachment)) {
 				if (strlen($attachments)) {
 					$attachments .= ',';
 				}
@@ -553,30 +555,29 @@ function item_post(App $a) {
 		}
 	}
 
-	$wall = 0;
-
-	if (($post_type === 'wall' || $post_type === 'wall-comment') && !count($forum_contact)) {
-		$wall = 1;
-	}
-
 	if (!strlen($verb)) {
 		$verb = ACTIVITY_POST;
 	}
 
 	if ($network == "") {
-		$network = NETWORK_DFRN;
+		$network = Protocol::DFRN;
 	}
 
-	$gravity = ($parent ? 6 : 0);
+	$gravity = ($parent ? GRAVITY_COMMENT : GRAVITY_PARENT);
 
 	// even if the post arrived via API we are considering that it
 	// originated on this site by default for determining relayability.
 
-	$origin = intval(defaults($_REQUEST, 'origin', 1));
+	// Don't use "defaults" here. It would turn 0 to 1
+	if (!isset($_REQUEST['origin'])) {
+		$origin = 1;
+	} else {
+		$origin = $_REQUEST['origin'];
+	}
 
 	$notify_type = ($parent ? 'comment-new' : 'wall-new');
 
-	$uri = ($message_id ? $message_id : item_new_uri($a->get_hostname(), $profile_uid, $guid));
+	$uri = ($message_id ? $message_id : Item::newURI($api_source ? $profile_uid : $uid, $guid));
 
 	// Fallback so that we alway have a parent uri
 	if (!$thr_parent_uri || !$parent) {
@@ -585,7 +586,6 @@ function item_post(App $a) {
 
 	$datarray = [];
 	$datarray['uid']           = $profile_uid;
-	$datarray['type']          = $post_type;
 	$datarray['wall']          = $wall;
 	$datarray['gravity']       = $gravity;
 	$datarray['network']       = $network;
@@ -615,6 +615,7 @@ function item_post(App $a) {
 	$datarray['file']          = $categories;
 	$datarray['inform']        = $inform;
 	$datarray['verb']          = $verb;
+	$datarray['post-type']     = $posttype;
 	$datarray['object-type']   = $objecttype;
 	$datarray['allow_cid']     = $str_contact_allow;
 	$datarray['allow_gid']     = $str_group_allow;
@@ -623,7 +624,6 @@ function item_post(App $a) {
 	$datarray['private']       = $private;
 	$datarray['pubmail']       = $pubmail_enabled;
 	$datarray['attach']        = $attachments;
-	$datarray['bookmark']      = intval($bookmark);
 
 	// This is not a bug. The item store function changes 'parent-uri' to 'thr-parent' and fetches 'parent-uri' new. (We should change this)
 	$datarray['parent-uri']    = $thr_parent_uri;
@@ -645,20 +645,22 @@ function item_post(App $a) {
 	$datarray['api_source'] = $api_source;
 
 	// This field is for storing the raw conversation data
-	$datarray['protocol'] = PROTOCOL_DFRN;
+	$datarray['protocol'] = Conversation::PARCEL_DFRN;
 
-	$r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $datarray['parent-uri']);
-	if (DBM::is_result($r)) {
-		if ($r['conversation-uri'] != '') {
-			$datarray['conversation-uri'] = $r['conversation-uri'];
+	$conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $datarray['parent-uri']]);
+	if (DBA::isResult($conversation)) {
+		if ($conversation['conversation-uri'] != '') {
+			$datarray['conversation-uri'] = $conversation['conversation-uri'];
 		}
-		if ($r['conversation-href'] != '') {
-			$datarray['conversation-href'] = $r['conversation-href'];
+		if ($conversation['conversation-href'] != '') {
+			$datarray['conversation-href'] = $conversation['conversation-href'];
 		}
 	}
 
 	if ($orig_post) {
 		$datarray['edit'] = true;
+	} else {
+		$datarray['edit'] = false;
 	}
 
 	// Check for hashtags in the body and repair or add hashtag links
@@ -672,6 +674,9 @@ function item_post(App $a) {
 		// We set the datarray ID to -1 because in preview mode the dataray
 		// doesn't have an ID.
 		$datarray["id"] = -1;
+		$datarray["item_id"] = -1;
+		$datarray["author-network"] = Protocol::DFRN;
+
 		$o = conversation($a,[array_merge($contact_record,$datarray)],'search', false, true);
 		logger('preview: ' . $o);
 		echo json_encode(['preview' => $o]);
@@ -680,14 +685,14 @@ function item_post(App $a) {
 
 	Addon::callHooks('post_local',$datarray);
 
-	if (x($datarray, 'cancel')) {
+	if (!empty($datarray['cancel'])) {
 		logger('mod_item: post cancelled by addon.');
 		if ($return_path) {
 			goaway($return_path);
 		}
 
 		$json = ['cancel' => 1];
-		if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) {
+		if (!empty($_REQUEST['jsreload']) && strlen($_REQUEST['jsreload'])) {
 			$json['reload'] = System::baseUrl() . '/' . $_REQUEST['jsreload'];
 		}
 
@@ -717,7 +722,7 @@ function item_post(App $a) {
 		// update filetags in pconfig
 		file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
 
-		if (x($_REQUEST, 'return') && strlen($return_path)) {
+		if (!empty($_REQUEST['return']) && strlen($return_path)) {
 			logger('return: ' . $return_path);
 			goaway($return_path);
 		}
@@ -737,9 +742,9 @@ function item_post(App $a) {
 		goaway($return_path);
 	}
 
-	$datarray = dba::selectFirst('item', [], ['id' => $post_id]);
+	$datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);
 
-	if (!DBM::is_result($datarray)) {
+	if (!DBA::isResult($datarray)) {
 		logger("Item with id ".$post_id." couldn't be fetched.");
 		goaway($return_path);
 	}
@@ -820,7 +825,7 @@ function item_post(App $a) {
 					'replyTo' => $a->user['email'],
 					'messageSubject' => $subject,
 					'htmlVersion' => $message,
-					'textVersion' => Friendica\Content\Text\HTML::toPlaintext($html.$disclaimer)
+					'textVersion' => HTML::toPlaintext($html.$disclaimer)
 				];
 				Emailer::send($params);
 			}
@@ -838,11 +843,16 @@ function item_post(App $a) {
 
 	logger('post_complete');
 
+	if ($api_source) {
+		return $post_id;
+	}
+
 	item_post_return(System::baseUrl(), $api_source, $return_path);
 	// NOTREACHED
 }
 
-function item_post_return($baseurl, $api_source, $return_path) {
+function item_post_return($baseurl, $api_source, $return_path)
+{
 	// figure out how to return, depending on from whence we came
 
 	if ($api_source) {
@@ -854,20 +864,18 @@ function item_post_return($baseurl, $api_source, $return_path) {
 	}
 
 	$json = ['success' => 1];
-	if (x($_REQUEST, 'jsreload') && strlen($_REQUEST['jsreload'])) {
+	if (!empty($_REQUEST['jsreload']) && strlen($_REQUEST['jsreload'])) {
 		$json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
 	}
 
-	logger('post_json: ' . print_r($json,true), LOGGER_DEBUG);
+	logger('post_json: ' . print_r($json, true), LOGGER_DEBUG);
 
 	echo json_encode($json);
 	killme();
 }
 
-
-
-function item_content(App $a) {
-
+function item_content(App $a)
+{
 	if (!local_user() && !remote_user()) {
 		return;
 	}
@@ -875,18 +883,21 @@ function item_content(App $a) {
 	require_once 'include/security.php';
 
 	$o = '';
+
 	if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
 		if (is_ajax()) {
 			$o = Item::deleteForUser(['id' => $a->argv[2]], local_user());
 		} else {
 			$o = drop_item($a->argv[2]);
 		}
+
 		if (is_ajax()) {
 			// ajax return: [<item id>, 0 (no perm) | <owner id>]
 			echo json_encode([intval($a->argv[2]), intval($o)]);
 			killme();
 		}
 	}
+
 	return $o;
 }
 
@@ -927,12 +938,15 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 			$pattern = "/[@!]\[url\=(.*?)\](.*?)\[\/url\]/ism";
 			if (preg_match($pattern, $tag, $matches)) {
 				$data = Contact::getDetailsByURL($matches[1]);
+
 				if ($data["alias"] != "") {
 					$newtag = '@[url=' . $data["alias"] . ']' . $data["nick"] . '[/url]';
+
 					if (!stripos($str_tags, '[url=' . $data["alias"] . ']')) {
 						if (strlen($str_tags)) {
 							$str_tags .= ',';
 						}
+
 						$str_tags .= $newtag;
 					}
 				}
@@ -940,6 +954,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 
 			return $replaced;
 		}
+
 		$stat = false;
 		//get the person's name
 		$name = substr($tag, 1);
@@ -961,41 +976,42 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 			$contact = Contact::getDetailsByAddr($name);
 		} else {
 			$contact = false;
-			$fields = ['id', 'url', 'nick', 'name', 'alias', 'network'];
+			$fields = ['id', 'url', 'nick', 'name', 'alias', 'network', 'forum', 'prv'];
 
 			if (strrpos($name, '+')) {
 				// Is it in format @nick+number?
 				$tagcid = intval(substr($name, strrpos($name, '+') + 1));
-				$contact = dba::selectFirst('contact', $fields, ['id' => $tagcid, 'uid' => $profile_uid]);
+				$contact = DBA::selectFirst('contact', $fields, ['id' => $tagcid, 'uid' => $profile_uid]);
 			}
 
 			// select someone by nick or attag in the current network
-			if (!DBM::is_result($contact) && ($network != "")) {
+			if (!DBA::isResult($contact) && ($network != "")) {
 				$condition = ["(`nick` = ? OR `attag` = ?) AND `network` = ? AND `uid` = ?",
 						$name, $name, $network, $profile_uid];
-				$contact = dba::selectFirst('contact', $fields, $condition);
+				$contact = DBA::selectFirst('contact', $fields, $condition);
 			}
 
 			//select someone by name in the current network
-			if (!DBM::is_result($contact) && ($network != "")) {
+			if (!DBA::isResult($contact) && ($network != "")) {
 				$condition = ['name' => $name, 'network' => $network, 'uid' => $profile_uid];
-				$contact = dba::selectFirst('contact', $fields, $condition);
+				$contact = DBA::selectFirst('contact', $fields, $condition);
 			}
 
 			// select someone by nick or attag in any network
-			if (!DBM::is_result($contact)) {
+			if (!DBA::isResult($contact)) {
 				$condition = ["(`nick` = ? OR `attag` = ?) AND `uid` = ?", $name, $name, $profile_uid];
-				$contact = dba::selectFirst('contact', $fields, $condition);
+				$contact = DBA::selectFirst('contact', $fields, $condition);
 			}
 
 			// select someone by name in any network
-			if (!DBM::is_result($contact)) {
+			if (!DBA::isResult($contact)) {
 				$condition = ['name' => $name, 'uid' => $profile_uid];
-				$contact = dba::selectFirst('contact', $fields, $condition);
+				$contact = DBA::selectFirst('contact', $fields, $condition);
 			}
 		}
 
-		if ($contact) {
+		// Check if $contact has been successfully loaded
+		if (DBA::isResult($contact)) {
 			if (strlen($inform) && (isset($contact["notify"]) || isset($contact["id"]))) {
 				$inform .= ',';
 			}
@@ -1009,8 +1025,9 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 			$profile = $contact["url"];
 			$alias   = $contact["alias"];
 			$newname = $contact["nick"];
-			if (($newname == "") || (($contact["network"] != NETWORK_OSTATUS) && ($contact["network"] != NETWORK_TWITTER)
-				&& ($contact["network"] != NETWORK_STATUSNET) && ($contact["network"] != NETWORK_APPNET))) {
+
+			if (($newname == "") || (($contact["network"] != Protocol::OSTATUS) && ($contact["network"] != Protocol::TWITTER)
+				&& ($contact["network"] != Protocol::STATUSNET))) {
 				$newname = $contact["name"];
 			}
 		}
diff --git a/mod/lockview.php b/mod/lockview.php
index 5134bfdb6..a2301b4cc 100644
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -5,90 +5,109 @@
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
-
-function lockview_content(App $a) {
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
 
+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)
-		killme();
-
-	if (!in_array($type, ['item','photo','event']))
-		killme();
-
-	$r = q("SELECT * FROM `%s` WHERE `id` = %d LIMIT 1",
-		dbesc($type),
-		intval($item_id)
-	);
-	if (! DBM::is_result($r)) {
+	if (!$item_id) {
+		killme();
+	}
+
+	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 {
+		$fields[] = 'private';
+		$item = Item::selectFirst($fields, $condition);
+	}
+
+	if (!DBA::isResult($item)) {
 		killme();
 	}
-	$item = $r[0];
 
 	Addon::callHooks('lockview_content', $item);
 
-	if($item['uid'] != local_user()) {
+	if ($item['uid'] != local_user()) {
 		echo L10n::t('Remote privacy information not available.') . '<br />';
 		killme();
 	}
 
-
-	if(($item['private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid']))
-		&& (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) {
-
+	if (isset($item['private'])
+		&& $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 = [];
 
-	if(count($allowed_groups)) {
+	if (count($allowed_groups)) {
 		$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
-			dbesc(implode(', ', $allowed_groups))
+			DBA::escape(implode(', ', $allowed_groups))
 		);
-		if (DBM::is_result($r))
-			foreach($r as $rr)
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
 				$l[] = '<b>' . $rr['name'] . '</b>';
+			}
+		}
 	}
-	if(count($allowed_users)) {
+
+	if (count($allowed_users)) {
 		$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
-			dbesc(implode(', ',$allowed_users))
+			DBA::escape(implode(', ', $allowed_users))
 		);
-		if (DBM::is_result($r))
-			foreach($r as $rr)
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
 				$l[] = $rr['name'];
-
+			}
+		}
 	}
 
-	if(count($deny_groups)) {
+	if (count($deny_groups)) {
 		$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
-			dbesc(implode(', ', $deny_groups))
+			DBA::escape(implode(', ', $deny_groups))
 		);
-		if (DBM::is_result($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 )",
-			dbesc(implode(', ',$deny_users))
-		);
-		if (DBM::is_result($r))
-			foreach($r as $rr)
-				$l[] = '<strike>' . $rr['name'] . '</strike>';
 
+	if (count($deny_users)) {
+		$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
+			DBA::escape(implode(', ', $deny_users))
+		);
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
+				$l[] = '<strike>' . $rr['name'] . '</strike>';
+			}
+		}
 	}
 
 	echo $o . implode(', ', $l);
diff --git a/mod/lostpass.php b/mod/lostpass.php
index af4518ca1..166da25fc 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -4,9 +4,10 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 
@@ -22,8 +23,8 @@ function lostpass_post(App $a)
 	}
 
 	$condition = ['(`email` = ? OR `nickname` = ?) AND `verified` = 1 AND `blocked` = 0', $loginame, $loginame];
-	$user = dba::selectFirst('user', ['uid', 'username', 'email'], $condition);
-	if (!DBM::is_result($user)) {
+	$user = DBA::selectFirst('user', ['uid', 'username', 'email', 'language'], $condition);
+	if (!DBA::isResult($user)) {
 		notice(L10n::t('No valid account found.') . EOL);
 		goaway(System::baseUrl());
 	}
@@ -34,12 +35,12 @@ function lostpass_post(App $a)
 		'pwdreset' => $pwdreset_token,
 		'pwdreset_time' => DateTimeFormat::utcNow()
 	];
-	$result = dba::update('user', $fields, ['uid' => $user['uid']]);
+	$result = DBA::update('user', $fields, ['uid' => $user['uid']]);
 	if ($result) {
 		info(L10n::t('Password reset request issued. Check your email.') . EOL);
 	}
 
-	$sitename = $a->config['sitename'];
+	$sitename = Config::get('config', 'sitename');
 	$resetlink = System::baseUrl() . '/lostpass/' . $pwdreset_token;
 
 	$preamble = deindent(L10n::t('
@@ -68,6 +69,8 @@ function lostpass_post(App $a)
 
 	notification([
 		'type'     => SYSTEM_EMAIL,
+		'language' => $user['language'],
+		'to_name'  => $user['username'],
 		'to_email' => $user['email'],
 		'uid'      => $user['uid'],
 		'subject'  => L10n::t('Password reset requested at %s', $sitename),
@@ -84,8 +87,8 @@ function lostpass_content(App $a)
 	if ($a->argc > 1) {
 		$pwdreset_token = $a->argv[1];
 
-		$user = dba::selectFirst('user', ['uid', 'username', 'email', 'pwdreset_time'], ['pwdreset' => $pwdreset_token]);
-		if (!DBM::is_result($user)) {
+		$user = DBA::selectFirst('user', ['uid', 'username', 'email', 'pwdreset_time', 'language'], ['pwdreset' => $pwdreset_token]);
+		if (!DBA::isResult($user)) {
 			notice(L10n::t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed."));
 
 			return lostpass_form();
@@ -97,7 +100,7 @@ function lostpass_content(App $a)
 				'pwdreset' => null,
 				'pwdreset_time' => null
 			];
-			dba::update('user', $fields, ['uid' => $user['uid']]);
+			DBA::update('user', $fields, ['uid' => $user['uid']]);
 
 			notice(L10n::t('Request has expired, please make a new one.'));
 
@@ -130,7 +133,7 @@ function lostpass_generate_password($user)
 
 	$new_password = User::generateNewPassword();
 	$result = User::updatePassword($user['uid'], $new_password);
-	if (DBM::is_result($result)) {
+	if (DBA::isResult($result)) {
 		$tpl = get_markup_template('pwdreset.tpl');
 		$o .= replace_macros($tpl, [
 			'$lbl1'    => L10n::t('Password Reset'),
@@ -145,7 +148,7 @@ function lostpass_generate_password($user)
 
 		info("Your password has been reset." . EOL);
 
-		$sitename = $a->config['sitename'];
+		$sitename = Config::get('config', 'sitename');
 		$preamble = deindent(L10n::t('
 			Dear %1$s,
 				Your password has been changed as requested. Please retain this
@@ -164,6 +167,8 @@ function lostpass_generate_password($user)
 
 		notification([
 			'type'     => SYSTEM_EMAIL,
+			'language' => $user['language'],
+			'to_name'  => $user['username'],
 			'to_email' => $user['email'],
 			'uid'      => $user['uid'],
 			'subject'  => L10n::t('Your password has been changed at %s', $sitename),
diff --git a/mod/manage.php b/mod/manage.php
index 0f60e704e..f81afb09a 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -6,7 +6,7 @@ use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 require_once "include/text.php";
 
@@ -23,7 +23,7 @@ function manage_post(App $a) {
 		$r = q("select * from user where uid = %d limit 1",
 			intval($_SESSION['submanage'])
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$uid = intval($r[0]['uid']);
 			$orig_record = $r[0];
 		}
@@ -43,7 +43,7 @@ function manage_post(App $a) {
 	$limited_id = 0;
 	$original_id = $uid;
 
-	if (DBM::is_result($submanage)) {
+	if (DBA::isResult($submanage)) {
 		foreach ($submanage as $m) {
 			if ($identity == $m['mid']) {
 				$limited_id = $m['mid'];
@@ -60,33 +60,33 @@ function manage_post(App $a) {
 		// Check if the target user is one of our children
 		$r = q("SELECT * FROM `user` WHERE `uid` = %d AND `parent-uid` = %d LIMIT 1",
 			intval($identity),
-			dbesc($orig_record['uid'])
+			DBA::escape($orig_record['uid'])
 		);
 
 		// Check if the target user is one of our siblings
-		if (!DBM::is_result($r) && ($orig_record['parent-uid'] != 0)) {
+		if (!DBA::isResult($r) && ($orig_record['parent-uid'] != 0)) {
 			$r = q("SELECT * FROM `user` WHERE `uid` = %d AND `parent-uid` = %d LIMIT 1",
 				intval($identity),
-				dbesc($orig_record['parent-uid'])
+				DBA::escape($orig_record['parent-uid'])
 			);
 		}
 
 		// Check if it's our parent
-		if (!DBM::is_result($r) && ($orig_record['parent-uid'] != 0) && ($orig_record['parent-uid'] == $identity)) {
+		if (!DBA::isResult($r) && ($orig_record['parent-uid'] != 0) && ($orig_record['parent-uid'] == $identity)) {
 			$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 				intval($identity)
 			);
 		}
 
 		// Finally check if it's out own user
-		if (!DBM::is_result($r) && ($orig_record['uid'] != 0) && ($orig_record['uid'] == $identity)) {
+		if (!DBA::isResult($r) && ($orig_record['uid'] != 0) && ($orig_record['uid'] == $identity)) {
 			$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 				intval($identity)
 			);
 		}
 	}
 
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		return;
 	}
 
@@ -132,7 +132,7 @@ function manage_content(App $a) {
 		return;
 	}
 
-	if ($_GET['identity']) {
+	if (!empty($_GET['identity'])) {
 		$_POST['identity'] = $_GET['identity'];
 		manage_post($a);
 		return;
@@ -143,7 +143,7 @@ function manage_content(App $a) {
 	//getting additinal information for each identity
 	foreach ($identities as $key=>$id) {
 		$thumb = q("SELECT `thumb` FROM `contact` WHERE `uid` = '%s' AND `self` = 1",
-			dbesc($id['uid'])
+			DBA::escape($id['uid'])
 		);
 
 		$identities[$key]['thumb'] = $thumb[0]['thumb'];
@@ -155,21 +155,21 @@ function manage_content(App $a) {
 		$r = q("SELECT DISTINCT(`parent`) FROM `notify` WHERE `uid` = %d AND NOT `seen` AND NOT (`type` IN (%d, %d))",
 			intval($id['uid']), intval(NOTIFY_INTRO), intval(NOTIFY_MAIL));
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$notifications = sizeof($r);
 		}
 
 		$r = q("SELECT DISTINCT(`convid`) FROM `mail` WHERE `uid` = %d AND NOT `seen`",
 			intval($id['uid']));
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$notifications = $notifications + sizeof($r);
 		}
 
 		$r = q("SELECT COUNT(*) AS `introductions` FROM `intro` WHERE NOT `blocked` AND NOT `ignore` AND `uid` = %d",
 			intval($id['uid']));
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$notifications = $notifications + $r[0]["introductions"];
 		}
 
diff --git a/mod/match.php b/mod/match.php
index c5e35031f..caa4c944c 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -2,18 +2,18 @@
 /**
  * @file mod/match.php
  */
+
 use Friendica\App;
 use Friendica\Content\Widget;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
-use Friendica\Model\Profile;
 use Friendica\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/text.php';
-require_once 'mod/proxy.php';
 
 /**
  * @brief Controller for /match.
@@ -41,7 +41,7 @@ function match_content(App $a)
 		"SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval(local_user())
 	);
-	if (! DBM::is_result($r)) {
+	if (! DBA::isResult($r)) {
 		return;
 	}
 	if (! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
@@ -79,28 +79,28 @@ function match_content(App $a)
 				$match = q(
 					"SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
 					intval(local_user()),
-					dbesc($match_nurl)
+					DBA::escape($match_nurl)
 				);
 
 				if (!count($match)) {
 					$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 					$connlnk = System::baseUrl() . '/follow/?url=' . $jj->url;
 					$photo_menu = [
-						'profile' => [L10n::t("View Profile"), Profile::zrl($jj->url)],
+						'profile' => [L10n::t("View Profile"), Contact::magicLink($jj->url)],
 						'follow' => [L10n::t("Connect/Follow"), $connlnk]
 					];
 
 					$contact_details = Contact::getDetailsByURL($jj->url, local_user());
 
 					$entry = [
-						'url' => Profile::zrl($jj->url),
-						'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url),
+						'url' => Contact::magicLink($jj->url),
+						'itemurl' => defaults($contact_details, 'addr', $jj->url),
 						'name' => $jj->name,
-						'details'       => $contact_details['location'],
-						'tags'          => $contact_details['keywords'],
-						'about'         => $contact_details['about'],
+						'details'       => defaults($contact_details, 'location', ''),
+						'tags'          => defaults($contact_details, 'keywords', ''),
+						'about'         => defaults($contact_details, 'about', ''),
 						'account_type'  => Contact::getAccountType($contact_details),
-						'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+						'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB),
 						'inttxt' => ' ' . L10n::t('is interested in:'),
 						'conntxt' => L10n::t('Connect'),
 						'connlnk' => $connlnk,
diff --git a/mod/message.php b/mod/message.php
index 6a48eb658..223976ddb 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -10,10 +10,11 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Mail;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
 
 require_once 'include/conversation.php';
@@ -108,8 +109,23 @@ function message_content(App $a)
 	$myprofile = System::baseUrl() . '/profile/' . $a->user['nickname'];
 
 	$tpl = get_markup_template('mail_head.tpl');
+	if ($a->argc > 1 && $a->argv[1] == 'new') {
+		$button = [
+			'label' => L10n::t('Discard'),
+			'url' => '/message',
+			'sel' => 'close',
+		];
+	} else {
+		$button = [
+			'label' => L10n::t('New Message'),
+			'url' => '/message/new',
+			'sel' => 'new',
+			'accesskey' => 'm',
+		];
+	}
 	$header = replace_macros($tpl, [
 		'$messages' => L10n::t('Messages'),
+		'$button' => $button,
 	]);
 
 	if (($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) {
@@ -118,7 +134,7 @@ function message_content(App $a)
 		}
 
 		// Check if we should do HTML-based delete confirmation
-		if ($_REQUEST['confirm']) {
+		if (!empty($_REQUEST['confirm'])) {
 			// <form> can't take arguments in its "action" parameter
 			// so add any arguments as hidden inputs
 			$query = explode_querystring($a->query_string);
@@ -141,16 +157,18 @@ function message_content(App $a)
 				'$cancel' => L10n::t('Cancel'),
 			]);
 		}
+
 		// Now check how the user responded to the confirmation query
-		if ($_REQUEST['canceled']) {
+		if (!empty($_REQUEST['canceled'])) {
 			goaway($_SESSION['return_url']);
 		}
 
 		$cmd = $a->argv[1];
 		if ($cmd === 'drop') {
-			if (dba::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
+			if (DBA::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
 				info(L10n::t('Message deleted.') . EOL);
 			}
+
 			//goaway(System::baseUrl(true) . '/message' );
 			goaway($_SESSION['return_url']);
 		} else {
@@ -158,11 +176,11 @@ function message_content(App $a)
 				intval($a->argv[2]),
 				intval(local_user())
 			);
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				$parent = $r[0]['parent-uri'];
 				$convid = $r[0]['convid'];
 
-				if (dba::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
+				if (DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
 					info(L10n::t('Conversation removed.') . EOL);
 				}
 			}
@@ -197,21 +215,21 @@ function message_content(App $a)
 				intval(local_user()),
 				intval($a->argv[2])
 			);
-			if (!DBM::is_result($r)) {
+			if (!DBA::isResult($r)) {
 				$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
 					intval(local_user()),
-					dbesc(normalise_link(base64_decode($a->argv[2])))
+					DBA::escape(normalise_link(base64_decode($a->argv[2])))
 				);
 			}
 
-			if (!DBM::is_result($r)) {
+			if (!DBA::isResult($r)) {
 				$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
 					intval(local_user()),
-					dbesc(base64_decode($a->argv[2]))
+					DBA::escape(base64_decode($a->argv[2]))
 				);
 			}
 
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				$prename = $r[0]['name'];
 				$preurl = $r[0]['url'];
 				$preid = $r[0]['id'];
@@ -262,13 +280,13 @@ function message_content(App $a)
 			intval(local_user())
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$a->set_pager_total($r[0]['total']);
 		}
 
 		$r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			info(L10n::t('No messages.') . EOL);
 			return $o;
 		}
@@ -290,14 +308,14 @@ function message_content(App $a)
 			intval(local_user()),
 			intval($a->argv[1])
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$contact_id = $r[0]['contact-id'];
 			$convid = $r[0]['convid'];
 
-			$sql_extra = sprintf(" and `mail`.`parent-uri` = '%s' ", dbesc($r[0]['parent-uri']));
+			$sql_extra = sprintf(" and `mail`.`parent-uri` = '%s' ", DBA::escape($r[0]['parent-uri']));
 			if ($convid)
 				$sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ",
-					dbesc($r[0]['parent-uri']),
+					DBA::escape($r[0]['parent-uri']),
 					intval($convid)
 				);
 
@@ -306,14 +324,16 @@ function message_content(App $a)
 				WHERE `mail`.`uid` = %d $sql_extra ORDER BY `mail`.`created` ASC",
 				intval(local_user())
 			);
+		} else {
+			$messages = false;
 		}
-		if (!count($messages)) {
+		if (!DBA::isResult($messages)) {
 			notice(L10n::t('Message not available.') . EOL);
 			return $o;
 		}
 
 		$r = q("UPDATE `mail` SET `seen` = 1 WHERE `parent-uri` = '%s' AND `uid` = %d",
-			dbesc($r[0]['parent-uri']),
+			DBA::escape($r[0]['parent-uri']),
 			intval(local_user())
 		);
 
@@ -341,11 +361,8 @@ function message_content(App $a)
 			if ($message['from-url'] == $myprofile) {
 				$from_url = $myprofile;
 				$sparkle = '';
-			} elseif ($message['contact-id'] != 0) {
-				$from_url = 'redir/' . $message['contact-id'];
-				$sparkle = ' sparkle';
 			} else {
-				$from_url = $message['from-url'] . "?zrl=" . urlencode($myprofile);
+				$from_url = Contact::magicLink($message['from-url']);
 				$sparkle = ' sparkle';
 			}
 
@@ -372,7 +389,7 @@ function message_content(App $a)
 				'from_url' => $from_url,
 				'from_addr' => $contact['addr'],
 				'sparkle' => $sparkle,
-				'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
+				'from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
 				'subject' => $subject_e,
 				'body' => $body_e,
 				'delete' => L10n::t('Delete message'),
@@ -470,10 +487,10 @@ function render_messages(array $msg, $t)
 		$rslt .= replace_macros($tpl, [
 			'$id' => $rr['id'],
 			'$from_name' => $participants,
-			'$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']),
-			'$from_addr' => $contact['addr'],
+			'$from_url' => Contact::magicLink($rr['url']),
+			'$from_addr' => defaults($contact, 'addr', ''),
 			'$sparkle' => ' sparkle',
-			'$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
+			'$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
 			'$subject' => $subject_e,
 			'$delete' => L10n::t('Delete conversation'),
 			'$body' => $body_e,
diff --git a/mod/modexp.php b/mod/modexp.php
index 6fdc1884d..966c111d5 100644
--- a/mod/modexp.php
+++ b/mod/modexp.php
@@ -1,7 +1,7 @@
 <?php
 
 use Friendica\App;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 function modexp_init(App $a) {
 
@@ -10,10 +10,10 @@ function modexp_init(App $a) {
 
 	$nick = $a->argv[1];
 	$r = q("SELECT `spubkey` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
-			dbesc($nick)
+			DBA::escape($nick)
 	);
 
-	if (! DBM::is_result($r)) {
+	if (! DBA::isResult($r)) {
 		killme();
 	}
 
diff --git a/mod/msearch.php b/mod/msearch.php
index 0d7cca4ff..d3477b0d5 100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -2,7 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 function msearch_post(App $a) {
 
@@ -15,21 +15,21 @@ function msearch_post(App $a) {
 		killme();
 
 	$r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `user`.`hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') ",
-		dbesc($search)
+		DBA::escape($search)
 	);
 
-	if (DBM::is_result($r))
+	if (DBA::isResult($r))
 		$total = $r[0]['total'];
 
 	$results = [];
 
 	$r = q("SELECT `pub_keywords`, `username`, `nickname`, `user`.`uid` FROM `user` LEFT JOIN `profile` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `user`.`hidewall` = 0 AND MATCH `pub_keywords` AGAINST ('%s') LIMIT %d , %d ",
-		dbesc($search),
+		DBA::escape($search),
 		intval($startrec),
 		intval($perpage)
 	);
 
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		foreach($r as $rr)
 			$results[] = [
 				'name' => $rr['name'],
diff --git a/mod/network.php b/mod/network.php
index 23835c8d5..c630beb25 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -14,14 +14,16 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Module\Login;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/conversation.php';
 require_once 'include/items.php';
@@ -40,13 +42,13 @@ function network_init(App $a)
 	}
 
 	if (x($_GET, 'save')) {
-		$exists = dba::exists('search', ['uid' => local_user(), 'term' => $search]);
+		$exists = DBA::exists('search', ['uid' => local_user(), 'term' => $search]);
 		if (!$exists) {
-			dba::insert('search', ['uid' => local_user(), 'term' => $search]);
+			DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
 		}
 	}
 	if (x($_GET, 'remove')) {
-		dba::delete('search', ['uid' => local_user(), 'term' => $search]);
+		DBA::delete('search', ['uid' => local_user(), 'term' => $search]);
 	}
 
 	$is_a_date_query = false;
@@ -103,7 +105,6 @@ function network_init(App $a)
 				'/new', //new
 				'',     //starred
 				'',     //bookmarked
-				'',     //spam
 			];
 			$tab_args = [
 				'f=&order=comment', //all
@@ -112,7 +113,6 @@ function network_init(App $a)
 				'',                 //new
 				'f=&star=1',        //starred
 				'f=&bmark=1',       //bookmarked
-				'f=&spam=1',        //spam
 			];
 
 			$k = array_search('active', $last_sel_tabs);
@@ -183,10 +183,10 @@ function saved_searches($search)
 
 	$o = '';
 
-	$terms = dba::select('search', ['id', 'term'], ['uid' => local_user()]);
+	$terms = DBA::select('search', ['id', 'term'], ['uid' => local_user()]);
 	$saved = [];
 
-	while ($rr = dba::fetch($terms)) {
+	while ($rr = DBA::fetch($terms)) {
 		$saved[] = [
 			'id'          => $rr['id'],
 			'term'        => $rr['term'],
@@ -218,9 +218,8 @@ function saved_searches($search)
  * 		'/network/new',				=> $new_active = 'active'
  * 		'/network?f=&star=1',		=> $starred_active = 'active'
  * 		'/network?f=&bmark=1',		=> $bookmarked_active = 'active'
- * 		'/network?f=&spam=1',		=> $spam_active = 'active'
  *
- * @return Array ($no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active);
+ * @return Array ($no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active);
  */
 function network_query_get_sel_tab(App $a)
 {
@@ -230,7 +229,6 @@ function network_query_get_sel_tab(App $a)
 	$bookmarked_active = '';
 	$all_active = '';
 	$conv_active = '';
-	$spam_active = '';
 	$postord_active = '';
 
 	if (($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new')) {
@@ -249,11 +247,7 @@ function network_query_get_sel_tab(App $a)
 		$conv_active = 'active';
 	}
 
-	if (x($_GET, 'spam')) {
-		$spam_active = 'active';
-	}
-
-	if (($new_active == '') && ($starred_active == '') && ($bookmarked_active == '') && ($conv_active == '') && ($spam_active == '')) {
+	if (($new_active == '') && ($starred_active == '') && ($bookmarked_active == '') && ($conv_active == '')) {
 		$no_active = 'active';
 	}
 
@@ -264,7 +258,7 @@ function network_query_get_sel_tab(App $a)
 		}
 	}
 
-	return [$no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active];
+	return [$no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active];
 }
 
 function network_query_get_sel_group(App $a)
@@ -324,7 +318,7 @@ function networkSetSeen($condition)
 		return;
 	}
 
-	$unseen = dba::exists('item', $condition);
+	$unseen = Item::exists($condition);
 
 	if ($unseen) {
 		$r = Item::update(['unseen' => false], $condition);
@@ -368,21 +362,21 @@ function network_content(App $a, $update = 0, $parent = 0)
 	$arr = ['query' => $a->query_string];
 	Addon::callHooks('network_content_init', $arr);
 
-	$nouveau = false;
+	$flat_mode = false;
 
 	if ($a->argc > 1) {
 		for ($x = 1; $x < $a->argc; $x ++) {
 			if ($a->argv[$x] === 'new') {
-				$nouveau = true;
+				$flat_mode = true;
 			}
 		}
 	}
 
 	if (x($_GET, 'file')) {
-		$nouveau = true;
+		$flat_mode = true;
 	}
 
-	if ($nouveau) {
+	if ($flat_mode) {
 		$o = networkFlatView($a, $update);
 	} else {
 		$o = networkThreadedView($a, $update, $parent);
@@ -401,7 +395,7 @@ function network_content(App $a, $update = 0, $parent = 0)
 function networkFlatView(App $a, $update = 0)
 {
 	// Rawmode is used for fetching new content at the end of the page
-	$rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw'));
+	$rawmode = (isset($_GET['mode']) && ($_GET['mode'] == 'raw'));
 
 	if (isset($_GET['last_id'])) {
 		$last_id = intval($_GET['last_id']);
@@ -424,9 +418,9 @@ function networkFlatView(App $a, $update = 0)
 			'allow_location' => $a->user['allow_location'],
 			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
-			'lockstate' => (((is_array($a->user) &&
-			((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) ||
-			(strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+			'lockstate' => (is_array($a->user) &&
+			(strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) ||
+			strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'),
 			'default_perms' => ACL::getDefaultUserPermissions($a->user),
 			'acl' => ACL::getFullSelectorHTML($a->user, true),
 			'bang' => '',
@@ -443,28 +437,33 @@ function networkFlatView(App $a, $update = 0)
 		}
 	}
 
-	if (strlen($file)) {
-		$sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
-			dbesc(protect_sprintf($file)), intval(TERM_OBJ_POST), intval(TERM_FILE), intval(local_user()));
-	} else {
-		$sql_post_table = " INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`";
-	}
-
 	$pager_sql = networkPager($a, $update);
 
-	// show all items unthreaded in reverse created date order
-	$items = q("SELECT %s FROM `item` $sql_post_table %s
-		WHERE %s AND `item`.`uid` = %d
-		ORDER BY `item`.`id` DESC $pager_sql ",
-		item_fieldlists(), item_joins(local_user()), item_condition(),
-		intval(local_user())
-	);
+	if (strlen($file)) {
+		$condition = ["`term` = ? AND `otype` = ? AND `type` = ? AND `uid` = ?",
+			$file, TERM_OBJ_POST, TERM_FILE, local_user()];
+		$params = ['order' => ['tid' => true], 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+		$result = DBA::select('term', ['oid'], $condition);
+
+		$posts = [];
+		while ($term = DBA::fetch($result)) {
+			$posts[] = $term['oid'];
+		}
+		DBA::close($result);
+
+		$condition = ['uid' => local_user(), 'id' => $posts];
+	} else {
+		$condition = ['uid' => local_user()];
+	}
+
+	$params = ['order' => ['id' => true], 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+	$result = Item::selectForUser(local_user(), [], $condition, $params);
+	$items = Item::inArray($result);
 
 	$condition = ['unseen' => true, 'uid' => local_user()];
 	networkSetSeen($condition);
 
-	$mode = 'network-new';
-	$o .= networkConversation($a, $items, $mode, $update);
+	$o .= networkConversation($a, $items, 'network-new', $update);
 
 	return $o;
 }
@@ -482,9 +481,9 @@ function networkThreadedView(App $a, $update, $parent)
 	$rawmode = (isset($_GET['mode']) AND ( $_GET['mode'] == 'raw'));
 
 	if (isset($_GET['last_received']) && isset($_GET['last_commented']) && isset($_GET['last_created']) && isset($_GET['last_id'])) {
-		$last_received = DBM::date($_GET['last_received']);
-		$last_commented = DBM::date($_GET['last_commented']);
-		$last_created = DBM::date($_GET['last_created']);
+		$last_received = DateTimeFormat::utc($_GET['last_received']);
+		$last_commented = DateTimeFormat::utc($_GET['last_commented']);
+		$last_created = DateTimeFormat::utc($_GET['last_created']);
 		$last_id = intval($_GET['last_id']);
 	} else {
 		$last_received = '';
@@ -497,6 +496,8 @@ function networkThreadedView(App $a, $update, $parent)
 
 	$gid = 0;
 
+	$default_permissions = [];
+
 	if ($a->argc > 1) {
 		for ($x = 1; $x < $a->argc; $x ++) {
 			if (is_a_date_arg($a->argv[$x])) {
@@ -508,7 +509,7 @@ function networkThreadedView(App $a, $update, $parent)
 				}
 			} elseif (intval($a->argv[$x])) {
 				$gid = intval($a->argv[$x]);
-				$def_acl = ['allow_gid' => '<' . $gid . '>'];
+				$default_permissions = ['allow_gid' => '<' . $gid . '>'];
 			}
 		}
 	}
@@ -523,18 +524,18 @@ function networkThreadedView(App $a, $update, $parent)
 	$nets  =        defaults($_GET, 'nets' , '');
 
 	if ($cid) {
-		$def_acl = ['allow_cid' => '<' . intval($cid) . '>'];
+		$default_permissions = ['allow_cid' => '<' . intval($cid) . '>'];
 	}
 
 	if ($nets) {
-		$r = dba::select('contact', ['id'], ['uid' => local_user(), 'network' => $nets], ['self' => false]);
+		$r = DBA::select('contact', ['id'], ['uid' => local_user(), 'network' => $nets], ['self' => false]);
 
 		$str = '';
-		while ($rr = dba::fetch($r)) {
+		while ($rr = DBA::fetch($r)) {
 			$str .= '<' . $rr['id'] . '>';
 		}
 		if (strlen($str)) {
-			$def_acl = ['allow_cid' => $str];
+			$default_permissions = ['allow_cid' => $str];
 		}
 	}
 
@@ -558,8 +559,8 @@ function networkThreadedView(App $a, $update, $parent)
 		if ($cid) {
 			// If $cid belongs to a communitity forum or a privat goup,.add a mention to the status editor
 			$condition = ["`id` = ? AND (`forum` OR `prv`)", $cid];
-			$contact = dba::selectFirst('contact', ['addr', 'nick'], $condition);
-			if (DBM::is_result($contact)) {
+			$contact = DBA::selectFirst('contact', ['addr', 'nick'], $condition);
+			if (DBA::isResult($contact)) {
 				if ($contact['addr'] != '') {
 					$content = '!' . $contact['addr'];
 				} else {
@@ -573,11 +574,11 @@ function networkThreadedView(App $a, $update, $parent)
 			'allow_location' => $a->user['allow_location'],
 			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
-			'lockstate' => ((($gid) || ($cid) || ($nets) || (is_array($a->user) &&
-			((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) ||
-			(strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
+			'lockstate' => ($gid || $cid || $nets || (is_array($a->user) &&
+			(strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) ||
+			strlen($a->user['deny_cid']) || strlen($a->user['deny_gid']))) ? 'lock' : 'unlock'),
 			'default_perms' => ACL::getDefaultUserPermissions($a->user),
-			'acl' => ACL::getFullSelectorHTML((($gid || $cid || $nets) ? $def_acl : $a->user), true),
+			'acl' => ACL::getFullSelectorHTML($a->user, true, $default_permissions),
 			'bang' => (($gid || $cid || $nets) ? '!' : ''),
 			'visitor' => 'block',
 			'profile_uid' => local_user(),
@@ -592,13 +593,14 @@ function networkThreadedView(App $a, $update, $parent)
 	// desired.
 
 	$sql_post_table = '';
-	$sql_options = (($star) ? " AND `thread`.`starred` " : '');
-	$sql_options .= (($bmark) ? " AND `thread`.`bookmark` " : '');
+	$sql_options = ($star ? " AND `thread`.`starred` " : '');
+	$sql_options .= ($bmark ? sprintf(" AND `thread`.`post-type` = %d ", Item::PT_PAGE) : '');
 	$sql_extra = $sql_options;
 	$sql_extra2 = '';
 	$sql_extra3 = '';
 	$sql_table = '`thread`';
 	$sql_parent = '`iid`';
+	$sql_order = '';
 
 	if ($update) {
 		$sql_table = '`item`';
@@ -606,12 +608,12 @@ function networkThreadedView(App $a, $update, $parent)
 		$sql_post_table = " INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`";
 	}
 
-	$sql_nets = (($nets) ? sprintf(" AND $sql_table.`network` = '%s' ", dbesc($nets)) : '');
-	$sql_tag_nets = (($nets) ? sprintf(" AND `item`.`network` = '%s' ", dbesc($nets)) : '');
+	$sql_nets = (($nets) ? sprintf(" AND $sql_table.`network` = '%s' ", DBA::escape($nets)) : '');
+	$sql_tag_nets = (($nets) ? sprintf(" AND `item`.`network` = '%s' ", DBA::escape($nets)) : '');
 
 	if ($gid) {
-		$group = dba::selectFirst('group', ['name'], ['id' => $gid, 'uid' => local_user()]);
-		if (!DBM::is_result($group)) {
+		$group = DBA::selectFirst('group', ['name'], ['id' => $gid, 'uid' => local_user()]);
+		if (!DBA::isResult($group)) {
 			if ($update) {
 				killme();
 			}
@@ -626,8 +628,8 @@ function networkThreadedView(App $a, $update, $parent)
 			$contact_str_self = '';
 
 			$contact_str = implode(',', $contacts);
-			$self = dba::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
-			if (DBM::is_result($self)) {
+			$self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
+			if (DBA::isResult($self)) {
 				$contact_str_self = $self['id'];
 			}
 
@@ -646,15 +648,15 @@ function networkThreadedView(App $a, $update, $parent)
 		$fields = ['id', 'name', 'network', 'writable', 'nurl',
 			'forum', 'prv', 'contact-type', 'addr', 'thumb', 'location'];
 		$condition = ["`id` = ? AND (NOT `blocked` OR `pending`)", $cid];
-		$contact = dba::selectFirst('contact', $fields, $condition);
-		if (DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', $fields, $condition);
+		if (DBA::isResult($contact)) {
 			$sql_extra = " AND " . $sql_table . ".`contact-id` = " . intval($cid);
 
 			$entries[0] = [
 				'id' => 'network',
 				'name' => htmlentities($contact['name']),
 				'itemurl' => defaults($contact, 'addr', $contact['nurl']),
-				'thumb' => proxy_url($contact['thumb'], false, PROXY_SIZE_THUMB),
+				'thumb' => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
 				'details' => $contact['location'],
 			];
 
@@ -665,7 +667,7 @@ function networkThreadedView(App $a, $update, $parent)
 				'id' => 'network',
 			]) . $o;
 
-			if ($contact['network'] === NETWORK_OSTATUS && $contact['writable'] && !PConfig::get(local_user(),'system','nowarn_insecure')) {
+			if ($contact['network'] === Protocol::OSTATUS && $contact['writable'] && !PConfig::get(local_user(),'system','nowarn_insecure')) {
 				notice(L10n::t('Private messages to this person are at risk of public disclosure.') . EOL);
 			}
 		} else {
@@ -682,11 +684,11 @@ function networkThreadedView(App $a, $update, $parent)
 
 	if ($datequery) {
 		$sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created <= '%s' ",
-				dbesc(DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get()))));
+				DBA::escape(DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get()))));
 	}
 	if ($datequery2) {
 		$sql_extra3 .= protect_sprintf(sprintf(" AND $sql_table.created >= '%s' ",
-				dbesc(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
+				DBA::escape(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
 	}
 
 	if ($conv) {
@@ -702,12 +704,10 @@ function networkThreadedView(App $a, $update, $parent)
 		$order_mode = 'commented';
 	}
 
-	if ($sql_order == '') {
-		$sql_order = "$sql_table.$ordering";
-	}
+	$sql_order = "$sql_table.$ordering";
 
 	if (x($_GET, 'offset')) {
-		$sql_range = sprintf(" AND $sql_order <= '%s'", dbesc($_GET['offset']));
+		$sql_range = sprintf(" AND $sql_order <= '%s'", DBA::escape($_GET['offset']));
 	} else {
 		$sql_range = '';
 	}
@@ -720,7 +720,7 @@ function networkThreadedView(App $a, $update, $parent)
 		case 'received':
 			if ($last_received != '') {
 				$last_date = $last_received;
-				$sql_range .= sprintf(" AND $sql_table.`received` < '%s'", dbesc($last_received));
+				$sql_range .= sprintf(" AND $sql_table.`received` < '%s'", DBA::escape($last_received));
 				$a->set_pager_page(1);
 				$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
 			}
@@ -728,7 +728,7 @@ function networkThreadedView(App $a, $update, $parent)
 		case 'commented':
 			if ($last_commented != '') {
 				$last_date = $last_commented;
-				$sql_range .= sprintf(" AND $sql_table.`commented` < '%s'", dbesc($last_commented));
+				$sql_range .= sprintf(" AND $sql_table.`commented` < '%s'", DBA::escape($last_commented));
 				$a->set_pager_page(1);
 				$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
 			}
@@ -736,14 +736,14 @@ function networkThreadedView(App $a, $update, $parent)
 		case 'created':
 			if ($last_created != '') {
 				$last_date = $last_created;
-				$sql_range .= sprintf(" AND $sql_table.`created` < '%s'", dbesc($last_created));
+				$sql_range .= sprintf(" AND $sql_table.`created` < '%s'", DBA::escape($last_created));
 				$a->set_pager_page(1);
 				$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
 			}
 			break;
 		case 'id':
 			if (($last_id > 0) && ($sql_table == '`thread`')) {
-				$sql_range .= sprintf(" AND $sql_table.`iid` < '%s'", dbesc($last_id));
+				$sql_range .= sprintf(" AND $sql_table.`iid` < '%s'", DBA::escape($last_id));
 				$a->set_pager_page(1);
 				$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
 			}
@@ -759,7 +759,7 @@ function networkThreadedView(App $a, $update, $parent)
 			// Load all unseen items
 			$sql_extra4 = "`item`.`unseen`";
 			if (Config::get("system", "like_no_comment")) {
-				$sql_extra4 .= " AND `item`.`verb` = '".ACTIVITY_POST."'";
+				$sql_extra4 .= " AND `item`.`gravity` IN (" . GRAVITY_PARENT . "," . GRAVITY_COMMENT . ")";
 			}
 			if ($order === 'post') {
 				// Only show toplevel posts when updating posts in this order mode
@@ -771,7 +771,7 @@ function networkThreadedView(App $a, $update, $parent)
 			FROM `item` $sql_post_table
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-				AND (`item`.`parent-uri` != `item`.`uri`
+				AND (`item`.`gravity` != %d
 					OR `contact`.`uid` = `item`.`uid` AND `contact`.`self`
 					OR `contact`.`rel` IN (%d, %d) AND NOT `contact`.`readonly`)
 			LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = %d
@@ -780,8 +780,9 @@ function networkThreadedView(App $a, $update, $parent)
 			AND NOT `item`.`moderated` AND $sql_extra4
 			$sql_extra3 $sql_extra $sql_range $sql_nets
 			ORDER BY `order_date` DESC LIMIT 100",
-			intval(CONTACT_IS_SHARING),
-			intval(CONTACT_IS_FRIEND),
+			intval(GRAVITY_PARENT),
+			intval(Contact::SHARING),
+			intval(Contact::FRIEND),
 			intval(local_user()),
 			intval(local_user())
 		);
@@ -791,7 +792,7 @@ function networkThreadedView(App $a, $update, $parent)
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
 				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 			STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
-				AND (`item`.`parent-uri` != `item`.`uri`
+				AND (`item`.`gravity` != %d
 					OR `contact`.`uid` = `item`.`uid` AND `contact`.`self`
 					OR `contact`.`rel` IN (%d, %d) AND NOT `contact`.`readonly`)
 			LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = %d
@@ -800,16 +801,17 @@ function networkThreadedView(App $a, $update, $parent)
 			AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
 			$sql_extra2 $sql_extra3 $sql_range $sql_extra $sql_nets
 			ORDER BY `order_date` DESC $pager_sql",
-			intval(CONTACT_IS_SHARING),
-			intval(CONTACT_IS_FRIEND),
+			intval(GRAVITY_PARENT),
+			intval(Contact::SHARING),
+			intval(Contact::FRIEND),
 			intval(local_user()),
 			intval(local_user())
 		);
 	}
 
 	// Only show it when unfiltered (no groups, no networks, ...)
-	if (in_array($nets, ['', NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]) && (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) {
-		if (DBM::is_result($r)) {
+	if (in_array($nets, ['', Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]) && (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) {
+		if (DBA::isResult($r)) {
 			$top_limit = current($r)['order_date'];
 			$bottom_limit = end($r)['order_date'];
 			if (empty($_SESSION['network_last_top_limit']) || ($_SESSION['network_last_top_limit'] < $top_limit)) {
@@ -838,7 +840,7 @@ function networkThreadedView(App $a, $update, $parent)
 			$top_limit = DateTimeFormat::utcNow();
 		}
 
-		$items = dba::p("SELECT `item`.`parent-uri` AS `uri`, 0 AS `item_id`, `item`.$ordering AS `order_date` FROM `item`
+		$items = DBA::p("SELECT `item`.`parent-uri` AS `uri`, 0 AS `item_id`, `item`.$ordering AS `order_date`, `author`.`url` AS `author-link` FROM `item`
 			STRAIGHT_JOIN (SELECT `oid` FROM `term` WHERE `term` IN
 				(SELECT SUBSTR(`term`, 2) FROM `search` WHERE `uid` = ? AND `term` LIKE '#%') AND `otype` = ? AND `type` = ? AND `uid` = 0) AS `term`
 			ON `item`.`id` = `term`.`oid`
@@ -848,7 +850,7 @@ function networkThreadedView(App $a, $update, $parent)
 			local_user(), TERM_OBJ_POST, TERM_HASHTAG,
 			$top_limit, $bottom_limit);
 
-		$data = dba::inArray($items);
+		$data = DBA::toArray($items);
 
 		if (count($data) > 0) {
 			$tag_top_limit = current($data)['order_date'];
@@ -865,7 +867,7 @@ function networkThreadedView(App $a, $update, $parent)
 				// Don't show hash tag posts from blocked or ignored contacts
 				$condition = ["`nurl` = ? AND `uid` = ? AND (`blocked` OR `readonly`)",
 					normalise_link($item['author-link']), local_user()];
-				if (!dba::exists('contact', $condition)) {
+				if (!DBA::exists('contact', $condition)) {
 					$s[$item['uri']] = $item;
 				}
 			}
@@ -878,7 +880,7 @@ function networkThreadedView(App $a, $update, $parent)
 
 	$items = $r;
 
-	if (DBM::is_result($items)) {
+	if (DBA::isResult($items)) {
 		$parents_arr = [];
 
 		foreach ($items as $item) {
@@ -906,7 +908,7 @@ function networkThreadedView(App $a, $update, $parent)
 		$condition = ['unseen' => true, 'uid' => local_user()];
 		networkSetSeen($condition);
 	} elseif ($parents_str) {
-		$condition = ["`uid` = ? AND `unseen` AND `parent` IN (" . dbesc($parents_str) . ")", local_user()];
+		$condition = ["`uid` = ? AND `unseen` AND `parent` IN (" . DBA::escape($parents_str) . ")", local_user()];
 		networkSetSeen($condition);
 	}
 
@@ -928,7 +930,7 @@ function network_tabs(App $a)
 	// item filter tabs
 	/// @TODO fix this logic, reduce duplication
 	/// $a->page['content'] .= '<div class="tabs-wrapper">';
-	list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a);
+	list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active) = network_query_get_sel_tab($a);
 
 	// if no tabs are selected, defaults to comments
 	if ($no_active == 'active') {
@@ -1004,7 +1006,7 @@ function network_tabs(App $a)
 	// save selected tab, but only if not in file mode
 	if (!x($_GET, 'file')) {
 		PConfig::set(local_user(), 'network.view', 'tab.selected', [
-			$all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active
+			$all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active
 		]);
 	}
 
diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index 134c690ce..072986cc5 100644
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -7,8 +7,9 @@
 
 use Friendica\App;
 use Friendica\Core\Addon;
-use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Util\Network;
 require_once 'include/dba.php';
 
@@ -61,9 +62,9 @@ function nodeinfo_init(App $a) {
 
 	$nodeinfo['usage'] = [];
 
-	$nodeinfo['openRegistrations'] = ($a->config['register_policy'] != 0);
+	$nodeinfo['openRegistrations'] = intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED;
 
-	$nodeinfo['metadata'] = ['nodeName' => $a->config['sitename']];
+	$nodeinfo['metadata'] = ['nodeName' => Config::get('config', 'sitename')];
 
 	if (Config::get('system', 'nodeinfo')) {
 
@@ -73,21 +74,12 @@ function nodeinfo_init(App $a) {
 		$nodeinfo['usage']['localPosts'] = (int)Config::get('nodeinfo', 'local_posts');
 		$nodeinfo['usage']['localComments'] = (int)Config::get('nodeinfo', 'local_comments');
 
-		if (Addon::isEnabled('appnet')) {
-			$nodeinfo['services']['inbound'][] = 'appnet';
-		}
-		if (Addon::isEnabled('appnet') || Addon::isEnabled('buffer')) {
-			$nodeinfo['services']['outbound'][] = 'appnet';
-		}
 		if (Addon::isEnabled('blogger')) {
 			$nodeinfo['services']['outbound'][] = 'blogger';
 		}
 		if (Addon::isEnabled('dwpost')) {
 			$nodeinfo['services']['outbound'][] = 'dreamwidth';
 		}
-		if (Addon::isEnabled('fbpost') || Addon::isEnabled('buffer')) {
-			$nodeinfo['services']['outbound'][] = 'facebook';
-		}
 		if (Addon::isEnabled('statusnet')) {
 			$nodeinfo['services']['inbound'][] = 'gnusocial';
 			$nodeinfo['services']['outbound'][] = 'gnusocial';
@@ -141,6 +133,8 @@ function nodeinfo_init(App $a) {
 		if (Addon::isEnabled('twitter')) {
 			$nodeinfo['metadata']['services']['inbound'][] = 'twitter';
 		}
+
+		$nodeinfo['metadata']['explicitContent'] = Config::get('system', 'explicit_content', false) == true;
 	}
 
 	header('Content-type: application/json; charset=utf-8');
@@ -212,11 +206,11 @@ function nodeinfo_cron() {
 		logger('total_users: ' . $total_users . '/' . $active_users_halfyear. '/' . $active_users_monthly, LOGGER_DEBUG);
 	}
 
-	$local_posts = dba::count('thread', ["`wall` AND NOT `deleted` AND `uid` != 0"]);
+	$local_posts = DBA::count('thread', ["`wall` AND NOT `deleted` AND `uid` != 0"]);
 	Config::set('nodeinfo', 'local_posts', $local_posts);
 	logger('local_posts: ' . $local_posts, LOGGER_DEBUG);
 
-	$local_comments = dba::count('item', ["`origin` AND `id` != `parent` AND NOT `deleted` AND `uid` != 0"]);
+	$local_comments = DBA::count('item', ["`origin` AND `id` != `parent` AND NOT `deleted` AND `uid` != 0"]);
 	Config::set('nodeinfo', 'local_comments', $local_comments);
 	logger('local_comments: ' . $local_comments, LOGGER_DEBUG);
 
diff --git a/mod/nogroup.php b/mod/nogroup.php
index 75781765e..18681d768 100644
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -5,21 +5,16 @@
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Core\System;
 
 function nogroup_init(App $a)
 {
 	if (! local_user()) {
 		return;
 	}
-
-	if (! x($a->page, 'aside')) {
-		$a->page['aside'] = '';
-	}
-
-	$a->page['aside'] .= Group::sidebarWidget('contacts', 'group', 'extended');
 }
 
 function nogroup_content(App $a)
@@ -29,41 +24,5 @@ function nogroup_content(App $a)
 		return '';
 	}
 
-	$r = Contact::getUngroupedList(local_user());
-	if (DBM::is_result($r)) {
-		$a->set_pager_total($r[0]['total']);
-	}
-	$r = Contact::getUngroupedList(local_user(), $a->pager['start'], $a->pager['itemspage']);
-	if (DBM::is_result($r)) {
-		foreach ($r as $rr) {
-			$contact_details = Contact::getDetailsByURL($rr['url'], local_user(), $rr);
-
-			$contacts[] = [
-				'img_hover' => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $rr['url']),
-				'edit_hover' => L10n::t('Edit contact'),
-				'photo_menu' => Contact::photoMenu($rr),
-				'id' => $rr['id'],
-				'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
-				'name' => $contact_details['name'],
-				'username' => $contact_details['name'],
-				'details'       => $contact_details['location'],
-				'tags'          => $contact_details['keywords'],
-				'about'         => $contact_details['about'],
-				'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
-				'url' => $rr['url'],
-				'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
-			];
-		}
-	}
-
-	$tpl = get_markup_template("nogroup-template.tpl");
-	$o = replace_macros(
-		$tpl,
-		[
-		'$header' => L10n::t('Contacts who are not members of a group'),
-		'$contacts' => $contacts,
-		'$paginate' => paginate($a)]
-	);
-
-	return $o;
+	goaway(System::baseUrl() . '/group/none');
 }
diff --git a/mod/noscrape.php b/mod/noscrape.php
index 20936929d..3a8abe229 100644
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -2,9 +2,12 @@
 /**
  * @file mod/noscrape.php
  */
+
 use Friendica\App;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 
 function noscrape_init(App $a)
@@ -29,7 +32,7 @@ function noscrape_init(App $a)
 		'guid'     => $a->profile['guid'],
 		'key'      => $a->profile['pubkey'],
 		'homepage' => System::baseUrl()."/profile/{$which}",
-		'comm'     => ($a->profile['account-type'] == ACCOUNT_TYPE_COMMUNITY),
+		'comm'     => ($a->profile['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY),
 	];
 
 	if (!$a->profile['net-publish'] || $a->profile['hidewall']) {
@@ -43,7 +46,7 @@ function noscrape_init(App $a)
 	$keywords = str_replace(['#',',',' ',',,'], ['',' ',',',','], $keywords);
 	$keywords = explode(',', $keywords);
 
-	$contactPhoto = dba::selectFirst('contact', ['photo'], ['self' => true, 'uid' => $a->profile['uid']]);
+	$contactPhoto = DBA::selectFirst('contact', ['photo'], ['self' => true, 'uid' => $a->profile['uid']]);
 
 	$json_info['fn'] = $a->profile['name'];
 	$json_info['photo'] = $contactPhoto["photo"];
@@ -53,18 +56,18 @@ function noscrape_init(App $a)
 		/// @todo What should this value tell us?
 		$r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
 			intval($a->profile['uid']));
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$json_info["updated"] =  date("c", strtotime($r[0]['updated']));
 		}
 
 		$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0
 				AND `network` IN ('%s', '%s', '%s', '')",
 			intval($a->profile['uid']),
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_DIASPORA),
-			dbesc(NETWORK_OSTATUS)
+			DBA::escape(Protocol::DFRN),
+			DBA::escape(Protocol::DIASPORA),
+			DBA::escape(Protocol::OSTATUS)
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$json_info["contacts"] = intval($r[0]['total']);
 		}
 	}
@@ -72,14 +75,14 @@ function noscrape_init(App $a)
 	// We display the last activity (post or login), reduced to year and week number
 	$last_active = 0;
 	$condition = ['uid' => $a->profile['uid'], 'self' => true];
-	$contact = dba::selectFirst('contact', ['last-item'], $condition);
-	if (DBM::is_result($contact)) {
+	$contact = DBA::selectFirst('contact', ['last-item'], $condition);
+	if (DBA::isResult($contact)) {
 		$last_active = strtotime($contact['last-item']);
 	}
 
 	$condition = ['uid' => $a->profile['uid']];
-	$user = dba::selectFirst('user', ['login_date'], $condition);
-	if (DBM::is_result($user)) {
+	$user = DBA::selectFirst('user', ['login_date'], $condition);
+	if (DBA::isResult($user)) {
 		if ($last_active < strtotime($user['login_date'])) {
 			$last_active = strtotime($user['login_date']);
 		}
diff --git a/mod/notes.php b/mod/notes.php
index 96a282608..01f283870 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -2,10 +2,12 @@
 /**
  * @file mod/notes.php
  */
+
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
 use Friendica\Model\Profile;
 
 function notes_init(App $a)
@@ -26,36 +28,21 @@ function notes_init(App $a)
 
 function notes_content(App $a, $update = false)
 {
-	if (! local_user()) {
+	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
 	require_once 'include/security.php';
 	require_once 'include/conversation.php';
-	$groups = [];
 
-
-	$o = '';
-
-	$remote_contact = false;
-
-	$contact_id = $_SESSION['cid'];
-	$contact = $a->contact;
-
-	$is_owner = true;
-
-	$o ="";
-	$o .= Profile::getTabs($a, true);
+	$o = Profile::getTabs($a, true);
 
 	if (!$update) {
 		$o .= '<h3>' . L10n::t('Personal Notes') . '</h3>';
 
-		$commpage = false;
-		$commvisitor = false;
-
 		$x = [
-			'is_owner' => $is_owner,
+			'is_owner' => true,
 			'allow_location' => (($a->user['allow_location']) ? true : false),
 			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
@@ -71,67 +58,26 @@ function notes_content(App $a, $update = false)
 		$o .= status_editor($a, $x, $a->contact['id']);
 	}
 
-	// Construct permissions
+	$condition = ['uid' => local_user(), 'post-type' => Item::PT_PERSONAL_NOTE, 'gravity' => GRAVITY_PARENT,
+		'wall' => false, 'contact-id'=> $a->contact['id']];
 
-	// default permissions - anonymous user
+	$a->set_pager_itemspage(40);
 
-	$sql_extra = " AND `item`.`allow_cid` = '<" . $a->contact['id'] . ">' ";
+	$params = ['order' => ['created' => true],
+		'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+	$r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
 
-	$r = q("SELECT COUNT(*) AS `total`
-		FROM `item` %s
-		WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
-		AND `contact`.`self` AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
-		$sql_extra ",
-		item_joins(local_user()),
-		item_condition(),
-		intval(local_user())
-	);
+	$count = 0;
 
-	if (DBM::is_result($r)) {
-		$a->set_pager_total($r[0]['total']);
-		$a->set_pager_itemspage(40);
+	if (DBA::isResult($r)) {
+		$notes = DBA::toArray($r);
+
+		$count = count($notes);
+
+		$o .= conversation($a, $notes, 'notes', $update);
 	}
 
-	$r = q("SELECT `item`.`id` AS `item_id` FROM `item` %s
-		WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
-		AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
-		$sql_extra
-		ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
-		item_joins(local_user()),
-		item_condition(),
-		intval(local_user()),
-		intval($a->pager['start']),
-		intval($a->pager['itemspage'])
+	$o .= alt_pager($a, $count);
 
-	);
-
-	$parents_arr = [];
-	$parents_str = '';
-
-	if (DBM::is_result($r)) {
-		foreach ($r as $rr) {
-			$parents_arr[] = $rr['item_id'];
-		}
-		$parents_str = implode(', ', $parents_arr);
-
-		$r = q("SELECT %s FROM `item` %s
-			WHERE %s AND `item`.`uid` = %d AND `item`.`parent` IN (%s)
-			$sql_extra
-			ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ",
-			item_fieldlists(),
-			item_joins(local_user()),
-			item_condition(),
-			intval(local_user()),
-			dbesc($parents_str)
-		);
-
-		if (DBM::is_result($r)) {
-			$items = conv_sort($r, "`commented`");
-
-			$o .= conversation($a, $items, 'notes', $update);
-		}
-	}
-
-	$o .= paginate($a);
 	return $o;
 }
diff --git a/mod/notice.php b/mod/notice.php
index c2d85db16..133fd22fc 100644
--- a/mod/notice.php
+++ b/mod/notice.php
@@ -7,13 +7,13 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 function notice_init(App $a)
 {
 	$id = $a->argv[1];
 	$r = q("SELECT `user`.`nickname` FROM `user` LEFT JOIN `item` ON `item`.`uid` = `user`.`uid` WHERE `item`.`id` = %d", intval($id));
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$nick = $r[0]['nickname'];
 		$url = System::baseUrl() . "/display/$nick/$id";
 		goaway($url);
diff --git a/mod/notifications.php b/mod/notifications.php
index f7f40d1d2..3934a3235 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -3,37 +3,35 @@
  * @file mod/notifications.php
  * @brief The notifications module
  */
+
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
 use Friendica\Core\L10n;
 use Friendica\Core\NotificationsManager;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
-function notifications_post(App $a) {
-
-	if (! local_user()) {
+function notifications_post(App $a)
+{
+	if (!local_user()) {
 		goaway(System::baseUrl());
 	}
 
 	$request_id = (($a->argc > 1) ? $a->argv[1] : 0);
 
-	if($request_id === "all")
+	if ($request_id === 'all') {
 		return;
+	}
 
-	if($request_id) {
+	if ($request_id) {
+		$intro = DBA::selectFirst('intro', ['id', 'contact-id', 'fid'], ['id' => $request_id, 'uid' => local_user()]);
 
-		$r = q("SELECT * FROM `intro` WHERE `id` = %d  AND `uid` = %d LIMIT 1",
-			intval($request_id),
-			intval(local_user())
-		);
-
-		if (DBM::is_result($r)) {
-			$intro_id = $r[0]['id'];
-			$contact_id = $r[0]['contact-id'];
-		}
-		else {
+		if (DBA::isResult($intro)) {
+			$intro_id = $intro['id'];
+			$contact_id = $intro['contact-id'];
+		} else {
 			notice(L10n::t('Invalid request identifier.') . EOL);
 			return;
 		}
@@ -41,41 +39,37 @@ function notifications_post(App $a) {
 		// If it is a friend suggestion, the contact is not a new friend but an existing friend
 		// that should not be deleted.
 
-		$fid = $r[0]['fid'];
+		$fid = $intro['fid'];
 
-		if($_POST['submit'] == L10n::t('Discard')) {
-			$r = q("DELETE FROM `intro` WHERE `id` = %d",
-				intval($intro_id)
-			);
-			if(! $fid) {
+		if ($_POST['submit'] == L10n::t('Discard')) {
+			DBA::delete('intro', ['id' => $intro_id]);
 
+			if (!$fid) {
 				// The check for blocked and pending is in case the friendship was already approved
 				// and we just want to get rid of the now pointless notification
-
-				$r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 AND `blocked` = 1 AND `pending` = 1",
-					intval($contact_id),
-					intval(local_user())
-				);
+				$condition = ['id' => $contact_id, 'uid' => local_user(),
+					'self' => false, 'blocked' => true, 'pending' => true];
+				DBA::delete('contact', $condition);
 			}
 			goaway('notifications/intros');
 		}
-		if($_POST['submit'] == L10n::t('Ignore')) {
-			$r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d",
-				intval($intro_id));
+
+		if ($_POST['submit'] == L10n::t('Ignore')) {
+			DBA::update('intro', ['ignore' => true], ['id' => $intro_id]);
 			goaway('notifications/intros');
 		}
 	}
 }
 
-function notifications_content(App $a) {
-
-	if (! local_user()) {
+function notifications_content(App $a)
+{
+	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		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');
 
@@ -87,49 +81,44 @@ function notifications_content(App $a) {
 	// Get the nav tabs for the notification pages
 	$tabs = $nm->getTabs();
 	$notif_content = [];
+	$notif_nocontent = '';
 
 	// Notification results per page
 	$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'));
 
 		$notifs = $nm->introNotifs($all, $startrec, $perpage);
 
 	// Get the network notifications
-	} else if (($a->argc > 1) && ($a->argv[1] == 'network')) {
-
+	} elseif (($a->argc > 1) && ($a->argv[1] == 'network')) {
 		$notif_header = L10n::t('Network Notifications');
 		$notifs = $nm->networkNotifs($show, $startrec, $perpage);
 
 	// Get the system notifications
-	} else if (($a->argc > 1) && ($a->argv[1] == 'system')) {
-
+	} elseif (($a->argc > 1) && ($a->argv[1] == 'system')) {
 		$notif_header = L10n::t('System Notifications');
 		$notifs = $nm->systemNotifs($show, $startrec, $perpage);
 
 	// Get the personal notifications
-	} else if (($a->argc > 1) && ($a->argv[1] == 'personal')) {
-
+	} elseif (($a->argc > 1) && ($a->argv[1] == 'personal')) {
 		$notif_header = L10n::t('Personal Notifications');
 		$notifs = $nm->personalNotifs($show, $startrec, $perpage);
 
 	// Get the home notifications
-	} else if (($a->argc > 1) && ($a->argv[1] == 'home')) {
-
+	} elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
 		$notif_header = L10n::t('Home Notifications');
 		$notifs = $nm->homeNotifs($show, $startrec, $perpage);
-
 	}
 
-
 	// Set the pager
-	$a->set_pager_total($notifs['total']);
 	$a->set_pager_itemspage($perpage);
 
 	// Add additional informations (needed for json output)
@@ -143,11 +132,15 @@ function notifications_content(App $a) {
 
 	$notif_tpl = get_markup_template('notifications.tpl');
 
-	// Process the data for template creation
-	if($notifs['ident'] === 'introductions') {
+	$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');
-		$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 = [
@@ -157,177 +150,171 @@ 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, [
-						'$str_notifytype' => L10n::t('Notification type: '),
-						'$notify_type' => $it['notify_type'],
-						'$intro_id' => $it['intro_id'],
-						'$madeby' => L10n::t('suggested by %s', $it['madeby']),
-						'$contact_id' => $it['contact-id'],
-						'$photo' => $it['photo'],
-						'$fullname' => $it['name'],
-						'$url' => $it['url'],
-						'$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'),
+						'$type'       => $notif['label'],
+						'$str_notifytype' => L10n::t('Notification type:'),
+						'$notify_type'=> $notif['notify_type'],
+						'$intro_id'   => $notif['intro_id'],
+						'$lbl_madeby' => L10n::t('Suggested by:'),
+						'$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'] !== NETWORK_OSTATUS) ? ' checked="checked" ' : ' disabled ');
-					$fan_selected = (($it['network'] === NETWORK_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   = '';
-					$dfrn_text = '';
+					$lbl_knowyou = '';
+					$knowyou     = '';
+					$helptext    = '';
+					$helptext2   = '';
+					$helptext3   = '';
 
-					if($it['network'] === NETWORK_DFRN || $it['network'] === NETWORK_DIASPORA) {
-						if($it['network'] === NETWORK_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'] == NETWORK_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'] != NETWORK_DIASPORA) {
+					if ($notif['network'] != Protocol::DIASPORA) {
 						$discard = L10n::t('Discard');
 					} else {
 						$discard = '';
 					}
 
 					$notif_content[] = replace_macros($tpl, [
-						'$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'],
+						'$type'        => $notif['label'],
+						'$header'      => htmlentities($header),
+						'$str_notifytype' => L10n::t('Notification type:'),
+						'$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;
 			}
 		}
 
-		if($notifs['total'] == 0)
+		if (count($notifs['notifications']) == 0) {
 			info(L10n::t('No introductions.') . EOL);
+		}
 
-	// Normal notifications (no introductions)
-	} else {
-
-		// 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';
-
+		// Normal notifications (no introductions)
+	} elseif (!empty($notifs['notifications'])) {
 		// 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) {
+			$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',
+			];
 
-			// We use the notification label to get the correct template file
-			$tpl_var_name = 'tpl_item_'.$it['label'];
-			$tpl_notif = get_markup_template($$tpl_var_name);
+			$tpl_notif = get_markup_template($notification_templates[$notif['label']]);
 
-			$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'],
 			]);
 		}
-
-		// It doesn't make sense to show the Show unread / Show all link visible if the user is on the
-		// "Show all" page and there are no notifications. So we will hide it.
-		if ($show == 0 || intval($show) && $notifs['total'] > 0) {
-			$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 ($notifs['total'] == 0) {
-			$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
-		}
+	} else {
+		$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
 	}
 
 	$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' => paginate($a)
+		'$notif_show_lnk'  => $notif_show_lnk,
+		'$notif_paginate'  => alt_pager($a, count($notif_content))
 	]);
 
 	return $o;
diff --git a/mod/notify.php b/mod/notify.php
index f22c1cf5b..458d0140a 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -8,7 +8,7 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\L10n;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
 use Friendica\Module\Login;
 use Friendica\Util\Temporal;
@@ -64,7 +64,7 @@ function notify_content(App $a)
 	$not_tpl = get_markup_template('notify.tpl');
 
 	$r = $nm->getAll(['seen'=>0]);
-	if (DBM::is_result($r) > 0) {
+	if (DBA::isResult($r) > 0) {
 		foreach ($r as $it) {
 			$notif_content .= replace_macros($not_tpl, [
 				'$item_link' => System::baseUrl(true).'/notify/view/'. $it['id'],
diff --git a/mod/oexchange.php b/mod/oexchange.php
index 9f844e1db..72577ab4e 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -21,7 +21,7 @@ function oexchange_init(App $a) {
 
 function oexchange_content(App $a) {
 
-	if (! local_user()) {
+	if (!local_user()) {
 		$o = Login::form();
 		return $o;
 	}
@@ -31,27 +31,26 @@ function oexchange_content(App $a) {
 		return;
 	}
 
-	$url = (((x($_REQUEST,'url')) && strlen($_REQUEST['url']))
+	$url = ((x($_REQUEST,'url') && strlen($_REQUEST['url']))
 		? urlencode(notags(trim($_REQUEST['url']))) : '');
-	$title = (((x($_REQUEST,'title')) && strlen($_REQUEST['title']))
+	$title = ((x($_REQUEST,'title') && strlen($_REQUEST['title']))
 		? '&title=' . urlencode(notags(trim($_REQUEST['title']))) : '');
-	$description = (((x($_REQUEST,'description')) && strlen($_REQUEST['description']))
+	$description = ((x($_REQUEST,'description') && strlen($_REQUEST['description']))
 		? '&description=' . urlencode(notags(trim($_REQUEST['description']))) : '');
-	$tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags']))
+	$tags = ((x($_REQUEST,'tags') && strlen($_REQUEST['tags']))
 		? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : '');
 
 	$s = Network::fetchUrl(System::baseUrl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
 
-	if (! strlen($s)) {
+	if (!strlen($s)) {
 		return;
 	}
 
 	$post = [];
 
 	$post['profile_uid'] = local_user();
-	$post['return'] = '/oexchange/done' ;
+	$post['return'] = '/oexchange/done';
 	$post['body'] = Friendica\Content\Text\HTML::toBBCode($s);
-	$post['type'] = 'wall';
 
 	$_REQUEST = $post;
 	require_once('mod/item.php');
diff --git a/mod/openid.php b/mod/openid.php
index 2c284f76d..41d45c1f6 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -7,7 +7,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 function openid_content(App $a) {
 
@@ -41,10 +41,10 @@ function openid_content(App $a) {
 				AND `blocked` = 0 AND `account_expired` = 0
 				AND `account_removed` = 0 AND `verified` = 1
 				LIMIT 1",
-				dbesc($authid), dbesc(normalise_openid($authid))
+				DBA::escape($authid), DBA::escape(normalise_openid($authid))
 			);
 
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 
 				// successful OpenID login
 
@@ -62,7 +62,7 @@ function openid_content(App $a) {
 			// Successful OpenID login - but we can't match it to an existing account.
 			// New registration?
 
-			if ($a->config['register_policy'] == REGISTER_CLOSED) {
+			if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
 				notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL);
 				goaway(System::baseUrl());
 			}
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index e8ba144a1..987f31699 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -5,6 +5,7 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Network\Probe;
@@ -72,8 +73,8 @@ function ostatus_subscribe_content(App $a) {
 	$o .= "<p>".$counter."/".$total.": ".$url;
 
 	$data = Probe::uri($url);
-	if ($data["network"] == NETWORK_OSTATUS) {
-		$result = Contact::createFromProbe($uid, $url, true, NETWORK_OSTATUS);
+	if ($data["network"] == Protocol::OSTATUS) {
+		$result = Contact::createFromProbe($uid, $url, true, Protocol::OSTATUS);
 		if ($result["success"]) {
 			$o .= " - ".L10n::t("success");
 		} else {
diff --git a/mod/p.php b/mod/p.php
deleted file mode 100644
index 2f69a231e..000000000
--- a/mod/p.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/*
-This file is part of the Diaspora protocol. It is used for fetching single public posts.
-*/
-
-use Friendica\App;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Protocol\Diaspora;
-
-function p_init($a){
-	if ($a->argc != 2) {
-		header($_SERVER["SERVER_PROTOCOL"].' 510 '.L10n::t('Not Extended'));
-		killme();
-	}
-
-	$guid = $a->argv[1];
-
-	if (strtolower(substr($guid, -4)) != ".xml") {
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
-		killme();
-	}
-
-	$guid = strtolower(substr($guid, 0, -4));
-
-	// Fetch the item
-	$item = q("SELECT `uid`, `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app`, `location`, `coord`
-			FROM `item` WHERE `wall` AND NOT `private` AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
-		dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
-	if (!$item) {
-		$r = q("SELECT `author-link`
-			FROM `item` WHERE `uid` = 0 AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
-			dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
-		if ($r) {
-			$parts = parse_url($r[0]["author-link"]);
-			$host = $parts["scheme"]."://".$parts["host"];
-
-			if (normalise_link($host) != normalise_link(System::baseUrl())) {
-				$location = $host."/p/".urlencode($guid).".xml";
-
-				header("HTTP/1.1 301 Moved Permanently");
-				header("Location:".$location);
-				killme();
-			}
-		}
-
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
-		killme();
-	}
-
-	// Fetch some data from the author (We could combine both queries - but I think this is more readable)
-	$r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
-		INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
-		WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
-	if (!DBM::is_result($r)) {
-		header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
-		killme();
-	}
-	$user = $r[0];
-
-	$status = Diaspora::buildStatus($item[0], $user);
-	$xml = Diaspora::buildPostXml($status["type"], $status["message"]);
-
-	header("Content-Type: application/xml; charset=utf-8");
-	echo $xml;
-
-	killme();
-}
diff --git a/mod/parse_url.php b/mod/parse_url.php
index ea860f6d3..ebe34875b 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -8,125 +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 (x($_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 ($_GET["title"]) {
-		$title = strip_tags(trim($_GET["title"]));
+	if (!empty($_GET['title'])) {
+		$title = strip_tags(trim($_GET['title']));
 	}
 
-	if ($_GET["description"]) {
-		$text = strip_tags(trim($_GET["description"]));
+	if (!empty($_GET['description'])) {
+		$text = strip_tags(trim($_GET['description']));
 	}
 
-	if ($_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) {
-			list($k,$v) = array_map("trim", explode(":", trim($l), 2));
-			$hdrs[$k] = $v;
+			$header = array_map('trim', explode(':', trim($l), 2));
+			if (count($header) == 2) {
+				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 allready some content information submitted we don't
+	// If there is already some content information submitted we don't
 	// need to parse the url for content.
-	if ($url && $title && $text) {
+	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();
 }
 
 /**
@@ -148,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;
 }
diff --git a/mod/photo.php b/mod/photo.php
index e899d671d..6d456b349 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -4,7 +4,7 @@
  * @file mod/photo.php
  */
 use Friendica\App;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Object\Image;
 
 require_once 'include/security.php';
@@ -39,7 +39,9 @@ function photo_init(App $a)
 	if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
 		header('HTTP/1.1 304 Not Modified');
 		header("Last-Modified: " . gmdate("D, d M Y H:i:s", time()) . " GMT");
-		header('Etag: ' . $_SERVER['HTTP_IF_NONE_MATCH']);
+		if (!empty($_SERVER['HTTP_IF_NONE_MATCH'])) {
+			header('Etag: ' . $_SERVER['HTTP_IF_NONE_MATCH']);
+		}
 		header("Expires: " . gmdate("D, d M Y H:i:s", time() + (31536000)) . " GMT");
 		header("Cache-Control: max-age=31536000");
 		if (function_exists('header_remove')) {
@@ -81,7 +83,7 @@ function photo_init(App $a)
 			intval($resolution),
 			intval($uid)
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$data = $r[0]['data'];
 			$mimetype = $r[0]['type'];
 		}
@@ -105,18 +107,18 @@ function photo_init(App $a)
 
 		// check if the photo exists and get the owner of the photo
 		$r = q("SELECT `uid` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
-			dbesc($photo),
+			DBA::escape($photo),
 			intval($resolution)
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$sql_extra = permissions_sql($r[0]['uid']);
 
 			// Now we'll see if we can access the photo
 			$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` <= %d $sql_extra ORDER BY scale DESC LIMIT 1",
-				dbesc($photo),
+				DBA::escape($photo),
 				intval($resolution)
 			);
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				$resolution = $r[0]['scale'];
 				$data = $r[0]['data'];
 				$mimetype = $r[0]['type'];
diff --git a/mod/photos.php b/mod/photos.php
index 30d3728d3..e205d72c6 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -13,12 +13,13 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Protocol\DFRN;
@@ -44,10 +45,10 @@ function photos_init(App $a) {
 	if ($a->argc > 1) {
 		$nick = $a->argv[1];
 		$user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
-			dbesc($nick)
+			DBA::escape($nick)
 		);
 
-		if (!DBM::is_result($user)) {
+		if (!DBA::isResult($user)) {
 			return;
 		}
 
@@ -78,6 +79,7 @@ function photos_init(App $a) {
 
 		if ($albums) {
 			$a->data['albums'] = $albums;
+
 			if ($albums_visible) {
 				$ret['success'] = true;
 			}
@@ -100,6 +102,8 @@ function photos_init(App $a) {
 
 		if (local_user() && $a->data['user']['uid'] == local_user()) {
 			$can_post = true;
+		} else {
+			$can_post = false;
 		}
 
 		if ($ret['success']) {
@@ -114,14 +118,18 @@ function photos_init(App $a) {
 			]);
 		}
 
-
-		if (!x($a->page, 'aside')) {
+		if (empty($a->page['aside'])) {
 			$a->page['aside'] = '';
 		}
+
 		$a->page['aside'] .= $vcard_widget;
-		$a->page['aside'] .= $photo_albums_widget;
+
+		if (!empty($photo_albums_widget)) {
+			$a->page['aside'] .= $photo_albums_widget;
+		}
 
 		$tpl = get_markup_template("photos_head.tpl");
+
 		$a->page['htmlhead'] .= replace_macros($tpl,[
 			'$ispublic' => L10n::t('everybody')
 		]);
@@ -142,52 +150,48 @@ function photos_post(App $a)
 	$visitor   = 0;
 
 	$page_owner_uid = $a->data['user']['uid'];
-	$community_page = $a->data['user']['page-flags'] == PAGE_COMMUNITY;
+	$community_page = $a->data['user']['page-flags'] == Contact::PAGE_COMMUNITY;
 
 	if (local_user() && (local_user() == $page_owner_uid)) {
 		$can_post = true;
-	} else {
-		if ($community_page && remote_user()) {
-			$contact_id = 0;
-			if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
-				foreach ($_SESSION['remote'] as $v) {
-					if ($v['uid'] == $page_owner_uid) {
-						$contact_id = $v['cid'];
-						break;
-					}
+	} elseif ($community_page && remote_user()) {
+		$contact_id = 0;
+
+		if (!empty($_SESSION['remote']) && is_array($_SESSION['remote'])) {
+			foreach ($_SESSION['remote'] as $v) {
+				if ($v['uid'] == $page_owner_uid) {
+					$contact_id = $v['cid'];
+					break;
 				}
 			}
-			if ($contact_id) {
-				$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
-					intval($contact_id),
-					intval($page_owner_uid)
-				);
-				if (DBM::is_result($r)) {
-					$can_post = true;
-					$visitor = $contact_id;
-				}
+		}
+
+		if ($contact_id > 0) {
+			$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+				intval($contact_id),
+				intval($page_owner_uid)
+			);
+
+			if (DBA::isResult($r)) {
+				$can_post = true;
+				$visitor = $contact_id;
 			}
 		}
 	}
 
 	if (!$can_post) {
-		notice(L10n::t('Permission denied.') . EOL );
+		notice(L10n::t('Permission denied.') . EOL);
 		killme();
 	}
 
-	$r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
-		WHERE `user`.`uid` = %d AND `self` = 1 LIMIT 1",
-		intval($page_owner_uid)
-	);
+	$owner_record = User::getOwnerDataById($page_owner_uid);
 
-	if (!DBM::is_result($r)) {
+	if (!$owner_record) {
 		notice(L10n::t('Contact information unavailable') . EOL);
 		logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
 		killme();
 	}
 
-	$owner_record = $r[0];
-
 	if ($a->argc > 3 && $a->argv[2] === 'album') {
 		$album = hex2bin($a->argv[3]);
 
@@ -197,17 +201,18 @@ function photos_post(App $a)
 		}
 
 		$r = q("SELECT `album` FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
-			dbesc($album),
+			DBA::escape($album),
 			intval($page_owner_uid)
 		);
-		if (!DBM::is_result($r)) {
+
+		if (!DBA::isResult($r)) {
 			notice(L10n::t('Album not found.') . EOL);
 			goaway($_SESSION['photo_return']);
 			return; // NOTREACHED
 		}
 
 		// Check if the user has responded to a delete confirmation query
-		if ($_REQUEST['canceled']) {
+		if (!empty($_REQUEST['canceled'])) {
 			goaway($_SESSION['photo_return']);
 		}
 
@@ -215,14 +220,14 @@ function photos_post(App $a)
 		$newalbum = notags(trim($_POST['albumname']));
 		if ($newalbum != $album) {
 			q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d",
-				dbesc($newalbum),
-				dbesc($album),
+				DBA::escape($newalbum),
+				DBA::escape($album),
 				intval($page_owner_uid)
 			);
 			// Update the photo albums cache
 			Photo::clearAlbumCache($page_owner_uid);
 
-			$newurl = str_replace(bin2hex($album), bin2hex($newalbum), $_SESSION['photo_return']);
+			$newurl = System::baseUrl() . '/photos/' . $a->user['nickname'] . '/album/' . bin2hex($newalbum);
 			goaway($newurl);
 			return; // NOTREACHED
 		}
@@ -233,11 +238,13 @@ function photos_post(App $a)
 
 		if ($_POST['dropalbum'] == L10n::t('Delete Album')) {
 			// Check if we should do HTML-based delete confirmation
-			if (x($_REQUEST, 'confirm')) {
+			if (!empty($_REQUEST['confirm'])) {
 				$drop_url = $a->query_string;
+
 				$extra_inputs = [
 					['name' => 'albumname', 'value' => $_POST['albumname']],
 				];
+
 				$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
 					'$method' => 'post',
 					'$message' => L10n::t('Do you really want to delete this photo album and all its photos?'),
@@ -247,6 +254,7 @@ function photos_post(App $a)
 					'$confirm_name' => 'dropalbum', // Needed so that confirmation will bring us back into this if statement
 					'$cancel' => L10n::t('Cancel'),
 				]);
+
 				$a->error = 1; // Set $a->error so the other module functions don't execute
 				return;
 			}
@@ -259,17 +267,18 @@ function photos_post(App $a)
 				$r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `album` = '%s'",
 					intval($visitor),
 					intval($page_owner_uid),
-					dbesc($album)
+					DBA::escape($album)
 				);
 			} else {
 				$r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
 					intval(local_user()),
-					dbesc($album)
+					DBA::escape($album)
 				);
 			}
-			if (DBM::is_result($r)) {
+
+			if (DBA::isResult($r)) {
 				foreach ($r as $rr) {
-					$res[] = "'" . dbesc($rr['rid']) . "'" ;
+					$res[] = "'" . DBA::escape($rr['rid']) . "'" ;
 				}
 			} else {
 				goaway($_SESSION['photo_return']);
@@ -279,7 +288,7 @@ function photos_post(App $a)
 			$str_res = implode(',', $res);
 
 			// remove the associated photos
-			q("DELETE FROM `photo` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
+			q("DELETE FROM `photo` WHERE `resource-id` IN ($str_res) AND `uid` = %d",
 				intval($page_owner_uid)
 			);
 
@@ -296,7 +305,7 @@ function photos_post(App $a)
 
 
 	// Check if the user has responded to a delete confirmation query for a single photo
-	if ($a->argc > 2 && x($_REQUEST, 'canceled')) {
+	if ($a->argc > 2 && !empty($_REQUEST['canceled'])) {
 		goaway($_SESSION['photo_return']);
 	}
 
@@ -305,8 +314,9 @@ function photos_post(App $a)
 		// same as above but remove single photo
 
 		// Check if we should do HTML-based delete confirmation
-		if (x($_REQUEST, 'confirm')) {
+		if (!empty($_REQUEST['confirm'])) {
 			$drop_url = $a->query_string;
+
 			$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
 				'$method' => 'post',
 				'$message' => L10n::t('Do you really want to delete this photo?'),
@@ -316,6 +326,7 @@ function photos_post(App $a)
 				'$confirm_name' => 'delete', // Needed so that confirmation will bring us back into this if statement
 				'$cancel' => L10n::t('Cancel'),
 			]);
+
 			$a->error = 1; // Set $a->error so the other module functions don't execute
 			return;
 		}
@@ -324,18 +335,19 @@ function photos_post(App $a)
 			$r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `resource-id` = '%s' LIMIT 1",
 				intval($visitor),
 				intval($page_owner_uid),
-				dbesc($a->argv[2])
+				DBA::escape($a->argv[2])
 			);
 		} else {
 			$r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' LIMIT 1",
 				intval(local_user()),
-				dbesc($a->argv[2])
+				DBA::escape($a->argv[2])
 			);
 		}
-		if (DBM::is_result($r)) {
+
+		if (DBA::isResult($r)) {
 			q("DELETE FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'",
 				intval($page_owner_uid),
-				dbesc($r[0]['resource-id'])
+				DBA::escape($r[0]['resource-id'])
 			);
 
 			Item::deleteForUser(['resource-id' => $r[0]['resource-id'], 'uid' => $page_owner_uid], $page_owner_uid);
@@ -348,16 +360,17 @@ function photos_post(App $a)
 		return; // NOTREACHED
 	}
 
-	if ($a->argc > 2 && (x($_POST, 'desc') !== false || x($_POST, 'newtag') !== false || x($_POST, 'albname') !== false)) {
-		$desc        = x($_POST, 'desc')      ? notags(trim($_POST['desc']))      : '';
-		$rawtags     = x($_POST, 'newtag')    ? notags(trim($_POST['newtag']))    : '';
-		$item_id     = x($_POST, 'item_id')   ? intval($_POST['item_id'])         : 0;
-		$albname     = x($_POST, 'albname')   ? notags(trim($_POST['albname']))   : '';
-		$origaname   = x($_POST, 'origaname') ? notags(trim($_POST['origaname'])) : '';
-		$str_group_allow   = perms2str($_POST['group_allow']);
-		$str_contact_allow = perms2str($_POST['contact_allow']);
-		$str_group_deny    = perms2str($_POST['group_deny']);
-		$str_contact_deny  = perms2str($_POST['contact_deny']);
+	if ($a->argc > 2 && (!empty($_POST['desc']) || !empty($_POST['newtag']) || !empty($_POST['albname']) !== false)) {
+		$desc        = !empty($_POST['desc'])      ? notags(trim($_POST['desc']))      : '';
+		$rawtags     = !empty($_POST['newtag'])    ? notags(trim($_POST['newtag']))    : '';
+		$item_id     = !empty($_POST['item_id'])   ? intval($_POST['item_id'])         : 0;
+		$albname     = !empty($_POST['albname'])   ? notags(trim($_POST['albname']))   : '';
+		$origaname   = !empty($_POST['origaname']) ? notags(trim($_POST['origaname'])) : '';
+
+		$str_group_allow   = !empty($_POST['group_allow'])   ? perms2str($_POST['group_allow'])   : '';
+		$str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
+		$str_group_deny    = !empty($_POST['group_deny'])    ? perms2str($_POST['group_deny'])    : '';
+		$str_contact_deny  = !empty($_POST['contact_deny'])  ? perms2str($_POST['contact_deny'])  : '';
 
 		$resource_id = $a->argv[2];
 
@@ -365,55 +378,56 @@ function photos_post(App $a)
 			$albname = DateTimeFormat::localNow('Y');
 		}
 
-		if (x($_POST,'rotate') !== false &&
-		   (intval($_POST['rotate']) == 1 || intval($_POST['rotate']) == 2)) {
+		if (!empty($_POST['rotate']) && (intval($_POST['rotate']) == 1 || intval($_POST['rotate']) == 2)) {
 			logger('rotate');
 
 			$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0 LIMIT 1",
-				dbesc($resource_id),
+				DBA::escape($resource_id),
 				intval($page_owner_uid)
 			);
-			if (DBM::is_result($r)) {
-				$Image = new Image($r[0]['data'], $r[0]['type']);
-				if ($Image->isValid()) {
-					$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
-					$Image->rotate($rotate_deg);
 
-					$width  = $Image->getWidth();
-					$height = $Image->getHeight();
+			if (DBA::isResult($r)) {
+				$image = new Image($r[0]['data'], $r[0]['type']);
+
+				if ($image->isValid()) {
+					$rotate_deg = ((intval($_POST['rotate']) == 1) ? 270 : 90);
+					$image->rotate($rotate_deg);
+
+					$width  = $image->getWidth();
+					$height = $image->getHeight();
 
 					$x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0",
-						dbesc($Image->asString()),
+						DBA::escape($image->asString()),
 						intval($height),
 						intval($width),
-						dbesc($resource_id),
+						DBA::escape($resource_id),
 						intval($page_owner_uid)
 					);
 
 					if ($width > 640 || $height > 640) {
-						$Image->scaleDown(640);
-						$width  = $Image->getWidth();
-						$height = $Image->getHeight();
+						$image->scaleDown(640);
+						$width  = $image->getWidth();
+						$height = $image->getHeight();
 
 						$x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 1",
-							dbesc($Image->asString()),
+							DBA::escape($image->asString()),
 							intval($height),
 							intval($width),
-							dbesc($resource_id),
+							DBA::escape($resource_id),
 							intval($page_owner_uid)
 						);
 					}
 
 					if ($width > 320 || $height > 320) {
-						$Image->scaleDown(320);
-						$width  = $Image->getWidth();
-						$height = $Image->getHeight();
+						$image->scaleDown(320);
+						$width  = $image->getWidth();
+						$height = $image->getHeight();
 
 						$x = q("UPDATE `photo` SET `data` = '%s', `height` = %d, `width` = %d WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 2",
-							dbesc($Image->asString()),
+							DBA::escape($image->asString()),
 							intval($height),
 							intval($width),
-							dbesc($resource_id),
+							DBA::escape($resource_id),
 							intval($page_owner_uid)
 						);
 					}
@@ -422,19 +436,20 @@ function photos_post(App $a)
 		}
 
 		$p = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ORDER BY `scale` DESC",
-			dbesc($resource_id),
+			DBA::escape($resource_id),
 			intval($page_owner_uid)
 		);
-		if (DBM::is_result($p)) {
+
+		if (DBA::isResult($p)) {
 			$ext = $phototypes[$p[0]['type']];
 			$r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d",
-				dbesc($desc),
-				dbesc($albname),
-				dbesc($str_contact_allow),
-				dbesc($str_group_allow),
-				dbesc($str_contact_deny),
-				dbesc($str_group_deny),
-				dbesc($resource_id),
+				DBA::escape($desc),
+				DBA::escape($albname),
+				DBA::escape($str_contact_allow),
+				DBA::escape($str_group_allow),
+				DBA::escape($str_contact_deny),
+				DBA::escape($str_group_deny),
+				DBA::escape($resource_id),
 				intval($page_owner_uid)
 			);
 
@@ -454,14 +469,14 @@ function photos_post(App $a)
 		if (!$item_id) {
 			// Create item container
 			$title = '';
-			$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
+			$uri = Item::newURI($page_owner_uid);
 
 			$arr = [];
-			$arr['guid']          = get_guid(32);
+			$arr['guid']          = System::createGUID(32);
 			$arr['uid']           = $page_owner_uid;
 			$arr['uri']           = $uri;
 			$arr['parent-uri']    = $uri;
-			$arr['type']          = 'photo';
+			$arr['post-type']     = Item::PT_IMAGE;
 			$arr['wall']          = 1;
 			$arr['resource-id']   = $p[0]['resource-id'];
 			$arr['contact-id']    = $owner_record['id'];
@@ -487,14 +502,11 @@ function photos_post(App $a)
 		}
 
 		if ($item_id) {
-			$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval($item_id),
-				intval($page_owner_uid)
-			);
+			$item = Item::selectFirst(['tag', 'inform'], ['id' => $item_id, 'uid' => $page_owner_uid]);
 		}
-		if (DBM::is_result($r)) {
-			$old_tag    = $r[0]['tag'];
-			$old_inform = $r[0]['inform'];
+		if (DBA::isResult($item)) {
+			$old_tag    = $item['tag'];
+			$old_inform = $item['inform'];
 		}
 
 		if (strlen($rawtags)) {
@@ -515,28 +527,35 @@ function photos_post(App $a)
 					if (strpos($tag, '@') === 0) {
 						$profile = '';
 						$name = substr($tag,1);
+
 						if ((strpos($name, '@')) || (strpos($name, 'http://'))) {
 							$newname = $name;
 							$links = @Probe::lrdd($name);
+
 							if (count($links)) {
 								foreach ($links as $link) {
 									if ($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') {
 										$profile = $link['@attributes']['href'];
 									}
+
 									if ($link['@attributes']['rel'] === 'salmon') {
 										$salmon = '$url:' . str_replace(',', '%sc', $link['@attributes']['href']);
+
 										if (strlen($inform)) {
 											$inform .= ',';
 										}
+
 										$inform .= $salmon;
 									}
 								}
 							}
+
 							$taginfo[] = [$newname, $profile, $salmon];
 						} else {
 							$newname = $name;
 							$alias = '';
 							$tagcid = 0;
+
 							if (strrpos($newname, '+')) {
 								$tagcid = intval(substr($newname, strrpos($newname, '+') + 1));
 							}
@@ -551,23 +570,24 @@ function photos_post(App $a)
 
 								//select someone from this user's contacts by name
 								$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
-										dbesc($newname),
+										DBA::escape($newname),
 										intval($page_owner_uid)
 								);
 
-								if (!DBM::is_result($r)) {
+								if (!DBA::isResult($r)) {
 									//select someone by attag or nick and the name passed in
 									$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
-											dbesc($name),
-											dbesc($name),
+											DBA::escape($name),
+											DBA::escape($name),
 											intval($page_owner_uid)
 									);
 								}
 							}
 
-							if (DBM::is_result($r)) {
+							if (DBA::isResult($r)) {
 								$newname = $r[0]['name'];
 								$profile = $r[0]['url'];
+
 								$notify = 'cid:' . $r[0]['id'];
 								if (strlen($inform)) {
 									$inform .= ',';
@@ -575,15 +595,18 @@ function photos_post(App $a)
 								$inform .= $notify;
 							}
 						}
+
 						if ($profile) {
 							if (substr($notify, 0, 4) === 'cid:') {
 								$taginfo[] = [$newname, $profile, $notify, $r[0], '@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]'];
 							} else {
 								$taginfo[] = [$newname, $profile, $notify, null, $str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]'];
 							}
+
 							if (strlen($str_tags)) {
 								$str_tags .= ',';
 							}
+
 							$profile = str_replace(',', '%2c', $profile);
 							$str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
 						}
@@ -616,6 +639,7 @@ function photos_post(App $a)
 					$best = 2;
 					break;
 				}
+
 				if (intval($scales['scale']) == 4) {
 					$best = 4;
 					break;
@@ -624,14 +648,13 @@ function photos_post(App $a)
 
 			if (count($taginfo)) {
 				foreach ($taginfo as $tagged) {
-					$uri = item_new_uri($a->get_hostname(), $page_owner_uid);
+					$uri = Item::newURI($page_owner_uid);
 
 					$arr = [];
-					$arr['guid']          = get_guid(32);
+					$arr['guid']          = System::createGUID(32);
 					$arr['uid']           = $page_owner_uid;
 					$arr['uri']           = $uri;
 					$arr['parent-uri']    = $uri;
-					$arr['type']          = 'activity';
 					$arr['wall']          = 1;
 					$arr['contact-id']    = $owner_record['id'];
 					$arr['owner-name']    = $owner_record['name'];
@@ -647,6 +670,7 @@ function photos_post(App $a)
 					$arr['deny_gid']      = $p[0]['deny_gid'];
 					$arr['visible']       = 1;
 					$arr['verb']          = ACTIVITY_TAG;
+					$arr['gravity']       = GRAVITY_PARENT;
 					$arr['object-type']   = ACTIVITY_OBJ_PERSON;
 					$arr['target-type']   = ACTIVITY_OBJ_IMAGE;
 					$arr['tag']           = $tagged[4];
@@ -682,8 +706,8 @@ function photos_post(App $a)
 	Addon::callHooks('photo_post_init', $_POST);
 
 	// Determine the album to use
-	$album    = x($_REQUEST, 'album') ? notags(trim($_REQUEST['album'])) : '';
-	$newalbum = x($_REQUEST, 'newalbum') ? notags(trim($_REQUEST['newalbum'])) : '';
+	$album    = !empty($_REQUEST['album'])    ? notags(trim($_REQUEST['album']))    : '';
+	$newalbum = !empty($_REQUEST['newalbum']) ? notags(trim($_REQUEST['newalbum'])) : '';
 
 	logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG);
 
@@ -704,16 +728,17 @@ function photos_post(App $a)
 	 */
 
 	$r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR ",
-		dbesc($album),
+		DBA::escape($album),
 		intval($page_owner_uid)
 	);
-	if (!DBM::is_result($r) || ($album == L10n::t('Profile Photos'))) {
+
+	if (!DBA::isResult($r) || ($album == L10n::t('Profile Photos'))) {
 		$visible = 1;
 	} else {
 		$visible = 0;
 	}
 
-	if (x($_REQUEST, 'not_visible') && $_REQUEST['not_visible'] !== 'false') {
+	if (!empty($_REQUEST['not_visible']) && $_REQUEST['not_visible'] !== 'false') {
 		$visible = 0;
 	}
 
@@ -731,18 +756,20 @@ function photos_post(App $a)
 
 	Addon::callHooks('photo_post_file', $ret);
 
-	if (x($ret, 'src') && x($ret, 'filesize')) {
+	if (!empty($ret['src']) && !empty($ret['filesize'])) {
 		$src      = $ret['src'];
 		$filename = $ret['filename'];
 		$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) {
@@ -799,9 +826,9 @@ function photos_post(App $a)
 
 	$imagedata = @file_get_contents($src);
 
-	$Image = new Image($imagedata, $type);
+	$image = new Image($imagedata, $type);
 
-	if (!$Image->isValid()) {
+	if (!$image->isValid()) {
 		logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
 		notice(L10n::t('Unable to process image.') . EOL);
 		@unlink($src);
@@ -810,7 +837,7 @@ function photos_post(App $a)
 		killme();
 	}
 
-	$exif = $Image->orient($src);
+	$exif = $image->orient($src);
 	@unlink($src);
 
 	$max_length = Config::get('system', 'max_image_length');
@@ -818,17 +845,17 @@ function photos_post(App $a)
 		$max_length = MAX_IMAGE_LENGTH;
 	}
 	if ($max_length > 0) {
-		$Image->scaleDown($max_length);
+		$image->scaleDown($max_length);
 	}
 
-	$width  = $Image->getWidth();
-	$height = $Image->getHeight();
+	$width  = $image->getWidth();
+	$height = $image->getHeight();
 
 	$smallest = 0;
 
 	$photo_hash = Photo::newResource();
 
-	$r = Photo::store($Image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+	$r = Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
 
 	if (!$r) {
 		logger('mod/photos.php: photos_post(): image store failed', LOGGER_DEBUG);
@@ -837,18 +864,18 @@ function photos_post(App $a)
 	}
 
 	if ($width > 640 || $height > 640) {
-		$Image->scaleDown(640);
-		Photo::store($Image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+		$image->scaleDown(640);
+		Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
 		$smallest = 1;
 	}
 
 	if ($width > 320 || $height > 320) {
-		$Image->scaleDown(320);
-		Photo::store($Image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
+		$image->scaleDown(320);
+		Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
 		$smallest = 2;
 	}
 
-	$uri = item_new_uri($a->get_hostname(), $page_owner_uid);
+	$uri = Item::newURI($page_owner_uid);
 
 	// Create item container
 	$lat = $lon = null;
@@ -862,7 +889,7 @@ function photos_post(App $a)
 		$arr['coord'] = $lat . ' ' . $lon;
 	}
 
-	$arr['guid']          = get_guid(32);
+	$arr['guid']          = System::createGUID(32);
 	$arr['uid']           = $page_owner_uid;
 	$arr['uri']           = $uri;
 	$arr['parent-uri']    = $uri;
@@ -885,7 +912,7 @@ function photos_post(App $a)
 	$arr['origin']        = 1;
 
 	$arr['body']          = '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
-				. '[img]' . System::baseUrl() . "/photo/{$photo_hash}-{$smallest}.".$Image->getExt() . '[/img]'
+				. '[img]' . System::baseUrl() . "/photo/{$photo_hash}-{$smallest}.".$image->getExt() . '[/img]'
 				. '[/url]';
 
 	$item_id = Item::insert($arr);
@@ -896,7 +923,7 @@ function photos_post(App $a)
 		Worker::add(PRIORITY_HIGH, "Notifier", 'wall-new', $item_id);
 	}
 
-	Addon::callHooks('photo_post_end', intval($item_id));
+	Addon::callHooks('photo_post_end', $item_id);
 
 	// addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook
 	// if they do not wish to be redirected
@@ -924,8 +951,8 @@ function photos_content(App $a)
 	require_once 'include/security.php';
 	require_once 'include/conversation.php';
 
-	if (!x($a->data,'user')) {
-		notice(L10n::t('No photos selected') . EOL );
+	if (empty($a->data['user'])) {
+		notice(L10n::t('No photos selected') . EOL);
 		return;
 	}
 
@@ -956,10 +983,11 @@ function photos_content(App $a)
 	$contact        = null;
 	$remote_contact = false;
 	$contact_id     = 0;
+	$edit           = false;
 
 	$owner_uid = $a->data['user']['uid'];
 
-	$community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
+	$community_page = (($a->data['user']['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
 
 	if (local_user() && (local_user() == $owner_uid)) {
 		$can_post = true;
@@ -979,7 +1007,7 @@ function photos_content(App $a)
 					intval($contact_id),
 					intval($owner_uid)
 				);
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					$can_post = true;
 					$contact = $r[0];
 					$remote_contact = true;
@@ -1008,7 +1036,7 @@ function photos_content(App $a)
 				intval($contact_id),
 				intval($owner_uid)
 			);
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				$contact = $r[0];
 				$remote_contact = true;
 			}
@@ -1044,8 +1072,8 @@ function photos_content(App $a)
 
 		$albumselect = '';
 
-		$albumselect .= '<option value="" ' . (!$selname ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
-		if (count($a->data['albums'])) {
+		$albumselect .= '<option value="" ' . (!$selname ? ' selected="selected" ' : '') . '>&lt;current year&gt;</option>';
+		if (!empty($a->data['albums'])) {
 			foreach ($a->data['albums'] as $album) {
 				if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === L10n::t('Contact Photos'))) {
 					continue;
@@ -1080,11 +1108,17 @@ function photos_content(App $a)
 			'$usage' => $usage_message,
 			'$nickname' => $a->data['user']['nickname'],
 			'$newalbum' => L10n::t('New album name: '),
-			'$existalbumtext' => L10n::t('or existing album name: '),
+			'$existalbumtext' => L10n::t('or select existing album:'),
 			'$nosharetext' => L10n::t('Do not show a status post for this upload'),
 			'$albumselect' => $albumselect,
 			'$permissions' => L10n::t('Permissions'),
 			'$aclselect' => $aclselect_e,
+			'$lockstate' => is_array($a->user)
+					&& (strlen($a->user['allow_cid'])
+						|| strlen($a->user['allow_gid'])
+						|| strlen($a->user['deny_cid'])
+						|| strlen($a->user['deny_gid'])
+					) ? 'lock' : 'unlock',
 			'$alt_uploader' => $ret['addon_text'],
 			'$default_upload_box' => ($ret['default_upload'] ? $default_upload_box : ''),
 			'$default_upload_submit' => ($ret['default_upload'] ? $default_upload_submit : ''),
@@ -1106,9 +1140,9 @@ function photos_content(App $a)
 		$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
 			AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
 			intval($owner_uid),
-			dbesc($album)
+			DBA::escape($album)
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$a->set_pager_total(count($r));
 			$a->set_pager_itemspage(20);
 		}
@@ -1127,7 +1161,7 @@ function photos_content(App $a)
 			FROM `photo` WHERE `uid` = %d AND `album` = '%s'
 			AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d",
 			intval($owner_uid),
-			dbesc($album),
+			DBA::escape($album),
 			intval($a->pager['start']),
 			intval($a->pager['itemspage'])
 		);
@@ -1157,14 +1191,14 @@ function photos_content(App $a)
 		}
 
 		if ($order_field === 'posted') {
-			$order =  [L10n::t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album)];
+			$order =  [L10n::t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album), 'oldest'];
 		} else {
-			$order = [L10n::t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted'];
+			$order = [L10n::t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted', 'newest'];
 		}
 
 		$photos = [];
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			// "Twist" is only used for the duepunto theme with style "slackr"
 			$twist = false;
 			foreach ($r as $rr) {
@@ -1211,19 +1245,19 @@ function photos_content(App $a)
 		$ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
 			$sql_extra ORDER BY `scale` ASC ",
 			intval($owner_uid),
-			dbesc($datum)
+			DBA::escape($datum)
 		);
 
-		if (!DBM::is_result($ph)) {
+		if (!DBA::isResult($ph)) {
 			$ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
 				LIMIT 1",
 				intval($owner_uid),
-				dbesc($datum)
+				DBA::escape($datum)
 			);
-			if (DBM::is_result($ph)) {
+			if (DBA::isResult($ph)) {
 				notice(L10n::t('Permission denied. Access to this item may be restricted.'));
 			} else {
-				notice(L10n::t('Photo not available') . EOL );
+				notice(L10n::t('Photo not available') . EOL);
 			}
 			return;
 		}
@@ -1231,11 +1265,14 @@ function photos_content(App $a)
 		$prevlink = '';
 		$nextlink = '';
 
-		/// @todo This query is totally bad, the whole functionality has to be changed
-		// The query leads to a really intense used index.
-		// By now we hide it if someone wants to.
+		/*
+		 * @todo This query is totally bad, the whole functionality has to be changed
+		 * The query leads to a really intense used index.
+		 * By now we hide it if someone wants to.
+		 */
 		if (!Config::get('system', 'no_count', false)) {
 			$order_field = defaults($_GET, 'order', '');
+
 			if ($order_field === 'posted') {
 				$order = 'ASC';
 			} else {
@@ -1244,11 +1281,13 @@ function photos_content(App $a)
 
 			$prvnxt = q("SELECT `resource-id` FROM `photo` WHERE `album` = '%s' AND `uid` = %d AND `scale` = 0
 				$sql_extra ORDER BY `created` $order ",
-				dbesc($ph[0]['album']),
+				DBA::escape($ph[0]['album']),
 				intval($owner_uid)
 			);
 
-			if (DBM::is_result($prvnxt)) {
+			if (DBA::isResult($prvnxt)) {
+				$prv = null;
+				$nxt = null;
 				foreach ($prvnxt as $z => $entry) {
 					if ($entry['resource-id'] == $ph[0]['resource-id']) {
 						$prv = $z - 1;
@@ -1263,13 +1302,19 @@ function photos_content(App $a)
 					}
 				}
 				$edit_suffix = ((($cmd === 'edit') && $can_post) ? '/edit' : '');
-				$prevlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . $edit_suffix . ($order_field === 'posted' ? '?f=&order=posted' : '');
-				$nextlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . $edit_suffix . ($order_field === 'posted' ? '?f=&order=posted' : '');
+				if (!is_null($prv)) {
+					$prevlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$prv]['resource-id'] . $edit_suffix . ($order_field === 'posted' ? '?f=&order=posted' : '');
+				}
+				if (!is_null($nxt)) {
+					$nextlink = 'photos/' . $a->data['user']['nickname'] . '/image/' . $prvnxt[$nxt]['resource-id'] . $edit_suffix . ($order_field === 'posted' ? '?f=&order=posted' : '');
+				}
  			}
 		}
 
-		if (count($ph) == 1)
+		if (count($ph) == 1) {
 			$hires = $lores = $ph[0];
+		}
+
 		if (count($ph) > 1) {
 			if ($ph[1]['scale'] == 2) {
 				// original is 640 or less, we can display it directly
@@ -1281,6 +1326,7 @@ function photos_content(App $a)
 		}
 
 		$album_link = 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($ph[0]['album']);
+
 		$tools = null;
 		$lock = null;
 
@@ -1291,15 +1337,15 @@ function photos_content(App $a)
 			];
 
 			// lock
-			$lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
-					|| strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) )
+			$lock = ((($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
+					|| strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])))
 					? L10n::t('Private Message')
 					: Null);
 
 
 		}
 
-		if ( $cmd === 'edit') {
+		if ($cmd === 'edit') {
 			$tpl = get_markup_template('photo_edit_head.tpl');
 			$a->page['htmlhead'] .= replace_macros($tpl,[
 				'$prevlink' => $prevlink,
@@ -1307,8 +1353,9 @@ function photos_content(App $a)
 			]);
 		}
 
-		if ($prevlink)
+		if ($prevlink) {
 			$prevlink = [$prevlink, '<div class="icon prev"></div>'] ;
+		}
 
 		$photo = [
 			'href' => 'photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
@@ -1333,50 +1380,24 @@ function photos_content(App $a)
 		// The difference is that we won't be displaying the conversation head item
 		// as a "post" but displaying instead the photo it is linked to
 
-		$linked_items = q("SELECT * FROM `item` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
-			dbesc($datum)
+		/// @todo Rewrite this query. To do so, $sql_extra must be changed
+		$linked_items = q("SELECT `id` FROM `item` WHERE `resource-id` = '%s' $sql_extra LIMIT 1",
+			DBA::escape($datum)
 		);
 
 		$map = null;
 		$link_item = [];
 
-		if (DBM::is_result($linked_items)) {
-			$link_item = $linked_items[0];
+		if (DBA::isResult($linked_items)) {
+			// This is a workaround to not being forced to rewrite the while $sql_extra handling
+			$link_item = Item::selectFirst([], ['id' => $linked_items[0]['id']]);
 
-			$r = q("SELECT COUNT(*) AS `total`
-				FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-				WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-				AND `item`.`uid` = %d
-				$sql_extra ",
-				dbesc($link_item['uri']),
-				dbesc($link_item['uri']),
-				intval($link_item['uid'])
+			$condition = ["`parent` = ? AND `parent` != `id`",  $link_item['parent']];
+			$a->set_pager_total(DBA::count('item', $condition));
 
-			);
-
-			if (DBM::is_result($r)) {
-				$a->set_pager_total($r[0]['total']);
-			}
-
-
-			$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
-				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`,
-				`contact`.`rel`, `contact`.`thumb`, `contact`.`self`,
-				`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
-				FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-				WHERE `parent-uri` = '%s' AND `uri` != '%s' AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-				AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-				AND `item`.`uid` = %d
-				$sql_extra
-				ORDER BY `parent` DESC, `id` ASC LIMIT %d ,%d ",
-				dbesc($link_item['uri']),
-				dbesc($link_item['uri']),
-				intval($link_item['uid']),
-				intval($a->pager['start']),
-				intval($a->pager['itemspage'])
-
-			);
+			$params = ['order' => ['id'], 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+			$result = Item::selectForUser($link_item['uid'], Item::ITEM_FIELDLIST, $condition, $params);
+			$items = Item::inArray($result);
 
 			if (local_user() && (local_user() == $link_item['uid'])) {
 				Item::update(['unseen' => false], ['parent' => $link_item['parent']]);
@@ -1413,7 +1434,7 @@ function photos_content(App $a)
 
 			$album_e = $ph[0]['album'];
 			$caption_e = $ph[0]['desc'];
-			$aclselect_e = ACL::getFullSelectorHTML($ph[0]);
+			$aclselect_e = ACL::getFullSelectorHTML($a->user, false, $ph[0]);
 
 			$edit = replace_macros($edit_tpl, [
 				'$id' => $ph[0]['id'],
@@ -1463,12 +1484,11 @@ function photos_content(App $a)
 				]);
 			}
 
-			if (!DBM::is_result($r)) {
+			if (!DBA::isResult($items)) {
 				if (($can_post || can_write_wall($owner_uid))) {
 					$comments .= replace_macros($cmnt_tpl, [
 						'$return_path' => '',
 						'$jsreload' => $return_url,
-						'$type' => 'wall-comment',
 						'$id' => $link_item['id'],
 						'$parent' => $link_item['id'],
 						'$profile_uid' =>  $owner_uid,
@@ -1491,15 +1511,16 @@ function photos_content(App $a)
 			];
 
 			// display comments
-			if (DBM::is_result($r)) {
-				foreach ($r as $item) {
+			if (DBA::isResult($items)) {
+				foreach ($items as $item) {
 					builtin_activity_puller($item, $conv_responses);
 				}
 
-				if (x($conv_responses['like'], $link_item['uri'])) {
+				if (!empty($conv_responses['like'][$link_item['uri']])) {
 					$like = format_like($conv_responses['like'][$link_item['uri']], $conv_responses['like'][$link_item['uri'] . '-l'], 'like', $link_item['id']);
 				}
-				if (x($conv_responses['dislike'], $link_item['uri'])) {
+
+				if (!empty($conv_responses['dislike'][$link_item['uri']])) {
 					$dislike = format_like($conv_responses['dislike'][$link_item['uri']], $conv_responses['dislike'][$link_item['uri'] . '-l'], 'dislike', $link_item['id']);
 				}
 
@@ -1507,7 +1528,6 @@ function photos_content(App $a)
 					$comments .= replace_macros($cmnt_tpl,[
 						'$return_path' => '',
 						'$jsreload' => $return_url,
-						'$type' => 'wall-comment',
 						'$id' => $link_item['id'],
 						'$parent' => $link_item['id'],
 						'$profile_uid' =>  $owner_uid,
@@ -1523,7 +1543,7 @@ function photos_content(App $a)
 					]);
 				}
 
-				foreach ($r as $item) {
+				foreach ($items as $item) {
 					$comment = '';
 					$template = $tpl;
 					$sparkle = '';
@@ -1532,24 +1552,13 @@ function photos_content(App $a)
 						continue;
 					}
 
-					$redirect_url = 'redir/' . $item['cid'];
-
-					if (local_user() && ($item['contact-uid'] == local_user())
-						&& ($item['network'] == NETWORK_DFRN) && !$item['self']) {
-						$profile_url = $redirect_url;
+					$profile_url = Contact::MagicLinkById($item['author-id']);
+					if (strpos($profile_url, 'redir/') === 0) {
 						$sparkle = ' sparkle';
 					} else {
-						$profile_url = $item['url'];
 						$sparkle = '';
 					}
 
-					$diff_author = (($item['url'] !== $item['author-link']) ? true : false);
-
-					$profile_name   = ((strlen($item['author-name'])   && $diff_author) ? $item['author-name']   : $item['name']);
-					$profile_avatar = ((strlen($item['author-avatar']) && $diff_author) ? $item['author-avatar'] : $item['thumb']);
-
-					$profile_link = $profile_url;
-
 					$dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()));
 					$drop = [
 						'dropping' => $dropping,
@@ -1558,15 +1567,14 @@ function photos_content(App $a)
 						'delete' => L10n::t('Delete'),
 					];
 
-					$name_e = $profile_name;
 					$title_e = $item['title'];
 					$body_e = BBCode::convert($item['body']);
 
 					$comments .= replace_macros($template,[
-						'$id' => $item['item_id'],
-						'$profile_url' => $profile_link,
-						'$name' => $name_e,
-						'$thumb' => $profile_avatar,
+						'$id' => $item['id'],
+						'$profile_url' => $profile_url,
+						'$name' => $item['author-name'],
+						'$thumb' => $item['author-avatar'],
 						'$sparkle' => $sparkle,
 						'$title' => $title_e,
 						'$body' => $body_e,
@@ -1580,7 +1588,6 @@ function photos_content(App $a)
 						$comments .= replace_macros($cmnt_tpl, [
 							'$return_path' => '',
 							'$jsreload' => $return_url,
-							'$type' => 'wall-comment',
 							'$id' => $item['item_id'],
 							'$parent' => $item['parent'],
 							'$profile_uid' =>  $owner_uid,
@@ -1628,7 +1635,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";
@@ -1643,10 +1650,11 @@ function photos_content(App $a)
 	$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
 		$sql_extra GROUP BY `resource-id`",
 		intval($a->data['user']['uid']),
-		dbesc('Contact Photos'),
-		dbesc(L10n::t('Contact Photos'))
+		DBA::escape('Contact Photos'),
+		DBA::escape(L10n::t('Contact Photos'))
 	);
-	if (DBM::is_result($r)) {
+
+	if (DBA::isResult($r)) {
 		$a->set_pager_total(count($r));
 		$a->set_pager_itemspage(20);
 	}
@@ -1657,20 +1665,21 @@ function photos_content(App $a)
 		WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
 		$sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
 		intval($a->data['user']['uid']),
-		dbesc('Contact Photos'),
-		dbesc(L10n::t('Contact Photos')),
+		DBA::escape('Contact Photos'),
+		DBA::escape(L10n::t('Contact Photos')),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);
 
 	$photos = [];
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		// "Twist" is only used for the duepunto theme with style "slackr"
 		$twist = false;
 		foreach ($r as $rr) {
 			//hide profile photos to others
-			if (!$is_owner && !remote_user() && ($rr['album'] == L10n::t('Profile Photos')))
+			if (!$is_owner && !remote_user() && ($rr['album'] == L10n::t('Profile Photos'))) {
 				continue;
+			}
 
 			$twist = !$twist;
 
@@ -1680,16 +1689,16 @@ function photos_content(App $a)
 			$name_e = $rr['album'];
 
 			$photos[] = [
-				'id'		=> $rr['id'],
-				'twist'		=> ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
-				'link'  	=> 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
-				'title' 	=> L10n::t('View Photo'),
-				'src'     	=> 'photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
-				'alt'     	=> $alt_e,
-				'album'	=> [
-					'link'  => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
-					'name'  => $name_e,
-					'alt'   => L10n::t('View Album'),
+				'id'    => $rr['id'],
+				'twist' => ' ' . ($twist ? 'rotleft' : 'rotright') . rand(2,4),
+				'link'  => 'photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
+				'title' => L10n::t('View Photo'),
+				'src'   => 'photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
+				'alt'   => $alt_e,
+				'album' => [
+					'link' => 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+					'name' => $name_e,
+					'alt'  => L10n::t('View Album'),
 				],
 
 			];
diff --git a/mod/ping.php b/mod/ping.php
index 146411206..968751a7d 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -9,17 +9,19 @@ use Friendica\Content\ForumManager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
+use Friendica\Model\Item;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\XML;
 
-require_once 'mod/proxy.php';
 require_once 'include/enotify.php';
 
 /**
@@ -106,7 +108,7 @@ function ping_init(App $a)
 
 	if (local_user()) {
 		// Different login session than the page that is calling us.
-		if (intval($_GET['uid']) && intval($_GET['uid']) != local_user()) {
+		if (!empty($_GET['uid']) && intval($_GET['uid']) != local_user()) {
 			$data = ['result' => ['invalid' => 1]];
 
 			if ($format == 'json') {
@@ -127,20 +129,14 @@ function ping_init(App $a)
 
 		$notifs = ping_get_notifications(local_user());
 
-		$items_unseen = q(
-			"SELECT `item`.`id`, `item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
-				`item`.`contact-id`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
-				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`
-				FROM `item` INNER JOIN `item` AS `pitem` ON  `pitem`.`id` = `item`.`parent`
-				WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
-				 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
-				AND `item`.`contact-id` != %d
-				ORDER BY `item`.`created` DESC",
-			intval(local_user()),
-			intval(local_user())
-		);
+		$condition = ["`unseen` AND `uid` = ? AND `contact-id` != ?", local_user(), local_user()];
+		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
+			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid', 'wall'];
+		$params = ['order' => ['created' => true]];
+		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
 
-		if (DBM::is_result($items_unseen)) {
+		if (DBA::isResult($items)) {
+			$items_unseen = Item::inArray($items);
 			$arr = ['items' => $items_unseen];
 			Addon::callHooks('network_ping', $arr);
 
@@ -157,7 +153,7 @@ function ping_init(App $a)
 			if (intval(Feature::isEnabled(local_user(), 'groups'))) {
 				// Find out how unseen network posts are spread across groups
 				$group_counts = Group::countUnseen();
-				if (DBM::is_result($group_counts)) {
+				if (DBA::isResult($group_counts)) {
 					foreach ($group_counts as $group_count) {
 						if ($group_count['count'] > 0) {
 							$groups_unseen[] = $group_count;
@@ -168,7 +164,7 @@ function ping_init(App $a)
 
 			if (intval(Feature::isEnabled(local_user(), 'forumlist_widget'))) {
 				$forum_counts = ForumManager::countUnseenItems();
-				if (DBM::is_result($forum_counts)) {
+				if (DBA::isResult($forum_counts)) {
 					foreach ($forum_counts as $forum_count) {
 						if ($forum_count['count'] > 0) {
 							$forums_unseen[] = $forum_count;
@@ -201,18 +197,18 @@ function ping_init(App $a)
 			"SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
 			WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
 			intval(local_user()),
-			dbesc($myurl)
+			DBA::escape($myurl)
 		);
 		$mail_count = count($mails);
 
-		if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
+		if (intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE && is_site_admin()) {
 			$regs = q(
 				"SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`
 				FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`
 				WHERE `contact`.`self` = 1"
 			);
 
-			if (DBM::is_result($regs)) {
+			if (DBA::isResult($regs)) {
 				$register_count = count($regs);
 			}
 		}
@@ -225,15 +221,15 @@ function ping_init(App $a)
 				WHERE `event`.`uid` = %d AND `start` < '%s' AND `finish` > '%s' and `ignore` = 0
 				ORDER BY `start` ASC ",
 				intval(local_user()),
-				dbesc(DateTimeFormat::utc('now + 7 days')),
-				dbesc(DateTimeFormat::utcNow())
+				DBA::escape(DateTimeFormat::utc('now + 7 days')),
+				DBA::escape(DateTimeFormat::utcNow())
 			);
-			if (DBM::is_result($ev)) {
+			if (DBA::isResult($ev)) {
 				Cache::set($cachekey, $ev, CACHE_HOUR);
 			}
 		}
 
-		if (DBM::is_result($ev)) {
+		if (DBA::isResult($ev)) {
 			$all_events = count($ev);
 
 			if ($all_events) {
@@ -271,7 +267,7 @@ function ping_init(App $a)
 		$data['birthdays']        = $birthdays;
 		$data['birthdays-today']  = $birthdays_today;
 
-		if (DBM::is_result($notifs)) {
+		if (DBA::isResult($notifs)) {
 			foreach ($notifs as $notif) {
 				if ($notif['seen'] == 0) {
 					$sysnotify_count ++;
@@ -280,9 +276,10 @@ function ping_init(App $a)
 		}
 
 		// merge all notification types in one array
-		if (DBM::is_result($intros)) {
+		if (DBA::isResult($intros)) {
 			foreach ($intros as $intro) {
 				$notif = [
+					'id'      => 0,
 					'href'    => System::baseUrl() . '/notifications/intros/' . $intro['id'],
 					'name'    => $intro['name'],
 					'url'     => $intro['url'],
@@ -295,9 +292,10 @@ function ping_init(App $a)
 			}
 		}
 
-		if (DBM::is_result($mails)) {
+		if (DBA::isResult($mails)) {
 			foreach ($mails as $mail) {
 				$notif = [
+					'id'      => 0,
 					'href'    => System::baseUrl() . '/message/' . $mail['id'],
 					'name'    => $mail['from-name'],
 					'url'     => $mail['from-url'],
@@ -310,9 +308,10 @@ function ping_init(App $a)
 			}
 		}
 
-		if (DBM::is_result($regs)) {
+		if (DBA::isResult($regs)) {
 			foreach ($regs as $reg) {
 				$notif = [
+					'id'      => 0,
 					'href'    => System::baseUrl() . '/admin/users/',
 					'name'    => $reg['name'],
 					'url'     => $reg['url'],
@@ -346,9 +345,9 @@ function ping_init(App $a)
 		};
 		usort($notifs, $sort_function);
 
-		if (DBM::is_result($notifs)) {
+		if (DBA::isResult($notifs)) {
 			// Are the nofications called from the regular process or via the friendica app?
-			$regularnotifications = (intval($_GET['uid']) && intval($_GET['_']));
+			$regularnotifications = (!empty($_GET['uid']) && !empty($_GET['_']));
 
 			foreach ($notifs as $notif) {
 				if ($a->is_friendica_app() || !$regularnotifications) {
@@ -357,9 +356,9 @@ function ping_init(App $a)
 
 				$contact = Contact::getDetailsByURL($notif['url']);
 				if (isset($contact['micro'])) {
-					$notif['photo'] = proxy_url($contact['micro'], false, PROXY_SIZE_MICRO);
+					$notif['photo'] = ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO);
 				} else {
-					$notif['photo'] = proxy_url($notif['photo'], false, PROXY_SIZE_MICRO);
+					$notif['photo'] = ProxyUtils::proxifyUrl($notif['photo'], false, ProxyUtils::SIZE_MICRO);
 				}
 
 				$local_time = DateTimeFormat::local($notif['date']);
@@ -442,7 +441,7 @@ function ping_get_notifications($uid)
 
 	do {
 		$r = q(
-			"SELECT `notify`.*, `item`.`visible`, `item`.`spam`, `item`.`deleted`
+			"SELECT `notify`.*, `item`.`visible`, `item`.`deleted`
 			FROM `notify` LEFT JOIN `item` ON `item`.`id` = `notify`.`iid`
 			WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
 			AND NOT (`notify`.`type` IN (%d, %d))
@@ -469,10 +468,6 @@ function ping_get_notifications($uid)
 				$notification["visible"] = true;
 			}
 
-			if (is_null($notification["spam"])) {
-				$notification["spam"] = 0;
-			}
-
 			if (is_null($notification["deleted"])) {
 				$notification["deleted"] = 0;
 			}
@@ -486,8 +481,8 @@ function ping_get_notifications($uid)
 
 				q(
 					"UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",
-					dbesc($notification["name"]),
-					dbesc($notification["message"]),
+					DBA::escape($notification["name"]),
+					DBA::escape($notification["message"]),
 					intval($notification["id"])
 				);
 			}
@@ -495,9 +490,8 @@ function ping_get_notifications($uid)
 			$notification["href"] = System::baseUrl() . "/notify/view/" . $notification["id"];
 
 			if ($notification["visible"]
-				&& !$notification["spam"]
 				&& !$notification["deleted"]
-				&& !(x($result, $notification["parent"]) && is_array($result[$notification["parent"]]))
+				&& !(x($result, $notification["parent"]) && !empty($result[$notification["parent"]]))
 			) {
 				// Should we condense the notifications or show them all?
 				if (PConfig::get(local_user(), 'system', 'detailed_notif')) {
@@ -516,16 +510,17 @@ 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, $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/mod/poco.php b/mod/poco.php
index 0728020ec..a16495326 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -8,8 +8,9 @@ use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
 
@@ -23,15 +24,15 @@ function poco_init(App $a) {
 	if ($a->argc > 1) {
 		$user = notags(trim($a->argv[1]));
 	}
-	if (! x($user)) {
+	if (empty($user)) {
 		$c = q("SELECT * FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1");
-		if (! DBM::is_result($c)) {
+		if (!DBA::isResult($c)) {
 			System::httpExit(401);
 		}
 		$system_mode = true;
 	}
 
-	$format = (($_GET['format']) ? $_GET['format'] : 'json');
+	$format = defaults($_GET, 'format', 'json');
 
 	$justme = false;
 	$global = false;
@@ -43,6 +44,7 @@ function poco_init(App $a) {
 		echo json_encode($ret);
 		killme();
 	}
+
 	if ($a->argc > 1 && $a->argv[1] === '@global') {
 		// List of all profiles that this server recently had data from
 		$global = true;
@@ -64,9 +66,9 @@ function poco_init(App $a) {
 	if (! $system_mode && ! $global) {
 		$users = q("SELECT `user`.*,`profile`.`hide-friends` from user left join profile on `user`.`uid` = `profile`.`uid`
 			where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1",
-			dbesc($user)
+			DBA::escape($user)
 		);
-		if (! DBM::is_result($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) {
+		if (! DBA::isResult($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) {
 			System::httpExit(404);
 		}
 
@@ -75,11 +77,11 @@ function poco_init(App $a) {
 
 	if ($justme) {
 		$sql_extra = " AND `contact`.`self` = 1 ";
+	} else {
+		$sql_extra = "";
 	}
-//	else
-//		$sql_extra = " AND `contact`.`self` = 0 ";
 
-	if ($cid) {
+	if (!empty($cid)) {
 		$sql_extra = sprintf(" AND `contact`.`id` = %d ", intval($cid));
 	}
 	if (x($_GET, 'updatedSince')) {
@@ -87,10 +89,10 @@ function poco_init(App $a) {
 	}
 	if ($global) {
 		$contacts = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure` AND NOT `hide` AND `network` IN ('%s', '%s', '%s')",
-			dbesc($update_limit),
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_DIASPORA),
-			dbesc(NETWORK_OSTATUS)
+			DBA::escape($update_limit),
+			DBA::escape(Protocol::DFRN),
+			DBA::escape(Protocol::DIASPORA),
+			DBA::escape(Protocol::OSTATUS)
 		);
 	} elseif ($system_mode) {
 		$contacts = q("SELECT count(*) AS `total` FROM `contact` WHERE `self` = 1
@@ -100,19 +102,20 @@ function poco_init(App $a) {
 			AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`)
 			AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra",
 			intval($user['uid']),
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_DIASPORA),
-			dbesc(NETWORK_OSTATUS),
-			dbesc(NETWORK_STATUSNET)
+			DBA::escape(Protocol::DFRN),
+			DBA::escape(Protocol::DIASPORA),
+			DBA::escape(Protocol::OSTATUS),
+			DBA::escape(Protocol::STATUSNET)
 		);
 	}
-	if (DBM::is_result($contacts)) {
+	if (DBA::isResult($contacts)) {
 		$totalResults = intval($contacts[0]['total']);
 	} else {
 		$totalResults = 0;
 	}
-	$startIndex = intval($_GET['startIndex']);
-	if (! $startIndex) {
+	if (!empty($_GET['startIndex'])) {
+		$startIndex = intval($_GET['startIndex']);
+	} else {
 		$startIndex = 0;
 	}
 	$itemsPerPage = ((x($_GET, 'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
@@ -121,10 +124,10 @@ function poco_init(App $a) {
 		logger("Start global query", LOGGER_DEBUG);
 		$contacts = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND NOT `hide` AND `network` IN ('%s', '%s', '%s') AND `updated` > `last_failure`
 			ORDER BY `updated` DESC LIMIT %d, %d",
-			dbesc($update_limit),
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_DIASPORA),
-			dbesc(NETWORK_OSTATUS),
+			DBA::escape($update_limit),
+			DBA::escape(Protocol::DFRN),
+			DBA::escape(Protocol::DIASPORA),
+			DBA::escape(Protocol::OSTATUS),
 			intval($startIndex),
 			intval($itemsPerPage)
 		);
@@ -146,10 +149,10 @@ function poco_init(App $a) {
 			AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`)
 			AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra LIMIT %d, %d",
 			intval($user['uid']),
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_DIASPORA),
-			dbesc(NETWORK_OSTATUS),
-			dbesc(NETWORK_STATUSNET),
+			DBA::escape(Protocol::DFRN),
+			DBA::escape(Protocol::DIASPORA),
+			DBA::escape(Protocol::OSTATUS),
+			DBA::escape(Protocol::STATUSNET),
 			intval($startIndex),
 			intval($itemsPerPage)
 		);
@@ -201,8 +204,12 @@ function poco_init(App $a) {
 	}
 
 	if (is_array($contacts)) {
-		if (DBM::is_result($contacts)) {
+		if (DBA::isResult($contacts)) {
 			foreach ($contacts as $contact) {
+				if (!isset($contact['updated'])) {
+					$contact['updated'] = '';
+				}
+
 				if (! isset($contact['generation'])) {
 					if ($global) {
 						$contact['generation'] = 3;
@@ -251,7 +258,7 @@ function poco_init(App $a) {
 				}
 
 				// Non connected persons can only see the keywords of a Diaspora account
-				if ($contact['network'] == NETWORK_DIASPORA) {
+				if ($contact['network'] == Protocol::DIASPORA) {
 					$contact['location'] = "";
 					$about = "";
 					$contact['gender'] = "";
@@ -278,7 +285,7 @@ function poco_init(App $a) {
 				}
 				if ($fields_ret['urls']) {
 					$entry['urls'] = [['value' => $contact['url'], 'type' => 'profile']];
-					if ($contact['addr'] && ($contact['network'] !== NETWORK_MAIL)) {
+					if ($contact['addr'] && ($contact['network'] !== Protocol::MAIL)) {
 						$entry['urls'][] = ['value' => 'acct:' . $contact['addr'], 'type' => 'webfinger'];
 					}
 				}
@@ -308,11 +315,11 @@ function poco_init(App $a) {
 				}
 				if ($fields_ret['network']) {
 					$entry['network'] = $contact['network'];
-					if ($entry['network'] == NETWORK_STATUSNET) {
-						$entry['network'] = NETWORK_OSTATUS;
+					if ($entry['network'] == Protocol::STATUSNET) {
+						$entry['network'] = Protocol::OSTATUS;
 					}
 					if (($entry['network'] == "") && ($contact['self'])) {
-						$entry['network'] = NETWORK_DFRN;
+						$entry['network'] = Protocol::DFRN;
 					}
 				}
 				if ($fields_ret['tags']) {
diff --git a/mod/poke.php b/mod/poke.php
index 3148896bc..91f33c0de 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -18,39 +18,40 @@ use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
 require_once 'include/security.php';
 require_once 'include/items.php';
 
-function poke_init(App $a) {
-
-	if (! local_user()) {
+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)) {
+	if (!array_key_exists($verb, $verbs)) {
 		return;
 	}
 
 	$activity = ACTIVITY_POKE . '#' . urlencode($verbs[$verb][0]);
 
 	$contact_id = intval($_GET['cid']);
-	if (! $contact_id) {
+	if (!$contact_id) {
 		return;
 	}
 
-	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
+	$parent = (x($_GET,'parent') ? intval($_GET['parent']) : 0);
 
 
 	logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
@@ -61,50 +62,45 @@ function poke_init(App $a) {
 		intval($uid)
 	);
 
-	if (! DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		logger('poke: no contact ' . $contact_id);
 		return;
 	}
 
 	$target = $r[0];
 
-	if($parent) {
-		$r = q("SELECT `uri`, `private`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`
-			FROM `item` WHERE `id` = %d AND `parent` = %d AND `uid` = %d LIMIT 1",
-			intval($parent),
-			intval($parent),
-			intval($uid)
-		);
-		if (DBM::is_result($r)) {
-			$parent_uri = $r[0]['uri'];
-			$private    = $r[0]['private'];
-			$allow_cid  = $r[0]['allow_cid'];
-			$allow_gid  = $r[0]['allow_gid'];
-			$deny_cid   = $r[0]['deny_cid'];
-			$deny_gid   = $r[0]['deny_gid'];
+	if ($parent) {
+		$fields = ['uri', 'private', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
+		$condition = ['id' => $parent, 'parent' => $parent, 'uid' => $uid];
+		$item = Item::selectFirst($fields, $condition);
+
+		if (DBA::isResult($item)) {
+			$parent_uri = $item['uri'];
+			$private    = $item['private'];
+			$allow_cid  = $item['allow_cid'];
+			$allow_gid  = $item['allow_gid'];
+			$deny_cid   = $item['deny_cid'];
+			$deny_gid   = $item['deny_gid'];
 		}
-	}
-	else {
+	} else {
+		$private = (x($_GET,'private') ? intval($_GET['private']) : 0);
 
-		$private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
-
-		$allow_cid     = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']);
-		$allow_gid     = (($private) ? '' : $a->user['allow_gid']);
-		$deny_cid      = (($private) ? '' : $a->user['deny_cid']);
-		$deny_gid      = (($private) ? '' : $a->user['deny_gid']);
+		$allow_cid     = ($private ? '<' . $target['id']. '>' : $a->user['allow_cid']);
+		$allow_gid     = ($private ? '' : $a->user['allow_gid']);
+		$deny_cid      = ($private ? '' : $a->user['deny_cid']);
+		$deny_gid      = ($private ? '' : $a->user['deny_gid']);
 	}
 
 	$poster = $a->contact;
 
-	$uri = item_new_uri($a->get_hostname(),$uid);
+	$uri = Item::newURI($uid);
 
 	$arr = [];
 
-	$arr['guid']          = get_guid(32);
+	$arr['guid']          = System::createGUID(32);
 	$arr['uid']           = $uid;
 	$arr['uri']           = $uri;
-	$arr['parent-uri']    = (($parent_uri) ? $parent_uri : $uri);
-	$arr['type']          = 'activity';
+	$arr['parent-uri']    = (!empty($parent_uri) ? $parent_uri : $uri);
 	$arr['wall']          = 1;
 	$arr['contact-id']    = $poster['id'];
 	$arr['owner-name']    = $poster['name'];
@@ -126,14 +122,14 @@ 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");
 	$arr['object'] .= '</link></object>' . "\n";
 
 	$item_id = Item::insert($arr);
-	if($item_id) {
+	if ($item_id) {
 		Worker::add(PRIORITY_HIGH, "Notifier", "tag", $item_id);
 	}
 
@@ -142,11 +138,9 @@ function poke_init(App $a) {
 	return;
 }
 
-
-
-function poke_content(App $a) {
-
-	if (! local_user()) {
+function poke_content(App $a)
+{
+	if (!local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
@@ -154,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 (DBM::is_result($r)) {
-			$name = $r[0]['name'];
-			$id = $r[0]['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();
 
@@ -175,16 +169,17 @@ function poke_content(App $a) {
 	]);
 
 
-	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
+	$parent = (x($_GET,'parent') ? intval($_GET['parent']) : '0');
 
 
 	$verbs = get_poke_verbs();
 
 	$shortlist = [];
-	foreach($verbs as $k => $v)
-		if($v[1] !== 'NOTRANSLATION')
-			$shortlist[] = [$k,$v[1]];
-
+	foreach ($verbs as $k => $v) {
+		if ($v[1] !== 'NOTRANSLATION') {
+			$shortlist[] = [$k, $v[1]];
+		}
+	}
 
 	$tpl = get_markup_template('poke_content.tpl');
 
@@ -202,5 +197,4 @@ function poke_content(App $a) {
 	]);
 
 	return $o;
-
 }
diff --git a/mod/probe.php b/mod/probe.php
index 5e7a5253f..b448ffd2b 100644
--- a/mod/probe.php
+++ b/mod/probe.php
@@ -18,12 +18,12 @@ function probe_content(App $a)
 	$o  = '<h3>Probe Diagnostic</h3>';
 
 	$o .= '<form action="probe" 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 />';
 
-	if (x($_GET, 'addr')) {
+	if (!empty($_GET['addr'])) {
 		$addr = trim($_GET['addr']);
 		$res = Probe::uri($addr, "", 0, false);
 		$o .= '<pre>';
diff --git a/mod/profile.php b/mod/profile.php
index 2fb947a83..2e3ccd28c 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -12,7 +12,8 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
@@ -22,7 +23,7 @@ use Friendica\Util\DateTimeFormat;
 
 function profile_init(App $a)
 {
-	if (!x($a->page, 'aside')) {
+	if (empty($a->page['aside'])) {
 		$a->page['aside'] = '';
 	}
 
@@ -30,7 +31,7 @@ function profile_init(App $a)
 		$which = htmlspecialchars($a->argv[1]);
 	} else {
 		$r = q("SELECT `nickname` FROM `user` WHERE `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 ORDER BY RAND() LIMIT 1");
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			goaway(System::baseUrl() . '/profile/' . $r[0]['nickname']);
 		} else {
 			logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
@@ -53,15 +54,15 @@ function profile_init(App $a)
 	$blocked   = !local_user() && !remote_user() && Config::get('system', 'block_public');
 	$userblock = !local_user() && !remote_user() && $a->profile['hidewall'];
 
-	if (x($a->profile, 'page-flags') && $a->profile['page-flags'] == PAGE_COMMUNITY) {
+	if (!empty($a->profile['page-flags']) && $a->profile['page-flags'] == Contact::PAGE_COMMUNITY) {
 		$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
 	}
 
-	if (x($a->profile, 'openidserver')) {
+	if (!empty($a->profile['openidserver'])) {
 		$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
 	}
 
-	if (x($a->profile, 'openid')) {
+	if (!empty($a->profile['openid'])) {
 		$delegate = strstr($a->profile['openid'], '://') ? $a->profile['openid'] : 'https://' . $a->profile['openid'];
 		$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
 	}
@@ -79,7 +80,7 @@ function profile_init(App $a)
 	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/" title="' . L10n::t('%s\'s posts', $a->profile['username']) . '"/>' . "\r\n";
 	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/comments" title="' . L10n::t('%s\'s comments', $a->profile['username']) . '"/>' . "\r\n";
 	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/activity" title="' . L10n::t('%s\'s timeline', $a->profile['username']) . '"/>' . "\r\n";
-	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->path ? '/' . $a->path : ''));
+	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->urlpath ? '/' . $a->urlpath : ''));
 	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
 	header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
@@ -108,7 +109,7 @@ function profile_content(App $a, $update = 0)
 		}
 	}
 
-	if (!x($category)) {
+	if (empty($category)) {
 		$category = defaults($_GET, 'category', '');
 	}
 
@@ -139,7 +140,7 @@ function profile_content(App $a, $update = 0)
 
 	$contact_id = 0;
 
-	if (x($_SESSION, 'remote') && is_array($_SESSION['remote'])) {
+	if (!empty($_SESSION['remote'])) {
 		foreach ($_SESSION['remote'] as $v) {
 			if ($v['uid'] == $a->profile['profile_uid']) {
 				$contact_id = $v['cid'];
@@ -154,7 +155,7 @@ function profile_content(App $a, $update = 0)
 			intval($contact_id),
 			intval($a->profile['profile_uid'])
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$contact = $r[0];
 			$remote_contact = true;
 		}
@@ -170,14 +171,14 @@ function profile_content(App $a, $update = 0)
 	$is_owner = local_user() == $a->profile['profile_uid'];
 	$last_updated_key = "profile:" . $a->profile['profile_uid'] . ":" . local_user() . ":" . remote_user();
 
-	if (x($a->profile, 'hidewall') && !$is_owner && !$remote_contact) {
+	if (!empty($a->profile['hidewall']) && !$is_owner && !$remote_contact) {
 		notice(L10n::t('Access to this profile has been restricted.') . EOL);
 		return;
 	}
 
 	if (!$update) {
 		$tab = false;
-		if (x($_GET, 'tab')) {
+		if (!empty($_GET['tab'])) {
 			$tab = notags(trim($_GET['tab']));
 		}
 
@@ -191,15 +192,11 @@ function profile_content(App $a, $update = 0)
 
 		$o .= Widget::commonFriendsVisitor($a->profile['profile_uid']);
 
-		if (x($_SESSION, 'new_member') && $is_owner) {
-			$o .= '<div id="newmember-tips"><a href="newmember"><b>' . L10n::t('Tips for New Members') . '</b></a></div>';
-		}
-
-		$commpage = $a->profile['page-flags'] == PAGE_COMMUNITY;
+		$commpage = $a->profile['page-flags'] == Contact::PAGE_COMMUNITY;
 		$commvisitor = $commpage && $remote_contact;
 
 		$a->page['aside'] .= posted_date_widget(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'], true);
-		$a->page['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], (x($category) ? xmlify($category) : ''));
+		$a->page['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], (!empty($category) ? xmlify($category) : ''));
 		$a->page['aside'] .= Widget::tagCloud();
 
 		if (can_write_wall($a->profile['profile_uid'])) {
@@ -230,7 +227,7 @@ function profile_content(App $a, $update = 0)
 	$sql_extra2 = '';
 
 	if ($update) {
-		$last_updated = (x($_SESSION['last_updated'], $last_updated_key) ? $_SESSION['last_updated'][$last_updated_key] : 0);
+		$last_updated = (!empty($_SESSION['last_updated'][$last_updated_key]) ? $_SESSION['last_updated'][$last_updated_key] : 0);
 
 		// If the page user is the owner of the page we should query for unseen
 		// items. Otherwise use a timestamp of the last succesful update request.
@@ -241,54 +238,48 @@ function profile_content(App $a, $update = 0)
 			$sql_extra4 = " AND `item`.`received` > '" . $gmupdate . "'";
 		}
 
-		$r = q("SELECT distinct(parent) AS `item_id`, `item`.`network` AS `item_network`, `item`.`created`
+		$items = q("SELECT DISTINCT(`parent-uri`) AS `uri`
 			FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
-			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND
-			(`item`.`deleted` = 0 OR item.verb = '" . ACTIVITY_LIKE . "'
-			OR item.verb = '" . ACTIVITY_DISLIKE . "' OR item.verb = '" . ACTIVITY_ATTEND . "'
-			OR item.verb = '" . ACTIVITY_ATTENDNO . "' OR item.verb = '" . ACTIVITY_ATTENDMAYBE . "')
-			AND `item`.`moderated` = 0
-			AND `item`.`wall` = 1
+			AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+			WHERE `item`.`uid` = %d AND `item`.`visible` AND
+			(NOT `item`.`deleted` OR `item`.`gravity` = %d)
+			AND NOT `item`.`moderated` AND `item`.`wall`
 			$sql_extra4
 			$sql_extra
 			ORDER BY `item`.`created` DESC",
-			intval($a->profile['profile_uid'])
+			intval($a->profile['profile_uid']), intval(GRAVITY_ACTIVITY)
 		);
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($items)) {
 			return '';
 		}
 	} else {
 		$sql_post_table = "";
 
-		if (x($category)) {
+		if (!empty($category)) {
 			$sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
-				dbesc(protect_sprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($a->profile['profile_uid']));
+				DBA::escape(protect_sprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($a->profile['profile_uid']));
 		}
 
-		if (x($hashtags)) {
+		if (!empty($hashtags)) {
 			$sql_post_table .= sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
-				dbesc(protect_sprintf($hashtags)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval($a->profile['profile_uid']));
+				DBA::escape(protect_sprintf($hashtags)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval($a->profile['profile_uid']));
 		}
 
-		if ($datequery) {
-			$sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` <= '%s' ", dbesc(DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get()))));
+		if (!empty($datequery)) {
+			$sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` <= '%s' ", DBA::escape(DateTimeFormat::convert($datequery, 'UTC', date_default_timezone_get()))));
 		}
-		if ($datequery2) {
-			$sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` >= '%s' ", dbesc(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
+		if (!empty($datequery2)) {
+			$sql_extra2 .= protect_sprintf(sprintf(" AND `thread`.`created` >= '%s' ", DBA::escape(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get()))));
 		}
 
-		// Belongs the profile page to a forum?
+		// Does the profile page belong to a forum?
 		// If not then we can improve the performance with an additional condition
-		$r = q("SELECT `uid` FROM `user` WHERE `uid` = %d AND `page-flags` IN (%d, %d)",
-			intval($a->profile['profile_uid']),
-			intval(PAGE_COMMUNITY),
-			intval(PAGE_PRVGROUP)
-		);
-
-		if (!DBM::is_result($r)) {
+		$condition = ['uid' => $a->profile['profile_uid'], 'page-flags' => [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP]];
+		if (!DBA::exists('user', $condition)) {
 			$sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
+		} else {
+			$sql_extra3 = "";
 		}
 
 		//  check if we serve a mobile device and get the user settings
@@ -309,7 +300,7 @@ function profile_content(App $a, $update = 0)
 
 		$pager_sql = sprintf(" LIMIT %d, %d ", intval($a->pager['start']), intval($a->pager['itemspage']));
 
-		$r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`
+		$items = q("SELECT `item`.`uri`
 			FROM `thread`
 			STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
 			$sql_post_table
@@ -325,47 +316,24 @@ function profile_content(App $a, $update = 0)
 		);
 	}
 
-	$parents_arr = [];
-	$parents_str = '';
-
 	// Set a time stamp for this page. We will make use of it when we
 	// search for new items (update routine)
 	$_SESSION['last_updated'][$last_updated_key] = time();
 
-	if (DBM::is_result($r)) {
-		foreach ($r as $rr) {
-			$parents_arr[] = $rr['item_id'];
-		}
-
-		$parents_str = implode(', ', $parents_arr);
-
-		$items = q(item_query($a->profile['profile_uid']) . " AND `item`.`uid` = %d
-			AND `item`.`parent` IN (%s)
-			$sql_extra ",
-			intval($a->profile['profile_uid']),
-			dbesc($parents_str)
-		);
-
-		$items = conv_sort($items, 'created');
-	} else {
-		$items = [];
-	}
-
 	if ($is_owner && !$update && !Config::get('theme', 'hide_eventlist')) {
 		$o .= Profile::getBirthdays();
 		$o .= Profile::getEventsReminderHTML();
 	}
 
-
 	if ($is_owner) {
-		$unseen = dba::exists('item', ['wall' => true, 'unseen' => true, 'uid' => local_user()]);
+		$unseen = Item::exists(['wall' => true, 'unseen' => true, 'uid' => local_user()]);
 		if ($unseen) {
 			$r = Item::update(['unseen' => false],
 					['wall' => true, 'unseen' => true, 'uid' => local_user()]);
 		}
 	}
 
-	$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));
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 1a80b539d..567a7f3a2 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -8,59 +8,59 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Object\Image;
-use Friendica\Util\DateTimeFormat;
 
 function profile_photo_init(App $a)
 {
-	if (! local_user()) {
+	if (!local_user()) {
 		return;
 	}
 
 	Profile::load($a, $a->user['nickname']);
 }
 
-function profile_photo_post(App $a) {
-
-	if (! local_user()) {
-		notice(L10n::t('Permission denied.') . EOL );
+function profile_photo_post(App $a)
+{
+	if (!local_user()) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
 	check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
 
-	if((x($_POST,'cropfinal')) && ($_POST['cropfinal'] == 1)) {
+	if (!empty($_POST['cropfinal']) && $_POST['cropfinal'] == 1) {
 
 		// unless proven otherwise
 		$is_default_profile = 1;
 
-		if($_REQUEST['profile']) {
-			$r = q("select id, `is-default` from profile where id = %d and uid = %d limit 1",
-				intval($_REQUEST['profile']),
+		if ($_REQUEST['profile']) {
+			$r = q("select id, `is-default` from profile where id = %d and uid = %d limit 1", intval($_REQUEST['profile']),
 				intval(local_user())
 			);
-			if (DBM::is_result($r) && (! intval($r[0]['is-default'])))
+
+			if (DBA::isResult($r) && (!intval($r[0]['is-default']))) {
 				$is_default_profile = 0;
+			}
 		}
 
 
 
 		// phase 2 - we have finished cropping
 
-		if($a->argc != 2) {
-			notice(L10n::t('Image uploaded but image cropping failed.') . EOL );
+		if ($a->argc != 2) {
+			notice(L10n::t('Image uploaded but image cropping failed.') . EOL);
 			return;
 		}
 
 		$image_id = $a->argv[1];
 
-		if(substr($image_id,-2,1) == '-') {
-			$scale = substr($image_id,-1,1);
-			$image_id = substr($image_id,0,-2);
+		if (substr($image_id, -2, 1) == '-') {
+			$scale = substr($image_id, -1, 1);
+			$image_id = substr($image_id, 0, -2);
 		}
 
 
@@ -69,20 +69,19 @@ function profile_photo_post(App $a) {
 		$srcW = $_POST['xfinal'] - $srcX;
 		$srcH = $_POST['yfinal'] - $srcY;
 
-		$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1",
-			dbesc($image_id),
-			dbesc(local_user()),
-			intval($scale));
-
-		if (DBM::is_result($r)) {
+		$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1", DBA::escape($image_id),
+			DBA::escape(local_user()), intval($scale));
 
+		$url = System::baseUrl() . '/profile/' . $a->user['nickname'];
+		if (DBA::isResult($r)) {
 			$base_image = $r[0];
 
 			$Image = new Image($base_image['data'], $base_image['type']);
 			if ($Image->isValid()) {
-				$Image->crop(175,$srcX,$srcY,$srcW,$srcH);
+				$Image->crop(175, $srcX, $srcY, $srcW, $srcH);
 
-				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 4, $is_default_profile);
+				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
+						L10n::t('Profile Photos'), 4, $is_default_profile);
 
 				if ($r === false) {
 					notice(L10n::t('Image size reduction [%s] failed.', "175") . EOL);
@@ -90,7 +89,8 @@ function profile_photo_post(App $a) {
 
 				$Image->scaleDown(80);
 
-				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 5, $is_default_profile);
+				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
+						L10n::t('Profile Photos'), 5, $is_default_profile);
 
 				if ($r === false) {
 					notice(L10n::t('Image size reduction [%s] failed.', "80") . EOL);
@@ -98,7 +98,8 @@ function profile_photo_post(App $a) {
 
 				$Image->scaleDown(48);
 
-				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 6, $is_default_profile);
+				$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
+						L10n::t('Profile Photos'), 6, $is_default_profile);
 
 				if ($r === false) {
 					notice(L10n::t('Image size reduction [%s] failed.', "48") . EOL);
@@ -108,15 +109,13 @@ function profile_photo_post(App $a) {
 
 				if ($is_default_profile) {
 					$r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
-						dbesc($base_image['resource-id']),
-						intval(local_user())
+						DBA::escape($base_image['resource-id']), intval(local_user())
 					);
 				} else {
 					$r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
-						dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
-						dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()),
-						intval($_REQUEST['profile']),
-						intval(local_user())
+						DBA::escape(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
+						DBA::escape(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()),
+						intval($_REQUEST['profile']), intval(local_user())
 					);
 				}
 
@@ -124,8 +123,7 @@ function profile_photo_post(App $a) {
 
 				info(L10n::t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
 				// Update global directory in background
-				$url = System::baseUrl() . '/profile/' . $a->user['nickname'];
-				if ($url && strlen(Config::get('system','directory'))) {
+				if ($url && strlen(Config::get('system', 'directory'))) {
 					Worker::add(PRIORITY_LOW, "Directory", $url);
 				}
 
@@ -135,11 +133,11 @@ function profile_photo_post(App $a) {
 			}
 		}
 
-		goaway(System::baseUrl() . '/profiles');
+		goaway($url);
 		return; // NOTREACHED
 	}
 
-	$src      = $_FILES['userfile']['tmp_name'];
+	$src = $_FILES['userfile']['tmp_name'];
 	$filename = basename($_FILES['userfile']['name']);
 	$filesize = intval($_FILES['userfile']['size']);
 	$filetype = $_FILES['userfile']['type'];
@@ -158,7 +156,7 @@ function profile_photo_post(App $a) {
 	$imagedata = @file_get_contents($src);
 	$ph = new Image($imagedata, $filetype);
 
-	if (! $ph->isValid()) {
+	if (!$ph->isValid()) {
 		notice(L10n::t('Unable to process image.') . EOL);
 		@unlink($src);
 		return;
@@ -166,70 +164,70 @@ function profile_photo_post(App $a) {
 
 	$ph->orient($src);
 	@unlink($src);
-	return profile_photo_crop_ui_head($a, $ph);
+
+	$imagecrop = profile_photo_crop_ui_head($a, $ph);
+	goaway(System::baseUrl() . '/profile_photo/use/' . $imagecrop['hash']);
 }
 
+function profile_photo_content(App $a)
+{
 
-function profile_photo_content(App $a) {
-
-	if (! local_user()) {
-		notice(L10n::t('Permission denied.') . EOL );
+	if (!local_user()) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
 	$newuser = false;
 
-	if($a->argc == 2 && $a->argv[1] === 'new')
+	if ($a->argc == 2 && $a->argv[1] === 'new') {
 		$newuser = true;
+	}
 
-	if( $a->argv[1]=='use'){
-		if ($a->argc<3){
-			notice(L10n::t('Permission denied.') . EOL );
-			return;
-		};
+	$imagecrop = [];
 
-//		check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+	if (isset($a->argv[1]) && $a->argv[1] == 'use' && $a->argc >= 3) {
+		// check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
 
 		$resource_id = $a->argv[2];
 		//die(":".local_user());
-		$r=q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC",
-			intval(local_user()),
-			dbesc($resource_id)
-			);
-		if (!DBM::is_result($r)){
-			notice(L10n::t('Permission denied.') . EOL );
+		$r = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC", intval(local_user()),
+			DBA::escape($resource_id)
+		);
+
+		if (!DBA::isResult($r)) {
+			notice(L10n::t('Permission denied.') . EOL);
 			return;
 		}
+
 		$havescale = false;
 		foreach ($r as $rr) {
-			if($rr['scale'] == 5)
+			if ($rr['scale'] == 5) {
 				$havescale = true;
+			}
 		}
 
 		// set an already uloaded photo as profile photo
 		// if photo is in 'Profile Photos', change it in db
-		if (($r[0]['album']== L10n::t('Profile Photos')) && ($havescale)){
-			$r=q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d",
-				intval(local_user()));
+		if (($r[0]['album'] == L10n::t('Profile Photos')) && ($havescale)) {
+			$r = q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d", intval(local_user()));
 
-			$r=q("UPDATE `photo` SET `profile`=1 WHERE `uid` = %d AND `resource-id` = '%s'",
-				intval(local_user()),
-				dbesc($resource_id)
-				);
+			$r = q("UPDATE `photo` SET `profile`=1 WHERE `uid` = %d AND `resource-id` = '%s'", intval(local_user()),
+				DBA::escape($resource_id)
+			);
 
 			Contact::updateSelfFromUserID(local_user(), true);
 
 			// Update global directory in background
 			$url = $_SESSION['my_url'];
-			if ($url && strlen(Config::get('system','directory'))) {
+			if ($url && strlen(Config::get('system', 'directory'))) {
 				Worker::add(PRIORITY_LOW, "Directory", $url);
 			}
 
-			goaway(System::baseUrl() . '/profiles');
+			goaway(System::baseUrl() . '/profile/' . $a->user['nickname']);
 			return; // NOTREACHED
 		}
 		$ph = new Image($r[0]['data'], $r[0]['type']);
-		profile_photo_crop_ui_head($a, $ph);
+		$imagecrop = profile_photo_crop_ui_head($a, $ph);
 		// go ahead as we have jus uploaded a new photo to crop
 	}
 
@@ -237,12 +235,11 @@ function profile_photo_content(App $a) {
 		intval(local_user())
 	);
 
-
-	if(! x($a->config,'imagecrop')) {
-
+	if (empty($imagecrop)) {
 		$tpl = get_markup_template('profile_photo.tpl');
 
-		$o = replace_macros($tpl,[
+		$o = replace_macros($tpl,
+			[
 			'$user' => $a->user['nickname'],
 			'$lbl_upfile' => L10n::t('Upload File:'),
 			'$lbl_profiles' => L10n::t('Select a profile:'),
@@ -250,23 +247,24 @@ function profile_photo_content(App $a) {
 			'$submit' => L10n::t('Upload'),
 			'$profiles' => $profiles,
 			'$form_security_token' => get_form_security_token("profile_photo"),
-			'$select' => sprintf('%s %s', L10n::t('or'), ($newuser) ? '<a href="' . System::baseUrl() . '">' . L10n::t('skip this step') . '</a>' : '<a href="'. System::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . L10n::t('select a photo from your photo albums') . '</a>')
+			'$select' => sprintf('%s %s', L10n::t('or'),
+				($newuser) ? '<a href="' . System::baseUrl() . '">' . L10n::t('skip this step') . '</a>' : '<a href="' . System::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . L10n::t('select a photo from your photo albums') . '</a>')
 		]);
 
 		return $o;
-	}
-	else {
-		$filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.'.$a->config['imagecrop_ext'];
+	} else {
+		$filename = $imagecrop['hash'] . '-' . $imagecrop['resolution'] . '.' . $imagecrop['ext'];
 		$tpl = get_markup_template("cropbody.tpl");
-		$o = replace_macros($tpl,[
-			'$filename' => $filename,
-			'$profile' => intval($_REQUEST['profile']),
-			'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
+		$o = replace_macros($tpl,
+			[
+			'$filename'  => $filename,
+			'$profile'   => (isset($_REQUEST['profile']) ? intval($_REQUEST['profile']) : 0),
+			'$resource'  => $imagecrop['hash'] . '-' . $imagecrop['resolution'],
 			'$image_url' => System::baseUrl() . '/photo/' . $filename,
-			'$title' => L10n::t('Crop Image'),
-			'$desc' => L10n::t('Please adjust the image cropping for optimum viewing.'),
+			'$title'     => L10n::t('Crop Image'),
+			'$desc'      => L10n::t('Please adjust the image cropping for optimum viewing.'),
 			'$form_security_token' => get_form_security_token("profile_photo"),
-			'$done' => L10n::t('Done Editing')
+			'$done'      => L10n::t('Done Editing')
 		]);
 		return $o;
 	}
@@ -274,23 +272,23 @@ function profile_photo_content(App $a) {
 	return; // NOTREACHED
 }
 
-
-function profile_photo_crop_ui_head(App $a, Image $Image) {
-	$max_length = Config::get('system','max_image_length');
-	if (! $max_length) {
+function profile_photo_crop_ui_head(App $a, Image $image)
+{
+	$max_length = Config::get('system', 'max_image_length');
+	if (!$max_length) {
 		$max_length = MAX_IMAGE_LENGTH;
 	}
 	if ($max_length > 0) {
-		$Image->scaleDown($max_length);
+		$image->scaleDown($max_length);
 	}
 
-	$width = $Image->getWidth();
-	$height = $Image->getHeight();
+	$width = $image->getWidth();
+	$height = $image->getHeight();
 
 	if ($width < 175 || $height < 175) {
-		$Image->scaleUp(200);
-		$width = $Image->getWidth();
-		$height = $Image->getHeight();
+		$image->scaleUp(200);
+		$width = $image->getWidth();
+		$height = $image->getHeight();
 	}
 
 	$hash = Photo::newResource();
@@ -299,7 +297,7 @@ function profile_photo_crop_ui_head(App $a, Image $Image) {
 	$smallest = 0;
 	$filename = '';
 
-	$r = Photo::store($Image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 0);
+	$r = Photo::store($image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 0);
 
 	if ($r) {
 		info(L10n::t('Image uploaded successfully.') . EOL);
@@ -308,8 +306,8 @@ function profile_photo_crop_ui_head(App $a, Image $Image) {
 	}
 
 	if ($width > 640 || $height > 640) {
-		$Image->scaleDown(640);
-		$r = Photo::store($Image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 1);
+		$image->scaleDown(640);
+		$r = Photo::store($image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 1);
 
 		if ($r === false) {
 			notice(L10n::t('Image size reduction [%s] failed.', "640") . EOL);
@@ -318,10 +316,14 @@ function profile_photo_crop_ui_head(App $a, Image $Image) {
 		}
 	}
 
-	$a->config['imagecrop'] = $hash;
-	$a->config['imagecrop_resolution'] = $smallest;
-	$a->config['imagecrop_ext'] = $Image->getExt();
 	$a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), []);
 	$a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), []);
-	return;
+
+	$imagecrop = [
+		'hash'       => $hash,
+		'resolution' => $smallest,
+		'ext'        => $image->getExt(),
+	];
+
+	return $imagecrop;
 }
diff --git a/mod/profiles.php b/mod/profiles.php
index 9c925924f..d951a470d 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -13,10 +13,9 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
-use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
@@ -35,7 +34,7 @@ function profiles_init(App $a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (! DBM::is_result($r)) {
+		if (! DBA::isResult($r)) {
 			notice(L10n::t('Profile not found.') . EOL);
 			goaway('profiles');
 			return; // NOTREACHED
@@ -54,7 +53,7 @@ function profiles_init(App $a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			info(L10n::t('Profile deleted.').EOL);
 		}
 
@@ -69,7 +68,7 @@ function profiles_init(App $a) {
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
 
-		$num_profiles = (DBM::is_result($r0) ? count($r0) : 0);
+		$num_profiles = (DBA::isResult($r0) ? count($r0) : 0);
 
 		$name = L10n::t('Profile-') . ($num_profiles + 1);
 
@@ -79,19 +78,19 @@ function profiles_init(App $a) {
 		$r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
 			VALUES ( %d, '%s', '%s', '%s', '%s' )",
 			intval(local_user()),
-			dbesc($name),
-			dbesc($r1[0]['name']),
-			dbesc($r1[0]['photo']),
-			dbesc($r1[0]['thumb'])
+			DBA::escape($name),
+			DBA::escape($r1[0]['name']),
+			DBA::escape($r1[0]['photo']),
+			DBA::escape($r1[0]['thumb'])
 		);
 
 		$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
 			intval(local_user()),
-			dbesc($name)
+			DBA::escape($name)
 		);
 
 		info(L10n::t('New profile created.') . EOL);
-		if (DBM::is_result($r3) && count($r3) == 1) {
+		if (DBA::isResult($r3) && count($r3) == 1) {
 			goaway('profiles/' . $r3[0]['id']);
 		}
 
@@ -105,14 +104,14 @@ function profiles_init(App $a) {
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
 
-		$num_profiles = (DBM::is_result($r0) ? count($r0) : 0);
+		$num_profiles = (DBA::isResult($r0) ? count($r0) : 0);
 
 		$name = L10n::t('Profile-') . ($num_profiles + 1);
 		$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
 			intval(local_user()),
 			intval($a->argv[2])
 		);
-		if(! DBM::is_result($r1)) {
+		if(! DBA::isResult($r1)) {
 			notice(L10n::t('Profile unavailable to clone.') . EOL);
 			killme();
 			return;
@@ -121,16 +120,16 @@ function profiles_init(App $a) {
 		$r1[0]['is-default'] = 0;
 		$r1[0]['publish'] = 0;
 		$r1[0]['net-publish'] = 0;
-		$r1[0]['profile-name'] = dbesc($name);
+		$r1[0]['profile-name'] = DBA::escape($name);
 
-		dba::insert('profile', $r1[0]);
+		DBA::insert('profile', $r1[0]);
 
 		$r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
 			intval(local_user()),
-			dbesc($name)
+			DBA::escape($name)
 		);
 		info(L10n::t('New profile created.') . EOL);
-		if ((DBM::is_result($r3)) && (count($r3) == 1)) {
+		if ((DBA::isResult($r3)) && (count($r3) == 1)) {
 			goaway('profiles/'.$r3[0]['id']);
 		}
 
@@ -145,7 +144,7 @@ function profiles_init(App $a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! DBM::is_result($r)) {
+		if (! DBA::isResult($r)) {
 			notice(L10n::t('Profile not found.') . EOL);
 			killme();
 			return;
@@ -153,12 +152,10 @@ function profiles_init(App $a) {
 
 		Profile::load($a, $a->user['nickname'], $r[0]['id']);
 	}
-
-
-
 }
 
-function profile_clean_keywords($keywords) {
+function profile_clean_keywords($keywords)
+{
 	$keywords = str_replace(",", " ", $keywords);
 	$keywords = explode(" ", $keywords);
 
@@ -192,7 +189,7 @@ function profiles_post(App $a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! DBM::is_result($orig)) {
+		if (! DBA::isResult($orig)) {
 			notice(L10n::t('Profile not found.') . EOL);
 			return;
 		}
@@ -284,16 +281,16 @@ function profiles_post(App $a) {
 					$newname = $lookup;
 
 					$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
-						dbesc($newname),
+						DBA::escape($newname),
 						intval(local_user())
 					);
-					if (! DBM::is_result($r)) {
+					if (! DBA::isResult($r)) {
 						$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
-							dbesc($lookup),
+							DBA::escape($lookup),
 							intval(local_user())
 						);
 					}
-					if (DBM::is_result($r)) {
+					if (DBA::isResult($r)) {
 						$prf = $r[0]['url'];
 						$newname = $r[0]['name'];
 					}
@@ -441,44 +438,45 @@ function profiles_post(App $a) {
 			`education` = '%s',
 			`hide-friends` = %d
 			WHERE `id` = %d AND `uid` = %d",
-			dbesc($profile_name),
-			dbesc($name),
-			dbesc($pdesc),
-			dbesc($gender),
-			dbesc($dob),
-			dbesc($address),
-			dbesc($locality),
-			dbesc($region),
-			dbesc($postal_code),
-			dbesc($country_name),
-			dbesc($marital),
-			dbesc($with),
-			dbesc($howlong),
-			dbesc($sexual),
-			dbesc($xmpp),
-			dbesc($homepage),
-			dbesc($hometown),
-			dbesc($politic),
-			dbesc($religion),
-			dbesc($pub_keywords),
-			dbesc($prv_keywords),
-			dbesc($likes),
-			dbesc($dislikes),
-			dbesc($about),
-			dbesc($interest),
-			dbesc($contact),
-			dbesc($music),
-			dbesc($book),
-			dbesc($tv),
-			dbesc($film),
-			dbesc($romance),
-			dbesc($work),
-			dbesc($education),
+			DBA::escape($profile_name),
+			DBA::escape($name),
+			DBA::escape($pdesc),
+			DBA::escape($gender),
+			DBA::escape($dob),
+			DBA::escape($address),
+			DBA::escape($locality),
+			DBA::escape($region),
+			DBA::escape($postal_code),
+			DBA::escape($country_name),
+			DBA::escape($marital),
+			DBA::escape($with),
+			DBA::escape($howlong),
+			DBA::escape($sexual),
+			DBA::escape($xmpp),
+			DBA::escape($homepage),
+			DBA::escape($hometown),
+			DBA::escape($politic),
+			DBA::escape($religion),
+			DBA::escape($pub_keywords),
+			DBA::escape($prv_keywords),
+			DBA::escape($likes),
+			DBA::escape($dislikes),
+			DBA::escape($about),
+			DBA::escape($interest),
+			DBA::escape($contact),
+			DBA::escape($music),
+			DBA::escape($book),
+			DBA::escape($tv),
+			DBA::escape($film),
+			DBA::escape($romance),
+			DBA::escape($work),
+			DBA::escape($education),
 			intval($hide_friends),
 			intval($a->argv[1]),
 			intval(local_user())
 		);
 
+		/// @TODO decide to use DBA::isResult() here and check $r
 		if ($r) {
 			info(L10n::t('Profile updated.') . EOL);
 		}
@@ -486,7 +484,7 @@ function profiles_post(App $a) {
 		if ($is_default) {
 			if ($namechanged) {
 				$r = q("UPDATE `user` set `username` = '%s' where `uid` = %d",
-					dbesc($name),
+					DBA::escape($name),
 					intval(local_user())
 				);
 			}
@@ -521,7 +519,7 @@ function profiles_content(App $a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! DBM::is_result($r)) {
+		if (! DBA::isResult($r)) {
 			notice(L10n::t('Profile not found.') . EOL);
 			return;
 		}
@@ -550,7 +548,7 @@ function profiles_content(App $a) {
 		]);
 
 		$personal_account = !(in_array($a->user["page-flags"],
-					[PAGE_COMMUNITY, PAGE_PRVGROUP]));
+					[Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP]));
 
 		$detailled_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
 
@@ -578,7 +576,9 @@ function profiles_content(App $a) {
 			'$banner'	=> L10n::t('Edit Profile Details'),
 			'$submit'	=> L10n::t('Submit'),
 			'$profpic'	=> L10n::t('Change Profile Photo'),
+			'$profpiclink'	=> '/photos/' . $a->user['nickname'],
 			'$viewprof'	=> L10n::t('View this profile'),
+			'$viewallprof'	=> L10n::t('View all profiles'),
 			'$editvis' 	=> L10n::t('Edit visibility'),
 			'$cr_prof'	=> L10n::t('Create a new profile using these settings'),
 			'$cl_prof'	=> L10n::t('Clone this profile'),
@@ -653,7 +653,7 @@ function profiles_content(App $a) {
 			$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
 				local_user()
 			);
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				//Go to the default profile.
 				goaway('profiles/' . $r[0]['id']);
 			}
@@ -662,7 +662,7 @@ function profiles_content(App $a) {
 		$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
 			local_user());
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 
 			$tpl = get_markup_template('profile_entry.tpl');
 
diff --git a/mod/profperm.php b/mod/profperm.php
index 0f864d42f..ee5e2f23d 100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -6,12 +6,13 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\Profile;
 
 function profperm_init(App $a)
 {
-	if (! local_user()) {
+	if (!local_user()) {
 		return;
 	}
 
@@ -24,13 +25,13 @@ function profperm_init(App $a)
 
 function profperm_content(App $a) {
 
-	if (! local_user()) {
+	if (!local_user()) {
 		notice(L10n::t('Permission denied') . EOL);
 		return;
 	}
 
 
-	if($a->argc < 2) {
+	if ($a->argc < 2) {
 		notice(L10n::t('Invalid profile identifier.') . EOL );
 		return;
 	}
@@ -44,24 +45,26 @@ function profperm_content(App $a) {
 		$switchtotext = Config::get('system','groupedit_image_limit', 400);
 	}
 
-	if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
+	if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
 		$r = q("SELECT `id` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `self` = 0
 			AND `network` = '%s' AND `id` = %d AND `uid` = %d LIMIT 1",
-			dbesc(NETWORK_DFRN),
+			DBA::escape(Protocol::DFRN),
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (DBM::is_result($r))
+
+		if (DBA::isResult($r)) {
 			$change = intval($a->argv[2]);
+		}
 	}
 
 
-	if(($a->argc > 1) && (intval($a->argv[1]))) {
+	if (($a->argc > 1) && (intval($a->argv[1]))) {
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			notice(L10n::t('Invalid profile identifier.') . EOL );
 			return;
 		}
@@ -73,14 +76,14 @@ function profperm_content(App $a) {
 		);
 
 		$ingroup = [];
-		if (DBM::is_result($r))
+		if (DBA::isResult($r))
 			foreach($r as $member)
 				$ingroup[] = $member['id'];
 
 		$members = $r;
 
-		if($change) {
-			if(in_array($change,$ingroup)) {
+		if (!empty($change)) {
+			if (in_array($change,$ingroup)) {
 				q("UPDATE `contact` SET `profile-id` = 0 WHERE `id` = %d AND `uid` = %d",
 					intval($change),
 					intval(local_user())
@@ -103,7 +106,7 @@ function profperm_content(App $a) {
 			$members = $r;
 
 			$ingroup = [];
-			if (DBM::is_result($r))
+			if (DBA::isResult($r))
 				foreach($r as $member)
 					$ingroup[] = $member['id'];
 		}
@@ -117,7 +120,7 @@ function profperm_content(App $a) {
 	}
 
 	$o .= '<div id="prof-update-wrapper">';
-	if($change)
+	if (!empty($change))
 		$o = '';
 
 	$o .= '<div id="prof-members-title">';
@@ -128,7 +131,7 @@ function profperm_content(App $a) {
 	$textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
 
 	foreach($members as $member) {
-		if($member['url']) {
+		if ($member['url']) {
 			$member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;';
 			$o .= micropro($member,true,'mpprof', $textmode);
 		}
@@ -144,13 +147,13 @@ function profperm_content(App $a) {
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0
 			AND `network` = '%s' ORDER BY `name` ASC",
 			intval(local_user()),
-			dbesc(NETWORK_DFRN)
+			DBA::escape(Protocol::DFRN)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
 			foreach($r as $member) {
-				if(! in_array($member['id'],$ingroup)) {
+				if (!in_array($member['id'],$ingroup)) {
 					$member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;';
 					$o .= micropro($member,true,'mpprof',$textmode);
 				}
@@ -159,7 +162,7 @@ function profperm_content(App $a) {
 
 		$o .= '</div><div id="prof-all-contacts-end"></div>';
 
-	if($change) {
+	if (!empty($change)) {
 		echo $o;
 		killme();
 	}
diff --git a/mod/proxy.php b/mod/proxy.php
deleted file mode 100644
index 0b84233e5..000000000
--- a/mod/proxy.php
+++ /dev/null
@@ -1,375 +0,0 @@
-<?php
-/**
- * @file mod/proxy.php
- * @brief Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
- */
-
-use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Model\Photo;
-use Friendica\Object\Image;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
-
-define('PROXY_DEFAULT_TIME', 86400); // 1 Day
-
-define('PROXY_SIZE_MICRO', 'micro');
-define('PROXY_SIZE_THUMB', 'thumb');
-define('PROXY_SIZE_SMALL', 'small');
-define('PROXY_SIZE_MEDIUM', 'medium');
-define('PROXY_SIZE_LARGE', 'large');
-
-require_once 'include/security.php';
-
-function proxy_init(App $a) {
-	// Pictures are stored in one of the following ways:
-	// 1. If a folder "proxy" exists and is writeable, then use this for caching
-	// 2. If a cache path is defined, use this
-	// 3. If everything else failed, cache into the database
-	//
-	// Question: Do we really need these three methods?
-
-	if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
-		header('HTTP/1.1 304 Not Modified');
-		header('Last-Modified: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
-		header('Etag: ' . $_SERVER['HTTP_IF_NONE_MATCH']);
-		header('Expires: ' . gmdate('D, d M Y H:i:s', time() + (31536000)) . ' GMT');
-		header('Cache-Control: max-age=31536000');
-
-		if (function_exists('header_remove')) {
-			header_remove('Last-Modified');
-			header_remove('Expires');
-			header_remove('Cache-Control');
-		}
-		exit;
-	}
-
-	if (function_exists('header_remove')) {
-		header_remove('Pragma');
-		header_remove('pragma');
-	}
-
-	$thumb = false;
-	$size = 1024;
-	$sizetype = '';
-	$basepath = $a->get_basepath();
-
-	// If the cache path isn't there, try to create it
-	if (!is_dir($basepath . '/proxy') && is_writable($basepath)) {
-		mkdir($basepath . '/proxy');
-	}
-
-	// Checking if caching into a folder in the webroot is activated and working
-	$direct_cache = (is_dir($basepath . '/proxy') && is_writable($basepath . '/proxy'));
-
-	// Look for filename in the arguments
-	if ((isset($a->argv[1]) || isset($a->argv[2]) || isset($a->argv[3])) && !isset($_REQUEST['url'])) {
-		if (isset($a->argv[3])) {
-			$url = $a->argv[3];
-		} elseif (isset($a->argv[2])) {
-			$url = $a->argv[2];
-		} else {
-			$url = $a->argv[1];
-		}
-
-		if (isset($a->argv[3]) && ($a->argv[3] == 'thumb')) {
-			$size = 200;
-		}
-
-		// thumb, small, medium and large.
-		if (substr($url, -6) == ':micro') {
-			$size = 48;
-			$sizetype = ':micro';
-			$url = substr($url, 0, -6);
-		} elseif (substr($url, -6) == ':thumb') {
-			$size = 80;
-			$sizetype = ':thumb';
-			$url = substr($url, 0, -6);
-		} elseif (substr($url, -6) == ':small') {
-			$size = 175;
-			$url = substr($url, 0, -6);
-			$sizetype = ':small';
-		} elseif (substr($url, -7) == ':medium') {
-			$size = 600;
-			$url = substr($url, 0, -7);
-			$sizetype = ':medium';
-		} elseif (substr($url, -6) == ':large') {
-			$size = 1024;
-			$url = substr($url, 0, -6);
-			$sizetype = ':large';
-		}
-
-		$pos = strrpos($url, '=.');
-		if ($pos) {
-			$url = substr($url, 0, $pos + 1);
-		}
-
-		$url = str_replace(['.jpg', '.jpeg', '.gif', '.png'], ['','','',''], $url);
-
-		$url = base64_decode(strtr($url, '-_', '+/'), true);
-
-		if ($url) {
-			$_REQUEST['url'] = $url;
-		}
-	} else {
-		$direct_cache = false;
-	}
-
-	if (!$direct_cache) {
-		$urlhash = 'pic:' . sha1($_REQUEST['url']);
-
-		$cachefile = get_cachefile(hash('md5', $_REQUEST['url']));
-		if ($cachefile != '' && file_exists($cachefile)) {
-			$img_str = file_get_contents($cachefile);
-			$mime = image_type_to_mime_type(exif_imagetype($cachefile));
-
-			header('Content-type: ' . $mime);
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
-			header('Etag: "' . md5($img_str) . '"');
-			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + (31536000)) . ' GMT');
-			header('Cache-Control: max-age=31536000');
-
-			// reduce quality - if it isn't a GIF
-			if ($mime != 'image/gif') {
-				$Image = new Image($img_str, $mime);
-				if ($Image->isValid()) {
-					$img_str = $Image->asString();
-				}
-			}
-
-			echo $img_str;
-			killme();
-		}
-	} else {
-		$cachefile = '';
-	}
-
-	$valid = true;
-	$photo = null;
-	if (!$direct_cache && ($cachefile == '')) {
-		$photo = dba::selectFirst('photo', ['data', 'desc'], ['resource-id' => $urlhash]);
-		if (DBM::is_result($photo)) {
-			$img_str = $photo['data'];
-			$mime = $photo['desc'];
-			if ($mime == '') {
-				$mime = 'image/jpeg';
-			}
-		}
-	}
-
-	if (!DBM::is_result($photo)) {
-		// It shouldn't happen but it does - spaces in URL
-		$_REQUEST['url'] = str_replace(' ', '+', $_REQUEST['url']);
-		$redirects = 0;
-		$img_str = Network::fetchUrl($_REQUEST['url'], true, $redirects, 10);
-
-		$tempfile = tempnam(get_temppath(), 'cache');
-		file_put_contents($tempfile, $img_str);
-		$mime = image_type_to_mime_type(exif_imagetype($tempfile));
-		unlink($tempfile);
-
-		// If there is an error then return a blank image
-		if ((substr($a->get_curl_code(), 0, 1) == '4') || (!$img_str)) {
-			$img_str = file_get_contents('images/blank.png');
-			$mime = 'image/png';
-			$cachefile = ''; // Clear the cachefile so that the dummy isn't stored
-			$valid = false;
-			$Image = new Image($img_str, 'image/png');
-			if ($Image->isValid()) {
-				$Image->scaleDown(10);
-				$img_str = $Image->asString();
-			}
-		} elseif ($mime != 'image/jpeg' && !$direct_cache && $cachefile == '') {
-			$image = @imagecreatefromstring($img_str);
-
-			if ($image === FALSE) {
-				die();
-			}
-
-			$fields = ['uid' => 0, 'contact-id' => 0, 'guid' => get_guid(), 'resource-id' => $urlhash, 'created' => DateTimeFormat::utcNow(), 'edited' => DateTimeFormat::utcNow(),
-				'filename' => basename($_REQUEST['url']), 'type' => '', 'album' => '', 'height' => imagesy($image), 'width' => imagesx($image),
-				'datasize' => 0, 'data' => $img_str, 'scale' => 100, 'profile' => 0,
-				'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '', 'desc' => $mime];
-			dba::insert('photo', $fields);
-		} else {
-			$Image = new Image($img_str, $mime);
-			if ($Image->isValid() && !$direct_cache && ($cachefile == '')) {
-				Photo::store($Image, 0, 0, $urlhash, $_REQUEST['url'], '', 100);
-			}
-		}
-	}
-
-	$img_str_orig = $img_str;
-
-	// reduce quality - if it isn't a GIF
-	if ($mime != 'image/gif') {
-		$Image = new Image($img_str, $mime);
-		if ($Image->isValid()) {
-			$Image->scaleDown($size);
-			$img_str = $Image->asString();
-		}
-	}
-
-	// If there is a real existing directory then put the cache file there
-	// advantage: real file access is really fast
-	// Otherwise write in cachefile
-	if ($valid && $direct_cache) {
-		file_put_contents($basepath . '/proxy/' . proxy_url($_REQUEST['url'], true), $img_str_orig);
-		if ($sizetype != '') {
-			file_put_contents($basepath . '/proxy/' . proxy_url($_REQUEST['url'], true) . $sizetype, $img_str);
-		}
-	} elseif ($cachefile != '') {
-		file_put_contents($cachefile, $img_str_orig);
-	}
-
-	header('Content-type: ' . $mime);
-
-	// Only output the cache headers when the file is valid
-	if ($valid) {
-		header('Last-Modified: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
-		header('Etag: "' . md5($img_str) . '"');
-		header('Expires: ' . gmdate('D, d M Y H:i:s', time() + (31536000)) . ' GMT');
-		header('Cache-Control: max-age=31536000');
-	}
-
-	echo $img_str;
-
-	killme();
-}
-
-/**
- * @brief Transform a remote URL into a local one
- *
- * This function only performs the URL replacement on http URL and if the
- * provided URL isn't local, "the isn't deactivated" (sic) and if the config
- * system.proxy_disabled is set to false.
- *
- * @param string $url       The URL to proxyfy
- * @param bool   $writemode Returns a local path the remote URL should be saved to
- * @param string $size      One of the PROXY_SIZE_* constants
- *
- * @return string The proxyfied URL or relative path
- */
-function proxy_url($url, $writemode = false, $size = '') {
-	$a = get_app();
-
-	if (substr($url, 0, strlen('http')) !== 'http') {
-		return $url;
-	}
-
-	// Only continue if it isn't a local image and the isn't deactivated
-	if (proxy_is_local_image($url)) {
-		$url = str_replace(normalise_link(System::baseUrl()) . '/', System::baseUrl() . '/', $url);
-		return $url;
-	}
-
-	if (Config::get('system', 'proxy_disabled')) {
-		return $url;
-	}
-
-	// Image URL may have encoded ampersands for display which aren't desirable for proxy
-	$url = html_entity_decode($url, ENT_NOQUOTES, 'utf-8');
-
-	// Creating a sub directory to reduce the amount of files in the cache directory
-	$basepath = $a->get_basepath() . '/proxy';
-
-	$shortpath = hash('md5', $url);
-	$longpath = substr($shortpath, 0, 2);
-
-	if (is_dir($basepath) && $writemode && !is_dir($basepath . '/' . $longpath)) {
-		mkdir($basepath . '/' . $longpath);
-		chmod($basepath . '/' . $longpath, 0777);
-	}
-
-	$longpath .= '/' . strtr(base64_encode($url), '+/', '-_');
-
-	// Extract the URL extension
-	$extension = pathinfo(parse_url($url, PHP_URL_PATH), PATHINFO_EXTENSION);
-
-	$extensions = ['jpg', 'jpeg', 'gif', 'png'];
-	if (in_array($extension, $extensions)) {
-		$shortpath .= '.' . $extension;
-		$longpath .= '.' . $extension;
-	}
-
-	$proxypath = System::baseUrl() . '/proxy/' . $longpath;
-
-	if ($size != '') {
-		$size = ':' . $size;
-	}
-
-	// Too long files aren't supported by Apache
-	// Writemode in combination with long files shouldn't be possible
-	if ((strlen($proxypath) > 250) && $writemode) {
-		return $shortpath;
-	} elseif (strlen($proxypath) > 250) {
-		return System::baseUrl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
-	} elseif ($writemode) {
-		return $longpath;
-	} else {
-		return $proxypath . $size;
-	}
-}
-
-/**
- * @param $url string
- * @return boolean
- */
-function proxy_is_local_image($url) {
-	if ($url[0] == '/') {
-		return true;
-	}
-
-	if (strtolower(substr($url, 0, 5)) == 'data:') {
-		return true;
-	}
-
-	// links normalised - bug #431
-	$baseurl = normalise_link(System::baseUrl());
-	$url = normalise_link($url);
-	return (substr($url, 0, strlen($baseurl)) == $baseurl);
-}
-
-/**
- * @brief Return the array of query string parameters from a URL
- *
- * @param string $url
- * @return array Associative array of query string parameters
- */
-function proxy_parse_query($url) {
-	$query = parse_url($url, PHP_URL_QUERY);
-	$query = html_entity_decode($query);
-	$query_list = explode('&', $query);
-	$arr = [];
-
-	foreach ($query_list as $key_value) {
-		$key_value_list = explode('=', $key_value);
-		$arr[$key_value_list[0]] = $key_value_list[1];
-	}
-
-	unset($url, $query_list, $url);
-	return $arr;
-}
-
-function proxy_img_cb($matches) {
-	// if the picture seems to be from another picture cache then take the original source
-	$queryvar = proxy_parse_query($matches[2]);
-	if (($queryvar['url'] != '') && (substr($queryvar['url'], 0, 4) == 'http')) {
-		$matches[2] = urldecode($queryvar['url']);
-	}
-
-	// following line changed per bug #431
-	if (proxy_is_local_image($matches[2])) {
-		return $matches[1] . $matches[2] . $matches[3];
-	}
-
-	return $matches[1] . proxy_url(htmlspecialchars_decode($matches[2])) . $matches[3];
-}
-
-function proxy_parse_html($html) {
-	$html = str_replace(normalise_link(System::baseUrl()) . '/', System::baseUrl() . '/', $html);
-
-	return preg_replace_callback('/(<img [^>]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', 'proxy_img_cb', $html);
-}
diff --git a/mod/pubsub.php b/mod/pubsub.php
index a68b222ec..bc284a4eb 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,7 +1,9 @@
 <?php
 
 use Friendica\App;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Protocol\OStatus;
 
 require_once('include/security.php');
@@ -43,8 +45,8 @@ function pubsub_init(App $a)
 
 		$subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
 
-		$owner = dba::selectFirst('user', ['uid'], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
-		if (!DBM::is_result($owner)) {
+		$owner = DBA::selectFirst('user', ['uid'], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
+		if (!DBA::isResult($owner)) {
 			logger('Local account not found: ' . $nick);
 			hub_return(false, '');
 		}
@@ -55,8 +57,8 @@ function pubsub_init(App $a)
 			$condition['hub-verify'] = $hub_verify;
 		}
 
-		$contact = dba::selectFirst('contact', ['id', 'poll'], $condition);
-		if (!DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', ['id', 'poll'], $condition);
+		if (!DBA::isResult($contact)) {
 			logger('Contact ' . $contact_id . ' not found.');
 			hub_return(false, '');
 		}
@@ -75,7 +77,7 @@ function pubsub_init(App $a)
 		}
 
 		if (!empty($hub_mode)) {
-			dba::update('contact', ['subhub' => $subscribe], ['id' => $contact['id']]);
+			DBA::update('contact', ['subhub' => $subscribe], ['id' => $contact['id']]);
 			logger($hub_mode . ' success for contact ' . $contact_id . '.');
 		}
  		hub_return(true, $hub_challenge);
@@ -92,35 +94,35 @@ function pubsub_post(App $a)
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
 	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
-	$importer = dba::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
-	if (!DBM::is_result($importer)) {
+	$importer = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
+	if (!DBA::isResult($importer)) {
 		hub_post_return();
 	}
 
 	$condition = ['id' => $contact_id, 'uid' => $importer['uid'], 'subhub' => true, 'blocked' => false];
-	$contact = dba::selectFirst('contact', [], $condition);
+	$contact = DBA::selectFirst('contact', [], $condition);
 
-	if (!DBM::is_result($contact)) {
+	if (!DBA::isResult($contact)) {
 		$author = OStatus::salmonAuthor($xml, $importer);
 		if (!empty($author['contact-id'])) {
 			$condition = ['id' => $author['contact-id'], 'uid' => $importer['uid'], 'subhub' => true, 'blocked' => false];
-			$contact = dba::selectFirst('contact', [], $condition);
+			$contact = DBA::selectFirst('contact', [], $condition);
 			logger('No record for ' . $nick .' with contact id ' . $contact_id . ' - using '.$author['contact-id'].' instead.');
 		}
-		if (!DBM::is_result($contact)) {
+		if (!DBA::isResult($contact)) {
 			logger('Contact ' . $author["author-link"] . ' (' . $contact_id . ') for user ' . $nick . " wasn't found - ignored. XML: " . $xml);
 			hub_post_return();
 		}
 	}
 
-	if (!in_array($contact['rel'], [CONTACT_IS_SHARING, CONTACT_IS_FRIEND]) && ($contact['network'] != NETWORK_FEED)) {
+	if (!in_array($contact['rel'], [Contact::SHARING, Contact::FRIEND]) && ($contact['network'] != Protocol::FEED)) {
 		logger('Contact ' . $contact['id'] . ' is not expected to share with us - ignored.');
 		hub_post_return();
 	}
 
 	// We import feeds from OStatus, Friendica and ATOM/RSS.
 	/// @todo Check if Friendica posts really arrive here - otherwise we can discard some stuff
-	if (!in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN, NETWORK_FEED])) {
+	if (!in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN, Protocol::FEED])) {
 		hub_post_return();
 	}
 
@@ -129,7 +131,7 @@ function pubsub_post(App $a)
 	consume_feed($xml, $importer, $contact, $feedhub);
 
 	// do it a second time for DFRN so that any children find their parents.
-	if ($contact['network'] === NETWORK_DFRN) {
+	if ($contact['network'] === Protocol::DFRN) {
 		consume_feed($xml, $importer, $contact, $feedhub);
 	}
 
diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index 6ee7955e0..8f9478d8a 100644
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -3,9 +3,9 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Util\Network;
+use Friendica\Database\DBA;
 use Friendica\Model\PushSubscriber;
+use Friendica\Util\Network;
 
 function post_var($name) {
 	return (x($_POST, $name)) ? notags(trim($_POST[$name])) : '';
@@ -63,8 +63,8 @@ function pubsubhubbub_init(App $a) {
 
 		// fetch user from database given the nickname
 		$condition = ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false];
-		$owner = dba::selectFirst('user', ['uid', 'hidewall'], $condition);
-		if (!DBM::is_result($owner)) {
+		$owner = DBA::selectFirst('user', ['uid', 'hidewall'], $condition);
+		if (!DBA::isResult($owner)) {
 			logger('Local account not found: ' . $nick . ' - topic: ' . $hub_topic . ' - callback: ' . $hub_callback);
 			System::httpExit(404);
 		}
@@ -78,8 +78,8 @@ function pubsubhubbub_init(App $a) {
 		// get corresponding row from contact table
 		$condition = ['uid' => $owner['uid'], 'blocked' => false,
 			'pending' => false, 'self' => true];
-		$contact = dba::selectFirst('contact', ['poll'], $condition);
-		if (!DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', ['poll'], $condition);
+		if (!DBA::isResult($contact)) {
 			logger('Self contact for user ' . $owner['uid'] . ' not found.');
 			System::httpExit(404);
 		}
diff --git a/mod/randprof.php b/mod/randprof.php
index c5154c12d..18bcb236f 100644
--- a/mod/randprof.php
+++ b/mod/randprof.php
@@ -4,6 +4,7 @@
  */
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
 
@@ -12,7 +13,7 @@ function randprof_init(App $a)
 	$x = GContact::getRandomUrl();
 
 	if ($x) {
-		goaway(Profile::zrl($x));
+		goaway(Contact::magicLink($x));
 	}
 
 	goaway(System::baseUrl() . '/profile');
diff --git a/mod/receive.php b/mod/receive.php
index 41f2225cb..80be7d2a2 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -7,7 +7,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Protocol\Diaspora;
 
 /**
@@ -24,7 +24,7 @@ function receive_post(App $a)
 
 	if (($a->argc == 2) && ($a->argv[1] === 'public')) {
 		$public = true;
-		$importer = false;
+		$importer = [];
 	} else {
 		$public = false;
 
@@ -33,8 +33,8 @@ function receive_post(App $a)
 		}
 		$guid = $a->argv[2];
 
-		$importer = dba::selectFirst('user', [], ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]);
-		if (!DBM::is_result($importer)) {
+		$importer = DBA::selectFirst('user', [], ['guid' => $guid, 'account_expired' => false, 'account_removed' => false]);
+		if (!DBA::isResult($importer)) {
 			System::httpExit(500);
 		}
 	}
@@ -43,9 +43,7 @@ function receive_post(App $a)
 
 	logger('mod-diaspora: receiving post', LOGGER_DEBUG);
 
-	$xml = urldecode($_POST['xml']);
-
-	if (!$xml) {
+	if (empty($_POST['xml'])) {
 		$postdata = file_get_contents("php://input");
 		if ($postdata == '') {
 			System::httpExit(500);
@@ -54,6 +52,8 @@ function receive_post(App $a)
 		logger('mod-diaspora: message is in the new format', LOGGER_DEBUG);
 		$msg = Diaspora::decodeRaw($importer, $postdata);
 	} else {
+		$xml = urldecode($_POST['xml']);
+
 		logger('mod-diaspora: decode message in the old format', LOGGER_DEBUG);
 		$msg = Diaspora::decode($importer, $xml);
 
diff --git a/mod/redir.php b/mod/redir.php
index b72923842..3acf960da 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,89 +1,129 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 
 function redir_init(App $a) {
 
-	$url = ((x($_GET,'url')) ? $_GET['url'] : '');
-	$quiet = ((x($_GET,'quiet')) ? '&quiet=1' : '');
-	$con_url = ((x($_GET,'conurl')) ? $_GET['conurl'] : '');
+	$url = defaults($_GET, 'url', '');
+	$quiet = !empty($_GET['quiet']) ? '&quiet=1' : '';
+	$con_url = defaults($_GET, 'conurl', '');
 
-	// traditional DFRN
+	if ($a->argc > 1 && intval($a->argv[1])) {
+		$cid = intval($a->argv[1]);
+	} elseif (local_user() && !empty($con_url)) {
+		$cid = Contact::getIdForURL($con_url, local_user());
+	} else {
+		$cid = 0;
+	}
 
-	if ($con_url || (local_user() && $a->argc > 1 && intval($a->argv[1]))) {
+	if (!empty($cid)) {
+		$fields = ['id', 'uid', 'nurl', 'url', 'addr', 'name', 'network', 'poll', 'issued-id', 'dfrn-id', 'duplex', 'pending'];
+		$contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => [0, local_user()]]);
+		if (!DBA::isResult($contact)) {
+			notice(L10n::t('Contact not found.'));
+			goaway(System::baseUrl());
+		}
 
-		if ($con_url) {
-			$con_url = str_replace('https', 'http', $con_url);
+		$contact_url = $contact['url'];
 
-			$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
-				dbesc($con_url),
-				intval(local_user())
-			);
+		if ($contact['network'] !== Protocol::DFRN // Authentication isn't supported for non DFRN contacts.
+			|| (!local_user() && !remote_user()) // Visitors (not logged in or not remotes) can't authenticate.
+			|| (!empty($a->contact['id']) && $a->contact['id'] == $cid)) // Local user is already authenticated.
+		{
+			goaway($url != '' ? $url : $contact_url);
+		}
 
-			if (!DBM::is_result($r)) {
-				goaway(System::baseUrl());
+		if ($contact['uid'] == 0 && local_user()) {
+			// Let's have a look if there is an established connection
+			// between the puplic contact we have found and the local user.
+			$contact = DBA::selectFirst('contact', $fields, ['nurl' => $contact['nurl'], 'uid' => local_user()]);
+
+			if (DBA::isResult($contact)) {
+				$cid = $contact['id'];
 			}
-			if ($r[0]['network'] !== NETWORK_DFRN) {
-				goaway(($url != '' ? $url : $r[0]['url']));
-			}
-			$cid = $r[0]['id'];
-		} else {
-			$cid = $a->argv[1];
 
-			$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval($cid),
-				intval(local_user())
-			);
-
-			if (!DBM::is_result($r)) {
-				goaway(System::baseUrl());
-			}
-			if ($r[0]['network'] !== NETWORK_DFRN) {
-				goaway(($url != '' ? $url : $r[0]['url']));
+			if (!empty($a->contact['id']) && $a->contact['id'] == $cid) {
+				// Local user is already authenticated.
+				$target_url = $url != '' ? $url : $contact_url;
+				logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
+				goaway($target_url);
 			}
 		}
 
-		$dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
+		if (remote_user()) {
+			$host = substr(System::baseUrl() . ($a->urlpath ? '/' . $a->urlpath : ''), strpos(System::baseUrl(), '://') + 3);
+			$remotehost = substr($contact['addr'], strpos($contact['addr'], '@') + 1);
 
-		if ($r[0]['duplex'] && $r[0]['issued-id']) {
-			$orig_id = $r[0]['issued-id'];
-			$dfrn_id = '1:' . $orig_id;
-		}
-		if ($r[0]['duplex'] && $r[0]['dfrn-id']) {
-			$orig_id = $r[0]['dfrn-id'];
-			$dfrn_id = '0:' . $orig_id;
+			// On a local instance we have to check if the local user has already authenticated
+			// with the local contact. Otherwise the local user would ask the local contact
+			// for authentification everytime he/she is visiting a profile page of the local
+			// contact.
+			if ($host == $remotehost
+				&& x($_SESSION, 'remote')
+				&& is_array($_SESSION['remote']))
+			{
+				foreach ($_SESSION['remote'] as $v) {
+					if ($v['uid'] == $_SESSION['visitor_visiting'] && $v['cid'] == $_SESSION['visitor_id']) {
+						// Remote user is already authenticated.
+						$target_url = $url != '' ? $url : $contact_url;
+						logger($contact['name'] . " is already authenticated. Redirecting to " . $target_url, LOGGER_DEBUG);
+						goaway($target_url);
+					}
+				}
+			}
 		}
 
-		$sec = random_string();
+		// Doing remote auth with dfrn.
+		if (local_user() && (!empty($contact['dfrn-id']) || !empty($contact['issued-id'])) && empty($contact['pending'])) {
+			$dfrn_id = $orig_id = (($contact['issued-id']) ? $contact['issued-id'] : $contact['dfrn-id']);
 
-		q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`)
-			VALUES( %d, %s, '%s', '%s', %d )",
-			intval(local_user()),
-			intval($cid),
-			dbesc($dfrn_id),
-			dbesc($sec),
-			intval(time() + 45)
-		);
+			if ($contact['duplex'] && $contact['issued-id']) {
+				$orig_id = $contact['issued-id'];
+				$dfrn_id = '1:' . $orig_id;
+			}
+			if ($contact['duplex'] && $contact['dfrn-id']) {
+				$orig_id = $contact['dfrn-id'];
+				$dfrn_id = '0:' . $orig_id;
+			}
 
-		logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
-		$dest = (($url) ? '&destination_url=' . $url : '');
-		goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
-			. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
+			$sec = random_string();
+
+			$fields = ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id,
+				'sec' => $sec, 'expire' => time() + 45];
+			DBA::insert('profile_check', $fields);
+
+			logger('mod_redir: ' . $contact['name'] . ' ' . $sec, LOGGER_DEBUG);
+
+			$dest = (!empty($url) ? '&destination_url=' . $url : '');
+
+			goaway($contact['poll'] . '?dfrn_id=' . $dfrn_id
+				. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
+		}
+
+		$url = $url != '' ? $url : $contact_url;
 	}
 
-	if (local_user()) {
-		$handle = $a->user['nickname'] . '@' . substr(System::baseUrl(),strpos(System::baseUrl(),'://')+3);
-	}
-	if (remote_user()) {
-		$handle = $_SESSION['handle'];
-	}
+	// If we don't have a connected contact, redirect with
+	// the 'zrl' parameter.
+	if (!empty($url)) {
+		$my_profile = Profile::getMyURL();
 
-	if ($url) {
-		$url = str_replace('{zid}','&zid=' . $handle,$url);
+		if (!empty($my_profile) && !link_compare($my_profile, $url)) {
+			$separator = strpos($url, '?') ? '&' : '?';
+
+			$url .= $separator . 'zrl=' . urlencode($my_profile);
+		}
+
+		logger('redirecting to ' . $url, LOGGER_DEBUG);
 		goaway($url);
 	}
 
+	notice(L10n::t('Contact not found.'));
 	goaway(System::baseUrl());
 }
diff --git a/mod/register.php b/mod/register.php
index 81919df10..b851faf2d 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -11,6 +11,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Module\Tos;
 use Friendica\Util\DateTimeFormat;
@@ -21,8 +22,6 @@ function register_post(App $a)
 {
 	check_form_security_token_redirectOnErr('/register', 'register');
 
-	global $lang;
-
 	$verified = 0;
 	$blocked  = 1;
 
@@ -37,7 +36,7 @@ function register_post(App $a)
 		}
 	}
 
-	switch ($a->config['register_policy']) {
+	switch (Config::get('config', 'register_policy')) {
 		case REGISTER_OPEN:
 			$blocked = 0;
 			$verified = 1;
@@ -50,7 +49,7 @@ function register_post(App $a)
 
 		default:
 		case REGISTER_CLOSED:
-			if ((!x($_SESSION, 'authenticated') && (!x($_SESSION, 'administrator')))) {
+			if (empty($_SESSION['authenticated']) && empty($_SESSION['administrator'])) {
 				notice(L10n::t('Permission denied.') . EOL);
 				return;
 			}
@@ -76,7 +75,7 @@ function register_post(App $a)
 
 	$user = $result['user'];
 
-	if ($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
+	if ($netpublish && intval(Config::get('config', 'register_policy')) !== REGISTER_APPROVE) {
 		$url = System::baseUrl() . '/profile/' . $user['nickname'];
 		Worker::add(PRIORITY_LOW, "Directory", $url);
 	}
@@ -85,16 +84,16 @@ function register_post(App $a)
 	$num_invites   = Config::get('system', 'number_invites');
 	$invite_id = ((x($_POST, 'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
 
-	if ($a->config['register_policy'] == REGISTER_OPEN) {
+	if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN) {
 		if ($using_invites && $invite_id) {
-			q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
+			q("delete * from register where hash = '%s' limit 1", DBA::escape($invite_id));
 			PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
 		}
 
 		// Only send a password mail when the password wasn't manually provided
 		if (!x($_POST, 'password1') || !x($_POST, 'confirm')) {
 			$res = User::sendRegisterOpenEmail(
-					$user['email'], $a->config['sitename'], System::baseUrl(), $user['username'], $result['password']);
+					$user['email'], Config::get('config', 'sitename'), System::baseUrl(), $user['username'], $result['password'], $user);
 
 			if ($res) {
 				info(L10n::t('Registration successful. Please check your email for further instructions.') . EOL);
@@ -111,30 +110,30 @@ function register_post(App $a)
 			info(L10n::t('Registration successful.') . EOL);
 			goaway(System::baseUrl());
 		}
-	} elseif ($a->config['register_policy'] == REGISTER_APPROVE) {
-		if (!strlen($a->config['admin_email'])) {
+	} elseif (intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE) {
+		if (!strlen(Config::get('config', 'admin_email'))) {
 			notice(L10n::t('Your registration can not be processed.') . EOL);
 			goaway(System::baseUrl());
 		}
 
 		$hash = random_string();
 		$r = q("INSERT INTO `register` ( `hash`, `created`, `uid`, `password`, `language`, `note` ) VALUES ( '%s', '%s', %d, '%s', '%s', '%s' ) ",
-			dbesc($hash),
-			dbesc(DateTimeFormat::utcNow()),
+			DBA::escape($hash),
+			DBA::escape(DateTimeFormat::utcNow()),
 			intval($user['uid']),
-			dbesc($result['password']),
-			dbesc($lang),
-			dbesc($_POST['permonlybox'])
+			DBA::escape($result['password']),
+			DBA::escape(Config::get('system', 'language')),
+			DBA::escape($_POST['permonlybox'])
 		);
 
 		// invite system
 		if ($using_invites && $invite_id) {
-			q("DELETE * FROM `register` WHERE `hash` = '%s' LIMIT 1", dbesc($invite_id));
+			q("DELETE * FROM `register` WHERE `hash` = '%s' LIMIT 1", DBA::escape($invite_id));
 			PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
 		}
 
 		// send email to admins
-		$admin_mail_list = "'" . implode("','", array_map(dbesc, explode(",", str_replace(" ", "", $a->config['admin_email'])))) . "'";
+		$admin_mail_list = "'" . implode("','", array_map(['Friendica\Database\DBA', 'escape'], explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))))) . "'";
 		$adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)",
 			$admin_mail_list
 		);
@@ -158,7 +157,7 @@ function register_post(App $a)
 		}
 		// send notification to the user, that the registration is pending
 		User::sendRegisterPendingEmail(
-			$user['email'], $a->config['sitename'], $user['username']);
+			$user['email'], Config::get('config', 'sitename'), $user['username']);
 
 		info(L10n::t('Your registration is pending approval by the site owner.') . EOL);
 		goaway(System::baseUrl());
@@ -179,7 +178,7 @@ function register_content(App $a)
 		return;
 	}
 
-	if ((!local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
+	if ((!local_user()) && (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED)) {
 		notice("Permission denied." . EOL);
 		return;
 	}
@@ -258,7 +257,7 @@ function register_content(App $a)
 	$o = replace_macros($tpl, [
 		'$oidhtml' => $oidhtml,
 		'$invitations' => Config::get('system', 'invitation_only'),
-		'$permonly'    => $a->config['register_policy'] == REGISTER_APPROVE,
+		'$permonly'    => intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE,
 		'$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')],
 		'$invite_desc' => L10n::t('Membership on this site is by invitation only.'),
 		'$invite_label' => L10n::t('Your invitation code: '),
@@ -292,7 +291,9 @@ function register_content(App $a)
 		'$showprivstatement' => Config::get('system', 'tosprivstatement'),
 		'$privstatement' => $tos->privacy_complete,
 		'$baseurl'   => System::baseurl(),
-		'$form_security_token' => get_form_security_token("register")
+		'$form_security_token' => get_form_security_token("register"),
+		'$explicit_content' => Config::get('system', 'explicit_content', false),
+		'$explicit_content_note' => L10n::t('Note: This node explicitly contains adult content')
 	]);
 	return $o;
 }
diff --git a/mod/regmod.php b/mod/regmod.php
index aa64986d0..11d8eee41 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -2,12 +2,13 @@
 /**
  * @file mod/regmod.php
  */
+
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Module\Login;
 
@@ -18,11 +19,11 @@ function user_allow($hash)
 	$a = get_app();
 
 	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
-		dbesc($hash)
+		DBA::escape($hash)
 	);
 
 
-	if (!DBM::is_result($register)) {
+	if (!DBA::isResult($register)) {
 		return false;
 	}
 
@@ -30,12 +31,12 @@ function user_allow($hash)
 		intval($register[0]['uid'])
 	);
 
-	if (!DBM::is_result($user)) {
+	if (!DBA::isResult($user)) {
 		killme();
 	}
 
 	$r = q("DELETE FROM `register` WHERE `hash` = '%s'",
-		dbesc($register[0]['hash'])
+		DBA::escape($register[0]['hash'])
 	);
 
 
@@ -46,7 +47,7 @@ function user_allow($hash)
 	$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1",
 		intval($user[0]['uid'])
 	);
-	if (DBM::is_result($r) && $r[0]['net-publish']) {
+	if (DBA::isResult($r) && $r[0]['net-publish']) {
 		$url = System::baseUrl() . '/profile/' . $user[0]['nickname'];
 		if ($url && strlen(Config::get('system', 'directory'))) {
 			Worker::add(PRIORITY_LOW, "Directory", $url);
@@ -57,10 +58,11 @@ function user_allow($hash)
 
 	$res = User::sendRegisterOpenEmail(
 		$user[0]['email'],
-		$a->config['sitename'],
+		Config::get('config', 'sitename'),
 		System::baseUrl(),
 		$user[0]['username'],
-		$register[0]['password']);
+		$register[0]['password'],
+		$user[0]);
 
 	L10n::popLang();
 
@@ -76,10 +78,10 @@ function user_allow($hash)
 function user_deny($hash)
 {
 	$register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
-		dbesc($hash)
+		DBA::escape($hash)
 	);
 
-	if (!DBM::is_result($register)) {
+	if (!DBA::isResult($register)) {
 		return false;
 	}
 
@@ -87,8 +89,8 @@ function user_deny($hash)
 		intval($register[0]['uid'])
 	);
 
-	dba::delete('user', ['uid' => $register[0]['uid']]);
-	dba::delete('register', ['hash' => $register[0]['hash']]);
+	DBA::delete('user', ['uid' => $register[0]['uid']]);
+	DBA::delete('register', ['hash' => $register[0]['hash']]);
 
 	notice(L10n::t('Registration revoked for %s', $user[0]['username']) . EOL);
 	return true;
@@ -96,11 +98,9 @@ function user_deny($hash)
 
 function regmod_content(App $a)
 {
-	global $lang;
-
 	if (!local_user()) {
 		info(L10n::t('Please login.') . EOL);
-		$o = '<br /><br />' . Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
+		$o = '<br /><br />' . Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 0 : 1);
 		return $o;
 	}
 
diff --git a/mod/removeme.php b/mod/removeme.php
index 2db63d8d8..b386ec12f 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -2,11 +2,13 @@
 /**
  * @file mod/removeme.php
  */
+
 use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Model\User;
-use Friendica\Database\DBM;
 
 require_once 'include/enotify.php';
 
@@ -34,10 +36,10 @@ function removeme_post(App $a)
 
 	// send notification to admins so that they can clean um the backups
 	// send email to admins
-	$admin_mails = explode(",", str_replace(" ", "", $a->config['admin_email']));
+	$admin_mails = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
 	foreach ($admin_mails as $mail) {
-		$admin = dba::selectFirst('user', ['uid', 'language', 'email'], ['email' => $mail]);
-		if (!DBM::is_result($admin)) {
+		$admin = DBA::selectFirst('user', ['uid', 'language', 'email', 'username'], ['email' => $mail]);
+		if (!DBA::isResult($admin)) {
 			continue;
 		}
 		notification([
@@ -46,6 +48,7 @@ function removeme_post(App $a)
 			'preamble'     => L10n::t('On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'),
 			'body'         => L10n::t('The user id is %d', local_user()),
 			'to_email'     => $admin['email'],
+			'to_name'      => $admin['username'],
 			'uid'          => $admin['uid'],
 			'language'     => $admin['language'] ? $admin['language'] : 'en',
 			'show_in_notification_page' => false
diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index b8f6fc523..3acaa687a 100644
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -2,9 +2,12 @@
 /**
  * @file mod/repair_ostatus.php
  */
+
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 
 function repair_ostatus_content(App $a) {
@@ -23,28 +26,29 @@ function repair_ostatus_content(App $a) {
 
 	$counter = intval($_REQUEST['counter']);
 
-        $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE
-                `uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)",
-                intval($uid),
-                dbesc(NETWORK_OSTATUS),
-                intval(CONTACT_IS_FRIEND),
-                intval(CONTACT_IS_SHARING));
+	$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE
+	`uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)",
+		intval($uid),
+		DBA::escape(Protocol::OSTATUS),
+		intval(Contact::FRIEND),
+		intval(Contact::SHARING));
 
-	if (!$r)
-		return($o.L10n::t("Error"));
+	if (!DBA::isResult($r)) {
+		return ($o . L10n::t("Error"));
+	}
 
 	$total = $r[0]["total"];
 
-        $r = q("SELECT `url` FROM `contact` WHERE
-                `uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)
+	$r = q("SELECT `url` FROM `contact` WHERE
+		`uid` = %d AND `network` = '%s' AND `rel` IN (%d, %d)
 		ORDER BY `url`
 		LIMIT %d, 1",
-                intval($uid),
-                dbesc(NETWORK_OSTATUS),
-                intval(CONTACT_IS_FRIEND),
-                intval(CONTACT_IS_SHARING), $counter++);
+		intval($uid),
+		DBA::escape(Protocol::OSTATUS),
+		intval(Contact::FRIEND),
+		intval(Contact::SHARING), $counter++);
 
-	if (!$r) {
+	if (!DBA::isResult($r)) {
 		$o .= L10n::t("Done");
 		return $o;
 	}
diff --git a/mod/salmon.php b/mod/salmon.php
index 22da151cf..bd4b3773c 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -4,8 +4,9 @@
  */
 use Friendica\App;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
@@ -25,9 +26,9 @@ function salmon_post(App $a, $xml = '') {
 	$mentions   = (($a->argc > 2 && $a->argv[2] === 'mention') ? true : false);
 
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
-		dbesc($nick)
+		DBA::escape($nick)
 	);
-	if (! DBM::is_result($r)) {
+	if (! DBA::isResult($r)) {
 		System::httpExit(500);
 	}
 
@@ -40,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);
 	}
@@ -145,23 +146,26 @@ function salmon_post(App $a, $xml = '') {
 	$r = q("SELECT * FROM `contact` WHERE `network` IN ('%s', '%s')
 						AND (`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s')
 						AND `uid` = %d LIMIT 1",
-		dbesc(NETWORK_OSTATUS),
-		dbesc(NETWORK_DFRN),
-		dbesc(normalise_link($author_link)),
-		dbesc($author_link),
-		dbesc(normalise_link($author_link)),
+		DBA::escape(Protocol::OSTATUS),
+		DBA::escape(Protocol::DFRN),
+		DBA::escape(normalise_link($author_link)),
+		DBA::escape($author_link),
+		DBA::escape(normalise_link($author_link)),
 		intval($importer['uid'])
 	);
-	if (! DBM::is_result($r)) {
+
+	if (!DBA::isResult($r)) {
 		logger('Author ' . $author_link . ' unknown to user ' . $importer['uid'] . '.');
-		if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) {
+
+		if (PConfig::get($importer['uid'], 'system', 'ostatus_autofriend')) {
 			$result = Contact::createFromProbe($importer['uid'], $author_link);
-			if($result['success']) {
+
+			if ($result['success']) {
 				$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
 					AND `uid` = %d LIMIT 1",
-					dbesc(NETWORK_OSTATUS),
-					dbesc($author_link),
-					dbesc($author_link),
+					DBA::escape(Protocol::OSTATUS),
+					DBA::escape($author_link),
+					DBA::escape($author_link),
 					intval($importer['uid'])
 				);
 			}
@@ -171,8 +175,8 @@ function salmon_post(App $a, $xml = '') {
 	// Have we ignored the person?
 	// If so we can not accept this post.
 
-	//if((DBM::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
-	if (DBM::is_result($r) && $r[0]['blocked']) {
+	//if((DBA::isResult($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == Contact::FOLLOWER) || ($r[0]['blocked']))) {
+	if (DBA::isResult($r) && $r[0]['blocked']) {
 		logger('Ignoring this author.');
 		System::httpExit(202);
 		// NOTREACHED
@@ -181,7 +185,7 @@ function salmon_post(App $a, $xml = '') {
 	// Placeholder for hub discovery.
 	$hub = '';
 
-	$contact_rec = ((DBM::is_result($r)) ? $r[0] : null);
+	$contact_rec = ((DBA::isResult($r)) ? $r[0] : null);
 
 	OStatus::import($data, $importer, $contact_rec, $hub);
 
diff --git a/mod/search.php b/mod/search.php
index a600965e4..64336e348 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -2,6 +2,7 @@
 /**
  * @file mod/search.php
  */
+
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
@@ -9,7 +10,8 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
 
 require_once 'include/security.php';
 require_once 'include/conversation.php';
@@ -20,14 +22,14 @@ function search_saved_searches() {
 	$o = '';
 	$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-	if (! Feature::isEnabled(local_user(),'savedsearch'))
+	if (!Feature::isEnabled(local_user(),'savedsearch'))
 		return $o;
 
 	$r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
 		intval(local_user())
 	);
 
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$saved = [];
 		foreach ($r as $rr) {
 			$saved[] = [
@@ -63,14 +65,19 @@ function search_init(App $a) {
 		if (x($_GET,'save') && $search) {
 			$r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
 				intval(local_user()),
-				dbesc($search)
+				DBA::escape($search)
 			);
-			if (!DBM::is_result($r)) {
-				dba::insert('search', ['uid' => local_user(), 'term' => $search]);
+			if (!DBA::isResult($r)) {
+				DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
 			}
 		}
 		if (x($_GET,'remove') && $search) {
-			dba::delete('search', ['uid' => local_user(), 'term' => $search]);
+			DBA::delete('search', ['uid' => local_user(), 'term' => $search]);
+		}
+
+		/// @todo Check if there is a case at all that "aside" is prefilled here
+		if (!isset($a->page['aside'])) {
+			$a->page['aside'] = '';
 		}
 
 		$a->page['aside'] .= search_saved_searches();
@@ -183,7 +190,7 @@ function search_content(App $a) {
 				break;
 		}
 
-	if (! $search)
+	if (!$search)
 		return $o;
 
 	if (Config::get('system','only_tag_search'))
@@ -197,34 +204,39 @@ function search_content(App $a) {
 	if ($tag) {
 		logger("Start tag search for '".$search."'", LOGGER_DEBUG);
 
-		$r = q("SELECT %s
-			FROM `term`
-				STRAIGHT_JOIN `item` ON `item`.`id`=`term`.`oid` %s
-			WHERE %s AND (`term`.`uid` = 0 OR (`term`.`uid` = %d AND NOT `term`.`global`))
-				AND `term`.`otype` = %d AND `term`.`type` = %d AND `term`.`term` = '%s' AND `item`.`verb` = '%s'
-				AND NOT `author`.`blocked` AND NOT `author`.`hidden`
-			ORDER BY term.created DESC LIMIT %d , %d ",
-				item_fieldlists(), item_joins(local_user()), item_condition(),
-				intval(local_user()),
-				intval(TERM_OBJ_POST), intval(TERM_HASHTAG), dbesc(protect_sprintf($search)), dbesc(ACTIVITY_POST),
-				intval($a->pager['start']), intval($a->pager['itemspage']));
+		$condition = ["(`uid` = 0 OR (`uid` = ? AND NOT `global`))
+			AND `otype` = ? AND `type` = ? AND `term` = ?",
+			local_user(), TERM_OBJ_POST, TERM_HASHTAG, $search];
+		$params = ['order' => ['created' => true],
+			'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+		$terms = DBA::select('term', ['oid'], $condition, $params);
+
+		$itemids = [];
+		while ($term = DBA::fetch($terms)) {
+			$itemids[] = $term['oid'];
+		}
+		DBA::close($terms);
+
+		if (!empty($itemids)) {
+			$params = ['order' => ['id' => true]];
+			$items = Item::selectForUser(local_user(), [], ['id' => $itemids], $params);
+			$r = Item::inArray($items);
+		} else {
+			$r = [];
+		}
 	} else {
 		logger("Start fulltext search for '".$search."'", LOGGER_DEBUG);
 
-		$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search))));
-
-		$r = q("SELECT %s
-			FROM `item` %s
-			WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`))
-				AND NOT `author`.`blocked` AND NOT `author`.`hidden`
-				$sql_extra
-			GROUP BY `item`.`uri`, `item`.`id` ORDER BY `item`.`id` DESC LIMIT %d , %d",
-				item_fieldlists(), item_joins(local_user()), item_condition(),
-				intval(local_user()),
-				intval($a->pager['start']), intval($a->pager['itemspage']));
+		$condition = ["(`uid` = 0 OR (`uid` = ? AND NOT `global`))
+			AND `body` LIKE CONCAT('%',?,'%')",
+			local_user(), $search];
+		$params = ['order' => ['id' => true],
+			'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+		$items = Item::selectForUser(local_user(), [], $condition, $params);
+		$r = Item::inArray($items);
 	}
 
-	if (! DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		info(L10n::t('No results.') . EOL);
 		return $o;
 	}
@@ -249,4 +261,3 @@ function search_content(App $a) {
 
 	return $o;
 }
-
diff --git a/mod/settings.php b/mod/settings.php
index cd45cc507..84bc230e3 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -14,7 +14,7 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
@@ -26,12 +26,12 @@ use Friendica\Util\Temporal;
 function get_theme_config_file($theme)
 {
 	$a = get_app();
-	$base_theme = $a->theme_info['extends'];
+	$base_theme = defaults($a->theme_info, 'extends');
 
 	if (file_exists("view/theme/$theme/config.php")) {
 		return "view/theme/$theme/config.php";
 	}
-	if (file_exists("view/theme/$base_theme/config.php")) {
+	if ($base_theme && file_exists("view/theme/$base_theme/config.php")) {
 		return "view/theme/$base_theme/config.php";
 	}
 	return null;
@@ -60,6 +60,13 @@ function settings_init(App $a)
 		],
 	];
 
+	$tabs[] =	[
+		'label'	=> L10n::t('Profiles'),
+		'url' 	=> 'profiles',
+		'selected'	=> (($a->argc == 1) && ($a->argv[0] === 'profiles')?'active':''),
+		'accesskey' => 'p',
+	];
+
 	if (Feature::get()) {
 		$tabs[] =	[
 					'label'	=> L10n::t('Additional features'),
@@ -149,7 +156,7 @@ function settings_post(App $a)
 		check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
 
 		$key = $_POST['remove'];
-		dba::delete('tokens', ['id' => $key, 'uid' => local_user()]);
+		DBA::delete('tokens', ['id' => $key, 'uid' => local_user()]);
 		goaway(System::baseUrl(true)."/settings/oauth/");
 		return;
 	}
@@ -175,23 +182,23 @@ function settings_post(App $a)
 							icon='%s',
 							uid=%d
 						WHERE client_id='%s'",
-					dbesc($key),
-					dbesc($secret),
-					dbesc($name),
-					dbesc($redirect),
-					dbesc($icon),
+					DBA::escape($key),
+					DBA::escape($secret),
+					DBA::escape($name),
+					DBA::escape($redirect),
+					DBA::escape($icon),
 					local_user(),
-					dbesc($key)
+					DBA::escape($key)
 				);
 			} else {
 				q("INSERT INTO clients
 							(client_id, pw, name, redirect_uri, icon, uid)
 						VALUES ('%s', '%s', '%s', '%s', '%s',%d)",
-					dbesc($key),
-					dbesc($secret),
-					dbesc($name),
-					dbesc($redirect),
-					dbesc($icon),
+					DBA::escape($key),
+					DBA::escape($secret),
+					DBA::escape($name),
+					DBA::escape($redirect),
+					DBA::escape($icon),
 					local_user()
 				);
 			}
@@ -239,24 +246,24 @@ function settings_post(App $a)
 				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 					intval(local_user())
 				);
-				if (!DBM::is_result($r)) {
-					dba::insert('mailacct', ['uid' => local_user()]);
+				if (!DBA::isResult($r)) {
+					DBA::insert('mailacct', ['uid' => local_user()]);
 				}
 				if (strlen($mail_pass)) {
 					$pass = '';
 					openssl_public_encrypt($mail_pass, $pass, $a->user['pubkey']);
-					dba::update('mailacct', ['pass' => bin2hex($pass)], ['uid' => local_user()]);
+					DBA::update('mailacct', ['pass' => bin2hex($pass)], ['uid' => local_user()]);
 				}
 				$r = q("UPDATE `mailacct` SET `server` = '%s', `port` = %d, `ssltype` = '%s', `user` = '%s',
 					`action` = %d, `movetofolder` = '%s',
 					`mailbox` = 'INBOX', `reply_to` = '%s', `pubmail` = %d WHERE `uid` = %d",
-					dbesc($mail_server),
+					DBA::escape($mail_server),
 					intval($mail_port),
-					dbesc($mail_ssl),
-					dbesc($mail_user),
+					DBA::escape($mail_ssl),
+					DBA::escape($mail_user),
 					intval($mail_action),
-					dbesc($mail_movetofolder),
-					dbesc($mail_replyto),
+					DBA::escape($mail_movetofolder),
+					DBA::escape($mail_replyto),
 					intval($mail_pubmail),
 					intval(local_user())
 				);
@@ -264,7 +271,7 @@ function settings_post(App $a)
 				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 					intval(local_user())
 				);
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					$eacct = $r[0];
 					$mb = Email::constructMailboxName($eacct);
 
@@ -356,7 +363,7 @@ function settings_post(App $a)
 		Theme::install($theme);
 
 		$r = q("UPDATE `user` SET `theme` = '%s' WHERE `uid` = %d",
-				dbesc($theme),
+				DBA::escape($theme),
 				intval(local_user())
 		);
 
@@ -403,7 +410,7 @@ function settings_post(App $a)
 
 		if (!$err) {
 			$result = User::updatePassword(local_user(), $newpass);
-			if (DBM::is_result($result)) {
+			if (DBA::isResult($result)) {
 				info(L10n::t('Password changed.') . EOL);
 			} else {
 				notice(L10n::t('Password update failed. Please try again.') . EOL);
@@ -474,14 +481,14 @@ function settings_post(App $a)
 	}
 
 	// Adjust the page flag if the account type doesn't fit to the page flag.
-	if (($account_type == ACCOUNT_TYPE_PERSON) && !in_array($page_flags, [PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE])) {
-		$page_flags = PAGE_NORMAL;
-	} elseif (($account_type == ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, [PAGE_SOAPBOX])) {
-		$page_flags = PAGE_SOAPBOX;
-	} elseif (($account_type == ACCOUNT_TYPE_NEWS) && !in_array($page_flags, [PAGE_SOAPBOX])) {
-		$page_flags = PAGE_SOAPBOX;
-	} elseif (($account_type == ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, [PAGE_COMMUNITY, PAGE_PRVGROUP])) {
-		$page_flags = PAGE_COMMUNITY;
+	if (($account_type == Contact::ACCOUNT_TYPE_PERSON) && !in_array($page_flags, [Contact::PAGE_NORMAL, Contact::PAGE_SOAPBOX, Contact::PAGE_FREELOVE])) {
+		$page_flags = Contact::PAGE_NORMAL;
+	} elseif (($account_type == Contact::ACCOUNT_TYPE_ORGANISATION) && !in_array($page_flags, [Contact::PAGE_SOAPBOX])) {
+		$page_flags = Contact::PAGE_SOAPBOX;
+	} elseif (($account_type == Contact::ACCOUNT_TYPE_NEWS) && !in_array($page_flags, [Contact::PAGE_SOAPBOX])) {
+		$page_flags = Contact::PAGE_SOAPBOX;
+	} elseif (($account_type == Contact::ACCOUNT_TYPE_COMMUNITY) && !in_array($page_flags, [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP])) {
+		$page_flags = Contact::PAGE_COMMUNITY;
 	}
 
 	$email_changed = false;
@@ -509,9 +516,8 @@ function settings_post(App $a)
 			$err .= L10n::t('Invalid email.');
 		}
 		//  ensure new email is not the admin mail
-		//if ((x($a->config, 'admin_email')) && (strcasecmp($email, $a->config['admin_email']) == 0)) {
-		if (x($a->config, 'admin_email')) {
-			$adminlist = explode(",", str_replace(" ", "", strtolower($a->config['admin_email'])));
+		if (Config::get('config', 'admin_email')) {
+			$adminlist = explode(",", str_replace(" ", "", strtolower(Config::get('config', 'admin_email'))));
 			if (in_array(strtolower($email), $adminlist)) {
 				$err .= L10n::t('Cannot change to that email.');
 				$email = $a->user['email'];
@@ -528,10 +534,10 @@ function settings_post(App $a)
 		date_default_timezone_set($timezone);
 	}
 
-	$str_group_allow   = perms2str($_POST['group_allow']);
-	$str_contact_allow = perms2str($_POST['contact_allow']);
-	$str_group_deny    = perms2str($_POST['group_deny']);
-	$str_contact_deny  = perms2str($_POST['contact_deny']);
+	$str_group_allow   = !empty($_POST['group_allow'])   ? perms2str($_POST['group_allow'])   : '';
+	$str_contact_allow = !empty($_POST['contact_allow']) ? perms2str($_POST['contact_allow']) : '';
+	$str_group_deny    = !empty($_POST['group_deny'])    ? perms2str($_POST['group_deny'])    : '';
+	$str_contact_deny  = !empty($_POST['contact_deny'])  ? perms2str($_POST['contact_deny'])  : '';
 
 	$openidserver = $a->user['openidserver'];
 	//$openid = normalise_openid($openid);
@@ -559,7 +565,7 @@ function settings_post(App $a)
 	PConfig::set(local_user(), 'system', 'email_textonly', $email_textonly);
 	PConfig::set(local_user(), 'system', 'detailed_notif', $detailed_notif);
 
-	if ($page_flags == PAGE_PRVGROUP) {
+	if ($page_flags == Contact::PAGE_PRVGROUP) {
 		$hidewall = 1;
 		if (!$str_contact_allow && !$str_group_allow && !$str_contact_deny && !$str_group_deny) {
 			if ($def_gid) {
@@ -580,32 +586,32 @@ function settings_post(App $a)
 				`def_gid` = %d, `blockwall` = %d, `hidewall` = %d, `blocktags` = %d,
 				`unkmail` = %d, `cntunkmail` = %d, `language` = '%s'
 			WHERE `uid` = %d",
-			dbesc($username),
-			dbesc($email),
-			dbesc($openid),
-			dbesc($timezone),
-			dbesc($str_contact_allow),
-			dbesc($str_group_allow),
-			dbesc($str_contact_deny),
-			dbesc($str_group_deny),
+			DBA::escape($username),
+			DBA::escape($email),
+			DBA::escape($openid),
+			DBA::escape($timezone),
+			DBA::escape($str_contact_allow),
+			DBA::escape($str_group_allow),
+			DBA::escape($str_contact_deny),
+			DBA::escape($str_group_deny),
 			intval($notify),
 			intval($page_flags),
 			intval($account_type),
-			dbesc($defloc),
+			DBA::escape($defloc),
 			intval($allow_location),
 			intval($maxreq),
 			intval($expire),
-			dbesc($openidserver),
+			DBA::escape($openidserver),
 			intval($def_gid),
 			intval($blockwall),
 			intval($hidewall),
 			intval($blocktags),
 			intval($unkmail),
 			intval($cntunkmail),
-			dbesc($language),
+			DBA::escape($language),
 			intval(local_user())
 	);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		info(L10n::t('Settings updated.') . EOL);
 	}
 
@@ -619,7 +625,7 @@ function settings_post(App $a)
 		`hide-friends` = %d
 		WHERE `is-default` = 1 AND `uid` = %d",
 		intval($publish),
-		dbesc($username),
+		DBA::escape($username),
 		intval($net_publish),
 		intval($hide_friends),
 		intval(local_user())
@@ -679,10 +685,10 @@ function settings_content(App $a)
 
 		if (($a->argc > 3) && ($a->argv[2] === 'edit')) {
 			$r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
-					dbesc($a->argv[3]),
+					DBA::escape($a->argv[3]),
 					local_user());
 
-			if (!DBM::is_result($r)) {
+			if (!DBA::isResult($r)) {
 				notice(L10n::t("You can't edit this application."));
 				return;
 			}
@@ -706,12 +712,12 @@ function settings_content(App $a)
 		if (($a->argc > 3) && ($a->argv[2] === 'delete')) {
 			check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
 
-			dba::delete('clients', ['client_id' => $a->argv[3], 'uid' => local_user()]);
+			DBA::delete('clients', ['client_id' => $a->argv[3], 'uid' => local_user()]);
 			goaway(System::baseUrl(true)."/settings/oauth/");
 			return;
 		}
 
-		/// @TODO validate result with DBM::is_result()
+		/// @TODO validate result with DBA::isResult()
 		$r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my
 				FROM clients
 				LEFT JOIN tokens ON clients.client_id=tokens.client_id
@@ -740,7 +746,7 @@ function settings_content(App $a)
 		$settings_addons = "";
 
 		$r = q("SELECT * FROM `hook` WHERE `hook` = 'addon_settings' ");
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			$settings_addons = L10n::t('No Addon settings configured');
 		}
 
@@ -813,15 +819,15 @@ function settings_content(App $a)
 			$r = null;
 		}
 
-		$mail_server       = ((DBM::is_result($r)) ? $r[0]['server'] : '');
-		$mail_port         = ((DBM::is_result($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
-		$mail_ssl          = ((DBM::is_result($r)) ? $r[0]['ssltype'] : '');
-		$mail_user         = ((DBM::is_result($r)) ? $r[0]['user'] : '');
-		$mail_replyto      = ((DBM::is_result($r)) ? $r[0]['reply_to'] : '');
-		$mail_pubmail      = ((DBM::is_result($r)) ? $r[0]['pubmail'] : 0);
-		$mail_action       = ((DBM::is_result($r)) ? $r[0]['action'] : 0);
-		$mail_movetofolder = ((DBM::is_result($r)) ? $r[0]['movetofolder'] : '');
-		$mail_chk          = ((DBM::is_result($r)) ? $r[0]['last_check'] : NULL_DATE);
+		$mail_server       = ((DBA::isResult($r)) ? $r[0]['server'] : '');
+		$mail_port         = ((DBA::isResult($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
+		$mail_ssl          = ((DBA::isResult($r)) ? $r[0]['ssltype'] : '');
+		$mail_user         = ((DBA::isResult($r)) ? $r[0]['user'] : '');
+		$mail_replyto      = ((DBA::isResult($r)) ? $r[0]['reply_to'] : '');
+		$mail_pubmail      = ((DBA::isResult($r)) ? $r[0]['pubmail'] : 0);
+		$mail_action       = ((DBA::isResult($r)) ? $r[0]['action'] : 0);
+		$mail_movetofolder = ((DBA::isResult($r)) ? $r[0]['movetofolder'] : '');
+		$mail_chk          = ((DBA::isResult($r)) ? $r[0]['last_check'] : NULL_DATE);
 
 
 		$tpl = get_markup_template('settings/connectors.tpl');
@@ -989,8 +995,8 @@ function settings_content(App $a)
 	 * ACCOUNT SETTINGS
 	 */
 
-	$profile = dba::selectFirst('profile', [], ['is-default' => true, 'uid' => local_user()]);
-	if (!DBM::is_result($profile)) {
+	$profile = DBA::selectFirst('profile', [], ['is-default' => true, 'uid' => local_user()]);
+	if (!DBA::isResult($profile)) {
 		notice(L10n::t('Unable to find your profile. Please contact your admin.') . EOL);
 		return;
 	}
@@ -1023,9 +1029,9 @@ function settings_content(App $a)
 
 	// Set the account type to "Community" when the page is a community page but the account type doesn't fit
 	// This is only happening on the first visit after the update
-	if (in_array($a->user['page-flags'], [PAGE_COMMUNITY, PAGE_PRVGROUP]) &&
-		($a->user['account-type'] != ACCOUNT_TYPE_COMMUNITY))
-		$a->user['account-type'] = ACCOUNT_TYPE_COMMUNITY;
+	if (in_array($a->user['page-flags'], [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP]) &&
+		($a->user['account-type'] != Contact::ACCOUNT_TYPE_COMMUNITY))
+		$a->user['account-type'] = Contact::ACCOUNT_TYPE_COMMUNITY;
 
 	$pageset_tpl = get_markup_template('settings/pagetypes.tpl');
 
@@ -1034,46 +1040,46 @@ function settings_content(App $a)
 		'$user' 		=> L10n::t("Personal Page Subtypes"),
 		'$community'		=> L10n::t("Community Forum Subtypes"),
 		'$account_type'		=> $a->user['account-type'],
-		'$type_person'		=> ACCOUNT_TYPE_PERSON,
-		'$type_organisation' 	=> ACCOUNT_TYPE_ORGANISATION,
-		'$type_news'		=> ACCOUNT_TYPE_NEWS,
-		'$type_community' 	=> ACCOUNT_TYPE_COMMUNITY,
+		'$type_person'		=> Contact::ACCOUNT_TYPE_PERSON,
+		'$type_organisation' 	=> Contact::ACCOUNT_TYPE_ORGANISATION,
+		'$type_news'		=> Contact::ACCOUNT_TYPE_NEWS,
+		'$type_community' 	=> Contact::ACCOUNT_TYPE_COMMUNITY,
 
-		'$account_person' 	=> ['account-type', L10n::t('Personal Page'), ACCOUNT_TYPE_PERSON,
+		'$account_person' 	=> ['account-type', L10n::t('Personal Page'), Contact::ACCOUNT_TYPE_PERSON,
 									L10n::t('Account for a personal profile.'),
-									($a->user['account-type'] == ACCOUNT_TYPE_PERSON)],
+									($a->user['account-type'] == Contact::ACCOUNT_TYPE_PERSON)],
 
-		'$account_organisation'	=> ['account-type', L10n::t('Organisation Page'), ACCOUNT_TYPE_ORGANISATION,
+		'$account_organisation'	=> ['account-type', L10n::t('Organisation Page'), Contact::ACCOUNT_TYPE_ORGANISATION,
 									L10n::t('Account for an organisation that automatically approves contact requests as "Followers".'),
-									($a->user['account-type'] == ACCOUNT_TYPE_ORGANISATION)],
+									($a->user['account-type'] == Contact::ACCOUNT_TYPE_ORGANISATION)],
 
-		'$account_news'		=> ['account-type', L10n::t('News Page'), ACCOUNT_TYPE_NEWS,
+		'$account_news'		=> ['account-type', L10n::t('News Page'), Contact::ACCOUNT_TYPE_NEWS,
 									L10n::t('Account for a news reflector that automatically approves contact requests as "Followers".'),
-									($a->user['account-type'] == ACCOUNT_TYPE_NEWS)],
+									($a->user['account-type'] == Contact::ACCOUNT_TYPE_NEWS)],
 
-		'$account_community' 	=> ['account-type', L10n::t('Community Forum'), ACCOUNT_TYPE_COMMUNITY,
+		'$account_community' 	=> ['account-type', L10n::t('Community Forum'), Contact::ACCOUNT_TYPE_COMMUNITY,
 									L10n::t('Account for community discussions.'),
-									($a->user['account-type'] == ACCOUNT_TYPE_COMMUNITY)],
+									($a->user['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY)],
 
-		'$page_normal'		=> ['page-flags', L10n::t('Normal Account Page'), PAGE_NORMAL,
+		'$page_normal'		=> ['page-flags', L10n::t('Normal Account Page'), Contact::PAGE_NORMAL,
 									L10n::t('Account for a regular personal profile that requires manual approval of "Friends" and "Followers".'),
-									($a->user['page-flags'] == PAGE_NORMAL)],
+									($a->user['page-flags'] == Contact::PAGE_NORMAL)],
 
-		'$page_soapbox' 	=> ['page-flags', L10n::t('Soapbox Page'), PAGE_SOAPBOX,
+		'$page_soapbox' 	=> ['page-flags', L10n::t('Soapbox Page'), Contact::PAGE_SOAPBOX,
 									L10n::t('Account for a public profile that automatically approves contact requests as "Followers".'),
-									($a->user['page-flags'] == PAGE_SOAPBOX)],
+									($a->user['page-flags'] == Contact::PAGE_SOAPBOX)],
 
-		'$page_community'	=> ['page-flags', L10n::t('Public Forum'), PAGE_COMMUNITY,
+		'$page_community'	=> ['page-flags', L10n::t('Public Forum'), Contact::PAGE_COMMUNITY,
 									L10n::t('Automatically approves all contact requests.'),
-									($a->user['page-flags'] == PAGE_COMMUNITY)],
+									($a->user['page-flags'] == Contact::PAGE_COMMUNITY)],
 
-		'$page_freelove' 	=> ['page-flags', L10n::t('Automatic Friend Page'), PAGE_FREELOVE,
+		'$page_freelove' 	=> ['page-flags', L10n::t('Automatic Friend Page'), Contact::PAGE_FREELOVE,
 									L10n::t('Account for a popular profile that automatically approves contact requests as "Friends".'),
-									($a->user['page-flags'] == PAGE_FREELOVE)],
+									($a->user['page-flags'] == Contact::PAGE_FREELOVE)],
 
-		'$page_prvgroup' 	=> ['page-flags', L10n::t('Private Forum [Experimental]'), PAGE_PRVGROUP,
+		'$page_prvgroup' 	=> ['page-flags', L10n::t('Private Forum [Experimental]'), Contact::PAGE_PRVGROUP,
 									L10n::t('Requires manual approval of contact requests.'),
-									($a->user['page-flags'] == PAGE_PRVGROUP)],
+									($a->user['page-flags'] == Contact::PAGE_PRVGROUP)],
 
 
 	]);
@@ -1155,7 +1161,7 @@ function settings_content(App $a)
 
 	// Private/public post links for the non-JS ACL form
 	$private_post = 1;
-	if ($_REQUEST['public']) {
+	if (!empty($_REQUEST['public']) && !$_REQUEST['public']) {
 		$private_post = 0;
 	}
 
diff --git a/mod/share.php b/mod/share.php
index f67dd3d20..74de1967b 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,50 +1,57 @@
 <?php
 
 use Friendica\App;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
 
 function share_init(App $a) {
 	$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
+
 	if (!$post_id || !local_user()) {
 		killme();
 	}
 
-	$r = q("SELECT item.*, contact.network FROM `item`
-		INNER JOIN `contact` ON `item`.`contact-id` = `contact`.`id`
-		WHERE `item`.`id` = %d LIMIT 1",
-		intval($post_id)
-	);
-	if (!DBM::is_result($r) || ($r[0]['private'] == 1)) {
+	$fields = ['private', 'body', 'author-name', 'author-link', 'author-avatar',
+		'guid', 'created', 'plink', 'title'];
+	$item = Item::selectFirst($fields, ['id' => $post_id]);
+
+	if (!DBA::isResult($item) || $item['private'] == 1) {
 		killme();
 	}
-	if (strpos($r[0]['body'], "[/share]") !== false) {
-		$pos = strpos($r[0]['body'], "[share");
-		$o = substr($r[0]['body'], $pos);
-	} else {
-		$o = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
 
-		if ($r[0]['title'])
-			$o .= '[b]'.$r[0]['title'].'[/b]'."\n";
-		$o .= $r[0]['body'];
-		$o.= "[/share]";
+	if (strpos($item['body'], "[/share]") !== false) {
+		$pos = strpos($item['body'], "[share");
+		$o = substr($item['body'], $pos);
+	} else {
+		$o = share_header($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
+
+		if ($item['title']) {
+			$o .= '[b]'.$item['title'].'[/b]'."\n";
+		}
+
+		$o .= $item['body'];
+		$o .= "[/share]";
 	}
 
 	echo $o;
 	killme();
 }
 
+/// @TODO Rewrite to handle over whole record array
 function share_header($author, $profile, $avatar, $guid, $posted, $link) {
-	$header = "[share author='".str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $author).
-		"' profile='".str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $profile).
-		"' avatar='".str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $avatar);
+	$header = "[share author='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $author).
+		"' profile='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $profile).
+		"' avatar='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $avatar);
 
 	if ($guid) {
-		$header .= "' guid='".str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $guid);
+		$header .= "' guid='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $guid);
 	}
+
 	if ($posted) {
-		$header .= "' posted='".str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $posted);
+		$header .= "' posted='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $posted);
 	}
-	$header .= "' link='".str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $link)."']";
+
+	$header .= "' link='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $link)."']";
 
 	return $header;
 }
diff --git a/mod/smilies.php b/mod/smilies.php
index a33cbf6ad..ecea3400e 100644
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -8,18 +8,24 @@ use Friendica\Core\System;
 
 /**
  * @param object $a App
- * @return mixed
+ * @return string
  */
 function smilies_content(App $a)
 {
-	if ($a->argv[1] === "json") {
-		$tmp = Smilies::getList();
+	$smilies = Smilies::getList();
+	if (!empty($a->argv[1]) && ($a->argv[1] === "json")) {
 		$results = [];
-		for ($i = 0; $i < count($tmp['texts']); $i++) {
-			$results[] = ['text' => $tmp['texts'][$i], 'icon' => $tmp['icons'][$i]];
+		for ($i = 0; $i < count($smilies['texts']); $i++) {
+			$results[] = ['text' => $smilies['texts'][$i], 'icon' => $smilies['icons'][$i]];
 		}
 		System::jsonExit($results);
 	} else {
-		return Smilies::replace('', true);
+		$s = '<div class="smiley-sample">';
+		for ($x = 0; $x < count($smilies['texts']); $x ++) {
+			$s .= '<dl><dt>' . $smilies['texts'][$x] . '</dt><dd>' . $smilies['icons'][$x] . '</dd></dl>';
+		}
+		$s .= '</div>';
+
+		return $s;
 	}
 }
diff --git a/mod/starred.php b/mod/starred.php
index ce0c8fc09..e75a09674 100644
--- a/mod/starred.php
+++ b/mod/starred.php
@@ -4,39 +4,36 @@
  */
 use Friendica\App;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
 function starred_init(App $a) {
 	$starred = 0;
 	$message_id = null;
 
-	if (! local_user()) {
+	if (!local_user()) {
 		killme();
 	}
 	if ($a->argc > 1) {
 		$message_id = intval($a->argv[1]);
 	}
-	if (! $message_id) {
+	if (!$message_id) {
 		killme();
 	}
 
-	$r = q("SELECT `starred` FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
-		intval(local_user()),
-		intval($message_id)
-	);
-	if (! DBM::is_result($r)) {
+	$item = Item::selectFirstForUser(local_user(), ['starred'], ['uid' => local_user(), 'id' => $message_id]);
+	if (!DBA::isResult($item)) {
 		killme();
 	}
 
-	if (! intval($r[0]['starred'])) {
+	if (!intval($item['starred'])) {
 		$starred = 1;
 	}
 
 	Item::update(['starred' => $starred], ['id' => $message_id]);
 
 	// See if we've been passed a return path to redirect to
-	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
+	$return_path = (x($_REQUEST,'return') ? $_REQUEST['return'] : '');
 	if ($return_path) {
 		$rand = '_=' . time();
 		if (strpos($return_path, '?')) {
diff --git a/mod/statistics_json.php b/mod/statistics_json.php
index c035c1c05..da95d5379 100644
--- a/mod/statistics_json.php
+++ b/mod/statistics_json.php
@@ -17,10 +17,10 @@ function statistics_json_init(App $a) {
 	}
 
 	$statistics = [
-		"name" => $a->config["sitename"],
+		"name" => Config::get('config', 'sitename'),
 		"network" => FRIENDICA_PLATFORM,
 		"version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION,
-		"registrations_open" => ($a->config['register_policy'] != 0),
+		"registrations_open" => intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED,
 		"total_users" => Config::get('nodeinfo', 'total_users'),
 		"active_users_halfyear" => Config::get('nodeinfo', 'active_users_halfyear'),
 		"active_users_monthly" => Config::get('nodeinfo', 'active_users_monthly'),
@@ -32,7 +32,6 @@ function statistics_json_init(App $a) {
 	$statistics["services"]["blogger"] = Addon::isEnabled("blogger");
 	$statistics["services"]["buffer"] = Addon::isEnabled("buffer");
 	$statistics["services"]["dreamwidth"] = Addon::isEnabled("dwpost");
-	$statistics["services"]["facebook"] = Addon::isEnabled("fbpost");
 	$statistics["services"]["gnusocial"] = Addon::isEnabled("statusnet");
 	$statistics["services"]["googleplus"] = Addon::isEnabled("gpluspost");
 	$statistics["services"]["libertree"] = Addon::isEnabled("libertree");
@@ -46,7 +45,6 @@ function statistics_json_init(App $a) {
 	$statistics["blogger"] = $statistics["services"]["blogger"];
 	$statistics["buffer"] = $statistics["services"]["buffer"];
 	$statistics["dreamwidth"] = $statistics["services"]["dreamwidth"];
-	$statistics["facebook"] = $statistics["services"]["facebook"];
 	$statistics["gnusocial"] = $statistics["services"]["gnusocial"];
 	$statistics["googleplus"] = $statistics["services"]["googleplus"];
 	$statistics["libertree"] = $statistics["services"]["libertree"];
diff --git a/mod/subthread.php b/mod/subthread.php
index c858f2d1f..1153f2147 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -6,7 +6,7 @@ use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
 require_once 'include/security.php';
@@ -14,7 +14,7 @@ require_once 'include/items.php';
 
 function subthread_content(App $a) {
 
-	if(! local_user() && ! remote_user()) {
+	if (!local_user() && !remote_user()) {
 		return;
 	}
 
@@ -22,37 +22,30 @@ function subthread_content(App $a) {
 
 	$item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
 
-	$r = q("SELECT * FROM `item` WHERE `parent` = '%s' OR `parent-uri` = '%s' and parent = id LIMIT 1",
-		dbesc($item_id),
-		dbesc($item_id)
-	);
+	$condition = ["`parent` = ? OR `parent-uri` = ? AND `parent` = `id`", $item_id, $item_id];
+	$item = Item::selectFirst([], $condition);
 
-	if(! $item_id || (! DBM::is_result($r))) {
+	if (empty($item_id) || !DBA::isResult($item)) {
 		logger('subthread: no item ' . $item_id);
 		return;
 	}
 
-	$item = $r[0];
-
 	$owner_uid = $item['uid'];
 
-	if(! can_write_wall($owner_uid)) {
+	if (!can_write_wall($owner_uid)) {
 		return;
 	}
 
 	$remote_owner = null;
 
-	if(! $item['wall']) {
+	if (!$item['wall']) {
 		// The top level post may have been written by somebody on another system
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($item['contact-id']),
-			intval($item['uid'])
-		);
-		if (! DBM::is_result($r)) {
+		$contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'uid' => $item['uid']]);
+		if (!DBA::isResult($contact)) {
 			return;
 		}
-		if (! $r[0]['self']) {
-			$remote_owner = $r[0];
+		if (!$contact['self']) {
+			$remote_owner = $contact;
 		}
 	}
 
@@ -63,36 +56,33 @@ function subthread_content(App $a) {
 		WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
 		intval($owner_uid)
 	);
-	if (DBM::is_result($r))
-		$owner = $r[0];
 
-	if (! $owner) {
+	if (DBA::isResult($r)) {
+		$owner = $r[0];
+	}
+
+	if (!$owner) {
 		logger('like: no owner');
 		return;
 	}
 
-	if (! $remote_owner)
+	if (!$remote_owner) {
 		$remote_owner = $owner;
-
+	}
 
 	$contact = null;
 	// This represents the person posting
 
-	if ((local_user()) && (local_user() == $owner_uid)) {
+	if (local_user() && (local_user() == $owner_uid)) {
 		$contact = $owner;
 	} else {
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($_SESSION['visitor_id']),
-			intval($owner_uid)
-		);
-		if (DBM::is_result($r))
-			$contact = $r[0];
-	}
-	if (! $contact) {
-		return;
+		$contact = DBA::selectFirst('contact', [], ['id' => $_SESSION['visitor_id'], 'uid' => $owner_uid]);
+		if (!DBA::isResult($contact)) {
+			return;
+		}
 	}
 
-	$uri = item_new_uri($a->get_hostname(),$owner_uid);
+	$uri = Item::newURI($owner_uid);
 
 	$post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
@@ -112,20 +102,19 @@ function subthread_content(App $a) {
 EOT;
 	$bodyverb = L10n::t('%1$s is following %2$s\'s %3$s');
 
-	if (! isset($bodyverb)) {
+	if (!isset($bodyverb)) {
 		return;
 	}
 
 	$arr = [];
 
-	$arr['guid'] = get_guid(32);
+	$arr['guid'] = System::createGUID(32);
 	$arr['uri'] = $uri;
 	$arr['uid'] = $owner_uid;
 	$arr['contact-id'] = $contact['id'];
-	$arr['type'] = 'activity';
 	$arr['wall'] = $item['wall'];
 	$arr['origin'] = 1;
-	$arr['gravity'] = GRAVITY_LIKE;
+	$arr['gravity'] = GRAVITY_ACTIVITY;
 	$arr['parent'] = $item['id'];
 	$arr['parent-uri'] = $item['uri'];
 	$arr['thr-parent'] = $item['uri'];
@@ -164,5 +153,3 @@ EOT;
 	killme();
 
 }
-
-
diff --git a/mod/suggest.php b/mod/suggest.php
index 5e8dcc5fb..81030842d 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -2,17 +2,19 @@
 /**
  * @file mod/suggest.php
  */
+
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Widget;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
-use Friendica\Model\Profile;
+use Friendica\Util\Proxy as ProxyUtils;
 
-function suggest_init(App $a) {
+function suggest_init(App $a)
+{
 	if (! local_user()) {
 		return;
 	}
@@ -45,17 +47,16 @@ function suggest_init(App $a) {
 		}
 		// Now check how the user responded to the confirmation query
 		if (!$_REQUEST['canceled']) {
-			dba::insert('gcign', ['uid' => local_user(), 'gcid' => $_GET['ignore']]);
+			DBA::insert('gcign', ['uid' => local_user(), 'gcid' => $_GET['ignore']]);
 		}
 	}
 
 }
 
-function suggest_content(App $a) {
-
-	require_once("mod/proxy.php");
-
+function suggest_content(App $a)
+{
 	$o = '';
+
 	if (! local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
@@ -69,17 +70,19 @@ function suggest_content(App $a) {
 
 	$r = GContact::suggestionQuery(local_user());
 
-	if (! DBM::is_result($r)) {
+	if (! DBA::isResult($r)) {
 		$o .= L10n::t('No suggestions available. If this is a new site, please try again in 24 hours.');
 		return $o;
 	}
 
+	$id = 0;
+
 	foreach ($r as $rr) {
 
 		$connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
 		$ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id'];
 		$photo_menu = [
-			'profile' => [L10n::t("View Profile"), Profile::zrl($rr["url"])],
+			'profile' => [L10n::t("View Profile"), Contact::magicLink($rr["url"])],
 			'follow' => [L10n::t("Connect/Follow"), $connlnk],
 			'hide' => [L10n::t('Ignore/Hide'), $ignlnk]
 		];
@@ -87,11 +90,11 @@ function suggest_content(App $a) {
 		$contact_details = Contact::getDetailsByURL($rr["url"], local_user(), $rr);
 
 		$entry = [
-			'url' => Profile::zrl($rr['url']),
+			'url' => Contact::magicLink($rr['url']),
 			'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
 			'img_hover' => $rr['url'],
 			'name' => $contact_details['name'],
-			'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
+			'thumb' => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
 			'details'       => $contact_details['location'],
 			'tags'          => $contact_details['keywords'],
 			'about'         => $contact_details['about'],
diff --git a/mod/tagger.php b/mod/tagger.php
index 16195cc33..959394c07 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -7,7 +7,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
 require_once 'include/security.php';
@@ -15,7 +15,7 @@ require_once 'include/items.php';
 
 function tagger_content(App $a) {
 
-	if(! local_user() && ! remote_user()) {
+	if (!local_user() && !remote_user()) {
 		return;
 	}
 
@@ -23,25 +23,22 @@ function tagger_content(App $a) {
 	// no commas allowed
 	$term = str_replace([',',' '],['','_'],$term);
 
-	if(! $term)
+	if (!$term) {
 		return;
+	}
 
 	$item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
 
 	logger('tagger: tag ' . $term . ' item ' . $item_id);
 
 
-	$r = q("SELECT * FROM `item` WHERE `id` = '%s' LIMIT 1",
-		dbesc($item_id)
-	);
+	$item = Item::selectFirst([], ['id' => $item_id]);
 
-	if(! $item_id || (! DBM::is_result($r))) {
+	if (!$item_id || !DBA::isResult($item)) {
 		logger('tagger: no item ' . $item_id);
 		return;
 	}
 
-	$item = $r[0];
-
 	$owner_uid = $item['uid'];
 	$owner_nick = '';
 	$blocktags = 0;
@@ -49,25 +46,26 @@ function tagger_content(App $a) {
 	$r = q("select `nickname`,`blocktags` from user where uid = %d limit 1",
 		intval($owner_uid)
 	);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$owner_nick = $r[0]['nickname'];
 		$blocktags = $r[0]['blocktags'];
 	}
 
-	if(local_user() != $owner_uid)
+	if (local_user() != $owner_uid) {
 		return;
+	}
 
 	$r = q("select * from contact where self = 1 and uid = %d limit 1",
 		intval(local_user())
 	);
-	if (DBM::is_result($r))
+	if (DBA::isResult($r)) {
 			$contact = $r[0];
-	else {
+	} else {
 		logger('tagger: no contact_id');
 		return;
 	}
 
-	$uri = item_new_uri($a->get_hostname(),$owner_uid);
+	$uri = Item::newURI($owner_uid);
 	$xterm = xmlify($term);
 	$post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
 	$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
@@ -109,7 +107,7 @@ EOT;
 
 	$bodyverb = L10n::t('%1$s tagged %2$s\'s %3$s with %4$s');
 
-	if (! isset($bodyverb)) {
+	if (!isset($bodyverb)) {
 		return;
 	}
 
@@ -117,11 +115,10 @@ EOT;
 
 	$arr = [];
 
-	$arr['guid'] = get_guid(32);
+	$arr['guid'] = System::createGUID(32);
 	$arr['uri'] = $uri;
 	$arr['uid'] = $owner_uid;
 	$arr['contact-id'] = $contact['id'];
-	$arr['type'] = 'activity';
 	$arr['wall'] = $item['wall'];
 	$arr['gravity'] = GRAVITY_COMMENT;
 	$arr['parent'] = $item['id'];
@@ -159,43 +156,43 @@ EOT;
 	}
 
 	$term_objtype = ($item['resource-id'] ? TERM_OBJ_PHOTO : TERM_OBJ_POST);
-        $t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
-                intval($item['id']),
-                dbesc($term)
-        );
-	if((! $blocktags) && $t[0]['tcount']==0 ) {
+
+	$t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
+		intval($item['id']),
+		DBA::escape($term)
+	);
+
+	if (!$blocktags && $t[0]['tcount'] == 0) {
 		q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
 		   intval($item['id']),
 		   $term_objtype,
 		   TERM_HASHTAG,
-		   dbesc($term),
-		   dbesc(System::baseUrl() . '/search?tag=' . $term),
+		   DBA::escape($term),
+		   DBA::escape(System::baseUrl() . '/search?tag=' . $term),
 		   intval($owner_uid)
 		);
 	}
 
 	// if the original post is on this site, update it.
+	$original_item = Item::selectFirst(['tag', 'id', 'uid'], ['origin' => true, 'uri' => $item['uri']]);
+	if (DBA::isResult($original_item)) {
+		$x = q("SELECT `blocktags` FROM `user` WHERE `uid`=%d LIMIT 1",
+			intval($original_item['uid'])
+		);
+		$t = q("SELECT COUNT(`tid`) AS `tcount` FROM `term` WHERE `oid`=%d AND `term`='%s'",
+			intval($original_item['id']),
+			DBA::escape($term)
+		);
 
-	$r = q("select `tag`,`id`,`uid` from item where `origin` = 1 AND `uri` = '%s' LIMIT 1",
-		dbesc($item['uri'])
-	);
-	if (DBM::is_result($r)) {
-		$x = q("SELECT `blocktags` FROM `user` WHERE `uid` = %d limit 1",
-			intval($r[0]['uid'])
-		);
-		$t = q("SELECT count(tid) as tcount FROM term WHERE oid=%d AND term='%s'",
-			intval($r[0]['id']),
-			dbesc($term)
-		);
-		if(count($x) && !$x[0]['blocktags'] && $t[0]['tcount']==0){
-			q("INSERT INTO term (oid, otype, type, term, url, uid) VALUE (%d, %d, %d, '%s', '%s', %d)",
-	                   intval($r[0]['id']),
-	                   $term_objtype,
-	                   TERM_HASHTAG,
-	                   dbesc($term),
-	                   dbesc(System::baseUrl() . '/search?tag=' . $term),
-	                   intval($owner_uid)
-	                );
+		if (DBA::isResult($x) && !$x[0]['blocktags'] && $t[0]['tcount'] == 0){
+			q("INSERT INTO term (`oid`, `otype`, `type`, `term`, `url`, `uid`) VALUE (%d, %d, %d, '%s', '%s', %d)",
+				intval($original_item['id']),
+				$term_objtype,
+				TERM_HASHTAG,
+				DBA::escape($term),
+				DBA::escape(System::baseUrl() . '/search?tag=' . $term),
+				intval($owner_uid)
+			);
 		}
 	}
 
diff --git a/mod/tagrm.php b/mod/tagrm.php
index b9991d68d..db0b76579 100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -7,32 +7,28 @@ use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
-function tagrm_post(App $a) {
-
+function tagrm_post(App $a)
+{
 	if (!local_user()) {
 		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
 	}
 
-	if ((x($_POST,'submit')) && ($_POST['submit'] === L10n::t('Cancel'))) {
+	if (x($_POST,'submit') && ($_POST['submit'] === L10n::t('Cancel'))) {
 		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
 	}
 
-	$tag =  ((x($_POST,'tag'))  ? hex2bin(notags(trim($_POST['tag']))) : '');
-	$item = ((x($_POST,'item')) ? intval($_POST['item'])               : 0 );
+	$tag =  (x($_POST,'tag')  ? hex2bin(notags(trim($_POST['tag']))) : '');
+	$item_id = (x($_POST,'item') ? intval($_POST['item'])               : 0);
 
-	$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		intval($item),
-		intval(local_user())
-	);
-
-	if (!DBM::is_result($r)) {
+	$item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
+	if (!DBA::isResult($item)) {
 		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
 	}
 
-	$arr = explode(',', $r[0]['tag']);
+	$arr = explode(',', $item['tag']);
 	for ($x = 0; $x < count($arr); $x ++) {
 		if ($arr[$x] === $tag) {
 			unset($arr[$x]);
@@ -42,7 +38,7 @@ function tagrm_post(App $a) {
 
 	$tag_str = implode(',',$arr);
 
-	Item::update(['tag' => $tag_str], ['id' => $item]);
+	Item::update(['tag' => $tag_str], ['id' => $item_id]);
 
 	info(L10n::t('Tag removed') . EOL );
 	goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
@@ -52,8 +48,8 @@ function tagrm_post(App $a) {
 
 
 
-function tagrm_content(App $a) {
-
+function tagrm_content(App $a)
+{
 	$o = '';
 
 	if (!local_user()) {
@@ -61,22 +57,18 @@ function tagrm_content(App $a) {
 		// NOTREACHED
 	}
 
-	$item = (($a->argc > 1) ? intval($a->argv[1]) : 0);
-	if (!$item) {
+	$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
+	if (!$item_id) {
 		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
 		// NOTREACHED
 	}
 
-	$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		intval($item),
-		intval(local_user())
-	);
-
-	if (!DBM::is_result($r)) {
+	$item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]);
+	if (!DBA::isResult($item)) {
 		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
 	}
 
-	$arr = explode(',', $r[0]['tag']);
+	$arr = explode(',', $item['tag']);
 
 	if (!count($arr)) {
 		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
@@ -87,7 +79,7 @@ function tagrm_content(App $a) {
 	$o .= '<p id="tag-remove-desc">' . L10n::t('Select a tag to remove: ') . '</p>';
 
 	$o .= '<form id="tagrm" action="tagrm" method="post" >';
-	$o .= '<input type="hidden" name="item" value="' . $item . '" />';
+	$o .= '<input type="hidden" name="item" value="' . $item_id . '" />';
 	$o .= '<ul>';
 
 	foreach ($arr as $x) {
@@ -100,5 +92,4 @@ function tagrm_content(App $a) {
 	$o .= '</form>';
 
 	return $o;
-
 }
diff --git a/mod/uexport.php b/mod/uexport.php
index c1b3dd1e4..993e39802 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -6,7 +6,7 @@ use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 function uexport_init(App $a) {
 	if (!local_user()) {
@@ -57,7 +57,7 @@ function uexport_content(App $a) {
 function _uexport_multirow($query) {
 	$result = [];
 	$r = q($query);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
 			$p = [];
 			foreach ($rr as $k => $v) {
@@ -72,7 +72,7 @@ function _uexport_multirow($query) {
 function _uexport_row($query) {
 	$result = [];
 	$r = q($query);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
 			foreach ($rr as $k => $v) {
 				$result[$k] = $v;
@@ -145,7 +145,7 @@ function uexport_all(App $a) {
 	$r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ",
 		intval(local_user())
 	);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$total = $r[0]['total'];
 	}
 	// chunk the output to avoid exhausting memory
diff --git a/mod/uimport.php b/mod/uimport.php
index 7d6805e7c..704439216 100644
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -11,39 +11,21 @@ use Friendica\Core\UserImport;
 
 function uimport_post(App $a)
 {
-	switch ($a->config['register_policy']) {
-		case REGISTER_OPEN:
-			$blocked = 0;
-			$verified = 1;
-			break;
-
-		case REGISTER_APPROVE:
-			$blocked = 1;
-			$verified = 0;
-			break;
-
-		default:
-		case REGISTER_CLOSED:
-			if ((!x($_SESSION, 'authenticated') && (!x($_SESSION, 'administrator')))) {
-				notice(L10n::t('Permission denied.') . EOL);
-				return;
-			}
-			$blocked = 1;
-			$verified = 0;
-			break;
+	if ((Config::get('config', 'register_policy') != REGISTER_OPEN) && !is_site_admin()) {
+		notice(L10n::t('Permission denied.') . EOL);
+		return;
 	}
 
-	if (x($_FILES, 'accountfile')) {
-		/// @TODO Pass $blocked / $verified, send email to admin on REGISTER_APPROVE
+	if (!empty($_FILES['accountfile'])) {
 		UserImport::importAccount($a, $_FILES['accountfile']);
 		return;
 	}
 }
 
-function uimport_content(App $a) {
-
-	if ((!local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
-		notice("Permission denied." . EOL);
+function uimport_content(App $a)
+{
+	if ((Config::get('config', 'register_policy') != REGISTER_OPEN) && !is_site_admin()) {
+		notice(L10n::t('User imports on closed servers can only be done by an administrator.') . EOL);
 		return;
 	}
 
diff --git a/mod/unfollow.php b/mod/unfollow.php
index a26557a9a..b80263a3e 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -2,59 +2,75 @@
 /**
  * @file mod/unfollow.php
  */
+
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Model\User;
 
-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']);
+	if (!empty($_REQUEST['cancel'])) {
+		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` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
-			$uid, CONTACT_IS_FRIEND, normalise_link($url),
-			normalise_link($url), $url, NETWORK_STATUSNET];
-	$contact = dba::selectFirst('contact', [], $condition);
+	$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);
 
-	if (!DBM::is_result($contact)) {
-		notice(L10n::t("Contact wasn't found or can't be unfollowed."));
-	} else {
-		if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_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 (DBM::is_result($r)) {
-				Contact::terminateFriendship($r[0], $contact);
-			}
-		}
-		dba::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]);
-
-		info(L10n::t('Contact unfollowed').EOL);
-		goaway(System::baseUrl().'/contacts/'.$contact['id']);
+	if (!DBA::isResult($contact)) {
+		notice(L10n::t("You aren't following this contact."));
+		goaway($return_url);
+		// NOTREACHED
 	}
-	goaway($return_url);
+
+	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+		notice(L10n::t('Unfollowing is currently not supported by your network.'));
+		goaway($return_url);
+		// NOTREACHED
+	}
+
+	$dissolve = ($contact['rel'] == Contact::SHARING);
+
+	$owner = User::getOwnerDataById($uid);
+	if ($owner) {
+		Contact::terminateFriendship($owner, $contact, $dissolve);
+	}
+
+	// Sharing-only contacts get deleted as there no relationship any more
+	if ($dissolve) {
+		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
 }
 
 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
 	}
@@ -62,77 +78,74 @@ 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];
 
-	$condition = ["`uid` = ? AND `rel` = ? AND (`nurl` = ? OR `alias` = ? OR `alias` = ?) AND `network` != ?",
-			local_user(), CONTACT_IS_FRIEND, normalise_link($url),
-			normalise_link($url), $url, NETWORK_STATUSNET];
-	$contact = dba::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);
+	$contact = DBA::selectFirst('contact', ['url', 'network', 'addr', 'name'], $condition);
 
-	if (!DBM::is_result($contact)) {
-		notice(L10n::t("You aren't a friend of this contact.").EOL);
-		$submit = "";
+	if (!DBA::isResult($contact)) {
+		notice(L10n::t("You aren't following this contact."));
+		goaway('contacts');
 		// NOTREACHED
 	}
 
-	if (!in_array($contact['network'], [NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_DFRN])) {
-		notice(L10n::t("Unfollowing is currently not supported by your network.").EOL);
-		$submit = "";
+	if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
+		notice(L10n::t('Unfollowing is currently not supported by your network.'));
+		goaway('contacts/' . $contact['id']);
 		// 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' => Profile::zrl($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;
 }
diff --git a/mod/update_community.php b/mod/update_community.php
index d64ea5d70..088da0143 100644
--- a/mod/update_community.php
+++ b/mod/update_community.php
@@ -19,10 +19,6 @@ function update_community_content(App $a) {
 		$text = '';
 	}
 
-	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
-	$replace = "<img\${1} dst=\"\${2}\"";
-	$text = preg_replace($pattern, $replace, $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";
diff --git a/mod/update_contacts.php b/mod/update_contacts.php
new file mode 100644
index 000000000..863542e66
--- /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();
+}
diff --git a/mod/update_display.php b/mod/update_display.php
index 48df9797d..4b6d26cb7 100644
--- a/mod/update_display.php
+++ b/mod/update_display.php
@@ -19,9 +19,6 @@ function update_display_content(App $a)
 	echo "<section>";
 
 	$text = display_content($a, true, $profile_uid);
-	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
-	$replace = "<img\${1} dst=\"\${2}\"";
-	$text = preg_replace($pattern, $replace, $text);
 
 	if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
 		$replace = "<br />" . L10n::t("[Embedded content - reload page to view]") . "<br />";
diff --git a/mod/update_network.php b/mod/update_network.php
index 962701627..11dfc5e03 100644
--- a/mod/update_network.php
+++ b/mod/update_network.php
@@ -12,6 +12,10 @@ require_once "mod/network.php";
 
 function update_network_content(App $a)
 {
+	if (!isset($_GET['p']) || !isset($_GET['item'])) {
+		killme();
+	}
+
 	$profile_uid = intval($_GET['p']);
 	$parent = intval($_GET['item']);
 
@@ -25,10 +29,6 @@ function update_network_content(App $a)
 		$text = "";
 	}
 
-	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
-	$replace = "<img\${1} dst=\"\${2}\"";
-	$text = preg_replace($pattern, $replace, $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";
diff --git a/mod/update_notes.php b/mod/update_notes.php
index 892e71d78..7db60e78e 100644
--- a/mod/update_notes.php
+++ b/mod/update_notes.php
@@ -32,10 +32,6 @@ function update_notes_content(App $a) {
 
 	$text = notes_content($a, $profile_uid);
 
-	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
-	$replace = "<img\${1} dst=\"\${2}\"";
-	$text = preg_replace($pattern, $replace, $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";
diff --git a/mod/update_profile.php b/mod/update_profile.php
index 1a05130e0..984fd7949 100644
--- a/mod/update_profile.php
+++ b/mod/update_profile.php
@@ -31,10 +31,6 @@ function update_profile_content(App $a) {
 
 	$text = profile_content($a, $profile_uid);
 
-	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
-	$replace = "<img\${1} dst=\"\${2}\"";
-	$text = preg_replace($pattern, $replace, $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";
diff --git a/mod/videos.php b/mod/videos.php
index 0dd653e91..e00df10a2 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -8,25 +8,23 @@ use Friendica\Content\Nav;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
-use Friendica\Model\Term;
 use Friendica\Protocol\DFRN;
-use Friendica\Util\DateTimeFormat;
 
 require_once 'include/items.php';
 require_once 'include/security.php';
 
-function videos_init(App $a) {
-
-	if($a->argc > 1)
+function videos_init(App $a)
+{
+	if ($a->argc > 1) {
 		DFRN::autoRedir($a, $a->argv[1]);
+	}
 
-	if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
+	if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
 		return;
 	}
 
@@ -34,14 +32,15 @@ function videos_init(App $a) {
 
 	$o = '';
 
-	if($a->argc > 1) {
+	if ($a->argc > 1) {
 		$nick = $a->argv[1];
 		$user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
-			dbesc($nick)
+			DBA::escape($nick)
 		);
 
-		if(! count($user))
+		if (!DBA::isResult($user)) {
 			return;
+		}
 
 		$a->data['user'] = $user[0];
 		$a->profile_uid = $user[0]['uid'];
@@ -60,7 +59,7 @@ function videos_init(App $a) {
 			'$pdesc' => defaults($profile, 'pdesc', ''),
 		]);
 
-
+		/// @TODO Old-lost code?
 		/*$sql_extra = permissions_sql($a->data['user']['uid']);
 
 		$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra order by created desc",
@@ -70,7 +69,7 @@ function videos_init(App $a) {
 		if(count($albums)) {
 			$a->data['albums'] = $albums;
 
-			$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
+			$albums_visible = ((intval($a->data['user']['hidewall']) && (!local_user()) && (!remote_user())) ? false : true);
 
 			if($albums_visible) {
 				$o .= '<div id="sidebar-photos-albums" class="widget">';
@@ -82,7 +81,7 @@ function videos_init(App $a) {
 					// don't show contact photos. We once translated this name, but then you could still access it under
 					// a different language setting. Now we store the name in English and check in English (and translated for legacy albums).
 
-					if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === L10n::t('Contact Photos')))
+					if((!strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === L10n::t('Contact Photos')))
 						continue;
 					$o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>';
 				}
@@ -95,10 +94,12 @@ function videos_init(App $a) {
 			$o .= '</div>';
 		}*/
 
-		if(! x($a->page,'aside'))
+		// If not there, create 'aside' empty
+		if (!isset($a->page['aside'])) {
 			$a->page['aside'] = '';
-		$a->page['aside'] .= $vcard_widget;
+		}
 
+		$a->page['aside'] .= $vcard_widget;
 
 		$tpl = get_markup_template("videos_head.tpl");
 		$a->page['htmlhead'] .= replace_macros($tpl,[
@@ -115,31 +116,29 @@ function videos_init(App $a) {
 	return;
 }
 
-
-
-function videos_post(App $a) {
-
+function videos_post(App $a)
+{
 	$owner_uid = $a->data['user']['uid'];
 
 	if (local_user() != $owner_uid) {
 		goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
 	}
 
-	if (($a->argc == 2) && x($_POST,'delete') && x($_POST, 'id')) {
-
+	if (($a->argc == 2) && !empty($_POST['delete']) && !empty($_POST['id'])) {
 		// Check if we should do HTML-based delete confirmation
-		if (!x($_REQUEST,'confirm')) {
-			if (x($_REQUEST,'canceled')) {
+		if (empty($_REQUEST['confirm'])) {
+			if (!empty($_REQUEST['canceled'])) {
 				goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
 			}
 
 			$drop_url = $a->query_string;
+
 			$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [
 				'$method' => 'post',
 				'$message' => L10n::t('Do you really want to delete this video?'),
 				'$extra_inputs' => [
-					['name'=>'id', 'value'=> $_POST['id']],
-					['name'=>'delete', 'value'=>'x']
+					['name' => 'id'    , 'value' => $_POST['id']],
+					['name' => 'delete', 'value' => 'x']
 				],
 				'$confirm' => L10n::t('Delete Video'),
 				'$confirm_url' => $drop_url,
@@ -147,7 +146,9 @@ function videos_post(App $a) {
 				'$cancel' => L10n::t('Cancel'),
 
 			]);
+
 			$a->error = 1; // Set $a->error so the other module functions don't execute
+
 			return;
 		}
 
@@ -155,20 +156,21 @@ function videos_post(App $a) {
 
 		$r = q("SELECT `id`  FROM `attach` WHERE `uid` = %d AND `id` = '%s' LIMIT 1",
 			intval(local_user()),
-			dbesc($video_id)
+			DBA::escape($video_id)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'",
 				intval(local_user()),
-				dbesc($video_id)
+				DBA::escape($video_id)
 			);
+
 			$i = q("SELECT `id` FROM `item` WHERE `attach` like '%%attach/%s%%' AND `uid` = %d LIMIT 1",
-				dbesc($video_id),
+				DBA::escape($video_id),
 				intval(local_user())
 			);
 
-			if (DBM::is_result($i)) {
+			if (DBA::isResult($i)) {
 				Item::deleteForUser(['id' => $i[0]['id']], local_user());
 			}
 		}
@@ -178,13 +180,10 @@ function videos_post(App $a) {
 	}
 
 	goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
-
 }
 
-
-
-function videos_content(App $a) {
-
+function videos_content(App $a)
+{
 	// URLs (most aren't currently implemented):
 	// videos/name
 	// videos/name/upload
@@ -195,15 +194,15 @@ function videos_content(App $a) {
 	// videos/name/video/xxxxx/edit
 
 
-	if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
+	if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
 		notice(L10n::t('Public access denied.') . EOL);
 		return;
 	}
 
-	require_once('include/security.php');
-	require_once('include/conversation.php');
+	require_once 'include/security.php';
+	require_once 'include/conversation.php';
 
-	if(! x($a->data,'user')) {
+	if (empty($a->data['user'])) {
 		notice(L10n::t('No videos selected') . EOL );
 		return;
 	}
@@ -215,25 +214,24 @@ function videos_content(App $a) {
 	//
 	// Parse arguments
 	//
-
-	if($a->argc > 3) {
+	if ($a->argc > 3) {
 		$datatype = $a->argv[2];
 		$datum = $a->argv[3];
-	}
-	elseif(($a->argc > 2) && ($a->argv[2] === 'upload'))
+	} elseif(($a->argc > 2) && ($a->argv[2] === 'upload')) {
 		$datatype = 'upload';
-	else
+	} else {
 		$datatype = 'summary';
+	}
 
-	if($a->argc > 4)
+	if ($a->argc > 4) {
 		$cmd = $a->argv[4];
-	else
+	} else {
 		$cmd = 'view';
+	}
 
 	//
 	// Setup permissions structures
 	//
-
 	$can_post       = false;
 	$visitor        = 0;
 	$contact        = null;
@@ -242,32 +240,31 @@ function videos_content(App $a) {
 
 	$owner_uid = $a->data['user']['uid'];
 
-	$community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
+	$community_page = (($a->data['user']['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
 
-	if((local_user()) && (local_user() == $owner_uid))
+	if ((local_user()) && (local_user() == $owner_uid)) {
 		$can_post = true;
-	else {
-		if($community_page && remote_user()) {
-			if(is_array($_SESSION['remote'])) {
-				foreach($_SESSION['remote'] as $v) {
-					if($v['uid'] == $owner_uid) {
-						$contact_id = $v['cid'];
-						break;
-					}
+	} elseif ($community_page && remote_user()) {
+		if (!empty($_SESSION['remote'])) {
+			foreach ($_SESSION['remote'] as $v) {
+				if ($v['uid'] == $owner_uid) {
+					$contact_id = $v['cid'];
+					break;
 				}
 			}
-			if($contact_id) {
+		}
 
-				$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
-					intval($contact_id),
-					intval($owner_uid)
-				);
-				if (DBM::is_result($r)) {
-					$can_post = true;
-					$contact = $r[0];
-					$remote_contact = true;
-					$visitor = $contact_id;
-				}
+		if ($contact_id > 0) {
+			$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+				intval($contact_id),
+				intval($owner_uid)
+			);
+
+			if (DBA::isResult($r)) {
+				$can_post = true;
+				$contact = $r[0];
+				$remote_contact = true;
+				$visitor = $contact_id;
 			}
 		}
 	}
@@ -275,9 +272,10 @@ function videos_content(App $a) {
 	$groups = [];
 
 	// perhaps they're visiting - but not a community page, so they wouldn't have write access
-	if(remote_user() && (! $visitor)) {
+	if (remote_user() && (!$visitor)) {
 		$contact_id = 0;
-		if(is_array($_SESSION['remote'])) {
+
+		if (!empty($_SESSION['remote'])) {
 			foreach($_SESSION['remote'] as $v) {
 				if($v['uid'] == $owner_uid) {
 					$contact_id = $v['cid'];
@@ -285,27 +283,27 @@ function videos_content(App $a) {
 				}
 			}
 		}
-		if($contact_id) {
+
+		if ($contact_id > 0) {
 			$groups = Group::getIdsByContactId($contact_id);
 			$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
 				intval($contact_id),
 				intval($owner_uid)
 			);
-			if (DBM::is_result($r)) {
+
+			if (DBA::isResult($r)) {
 				$contact = $r[0];
 				$remote_contact = true;
 			}
 		}
 	}
 
-	if(! $remote_contact) {
-		if(local_user()) {
-			$contact_id = $_SESSION['cid'];
-			$contact = $a->contact;
-		}
+	if (!$remote_contact && local_user()) {
+		$contact_id = $_SESSION['cid'];
+		$contact = $a->contact;
 	}
 
-	if($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (! $remote_contact)) {
+	if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (!$remote_contact)) {
 		notice(L10n::t('Access to this item is restricted.') . EOL);
 		return;
 	}
@@ -321,24 +319,20 @@ function videos_content(App $a) {
 	//
 	// dispatch request
 	//
-
-
-	if($datatype === 'upload') {
+	if ($datatype === 'upload') {
 		return; // no uploading for now
 
 		// DELETED -- look at mod/photos.php if you want to implement
 	}
 
-	if($datatype === 'album') {
-
+	if ($datatype === 'album') {
 		return; // no albums for now
 
 		// DELETED -- look at mod/photos.php if you want to implement
 	}
 
 
-	if($datatype === 'video') {
-
+	if ($datatype === 'video') {
 		return; // no single video view for now
 
 		// DELETED -- look at mod/photos.php if you want to implement
@@ -351,7 +345,8 @@ function videos_content(App $a) {
 		$sql_extra GROUP BY hash",
 		intval($a->data['user']['uid'])
 	);
-	if (DBM::is_result($r)) {
+
+	if (DBA::isResult($r)) {
 		$a->set_pager_total(count($r));
 		$a->set_pager_itemspage(20);
 	}
@@ -366,17 +361,18 @@ function videos_content(App $a) {
 		intval($a->pager['itemspage'])
 	);
 
-
-
 	$videos = [];
-	if (DBM::is_result($r)) {
+
+	if (DBA::isResult($r)) {
 		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,
@@ -386,7 +382,6 @@ function videos_content(App $a) {
 					'name'  => $name_e,
 					'alt'   => L10n::t('View Album'),
 				],
-
 			];
 		}
 	}
@@ -395,12 +390,12 @@ function videos_content(App $a) {
 	$o .= replace_macros($tpl, [
 		'$title'      => L10n::t('Recent Videos'),
 		'$can_post'   => $can_post,
-		'$upload'     => [L10n::t('Upload New Videos'), System::baseUrl().'/videos/'.$a->data['user']['nickname'].'/upload'],
+		'$upload'     => [L10n::t('Upload New Videos'), System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/upload'],
 		'$videos'     => $videos,
-		'$delete_url' => (($can_post)?System::baseUrl().'/videos/'.$a->data['user']['nickname']:False)
+		'$delete_url' => (($can_post) ? System::baseUrl() . '/videos/' . $a->data['user']['nickname'] : false)
 	]);
 
-
 	$o .= paginate($a);
+
 	return $o;
 }
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 7763dc8bf..9446470e1 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -7,41 +7,44 @@ use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
+use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Core\System;
 
 function viewcontacts_init(App $a)
 {
-	if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
-		return;
+	if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
+		System::httpExit(403, ["title" => L10n::t('Access denied.')]);
+	}
+
+	if ($a->argc < 2) {
+		System::httpExit(403, ["title" => L10n::t('Access denied.')]);
 	}
 
 	Nav::setSelected('home');
 
-	if ($a->argc > 1) {
-		$nick = $a->argv[1];
-		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
-			dbesc($nick)
-		);
+	$nick = $a->argv[1];
+	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
+		DBA::escape($nick)
+	);
 
-		if (! DBM::is_result($r)) {
-			return;
-		}
-
-		$a->data['user'] = $r[0];
-		$a->profile_uid = $r[0]['uid'];
-		$is_owner = (local_user() && (local_user() == $a->profile_uid));
-
-		Profile::load($a, $a->argv[1]);
+	if (!DBA::isResult($r)) {
+		System::httpExit(404, ["title" => L10n::t('Page not found.')]);
 	}
+
+	$a->data['user'] = $r[0];
+	$a->profile_uid = $r[0]['uid'];
+	$is_owner = (local_user() && (local_user() == $a->profile_uid));
+
+	Profile::load($a, $a->argv[1]);
 }
 
 function viewcontacts_content(App $a)
 {
-	require_once("mod/proxy.php");
-
-	if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
+	if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
 		notice(L10n::t('Public access denied.') . EOL);
 		return;
 	}
@@ -53,7 +56,7 @@ function viewcontacts_content(App $a)
 	// tabs
 	$o .= Profile::getTabs($a, $is_owner, $a->data['user']['nickname']);
 
-	if (((! count($a->profile)) || ($a->profile['hide-friends']))) {
+	if (!count($a->profile) || $a->profile['hide-friends']) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return $o;
 	}
@@ -63,11 +66,11 @@ function viewcontacts_content(App $a)
 			AND NOT `hidden` AND NOT `archive`
 			AND `network` IN ('%s', '%s', '%s')",
 		intval($a->profile['uid']),
-		dbesc(NETWORK_DFRN),
-		dbesc(NETWORK_DIASPORA),
-		dbesc(NETWORK_OSTATUS)
+		DBA::escape(Protocol::DFRN),
+		DBA::escape(Protocol::DIASPORA),
+		DBA::escape(Protocol::OSTATUS)
 	);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$a->set_pager_total($r[0]['total']);
 	}
 
@@ -77,13 +80,13 @@ function viewcontacts_content(App $a)
 			AND `network` IN ('%s', '%s', '%s')
 		ORDER BY `name` ASC LIMIT %d, %d",
 		intval($a->profile['uid']),
-		dbesc(NETWORK_DFRN),
-		dbesc(NETWORK_DIASPORA),
-		dbesc(NETWORK_OSTATUS),
+		DBA::escape(Protocol::DFRN),
+		DBA::escape(Protocol::DIASPORA),
+		DBA::escape(Protocol::OSTATUS),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		info(L10n::t('No contacts.').EOL);
 		return $o;
 	}
@@ -96,29 +99,20 @@ function viewcontacts_content(App $a)
 			continue;
 		}
 
-		$url = $rr['url'];
-
-		// route DFRN profiles through the redirect
-		if ($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) {
-			$url = 'redir/' . $rr['id'];
-		} else {
-			$url = Profile::zrl($url);
-		}
-
 		$contact_details = Contact::getDetailsByURL($rr['url'], $a->profile['uid'], $rr);
 
 		$contacts[] = [
 			'id' => $rr['id'],
 			'img_hover' => L10n::t('Visit %s\'s profile [%s]', $contact_details['name'], $rr['url']),
 			'photo_menu' => Contact::photoMenu($rr),
-			'thumb' => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
+			'thumb' => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
 			'name' => htmlentities(substr($contact_details['name'], 0, 20)),
 			'username' => htmlentities($contact_details['name']),
 			'details'       => $contact_details['location'],
 			'tags'          => $contact_details['keywords'],
 			'about'         => $contact_details['about'],
 			'account_type'  => Contact::getAccountType($contact_details),
-			'url' => $url,
+			'url' => Contact::magicLink($rr['url']),
 			'sparkle' => '',
 			'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
 			'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
@@ -133,6 +127,5 @@ function viewcontacts_content(App $a)
 		'$paginate' => paginate($a),
 	]);
 
-
 	return $o;
 }
diff --git a/mod/viewsrc.php b/mod/viewsrc.php
index d2f0d01a0..afdcaada2 100644
--- a/mod/viewsrc.php
+++ b/mod/viewsrc.php
@@ -4,39 +4,34 @@
  */
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
 
-function viewsrc_content(App $a) {
-
-	if (! local_user()) {
+function viewsrc_content(App $a)
+{
+	if (!local_user()) {
 		notice(L10n::t('Access denied.') . EOL);
 		return;
 	}
 
-	$o = ''; 
+	$o = '';
 	$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-	if(! $item_id) {
+	if (!$item_id) {
 		$a->error = 404;
 		notice(L10n::t('Item not found.') . EOL);
 		return;
 	}
 
-	$r = q("SELECT `item`.`body` FROM `item`
-		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
-		and `item`.`moderated` = 0
-		AND `item`.`id` = '%s' LIMIT 1",
-		intval(local_user()),
-		dbesc($item_id)
-	);
+	$item = Item::selectFirst(['body'], ['uid' => local_user(), 'id' => $item_id]);
 
-	if (DBM::is_result($r))
-		if(is_ajax()) {
-			echo str_replace("\n",'<br />',$r[0]['body']);
+	if (DBA::isResult($item)) {
+		if (is_ajax()) {
+			echo str_replace("\n", '<br />', $item['body']);
 			killme();
 		} else {
-			$o .= str_replace("\n",'<br />',$r[0]['body']);
+			$o .= str_replace("\n", '<br />', $item['body']);
 		}
+	}
 	return $o;
 }
-
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 07092cf18..2a3038e8f 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -6,7 +6,9 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Mimetype;
 
@@ -14,24 +16,25 @@ function wall_attach_post(App $a) {
 
 	$r_json = (x($_GET,'response') && $_GET['response']=='json');
 
-	if($a->argc > 1) {
+	if ($a->argc > 1) {
 		$nick = $a->argv[1];
 		$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
-			dbesc($nick)
+			DBA::escape($nick)
 		);
-		if (! DBM::is_result($r)) {
+
+		if (! DBA::isResult($r)) {
 			if ($r_json) {
-				echo json_encode(['error'=>L10n::t('Invalid request.')]);
+				echo json_encode(['error' => L10n::t('Invalid request.')]);
 				killme();
 			}
 			return;
-	}
-
+		}
 	} else {
 		if ($r_json) {
-			echo json_encode(['error'=>L10n::t('Invalid request.')]);
+			echo json_encode(['error' => L10n::t('Invalid request.')]);
 			killme();
 		}
+
 		return;
 	}
 
@@ -41,46 +44,49 @@ function wall_attach_post(App $a) {
 	$page_owner_uid   = $r[0]['uid'];
 	$page_owner_cid   = $r[0]['id'];
 	$page_owner_nick  = $r[0]['nickname'];
-	$community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+	$community_page   = (($r[0]['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
 
-	if((local_user()) && (local_user() == $page_owner_uid))
+	if ((local_user()) && (local_user() == $page_owner_uid)) {
 		$can_post = true;
-	else {
-		if($community_page && remote_user()) {
+	} else {
+		if ($community_page && remote_user()) {
 			$contact_id = 0;
-			if(is_array($_SESSION['remote'])) {
-				foreach($_SESSION['remote'] as $v) {
-					if($v['uid'] == $page_owner_uid) {
+
+			if (is_array($_SESSION['remote'])) {
+				foreach ($_SESSION['remote'] as $v) {
+					if ($v['uid'] == $page_owner_uid) {
 						$contact_id = $v['cid'];
 						break;
 					}
 				}
 			}
-			if($contact_id) {
 
+			if ($contact_id > 0) {
 				$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
 					intval($contact_id),
 					intval($page_owner_uid)
 				);
-				if (DBM::is_result($r)) {
+
+				if (DBA::isResult($r)) {
 					$can_post = true;
 					$visitor = $contact_id;
 				}
 			}
 		}
 	}
-	if(! $can_post) {
+
+	if (! $can_post) {
 		if ($r_json) {
-			echo json_encode(['error'=>L10n::t('Permission denied.')]);
+			echo json_encode(['error' => L10n::t('Permission denied.')]);
 			killme();
 		}
 		notice(L10n::t('Permission denied.') . EOL );
 		killme();
 	}
 
-	if(! x($_FILES,'userfile')) {
+	if (! x($_FILES,'userfile')) {
 		if ($r_json) {
-			echo json_encode(['error'=>L10n::t('Invalid request.')]);
+			echo json_encode(['error' => L10n::t('Invalid request.')]);
 		}
 		killme();
 	}
@@ -97,23 +103,23 @@ function wall_attach_post(App $a) {
 	 * Then Filesize gets <= 0.
 	 */
 
-	if($filesize <=0) {
+	if ($filesize <= 0) {
 		$msg = L10n::t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(L10n::t('Or - did you try to upload an empty file?'));
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(['error' => $msg]);
 		} else {
-			notice( $msg. EOL );
+			notice($msg . EOL);
 		}
 		@unlink($src);
 		killme();
 	}
 
-	if(($maxfilesize) && ($filesize > $maxfilesize)) {
+	if ($maxfilesize && $filesize > $maxfilesize) {
 		$msg = L10n::t('File exceeds size limit of %s', formatBytes($maxfilesize));
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(['error' => $msg]);
 		} else {
-			echo  $msg. EOL ;
+			echo $msg . EOL ;
 		}
 		@unlink($src);
 		killme();
@@ -121,45 +127,45 @@ function wall_attach_post(App $a) {
 
 	$filedata = @file_get_contents($src);
 	$mimetype = Mimetype::getContentType($filename);
-	$hash = get_guid(64);
+	$hash = System::createGUID(64);
 	$created = DateTimeFormat::utcNow();
 
 	$fields = ['uid' => $page_owner_uid, 'hash' => $hash, 'filename' => $filename, 'filetype' => $mimetype,
 		'filesize' => $filesize, 'data' => $filedata, 'created' => $created, 'edited' => $created,
 		'allow_cid' => '<' . $page_owner_cid . '>', 'allow_gid' => '','deny_cid' => '', 'deny_gid' => ''];
 
-	$r = dba::insert('attach', $fields);
+	$r = DBA::insert('attach', $fields);
 
 	@unlink($src);
 
-	if(! $r) {
+	if (! $r) {
 		$msg =  L10n::t('File upload failed.');
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(['error' => $msg]);
 		} else {
-			echo  $msg. EOL ;
+			echo $msg . EOL ;
 		}
 		killme();
 	}
 
 	$r = q("SELECT `id` FROM `attach` WHERE `uid` = %d AND `created` = '%s' AND `hash` = '%s' LIMIT 1",
 		intval($page_owner_uid),
-		dbesc($created),
-		dbesc($hash)
+		DBA::escape($created),
+		DBA::escape($hash)
 	);
 
-	if (! DBM::is_result($r)) {
+	if (! DBA::isResult($r)) {
 		$msg = L10n::t('File upload failed.');
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(['error' => $msg]);
 		} else {
-			echo  $msg. EOL ;
+			echo $msg . EOL ;
 		}
 		killme();
 	}
 
 	if ($r_json) {
-		echo json_encode(['ok'=>true]);
+		echo json_encode(['ok' => true]);
 		killme();
 	}
 
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 61578ca5c..c23c3adbc 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -12,30 +12,31 @@ use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
 
-function wall_upload_post(App $a, $desktopmode = true) {
-
+function wall_upload_post(App $a, $desktopmode = true)
+{
 	logger("wall upload: starting new upload", LOGGER_DEBUG);
 
 	$r_json = (x($_GET, 'response') && $_GET['response'] == 'json');
 	$album = (x($_GET, 'album') ? notags(trim($_GET['album'])) : '');
 
 	if ($a->argc > 1) {
-		if (! x($_FILES, 'media')) {
+		if (!x($_FILES, 'media')) {
 			$nick = $a->argv[1];
 			$r = q("SELECT `user`.*, `contact`.`id` FROM `user`
 				INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
 				WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0
 				AND `contact`.`self` = 1 LIMIT 1",
-				dbesc($nick)
+				DBA::escape($nick)
 			);
 
-			if (! DBM::is_result($r)) {
+			if (!DBA::isResult($r)) {
 				if ($r_json) {
-					echo json_encode(['error'=>L10n::t('Invalid request.')]);
+					echo json_encode(['error' => L10n::t('Invalid request.')]);
 					killme();
 				}
 				return;
@@ -46,12 +47,12 @@ function wall_upload_post(App $a, $desktopmode = true) {
 				INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
 				WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0
 				AND `contact`.`self` = 1 LIMIT 1",
-				dbesc($user_info['screen_name'])
+				DBA::escape($user_info['screen_name'])
 			);
 		}
 	} else {
 		if ($r_json) {
-			echo json_encode(['error'=>L10n::t('Invalid request.')]);
+			echo json_encode(['error' => L10n::t('Invalid request.')]);
 			killme();
 		}
 		return;
@@ -66,7 +67,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	$page_owner_uid   = $r[0]['uid'];
 	$default_cid      = $r[0]['id'];
 	$page_owner_nick  = $r[0]['nickname'];
-	$community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+	$community_page   = (($r[0]['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
 
 	if ((local_user()) && (local_user() == $page_owner_uid)) {
 		$can_post = true;
@@ -89,7 +90,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 					intval($contact_id),
 					intval($page_owner_uid)
 				);
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					$can_post = true;
 					$visitor = $contact_id;
 				}
@@ -98,18 +99,18 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	}
 
 
-	if (! $can_post) {
+	if (!$can_post) {
 		if ($r_json) {
-			echo json_encode(['error'=>L10n::t('Permission denied.')]);
+			echo json_encode(['error' => L10n::t('Permission denied.')]);
 			killme();
 		}
 		notice(L10n::t('Permission denied.') . EOL);
 		killme();
 	}
 
-	if (! x($_FILES, 'userfile') && ! x($_FILES, 'media')) {
+	if (!x($_FILES, 'userfile') && !x($_FILES, 'media')) {
 		if ($r_json) {
-			echo json_encode(['error'=>L10n::t('Invalid request.')]);
+			echo json_encode(['error' => L10n::t('Invalid request.')]);
 		}
 		killme();
 	}
@@ -125,34 +126,42 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		$filetype = $_FILES['userfile']['type'];
 
 	} elseif (x($_FILES, 'media')) {
-		if (is_array($_FILES['media']['tmp_name'])) {
-			$src = $_FILES['media']['tmp_name'][0];
-		} else {
-			$src = $_FILES['media']['tmp_name'];
+		if (!empty($_FILES['media']['tmp_name'])) {
+			if (is_array($_FILES['media']['tmp_name'])) {
+				$src = $_FILES['media']['tmp_name'][0];
+			} else {
+				$src = $_FILES['media']['tmp_name'];
+			}
 		}
 
-		if (is_array($_FILES['media']['name'])) {
-			$filename = basename($_FILES['media']['name'][0]);
-		} else {
-			$filename = basename($_FILES['media']['name']);
+		if (!empty($_FILES['media']['name'])) {
+			if (is_array($_FILES['media']['name'])) {
+				$filename = basename($_FILES['media']['name'][0]);
+			} else {
+				$filename = basename($_FILES['media']['name']);
+			}
 		}
 
-		if (is_array($_FILES['media']['size'])) {
-			$filesize = intval($_FILES['media']['size'][0]);
-		} else {
-			$filesize = intval($_FILES['media']['size']);
+		if (!empty($_FILES['media']['size'])) {
+			if (is_array($_FILES['media']['size'])) {
+				$filesize = intval($_FILES['media']['size'][0]);
+			} else {
+				$filesize = intval($_FILES['media']['size']);
+			}
 		}
 
-		if (is_array($_FILES['media']['type'])) {
-			$filetype = $_FILES['media']['type'][0];
-		} else {
-			$filetype = $_FILES['media']['type'];
+		if (!empty($_FILES['media']['type'])) {
+			if (is_array($_FILES['media']['type'])) {
+				$filetype = $_FILES['media']['type'][0];
+			} else {
+				$filetype = $_FILES['media']['type'];
+			}
 		}
 	}
 
-	if ($src=="") {
+	if ($src == "") {
 		if ($r_json) {
-			echo json_encode(['error'=>L10n::t('Invalid request.')]);
+			echo json_encode(['error' => L10n::t('Invalid request.')]);
 			killme();
 		}
 		notice(L10n::t('Invalid request.').EOL);
@@ -185,7 +194,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	if (($maximagesize) && ($filesize > $maximagesize)) {
 		$msg = L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize));
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(['error' => $msg]);
 		} else {
 			echo  $msg. EOL;
 		}
@@ -196,10 +205,10 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	$imagedata = @file_get_contents($src);
 	$Image = new Image($imagedata, $filetype);
 
-	if (! $Image->isValid()) {
+	if (!$Image->isValid()) {
 		$msg = L10n::t('Unable to process image.');
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(['error' => $msg]);
 		} else {
 			echo  $msg. EOL;
 		}
@@ -211,7 +220,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	@unlink($src);
 
 	$max_length = Config::get('system', 'max_image_length');
-	if (! $max_length) {
+	if (!$max_length) {
 		$max_length = MAX_IMAGE_LENGTH;
 	}
 	if ($max_length > 0) {
@@ -227,7 +236,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 	$smallest = 0;
 
 	// If we don't have an album name use the Wall Photos album
-	if (! strlen($album)) {
+	if (!strlen($album)) {
 		$album = L10n::t('Wall Photos');
 	}
 
@@ -235,10 +244,10 @@ function wall_upload_post(App $a, $desktopmode = true) {
 
 	$r = Photo::store($Image, $page_owner_uid, $visitor, $hash, $filename, $album, 0, 0, $defperm);
 
-	if (! $r) {
+	if (!$r) {
 		$msg = L10n::t('Image upload failed.');
 		if ($r_json) {
-			echo json_encode(['error'=>$msg]);
+			echo json_encode(['error' => $msg]);
 		} else {
 			echo  $msg. EOL;
 		}
@@ -271,7 +280,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		);
 		if (!$r) {
 			if ($r_json) {
-				echo json_encode(['error'=>'']);
+				echo json_encode(['error' => '']);
 				killme();
 			}
 			return false;
@@ -288,28 +297,21 @@ function wall_upload_post(App $a, $desktopmode = true) {
 		$picture["preview"]   = System::baseUrl() . "/photo/{$hash}-{$smallest}." . $Image->getExt();
 
 		if ($r_json) {
-			echo json_encode(['picture'=>$picture]);
+			echo json_encode(['picture' => $picture]);
 			killme();
 		}
+		logger("upload done", LOGGER_DEBUG);
 		return $picture;
 	}
 
+	logger("upload done", LOGGER_DEBUG);
 
 	if ($r_json) {
-		echo json_encode(['ok'=>true]);
+		echo json_encode(['ok' => true]);
 		killme();
 	}
 
-/* mod Waitman Gobble NO WARRANTY */
-	// if we get the signal then return the image url info in BBCODE
-	if ($_REQUEST['hush']!='yeah') {
-		echo  "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . System::baseUrl() . "/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
-	} else {
-		$m = '[url='.System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash.'][img]'.System::baseUrl()."/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]";
-		return($m);
-	}
-/* mod Waitman Gobble NO WARRANTY */
-
+	echo  "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . System::baseUrl() . "/photo/{$hash}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
 	killme();
 	// NOTREACHED
 }
diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 75aca1f68..5606b6fee 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -5,7 +5,7 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Mail;
 use Friendica\Model\Profile;
 
@@ -26,10 +26,10 @@ function wallmessage_post(App $a) {
 	}
 
 	$r = q("select * from user where nickname = '%s' limit 1",
-		dbesc($recipient)
+		DBA::escape($recipient)
 	);
 
-	if (! DBM::is_result($r)) {
+	if (! DBA::isResult($r)) {
 		logger('wallmessage: no recipient');
 		return;
 	}
@@ -88,10 +88,10 @@ function wallmessage_content(App $a) {
 	}
 
 	$r = q("select * from user where nickname = '%s' limit 1",
-		dbesc($recipient)
+		DBA::escape($recipient)
 	);
 
-	if (! DBM::is_result($r)) {
+	if (! DBA::isResult($r)) {
 		notice(L10n::t('No recipient.') . EOL);
 		logger('wallmessage: no recipient');
 		return;
diff --git a/mod/webfinger.php b/mod/webfinger.php
index 6f49a8f28..4f23db6d8 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/mod/worker.php b/mod/worker.php
index 1bd588078..c18155c5f 100644
--- a/mod/worker.php
+++ b/mod/worker.php
@@ -6,8 +6,11 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
 
-function worker_init(){
+function worker_init()
+{
 
 	if (!Config::get("system", "frontend_worker")) {
 		return;
@@ -35,12 +38,13 @@ function worker_init(){
 	Worker::callWorker();
 
 	if ($r = Worker::workerProcess()) {
-
 		// On most configurations this parameter wouldn't have any effect.
 		// But since it doesn't destroy anything, we just try to get more execution time in any way.
 		set_time_limit(0);
 
-		if (poller_claim_process($r[0])) {
+		$fields = ['executed' => DateTimeFormat::utcNow(), 'pid' => getmypid(), 'done' => false];
+		$condition =  ['id' => $r[0]["id"], 'pid' => 0];
+		if (DBA::update('workerqueue', $fields, $condition)) {
 			Worker::execute($r[0]);
 		}
 	}
diff --git a/mod/xrd.php b/mod/xrd.php
index bbfd7ce64..61505f299 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -2,24 +2,33 @@
 /**
  * @file mod/xrd.php
  */
+
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Protocol\Salmon;
 
 function xrd_init(App $a)
 {
 	if ($a->argv[0] == 'xrd') {
+		if (empty($_GET['uri'])) {
+			killme();
+		}
+
 		$uri = urldecode(notags(trim($_GET['uri'])));
-		if ($_SERVER['HTTP_ACCEPT'] == 'application/jrd+json') {
+		if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/jrd+json') {
 			$mode = 'json';
 		} else {
 			$mode = 'xml';
 		}
 	} else {
+		if (empty($_GET['resource'])) {
+			killme();
+		}
+
 		$uri = urldecode(notags(trim($_GET['resource'])));
-		if ($_SERVER['HTTP_ACCEPT'] == 'application/xrd+xml') {
+		if (defaults($_SERVER, 'HTTP_ACCEPT', '') == 'application/xrd+xml') {
 			$mode = 'xml';
 		} else {
 			$mode = 'json';
@@ -37,8 +46,8 @@ function xrd_init(App $a)
 		$name = substr($local, 0, strpos($local, '@'));
 	}
 
-	$user = dba::selectFirst('user', [], ['nickname' => $name]);
-	if (!DBM::is_result($user)) {
+	$user = DBA::selectFirst('user', [], ['nickname' => $name]);
+	if (!DBA::isResult($user)) {
 		killme();
 	}
 
@@ -66,20 +75,23 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
 	header("Content-type: application/json; charset=utf-8");
 
 	$json = ['subject' => $uri,
-			'aliases' => [$alias, $profile_url],
-			'links' => [['rel' => NAMESPACE_DFRN, 'href' => $profile_url],
-					['rel' => NAMESPACE_FEED, 'type' => 'application/atom+xml', 'href' => System::baseUrl().'/dfrn_poll/'.$r['nickname']],
-					['rel' => 'http://webfinger.net/rel/profile-page', 'type' => 'text/html', 'href' => $profile_url],
-					['rel' => 'http://microformats.org/profile/hcard', 'type' => 'text/html', 'href' => System::baseUrl().'/hcard/'.$r['nickname']],
-					['rel' => NAMESPACE_POCO, 'href' => System::baseUrl().'/poco/'.$r['nickname']],
-					['rel' => 'http://webfinger.net/rel/avatar', 'type' => 'image/jpeg', 'href' => System::baseUrl().'/photo/profile/'.$r['uid'].'.jpg'],
-					['rel' => 'http://joindiaspora.com/seed_location', 'type' => 'text/html', 'href' => System::baseUrl()],
-					['rel' => 'salmon', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
-					['rel' => 'http://salmon-protocol.org/ns/salmon-replies', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
-					['rel' => 'http://salmon-protocol.org/ns/salmon-mention', 'href' => System::baseUrl().'/salmon/'.$r['nickname'].'/mention'],
-					['rel' => 'http://ostatus.org/schema/1.0/subscribe', 'template' => System::baseUrl().'/follow?url={uri}'],
-					['rel' => 'magic-public-key', 'href' => 'data:application/magic-public-key,'.$salmon_key]
-	]];
+		'aliases' => [$alias, $profile_url],
+		'links' => [
+			['rel' => NAMESPACE_DFRN, 'href' => $profile_url],
+			['rel' => NAMESPACE_FEED, 'type' => 'application/atom+xml', 'href' => System::baseUrl().'/dfrn_poll/'.$r['nickname']],
+			['rel' => 'http://webfinger.net/rel/profile-page', 'type' => 'text/html', 'href' => $profile_url],
+			['rel' => 'http://microformats.org/profile/hcard', 'type' => 'text/html', 'href' => System::baseUrl().'/hcard/'.$r['nickname']],
+			['rel' => NAMESPACE_POCO, 'href' => System::baseUrl().'/poco/'.$r['nickname']],
+			['rel' => 'http://webfinger.net/rel/avatar', 'type' => 'image/jpeg', 'href' => System::baseUrl().'/photo/profile/'.$r['uid'].'.jpg'],
+			['rel' => 'http://joindiaspora.com/seed_location', 'type' => 'text/html', 'href' => System::baseUrl()],
+			['rel' => 'salmon', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
+			['rel' => 'http://salmon-protocol.org/ns/salmon-replies', 'href' => System::baseUrl().'/salmon/'.$r['nickname']],
+			['rel' => 'http://salmon-protocol.org/ns/salmon-mention', 'href' => System::baseUrl().'/salmon/'.$r['nickname'].'/mention'],
+			['rel' => 'http://ostatus.org/schema/1.0/subscribe', 'template' => System::baseUrl().'/follow?url={uri}'],
+			['rel' => 'magic-public-key', 'href' => 'data:application/magic-public-key,'.$salmon_key],
+			['rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-dfrn+json', 'href' => System::baseUrl().'/owa']
+		]
+	];
 	echo json_encode($json);
 	killme();
 }
@@ -102,10 +114,11 @@ function xrd_xml($a, $uri, $alias, $profile_url, $r)
 		'$atom'        => System::baseUrl() . '/dfrn_poll/'     . $r['nickname'],
 		'$poco_url'    => System::baseUrl() . '/poco/'          . $r['nickname'],
 		'$photo'       => System::baseUrl() . '/photo/profile/' . $r['uid']      . '.jpg',
-		'$baseurl' => System::baseUrl(),
+		'$baseurl'     => System::baseUrl(),
 		'$salmon'      => System::baseUrl() . '/salmon/'        . $r['nickname'],
 		'$salmen'      => System::baseUrl() . '/salmon/'        . $r['nickname'] . '/mention',
 		'$subscribe'   => System::baseUrl() . '/follow?url={uri}',
+		'$openwebauth' => System::baseUrl() . '/owa',
 		'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key]
 	);
 
diff --git a/mods/readme.txt b/mods/redme.txt
similarity index 100%
rename from mods/readme.txt
rename to mods/redme.txt
diff --git a/mods/sample-nginx.config b/mods/sample-nginx.config
index eb4ae4577..5a9397210 100644
--- a/mods/sample-nginx.config
+++ b/mods/sample-nginx.config
@@ -72,37 +72,37 @@ server {
   charset utf-8;
   root /var/www/friendica;
   access_log /var/log/nginx/friendica.log;
-    #Uncomment the following line to include a standard configuration file
-    #Note that the most specific rule wins and your standard configuration
-    #will therefore *add* to this file, but not override it.
+
+  # Uncomment the following line to include a standard configuration file Note
+  # that the most specific rule wins and your standard configuration will
+  # therefore *add* to this file, but not override it.
   #include standard.conf
+
   # allow uploads up to 20MB in size
   client_max_body_size 20m;
   client_body_buffer_size 128k;
 
   # rewrite to front controller as default rule
   location / {
-    if (!-e $request_filename) {
-    	rewrite ^(.*)$ /index.php?pagename=$1;
-    }
+    try_files $uri /index.php?pagename=$uri&$args;
   }
-  
 
   # make sure webfinger and other well known services aren't blocked
   # by denying dot files and rewrite request to the front controller
   location ^~ /.well-known/ {
     allow all;
-   if (!-e $request_filename) {
-     rewrite ^(.*)$ /index.php?pagename=$1;
-   }
+    try_files $uri /index.php?pagename=$uri&$args;
   }
-  
+
   include mime.types;
 
-  # block these file types
-  location ~* \.(tpl|md|tgz|log|out)$ {
-    deny all;
-  }
+  # statically serve these file types when possible otherwise fall back to
+  # front controller allow browser to cache them added .htm for advanced source
+  # code editor library
+  #location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|ttf|woff|svg)$ {
+  #  expires 30d;
+  #  try_files $uri /index.php?pagename=$uri&$args;
+  #}
 
   # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
   # or a unix socket
@@ -129,6 +129,11 @@ server {
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
   }
 
+  # block these file types
+  location ~* \.(tpl|md|tgz|log|out)$ {
+    deny all;
+  }
+
   # deny access to all dot files
   location ~ /\. {
     deny all;
diff --git a/phpunit.xml b/phpunit.xml
index 6a275ad3f..9ed293b63 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,8 +1,29 @@
 <?xml version="1.0"?>
-<phpunit bootstrap="boot.php">
+<phpunit
+	bootstrap="tests/bootstrap.php"
+	verbose="true">
     <testsuites>
         <testsuite>
             <directory>tests/</directory>
         </testsuite>
     </testsuites>
+	<!-- Filters for Code Coverage -->
+	<filter>
+		<whitelist>
+			<directory suffix=".php">.</directory>
+			<exclude>
+				<directory suffix=".php">config/</directory>
+				<directory suffix=".php">doc/</directory>
+				<directory suffix=".php">images/</directory>
+				<directory suffix=".php">library/</directory>
+				<directory suffix=".php">spec/</directory>
+				<directory suffix=".php">tests/</directory>
+				<directory suffix=".php">util/</directory>
+				<directory suffix=".php">view/</directory>
+			</exclude>
+		</whitelist>
+	</filter>
+	<logging>
+		<log type="coverage-clover" target="clover.xml" />
+	</logging>
 </phpunit>
diff --git a/spec/dfrn-snap2.jpg b/spec/dfrn-snap2.jpg
index ee00f5654..5697732c2 100644
Binary files a/spec/dfrn-snap2.jpg and b/spec/dfrn-snap2.jpg differ
diff --git a/spec/dfrn2_contact_confirmation.png b/spec/dfrn2_contact_confirmation.png
index 843e7c707..e192ebc1b 100644
Binary files a/spec/dfrn2_contact_confirmation.png and b/spec/dfrn2_contact_confirmation.png differ
diff --git a/spec/dfrn2_contact_request.png b/spec/dfrn2_contact_request.png
index cf60094ae..7ca6bca05 100644
Binary files a/spec/dfrn2_contact_request.png and b/spec/dfrn2_contact_request.png differ
diff --git a/src/App.php b/src/App.php
index dd3d2397c..0dc4b86b9 100644
--- a/src/App.php
+++ b/src/App.php
@@ -4,19 +4,16 @@
  */
 namespace Friendica;
 
-use Friendica\Core\Cache;
+use Detection\MobileDetect;
+use Exception;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
-use dba;
-
-use Detection\MobileDetect;
-
-use Exception;
+use Friendica\Database\DBA;
 
 require_once 'boot.php';
+require_once 'include/dba.php';
 require_once 'include/text.php';
 
 /**
@@ -34,15 +31,27 @@ require_once 'include/text.php';
  */
 class App
 {
-	const MODE_NORMAL = 0;
-	const MODE_INSTALL = 1;
-	const MODE_MAINTENANCE = 2;
+	const MODE_LOCALCONFIGPRESENT = 1;
+	const MODE_DBAVAILABLE = 2;
+	const MODE_DBCONFIGAVAILABLE = 4;
+	const MODE_MAINTENANCEDISABLED = 8;
+
+	/**
+	 * @deprecated since version 2008.08 Use App->isInstallMode() instead to check for install mode.
+	 */
+	const MODE_INSTALL = 0;
+
+	/**
+	 * @deprecated since version 2008.08 Use the precise mode constant to check for a specific capability instead.
+	 */
+	const MODE_NORMAL = App::MODE_LOCALCONFIGPRESENT | App::MODE_DBAVAILABLE | App::MODE_DBCONFIGAVAILABLE | App::MODE_MAINTENANCEDISABLED;
 
 	public $module_loaded = false;
 	public $module_class = null;
-	public $query_string;
-	public $config;
-	public $page;
+	public $query_string = '';
+	public $config = [];
+	public $page = [];
+	public $pager = [];
 	public $page_offset;
 	public $profile;
 	public $profile_uid;
@@ -54,16 +63,15 @@ class App
 	public $content;
 	public $data = [];
 	public $error = false;
-	public $cmd;
+	public $cmd = '';
 	public $argv;
 	public $argc;
 	public $module;
-	public $mode = App::MODE_NORMAL;
-	public $pager;
+	public $mode = App::MODE_INSTALL;
 	public $strings;
 	public $basepath;
-	public $path;
-	public $hooks;
+	public $urlpath;
+	public $hooks = [];
 	public $timezone;
 	public $interactive = true;
 	public $addons;
@@ -127,31 +135,24 @@ class App
 	private $curl_code;
 	private $curl_content_type;
 	private $curl_headers;
-	private static $a;
 
 	/**
 	 * @brief App constructor.
 	 *
 	 * @param string $basepath Path to the app base folder
+	 *
+	 * @throws Exception if the Basepath is not usable
 	 */
 	public function __construct($basepath)
 	{
-		global $default_timezone;
-
 		if (!static::directory_usable($basepath, false)) {
 			throw new Exception('Basepath ' . $basepath . ' isn\'t usable.');
 		}
 
+		BaseObject::setApp($this);
+
 		$this->basepath = rtrim($basepath, DIRECTORY_SEPARATOR);
 
-		if (file_exists($this->basepath . DIRECTORY_SEPARATOR . '.htpreconfig.php')) {
-			include $this->basepath . DIRECTORY_SEPARATOR . '.htpreconfig.php';
-		}
-
-		$this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
-
-		date_default_timezone_set($this->timezone);
-
 		$this->performance['start'] = microtime(true);
 		$this->performance['database'] = 0;
 		$this->performance['database_write'] = 0;
@@ -173,15 +174,12 @@ class App
 		$this->callstack['rendering'] = [];
 		$this->callstack['parser'] = [];
 
-		$this->config = [];
-		$this->page = [];
-		$this->pager = [];
+		$this->reload();
 
-		$this->query_string = '';
+		set_time_limit(0);
 
-		$this->process_id = uniqid('log', true);
-
-		startup();
+		// This has to be quite large to deal with embedded private photos
+		ini_set('pcre.backtrack_limit', 500000);
 
 		$this->scheme = 'http';
 
@@ -201,16 +199,6 @@ class App
 			if (x($_SERVER, 'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
 				$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
 			}
-			/*
-			 * Figure out if we are running at the top of a domain
-			 * or in a sub-directory and adjust accordingly
-			 */
-
-			/// @TODO This kind of escaping breaks syntax-highlightning on CoolEdit (Midnight Commander)
-			$path = trim(dirname($_SERVER['SCRIPT_NAME']), '/\\');
-			if (isset($path) && strlen($path) && ($path != $this->path)) {
-				$this->path = $path;
-			}
 		}
 
 		set_include_path(
@@ -221,19 +209,16 @@ class App
 
 		if ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 9) === 'pagename=') {
 			$this->query_string = substr($_SERVER['QUERY_STRING'], 9);
-
-			// removing trailing / - maybe a nginx problem
-			$this->query_string = ltrim($this->query_string, '/');
 		} elseif ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 2) === 'q=') {
 			$this->query_string = substr($_SERVER['QUERY_STRING'], 2);
-
-			// removing trailing / - maybe a nginx problem
-			$this->query_string = ltrim($this->query_string, '/');
 		}
 
-		if (x($_GET, 'pagename')) {
+		// removing trailing / - maybe a nginx problem
+		$this->query_string = ltrim($this->query_string, '/');
+
+		if (!empty($_GET['pagename'])) {
 			$this->cmd = trim($_GET['pagename'], '/\\');
-		} elseif (x($_GET, 'q')) {
+		} elseif (!empty($_GET['q'])) {
 			$this->cmd = trim($_GET['q'], '/\\');
 		}
 
@@ -290,20 +275,301 @@ class App
 		$this->is_tablet = $mobile_detect->isTablet();
 
 		// Friendica-Client
-		$this->is_friendica_app = ($_SERVER['HTTP_USER_AGENT'] == 'Apache-HttpClient/UNAVAILABLE (java 1.4)');
+		$this->is_friendica_app = isset($_SERVER['HTTP_USER_AGENT']) && $_SERVER['HTTP_USER_AGENT'] == 'Apache-HttpClient/UNAVAILABLE (java 1.4)';
 
 		// Register template engines
 		$this->register_template_engine('Friendica\Render\FriendicaSmartyEngine');
+	}
 
-		/**
-		 * Load the configuration file which contains our DB credentials.
-		 * Ignore errors. If the file doesn't exist or is empty, we are running in
-		 * installation mode.	 *
+	/**
+	 * Reloads the whole app instance
+	 */
+	public function reload()
+	{
+		// The order of the following calls is important to ensure proper initialization
+		$this->loadConfigFiles();
+
+		$this->loadDatabase();
+
+		$this->determineMode();
+
+		$this->determineUrlPath();
+
+		Config::load();
+
+		if ($this->mode & self::MODE_DBAVAILABLE) {
+			Core\Addon::loadHooks();
+
+			$this->loadAddonConfig();
+		}
+
+		$this->loadDefaultTimezone();
+
+		$this->page = [
+			'aside' => '',
+			'bottom' => '',
+			'content' => '',
+			'end' => '',
+			'footer' => '',
+			'htmlhead' => '',
+			'nav' => '',
+			'page_title' => '',
+			'right_aside' => '',
+			'template' => '',
+			'title' => ''
+		];
+
+		$this->process_id = System::processID('log');
+	}
+
+	/**
+	 * Load the configuration files
+	 *
+	 * First loads the default value for all the configuration keys, then the legacy configuration files, then the
+	 * expected local.ini.php
+	 */
+	private function loadConfigFiles()
+	{
+		$this->loadConfigFile($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'config.ini.php');
+		$this->loadConfigFile($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'settings.ini.php');
+
+		// Legacy .htconfig.php support
+		if (file_exists($this->basepath . DIRECTORY_SEPARATOR . '.htpreconfig.php')) {
+			$a = $this;
+			include $this->basepath . DIRECTORY_SEPARATOR . '.htpreconfig.php';
+		}
+
+		// Legacy .htconfig.php support
+		if (file_exists($this->basepath . DIRECTORY_SEPARATOR . '.htconfig.php')) {
+			$a = $this;
+
+			include $this->basepath . DIRECTORY_SEPARATOR . '.htconfig.php';
+
+			$this->setConfigValue('database', 'hostname', $db_host);
+			$this->setConfigValue('database', 'username', $db_user);
+			$this->setConfigValue('database', 'password', $db_pass);
+			$this->setConfigValue('database', 'database', $db_data);
+			if (isset($a->config['system']['db_charset'])) {
+				$this->setConfigValue('database', 'charset', $a->config['system']['db_charset']);
+			}
+
+			unset($db_host, $db_user, $db_pass, $db_data);
+
+			if (isset($default_timezone)) {
+				$this->setConfigValue('system', 'default_timezone', $default_timezone);
+				unset($default_timezone);
+			}
+
+			if (isset($pidfile)) {
+				$this->setConfigValue('system', 'pidfile', $pidfile);
+				unset($pidfile);
+			}
+
+			if (isset($lang)) {
+				$this->setConfigValue('system', 'language', $lang);
+				unset($lang);
+			}
+		}
+
+		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', true);
+		}
+	}
+
+	/**
+	 * Tries to load the specified configuration file into the App->config array.
+	 * 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:
+	 *
+	 * <?php return <<<INI
+	 *
+	 * [section]
+	 * key = value
+	 *
+	 * INI;
+	 * // Keep this line
+	 *
+	 * @param type $filepath
+	 * @param bool $overwrite Force value overwrite if the config key already exists
+	 * @throws Exception
+	 */
+	public function loadConfigFile($filepath, $overwrite = false)
+	{
+		if (!file_exists($filepath)) {
+			throw new Exception('Error parsing non-existent config file ' . $filepath);
+		}
+
+		$contents = include($filepath);
+
+		$config = parse_ini_string($contents, true, INI_SCANNER_TYPED);
+
+		if ($config === false) {
+			throw new Exception('Error parsing config file ' . $filepath);
+		}
+
+		foreach ($config as $category => $values) {
+			foreach ($values as $key => $value) {
+				if ($overwrite) {
+					$this->setConfigValue($category, $key, $value);
+				} else {
+					$this->setDefaultConfigValue($category, $key, $value);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Loads addons configuration files
+	 *
+	 * First loads all activated addons default configuration throught the load_config hook, then load the local.ini.php
+	 * again to overwrite potential local addon configuration.
+	 */
+	private function loadAddonConfig()
+	{
+		// Loads addons default config
+		Core\Addon::callHooks('load_config');
+
+		// 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', true);
+		}
+	}
+
+	/**
+	 * Loads the default timezone
+	 *
+	 * Include support for legacy $default_timezone
+	 *
+	 * @global string $default_timezone
+	 */
+	private function loadDefaultTimezone()
+	{
+		if ($this->getConfigValue('system', 'default_timezone')) {
+			$this->timezone = $this->getConfigValue('system', 'default_timezone');
+		} else {
+			global $default_timezone;
+			$this->timezone = !empty($default_timezone) ? $default_timezone : 'UTC';
+		}
+
+		if ($this->timezone) {
+			date_default_timezone_set($this->timezone);
+		}
+	}
+
+	/**
+	 * Figure out if we are running at the top of a domain or in a sub-directory and adjust accordingly
+	 */
+	private function determineUrlPath()
+	{
+		$this->urlpath = $this->getConfigValue('system', 'urlpath');
+
+		/* SCRIPT_URL gives /path/to/friendica/module/parameter
+		 * QUERY_STRING gives pagename=module/parameter
+		 *
+		 * To get /path/to/friendica we perform dirname() for as many levels as there are slashes in the QUERY_STRING
 		 */
-		$this->mode = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? App::MODE_NORMAL : App::MODE_INSTALL);
+		if (!empty($_SERVER['SCRIPT_URL'])) {
+			// Module
+			if (!empty($_SERVER['QUERY_STRING'])) {
+				$path = trim(dirname($_SERVER['SCRIPT_URL'], substr_count(trim($_SERVER['QUERY_STRING'], '/'), '/') + 1), '/');
+			} else {
+				// Root page
+				$path = trim($_SERVER['SCRIPT_URL'], '/');
+			}
 
+			if ($path && $path != $this->urlpath) {
+				$this->urlpath = $path;
+			}
+		}
+	}
 
-		self::$a = $this;
+	/**
+	 * Sets the App mode
+	 *
+	 * - App::MODE_INSTALL    : Either the database connection can't be established or the config table doesn't exist
+	 * - App::MODE_MAINTENANCE: The maintenance mode has been set
+	 * - App::MODE_NORMAL     : Normal run with all features enabled
+	 *
+	 * @return type
+	 */
+	private function determineMode()
+	{
+		$this->mode = 0;
+
+		if (!file_exists($this->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php')
+			&& !file_exists($this->basepath . DIRECTORY_SEPARATOR . '.htconfig.php')) {
+			return;
+		}
+
+		$this->mode |= App::MODE_LOCALCONFIGPRESENT;
+
+		if (!DBA::connected()) {
+			return;
+		}
+
+		$this->mode |= App::MODE_DBAVAILABLE;
+
+		if (DBA::fetchFirst("SHOW TABLES LIKE 'config'") === false) {
+			return;
+		}
+
+		$this->mode |= App::MODE_DBCONFIGAVAILABLE;
+
+		if (Config::get('system', 'maintenance')) {
+			return;
+		}
+
+		$this->mode |= App::MODE_MAINTENANCEDISABLED;
+	}
+
+	public function loadDatabase()
+	{
+		if (DBA::connected()) {
+			return;
+		}
+
+		$db_host = $this->getConfigValue('database', 'hostname');
+		$db_user = $this->getConfigValue('database', 'username');
+		$db_pass = $this->getConfigValue('database', 'password');
+		$db_data = $this->getConfigValue('database', 'database');
+		$charset = $this->getConfigValue('database', 'charset');
+
+		// Use environment variables for mysql if they are set beforehand
+		if (!empty(getenv('MYSQL_HOST'))
+			&& (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
+			&& getenv('MYSQL_PASSWORD') !== false
+			&& !empty(getenv('MYSQL_DATABASE')))
+		{
+			$db_host = getenv('MYSQL_HOST');
+			if (!empty(getenv('MYSQL_PORT'))) {
+				$db_host .= ':' . getenv('MYSQL_PORT');
+			}
+			if (!empty(getenv('MYSQL_USERNAME'))) {
+				$db_user = getenv('MYSQL_USERNAME');
+			} else {
+				$db_user = getenv('MYSQL_USER');
+			}
+			$db_pass = (string) getenv('MYSQL_PASSWORD');
+			$db_data = getenv('MYSQL_DATABASE');
+		}
+
+		$stamp1 = microtime(true);
+
+		DBA::connect($db_host, $db_user, $db_pass, $db_data, $charset);
+		unset($db_host, $db_user, $db_pass, $db_data, $charset);
+
+		$this->save_timestamp($stamp1, 'network');
+	}
+
+	/**
+	 * Install mode is when the local config file is missing or the DB schema hasn't been installed yet.
+	 *
+	 * @return bool
+	 */
+	public function isInstallMode()
+	{
+		return !($this->mode & App::MODE_LOCALCONFIGPRESENT) || !($this->mode & App::MODE_DBCONFIGAVAILABLE);
 	}
 
 	/**
@@ -396,7 +662,7 @@ class App
 			$this->hostname = Config::get('config', 'hostname');
 		}
 
-		return $scheme . '://' . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
+		return $scheme . '://' . $this->hostname . (!empty($this->urlpath) ? '/' . $this->urlpath : '' );
 	}
 
 	/**
@@ -409,16 +675,22 @@ class App
 	public function set_baseurl($url)
 	{
 		$parsed = @parse_url($url);
+		$hostname = '';
 
 		if (x($parsed)) {
-			$this->scheme = $parsed['scheme'];
+			if (!empty($parsed['scheme'])) {
+				$this->scheme = $parsed['scheme'];
+			}
+
+			if (!empty($parsed['host'])) {
+				$hostname = $parsed['host'];
+			}
 
-			$hostname = $parsed['host'];
 			if (x($parsed, 'port')) {
 				$hostname .= ':' . $parsed['port'];
 			}
 			if (x($parsed, 'path')) {
-				$this->path = trim($parsed['path'], '\\/');
+				$this->urlpath = trim($parsed['path'], '\\/');
 			}
 
 			if (file_exists($this->basepath . DIRECTORY_SEPARATOR . '.htpreconfig.php')) {
@@ -429,7 +701,7 @@ class App
 				$this->hostname = Config::get('config', 'hostname');
 			}
 
-			if (!isset($this->hostname) || ( $this->hostname == '')) {
+			if (!isset($this->hostname) || ($this->hostname == '')) {
 				$this->hostname = $hostname;
 			}
 		}
@@ -446,7 +718,7 @@ class App
 
 	public function get_path()
 	{
-		return $this->path;
+		return $this->urlpath;
 	}
 
 	public function set_pager_total($n)
@@ -531,6 +803,7 @@ class App
 			'$touch_icon'      => $touch_icon,
 			'$stylesheet'      => $stylesheet,
 			'$infinite_scroll' => $invinite_scroll,
+			'$block_public'    => intval(Config::get('system', 'block_public')),
 		]) . $this->page['htmlhead'];
 	}
 
@@ -751,7 +1024,7 @@ class App
 	 *
 	 * @return bool Is the limit reached?
 	 */
-	public function max_processes_reached()
+	public function isMaxProcessesReached()
 	{
 		// Deactivated, needs more investigating if this check really makes sense
 		return false;
@@ -773,7 +1046,7 @@ class App
 			}
 		}
 
-		$processlist = DBM::processlist();
+		$processlist = DBA::processlist();
 		if ($processlist['list'] != '') {
 			logger('Processcheck: Processes: ' . $processlist['amount'] . ' - Processlist: ' . $processlist['list'], LOGGER_DEBUG);
 
@@ -806,7 +1079,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);
 		}
@@ -831,7 +1108,7 @@ class App
 	 *
 	 * @return bool Is the load reached?
 	 */
-	public function maxload_reached()
+	public function isMaxLoadReached()
 	{
 		if ($this->is_backend()) {
 			$process = 'backend';
@@ -857,25 +1134,36 @@ class App
 		return false;
 	}
 
-	public function proc_run($args)
+	/**
+	 * Executes a child process with 'proc_open'
+	 *
+	 * @param string $command The command to execute
+	 * @param array  $args    Arguments to pass to the command ( [ 'key' => value, 'key2' => value2, ... ]
+	 */
+	public function proc_run($command, $args)
 	{
 		if (!function_exists('proc_open')) {
 			return;
 		}
 
-		array_unshift($args, ((x($this->config, 'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php'));
+		$cmdline = $this->getConfigValue('config', 'php_path', 'php') . ' ' . escapeshellarg($command);
 
-		for ($x = 0; $x < count($args); $x ++) {
-			$args[$x] = escapeshellarg($args[$x]);
+		foreach ($args as $key => $value) {
+			if (!is_null($value) && is_bool($value) && !$value) {
+				continue;
+			}
+
+			$cmdline .= ' --' . $key;
+			if (!is_null($value) && !is_bool($value)) {
+				$cmdline .= ' ' . $value;
+			}
 		}
 
-		$cmdline = implode(' ', $args);
-
 		if ($this->min_memory_reached()) {
 			return;
 		}
 
-		if (Config::get('system', 'proc_windows')) {
+		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
 			$resource = proc_open('cmd /c start /b ' . $cmdline, [], $foo, $this->get_basepath());
 		} else {
 			$resource = proc_open($cmdline . ' &', [], $foo, $this->get_basepath());
@@ -961,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
 	 *
@@ -976,6 +1278,10 @@ class App
 		if ($cat === 'config') {
 			$this->config[$k] = $value;
 		} else {
+			if (!isset($this->config[$cat])) {
+				$this->config[$cat] = [];
+			}
+
 			$this->config[$cat][$k] = $value;
 		}
 	}
@@ -1034,6 +1340,14 @@ class App
 		// Only arrays are serialized in database, so we have to unserialize sparingly
 		$value = is_string($v) && preg_match("|^a:[0-9]+:{.*}$|s", $v) ? unserialize($v) : $v;
 
+		if (!isset($this->config[$uid]) || !is_array($this->config[$uid])) {
+			$this->config[$uid] = [];
+		}
+
+		if (!isset($this->config[$uid][$cat]) || !is_array($this->config[$uid][$cat])) {
+			$this->config[$uid][$cat] = [];
+		}
+
 		$this->config[$uid][$cat][$k] = $value;
 	}
 
@@ -1071,21 +1385,6 @@ class App
 		return $sender_email;
 	}
 
-	/**
-	 * @note Checks, if the App is in the Maintenance-Mode
-	 *
-	 * @return boolean
-	 */
-	public function checkMaintenanceMode()
-	{
-		if (Config::get('system', 'maintenance')) {
-			$this->mode = App::MODE_MAINTENANCE;
-			return true;
-		}
-
-		return false;
-	}
-
 	/**
 	 * Returns the current theme name.
 	 *
@@ -1093,7 +1392,7 @@ class App
 	 */
 	public function getCurrentTheme()
 	{
-		if ($this->mode == App::MODE_INSTALL) {
+		if ($this->isInstallMode()) {
 			return '';
 		}
 
@@ -1127,17 +1426,18 @@ class App
 		if ($this->profile_uid && ($this->profile_uid != local_user())) {
 			// Allow folks to override user themes and always use their own on their own site.
 			// This works only if the user is on the same server
-			$user = dba::selectFirst('user', ['theme'], ['uid' => $this->profile_uid]);
-			if (DBM::is_result($user) && !PConfig::get(local_user(), 'system', 'always_my_theme')) {
+			$user = DBA::selectFirst('user', ['theme'], ['uid' => $this->profile_uid]);
+			if (DBA::isResult($user) && !PConfig::get(local_user(), 'system', 'always_my_theme')) {
 				$page_theme = $user['theme'];
 			}
 		}
 
-		$user_theme = defaults($_SESSION, 'theme', $system_theme);
+		$user_theme = Core\Session::get('theme', $system_theme);
+
 		// Specific mobile theme override
-		if (($this->is_mobile || $this->is_tablet) && defaults($_SESSION, 'show-mobile', true)) {
+		if (($this->is_mobile || $this->is_tablet) && Core\Session::get('show-mobile', true)) {
 			$system_mobile_theme = Config::get('system', 'mobile-theme');
-			$user_mobile_theme = defaults($_SESSION, 'mobile-theme', $system_mobile_theme);
+			$user_mobile_theme = Core\Session::get('mobile-theme', $system_mobile_theme);
 
 			// --- means same mobile theme as desktop
 			if (!empty($user_mobile_theme) && $user_mobile_theme !== '---') {
diff --git a/src/BaseModule.php b/src/BaseModule.php
index d0019ccd1..3ad4a4f05 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/BaseObject.php b/src/BaseObject.php
index 5adfe096d..6b64daccf 100644
--- a/src/BaseObject.php
+++ b/src/BaseObject.php
@@ -24,12 +24,10 @@ class BaseObject
 	 */
 	public static function getApp()
 	{
-		if (self::$app) {
-			return self::$app;
+		if (empty(self::$app)) {
+			self::$app = new App(dirname(__DIR__));
 		}
 
-		self::$app = get_app();
-
 		return self::$app;
 	}
 
@@ -40,7 +38,7 @@ class BaseObject
 	 *
 	 * @return void
 	 */
-	public static function setApp($app)
+	public static function setApp(App $app)
 	{
 		self::$app = $app;
 	}
diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 06972c36d..d5efecb80 100644
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -6,9 +6,8 @@ namespace Friendica\Content;
 
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
-use Friendica\Protocol\Diaspora;
-use dba;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 
 /**
  * @brief ContactSelector class
@@ -27,10 +26,10 @@ class ContactSelector
 
 		$o .= "<select id=\"contact-profile-selector\" class=\"form-control\" $disabled name=\"profile-assign\" >\r\n";
 
-		$s = dba::select('profile', ['id', 'profile-name', 'is-default'], ['uid' => $_SESSION['uid']]);
-		$r = dba::inArray($s);
+		$s = DBA::select('profile', ['id', 'profile-name', 'is-default'], ['uid' => $_SESSION['uid']]);
+		$r = DBA::toArray($s);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r as $rr) {
 				$selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : "");
 				$o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
@@ -76,23 +75,21 @@ class ContactSelector
 	public static function networkToName($s, $profile = "")
 	{
 		$nets = [
-			NETWORK_DFRN     => L10n::t('Friendica'),
-			NETWORK_OSTATUS  => L10n::t('OStatus'),
-			NETWORK_FEED     => L10n::t('RSS/Atom'),
-			NETWORK_MAIL     => L10n::t('Email'),
-			NETWORK_DIASPORA => L10n::t('Diaspora'),
-			NETWORK_FACEBOOK => L10n::t('Facebook'),
-			NETWORK_ZOT      => L10n::t('Zot!'),
-			NETWORK_LINKEDIN => L10n::t('LinkedIn'),
-			NETWORK_XMPP     => L10n::t('XMPP/IM'),
-			NETWORK_MYSPACE  => L10n::t('MySpace'),
-			NETWORK_GPLUS    => L10n::t('Google+'),
-			NETWORK_PUMPIO   => L10n::t('pump.io'),
-			NETWORK_TWITTER  => L10n::t('Twitter'),
-			NETWORK_DIASPORA2 => L10n::t('Diaspora Connector'),
-			NETWORK_STATUSNET => L10n::t('GNU Social Connector'),
-			NETWORK_PNUT      => L10n::t('pnut'),
-			NETWORK_APPNET => L10n::t('App.net')
+			Protocol::DFRN      => L10n::t('Friendica'),
+			Protocol::OSTATUS   => L10n::t('OStatus'),
+			Protocol::FEED      => L10n::t('RSS/Atom'),
+			Protocol::MAIL      => L10n::t('Email'),
+			Protocol::DIASPORA  => L10n::t('Diaspora'),
+			Protocol::ZOT       => L10n::t('Zot!'),
+			Protocol::LINKEDIN  => L10n::t('LinkedIn'),
+			Protocol::XMPP      => L10n::t('XMPP/IM'),
+			Protocol::MYSPACE   => L10n::t('MySpace'),
+			Protocol::GPLUS     => L10n::t('Google+'),
+			Protocol::PUMPIO    => L10n::t('pump.io'),
+			Protocol::TWITTER   => L10n::t('Twitter'),
+			Protocol::DIASPORA2 => L10n::t('Diaspora Connector'),
+			Protocol::STATUSNET => L10n::t('GNU Social Connector'),
+			Protocol::PNUT      => L10n::t('pnut'),
 		];
 
 		Addon::callHooks('network_to_name', $nets);
@@ -102,12 +99,12 @@ class ContactSelector
 
 		$networkname = str_replace($search, $replace, $s);
 
-		if ((in_array($s, [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) && ($profile != "")) {
-			$r = dba::fetch_first("SELECT `gserver`.`platform` FROM `gcontact`
+		if ((in_array($s, [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) && ($profile != "")) {
+			$r = DBA::fetchFirst("SELECT `gserver`.`platform` FROM `gcontact`
 					INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
 					WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));
 
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				$networkname = $r['platform'];
 			}
 		}
diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index cfd083f9f..35df0aee9 100644
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -5,12 +5,13 @@
  */
 namespace Friendica\Content;
 
-use Friendica\App;
+use Friendica\Core\Protocol;
 use Friendica\Content\Feature;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
-use dba;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/dba.php';
 
@@ -36,30 +37,34 @@ class ForumManager
 	 */
 	public static function getList($uid, $lastitem, $showhidden = true, $showprivate = false)
 	{
-		$forumlist = [];
-
-		$order = (($showhidden) ? '' : ' AND NOT `hidden` ');
-		$order .= (($lastitem) ? ' ORDER BY `last-item` DESC ' : ' ORDER BY `name` ASC ');
-		$select = '`forum` ';
-		if ($showprivate) {
-			$select = '(`forum` OR `prv`)';
+		if ($lastitem) {
+			$params = ['order' => ['last-item' => true]];
+		} else {
+			$params = ['order' => ['name']];
 		}
 
-		$contacts = dba::p(
-			"SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro`, `contact`.`thumb`
-			FROM `contact`
-				WHERE `network`= 'dfrn' AND $select AND `uid` = ?
-				AND NOT `blocked` AND NOT `pending` AND NOT `archive`
-				AND `success_update` > `failure_update`
-			$order ",
-			$uid
-		);
+		$condition_str = "`network` = ? AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `success_update` > `failure_update` AND ";
 
+		if ($showprivate) {
+			$condition_str .= '(`forum` OR `prv`)';
+		} else {
+			$condition_str .= '`forum`';
+		}
+
+		if (!$showhidden) {
+			$condition_str .=  ' AND NOT `hidden`';
+		}
+
+		$forumlist = [];
+
+		$fields = ['id', 'url', 'name', 'micro', 'thumb'];
+		$condition = [$condition_str, Protocol::DFRN, $uid];
+		$contacts = DBA::select('contact', $fields, $condition, $params);
 		if (!$contacts) {
 			return($forumlist);
 		}
 
-		while ($contact = dba::fetch($contacts)) {
+		while ($contact = DBA::fetch($contacts)) {
 			$forumlist[] = [
 				'url'	=> $contact['url'],
 				'name'	=> $contact['name'],
@@ -68,7 +73,7 @@ class ForumManager
 				'thumb' => $contact['thumb'],
 			];
 		}
-		dba::close($contacts);
+		DBA::close($contacts);
 
 		return($forumlist);
 	}
@@ -99,7 +104,7 @@ class ForumManager
 		$total = count($contacts);
 		$visible_forums = 10;
 
-		if (DBM::is_result($contacts)) {
+		if (DBA::isResult($contacts)) {
 			$id = 0;
 
 			foreach ($contacts as $contact) {
@@ -107,11 +112,11 @@ class ForumManager
 
 				$entry = [
 					'url' => 'network?f=&cid=' . $contact['id'],
-					'external_url' => 'redir/' . $contact['id'],
+					'external_url' => Contact::magicLink($contact['url']),
 					'name' => $contact['name'],
 					'cid' => $contact['id'],
 					'selected' 	=> $selected,
-					'micro' => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
+					'micro' => System::removedBaseUrl(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
 					'id' => ++$id,
 				];
 				$entries[] = $entry;
diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index b0fe8a14e..99decc92b 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -10,9 +10,9 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\Profile;
-use dba;
 
 require_once 'boot.php';
 require_once 'dba.php';
@@ -105,9 +105,9 @@ class Nav
 			$nav['usermenu'][] = ['notes/', L10n::t('Personal notes'), '', L10n::t('Your personal notes')];
 
 			// user info
-			$contact = dba::selectFirst('contact', ['micro'], ['uid' => $a->user['uid'], 'self' => true]);
+			$contact = DBA::selectFirst('contact', ['micro'], ['uid' => $a->user['uid'], 'self' => true]);
 			$userinfo = [
-				'icon' => (DBM::is_result($contact) ? $a->remove_baseurl($contact['micro']) : 'images/person-48.jpg'),
+				'icon' => (DBA::isResult($contact) ? $a->remove_baseurl($contact['micro']) : 'images/person-48.jpg'),
 				'name' => $a->user['username'],
 			];
 		} else {
@@ -124,7 +124,7 @@ class Nav
 			$nav['home'] = [$homelink, L10n::t('Home'), '', L10n::t('Home Page')];
 		}
 
-		if (($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user())) {
+		if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN && !local_user() && !remote_user()) {
 			$nav['register'] = ['register', L10n::t('Register'), '', L10n::t('Create an account')];
 		}
 
@@ -186,7 +186,7 @@ class Nav
 			$nav['home'] = ['profile/' . $a->user['nickname'], L10n::t('Home'), '', L10n::t('Your posts and conversations')];
 
 			// Don't show notifications for public communities
-			if ($_SESSION['page_flags'] != PAGE_COMMUNITY) {
+			if (defaults($_SESSION, 'page_flags', '') != Contact::PAGE_COMMUNITY) {
 				$nav['introductions'] = ['notifications/intros', L10n::t('Introductions'), '', L10n::t('Friend Requests')];
 				$nav['notifications'] = ['notifications',	L10n::t('Notifications'), '', L10n::t('Notifications')];
 				$nav['notifications']['all'] = ['notifications/system', L10n::t('See all notifications'), '', ''];
diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index b09fd2249..116120ab5 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -5,24 +5,23 @@
  */
 namespace Friendica\Content;
 
-use Friendica\Core\Addon;
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
-use Friendica\Util\ParseUrl;
-use dba;
 use DOMDocument;
 use DOMNode;
 use DOMText;
 use DOMXPath;
 use Exception;
+use Friendica\Core\Addon;
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
+use Friendica\Util\ParseUrl;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/dba.php';
-require_once 'mod/proxy.php';
 
 /**
  * Handles all OEmbed content fetching and replacement
@@ -32,7 +31,7 @@ require_once 'mod/proxy.php';
  *
  * @see https://oembed.com
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class OEmbed
 {
@@ -48,131 +47,132 @@ class OEmbed
 	/**
 	 * @brief Get data from an URL to embed its content.
 	 *
-	 * @param string $embedurl The URL from which the data should be fetched.
-	 * @param bool $no_rich_type If set to true rich type content won't be fetched.
+	 * @param string $embedurl     The URL from which the data should be fetched.
+	 * @param bool   $no_rich_type If set to true rich type content won't be fetched.
 	 *
-	 * @return bool|object Returns object with embed content or false if no embeddable
-	 * 	                   content exists
+	 * @return \Friendica\Object\OEmbed
 	 */
 	public static function fetchURL($embedurl, $no_rich_type = false)
 	{
-		$embedurl = trim($embedurl, "'");
-		$embedurl = trim($embedurl, '"');
+		$embedurl = trim($embedurl, '\'"');
 
 		$a = get_app();
 
+		$cache_key = 'oembed:' . $a->videowidth . ':' . $embedurl;
+
 		$condition = ['url' => normalise_link($embedurl), 'maxwidth' => $a->videowidth];
-		$oembed = dba::selectFirst('oembed', ['content'], $condition);
-		if (DBM::is_result($oembed)) {
-			$txt = $oembed["content"];
+		$oembed_record = DBA::selectFirst('oembed', ['content'], $condition);
+		if (DBA::isResult($oembed_record)) {
+			$json_string = $oembed_record['content'];
 		} else {
-			$txt = Cache::get($a->videowidth . $embedurl);
+			$json_string = Cache::get($cache_key);
 		}
+
 		// These media files should now be caught in bbcode.php
 		// left here as a fallback in case this is called from another source
-
-		$noexts = ["mp3", "mp4", "ogg", "ogv", "oga", "ogm", "webm"];
+		$noexts = ['mp3', 'mp4', 'ogg', 'ogv', 'oga', 'ogm', 'webm'];
 		$ext = pathinfo(strtolower($embedurl), PATHINFO_EXTENSION);
 
+		$oembed = new \Friendica\Object\OEmbed($embedurl);
 
-		if (is_null($txt)) {
-			$txt = "";
+		if ($json_string) {
+			$oembed->parseJSON($json_string);
+		} else {
+			$json_string = '';
 
 			if (!in_array($ext, $noexts)) {
 				// try oembed autodiscovery
 				$redirects = 0;
-				$html_text = Network::fetchUrl($embedurl, false, $redirects, 15, "text/*");
+				$html_text = Network::fetchUrl($embedurl, false, $redirects, 15, 'text/*');
 				if ($html_text) {
 					$dom = @DOMDocument::loadHTML($html_text);
 					if ($dom) {
 						$xpath = new DOMXPath($dom);
 						$entries = $xpath->query("//link[@type='application/json+oembed']");
 						foreach ($entries as $e) {
-							$href = $e->getAttributeNode("href")->nodeValue;
-							$txt = Network::fetchUrl($href . '&maxwidth=' . $a->videowidth);
+							$href = $e->getAttributeNode('href')->nodeValue;
+							$json_string = Network::fetchUrl($href . '&maxwidth=' . $a->videowidth);
 							break;
 						}
+
 						$entries = $xpath->query("//link[@type='text/json+oembed']");
 						foreach ($entries as $e) {
-							$href = $e->getAttributeNode("href")->nodeValue;
-							$txt = Network::fetchUrl($href . '&maxwidth=' . $a->videowidth);
+							$href = $e->getAttributeNode('href')->nodeValue;
+							$json_string = Network::fetchUrl($href . '&maxwidth=' . $a->videowidth);
 							break;
 						}
 					}
 				}
 			}
 
-			$txt = trim($txt);
+			$json_string = trim($json_string);
 
-			if (!$txt || $txt[0] != "{") {
-				$txt = '{"type":"error"}';
-			} else { //save in cache
-				$j = json_decode($txt);
-				if ($j->type != "error") {
-					dba::insert('oembed', [
-						'url' => normalise_link($embedurl),
-						'maxwidth' => $a->videowidth,
-						'content' => $txt,
-						'created' => DateTimeFormat::utcNow()
-					], true);
-				}
-
-				Cache::set($a->videowidth . $embedurl, $txt, CACHE_DAY);
+			if (!$json_string || $json_string[0] != '{') {
+				$json_string = '{"type":"error"}';
 			}
+
+			$oembed->parseJSON($json_string);
+
+			if (!empty($oembed->type) && $oembed->type != 'error') {
+				DBA::insert('oembed', [
+					'url' => normalise_link($embedurl),
+					'maxwidth' => $a->videowidth,
+					'content' => $json_string,
+					'created' => DateTimeFormat::utcNow()
+				], true);
+				$cache_ttl = CACHE_DAY;
+			} else {
+				$cache_ttl = CACHE_FIVE_MINUTES;
+			}
+
+			Cache::set($cache_key, $json_string, $cache_ttl);
 		}
 
-		$j = json_decode($txt);
-
-		if (!is_object($j)) {
-			return false;
+		if ($oembed->type == 'error') {
+			return $oembed;
 		}
 
 		// Always embed the SSL version
-		if (isset($j->html)) {
-			$j->html = str_replace(["http://www.youtube.com/", "http://player.vimeo.com/"], ["https://www.youtube.com/", "https://player.vimeo.com/"], $j->html);
-		}
-
-		$j->embedurl = $embedurl;
+		$oembed->html = str_replace(['http://www.youtube.com/', 'http://player.vimeo.com/'], ['https://www.youtube.com/', 'https://player.vimeo.com/'], $oembed->html);
 
 		// If fetching information doesn't work, then improve via internal functions
-		if ($no_rich_type && ($j->type == "rich")) {
+		if ($no_rich_type && ($oembed->type == 'rich')) {
 			$data = ParseUrl::getSiteinfoCached($embedurl, true, false);
-			$j->type = $data["type"];
+			$oembed->type = $data['type'];
 
-			if ($j->type == "photo") {
-				$j->url = $data["url"];
+			if ($oembed->type == 'photo') {
+				$oembed->url = $data['url'];
 			}
 
-			if (isset($data["title"])) {
-				$j->title = $data["title"];
+			if (isset($data['title'])) {
+				$oembed->title = $data['title'];
 			}
 
-			if (isset($data["text"])) {
-				$j->description = $data["text"];
+			if (isset($data['text'])) {
+				$oembed->description = $data['text'];
 			}
 
-			if (is_array($data["images"])) {
-				$j->thumbnail_url = $data["images"][0]["src"];
-				$j->thumbnail_width = $data["images"][0]["width"];
-				$j->thumbnail_height = $data["images"][0]["height"];
+			if (!empty($data['images'])) {
+				$oembed->thumbnail_url = $data['images'][0]['src'];
+				$oembed->thumbnail_width = $data['images'][0]['width'];
+				$oembed->thumbnail_height = $data['images'][0]['height'];
 			}
 		}
 
-		Addon::callHooks('oembed_fetch_url', $embedurl, $j);
+		Addon::callHooks('oembed_fetch_url', $embedurl, $oembed);
 
-		return $j;
+		return $oembed;
 	}
 
-	private static function formatObject($j)
+	private static function formatObject(\Friendica\Object\OEmbed $oembed)
 	{
-		$embedurl = $j->embedurl;
-		$jhtml = $j->html;
-		$ret = '<div class="oembed ' . $j->type . '">';
-		switch ($j->type) {
+		$ret = '<div class="oembed ' . $oembed->type . '">';
+
+		switch ($oembed->type) {
 			case "video":
-				if (isset($j->thumbnail_url)) {
-					$tw = (isset($j->thumbnail_width) && intval($j->thumbnail_width)) ? $j->thumbnail_width : 200;
-					$th = (isset($j->thumbnail_height) && intval($j->thumbnail_height)) ? $j->thumbnail_height : 180;
+				if ($oembed->thumbnail_url) {
+					$tw = (isset($oembed->thumbnail_width) && intval($oembed->thumbnail_width)) ? $oembed->thumbnail_width : 200;
+					$th = (isset($oembed->thumbnail_height) && intval($oembed->thumbnail_height)) ? $oembed->thumbnail_height : 180;
 					// make sure we don't attempt divide by zero, fallback is a 1:1 ratio
 					$tr = (($th) ? $tw / $th : 1);
 
@@ -181,63 +181,66 @@ class OEmbed
 					$tpl = get_markup_template('oembed_video.tpl');
 					$ret .= replace_macros($tpl, [
 						'$baseurl' => System::baseUrl(),
-						'$embedurl' => $embedurl,
-						'$escapedhtml' => base64_encode($jhtml),
+						'$embedurl' => $oembed->embed_url,
+						'$escapedhtml' => base64_encode($oembed->html),
 						'$tw' => $tw,
 						'$th' => $th,
-						'$turl' => $j->thumbnail_url,
+						'$turl' => $oembed->thumbnail_url,
 					]);
 				} else {
-					$ret = $jhtml;
+					$ret = $oembed->html;
 				}
 				break;
+
 			case "photo":
-				$ret .= '<img width="' . $j->width . '" src="' . proxy_url($j->url) . '">';
+				$ret .= '<img width="' . $oembed->width . '" src="' . ProxyUtils::proxifyUrl($oembed->url) . '">';
 				break;
+
 			case "link":
 				break;
+
 			case "rich":
-				$ret .= proxy_parse_html($jhtml);
+				$ret .= ProxyUtils::proxifyHtml($oembed->html);
 				break;
 		}
 
 		// add link to source if not present in "rich" type
-		if ($j->type != 'rich' || !strpos($j->html, $embedurl)) {
+		if ($oembed->type != 'rich' || !strpos($oembed->html, $oembed->embed_url)) {
 			$ret .= '<h4>';
-			if (!empty($j->title)) {
-				if (!empty($j->provider_name)) {
-					$ret .= $j->provider_name . ": ";
+			if (!empty($oembed->title)) {
+				if (!empty($oembed->provider_name)) {
+					$ret .= $oembed->provider_name . ": ";
 				}
 
-				$ret .= '<a href="' . $embedurl . '" rel="oembed">' . $j->title . '</a>';
-				if (!empty($j->author_name)) {
-					$ret .= ' (' . $j->author_name . ')';
+				$ret .= '<a href="' . $oembed->embed_url . '" rel="oembed">' . $oembed->title . '</a>';
+				if (!empty($oembed->author_name)) {
+					$ret .= ' (' . $oembed->author_name . ')';
 				}
-			} elseif (!empty($j->provider_name) || !empty($j->author_name)) {
+			} elseif (!empty($oembed->provider_name) || !empty($oembed->author_name)) {
 				$embedlink = "";
-				if (!empty($j->provider_name)) {
-					$embedlink .= $j->provider_name;
+				if (!empty($oembed->provider_name)) {
+					$embedlink .= $oembed->provider_name;
 				}
 
-				if (!empty($j->author_name)) {
+				if (!empty($oembed->author_name)) {
 					if ($embedlink != "") {
 						$embedlink .= ": ";
 					}
 
-					$embedlink .= $j->author_name;
+					$embedlink .= $oembed->author_name;
 				}
 				if (trim($embedlink) == "") {
-					$embedlink = $embedurl;
+					$embedlink = $oembed->embed_url;
 				}
 
-				$ret .= '<a href="' . $embedurl . '" rel="oembed">' . $embedlink . '</a>';
+				$ret .= '<a href="' . $oembed->embed_url . '" rel="oembed">' . $embedlink . '</a>';
 			} else {
-				$ret .= '<a href="' . $embedurl . '" rel="oembed">' . $embedurl . '</a>';
+				$ret .= '<a href="' . $oembed->embed_url . '" rel="oembed">' . $oembed->embed_url . '</a>';
 			}
 			$ret .= "</h4>";
-		} elseif (!strpos($j->html, $embedurl)) {
+		} elseif (!strpos($oembed->html, $oembed->embed_url)) {
 			// add <a> for html2bbcode conversion
-			$ret .= '<a href="' . $embedurl . '" rel="oembed">' . $j->title . '</a>';
+			$ret .= '<a href="' . $oembed->embed_url . '" rel="oembed">' . $oembed->title . '</a>';
 		}
 
 		$ret .= '</div>';
@@ -326,7 +329,7 @@ class OEmbed
 
 		$o = self::fetchURL($url, !self::isAllowedURL($url));
 
-		if (!is_object($o) || $o->type == 'error') {
+		if (!is_object($o) || property_exists($o, 'type') && $o->type == 'error') {
 			throw new Exception('OEmbed failed for URL: ' . $url);
 		}
 
diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 89a833d71..39de3c20e 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -145,8 +145,29 @@ class Smilies
 		return $params;
 	}
 
+
 	/**
-	 * @brief Replaces text emoticons with graphical images
+	 * Copied from http://php.net/manual/en/function.str-replace.php#88569
+	 * Modified for camel caps: renamed stro_replace -> strOrigReplace
+	 *
+	 * When using str_replace(...), values that did not exist in the original string (but were put there by previous
+	 * replacements) will be replaced continuously.  This string replacement function is designed to replace the values
+	 * in $search with those in $replace while not factoring in prior replacements.  Note that this function will
+	 * always look for the longest possible match first and then work its way down to individual characters.
+	 *
+	 * @param array $search list of strings or characters that need to be replaced
+	 * @param array $replace list of strings or characters that will replace the corresponding values in $search
+	 * @param string $subject the string on which this operation is being performed
+	 *
+	 * @return string $subject with all substrings in the $search array replaced by the values in the $replace array
+	 */
+	private static function strOrigReplace($search, $replace, $subject)
+	{
+		return strtr($subject, array_combine($search, $replace));
+	}
+
+	/**
+	 * Replaces text emoticons with graphical images
 	 *
 	 * It is expected that this function will be called using HTML text.
 	 * We will escape text between HTML pre and code blocks from being
@@ -156,53 +177,61 @@ class Smilies
 	 * function from being executed by the prepare_text() routine when preparing
 	 * bbcode source for HTML display
 	 *
+	 * @brief Replaces text emoticons with graphical images
 	 * @param string  $s         Text that should be replaced
-	 * @param boolean $sample    optional, default false
 	 * @param boolean $no_images Only replace emoticons without images
 	 *
-	 * @return string HML Output of the Smilie
+	 * @return string HTML Output of the Smilie
 	 */
-	public static function replace($s, $sample = false, $no_images = false)
+	public static function replace($s, $no_images = false)
+	{
+		$smilies = self::getList();
+
+		$s = self::replaceFromArray($s, $smilies, $no_images);
+
+		return $s;
+	}
+
+	/**
+	 * Replaces emoji shortcodes in a string from a structured array of searches and replaces.
+	 *
+	 * Depends on system.no_smilies config value, skips <pre> and <code> tags.
+	 *
+	 * @param string $text      An HTML string
+	 * @param array  $smilies   An string replacement array with the following structure: ['texts' => [], 'icons' => []]
+	 * @param bool   $no_images Only replace shortcodes without image replacement (e.g. Unicode characters)
+	 * @return string
+	 */
+	public static function replaceFromArray($text, array $smilies, $no_images = false)
 	{
 		if (intval(Config::get('system', 'no_smilies'))
 			|| (local_user() && intval(PConfig::get(local_user(), 'system', 'no_smilies')))
 		) {
-			return $s;
+			return $text;
 		}
 
-		$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism', 'self::encode', $s);
-		$s = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::encode', $s);
-
-		$params = self::getList();
+		$text = preg_replace_callback('/<pre>(.*?)<\/pre>/ism'  , 'self::encode', $text);
+		$text = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::encode', $text);
 
 		if ($no_images) {
 			$cleaned = ['texts' => [], 'icons' => []];
-			$icons = $params['icons'];
+			$icons = $smilies['icons'];
 			foreach ($icons as $key => $icon) {
 				if (!strstr($icon, '<img ')) {
-					$cleaned['texts'][] = $params['texts'][$key];
-					$cleaned['icons'][] = $params['icons'][$key];
+					$cleaned['texts'][] = $smilies['texts'][$key];
+					$cleaned['icons'][] = $smilies['icons'][$key];
 				}
 			}
-			$params = $cleaned;
+			$smilies = $cleaned;
 		}
 
-		$params['string'] = $s;
+		$text = preg_replace_callback('/&lt;(3+)/', 'self::pregHeart', $text);
+		$text = self::strOrigReplace($smilies['texts'], $smilies['icons'], $text);
 
-		if ($sample) {
-			$s = '<div class="smiley-sample">';
-			for ($x = 0; $x < count($params['texts']); $x ++) {
-				$s .= '<dl><dt>' . $params['texts'][$x] . '</dt><dd>' . $params['icons'][$x] . '</dd></dl>';
-			}
-		} else {
-			$params['string'] = preg_replace_callback('/&lt;(3+)/', 'self::pregHeart', $params['string']);
-			$s = str_replace($params['texts'], $params['icons'], $params['string']);
-		}
+		$text = preg_replace_callback('/<pre>(.*?)<\/pre>/ism', 'self::decode', $text);
+		$text = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::decode', $text);
 
-		$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism', 'self::decode', $s);
-		$s = preg_replace_callback('/<code>(.*?)<\/code>/ism', 'self::decode', $s);
-
-		return $s;
+		return $text;
 	}
 
 	/**
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 35f4979d1..c3453bcf7 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file src/Content/Text/BBCode.php
  */
@@ -16,7 +15,6 @@ use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Model\Contact;
@@ -26,9 +24,7 @@ use Friendica\Object\Image;
 use Friendica\Util\Map;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
-use League\HTMLToMarkdown\HtmlConverter;
-
-require_once "mod/proxy.php";
+use Friendica\Util\Proxy as ProxyUtils;
 
 class BBCode extends BaseObject
 {
@@ -89,7 +85,7 @@ class BBCode extends BaseObject
 					$post["url"] = $matches[1];
 					$post["title"] = $matches[2];
 				}
-				if (($post["url"] == "") && (in_array($post["type"], ["link", "video"]))
+				if (!empty($post["url"]) && (in_array($post["type"], ["link", "video"]))
 					&& preg_match("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $attacheddata, $matches)) {
 					$post["url"] = $matches[1];
 				}
@@ -351,7 +347,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);
 		}
@@ -363,7 +359,7 @@ class BBCode extends BaseObject
 	{
 		// Only send proxied pictures to API and for internal display
 		if (in_array($simplehtml, [false, 2])) {
-			return proxy_url($image);
+			return ProxyUtils::proxifyUrl($image);
 		} else {
 			return $image;
 		}
@@ -449,7 +445,7 @@ class BBCode extends BaseObject
 	 */
 	public static function limitBodySize($body)
 	{
-		$maxlen = get_max_import_size();
+		$maxlen = Config::get('config', 'max_import_size', 0);
 
 		// If the length of the body, including the embedded images, is smaller
 		// than the maximum, then don't waste time looking for the images
@@ -540,16 +536,18 @@ class BBCode extends BaseObject
 	private static function convertAttachment($return, $simplehtml = false, $tryoembed = true)
 	{
 		$data = self::getAttachmentData($return);
-		if (!$data) {
+		if (empty($data) || empty($data["url"])) {
 			return $return;
 		}
 
 		if (isset($data["title"])) {
 			$data["title"] = strip_tags($data["title"]);
 			$data["title"] = str_replace(["http://", "https://"], "", $data["title"]);
+		} else {
+			$data["title"] = null;
 		}
 
-		if (((strpos($data["text"], "[img=") !== false) || (strpos($data["text"], "[img]") !== false) || Config::get('system', 'always_show_preview')) && ($data["image"] != "")) {
+		if (((strpos($data["text"], "[img=") !== false) || (strpos($data["text"], "[img]") !== false) || Config::get('system', 'always_show_preview')) && !empty($data["image"])) {
 			$data["preview"] = $data["image"];
 			$data["image"] = "";
 		}
@@ -567,28 +565,32 @@ class BBCode extends BaseObject
 					throw new Exception('OEmbed is disabled for this attachment.');
 				}
 			} catch (Exception $e) {
+				$data["title"] = defaults($data, 'title', $data['url']);
+
 				if ($simplehtml != 4) {
 					$return = sprintf('<div class="type-%s">', $data["type"]);
 				}
 
-				if ($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 ($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"]);
+				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 (($data["type"] == "photo") && ($data["url"] != "") && ($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 {
-					$return .= sprintf('<h4><a href="%s">%s</a></h4>', $data['url'], $data['title']);
-				}
-
-				if ($data["description"] != "" && $data["description"] != $data["title"]) {
+				if (!empty($data["description"]) && $data["description"] != $data["title"]) {
 					// Sanitize the HTML by converting it to BBCode
 					$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));
 				}
 
@@ -598,7 +600,7 @@ class BBCode extends BaseObject
 			}
 		}
 
-		return trim($data["text"] . ' ' . $return . ' ' . $data["after"]);
+		return trim(defaults($data, 'text', '') . ' ' . $return . ' ' . defaults($data, 'after', ''));
 	}
 
 	public static function removeShareInformation($Text, $plaintext = false, $nolink = false)
@@ -608,10 +610,10 @@ class BBCode extends BaseObject
 		if (!$data) {
 			return $Text;
 		} elseif ($nolink) {
-			return $data["text"] . $data["after"];
+			return $data["text"] . defaults($data, 'after', '');
 		}
 
-		$title = htmlentities($data["title"], ENT_QUOTES, 'UTF-8', false);
+		$title = htmlentities(defaults($data, 'title', ''), ENT_QUOTES, 'UTF-8', false);
 		$text = htmlentities($data["text"], ENT_QUOTES, 'UTF-8', false);
 		if ($plaintext || (($title != "") && strstr($text, $title))) {
 			$data["title"] = $data["url"];
@@ -625,15 +627,15 @@ class BBCode extends BaseObject
 		}
 
 		// If the link already is included in the post, don't add it again
-		if (($data["url"] != "") && strpos($data["text"], $data["url"])) {
+		if (!empty($data["url"]) && strpos($data["text"], $data["url"])) {
 			return $data["text"] . $data["after"];
 		}
 
 		$text = $data["text"];
 
-		if (($data["url"] != "") && ($data["title"] != "")) {
+		if (!empty($data["url"]) && !empty($data["title"])) {
 			$text .= "\n[url=" . $data["url"] . "]" . $data["title"] . "[/url]";
-		} elseif (($data["url"] != "")) {
+		} elseif (!empty($data["url"])) {
 			$text .= "\n[url]" . $data["url"] . "[/url]";
 		}
 
@@ -1002,16 +1004,13 @@ class BBCode extends BaseObject
 			case 5:
 				$text = $preshare . html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . ' ' . $userid_compact . ": <br />" . $share[3];
 				break;
-			case 6: // app.net
-				$text = $preshare . "&gt;&gt; @" . $userid_compact . ": <br />" . $share[3];
-				break;
 			case 7: // statusnet/GNU Social
 				$text = $preshare . html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . " @" . $userid_compact . ": " . $share[3];
 				break;
 			case 8: // twitter
 				$text = $preshare . "RT @" . $userid_compact . ": " . $share[3];
 				break;
-			case 9: // Google+/Facebook
+			case 9: // Google+
 				$text = $preshare . html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8') . ' ' . $userid_compact . ": <br />" . $share[3];
 
 				if ($link != "") {
@@ -1031,7 +1030,7 @@ class BBCode extends BaseObject
 				} else {
 					$text = trim($share[1]) . "\n";
 
-					$avatar = proxy_url($avatar, false, PROXY_SIZE_THUMB);
+					$avatar = ProxyUtils::proxifyUrl($avatar, false, ProxyUtils::SIZE_THUMB);
 
 					$tpl = get_markup_template('shared_content.tpl');
 					$text .= replace_macros($tpl, [
@@ -1164,21 +1163,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
 	 *
@@ -1188,11 +1172,11 @@ class BBCode extends BaseObject
 	 * Simple HTML values meaning:
 	 * - 0: Friendica display
 	 * - 1: Unused
-	 * - 2: Used for Facebook, Google+, Windows Phone push, Friendica API
+	 * - 2: Used for Google+, Windows Phone push, Friendica API
 	 * - 3: Used before converting to Markdown in bb2diaspora.php
 	 * - 4: Used for WordPress, Libertree (before Markdown), pump.io and tumblr
 	 * - 5: Unused
-	 * - 6: Used for Appnet
+	 * - 6: Unused
 	 * - 7: Used for dfrn, OStatus
 	 * - 8: Used for WP backlink text setting
 	 *
@@ -1227,6 +1211,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 +1273,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
@@ -1380,6 +1375,13 @@ class BBCode extends BaseObject
 			}, $text
 		);
 
+		$text = preg_replace_callback(
+			"&\[url=/people\?q\=(.*)\](.*)\[\/url\]&Usi",
+			function ($match) {
+				return "[url=" . System::baseUrl() . "/search?search=%40" . $match[1] . "]" . $match[2] . "[/url]";
+			}, $text
+		);
+
 		// Server independent link to posts and comments
 		// See issue: https://github.com/diaspora/diaspora_federation/issues/75
 		$expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
@@ -1764,6 +1766,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.
@@ -1898,23 +1912,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);
@@ -1944,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);
@@ -1968,18 +1964,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 896db876f..c256717a1 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
 {
@@ -122,7 +123,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) . ']';
 
@@ -131,7 +132,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
@@ -520,7 +521,7 @@ class HTML
 
 			// A list of some links that should be ignored
 			$list = ["/user/", "/tag/", "/group/", "/profile/", "/search?search=", "/search?tag=", "mailto:", "/u/", "/node/",
-				"//facebook.com/profile.php?id=", "//plus.google.com/", "//twitter.com/"];
+				"//plus.google.com/", "//twitter.com/"];
 			foreach ($list as $listitem) {
 				if (strpos($treffer[1], $listitem) !== false) {
 					$ignore = true;
@@ -549,8 +550,6 @@ class HTML
 
 	public static function toPlaintext($html, $wraplength = 75, $compact = false)
 	{
-		global $lang;
-
 		$message = str_replace("\r", "", $html);
 
 		$doc = new DOMDocument();
@@ -674,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;
+	}
 }
diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index ac598d0fc..0687b5377 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
 {
@@ -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");
@@ -53,6 +54,10 @@ class Markdown extends BaseObject
 
 		$data = Contact::getDetailsByAddr($match[2]);
 
+		if (empty($data)) {
+			return;
+		}
+
 		$name = $match[1];
 
 		if ($name == '') {
diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 04dfbb8e0..f245f0d95 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -10,12 +10,12 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
-use dba;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -49,7 +49,7 @@ class Widget
 		if (Config::get('system', 'invitation_only')) {
 			$x = PConfig::get(local_user(), 'system', 'invites_remaining');
 			if ($x || is_site_admin()) {
-				$a->page['aside'] .= '<div class="side-link" id="side-invite-remain">'
+				$a->page['aside'] .= '<div class="side-link widget" id="side-invite-remain">'
 					. L10n::tt('%d invitation available', '%d invitations available', $x)
 					. '</div>';
 			}
@@ -80,38 +80,31 @@ class Widget
 	 */
 	public static function unavailableNetworks()
 	{
-		$networks = array();
-
-		if (!Addon::isEnabled("appnet")) {
-			$networks[] = NETWORK_APPNET;
-		}
-
-		if (!Addon::isEnabled("fbpost") && !Addon::isEnabled("facebook")) {
-			$networks[] = NETWORK_FACEBOOK;
-		}
+		// Always hide content from these networks
+		$networks = ['face', 'apdn'];
 
 		if (!Addon::isEnabled("statusnet")) {
-			$networks[] = NETWORK_STATUSNET;
+			$networks[] = Protocol::STATUSNET;
 		}
 
 		if (!Addon::isEnabled("pumpio")) {
-			$networks[] = NETWORK_PUMPIO;
+			$networks[] = Protocol::PUMPIO;
 		}
 
 		if (!Addon::isEnabled("twitter")) {
-			$networks[] = NETWORK_TWITTER;
+			$networks[] = Protocol::TWITTER;
 		}
 
 		if (Config::get("system", "ostatus_disabled")) {
-			$networks[] = NETWORK_OSTATUS;
+			$networks[] = Protocol::OSTATUS;
 		}
 
 		if (!Config::get("system", "diaspora_enabled")) {
-			$networks[] = NETWORK_DIASPORA;
+			$networks[] = Protocol::DIASPORA;
 		}
 
 		if (!Addon::isEnabled("pnut")) {
-			$networks[] = NETWORK_PNUT;
+			$networks[] = Protocol::PNUT;
 		}
 
 		if (!sizeof($networks)) {
@@ -143,18 +136,18 @@ class Widget
 
 		$extra_sql = self::unavailableNetworks();
 
-		$r = dba::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND `network` != '' $extra_sql ORDER BY `network`",
+		$r = DBA::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND `network` != '' $extra_sql ORDER BY `network`",
 			local_user()
 		);
 
 		$nets = array();
-		while ($rr = dba::fetch($r)) {
+		while ($rr = DBA::fetch($r)) {
 			/// @TODO If 'network' is not there, this triggers an E_NOTICE
 			if ($rr['network']) {
 				$nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
 			}
 		}
-		dba::close($r);
+		DBA::close($r);
 
 		if (count($nets) < 2) {
 			return '';
@@ -264,7 +257,7 @@ class Widget
 
 		$cid = $zcid = 0;
 
-		if (is_array($_SESSION['remote'])) {
+		if (!empty($_SESSION['remote'])) {
 			foreach ($_SESSION['remote'] as $visitor) {
 				if ($visitor['uid'] == $profile_uid) {
 					$cid = $visitor['cid'];
@@ -275,13 +268,13 @@ class Widget
 
 		if (!$cid) {
 			if (Profile::getMyURL()) {
-				$contact = dba::selectFirst('contact', ['id'],
+				$contact = DBA::selectFirst('contact', ['id'],
 						['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $profile_uid]);
-				if (DBM::is_result($contact)) {
+				if (DBA::isResult($contact)) {
 					$cid = $contact['id'];
 				} else {
-					$gcontact = dba::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
-					if (DBM::is_result($gcontact)) {
+					$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
+					if (DBA::isResult($gcontact)) {
 						$zcid = $gcontact['id'];
 					}
 				}
diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php
index 0e85e16c4..2c21b2f0d 100644
--- a/src/Content/Widget/CalendarExport.php
+++ b/src/Content/Widget/CalendarExport.php
@@ -27,6 +27,10 @@ class CalendarExport
 	public static function getHTML() {
 		$a = get_app();
 
+		if (empty($a->data['user'])) {
+			return;
+		}
+
 		$owner_uid = $a->data['user']['uid'];
 
 		// The permission testing is a little bit tricky because we have to respect many cases.
diff --git a/src/Content/Widget/TagCloud.php b/src/Content/Widget/TagCloud.php
index 19ea3eea0..71872830c 100644
--- a/src/Content/Widget/TagCloud.php
+++ b/src/Content/Widget/TagCloud.php
@@ -6,10 +6,9 @@
 
 namespace Friendica\Content\Widget;
 
-use dba;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 require_once 'include/security.php';
@@ -38,7 +37,7 @@ class TagCloud
 		$o = '';
 		$r = self::tagadelic($uid, $count, $owner_id, $flags, $type);
 		if (count($r)) {
-			$contact = dba::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
+			$contact = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
 			$url = System::removedBaseUrl($contact['url']);
 
 			foreach ($r as $rr) {
@@ -74,7 +73,6 @@ class TagCloud
 	 */
 	private static function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG)
 	{
-		$item_condition = item_condition();
 		$sql_options = item_permissions_sql($uid);
 		$limit = $count ? sprintf('LIMIT %d', intval($count)) : '';
 
@@ -89,17 +87,18 @@ class TagCloud
 		}
 
 		// Fetch tags
-		$r = dba::p("SELECT `term`, COUNT(`term`) AS `total` FROM `term`
+		$r = DBA::p("SELECT `term`, COUNT(`term`) AS `total` FROM `term`
 			LEFT JOIN `item` ON `term`.`oid` = `item`.`id`
 			WHERE `term`.`uid` = ? AND `term`.`type` = ?
 			AND `term`.`otype` = ?
-			AND $item_condition $sql_options
+			AND `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
+			$sql_options
 			GROUP BY `term` ORDER BY `total` DESC $limit",
 			$uid,
 			$type,
 			TERM_OBJ_POST
 		);
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return [];
 		}
 
diff --git a/src/Core/ACL.php b/src/Core/ACL.php
index 4e8bf6abd..ffe11363f 100644
--- a/src/Core/ACL.php
+++ b/src/Core/ACL.php
@@ -6,32 +6,18 @@
 
 namespace Friendica\Core;
 
-use dba;
 use Friendica\BaseObject;
 use Friendica\Content\Feature;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Util\Network;
-use const CONTACT_IS_FRIEND;
-use const NETWORK_DFRN;
-use const NETWORK_DIASPORA;
-use const NETWORK_FACEBOOK;
-use const NETWORK_MAIL;
-use const NETWORK_OSTATUS;
-use const PHP_EOL;
-use function dbesc;
-use function defaults;
-use function get_markup_template;
-use function get_server;
-use function local_user;
-use function remote_user;
-use function replace_macros;
 
 /**
  * Handle ACL management and display
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class ACL extends BaseObject
 {
@@ -61,22 +47,21 @@ class ACL extends BaseObject
 
 		switch (defaults($options, 'networks', Protocol::PHANTOM)) {
 			case 'DFRN_ONLY':
-				$networks = [NETWORK_DFRN];
+				$networks = [Protocol::DFRN];
 				break;
+
 			case 'PRIVATE':
-				if (!empty($a->user['prvnets'])) {
-					$networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA];
-				} else {
-					$networks = [NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA];
-				}
+				$networks = [Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA];
 				break;
+
 			case 'TWO_WAY':
 				if (!empty($a->user['prvnets'])) {
-					$networks = [NETWORK_DFRN, NETWORK_MAIL, NETWORK_DIASPORA];
+					$networks = [Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA];
 				} else {
-					$networks = [NETWORK_DFRN, NETWORK_FACEBOOK, NETWORK_MAIL, NETWORK_DIASPORA, NETWORK_OSTATUS];
+					$networks = [Protocol::DFRN, Protocol::MAIL, Protocol::DIASPORA, Protocol::OSTATUS];
 				}
 				break;
+
 			default: /// @TODO Maybe log this call?
 				break;
 		}
@@ -90,7 +75,7 @@ class ACL extends BaseObject
 		$sql_extra = '';
 
 		if (!empty($x['mutual'])) {
-			$sql_extra .= sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
+			$sql_extra .= sprintf(" AND `rel` = %d ", intval(Contact::FRIEND));
 		}
 
 		if (!empty($x['exclude'])) {
@@ -100,7 +85,7 @@ class ACL extends BaseObject
 		if (!empty($x['networks'])) {
 			/// @TODO rewrite to foreach()
 			array_walk($x['networks'], function (&$value) {
-				$value = "'" . dbesc($value) . "'";
+				$value = "'" . DBA::escape($value) . "'";
 			});
 			$str_nets = implode(',', $x['networks']);
 			$sql_extra .= " AND `network` IN ( $str_nets ) ";
@@ -114,20 +99,20 @@ class ACL extends BaseObject
 			$o .= "<select name=\"{$selname}[]\" id=\"$selclass\" class=\"$selclass\" multiple=\"multiple\" size=\"" . $x['size'] . "$\" $tabindex >\r\n";
 		}
 
-		$stmt = dba::p("SELECT `id`, `name`, `url`, `network` FROM `contact`
+		$stmt = DBA::p("SELECT `id`, `name`, `url`, `network` FROM `contact`
 			WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
 			$sql_extra
 			ORDER BY `name` ASC ", intval(local_user())
 		);
 
-		$contacts = dba::inArray($stmt);
+		$contacts = DBA::toArray($stmt);
 
 		$arr = ['contact' => $contacts, 'entry' => $o];
 
 		// e.g. 'network_pre_contact_deny', 'profile_pre_contact_allow'
 		Addon::callHooks($a->module . '_pre_' . $selname, $arr);
 
-		if (DBM::is_result($contacts)) {
+		if (DBA::isResult($contacts)) {
 			foreach ($contacts as $contact) {
 				if (in_array($contact['id'], $preselected)) {
 					$selected = ' selected="selected" ';
@@ -166,8 +151,8 @@ class ACL extends BaseObject
 
 		// When used for private messages, we limit correspondence to mutual DFRN/Friendica friends and the selector
 		// to one recipient. By default our selector allows multiple selects amongst all contacts.
-		$sql_extra = sprintf(" AND `rel` = %d ", intval(CONTACT_IS_FRIEND));
-		$sql_extra .= sprintf(" AND `network` IN ('%s' , '%s') ", NETWORK_DFRN, NETWORK_DIASPORA);
+		$sql_extra = sprintf(" AND `rel` = %d ", intval(Contact::FRIEND));
+		$sql_extra .= sprintf(" AND `network` IN ('%s' , '%s') ", Protocol::DFRN, Protocol::DIASPORA);
 
 		$tabindex_attr = !empty($tabindex) ? ' tabindex="' . intval($tabindex) . '"' : '';
 
@@ -179,13 +164,13 @@ class ACL extends BaseObject
 
 		$o .= "<select name=\"$selname\" id=\"$selclass\" class=\"$selclass\" size=\"$size\"$tabindex_attr$hidepreselected>\r\n";
 
-		$stmt = dba::p("SELECT `id`, `name`, `url`, `network` FROM `contact`
+		$stmt = DBA::p("SELECT `id`, `name`, `url`, `network` FROM `contact`
 			WHERE `uid` = ? AND NOT `self` AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `notify` != ''
 			$sql_extra
 			ORDER BY `name` ASC ", intval(local_user())
 		);
 
-		$contacts = dba::inArray($stmt);
+		$contacts = DBA::toArray($stmt);
 
 		$arr = ['contact' => $contacts, 'entry' => $o];
 
@@ -194,7 +179,7 @@ class ACL extends BaseObject
 
 		$receiverlist = [];
 
-		if (DBM::is_result($contacts)) {
+		if (DBA::isResult($contacts)) {
 			foreach ($contacts as $contact) {
 				if (in_array($contact['id'], $preselected)) {
 					$selected = ' selected="selected"';
@@ -266,13 +251,17 @@ class ACL extends BaseObject
 	/**
 	 * Return the full jot ACL selector HTML
 	 *
-	 * @param array $user
+	 * @param array $user                User array
+	 * @param array $default_permissions Static defaults permission array: ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']
 	 * @param bool  $show_jotnets
 	 * @return string
 	 */
-	public static function getFullSelectorHTML(array $user = null, $show_jotnets = false)
+	public static function getFullSelectorHTML(array $user, $show_jotnets = false, array $default_permissions = [])
 	{
-		$perms = self::getDefaultUserPermissions($user);
+		// Defaults user permissions
+		if (empty($default_permissions)) {
+			$default_permissions = self::getDefaultUserPermissions($user);
+		}
 
 		$jotnets = '';
 		if ($show_jotnets) {
@@ -282,14 +271,14 @@ class ACL extends BaseObject
 			$pubmail_enabled = false;
 
 			if (!$imap_disabled) {
-				$mailacct = dba::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', local_user()]);
-				if (DBM::is_result($mailacct)) {
+				$mailacct = DBA::selectFirst('mailacct', ['pubmail'], ['`uid` = ? AND `server` != ""', local_user()]);
+				if (DBA::isResult($mailacct)) {
 					$mail_enabled = true;
 					$pubmail_enabled = !empty($mailacct['pubmail']);
 				}
 			}
 
-			if (empty($user['hidewall'])) {
+			if (empty($default_permissions['hidewall'])) {
 				if ($mail_enabled) {
 					$selected = $pubmail_enabled ? ' checked="checked"' : '';
 					$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> ' . L10n::t("Post to Email") . '</div>';
@@ -307,10 +296,10 @@ class ACL extends BaseObject
 			'$showall' => L10n::t('Visible to everybody'),
 			'$show' => L10n::t('show'),
 			'$hide' => L10n::t('don\'t show'),
-			'$allowcid' => json_encode($perms['allow_cid']),
-			'$allowgid' => json_encode($perms['allow_gid']),
-			'$denycid' => json_encode($perms['deny_cid']),
-			'$denygid' => json_encode($perms['deny_gid']),
+			'$allowcid' => json_encode(defaults($default_permissions, 'allow_cid', '')),
+			'$allowgid' => json_encode(defaults($default_permissions, 'allow_gid', '')),
+			'$denycid' => json_encode(defaults($default_permissions, 'deny_cid', '')),
+			'$denygid' => json_encode(defaults($default_permissions, 'deny_gid', '')),
 			'$networks' => $show_jotnets,
 			'$emailcc' => L10n::t('CC: email addresses'),
 			'$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
@@ -335,7 +324,7 @@ class ACL extends BaseObject
 	 */
 	public static function contactAutocomplete($search, $mode)
 	{
-		if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
+		if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
 			return [];
 		}
 
diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 50247d240..4c20c96ad 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -4,11 +4,8 @@
  */
 namespace Friendica\Core;
 
-use Friendica\Core\Config;
-use Friendica\Database\DBM;
-use Friendica\Core\Worker;
-
-use dba;
+use Friendica\App;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 
@@ -26,7 +23,7 @@ class Addon
 	public static function uninstall($addon)
 	{
 		logger("Addons: uninstalling " . $addon);
-		dba::delete('addon', ['name' => $addon]);
+		DBA::delete('addon', ['name' => $addon]);
 
 		@include_once('addon/' . $addon . '/' . $addon . '.php');
 		if (function_exists($addon . '_uninstall')) {
@@ -57,7 +54,7 @@ class Addon
 
 			$addon_admin = (function_exists($addon."_addon_admin") ? 1 : 0);
 
-			dba::insert('addon', ['name' => $addon, 'installed' => true,
+			DBA::insert('addon', ['name' => $addon, 'installed' => true,
 						'timestamp' => $t, 'plugin_admin' => $addon_admin]);
 
 			// we can add the following with the previous SQL
@@ -65,7 +62,7 @@ class Addon
 			// This way the system won't fall over dead during the update.
 
 			if (file_exists('addon/' . $addon . '/.hidden')) {
-				dba::update('addon', ['hidden' => true], ['name' => $addon]);
+				DBA::update('addon', ['hidden' => true], ['name' => $addon]);
 			}
 			return true;
 		} else {
@@ -81,9 +78,9 @@ class Addon
 	{
 		$addons = Config::get('system', 'addon');
 		if (strlen($addons)) {
-			$r = dba::select('addon', [], ['installed' => 1]);
-			if (DBM::is_result($r)) {
-				$installed = dba::inArray($r);
+			$r = DBA::select('addon', [], ['installed' => 1]);
+			if (DBA::isResult($r)) {
+				$installed = DBA::toArray($r);
 			} else {
 				$installed = [];
 			}
@@ -110,7 +107,7 @@ class Addon
 									$func = $addon . '_install';
 									$func();
 								}
-								dba::update('addon', ['timestamp' => $t], ['id' => $i['id']]);
+								DBA::update('addon', ['timestamp' => $t], ['id' => $i['id']]);
 							}
 						}
 					}
@@ -127,7 +124,7 @@ class Addon
 	 */
 	public static function isEnabled($addon)
 	{
-		return dba::exists('addon', ['installed' => true, 'name' => $addon]);
+		return DBA::exists('addon', ['installed' => true, 'name' => $addon]);
 	}
 
 
@@ -142,13 +139,15 @@ class Addon
 	 */
 	public static function registerHook($hook, $file, $function, $priority = 0)
 	{
+		$file = str_replace(get_app()->get_basepath() . DIRECTORY_SEPARATOR, '', $file);
+
 		$condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
-		$exists = dba::exists('hook', $condition);
+		$exists = DBA::exists('hook', $condition);
 		if ($exists) {
 			return true;
 		}
 
-		$r = dba::insert('hook', ['hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority]);
+		$r = DBA::insert('hook', ['hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority]);
 
 		return $r;
 	}
@@ -163,8 +162,14 @@ class Addon
 	 */
 	public static function unregisterHook($hook, $file, $function)
 	{
+		$relative_file = str_replace(get_app()->get_basepath() . DIRECTORY_SEPARATOR, '', $file);
+
+		// This here is only needed for fixing a problem that existed on the develop branch
 		$condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
-		$r = dba::delete('hook', $condition);
+		DBA::delete('hook', $condition);
+
+		$condition = ['hook' => $hook, 'file' => $relative_file, 'function' => $function];
+		$r = DBA::delete('hook', $condition);
 		return $r;
 	}
 
@@ -175,15 +180,15 @@ class Addon
 	{
 		$a = get_app();
 		$a->hooks = [];
-		$r = dba::select('hook', ['hook', 'file', 'function'], [], ['order' => ['priority' => 'desc', 'file']]);
+		$r = DBA::select('hook', ['hook', 'file', 'function'], [], ['order' => ['priority' => 'desc', 'file']]);
 
-		while ($rr = dba::fetch($r)) {
+		while ($rr = DBA::fetch($r)) {
 			if (! array_key_exists($rr['hook'], $a->hooks)) {
 				$a->hooks[$rr['hook']] = [];
 			}
 			$a->hooks[$rr['hook']][] = [$rr['file'],$rr['function']];
 		}
-		dba::close($r);
+		DBA::close($r);
 	}
 
 	/**
@@ -228,12 +233,12 @@ class Addon
 	/**
 	 * @brief Calls a single hook.
 	 *
-	 * @param \Friendica\App $a
+	 * @param App $a
 	 * @param string         $name of the hook to call
 	 * @param array          $hook Hook data
 	 * @param string|array   &$data to transmit to the callback handler
 	 */
-	public static function callSingleHook(\Friendica\App $a, $name, $hook, &$data = null)
+	public static function callSingleHook(App $a, $name, $hook, &$data = null)
 	{
 		// Don't run a theme's hook if the user isn't using the theme
 		if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/' . $a->getCurrentTheme()) === false) {
@@ -247,7 +252,7 @@ class Addon
 		} else {
 			// remove orphan hooks
 			$condition = ['hook' => $name, 'file' => $hook[0], 'function' => $hook[1]];
-			dba::delete('hook', $condition, ['cascade' => false]);
+			DBA::delete('hook', $condition, ['cascade' => false]);
 		}
 	}
 
@@ -314,7 +319,12 @@ class Addon
 			foreach ($ll as $l) {
 				$l = trim($l, "\t\n\r */");
 				if ($l != "") {
-					list($type, $v) = array_map("trim", explode(":", $l, 2));
+					$addon_info = array_map("trim", explode(":", $l, 2));
+					if (count($addon_info) < 2) {
+						continue;
+					}
+
+					list($type, $v) = $addon_info;
 					$type = strtolower($type);
 					if ($type == "author" || $type == "maintainer") {
 						$r = preg_match("|([^<]+)<([^>]+)>|", $v, $m);
diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index f1d1e11a5..cc77d9bfd 100644
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -4,8 +4,7 @@
  */
 namespace Friendica\Core;
 
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
+use Friendica\Core\Cache\CacheDriverFactory;
 
 /**
  * @brief Class for storing data for a short time
@@ -24,25 +23,13 @@ class Cache extends \Friendica\BaseObject
 	/**
 	 * @var Cache\ICacheDriver
 	 */
-	static $driver = null;
+	private static $driver = null;
 
 	public static function init()
 	{
-		switch(Config::get('system', 'cache_driver', 'database')) {
-			case 'memcache':
-				$memcache_host = Config::get('system', 'memcache_host', '127.0.0.1');
-				$memcache_port = Config::get('system', 'memcache_port', 11211);
+		$driver_name = Config::get('system', 'cache_driver', 'database');
 
-				self::$driver = new Cache\MemcacheCacheDriver($memcache_host, $memcache_port);
-				break;
-			case 'memcached':
-				$memcached_hosts = Config::get('system', 'memcached_hosts', [['127.0.0.1', 11211]]);
-
-				self::$driver = new Cache\MemcachedCacheDriver($memcached_hosts);
-				break;
-			default:
-				self::$driver = new Cache\DatabaseCacheDriver();
-		}
+		self::$driver = CacheDriverFactory::create($driver_name);
 	}
 
 	/**
diff --git a/src/Core/Cache/AbstractCacheDriver.php b/src/Core/Cache/AbstractCacheDriver.php
new file mode 100644
index 000000000..15b822dc3
--- /dev/null
+++ b/src/Core/Cache/AbstractCacheDriver.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Friendica\Core\Cache;
+use Friendica\BaseObject;
+
+
+/**
+ * Abstract class for common used functions
+ *
+ * Class AbstractCacheDriver
+ *
+ * @package Friendica\Core\Cache
+ */
+abstract class AbstractCacheDriver extends BaseObject
+{
+	/**
+	 * @param string $key	The original key
+	 * @return string		The cache key used for the cache
+	 */
+	protected function getCacheKey($key) {
+		// We fetch with the hostname as key to avoid problems with other applications
+		return self::getApp()->get_hostname() . ":" . $key;
+	}
+}
diff --git a/src/Core/Cache/ArrayCache.php b/src/Core/Cache/ArrayCache.php
new file mode 100644
index 000000000..b19828714
--- /dev/null
+++ b/src/Core/Cache/ArrayCache.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Friendica\Core\Cache;
+
+
+use Friendica\Core\Cache;
+
+/**
+ * Implementation of the IMemoryCacheDriver mainly for testing purpose
+ *
+ * Class ArrayCache
+ *
+ * @package Friendica\Core\Cache
+ */
+class ArrayCache extends AbstractCacheDriver implements IMemoryCacheDriver
+{
+	use TraitCompareDelete;
+
+	/** @var array Array with the cached data */
+	protected $cachedData = array();
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function get($key)
+	{
+		if (isset($this->cachedData[$key])) {
+			return $this->cachedData[$key];
+		}
+		return null;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function set($key, $value, $ttl = Cache::FIVE_MINUTES)
+	{
+		$this->cachedData[$key] = $value;
+		return true;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function delete($key)
+	{
+		unset($this->cachedData[$key]);
+		return true;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function clear($outdated = true)
+	{
+		$this->cachedData = [];
+		return true;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
+	{
+		if (isset($this->cachedData[$key])) {
+			return false;
+		} else {
+			return $this->set($key, $value, $ttl);
+		}
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function compareSet($key, $oldValue, $newValue, $ttl = Cache::FIVE_MINUTES)
+	{
+		if ($this->get($key) === $oldValue) {
+			return $this->set($key, $newValue);
+		} else {
+			return false;
+		}
+	}
+}
diff --git a/src/Core/Cache/CacheDriverFactory.php b/src/Core/Cache/CacheDriverFactory.php
new file mode 100644
index 000000000..307f52a2e
--- /dev/null
+++ b/src/Core/Cache/CacheDriverFactory.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Friendica\Core\Cache;
+
+use Friendica\Core\Config;
+
+/**
+ * Class CacheDriverFactory
+ *
+ * @package Friendica\Core\Cache
+ *
+ * A basic class to generate a CacheDriver
+ */
+class CacheDriverFactory
+{
+	/**
+	 * This method creates a CacheDriver for the given cache driver name
+	 *
+	 * @param string $driver The name of the cache driver
+	 * @return ICacheDriver  The instance of the CacheDriver
+	 * @throws \Exception    The exception if something went wrong during the CacheDriver creation
+	 */
+	public static function create($driver) {
+
+		switch ($driver) {
+			case 'memcache':
+				$memcache_host = Config::get('system', 'memcache_host');
+				$memcache_port = Config::get('system', 'memcache_port');
+
+				return new MemcacheCacheDriver($memcache_host, $memcache_port);
+				break;
+
+			case 'memcached':
+				$memcached_hosts = Config::get('system', 'memcached_hosts');
+
+				return new MemcachedCacheDriver($memcached_hosts);
+				break;
+			case 'redis':
+				$redis_host = Config::get('system', 'redis_host');
+				$redis_port = Config::get('system', 'redis_port');
+
+				return new RedisCacheDriver($redis_host, $redis_port);
+				break;
+			default:
+				return new DatabaseCacheDriver();
+		}
+	}
+}
diff --git a/src/Core/Cache/DatabaseCacheDriver.php b/src/Core/Cache/DatabaseCacheDriver.php
index 7248e0b34..ca4842a46 100644
--- a/src/Core/Cache/DatabaseCacheDriver.php
+++ b/src/Core/Cache/DatabaseCacheDriver.php
@@ -2,23 +2,22 @@
 
 namespace Friendica\Core\Cache;
 
-use dba;
 use Friendica\Core\Cache;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
 /**
  * Database Cache Driver
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-class DatabaseCacheDriver implements ICacheDriver
+class DatabaseCacheDriver extends AbstractCacheDriver implements ICacheDriver
 {
 	public function get($key)
 	{
-		$cache = dba::selectFirst('cache', ['v'], ['`k` = ? AND `expires` >= ?', $key, DateTimeFormat::utcNow()]);
+		$cache = DBA::selectFirst('cache', ['v'], ['`k` = ? AND `expires` >= ?', $key, DateTimeFormat::utcNow()]);
 
-		if (DBM::is_result($cache)) {
+		if (DBA::isResult($cache)) {
 			$cached = $cache['v'];
 			$value = @unserialize($cached);
 
@@ -33,24 +32,28 @@ class DatabaseCacheDriver implements ICacheDriver
 		return null;
 	}
 
-	public function set($key, $value, $duration = Cache::MONTH)
+	public function set($key, $value, $ttl = Cache::FIVE_MINUTES)
 	{
 		$fields = [
 			'v'       => serialize($value),
-			'expires' => DateTimeFormat::utc('now + ' . $duration . ' seconds'),
+			'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds'),
 			'updated' => DateTimeFormat::utcNow()
 		];
 
-		return dba::update('cache', $fields, ['k' => $key], true);
+		return DBA::update('cache', $fields, ['k' => $key], true);
 	}
 
 	public function delete($key)
 	{
-		return dba::delete('cache', ['k' => $key]);
+		return DBA::delete('cache', ['k' => $key]);
 	}
 
-	public function clear()
+	public function clear($outdated = true)
 	{
-		return dba::delete('cache', ['`expires` < NOW()']);
+		if ($outdated) {
+			return DBA::delete('cache', ['`expires` < NOW()']);
+		} else {
+			return DBA::delete('cache', ['`k` IS NOT NULL ']);
+		}
 	}
 }
diff --git a/src/Core/Cache/ICacheDriver.php b/src/Core/Cache/ICacheDriver.php
index be896edf7..9ddcf5ad1 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
 {
@@ -25,17 +25,16 @@ interface ICacheDriver
 	 *
 	 * @param string  $key      The cache key
 	 * @param mixed   $value    The value to store
-	 * @param integer $duration The cache lifespan, must be one of the Cache constants
+	 * @param integer $ttl The cache lifespan, must be one of the Cache constants
 	 *
 	 * @return bool
 	 */
-	public function set($key, $value, $duration = Cache::MONTH);
-
+	public function set($key, $value, $ttl = Cache::FIVE_MINUTES);
 
 	/**
 	 * Delete a key from the cache
 	 *
-	 * @param string $key
+	 * @param string $key      The cache key
 	 *
 	 * @return bool
 	 */
@@ -43,8 +42,9 @@ interface ICacheDriver
 
 	/**
 	 * Remove outdated data from the cache
+	 * @param  boolean $outdated just remove outdated values
 	 *
 	 * @return bool
 	 */
-	public function clear();
+	public function clear($outdated = true);
 }
diff --git a/src/Core/Cache/IMemoryCacheDriver.php b/src/Core/Cache/IMemoryCacheDriver.php
new file mode 100644
index 000000000..a50e2d1d4
--- /dev/null
+++ b/src/Core/Cache/IMemoryCacheDriver.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Friendica\Core\Cache;
+use Friendica\Core\Cache;
+
+/**
+ * This interface defines methods for Memory-Caches only
+ *
+ * Interface IMemoryCacheDriver
+ *
+ * @package Friendica\Core\Cache
+ */
+interface IMemoryCacheDriver extends ICacheDriver
+{
+	/**
+	 * Sets a value if it's not already stored
+	 *
+	 * @param string $key      The cache key
+	 * @param mixed  $value    The old value we know from the cache
+	 * @param int    $ttl      The cache lifespan, must be one of the Cache constants
+	 * @return bool
+	 */
+	public function add($key, $value, $ttl = Cache::FIVE_MINUTES);
+
+	/**
+	 * Compares if the old value is set and sets the new value
+	 *
+	 * @param string $key         The cache key
+	 * @param mixed  $oldValue    The old value we know from the cache
+	 * @param mixed  $newValue    The new value we want to set
+	 * @param int    $ttl      	   The cache lifespan, must be one of the Cache constants
+	 *
+	 * @return bool
+	 */
+	public function compareSet($key, $oldValue, $newValue, $ttl = Cache::FIVE_MINUTES);
+
+	/**
+	 * Compares if the old value is set and removes it
+	 *
+	 * @param string $key          The cache key
+	 * @param mixed  $value        The old value we know and want to delete
+	 * @return bool
+	 */
+	public function compareDelete($key, $value);
+}
diff --git a/src/Core/Cache/MemcacheCacheDriver.php b/src/Core/Cache/MemcacheCacheDriver.php
index 1537be25b..4ca5aa38d 100644
--- a/src/Core/Cache/MemcacheCacheDriver.php
+++ b/src/Core/Cache/MemcacheCacheDriver.php
@@ -2,16 +2,21 @@
 
 namespace Friendica\Core\Cache;
 
-use Friendica\BaseObject;
 use Friendica\Core\Cache;
 
+use Exception;
+use Memcache;
+
 /**
  * Memcache Cache Driver
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-class MemcacheCacheDriver extends BaseObject implements ICacheDriver
+class MemcacheCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 {
+	use TraitCompareSet;
+	use TraitCompareDelete;
+
 	/**
 	 * @var Memcache
 	 */
@@ -20,22 +25,26 @@ class MemcacheCacheDriver extends BaseObject implements ICacheDriver
 	public function __construct($memcache_host, $memcache_port)
 	{
 		if (!class_exists('Memcache', false)) {
-			throw new \Exception('Memcache class isn\'t available');
+			throw new Exception('Memcache class isn\'t available');
 		}
 
-		$this->memcache = new \Memcache();
+		$this->memcache = new Memcache();
 
 		if (!$this->memcache->connect($memcache_host, $memcache_port)) {
-			throw new \Exception('Expected Memcache server at ' . $memcache_host . ':' . $memcache_port . ' isn\'t available');
+			throw new Exception('Expected Memcache server at ' . $memcache_host . ':' . $memcache_port . ' isn\'t available');
 		}
 	}
 
+	/**
+	 * (@inheritdoc)
+	 */
 	public function get($key)
 	{
 		$return = null;
+		$cachekey = $this->getCacheKey($key);
 
 		// We fetch with the hostname as key to avoid problems with other applications
-		$cached = $this->memcache->get(self::getApp()->get_hostname() . ':' . $key);
+		$cached = $this->memcache->get($cachekey);
 
 		// @see http://php.net/manual/en/memcache.get.php#84275
 		if (is_bool($cached) || is_double($cached) || is_long($cached)) {
@@ -54,24 +63,57 @@ class MemcacheCacheDriver extends BaseObject implements ICacheDriver
 		return $return;
 	}
 
-	public function set($key, $value, $duration = Cache::MONTH)
+	/**
+	 * (@inheritdoc)
+	 */
+	public function set($key, $value, $ttl = Cache::FIVE_MINUTES)
 	{
+		$cachekey = $this->getCacheKey($key);
+
 		// We store with the hostname as key to avoid problems with other applications
-		return $this->memcache->set(
-			self::getApp()->get_hostname() . ":" . $key,
-			serialize($value),
-			MEMCACHE_COMPRESSED,
-			time() + $duration
-		);
+		if ($ttl > 0) {
+			return $this->memcache->set(
+				$cachekey,
+				serialize($value),
+				MEMCACHE_COMPRESSED,
+				time() + $ttl
+			);
+		} else {
+			return $this->memcache->set(
+				$cachekey,
+				serialize($value),
+				MEMCACHE_COMPRESSED
+			);
+		}
 	}
 
+	/**
+	 * (@inheritdoc)
+	 */
 	public function delete($key)
 	{
-		return $this->memcache->delete($key);
+		$cachekey = $this->getCacheKey($key);
+		return $this->memcache->delete($cachekey);
 	}
 
-	public function clear()
+	/**
+	 * (@inheritdoc)
+	 */
+	public function clear($outdated = true)
 	{
-		return true;
+		if ($outdated) {
+			return true;
+		} else {
+			return $this->memcache->flush();
+		}
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
+	{
+		$cachekey = $this->getCacheKey($key);
+		return $this->memcache->add($cachekey, serialize($value), MEMCACHE_COMPRESSED, $ttl);
 	}
 }
diff --git a/src/Core/Cache/MemcachedCacheDriver.php b/src/Core/Cache/MemcachedCacheDriver.php
index 78a4a6bdf..9e9c00f0b 100644
--- a/src/Core/Cache/MemcachedCacheDriver.php
+++ b/src/Core/Cache/MemcachedCacheDriver.php
@@ -2,69 +2,118 @@
 
 namespace Friendica\Core\Cache;
 
-use Friendica\BaseObject;
 use Friendica\Core\Cache;
 
+use Exception;
+use Memcached;
+
 /**
  * Memcached Cache Driver
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-class MemcachedCacheDriver extends BaseObject implements ICacheDriver
+class MemcachedCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
 {
+	use TraitCompareSet;
+	use TraitCompareDelete;
+
 	/**
-	 * @var Memcached
+	 * @var \Memcached
 	 */
 	private $memcached;
 
+	/**
+	 * Due to limitations of the INI format, the expected configuration for Memcached servers is the following:
+	 * array {
+	 *   0 => "hostname, port(, weight)",
+	 *   1 => ...
+	 * }
+	 *
+	 * @param array $memcached_hosts
+	 * @throws \Exception
+	 */
 	public function __construct(array $memcached_hosts)
 	{
 		if (!class_exists('Memcached', false)) {
-			throw new \Exception('Memcached class isn\'t available');
+			throw new Exception('Memcached class isn\'t available');
 		}
 
-		$this->memcached = new \Memcached();
+		$this->memcached = new Memcached();
+
+		array_walk($memcached_hosts, function (&$value) {
+			if (is_string($value)) {
+				$value = array_map('trim', explode(',', $value));
+			}
+		});
 
 		$this->memcached->addServers($memcached_hosts);
 
 		if (count($this->memcached->getServerList()) == 0) {
-			throw new \Exception('Expected Memcached servers aren\'t available, config:' . var_export($memcached_hosts, true));
+			throw new Exception('Expected Memcached servers aren\'t available, config:' . var_export($memcached_hosts, true));
 		}
 	}
 
 	public function get($key)
 	{
 		$return = null;
+		$cachekey = $this->getCacheKey($key);
 
 		// We fetch with the hostname as key to avoid problems with other applications
-		$value = $this->memcached->get(self::getApp()->get_hostname() . ':' . $key);
+		$value = $this->memcached->get($cachekey);
 
-		if ($this->memcached->getResultCode() === \Memcached::RES_SUCCESS) {
+		if ($this->memcached->getResultCode() === Memcached::RES_SUCCESS) {
 			$return = $value;
 		}
 
 		return $return;
 	}
 
-	public function set($key, $value, $duration = Cache::MONTH)
+	public function set($key, $value, $ttl = Cache::FIVE_MINUTES)
 	{
+		$cachekey = $this->getCacheKey($key);
+
 		// We store with the hostname as key to avoid problems with other applications
-		return $this->memcached->set(
-			self::getApp()->get_hostname() . ':' . $key,
-			$value,
-			time() + $duration
-		);
+		if ($ttl > 0) {
+			return $this->memcached->set(
+				$cachekey,
+				$value,
+				$ttl
+			);
+		} else {
+			return $this->memcached->set(
+				$cachekey,
+				$value
+			);
+		}
+
 	}
 
 	public function delete($key)
 	{
-		$return = $this->memcached->delete(self::getApp()->get_hostname() . ':' . $key);
-
-		return $return;
+		$cachekey = $this->getCacheKey($key);
+		return $this->memcached->delete($cachekey);
 	}
 
-	public function clear()
+	public function clear($outdated = true)
 	{
-		return true;
+		if ($outdated) {
+			return true;
+		} else {
+			return $this->memcached->flush();
+		}
+	}
+
+	/**
+	 * @brief Sets a value if it's not already stored
+	 *
+	 * @param string $key      The cache key
+	 * @param mixed  $value    The old value we know from the cache
+	 * @param int    $ttl      The cache lifespan, must be one of the Cache constants
+	 * @return bool
+	 */
+	public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
+	{
+		$cachekey = $this->getCacheKey($key);
+		return $this->memcached->add($cachekey, $value, $ttl);
 	}
 }
diff --git a/src/Core/Cache/RedisCacheDriver.php b/src/Core/Cache/RedisCacheDriver.php
new file mode 100644
index 000000000..2c2a3e5d7
--- /dev/null
+++ b/src/Core/Cache/RedisCacheDriver.php
@@ -0,0 +1,148 @@
+<?php
+
+namespace Friendica\Core\Cache;
+
+use Friendica\Core\Cache;
+
+use Exception;
+use Redis;
+
+/**
+ * Redis Cache Driver. This driver is based on Memcache driver
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ * @author Roland Haeder <roland@mxchange.org>
+ */
+class RedisCacheDriver extends AbstractCacheDriver implements IMemoryCacheDriver
+{
+	/**
+	 * @var Redis
+	 */
+	private $redis;
+
+	public function __construct($redis_host, $redis_port)
+	{
+		if (!class_exists('Redis', false)) {
+			throw new Exception('Redis class isn\'t available');
+		}
+
+		$this->redis = new Redis();
+
+		if (!$this->redis->connect($redis_host, $redis_port)) {
+			throw new Exception('Expected Redis server at ' . $redis_host . ':' . $redis_port . ' isn\'t available');
+		}
+	}
+
+	public function get($key)
+	{
+		$return = null;
+		$cachekey = $this->getCacheKey($key);
+
+		$cached = $this->redis->get($cachekey);
+		if ($cached === false && !$this->redis->exists($cachekey)) {
+			return null;
+		}
+
+		$value = unserialize($cached);
+
+		// Only return a value if the serialized value is valid.
+		// We also check if the db entry is a serialized
+		// boolean 'false' value (which we want to return).
+		if ($cached === serialize(false) || $value !== false) {
+			$return = $value;
+		}
+
+		return $return;
+	}
+
+	public function set($key, $value, $ttl = Cache::FIVE_MINUTES)
+	{
+		$cachekey = $this->getCacheKey($key);
+
+		$cached = serialize($value);
+
+		if ($ttl > 0) {
+			return $this->redis->setex(
+				$cachekey,
+				$ttl,
+				$cached
+			);
+		} else {
+			return $this->redis->set(
+				$cachekey,
+				$cached
+			);
+		}
+	}
+
+	public function delete($key)
+	{
+		$cachekey = $this->getCacheKey($key);
+		return ($this->redis->delete($cachekey) > 0);
+	}
+
+	public function clear($outdated = true)
+	{
+		if ($outdated) {
+			return true;
+		} else {
+			return $this->redis->flushAll();
+		}
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function add($key, $value, $ttl = Cache::FIVE_MINUTES)
+	{
+		$cachekey = $this->getCacheKey($key);
+		$cached = serialize($value);
+
+		return $this->redis->setnx($cachekey, $cached);
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function compareSet($key, $oldValue, $newValue, $ttl = Cache::FIVE_MINUTES)
+	{
+		$cachekey = $this->getCacheKey($key);
+
+		$newCached = serialize($newValue);
+
+		$this->redis->watch($cachekey);
+		// If the old value isn't what we expected, somebody else changed the key meanwhile
+		if ($this->get($key) === $oldValue) {
+			if ($ttl > 0) {
+				$result = $this->redis->multi()
+					->setex($cachekey, $ttl, $newCached)
+					->exec();
+			} else {
+				$result = $this->redis->multi()
+					->set($cachekey, $newValue)
+					->exec();
+			}
+			return $result !== false;
+		}
+		$this->redis->unwatch();
+		return false;
+	}
+	/**
+	 * (@inheritdoc)
+	 */
+	public function compareDelete($key, $value)
+	{
+		$cachekey = $this->getCacheKey($key);
+
+		$this->redis->watch($cachekey);
+		// If the old value isn't what we expected, somebody else changed the key meanwhile
+		if ($this->get($key) === $value) {
+			$result = $this->redis->multi()
+				->del($cachekey)
+				->exec();
+			return $result !== false;
+		}
+		$this->redis->unwatch();
+		return false;
+	}
+}
diff --git a/src/Core/Cache/TraitCompareDelete.php b/src/Core/Cache/TraitCompareDelete.php
new file mode 100644
index 000000000..ef59f69cd
--- /dev/null
+++ b/src/Core/Cache/TraitCompareDelete.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Friendica\Core\Cache;
+
+use Friendica\Core\Cache;
+
+/**
+ * Trait TraitCompareSetDelete
+ *
+ * This Trait is to compensate non native "exclusive" sets/deletes in caches
+ *
+ * @package Friendica\Core\Cache
+ */
+trait TraitCompareDelete
+{
+	abstract public function get($key);
+
+	abstract public function set($key, $value, $ttl = Cache::FIVE_MINUTES);
+
+	abstract public function delete($key);
+
+	abstract public function add($key, $value, $ttl = Cache::FIVE_MINUTES);
+
+	/**
+	 * NonNative - Compares if the old value is set and removes it
+	 *
+	 * @param string $key          The cache key
+	 * @param mixed  $value        The old value we know and want to delete
+	 * @return bool
+	 */
+	public function compareDelete($key, $value) {
+		if ($this->add($key . "_lock", true)) {
+			if ($this->get($key) === $value) {
+				$this->delete($key);
+				$this->delete($key . "_lock");
+				return true;
+			} else {
+				$this->delete($key . "_lock");
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
+}
diff --git a/src/Core/Cache/TraitCompareSet.php b/src/Core/Cache/TraitCompareSet.php
new file mode 100644
index 000000000..77a602835
--- /dev/null
+++ b/src/Core/Cache/TraitCompareSet.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Friendica\Core\Cache;
+
+use Friendica\Core\Cache;
+
+/**
+ * Trait TraitCompareSetDelete
+ *
+ * This Trait is to compensate non native "exclusive" sets/deletes in caches
+ *
+ * @package Friendica\Core\Cache
+ */
+trait TraitCompareSet
+{
+	abstract public function get($key);
+
+	abstract public function set($key, $value, $ttl = Cache::FIVE_MINUTES);
+
+	abstract public function delete($key);
+
+	abstract public function add($key, $value, $ttl = Cache::FIVE_MINUTES);
+
+	/**
+	 * NonNative - Compares if the old value is set and sets the new value
+	 *
+	 * @param string $key         The cache key
+	 * @param mixed  $oldValue    The old value we know from the cache
+	 * @param mixed  $newValue    The new value we want to set
+	 * @param int    $ttl      The cache lifespan, must be one of the Cache constants
+	 *
+	 * @return bool
+	 */
+	public function compareSet($key, $oldValue, $newValue, $ttl = Cache::FIVE_MINUTES) {
+		if ($this->add($key . "_lock", true)) {
+			if ($this->get($key) === $oldValue) {
+				$this->set($key, $newValue, $ttl);
+				$this->delete($key . "_lock");
+				return true;
+ 			} else {
+				$this->delete($key . "_lock");
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
+}
diff --git a/src/Core/Config.php b/src/Core/Config.php
index 3c1d3245f..f71522d06 100644
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -8,6 +8,7 @@
  */
 namespace Friendica\Core;
 
+use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Core\Config;
 
@@ -29,6 +30,11 @@ class Config extends BaseObject
 
 	public static function init()
 	{
+		// Database isn't ready or populated yet
+		if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+			return;
+		}
+
 		if (self::getApp()->getConfigValue('system', 'config_adapter') == 'preload') {
 			self::$adapter = new Config\PreloadConfigAdapter();
 		} else {
@@ -48,6 +54,11 @@ class Config extends BaseObject
 	 */
 	public static function load($family = "config")
 	{
+		// Database isn't ready or populated yet
+		if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+			return;
+		}
+
 		if (empty(self::$adapter)) {
 			self::init();
 		}
@@ -76,6 +87,11 @@ class Config extends BaseObject
 	 */
 	public static function get($family, $key, $default_value = null, $refresh = false)
 	{
+		// Database isn't ready or populated yet, fallback to file config
+		if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+			return self::getApp()->getConfigValue($family, $key, $default_value);
+		}
+
 		if (empty(self::$adapter)) {
 			self::init();
 		}
@@ -95,10 +111,15 @@ class Config extends BaseObject
 	 * @param string $key    The configuration key to set
 	 * @param mixed  $value  The value to store
 	 *
-	 * @return mixed Stored $value or false if the database update failed
+	 * @return bool Operation success
 	 */
 	public static function set($family, $key, $value)
 	{
+		// Database isn't ready or populated yet
+		if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+			return false;
+		}
+
 		if (empty(self::$adapter)) {
 			self::init();
 		}
@@ -119,6 +140,11 @@ class Config extends BaseObject
 	 */
 	public static function delete($family, $key)
 	{
+		// Database isn't ready or populated yet
+		if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+			return false;
+		}
+
 		if (empty(self::$adapter)) {
 			self::init();
 		}
diff --git a/src/Core/Config/IConfigAdapter.php b/src/Core/Config/IConfigAdapter.php
index d1bb60033..f9af253c0 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
 {
@@ -53,7 +53,7 @@ interface IConfigAdapter
 	 * @param string $key    The configuration key to set
 	 * @param mixed  $value  The value to store
 	 *
-	 * @return mixed Stored $value or false if the database update failed
+	 * @return bool Operation success
 	 */
 	public function set($cat, $k, $value);
 
diff --git a/src/Core/Config/IPConfigAdapter.php b/src/Core/Config/IPConfigAdapter.php
index a0f0c9a94..b91241843 100644
--- a/src/Core/Config/IPConfigAdapter.php
+++ b/src/Core/Config/IPConfigAdapter.php
@@ -57,7 +57,7 @@ interface IPConfigAdapter
 	 * @param string $k     The configuration key to set
 	 * @param string $value The value to store
 	 *
-	 * @return mixed Stored $value or false
+	 * @return bool Operation success
 	 */
 	public function set($uid, $cat, $k, $value);
 
diff --git a/src/Core/Config/JITConfigAdapter.php b/src/Core/Config/JITConfigAdapter.php
index 0e7731690..b985d91c2 100644
--- a/src/Core/Config/JITConfigAdapter.php
+++ b/src/Core/Config/JITConfigAdapter.php
@@ -1,9 +1,8 @@
 <?php
 namespace Friendica\Core\Config;
 
-use dba;
 use Friendica\BaseObject;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 
@@ -12,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
 {
@@ -27,8 +26,8 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
 			return;
 		}
 
-		$configs = dba::select('config', ['v', 'k'], ['cat' => $cat]);
-		while ($config = dba::fetch($configs)) {
+		$configs = DBA::select('config', ['v', 'k'], ['cat' => $cat]);
+		while ($config = DBA::fetch($configs)) {
 			$k = $config['k'];
 
 			self::getApp()->setConfigValue($cat, $k, $config['v']);
@@ -38,7 +37,7 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
 				$this->in_db[$cat][$k] = true;
 			}
 		}
-		dba::close($configs);
+		DBA::close($configs);
 	}
 
 	public function get($cat, $k, $default_value = null, $refresh = false)
@@ -56,8 +55,8 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
 			}
 		}
 
-		$config = dba::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
-		if (DBM::is_result($config)) {
+		$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
+		if (DBA::isResult($config)) {
 			// manage array value
 			$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
 
@@ -66,11 +65,17 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
 			$this->in_db[$cat][$k] = true;
 			return $value;
 		} elseif (isset($a->config[$cat][$k])) {
-			// Assign the value (mostly) from the .htconfig.php to the cache
+			// Assign the value (mostly) from config/local.ini.php file to the cache
 			$this->cache[$cat][$k] = $a->config[$cat][$k];
 			$this->in_db[$cat][$k] = false;
 
 			return $a->config[$cat][$k];
+		} elseif (isset($a->config[$k])) {
+			// Assign the value (mostly) from config/local.ini.php file to the cache
+			$this->cache[$k] = $a->config[$k];
+			$this->in_db[$k] = false;
+
+			return $a->config[$k];
 		}
 
 		$this->cache[$cat][$k] = '!<unset>!';
@@ -90,6 +95,13 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
 
 		$stored = $this->get($cat, $k, null, true);
 
+		if (!isset($this->in_db[$cat])) {
+			$this->in_db[$cat] = [];
+		}
+		if (!isset($this->in_db[$cat][$k])) {
+			$this->in_db[$cat] = false;
+		}
+
 		if (($stored === $dbvalue) && $this->in_db[$cat][$k]) {
 			return true;
 		}
@@ -102,11 +114,10 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
 		// manage array value
 		$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
 
-		$result = dba::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
+		$result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
 
 		if ($result) {
 			$this->in_db[$cat][$k] = true;
-			return $value;
 		}
 
 		return $result;
@@ -119,7 +130,7 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
 			unset($this->in_db[$cat][$k]);
 		}
 
-		$result = dba::delete('config', ['cat' => $cat, 'k' => $k]);
+		$result = DBA::delete('config', ['cat' => $cat, 'k' => $k]);
 
 		return $result;
 	}
diff --git a/src/Core/Config/JITPConfigAdapter.php b/src/Core/Config/JITPConfigAdapter.php
index ce9c5b646..512004b50 100644
--- a/src/Core/Config/JITPConfigAdapter.php
+++ b/src/Core/Config/JITPConfigAdapter.php
@@ -1,9 +1,8 @@
 <?php
 namespace Friendica\Core\Config;
 
-use dba;
 use Friendica\BaseObject;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 
@@ -12,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
 {
@@ -22,9 +21,9 @@ class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
 	{
 		$a = self::getApp();
 
-		$pconfigs = dba::select('pconfig', ['v', 'k'], ['cat' => $cat, 'uid' => $uid]);
-		if (DBM::is_result($pconfigs)) {
-			while ($pconfig = dba::fetch($pconfigs)) {
+		$pconfigs = DBA::select('pconfig', ['v', 'k'], ['cat' => $cat, 'uid' => $uid]);
+		if (DBA::isResult($pconfigs)) {
+			while ($pconfig = DBA::fetch($pconfigs)) {
 				$k = $pconfig['k'];
 
 				self::getApp()->setPConfigValue($uid, $cat, $k, $pconfig['v']);
@@ -35,7 +34,7 @@ class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
 			// Negative caching
 			$a->config[$uid][$cat] = "!<unset>!";
 		}
-		dba::close($pconfigs);
+		DBA::close($pconfigs);
 	}
 
 	public function get($uid, $cat, $k, $default_value = null, $refresh = false)
@@ -58,8 +57,8 @@ class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
 			}
 		}
 
-		$pconfig = dba::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
-		if (DBM::is_result($pconfig)) {
+		$pconfig = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
+		if (DBA::isResult($pconfig)) {
 			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']);
 
 			self::getApp()->setPConfigValue($uid, $cat, $k, $val);
@@ -94,11 +93,10 @@ class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
 		// manage array value
 		$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
 
-		$result = dba::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $k], true);
+		$result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $k], true);
 
 		if ($result) {
 			$this->in_db[$uid][$cat][$k] = true;
-			return $value;
 		}
 
 		return $result;
@@ -112,7 +110,7 @@ class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
 			unset($this->in_db[$uid][$cat][$k]);
 		}
 
-		$result = dba::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
+		$result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
 
 		return $result;
 	}
diff --git a/src/Core/Config/PreloadConfigAdapter.php b/src/Core/Config/PreloadConfigAdapter.php
index 204e46294..67cf30845 100644
--- a/src/Core/Config/PreloadConfigAdapter.php
+++ b/src/Core/Config/PreloadConfigAdapter.php
@@ -2,11 +2,9 @@
 
 namespace Friendica\Core\Config;
 
-use dba;
 use Exception;
-use Friendica\App;
 use Friendica\BaseObject;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 
@@ -15,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
 {
@@ -32,11 +30,11 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
 			return;
 		}
 
-		$configs = dba::select('config', ['cat', 'v', 'k']);
-		while ($config = dba::fetch($configs)) {
+		$configs = DBA::select('config', ['cat', 'v', 'k']);
+		while ($config = DBA::fetch($configs)) {
 			self::getApp()->setConfigValue($config['cat'], $config['k'], $config['v']);
 		}
-		dba::close($configs);
+		DBA::close($configs);
 
 		$this->config_loaded = true;
 	}
@@ -44,8 +42,8 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
 	public function get($cat, $k, $default_value = null, $refresh = false)
 	{
 		if ($refresh) {
-			$config = dba::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
-			if (DBM::is_result($config)) {
+			$config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
+			if (DBA::isResult($config)) {
 				self::getApp()->setConfigValue($cat, $k, $config['v']);
 			}
 		}
@@ -71,7 +69,7 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
 		// manage array value
 		$dbvalue = is_array($value) ? serialize($value) : $value;
 
-		$result = dba::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
+		$result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
 		if (!$result) {
 			throw new Exception('Unable to store config value in [' . $cat . '][' . $k . ']');
 		}
@@ -83,7 +81,7 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
 	{
 		self::getApp()->deleteConfigValue($cat, $k);
 
-		$result = dba::delete('config', ['cat' => $cat, 'k' => $k]);
+		$result = DBA::delete('config', ['cat' => $cat, 'k' => $k]);
 
 		return $result;
 	}
diff --git a/src/Core/Config/PreloadPConfigAdapter.php b/src/Core/Config/PreloadPConfigAdapter.php
index 8ed3ee10e..ebccb018b 100644
--- a/src/Core/Config/PreloadPConfigAdapter.php
+++ b/src/Core/Config/PreloadPConfigAdapter.php
@@ -2,11 +2,9 @@
 
 namespace Friendica\Core\Config;
 
-use dba;
 use Exception;
-use Friendica\App;
 use Friendica\BaseObject;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 
@@ -15,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
 {
@@ -36,11 +34,11 @@ class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
 			return;
 		}
 
-		$pconfigs = dba::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
-		while ($pconfig = dba::fetch($pconfigs)) {
+		$pconfigs = DBA::select('pconfig', ['cat', 'v', 'k'], ['uid' => $uid]);
+		while ($pconfig = DBA::fetch($pconfigs)) {
 			self::getApp()->setPConfigValue($uid, $pconfig['cat'], $pconfig['k'], $pconfig['v']);
 		}
-		dba::close($pconfigs);
+		DBA::close($pconfigs);
 
 		$this->config_loaded = true;
 	}
@@ -52,8 +50,8 @@ class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
 		}
 
 		if ($refresh) {
-			$config = dba::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
-			if (DBM::is_result($config)) {
+			$config = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
+			if (DBA::isResult($config)) {
 				self::getApp()->setPConfigValue($uid, $cat, $k, $config['v']);
 			} else {
 				self::getApp()->deletePConfigValue($uid, $cat, $k);
@@ -84,7 +82,7 @@ class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
 		// manage array value
 		$dbvalue = is_array($value) ? serialize($value) : $value;
 
-		$result = dba::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $k], true);
+		$result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $k], true);
 		if (!$result) {
 			throw new Exception('Unable to store config value in [' . $uid . '][' . $cat . '][' . $k . ']');
 		}
@@ -100,7 +98,7 @@ class PreloadPConfigAdapter extends BaseObject implements IPConfigAdapter
 
 		self::getApp()->deletePConfigValue($uid, $cat, $k);
 
-		$result = dba::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
+		$result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
 
 		return $result;
 	}
diff --git a/src/Core/Console.php b/src/Core/Console.php
index a5aff4ae8..29ccd795b 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
 {
@@ -28,6 +28,7 @@ class Console extends \Asika\SimpleConsole\Console
 		'php2po'                 => __NAMESPACE__ . '\Console\PhpToPo',
 		'po2php'                 => __NAMESPACE__ . '\Console\PoToPhp',
 		'typo'                   => __NAMESPACE__ . '\Console\Typo',
+		'postupdate'             => __NAMESPACE__ . '\Console\PostUpdate',
 	];
 
 	protected function getHelp()
@@ -51,6 +52,7 @@ Commands:
 	php2po                 Generate a messages.po file from a strings.php file
 	po2php                 Generate a strings.php file from a messages.po file
 	typo                   Checks for parse errors in Friendica files
+	postupdate             Execute pending post update scripts (can last days)
 
 Options:
 	-h|--help|-? Show help information
diff --git a/src/Core/Console/ArchiveContact.php b/src/Core/Console/ArchiveContact.php
index 7a973f311..acdacbed1 100644
--- a/src/Core/Console/ArchiveContact.php
+++ b/src/Core/Console/ArchiveContact.php
@@ -2,8 +2,10 @@
 
 namespace Friendica\Core\Console;
 
+use Friendica\App;
 use Friendica\Core\L10n;
-use dba;
+use Friendica\Database\DBA;
+use RuntimeException;
 
 /**
  * @brief tool to archive a contact on the server
@@ -54,24 +56,20 @@ HELP;
 			throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
 		}
 
-		require_once '.htconfig.php';
-		$result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
-
-		if (!$result) {
-			throw new \RuntimeException('Unable to connect to database');
+		if ($a->mode === App::MODE_INSTALL) {
+			throw new RuntimeException('Friendica isn\'t properly installed yet.');
 		}
 
 		$nurl = normalise_link($this->getArgument(0));
-		if (!dba::exists('contact', ['nurl' => $nurl, 'archive' => false])) {
-			throw new \RuntimeException(L10n::t('Could not find any unarchived contact entry for this URL (%s)', $nurl));
+		if (!DBA::exists('contact', ['nurl' => $nurl, 'archive' => false])) {
+			throw new RuntimeException(L10n::t('Could not find any unarchived contact entry for this URL (%s)', $nurl));
 		}
-		if (dba::update('contact', ['archive' => true], ['nurl' => $nurl])) {
+		if (DBA::update('contact', ['archive' => true], ['nurl' => $nurl])) {
 			$condition = ["`cid` IN (SELECT `id` FROM `contact` WHERE `archive`)"];
-			dba::delete('queue', $condition);
+			DBA::delete('queue', $condition);
 			$this->out(L10n::t('The contact entries have been archived'));
 		} else {
-			throw new \RuntimeException('The contact archival failed.');
+			throw new RuntimeException('The contact archival failed.');
 		}
 
 		return 0;
diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php
index e0eea1f50..f0f3def2a 100644
--- a/src/Core/Console/AutomaticInstallation.php
+++ b/src/Core/Console/AutomaticInstallation.php
@@ -3,10 +3,13 @@
 namespace Friendica\Core\Console;
 
 use Asika\SimpleConsole\Console;
-use dba;
 use Friendica\App;
+use Friendica\BaseObject;
+use Friendica\Core\Config;
 use Friendica\Core\Install;
 use Friendica\Core\Theme;
+use Friendica\Database\DBA;
+use RuntimeException;
 
 require_once 'mod/install.php';
 require_once 'include/dba.php';
@@ -18,19 +21,50 @@ class AutomaticInstallation extends Console
 		return <<<HELP
 Installation - Install Friendica automatically
 Synopsis
-	bin/console autoinstall [-h|--help|-?] [-v] [-a] 
-	
-Description
-    Installs Friendica with data based on the htconfig.php file
+	bin/console autoinstall [-h|--help|-?] [-v] [-a] [-f]
 
-Notes:
+Description
+    Installs Friendica with data based on the local.ini.php file or environment variables
+
+Notes
     Not checking .htaccess/URL-Rewrite during CLI installation.
 
 Options
-    -h|--help|-? Show help information
-    -v           Show more debug information.
-    -a           All setup checks are required (except .htaccess)
-    -f           prepared config file (e.g. ".htconfig.php" itself)
+    -h|--help|-?           Show help information
+    -v                     Show more debug information.
+    -a                     All setup checks are required (except .htaccess)
+    -f|--file <config>     prepared config file (e.g. "config/local.ini.php" itself) which will override every other config option - except the environment variables)
+    -s|--savedb            Save the DB credentials to the file (if environment variables is used)
+    -H|--dbhost <host>     The host of the mysql/mariadb database (env MYSQL_HOST)
+    -p|--dbport <port>     The port of the mysql/mariadb database (env MYSQL_PORT)
+    -d|--dbdata <database> The name of the mysql/mariadb database (env MYSQL_DATABASE)
+    -U|--dbuser <username> The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME)
+    -P|--dbpass <password> The password of the mysql/mariadb database login (env MYSQL_PASSWORD)
+    -b|--phppath <path>    The path of the PHP binary (env FRIENDICA_PHP_PATH) 
+    -A|--admin <mail>      The admin email address of Friendica (env FRIENDICA_ADMIN_MAIL)
+    -T|--tz <timezone>     The timezone of Friendica (env FRIENDICA_TZ)
+    -L|--lang <language>   The language of Friendica (env FRIENDICA_LANG)
+ 
+Environment variables
+   MYSQL_HOST                  The host of the mysql/mariadb database (mandatory if mysql and environment is used)
+   MYSQL_PORT                  The port of the mysql/mariadb database
+   MYSQL_USERNAME|MYSQL_USER   The username of the mysql/mariadb database login (MYSQL_USERNAME is for mysql, MYSQL_USER for mariadb)
+   MYSQL_PASSWORD              The password of the mysql/mariadb database login
+   MYSQL_DATABASE              The name of the mysql/mariadb database
+   FRIENDICA_PHP_PATH          The path of the PHP binary
+   FRIENDICA_ADMIN_MAIL        The admin email address of Friendica (this email will be used for admin access)
+   FRIENDICA_TZ                The timezone of Friendica
+   FRIENDICA_LANG              The langauge of Friendica
+   
+Examples
+	bin/console autoinstall -f 'input.ini.php
+		Installs Friendica with the prepared 'input.ini.php' file
+
+	bin/console autoinstall --savedb
+		Installs Friendica with environment variables and saves them to the 'config/local.ini.php' file
+
+	bin/console autoinstall -h localhost -p 3365 -U user -P passwort1234 -d friendica
+		Installs Friendica with a local mysql database with credentials
 HELP;
 	}
 
@@ -39,18 +73,52 @@ HELP;
 		// Initialise the app
 		$this->out("Initializing setup...\n");
 
-		$a = get_app();
-		$db_host = '';
-		$db_user = '';
-		$db_pass = '';
-		$db_data = '';
+		$a = BaseObject::getApp();
 
-		$config_file = $this->getOption('f', 'htconfig.php');
+		// if a config file is set,
+		$config_file = $this->getOption(['f', 'file']);
 
-		$this->out("Using config $config_file...\n");
-		require_once $config_file;
+		if (!empty($config_file)) {
+			if ($config_file != 'config' . DIRECTORY_SEPARATOR . 'local.ini.php') {
+				// Copy config file
+				$this->out("Copying config file...\n");
+				if (!copy($a->basepath . DIRECTORY_SEPARATOR . $config_file, $a->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php')) {
+					throw new RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '$a->basepath" . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "local.ini.php' manually.\n");
+				}
+			}
 
-		Install::setInstallMode();
+			$db_host = $a->getConfigValue('database', 'hostname');
+			$db_user = $a->getConfigValue('database', 'username');
+			$db_pass = $a->getConfigValue('database', 'password');
+			$db_data = $a->getConfigValue('database', 'database');
+		} else {
+			// Creating config file
+			$this->out("Creating config file...\n");
+
+			$save_db = $this->getOption(['s', 'savedb'], false);
+
+			$db_host = $this->getOption(['H', 'dbhost'], ($save_db) ? getenv('MYSQL_HOST') : '');
+			$db_port = $this->getOption(['p', 'dbport'], ($save_db) ? getenv('MYSQL_PORT') : null);
+			$db_data = $this->getOption(['d', 'dbdata'], ($save_db) ? getenv('MYSQL_DATABASE') : '');
+			$db_user = $this->getOption(['U', 'dbuser'], ($save_db) ? getenv('MYSQL_USER') . getenv('MYSQL_USERNAME') : '');
+			$db_pass = $this->getOption(['P', 'dbpass'], ($save_db) ? getenv('MYSQL_PASSWORD') : '');
+			$php_path = $this->getOption(['b', 'phppath'], (!empty('FRIENDICA_PHP_PATH')) ? getenv('FRIENDICA_PHP_PATH') : '');
+			$admin_mail = $this->getOption(['A', 'admin'], (!empty('FRIENDICA_ADMIN_MAIL')) ? getenv('FRIENDICA_ADMIN_MAIL') : '');
+			$tz = $this->getOption(['T', 'tz'], (!empty('FRIENDICA_TZ')) ? getenv('FRIENDICA_TZ') : '');
+			$lang = $this->getOption(['L', 'lang'], (!empty('FRIENDICA_LANG')) ? getenv('FRIENDICA_LANG') : '');
+
+			Install::createConfig(
+				$php_path,
+				((!empty($db_port)) ? $db_host . ':' . $db_port : $db_host),
+				$db_user,
+				$db_pass,
+				$db_data,
+				$php_path,
+				$tz,
+				$lang,
+				$admin_mail
+			);
+		}
 
 		$this->out(" Complete!\n\n");
 
@@ -62,7 +130,7 @@ HELP;
 		$errorMessage = $this->extractErrors($checkResults['basic']);
 
 		if ($errorMessage !== '') {
-			throw new \RuntimeException($errorMessage);
+			throw new RuntimeException($errorMessage);
 		}
 
 		$this->out(" Complete!\n\n");
@@ -75,7 +143,7 @@ HELP;
 		$errorMessage = $this->extractErrors($checkResults['db']);
 
 		if ($errorMessage !== '') {
-			throw new \RuntimeException($errorMessage);
+			throw new RuntimeException($errorMessage);
 		}
 
 		$this->out(" Complete!\n\n");
@@ -86,26 +154,20 @@ HELP;
 		$checkResults['data'] = Install::installDatabaseStructure();
 
 		if ($checkResults['data'] !== '') {
-			throw new \RuntimeException("ERROR: DB Database creation error. Is the DB empty?\n");
+			throw new RuntimeException("ERROR: DB Database creation error. Is the DB empty?\n");
 		}
 
 		$this->out(" Complete!\n\n");
 
 		// Install theme
 		$this->out("Installing theme\n");
-		if (!empty($a->config['system']['theme'])) {
-			Theme::install($a->config['system']['theme']);
+		if (!empty(Config::get('system', 'theme'))) {
+			Theme::install(Config::get('system', 'theme'));
 			$this->out(" Complete\n\n");
 		} else {
-			$this->out(" Theme setting is empty. Please check the file htconfig.php\n\n");
+			$this->out(" Theme setting is empty. Please check the file 'config/local.ini.php'\n\n");
 		}
 
-		// Copy config file
-		$this->out("Saving config file...\n");
-		if ($config_file != '.htconfig.php' && !copy($config_file, '.htconfig.php')) {
-			throw new \RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '.htconfig.php' manually.\n");
-		}
-		$this->out(" Complete!\n\n");
 		$this->out("\nInstallation is finished\n");
 
 		return 0;
@@ -121,14 +183,14 @@ HELP;
 
 		Install::checkFunctions($checks);
 		Install::checkImagick($checks);
-		Install::checkHtConfig($checks);
+		Install::checkLocalIni($checks);
 		Install::checkSmarty3($checks);
 		Install::checkKeys($checks);
 
-		if (!empty($app->config['php_path'])) {
-			Install::checkPHP($app->config['php_path'], $checks);
+		if (!empty(Config::get('config', 'php_path'))) {
+			Install::checkPHP(Config::get('config', 'php_path'), $checks);
 		} else {
-			throw new \RuntimeException(" ERROR: The php_path is not set in the config. Please check the file .htconfig.php.\n");
+			throw new RuntimeException(" ERROR: The php_path is not set in the config.\n");
 		}
 
 		$this->out(" NOTICE: Not checking .htaccess/URL-Rewrite during CLI installation.\n");
@@ -153,7 +215,7 @@ HELP;
 		);
 
 
-		if (!dba::connect($db_host, $db_user, $db_pass, $db_data)) {
+		if (!DBA::connect($db_host, $db_user, $db_pass, $db_data)) {
 			$result['status'] = false;
 			$result['help'] = 'Failed, please check your MySQL settings and credentials.';
 		}
diff --git a/src/Core/Console/Config.php b/src/Core/Console/Config.php
index 306e1c275..da2d20fd1 100644
--- a/src/Core/Console/Config.php
+++ b/src/Core/Console/Config.php
@@ -9,8 +9,9 @@
 namespace Friendica\Core\Console;
 
 use Asika\SimpleConsole\CommandArgsException;
-use dba;
+use Friendica\App;
 use Friendica\Core;
+use RuntimeException;
 
 require_once 'include/dba.php';
 require_once 'include/text.php';
@@ -36,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
 {
@@ -67,7 +68,7 @@ Description
 		Sets the value of the provided key in the category
 
 Notes:
-	Setting config entries which are manually set in .htconfig.php may result in
+	Setting config entries which are manually set in config/local.ini.php may result in
 	conflict between database settings and the manual startup settings.
 
 Options
@@ -92,32 +93,56 @@ HELP;
 			throw new CommandArgsException('Too many arguments');
 		}
 
-		require_once '.htconfig.php';
-		$result = dba::connect($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
-
-		if (!$result) {
-			throw new \RuntimeException('Unable to connect to database');
+		if (!($a->mode & App::MODE_DBCONFIGAVAILABLE)) {
+			$this->out('Database isn\'t ready or populated yet, showing file config only');
 		}
 
 		if (count($this->args) == 3) {
-			Core\Config::set($this->getArgument(0), $this->getArgument(1), $this->getArgument(2));
-			$this->out("config[{$this->getArgument(0)}][{$this->getArgument(1)}] = " . Core\Config::get($this->getArgument(0),
-					$this->getArgument(1)));
+			$cat = $this->getArgument(0);
+			$key = $this->getArgument(1);
+			$value = $this->getArgument(2);
+
+			if (is_array(Core\Config::get($cat, $key))) {
+				throw new RuntimeException("$cat.$key is an array and can't be set using this command.");
+			}
+
+			$result = Core\Config::set($cat, $key, $value);
+			if ($result) {
+				$this->out("{$cat}.{$key} <= " .
+					Core\Config::get($cat, $key));
+			} else {
+				$this->out("Unable to set {$cat}.{$key}");
+			}
 		}
 
 		if (count($this->args) == 2) {
-			$this->out("config[{$this->getArgument(0)}][{$this->getArgument(1)}] = " . Core\Config::get($this->getArgument(0),
-					$this->getArgument(1)));
+			$cat = $this->getArgument(0);
+			$key = $this->getArgument(1);
+			$value = Core\Config::get($this->getArgument(0), $this->getArgument(1));
+
+			if (is_array($value)) {
+				foreach ($value as $k => $v) {
+					$this->out("{$cat}.{$key}[{$k}] => " . $v);
+				}
+			} else {
+				$this->out("{$cat}.{$key} => " . $value);
+			}
 		}
 
 		if (count($this->args) == 1) {
-			Core\Config::load($this->getArgument(0));
+			$cat = $this->getArgument(0);
+			Core\Config::load($cat);
 
-			$a = get_app();
-			if (!is_null($a->config[$this->getArgument(0)])) {
-				foreach ($a->config[$this->getArgument(0)] as $k => $x) {
-					$this->out("config[{$this->getArgument(0)}][{$k}] = " . $x);
+			if (!is_null($a->config[$cat])) {
+				$this->out("[{$cat}]");
+				foreach ($a->config[$cat] as $key => $value) {
+					if (is_array($value)) {
+						foreach ($value as $k => $v) {
+							$this->out("{$key}[{$k}] => " . $v);
+						}
+					} else {
+						$this->out("{$key} => " . $value);
+					}
 				}
 			} else {
 				$this->out('Config section ' . $this->getArgument(0) . ' returned nothing');
@@ -125,13 +150,29 @@ HELP;
 		}
 
 		if (count($this->args) == 0) {
-			$configs = dba::select('config');
-			foreach ($configs as $config) {
-				$this->out("config[{$config['cat']}][{$config['k']}] = " . $config['v']);
+			Core\Config::load();
+
+			if (Core\Config::get('system', 'config_adapter') == 'jit' && $a->mode & App::MODE_DBCONFIGAVAILABLE) {
+				$this->out('Warning: The JIT (Just In Time) Config adapter doesn\'t support loading the entire configuration, showing file config only');
+			}
+
+			foreach ($a->config as $cat => $section) {
+				if (is_array($section)) {
+					foreach ($section as $key => $value) {
+						if (is_array($value)) {
+							foreach ($value as $k => $v) {
+								$this->out("{$cat}.{$key}[{$k}] => " . $v);
+							}
+						} else {
+							$this->out("{$cat}.{$key} => " . $value);
+						}
+					}
+				} else {
+					$this->out("config.{$cat} => " . $section);
+				}
 			}
 		}
 
 		return 0;
 	}
-
 }
diff --git a/src/Core/Console/CreateDoxygen.php b/src/Core/Console/CreateDoxygen.php
index b60116db3..1de2cee04 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 eb4c6df99..4b607c1e6 100644
--- a/src/Core/Console/DatabaseStructure.php
+++ b/src/Core/Console/DatabaseStructure.php
@@ -3,15 +3,17 @@
 namespace Friendica\Core\Console;
 
 use Friendica\Core;
+use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
+use RuntimeException;
 
 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>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class DatabaseStructure extends \Asika\SimpleConsole\Console
 {
@@ -20,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]
 
@@ -56,12 +58,8 @@ HELP;
 			throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
 		}
 
-		require_once '.htconfig.php';
-		$result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
-
-		if (!$result) {
-			throw new \RuntimeException('Unable to connect to database');
+		if (!DBA::connected()) {
+			throw new RuntimeException('Unable to connect to database');
 		}
 
 		Core\Config::load();
@@ -71,8 +69,6 @@ HELP;
 				$output = DBStructure::update(true, false);
 				break;
 			case "update":
-				$output = DBStructure::update(true, true);
-
 				$build = Core\Config::get('system', 'build');
 				if (empty($build)) {
 					Core\Config::set('system', 'build', DB_UPDATE_VERSION);
@@ -82,9 +78,19 @@ HELP;
 				$stored = intval($build);
 				$current = intval(DB_UPDATE_VERSION);
 
-				// run any left update_nnnn functions in update.php
+				// run the pre_update_nnnn functions in update.php
 				for ($x = $stored; $x < $current; $x ++) {
-					$r = run_update_function($x);
+					$r = run_update_function($x, 'pre_update');
+					if (!$r) {
+						break;
+					}
+				}
+
+				$output = DBStructure::update(true, true);
+
+				// run the update_nnnn functions in update.php
+				for ($x = $stored; $x < $current; $x ++) {
+					$r = run_update_function($x, 'update');
 					if (!$r) {
 						break;
 					}
diff --git a/src/Core/Console/DocBloxErrorChecker.php b/src/Core/Console/DocBloxErrorChecker.php
index 50d44d114..b29f8e2ba 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 810d5be41..e7c751f94 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 26c5d1313..f51ed95fe 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
 {
@@ -56,12 +56,8 @@ HELP;
 			throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
 		}
 
-		require_once '.htconfig.php';
-		$result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
-
-		if (!$result) {
-			throw new \RuntimeException('Unable to connect to database');
+		if ($a->isInstallMode()) {
+			throw new \RuntimeException('Database isn\'t ready or populated yet');
 		}
 
 		$contact_id = Contact::getIdForURL($this->getArgument(0));
diff --git a/src/Core/Console/GlobalCommunitySilence.php b/src/Core/Console/GlobalCommunitySilence.php
index 72d5a4f88..03101cdf0 100644
--- a/src/Core/Console/GlobalCommunitySilence.php
+++ b/src/Core/Console/GlobalCommunitySilence.php
@@ -3,8 +3,9 @@
 namespace Friendica\Core\Console;
 
 use Friendica\Core\Protocol;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Network\Probe;
+use RuntimeException;
 
 require_once 'include/text.php';
 
@@ -18,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
 {
@@ -64,12 +65,8 @@ HELP;
 			throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
 		}
 
-		require_once '.htconfig.php';
-		$result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
-
-		if (!$result) {
-			throw new \RuntimeException('Unable to connect to database');
+		if ($a->isInstallMode()) {
+			throw new RuntimeException('Database isn\'t ready or populated yet');
 		}
 
 		/**
@@ -79,16 +76,16 @@ HELP;
 		 * */
 		$net = Probe::uri($this->getArgument(0));
 		if (in_array($net['network'], [Protocol::PHANTOM, Protocol::MAIL])) {
-			throw new \RuntimeException('This account seems not to exist.');
+			throw new RuntimeException('This account seems not to exist.');
 		}
 
 		$nurl = normalise_link($net['url']);
-		$contact = \dba::selectFirst("contact", ["id"], ["nurl" => $nurl, "uid" => 0]);
-		if (DBM::is_result($contact)) {
-			\dba::update("contact", ["hidden" => true], ["id" => $contact["id"]]);
+		$contact = DBA::selectFirst("contact", ["id"], ["nurl" => $nurl, "uid" => 0]);
+		if (DBA::isResult($contact)) {
+			DBA::update("contact", ["hidden" => true], ["id" => $contact["id"]]);
 			$this->out('NOTICE: The account should be silenced from the global community page');
 		} else {
-			throw new \RuntimeException('NOTICE: Could not find any entry for this URL (' . $nurl . ')');
+			throw new RuntimeException('NOTICE: Could not find any entry for this URL (' . $nurl . ')');
 		}
 
 		return 0;
diff --git a/src/Core/Console/Maintenance.php b/src/Core/Console/Maintenance.php
index 6638e4bfe..a3e3b80a7 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
 {
@@ -64,12 +64,8 @@ HELP;
 			throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
 		}
 
-		require_once '.htconfig.php';
-		$result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
-
-		if (!$result) {
-			throw new \RuntimeException('Unable to connect to database');
+		if ($a->isInstallMode()) {
+			throw new \RuntimeException('Database isn\'t ready or populated yet');
 		}
 
 		Core\Config::load();
diff --git a/src/Core/Console/NewPassword.php b/src/Core/Console/NewPassword.php
index f5698ba71..2581d81cd 100644
--- a/src/Core/Console/NewPassword.php
+++ b/src/Core/Console/NewPassword.php
@@ -2,12 +2,11 @@
 
 namespace Friendica\Core\Console;
 
-use Friendica\Core\L10n;
-use Friendica\Model\Contact;
-use Friendica\Model\User;
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
-use dba;
+use Friendica\Core\L10n;
+use Friendica\Database\DBA;
+use Friendica\Model\User;
+use RuntimeException;
 
 /**
  * @brief tool to set a new password for a user
@@ -58,19 +57,15 @@ HELP;
 			throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
 		}
 
-		require_once '.htconfig.php';
-		$result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
-
-		if (!$result) {
-			throw new \RuntimeException('Unable to connect to database');
+		if ($a->isInstallMode()) {
+			throw new RuntimeException('Database isn\'t ready or populated yet');
 		}
 
 		$nick = $this->getArgument(0);
 
-		$user = dba::selectFirst('user', ['uid'], ['nickname' => $nick]);
-		if (!DBM::is_result($user)) {
-			throw new \RuntimeException(L10n::t('User not found'));
+		$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nick]);
+		if (!DBA::isResult($user)) {
+			throw new RuntimeException(L10n::t('User not found'));
 		}
 
 		$password = $this->getArgument(1);
@@ -80,15 +75,15 @@ HELP;
 		}
 
 		if (!$password) {
-			throw new \RuntimeException(L10n::t('Password can\'t be empty'));
+			throw new RuntimeException(L10n::t('Password can\'t be empty'));
 		}
 
 		if (!Config::get('system', 'disable_password_exposed', false) && User::isPasswordExposed($password)) {
-			throw new \RuntimeException(L10n::t('The new password has been exposed in a public data dump, please choose another.'));
+			throw new RuntimeException(L10n::t('The new password has been exposed in a public data dump, please choose another.'));
 		}
 
 		if (!User::updatePassword($user['uid'], $password)) {
-			throw new \RuntimeException(L10n::t('Password update failed. Please try again.'));
+			throw new RuntimeException(L10n::t('Password update failed. Please try again.'));
 		}
 
 		$this->out(L10n::t('Password changed.'));
diff --git a/src/Core/Console/PhpToPo.php b/src/Core/Console/PhpToPo.php
index 76cf16434..fb7ecac43 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 e97e1ff3d..b7c9bfaae 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
new file mode 100644
index 000000000..24ed514b5
--- /dev/null
+++ b/src/Core/Console/PostUpdate.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Friendica\Core\Console;
+
+use Friendica\Core\L10n;
+use Friendica\Core\Config;
+
+/**
+ * Performs database post updates
+ *
+ * License: AGPLv3 or later, same as Friendica
+ *
+ * @author Tobias Diekershoff <tobias.diekershoff@gmx.net>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class PostUpdate extends \Asika\SimpleConsole\Console
+{
+        protected $helpOptions = ['h', 'help', '?'];
+
+        protected function getHelp()
+        {
+                $help = <<<HELP
+console postupdate - Performs 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 ($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()) {
+			throw new \RuntimeException('Database isn\'t ready or populated yet');
+		}
+
+		echo L10n::t('Execute pending post updates.') . "\n";
+
+		while (!\Friendica\Database\PostUpdate::update()) {
+			echo '.';
+		}
+
+		echo "\n" . L10n::t('All pending post updates are done.') . "\n";
+
+		return 0;
+	}
+}
diff --git a/src/Core/Console/Typo.php b/src/Core/Console/Typo.php
index e3ae52263..cdb3f9c81 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/Install.php b/src/Core/Install.php
index 65ef1db24..ba3a97ea6 100644
--- a/src/Core/Install.php
+++ b/src/Core/Install.php
@@ -1,428 +1,410 @@
-<?php
-/**
- * @file src/Core/Install.php
- */
-namespace Friendica\Core;
-
-use Friendica\BaseObject;
-use Friendica\App;
-use Friendica\Database\DBStructure;
-use Friendica\Object\Image;
-use Friendica\Util\Network;
-
-use Exception;
-use DOMDocument;
-
-/**
- * Contains methods for installation purpose of Friendica
- */
-class Install extends BaseObject
-{
-	/**
-	 * Sets the install-mode for further methods
-	 */
-	public static function setInstallMode()
-	{
-		self::getApp()->mode = App::MODE_INSTALL;
-	}
-
-	/**
-	 * Checks the current installation environment. There are optional and mandatory checks.
-	 *
-	 * @param string $phpath Optional path to the PHP binary (Default is 'php')
-	 *
-	 * @return array First element is a list of all checks and their results,
-	 *               the second element is a list of passed checks
-	 */
-	public static function check($phpath = 'php')
-	{
-		$checks = [];
-
-		self::checkFunctions($checks);
-
-		self::checkImagick($checks);
-
-		self::checkHtConfig($checks);
-
-		self::checkSmarty3($checks);
-
-		self::checkKeys($checks);
-
-		self::checkPHP($phpath, $checks);
-
-		self::checkHtAccess($checks);
-
-		$checkspassed = array_reduce($checks,
-			function ($v, $c) {
-				if ($c['require']) {
-					$v = $v && $c['status'];
-				}
-				return $v;
-			},
-			true);
-
-		return array($checks, $checkspassed);
-	}
-
-	/**
-	 * Executes the installation of Friendica in the given environment.
-	 * - Creates `.htconfig.php`
-	 * - Installs Database Structure
-	 *
-	 * @param string 	$urlpath 	Path based on the URL of Friendica (e.g. '/friendica')
-	 * @param string 	$dbhost 	Hostname/IP of the Friendica Database
-	 * @param string 	$dbuser 	Username of the Database connection credentials
-	 * @param string 	$dbpass 	Password of the Database connection credentials
-	 * @param string 	$dbdata 	Name of the Database
-	 * @param string 	$phpath 	Path to the PHP-Binary (e.g. 'php' or '/usr/bin/php')
-	 * @param string 	$timezone 	Timezone of the Friendica Installaton (e.g. 'Europe/Berlin')
-	 * @param string 	$language 	2-letter ISO 639-1 code (eg. 'en')
-	 * @param string 	$adminmail 	Mail-Adress of the administrator
-	 * @param int 		$rino		Rino-enabled (1 = true, 0 = false)
-	 */
-	public static function install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail, $rino = 1)
-	{
-		$tpl = get_markup_template('htconfig.tpl');
-		$txt = replace_macros($tpl,[
-			'$dbhost' => $dbhost,
-			'$dbuser' => $dbuser,
-			'$dbpass' => $dbpass,
-			'$dbdata' => $dbdata,
-			'$timezone' => $timezone,
-			'$language' => $language,
-			'$urlpath' => $urlpath,
-			'$phpath' => $phpath,
-			'$adminmail' => $adminmail,
-			'$rino' => $rino
-		]);
-
-		$result = file_put_contents('.htconfig.php', $txt);
-		if (! $result) {
-			self::getApp()->data['txt'] = $txt;
-		}
-
-		$errors = self::installDatabaseStructure();
-
-		if ($errors) {
-			self::getApp()->data['db_failed'] = $errors;
-		} else {
-			self::getApp()->data['db_installed'] = true;
-		}
-	}
-
-	/**
-	 * Adds new checks to the array $checks
-	 *
-	 * @param array $checks The list of all checks (by-ref parameter!)
-	 * @param string $title The title of the current check
-	 * @param bool $status 1 = check passed, 0 = check not passed
-	 * @param bool $required 1 = check is mandatory, 0 = check is optional
-	 * @param string $help A help-string for the current check
-	 * @param string $error_msg Optional. A error message, if the current check failed
-	 */
-	private static function addCheck(&$checks, $title, $status, $required, $help, $error_msg = "")
-	{
-		$checks[] = [
-			'title' => $title,
-			'status' => $status,
-			'required' => $required,
-			'help' => $help,
-			'error_msg' => $error_msg,
-		];
-	}
-
-	/**
-	 * PHP Check
-	 *
-	 * Checks the PHP environment.
-	 *
-	 * - Checks if a PHP binary is available
-	 * - Checks if it is the CLI version
-	 * - Checks if "register_argc_argv" is enabled
- 	 *
-	 * @param string $phpath Optional. The Path to the PHP-Binary
-	 * @param array $checks The list of all checks (by-ref parameter!)
-	 */
-	public static function checkPHP(&$phpath, &$checks)
-	{
-		$passed = $passed2 = $passed3 = false;
-		if (strlen($phpath)) {
-			$passed = file_exists($phpath);
-		} else {
-			$phpath = trim(shell_exec('which php'));
-			$passed = strlen($phpath);
-		}
-		$help = "";
-		if (!$passed) {
-			$help .= L10n::t('Could not find a command line version of PHP in the web server PATH.') . EOL;
-			$help .= L10n::t("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>") . EOL;
-			$help .= EOL . EOL;
-			$tpl = get_markup_template('field_input.tpl');
-			$help .= replace_macros($tpl, [
-				'$field' => ['phpath', L10n::t('PHP executable path'), $phpath, L10n::t('Enter full path to php executable. You can leave this blank to continue the installation.')],
-			]);
-			$phpath = "";
-		}
-
-		self::addCheck($checks, L10n::t('Command line PHP').($passed?" (<tt>$phpath</tt>)":""), $passed, false, $help);
-
-		if ($passed) {
-			$cmd = "$phpath -v";
-			$result = trim(shell_exec($cmd));
-			$passed2 = (strpos($result, "(cli)") !== false);
-			list($result) = explode("\n", $result);
-			$help = "";
-			if (!$passed2) {
-				$help .= L10n::t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29") . EOL;
-				$help .= L10n::t('Found PHP version: ') . "<tt>$result</tt>";
-			}
-			self::addCheck($checks, L10n::t('PHP cli binary'), $passed2, true, $help);
-		}
-
-		if ($passed2) {
-			$str = autoname(8);
-			$cmd = "$phpath testargs.php $str";
-			$result = trim(shell_exec($cmd));
-			$passed3 = $result == $str;
-			$help = "";
-			if (!$passed3) {
-				$help .= L10n::t('The command line version of PHP on your system does not have "register_argc_argv" enabled.') . EOL;
-				$help .= L10n::t('This is required for message delivery to work.');
-			}
-			self::addCheck($checks, L10n::t('PHP register_argc_argv'), $passed3, true, $help);
-		}
-	}
-
-	/**
-	 * OpenSSL Check
-	 *
-	 * Checks the OpenSSL Environment
-	 *
-	 * - Checks, if the command "openssl_pkey_new" is available
-	 *
-	 * @param array $checks The list of all checks (by-ref parameter!)
-	 */
-	public static function checkKeys(&$checks)
-	{
-		$help = '';
-		$res = false;
-
-		if (function_exists('openssl_pkey_new')) {
-			$res = openssl_pkey_new([
-				'digest_alg' => 'sha1',
-				'private_key_bits' => 4096,
-				'encrypt_key' => false
-			]);
-		}
-
-		// Get private key
-		if (!$res) {
-			$help .= L10n::t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . EOL;
-			$help .= L10n::t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".');
-		}
-		self::addCheck($checks, L10n::t('Generate encryption keys'), $res, true, $help);
-	}
-
-	/**
-	 * PHP functions Check
-	 *
-	 * Checks the following PHP functions
-	 * - libCurl
-	 * - GD Graphics
-	 * - OpenSSL
-	 * - PDO or MySQLi
-	 * - mb_string
-	 * - XML
-	 * - iconv
-	 * - POSIX
-	 *
-	 * @param array $checks The list of all checks (by-ref parameter!)
-	 */
-	public static function checkFunctions(&$checks)
-	{
-		$ck_funcs = [];
-		self::addCheck($ck_funcs, L10n::t('libCurl PHP module'), true, true, "");
-		self::addCheck($ck_funcs, L10n::t('GD graphics PHP module'), true, true, "");
-		self::addCheck($ck_funcs, L10n::t('OpenSSL PHP module'), true, true, "");
-		self::addCheck($ck_funcs, L10n::t('PDO or MySQLi PHP module'), true, true, "");
-		self::addCheck($ck_funcs, L10n::t('mb_string PHP module'), true, true, "");
-		self::addCheck($ck_funcs, L10n::t('XML PHP module'), true, true, "");
-		self::addCheck($ck_funcs, L10n::t('iconv PHP module'), true, true, "");
-		self::addCheck($ck_funcs, L10n::t('POSIX PHP module'), true, true, "");
-
-		if (function_exists('apache_get_modules')) {
-			if (! in_array('mod_rewrite',apache_get_modules())) {
-				self::addCheck($ck_funcs, L10n::t('Apache mod_rewrite module'), false, true, L10n::t('Error: Apache webserver mod-rewrite module is required but not installed.'));
-			} else {
-				self::addCheck($ck_funcs, L10n::t('Apache mod_rewrite module'), true, true, "");
-			}
-		}
-
-		if (!function_exists('curl_init')) {
-			$ck_funcs[0]['status'] = false;
-			$ck_funcs[0]['help'] = L10n::t('Error: libCURL PHP module required but not installed.');
-		}
-		if (!function_exists('imagecreatefromjpeg')) {
-			$ck_funcs[1]['status'] = false;
-			$ck_funcs[1]['help'] = L10n::t('Error: GD graphics PHP module with JPEG support required but not installed.');
-		}
-		if (!function_exists('openssl_public_encrypt')) {
-			$ck_funcs[2]['status'] = false;
-			$ck_funcs[2]['help'] = L10n::t('Error: openssl PHP module required but not installed.');
-		}
-		if (!function_exists('mysqli_connect') && !class_exists('pdo')) {
-			$ck_funcs[3]['status'] = false;
-			$ck_funcs[3]['help'] = L10n::t('Error: PDO or MySQLi PHP module required but not installed.');
-		}
-		if (!function_exists('mysqli_connect') && class_exists('pdo') && !in_array('mysql', \PDO::getAvailableDrivers())) {
-			$ck_funcs[3]['status'] = false;
-			$ck_funcs[3]['help'] = L10n::t('Error: The MySQL driver for PDO is not installed.');
-		}
-		if (!function_exists('mb_strlen')) {
-			$ck_funcs[4]['status'] = false;
-			$ck_funcs[4]['help'] = L10n::t('Error: mb_string PHP module required but not installed.');
-		}
-		if (!function_exists('iconv_strlen')) {
-			$ck_funcs[6]['status'] = false;
-			$ck_funcs[6]['help'] = L10n::t('Error: iconv PHP module required but not installed.');
-		}
-		if (!function_exists('posix_kill')) {
-			$ck_funcs[7]['status'] = false;
-			$ck_funcs[7]['help'] = L10n::t('Error: POSIX PHP module required but not installed.');
-		}
-
-		$checks = array_merge($checks, $ck_funcs);
-
-		// check for XML DOM Documents being able to be generated
-		try {
-			$xml = new DOMDocument();
-		} catch (Exception $e) {
-			$ck_funcs[5]['status'] = false;
-			$ck_funcs[5]['help'] = L10n::t('Error, XML PHP module required but not installed.');
-		}
-	}
-
-	/**
-	 * ".htconfig.php" - Check
-	 *
-	 * Checks if it's possible to create the ".htconfig.php"
-	 *
-	 * @param array $checks The list of all checks (by-ref parameter!)
-	 */
-	public static function checkHtConfig(&$checks)
-	{
-		$status = true;
-		$help = "";
-		if ((file_exists('.htconfig.php') && !is_writable('.htconfig.php')) ||
-			(!file_exists('.htconfig.php') && !is_writable('.'))) {
-
-			$status = false;
-			$help = L10n::t('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.') . EOL;
-			$help .= L10n::t('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.') . EOL;
-			$help .= L10n::t('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.') . EOL;
-			$help .= L10n::t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.') . EOL;
-		}
-
-		self::addCheck($checks, L10n::t('.htconfig.php is writable'), $status, false, $help);
-
-	}
-
-	/**
-	 * Smarty3 Template Check
-	 *
-	 * Checks, if the directory of Smarty3 is writable
-	 *
-	 * @param array $checks The list of all checks (by-ref parameter!)
-	 */
-	public static function checkSmarty3(&$checks)
-	{
-		$status = true;
-		$help = "";
-		if (!is_writable('view/smarty3')) {
-
-			$status = false;
-			$help = L10n::t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') . EOL;
-			$help .= L10n::t('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.') . EOL;
-			$help .= L10n::t("Please ensure that the user that your web server runs as \x28e.g. www-data\x29 has write access to this folder.") . EOL;
-			$help .= L10n::t("Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files \x28.tpl\x29 that it contains.") . EOL;
-		}
-
-		self::addCheck($checks, L10n::t('view/smarty3 is writable'), $status, true, $help);
-	}
-
-	/**
-	 * ".htaccess" - Check
-	 *
-	 * Checks, if "url_rewrite" is enabled in the ".htaccess" file
-	 *
-	 * @param array $checks The list of all checks (by-ref parameter!)
-	 */
-	public static function checkHtAccess(&$checks)
-	{
-		$status = true;
-		$help = "";
-		$error_msg = "";
-		if (function_exists('curl_init')) {
-			$test = Network::fetchUrlFull(System::baseUrl() . "/install/testrewrite");
-
-			$url = normalise_link(System::baseUrl() . "/install/testrewrite");
-			if ($test['body'] != "ok") {
-				$test = Network::fetchUrlFull($url);
-			}
-
-			if ($test['body'] != "ok") {
-				$status = false;
-				$help = L10n::t('Url rewrite in .htaccess is not working. Check your server configuration.');
-				$error_msg = [];
-				$error_msg['head'] = L10n::t('Error message from Curl when fetching');
-				$error_msg['url'] = $test['redirect_url'];
-				$error_msg['msg'] = $test['error'];
-			}
-			self::addCheck($checks, L10n::t('Url rewrite is working'), $status, true, $help, $error_msg);
-		} else {
-			// cannot check modrewrite if libcurl is not installed
-			/// @TODO Maybe issue warning here?
-		}
-	}
-
-	/**
-	 * Imagick Check
-	 *
-	 * Checks, if the imagick module is available
-	 *
-	 * @param array $checks The list of all checks (by-ref parameter!)
-	 */
-	public static function checkImagick(&$checks)
-	{
-		$imagick = false;
-		$gif = false;
-
-		if (class_exists('Imagick')) {
-			$imagick = true;
-			$supported = Image::supportedTypes();
-			if (array_key_exists('image/gif', $supported)) {
-				$gif = true;
-			}
-		}
-		if ($imagick == false) {
-			self::addCheck($checks, L10n::t('ImageMagick PHP extension is not installed'), $imagick, false, "");
-		} else {
-			self::addCheck($checks, L10n::t('ImageMagick PHP extension is installed'), $imagick, false, "");
-			if ($imagick) {
-				self::addCheck($checks, L10n::t('ImageMagick supports GIF'), $gif, false, "");
-			}
-		}
-	}
-
-	/**
-	 * Installs the Database structure
-	 *
-	 * @return string A possible error
-	 */
-	public static function installDatabaseStructure()
-	{
-		$errors = DBStructure::update(false, true, true);
-
-		return $errors;
-	}
-}
+<?php
+/**
+ * @file src/Core/Install.php
+ */
+namespace Friendica\Core;
+
+use DOMDocument;
+use Exception;
+use Friendica\BaseObject;
+use Friendica\Database\DBStructure;
+use Friendica\Object\Image;
+use Friendica\Util\Network;
+
+/**
+ * Contains methods for installation purpose of Friendica
+ */
+class Install extends BaseObject
+{
+	/**
+	 * Checks the current installation environment. There are optional and mandatory checks.
+	 *
+	 * @param string $phpath Optional path to the PHP binary (Default is 'php')
+	 *
+	 * @return array First element is a list of all checks and their results,
+	 *               the second element is a list of passed checks
+	 */
+	public static function check($phpath = 'php')
+	{
+		$checks = [];
+
+		self::checkFunctions($checks);
+
+		self::checkImagick($checks);
+
+		self::checkLocalIni($checks);
+
+		self::checkSmarty3($checks);
+
+		self::checkKeys($checks);
+
+		self::checkPHP($phpath, $checks);
+
+		self::checkHtAccess($checks);
+
+		$checkspassed = array_reduce($checks,
+			function ($v, $c) {
+				if (!empty($c['require'])) {
+					$v = $v && $c['status'];
+				}
+				return $v;
+			},
+			true);
+
+		return array($checks, $checkspassed);
+	}
+
+	/**
+	 * Executes the installation of Friendica in the given environment.
+	 * - Creates `config/local.ini.php`
+	 * - Installs Database Structure
+	 *
+	 * @param string 	$urlpath 	Path based on the URL of Friendica (e.g. '/friendica')
+	 * @param string 	$dbhost 	Hostname/IP of the Friendica Database
+	 * @param string 	$dbuser 	Username of the Database connection credentials
+	 * @param string 	$dbpass 	Password of the Database connection credentials
+	 * @param string 	$dbdata 	Name of the Database
+	 * @param string 	$phpath 	Path to the PHP-Binary (e.g. 'php' or '/usr/bin/php')
+	 * @param string 	$timezone 	Timezone of the Friendica Installaton (e.g. 'Europe/Berlin')
+	 * @param string 	$language 	2-letter ISO 639-1 code (eg. 'en')
+	 * @param string 	$adminmail 	Mail-Adress of the administrator
+	 */
+	public static function createConfig($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail)
+	{
+		$tpl = get_markup_template('local.ini.tpl');
+		$txt = replace_macros($tpl,[
+			'$dbhost' => $dbhost,
+			'$dbuser' => $dbuser,
+			'$dbpass' => $dbpass,
+			'$dbdata' => $dbdata,
+			'$timezone' => $timezone,
+			'$language' => $language,
+			'$urlpath' => $urlpath,
+			'$phpath' => $phpath,
+			'$adminmail' => $adminmail,
+		]);
+
+		$app = self::getApp();
+
+		$result = file_put_contents($app->basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php', $txt);
+		if (!$result) {
+			$app->data['txt'] = $txt;
+		}
+	}
+
+	/**
+	 * Adds new checks to the array $checks
+	 *
+	 * @param array $checks The list of all checks (by-ref parameter!)
+	 * @param string $title The title of the current check
+	 * @param bool $status 1 = check passed, 0 = check not passed
+	 * @param bool $required 1 = check is mandatory, 0 = check is optional
+	 * @param string $help A help-string for the current check
+	 * @param string $error_msg Optional. A error message, if the current check failed
+	 */
+	private static function addCheck(&$checks, $title, $status, $required, $help, $error_msg = "")
+	{
+		$checks[] = [
+			'title' => $title,
+			'status' => $status,
+			'required' => $required,
+			'help' => $help,
+			'error_msg' => $error_msg,
+		];
+	}
+
+	/**
+	 * PHP Check
+	 *
+	 * Checks the PHP environment.
+	 *
+	 * - Checks if a PHP binary is available
+	 * - Checks if it is the CLI version
+	 * - Checks if "register_argc_argv" is enabled
+ 	 *
+	 * @param string $phpath Optional. The Path to the PHP-Binary
+	 * @param array $checks The list of all checks (by-ref parameter!)
+	 */
+	public static function checkPHP($phpath, &$checks)
+	{
+		$passed = $passed2 = $passed3 = false;
+		if (strlen($phpath)) {
+			$passed = file_exists($phpath);
+		} else {
+			$phpath = trim(shell_exec('which php'));
+			$passed = strlen($phpath);
+		}
+		$help = "";
+		if (!$passed) {
+			$help .= L10n::t('Could not find a command line version of PHP in the web server PATH.') . EOL;
+			$help .= L10n::t("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>") . EOL;
+			$help .= EOL . EOL;
+			$tpl = get_markup_template('field_input.tpl');
+			$help .= replace_macros($tpl, [
+				'$field' => ['phpath', L10n::t('PHP executable path'), $phpath, L10n::t('Enter full path to php executable. You can leave this blank to continue the installation.')],
+			]);
+			$phpath = "";
+		}
+
+		self::addCheck($checks, L10n::t('Command line PHP').($passed?" (<tt>$phpath</tt>)":""), $passed, false, $help);
+
+		if ($passed) {
+			$cmd = "$phpath -v";
+			$result = trim(shell_exec($cmd));
+			$passed2 = (strpos($result, "(cli)") !== false);
+			list($result) = explode("\n", $result);
+			$help = "";
+			if (!$passed2) {
+				$help .= L10n::t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29") . EOL;
+				$help .= L10n::t('Found PHP version: ') . "<tt>$result</tt>";
+			}
+			self::addCheck($checks, L10n::t('PHP cli binary'), $passed2, true, $help);
+		}
+
+		if ($passed2) {
+			$str = autoname(8);
+			$cmd = "$phpath testargs.php $str";
+			$result = trim(shell_exec($cmd));
+			$passed3 = $result == $str;
+			$help = "";
+			if (!$passed3) {
+				$help .= L10n::t('The command line version of PHP on your system does not have "register_argc_argv" enabled.') . EOL;
+				$help .= L10n::t('This is required for message delivery to work.');
+			}
+			self::addCheck($checks, L10n::t('PHP register_argc_argv'), $passed3, true, $help);
+		}
+	}
+
+	/**
+	 * OpenSSL Check
+	 *
+	 * Checks the OpenSSL Environment
+	 *
+	 * - Checks, if the command "openssl_pkey_new" is available
+	 *
+	 * @param array $checks The list of all checks (by-ref parameter!)
+	 */
+	public static function checkKeys(&$checks)
+	{
+		$help = '';
+		$res = false;
+
+		if (function_exists('openssl_pkey_new')) {
+			$res = openssl_pkey_new([
+				'digest_alg' => 'sha1',
+				'private_key_bits' => 4096,
+				'encrypt_key' => false
+			]);
+		}
+
+		// Get private key
+		if (!$res) {
+			$help .= L10n::t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . EOL;
+			$help .= L10n::t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".');
+		}
+		self::addCheck($checks, L10n::t('Generate encryption keys'), $res, true, $help);
+	}
+
+	/**
+	 * PHP functions Check
+	 *
+	 * Checks the following PHP functions
+	 * - libCurl
+	 * - GD Graphics
+	 * - OpenSSL
+	 * - PDO or MySQLi
+	 * - mb_string
+	 * - XML
+	 * - iconv
+	 * - POSIX
+	 *
+	 * @param array $checks The list of all checks (by-ref parameter!)
+	 */
+	public static function checkFunctions(&$checks)
+	{
+		$ck_funcs = [];
+		self::addCheck($ck_funcs, L10n::t('libCurl PHP module'), true, true, "");
+		self::addCheck($ck_funcs, L10n::t('GD graphics PHP module'), true, true, "");
+		self::addCheck($ck_funcs, L10n::t('OpenSSL PHP module'), true, true, "");
+		self::addCheck($ck_funcs, L10n::t('PDO or MySQLi PHP module'), true, true, "");
+		self::addCheck($ck_funcs, L10n::t('mb_string PHP module'), true, true, "");
+		self::addCheck($ck_funcs, L10n::t('XML PHP module'), true, true, "");
+		self::addCheck($ck_funcs, L10n::t('iconv PHP module'), true, true, "");
+		self::addCheck($ck_funcs, L10n::t('POSIX PHP module'), true, true, "");
+
+		if (function_exists('apache_get_modules')) {
+			if (! in_array('mod_rewrite',apache_get_modules())) {
+				self::addCheck($ck_funcs, L10n::t('Apache mod_rewrite module'), false, true, L10n::t('Error: Apache webserver mod-rewrite module is required but not installed.'));
+			} else {
+				self::addCheck($ck_funcs, L10n::t('Apache mod_rewrite module'), true, true, "");
+			}
+		}
+
+		if (!function_exists('curl_init')) {
+			$ck_funcs[0]['status'] = false;
+			$ck_funcs[0]['help'] = L10n::t('Error: libCURL PHP module required but not installed.');
+		}
+		if (!function_exists('imagecreatefromjpeg')) {
+			$ck_funcs[1]['status'] = false;
+			$ck_funcs[1]['help'] = L10n::t('Error: GD graphics PHP module with JPEG support required but not installed.');
+		}
+		if (!function_exists('openssl_public_encrypt')) {
+			$ck_funcs[2]['status'] = false;
+			$ck_funcs[2]['help'] = L10n::t('Error: openssl PHP module required but not installed.');
+		}
+		if (!function_exists('mysqli_connect') && !class_exists('pdo')) {
+			$ck_funcs[3]['status'] = false;
+			$ck_funcs[3]['help'] = L10n::t('Error: PDO or MySQLi PHP module required but not installed.');
+		}
+		if (!function_exists('mysqli_connect') && class_exists('pdo') && !in_array('mysql', \PDO::getAvailableDrivers())) {
+			$ck_funcs[3]['status'] = false;
+			$ck_funcs[3]['help'] = L10n::t('Error: The MySQL driver for PDO is not installed.');
+		}
+		if (!function_exists('mb_strlen')) {
+			$ck_funcs[4]['status'] = false;
+			$ck_funcs[4]['help'] = L10n::t('Error: mb_string PHP module required but not installed.');
+		}
+		if (!function_exists('iconv_strlen')) {
+			$ck_funcs[6]['status'] = false;
+			$ck_funcs[6]['help'] = L10n::t('Error: iconv PHP module required but not installed.');
+		}
+		if (!function_exists('posix_kill')) {
+			$ck_funcs[7]['status'] = false;
+			$ck_funcs[7]['help'] = L10n::t('Error: POSIX PHP module required but not installed.');
+		}
+
+		$checks = array_merge($checks, $ck_funcs);
+
+		// check for XML DOM Documents being able to be generated
+		try {
+			$xml = new DOMDocument();
+		} catch (Exception $e) {
+			$ck_funcs[5]['status'] = false;
+			$ck_funcs[5]['help'] = L10n::t('Error, XML PHP module required but not installed.');
+		}
+	}
+
+	/**
+	 * "config/local.ini.php" - Check
+	 *
+	 * Checks if it's possible to create the "config/local.ini.php"
+	 *
+	 * @param array $checks The list of all checks (by-ref parameter!)
+	 */
+	public static function checkLocalIni(&$checks)
+	{
+		$status = true;
+		$help = "";
+		if ((file_exists('config/local.ini.php') && !is_writable('config/local.ini.php')) ||
+			(!file_exists('config/local.ini.php') && !is_writable('.'))) {
+
+			$status = false;
+			$help = L10n::t('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.') . EOL;
+			$help .= L10n::t('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.') . EOL;
+			$help .= L10n::t('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.') . EOL;
+			$help .= L10n::t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.') . EOL;
+		}
+
+		self::addCheck($checks, L10n::t('config/local.ini.php is writable'), $status, false, $help);
+
+	}
+
+	/**
+	 * Smarty3 Template Check
+	 *
+	 * Checks, if the directory of Smarty3 is writable
+	 *
+	 * @param array $checks The list of all checks (by-ref parameter!)
+	 */
+	public static function checkSmarty3(&$checks)
+	{
+		$status = true;
+		$help = "";
+		if (!is_writable('view/smarty3')) {
+
+			$status = false;
+			$help = L10n::t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') . EOL;
+			$help .= L10n::t('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.') . EOL;
+			$help .= L10n::t("Please ensure that the user that your web server runs as \x28e.g. www-data\x29 has write access to this folder.") . EOL;
+			$help .= L10n::t("Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files \x28.tpl\x29 that it contains.") . EOL;
+		}
+
+		self::addCheck($checks, L10n::t('view/smarty3 is writable'), $status, true, $help);
+	}
+
+	/**
+	 * ".htaccess" - Check
+	 *
+	 * Checks, if "url_rewrite" is enabled in the ".htaccess" file
+	 *
+	 * @param array $checks The list of all checks (by-ref parameter!)
+	 */
+	public static function checkHtAccess(&$checks)
+	{
+		$status = true;
+		$help = "";
+		$error_msg = "";
+		if (function_exists('curl_init')) {
+			$test = Network::fetchUrlFull(System::baseUrl() . "/install/testrewrite");
+
+			$url = normalise_link(System::baseUrl() . "/install/testrewrite");
+			if ($test['body'] != "ok") {
+				$test = Network::fetchUrlFull($url);
+			}
+
+			if ($test['body'] != "ok") {
+				$status = false;
+				$help = L10n::t('Url rewrite in .htaccess is not working. Check your server configuration.');
+				$error_msg = [];
+				$error_msg['head'] = L10n::t('Error message from Curl when fetching');
+				$error_msg['url'] = $test['redirect_url'];
+				$error_msg['msg'] = defaults($test, 'error', '');
+			}
+			self::addCheck($checks, L10n::t('Url rewrite is working'), $status, true, $help, $error_msg);
+		} else {
+			// cannot check modrewrite if libcurl is not installed
+			/// @TODO Maybe issue warning here?
+		}
+	}
+
+	/**
+	 * Imagick Check
+	 *
+	 * Checks, if the imagick module is available
+	 *
+	 * @param array $checks The list of all checks (by-ref parameter!)
+	 */
+	public static function checkImagick(&$checks)
+	{
+		$imagick = false;
+		$gif = false;
+
+		if (class_exists('Imagick')) {
+			$imagick = true;
+			$supported = Image::supportedTypes();
+			if (array_key_exists('image/gif', $supported)) {
+				$gif = true;
+			}
+		}
+		if ($imagick == false) {
+			self::addCheck($checks, L10n::t('ImageMagick PHP extension is not installed'), $imagick, false, "");
+		} else {
+			self::addCheck($checks, L10n::t('ImageMagick PHP extension is installed'), $imagick, false, "");
+			if ($imagick) {
+				self::addCheck($checks, L10n::t('ImageMagick supports GIF'), $gif, false, "");
+			}
+		}
+	}
+
+	/**
+	 * Installs the Database structure
+	 *
+	 * @return string A possible error
+	 */
+	public static function installDatabaseStructure()
+	{
+		$errors = DBStructure::update(false, true, true);
+
+		return $errors;
+	}
+}
diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 277b3401d..542590646 100644
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -4,8 +4,9 @@
  */
 namespace Friendica\Core;
 
-use Friendica\Core\Config;
-use dba;
+use Friendica\BaseObject;
+use Friendica\Database\DBA;
+use Friendica\Core\System;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -14,7 +15,7 @@ require_once 'include/dba.php';
  * Provide Languange, Translation, and Localisation functions to the application
  * Localisation can be referred to by the numeronym L10N (as in: "L", followed by ten more letters, and then "N").
  */
-class L10n
+class L10n extends BaseObject
 {
 	/**
 	 * @brief get the prefered language from the HTTP_ACCEPT_LANGUAGE header
@@ -62,11 +63,11 @@ class L10n
 	 */
 	public static function pushLang($language)
 	{
-		global $lang, $a;
+		$a = self::getApp();
 
-		$a->langsave = $lang;
+		$a->langsave = Config::get('system', 'language');
 
-		if ($language === $lang) {
+		if ($language === $a->langsave) {
 			return;
 		}
 
@@ -75,7 +76,7 @@ class L10n
 		}
 		$a->strings = [];
 		self::loadTranslationTable($language);
-		$lang = $language;
+		Config::set('system', 'language', $language);
 	}
 
 	/**
@@ -83,9 +84,9 @@ class L10n
 	 */
 	public static function popLang()
 	{
-		global $lang, $a;
+		$a = self::getApp();
 
-		if ($lang === $a->langsave) {
+		if (Config::get('system', 'language') === $a->langsave) {
 			return;
 		}
 
@@ -95,7 +96,7 @@ class L10n
 			$a->strings = [];
 		}
 
-		$lang = $a->langsave;
+		Config::set('system', 'language', $a->langsave);
 	}
 
 	/**
@@ -107,12 +108,12 @@ class L10n
 	 */
 	public static function loadTranslationTable($lang)
 	{
-		$a = get_app();
+		$a = self::getApp();
 
 		$a->strings = [];
 		// load enabled addons strings
-		$addons = dba::select('addon', ['name'], ['installed' => true]);
-		while ($p = dba::fetch($addons)) {
+		$addons = DBA::select('addon', ['name'], ['installed' => true]);
+		while ($p = DBA::fetch($addons)) {
 			$name = $p['name'];
 			if (file_exists("addon/$name/lang/$lang/strings.php")) {
 				include "addon/$name/lang/$lang/strings.php";
@@ -142,7 +143,11 @@ class L10n
 	 */
 	public static function t($s, ...$vars)
 	{
-		$a = get_app();
+		$a = self::getApp();
+
+		if (empty($s)) {
+			return '';
+		}
 
 		if (x($a->strings, $s)) {
 			$t = $a->strings[$s];
@@ -169,7 +174,6 @@ class L10n
 	 * - L10n::tt('Like', 'Likes', $count)
 	 * - L10n::tt("%s user deleted", "%s users deleted", count($users))
 	 *
-	 * @global type $lang
 	 * @param string $singular
 	 * @param string $plural
 	 * @param int $count
@@ -177,10 +181,15 @@ class L10n
 	 */
 	public static function tt($singular, $plural, $count)
 	{
-		global $lang;
-		$a = get_app();
+		$a = self::getApp();
 
-		if (x($a->strings, $singular)) {
+		if (!is_numeric($count)) {
+			logger('Non numeric count called by ' . System::callstack(20));
+		}
+
+		$lang = Config::get('system', 'language');
+
+		if (!empty($a->strings[$singular])) {
 			$t = $a->strings[$singular];
 			if (is_array($t)) {
 				$plural_function = 'string_plural_select_' . str_replace('-', '_', $lang);
@@ -189,7 +198,13 @@ class L10n
 				} else {
 					$i = self::stringPluralSelectDefault($count);
 				}
-				$s = $t[$i];
+
+				// for some languages there is only a single array item
+				if (!isset($t[$i])) {
+					$s = $t[0];
+				} else {
+					$s = $t[$i];
+				}
 			} else {
 				$s = $t;
 			}
diff --git a/src/Core/Lock.php b/src/Core/Lock.php
new file mode 100644
index 000000000..9892f1f4e
--- /dev/null
+++ b/src/Core/Lock.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Friendica\Core;
+
+/**
+ * @file src/Core/Lock.php
+ * @brief Functions for preventing parallel execution of functions
+ */
+
+use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Core\Cache\IMemoryCacheDriver;
+
+/**
+ * @brief This class contain Functions for preventing parallel execution of functions
+ */
+class Lock
+{
+	/**
+	 * @var Lock\ILockDriver;
+	 */
+	static $driver = null;
+
+	public static function init()
+	{
+		$lock_driver = Config::get('system', 'lock_driver', 'default');
+
+		try {
+			switch ($lock_driver) {
+				case 'memcache':
+				case 'memcached':
+				case 'redis':
+					$cache_driver = CacheDriverFactory::create($lock_driver);
+					if ($cache_driver instanceof IMemoryCacheDriver) {
+						self::$driver = new Lock\CacheLockDriver($cache_driver);
+					}
+					break;
+
+				case 'database':
+					self::$driver = new Lock\DatabaseLockDriver();
+					break;
+
+				case 'semaphore':
+					self::$driver = new Lock\SemaphoreLockDriver();
+					break;
+
+				default:
+					self::useAutoDriver();
+			}
+		} catch (\Exception $exception) {
+			logger ('Driver \'' . $lock_driver . '\' failed - Fallback to \'useAutoDriver()\'');
+			self::useAutoDriver();
+		}
+	}
+
+	/**
+	 * @brief This method tries to find the best - local - locking method for Friendica
+	 *
+	 * The following sequence will be tried:
+	 * 1. Semaphore Locking
+	 * 2. Cache Locking
+	 * 3. Database Locking
+	 *
+	 */
+	private static function useAutoDriver() {
+
+		// 1. Try to use Semaphores for - local - locking
+		if (function_exists('sem_get')) {
+			try {
+				self::$driver = new Lock\SemaphoreLockDriver();
+				return;
+			} catch (\Exception $exception) {
+				logger ('Using Semaphore driver for locking failed: ' . $exception->getMessage());
+			}
+		}
+
+		// 2. Try to use Cache Locking (don't use the DB-Cache Locking because it works different!)
+		$cache_driver = Config::get('system', 'cache_driver', 'database');
+		if ($cache_driver != 'database') {
+			try {
+				$lock_driver = CacheDriverFactory::create($cache_driver);
+				if ($lock_driver instanceof IMemoryCacheDriver) {
+					self::$driver = new Lock\CacheLockDriver($lock_driver);
+				}
+				return;
+			} catch (\Exception $exception) {
+				logger('Using Cache driver for locking failed: ' . $exception->getMessage());
+			}
+		}
+
+		// 3. Use Database Locking as a Fallback
+		self::$driver = new Lock\DatabaseLockDriver();
+	}
+
+	/**
+	 * Returns the current cache driver
+	 *
+	 * @return Lock\ILockDriver;
+	 */
+	private static function getDriver()
+	{
+		if (self::$driver === null) {
+			self::init();
+		}
+
+		return self::$driver;
+	}
+
+	/**
+	 * @brief Acquires a lock for a given name
+	 *
+	 * @param string  $key Name of the lock
+	 * @param integer $timeout Seconds until we give up
+	 *
+	 * @return boolean Was the lock successful?
+	 */
+	public static function acquire($key, $timeout = 120)
+	{
+		return self::getDriver()->acquireLock($key, $timeout);
+	}
+
+	/**
+	 * @brief Releases a lock if it was set by us
+	 *
+	 * @param string $key Name of the lock
+	 * @return void
+	 */
+	public static function release($key)
+	{
+		self::getDriver()->releaseLock($key);
+	}
+
+	/**
+	 * @brief Releases all lock that were set by us
+	 * @return void
+	 */
+	public static function releaseAll()
+	{
+		self::getDriver()->releaseAll();
+	}
+}
diff --git a/src/Core/Lock/AbstractLockDriver.php b/src/Core/Lock/AbstractLockDriver.php
new file mode 100644
index 000000000..033d6f356
--- /dev/null
+++ b/src/Core/Lock/AbstractLockDriver.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Friendica\Core\Lock;
+use Friendica\BaseObject;
+
+/**
+ * Class AbstractLockDriver
+ *
+ * @package Friendica\Core\Lock
+ *
+ * Basic class for Locking with common functions (local acquired locks, releaseAll, ..)
+ */
+abstract class AbstractLockDriver extends BaseObject implements ILockDriver
+{
+	/**
+	 * @var array The local acquired locks
+	 */
+	protected $acquiredLocks = [];
+
+	/**
+	 * Check if we've locally acquired a lock
+	 *
+	 * @param string key The Name of the lock
+	 * @return bool      Returns true if the lock is set
+	 */
+	protected function hasAcquiredLock($key) {
+		return isset($this->acquireLock[$key]) && $this->acquiredLocks[$key] === true;
+	}
+
+	/**
+	 * Mark a locally acquired lock
+	 *
+	 * @param string $key The Name of the lock
+	 */
+	protected function markAcquire($key) {
+		$this->acquiredLocks[$key] = true;
+	}
+
+	/**
+	 * Mark a release of a locally acquired lock
+	 *
+	 * @param string $key The Name of the lock
+	 */
+	protected function markRelease($key) {
+		unset($this->acquiredLocks[$key]);
+	}
+
+	/**
+	 * Releases all lock that were set by us
+	 *
+	 * @return void
+	 */
+	public function releaseAll() {
+		foreach ($this->acquiredLocks as $acquiredLock => $hasLock) {
+			$this->releaseLock($acquiredLock);
+		}
+	}
+}
diff --git a/src/Core/Lock/CacheLockDriver.php b/src/Core/Lock/CacheLockDriver.php
new file mode 100644
index 000000000..18d441ffe
--- /dev/null
+++ b/src/Core/Lock/CacheLockDriver.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace Friendica\Core\Lock;
+
+use Friendica\Core\Cache;
+use Friendica\Core\Cache\IMemoryCacheDriver;
+
+class CacheLockDriver extends AbstractLockDriver
+{
+	/**
+	 * @var \Friendica\Core\Cache\ICacheDriver;
+	 */
+	private $cache;
+
+	/**
+	 * CacheLockDriver constructor.
+	 *
+	 * @param IMemoryCacheDriver $cache The CacheDriver for this type of lock
+	 */
+	public function __construct(IMemoryCacheDriver $cache)
+	{
+		$this->cache = $cache;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function acquireLock($key, $timeout = 120, $ttl = Cache::FIVE_MINUTES)
+	{
+		$got_lock = false;
+		$start = time();
+
+		$cachekey = self::getLockKey($key);
+
+		do {
+			$lock = $this->cache->get($cachekey);
+			// When we do want to lock something that was already locked by us.
+			if ((int)$lock == getmypid()) {
+				$got_lock = true;
+			}
+
+			// When we do want to lock something new
+			if (is_null($lock)) {
+				// At first initialize it with "0"
+				$this->cache->add($cachekey, 0);
+				// Now the value has to be "0" because otherwise the key was used by another process meanwhile
+				if ($this->cache->compareSet($cachekey, 0, getmypid(), $ttl)) {
+					$got_lock = true;
+					$this->markAcquire($key);
+				}
+			}
+
+			if (!$got_lock && ($timeout > 0)) {
+				usleep(rand(10000, 200000));
+			}
+		} while (!$got_lock && ((time() - $start) < $timeout));
+
+		return $got_lock;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function releaseLock($key)
+	{
+		$cachekey = self::getLockKey($key);
+
+		$this->cache->compareDelete($cachekey, getmypid());
+		$this->markRelease($key);
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function isLocked($key)
+	{
+		$cachekey = self::getLockKey($key);
+		$lock = $this->cache->get($cachekey);
+		return isset($lock) && ($lock !== false);
+	}
+
+	/**
+	 * @param string $key	The original key
+	 * @return string		The cache key used for the cache
+	 */
+	private static function getLockKey($key) {
+		return "lock:" . $key;
+	}
+}
diff --git a/src/Core/Lock/DatabaseLockDriver.php b/src/Core/Lock/DatabaseLockDriver.php
new file mode 100644
index 000000000..a8788d1f4
--- /dev/null
+++ b/src/Core/Lock/DatabaseLockDriver.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Friendica\Core\Lock;
+
+use Friendica\Core\Cache;
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
+
+/**
+ * Locking driver that stores the locks in the database
+ */
+class DatabaseLockDriver extends AbstractLockDriver
+{
+	/**
+	 * (@inheritdoc)
+	 */
+	public function acquireLock($key, $timeout = 120, $ttl = Cache::FIVE_MINUTES)
+	{
+		$got_lock = false;
+		$start = time();
+
+		do {
+			DBA::lock('locks');
+			$lock = DBA::selectFirst('locks', ['locked', 'pid'], ['`name` = ? AND `expires` >= ?', $key, DateTimeFormat::utcNow()]);
+
+			if (DBA::isResult($lock)) {
+				if ($lock['locked']) {
+					// We want to lock something that was already locked by us? So we got the lock.
+					if ($lock['pid'] == getmypid()) {
+						$got_lock = true;
+					}
+				}
+				if (!$lock['locked']) {
+					DBA::update('locks', ['locked' => true, 'pid' => getmypid(), 'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds')], ['name' => $key]);
+					$got_lock = true;
+				}
+			} else {
+				DBA::insert('locks', ['name' => $key, 'locked' => true, 'pid' => getmypid(), 'expires' => DateTimeFormat::utc('now + ' . $ttl . 'seconds')]);
+				$got_lock = true;
+				$this->markAcquire($key);
+			}
+
+			DBA::unlock();
+
+			if (!$got_lock && ($timeout > 0)) {
+				usleep(rand(100000, 2000000));
+			}
+		} while (!$got_lock && ((time() - $start) < $timeout));
+
+		return $got_lock;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function releaseLock($key)
+	{
+		DBA::delete('locks', ['name' => $key, 'pid' => getmypid()]);
+
+		$this->markRelease($key);
+
+		return;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function releaseAll()
+	{
+		DBA::delete('locks', ['pid' => getmypid()]);
+
+		$this->acquiredLocks = [];
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function isLocked($key)
+	{
+		$lock = DBA::selectFirst('locks', ['locked'], ['`name` = ? AND `expires` >= ?', $key, DateTimeFormat::utcNow()]);
+
+		if (DBA::isResult($lock)) {
+			return $lock['locked'] !== false;
+		} else {
+			return false;
+		}
+	}
+}
diff --git a/src/Core/Lock/ILockDriver.php b/src/Core/Lock/ILockDriver.php
new file mode 100644
index 000000000..a255f6834
--- /dev/null
+++ b/src/Core/Lock/ILockDriver.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Friendica\Core\Lock;
+use Friendica\Core\Cache;
+
+/**
+ * Lock Driver Interface
+ *
+ * @author Philipp Holzer <admin@philipp.info>
+ */
+interface ILockDriver
+{
+	/**
+	 * Checks, if a key is currently locked to a or my process
+	 *
+	 * @param string $key 		The name of the lock
+	 * @return bool
+	 */
+	public function isLocked($key);
+
+	/**
+	 *
+	 * Acquires a lock for a given name
+	 *
+	 * @param string  $key      The Name of the lock
+	 * @param integer $timeout  Seconds until we give up
+	 * @param integer $ttl      Seconds The lock lifespan, must be one of the Cache constants
+	 *
+	 * @return boolean Was the lock successful?
+	 */
+	public function acquireLock($key, $timeout = 120, $ttl = Cache::FIVE_MINUTES);
+
+	/**
+	 * Releases a lock if it was set by us
+	 *
+	 * @param string $key The Name of the lock
+	 *
+	 * @return void
+	 */
+	public function releaseLock($key);
+
+	/**
+	 * Releases all lock that were set by us
+	 *
+	 * @return void
+	 */
+	public function releaseAll();
+}
diff --git a/src/Core/Lock/SemaphoreLockDriver.php b/src/Core/Lock/SemaphoreLockDriver.php
new file mode 100644
index 000000000..cf1ce5a8d
--- /dev/null
+++ b/src/Core/Lock/SemaphoreLockDriver.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Friendica\Core\Lock;
+
+use Friendica\Core\Cache;
+
+class SemaphoreLockDriver extends AbstractLockDriver
+{
+	private static $semaphore = [];
+
+	public function __construct()
+	{
+		if (!function_exists('sem_get')) {
+			throw new \Exception('Semaphore lock not supported');
+		}
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	private static function semaphoreKey($key)
+	{
+		$temp = get_temppath();
+
+		$file = $temp . '/' . $key . '.sem';
+
+		if (!file_exists($file)) {
+			file_put_contents($file, $key);
+		}
+
+		return ftok($file, 'f');
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function acquireLock($key, $timeout = 120, $ttl = Cache::FIVE_MINUTES)
+	{
+		self::$semaphore[$key] = sem_get(self::semaphoreKey($key));
+		if (self::$semaphore[$key]) {
+			if (sem_acquire(self::$semaphore[$key], ($timeout == 0))) {
+				$this->markAcquire($key);
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function releaseLock($key)
+	{
+		if (empty(self::$semaphore[$key])) {
+			return false;
+		} else {
+			$success = @sem_release(self::$semaphore[$key]);
+			unset(self::$semaphore[$key]);
+			$this->markRelease($key);
+			return $success;
+		}
+	}
+
+	/**
+	 * (@inheritdoc)
+	 */
+	public function isLocked($key)
+	{
+		return isset(self::$semaphore[$key]);
+	}
+}
diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index 6a13c025c..f8c4ee3f8 100644
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -9,13 +9,12 @@ namespace Friendica\Core;
 use Friendica\BaseObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
-use Friendica\Model\Profile;
+use Friendica\Model\Item;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
@@ -69,7 +68,7 @@ class NotificationsManager extends BaseObject
 		$filter_str = [];
 		$filter_sql = "";
 		foreach ($filter as $column => $value) {
-			$filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value));
+			$filter_str[] = sprintf("`%s` = '%s'", $column, DBA::escape($value));
 		}
 		if (count($filter_str) > 0) {
 			$filter_sql = "AND " . implode(" AND ", $filter_str);
@@ -99,7 +98,7 @@ class NotificationsManager extends BaseObject
 			intval(local_user())
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return $this->_set_extra($r);
 		}
 
@@ -119,7 +118,7 @@ class NotificationsManager extends BaseObject
 			intval($id),
 			intval(local_user())
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return $this->_set_extra($r)[0];
 		}
 		return null;
@@ -137,9 +136,9 @@ class NotificationsManager extends BaseObject
 		return q(
 			"UPDATE `notify` SET `seen` = %d WHERE (`link` = '%s' OR (`parent` != 0 AND `parent` = %d AND `otype` = '%s')) AND `uid` = %d",
 			intval($seen),
-			dbesc($note['link']),
+			DBA::escape($note['link']),
 			intval($note['parent']),
-			dbesc($note['otype']),
+			DBA::escape($note['otype']),
 			intval(local_user())
 		);
 	}
@@ -166,39 +165,41 @@ class NotificationsManager extends BaseObject
 	 */
 	public function getTabs()
 	{
+		$selected = defaults(self::getApp()->argv, 1, '');
+
 		$tabs = [
 			[
 				'label' => L10n::t('System'),
 				'url'   => 'notifications/system',
-				'sel'   => ((self::getApp()->argv[1] == 'system') ? 'active' : ''),
+				'sel'   => (($selected == 'system') ? 'active' : ''),
 				'id'    => 'system-tab',
 				'accesskey' => 'y',
 			],
 			[
 				'label' => L10n::t('Network'),
 				'url'   => 'notifications/network',
-				'sel'   => ((self::getApp()->argv[1] == 'network') ? 'active' : ''),
+				'sel'   => (($selected == 'network') ? 'active' : ''),
 				'id'    => 'network-tab',
 				'accesskey' => 'w',
 			],
 			[
 				'label' => L10n::t('Personal'),
 				'url'   => 'notifications/personal',
-				'sel'   => ((self::getApp()->argv[1] == 'personal') ? 'active' : ''),
+				'sel'   => (($selected == 'personal') ? 'active' : ''),
 				'id'    => 'personal-tab',
 				'accesskey' => 'r',
 			],
 			[
 				'label' => L10n::t('Home'),
 				'url'   => 'notifications/home',
-				'sel'   => ((self::getApp()->argv[1] == 'home') ? 'active' : ''),
+				'sel'   => (($selected == 'home') ? 'active' : ''),
 				'id'    => 'home-tab',
 				'accesskey' => 'h',
 			],
 			[
 				'label' => L10n::t('Introductions'),
 				'url'   => 'notifications/intros',
-				'sel'   => ((self::getApp()->argv[1] == 'intros') ? 'active' : ''),
+				'sel'   => (($selected == 'intros') ? 'active' : ''),
 				'id'    => 'intro-tab',
 				'accesskey' => 'i',
 			],
@@ -222,12 +223,12 @@ class NotificationsManager extends BaseObject
 	 * 	string 'ago' => T relative date of the notification
 	 * 	bool 'seen' => Is the notification marked as "seen"
 	 */
-	private function formatNotifs($notifs, $ident = "")
+	private function formatNotifs(array $notifs, $ident = "")
 	{
 		$notif = [];
 		$arr = [];
 
-		if (DBM::is_result($notifs)) {
+		if (DBA::isResult($notifs)) {
 			foreach ($notifs as $it) {
 				// Because we use different db tables for the notification query
 				// we have sometimes $it['unseen'] and sometimes $it['seen].
@@ -236,12 +237,17 @@ class NotificationsManager extends BaseObject
 					$it['seen'] = ($it['unseen'] > 0 ? false : true);
 				}
 
+				// For feed items we use the user's contact, since the avatar is mostly self choosen.
+				if (!empty($it['network']) && $it['network'] == Protocol::FEED) {
+					$it['author-avatar'] = $it['contact-avatar'];
+				}
+
 				// Depending on the identifier of the notification we need to use different defaults
 				switch ($ident) {
 					case 'system':
 						$default_item_label = 'notify';
 						$default_item_link = System::baseUrl(true) . '/notify/view/' . $it['id'];
-						$default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
+						$default_item_image = ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_MICRO);
 						$default_item_url = $it['url'];
 						$default_item_text = strip_tags(BBCode::convert($it['msg']));
 						$default_item_when = DateTimeFormat::local($it['date'], 'r');
@@ -250,22 +256,22 @@ class NotificationsManager extends BaseObject
 
 					case 'home':
 						$default_item_label = 'comment';
-						$default_item_link = System::baseUrl(true) . '/display/' . $it['pguid'];
-						$default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
+						$default_item_link = System::baseUrl(true) . '/display/' . $it['parent-guid'];
+						$default_item_image = ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO);
 						$default_item_url = $it['author-link'];
-						$default_item_text = L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']);
+						$default_item_text = L10n::t("%s commented on %s's post", $it['author-name'], $it['parent-author-name']);
 						$default_item_when = DateTimeFormat::local($it['created'], 'r');
 						$default_item_ago = Temporal::getRelativeDate($it['created']);
 						break;
 
 					default:
 						$default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment');
-						$default_item_link = System::baseUrl(true) . '/display/' . $it['pguid'];
-						$default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
+						$default_item_link = System::baseUrl(true) . '/display/' . $it['parent-guid'];
+						$default_item_image = ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO);
 						$default_item_url = $it['author-link'];
 						$default_item_text = (($it['id'] == $it['parent'])
 									? L10n::t("%s created a new post", $it['author-name'])
-									: L10n::t("%s commented on %s's post", $it['author-name'], $it['pname']));
+									: L10n::t("%s commented on %s's post", $it['author-name'], $it['parent-author-name']));
 						$default_item_when = DateTimeFormat::local($it['created'], 'r');
 						$default_item_ago = Temporal::getRelativeDate($it['created']);
 				}
@@ -275,10 +281,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_LIKE:
 						$notif = [
 							'label' => 'like',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
+							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
 							'url' => $it['author-link'],
-							'text' => L10n::t("%s liked %s's post", $it['author-name'], $it['pname']),
+							'text' => L10n::t("%s liked %s's post", $it['author-name'], $it['parent-author-name']),
 							'when' => $default_item_when,
 							'ago' => $default_item_ago,
 							'seen' => $it['seen']
@@ -288,10 +294,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_DISLIKE:
 						$notif = [
 							'label' => 'dislike',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
+							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
 							'url' => $it['author-link'],
-							'text' => L10n::t("%s disliked %s's post", $it['author-name'], $it['pname']),
+							'text' => L10n::t("%s disliked %s's post", $it['author-name'], $it['parent-author-name']),
 							'when' => $default_item_when,
 							'ago' => $default_item_ago,
 							'seen' => $it['seen']
@@ -301,10 +307,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_ATTEND:
 						$notif = [
 							'label' => 'attend',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
+							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
 							'url' => $it['author-link'],
-							'text' => L10n::t("%s is attending %s's event", $it['author-name'], $it['pname']),
+							'text' => L10n::t("%s is attending %s's event", $it['author-name'], $it['parent-author-name']),
 							'when' => $default_item_when,
 							'ago' => $default_item_ago,
 							'seen' => $it['seen']
@@ -314,10 +320,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_ATTENDNO:
 						$notif = [
 							'label' => 'attendno',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
+							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
 							'url' => $it['author-link'],
-							'text' => L10n::t("%s is not attending %s's event", $it['author-name'], $it['pname']),
+							'text' => L10n::t("%s is not attending %s's event", $it['author-name'], $it['parent-author-name']),
 							'when' => $default_item_when,
 							'ago' => $default_item_ago,
 							'seen' => $it['seen']
@@ -327,10 +333,10 @@ class NotificationsManager extends BaseObject
 					case ACTIVITY_ATTENDMAYBE:
 						$notif = [
 							'label' => 'attendmaybe',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
+							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
 							'url' => $it['author-link'],
-							'text' => L10n::t("%s may attend %s's event", $it['author-name'], $it['pname']),
+							'text' => L10n::t("%s may attend %s's event", $it['author-name'], $it['parent-author-name']),
 							'when' => $default_item_when,
 							'ago' => $default_item_ago,
 							'seen' => $it['seen']
@@ -338,14 +344,30 @@ class NotificationsManager extends BaseObject
 						break;
 
 					case ACTIVITY_FRIEND:
+						if (!isset($it['object'])) {
+							$notif = [
+								'label' => 'friend',
+								'link' => $default_item_link,
+								'image' => $default_item_image,
+								'url' => $default_item_url,
+								'text' => $default_item_text,
+								'when' => $default_item_when,
+								'ago' => $default_item_ago,
+								'seen' => $it['seen']
+							];
+							break;
+						}
+						/// @todo Check if this part here is used at all
+						logger('Complete data: ' . json_encode($it) . ' - ' . System::callstack(20), LOGGER_DEBUG);
+
 						$xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
 						$obj = XML::parseString($xmlhead . $it['object']);
 						$it['fname'] = $obj->title;
 
 						$notif = [
 							'label' => 'friend',
-							'link' => System::baseUrl(true) . '/display/' . $it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+							'link' => System::baseUrl(true) . '/display/' . $it['parent-guid'],
+							'image' => ProxyUtils::proxifyUrl($it['author-avatar'], false, ProxyUtils::SIZE_MICRO),
 							'url' => $it['author-link'],
 							'text' => L10n::t("%s is now friends with %s", $it['author-name'], $it['fname']),
 							'when' => $default_item_when,
@@ -374,38 +396,6 @@ class NotificationsManager extends BaseObject
 		return $arr;
 	}
 
-	/**
-	 * @brief Total number of network notifications
-	 * @param int|string $seen If 0 only include notifications into the query
-	 * 	                       which aren't marked as "seen"
-	 *
-	 * @return int Number of network notifications
-	 */
-	private function networkTotal($seen = 0)
-	{
-		$sql_seen = "";
-		$index_hint = "";
-
-		if ($seen === 0) {
-			$sql_seen = " AND `item`.`unseen` ";
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
-		}
-
-		$r = q(
-			"SELECT COUNT(*) AS `total`
-				FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
-				WHERE `item`.`visible` AND `pitem`.`parent` != 0 AND
-				NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall`
-				$sql_seen",
-			intval(local_user())
-		);
-		if (DBM::is_result($r)) {
-			return $r[0]['total'];
-		}
-
-		return 0;
-	}
-
 	/**
 	 * @brief Get network notifications
 	 *
@@ -416,74 +406,37 @@ class NotificationsManager extends BaseObject
 	 *
 	 * @return array with
 	 * 	string 'ident' => Notification identifier
-	 * 	int 'total' => Total number of available network notifications
 	 * 	array 'notifications' => Network notifications
 	 */
 	public function networkNotifs($seen = 0, $start = 0, $limit = 80)
 	{
 		$ident = 'network';
-		$total = $this->networkTotal($seen);
 		$notifs = [];
-		$sql_seen = "";
-		$index_hint = "";
+
+		$condition = ['wall' => false, 'uid' => local_user()];
 
 		if ($seen === 0) {
-			$sql_seen = " AND `item`.`unseen` ";
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
+			$condition['unseen'] = true;
 		}
 
-		$r = q(
-			"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
-				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
-				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
-			FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
-			WHERE `item`.`visible` AND `pitem`.`parent` != 0 AND
-				NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall`
-				$sql_seen
-			ORDER BY `item`.`created` DESC LIMIT %d, %d ",
-			intval(local_user()),
-			intval($start),
-			intval($limit)
-		);
-		if (DBM::is_result($r)) {
-			$notifs = $this->formatNotifs($r, $ident);
+		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
+			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
+		$params = ['order' => ['created' => true], 'limit' => [$start, $limit]];
+
+		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
+
+		if (DBA::isResult($items)) {
+			$notifs = $this->formatNotifs(Item::inArray($items), $ident);
 		}
 
 		$arr = [
 			'notifications' => $notifs,
 			'ident' => $ident,
-			'total' => $total,
 		];
 
 		return $arr;
 	}
 
-	/**
-	 * @brief Total number of system notifications
-	 * @param int|string $seen If 0 only include notifications into the query
-	 * 	                       which aren't marked as "seen"
-	 *
-	 * @return int Number of system notifications
-	 */
-	private function systemTotal($seen = 0)
-	{
-		$sql_seen = "";
-
-		if ($seen === 0) {
-			$sql_seen = " AND NOT `seen` ";
-		}
-
-		$r = q(
-			"SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen",
-			intval(local_user())
-		);
-		if (DBM::is_result($r)) {
-			return $r[0]['total'];
-		}
-
-		return 0;
-	}
-
 	/**
 	 * @brief Get system notifications
 	 *
@@ -494,13 +447,11 @@ class NotificationsManager extends BaseObject
 	 *
 	 * @return array with
 	 * 	string 'ident' => Notification identifier
-	 * 	int 'total' => Total number of available system notifications
 	 * 	array 'notifications' => System notifications
 	 */
 	public function systemNotifs($seen = 0, $start = 0, $limit = 80)
 	{
 		$ident = 'system';
-		$total = $this->systemTotal($seen);
 		$notifs = [];
 		$sql_seen = "";
 
@@ -509,80 +460,25 @@ class NotificationsManager extends BaseObject
 		}
 
 		$r = q(
-			"SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify`
+			"SELECT `id`, `url`, `photo`, `msg`, `date`, `seen`, `verb` FROM `notify`
 				WHERE `uid` = %d $sql_seen ORDER BY `date` DESC LIMIT %d, %d ",
 			intval(local_user()),
 			intval($start),
 			intval($limit)
 		);
-		if (DBM::is_result($r)) {
+
+		if (DBA::isResult($r)) {
 			$notifs = $this->formatNotifs($r, $ident);
 		}
 
 		$arr = [
 			'notifications' => $notifs,
 			'ident' => $ident,
-			'total' => $total,
 		];
 
 		return $arr;
 	}
 
-	/**
-	 * @brief Additional SQL query string for the personal notifications
-	 *
-	 * @return string The additional SQL query
-	 */
-	private function personalSqlExtra()
-	{
-		$myurl = System::baseUrl(true) . '/profile/' . self::getApp()->user['nickname'];
-		$myurl = substr($myurl, strpos($myurl, '://') + 3);
-		$myurl = str_replace(['www.', '.'], ['', '\\.'], $myurl);
-		$diasp_url = str_replace('/profile/', '/u/', $myurl);
-		$sql_extra = sprintf(
-			" AND (`item`.`author-link` REGEXP '%s' OR `item`.`tag` REGEXP '%s' OR `item`.`tag` REGEXP '%s') ",
-			dbesc($myurl . '$'),
-			dbesc($myurl . '\\]'),
-			dbesc($diasp_url . '\\]')
-		);
-
-		return $sql_extra;
-	}
-
-	/**
-	 * @brief Total number of personal notifications
-	 * @param int|string $seen If 0 only include notifications into the query
-	 * 	                       which aren't marked as "seen"
-	 *
-	 * @return int Number of personal notifications
-	 */
-	private function personalTotal($seen = 0)
-	{
-		$sql_seen = "";
-		$index_hint = "";
-		$sql_extra = $this->personalSqlExtra();
-
-		if ($seen === 0) {
-			$sql_seen = " AND `item`.`unseen` ";
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
-		}
-
-		$r = q(
-			"SELECT COUNT(*) AS `total`
-				FROM `item` $index_hint
-				WHERE `item`.`visible`
-				$sql_extra
-				$sql_seen
-				AND NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall`",
-			intval(local_user())
-		);
-		if (DBM::is_result($r)) {
-			return $r[0]['total'];
-		}
-
-		return 0;
-	}
-
 	/**
 	 * @brief Get personal notifications
 	 *
@@ -593,81 +489,41 @@ class NotificationsManager extends BaseObject
 	 *
 	 * @return array with
 	 * 	string 'ident' => Notification identifier
-	 * 	int 'total' => Total number of available personal notifications
 	 * 	array 'notifications' => Personal notifications
 	 */
 	public function personalNotifs($seen = 0, $start = 0, $limit = 80)
 	{
 		$ident = 'personal';
-		$total = $this->personalTotal($seen);
-		$sql_extra = $this->personalSqlExtra();
 		$notifs = [];
-		$sql_seen = "";
-		$index_hint = "";
+
+		$myurl = str_replace('http://', '', self::getApp()->contact['nurl']);
+		$diasp_url = str_replace('/profile/', '/u/', $myurl);
+
+		$condition = ["NOT `wall` AND `uid` = ? AND (`item`.`author-id` = ? OR `item`.`tag` REGEXP ? OR `item`.`tag` REGEXP ?)",
+			local_user(), public_contact(), $myurl . '\\]', $diasp_url . '\\]'];
 
 		if ($seen === 0) {
-			$sql_seen = " AND `item`.`unseen` ";
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
+			$condition[0] .= " AND `unseen`";
 		}
 
-		$r = q(
-			"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
-				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
-				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
-			FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
-			WHERE `item`.`visible`
-				$sql_extra
-				$sql_seen
-				AND NOT `item`.`deleted` AND `item`.`uid` = %d AND NOT `item`.`wall`
-			ORDER BY `item`.`created` DESC LIMIT %d, %d ",
-			intval(local_user()),
-			intval($start),
-			intval($limit)
-		);
-		if (DBM::is_result($r)) {
-			$notifs = $this->formatNotifs($r, $ident);
+		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
+			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
+		$params = ['order' => ['created' => true], 'limit' => [$start, $limit]];
+
+		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
+
+		if (DBA::isResult($items)) {
+			$notifs = $this->formatNotifs(Item::inArray($items), $ident);
 		}
 
 		$arr = [
 			'notifications' => $notifs,
 			'ident' => $ident,
-			'total' => $total,
 		];
 
 		return $arr;
 	}
 
-	/**
-	 * @brief Total number of home notifications
-	 * @param int|string $seen If 0 only include notifications into the query
-	 * 	                       which aren't marked as "seen"
-	 *
-	 * @return int Number of home notifications
-	 */
-	private function homeTotal($seen = 0)
-	{
-		$sql_seen = "";
-		$index_hint = "";
-
-		if ($seen === 0) {
-			$sql_seen = " AND `item`.`unseen` ";
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
-		}
-
-		$r = q(
-			"SELECT COUNT(*) AS `total` FROM `item` $index_hint
-				WHERE `item`.`visible` = 1 AND
-				 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1
-				$sql_seen",
-			intval(local_user())
-		);
-		if (DBM::is_result($r)) {
-			return $r[0]['total'];
-		}
-
-		return 0;
-	}
-
 	/**
 	 * @brief Get home notifications
 	 *
@@ -678,76 +534,36 @@ class NotificationsManager extends BaseObject
 	 *
 	 * @return array with
 	 * 	string 'ident' => Notification identifier
-	 * 	int 'total' => Total number of available home notifications
 	 * 	array 'notifications' => Home notifications
 	 */
 	public function homeNotifs($seen = 0, $start = 0, $limit = 80)
 	{
 		$ident = 'home';
-		$total = $this->homeTotal($seen);
 		$notifs = [];
-		$sql_seen = "";
-		$index_hint = "";
+
+		$condition = ['wall' => true, 'uid' => local_user()];
 
 		if ($seen === 0) {
-			$sql_seen = " AND `item`.`unseen` ";
-			$index_hint = "USE INDEX (`uid_unseen_contactid`)";
+			$condition['unseen'] = true;
 		}
 
-		$r = q(
-			"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
-				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
-				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
-			FROM `item` $index_hint STRAIGHT_JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
-			WHERE `item`.`visible` AND
-				NOT `item`.`deleted` AND `item`.`uid` = %d AND `item`.`wall`
-				$sql_seen
-			ORDER BY `item`.`created` DESC LIMIT %d, %d ",
-			intval(local_user()),
-			intval($start),
-			intval($limit)
-		);
-		if (DBM::is_result($r)) {
-			$notifs = $this->formatNotifs($r, $ident);
+		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
+			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
+		$params = ['order' => ['created' => true], 'limit' => [$start, $limit]];
+		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
+
+		if (DBA::isResult($items)) {
+			$notifs = $this->formatNotifs(Item::inArray($items), $ident);
 		}
 
 		$arr = [
 			'notifications' => $notifs,
 			'ident' => $ident,
-			'total' => $total,
 		];
 
 		return $arr;
 	}
 
-	/**
-	 * @brief Total number of introductions
-	 * @param bool $all If false only include introductions into the query
-	 * 	                which aren't marked as ignored
-	 *
-	 * @return int Number of introductions
-	 */
-	private function introTotal($all = false)
-	{
-		$sql_extra = "";
-
-		if (!$all) {
-			$sql_extra = " AND `ignore` = 0 ";
-		}
-
-		$r = q(
-			"SELECT COUNT(*) AS `total` FROM `intro`
-			WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
-			intval($_SESSION['uid'])
-		);
-
-		if (DBM::is_result($r)) {
-			return $r[0]['total'];
-		}
-
-		return 0;
-	}
-
 	/**
 	 * @brief Get introductions
 	 *
@@ -758,13 +574,11 @@ class NotificationsManager extends BaseObject
 	 *
 	 * @return array with
 	 *	string 'ident' => Notification identifier
-	 *	int 'total' => Total number of available introductions
 	 *	array 'notifications' => Introductions
 	 */
 	public function introNotifs($all = false, $start = 0, $limit = 80)
 	{
 		$ident = 'introductions';
-		$total = $this->introTotal($all);
 		$notifs = [];
 		$sql_extra = "";
 
@@ -775,7 +589,7 @@ class NotificationsManager extends BaseObject
 		/// @todo Fetch contact details by "Contact::getDetailsByUrl" instead of queries to contact, fcontact and gcontact
 		$r = q(
 			"SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*,
-				`fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`,
+				`fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`, `fcontact`.`addr` AS `faddr`,
 				`fcontact`.`photo` AS `fphoto`, `fcontact`.`request` AS `frequest`,
 				`gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`,
 				`gcontact`.`keywords` AS `gkeywords`, `gcontact`.`gender` AS `ggender`,
@@ -790,13 +604,12 @@ class NotificationsManager extends BaseObject
 			intval($start),
 			intval($limit)
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$notifs = $this->formatIntros($r);
 		}
 
 		$arr = [
 			'ident' => $ident,
-			'total' => $total,
 			'notifications' => $notifs,
 		];
 
@@ -818,17 +631,21 @@ class NotificationsManager extends BaseObject
 			// We have to distinguish between these two because they use different data.
 			// Contact suggestions
 			if ($it['fid']) {
-				$return_addr = bin2hex(self::getApp()->user['nickname'] . '@' . self::getApp()->get_hostname() . ((self::getApp()->path) ? '/' . self::getApp()->path : ''));
+				$return_addr = bin2hex(self::getApp()->user['nickname'] . '@' . self::getApp()->get_hostname() . ((self::getApp()->urlpath) ? '/' . self::getApp()->urlpath : ''));
 
 				$intro = [
 					'label' => 'friend_suggestion',
 					'notify_type' => L10n::t('Friend Suggestion'),
 					'intro_id' => $it['intro_id'],
 					'madeby' => $it['name'],
+					'madeby_url' => $it['url'],
+					'madeby_zrl' => Contact::magicLink($it['url']),
+					'madeby_addr' => $it['addr'],
 					'contact_id' => $it['contact-id'],
-					'photo' => ((x($it, 'fphoto')) ? proxy_url($it['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
+					'photo' => ((x($it, 'fphoto')) ? ProxyUtils::proxifyUrl($it['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-175.jpg"),
 					'name' => $it['fname'],
-					'url' => Profile::zrl($it['furl']),
+					'url' => $it['furl'],
+					'zrl' => Contact::magicLink($it['furl']),
 					'hidden' => $it['hidden'] == 1,
 					'post_newfriend' => (intval(PConfig::get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
 					'knowyou' => $knowyou,
@@ -840,20 +657,24 @@ class NotificationsManager extends BaseObject
 			} else {
 				$it = $this->getMissingIntroData($it);
 
+				if (empty($it['url'])) {
+					continue;
+				}
+
 				// Don't show these data until you are connected. Diaspora is doing the same.
-				if ($it['gnetwork'] === NETWORK_DIASPORA) {
+				if ($it['gnetwork'] === Protocol::DIASPORA) {
 					$it['glocation'] = "";
 					$it['gabout'] = "";
 					$it['ggender'] = "";
 				}
 				$intro = [
-					'label' => (($it['network'] !== NETWORK_OSTATUS) ? 'friend_request' : 'follower'),
-					'notify_type' => (($it['network'] !== NETWORK_OSTATUS) ? L10n::t('Friend/Connect Request') : L10n::t('New Follower')),
+					'label' => (($it['network'] !== Protocol::OSTATUS) ? 'friend_request' : 'follower'),
+					'notify_type' => (($it['network'] !== Protocol::OSTATUS) ? L10n::t('Friend/Connect Request') : L10n::t('New Follower')),
 					'dfrn_id' => $it['issued-id'],
 					'uid' => $_SESSION['uid'],
 					'intro_id' => $it['intro_id'],
 					'contact_id' => $it['contact-id'],
-					'photo' => ((x($it, 'photo')) ? proxy_url($it['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
+					'photo' => ((x($it, 'photo')) ? ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-175.jpg"),
 					'name' => $it['name'],
 					'location' => BBCode::convert($it['glocation'], false),
 					'about' => BBCode::convert($it['gabout'], false),
@@ -862,7 +683,7 @@ class NotificationsManager extends BaseObject
 					'hidden' => $it['hidden'] == 1,
 					'post_newfriend' => (intval(PConfig::get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
 					'url' => $it['url'],
-					'zrl' => Profile::zrl($it['url']),
+					'zrl' => Contact::magicLink($it['url']),
 					'addr' => $it['gaddr'],
 					'network' => $it['gnetwork'],
 					'knowyou' => $it['knowyou'],
@@ -888,22 +709,22 @@ class NotificationsManager extends BaseObject
 	{
 		// If the network and the addr isn't available from the gcontact
 		// table entry, take the one of the contact table entry
-		if ($arr['gnetwork'] == "") {
+		if (empty($arr['gnetwork']) && !empty($arr['network'])) {
 			$arr['gnetwork'] = $arr['network'];
 		}
-		if ($arr['gaddr'] == "") {
+		if (empty($arr['gaddr']) && !empty($arr['addr'])) {
 			$arr['gaddr'] = $arr['addr'];
 		}
 
 		// If the network and addr is still not available
 		// get the missing data data from other sources
-		if ($arr['gnetwork'] == "" || $arr['gaddr'] == "") {
+		if (empty($arr['gnetwork']) || empty($arr['gaddr'])) {
 			$ret = Contact::getDetailsByURL($arr['url']);
 
-			if ($arr['gnetwork'] == "" && $ret['network'] != "") {
+			if (empty($arr['gnetwork']) && !empty($ret['network'])) {
 				$arr['gnetwork'] = $ret['network'];
 			}
-			if ($arr['gaddr'] == "" && $ret['addr'] != "") {
+			if (empty($arr['gaddr']) && !empty($ret['addr'])) {
 				$arr['gaddr'] = $ret['addr'];
 			}
 		}
diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index bfa52f5a3..2b6618930 100644
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -8,8 +8,8 @@
  */
 namespace Friendica\Core;
 
+use Friendica\App;
 use Friendica\BaseObject;
-use Friendica\Core\Config;
 
 require_once 'include/dba.php';
 
@@ -29,9 +29,12 @@ class PConfig extends BaseObject
 
 	public static function init($uid)
 	{
-		$a = self::getApp();
+		// Database isn't ready or populated yet
+		if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+			return;
+		}
 
-		if (isset($a->config['system']['config_adapter']) && $a->config['system']['config_adapter'] == 'preload') {
+		if (self::getApp()->getConfigValue('system', 'config_adapter') == 'preload') {
 			self::$adapter = new Config\PreloadPConfigAdapter($uid);
 		} else {
 			self::$adapter = new Config\JITPConfigAdapter($uid);
@@ -51,6 +54,11 @@ class PConfig extends BaseObject
 	 */
 	public static function load($uid, $family)
 	{
+		// Database isn't ready or populated yet
+		if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+			return;
+		}
+
 		if (empty(self::$adapter)) {
 			self::init($uid);
 		}
@@ -75,6 +83,11 @@ class PConfig extends BaseObject
 	 */
 	public static function get($uid, $family, $key, $default_value = null, $refresh = false)
 	{
+		// Database isn't ready or populated yet
+		if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+			return;
+		}
+
 		if (empty(self::$adapter)) {
 			self::init($uid);
 		}
@@ -95,10 +108,15 @@ class PConfig extends BaseObject
 	 * @param string $key    The configuration key to set
 	 * @param string $value  The value to store
 	 *
-	 * @return mixed Stored $value or false
+	 * @return bool Operation success
 	 */
 	public static function set($uid, $family, $key, $value)
 	{
+		// Database isn't ready or populated yet
+		if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+			return false;
+		}
+
 		if (empty(self::$adapter)) {
 			self::init($uid);
 		}
@@ -120,6 +138,11 @@ class PConfig extends BaseObject
 	 */
 	public static function delete($uid, $family, $key)
 	{
+		// Database isn't ready or populated yet
+		if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+			return false;
+		}
+
 		if (empty(self::$adapter)) {
 			self::init($uid);
 		}
diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php
index 4467bf002..d41250a68 100644
--- a/src/Core/Protocol.php
+++ b/src/Core/Protocol.php
@@ -9,31 +9,37 @@ use Friendica\Util\Network;
 /**
  * Manage compatibility with federated networks
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 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
 
diff --git a/src/Core/Session.php b/src/Core/Session.php
index b245c675b..d9143c880 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
 {
@@ -45,9 +45,24 @@ class Session
 		return isset($_SESSION[$name]);
 	}
 
-	public static function get($name)
+	/**
+	 * Retrieves a key from the session super global or the defaults if the key is missing or the value is falsy.
+	 * 
+	 * Handle the case where session_start() hasn't been called and the super global isn't available.
+	 *
+	 * @param string $name
+	 * @param mixed $defaults
+	 * @return mixed
+	 */
+	public static function get($name, $defaults = null)
 	{
-		return defaults($_SESSION, $name, null);
+		if (isset($_SESSION)) {
+			$return = defaults($_SESSION, $name, $defaults);
+		} else {
+			$return = $defaults;
+		}
+
+		return $return;
 	}
 
 	public static function set($name, $value)
diff --git a/src/Core/Session/CacheSessionHandler.php b/src/Core/Session/CacheSessionHandler.php
index 507735c4f..3ebdb99e1 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 f69531a88..f249b37fd 100644
--- a/src/Core/Session/DatabaseSessionHandler.php
+++ b/src/Core/Session/DatabaseSessionHandler.php
@@ -4,9 +4,8 @@ namespace Friendica\Core\Session;
 
 use Friendica\BaseObject;
 use Friendica\Core\Session;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use SessionHandlerInterface;
-use dba;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -15,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
 {
@@ -30,8 +29,8 @@ class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterfa
 			return '';
 		}
 
-		$session = dba::selectFirst('session', ['data'], ['sid' => $session_id]);
-		if (DBM::is_result($session)) {
+		$session = DBA::selectFirst('session', ['data'], ['sid' => $session_id]);
+		if (DBA::isResult($session)) {
 			Session::$exists = true;
 			return $session['data'];
 		}
@@ -67,10 +66,10 @@ class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterfa
 		if (Session::$exists) {
 			$fields = ['data' => $session_data, 'expire' => $expire];
 			$condition = ["`sid` = ? AND (`data` != ? OR `expire` != ?)", $session_id, $session_data, $expire];
-			dba::update('session', $fields, $condition);
+			DBA::update('session', $fields, $condition);
 		} else {
 			$fields = ['sid' => $session_id, 'expire' => $default_expire, 'data' => $session_data];
-			dba::insert('session', $fields);
+			DBA::insert('session', $fields);
 		}
 
 		return true;
@@ -83,13 +82,13 @@ class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterfa
 
 	public function destroy($id)
 	{
-		dba::delete('session', ['sid' => $id]);
+		DBA::delete('session', ['sid' => $id]);
 		return true;
 	}
 
 	public function gc($maxlifetime)
 	{
-		dba::delete('session', ["`expire` < ?", time()]);
+		DBA::delete('session', ["`expire` < ?", time()]);
 		return true;
 	}
 }
diff --git a/src/Core/System.php b/src/Core/System.php
index 1db417eb8..88b89cda2 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -65,13 +65,14 @@ class System extends BaseObject
 		while ($func = array_pop($trace)) {
 			if (!empty($func['class'])) {
 				// Don't show multiple calls from the "dba" class to show the essential parts of the callstack
-				if ((($previous['class'] != $func['class']) || ($func['class'] != 'dba')) && ($previous['function'] != 'q')) {
+				if ((($previous['class'] != $func['class']) || ($func['class'] != 'Friendica\Database\DBA')) && ($previous['function'] != 'q')) {
 					$classparts = explode("\\", $func['class']);
 					$callstack[] = array_pop($classparts).'::'.$func['function'];
 					$previous = $func;
 				}
 			} elseif (!in_array($func['function'], $ignore)) {
 				$callstack[] = $func['function'];
+				$func['class'] = '';
 				$previous = $func;
 			}
 		}
@@ -84,20 +85,6 @@ class System extends BaseObject
 		return implode(', ', $callstack2);
 	}
 
-	/**
-	 * @brief Called from db initialisation when db is dead.
-	 */
-	static public function unavailable() {
-echo <<< EOT
-<html>
-	<head><title>System Unavailable</title></head>
-	<body>Apologies but this site is unavailable at the moment. Please try again later.</body>
-</html>
-EOT;
-
-		killme();
-	}
-
 	/**
 	 * Generic XML return
 	 * Outputs a basic dfrn XML status structure to STDOUT, with a <status> variable
@@ -151,36 +138,74 @@ EOT;
 
 		if (isset($description["title"])) {
 			$tpl = get_markup_template('http_status.tpl');
-			echo replace_macros(
-				$tpl,
-				[
-					'$title' => $description["title"],
-					'$description' => $description["description"]]
-			);
+			echo replace_macros($tpl, ['$title' => $description["title"],
+				'$description' => defaults($description, 'description', '')]);
 		}
 
 		killme();
 	}
 
 	/**
-	 * @brief Encodes content to json
+	 * @brief Encodes content to json.
 	 *
 	 * This function encodes an array to json format
 	 * and adds an application/json HTTP header to the output.
 	 * After finishing the process is getting killed.
 	 *
-	 * @param array $x The input content
+	 * @param array  $x The input content.
+	 * @param string $content_type Type of the input (Default: 'application/json').
 	 */
-	public static function jsonExit($x)
-	{
-		header("content-type: application/json");
+	public static function jsonExit($x, $content_type = 'application/json') {
+		header("Content-type: $content_type");
 		echo json_encode($x);
 		killme();
 	}
 
+	/**
+	 * Generates a GUID with the given parameters
+	 *
+	 * @param int          $size     The size of the GUID (default is 16)
+	 * @param bool|string  $prefix   A given prefix (default is empty)
+	 * @return string a generated GUID
+	 */
+	public static function createGUID($size = 16, $prefix = '')
+	{
+		if (is_bool($prefix) && !$prefix) {
+			$prefix = '';
+		} elseif (empty($prefix)) {
+			$prefix = hash('crc32', self::getApp()->get_hostname());
+		}
+
+		while (strlen($prefix) < ($size - 13)) {
+			$prefix .= mt_rand();
+		}
+
+		if ($size >= 24) {
+			$prefix = substr($prefix, 0, $size - 22);
+			return str_replace('.', '', uniqid($prefix, true));
+		} else {
+			$prefix = substr($prefix, 0, max($size - 13, 0));
+			return uniqid($prefix);
+		}
+	}
+
+	/**
+	 * Generates a process identifier for the logging
+	 *
+	 * @param string $prefix A given prefix
+	 *
+	 * @return string a generated process identifier
+	 */
+	public static function processID($prefix)
+	{
+		// We aren't calling any other function here.
+		// Doing so could easily create an endless loop
+		$trailer = $prefix . ':' . getmypid() . ':';
+		return substr($trailer . uniqid('') . mt_rand(), 0, 26);
+	}
+
 	/// @todo Move the following functions from boot.php
 	/*
-	function get_guid($size = 16, $prefix = "")
 	function killme()
 	function goaway($s)
 	function local_user()
diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 0832dae45..e62084049 100644
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -5,14 +5,10 @@
 namespace Friendica\Core;
 
 use Friendica\App;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
-use Friendica\Core\PConfig;
-use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
-use dba;
 
 require_once "include/dba.php";
 
@@ -29,7 +25,7 @@ class UserImport
 			return 1;
 		}
 
-		return dba::lastInsertId();
+		return DBA::lastInsertId();
 	}
 
 	/**
@@ -40,7 +36,7 @@ class UserImport
 	 */
 	private static function checkCols($table, &$arr)
 	{
-		$query = sprintf("SHOW COLUMNS IN `%s`", dbesc($table));
+		$query = sprintf("SHOW COLUMNS IN `%s`", DBA::escape($table));
 		logger("uimport: $query", LOGGER_DEBUG);
 		$r = q($query);
 		$tcols = [];
@@ -69,8 +65,8 @@ class UserImport
 		}
 
 		self::checkCols($table, $arr);
-		$cols = implode("`,`", array_map('dbesc', array_keys($arr)));
-		$vals = implode("','", array_map('dbesc', array_values($arr)));
+		$cols = implode("`,`", array_map(['Friendica\Database\DBA', 'escape'], array_keys($arr)));
+		$vals = implode("','", array_map(['Friendica\Database\DBA', 'escape'], array_values($arr)));
 		$query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')";
 		logger("uimport: $query", LOGGER_TRACE);
 
@@ -113,8 +109,8 @@ class UserImport
 
 		// check for username
 		// check if username matches deleted account
-		if (dba::exists('user', ['nickname' => $account['user']['nickname']])
-			|| dba::exists('userd', ['username' => $account['user']['nickname']])) {
+		if (DBA::exists('user', ['nickname' => $account['user']['nickname']])
+			|| DBA::exists('userd', ['username' => $account['user']['nickname']])) {
 			notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname']));
 			return;
 		}
@@ -147,7 +143,7 @@ class UserImport
 		// import user
 		$r = self::dbImportAssoc('user', $account['user']);
 		if ($r === false) {
-			logger("uimport:insert user : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+			logger("uimport:insert user : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
 			notice(L10n::t("User creation error"));
 			return;
 		}
@@ -165,9 +161,9 @@ class UserImport
 			$profile['uid'] = $newuid;
 			$r = self::dbImportAssoc('profile', $profile);
 			if ($r === false) {
-				logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+				logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
 				info(L10n::t("User profile creation error"));
-				dba::delete('user', ['uid' => $newuid]);
+				DBA::delete('user', ['uid' => $newuid]);
 				return;
 			}
 		}
@@ -187,12 +183,12 @@ class UserImport
 				$contact["avatar-date"] = NULL_DATE;
 
 				switch ($contact['network']) {
-					case NETWORK_DFRN:
-					case NETWORK_DIASPORA:
+					case Protocol::DFRN:
+					case Protocol::DIASPORA:
 						//  send relocate message (below)
 						break;
-					case NETWORK_FEED:
-					case NETWORK_MAIL:
+					case Protocol::FEED:
+					case Protocol::MAIL:
 						// Nothing to do
 						break;
 					default:
@@ -203,7 +199,7 @@ class UserImport
 			$contact['uid'] = $newuid;
 			$r = self::dbImportAssoc('contact', $contact);
 			if ($r === false) {
-				logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+				logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
 				$errorcount++;
 			} else {
 				$contact['newid'] = self::lastInsertId();
@@ -217,7 +213,7 @@ class UserImport
 			$group['uid'] = $newuid;
 			$r = self::dbImportAssoc('group', $group);
 			if ($r === false) {
-				logger("uimport:insert group " . $group['name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+				logger("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
 			} else {
 				$group['newid'] = self::lastInsertId();
 			}
@@ -242,7 +238,7 @@ class UserImport
 			if ($import == 2) {
 				$r = self::dbImportAssoc('group_member', $group_member);
 				if ($r === false) {
-					logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+					logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
 				}
 			}
 		}
@@ -260,7 +256,7 @@ class UserImport
 			);
 
 			if ($r === false) {
-				logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+				logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
 			}
 		}
 
@@ -268,7 +264,7 @@ class UserImport
 			$pconfig['uid'] = $newuid;
 			$r = self::dbImportAssoc('pconfig', $pconfig);
 			if ($r === false) {
-				logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+				logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
 			}
 		}
 
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 2936480de..9dd973728 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -4,15 +4,10 @@
  */
 namespace Friendica\Core;
 
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Process;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Lock;
 use Friendica\Util\Network;
-use dba;
 
 require_once 'include/dba.php';
 
@@ -45,7 +40,7 @@ class Worker
 		self::$up_start = microtime(true);
 
 		// At first check the maximum load. We shouldn't continue with a high load
-		if ($a->maxload_reached()) {
+		if ($a->isMaxLoadReached()) {
 			logger('Pre check: maximum load reached, quitting.', LOGGER_DEBUG);
 			return;
 		}
@@ -54,9 +49,9 @@ class Worker
 		self::startProcess();
 
 		// Kill stale processes every 5 minutes
-		$last_cleanup = Config::get('system', 'poller_last_cleaned', 0);
+		$last_cleanup = Config::get('system', 'worker_last_cleaned', 0);
 		if (time() > ($last_cleanup + 300)) {
-			Config::set('system', 'poller_last_cleaned', time());
+			Config::set('system', 'worker_last_cleaned', time());
 			self::killStaleWorkers();
 		}
 
@@ -79,7 +74,7 @@ class Worker
 		}
 
 		// Possibly there are too much database processes that block the system
-		if ($a->max_processes_reached()) {
+		if ($a->isMaxProcessesReached()) {
 			logger('Pre check: maximum processes reached, quitting.', LOGGER_DEBUG);
 			return;
 		}
@@ -108,16 +103,16 @@ class Worker
 				}
 
 				// If possible we will fetch new jobs for this worker
-				if (!$refetched && Lock::set('poller_worker_process', 0)) {
+				if (!$refetched && Lock::acquire('worker_process', 0)) {
 					$stamp = (float)microtime(true);
 					$refetched = self::findWorkerProcesses($passing_slow);
 					self::$db_duration += (microtime(true) - $stamp);
-					Lock::remove('poller_worker_process');
+					Lock::release('worker_process');
 				}
 			}
 
 			// To avoid the quitting of multiple workers only one worker at a time will execute the check
-			if (Lock::set('poller_worker', 0)) {
+			if (Lock::acquire('worker', 0)) {
 				$stamp = (float)microtime(true);
 				// Count active workers and compare them with a maximum value that depends on the load
 				if (self::tooMuchWorkers()) {
@@ -130,7 +125,7 @@ class Worker
 					logger('Memory limit reached, quitting.', LOGGER_DEBUG);
 					return;
 				}
-				Lock::remove('poller_worker');
+				Lock::release('worker');
 				self::$db_duration += (microtime(true) - $stamp);
 			}
 
@@ -140,7 +135,12 @@ class Worker
 				return;
 			}
 		}
-		logger("Couldn't select a workerqueue entry, quitting.", LOGGER_DEBUG);
+
+		// Cleaning up. Possibly not needed, but it doesn't harm anything.
+		if (Config::get('system', 'worker_daemon_mode', false)) {
+			self::IPCSetJobState(false);
+		}
+		logger("Couldn't select a workerqueue entry, quitting process " . getmypid() . ".", LOGGER_DEBUG);
 	}
 
 	/**
@@ -150,12 +150,7 @@ class Worker
 	 */
 	private static function totalEntries()
 	{
-		$s = dba::fetch_first("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` <= ? AND NOT `done`", NULL_DATE);
-		if (DBM::is_result($s)) {
-			return $s["total"];
-		} else {
-			return 0;
-		}
+		return DBA::count('workerqueue', ["`executed` <= ? AND NOT `done`", NULL_DATE]);
 	}
 
 	/**
@@ -166,8 +161,8 @@ class Worker
 	private static function highestPriority()
 	{
 		$condition = ["`executed` <= ? AND NOT `done`", NULL_DATE];
-		$workerqueue = dba::selectFirst('workerqueue', ['priority'], $condition, ['order' => ['priority']]);
-		if (DBM::is_result($workerqueue)) {
+		$workerqueue = DBA::selectFirst('workerqueue', ['priority'], $condition, ['order' => ['priority']]);
+		if (DBA::isResult($workerqueue)) {
 			return $workerqueue["priority"];
 		} else {
 			return 0;
@@ -184,7 +179,7 @@ class Worker
 	private static function processWithPriorityActive($priority)
 	{
 		$condition = ["`priority` <= ? AND `executed` > ? AND NOT `done`", $priority, NULL_DATE];
-		return dba::exists('workerqueue', $condition);
+		return DBA::exists('workerqueue', $condition);
 	}
 
 	/**
@@ -207,7 +202,7 @@ class Worker
 		}
 
 		// Constantly check the number of parallel database processes
-		if ($a->max_processes_reached()) {
+		if ($a->isMaxProcessesReached()) {
 			logger("Max processes reached for process ".$mypid, LOGGER_DEBUG);
 			return false;
 		}
@@ -234,7 +229,7 @@ class Worker
 
 			if ($age > 1) {
 				$stamp = (float)microtime(true);
-				dba::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);
+				DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);
 				self::$db_duration += (microtime(true) - $stamp);
 			}
 
@@ -243,8 +238,8 @@ class Worker
 			self::execFunction($queue, $include, $argv, true);
 
 			$stamp = (float)microtime(true);
-			if (dba::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
-				Config::set('system', 'last_poller_execution', DateTimeFormat::utcNow());
+			if (DBA::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
+				Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow());
 			}
 			self::$db_duration = (microtime(true) - $stamp);
 
@@ -258,7 +253,7 @@ class Worker
 
 		if (!validate_include($include)) {
 			logger("Include file ".$argv[0]." is not valid!");
-			dba::delete('workerqueue', ['id' => $queue["id"]]);
+			DBA::delete('workerqueue', ['id' => $queue["id"]]);
 			return true;
 		}
 
@@ -277,20 +272,20 @@ class Worker
 
 			if ($age > 1) {
 				$stamp = (float)microtime(true);
-				dba::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);
+				DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow()], ['pid' => $mypid, 'done' => false]);
 				self::$db_duration += (microtime(true) - $stamp);
 			}
 
 			self::execFunction($queue, $funcname, $argv, false);
 
 			$stamp = (float)microtime(true);
-			if (dba::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
-				Config::set('system', 'last_poller_execution', DateTimeFormat::utcNow());
+			if (DBA::update('workerqueue', ['done' => true], ['id' => $queue["id"]])) {
+				Config::set('system', 'last_worker_execution', DateTimeFormat::utcNow());
 			}
 			self::$db_duration = (microtime(true) - $stamp);
 		} else {
 			logger("Function ".$funcname." does not exist");
-			dba::delete('workerqueue', ['id' => $queue["id"]]);
+			DBA::delete('workerqueue', ['id' => $queue["id"]]);
 		}
 
 		return true;
@@ -313,7 +308,7 @@ class Worker
 
 		$argc = count($argv);
 
-		$new_process_id = uniqid("wrk", true);
+		$new_process_id = System::processID("wrk");
 
 		logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]." - Process PID: ".$new_process_id);
 
@@ -356,7 +351,7 @@ class Worker
 		$a->process_id = $old_process_id;
 		unset($a->queue);
 
-		$duration = number_format(microtime(true) - $stamp, 3);
+		$duration = (microtime(true) - $stamp);
 
 		self::$up_start = microtime(true);
 
@@ -481,13 +476,13 @@ class Worker
 
 		if ($max == 0) {
 			// the maximum number of possible user connections can be a system variable
-			$r = dba::fetch_first("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'");
-			if (DBM::is_result($r)) {
+			$r = DBA::fetchFirst("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'");
+			if (DBA::isResult($r)) {
 				$max = $r["Value"];
 			}
 			// Or it can be granted. This overrides the system variable
-			$r = dba::p('SHOW GRANTS');
-			while ($grants = dba::fetch($r)) {
+			$r = DBA::p('SHOW GRANTS');
+			while ($grants = DBA::fetch($r)) {
 				$grant = array_pop($grants);
 				if (stristr($grant, "GRANT USAGE ON")) {
 					if (preg_match("/WITH MAX_USER_CONNECTIONS (\d*)/", $grant, $match)) {
@@ -495,15 +490,15 @@ class Worker
 					}
 				}
 			}
-			dba::close($r);
+			DBA::close($r);
 		}
 
 		// If $max is set we will use the processlist to determine the current number of connections
 		// The processlist only shows entries of the current user
 		if ($max != 0) {
-			$r = dba::p('SHOW PROCESSLIST');
-			$used = dba::num_rows($r);
-			dba::close($r);
+			$r = DBA::p('SHOW PROCESSLIST');
+			$used = DBA::numRows($r);
+			DBA::close($r);
 
 			logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG);
 
@@ -517,16 +512,16 @@ class Worker
 
 		// We will now check for the system values.
 		// This limit could be reached although the user limits are fine.
-		$r = dba::fetch_first("SHOW VARIABLES WHERE `variable_name` = 'max_connections'");
-		if (!DBM::is_result($r)) {
+		$r = DBA::fetchFirst("SHOW VARIABLES WHERE `variable_name` = 'max_connections'");
+		if (!DBA::isResult($r)) {
 			return false;
 		}
 		$max = intval($r["Value"]);
 		if ($max == 0) {
 			return false;
 		}
-		$r = dba::fetch_first("SHOW STATUS WHERE `variable_name` = 'Threads_connected'");
-		if (!DBM::is_result($r)) {
+		$r = DBA::fetchFirst("SHOW STATUS WHERE `variable_name` = 'Threads_connected'");
+		if (!DBA::isResult($r)) {
 			return false;
 		}
 		$used = intval($r["Value"]);
@@ -550,16 +545,16 @@ class Worker
 	 */
 	private static function killStaleWorkers()
 	{
-		$entries = dba::select(
+		$entries = DBA::select(
 			'workerqueue',
 			['id', 'pid', 'executed', 'priority', 'parameter'],
 			['`executed` > ? AND NOT `done` AND `pid` != 0', NULL_DATE],
 			['order' => ['priority', 'created']]
 		);
 
-		while ($entry = dba::fetch($entries)) {
+		while ($entry = DBA::fetch($entries)) {
 			if (!posix_kill($entry["pid"], 0)) {
-				dba::update(
+				DBA::update(
 					'workerqueue',
 					['executed' => NULL_DATE, 'pid' => 0],
 					['id' => $entry["id"]]
@@ -581,7 +576,7 @@ class Worker
 				// How long is the process already running?
 				$duration = (time() - strtotime($entry["executed"])) / 60;
 				if ($duration > $max_duration) {
-					logger("Worker process ".$entry["pid"]." (".implode(" ", $argv).") took more than ".$max_duration." minutes. It will be killed now.");
+					logger("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") took more than ".$max_duration." minutes. It will be killed now.");
 					posix_kill($entry["pid"], SIGTERM);
 
 					// We killed the stale process.
@@ -595,13 +590,13 @@ class Worker
 					} elseif ($entry["priority"] != PRIORITY_CRITICAL) {
 						$new_priority = PRIORITY_NEGLIGIBLE;
 					}
-					dba::update(
+					DBA::update(
 						'workerqueue',
 						['executed' => NULL_DATE, 'created' => DateTimeFormat::utcNow(), 'priority' => $new_priority, 'pid' => 0],
 						['id' => $entry["id"]]
 					);
 				} else {
-					logger("Worker process ".$entry["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG);
+					logger("Worker process ".$entry["pid"]." (".substr(json_encode($argv), 0, 50).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG);
 				}
 			}
 		}
@@ -625,12 +620,15 @@ class Worker
 		if ($load) {
 			$maxsysload = intval(Config::get("system", "maxloadavg", 50));
 
-			$maxworkers = $queues;
+			/* Default exponent 3 causes queues to rapidly decrease as load increases.
+			 * If you have 20 max queues at idle, then you get only 5 queues at 37.1% of $maxsysload.
+			 * For some environments, this rapid decrease is not needed.
+			 * With exponent 1, you could have 20 max queues at idle and 13 at 37% of $maxsysload.
+			 */
+			$exponent = intval(Config::get('system', 'worker_load_exponent', 3));
+			$slope = pow(max(0, $maxsysload - $load) / $maxsysload, $exponent);
+			$queues = intval(ceil($slope * $maxqueues));
 
-			// Some magical mathemathics to reduce the workers
-			$exponent = 3;
-			$slope = $maxworkers / pow($maxsysload, $exponent);
-			$queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent));
 			$processlist = '';
 
 			if (Config::get('system', 'worker_debug')) {
@@ -638,37 +636,37 @@ class Worker
 				$listitem = [];
 
 				// Adding all processes with no workerqueue entry
-				$processes = dba::p(
+				$processes = DBA::p(
 					"SELECT COUNT(*) AS `running` FROM `process` WHERE NOT EXISTS
 							(SELECT id FROM `workerqueue`
 							WHERE `workerqueue`.`pid` = `process`.`pid` AND NOT `done` AND `pid` != ?)",
 					getmypid()
 				);
 
-				if ($process = dba::fetch($processes)) {
+				if ($process = DBA::fetch($processes)) {
 					$listitem[0] = "0:".$process["running"];
 				}
-				dba::close($processes);
+				DBA::close($processes);
 
 				// Now adding all processes with workerqueue entries
-				$entries = dba::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` GROUP BY `priority`");
-				while ($entry = dba::fetch($entries)) {
-					$processes = dba::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` WHERE `priority` = ?", $entry["priority"]);
-					if ($process = dba::fetch($processes)) {
+				$entries = DBA::p("SELECT COUNT(*) AS `entries`, `priority` FROM `workerqueue` WHERE NOT `done` GROUP BY `priority`");
+				while ($entry = DBA::fetch($entries)) {
+					$processes = DBA::p("SELECT COUNT(*) AS `running` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` WHERE `priority` = ?", $entry["priority"]);
+					if ($process = DBA::fetch($processes)) {
 						$listitem[$entry["priority"]] = $entry["priority"].":".$process["running"]."/".$entry["entries"];
 					}
-					dba::close($processes);
+					DBA::close($processes);
 				}
-				dba::close($entries);
+				DBA::close($entries);
 
 				$intervals = [1, 10, 60];
 				$jobs_per_minute = [];
 				foreach ($intervals as $interval) {
-					$jobs = dba::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL ".intval($interval)." MINUTE");
-					if ($job = dba::fetch($jobs)) {
+					$jobs = DBA::p("SELECT COUNT(*) AS `jobs` FROM `workerqueue` WHERE `done` AND `executed` > UTC_TIMESTAMP() - INTERVAL ".intval($interval)." MINUTE");
+					if ($job = DBA::fetch($jobs)) {
 						$jobs_per_minute[$interval] = number_format($job['jobs'] / $interval, 0);
 					}
-					dba::close($jobs);
+					DBA::close($jobs);
 				}
 				$processlist = ' - jpm: '.implode('/', $jobs_per_minute).' ('.implode(', ', $listitem).')';
 			}
@@ -688,13 +686,22 @@ class Worker
 			logger("Load: ".$load."/".$maxsysload." - processes: ".$active."/".$entries.$processlist." - maximum: ".$queues."/".$maxqueues, LOGGER_DEBUG);
 
 			// Are there fewer workers running as possible? Then fork a new one.
-			if (!Config::get("system", "worker_dont_fork") && ($queues > ($active + 1)) && ($entries > 1)) {
+			if (!Config::get("system", "worker_dont_fork", false) && ($queues > ($active + 1)) && ($entries > 1)) {
 				logger("Active workers: ".$active."/".$queues." Fork a new worker.", LOGGER_DEBUG);
-				self::spawnWorker();
+				if (Config::get('system', 'worker_daemon_mode', false)) {
+					self::IPCSetJobState(true);
+				} else {
+					self::spawnWorker();
+				}
 			}
 		}
 
-		return $active >= $queues;
+		// if there are too much worker, we don't spawn a new one.
+		if (Config::get('system', 'worker_daemon_mode', false) && ($active > $queues)) {
+			self::IPCSetJobState(false);
+		}
+
+		return $active > $queues;
 	}
 
 	/**
@@ -704,9 +711,7 @@ class Worker
 	 */
 	private static function activeWorkers()
 	{
-		$workers = dba::fetch_first("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'Worker.php'");
-
-		return $workers["processes"];
+		return DBA::count('process', ['command' => 'Worker.php']);
 	}
 
 	/**
@@ -722,21 +727,21 @@ class Worker
 	{
 		$highest_priority = 0;
 
-		$r = dba::p(
+		$r = DBA::p(
 			"SELECT `priority`
 				FROM `process`
 				INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done`"
 		);
 
 		// No active processes at all? Fine
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return false;
 		}
 		$priorities = [];
-		while ($line = dba::fetch($r)) {
+		while ($line = DBA::fetch($r)) {
 			$priorities[] = $line["priority"];
 		}
-		dba::close($r);
+		DBA::close($r);
 
 		// Should not happen
 		if (count($priorities) == 0) {
@@ -795,33 +800,33 @@ class Worker
 		$ids = [];
 		if (self::passingSlow($highest_priority)) {
 			// Are there waiting processes with a higher priority than the currently highest?
-			$result = dba::select(
+			$result = DBA::select(
 				'workerqueue',
 				['id'],
 				["`executed` <= ? AND `priority` < ? AND NOT `done`", NULL_DATE, $highest_priority],
 				['limit' => $limit, 'order' => ['priority', 'created']]
 			);
 
-			while ($id = dba::fetch($result)) {
+			while ($id = DBA::fetch($result)) {
 				$ids[] = $id["id"];
 			}
-			dba::close($result);
+			DBA::close($result);
 
 			$found = (count($ids) > 0);
 
 			if (!$found) {
 				// Give slower processes some processing time
-				$result = dba::select(
+				$result = DBA::select(
 					'workerqueue',
 					['id'],
 					["`executed` <= ? AND `priority` > ? AND NOT `done`", NULL_DATE, $highest_priority],
 					['limit' => $limit, 'order' => ['priority', 'created']]
 				);
 
-				while ($id = dba::fetch($result)) {
+				while ($id = DBA::fetch($result)) {
 					$ids[] = $id["id"];
 				}
-				dba::close($result);
+				DBA::close($result);
 
 				$found = (count($ids) > 0);
 				$passing_slow = $found;
@@ -830,17 +835,17 @@ class Worker
 
 		// If there is no result (or we shouldn't pass lower processes) we check without priority limit
 		if (!$found) {
-			$result = dba::select(
+			$result = DBA::select(
 				'workerqueue',
 				['id'],
 				["`executed` <= ? AND NOT `done`", NULL_DATE],
 				['limit' => $limit, 'order' => ['priority', 'created']]
 			);
 
-			while ($id = dba::fetch($result)) {
+			while ($id = DBA::fetch($result)) {
 				$ids[] = $id["id"];
 			}
-			dba::close($result);
+			DBA::close($result);
 
 			$found = (count($ids) > 0);
 		}
@@ -848,7 +853,7 @@ class Worker
 		if ($found) {
 			$condition = "`id` IN (".substr(str_repeat("?, ", count($ids)), 0, -2).") AND `pid` = 0 AND NOT `done`";
 			array_unshift($ids, $condition);
-			dba::update('workerqueue', ['executed' => DateTimeFormat::utcNow(), 'pid' => $mypid], $ids);
+			DBA::update('workerqueue', ['executed' => DateTimeFormat::utcNow(), 'pid' => $mypid], $ids);
 		}
 
 		return $found;
@@ -865,15 +870,15 @@ class Worker
 		$stamp = (float)microtime(true);
 
 		// There can already be jobs for us in the queue.
-		$r = dba::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
-		if (DBM::is_result($r)) {
+		$r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
+		if (DBA::isResult($r)) {
 			self::$db_duration += (microtime(true) - $stamp);
-			return dba::inArray($r);
+			return DBA::toArray($r);
 		}
-		dba::close($r);
+		DBA::close($r);
 
 		$stamp = (float)microtime(true);
-		if (!Lock::set('poller_worker_process')) {
+		if (!Lock::acquire('worker_process')) {
 			return false;
 		}
 		self::$lock_duration = (microtime(true) - $stamp);
@@ -882,11 +887,11 @@ class Worker
 		$found = self::findWorkerProcesses($passing_slow);
 		self::$db_duration += (microtime(true) - $stamp);
 
-		Lock::remove('poller_worker_process');
+		Lock::release('worker_process');
 
 		if ($found) {
-			$r = dba::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
-			return dba::inArray($r);
+			$r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
+			return DBA::toArray($r);
 		}
 		return false;
 	}
@@ -899,7 +904,7 @@ class Worker
 	{
 		$mypid = getmypid();
 
-		dba::update('workerqueue', ['executed' => NULL_DATE, 'pid' => 0], ['pid' => $mypid, 'done' => false]);
+		DBA::update('workerqueue', ['executed' => NULL_DATE, 'pid' => 0], ['pid' => $mypid, 'done' => false]);
 	}
 
 	/**
@@ -959,9 +964,9 @@ class Worker
 
 		self::clearProcesses();
 
-		$workers = dba::fetch_first("SELECT COUNT(*) AS `processes` FROM `process` WHERE `command` = 'worker.php'");
+		$workers = self::activeWorkers();
 
-		if ($workers["processes"] == 0) {
+		if ($workers == 0) {
 			self::callWorker();
 		}
 	}
@@ -977,7 +982,7 @@ class Worker
 		/// @todo We should clean up the corresponding workerqueue entries as well
 		$condition = ["`created` < ? AND `command` = 'worker.php'",
 				DateTimeFormat::utc("now - ".$timeout." minutes")];
-		dba::delete('process', $condition);
+		DBA::delete('process', $condition);
 	}
 
 	/**
@@ -1002,10 +1007,18 @@ class Worker
 	 * @brief Spawns a new worker
 	 * @return void
 	 */
-	public static function spawnWorker()
+	public static function spawnWorker($do_cron = false)
 	{
-		$args = ["bin/worker.php", "no_cron"];
-		get_app()->proc_run($args);
+		$command = 'bin/worker.php';
+
+		$args = ['no_cron' => !$do_cron];
+
+		get_app()->proc_run($command, $args);
+
+		// after spawning we have to remove the flag.
+		if (Config::get('system', 'worker_daemon_mode', false)) {
+			self::IPCSetJobState(false);
+		}
 	}
 
 	/**
@@ -1040,7 +1053,7 @@ class Worker
 		}
 
 		$priority = PRIORITY_MEDIUM;
-		$dont_fork = Config::get("system", "worker_dont_fork");
+		$dont_fork = Config::get("system", "worker_dont_fork", false);
 		$created = DateTimeFormat::utcNow();
 
 		$run_parameter = array_shift($args);
@@ -1060,15 +1073,15 @@ class Worker
 		}
 
 		$parameters = json_encode($args);
-		$found = dba::exists('workerqueue', ['parameter' => $parameters, 'done' => false]);
+		$found = DBA::exists('workerqueue', ['parameter' => $parameters, 'done' => false]);
 
 		// Quit if there was a database error - a precaution for the update process to 3.5.3
-		if (dba::errorNo() != 0) {
+		if (DBA::errorNo() != 0) {
 			return false;
 		}
 
 		if (!$found) {
-			dba::insert('workerqueue', ['parameter' => $parameters, 'created' => $created, 'priority' => $priority]);
+			DBA::insert('workerqueue', ['parameter' => $parameters, 'created' => $created, 'priority' => $priority]);
 		}
 
 		// Should we quit and wait for the worker to be called as a cronjob?
@@ -1077,18 +1090,24 @@ class Worker
 		}
 
 		// If there is a lock then we don't have to check for too much worker
-		if (!Lock::set('poller_worker', 0)) {
+		if (!Lock::acquire('worker', 0)) {
 			return true;
 		}
 
 		// If there are already enough workers running, don't fork another one
 		$quit = self::tooMuchWorkers();
-		Lock::remove('poller_worker');
+		Lock::release('worker');
 
 		if ($quit) {
 			return true;
 		}
 
+		// We tell the daemon that a new job entry exists
+		if (Config::get('system', 'worker_daemon_mode', false)) {
+			// We don't have to set the IPC flag - this is done in "tooMuchWorkers"
+			return true;
+		}
+
 		// Now call the worker to execute the jobs that we just added to the queue
 		self::spawnWorker();
 
@@ -1121,4 +1140,33 @@ class Worker
 	{
 		return Process::deleteByPid();
 	}
+
+	/**
+	 * Set the flag if some job is waiting
+	 *
+	 * @brief Set the flag if some job is waiting
+	 * @param boolean $jobs Is there a waiting job?
+	 */
+	public static function IPCSetJobState($jobs)
+	{
+		DBA::update('worker-ipc', ['jobs' => $jobs], ['key' => 1], true);
+	}
+
+	/**
+	 * Checks if some worker job waits to be executed
+	 *
+	 * @brief Checks if some worker job waits to be executed
+	 * @return bool
+	 */
+	public static function IPCJobsExists()
+	{
+		$row = DBA::selectFirst('worker-ipc', ['jobs'], ['key' => 1]);
+
+		// When we don't have a row, no job is running
+		if (!DBA::isResult($row)) {
+			return false;
+		}
+
+		return (bool)$row['jobs'];
+	}
 }
diff --git a/src/Database/DBA.php b/src/Database/DBA.php
new file mode 100644
index 000000000..ab856ef9d
--- /dev/null
+++ b/src/Database/DBA.php
@@ -0,0 +1,1651 @@
+<?php
+
+namespace Friendica\Database;
+
+// Do not use Core\Config in this class at risk of infinite loop.
+// Please use App->getConfigVariable() instead.
+//use Friendica\Core\Config;
+
+use Friendica\Core\System;
+use Friendica\Util\DateTimeFormat;
+use mysqli;
+use mysqli_result;
+use mysqli_stmt;
+use PDO;
+use PDOException;
+use PDOStatement;
+
+require_once 'include/dba.php';
+
+/**
+ * @class MySQL database class
+ *
+ * This class is for the low level database stuff that does driver specific things.
+ */
+class DBA
+{
+	public static $connected = false;
+
+	private static $server_info = '';
+	private static $connection;
+	private static $driver;
+	private static $error = false;
+	private static $errorno = 0;
+	private static $affected_rows = 0;
+	private static $in_transaction = false;
+	private static $in_retrial = false;
+	private static $relation = [];
+	private static $db_serveraddr = '';
+	private static $db_user = '';
+	private static $db_pass = '';
+	private static $db_name = '';
+	private static $db_charset = '';
+
+	public static function connect($serveraddr, $user, $pass, $db, $charset = null)
+	{
+		if (!is_null(self::$connection) && self::connected()) {
+			return true;
+		}
+
+		// We are storing these values for being able to perform a reconnect
+		self::$db_serveraddr = $serveraddr;
+		self::$db_user = $user;
+		self::$db_pass = $pass;
+		self::$db_name = $db;
+		self::$db_charset = $charset;
+
+		$port = 0;
+		$serveraddr = trim($serveraddr);
+
+		$serverdata = explode(':', $serveraddr);
+		$server = $serverdata[0];
+
+		if (count($serverdata) > 1) {
+			$port = trim($serverdata[1]);
+		}
+
+		$server = trim($server);
+		$user = trim($user);
+		$pass = trim($pass);
+		$db = trim($db);
+		$charset = trim($charset);
+
+		if (!(strlen($server) && strlen($user))) {
+			return false;
+		}
+
+		if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
+			self::$driver = 'pdo';
+			$connect = "mysql:host=".$server.";dbname=".$db;
+
+			if ($port > 0) {
+				$connect .= ";port=".$port;
+			}
+
+			if ($charset) {
+				$connect .= ";charset=".$charset;
+			}
+
+			try {
+				self::$connection = @new PDO($connect, $user, $pass);
+				self::$connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
+				self::$connected = true;
+			} catch (PDOException $e) {
+				/// @TODO At least log exception, don't ignore it!
+			}
+		}
+
+		if (!self::$connected && class_exists('\mysqli')) {
+			self::$driver = 'mysqli';
+
+			if ($port > 0) {
+				self::$connection = @new mysqli($server, $user, $pass, $db, $port);
+			} else {
+				self::$connection = @new mysqli($server, $user, $pass, $db);
+			}
+
+			if (!mysqli_connect_errno()) {
+				self::$connected = true;
+
+				if ($charset) {
+					self::$connection->set_charset($charset);
+				}
+			}
+		}
+
+		// No suitable SQL driver was found.
+		if (!self::$connected) {
+			self::$driver = null;
+			self::$connection = null;
+		}
+
+		return self::$connected;
+	}
+
+	/**
+	 * Disconnects the current database connection
+	 */
+	public static function disconnect()
+	{
+		if (is_null(self::$connection)) {
+			return;
+		}
+
+		switch (self::$driver) {
+			case 'pdo':
+				self::$connection = null;
+				break;
+			case 'mysqli':
+				self::$connection->close();
+				self::$connection = null;
+				break;
+		}
+	}
+
+	/**
+	 * Perform a reconnect of an existing database connection
+	 */
+	public static function reconnect() {
+		self::disconnect();
+
+		$ret = self::connect(self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
+		return $ret;
+	}
+
+	/**
+	 * Return the database object.
+	 * @return PDO|mysqli
+	 */
+	public static function getConnection()
+	{
+		return self::$connection;
+	}
+
+	/**
+	 * @brief Returns the MySQL server version string
+	 *
+	 * This function discriminate between the deprecated mysql API and the current
+	 * object-oriented mysqli API. Example of returned string: 5.5.46-0+deb8u1
+	 *
+	 * @return string
+	 */
+	public static function serverInfo() {
+		if (self::$server_info == '') {
+			switch (self::$driver) {
+				case 'pdo':
+					self::$server_info = self::$connection->getAttribute(PDO::ATTR_SERVER_VERSION);
+					break;
+				case 'mysqli':
+					self::$server_info = self::$connection->server_info;
+					break;
+			}
+		}
+		return self::$server_info;
+	}
+
+	/**
+	 * @brief Returns the selected database name
+	 *
+	 * @return string
+	 */
+	public static function databaseName() {
+		$ret = self::p("SELECT DATABASE() AS `db`");
+		$data = self::toArray($ret);
+		return $data[0]['db'];
+	}
+
+	/**
+	 * @brief Analyze a database query and log this if some conditions are met.
+	 *
+	 * @param string $query The database query that will be analyzed
+	 */
+	private static function logIndex($query) {
+		$a = get_app();
+
+		if (!$a->getConfigVariable('system', 'db_log_index')) {
+			return;
+		}
+
+		// Don't explain an explain statement
+		if (strtolower(substr($query, 0, 7)) == "explain") {
+			return;
+		}
+
+		// Only do the explain on "select", "update" and "delete"
+		if (!in_array(strtolower(substr($query, 0, 6)), ["select", "update", "delete"])) {
+			return;
+		}
+
+		$r = self::p("EXPLAIN ".$query);
+		if (!self::isResult($r)) {
+			return;
+		}
+
+		$watchlist = explode(',', $a->getConfigVariable('system', 'db_log_index_watch'));
+		$blacklist = explode(',', $a->getConfigVariable('system', 'db_log_index_blacklist'));
+
+		while ($row = self::fetch($r)) {
+			if ((intval($a->getConfigVariable('system', 'db_loglimit_index')) > 0)) {
+				$log = (in_array($row['key'], $watchlist) &&
+					($row['rows'] >= intval($a->getConfigVariable('system', 'db_loglimit_index'))));
+			} else {
+				$log = false;
+			}
+
+			if ((intval($a->getConfigVariable('system', 'db_loglimit_index_high')) > 0) && ($row['rows'] >= intval($a->getConfigVariable('system', 'db_loglimit_index_high')))) {
+				$log = true;
+			}
+
+			if (in_array($row['key'], $blacklist) || ($row['key'] == "")) {
+				$log = false;
+			}
+
+			if ($log) {
+				$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+				@file_put_contents($a->getConfigVariable('system', 'db_log_index'), DateTimeFormat::utcNow()."\t".
+						$row['key']."\t".$row['rows']."\t".$row['Extra']."\t".
+						basename($backtrace[1]["file"])."\t".
+						$backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
+						substr($query, 0, 2000)."\n", FILE_APPEND);
+			}
+		}
+	}
+
+	public static function escape($str) {
+		if (self::$connected) {
+			switch (self::$driver) {
+				case 'pdo':
+					return substr(@self::$connection->quote($str, PDO::PARAM_STR), 1, -1);
+
+				case 'mysqli':
+					return @self::$connection->real_escape_string($str);
+			}
+		} else {
+			return str_replace("'", "\\'", $str);
+		}
+	}
+
+	public static function connected() {
+		$connected = false;
+
+		if (is_null(self::$connection)) {
+			return false;
+		}
+
+		switch (self::$driver) {
+			case 'pdo':
+				$r = self::p("SELECT 1");
+				if (self::isResult($r)) {
+					$row = self::toArray($r);
+					$connected = ($row[0]['1'] == '1');
+				}
+				break;
+			case 'mysqli':
+				$connected = self::$connection->ping();
+				break;
+		}
+		return $connected;
+	}
+
+	/**
+	 * @brief Replaces ANY_VALUE() function by MIN() function,
+	 *  if the database server does not support ANY_VALUE().
+	 *
+	 * Considerations for Standard SQL, or MySQL with ONLY_FULL_GROUP_BY (default since 5.7.5).
+	 * ANY_VALUE() is available from MySQL 5.7.5 https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html
+	 * A standard fall-back is to use MIN().
+	 *
+	 * @param string $sql An SQL string without the values
+	 * @return string The input SQL string modified if necessary.
+	 */
+	public static function anyValueFallback($sql) {
+		$server_info = self::serverInfo();
+		if (version_compare($server_info, '5.7.5', '<') ||
+			(stripos($server_info, 'MariaDB') !== false)) {
+			$sql = str_ireplace('ANY_VALUE(', 'MIN(', $sql);
+		}
+		return $sql;
+	}
+
+	/**
+	 * @brief beautifies the query - useful for "SHOW PROCESSLIST"
+	 *
+	 * This is safe when we bind the parameters later.
+	 * The parameter values aren't part of the SQL.
+	 *
+	 * @param string $sql An SQL string without the values
+	 * @return string The input SQL string modified if necessary.
+	 */
+	public static function cleanQuery($sql) {
+		$search = ["\t", "\n", "\r", "  "];
+		$replace = [' ', ' ', ' ', ' '];
+		do {
+			$oldsql = $sql;
+			$sql = str_replace($search, $replace, $sql);
+		} while ($oldsql != $sql);
+
+		return $sql;
+	}
+
+
+	/**
+	 * @brief Replaces the ? placeholders with the parameters in the $args array
+	 *
+	 * @param string $sql SQL query
+	 * @param array $args The parameters that are to replace the ? placeholders
+	 * @return string The replaced SQL query
+	 */
+	private static function replaceParameters($sql, $args) {
+		$offset = 0;
+		foreach ($args AS $param => $value) {
+			if (is_int($args[$param]) || is_float($args[$param])) {
+				$replace = intval($args[$param]);
+			} else {
+				$replace = "'".self::escape($args[$param])."'";
+			}
+
+			$pos = strpos($sql, '?', $offset);
+			if ($pos !== false) {
+				$sql = substr_replace($sql, $replace, $pos, 1);
+			}
+			$offset = $pos + strlen($replace);
+		}
+		return $sql;
+	}
+
+	/**
+	 * @brief Convert parameter array to an universal form
+	 * @param array $args Parameter array
+	 * @return array universalized parameter array
+	 */
+	private static function getParam($args) {
+		unset($args[0]);
+
+		// When the second function parameter is an array then use this as the parameter array
+		if ((count($args) > 0) && (is_array($args[1]))) {
+			return $args[1];
+		} else {
+			return $args;
+		}
+	}
+
+	/**
+	 * @brief Executes a prepared statement that returns data
+	 * @usage Example: $r = p("SELECT * FROM `item` WHERE `guid` = ?", $guid);
+	 *
+	 * Please only use it with complicated queries.
+	 * For all regular queries please use DBA::select or DBA::exists
+	 *
+	 * @param string $sql SQL statement
+	 * @return bool|object statement object or result object
+	 */
+	public static function p($sql) {
+		$a = get_app();
+
+		$stamp1 = microtime(true);
+
+		$params = self::getParam(func_get_args());
+
+		// Renumber the array keys to be sure that they fit
+		$i = 0;
+		$args = [];
+		foreach ($params AS $param) {
+			// Avoid problems with some MySQL servers and boolean values. See issue #3645
+			if (is_bool($param)) {
+				$param = (int)$param;
+			}
+			$args[++$i] = $param;
+		}
+
+		if (!self::$connected) {
+			return false;
+		}
+
+		if ((substr_count($sql, '?') != count($args)) && (count($args) > 0)) {
+			// Question: Should we continue or stop the query here?
+			logger('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), LOGGER_DEBUG);
+		}
+
+		$sql = self::cleanQuery($sql);
+		$sql = self::anyValueFallback($sql);
+
+		$orig_sql = $sql;
+
+		if ($a->getConfigValue('system', 'db_callstack')) {
+			$sql = "/*".System::callstack()." */ ".$sql;
+		}
+
+		self::$error = '';
+		self::$errorno = 0;
+		self::$affected_rows = 0;
+
+		// We have to make some things different if this function is called from "e"
+		$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+
+		if (isset($trace[1])) {
+			$called_from = $trace[1];
+		} else {
+			// We use just something that is defined to avoid warnings
+			$called_from = $trace[0];
+		}
+		// We are having an own error logging in the function "e"
+		$called_from_e = ($called_from['function'] == 'e');
+
+		switch (self::$driver) {
+			case 'pdo':
+				// If there are no arguments we use "query"
+				if (count($args) == 0) {
+					if (!$retval = self::$connection->query($sql)) {
+						$errorInfo = self::$connection->errorInfo();
+						self::$error = $errorInfo[2];
+						self::$errorno = $errorInfo[1];
+						$retval = false;
+						break;
+					}
+					self::$affected_rows = $retval->rowCount();
+					break;
+				}
+
+				if (!$stmt = self::$connection->prepare($sql)) {
+					$errorInfo = self::$connection->errorInfo();
+					self::$error = $errorInfo[2];
+					self::$errorno = $errorInfo[1];
+					$retval = false;
+					break;
+				}
+
+				foreach ($args AS $param => $value) {
+					if (is_int($args[$param])) {
+						$data_type = PDO::PARAM_INT;
+					} else {
+						$data_type = PDO::PARAM_STR;
+					}
+					$stmt->bindParam($param, $args[$param], $data_type);
+				}
+
+				if (!$stmt->execute()) {
+					$errorInfo = $stmt->errorInfo();
+					self::$error = $errorInfo[2];
+					self::$errorno = $errorInfo[1];
+					$retval = false;
+				} else {
+					$retval = $stmt;
+					self::$affected_rows = $retval->rowCount();
+				}
+				break;
+			case 'mysqli':
+				// There are SQL statements that cannot be executed with a prepared statement
+				$parts = explode(' ', $orig_sql);
+				$command = strtolower($parts[0]);
+				$can_be_prepared = in_array($command, ['select', 'update', 'insert', 'delete']);
+
+				// The fallback routine is called as well when there are no arguments
+				if (!$can_be_prepared || (count($args) == 0)) {
+					$retval = self::$connection->query(self::replaceParameters($sql, $args));
+					if (self::$connection->errno) {
+						self::$error = self::$connection->error;
+						self::$errorno = self::$connection->errno;
+						$retval = false;
+					} else {
+						if (isset($retval->num_rows)) {
+							self::$affected_rows = $retval->num_rows;
+						} else {
+							self::$affected_rows = self::$connection->affected_rows;
+						}
+					}
+					break;
+				}
+
+				$stmt = self::$connection->stmt_init();
+
+				if (!$stmt->prepare($sql)) {
+					self::$error = $stmt->error;
+					self::$errorno = $stmt->errno;
+					$retval = false;
+					break;
+				}
+
+				$param_types = '';
+				$values = [];
+				foreach ($args AS $param => $value) {
+					if (is_int($args[$param])) {
+						$param_types .= 'i';
+					} elseif (is_float($args[$param])) {
+						$param_types .= 'd';
+					} elseif (is_string($args[$param])) {
+						$param_types .= 's';
+					} else {
+						$param_types .= 'b';
+					}
+					$values[] = &$args[$param];
+				}
+
+				if (count($values) > 0) {
+					array_unshift($values, $param_types);
+					call_user_func_array([$stmt, 'bind_param'], $values);
+				}
+
+				if (!$stmt->execute()) {
+					self::$error = self::$connection->error;
+					self::$errorno = self::$connection->errno;
+					$retval = false;
+				} else {
+					$stmt->store_result();
+					$retval = $stmt;
+					self::$affected_rows = $retval->affected_rows;
+				}
+				break;
+		}
+
+		// We are having an own error logging in the function "e"
+		if ((self::$errorno != 0) && !$called_from_e) {
+			// We have to preserve the error code, somewhere in the logging it get lost
+			$error = self::$error;
+			$errorno = self::$errorno;
+
+			logger('DB Error '.self::$errorno.': '.self::$error."\n".
+				System::callstack(8)."\n".self::replaceParameters($sql, $args));
+
+			// On a lost connection we try to reconnect - but only once.
+			if ($errorno == 2006) {
+				if (self::$in_retrial || !self::reconnect()) {
+					// It doesn't make sense to continue when the database connection was lost
+					if (self::$in_retrial) {
+						logger('Giving up retrial because of database error '.$errorno.': '.$error);
+					} else {
+						logger("Couldn't reconnect after database error ".$errorno.': '.$error);
+					}
+					exit(1);
+				} else {
+					// We try it again
+					logger('Reconnected after database error '.$errorno.': '.$error);
+					self::$in_retrial = true;
+					$ret = self::p($sql, $args);
+					self::$in_retrial = false;
+					return $ret;
+				}
+			}
+
+			self::$error = $error;
+			self::$errorno = $errorno;
+		}
+
+		$a->save_timestamp($stamp1, 'database');
+
+		if ($a->getConfigValue('system', 'db_log')) {
+			$stamp2 = microtime(true);
+			$duration = (float)($stamp2 - $stamp1);
+
+			if (($duration > $a->getConfigValue('system', 'db_loglimit'))) {
+				$duration = round($duration, 3);
+				$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+
+				@file_put_contents($a->getConfigValue('system', 'db_log'), DateTimeFormat::utcNow()."\t".$duration."\t".
+						basename($backtrace[1]["file"])."\t".
+						$backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
+						substr(self::replaceParameters($sql, $args), 0, 2000)."\n", FILE_APPEND);
+			}
+		}
+		return $retval;
+	}
+
+	/**
+	 * @brief Executes a prepared statement like UPDATE or INSERT that doesn't return data
+	 *
+	 * Please use DBA::delete, DBA::insert, DBA::update, ... instead
+	 *
+	 * @param string $sql SQL statement
+	 * @return boolean Was the query successfull? False is returned only if an error occurred
+	 */
+	public static function e($sql) {
+		$a = get_app();
+
+		$stamp = microtime(true);
+
+		$params = self::getParam(func_get_args());
+
+		// In a case of a deadlock we are repeating the query 20 times
+		$timeout = 20;
+
+		do {
+			$stmt = self::p($sql, $params);
+
+			if (is_bool($stmt)) {
+				$retval = $stmt;
+			} elseif (is_object($stmt)) {
+				$retval = true;
+			} else {
+				$retval = false;
+			}
+
+			self::close($stmt);
+
+		} while ((self::$errorno == 1213) && (--$timeout > 0));
+
+		if (self::$errorno != 0) {
+			// We have to preserve the error code, somewhere in the logging it get lost
+			$error = self::$error;
+			$errorno = self::$errorno;
+
+			logger('DB Error '.self::$errorno.': '.self::$error."\n".
+				System::callstack(8)."\n".self::replaceParameters($sql, $params));
+
+			// On a lost connection we simply quit.
+			// A reconnect like in self::p could be dangerous with modifications
+			if ($errorno == 2006) {
+				logger('Giving up because of database error '.$errorno.': '.$error);
+				exit(1);
+			}
+
+			self::$error = $error;
+			self::$errorno = $errorno;
+		}
+
+		$a->save_timestamp($stamp, "database_write");
+
+		return $retval;
+	}
+
+	/**
+	 * @brief Check if data exists
+	 *
+	 * @param string $table Table name
+	 * @param array $condition array of fields for condition
+	 *
+	 * @return boolean Are there rows for that condition?
+	 */
+	public static function exists($table, $condition) {
+		if (empty($table)) {
+			return false;
+		}
+
+		$fields = [];
+
+		if (empty($condition)) {
+			return DBStructure::existsTable($table);
+		}
+
+		reset($condition);
+		$first_key = key($condition);
+		if (!is_int($first_key)) {
+			$fields = [$first_key];
+		}
+
+		$stmt = self::select($table, $fields, $condition, ['limit' => 1]);
+
+		if (is_bool($stmt)) {
+			$retval = $stmt;
+		} else {
+			$retval = (self::numRows($stmt) > 0);
+		}
+
+		self::close($stmt);
+
+		return $retval;
+	}
+
+	/**
+	 * Fetches the first row
+	 *
+	 * Please use DBA::selectFirst or DBA::exists whenever this is possible.
+	 *
+	 * @brief Fetches the first row
+	 * @param string $sql SQL statement
+	 * @return array first row of query
+	 */
+	public static function fetchFirst($sql) {
+		$params = self::getParam(func_get_args());
+
+		$stmt = self::p($sql, $params);
+
+		if (is_bool($stmt)) {
+			$retval = $stmt;
+		} else {
+			$retval = self::fetch($stmt);
+		}
+
+		self::close($stmt);
+
+		return $retval;
+	}
+
+	/**
+	 * @brief Returns the number of affected rows of the last statement
+	 *
+	 * @return int Number of rows
+	 */
+	public static function affectedRows() {
+		return self::$affected_rows;
+	}
+
+	/**
+	 * @brief Returns the number of columns of a statement
+	 *
+	 * @param object Statement object
+	 * @return int Number of columns
+	 */
+	public static function columnCount($stmt) {
+		if (!is_object($stmt)) {
+			return 0;
+		}
+		switch (self::$driver) {
+			case 'pdo':
+				return $stmt->columnCount();
+			case 'mysqli':
+				return $stmt->field_count;
+		}
+		return 0;
+	}
+	/**
+	 * @brief Returns the number of rows of a statement
+	 *
+	 * @param PDOStatement|mysqli_result|mysqli_stmt Statement object
+	 * @return int Number of rows
+	 */
+	public static function numRows($stmt) {
+		if (!is_object($stmt)) {
+			return 0;
+		}
+		switch (self::$driver) {
+			case 'pdo':
+				return $stmt->rowCount();
+			case 'mysqli':
+				return $stmt->num_rows;
+		}
+		return 0;
+	}
+
+	/**
+	 * @brief Fetch a single row
+	 *
+	 * @param mixed $stmt statement object
+	 * @return array current row
+	 */
+	public static function fetch($stmt) {
+		$a = get_app();
+
+		$stamp1 = microtime(true);
+
+		$columns = [];
+
+		if (!is_object($stmt)) {
+			return false;
+		}
+
+		switch (self::$driver) {
+			case 'pdo':
+				$columns = $stmt->fetch(PDO::FETCH_ASSOC);
+				break;
+			case 'mysqli':
+				if (get_class($stmt) == 'mysqli_result') {
+					$columns = $stmt->fetch_assoc();
+					break;
+				}
+
+				// This code works, but is slow
+
+				// Bind the result to a result array
+				$cols = [];
+
+				$cols_num = [];
+				for ($x = 0; $x < $stmt->field_count; $x++) {
+					$cols[] = &$cols_num[$x];
+				}
+
+				call_user_func_array([$stmt, 'bind_result'], $cols);
+
+				if (!$stmt->fetch()) {
+					return false;
+				}
+
+				// The slow part:
+				// We need to get the field names for the array keys
+				// It seems that there is no better way to do this.
+				$result = $stmt->result_metadata();
+				$fields = $result->fetch_fields();
+
+				foreach ($cols_num AS $param => $col) {
+					$columns[$fields[$param]->name] = $col;
+				}
+		}
+
+		$a->save_timestamp($stamp1, 'database');
+
+		return $columns;
+	}
+
+	/**
+	 * @brief Insert a row into a table
+	 *
+	 * @param string $table Table name
+	 * @param array $param parameter array
+	 * @param bool $on_duplicate_update Do an update on a duplicate entry
+	 *
+	 * @return boolean was the insert successfull?
+	 */
+	public static function insert($table, $param, $on_duplicate_update = false) {
+
+		if (empty($table) || empty($param)) {
+			logger('Table and fields have to be set');
+			return false;
+		}
+
+		$sql = "INSERT INTO `".self::escape($table)."` (`".implode("`, `", array_keys($param))."`) VALUES (".
+			substr(str_repeat("?, ", count($param)), 0, -2).")";
+
+		if ($on_duplicate_update) {
+			$sql .= " ON DUPLICATE KEY UPDATE `".implode("` = ?, `", array_keys($param))."` = ?";
+
+			$values = array_values($param);
+			$param = array_merge_recursive($values, $values);
+		}
+
+		return self::e($sql, $param);
+	}
+
+	/**
+	 * @brief Fetch the id of the last insert command
+	 *
+	 * @return integer Last inserted id
+	 */
+	public static function lastInsertId() {
+		switch (self::$driver) {
+			case 'pdo':
+				$id = self::$connection->lastInsertId();
+				break;
+			case 'mysqli':
+				$id = self::$connection->insert_id;
+				break;
+		}
+		return $id;
+	}
+
+	/**
+	 * @brief Locks a table for exclusive write access
+	 *
+	 * This function can be extended in the future to accept a table array as well.
+	 *
+	 * @param string $table Table name
+	 *
+	 * @return boolean was the lock successful?
+	 */
+	public static function lock($table) {
+		// See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html
+		if (self::$driver == 'pdo') {
+			self::e("SET autocommit=0");
+			self::$connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
+		} else {
+			self::$connection->autocommit(false);
+		}
+
+		$success = self::e("LOCK TABLES `".self::escape($table)."` WRITE");
+
+		if (self::$driver == 'pdo') {
+			self::$connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
+		}
+
+		if (!$success) {
+			if (self::$driver == 'pdo') {
+				self::e("SET autocommit=1");
+			} else {
+				self::$connection->autocommit(true);
+			}
+		} else {
+			self::$in_transaction = true;
+		}
+		return $success;
+	}
+
+	/**
+	 * @brief Unlocks all locked tables
+	 *
+	 * @return boolean was the unlock successful?
+	 */
+	public static function unlock() {
+		// See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html
+		self::performCommit();
+
+		if (self::$driver == 'pdo') {
+			self::$connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
+		}
+
+		$success = self::e("UNLOCK TABLES");
+
+		if (self::$driver == 'pdo') {
+			self::$connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
+			self::e("SET autocommit=1");
+		} else {
+			self::$connection->autocommit(true);
+		}
+
+		self::$in_transaction = false;
+		return $success;
+	}
+
+	/**
+	 * @brief Starts a transaction
+	 *
+	 * @return boolean Was the command executed successfully?
+	 */
+	public static function transaction() {
+		if (!self::performCommit()) {
+			return false;
+		}
+
+		switch (self::$driver) {
+			case 'pdo':
+				if (!self::$connection->inTransaction() && !self::$connection->beginTransaction()) {
+					return false;
+				}
+				break;
+
+			case 'mysqli':
+				if (!self::$connection->begin_transaction()) {
+					return false;
+				}
+				break;
+		}
+
+		self::$in_transaction = true;
+		return true;
+	}
+
+	private static function performCommit()
+	{
+		switch (self::$driver) {
+			case 'pdo':
+				if (!self::$connection->inTransaction()) {
+					return true;
+				}
+
+				return self::$connection->commit();
+
+			case 'mysqli':
+				return self::$connection->commit();
+		}
+
+		return true;
+	}
+
+	/**
+	 * @brief Does a commit
+	 *
+	 * @return boolean Was the command executed successfully?
+	 */
+	public static function commit() {
+		if (!self::performCommit()) {
+			return false;
+		}
+		self::$in_transaction = false;
+		return true;
+	}
+
+	/**
+	 * @brief Does a rollback
+	 *
+	 * @return boolean Was the command executed successfully?
+	 */
+	public static function rollback() {
+		$ret = false;
+
+		switch (self::$driver) {
+			case 'pdo':
+				if (!self::$connection->inTransaction()) {
+					$ret = true;
+					break;
+				}
+				$ret = self::$connection->rollBack();
+				break;
+
+			case 'mysqli':
+				$ret = self::$connection->rollback();
+				break;
+		}
+		self::$in_transaction = false;
+		return $ret;
+	}
+
+	/**
+	 * @brief Build the array with the table relations
+	 *
+	 * The array is build from the database definitions in DBStructure.php
+	 *
+	 * This process must only be started once, since the value is cached.
+	 */
+	private static function buildRelationData() {
+		$definition = DBStructure::definition();
+
+		foreach ($definition AS $table => $structure) {
+			foreach ($structure['fields'] AS $field => $field_struct) {
+				if (isset($field_struct['relation'])) {
+					foreach ($field_struct['relation'] AS $rel_table => $rel_field) {
+						self::$relation[$rel_table][$rel_field][$table][] = $field;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * @brief Delete a row from a table
+	 *
+	 * @param string  $table       Table name
+	 * @param array   $conditions  Field condition(s)
+	 * @param array   $options
+	 *                - cascade: If true we delete records in other tables that depend on the one we're deleting through
+	 *                           relations (default: true)
+	 * @param boolean $in_process  Internal use: Only do a commit after the last delete
+	 * @param array   $callstack   Internal use: prevent endless loops
+	 *
+	 * @return boolean|array was the delete successful? When $in_process is set: deletion data
+	 */
+	public static function delete($table, array $conditions, array $options = [], $in_process = false, array &$callstack = [])
+	{
+		if (empty($table) || empty($conditions)) {
+			logger('Table and conditions have to be set');
+			return false;
+		}
+
+		$commands = [];
+
+		// Create a key for the loop prevention
+		$key = $table . ':' . json_encode($conditions);
+
+		// We quit when this key already exists in the callstack.
+		if (isset($callstack[$key])) {
+			return $commands;
+		}
+
+		$callstack[$key] = true;
+
+		$table = self::escape($table);
+
+		$commands[$key] = ['table' => $table, 'conditions' => $conditions];
+
+		// Don't use "defaults" here, since it would set "false" to "true"
+		if (isset($options['cascade'])) {
+			$cascade = $options['cascade'];
+		} else {
+			$cascade = true;
+		}
+
+		// To speed up the whole process we cache the table relations
+		if ($cascade && count(self::$relation) == 0) {
+			self::buildRelationData();
+		}
+
+		// Is there a relation entry for the table?
+		if ($cascade && isset(self::$relation[$table])) {
+			// We only allow a simple "one field" relation.
+			$field = array_keys(self::$relation[$table])[0];
+			$rel_def = array_values(self::$relation[$table])[0];
+
+			// Create a key for preventing double queries
+			$qkey = $field . '-' . $table . ':' . json_encode($conditions);
+
+			// When the search field is the relation field, we don't need to fetch the rows
+			// This is useful when the leading record is already deleted in the frontend but the rest is done in the backend
+			if ((count($conditions) == 1) && ($field == array_keys($conditions)[0])) {
+				foreach ($rel_def AS $rel_table => $rel_fields) {
+					foreach ($rel_fields AS $rel_field) {
+						$retval = self::delete($rel_table, [$rel_field => array_values($conditions)[0]], $options, true, $callstack);
+						$commands = array_merge($commands, $retval);
+					}
+				}
+				// We quit when this key already exists in the callstack.
+			} elseif (!isset($callstack[$qkey])) {
+
+				$callstack[$qkey] = true;
+
+				// Fetch all rows that are to be deleted
+				$data = self::select($table, [$field], $conditions);
+
+				while ($row = self::fetch($data)) {
+					// Now we accumulate the delete commands
+					$retval = self::delete($table, [$field => $row[$field]], $options, true, $callstack);
+					$commands = array_merge($commands, $retval);
+				}
+
+				self::close($data);
+
+				// Since we had split the delete command we don't need the original command anymore
+				unset($commands[$key]);
+			}
+		}
+
+		if (!$in_process) {
+			// Now we finalize the process
+			$do_transaction = !self::$in_transaction;
+
+			if ($do_transaction) {
+				self::transaction();
+			}
+
+			$compacted = [];
+			$counter = [];
+
+			foreach ($commands AS $command) {
+				$conditions = $command['conditions'];
+				reset($conditions);
+				$first_key = key($conditions);
+
+				$condition_string = self::buildCondition($conditions);
+
+				if ((count($command['conditions']) > 1) || is_int($first_key)) {
+					$sql = "DELETE FROM `" . $command['table'] . "`" . $condition_string;
+					logger(self::replaceParameters($sql, $conditions), LOGGER_DATA);
+
+					if (!self::e($sql, $conditions)) {
+						if ($do_transaction) {
+							self::rollback();
+						}
+						return false;
+					}
+				} else {
+					$key_table = $command['table'];
+					$key_condition = array_keys($command['conditions'])[0];
+					$value = array_values($command['conditions'])[0];
+
+					// Split the SQL queries in chunks of 100 values
+					// We do the $i stuff here to make the code better readable
+					$i = isset($counter[$key_table][$key_condition]) ? $counter[$key_table][$key_condition] : 0;
+					if (isset($compacted[$key_table][$key_condition][$i]) && count($compacted[$key_table][$key_condition][$i]) > 100) {
+						++$i;
+					}
+
+					$compacted[$key_table][$key_condition][$i][$value] = $value;
+					$counter[$key_table][$key_condition] = $i;
+				}
+			}
+			foreach ($compacted AS $table => $values) {
+				foreach ($values AS $field => $field_value_list) {
+					foreach ($field_value_list AS $field_values) {
+						$sql = "DELETE FROM `" . $table . "` WHERE `" . $field . "` IN (" .
+							substr(str_repeat("?, ", count($field_values)), 0, -2) . ");";
+
+						logger(self::replaceParameters($sql, $field_values), LOGGER_DATA);
+
+						if (!self::e($sql, $field_values)) {
+							if ($do_transaction) {
+								self::rollback();
+							}
+							return false;
+						}
+					}
+				}
+			}
+			if ($do_transaction) {
+				self::commit();
+			}
+			return true;
+		}
+
+		return $commands;
+	}
+
+	/**
+	 * @brief Updates rows
+	 *
+	 * Updates rows in the database. When $old_fields is set to an array,
+	 * the system will only do an update if the fields in that array changed.
+	 *
+	 * Attention:
+	 * Only the values in $old_fields are compared.
+	 * This is an intentional behaviour.
+	 *
+	 * Example:
+	 * We include the timestamp field in $fields but not in $old_fields.
+	 * Then the row will only get the new timestamp when the other fields had changed.
+	 *
+	 * When $old_fields is set to a boolean value the system will do this compare itself.
+	 * When $old_fields is set to "true" the system will do an insert if the row doesn't exists.
+	 *
+	 * Attention:
+	 * Only set $old_fields to a boolean value when you are sure that you will update a single row.
+	 * When you set $old_fields to "true" then $fields must contain all relevant fields!
+	 *
+	 * @param string $table Table name
+	 * @param array $fields contains the fields that are updated
+	 * @param array $condition condition array with the key values
+	 * @param array|boolean $old_fields array with the old field values that are about to be replaced (true = update on duplicate)
+	 *
+	 * @return boolean was the update successfull?
+	 */
+	public static function update($table, $fields, $condition, $old_fields = []) {
+
+		if (empty($table) || empty($fields) || empty($condition)) {
+			logger('Table, fields and condition have to be set');
+			return false;
+		}
+
+		$table = self::escape($table);
+
+		$condition_string = self::buildCondition($condition);
+
+		if (is_bool($old_fields)) {
+			$do_insert = $old_fields;
+
+			$old_fields = self::selectFirst($table, [], $condition);
+
+			if (is_bool($old_fields)) {
+				if ($do_insert) {
+					$values = array_merge($condition, $fields);
+					return self::insert($table, $values, $do_insert);
+				}
+				$old_fields = [];
+			}
+		}
+
+		$do_update = (count($old_fields) == 0);
+
+		foreach ($old_fields AS $fieldname => $content) {
+			if (isset($fields[$fieldname])) {
+				if ($fields[$fieldname] == $content) {
+					unset($fields[$fieldname]);
+				} else {
+					$do_update = true;
+				}
+			}
+		}
+
+		if (!$do_update || (count($fields) == 0)) {
+			return true;
+		}
+
+		$sql = "UPDATE `".$table."` SET `".
+			implode("` = ?, `", array_keys($fields))."` = ?".$condition_string;
+
+		$params1 = array_values($fields);
+		$params2 = array_values($condition);
+		$params = array_merge_recursive($params1, $params2);
+
+		return self::e($sql, $params);
+	}
+
+	/**
+	 * Retrieve a single record from a table and returns it in an associative array
+	 *
+	 * @brief Retrieve a single record from a table
+	 * @param string $table
+	 * @param array  $fields
+	 * @param array  $condition
+	 * @param array  $params
+	 * @return bool|array
+	 * @see self::select
+	 */
+	public static function selectFirst($table, array $fields = [], array $condition = [], $params = [])
+	{
+		$params['limit'] = 1;
+		$result = self::select($table, $fields, $condition, $params);
+
+		if (is_bool($result)) {
+			return $result;
+		} else {
+			$row = self::fetch($result);
+			self::close($result);
+			return $row;
+		}
+	}
+
+	/**
+	 * @brief Select rows from a table
+	 *
+	 * @param string $table     Table name
+	 * @param array  $fields    Array of selected fields, empty for all
+	 * @param array  $condition Array of fields for condition
+	 * @param array  $params    Array of several parameters
+	 *
+	 * @return boolean|object
+	 *
+	 * Example:
+	 * $table = "item";
+	 * $fields = array("id", "uri", "uid", "network");
+	 *
+	 * $condition = array("uid" => 1, "network" => 'dspr');
+	 * or:
+	 * $condition = array("`uid` = ? AND `network` IN (?, ?)", 1, 'dfrn', 'dspr');
+	 *
+	 * $params = array("order" => array("id", "received" => true), "limit" => 10);
+	 *
+	 * $data = DBA::select($table, $fields, $condition, $params);
+	 */
+	public static function select($table, array $fields = [], array $condition = [], array $params = [])
+	{
+		if ($table == '') {
+			return false;
+		}
+
+		$table = self::escape($table);
+
+		if (count($fields) > 0) {
+			$select_fields = "`" . implode("`, `", array_values($fields)) . "`";
+		} else {
+			$select_fields = "*";
+		}
+
+		$condition_string = self::buildCondition($condition);
+
+		$param_string = self::buildParameter($params);
+
+		$sql = "SELECT " . $select_fields . " FROM `" . $table . "`" . $condition_string . $param_string;
+
+		$result = self::p($sql, $condition);
+
+		return $result;
+	}
+
+	/**
+	 * @brief Counts the rows from a table satisfying the provided condition
+	 *
+	 * @param string $table Table name
+	 * @param array $condition array of fields for condition
+	 *
+	 * @return int
+	 *
+	 * Example:
+	 * $table = "item";
+	 *
+	 * $condition = ["uid" => 1, "network" => 'dspr'];
+	 * or:
+	 * $condition = ["`uid` = ? AND `network` IN (?, ?)", 1, 'dfrn', 'dspr'];
+	 *
+	 * $count = DBA::count($table, $condition);
+	 */
+	public static function count($table, array $condition = [])
+	{
+		if ($table == '') {
+			return false;
+		}
+
+		$condition_string = self::buildCondition($condition);
+
+		$sql = "SELECT COUNT(*) AS `count` FROM `".$table."`".$condition_string;
+
+		$row = self::fetchFirst($sql, $condition);
+
+		return $row['count'];
+	}
+
+	/**
+	 * @brief Returns the SQL condition string built from the provided condition array
+	 *
+	 * This function operates with two modes.
+	 * - Supplied with a filed/value associative array, it builds simple strict
+	 *   equality conditions linked by AND.
+	 * - Supplied with a flat list, the first element is the condition string and
+	 *   the following arguments are the values to be interpolated
+	 *
+	 * $condition = ["uid" => 1, "network" => 'dspr'];
+	 * or:
+	 * $condition = ["`uid` = ? AND `network` IN (?, ?)", 1, 'dfrn', 'dspr'];
+	 *
+	 * In either case, the provided array is left with the parameters only
+	 *
+	 * @param array $condition
+	 * @return string
+	 */
+	public static function buildCondition(array &$condition = [])
+	{
+		$condition_string = '';
+		if (count($condition) > 0) {
+			reset($condition);
+			$first_key = key($condition);
+			if (is_int($first_key)) {
+				$condition_string = " WHERE (" . array_shift($condition) . ")";
+			} else {
+				$new_values = [];
+				$condition_string = "";
+				foreach ($condition as $field => $value) {
+					if ($condition_string != "") {
+						$condition_string .= " AND ";
+					}
+					if (is_array($value)) {
+						/* Workaround for MySQL Bug #64791.
+						 * Never mix data types inside any IN() condition.
+						 * In case of mixed types, cast all as string.
+						 * Logic needs to be consistent with DBA::p() data types.
+						 */
+						$is_int = false;
+						$is_alpha = false;
+						foreach ($value as $single_value) {
+							if (is_int($single_value)) {
+								$is_int = true;
+							} else {
+								$is_alpha = true;
+							}
+						}
+
+						if ($is_int && $is_alpha) {
+							foreach ($value as &$ref) {
+								if (is_int($ref)) {
+									$ref = (string)$ref;
+								}
+							}
+							unset($ref); //Prevent accidental re-use.
+						}
+
+						$new_values = array_merge($new_values, array_values($value));
+						$placeholders = substr(str_repeat("?, ", count($value)), 0, -2);
+						$condition_string .= "`" . $field . "` IN (" . $placeholders . ")";
+					} else {
+						$new_values[$field] = $value;
+						$condition_string .= "`" . $field . "` = ?";
+					}
+				}
+				$condition_string = " WHERE (" . $condition_string . ")";
+				$condition = $new_values;
+			}
+		}
+
+		return $condition_string;
+	}
+
+	/**
+	 * @brief Returns the SQL parameter string built from the provided parameter array
+	 *
+	 * @param array $params
+	 * @return string
+	 */
+	public static function buildParameter(array $params = [])
+	{
+		$order_string = '';
+		if (isset($params['order'])) {
+			$order_string = " ORDER BY ";
+			foreach ($params['order'] AS $fields => $order) {
+				if (!is_int($fields)) {
+					$order_string .= "`" . $fields . "` " . ($order ? "DESC" : "ASC") . ", ";
+				} else {
+					$order_string .= "`" . $order . "`, ";
+				}
+			}
+			$order_string = substr($order_string, 0, -2);
+		}
+
+		$limit_string = '';
+		if (isset($params['limit']) && is_int($params['limit'])) {
+			$limit_string = " LIMIT " . intval($params['limit']);
+		}
+
+		if (isset($params['limit']) && is_array($params['limit'])) {
+			$limit_string = " LIMIT " . intval($params['limit'][0]) . ", " . intval($params['limit'][1]);
+		}
+
+		return $order_string.$limit_string;
+	}
+
+	/**
+	 * @brief Fills an array with data from a query
+	 *
+	 * @param object $stmt statement object
+	 * @return array Data array
+	 */
+	public static function toArray($stmt, $do_close = true) {
+		if (is_bool($stmt)) {
+			return $stmt;
+		}
+
+		$data = [];
+		while ($row = self::fetch($stmt)) {
+			$data[] = $row;
+		}
+		if ($do_close) {
+			self::close($stmt);
+		}
+		return $data;
+	}
+
+	/**
+	 * @brief Returns the error number of the last query
+	 *
+	 * @return string Error number (0 if no error)
+	 */
+	public static function errorNo() {
+		return self::$errorno;
+	}
+
+	/**
+	 * @brief Returns the error message of the last query
+	 *
+	 * @return string Error message ('' if no error)
+	 */
+	public static function errorMessage() {
+		return self::$error;
+	}
+
+	/**
+	 * @brief Closes the current statement
+	 *
+	 * @param object $stmt statement object
+	 * @return boolean was the close successful?
+	 */
+	public static function close($stmt) {
+		$a = get_app();
+
+		$stamp1 = microtime(true);
+
+		if (!is_object($stmt)) {
+			return false;
+		}
+
+		switch (self::$driver) {
+			case 'pdo':
+				$ret = $stmt->closeCursor();
+				break;
+			case 'mysqli':
+				// MySQLi offers both a mysqli_stmt and a mysqli_result class.
+				// We should be careful not to assume the object type of $stmt
+				// because DBA::p() has been able to return both types.
+				if ($stmt instanceof mysqli_stmt) {
+					$stmt->free_result();
+					$ret = $stmt->close();
+				} elseif ($stmt instanceof mysqli_result) {
+					$stmt->free();
+					$ret = true;
+				} else {
+					$ret = false;
+				}
+				break;
+		}
+
+		$a->save_timestamp($stamp1, 'database');
+
+		return $ret;
+	}
+
+	/**
+	 * @brief Return a list of database processes
+	 *
+	 * @return array
+	 *      'list' => List of processes, separated in their different states
+	 *      'amount' => Number of concurrent database processes
+	 */
+	public static function processlist()
+	{
+		$ret = self::p("SHOW PROCESSLIST");
+		$data = self::toArray($ret);
+
+		$s = [];
+
+		$processes = 0;
+		$states = [];
+		foreach ($data as $process) {
+			$state = trim($process["State"]);
+
+			// Filter out all non blocking processes
+			if (!in_array($state, ["", "init", "statistics", "updating"])) {
+				++$states[$state];
+				++$processes;
+			}
+		}
+
+		$statelist = "";
+		foreach ($states as $state => $usage) {
+			if ($statelist != "") {
+				$statelist .= ", ";
+			}
+			$statelist .= $state.": ".$usage;
+		}
+		return(["list" => $statelist, "amount" => $processes]);
+	}
+
+	/**
+	 * Checks if $array is a filled array with at least one entry.
+	 *
+	 * @param mixed $array A filled array with at least one entry
+	 *
+	 * @return boolean Whether $array is a filled array or an object with rows
+	 */
+	public static function isResult($array)
+	{
+		// It could be a return value from an update statement
+		if (is_bool($array)) {
+			return $array;
+		}
+
+		if (is_object($array)) {
+			return self::numRows($array) > 0;
+		}
+
+		return (is_array($array) && (count($array) > 0));
+	}
+
+	/**
+	 * @brief Callback function for "esc_array"
+	 *
+	 * @param mixed   $value         Array value
+	 * @param string  $key           Array key
+	 * @param boolean $add_quotation add quotation marks for string values
+	 * @return void
+	 */
+	private static function escapeArrayCallback(&$value, $key, $add_quotation)
+	{
+		if (!$add_quotation) {
+			if (is_bool($value)) {
+				$value = ($value ? '1' : '0');
+			} else {
+				$value = self::escape($value);
+			}
+			return;
+		}
+
+		if (is_bool($value)) {
+			$value = ($value ? 'true' : 'false');
+		} elseif (is_float($value) || is_integer($value)) {
+			$value = (string) $value;
+		} else {
+			$value = "'" . self::escape($value) . "'";
+		}
+	}
+
+	/**
+	 * @brief Escapes a whole array
+	 *
+	 * @param mixed   $arr           Array with values to be escaped
+	 * @param boolean $add_quotation add quotation marks for string values
+	 * @return void
+	 */
+	public static function escapeArray(&$arr, $add_quotation = false)
+	{
+		array_walk($arr, 'self::escapeArrayCallback', $add_quotation);
+	}
+}
diff --git a/src/Database/DBM.php b/src/Database/DBM.php
deleted file mode 100644
index 7daf6b545..000000000
--- a/src/Database/DBM.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * @file src/Database/DBM.php
- */
-namespace Friendica\Database;
-
-use dba;
-use Friendica\Util\DateTimeFormat;
-
-require_once 'include/dba.php';
-
-/**
- * @brief This class contain functions for the database management
- *
- * This class contains functions that doesn't need to know if pdo, mysqli or whatever is used.
- */
-class DBM
-{
-	/**
-	 * @brief Return a list of database processes
-	 *
-	 * @return array
-	 *      'list' => List of processes, separated in their different states
-	 *      'amount' => Number of concurrent database processes
-	 */
-	public static function processlist()
-	{
-		$r = q("SHOW PROCESSLIST");
-		$s = [];
-
-		$processes = 0;
-		$states = [];
-		foreach ($r as $process) {
-			$state = trim($process["State"]);
-
-			// Filter out all non blocking processes
-			if (!in_array($state, ["", "init", "statistics", "updating"])) {
-				++$states[$state];
-				++$processes;
-			}
-		}
-
-		$statelist = "";
-		foreach ($states as $state => $usage) {
-			if ($statelist != "") {
-				$statelist .= ", ";
-			}
-			$statelist .= $state.": ".$usage;
-		}
-		return(["list" => $statelist, "amount" => $processes]);
-	}
-
-	/**
-	 * Checks if $array is a filled array with at least one entry.
-	 *
-	 * @param mixed $array A filled array with at least one entry
-	 *
-	 * @return boolean Whether $array is a filled array or an object with rows
-	 */
-	public static function is_result($array)
-	{
-		// It could be a return value from an update statement
-		if (is_bool($array)) {
-			return $array;
-		}
-
-		if (is_object($array)) {
-			return dba::num_rows($array) > 0;
-		}
-
-		return (is_array($array) && (count($array) > 0));
-	}
-
-	/**
-	 * @brief Callback function for "esc_array"
-	 *
-	 * @param mixed   $value         Array value
-	 * @param string  $key           Array key
-	 * @param boolean $add_quotation add quotation marks for string values
-	 * @return void
-	 */
-	private static function esc_array_callback(&$value, $key, $add_quotation)
-	{
-		if (!$add_quotation) {
-			if (is_bool($value)) {
-				$value = ($value ? '1' : '0');
-			} else {
-				$value = dbesc($value);
-			}
-			return;
-		}
-
-		if (is_bool($value)) {
-			$value = ($value ? 'true' : 'false');
-		} elseif (is_float($value) || is_integer($value)) {
-			$value = (string)$value;
-		} else {
-			 $value = "'".dbesc($value)."'";
-		}
-	}
-
-	/**
-	 * @brief Escapes a whole array
-	 *
-	 * @param mixed   $arr           Array with values to be escaped
-	 * @param boolean $add_quotation add quotation marks for string values
-	 * @return void
-	 */
-	public static function esc_array(&$arr, $add_quotation = false)
-	{
-		array_walk($arr, 'self::esc_array_callback', $add_quotation);
-	}
-
-	/**
-	 * Checks Converts any date string into a SQL compatible date string
-	 *
-	 * @deprecated since version 3.6
-	 * @param string $date a date string in any format
-	 *
-	 * @return string SQL style date string
-	 */
-	public static function date($date = 'now')
-	{
-		return DateTimeFormat::utc($date);
-	}
-}
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 847449b75..d6cd66aaf 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -4,10 +4,11 @@
  */
 namespace Friendica\Database;
 
+use Exception;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
-use dba;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -26,19 +27,19 @@ class DBStructure
 	 */
 	public static function convertToInnoDB() {
 		$r = q("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `engine` = 'MyISAM' AND `table_schema` = '%s'",
-			dbesc(dba::database_name()));
+			DBA::escape(DBA::databaseName()));
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			echo L10n::t('There are no tables on MyISAM.')."\n";
 			return;
 		}
 
 		foreach ($r AS $table) {
-			$sql = sprintf("ALTER TABLE `%s` engine=InnoDB;", dbesc($table['TABLE_NAME']));
+			$sql = sprintf("ALTER TABLE `%s` engine=InnoDB;", DBA::escape($table['TABLE_NAME']));
 			echo $sql."\n";
 
-			$result = dba::e($sql);
-			if (!DBM::is_result($result)) {
+			$result = DBA::e($sql);
+			if (!DBA::isResult($result)) {
 				self::printUpdateError($sql);
 			}
 		}
@@ -54,14 +55,14 @@ class DBStructure
 		$a = get_app();
 
 		//send the administrators an e-mail
-		$admin_mail_list = "'".implode("','", array_map(dbesc, explode(",", str_replace(" ", "", $a->config['admin_email']))))."'";
+		$admin_mail_list = "'".implode("','", array_map(['Friendica\Database\DBA', 'escape'], explode(",", str_replace(" ", "", Config::get('config', 'admin_email')))))."'";
 		$adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)",
 			$admin_mail_list
 		);
 
 		// No valid result?
-		if (!DBM::is_result($adminlist)) {
-			logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_NORMAL);
+		if (!DBA::isResult($adminlist)) {
+			logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_INFO);
 
 			// Don't continue
 			return;
@@ -104,7 +105,7 @@ class DBStructure
 
 		$table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table);
 
-		if (DBM::is_result($table_status)) {
+		if (DBA::isResult($table_status)) {
 			$table_status = $table_status[0];
 		} else {
 			$table_status = [];
@@ -113,7 +114,7 @@ class DBStructure
 		$fielddata = [];
 		$indexdata = [];
 
-		if (DBM::is_result($indexes)) {
+		if (DBA::isResult($indexes)) {
 			foreach ($indexes AS $index) {
 				if ($index['Key_name'] != 'PRIMARY' && $index['Non_unique'] == '0' && !isset($indexdata[$index["Key_name"]])) {
 					$indexdata[$index["Key_name"]] = ['UNIQUE'];
@@ -128,7 +129,7 @@ class DBStructure
 				$indexdata[$index["Key_name"]][] = $column;
 			}
 		}
-		if (DBM::is_result($structures)) {
+		if (DBA::isResult($structures)) {
 			foreach ($structures AS $field) {
 				// Replace the default size values so that we don't have to define them
 				$search = ['tinyint(1)', 'tinyint(3) unsigned', 'tinyint(4)', 'smallint(5) unsigned', 'smallint(6)', 'mediumint(8) unsigned', 'mediumint(9)', 'bigint(20)', 'int(10) unsigned', 'int(11)'];
@@ -153,7 +154,7 @@ class DBStructure
 				}
 			}
 		}
-		if (DBM::is_result($full_columns)) {
+		if (DBA::isResult($full_columns)) {
 			foreach ($full_columns AS $column) {
 				$fielddata[$column["Field"]]["Collation"] = $column["Collation"];
 				$fielddata[$column["Field"]]["comment"] = $column["Comment"];
@@ -174,7 +175,7 @@ class DBStructure
 			echo "--\n";
 			echo "-- TABLE $name\n";
 			echo "--\n";
-			self::createTable($name, $structure['fields'], true, false, $structure["indexes"]);
+			self::createTable($name, $structure, true, false);
 
 			echo "\n";
 		}
@@ -189,7 +190,7 @@ class DBStructure
 	 */
 	private static function printUpdateError($message) {
 		echo L10n::t("\nError %d occurred during database update:\n%s\n",
-			dba::errorNo(), dba::errorMessage());
+			DBA::errorNo(), DBA::errorMessage());
 
 		return L10n::t('Errors encountered performing database changes: ').$message.EOL;
 	}
@@ -207,7 +208,7 @@ class DBStructure
 	public static function update($verbose, $action, $install = false, array $tables = null, array $definition = null) {
 		if ($action && !$install) {
 			Config::set('system', 'maintenance', 1);
-			Config::set('system', 'maintenance_reason', L10n::t('%s: Database update', DBM::date().' '.date('e')));
+			Config::set('system', 'maintenance_reason', L10n::t('%s: Database update', DateTimeFormat::utcNow().' '.date('e')));
 		}
 
 		$errors = '';
@@ -221,7 +222,7 @@ class DBStructure
 			$tables = q("SHOW TABLES");
 		}
 
-		if (DBM::is_result($tables)) {
+		if (DBA::isResult($tables)) {
 			foreach ($tables AS $table) {
 				$table = current($table);
 
@@ -236,8 +237,8 @@ class DBStructure
 		}
 
 		// MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
-		if ((version_compare(dba::server_info(), '5.7.4') >= 0) &&
-			!(strpos(dba::server_info(), 'MariaDB') !== false)) {
+		if ((version_compare(DBA::serverInfo(), '5.7.4') >= 0) &&
+			!(strpos(DBA::serverInfo(), 'MariaDB') !== false)) {
 			$ignore = '';
 		} else {
 			$ignore = ' IGNORE';
@@ -251,8 +252,8 @@ class DBStructure
 			$is_unique = false;
 			$temp_name = $name;
 			if (!isset($database[$name])) {
-				$r = self::createTable($name, $structure["fields"], $verbose, $action, $structure['indexes']);
-				if (!DBM::is_result($r)) {
+				$r = self::createTable($name, $structure, $verbose, $action);
+				if (!DBA::isResult($r)) {
 					$errors .= self::printUpdateError($name);
 				}
 				$is_new_table = true;
@@ -322,8 +323,8 @@ class DBStructure
 							$parameters['comment'] = "";
 						}
 
-						$current_field_definition = implode(",", $field_definition);
-						$new_field_definition = implode(",", $parameters);
+						$current_field_definition = DBA::cleanQuery(implode(",", $field_definition));
+						$new_field_definition = DBA::cleanQuery(implode(",", $parameters));
 						if ($current_field_definition != $new_field_definition) {
 							$sql2 = self::modifyTableField($fieldname, $parameters);
 							if ($sql3 == "") {
@@ -368,7 +369,19 @@ class DBStructure
 
 				if (isset($database[$name]["table_status"]["Comment"])) {
 					if ($database[$name]["table_status"]["Comment"] != $structure['comment']) {
-						$sql2 = "COMMENT = '".dbesc($structure['comment'])."'";
+						$sql2 = "COMMENT = '".DBA::escape($structure['comment'])."'";
+
+						if ($sql3 == "") {
+							$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
+						} else {
+							$sql3 .= ", ".$sql2;
+						}
+					}
+				}
+
+				if (isset($database[$name]["table_status"]["Engine"]) && isset($structure['engine'])) {
+					if ($database[$name]["table_status"]["Engine"] != $structure['engine']) {
+						$sql2 = "ENGINE = '".DBA::escape($structure['engine'])."'";
 
 						if ($sql3 == "") {
 							$sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
@@ -398,10 +411,10 @@ class DBStructure
 				// Compare the field structure field by field
 				foreach ($structure["fields"] AS $fieldname => $parameters) {
 					// Compare the field definition
-					$field_definition = $database[$name]["fields"][$fieldname];
+					$field_definition = defaults($database[$name]["fields"], $fieldname, ['Collation' => '']);
 
 					// Define the default collation if not given
-					if (!isset($parameters['Collation']) && !is_null($field_definition['Collation'])) {
+					if (!isset($parameters['Collation']) && !empty($field_definition['Collation'])) {
 						$parameters['Collation'] = 'utf8mb4_general_ci';
 					} else {
 						$parameters['Collation'] = null;
@@ -448,7 +461,7 @@ class DBStructure
 						if ($ignore != "") {
 							echo "SET session old_alter_table=0;\n";
 						} else {
-							echo "INSERT INTO `".$temp_name."` SELECT ".dba::any_value_fallback($field_list)." FROM `".$name."`".$group_by.";\n";
+							echo "INSERT INTO `".$temp_name."` SELECT ".DBA::anyValueFallback($field_list)." FROM `".$name."`".$group_by.";\n";
 							echo "DROP TABLE `".$name."`;\n";
 							echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n";
 						}
@@ -457,48 +470,48 @@ class DBStructure
 
 				if ($action) {
 					if (!$install) {
-						Config::set('system', 'maintenance_reason', L10n::t('%s: updating %s table.', DBM::date().' '.date('e'), $name));
+						Config::set('system', 'maintenance_reason', L10n::t('%s: updating %s table.', DateTimeFormat::utcNow().' '.date('e'), $name));
 					}
 
 					// Ensure index conversion to unique removes duplicates
 					if ($is_unique && ($temp_name != $name)) {
 						if ($ignore != "") {
-							dba::e("SET session old_alter_table=1;");
+							DBA::e("SET session old_alter_table=1;");
 						} else {
-							$r = dba::e("DROP TABLE IF EXISTS `".$temp_name."`;");
-							if (!DBM::is_result($r)) {
+							$r = DBA::e("DROP TABLE IF EXISTS `".$temp_name."`;");
+							if (!DBA::isResult($r)) {
 								$errors .= self::printUpdateError($sql3);
 								return $errors;
 							}
 
-							$r = dba::e("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
-							if (!DBM::is_result($r)) {
+							$r = DBA::e("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
+							if (!DBA::isResult($r)) {
 								$errors .= self::printUpdateError($sql3);
 								return $errors;
 							}
 						}
 					}
 
-					$r = dba::e($sql3);
-					if (!DBM::is_result($r)) {
+					$r = DBA::e($sql3);
+					if (!DBA::isResult($r)) {
 						$errors .= self::printUpdateError($sql3);
 					}
 					if ($is_unique && ($temp_name != $name)) {
 						if ($ignore != "") {
-							dba::e("SET session old_alter_table=0;");
+							DBA::e("SET session old_alter_table=0;");
 						} else {
-							$r = dba::e("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
-							if (!DBM::is_result($r)) {
+							$r = DBA::e("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
+							if (!DBA::isResult($r)) {
 								$errors .= self::printUpdateError($sql3);
 								return $errors;
 							}
-							$r = dba::e("DROP TABLE `".$name."`;");
-							if (!DBM::is_result($r)) {
+							$r = DBA::e("DROP TABLE `".$name."`;");
+							if (!DBA::isResult($r)) {
 								$errors .= self::printUpdateError($sql3);
 								return $errors;
 							}
-							$r = dba::e("RENAME TABLE `".$temp_name."` TO `".$name."`;");
-							if (!DBM::is_result($r)) {
+							$r = DBA::e("RENAME TABLE `".$temp_name."` TO `".$name."`;");
+							if (!DBA::isResult($r)) {
 								$errors .= self::printUpdateError($sql3);
 								return $errors;
 							}
@@ -525,11 +538,11 @@ class DBStructure
 	private static function FieldCommand($parameters, $create = true) {
 		$fieldstruct = $parameters["type"];
 
-		if (!is_null($parameters["Collation"])) {
+		if (isset($parameters["Collation"])) {
 			$fieldstruct .= " COLLATE ".$parameters["Collation"];
 		}
 
-		if ($parameters["not null"]) {
+		if (isset($parameters["not null"])) {
 			$fieldstruct .= " NOT NULL";
 		}
 
@@ -540,12 +553,12 @@ class DBStructure
 				$fieldstruct .= " DEFAULT '".$parameters["default"]."'";
 			}
 		}
-		if ($parameters["extra"] != "") {
+		if (isset($parameters["extra"])) {
 			$fieldstruct .= " ".$parameters["extra"];
 		}
 
-		if (!is_null($parameters["comment"])) {
-			$fieldstruct .= " COMMENT '".dbesc($parameters["comment"])."'";
+		if (isset($parameters["comment"])) {
+			$fieldstruct .= " COMMENT '".DBA::escape($parameters["comment"])."'";
 		}
 
 		/*if (($parameters["primary"] != "") && $create)
@@ -554,20 +567,22 @@ class DBStructure
 		return($fieldstruct);
 	}
 
-	private static function createTable($name, $fields, $verbose, $action, $indexes=null) {
+	private static function createTable($name, $structure, $verbose, $action) {
 		$r = true;
 
+		$engine = "";
+		$comment = "";
 		$sql_rows = [];
 		$primary_keys = [];
-		foreach ($fields AS $fieldname => $field) {
-			$sql_rows[] = "`".dbesc($fieldname)."` ".self::FieldCommand($field);
+		foreach ($structure["fields"] AS $fieldname => $field) {
+			$sql_rows[] = "`".DBA::escape($fieldname)."` ".self::FieldCommand($field);
 			if (x($field,'primary') && $field['primary']!='') {
 				$primary_keys[] = $fieldname;
 			}
 		}
 
-		if (!is_null($indexes)) {
-			foreach ($indexes AS $indexname => $fieldnames) {
+		if (!empty($structure["indexes"])) {
+			foreach ($structure["indexes"] AS $indexname => $fieldnames) {
 				$sql_index = self::createIndex($indexname, $fieldnames, "");
 				if (!is_null($sql_index)) {
 					$sql_rows[] = $sql_index;
@@ -575,39 +590,48 @@ class DBStructure
 			}
 		}
 
+		if (isset($structure["engine"])) {
+			$engine = " ENGINE=" . $structure["engine"];
+		}
+
+		if (isset($structure["comment"])) {
+			$comment = " COMMENT='" . DBA::escape($structure["comment"]) . "'";
+		}
+
 		$sql = implode(",\n\t", $sql_rows);
 
-		$sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT COLLATE utf8mb4_general_ci";
+		$sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", DBA::escape($name)).$sql.
+				"\n)" . $engine . " DEFAULT COLLATE utf8mb4_general_ci" . $comment;
 		if ($verbose) {
 			echo $sql.";\n";
 		}
 
 		if ($action) {
-			$r = dba::e($sql);
+			$r = DBA::e($sql);
 		}
 
 		return $r;
 	}
 
 	private static function addTableField($fieldname, $parameters) {
-		$sql = sprintf("ADD `%s` %s", dbesc($fieldname), self::FieldCommand($parameters));
+		$sql = sprintf("ADD `%s` %s", DBA::escape($fieldname), self::FieldCommand($parameters));
 		return($sql);
 	}
 
 	private static function modifyTableField($fieldname, $parameters) {
-		$sql = sprintf("MODIFY `%s` %s", dbesc($fieldname), self::FieldCommand($parameters, false));
+		$sql = sprintf("MODIFY `%s` %s", DBA::escape($fieldname), self::FieldCommand($parameters, false));
 		return($sql);
 	}
 
 	private static function dropIndex($indexname) {
-		$sql = sprintf("DROP INDEX `%s`", dbesc($indexname));
+		$sql = sprintf("DROP INDEX `%s`", DBA::escape($indexname));
 		return($sql);
 	}
 
 	private static function createIndex($indexname, $fieldnames, $method = "ADD") {
 		$method = strtoupper(trim($method));
 		if ($method!="" && $method!="ADD") {
-			throw new \Exception("Invalid parameter 'method' in self::createIndex(): '$method'");
+			throw new Exception("Invalid parameter 'method' in self::createIndex(): '$method'");
 		}
 
 		if ($fieldnames[0] == "UNIQUE") {
@@ -622,9 +646,9 @@ class DBStructure
 			}
 
 			if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches)) {
-				$names .= "`".dbesc($matches[1])."`(".intval($matches[2]).")";
+				$names .= "`".DBA::escape($matches[1])."`(".intval($matches[2]).")";
 			} else {
-				$names .= "`".dbesc($fieldname)."`";
+				$names .= "`".DBA::escape($fieldname)."`";
 			}
 		}
 
@@ -633,7 +657,7 @@ class DBStructure
 		}
 
 
-		$sql = sprintf("%s INDEX `%s` (%s)", $method, dbesc($indexname), $names);
+		$sql = sprintf("%s INDEX `%s` (%s)", $method, DBA::escape($indexname), $names);
 		return($sql);
 	}
 
@@ -651,9 +675,9 @@ class DBStructure
 			}
 
 			if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches)) {
-				$names .= "`".dbesc($matches[1])."`";
+				$names .= "`".DBA::escape($matches[1])."`";
 			} else {
-				$names .= "`".dbesc($fieldname)."`";
+				$names .= "`".DBA::escape($fieldname)."`";
 			}
 		}
 
@@ -661,1163 +685,178 @@ class DBStructure
 		return $sql;
 	}
 
+	/**
+	 * 	Check if a table exists
+	 *
+	 * @param string $table Table name
+	 *
+	 * @return boolean Does the table exist?
+	 */
+	public static function existsTable($table)
+	{
+		if (empty($table)) {
+			return false;
+		}
+
+		$table = DBA::escape($table);
+
+		$sql = "SHOW TABLES LIKE '" . $table . "';";
+
+		$stmt = DBA::p($sql);
+
+		if (is_bool($stmt)) {
+			$retval = $stmt;
+		} else {
+			$retval = (DBA::numRows($stmt) > 0);
+		}
+
+		DBA::close($stmt);
+
+		return $retval;
+	}
+
+	/**
+	 * 	Check if the columns of the table exists
+	 *
+	 * @param string $table   Table name
+	 * @param array  $columns Columns to check ( Syntax: [ $col1, $col2, .. ] )
+	 *
+	 * @return boolean Does the table exist?
+	 */
+	public static function existsColumn($table, $columns = []) {
+		if (empty($table)) {
+			return false;
+		}
+
+		if (is_null($columns) || empty($columns)) {
+			return self::existsTable($table);
+		}
+
+		$table = DBA::escape($table);
+
+		foreach ($columns AS $column) {
+			$sql = "SHOW COLUMNS FROM `" . $table . "` LIKE '" . $column . "';";
+
+			$stmt = DBA::p($sql);
+
+			if (is_bool($stmt)) {
+				$retval = $stmt;
+			} else {
+				$retval = (DBA::numRows($stmt) > 0);
+			}
+
+			DBA::close($stmt);
+
+			if (!$retval) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	const RENAME_COLUMN = 0;
+	const RENAME_PRIMARY_KEY = 1;
+
+	/**
+	 * Renames columns or the primary key of a table
+	 * @todo You cannot rename a primary key if "auto increment" is set
+	 *
+	 * @param string $table    Table name
+	 * @param array  $columns  Columns Syntax for Rename: [ $old1 => [ $new1, $type1 ], $old2 => [ $new2, $type2 ], ... ] )
+	 *                                 Syntax for Primary Key: [ $col1, $col2, ...] )
+	 * @param int    $type     The type of renaming (Default is Column)
+	 *
+	 * @return boolean Was the renaming successful?
+	 *
+	 */
+	public static function rename($table, $columns, $type = self::RENAME_COLUMN) {
+		if (empty($table) || empty($columns)) {
+			return false;
+		}
+
+		if (!is_array($columns)) {
+			return false;
+		}
+
+		$table = DBA::escape($table);
+
+		$sql = "ALTER TABLE `" . $table . "`";
+		switch ($type) {
+			case self::RENAME_COLUMN:
+				if (!self::existsColumn($table, array_keys($columns))) {
+					return false;
+				}
+				$sql .= implode(',', array_map(
+					function ($to, $from) {
+						return " CHANGE `" . $from . "` `" . $to[0] . "` " . $to[1];
+					},
+					$columns,
+					array_keys($columns)
+				));
+				break;
+			case self::RENAME_PRIMARY_KEY:
+				if (!self::existsColumn($table, $columns)) {
+					return false;
+				}
+				$sql .= " DROP PRIMARY KEY, ADD PRIMARY KEY(`" . implode('`, `', $columns) . "`)";
+				break;
+			default:
+				return false;
+		}
+
+		$sql .= ";";
+
+		$stmt = DBA::p($sql);
+
+		if (is_bool($stmt)) {
+			$retval = $stmt;
+		} else {
+			$retval = true;
+		}
+
+		DBA::close($stmt);
+
+		return $retval;
+	}
+
+	/**
+	 * Loads the database structure definition from the /config/dbstructure.json file
+	 *
+	 * Expected format:
+	 * "table_name": {
+	 *   "comment": "meaningful table comment",
+	 *   "fields": {
+	 *     "field_name1": {"type": "int unsigned", "not null": "1", "extra": "auto_increment", "primary": "1", "comment": "meaningful field comment"},
+	 *     "field_name2": {"type": "varchar(50)", "not null": "1", "default": "", "comment": "meaningful field comment"},
+	 *   },
+	 *   "indexes": {
+	 *     "PRIMARY": ["field_name1"],
+	 *     "name": ["UNIQUE", "field_name2"]
+	 *   }
+	 * }
+	 *
+	 * @return array
+	 * @throws Exception
+	 */
 	public static function definition() {
-		$database = [];
+		$a = \Friendica\BaseObject::getApp();
 
-		$database["addon"] = [
-				"comment" => "registered addons",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"name" => ["type" => "varchar(50)", "not null" => "1", "default" => "", "comment" => ""],
-						"version" => ["type" => "varchar(50)", "not null" => "1", "default" => "", "comment" => ""],
-						"installed" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"timestamp" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"plugin_admin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"name" => ["UNIQUE", "name"],
-						]
-				];
-		$database["attach"] = [
-				"comment" => "file attachments",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"hash" => ["type" => "varchar(64)", "not null" => "1", "default" => "", "comment" => ""],
-						"filename" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"filetype" => ["type" => "varchar(64)", "not null" => "1", "default" => "", "comment" => ""],
-						"filesize" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"data" => ["type" => "longblob", "not null" => "1", "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"edited" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"allow_cid" => ["type" => "mediumtext", "comment" => ""],
-						"allow_gid" => ["type" => "mediumtext", "comment" => ""],
-						"deny_cid" => ["type" => "mediumtext", "comment" => ""],
-						"deny_gid" => ["type" => "mediumtext", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						]
-				];
-		$database["auth_codes"] = [
-				"comment" => "OAuth usage",
-				"fields" => [
-						"id" => ["type" => "varchar(40)", "not null" => "1", "primary" => "1", "comment" => ""],
-						"client_id" => ["type" => "varchar(20)", "not null" => "1", "default" => "", "relation" => ["clients" => "client_id"], "comment" => ""],
-						"redirect_uri" => ["type" => "varchar(200)", "not null" => "1", "default" => "", "comment" => ""],
-						"expires" => ["type" => "int", "not null" => "1", "default" => "0", "comment" => ""],
-						"scope" => ["type" => "varchar(250)", "not null" => "1", "default" => "", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						]
-				];
-		$database["cache"] = [
-				"comment" => "Stores temporary data",
-				"fields" => [
-						"k" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "cache key"],
-						"v" => ["type" => "mediumtext", "comment" => "cached serialized value"],
-						"expires" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "datetime of cache expiration"],
-						"updated" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "datetime of cache insertion"],
-						],
-				"indexes" => [
-						"PRIMARY" => ["k"],
-						"k_expires" => ["k", "expires"],
-						]
-				];
-		$database["challenge"] = [
-				"comment" => "",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"challenge" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"dfrn-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"expire" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"type" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"last_update" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						]
-				];
-		$database["clients"] = [
-				"comment" => "OAuth usage",
-				"fields" => [
-						"client_id" => ["type" => "varchar(20)", "not null" => "1", "primary" => "1", "comment" => ""],
-						"pw" => ["type" => "varchar(20)", "not null" => "1", "default" => "", "comment" => ""],
-						"redirect_uri" => ["type" => "varchar(200)", "not null" => "1", "default" => "", "comment" => ""],
-						"name" => ["type" => "text", "comment" => ""],
-						"icon" => ["type" => "text", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						],
-				"indexes" => [
-						"PRIMARY" => ["client_id"],
-						]
-				];
-		$database["config"] = [
-				"comment" => "main configuration storage",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"cat" => ["type" => "varbinary(50)", "not null" => "1", "default" => "", "comment" => ""],
-						"k" => ["type" => "varbinary(50)", "not null" => "1", "default" => "", "comment" => ""],
-						"v" => ["type" => "mediumtext", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"cat_k" => ["UNIQUE", "cat", "k"],
-						]
-				];
-		$database["contact"] = [
-				"comment" => "contact table",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"self" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"remote_self" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"rel" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"duplex" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
-						"name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"nick" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"about" => ["type" => "text", "comment" => ""],
-						"keywords" => ["type" => "text", "comment" => ""],
-						"gender" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
-						"xmpp" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"attag" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"avatar" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"photo" => ["type" => "varchar(255)", "default" => "", "comment" => ""],
-						"thumb" => ["type" => "varchar(255)", "default" => "", "comment" => ""],
-						"micro" => ["type" => "varchar(255)", "default" => "", "comment" => ""],
-						"site-pubkey" => ["type" => "text", "comment" => ""],
-						"issued-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"dfrn-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"nurl" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"addr" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"alias" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"pubkey" => ["type" => "text", "comment" => ""],
-						"prvkey" => ["type" => "text", "comment" => ""],
-						"batch" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"request" => ["type" => "varchar(255)", "comment" => ""],
-						"notify" => ["type" => "varchar(255)", "comment" => ""],
-						"poll" => ["type" => "varchar(255)", "comment" => ""],
-						"confirm" => ["type" => "varchar(255)", "comment" => ""],
-						"poco" => ["type" => "varchar(255)", "comment" => ""],
-						"aes_allow" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"ret-aes" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"usehub" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"subhub" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"hub-verify" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"last-update" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"success_update" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"failure_update" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"name-date" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"uri-date" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"avatar-date" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"term-date" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"last-item" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"priority" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"blocked" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => ""],
-						"readonly" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"writable" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"forum" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"prv" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"contact-type" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => ""],
-						"hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"archive" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"pending" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => ""],
-						"rating" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => ""],
-						"reason" => ["type" => "text", "comment" => ""],
-						"closeness" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "99", "comment" => ""],
-						"info" => ["type" => "mediumtext", "comment" => ""],
-						"profile-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"bdyear" => ["type" => "varchar(4)", "not null" => "1", "default" => "", "comment" => ""],
-						"bd" => ["type" => "date", "not null" => "1", "default" => "0001-01-01", "comment" => ""],
-						"notify_new_posts" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"fetch_further_information" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"ffi_keyword_blacklist" => ["type" => "text", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"uid_name" => ["uid", "name(190)"],
-						"self_uid" => ["self", "uid"],
-						"alias_uid" => ["alias(32)", "uid"],
-						"pending_uid" => ["pending", "uid"],
-						"blocked_uid" => ["blocked", "uid"],
-						"uid_rel_network_poll" => ["uid", "rel", "network", "poll(64)", "archive"],
-						"uid_network_batch" => ["uid", "network", "batch(64)"],
-						"addr_uid" => ["addr(32)", "uid"],
-						"nurl_uid" => ["nurl(32)", "uid"],
-						"nick_uid" => ["nick(32)", "uid"],
-						"dfrn-id" => ["dfrn-id(64)"],
-						"issued-id" => ["issued-id(64)"],
-						]
-				];
-		$database["conv"] = [
-				"comment" => "private messages",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"recips" => ["type" => "text", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"creator" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"updated" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"subject" => ["type" => "text", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"uid" => ["uid"],
-						]
-				];
-		$database["conversation"] = [
-				"comment" => "Raw data and structure information for messages",
-				"fields" => [
-						"item-uri" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => ""],
-						"reply-to-uri" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"conversation-uri" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"conversation-href" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"protocol" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"source" => ["type" => "mediumtext", "comment" => ""],
-						"received" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["item-uri"],
-						"conversation-uri" => ["conversation-uri"],
-						"received" => ["received"],
-						]
-				];
-		$database["event"] = [
-				"comment" => "Events",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"cid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
-						"uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"edited" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"start" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"finish" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"summary" => ["type" => "text", "comment" => ""],
-						"desc" => ["type" => "text", "comment" => ""],
-						"location" => ["type" => "text", "comment" => ""],
-						"type" => ["type" => "varchar(20)", "not null" => "1", "default" => "", "comment" => ""],
-						"nofinish" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"adjust" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => ""],
-						"ignore" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"allow_cid" => ["type" => "mediumtext", "comment" => ""],
-						"allow_gid" => ["type" => "mediumtext", "comment" => ""],
-						"deny_cid" => ["type" => "mediumtext", "comment" => ""],
-						"deny_gid" => ["type" => "mediumtext", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"uid_start" => ["uid", "start"],
-						]
-				];
-		$database["fcontact"] = [
-				"comment" => "Diaspora compatible contacts - used in the Diaspora implementation",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"request" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"nick" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"addr" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"batch" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"notify" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"poll" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"confirm" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"priority" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
-						"alias" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"pubkey" => ["type" => "text", "comment" => ""],
-						"updated" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"addr" => ["addr(32)"],
-						"url" => ["UNIQUE", "url(190)"],
-						]
-				];
-		$database["fsuggest"] = [
-				"comment" => "friend suggestion stuff",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"cid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
-						"name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"request" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"note" => ["type" => "text", "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						]
-				];
-		$database["gcign"] = [
-				"comment" => "contacts ignored by friend suggestions",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"gcid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["gcontact" => "id"], "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"uid" => ["uid"],
-						"gcid" => ["gcid"],
-						]
-				];
-		$database["gcontact"] = [
-				"comment" => "global contacts",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"nick" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"nurl" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"connect" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"updated" => ["type" => "datetime", "default" => NULL_DATE, "comment" => ""],
-						"last_contact" => ["type" => "datetime", "default" => NULL_DATE, "comment" => ""],
-						"last_failure" => ["type" => "datetime", "default" => NULL_DATE, "comment" => ""],
-						"location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"about" => ["type" => "text", "comment" => ""],
-						"keywords" => ["type" => "text", "comment" => ""],
-						"gender" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
-						"birthday" => ["type" => "varchar(32)", "not null" => "1", "default" => "0001-01-01", "comment" => ""],
-						"community" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"contact-type" => ["type" => "tinyint", "not null" => "1", "default" => "-1", "comment" => ""],
-						"hide" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"nsfw" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
-						"addr" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"notify" => ["type" => "varchar(255)", "comment" => ""],
-						"alias" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"generation" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"server_url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"nurl" => ["UNIQUE", "nurl(190)"],
-						"name" => ["name(64)"],
-						"nick" => ["nick(32)"],
-						"addr" => ["addr(64)"],
-						"hide_network_updated" => ["hide", "network", "updated"],
-						"updated" => ["updated"],
-						]
-				];
-		$database["glink"] = [
-				"comment" => "'friends of friends' linkages derived from poco",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"cid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"gcid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["gcontact" => "id"], "comment" => ""],
-						"zcid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["gcontact" => "id"], "comment" => ""],
-						"updated" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"cid_uid_gcid_zcid" => ["UNIQUE", "cid","uid","gcid","zcid"],
-						"gcid" => ["gcid"],
-						]
-				];
-		$database["group"] = [
-				"comment" => "privacy groups, group info",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"uid" => ["uid"],
-						]
-				];
-		$database["group_member"] = [
-				"comment" => "privacy groups, member info",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"gid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["group" => "id"], "comment" => ""],
-						"contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"contactid" => ["contact-id"],
-						"gid_contactid" => ["UNIQUE", "gid", "contact-id"],
-						]
-				];
-		$database["gserver"] = [
-				"comment" => "Global servers",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"nurl" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"version" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"site_name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"info" => ["type" => "text", "comment" => ""],
-						"register_policy" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => ""],
-						"registered-users" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"poco" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"noscrape" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
-						"platform" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"relay-subscribe" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Has the server subscribed to the relay system"],
-						"relay-scope" => ["type" => "varchar(10)", "not null" => "1", "default" => "", "comment" => "The scope of messages that the server wants to get"],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"last_poco_query" => ["type" => "datetime", "default" => NULL_DATE, "comment" => ""],
-						"last_contact" => ["type" => "datetime", "default" => NULL_DATE, "comment" => ""],
-						"last_failure" => ["type" => "datetime", "default" => NULL_DATE, "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"nurl" => ["UNIQUE", "nurl(190)"],
-						]
-				];
-		$database["gserver-tag"] = [
-				"comment" => "Tags that the server has subscribed",
-				"fields" => [
-						"gserver-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["gserver" => "id"], "primary" => "1", "comment" => "The id of the gserver"],
-						"tag" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "primary" => "1", "comment" => "Tag that the server has subscribed"],
-						],
-				"indexes" => [
-						"PRIMARY" => ["gserver-id", "tag"],
-						"tag" => ["tag"],
-						]
-				];
-		$database["hook"] = [
-				"comment" => "addon hook registry",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"hook" => ["type" => "varbinary(100)", "not null" => "1", "default" => "", "comment" => ""],
-						"file" => ["type" => "varbinary(200)", "not null" => "1", "default" => "", "comment" => ""],
-						"function" => ["type" => "varbinary(200)", "not null" => "1", "default" => "", "comment" => ""],
-						"priority" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"hook_file_function" => ["UNIQUE", "hook", "file", "function"],
-						]
-				];
-		$database["intro"] = [
-				"comment" => "",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"fid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["fcontact" => "id"], "comment" => ""],
-						"contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
-						"knowyou" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"duplex" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"note" => ["type" => "text", "comment" => ""],
-						"hash" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"datetime" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"blocked" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => ""],
-						"ignore" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						]
-				];
-		$database["item"] = [
-				"comment" => "All posts",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "relation" => ["thread" => "iid"]],
-						"guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
-						"type" => ["type" => "varchar(20)", "not null" => "1", "default" => "", "comment" => ""],
-						"wall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"gravity" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"parent" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => ""],
-						"parent-uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"extid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"thr-parent" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"edited" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"commented" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"received" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"changed" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
-						"owner-name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"owner-link" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"owner-avatar" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
-						"author-name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"author-link" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"author-avatar" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"content-warning" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"body" => ["type" => "mediumtext", "comment" => ""],
-						"app" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"verb" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => ""],
-						"object-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => ""],
-						"object" => ["type" => "text", "comment" => ""],
-						"target-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => ""],
-						"target" => ["type" => "text", "comment" => ""],
-						"postopts" => ["type" => "text", "comment" => ""],
-						"plink" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"resource-id" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
-						"event-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["event" => "id"], "comment" => ""],
-						"tag" => ["type" => "mediumtext", "comment" => ""],
-						"attach" => ["type" => "mediumtext", "comment" => ""],
-						"inform" => ["type" => "mediumtext", "comment" => ""],
-						"file" => ["type" => "mediumtext", "comment" => ""],
-						"location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"coord" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"allow_cid" => ["type" => "mediumtext", "comment" => ""],
-						"allow_gid" => ["type" => "mediumtext", "comment" => ""],
-						"deny_cid" => ["type" => "mediumtext", "comment" => ""],
-						"deny_gid" => ["type" => "mediumtext", "comment" => ""],
-						"private" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"pubmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"moderated" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"spam" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"starred" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"bookmark" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"unseen" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => ""],
-						"deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"origin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"forum_mode" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"mention" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
-						"rendered-hash" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
-						"rendered-html" => ["type" => "mediumtext", "comment" => ""],
-						"global" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"guid" => ["guid(191)"],
-						"uri" => ["uri(191)"],
-						"parent" => ["parent"],
-						"parent-uri" => ["parent-uri(191)"],
-						"extid" => ["extid(191)"],
-						"uid_id" => ["uid","id"],
-						"uid_contactid_id" => ["uid","contact-id","id"],
-						"uid_created" => ["uid","created"],
-						"uid_commented" => ["uid","commented"],
-						"uid_unseen_contactid" => ["uid","unseen","contact-id"],
-						"uid_network_received" => ["uid","network","received"],
-						"uid_network_commented" => ["uid","network","commented"],
-						"uid_thrparent" => ["uid","thr-parent(190)"],
-						"uid_parenturi" => ["uid","parent-uri(190)"],
-						"uid_contactid_created" => ["uid","contact-id","created"],
-						"authorid_created" => ["author-id","created"],
-						"ownerid" => ["owner-id"],
-						"uid_uri" => ["uid", "uri(190)"],
-						"resource-id" => ["resource-id"],
-						"contactid_allowcid_allowpid_denycid_denygid" => ["contact-id","allow_cid(10)","allow_gid(10)","deny_cid(10)","deny_gid(10)"], //
-						"uid_type_changed" => ["uid","type","changed"],
-						"contactid_verb" => ["contact-id","verb"],
-						"deleted_changed" => ["deleted","changed"],
-						"uid_wall_changed" => ["uid","wall","changed"],
-						"uid_eventid" => ["uid","event-id"],
-						"uid_authorlink" => ["uid","author-link(190)"],
-						"uid_ownerlink" => ["uid","owner-link(190)"],
-						]
-				];
-		$database["locks"] = [
-				"comment" => "",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"name" => ["type" => "varchar(128)", "not null" => "1", "default" => "", "comment" => ""],
-						"locked" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"pid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						]
-				];
-		$database["mail"] = [
-				"comment" => "private messages",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"from-name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"from-photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"from-url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"contact-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "relation" => ["contact" => "id"], "comment" => ""],
-						"convid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["conv" => "id"], "comment" => ""],
-						"title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"body" => ["type" => "mediumtext", "comment" => ""],
-						"seen" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"reply" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"replied" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"unknown" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"parent-uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"uid_seen" => ["uid", "seen"],
-						"convid" => ["convid"],
-						"uri" => ["uri(64)"],
-						"parent-uri" => ["parent-uri(64)"],
-						"contactid" => ["contact-id(32)"],
-						]
-				];
-		$database["mailacct"] = [
-				"comment" => "Mail account data for fetching mails",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"server" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"port" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"ssltype" => ["type" => "varchar(16)", "not null" => "1", "default" => "", "comment" => ""],
-						"mailbox" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"user" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"pass" => ["type" => "text", "comment" => ""],
-						"reply_to" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"action" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"movetofolder" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"pubmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"last_check" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						]
-				];
-		$database["manage"] = [
-				"comment" => "table of accounts that can manage each other",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"mid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"uid_mid" => ["UNIQUE", "uid","mid"],
-						]
-				];
-		$database["notify"] = [
-				"comment" => "notifications",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"hash" => ["type" => "varchar(64)", "not null" => "1", "default" => "", "comment" => ""],
-						"type" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"date" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"msg" => ["type" => "mediumtext", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"link" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => ""],
-						"parent" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => ""],
-						"seen" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"verb" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => ""],
-						"otype" => ["type" => "varchar(10)", "not null" => "1", "default" => "", "comment" => ""],
-						"name_cache" => ["type" => "tinytext", "comment" => ""],
-						"msg_cache" => ["type" => "mediumtext", "comment" => ""]
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"hash_uid" => ["hash", "uid"],
-						"seen_uid_date" => ["seen", "uid", "date"],
-						"uid_date" => ["uid", "date"],
-						"uid_type_link" => ["uid", "type", "link(190)"],
-						]
-				];
-		$database["notify-threads"] = [
-				"comment" => "",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"notify-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["notify" => "id"], "comment" => ""],
-						"master-parent-item" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => ""],
-						"parent-item" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"receiver-uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						]
-				];
-		$database["oembed"] = [
-				"comment" => "cache for OEmbed queries",
-				"fields" => [
-						"url" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => ""],
-						"maxwidth" => ["type" => "mediumint unsigned", "not null" => "1", "primary" => "1", "comment" => ""],
-						"content" => ["type" => "mediumtext", "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["url", "maxwidth"],
-						"created" => ["created"],
-						]
-				];
-		$database["parsed_url"] = [
-				"comment" => "cache for 'parse_url' queries",
-				"fields" => [
-						"url" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => ""],
-						"guessing" => ["type" => "boolean", "not null" => "1", "default" => "0", "primary" => "1", "comment" => ""],
-						"oembed" => ["type" => "boolean", "not null" => "1", "default" => "0", "primary" => "1", "comment" => ""],
-						"content" => ["type" => "mediumtext", "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["url", "guessing", "oembed"],
-						"created" => ["created"],
-						]
-				];
-		$database["participation"] = [
-				"comment" => "Storage for participation messages from Diaspora",
-				"fields" => [
-						"iid" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "relation" => ["item" => "id"], "comment" => ""],
-						"server" => ["type" => "varchar(60)", "not null" => "1", "primary" => "1", "comment" => ""],
-						"cid" => ["type" => "int unsigned", "not null" => "1", "relation" => ["contact" => "id"], "comment" => ""],
-						"fid" => ["type" => "int unsigned", "not null" => "1", "relation" => ["fcontact" => "id"], "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["iid", "server"]
-						]
-				];
-		$database["pconfig"] = [
-				"comment" => "personal (per user) configuration storage",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"cat" => ["type" => "varbinary(50)", "not null" => "1", "default" => "", "comment" => ""],
-						"k" => ["type" => "varbinary(100)", "not null" => "1", "default" => "", "comment" => ""],
-						"v" => ["type" => "mediumtext", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"uid_cat_k" => ["UNIQUE", "uid", "cat", "k"],
-						]
-				];
-		$database["photo"] = [
-				"comment" => "photo storage",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
-						"guid" => ["type" => "char(16)", "not null" => "1", "default" => "", "comment" => ""],
-						"resource-id" => ["type" => "char(32)", "not null" => "1", "default" => "", "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"edited" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"desc" => ["type" => "text", "comment" => ""],
-						"album" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"filename" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"type" => ["type" => "varchar(30)", "not null" => "1", "default" => "image/jpeg"],
-						"height" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"width" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"datasize" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"data" => ["type" => "mediumblob", "not null" => "1", "comment" => ""],
-						"scale" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"profile" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"allow_cid" => ["type" => "mediumtext", "comment" => ""],
-						"allow_gid" => ["type" => "mediumtext", "comment" => ""],
-						"deny_cid" => ["type" => "mediumtext", "comment" => ""],
-						"deny_gid" => ["type" => "mediumtext", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"contactid" => ["contact-id"],
-						"uid_contactid" => ["uid", "contact-id"],
-						"uid_profile" => ["uid", "profile"],
-						"uid_album_scale_created" => ["uid", "album(32)", "scale", "created"],
-						"uid_album_resource-id_created" => ["uid", "album(32)", "resource-id", "created"],
-						"resource-id" => ["resource-id"],
-						]
-				];
-		$database["poll"] = [
-				"comment" => "Currently unused table for storing poll results",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"q0" => ["type" => "text", "comment" => ""],
-						"q1" => ["type" => "text", "comment" => ""],
-						"q2" => ["type" => "text", "comment" => ""],
-						"q3" => ["type" => "text", "comment" => ""],
-						"q4" => ["type" => "text", "comment" => ""],
-						"q5" => ["type" => "text", "comment" => ""],
-						"q6" => ["type" => "text", "comment" => ""],
-						"q7" => ["type" => "text", "comment" => ""],
-						"q8" => ["type" => "text", "comment" => ""],
-						"q9" => ["type" => "text", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"uid" => ["uid"],
-						]
-				];
-		$database["poll_result"] = [
-				"comment" => "data for polls - currently unused",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"poll_id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["poll" => "id"]],
-						"choice" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"poll_id" => ["poll_id"],
-						]
-				];
-		$database["process"] = [
-				"comment" => "Currently running system processes",
-				"fields" => [
-						"pid" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "comment" => ""],
-						"command" => ["type" => "varbinary(32)", "not null" => "1", "default" => "", "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["pid"],
-						"command" => ["command"],
-						]
-				];
-		$database["profile"] = [
-				"comment" => "user profiles data",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"profile-name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"is-default" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"hide-friends" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"pdesc" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"dob" => ["type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00", "comment" => ""],
-						"address" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"locality" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"region" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"postal-code" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
-						"country-name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"hometown" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"gender" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => ""],
-						"marital" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"with" => ["type" => "text", "comment" => ""],
-						"howlong" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"sexual" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"politic" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"religion" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"pub_keywords" => ["type" => "text", "comment" => ""],
-						"prv_keywords" => ["type" => "text", "comment" => ""],
-						"likes" => ["type" => "text", "comment" => ""],
-						"dislikes" => ["type" => "text", "comment" => ""],
-						"about" => ["type" => "text", "comment" => ""],
-						"summary" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"music" => ["type" => "text", "comment" => ""],
-						"book" => ["type" => "text", "comment" => ""],
-						"tv" => ["type" => "text", "comment" => ""],
-						"film" => ["type" => "text", "comment" => ""],
-						"interest" => ["type" => "text", "comment" => ""],
-						"romance" => ["type" => "text", "comment" => ""],
-						"work" => ["type" => "text", "comment" => ""],
-						"education" => ["type" => "text", "comment" => ""],
-						"contact" => ["type" => "text", "comment" => ""],
-						"homepage" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"xmpp" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"thumb" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"publish" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"net-publish" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"uid_is-default" => ["uid", "is-default"],
-						]
-				];
-		$database["profile_check"] = [
-				"comment" => "DFRN remote auth use",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"cid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
-						"dfrn_id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"sec" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"expire" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						]
-				];
-		$database["push_subscriber"] = [
-				"comment" => "Used for OStatus: Contains feed subscribers",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"callback_url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"topic" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"nickname" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"push" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => "Retrial counter"],
-						"last_update" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date of last successful trial"],
-						"next_try" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Next retrial date"],
-						"renewed" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date of last subscription renewal"],
-						"secret" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"next_try" => ["next_try"],
-						]
-				];
-		$database["queue"] = [
-				"comment" => "Queue for messages that couldn't be delivered",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"cid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => "Message receiver"],
-						"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "Receiver's network"],
-						"guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Unique GUID of the message"],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date, when the message was created"],
-						"last" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Date of last trial"],
-						"next" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Next retrial date"],
-						"retrial" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => "Retrial counter"],
-						"content" => ["type" => "mediumtext", "comment" => ""],
-						"batch" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"last" => ["last"],
-						"next" => ["next"],
-						]
-				];
-		$database["register"] = [
-				"comment" => "registrations requiring admin approval",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"hash" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"password" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"language" => ["type" => "varchar(16)", "not null" => "1", "default" => "", "comment" => ""],
-						"note" => ["type" => "text", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						]
-				];
-		$database["search"] = [
-				"comment" => "",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"term" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"uid" => ["uid"],
-						]
-				];
-		$database["session"] = [
-				"comment" => "web session storage",
-				"fields" => [
-						"id" => ["type" => "bigint unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"sid" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"data" => ["type" => "text", "comment" => ""],
-						"expire" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"sid" => ["sid(64)"],
-						"expire" => ["expire"],
-						]
-				];
-		$database["sign"] = [
-				"comment" => "Diaspora signatures",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => ""],
-						"signed_text" => ["type" => "mediumtext", "comment" => ""],
-						"signature" => ["type" => "text", "comment" => ""],
-						"signer" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"iid" => ["UNIQUE", "iid"],
-						]
-				];
-		$database["term"] = [
-				"comment" => "item taxonomy (categories, tags, etc.) table",
-				"fields" => [
-						"tid" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"oid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["item" => "id"], "comment" => ""],
-						"otype" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"term" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"received" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"global" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"aid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						],
-				"indexes" => [
-						"PRIMARY" => ["tid"],
-						"oid_otype_type_term" => ["oid","otype","type","term(32)"],
-						"uid_otype_type_term_global_created" => ["uid","otype","type","term(32)","global","created"],
-						"uid_otype_type_url" => ["uid","otype","type","url(64)"],
-						"guid" => ["guid(64)"],
-						]
-				];
-		$database["thread"] = [
-				"comment" => "Thread related data",
-				"fields" => [
-						"iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["item" => "id"], "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
-						"owner-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
-						"author-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "relation" => ["contact" => "id"], "comment" => ""],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"edited" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"commented" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"received" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"changed" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"wall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"private" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"pubmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"moderated" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"spam" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"starred" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"ignored" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"bookmark" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"unseen" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => ""],
-						"deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"origin" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"forum_mode" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"mention" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["iid"],
-						"uid_network_commented" => ["uid","network","commented"],
-						"uid_network_created" => ["uid","network","created"],
-						"uid_contactid_commented" => ["uid","contact-id","commented"],
-						"uid_contactid_created" => ["uid","contact-id","created"],
-						"contactid" => ["contact-id"],
-						"ownerid" => ["owner-id"],
-						"authorid" => ["author-id"],
-						"uid_created" => ["uid","created"],
-						"uid_commented" => ["uid","commented"],
-						"uid_wall_created" => ["uid","wall","created"],
-						"private_wall_origin_commented" => ["private","wall","origin","commented"],
-						]
-				];
-		$database["tokens"] = [
-				"comment" => "OAuth usage",
-				"fields" => [
-						"id" => ["type" => "varchar(40)", "not null" => "1", "primary" => "1", "comment" => ""],
-						"secret" => ["type" => "text", "comment" => ""],
-						"client_id" => ["type" => "varchar(20)", "not null" => "1", "default" => "", "relation" => ["clients" => "client_id"]],
-						"expires" => ["type" => "int", "not null" => "1", "default" => "0", "comment" => ""],
-						"scope" => ["type" => "varchar(200)", "not null" => "1", "default" => "", "comment" => ""],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						]
-				];
-		$database["user"] = [
-				"comment" => "The local users",
-				"fields" => [
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"parent-uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "The parent user that has full control about this user"],
-						"guid" => ["type" => "varchar(64)", "not null" => "1", "default" => "", "comment" => ""],
-						"username" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"password" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"legacy_password" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Is the password hash double-hashed?"],
-						"nickname" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"email" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"openid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"timezone" => ["type" => "varchar(128)", "not null" => "1", "default" => "", "comment" => ""],
-						"language" => ["type" => "varchar(32)", "not null" => "1", "default" => "en", "comment" => ""],
-						"register_date" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"login_date" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"default-location" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"allow_location" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"theme" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-						"pubkey" => ["type" => "text", "comment" => ""],
-						"prvkey" => ["type" => "text", "comment" => ""],
-						"spubkey" => ["type" => "text", "comment" => ""],
-						"sprvkey" => ["type" => "text", "comment" => ""],
-						"verified" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"blocked" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"blockwall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"hidewall" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"blocktags" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"unkmail" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"cntunkmail" => ["type" => "int unsigned", "not null" => "1", "default" => "10", "comment" => ""],
-						"notify-flags" => ["type" => "smallint unsigned", "not null" => "1", "default" => "65535", "comment" => ""],
-						"page-flags" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"account-type" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"prvnets" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"pwdreset" => ["type" => "varchar(255)", "comment" => "Password reset request token"],
-						"pwdreset_time" => ["type" => "datetime", "comment" => "Timestamp of the last password reset request"],
-						"maxreq" => ["type" => "int unsigned", "not null" => "1", "default" => "10", "comment" => ""],
-						"expire" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"account_removed" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"account_expired" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-						"account_expires_on" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"expire_notification_sent" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => ""],
-						"def_gid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-						"allow_cid" => ["type" => "mediumtext", "comment" => ""],
-						"allow_gid" => ["type" => "mediumtext", "comment" => ""],
-						"deny_cid" => ["type" => "mediumtext", "comment" => ""],
-						"deny_gid" => ["type" => "mediumtext", "comment" => ""],
-						"openidserver" => ["type" => "text", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["uid"],
-						"nickname" => ["nickname(32)"],
-						]
-				];
-		$database["userd"] = [
-				"comment" => "Deleted usernames",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""],
-						"username" => ["type" => "varchar(255)", "not null" => "1", "comment" => ""],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"username" => ["username(32)"],
-						]
-				];
-		$database["user-item"] = [
-				"comment" => "User specific item data",
-				"fields" => [
-						"iid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["item" => "id"], "comment" => "Item id"],
-						"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => ["user" => "uid"], "comment" => "User id"],
-						"hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Marker to hide an item from the user"],
-						],
-				"indexes" => [
-						"PRIMARY" => ["uid", "iid"],
-						]
-				];
-		$database["workerqueue"] = [
-				"comment" => "Background tasks queue entries",
-				"fields" => [
-						"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "Auto incremented worker task id"],
-						"parameter" => ["type" => "mediumblob", "comment" => "Task command"],
-						"priority" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "Task priority"],
-						"created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Creation date"],
-						"pid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "comment" => "Process id of the worker"],
-						"executed" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "Execution date"],
-						"done" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Marked when the task was done, will be deleted later"],
-						],
-				"indexes" => [
-						"PRIMARY" => ["id"],
-						"pid" => ["pid"],
-						"parameter" => ["parameter(64)"],
-						"priority_created" => ["priority", "created"],
-						"done_executed" => ["done", "executed"],
-						]
-				];
+		$filename = $a->get_basepath() . '/config/dbstructure.json';
 
-		\Friendica\Core\Addon::callHooks('dbstructure_definition', $database);
+		if (!is_readable($filename)) {
+			throw new Exception('Missing database structure config file config/dbstructure.json');
+		}
+
+		$json = file_get_contents($filename);
+
+		$database = json_decode($json, true);
+
+		if (!$database) {
+			throw new Exception('Corrupted database structure config file config/dbstructure.json');
+		}
+
+		Addon::callHooks('dbstructure_definition', $database);
 
 		return $database;
 	}
diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 13da43779..dbadcbbb1 100644
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -5,9 +5,12 @@
 namespace Friendica\Database;
 
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
 use Friendica\Model\Contact;
-use dba;
+use Friendica\Model\Item;
+use Friendica\Model\ItemURI;
+use Friendica\Model\PermissionSet;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 
@@ -22,14 +25,19 @@ class PostUpdate
 	public static function update()
 	{
 		if (!self::update1194()) {
-			return;
-		}
-		if (!self::update1198()) {
-			return;
+			return false;
 		}
 		if (!self::update1206()) {
-			return;
+			return false;
 		}
+		if (!self::update1279()) {
+			return false;
+		}
+		if (!self::update1281()) {
+			return false;
+		}
+
+		return true;
 	}
 
 	/**
@@ -67,13 +75,11 @@ class PostUpdate
 				AND `item`.`visible` AND NOT `item`.`private`
 				AND NOT `item`.`deleted` AND NOT `item`.`moderated`
 				AND `item`.`network` IN ('%s', '%s', '%s', '')
-				AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = ''
-				AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
 				AND NOT `item`.`global`";
 
 		$r = q($query1.$query2.$query3."  ORDER BY `item`.`id` LIMIT 1",
 			intval($start_id), intval($end_id),
-			dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
+			DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::OSTATUS));
 		if (!$r) {
 			Config::set("system", "post_update_version", 1194);
 			logger("Update is done", LOGGER_DEBUG);
@@ -87,7 +93,7 @@ class PostUpdate
 
 		$r = q($query1.$query2.$query3."  ORDER BY `item`.`id` LIMIT 1000,1",
 			intval($start_id), intval($end_id),
-			dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
+			DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::OSTATUS));
 		if ($r) {
 			$pos_id = $r[0]["id"];
 		} else {
@@ -97,93 +103,11 @@ class PostUpdate
 
 		q("UPDATE `item` ".$query2." SET `item`.`global` = 1 ".$query3,
 			intval($start_id), intval($pos_id),
-			dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
+			DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA), DBA::escape(Protocol::OSTATUS));
 
 		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 (DBM::is_result($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
 	 *
@@ -204,12 +128,12 @@ class PostUpdate
 			FROM `user`
 			INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`");
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return false;
 		}
 		foreach ($r as $user) {
 			if (!empty($user["lastitem_date"]) && ($user["lastitem_date"] > $user["last-item"])) {
-				dba::update('contact', ['last-item' => $user['lastitem_date']], ['id' => $user['id']]);
+				DBA::update('contact', ['last-item' => $user['lastitem_date']], ['id' => $user['id']]);
 			}
 		}
 
@@ -217,4 +141,237 @@ class PostUpdate
 		logger("Done", LOGGER_DEBUG);
 		return true;
 	}
+
+	/**
+	 * @brief update the item related tables
+	 *
+	 * @return bool "true" when the job is done
+	 */
+	private static function update1279()
+	{
+		// Was the script completed?
+		if (Config::get("system", "post_update_version") >= 1279) {
+			return true;
+		}
+
+		$id = Config::get("system", "post_update_version_1279_id", 0);
+
+		logger("Start from item " . $id, LOGGER_DEBUG);
+
+		$fields = array_merge(Item::MIXED_CONTENT_FIELDLIST, ['network', 'author-id', 'owner-id', 'tag', 'file',
+			'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link', 'id',
+			'uid', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'psid', 'post-type', 'bookmark', 'type',
+			'inform', 'postopts', 'icid']);
+
+		$start_id = $id;
+		$rows = 0;
+		$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'];
+
+			if (empty($item['author-id'])) {
+				$default = ['url' => $item['author-link'], 'name' => $item['author-name'],
+					'photo' => $item['author-avatar'], 'network' => $item['network']];
+
+				$item['author-id'] = Contact::getIdForURL($item["author-link"], 0, false, $default);
+			}
+
+			if (empty($item['owner-id'])) {
+				$default = ['url' => $item['owner-link'], 'name' => $item['owner-name'],
+					'photo' => $item['owner-avatar'], 'network' => $item['network']];
+
+				$item['owner-id'] = Contact::getIdForURL($item["owner-link"], 0, false, $default);
+			}
+
+			if (empty($item['psid'])) {
+				$item['psid'] = PermissionSet::fetchIDForPost($item);
+			} else {
+				$item['allow_cid'] = null;
+				$item['allow_gid'] = null;
+				$item['deny_cid'] = null;
+				$item['deny_gid'] = null;
+			}
+
+			if ($item['post-type'] == 0) {
+				if (!empty($item['type']) && ($item['type'] == 'note')) {
+					$item['post-type'] = Item::PT_PERSONAL_NOTE;
+				} elseif (!empty($item['type']) && ($item['type'] == 'photo')) {
+					$item['post-type'] = Item::PT_IMAGE;
+				} elseif (!empty($item['bookmark']) && $item['bookmark']) {
+					$item['post-type'] = Item::PT_PAGE;
+				}
+			}
+
+			self::createLanguage($item);
+
+			if (!empty($item['icid']) && !empty($item['language'])) {
+				DBA::update('item-content', ['language' => $item['language']], ['id' => $item['icid']]);
+			}
+			unset($item['language']);
+
+			Item::update($item, ['id' => $id]);
+
+			++$rows;
+		}
+		DBA::close($items);
+
+		Config::set("system", "post_update_version_1279_id", $id);
+
+		logger("Processed rows: " . $rows . " - last processed item:  " . $id, LOGGER_DEBUG);
+
+		if ($start_id == $id) {
+			// Set all deprecated fields to "null" if they contain an empty string
+			$nullfields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'postopts', 'inform', 'type',
+				'bookmark', 'file', 'location', 'coord', 'tag', 'plink', 'title', 'content-warning',
+				'body', 'app', 'verb', 'object-type', 'object', 'target-type', 'target',
+				'author-name', 'author-link', 'author-avatar', 'owner-name', 'owner-link', 'owner-avatar',
+				'rendered-hash', 'rendered-html'];
+			foreach ($nullfields as $field) {
+				$fields = [$field => null];
+				$condition = [$field => ''];
+				logger("Setting '" . $field . "' to null if empty.", LOGGER_DEBUG);
+				// Important: This has to be a "DBA::update", not a "Item::update"
+				DBA::update('item', $fields, $condition);
+			}
+
+			Config::set("system", "post_update_version", 1279);
+			logger("Done", LOGGER_DEBUG);
+			return true;
+		}
+
+		return false;
+	}
+
+	private static function createLanguage(&$item)
+	{
+		if (empty($item['postopts'])) {
+			return;
+		}
+
+		$opts = explode(',', $item['postopts']);
+
+		$postopts = [];
+
+		foreach ($opts as $opt) {
+			if (strstr($opt, 'lang=')) {
+				$language = substr($opt, 5);
+			} else {
+				$postopts[] = $opt;
+			}
+		}
+
+		if (empty($language)) {
+			return;
+		}
+
+		if (!empty($postopts)) {
+			$item['postopts'] = implode(',', $postopts);
+		} else {
+			$item['postopts'] = null;
+		}
+
+		$lang_pairs = explode(':', $language);
+
+		$lang_arr = [];
+
+		foreach ($lang_pairs as $pair) {
+			$lang_pair_arr = explode(';', $pair);
+			if (count($lang_pair_arr) == 2) {
+				$lang_arr[$lang_pair_arr[0]] = $lang_pair_arr[1];
+			}
+		}
+
+		$item['language'] = json_encode($lang_arr);
+	}
+
+	/**
+	 * @brief update item-uri data. Prerequisite for the next item structure update.
+	 *
+	 * @return bool "true" when the job is done
+	 */
+	private static function update1281()
+	{
+		// Was the script completed?
+		if (Config::get("system", "post_update_version") >= 1281) {
+			return true;
+		}
+
+		$id = Config::get("system", "post_update_version_1281_id", 0);
+
+		logger("Start from item " . $id, LOGGER_DEBUG);
+
+		$fields = ['id', 'guid', 'uri', 'uri-id', 'parent-uri', 'parent-uri-id', 'thr-parent', 'thr-parent-id'];
+
+		$start_id = $id;
+		$rows = 0;
+		$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'];
+
+			if (empty($item['uri'])) {
+				// Should not happen
+				continue;
+			} elseif (empty($item['uri-id'])) {
+				$item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
+			}
+
+			if (empty($item['parent-uri'])) {
+				$item['parent-uri-id'] = $item['uri-id'];
+			} elseif (empty($item['parent-uri-id'])) {
+				$item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']);
+			}
+
+			// Very old items don't have this field
+			if (empty($item['thr-parent'])) {
+				$item['thr-parent-id'] = $item['parent-uri-id'];
+			} elseif (empty($item['thr-parent-id'])) {
+				$item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']);
+			}
+
+			unset($item['id']);
+			unset($item['guid']);
+			unset($item['uri']);
+			unset($item['parent-uri']);
+			unset($item['thr-parent']);
+
+			DBA::update('item', $item, ['id' => $id]);
+
+			++$rows;
+		}
+		DBA::close($items);
+
+		Config::set("system", "post_update_version_1281_id", $id);
+
+		logger("Processed rows: " . $rows . " - last processed item:  " . $id, LOGGER_DEBUG);
+
+		if ($start_id == $id) {
+			logger("Updating item-uri in item-activity", LOGGER_DEBUG);
+			DBA::e("UPDATE `item-activity` INNER JOIN `item-uri` ON `item-uri`.`uri` = `item-activity`.`uri` SET `item-activity`.`uri-id` = `item-uri`.`id` WHERE `item-activity`.`uri-id` IS NULL");
+
+			logger("Updating item-uri in item-content", LOGGER_DEBUG);
+			DBA::e("UPDATE `item-content` INNER JOIN `item-uri` ON `item-uri`.`uri` = `item-content`.`uri` SET `item-content`.`uri-id` = `item-uri`.`id` WHERE `item-content`.`uri-id` IS NULL");
+
+			Config::set("system", "post_update_version", 1281);
+			logger("Done", LOGGER_DEBUG);
+			return true;
+		}
+
+		return false;
+	}
 }
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index bbfb39923..1bbc0228a 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -9,21 +9,20 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
-use Friendica\Model\Photo;
+use Friendica\Database\DBA;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
-use Friendica\Protocol\DFRN;
+use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Object\Image;
-use dba;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -34,6 +33,272 @@ require_once 'include/text.php';
  */
 class Contact extends BaseObject
 {
+	/**
+	 * @name page/profile types
+	 *
+	 * PAGE_NORMAL is a typical personal profile account
+	 * PAGE_SOAPBOX automatically approves all friend requests as Contact::SHARING, (readonly)
+	 * PAGE_COMMUNITY automatically approves all friend requests as Contact::SHARING, but with
+	 *      write access to wall and comments (no email and not included in page owner's ACL lists)
+	 * PAGE_FREELOVE automatically approves all friend requests as full friends (Contact::FRIEND).
+	 *
+	 * @{
+	 */
+	const PAGE_NORMAL    = 0;
+	const PAGE_SOAPBOX   = 1;
+	const PAGE_COMMUNITY = 2;
+	const PAGE_FREELOVE  = 3;
+	const PAGE_BLOG      = 4;
+	const PAGE_PRVGROUP  = 5;
+	/**
+	 * @}
+	 */
+
+	/**
+	 * @name account types
+	 *
+	 * ACCOUNT_TYPE_PERSON - the account belongs to a person
+	 *	Associated page types: PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE
+	 *
+	 * ACCOUNT_TYPE_ORGANISATION - the account belongs to an organisation
+	 *	Associated page type: PAGE_SOAPBOX
+	 *
+	 * ACCOUNT_TYPE_NEWS - the account is a news reflector
+	 *	Associated page type: PAGE_SOAPBOX
+	 *
+	 * ACCOUNT_TYPE_COMMUNITY - the account is community forum
+	 *	Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
+	 *
+	 * ACCOUNT_TYPE_RELAY - the account is a relay
+	 *      This will only be assigned to contacts, not to user accounts
+	 * @{
+	 */
+	const ACCOUNT_TYPE_PERSON =       0;
+	const ACCOUNT_TYPE_ORGANISATION = 1;
+	const ACCOUNT_TYPE_NEWS =         2;
+	const ACCOUNT_TYPE_COMMUNITY =    3;
+	const ACCOUNT_TYPE_RELAY =        4;
+	/**
+	 * @}
+	 */
+
+	/**
+	 * @name Contact_is
+	 *
+	 * Relationship types
+	 * @{
+	 */
+	const FOLLOWER = 1;
+	const SHARING  = 2;
+	const FRIEND   = 3;
+	/**
+	 * @}
+	 */
+
+	/**
+	 * @brief Returns the contact id for the user and the public contact id for a given contact id
+	 *
+	 * @param int $cid Either public contact id or user's contact id
+	 * @param int $uid User ID
+	 *
+	 * @return array with public and user's contact id
+	 */
+	private static function getPublicAndUserContacID($cid, $uid)
+	{
+		if (empty($uid) || empty($cid)) {
+			return [];
+		}
+
+		$contact = DBA::selectFirst('contact', ['id', 'uid', 'url'], ['id' => $cid]);
+		if (!DBA::isResult($contact)) {
+			return [];
+		}
+
+		// We quit when the user id don't match the user id of the provided contact
+		if (($contact['uid'] != $uid) && ($contact['uid'] != 0)) {
+			return [];
+		}
+
+		if ($contact['uid'] != 0) {
+			$pcid = Contact::getIdForURL($contact['url'], 0, true, ['url' => $contact['url']]);
+			if (empty($pcid)) {
+				return [];
+			}
+			$ucid = $contact['id'];
+		} else {
+			$pcid = $contact['id'];
+			$ucid = Contact::getIdForURL($contact['url'], $uid, true);
+		}
+
+		return ['public' => $pcid, 'user' => $ucid];
+	}
+
+	/**
+	 * @brief Block contact id for user id
+	 *
+	 * @param int     $cid     Either public contact id or user's contact id
+	 * @param int     $uid     User ID
+	 * @param boolean $blocked Is the contact blocked or unblocked?
+	 */
+	public static function setBlockedForUser($cid, $uid, $blocked)
+	{
+		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		if (empty($cdata)) {
+			return;
+		}
+
+		if ($cdata['user'] != 0) {
+			DBA::update('contact', ['blocked' => $blocked], ['id' => $cdata['user'], 'pending' => false]);
+		}
+
+		DBA::update('user-contact', ['blocked' => $blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
+	}
+
+	/**
+	 * @brief Returns "block" state for contact id and user id
+	 *
+	 * @param int $cid Either public contact id or user's contact id
+	 * @param int $uid User ID
+	 *
+	 * @return boolean is the contact id blocked for the given user?
+	 */
+	public static function isBlockedByUser($cid, $uid)
+	{
+		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		if (empty($cdata)) {
+			return;
+		}
+
+		$public_blocked = false;
+
+		if (!empty($cdata['public'])) {
+			$public_contact = DBA::selectFirst('user-contact', ['blocked'], ['cid' => $cdata['public'], 'uid' => $uid]);
+			if (DBA::isResult($public_contact)) {
+				$public_blocked = $public_contact['blocked'];
+			}
+		}
+
+		$user_blocked = $public_blocked;
+
+		if (!empty($cdata['user'])) {
+			$user_contact = DBA::selectFirst('contact', ['blocked'], ['id' => $cdata['user'], 'pending' => false]);
+			if (DBA::isResult($user_contact)) {
+				$user_blocked = $user_contact['blocked'];
+			}
+		}
+
+		if ($user_blocked != $public_blocked) {
+			DBA::update('user-contact', ['blocked' => $user_blocked], ['cid' => $cdata['public'], 'uid' => $uid], true);
+		}
+
+		return $user_blocked;
+	}
+
+	/**
+	 * @brief Ignore contact id for user id
+	 *
+	 * @param int     $cid     Either public contact id or user's contact id
+	 * @param int     $uid     User ID
+	 * @param boolean $ignored Is the contact ignored or unignored?
+	 */
+	public static function setIgnoredForUser($cid, $uid, $ignored)
+	{
+		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		if (empty($cdata)) {
+			return;
+		}
+
+		if ($cdata['user'] != 0) {
+			DBA::update('contact', ['readonly' => $ignored], ['id' => $cdata['user'], 'pending' => false]);
+		}
+
+		DBA::update('user-contact', ['ignored' => $ignored], ['cid' => $cdata['public'], 'uid' => $uid], true);
+	}
+
+	/**
+	 * @brief Returns "ignore" state for contact id and user id
+	 *
+	 * @param int $cid Either public contact id or user's contact id
+	 * @param int $uid User ID
+	 *
+	 * @return boolean is the contact id ignored for the given user?
+	 */
+	public static function isIgnoredByUser($cid, $uid)
+	{
+		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		if (empty($cdata)) {
+			return;
+		}
+
+		$public_ignored = false;
+
+		if (!empty($cdata['public'])) {
+			$public_contact = DBA::selectFirst('user-contact', ['ignored'], ['cid' => $cdata['public'], 'uid' => $uid]);
+			if (DBA::isResult($public_contact)) {
+				$public_ignored = $public_contact['ignored'];
+			}
+		}
+
+		$user_ignored = $public_ignored;
+
+		if (!empty($cdata['user'])) {
+			$user_contact = DBA::selectFirst('contact', ['readonly'], ['id' => $cdata['user'], 'pending' => false]);
+			if (DBA::isResult($user_contact)) {
+				$user_ignored = $user_contact['readonly'];
+			}
+		}
+
+		if ($user_ignored != $public_ignored) {
+			DBA::update('user-contact', ['ignored' => $user_ignored], ['cid' => $cdata['public'], 'uid' => $uid], true);
+		}
+
+		return $user_ignored;
+	}
+
+	/**
+	 * @brief Set "collapsed" for contact id and user id
+	 *
+	 * @param int     $cid       Either public contact id or user's contact id
+	 * @param int     $uid       User ID
+	 * @param boolean $collapsed are the contact's posts collapsed or uncollapsed?
+	 */
+	public static function setCollapsedForUser($cid, $uid, $collapsed)
+	{
+		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		if (empty($cdata)) {
+			return;
+		}
+
+		DBA::update('user-contact', ['collapsed' => $collapsed], ['cid' => $cdata['public'], 'uid' => $uid], true);
+	}
+
+	/**
+	 * @brief Returns "collapsed" state for contact id and user id
+	 *
+	 * @param int $cid Either public contact id or user's contact id
+	 * @param int $uid User ID
+	 *
+	 * @return boolean is the contact id blocked for the given user?
+	 */
+	public static function isCollapsedByUser($cid, $uid)
+	{
+		$cdata = self::getPublicAndUserContacID($cid, $uid);
+		if (empty($cdata)) {
+			return;
+		}
+
+		$collapsed = false;
+
+		if (!empty($cdata['public'])) {
+			$public_contact = DBA::selectFirst('user-contact', ['collapsed'], ['cid' => $cdata['public'], 'uid' => $uid]);
+			if (DBA::isResult($public_contact)) {
+				$collapsed = $public_contact['collapsed'];
+			}
+		}
+
+		return $collapsed;
+	}
+
 	/**
 	 * @brief Returns a list of contacts belonging in a group
 	 *
@@ -43,8 +308,9 @@ class Contact extends BaseObject
 	public static function getByGroupId($gid)
 	{
 		$return = [];
+
 		if (intval($gid)) {
-			$stmt = dba::p('SELECT `group_member`.`contact-id`, `contact`.*
+			$stmt = DBA::p('SELECT `group_member`.`contact-id`, `contact`.*
 				FROM `contact`
 				INNER JOIN `group_member`
 					ON `contact`.`id` = `group_member`.`contact-id`
@@ -57,8 +323,9 @@ class Contact extends BaseObject
 				$gid,
 				local_user()
 			);
-			if (DBM::is_result($stmt)) {
-				$return = dba::inArray($stmt);
+
+			if (DBA::isResult($stmt)) {
+				$return = DBA::toArray($stmt);
 			}
 		}
 
@@ -75,7 +342,7 @@ class Contact extends BaseObject
 	{
 		$return = 0;
 		if (intval($gid)) {
-			$contacts = dba::fetch_first('SELECT COUNT(*) AS `count`
+			$contacts = DBA::fetchFirst('SELECT COUNT(*) AS `count`
 				FROM `contact`
 				INNER JOIN `group_member`
 					ON `contact`.`id` = `group_member`.`contact-id`
@@ -85,7 +352,7 @@ class Contact extends BaseObject
 				AND `contact`.`notify` != ""',
 				$gid,
 				local_user(),
-				NETWORK_OSTATUS
+				Protocol::OSTATUS
 			);
 			$return = $contacts['count'];
 		}
@@ -102,16 +369,16 @@ class Contact extends BaseObject
 	public static function createSelfFromUserId($uid)
 	{
 		// Only create the entry if it doesn't exist yet
-		if (dba::exists('contact', ['uid' => $uid, 'self' => true])) {
+		if (DBA::exists('contact', ['uid' => $uid, 'self' => true])) {
 			return true;
 		}
 
-		$user = dba::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]);
-		if (!DBM::is_result($user)) {
+		$user = DBA::selectFirst('user', ['uid', 'username', 'nickname'], ['uid' => $uid]);
+		if (!DBA::isResult($user)) {
 			return false;
 		}
 
-		$return = dba::insert('contact', [
+		$return = DBA::insert('contact', [
 			'uid'         => $user['uid'],
 			'created'     => DateTimeFormat::utcNow(),
 			'self'        => 1,
@@ -149,21 +416,21 @@ class Contact extends BaseObject
 	{
 		$fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar',
 			'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'nurl'];
-		$self = dba::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
-		if (!DBM::is_result($self)) {
+		$self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
+		if (!DBA::isResult($self)) {
 			return;
 		}
 
 		$fields = ['nickname', 'page-flags', 'account-type'];
-		$user = dba::selectFirst('user', $fields, ['uid' => $uid]);
-		if (!DBM::is_result($user)) {
+		$user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
+		if (!DBA::isResult($user)) {
 			return;
 		}
 
 		$fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region',
 			'country-name', 'gender', 'pub_keywords', 'xmpp'];
-		$profile = dba::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
-		if (!DBM::is_result($profile)) {
+		$profile = DBA::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+		if (!DBA::isResult($profile)) {
 			return;
 		}
 
@@ -173,8 +440,8 @@ class Contact extends BaseObject
 			'gender' => $profile['gender'], 'avatar' => $profile['photo'],
 			'contact-type' => $user['account-type'], 'xmpp' => $profile['xmpp']];
 
-		$avatar = dba::selectFirst('photo', ['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
-		if (DBM::is_result($avatar)) {
+		$avatar = DBA::selectFirst('photo', ['resource-id', 'type'], ['uid' => $uid, 'profile' => true]);
+		if (DBA::isResult($avatar)) {
 			if ($update_avatar) {
 				$fields['avatar-date'] = DateTimeFormat::utcNow();
 			}
@@ -203,8 +470,8 @@ class Contact extends BaseObject
 			$fields['micro'] = System::baseUrl() . '/images/person-48.jpg';
 		}
 
-		$fields['forum'] = $user['page-flags'] == PAGE_COMMUNITY;
-		$fields['prv'] = $user['page-flags'] == PAGE_PRVGROUP;
+		$fields['forum'] = $user['page-flags'] == self::PAGE_COMMUNITY;
+		$fields['prv'] = $user['page-flags'] == self::PAGE_PRVGROUP;
 
 		// it seems as if ported accounts can have wrong values, so we make sure that now everything is fine.
 		$fields['url'] = System::baseUrl() . '/profile/' . $user['nickname'];
@@ -219,22 +486,22 @@ class Contact extends BaseObject
 		$update = false;
 
 		foreach ($fields as $field => $content) {
-			if ($self[$field] != $content) {
+			if (isset($self[$field]) && $self[$field] != $content) {
 				$update = true;
 			}
 		}
 
 		if ($update) {
 			$fields['name-date'] = DateTimeFormat::utcNow();
-			dba::update('contact', $fields, ['id' => $self['id']]);
+			DBA::update('contact', $fields, ['id' => $self['id']]);
 
 			// Update the public contact as well
-			dba::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
+			DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
 
 			// Update the profile
 			$fields = ['photo' => System::baseUrl() . '/photo/profile/' .$uid . '.jpg',
 				'thumb' => System::baseUrl() . '/photo/avatar/' . $uid .'.jpg'];
-			dba::update('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+			DBA::update('profile', $fields, ['uid' => $uid, 'is-default' => true]);
 		}
 	}
 
@@ -247,43 +514,46 @@ class Contact extends BaseObject
 	public static function remove($id)
 	{
 		// We want just to make sure that we don't delete our "self" contact
-		$contact = dba::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]);
-		if (!DBM::is_result($contact) || !intval($contact['uid'])) {
+		$contact = DBA::selectFirst('contact', ['uid'], ['id' => $id, 'self' => false]);
+		if (!DBA::isResult($contact) || !intval($contact['uid'])) {
 			return;
 		}
 
-		$archive = PConfig::get($contact['uid'], 'system', 'archive_removed_contacts');
-		if ($archive) {
-			dba::update('contact', ['archive' => true, 'network' => 'none', 'writable' => false], ['id' => $id]);
-			return;
-		}
+		// Archive the contact
+		DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM], ['id' => $id]);
 
-		dba::delete('contact', ['id' => $id]);
-
-		// Delete the rest in the background
+		// Delete it in the background
 		Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
 	}
 
 	/**
 	 * @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'], [NETWORK_OSTATUS, NETWORK_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";
 			$item['follow'] = $contact["url"];
+			$item['body'] = '';
+			$item['title'] = '';
+			$item['guid'] = '';
+			$item['tag'] = '';
+			$item['attach'] = '';
 			$slap = OStatus::salmon($item, $user);
 
 			if (!empty($contact['notify'])) {
 				Salmon::slapper($user, $contact['notify'], $slap);
 			}
-		} elseif ($contact['network'] == NETWORK_DIASPORA) {
+		} elseif ($contact['network'] == Protocol::DIASPORA) {
 			Diaspora::sendUnshare($user, $contact);
 		}
 	}
@@ -302,17 +572,24 @@ class Contact extends BaseObject
 	 */
 	public static function markForArchival(array $contact)
 	{
+		if (!isset($contact['url']) && !empty($contact['id'])) {
+			$fields = ['id', 'url', 'archive', 'self', 'term-date'];
+			$contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+			if (!DBA::isResult($contact)) {
+				return;
+			}
+		} elseif (!isset($contact['url'])) {
+			logger('Empty contact: ' . json_encode($contact) . ' - ' . System::callstack(20), LOGGER_DEBUG);
+		}
+
 		// Contact already archived or "self" contact? => nothing to do
 		if ($contact['archive'] || $contact['self']) {
 			return;
 		}
 
 		if ($contact['term-date'] <= NULL_DATE) {
-			dba::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
-
-			if ($contact['url'] != '') {
-				dba::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
-			}
+			DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+			DBA::update('contact', ['term-date' => DateTimeFormat::utcNow()], ['`nurl` = ? AND `term-date` <= ? AND NOT `self`', normalise_link($contact['url']), NULL_DATE]);
 		} else {
 			/* @todo
 			 * We really should send a notification to the owner after 2-3 weeks
@@ -329,11 +606,8 @@ class Contact extends BaseObject
 				 * delete, though if the owner tries to unarchive them we'll start
 				 * the whole process over again.
 				 */
-				dba::update('contact', ['archive' => 1], ['id' => $contact['id']]);
-
-				if ($contact['url'] != '') {
-					dba::update('contact', ['archive' => 1], ['nurl' => normalise_link($contact['url']), 'self' => false]);
-				}
+				DBA::update('contact', ['archive' => 1], ['id' => $contact['id']]);
+				DBA::update('contact', ['archive' => 1], ['nurl' => normalise_link($contact['url']), 'self' => false]);
 			}
 		}
 	}
@@ -349,24 +623,29 @@ class Contact extends BaseObject
 	public static function unmarkForArchival(array $contact)
 	{
 		$condition = ['`id` = ? AND (`term-date` > ? OR `archive`)', $contact['id'], NULL_DATE];
-		$exists = dba::exists('contact', $condition);
+		$exists = DBA::exists('contact', $condition);
 
 		// We don't need to update, we never marked this contact for archival
 		if (!$exists) {
 			return;
 		}
 
-		// It's a miracle. Our dead contact has inexplicably come back to life.
-		$fields = ['term-date' => NULL_DATE, 'archive' => false];
-		dba::update('contact', $fields, ['id' => $contact['id']]);
-
-		if (!empty($contact['url'])) {
-			dba::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
+		if (!isset($contact['url']) && !empty($contact['id'])) {
+			$fields = ['id', 'url', 'batch'];
+			$contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+			if (!DBA::isResult($contact)) {
+				return;
+			}
 		}
 
+		// It's a miracle. Our dead contact has inexplicably come back to life.
+		$fields = ['term-date' => NULL_DATE, 'archive' => false];
+		DBA::update('contact', $fields, ['id' => $contact['id']]);
+		DBA::update('contact', $fields, ['nurl' => normalise_link($contact['url'])]);
+
 		if (!empty($contact['batch'])) {
-			$condition = ['batch' => $contact['batch'], 'contact-type' => ACCOUNT_TYPE_RELAY];
-			dba::update('contact', $fields, $condition);
+			$condition = ['batch' => $contact['batch'], 'contact-type' => self::ACCOUNT_TYPE_RELAY];
+			DBA::update('contact', $fields, $condition);
 		}
 	}
 
@@ -401,48 +680,48 @@ class Contact extends BaseObject
 		$ssl_url = str_replace('http://', 'https://', $url);
 
 		// Fetch contact data from the contact table for the given user
-		$s = dba::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+		$s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
 			`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
 		FROM `contact` WHERE `nurl` = ? AND `uid` = ?", normalise_link($url), $uid);
-		$r = dba::inArray($s);
+		$r = DBA::toArray($s);
 
 		// Fetch contact data from the contact table for the given user, checking with the alias
-		if (!DBM::is_result($r)) {
-			$s = dba::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+		if (!DBA::isResult($r)) {
+			$s = DBA::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
 				`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
 			FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ?", normalise_link($url), $url, $ssl_url, $uid);
-			$r = dba::inArray($s);
+			$r = DBA::toArray($s);
 		}
 
 		// Fetch the data from the contact table with "uid=0" (which is filled automatically)
-		if (!DBM::is_result($r)) {
-			$s = dba::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+		if (!DBA::isResult($r)) {
+			$s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
 			`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
 			FROM `contact` WHERE `nurl` = ? AND `uid` = 0", normalise_link($url));
-			$r = dba::inArray($s);
+			$r = DBA::toArray($s);
 		}
 
 		// Fetch the data from the contact table with "uid=0" (which is filled automatically) - checked with the alias
-		if (!DBM::is_result($r)) {
-			$s = dba::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+		if (!DBA::isResult($r)) {
+			$s = DBA::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
 			`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
 			FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = 0", normalise_link($url), $url, $ssl_url);
-			$r = dba::inArray($s);
+			$r = DBA::toArray($s);
 		}
 
 		// Fetch the data from the gcontact table
-		if (!DBM::is_result($r)) {
-			$s = dba::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
+		if (!DBA::isResult($r)) {
+			$s = DBA::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
 			`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, 0 AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
 			FROM `gcontact` WHERE `nurl` = ?", normalise_link($url));
-			$r = dba::inArray($s);
+			$r = DBA::toArray($s);
 		}
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			// If there is more than one entry we filter out the connector networks
 			if (count($r) > 1) {
 				foreach ($r as $id => $result) {
-					if ($result["network"] == NETWORK_STATUSNET) {
+					if ($result["network"] == Protocol::STATUSNET) {
 						unset($r[$id]);
 					}
 				}
@@ -475,34 +754,34 @@ class Contact extends BaseObject
 			$profile = $default;
 		}
 
-		if (($profile["photo"] == "") && isset($default["photo"])) {
+		if (empty($profile["photo"]) && isset($default["photo"])) {
 			$profile["photo"] = $default["photo"];
 		}
 
-		if (($profile["name"] == "") && isset($default["name"])) {
+		if (empty($profile["name"]) && isset($default["name"])) {
 			$profile["name"] = $default["name"];
 		}
 
-		if (($profile["network"] == "") && isset($default["network"])) {
+		if (empty($profile["network"]) && isset($default["network"])) {
 			$profile["network"] = $default["network"];
 		}
 
-		if (($profile["thumb"] == "") && isset($profile["photo"])) {
+		if (empty($profile["thumb"]) && isset($profile["photo"])) {
 			$profile["thumb"] = $profile["photo"];
 		}
 
-		if (($profile["micro"] == "") && isset($profile["thumb"])) {
+		if (empty($profile["micro"]) && isset($profile["thumb"])) {
 			$profile["micro"] = $profile["thumb"];
 		}
 
-		if ((($profile["addr"] == "") || ($profile["name"] == "")) && ($profile["gid"] != 0)
-			&& in_array($profile["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])
+		if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0)
+			&& in_array($profile["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])
 		) {
 			Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]);
 		}
 
 		// Show contact details of Diaspora contacts only if connected
-		if (($profile["cid"] == 0) && ($profile["network"] == NETWORK_DIASPORA)) {
+		if ((defaults($profile, "cid", 0) == 0) && (defaults($profile, "network", "") == Protocol::DIASPORA)) {
 			$profile["location"] = "";
 			$profile["about"] = "";
 			$profile["gender"] = "";
@@ -540,28 +819,28 @@ class Contact extends BaseObject
 		$r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
 			`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
 			FROM `contact` WHERE `addr` = '%s' AND `uid` = %d",
-			dbesc($addr),
+			DBA::escape($addr),
 			intval($uid)
 		);
 		// Fetch the data from the contact table with "uid=0" (which is filled automatically)
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			$r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
 				`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
 				FROM `contact` WHERE `addr` = '%s' AND `uid` = 0",
-				dbesc($addr)
+				DBA::escape($addr)
 			);
 		}
 
 		// Fetch the data from the gcontact table
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			$r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
 				`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
 				FROM `gcontact` WHERE `addr` = '%s'",
-				dbesc($addr)
+				DBA::escape($addr)
 			);
 		}
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			$data = Probe::uri($addr);
 
 			$profile = self::getDetailsByURL($data['url'], $uid);
@@ -596,32 +875,23 @@ class Contact extends BaseObject
 			$uid = local_user();
 		}
 
-		if ($contact['uid'] != $uid) {
+		if (empty($contact['uid']) || ($contact['uid'] != $uid)) {
 			if ($uid == 0) {
-				$profile_link = Profile::zrl($contact['url']);
+				$profile_link = self::magicLink($contact['url']);
 				$menu = ['profile' => [L10n::t('View Profile'), $profile_link, true]];
 
 				return $menu;
 			}
 
 			// Look for our own contact if the uid doesn't match and isn't public
-			$contact_own = dba::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
-			if (DBM::is_result($contact_own)) {
+			$contact_own = DBA::selectFirst('contact', [], ['nurl' => $contact['nurl'], 'network' => $contact['network'], 'uid' => $uid]);
+			if (DBA::isResult($contact_own)) {
 				return self::photoMenu($contact_own, $uid);
-			} else {
-				$profile_link = Profile::zrl($contact['url']);
-				$connlnk = 'follow/?url=' . $contact['url'];
-				$menu = [
-					'profile' => [L10n::t('View Profile'), $profile_link, true],
-					'follow' => [L10n::t('Connect/Follow'), $connlnk, true]
-				];
-
-				return $menu;
 			}
 		}
 
 		$sparkle = false;
-		if (($contact['network'] === NETWORK_DFRN) && !$contact['self']) {
+		if (($contact['network'] === Protocol::DFRN) && !$contact['self']) {
 			$sparkle = true;
 			$profile_link = System::baseUrl() . '/redir/' . $contact['id'];
 		} else {
@@ -638,17 +908,17 @@ class Contact extends BaseObject
 			$profile_link = $profile_link . '?url=profile';
 		}
 
-		if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_DIASPORA]) && !$contact['self']) {
+		if (in_array($contact['network'], [Protocol::DFRN, Protocol::DIASPORA]) && !$contact['self']) {
 			$pm_url = System::baseUrl() . '/message/new/' . $contact['id'];
 		}
 
-		if (($contact['network'] == NETWORK_DFRN) && !$contact['self']) {
+		if (($contact['network'] == Protocol::DFRN) && !$contact['self']) {
 			$poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id'];
 		}
 
 		$contact_url = System::baseUrl() . '/contacts/' . $contact['id'];
 
-		$posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/posts';
+		$posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/conversations';
 
 		if (!$contact['self']) {
 			$contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
@@ -658,16 +928,26 @@ class Contact extends BaseObject
 		 * Menu array:
 		 * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
 		 */
-		$menu = [
-			'status'  => [L10n::t("View Status")  , $status_link      , true],
-			'profile' => [L10n::t("View Profile") , $profile_link     , true],
-			'photos'  => [L10n::t("View Photos")  , $photos_link      , true],
-			'network' => [L10n::t("Network Posts"), $posts_link       , false],
-			'edit'    => [L10n::t("View Contact") , $contact_url      , false],
-			'drop'    => [L10n::t("Drop Contact") , $contact_drop_link, false],
-			'pm'      => [L10n::t("Send PM")      , $pm_url           , false],
-			'poke'    => [L10n::t("Poke")         , $poke_link        , false],
-		];
+		if (empty($contact['uid'])) {
+			$connlnk = 'follow/?url=' . $contact['url'];
+			$menu = [
+				'profile' => [L10n::t('View Profile'),   $profile_link, true],
+				'network' => [L10n::t('Network Posts'),  $posts_link,   false],
+				'edit'    => [L10n::t('View Contact'),   $contact_url,  false],
+				'follow'  => [L10n::t('Connect/Follow'), $connlnk,      true],
+			];
+		} else {
+			$menu = [
+				'status'  => [L10n::t('View Status'),   $status_link,       true],
+				'profile' => [L10n::t('View Profile'),  $profile_link,      true],
+				'photos'  => [L10n::t('View Photos'),   $photos_link,       true],
+				'network' => [L10n::t('Network Posts'), $posts_link,        false],
+				'edit'    => [L10n::t('View Contact'),  $contact_url,       false],
+				'drop'    => [L10n::t('Drop Contact'),  $contact_drop_link, false],
+				'pm'      => [L10n::t('Send PM'),       $pm_url,            false],
+				'poke'    => [L10n::t('Poke'),          $poke_link,         false],
+			];
+		}
 
 		$args = ['contact' => $contact, 'menu' => &$menu];
 
@@ -696,49 +976,20 @@ class Contact extends BaseObject
 	 *
 	 * @return array
 	 */
-	public static function getUngroupedList($uid, $start = 0, $count = 0)
+	public static function getUngroupedList($uid)
 	{
-		if (!$count) {
-			$r = q(
-				"SELECT COUNT(*) AS `total`
-				 FROM `contact`
-				 WHERE `uid` = %d
-				 AND NOT `self`
-				 AND NOT `blocked`
-				 AND NOT `pending`
-				 AND `id` NOT IN (
-					SELECT DISTINCT(`contact-id`)
-					FROM `group_member`
-					WHERE `uid` = %d
-				)",
-				intval($uid),
-				intval($uid)
-			);
-
-			return $r;
-		}
-
-		$r = q(
-			"SELECT *
-			FROM `contact`
-			WHERE `uid` = %d
-			AND NOT `self`
-			AND NOT `blocked`
-			AND NOT `pending`
-			AND `id` NOT IN (
-				SELECT DISTINCT(`contact-id`)
-				FROM `group_member`
-				INNER JOIN `group` ON `group`.`id` = `group_member`.`gid`
-				WHERE `group`.`uid` = %d
-			)
-			LIMIT %d, %d",
-			intval($uid),
-			intval($uid),
-			intval($start),
-			intval($count)
-		);
-
-		return $r;
+		return q("SELECT *
+			   FROM `contact`
+			   WHERE `uid` = %d
+			   AND NOT `self`
+			   AND NOT `blocked`
+			   AND NOT `pending`
+			   AND `id` NOT IN (
+			   	SELECT DISTINCT(`contact-id`)
+			   	FROM `group_member`
+			   	INNER JOIN `group` ON `group`.`id` = `group_member`.`gid`
+			   	WHERE `group`.`uid` = %d
+			   )", intval($uid), intval($uid));
 	}
 
 	/**
@@ -778,22 +1029,22 @@ class Contact extends BaseObject
 
 		/// @todo Verify if we can't use Contact::getDetailsByUrl instead of the following
 		// We first try the nurl (http://server.tld/nick), most common case
-		$contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => normalise_link($url), 'uid' => $uid]);
+		$contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => normalise_link($url), 'uid' => $uid]);
 
 		// Then the addr (nick@server.tld)
-		if (!DBM::is_result($contact)) {
-			$contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid]);
+		if (!DBA::isResult($contact)) {
+			$contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid]);
 		}
 
 		// Then the alias (which could be anything)
-		if (!DBM::is_result($contact)) {
+		if (!DBA::isResult($contact)) {
 			// The link could be provided as http although we stored it as https
 			$ssl_url = str_replace('http://', 'https://', $url);
 			$condition = ['`alias` IN (?, ?, ?) AND `uid` = ?', $url, normalise_link($url), $ssl_url, $uid];
-			$contact = dba::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition);
+			$contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition);
 		}
 
-		if (DBM::is_result($contact)) {
+		if (DBA::isResult($contact)) {
 			$contact_id = $contact["id"];
 
 			// Update the contact every 7 days
@@ -812,47 +1063,69 @@ class Contact extends BaseObject
 			return 0;
 		}
 
-		$data = Probe::uri($url, "", $uid);
+		// When we don't want to update, we look if some of our users already know this contact
+		if ($no_update) {
+			$fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
+				'photo', 'keywords', 'location', 'about', 'network',
+				'priority', 'batch', 'request', 'confirm', 'poco'];
+			$data = DBA::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]);
+
+			if (DBA::isResult($data)) {
+				// For security reasons we don't fetch key data from our users
+				$data["pubkey"] = '';
+			}
+		} else {
+			$data = [];
+		}
+
+		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
-		if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_PUMPIO, NETWORK_MAIL, NETWORK_FEED])) {
+		if (!in_array($data["network"], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::PUMPIO, Protocol::MAIL, Protocol::FEED])) {
 			if ($uid != 0) {
 				return 0;
 			}
 
 			// Get data from the gcontact table
 			$fields = ['name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'];
-			$contact = dba::selectFirst('gcontact', $fields, ['nurl' => normalise_link($url)]);
-			if (!DBM::is_result($contact)) {
-				$contact = dba::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]);
+			$contact = DBA::selectFirst('gcontact', $fields, ['nurl' => normalise_link($url)]);
+			if (!DBA::isResult($contact)) {
+				$contact = DBA::selectFirst('contact', $fields, ['nurl' => normalise_link($url)]);
 			}
 
-			if (!DBM::is_result($contact)) {
+			if (!DBA::isResult($contact)) {
 				$fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
 					'photo', 'keywords', 'location', 'about', 'network',
 					'priority', 'batch', 'request', 'confirm', 'poco'];
-				$contact = dba::selectFirst('contact', $fields, ['addr' => $url]);
+				$contact = DBA::selectFirst('contact', $fields, ['addr' => $url]);
 			}
 
-			if (!DBM::is_result($contact)) {
+			if (!DBA::isResult($contact)) {
 				// The link could be provided as http although we stored it as https
 				$ssl_url = str_replace('http://', 'https://', $url);
 				$condition = ['alias' => [$url, normalise_link($url), $ssl_url]];
-				$contact = dba::selectFirst('contact', $fields, $condition);
+				$contact = DBA::selectFirst('contact', $fields, $condition);
 			}
 
-			if (!DBM::is_result($contact)) {
+			if (!DBA::isResult($contact)) {
 				$fields = ['url', 'addr', 'alias', 'notify', 'poll', 'name', 'nick',
 					'photo', 'network', 'priority', 'batch', 'request', 'confirm'];
 				$condition = ['url' => [$url, normalise_link($url), $ssl_url]];
-				$contact = dba::selectFirst('fcontact', $fields, $condition);
+				$contact = DBA::selectFirst('fcontact', $fields, $condition);
 			}
 
 			if (!empty($default)) {
 				$contact = $default;
 			}
 
-			if (!DBM::is_result($contact)) {
+			if (!DBA::isResult($contact)) {
 				return 0;
 			} else {
 				$data = array_merge($data, $contact);
@@ -865,7 +1138,7 @@ class Contact extends BaseObject
 
 		$url = $data["url"];
 		if (!$contact_id) {
-			dba::insert('contact', [
+			DBA::insert('contact', [
 				'uid'       => $uid,
 				'created'   => DateTimeFormat::utcNow(),
 				'url'       => $data["url"],
@@ -882,7 +1155,7 @@ class Contact extends BaseObject
 				'about'     => $data["about"],
 				'network'   => $data["network"],
 				'pubkey'    => $data["pubkey"],
-				'rel'       => CONTACT_IS_SHARING,
+				'rel'       => self::SHARING,
 				'priority'  => $data["priority"],
 				'batch'     => $data["batch"],
 				'request'   => $data["request"],
@@ -897,17 +1170,17 @@ class Contact extends BaseObject
 				'pending'   => 0]
 			);
 
-			$s = dba::select('contact', ['id'], ['nurl' => normalise_link($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]);
-			$contacts = dba::inArray($s);
-			if (!DBM::is_result($contacts)) {
+			$s = DBA::select('contact', ['id'], ['nurl' => normalise_link($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]);
+			$contacts = DBA::toArray($s);
+			if (!DBA::isResult($contacts)) {
 				return 0;
 			}
 
 			$contact_id = $contacts[0]["id"];
 
 			// Update the newly created contact from data in the gcontact table
-			$gcontact = dba::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => normalise_link($data["url"])]);
-			if (DBM::is_result($gcontact)) {
+			$gcontact = DBA::selectFirst('gcontact', ['location', 'about', 'keywords', 'gender'], ['nurl' => normalise_link($data["url"])]);
+			if (DBA::isResult($gcontact)) {
 				// Only use the information when the probing hadn't fetched these values
 				if ($data['keywords'] != '') {
 					unset($gcontact['keywords']);
@@ -918,11 +1191,11 @@ class Contact extends BaseObject
 				if ($data['about'] != '') {
 					unset($gcontact['about']);
 				}
-				dba::update('contact', $gcontact, ['id' => $contact_id]);
+				DBA::update('contact', $gcontact, ['id' => $contact_id]);
 			}
 
 			if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") {
-				dba::delete('contact', ["`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
+				DBA::delete('contact', ["`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
 					normalise_link($data["url"]), $contact_id]);
 			}
 		}
@@ -930,10 +1203,10 @@ class Contact extends BaseObject
 		self::updateAvatar($data["photo"], $uid, $contact_id);
 
 		$fields = ['url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date', 'pubkey'];
-		$contact = dba::selectFirst('contact', $fields, ['id' => $contact_id]);
+		$contact = DBA::selectFirst('contact', $fields, ['id' => $contact_id]);
 
 		// This condition should always be true
-		if (!DBM::is_result($contact)) {
+		if (!DBA::isResult($contact)) {
 			return $contact_id;
 		}
 
@@ -944,21 +1217,36 @@ class Contact extends BaseObject
 			'name' => $data['name'],
 			'nick' => $data['nick']];
 
-		// Only fill the pubkey if it was empty before. We have to prevent identity theft.
-		if (!empty($contact['pubkey'])) {
-			unset($contact['pubkey']);
-		} else {
-			$updated['pubkey'] = $data['pubkey'];
-		}
-
 		if ($data['keywords'] != '') {
 			$updated['keywords'] = $data['keywords'];
 		}
 		if ($data['location'] != '') {
 			$updated['location'] = $data['location'];
 		}
-		if ($data['about'] != '') {
-			$updated['about'] = $data['about'];
+
+		// Update the technical stuff as well - if filled
+		if ($data['notify'] != '') {
+			$updated['notify'] = $data['notify'];
+		}
+		if ($data['poll'] != '') {
+			$updated['poll'] = $data['poll'];
+		}
+		if ($data['batch'] != '') {
+			$updated['batch'] = $data['batch'];
+		}
+		if ($data['request'] != '') {
+			$updated['request'] = $data['request'];
+		}
+		if ($data['confirm'] != '') {
+			$updated['confirm'] = $data['confirm'];
+		}
+		if ($data['poco'] != '') {
+			$updated['poco'] = $data['poco'];
+		}
+
+		// Only fill the pubkey if it had been empty before. We have to prevent identity theft.
+		if (empty($contact['pubkey'])) {
+			$updated['pubkey'] = $data['pubkey'];
 		}
 
 		if (($data["addr"] != $contact["addr"]) || ($data["alias"] != $contact["alias"])) {
@@ -970,7 +1258,7 @@ class Contact extends BaseObject
 
 		$updated['avatar-date'] = DateTimeFormat::utcNow();
 
-		dba::update('contact', $updated, ['id' => $contact_id], $contact);
+		DBA::update('contact', $updated, ['id' => $contact_id], $contact);
 
 		return $contact_id;
 	}
@@ -988,8 +1276,8 @@ class Contact extends BaseObject
 			return false;
 		}
 
-		$blocked = dba::selectFirst('contact', ['blocked'], ['id' => $cid]);
-		if (!DBM::is_result($blocked)) {
+		$blocked = DBA::selectFirst('contact', ['blocked'], ['id' => $cid]);
+		if (!DBA::isResult($blocked)) {
 			return false;
 		}
 		return (bool) $blocked['blocked'];
@@ -1008,8 +1296,8 @@ class Contact extends BaseObject
 			return false;
 		}
 
-		$hidden = dba::selectFirst('contact', ['hidden'], ['id' => $cid]);
-		if (!DBM::is_result($hidden)) {
+		$hidden = DBA::selectFirst('contact', ['hidden'], ['id' => $cid]);
+		if (!DBA::isResult($hidden)) {
 			return false;
 		}
 		return (bool) $hidden['hidden'];
@@ -1022,7 +1310,7 @@ class Contact extends BaseObject
 	 *
 	 * @return string posts in HTML
 	 */
-	public static function getPostsFromUrl($contact_url)
+	public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0)
 	{
 		$a = self::getApp();
 
@@ -1032,32 +1320,51 @@ class Contact extends BaseObject
 		// This speeds up the query a lot
 		$r = q("SELECT `network`, `id` AS `author-id`, `contact-type` FROM `contact`
 			WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
-			dbesc(normalise_link($contact_url))
+			DBA::escape(normalise_link($contact_url))
 		);
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return '';
 		}
 
-		if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
-			$sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND NOT `item`.`global`))";
+		if (in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
+			$sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
 		} else {
-			$sql = "`item`.`uid` = %d";
+			$sql = "`item`.`uid` = ?";
 		}
 
 		$author_id = intval($r[0]["author-id"]);
 
-		$contact = ($r[0]["contact-type"] == ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
+		$contact = ($r[0]["contact-type"] == self::ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
 
-		$r = q(item_query(local_user()) . " AND `item`.`" . $contact . "` = %d AND " . $sql .
-			" AND `item`.`verb` = '%s' ORDER BY `item`.`created` DESC LIMIT %d, %d",
-			intval($author_id), intval(local_user()), dbesc(ACTIVITY_POST),
-			intval($a->pager['start']), intval($a->pager['itemspage'])
-		);
+		if ($thread_mode) {
+			$condition = ["`$contact` = ? AND `gravity` = ? AND " . $sql,
+				$author_id, GRAVITY_PARENT, local_user()];
+		} else {
+			$condition = ["`$contact` = ? AND `gravity` IN (?, ?) AND " . $sql,
+				$author_id, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
+		}
 
-		$o = conversation($a, $r, 'contact-posts', false);
+		$params = ['order' => ['created' => true],
+			'limit' => [$a->pager['start'], $a->pager['itemspage']]];
 
-		$o .= alt_pager($a, count($r));
+		if ($thread_mode) {
+			$r = Item::selectThreadForUser(local_user(), ['uri'], $condition, $params);
+
+			$items = Item::inArray($r);
+
+			$o = conversation($a, $items, 'contacts', $update);
+		} else {
+			$r = Item::selectForUser(local_user(), [], $condition, $params);
+
+			$items = Item::inArray($r);
+
+			$o = conversation($a, $items, 'contact-posts', false);
+		}
+
+		if (!$update) {
+			$o .= alt_pager($a, count($items));
+		}
 
 		return $o;
 	}
@@ -1074,17 +1381,17 @@ class Contact extends BaseObject
 	{
 		// There are several fields that indicate that the contact or user is a forum
 		// "page-flags" is a field in the user table,
-		// "forum" and "prv" are used in the contact table. They stand for PAGE_COMMUNITY and PAGE_PRVGROUP.
-		// "community" is used in the gcontact table and is true if the contact is PAGE_COMMUNITY or PAGE_PRVGROUP.
-		if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY))
-			|| (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP))
+		// "forum" and "prv" are used in the contact table. They stand for self::PAGE_COMMUNITY and self::PAGE_PRVGROUP.
+		// "community" is used in the gcontact table and is true if the contact is self::PAGE_COMMUNITY or self::PAGE_PRVGROUP.
+		if ((isset($contact['page-flags']) && (intval($contact['page-flags']) == self::PAGE_COMMUNITY))
+			|| (isset($contact['page-flags']) && (intval($contact['page-flags']) == self::PAGE_PRVGROUP))
 			|| (isset($contact['forum']) && intval($contact['forum']))
 			|| (isset($contact['prv']) && intval($contact['prv']))
 			|| (isset($contact['community']) && intval($contact['community']))
 		) {
-			$type = ACCOUNT_TYPE_COMMUNITY;
+			$type = self::ACCOUNT_TYPE_COMMUNITY;
 		} else {
-			$type = ACCOUNT_TYPE_PERSON;
+			$type = self::ACCOUNT_TYPE_PERSON;
 		}
 
 		// The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
@@ -1097,15 +1404,18 @@ class Contact extends BaseObject
 		}
 
 		switch ($type) {
-			case ACCOUNT_TYPE_ORGANISATION:
+			case self::ACCOUNT_TYPE_ORGANISATION:
 				$account_type = L10n::t("Organisation");
 				break;
-			case ACCOUNT_TYPE_NEWS:
+
+			case self::ACCOUNT_TYPE_NEWS:
 				$account_type = L10n::t('News');
 				break;
-			case ACCOUNT_TYPE_COMMUNITY:
+
+			case self::ACCOUNT_TYPE_COMMUNITY:
 				$account_type = L10n::t("Forum");
 				break;
+
 			default:
 				$account_type = "";
 				break;
@@ -1122,7 +1432,7 @@ class Contact extends BaseObject
 	 */
 	public static function block($uid)
 	{
-		$return = dba::update('contact', ['blocked' => true], ['id' => $uid]);
+		$return = DBA::update('contact', ['blocked' => true], ['id' => $uid]);
 
 		return $return;
 	}
@@ -1135,7 +1445,7 @@ class Contact extends BaseObject
 	 */
 	public static function unblock($uid)
 	{
-		$return = dba::update('contact', ['blocked' => false], ['id' => $uid]);
+		$return = DBA::update('contact', ['blocked' => false], ['id' => $uid]);
 
 		return $return;
 	}
@@ -1152,8 +1462,8 @@ class Contact extends BaseObject
 	 */
 	public static function updateAvatar($avatar, $uid, $cid, $force = false)
 	{
-		$contact = dba::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid]);
-		if (!DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid]);
+		if (!DBA::isResult($contact)) {
 			return false;
 		} else {
 			$data = [$contact["photo"], $contact["thumb"], $contact["micro"]];
@@ -1163,7 +1473,7 @@ class Contact extends BaseObject
 			$photos = Photo::importProfilePhoto($avatar, $uid, $cid, true);
 
 			if ($photos) {
-				dba::update(
+				DBA::update(
 					'contact',
 					['avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => DateTimeFormat::utcNow()],
 					['id' => $cid]
@@ -1171,8 +1481,8 @@ class Contact extends BaseObject
 
 				// Update the public contact (contact id = 0)
 				if ($uid != 0) {
-					$pcontact = dba::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]);
-					if (DBM::is_result($pcontact)) {
+					$pcontact = DBA::selectFirst('contact', ['id'], ['nurl' => $contact['nurl'], 'uid' => 0]);
+					if (DBA::isResult($pcontact)) {
 						self::updateAvatar($avatar, 0, $pcontact['id'], $force);
 					}
 				}
@@ -1196,8 +1506,8 @@ class Contact extends BaseObject
 		 */
 
 		$fields = ['url', 'nurl', 'addr', 'alias', 'batch', 'notify', 'poll', 'poco', 'network'];
-		$contact = dba::selectFirst('contact', $fields, ['id' => $id]);
-		if (!DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', $fields, ['id' => $id]);
+		if (!DBA::isResult($contact)) {
 			return false;
 		}
 
@@ -1225,7 +1535,7 @@ class Contact extends BaseObject
 			return true;
 		}
 
-		dba::update(
+		DBA::update(
 			'contact', [
 				'url'    => $ret['url'],
 				'nurl'   => normalise_link($ret['url']),
@@ -1311,24 +1621,16 @@ class Contact extends BaseObject
 		// the poll url is more reliable than the profile url, as we may have
 		// indirect links or webfinger links
 
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` IN ('%s', '%s') AND `network` = '%s' AND NOT `pending` LIMIT 1",
-			intval($uid),
-			dbesc($ret['poll']),
-			dbesc(normalise_link($ret['poll'])),
-			dbesc($ret['network'])
-		);
-
-		if (!DBM::is_result($r)) {
-			$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' AND NOT `pending` LIMIT 1",
-				intval($uid),
-				dbesc(normalise_link($url)),
-				dbesc($ret['network'])
-			);
+		$condition = ['uid' => $uid, 'poll' => [$ret['poll'], normalise_link($ret['poll'])], 'network' => $ret['network'], 'pending' => false];
+		$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
+		if (!DBA::isResult($contact)) {
+			$condition = ['uid' => $uid, 'nurl' => normalise_link($url), 'network' => $ret['network'], 'pending' => false];
+			$contact = DBA::selectFirst('contact', ['id', 'rel'], $condition);
 		}
 
-		if (($ret['network'] === NETWORK_DFRN) && !DBM::is_result($r)) {
+		if (($ret['network'] === Protocol::DFRN) && !DBA::isResult($contact)) {
 			if ($interactive) {
-				if (strlen($a->path)) {
+				if (strlen($a->urlpath)) {
 					$myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']);
 				} else {
 					$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
@@ -1338,14 +1640,14 @@ class Contact extends BaseObject
 
 				// NOTREACHED
 			}
-		} elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != NETWORK_DFRN)) {
+		} elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != Protocol::DFRN)) {
 			$result['message'] = L10n::t('This site is not configured to allow communications with other networks.') . EOL;
 			$result['message'] != L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
 			return $result;
 		}
 
 		// This extra param just confuses things, remove it
-		if ($ret['network'] === NETWORK_DIASPORA) {
+		if ($ret['network'] === Protocol::DIASPORA) {
 			$ret['url'] = str_replace('?absolute=true', '', $ret['url']);
 		}
 
@@ -1369,7 +1671,7 @@ class Contact extends BaseObject
 			return $result;
 		}
 
-		if ($ret['network'] === NETWORK_OSTATUS && Config::get('system', 'ostatus_disabled')) {
+		if ($ret['network'] === Protocol::OSTATUS && Config::get('system', 'ostatus_disabled')) {
 			$result['message'] .= L10n::t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
 			$ret['notify'] = '';
 		}
@@ -1378,27 +1680,27 @@ class Contact extends BaseObject
 			$result['message'] .= L10n::t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL;
 		}
 
-		$writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
+		$writeable = ((($ret['network'] === Protocol::OSTATUS) && ($ret['notify'])) ? 1 : 0);
 
-		$subhub = (($ret['network'] === NETWORK_OSTATUS) ? true : false);
+		$subhub = (($ret['network'] === Protocol::OSTATUS) ? true : false);
 
-		$hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
+		$hidden = (($ret['network'] === Protocol::MAIL) ? 1 : 0);
 
-		if (in_array($ret['network'], [NETWORK_MAIL, NETWORK_DIASPORA])) {
+		if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA])) {
 			$writeable = 1;
 		}
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($contact)) {
 			// update contact
-			$new_relation = (($r[0]['rel'] == CONTACT_IS_FOLLOWER) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
+			$new_relation = (($contact['rel'] == self::FOLLOWER) ? self::FRIEND : self::SHARING);
 
 			$fields = ['rel' => $new_relation, 'subhub' => $subhub, 'readonly' => false];
-			dba::update('contact', $fields, ['id' => $r[0]['id']]);
+			DBA::update('contact', $fields, ['id' => $contact['id']]);
 		} else {
-			$new_relation = ((in_array($ret['network'], [NETWORK_MAIL])) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
+			$new_relation = (in_array($ret['network'], [Protocol::MAIL]) ? self::FRIEND : self::SHARING);
 
 			// create contact record
-			dba::insert('contact', [
+			DBA::insert('contact', [
 				'uid'     => $uid,
 				'created' => DateTimeFormat::utcNow(),
 				'url'     => $ret['url'],
@@ -1424,8 +1726,8 @@ class Contact extends BaseObject
 			]);
 		}
 
-		$contact = dba::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
-		if (!DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);
+		if (!DBA::isResult($contact)) {
 			$result['message'] .= L10n::t('Unable to retrieve contact information.') . EOL;
 			return $result;
 		}
@@ -1442,22 +1744,26 @@ class Contact extends BaseObject
 
 		Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
 
-		$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)
-		);
+		$owner = User::getOwnerDataById($uid);
 
-		if (DBM::is_result($r)) {
-			if (in_array($contact['network'], [NETWORK_OSTATUS, NETWORK_DFRN])) {
+		if (DBA::isResult($owner)) {
+			if (in_array($contact['network'], [Protocol::OSTATUS, Protocol::DFRN])) {
 				// create a follow slap
 				$item = [];
 				$item['verb'] = ACTIVITY_FOLLOW;
 				$item['follow'] = $contact["url"];
-				$slap = OStatus::salmon($item, $r[0]);
+				$item['body'] = '';
+				$item['title'] = '';
+				$item['guid'] = '';
+				$item['tag'] = '';
+				$item['attach'] = '';
+
+				$slap = OStatus::salmon($item, $owner);
+
 				if (!empty($contact['notify'])) {
-					Salmon::slapper($r[0], $contact['notify'], $slap);
+					Salmon::slapper($owner, $contact['notify'], $slap);
 				}
-			} elseif ($contact['network'] == NETWORK_DIASPORA) {
+			} elseif ($contact['network'] == Protocol::DIASPORA) {
 				$ret = Diaspora::sendShare($a->user, $contact);
 				logger('share returns: ' . $ret);
 			}
@@ -1467,7 +1773,15 @@ class Contact extends BaseObject
 		return $result;
 	}
 
-	public static function updateSslPolicy($contact, $new_policy)
+	/**
+	 * @brief Updated contact's SSL policy
+	 *
+	 * @param array  $contact Contact array
+	 * @param string $new_policy New policy, valid: self,full
+	 *
+	 * @return array Contact array with updated values
+	 */
+	public static function updateSslPolicy(array $contact, $new_policy)
 	{
 		$ssl_changed = false;
 		if ((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) {
@@ -1494,36 +1808,40 @@ class Contact extends BaseObject
 			$fields = ['url' => $contact['url'], 'request' => $contact['request'],
 					'notify' => $contact['notify'], 'poll' => $contact['poll'],
 					'confirm' => $contact['confirm'], 'poco' => $contact['poco']];
-			dba::update('contact', $fields, ['id' => $contact['id']]);
+			DBA::update('contact', $fields, ['id' => $contact['id']]);
 		}
 
 		return $contact;
 	}
 
 	public static function addRelationship($importer, $contact, $datarray, $item, $sharing = false) {
-		$url = notags(trim($datarray['author-link']));
-		$name = notags(trim($datarray['author-name']));
-		$photo = notags(trim($datarray['author-avatar']));
-		$nick = '';
-
-		if (is_object($item)) {
-			$rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor');
-			if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']) {
-				$nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
-			}
-		} else {
-			$nick = $item;
+		// Should always be set
+		if (empty($datarray['author-id'])) {
+			return;
 		}
 
+		$fields = ['url', 'name', 'nick', 'photo', 'network'];
+		$pub_contact = DBA::selectFirst('contact', $fields, ['id' => $datarray['author-id']]);
+		if (!DBA::isResult($pub_contact)) {
+			// Should never happen
+			return;
+		}
+
+		$url = $pub_contact['url'];
+		$name = $pub_contact['name'];
+		$photo = $pub_contact['photo'];
+		$nick = $pub_contact['nick'];
+		$network = $pub_contact['network'];
+
 		if (is_array($contact)) {
-			if (($contact['rel'] == CONTACT_IS_SHARING)
-				|| ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
-				dba::update('contact', ['rel' => CONTACT_IS_FRIEND, 'writable' => true],
+			if (($contact['rel'] == self::SHARING)
+				|| ($sharing && $contact['rel'] == self::FOLLOWER)) {
+				DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true],
 						['id' => $contact['id'], 'uid' => $importer['uid']]);
 			}
 			// send email notification to owner?
 		} else {
-			if (dba::exists('contact', ['nurl' => normalise_link($url), 'uid' => $importer['uid'], 'pending' => true])) {
+			if (DBA::exists('contact', ['nurl' => normalise_link($url), 'uid' => $importer['uid'], 'pending' => true])) {
 				logger('ignoring duplicated connection request from pending contact ' . $url);
 				return;
 			}
@@ -1533,31 +1851,35 @@ class Contact extends BaseObject
 				`blocked`, `readonly`, `pending`, `writable`)
 				VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, 1)",
 				intval($importer['uid']),
-				dbesc(DateTimeFormat::utcNow()),
-				dbesc($url),
-				dbesc(normalise_link($url)),
-				dbesc($name),
-				dbesc($nick),
-				dbesc($photo),
-				dbesc(NETWORK_OSTATUS),
-				intval(CONTACT_IS_FOLLOWER)
+				DBA::escape(DateTimeFormat::utcNow()),
+				DBA::escape($url),
+				DBA::escape(normalise_link($url)),
+				DBA::escape($name),
+				DBA::escape($nick),
+				DBA::escape($photo),
+				DBA::escape($network),
+				intval(self::FOLLOWER)
 			);
 
 			$contact_record = [
-				'id' => dba::lastInsertId(),
-				'network' => NETWORK_OSTATUS
+				'id' => DBA::lastInsertId(),
+				'network' => $network,
+				'name' => $name,
+				'url' => $url,
+				'photo' => $photo
 			];
+
 			Contact::updateAvatar($photo, $importer["uid"], $contact_record["id"], true);
 
 			/// @TODO Encapsulate this into a function/method
 			$fields = ['uid', 'username', 'email', 'page-flags', 'notify-flags', 'language'];
-			$user = dba::selectFirst('user', $fields, ['uid' => $importer['uid']]);
-			if (DBM::is_result($user) && !in_array($user['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) {
+			$user = DBA::selectFirst('user', $fields, ['uid' => $importer['uid']]);
+			if (DBA::isResult($user) && !in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) {
 				// create notification
 				$hash = random_string();
 
 				if (is_array($contact_record)) {
-					dba::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
+					DBA::insert('intro', ['uid' => $importer['uid'], 'contact-id' => $contact_record['id'],
 								'blocked' => false, 'knowyou' => false,
 								'hash' => $hash, 'datetime' => DateTimeFormat::utcNow()]);
 				}
@@ -1565,7 +1887,7 @@ class Contact extends BaseObject
 				Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
 
 				if (($user['notify-flags'] & NOTIFY_INTRO) &&
-					in_array($user['page-flags'], [PAGE_NORMAL])) {
+					in_array($user['page-flags'], [self::PAGE_NORMAL])) {
 
 					notification([
 						'type'         => NOTIFY_INTRO,
@@ -1574,7 +1896,7 @@ class Contact extends BaseObject
 						'to_name'      => $user['username'],
 						'to_email'     => $user['email'],
 						'uid'          => $user['uid'],
-						'link'		   => System::baseUrl() . '/notifications/intro',
+						'link'         => System::baseUrl() . '/notifications/intro',
 						'source_name'  => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')),
 						'source_link'  => $contact_record['url'],
 						'source_photo' => $contact_record['photo'],
@@ -1583,28 +1905,26 @@ class Contact extends BaseObject
 					]);
 
 				}
-			} elseif (DBM::is_result($user) && in_array($user['page-flags'], [PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY])) {
-				q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
-						intval($importer['uid']),
-						dbesc($url)
-				);
+			} elseif (DBA::isResult($user) && in_array($user['page-flags'], [self::PAGE_SOAPBOX, self::PAGE_FREELOVE, self::PAGE_COMMUNITY])) {
+				$condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
+				DBA::update('contact', ['pending' => false], $condition);
 			}
 		}
 	}
 
-	public static function removeFollower($importer, $contact, array $datarray = [], $item = "") {
-
-		if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
-			dba::update('contact', ['rel' => CONTACT_IS_SHARING], ['id' => $contact['id']]);
+	public static function removeFollower($importer, $contact, array $datarray = [], $item = "")
+	{
+		if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::SHARING)) {
+			DBA::update('contact', ['rel' => self::SHARING], ['id' => $contact['id']]);
 		} else {
 			Contact::remove($contact['id']);
 		}
 	}
 
-	public static function removeSharer($importer, $contact, array $datarray = [], $item = "") {
-
-		if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
-			dba::update('contact', ['rel' => CONTACT_IS_FOLLOWER], ['id' => $contact['id']]);
+	public static function removeSharer($importer, $contact, array $datarray = [], $item = "")
+	{
+		if (($contact['rel'] == self::FRIEND) || ($contact['rel'] == self::FOLLOWER)) {
+			DBA::update('contact', ['rel' => self::FOLLOWER], ['id' => $contact['id']]);
 		} else {
 			Contact::remove($contact['id']);
 		}
@@ -1621,7 +1941,7 @@ class Contact extends BaseObject
 		// In-network birthdays are handled within local_delivery
 
 		$r = q("SELECT * FROM `contact` WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`, 1, 4) != `bdyear` ");
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r as $rr) {
 				logger('update_contact_birthday: ' . $rr['bd']);
 
@@ -1636,10 +1956,9 @@ class Contact extends BaseObject
 				 */
 
 				// Check for duplicates
-				$s = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
-					intval($rr['uid']), intval($rr['id']), dbesc(DateTimeFormat::utc($nextbd)), dbesc('birthday'));
-
-				if (DBM::is_result($s)) {
+				$condition = ['uid' => $rr['uid'], 'cid' => $rr['id'],
+					'start' => DateTimeFormat::utc($nextbd), 'type' => 'birthday'];
+				if (DBA::exists('event', $condition)) {
 					continue;
 				}
 
@@ -1648,15 +1967,14 @@ class Contact extends BaseObject
 
 				q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`,`adjust`)
 				VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%d' ) ", intval($rr['uid']), intval($rr['id']),
-					dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utcNow()), dbesc(DateTimeFormat::utc($nextbd)),
-					dbesc(DateTimeFormat::utc($nextbd . ' + 1 day ')), dbesc($bdtext), dbesc($bdtext2), dbesc('birthday'),
+					DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utcNow()), DBA::escape(DateTimeFormat::utc($nextbd)),
+					DBA::escape(DateTimeFormat::utc($nextbd . ' + 1 day ')), DBA::escape($bdtext), DBA::escape($bdtext2), DBA::escape('birthday'),
 					intval(0)
 				);
 
-
 				// update bdyear
-				q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d", dbesc(substr($nextbd, 0, 4)),
-					dbesc($nextbd), intval($rr['uid']), intval($rr['id'])
+				q("UPDATE `contact` SET `bdyear` = '%s', `bd` = '%s' WHERE `uid` = %d AND `id` = %d", DBA::escape(substr($nextbd, 0, 4)),
+					DBA::escape($nextbd), intval($rr['uid']), intval($rr['id'])
 				);
 			}
 		}
@@ -1673,17 +1991,82 @@ class Contact extends BaseObject
 			return;
 		}
 
-		$str = dbesc(implode(',', $contact_ids));
+		$str = DBA::escape(implode(',', $contact_ids));
 
-		$stmt = dba::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
+		$stmt = DBA::p("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0");
 
 		$return = [];
-		while($contact = dba::fetch($stmt)) {
+		while($contact = DBA::fetch($stmt)) {
 			$return[] = $contact['id'];
 		}
 
-		dba::close($stmt);
+		DBA::close($stmt);
 
 		$contact_ids = $return;
 	}
+
+	/**
+	 * @brief Returns a magic link to authenticate remote visitors
+	 *
+	 * @param string $contact_url The address of the target contact profile
+	 * @param integer $url An url that we will be redirected to after the authentication
+	 *
+	 * @return string with "redir" link
+	 */
+	public static function magicLink($contact_url, $url = '')
+	{
+		$cid = self::getIdForURL($contact_url, 0, true);
+		if (empty($cid)) {
+			return $url ?: $contact_url; // Equivalent to: ($url != '') ? $url : $contact_url;
+		}
+
+		return self::magicLinkbyId($cid, $url);
+	}
+
+	/**
+	 * @brief Returns a magic link to authenticate remote visitors
+	 *
+	 * @param integer $cid The contact id of the target contact profile
+	 * @param integer $url An url that we will be redirected to after the authentication
+	 *
+	 * @return string with "redir" link
+	 */
+	public static function magicLinkbyId($cid, $url = '')
+	{
+		$contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], ['id' => $cid]);
+
+		return self::magicLinkbyContact($contact, $url);
+        }
+
+	/**
+	 * @brief Returns a magic link to authenticate remote visitors
+	 *
+	 * @param array $contact The contact array with "uid", "network" and "url"
+	 * @param integer $url An url that we will be redirected to after the authentication
+	 *
+	 * @return string with "redir" link
+	 */
+	public static function magicLinkbyContact($contact, $url = '')
+	{
+		if ($contact['network'] != Protocol::DFRN) {
+			return $url ?: $contact['url']; // Equivalent to ($url != '') ? $url : $contact['url'];
+		}
+
+		// Only redirections to the same host do make sense
+		if (($url != '') && (parse_url($url, PHP_URL_HOST) != parse_url($contact['url'], PHP_URL_HOST))) {
+			return $url;
+		}
+
+		if ($contact['uid'] != 0) {
+			return self::magicLink($contact['url'], $url);
+		}
+
+		$redirect = 'redir/' . $contact['id'];
+
+		if ($url != '') {
+			$redirect .= '?url=' . $url;
+		}
+
+		return $redirect;
+	}
 }
diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index cd51a537e..0692a7341 100644
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -2,22 +2,28 @@
 /**
  * @file src/Model/Conversation
  */
+
 namespace Friendica\Model;
 
-use Friendica\Database\DBM;
-use dba;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
 
 require_once "include/dba.php";
 
 class Conversation
 {
-	const PROTOCOL_UNKNOWN         = 0;
-	const PROTOCOL_DFRN            = 1;
-	const PROTOCOL_DIASPORA        = 2;
-	const PROTOCOL_OSTATUS_SALMON  = 3;
-	const PROTOCOL_OSTATUS_FEED    = 4; // Deprecated
-	const PROTOCOL_GS_CONVERSATION = 5; // Deprecated
-	const PROTOCOL_SPLITTED_CONV   = 6;
+	/*
+	 * These constants represent the parcel format used to transport a conversation independently of the message protocol.
+	 * It currently is stored in the "protocol" field for legacy reasons.
+	 */
+	const PARCEL_UNKNOWN            = 0;
+	const PARCEL_DFRN               = 1;
+	const PARCEL_DIASPORA           = 2;
+	const PARCEL_SALMON             = 3;
+	const PARCEL_FEED               = 4; // Deprecated
+	const PARCEL_SPLIT_CONVERSATION = 6;
+	const PARCEL_TWITTER            = 67;
 
 	/**
 	 * @brief Store the conversation data
@@ -25,13 +31,16 @@ class Conversation
 	 * @param array $arr Item array with conversation data
 	 * @return array Item array with removed conversation data
 	 */
-	public static function insert($arr) {
-		if (in_array(defaults($arr, 'network', NETWORK_PHANTOM), [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]) && !empty($arr['uri'])) {
-			$conversation = ['item-uri' => $arr['uri'], 'received' => DBM::date()];
+	public static function insert(array $arr)
+	{
+		if (in_array(defaults($arr, 'network', Protocol::PHANTOM),
+				[Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::TWITTER]) && !empty($arr['uri'])) {
+			$conversation = ['item-uri' => $arr['uri'], 'received' => DateTimeFormat::utcNow()];
 
 			if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {
 				$conversation['reply-to-uri'] = $arr['parent-uri'];
 			}
+
 			if (isset($arr['thr-parent']) && ($arr['thr-parent'] != $arr['uri'])) {
 				$conversation['reply-to-uri'] = $arr['thr-parent'];
 			}
@@ -52,25 +61,27 @@ class Conversation
 				$conversation['source'] = $arr['source'];
 			}
 
-			$old_conv = dba::fetch_first("SELECT `item-uri`, `reply-to-uri`, `conversation-uri`, `conversation-href`, `protocol`, `source`
-					FROM `conversation` WHERE `item-uri` = ?", $conversation['item-uri']);
-			if (DBM::is_result($old_conv)) {
+			$fields = ['item-uri', 'reply-to-uri', 'conversation-uri', 'conversation-href', 'protocol', 'source'];
+			$old_conv = DBA::selectFirst('conversation', $fields, ['item-uri' => $conversation['item-uri']]);
+			if (DBA::isResult($old_conv)) {
 				// Don't update when only the source has changed.
 				// Only do this when there had been no source before.
 				if ($old_conv['source'] != '') {
 					unset($old_conv['source']);
 				}
 				// Update structure data all the time but the source only when its from a better protocol.
-				if (($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) {
+				if (isset($conversation['protocol']) && isset($conversation['source']) && ($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) {
 					unset($conversation['protocol']);
 					unset($conversation['source']);
 				}
-				if (!dba::update('conversation', $conversation, ['item-uri' => $conversation['item-uri']], $old_conv)) {
-					logger('Conversation: update for '.$conversation['item-uri'].' from '.$old_conv['protocol'].' to '.$conversation['protocol'].' failed', LOGGER_DEBUG);
+				if (!DBA::update('conversation', $conversation, ['item-uri' => $conversation['item-uri']], $old_conv)) {
+					logger('Conversation: update for ' . $conversation['item-uri'] . ' from ' . $old_conv['protocol'] . ' to ' . $conversation['protocol'] . ' failed',
+						LOGGER_DEBUG);
 				}
 			} else {
-				if (!dba::insert('conversation', $conversation, true)) {
-					logger('Conversation: insert for '.$conversation['item-uri'].' (protocol '.$conversation['protocol'].') failed', LOGGER_DEBUG);
+				if (!DBA::insert('conversation', $conversation, true)) {
+					logger('Conversation: insert for ' . $conversation['item-uri'] . ' (protocol ' . $conversation['protocol'] . ') failed',
+						LOGGER_DEBUG);
 				}
 			}
 		}
diff --git a/src/Model/Event.php b/src/Model/Event.php
index e65e61ee5..016d1f8d9 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -5,15 +5,14 @@
 
 namespace Friendica\Model;
 
-use dba;
 use Friendica\BaseObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Model\Item;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 
@@ -36,19 +35,27 @@ class Event extends BaseObject
 		$bd_format = L10n::t('l F d, Y \@ g:i A'); // Friday January 18, 2011 @ 8 AM.
 
 		$event_start = day_translate(
-			$event['adjust'] ?
+			!empty($event['adjust']) ?
 			DateTimeFormat::local($event['start'], $bd_format) : DateTimeFormat::utc($event['start'], $bd_format)
 		);
 
-		$event_end = day_translate(
-			$event['adjust'] ?
-			DateTimeFormat::local($event['finish'], $bd_format) : DateTimeFormat::utc($event['finish'], $bd_format)
-		);
+		if (!empty($event['finish'])) {
+			$event_end = day_translate(
+				!empty($event['adjust']) ?
+				DateTimeFormat::local($event['finish'], $bd_format) : DateTimeFormat::utc($event['finish'], $bd_format)
+			);
+		} else {
+			$event_end = '';
+		}
 
 		if ($simple) {
-			$o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
+			if (!empty($event['summary'])) {
+				$o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
+			}
 
-			$o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
+			if (!empty($event['desc'])) {
+				$o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
+			}
 
 			$o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";
 
@@ -56,7 +63,7 @@ class Event extends BaseObject
 				$o .= "<h4>" . L10n::t('Finishes:') . "</h4><p>" . $event_end . "</p>";
 			}
 
-			if (strlen($event['location'])) {
+			if (!empty($event['location'])) {
 				$o .= "<h4>" . L10n::t('Location:') . "</h4><p>" . BBCode::convert($event['location'], false, $simple) . "</p>";
 			}
 
@@ -68,20 +75,22 @@ class Event extends BaseObject
 		$o .= '<div class="summary event-summary">' . BBCode::convert($event['summary'], false, $simple) . '</div>' . "\r\n";
 
 		$o .= '<div class="event-start"><span class="event-label">' . L10n::t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
-			. DateTimeFormat::utc($event['start'], (($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
+			. DateTimeFormat::utc($event['start'], (!empty($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
 			. '" >' . $event_start
 			. '</span></div>' . "\r\n";
 
 		if (!$event['nofinish']) {
 			$o .= '<div class="event-end" ><span class="event-label">' . L10n::t('Finishes:') . '</span>&nbsp;<span class="dtend" title="'
-				. DateTimeFormat::utc($event['finish'], (($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
+				. DateTimeFormat::utc($event['finish'], (!empty($event['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s'))
 				. '" >' . $event_end
 				. '</span></div>' . "\r\n";
 		}
 
-		$o .= '<div class="description event-description">' . BBCode::convert($event['desc'], false, $simple) . '</div>' . "\r\n";
+		if (!empty($event['desc'])) {
+			$o .= '<div class="description event-description">' . BBCode::convert($event['desc'], false, $simple) . '</div>' . "\r\n";
+		}
 
-		if (strlen($event['location'])) {
+		if (!empty($event['location'])) {
 			$o .= '<div class="event-location"><span class="event-label">' . L10n::t('Location:') . '</span>&nbsp;<span class="location">'
 				. BBCode::convert($event['location'], false, $simple)
 				. '</span></div>' . "\r\n";
@@ -214,7 +223,7 @@ class Event extends BaseObject
 			return;
 		}
 
-		dba::delete('event', ['id' => $event_id]);
+		DBA::delete('event', ['id' => $event_id]);
 		logger("Deleted event ".$event_id, LOGGER_DEBUG);
 	}
 
@@ -234,7 +243,7 @@ class Event extends BaseObject
 		$event['id']        = intval(defaults($arr, 'id'       , 0));
 		$event['uid']       = intval(defaults($arr, 'uid'      , 0));
 		$event['cid']       = intval(defaults($arr, 'cid'      , 0));
-		$event['uri']       =        defaults($arr, 'uri'      , item_new_uri($a->get_hostname(), $event['uid']));
+		$event['uri']       =        defaults($arr, 'uri'      , Item::newURI($event['uid']));
 		$event['type']      =        defaults($arr, 'type'     , 'event');
 		$event['summary']   =        defaults($arr, 'summary'  , '');
 		$event['desc']      =        defaults($arr, 'desc'     , '');
@@ -262,17 +271,17 @@ class Event extends BaseObject
 			$conditions['self'] = true;
 		}
 
-		$contact = dba::selectFirst('contact', [], $conditions);
+		$contact = DBA::selectFirst('contact', [], $conditions);
 
 		// Existing event being modified.
 		if ($event['id']) {
 			// has the event actually changed?
-			$existing_event = dba::selectFirst('event', ['edited'], ['id' => $event['id'], 'uid' => $event['uid']]);
-			if ((! DBM::is_result($existing_event)) || ($existing_event['edited'] === $event['edited'])) {
+			$existing_event = DBA::selectFirst('event', ['edited'], ['id' => $event['id'], 'uid' => $event['uid']]);
+			if (!DBA::isResult($existing_event) || ($existing_event['edited'] === $event['edited'])) {
 
-				$item = dba::selectFirst('item', [], ['event-id' => $event['id'], 'uid' => $event['uid']]);
+				$item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
 
-				return DBM::is_result($item) ? $item['id'] : 0;
+				return DBA::isResult($item) ? $item['id'] : 0;
 			}
 
 			$updated_fields = [
@@ -287,10 +296,10 @@ class Event extends BaseObject
 				'nofinish' => $event['nofinish'],
 			];
 
-			dba::update('event', $updated_fields, ['id' => $event['id'], 'uid' => $event['uid']]);
+			DBA::update('event', $updated_fields, ['id' => $event['id'], 'uid' => $event['uid']]);
 
-			$item = dba::selectFirst('item', ['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
-			if (DBM::is_result($item)) {
+			$item = Item::selectFirst(['id'], ['event-id' => $event['id'], 'uid' => $event['uid']]);
+			if (DBA::isResult($item)) {
 				$object = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($event['uri']) . '</id>';
 				$object .= '<content>' . xmlify(self::getBBCode($event)) . '</content>';
 				$object .= '</object>' . "\n";
@@ -305,12 +314,12 @@ class Event extends BaseObject
 
 			Addon::callHooks('event_updated', $event['id']);
 		} else {
-			$event['guid'] = get_guid(32);
+			$event['guid']  = defaults($arr, 'guid', System::createGUID(32));
 
 			// New event. Store it.
-			dba::insert('event', $event);
+			DBA::insert('event', $event);
 
-			$event['id'] = dba::lastInsertId();
+			$event['id'] = DBA::lastInsertId();
 
 			$item_arr = [];
 
@@ -319,7 +328,8 @@ class Event extends BaseObject
 			$item_arr['uri']           = $event['uri'];
 			$item_arr['parent-uri']    = $event['uri'];
 			$item_arr['guid']          = $event['guid'];
-			$item_arr['type']          = 'activity';
+			$item_arr['plink']         = defaults($arr, 'plink', '');
+			$item_arr['post-type']     = Item::PT_EVENT;
 			$item_arr['wall']          = $event['cid'] ? 0 : 1;
 			$item_arr['contact-id']    = $contact['id'];
 			$item_arr['owner-name']    = $contact['name'];
@@ -464,15 +474,14 @@ class Event extends BaseObject
 		}
 
 		// Query for the event by event id
-		$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
-				`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
+		$r = q("SELECT `event`.*, `item`.`id` AS `itemid` FROM `event`
 			LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
 			WHERE `event`.`uid` = %d AND `event`.`id` = %d $sql_extra",
 			intval($owner_uid),
 			intval($event_id)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$return = self::removeDuplicates($r);
 		}
 
@@ -505,8 +514,7 @@ class Event extends BaseObject
 
 		// Query for the event by date.
 		// @todo Slow query (518 seconds to run), to be optimzed
-		$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
-					`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
+		$r = q("SELECT `event`.*, `item`.`id` AS `itemid` FROM `event`
 				LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
 				WHERE `event`.`uid` = %d AND event.ignore = %d
 				AND ((`adjust` = 0 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s')
@@ -514,15 +522,15 @@ class Event extends BaseObject
 				$sql_extra ",
 				intval($owner_uid),
 				intval($event_params["ignore"]),
-				dbesc($event_params["start"]),
-				dbesc($event_params["start"]),
-				dbesc($event_params["finish"]),
-				dbesc($event_params["adjust_start"]),
-				dbesc($event_params["adjust_start"]),
-				dbesc($event_params["adjust_finish"])
+				DBA::escape($event_params["start"]),
+				DBA::escape($event_params["start"]),
+				DBA::escape($event_params["finish"]),
+				DBA::escape($event_params["adjust_start"]),
+				DBA::escape($event_params["adjust_start"]),
+				DBA::escape($event_params["adjust_finish"])
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$return = self::removeDuplicates($r);
 		}
 
@@ -542,6 +550,14 @@ class Event extends BaseObject
 		$last_date = '';
 		$fmt = L10n::t('l, F j');
 		foreach ($event_result as $event) {
+			$item = Item::selectFirst(['plink', 'author-name', 'author-avatar', 'author-link'], ['id' => $event['itemid']]);
+			if (!DBA::isResult($item)) {
+				// Using default values when no item had been found
+				$item = ['plink' => '', 'author-name' => '', 'author-avatar' => '', 'author-link' => ''];
+			}
+
+			$event = array_merge($event, $item);
+
 			$start = $event['adjust'] ? DateTimeFormat::local($event['start'], 'c')  : DateTimeFormat::utc($event['start'], 'c');
 			$j     = $event['adjust'] ? DateTimeFormat::local($event['start'], 'j')  : DateTimeFormat::utc($event['start'], 'j');
 			$day   = $event['adjust'] ? DateTimeFormat::local($event['start'], $fmt) : DateTimeFormat::utc($event['start'], $fmt);
@@ -574,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']);
@@ -735,9 +757,9 @@ class Event extends BaseObject
 			$conditions += ['allow_cid' => '', 'allow_gid' => ''];
 		}
 
-		$events = dba::select('event', $fields, $conditions);
-		if (DBM::is_result($events)) {
-			$return = dba::inArray($events);
+		$events = DBA::select('event', $fields, $conditions);
+		if (DBA::isResult($events)) {
+			$return = DBA::toArray($events);
 		}
 
 		return $return;
@@ -759,8 +781,8 @@ class Event extends BaseObject
 	{
 		$process = false;
 
-		$user = dba::selectFirst('user', ['timezone'], ['uid' => $uid]);
-		if (DBM::is_result($user)) {
+		$user = DBA::selectFirst('user', ['timezone'], ['uid' => $uid]);
+		if (DBA::isResult($user)) {
 			$timezone = $user['timezone'];
 		}
 
@@ -803,10 +825,10 @@ class Event extends BaseObject
 	/**
 	 * @brief Format an item array with event data to HTML.
 	 *
-	 * @param arr $item Array with item and event data.
+	 * @param array $item Array with item and event data.
 	 * @return string HTML output.
 	 */
-	public static function getItemHTML($item) {
+	public static function getItemHTML(array $item) {
 		$same_date = false;
 		$finish    = false;
 
@@ -862,18 +884,18 @@ class Event extends BaseObject
 			if (substr($dtstart_title, 0, 10) === substr($dtend_title, 0, 10)) {
 				$same_date = true;
 			}
+		} else {
+			$dtend_title = '';
+			$dtend_dt = '';
+			$end_time = '';
+			$end_short = '';
 		}
 
 		// Format the event location.
 		$location = self::locationToArray($item['event-location']);
 
 		// Construct the profile link (magic-auth).
-		$sp = false;
-		$profile_link = best_link_url($item, $sp);
-
-		if (!$sp) {
-			$profile_link = Profile::zrl($profile_link);
-		}
+		$profile_link = Contact::magicLinkById($item['author-id']);
 
 		$tpl = get_markup_template('event_stream_item.tpl');
 		$return = replace_macros($tpl, [
diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index c413bef4f..18d817161 100644
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -6,18 +6,16 @@
  */
 namespace Friendica\Model;
 
+use Exception;
 use Friendica\Core\Config;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
-use Friendica\Model\Contact;
-use Friendica\Model\Profile;
+use Friendica\Database\DBA;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use dba;
-use Exception;
 
 require_once 'include/dba.php';
 
@@ -42,15 +40,15 @@ class GContact
 
 		// check supported networks
 		if (Config::get('system', 'diaspora_enabled')) {
-			$diaspora = NETWORK_DIASPORA;
+			$diaspora = Protocol::DIASPORA;
 		} else {
-			$diaspora = NETWORK_DFRN;
+			$diaspora = Protocol::DFRN;
 		}
 
 		if (!Config::get('system', 'ostatus_disabled')) {
-			$ostatus = NETWORK_OSTATUS;
+			$ostatus = Protocol::OSTATUS;
 		} else {
-			$ostatus = NETWORK_DFRN;
+			$ostatus = Protocol::DFRN;
 		}
 
 		// check if we search only communities or every contact
@@ -62,16 +60,16 @@ class GContact
 
 		$search .= "%";
 
-		$results = dba::p("SELECT `nurl` FROM `gcontact`
+		$results = DBA::p("SELECT `nurl` FROM `gcontact`
 			WHERE NOT `hide` AND `network` IN (?, ?, ?) AND
 				((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) AND
 				(`addr` LIKE ? OR `name` LIKE ? OR `nick` LIKE ?) $extra_sql
 				GROUP BY `nurl` ORDER BY `nurl` DESC LIMIT 1000",
-			NETWORK_DFRN, $ostatus, $diaspora, $search, $search, $search
+			Protocol::DFRN, $ostatus, $diaspora, $search, $search, $search
 		);
 
 		$gcontacts = [];
-		while ($result = dba::fetch($results)) {
+		while ($result = DBA::fetch($results)) {
 			$urlparts = parse_url($result["nurl"]);
 
 			// Ignore results that look strange.
@@ -100,33 +98,8 @@ class GContact
 			return;
 		}
 
-		$r = q(
-			"SELECT * FROM `glink` WHERE `cid` = %d AND `uid` = %d AND `gcid` = %d AND `zcid` = %d LIMIT 1",
-			intval($cid),
-			intval($uid),
-			intval($gcid),
-			intval($zcid)
-		);
-
-		if (!DBM::is_result($r)) {
-			q(
-				"INSERT INTO `glink` (`cid`, `uid`, `gcid`, `zcid`, `updated`) VALUES (%d, %d, %d, %d, '%s') ",
-				intval($cid),
-				intval($uid),
-				intval($gcid),
-				intval($zcid),
-				dbesc(DateTimeFormat::utcNow())
-			);
-		} else {
-			q(
-				"UPDATE `glink` SET `updated` = '%s' WHERE `cid` = %d AND `uid` = %d AND `gcid` = %d AND `zcid` = %d",
-				dbesc(DateTimeFormat::utcNow()),
-				intval($cid),
-				intval($uid),
-				intval($gcid),
-				intval($zcid)
-			);
-		}
+		$condition = ['cid' => $cid, 'uid' => $uid, 'gcid' => $gcid, 'zcid' => $zcid];
+		DBA::update('glink', ['updated' => DateTimeFormat::utcNow()], $condition, true);
 	}
 
 	/**
@@ -154,18 +127,18 @@ class GContact
 			throw new Exception("This (".$gcontact['url'].") doesn't seem to be an url.");
 		}
 
-		if (in_array($urlparts["host"],	["www.facebook.com", "facebook.com", "twitter.com", "identi.ca", "alpha.app.net"])) {
+		if (in_array($urlparts["host"],	["twitter.com", "identi.ca"])) {
 			throw new Exception('Contact from a non federated network ignored. ('.$gcontact['url'].')');
 		}
 
 		// Don't store the statusnet connector as network
-		// We can't simply set this to NETWORK_OSTATUS since the connector could have fetched posts from friendica as well
-		if ($gcontact['network'] == NETWORK_STATUSNET) {
+		// We can't simply set this to Protocol::OSTATUS since the connector could have fetched posts from friendica as well
+		if ($gcontact['network'] == Protocol::STATUSNET) {
 			$gcontact['network'] = "";
 		}
 
 		// Assure that there are no parameter fragments in the profile url
-		if (in_array($gcontact['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
+		if (in_array($gcontact['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
 			$gcontact['url'] = self::cleanContactUrl($gcontact['url']);
 		}
 
@@ -177,24 +150,19 @@ class GContact
 		}
 
 		if (!isset($gcontact['network'])) {
-			$r = q(
-				"SELECT `network` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
-				dbesc(normalise_link($gcontact['url'])),
-				dbesc(NETWORK_STATUSNET)
-			);
-			if (DBM::is_result($r)) {
-				$gcontact['network'] = $r[0]["network"];
+			$condition = ["`uid` = 0 AND `nurl` = ? AND `network` != '' AND `network` != ?",
+				normalise_link($gcontact['url']), Protocol::STATUSNET];
+			$contact = DBA::selectFirst('contact', ['network'], $condition);
+			if (DBA::isResult($contact)) {
+				$gcontact['network'] = $contact["network"];
 			}
 
-			if (($gcontact['network'] == "") || ($gcontact['network'] == NETWORK_OSTATUS)) {
-				$r = q(
-					"SELECT `network`, `url` FROM `contact` WHERE `uid` = 0 AND `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1",
-					dbesc($gcontact['url']),
-					dbesc(normalise_link($gcontact['url'])),
-					dbesc(NETWORK_STATUSNET)
-				);
-				if (DBM::is_result($r)) {
-					$gcontact['network'] = $r[0]["network"];
+			if (($gcontact['network'] == "") || ($gcontact['network'] == Protocol::OSTATUS)) {
+				$condition = ["`uid` = 0 AND `alias` IN (?, ?) AND `network` != '' AND `network` != ?",
+					$gcontact['url'], normalise_link($gcontact['url']), Protocol::STATUSNET];
+				$contact = DBA::selectFirst('contact', ['network'], $condition);
+				if (DBA::isResult($contact)) {
+					$gcontact['network'] = $contact["network"];
 				}
 			}
 		}
@@ -202,23 +170,20 @@ class GContact
 		$gcontact['server_url'] = '';
 		$gcontact['network'] = '';
 
-		$x = q(
-			"SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-			dbesc(normalise_link($gcontact['url']))
-		);
-
-		if (DBM::is_result($x)) {
-			if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) {
-				$gcontact['network'] = $x[0]["network"];
+		$fields = ['network', 'updated', 'server_url', 'url', 'addr'];
+		$gcnt = DBA::selectFirst('gcontact', $fields, ['nurl' => normalise_link($gcontact['url'])]);
+		if (DBA::isResult($gcnt)) {
+			if (!isset($gcontact['network']) && ($gcnt["network"] != Protocol::STATUSNET)) {
+				$gcontact['network'] = $gcnt["network"];
 			}
 			if ($gcontact['updated'] <= NULL_DATE) {
-				$gcontact['updated'] = $x[0]["updated"];
+				$gcontact['updated'] = $gcnt["updated"];
 			}
-			if (!isset($gcontact['server_url']) && (normalise_link($x[0]["server_url"]) != normalise_link($x[0]["url"]))) {
-				$gcontact['server_url'] = $x[0]["server_url"];
+			if (!isset($gcontact['server_url']) && (normalise_link($gcnt["server_url"]) != normalise_link($gcnt["url"]))) {
+				$gcontact['server_url'] = $gcnt["server_url"];
 			}
 			if (!isset($gcontact['addr'])) {
-				$gcontact['addr'] = $x[0]["addr"];
+				$gcontact['addr'] = $gcnt["addr"];
 			}
 		}
 
@@ -227,7 +192,7 @@ class GContact
 		) {
 			$data = Probe::uri($gcontact['url']);
 
-			if ($data["network"] == NETWORK_PHANTOM) {
+			if ($data["network"] == Protocol::PHANTOM) {
 				throw new Exception('Probing for URL '.$gcontact['url'].' failed');
 			}
 
@@ -237,10 +202,10 @@ class GContact
 
 			$gcontact = array_merge($gcontact, $data);
 
-			if ($alternate && ($gcontact['network'] == NETWORK_OSTATUS)) {
+			if ($alternate && ($gcontact['network'] == Protocol::OSTATUS)) {
 				// Delete the old entry - if it exists
-				if (dba::exists('gcontact', ['nurl' => normalise_link($orig_profile)])) {
-					dba::delete('gcontact', ['nurl' => normalise_link($orig_profile)]);
+				if (DBA::exists('gcontact', ['nurl' => normalise_link($orig_profile)])) {
+					DBA::delete('gcontact', ['nurl' => normalise_link($orig_profile)]);
 				}
 			}
 		}
@@ -249,7 +214,7 @@ class GContact
 			throw new Exception('No name and photo for URL '.$gcontact['url']);
 		}
 
-		if (!in_array($gcontact['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) {
+		if (!in_array($gcontact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
 			throw new Exception('No federated network ('.$gcontact['network'].') detected for URL '.$gcontact['url']);
 		}
 
@@ -292,7 +257,7 @@ class GContact
 		);
 
 		// logger("countCommonFriends: $uid $cid {$r[0]['total']}");
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return $r[0]['total'];
 		}
 		return 0;
@@ -314,7 +279,7 @@ class GContact
 			intval($uid)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return $r[0]['total'];
 		}
 
@@ -355,7 +320,7 @@ class GContact
 			intval($limit)
 		);
 
-		/// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
+		/// @TODO Check all calling-findings of this function if they properly use DBA::isResult()
 		return $r;
 	}
 
@@ -387,7 +352,7 @@ class GContact
 			intval($limit)
 		);
 
-		/// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
+		/// @TODO Check all calling-findings of this function if they properly use DBA::isResult()
 		return $r;
 	}
 
@@ -407,7 +372,7 @@ class GContact
 			intval($uid)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return $r[0]['total'];
 		}
 
@@ -438,7 +403,7 @@ class GContact
 			intval($limit)
 		);
 
-		/// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
+		/// @TODO Check all calling-findings of this function if they properly use DBA::isResult()
 		return $r;
 	}
 
@@ -463,14 +428,14 @@ class GContact
 		//	return $list;
 		//}
 
-		$network = [NETWORK_DFRN];
+		$network = [Protocol::DFRN];
 
 		if (Config::get('system', 'diaspora_enabled')) {
-			$network[] = NETWORK_DIASPORA;
+			$network[] = Protocol::DIASPORA;
 		}
 
 		if (!Config::get('system', 'ostatus_disabled')) {
-			$network[] = NETWORK_OSTATUS;
+			$network[] = Protocol::OSTATUS;
 		}
 
 		$sql_network = implode("', '", $network);
@@ -492,13 +457,13 @@ class GContact
 			intval($uid),
 			intval($uid),
 			intval($uid),
-			dbesc(NULL_DATE),
+			DBA::escape(NULL_DATE),
 			$sql_network,
 			intval($start),
 			intval($limit)
 		);
 
-		if (DBM::is_result($r) && count($r) >= ($limit -1)) {
+		if (DBA::isResult($r) && count($r) >= ($limit -1)) {
 			/*
 			* Uncommented because the result of the queries are to big to store it in the cache.
 			* We need to decide if we want to change the db column type or if we want to delete it.
@@ -521,7 +486,7 @@ class GContact
 			intval($uid),
 			intval($uid),
 			intval($uid),
-			dbesc(NULL_DATE),
+			DBA::escape(NULL_DATE),
 			$sql_network,
 			intval($start),
 			intval($limit)
@@ -564,15 +529,16 @@ class GContact
 
 		if (strlen(Config::get('system', 'directory'))) {
 			$x = Network::fetchUrl(get_server()."/pubsites");
-			if ($x) {
+			if (!empty($x)) {
 				$j = json_decode($x);
-				if ($j->entries) {
+				if (!empty($j->entries)) {
 					foreach ($j->entries as $entry) {
 						PortableContact::checkServer($entry->url);
 
 						$url = $entry->url . '/poco';
-						if (! in_array($url, $done)) {
-							PortableContact::loadWorker(0, 0, 0, $entry->url . '/poco');
+						if (!in_array($url, $done)) {
+							PortableContact::loadWorker(0, 0, 0, $url);
+							$done[] = $url;
 						}
 					}
 				}
@@ -582,11 +548,11 @@ class GContact
 		// Query your contacts from Friendica and Redmatrix/Hubzilla for their contacts
 		$r = q(
 			"SELECT DISTINCT(`poco`) AS `poco` FROM `contact` WHERE `network` IN ('%s', '%s')",
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_DIASPORA)
+			DBA::escape(Protocol::DFRN),
+			DBA::escape(Protocol::DIASPORA)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r as $rr) {
 				$base = substr($rr['poco'], 0, strrpos($rr['poco'], '/'));
 				if (! in_array($base, $done)) {
@@ -636,9 +602,9 @@ class GContact
 	 */
 	public static function fixAlternateContactAddress(&$contact)
 	{
-		if (($contact["network"] == NETWORK_OSTATUS) && PortableContact::alternateOStatusUrl($contact["url"])) {
+		if (($contact["network"] == Protocol::OSTATUS) && PortableContact::alternateOStatusUrl($contact["url"])) {
 			$data = Probe::uri($contact["url"]);
-			if ($contact["network"] == NETWORK_OSTATUS) {
+			if ($contact["network"] == Protocol::OSTATUS) {
 				logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
 				$contact["url"] = $data["url"];
 				$contact["addr"] = $data["addr"];
@@ -662,13 +628,18 @@ class GContact
 		$last_failure_str = '';
 		$last_contact_str = '';
 
-		if (in_array($contact["network"], [NETWORK_PHANTOM])) {
+		if (empty($contact["network"])) {
+			logger("Empty network for contact url ".$contact["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
+			return false;
+		}
+
+		if (in_array($contact["network"], [Protocol::PHANTOM])) {
 			logger("Invalid network for contact url ".$contact["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
 			return false;
 		}
 
-		if ($contact["network"] == NETWORK_STATUSNET) {
-			$contact["network"] = NETWORK_OSTATUS;
+		if ($contact["network"] == Protocol::STATUSNET) {
+			$contact["network"] = Protocol::OSTATUS;
 		}
 
 		// All new contacts are hidden by default
@@ -680,58 +651,55 @@ class GContact
 		self::fixAlternateContactAddress($contact);
 
 		// Remove unwanted parts from the contact url (e.g. "?zrl=...")
-		if (in_array($contact["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
+		if (in_array($contact["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
 			$contact["url"] = self::cleanContactUrl($contact["url"]);
 		}
 
-		dba::lock('gcontact');
-		$r = q(
-			"SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-			dbesc(normalise_link($contact["url"]))
-		);
-
-		if (DBM::is_result($r)) {
-			$gcontact_id = $r[0]["id"];
+		DBA::lock('gcontact');
+		$fields = ['id', 'last_contact', 'last_failure', 'network'];
+		$gcnt = DBA::selectFirst('gcontact', $fields, ['nurl' => normalise_link($contact["url"])]);
+		if (DBA::isResult($gcnt)) {
+			$gcontact_id = $gcnt["id"];
 
 			// Update every 90 days
-			if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
-				$last_failure_str = $r[0]["last_failure"];
-				$last_failure = strtotime($r[0]["last_failure"]);
-				$last_contact_str = $r[0]["last_contact"];
-				$last_contact = strtotime($r[0]["last_contact"]);
+			if (in_array($gcnt["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
+				$last_failure_str = $gcnt["last_failure"];
+				$last_failure = strtotime($gcnt["last_failure"]);
+				$last_contact_str = $gcnt["last_contact"];
+				$last_contact = strtotime($gcnt["last_contact"]);
 				$doprobing = (((time() - $last_contact) > (90 * 86400)) && ((time() - $last_failure) > (90 * 86400)));
 			}
 		} else {
+			$contact['location'] = defaults($contact, 'location', '');
+			$contact['about'] = defaults($contact, 'about', '');
+			$contact['generation'] = defaults($contact, 'generation', 0);
+
 			q(
 				"INSERT INTO `gcontact` (`name`, `nick`, `addr` , `network`, `url`, `nurl`, `photo`, `created`, `updated`, `location`, `about`, `hide`, `generation`)
 				VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
-				dbesc($contact["name"]),
-				dbesc($contact["nick"]),
-				dbesc($contact["addr"]),
-				dbesc($contact["network"]),
-				dbesc($contact["url"]),
-				dbesc(normalise_link($contact["url"])),
-				dbesc($contact["photo"]),
-				dbesc(DateTimeFormat::utcNow()),
-				dbesc(DateTimeFormat::utcNow()),
-				dbesc($contact["location"]),
-				dbesc($contact["about"]),
+				DBA::escape($contact["name"]),
+				DBA::escape($contact["nick"]),
+				DBA::escape($contact["addr"]),
+				DBA::escape($contact["network"]),
+				DBA::escape($contact["url"]),
+				DBA::escape(normalise_link($contact["url"])),
+				DBA::escape($contact["photo"]),
+				DBA::escape(DateTimeFormat::utcNow()),
+				DBA::escape(DateTimeFormat::utcNow()),
+				DBA::escape($contact["location"]),
+				DBA::escape($contact["about"]),
 				intval($contact["hide"]),
 				intval($contact["generation"])
 			);
 
-			$r = q(
-				"SELECT `id`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
-				dbesc(normalise_link($contact["url"]))
-			);
-
-			if (DBM::is_result($r)) {
-				$gcontact_id = $r[0]["id"];
-
-				$doprobing = in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""]);
+			$condition = ['nurl' => normalise_link($contact["url"])];
+			$cnt = DBA::selectFirst('gcontact', ['id', 'network'], $condition, ['order' => ['id']]);
+			if (DBA::isResult($cnt)) {
+				$gcontact_id = $cnt["id"];
+				$doprobing = in_array($cnt["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""]);
 			}
 		}
-		dba::unlock();
+		DBA::unlock();
 
 		if ($doprobing) {
 			logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
@@ -782,11 +750,11 @@ class GContact
 
 		// Bugfix: We had an error in the storing of keywords which lead to the "0"
 		// This value is still transmitted via poco.
-		if ($contact["keywords"] == "0") {
+		if (!empty($contact["keywords"]) && ($contact["keywords"] == "0")) {
 			unset($contact["keywords"]);
 		}
 
-		if ($public_contact[0]["keywords"] == "0") {
+		if (!empty($public_contact[0]["keywords"]) && ($public_contact[0]["keywords"] == "0")) {
 			$public_contact[0]["keywords"] = "";
 		}
 
@@ -803,24 +771,24 @@ class GContact
 
 		$fields["hide"] = $public_contact[0]["hide"];
 
-		if ($contact["network"] == NETWORK_STATUSNET) {
-			$contact["network"] = NETWORK_OSTATUS;
+		if ($contact["network"] == Protocol::STATUSNET) {
+			$contact["network"] = Protocol::OSTATUS;
 		}
 
 		// Replace alternate OStatus user format with the primary one
 		self::fixAlternateContactAddress($contact);
 
 		if (!isset($contact["updated"])) {
-			$contact["updated"] = DBM::date();
+			$contact["updated"] = DateTimeFormat::utcNow();
 		}
 
-		if ($contact["network"] == NETWORK_TWITTER) {
+		if ($contact["network"] == Protocol::TWITTER) {
 			$contact["server_url"] = 'http://twitter.com';
 		}
 
 		if ($contact["server_url"] == "") {
 			$data = Probe::uri($contact["url"]);
-			if ($data["network"] != NETWORK_PHANTOM) {
+			if ($data["network"] != Protocol::PHANTOM) {
 				$contact["server_url"] = $data['baseurl'];
 			}
 		} else {
@@ -854,7 +822,7 @@ class GContact
 			logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG);
 			$condition = ['`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
 					normalise_link($contact["url"]), $contact["generation"]];
-			$contact["updated"] = DBM::date($contact["updated"]);
+			$contact["updated"] = DateTimeFormat::utc($contact["updated"]);
 
 			$updated = ['photo' => $contact['photo'], 'name' => $contact['name'],
 					'nick' => $contact['nick'], 'addr' => $contact['addr'],
@@ -867,14 +835,14 @@ class GContact
 					'generation' => $contact['generation'], 'updated' => $contact['updated'],
 					'server_url' => $contact['server_url'], 'connect' => $contact['connect']];
 
-			dba::update('gcontact', $updated, $condition, $fields);
+			DBA::update('gcontact', $updated, $condition, $fields);
 
 			// Now update the contact entry with the user id "0" as well.
 			// This is used for the shadow copies of public items.
 			/// @todo Check if we really should do this.
 			// The quality of the gcontact table is mostly lower than the public contact
-			$public_contact = dba::selectFirst('contact', ['id'], ['nurl' => normalise_link($contact["url"]), 'uid' => 0]);
-			if (DBM::is_result($public_contact)) {
+			$public_contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link($contact["url"]), 'uid' => 0]);
+			if (DBA::isResult($public_contact)) {
 				logger("Update public contact ".$public_contact["id"], LOGGER_DEBUG);
 
 				Contact::updateAvatar($contact["photo"], 0, $public_contact["id"]);
@@ -883,7 +851,7 @@ class GContact
 						'network', 'bd', 'gender',
 						'keywords', 'alias', 'contact-type',
 						'url', 'location', 'about'];
-				$old_contact = dba::selectFirst('contact', $fields, ['id' => $public_contact["id"]]);
+				$old_contact = DBA::selectFirst('contact', $fields, ['id' => $public_contact["id"]]);
 
 				// Update it with the current values
 				$fields = ['name' => $contact['name'], 'nick' => $contact['nick'],
@@ -899,7 +867,7 @@ class GContact
 				}
 
 
-				dba::update('contact', $fields, ['id' => $public_contact["id"]], $old_contact);
+				DBA::update('contact', $fields, ['id' => $public_contact["id"]], $old_contact);
 			}
 		}
 
@@ -916,7 +884,7 @@ class GContact
 	{
 		$data = Probe::uri($url);
 
-		if (in_array($data["network"], [NETWORK_PHANTOM])) {
+		if (in_array($data["network"], [Protocol::PHANTOM])) {
 			logger("Invalid network for contact url ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
 			return;
 		}
@@ -947,6 +915,11 @@ class GContact
 			intval($uid)
 		);
 
+		if (!DBA::isResult($r)) {
+			logger('Cannot find user with uid=' . $uid, LOGGER_INFO);
+			return false;
+		}
+
 		$location = Profile::formatLocation(
 			["locality" => $r[0]["locality"], "region" => $r[0]["region"], "country-name" => $r[0]["country-name"]]
 		);
@@ -965,7 +938,7 @@ class GContact
 				"hide" => ($r[0]["hidewall"] || !$r[0]["net-publish"]),
 				"nick" => $r[0]["nickname"], "addr" => $addr,
 				"connect" => $addr, "server_url" => System::baseUrl(),
-				"generation" => 1, "network" => NETWORK_DFRN];
+				"generation" => 1, "network" => Protocol::DFRN];
 
 		self::update($gcontact);
 	}
@@ -991,7 +964,7 @@ class GContact
 
 		$statistics = json_decode($result["body"]);
 
-		if (is_object($statistics->config)) {
+		if (!empty($statistics->config)) {
 			if ($statistics->config->instance_with_ssl) {
 				$server = "https://";
 			} else {
@@ -1001,8 +974,7 @@ class GContact
 			$server .= $statistics->config->instance_address;
 
 			$hostname = $statistics->config->instance_address;
-		} else {
-			/// @TODO is_object() above means here no object, still $statistics is being used as object
+		} elseif (!empty($statistics)) {
 			if ($statistics->instance_with_ssl) {
 				$server = "https://";
 			} else {
@@ -1014,7 +986,7 @@ class GContact
 			$hostname = $statistics->instance_address;
 		}
 
-		if (is_object($statistics->users)) {
+		if (!empty($statistics->users)) {
 			foreach ($statistics->users as $nick => $user) {
 				$profile_url = $server."/".$user->nickname;
 
@@ -1022,9 +994,13 @@ class GContact
 						"name" => $user->fullname,
 						"addr" => $user->nickname."@".$hostname,
 						"nick" => $user->nickname,
-						"about" => $user->bio,
-						"network" => NETWORK_OSTATUS,
+						"network" => Protocol::OSTATUS,
 						"photo" => System::baseUrl()."/images/person-175.jpg"];
+
+				if (isset($user->bio)) {
+					$contact["about"] = $user->bio;
+				}
+
 				self::getId($contact);
 			}
 		}
@@ -1042,17 +1018,17 @@ class GContact
 
 		$r = q(
 			"SELECT `nurl`, `url` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `network` = '%s' AND `last_poco_query` < '%s' ORDER BY RAND() LIMIT 5",
-			dbesc(NETWORK_OSTATUS),
-			dbesc($last_update)
+			DBA::escape(Protocol::OSTATUS),
+			DBA::escape($last_update)
 		);
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return;
 		}
 
 		foreach ($r as $server) {
 			self::fetchGsUsers($server["url"]);
-			q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(DateTimeFormat::utcNow()), dbesc($server["nurl"]));
+			q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", DBA::escape(DateTimeFormat::utcNow()), DBA::escape($server["nurl"]));
 		}
 	}
 
@@ -1066,10 +1042,10 @@ class GContact
 					AND `last_contact` >= `last_failure`
 					AND `updated` > UTC_TIMESTAMP - INTERVAL 1 MONTH
 				ORDER BY rand() LIMIT 1",
-			dbesc(NETWORK_DFRN)
+			DBA::escape(Protocol::DFRN)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return dirname($r[0]['url']);
 		}
 
diff --git a/src/Model/Group.php b/src/Model/Group.php
index 50a3affa1..71f794118 100644
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -6,8 +6,7 @@ namespace Friendica\Model;
 
 use Friendica\BaseObject;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
-use dba;
+use Friendica\Database\DBA;
 
 require_once 'boot.php';
 require_once 'include/dba.php';
@@ -38,17 +37,17 @@ class Group extends BaseObject
 				// all the old members are gone, but the group remains so we don't break any security
 				// access lists. What we're doing here is reviving the dead group, but old content which
 				// was restricted to this group may now be seen by the new group members.
-				$group = dba::selectFirst('group', ['deleted'], ['id' => $gid]);
-				if (DBM::is_result($group) && $group['deleted']) {
-					dba::update('group', ['deleted' => 0], ['id' => $gid]);
+				$group = DBA::selectFirst('group', ['deleted'], ['id' => $gid]);
+				if (DBA::isResult($group) && $group['deleted']) {
+					DBA::update('group', ['deleted' => 0], ['id' => $gid]);
 					notice(L10n::t('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.') . EOL);
 				}
 				return true;
 			}
 
-			$return = dba::insert('group', ['uid' => $uid, 'name' => $name]);
+			$return = DBA::insert('group', ['uid' => $uid, 'name' => $name]);
 			if ($return) {
-				$return = dba::lastInsertId();
+				$return = DBA::lastInsertId();
 			}
 		}
 		return $return;
@@ -64,7 +63,7 @@ class Group extends BaseObject
 	 */
 	public static function update($id, $name)
 	{
-		return dba::update('group', ['name' => $name], ['id' => $id]);
+		return DBA::update('group', ['name' => $name], ['id' => $id]);
 	}
 
 	/**
@@ -76,11 +75,11 @@ class Group extends BaseObject
 	public static function getIdsByContactId($cid)
 	{
 		$condition = ['contact-id' => $cid];
-		$stmt = dba::select('group_member', ['gid'], $condition);
+		$stmt = DBA::select('group_member', ['gid'], $condition);
 
 		$return = [];
 
-		while ($group = dba::fetch($stmt)) {
+		while ($group = DBA::fetch($stmt)) {
 			$return[] = $group['gid'];
 		}
 
@@ -99,7 +98,7 @@ class Group extends BaseObject
 	 */
 	public static function countUnseen()
 	{
-		$stmt = dba::p("SELECT `group`.`id`, `group`.`name`,
+		$stmt = DBA::p("SELECT `group`.`id`, `group`.`name`,
 				(SELECT COUNT(*) FROM `item` FORCE INDEX (`uid_unseen_contactid`)
 					WHERE `uid` = ?
 					AND `unseen`
@@ -114,7 +113,7 @@ class Group extends BaseObject
 			local_user()
 		);
 
-		return dba::inArray($stmt);
+		return DBA::toArray($stmt);
 	}
 
 	/**
@@ -132,8 +131,8 @@ class Group extends BaseObject
 			return false;
 		}
 
-		$group = dba::selectFirst('group', ['id'], ['uid' => $uid, 'name' => $name]);
-		if (DBM::is_result($group)) {
+		$group = DBA::selectFirst('group', ['id'], ['uid' => $uid, 'name' => $name]);
+		if (DBA::isResult($group)) {
 			return $group['id'];
 		}
 
@@ -151,14 +150,14 @@ class Group extends BaseObject
 			return false;
 		}
 
-		$group = dba::selectFirst('group', ['uid'], ['id' => $gid]);
-		if (!DBM::is_result($group)) {
+		$group = DBA::selectFirst('group', ['uid'], ['id' => $gid]);
+		if (!DBA::isResult($group)) {
 			return false;
 		}
 
 		// remove group from default posting lists
-		$user = dba::selectFirst('user', ['def_gid', 'allow_gid', 'deny_gid'], ['uid' => $group['uid']]);
-		if (DBM::is_result($user)) {
+		$user = DBA::selectFirst('user', ['def_gid', 'allow_gid', 'deny_gid'], ['uid' => $group['uid']]);
+		if (DBA::isResult($user)) {
 			$change = false;
 
 			if ($user['def_gid'] == $gid) {
@@ -175,15 +174,15 @@ class Group extends BaseObject
 			}
 
 			if ($change) {
-				dba::update('user', $user, ['uid' => $group['uid']]);
+				DBA::update('user', $user, ['uid' => $group['uid']]);
 			}
 		}
 
 		// remove all members
-		dba::delete('group_member', ['gid' => $gid]);
+		DBA::delete('group_member', ['gid' => $gid]);
 
 		// remove group
-		$return = dba::update('group', ['deleted' => 1], ['id' => $gid]);
+		$return = DBA::update('group', ['deleted' => 1], ['id' => $gid]);
 
 		return $return;
 	}
@@ -221,12 +220,12 @@ class Group extends BaseObject
 			return false;
 		}
 
-		$row_exists = dba::exists('group_member', ['gid' => $gid, 'contact-id' => $cid]);
+		$row_exists = DBA::exists('group_member', ['gid' => $gid, 'contact-id' => $cid]);
 		if ($row_exists) {
 			// Row already existing, nothing to do
 			$return = true;
 		} else {
-			$return = dba::insert('group_member', ['gid' => $gid, 'contact-id' => $cid]);
+			$return = DBA::insert('group_member', ['gid' => $gid, 'contact-id' => $cid]);
 		}
 
 		return $return;
@@ -245,7 +244,7 @@ class Group extends BaseObject
 			return false;
 		}
 
-		$return = dba::delete('group_member', ['gid' => $gid, 'contact-id' => $cid]);
+		$return = DBA::delete('group_member', ['gid' => $gid, 'contact-id' => $cid]);
 
 		return $return;
 	}
@@ -274,36 +273,25 @@ class Group extends BaseObject
 	 *
 	 * @param array $group_ids
 	 * @param boolean $check_dead
-	 * @param boolean $use_gcontact
 	 * @return array
 	 */
-	public static function expand($group_ids, $check_dead = false, $use_gcontact = false)
+	public static function expand($group_ids, $check_dead = false)
 	{
 		if (!is_array($group_ids) || !count($group_ids)) {
 			return [];
 		}
 
-		$condition = '`gid` IN (' . substr(str_repeat("?, ", count($group_ids)), 0, -2) . ')';
-		if ($use_gcontact) {
-			$sql = 'SELECT `gcontact`.`id` AS `contact-id` FROM `group_member`
-					INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
-					INNER JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl`
-				WHERE ' . $condition;
-			$param_arr = array_merge([$sql], $group_ids);
-			$stmt = call_user_func_array('dba::p', $param_arr);
-		} else {
-			$condition_array = array_merge([$condition], $group_ids);
-			$stmt = dba::select('group_member', ['contact-id'], $condition_array);
-		}
+		$stmt = DBA::select('group_member', ['contact-id'], ['gid' => $group_ids]);
 
 		$return = [];
-		while($group_member = dba::fetch($stmt)) {
+		while($group_member = DBA::fetch($stmt)) {
 			$return[] = $group_member['contact-id'];
 		}
 
-		if ($check_dead && !$use_gcontact) {
+		if ($check_dead) {
 			Contact::pruneUnavailable($return);
 		}
+
 		return $return;
 	}
 
@@ -319,7 +307,7 @@ class Group extends BaseObject
 	{
 		$o = '';
 
-		$stmt = dba::select('group', [], ['deleted' => 0, 'uid' => $uid], ['order' => ['name']]);
+		$stmt = DBA::select('group', [], ['deleted' => 0, 'uid' => $uid], ['order' => ['name']]);
 
 		$display_groups = [
 			[
@@ -328,7 +316,7 @@ class Group extends BaseObject
 				'selected' => ''
 			]
 		];
-		while ($group = dba::fetch($stmt)) {
+		while ($group = DBA::fetch($stmt)) {
 			$display_groups[] = [
 				'name' => $group['name'],
 				'id' => $group['id'],
@@ -361,7 +349,7 @@ class Group extends BaseObject
 	 * @param int $cid
 	 * @return string
 	 */
-	public static function sidebarWidget($every = 'contacts', $each = 'group', $editmode = 'standard', $group_id = 0, $cid = 0)
+	public static function sidebarWidget($every = 'contacts', $each = 'group', $editmode = 'standard', $group_id = '', $cid = 0)
 	{
 		$o = '';
 
@@ -373,19 +361,19 @@ class Group extends BaseObject
 			[
 				'text' => L10n::t('Everybody'),
 				'id' => 0,
-				'selected' => (($group_id == 0) ? 'group-selected' : ''),
+				'selected' => (($group_id === 'everyone') ? 'group-selected' : ''),
 				'href' => $every,
 			]
 		];
 
-		$stmt = dba::select('group', [], ['deleted' => 0, 'uid' => local_user()], ['order' => ['name']]);
+		$stmt = DBA::select('group', [], ['deleted' => 0, 'uid' => local_user()], ['order' => ['name']]);
 
 		$member_of = [];
 		if ($cid) {
 			$member_of = self::getIdsByContactId($cid);
 		}
 
-		while ($group = dba::fetch($stmt)) {
+		while ($group = DBA::fetch($stmt)) {
 			$selected = (($group_id == $group['id']) ? ' group-selected' : '');
 
 			if ($editmode == 'full') {
@@ -417,6 +405,7 @@ class Group extends BaseObject
 			'grouppage' => 'group/',
 			'$edittext' => L10n::t('Edit group'),
 			'$ungrouped' => $every === 'contacts' ? L10n::t('Contacts not in any group') : '',
+			'$ungrouped_selected' => (($group_id === 'none') ? 'group-selected' : ''),
 			'$createtext' => L10n::t('Create a new group'),
 			'$creategroup' => L10n::t('Group Name: '),
 			'$editgroupstext' => L10n::t('Edit groups'),
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 0bac3210d..d10a211a5 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -7,24 +7,23 @@
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
-use Friendica\Content\Text;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
+use Friendica\Core\Lock;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
-use Friendica\Model\Conversation;
-use Friendica\Model\Group;
-use Friendica\Model\Term;
+use Friendica\Model\PermissionSet;
+use Friendica\Model\ItemURI;
 use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\XML;
-use dba;
 use Text_LanguageDetect;
 
 require_once 'boot.php';
@@ -33,6 +32,737 @@ require_once 'include/text.php';
 
 class Item extends BaseObject
 {
+	// Posting types, inspired by https://www.w3.org/TR/activitystreams-vocabulary/#object-types
+	const PT_ARTICLE = 0;
+	const PT_NOTE = 1;
+	const PT_PAGE = 2;
+	const PT_IMAGE = 16;
+	const PT_AUDIO = 17;
+	const PT_VIDEO = 18;
+	const PT_DOCUMENT = 19;
+	const PT_EVENT = 32;
+	const PT_PERSONAL_NOTE = 128;
+
+	// Field list that is used to display the items
+	const DISPLAY_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network',
+			'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
+			'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', 'language',
+			'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
+			'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id',
+			'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
+			'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network',
+			'contact-id', 'contact-link', 'contact-name', 'contact-avatar',
+			'writable', 'self', 'cid', 'alias',
+			'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish',
+			'event-summary', 'event-desc', 'event-location', 'event-type',
+			'event-nofinish', 'event-adjust', 'event-ignore', 'event-id'];
+
+	// Field list that is used to deliver items via the protocols
+	const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid',
+			'created', 'edited', 'verb', 'object-type', 'object', 'target',
+			'private', 'title', 'body', 'location', 'coord', 'app',
+			'attach', 'tag', 'deleted', 'extid', 'post-type',
+			'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+			'author-id', 'author-link', 'owner-link', 'contact-uid',
+			'signed_text', 'signature', 'signer', 'network'];
+
+	// Field list for "item-content" table that is mixed with the item table
+	const MIXED_CONTENT_FIELDLIST = ['title', 'content-warning', 'body', 'location',
+			'coord', 'app', 'rendered-hash', 'rendered-html', 'verb',
+			'object-type', 'object', 'target-type', 'target', 'plink'];
+
+	// Field list for "item-content" table that is not present in the "item" table
+	const CONTENT_FIELDLIST = ['language'];
+
+	// Field list for additional delivery data
+	const DELIVERY_DATA_FIELDLIST = ['postopts', 'inform'];
+
+	// All fields in the item table
+	const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
+			'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid',
+			'uri-hash', 'created', 'edited', 'commented', 'received', 'changed', 'verb',
+			'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform',
+			'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type',
+			'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
+			'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global', 'network',
+			'title', 'content-warning', 'body', 'location', 'coord', 'app',
+			'rendered-hash', 'rendered-html', 'object-type', 'object', 'target-type', 'target',
+			'author-id', 'author-link', 'author-name', 'author-avatar',
+			'owner-id', 'owner-link', 'owner-name', 'owner-avatar'];
+
+	// Never reorder or remove entries from this list. Just add new ones at the end, if needed.
+	// The item-activity table only stores the index and needs this array to know the matching activity.
+	const ACTIVITIES = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
+
+	private static $legacy_mode = null;
+
+	public static function isLegacyMode()
+	{
+		if (is_null(self::$legacy_mode)) {
+			self::$legacy_mode = (Config::get("system", "post_update_version") < 1279);
+		}
+
+		return self::$legacy_mode;
+	}
+
+	/**
+	 * @brief returns an activity index from an activity string
+	 *
+	 * @param string $activity activity string
+	 * @return integer Activity index
+	 */
+	public static function activityToIndex($activity)
+	{
+		$index = array_search($activity, self::ACTIVITIES);
+
+		if (is_bool($index)) {
+			$index = -1;
+		}
+
+		return $index;
+	}
+
+	/**
+	 * @brief returns an activity string from an activity index
+	 *
+	 * @param integer $index activity index
+	 * @return string Activity string
+	 */
+	private static function indexToActivity($index)
+	{
+		if (is_null($index) || !array_key_exists($index, self::ACTIVITIES)) {
+			return '';
+		}
+
+		return self::ACTIVITIES[$index];
+	}
+
+	/**
+	 * @brief Fetch a single item row
+	 *
+	 * @param mixed $stmt statement object
+	 * @return array current row
+	 */
+	public static function fetch($stmt)
+	{
+		$row = DBA::fetch($stmt);
+
+		if (is_bool($row)) {
+			return $row;
+		}
+
+		// ---------------------- Transform item structure data ----------------------
+
+		// We prefer the data from the user's contact over the public one
+		if (!empty($row['author-link']) && !empty($row['contact-link']) &&
+			($row['author-link'] == $row['contact-link'])) {
+			if (isset($row['author-avatar']) && !empty($row['contact-avatar'])) {
+				$row['author-avatar'] = $row['contact-avatar'];
+			}
+			if (isset($row['author-name']) && !empty($row['contact-name'])) {
+				$row['author-name'] = $row['contact-name'];
+			}
+		}
+
+		if (!empty($row['owner-link']) && !empty($row['contact-link']) &&
+			($row['owner-link'] == $row['contact-link'])) {
+			if (isset($row['owner-avatar']) && !empty($row['contact-avatar'])) {
+				$row['owner-avatar'] = $row['contact-avatar'];
+			}
+			if (isset($row['owner-name']) && !empty($row['contact-name'])) {
+				$row['owner-name'] = $row['contact-name'];
+			}
+		}
+
+		// We can always comment on posts from these networks
+		if (array_key_exists('writable', $row) &&
+			in_array($row['internal-network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+			$row['writable'] = true;
+		}
+
+		// ---------------------- Transform item content data ----------------------
+
+		// Fetch data from the item-content table whenever there is content there
+		if (self::isLegacyMode()) {
+			$legacy_fields = array_merge(self::DELIVERY_DATA_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
+			foreach ($legacy_fields as $field) {
+				if (empty($row[$field]) && !empty($row['internal-item-' . $field])) {
+					$row[$field] = $row['internal-item-' . $field];
+				}
+				unset($row['internal-item-' . $field]);
+			}
+		}
+
+		if (!empty($row['internal-iaid']) && array_key_exists('verb', $row)) {
+			$row['verb'] = self::indexToActivity($row['internal-activity']);
+			if (array_key_exists('title', $row)) {
+				$row['title'] = '';
+			}
+			if (array_key_exists('body', $row)) {
+				$row['body'] = $row['verb'];
+			}
+			if (array_key_exists('object', $row)) {
+				$row['object'] = '';
+			}
+			if (array_key_exists('object-type', $row)) {
+				$row['object-type'] = ACTIVITY_OBJ_NOTE;
+			}
+		} elseif (array_key_exists('verb', $row) && in_array($row['verb'], ['', ACTIVITY_POST, ACTIVITY_SHARE])) {
+			// Posts don't have an object or target - but having tags or files.
+			// We safe some performance by building tag and file strings only here.
+			// We remove object and target since they aren't used for this type.
+			if (array_key_exists('object', $row)) {
+				$row['object'] = '';
+			}
+			if (array_key_exists('target', $row)) {
+				$row['target'] = '';
+			}
+		}
+
+		if (!array_key_exists('verb', $row) || in_array($row['verb'], ['', ACTIVITY_POST, ACTIVITY_SHARE])) {
+			// Build the tag string out of the term entries
+			if (array_key_exists('tag', $row) && empty($row['tag'])) {
+				$row['tag'] = Term::tagTextFromItemId($row['internal-iid']);
+			}
+
+			// Build the file string out of the term entries
+			if (array_key_exists('file', $row) && empty($row['file'])) {
+				$row['file'] = Term::fileTextFromItemId($row['internal-iid']);
+			}
+		}
+
+		if (array_key_exists('ignored', $row) && array_key_exists('internal-user-ignored', $row) && !is_null($row['internal-user-ignored'])) {
+			$row['ignored'] = $row['internal-user-ignored'];
+		}
+
+		// Remove internal fields
+		unset($row['internal-activity']);
+		unset($row['internal-network']);
+		unset($row['internal-iid']);
+		unset($row['internal-iaid']);
+		unset($row['internal-icid']);
+		unset($row['internal-user-ignored']);
+
+		return $row;
+	}
+
+	/**
+	 * @brief Fills an array with data from an item query
+	 *
+	 * @param object $stmt statement object
+	 * @return array Data array
+	 */
+	public static function inArray($stmt, $do_close = true) {
+		if (is_bool($stmt)) {
+			return $stmt;
+		}
+
+		$data = [];
+		while ($row = self::fetch($stmt)) {
+			$data[] = $row;
+		}
+		if ($do_close) {
+			DBA::close($stmt);
+		}
+		return $data;
+	}
+
+	/**
+	 * @brief Check if item data exists
+	 *
+	 * @param array $condition array of fields for condition
+	 *
+	 * @return boolean Are there rows for that condition?
+	 */
+	public static function exists($condition) {
+		$stmt = self::select(['id'], $condition, ['limit' => 1]);
+
+		if (is_bool($stmt)) {
+			$retval = $stmt;
+		} else {
+			$retval = (DBA::numRows($stmt) > 0);
+		}
+
+		DBA::close($stmt);
+
+		return $retval;
+	}
+
+	/**
+	 * Retrieve a single record from the item table for a given user and returns it in an associative array
+	 *
+	 * @brief Retrieve a single record from a table
+	 * @param integer $uid User ID
+	 * @param array  $fields
+	 * @param array  $condition
+	 * @param array  $params
+	 * @return bool|array
+	 * @see DBA::select
+	 */
+	public static function selectFirstForUser($uid, array $selected = [], array $condition = [], $params = [])
+	{
+		$params['uid'] = $uid;
+
+		if (empty($selected)) {
+			$selected = Item::DISPLAY_FIELDLIST;
+		}
+
+		return self::selectFirst($selected, $condition, $params);
+	}
+
+	/**
+	 * @brief Select rows from the item table for a given user
+	 *
+	 * @param integer $uid User ID
+	 * @param array  $selected  Array of selected fields, empty for all
+	 * @param array  $condition Array of fields for condition
+	 * @param array  $params    Array of several parameters
+	 *
+	 * @return boolean|object
+	 */
+	public static function selectForUser($uid, array $selected = [], array $condition = [], $params = [])
+	{
+		$params['uid'] = $uid;
+
+		if (empty($selected)) {
+			$selected = Item::DISPLAY_FIELDLIST;
+		}
+
+		return self::select($selected, $condition, $params);
+	}
+
+	/**
+	 * Retrieve a single record from the item table and returns it in an associative array
+	 *
+	 * @brief Retrieve a single record from a table
+	 * @param array  $fields
+	 * @param array  $condition
+	 * @param array  $params
+	 * @return bool|array
+	 * @see DBA::select
+	 */
+	public static function selectFirst(array $fields = [], array $condition = [], $params = [])
+	{
+		$params['limit'] = 1;
+
+		$result = self::select($fields, $condition, $params);
+
+		if (is_bool($result)) {
+			return $result;
+		} else {
+			$row = self::fetch($result);
+			DBA::close($result);
+			return $row;
+		}
+	}
+
+	/**
+	 * @brief Select rows from the item table
+	 *
+	 * @param array  $selected  Array of selected fields, empty for all
+	 * @param array  $condition Array of fields for condition
+	 * @param array  $params    Array of several parameters
+	 *
+	 * @return boolean|object
+	 */
+	public static function select(array $selected = [], array $condition = [], $params = [])
+	{
+		$uid = 0;
+		$usermode = false;
+
+		if (isset($params['uid'])) {
+			$uid = $params['uid'];
+			$usermode = true;
+		}
+
+		$fields = self::fieldlist($selected, $usermode);
+
+		$select_fields = self::constructSelectFields($fields, $selected);
+
+		$condition_string = DBA::buildCondition($condition);
+
+		$condition_string = self::addTablesToFields($condition_string, $fields);
+
+		if ($usermode) {
+			$condition_string = $condition_string . ' AND ' . self::condition(false);
+		}
+
+		$param_string = self::addTablesToFields(DBA::buildParameter($params), $fields);
+
+		$table = "`item` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, false, $usermode);
+
+		$sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string;
+
+		return DBA::p($sql, $condition);
+	}
+
+	/**
+	 * @brief Select rows from the starting post in the item table
+	 *
+	 * @param integer $uid User ID
+	 * @param array  $fields    Array of selected fields, empty for all
+	 * @param array  $condition Array of fields for condition
+	 * @param array  $params    Array of several parameters
+	 *
+	 * @return boolean|object
+	 */
+	public static function selectThreadForUser($uid, array $selected = [], array $condition = [], $params = [])
+	{
+		$params['uid'] = $uid;
+
+		if (empty($selected)) {
+			$selected = Item::DISPLAY_FIELDLIST;
+		}
+
+		return self::selectThread($selected, $condition, $params);
+	}
+
+	/**
+	 * Retrieve a single record from the starting post in the item table and returns it in an associative array
+	 *
+	 * @brief Retrieve a single record from a table
+	 * @param integer $uid User ID
+	 * @param array  $selected
+	 * @param array  $condition
+	 * @param array  $params
+	 * @return bool|array
+	 * @see DBA::select
+	 */
+	public static function selectFirstThreadForUser($uid, array $selected = [], array $condition = [], $params = [])
+	{
+		$params['uid'] = $uid;
+
+		if (empty($selected)) {
+			$selected = Item::DISPLAY_FIELDLIST;
+		}
+
+		return self::selectFirstThread($selected, $condition, $params);
+	}
+
+	/**
+	 * Retrieve a single record from the starting post in the item table and returns it in an associative array
+	 *
+	 * @brief Retrieve a single record from a table
+	 * @param array  $fields
+	 * @param array  $condition
+	 * @param array  $params
+	 * @return bool|array
+	 * @see DBA::select
+	 */
+	public static function selectFirstThread(array $fields = [], array $condition = [], $params = [])
+	{
+		$params['limit'] = 1;
+		$result = self::selectThread($fields, $condition, $params);
+
+		if (is_bool($result)) {
+			return $result;
+		} else {
+			$row = self::fetch($result);
+			DBA::close($result);
+			return $row;
+		}
+	}
+
+	/**
+	 * @brief Select rows from the starting post in the item table
+	 *
+	 * @param array  $selected  Array of selected fields, empty for all
+	 * @param array  $condition Array of fields for condition
+	 * @param array  $params    Array of several parameters
+	 *
+	 * @return boolean|object
+	 */
+	public static function selectThread(array $selected = [], array $condition = [], $params = [])
+	{
+		$uid = 0;
+		$usermode = false;
+
+		if (isset($params['uid'])) {
+			$uid = $params['uid'];
+			$usermode = true;
+		}
+
+		$fields = self::fieldlist($selected, $usermode);
+
+		$fields['thread'] = ['mention', 'ignored', 'iid'];
+
+		$threadfields = ['thread' => ['iid', 'uid', 'contact-id', 'owner-id', 'author-id',
+			'created', 'edited', 'commented', 'received', 'changed', 'wall', 'private',
+			'pubmail', 'moderated', 'visible', 'starred', 'ignored', 'post-type',
+			'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'network']];
+
+		$select_fields = self::constructSelectFields($fields, $selected);
+
+		$condition_string = DBA::buildCondition($condition);
+
+		$condition_string = self::addTablesToFields($condition_string, $threadfields);
+		$condition_string = self::addTablesToFields($condition_string, $fields);
+
+		if ($usermode) {
+			$condition_string = $condition_string . ' AND ' . self::condition(true);
+		}
+
+		$param_string = DBA::buildParameter($params);
+		$param_string = self::addTablesToFields($param_string, $threadfields);
+		$param_string = self::addTablesToFields($param_string, $fields);
+
+		$table = "`thread` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, true, $usermode);
+
+		$sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string;
+
+		return DBA::p($sql, $condition);
+	}
+
+	/**
+	 * @brief Returns a list of fields that are associated with the item table
+	 *
+	 * @return array field list
+	 */
+	private static function fieldlist($selected, $usermode)
+	{
+		$fields = [];
+
+		$fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
+			'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid',
+			'created', 'edited', 'commented', 'received', 'changed', 'psid', 'uri-hash',
+			'resource-id', 'event-id', 'tag', 'attach', 'post-type', 'file',
+			'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
+			'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global',
+			'id' => 'item_id', 'network', 'icid', 'iaid', 'id' => 'internal-iid',
+			'network' => 'internal-network', 'icid' => 'internal-icid',
+			'iaid' => 'internal-iaid'];
+
+		if ($usermode) {
+			$fields['user-item'] = ['ignored' => 'internal-user-ignored'];
+		}
+
+		$fields['item-activity'] = ['activity', 'activity' => 'internal-activity'];
+
+		$fields['item-content'] = array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
+
+		$fields['item-delivery-data'] = self::DELIVERY_DATA_FIELDLIST;
+
+		$fields['permissionset'] = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
+
+		$fields['author'] = ['url' => 'author-link', 'name' => 'author-name',
+			'thumb' => 'author-avatar', 'nick' => 'author-nick', 'network' => 'author-network'];
+
+		$fields['owner'] = ['url' => 'owner-link', 'name' => 'owner-name',
+			'thumb' => 'owner-avatar', 'nick' => 'owner-nick', 'network' => 'owner-network'];
+
+		$fields['contact'] = ['url' => 'contact-link', 'name' => 'contact-name', 'thumb' => 'contact-avatar',
+			'writable', 'self', 'id' => 'cid', 'alias', 'uid' => 'contact-uid',
+			'photo', 'name-date', 'uri-date', 'avatar-date', 'thumb', 'dfrn-id'];
+
+		$fields['parent-item'] = ['guid' => 'parent-guid', 'network' => 'parent-network'];
+
+		$fields['parent-item-author'] = ['url' => 'parent-author-link', 'name' => 'parent-author-name'];
+
+		$fields['event'] = ['created' => 'event-created', 'edited' => 'event-edited',
+			'start' => 'event-start','finish' => 'event-finish',
+			'summary' => 'event-summary','desc' => 'event-desc',
+			'location' => 'event-location', 'type' => 'event-type',
+			'nofinish' => 'event-nofinish','adjust' => 'event-adjust',
+			'ignore' => 'event-ignore', 'id' => 'event-id'];
+
+		$fields['sign'] = ['signed_text', 'signature', 'signer'];
+
+		return $fields;
+	}
+
+	/**
+	 * @brief Returns SQL condition for the "select" functions
+	 *
+	 * @param boolean $thread_mode Called for the items (false) or for the threads (true)
+	 *
+	 * @return string SQL condition
+	 */
+	private static function condition($thread_mode)
+	{
+		if ($thread_mode) {
+			$master_table = "`thread`";
+		} else {
+			$master_table = "`item`";
+		}
+		return sprintf("$master_table.`visible` AND NOT $master_table.`deleted` AND NOT $master_table.`moderated`
+			AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`)
+			AND (`user-author`.`blocked` IS NULL OR NOT `user-author`.`blocked`)
+			AND (`user-author`.`ignored` IS NULL OR NOT `user-author`.`ignored` OR `item`.`gravity` != %d)
+			AND (`user-owner`.`blocked` IS NULL OR NOT `user-owner`.`blocked`)
+			AND (`user-owner`.`ignored` IS NULL OR NOT `user-owner`.`ignored` OR `item`.`gravity` != %d) ",
+			GRAVITY_PARENT, GRAVITY_PARENT);
+	}
+
+	/**
+	 * @brief Returns all needed "JOIN" commands for the "select" functions
+	 *
+	 * @param integer $uid User ID
+	 * @param string $sql_commands The parts of the built SQL commands in the "select" functions
+	 * @param boolean $thread_mode Called for the items (false) or for the threads (true)
+	 *
+	 * @return string The SQL joins for the "select" functions
+	 */
+	private static function constructJoins($uid, $sql_commands, $thread_mode, $user_mode)
+	{
+		if ($thread_mode) {
+			$master_table = "`thread`";
+			$master_table_key = "`thread`.`iid`";
+			$joins = "STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid` ";
+		} else {
+			$master_table = "`item`";
+			$master_table_key = "`item`.`id`";
+			$joins = '';
+		}
+
+		if ($user_mode) {
+			$joins .= sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`
+				AND NOT `contact`.`blocked`
+				AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s)))
+				OR `contact`.`self` OR `item`.`gravity` != %d OR `contact`.`uid` = 0)
+				STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id` AND NOT `author`.`blocked`
+				STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id` AND NOT `owner`.`blocked`
+				LEFT JOIN `user-item` ON `user-item`.`iid` = $master_table_key AND `user-item`.`uid` = %d
+				LEFT JOIN `user-contact` AS `user-author` ON `user-author`.`cid` = $master_table.`author-id` AND `user-author`.`uid` = %d
+				LEFT JOIN `user-contact` AS `user-owner` ON `user-owner`.`cid` = $master_table.`owner-id` AND `user-owner`.`uid` = %d",
+				Contact::SHARING, Contact::FRIEND, GRAVITY_PARENT, intval($uid), intval($uid), intval($uid));
+		} else {
+			if (strpos($sql_commands, "`contact`.") !== false) {
+				$joins .= "LEFT JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`";
+			}
+			if (strpos($sql_commands, "`author`.") !== false) {
+				$joins .= " LEFT JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id`";
+			}
+			if (strpos($sql_commands, "`owner`.") !== false) {
+				$joins .= " LEFT JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id`";
+			}
+		}
+
+		if (strpos($sql_commands, "`group_member`.") !== false) {
+			$joins .= " STRAIGHT_JOIN `group_member` ON `group_member`.`contact-id` = $master_table.`contact-id`";
+		}
+
+		if (strpos($sql_commands, "`user`.") !== false) {
+			$joins .= " STRAIGHT_JOIN `user` ON `user`.`uid` = $master_table.`uid`";
+		}
+
+		if (strpos($sql_commands, "`event`.") !== false) {
+			$joins .= " LEFT JOIN `event` ON `event-id` = `event`.`id`";
+		}
+
+		if (strpos($sql_commands, "`sign`.") !== false) {
+			$joins .= " LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`";
+		}
+
+		if (strpos($sql_commands, "`item-activity`.") !== false) {
+			$joins .= " LEFT JOIN `item-activity` ON `item-activity`.`id` = `item`.`iaid`";
+		}
+
+		if (strpos($sql_commands, "`item-content`.") !== false) {
+			$joins .= " LEFT JOIN `item-content` ON `item-content`.`id` = `item`.`icid`";
+		}
+
+		if (strpos($sql_commands, "`item-delivery-data`.") !== false) {
+			$joins .= " LEFT JOIN `item-delivery-data` ON `item-delivery-data`.`iid` = `item`.`id`";
+		}
+
+		if (strpos($sql_commands, "`permissionset`.") !== false) {
+			$joins .= " LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`";
+		}
+
+		if ((strpos($sql_commands, "`parent-item`.") !== false) || (strpos($sql_commands, "`parent-author`.") !== false)) {
+			$joins .= " STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`";
+		}
+
+		if (strpos($sql_commands, "`parent-item-author`.") !== false) {
+			$joins .= " STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`";
+		}
+
+		return $joins;
+	}
+
+	/**
+	 * @brief Add the field list for the "select" functions
+	 *
+	 * @param array $fields The field definition array
+	 * @param array $selected The array with the selected fields from the "select" functions
+	 *
+	 * @return string The field list
+	 */
+	private static function constructSelectFields($fields, $selected)
+	{
+		if (!empty($selected)) {
+			$selected[] = 'internal-iid';
+			$selected[] = 'internal-iaid';
+			$selected[] = 'internal-icid';
+			$selected[] = 'internal-network';
+		}
+
+		if (in_array('verb', $selected)) {
+			$selected[] = 'internal-activity';
+		}
+
+		if (in_array('ignored', $selected)) {
+			$selected[] = 'internal-user-ignored';
+		}
+
+		$selection = [];
+		foreach ($fields as $table => $table_fields) {
+			foreach ($table_fields as $field => $select) {
+				if (empty($selected) || in_array($select, $selected)) {
+					$legacy_fields = array_merge(self::DELIVERY_DATA_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
+					if (self::isLegacyMode() && in_array($select, $legacy_fields)) {
+						$selection[] = "`item`.`".$select."` AS `internal-item-" . $select . "`";
+					}
+					if (is_int($field)) {
+						$selection[] = "`" . $table . "`.`" . $select . "`";
+					} else {
+						$selection[] = "`" . $table . "`.`" . $field . "` AS `" . $select . "`";
+					}
+				}
+			}
+		}
+		return implode(", ", $selection);
+	}
+
+	/**
+	 * @brief add table definition to fields in an SQL query
+	 *
+	 * @param string $query SQL query
+	 * @param array $fields The field definition array
+	 *
+	 * @return string the changed SQL query
+	 */
+	private static function addTablesToFields($query, $fields)
+	{
+		foreach ($fields as $table => $table_fields) {
+			foreach ($table_fields as $alias => $field) {
+				if (is_int($alias)) {
+					$replace_field = $field;
+				} else {
+					$replace_field = $alias;
+				}
+
+				$search = "/([^\.])`" . $field . "`/i";
+				$replace = "$1`" . $table . "`.`" . $replace_field . "`";
+				$query = preg_replace($search, $replace, $query);
+			}
+		}
+		return $query;
+	}
+
+	/**
+	 * @brief Generate a server unique item hash for linking between the item tables
+	 *
+	 * @param string $uri     Item URI
+	 * @param date   $created Item creation date
+	 *
+	 * @return string the item hash
+	 */
+	private static function itemHash($uri, $created)
+	{
+		return round(strtotime($created) / 100) . hash('ripemd128', $uri);
+	}
+
 	/**
 	 * @brief Update existing item entries
 	 *
@@ -53,26 +783,159 @@ class Item extends BaseObject
 		}
 
 		// To ensure the data integrity we do it in an transaction
-		dba::transaction();
+		DBA::transaction();
 
 		// We cannot simply expand the condition to check for origin entries
 		// The condition needn't to be a simple array but could be a complex condition.
 		// And we have to execute this query before the update to ensure to fetch the same data.
-		$items = dba::select('item', ['id', 'origin'], $condition);
+		$items = DBA::select('item', ['id', 'origin', 'uri', 'created', 'uri-hash', 'iaid', 'icid', 'tag', 'file'], $condition);
 
-		$success = dba::update('item', $fields, $condition);
-
-		if (!$success) {
-			dba::close($items);
-			dba::rollback();
-			return false;
+		$content_fields = [];
+		foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
+			if (isset($fields[$field])) {
+				$content_fields[$field] = $fields[$field];
+				if (in_array($field, self::CONTENT_FIELDLIST) || !self::isLegacyMode()) {
+					unset($fields[$field]);
+				} else {
+					$fields[$field] = null;
+				}
+			}
 		}
 
-		$rows = dba::affected_rows();
+		$clear_fields = ['bookmark', 'type', 'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link'];
+		foreach ($clear_fields as $field) {
+			if (array_key_exists($field, $fields)) {
+				$fields[$field] = null;
+			}
+		}
+
+		if (array_key_exists('tag', $fields)) {
+			$tags = $fields['tag'];
+			$fields['tag'] = null;
+		} else {
+			$tags = '';
+		}
+
+		if (array_key_exists('file', $fields)) {
+			$files = $fields['file'];
+			$fields['file'] = null;
+		} else {
+			$files = '';
+		}
+
+		$delivery_data = ['postopts' => defaults($fields, 'postopts', ''),
+			'inform' => defaults($fields, 'inform', '')];
+
+		$fields['postopts'] = null;
+		$fields['inform'] = null;
+
+		if (!empty($fields)) {
+			$success = DBA::update('item', $fields, $condition);
+
+			if (!$success) {
+				DBA::close($items);
+				DBA::rollback();
+				return false;
+			}
+		}
+
+		// When there is no content for the "old" item table, this will count the fetched items
+		$rows = DBA::affectedRows();
+
+		while ($item = DBA::fetch($items)) {
+
+			// This part here can safely be removed when the legacy fields in the item had been removed
+			if (empty($item['uri-hash']) && !empty($item['uri']) && !empty($item['created'])) {
+
+				// Fetch the uri-hash from an existing item entry if there is one
+				$item_condition = ["`uri` = ? AND `uri-hash` != ''", $item['uri']];
+				$existing = DBA::selectfirst('item', ['uri-hash'], $item_condition);
+				if (DBA::isResult($existing)) {
+					$item['uri-hash'] = $existing['uri-hash'];
+				} else {
+					$item['uri-hash'] = self::itemHash($item['uri'], $item['created']);
+				}
+
+				DBA::update('item', ['uri-hash' => $item['uri-hash']], ['id' => $item['id']]);
+				DBA::update('item-activity', ['uri-hash' => $item['uri-hash']], ["`uri` = ? AND `uri-hash` = ''", $item['uri']]);
+				DBA::update('item-content', ['uri-plink-hash' => $item['uri-hash']], ["`uri` = ? AND `uri-plink-hash` = ''", $item['uri']]);
+			}
+
+			if (!empty($item['iaid']) || (!empty($content_fields['verb']) && (self::activityToIndex($content_fields['verb']) >= 0))) {
+				if (!empty($item['iaid'])) {
+					$update_condition = ['id' => $item['iaid']];
+				} else {
+					$update_condition = ['uri-hash' => $item['uri-hash']];
+				}
+				self::updateActivity($content_fields, $update_condition);
+
+				if (empty($item['iaid'])) {
+					$item_activity = DBA::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]);
+					if (DBA::isResult($item_activity)) {
+						$item_fields = ['iaid' => $item_activity['id'], 'icid' => null];
+						foreach (self::MIXED_CONTENT_FIELDLIST as $field) {
+							if (self::isLegacyMode()) {
+								$item_fields[$field] = null;
+							} else {
+								unset($item_fields[$field]);
+							}
+						}
+						DBA::update('item', $item_fields, ['id' => $item['id']]);
+
+						if (!empty($item['icid']) && !DBA::exists('item', ['icid' => $item['icid']])) {
+							DBA::delete('item-content', ['id' => $item['icid']]);
+						}
+					}
+				} elseif (!empty($item['icid'])) {
+					DBA::update('item', ['icid' => null], ['id' => $item['id']]);
+
+					if (!DBA::exists('item', ['icid' => $item['icid']])) {
+						DBA::delete('item-content', ['id' => $item['icid']]);
+					}
+				}
+			} else {
+				if (!empty($item['icid'])) {
+					$update_condition = ['id' => $item['icid']];
+				} else {
+					$update_condition = ['uri-plink-hash' => $item['uri-hash']];
+				}
+				self::updateContent($content_fields, $update_condition);
+
+				if (empty($item['icid'])) {
+					$item_content = DBA::selectFirst('item-content', [], ['uri-plink-hash' => $item['uri-hash']]);
+					if (DBA::isResult($item_content)) {
+						$item_fields = ['icid' => $item_content['id']];
+						// Clear all fields in the item table that have a content in the item-content table
+						foreach ($item_content as $field => $content) {
+							if (in_array($field, self::MIXED_CONTENT_FIELDLIST) && !empty($item_content[$field])) {
+								if (self::isLegacyMode()) {
+									$item_fields[$field] = null;
+								} else {
+									unset($item_fields[$field]);
+								}
+							}
+						}
+						DBA::update('item', $item_fields, ['id' => $item['id']]);
+					}
+				}
+			}
+
+			if (!empty($tags)) {
+				Term::insertFromTagFieldByItemId($item['id'], $tags);
+				if (!empty($item['tag'])) {
+					DBA::update('item', ['tag' => ''], ['id' => $item['id']]);
+				}
+			}
+
+			if (!empty($files)) {
+				Term::insertFromFileFieldByItemId($item['id'], $files);
+				if (!empty($item['file'])) {
+					DBA::update('item', ['file' => ''], ['id' => $item['id']]);
+				}
+			}
+
+			self::updateDeliveryData($item['id'], $delivery_data);
 
-		while ($item = dba::fetch($items)) {
-			Term::insertFromTagFieldByItemId($item['id']);
-			Term::insertFromFileFieldByItemId($item['id']);
 			self::updateThread($item['id']);
 
 			// We only need to notfiy others when it is an original entry from us.
@@ -82,8 +945,8 @@ class Item extends BaseObject
 			}
 		}
 
-		dba::close($items);
-		dba::commit();
+		DBA::close($items);
+		DBA::commit();
 		return $rows;
 	}
 
@@ -95,11 +958,11 @@ class Item extends BaseObject
 	 */
 	public static function delete($condition, $priority = PRIORITY_HIGH)
 	{
-		$items = dba::select('item', ['id'], $condition);
-		while ($item = dba::fetch($items)) {
+		$items = self::select(['id'], $condition);
+		while ($item = self::fetch($items)) {
 			self::deleteById($item['id'], $priority);
 		}
-		dba::close($items);
+		DBA::close($items);
 	}
 
 	/**
@@ -114,18 +977,18 @@ class Item extends BaseObject
 			return;
 		}
 
-		$items = dba::select('item', ['id', 'uid'], $condition);
-		while ($item = dba::fetch($items)) {
+		$items = self::select(['id', 'uid'], $condition);
+		while ($item = self::fetch($items)) {
 			// "Deleting" global items just means hiding them
 			if ($item['uid'] == 0) {
-				dba::update('user-item', ['hidden' => true], ['iid' => $item['id'], 'uid' => $uid], true);
+				DBA::update('user-item', ['hidden' => true], ['iid' => $item['id'], 'uid' => $uid], true);
 			} elseif ($item['uid'] == $uid) {
 				self::deleteById($item['id'], PRIORITY_HIGH);
 			} else {
 				logger('Wrong ownership. Not deleting item ' . $item['id']);
 			}
 		}
-		dba::close($items);
+		DBA::close($items);
 	}
 
 	/**
@@ -141,9 +1004,10 @@ class Item extends BaseObject
 		// locate item to be deleted
 		$fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin',
 			'deleted', 'file', 'resource-id', 'event-id', 'attach',
-			'verb', 'object-type', 'object', 'target', 'contact-id'];
-		$item = dba::selectFirst('item', $fields, ['id' => $item_id]);
-		if (!DBM::is_result($item)) {
+			'verb', 'object-type', 'object', 'target', 'contact-id',
+			'icid', 'iaid', 'psid'];
+		$item = self::selectFirst($fields, ['id' => $item_id]);
+		if (!DBA::isResult($item)) {
 			logger('Item with ID ' . $item_id . " hasn't been found.", LOGGER_DEBUG);
 			return false;
 		}
@@ -153,8 +1017,8 @@ class Item extends BaseObject
 			return false;
 		}
 
-		$parent = dba::selectFirst('item', ['origin'], ['id' => $item['parent']]);
-		if (!DBM::is_result($parent)) {
+		$parent = self::selectFirst(['origin'], ['id' => $item['parent']]);
+		if (!DBA::isResult($parent)) {
 			$parent = ['origin' => false];
 		}
 
@@ -184,7 +1048,7 @@ class Item extends BaseObject
 		 * generate a resource-id and therefore aren't intimately linked to the item.
 		 */
 		if (strlen($item['resource-id'])) {
-			dba::delete('photo', ['resource-id' => $item['resource-id'], 'uid' => $item['uid']]);
+			DBA::delete('photo', ['resource-id' => $item['resource-id'], 'uid' => $item['uid']]);
 		}
 
 		// If item is a link to an event, delete the event.
@@ -195,25 +1059,40 @@ class Item extends BaseObject
 		// If item has attachments, drop them
 		foreach (explode(", ", $item['attach']) as $attach) {
 			preg_match("|attach/(\d+)|", $attach, $matches);
-			dba::delete('attach', ['id' => $matches[1], 'uid' => $item['uid']]);
+			if (is_array($matches) && count($matches) > 1) {
+				DBA::delete('attach', ['id' => $matches[1], 'uid' => $item['uid']]);
+			}
 		}
 
 		// Delete tags that had been attached to other items
 		self::deleteTagsFromItem($item);
 
 		// Set the item to "deleted"
-		dba::update('item', ['deleted' => true, 'title' => '', 'body' => '',
-					'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()],
-				['id' => $item['id']]);
+		$item_fields = ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()];
+		DBA::update('item', $item_fields, ['id' => $item['id']]);
 
-		Term::insertFromTagFieldByItemId($item['id']);
-		Term::insertFromFileFieldByItemId($item['id']);
+		Term::insertFromTagFieldByItemId($item['id'], '');
+		Term::insertFromFileFieldByItemId($item['id'], '');
 		self::deleteThread($item['id'], $item['parent-uri']);
 
-		if (!dba::exists('item', ["`uri` = ? AND `uid` != 0 AND NOT `deleted`", $item['uri']])) {
+		if (!self::exists(["`uri` = ? AND `uid` != 0 AND NOT `deleted`", $item['uri']])) {
 			self::delete(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority);
 		}
 
+		DBA::delete('item-delivery-data', ['iid' => $item['id']]);
+
+		if (!empty($item['iaid']) && !self::exists(['iaid' => $item['iaid'], 'deleted' => false])) {
+			DBA::delete('item-activity', ['id' => $item['iaid']], ['cascade' => false]);
+		}
+		if (!empty($item['icid']) && !self::exists(['icid' => $item['icid'], 'deleted' => false])) {
+			DBA::delete('item-content', ['id' => $item['icid']], ['cascade' => false]);
+		}
+		// When the permission set will be used in photo and events as well,
+		// this query here needs to be extended.
+		if (!empty($item['psid']) && !self::exists(['psid' => $item['psid'], 'deleted' => false])) {
+			DBA::delete('permissionset', ['id' => $item['psid']], ['cascade' => false]);
+		}
+
 		// If it's the parent of a comment thread, kill all the kids
 		if ($item['id'] == $item['parent']) {
 			self::delete(['parent' => $item['parent'], 'deleted' => false], $priority);
@@ -230,9 +1109,9 @@ class Item extends BaseObject
 		} elseif ($item['uid'] != 0) {
 
 			// When we delete just our local user copy of an item, we have to set a marker to hide it
-			$global_item = dba::selectFirst('item', ['id'], ['uri' => $item['uri'], 'uid' => 0, 'deleted' => false]);
-			if (DBM::is_result($global_item)) {
-				dba::update('user-item', ['hidden' => true], ['iid' => $global_item['id'], 'uid' => $item['uid']], true);
+			$global_item = self::selectFirst(['id'], ['uri' => $item['uri'], 'uid' => 0, 'deleted' => false]);
+			if (DBA::isResult($global_item)) {
+				DBA::update('user-item', ['hidden' => true], ['iid' => $global_item['id'], 'uid' => $item['uid']], true);
 			}
 		}
 
@@ -254,8 +1133,8 @@ class Item extends BaseObject
 			return;
 		}
 
-		$i = dba::selectFirst('item', ['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]);
-		if (!DBM::is_result($i)) {
+		$i = self::selectFirst(['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]);
+		if (!DBA::isResult($i)) {
 			return;
 		}
 
@@ -281,10 +1160,8 @@ class Item extends BaseObject
 
 	private static function guid($item, $notify)
 	{
-		$guid =	notags(trim($item['guid']));
-
-		if (!empty($guid)) {
-			return $guid;
+		if (!empty($item['guid'])) {
+			return notags(trim($item['guid']));
 		}
 
 		if ($notify) {
@@ -328,7 +1205,7 @@ class Item extends BaseObject
 		} elseif (!empty($item['uri'])) {
 			$guid = self::guidFromUri($item['uri'], $prefix_host);
 		} else {
-			$guid = get_guid(32, hash('crc32', $prefix_host));
+			$guid = System::createGUID(32, hash('crc32', $prefix_host));
 		}
 
 		return $guid;
@@ -357,8 +1234,8 @@ class Item extends BaseObject
 
 		// Still missing? Then use the "self" contact of the current user
 		if ($contact_id == 0) {
-			$self = dba::selectFirst('contact', ['id'], ['self' => true, 'uid' => $item['uid']]);
-			if (DBM::is_result($self)) {
+			$self = DBA::selectFirst('contact', ['id'], ['self' => true, 'uid' => $item['uid']]);
+			if (DBA::isResult($self)) {
 				$contact_id = $self["id"];
 			}
 		}
@@ -367,6 +1244,17 @@ class Item extends BaseObject
 		return $contact_id;
 	}
 
+	// This function will finally cover most of the preparation functionality in mod/item.php
+	public static function prepare(&$item)
+	{
+		$data = BBCode::getAttachmentData($item['body']);
+		if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $item['body'], $match, PREG_SET_ORDER) || isset($data["type"]))
+			&& ($posttype != Item::PT_PERSONAL_NOTE)) {
+			$posttype = Item::PT_PAGE;
+			$objecttype = ACTIVITY_OBJ_BOOKMARK;
+		}
+	}
+
 	public static function insert($item, $force_parent = false, $notify = false, $dontcache = false)
 	{
 		$a = get_app();
@@ -374,10 +1262,9 @@ class Item extends BaseObject
 		// If it is a posting where users should get notifications, then define it as wall posting
 		if ($notify) {
 			$item['wall'] = 1;
-			$item['type'] = 'wall';
 			$item['origin'] = 1;
-			$item['network'] = NETWORK_DFRN;
-			$item['protocol'] = PROTOCOL_DFRN;
+			$item['network'] = Protocol::DFRN;
+			$item['protocol'] = Conversation::PARCEL_DFRN;
 
 			if (is_int($notify)) {
 				$priority = $notify;
@@ -385,11 +1272,14 @@ class Item extends BaseObject
 				$priority = PRIORITY_HIGH;
 			}
 		} else {
-			$item['network'] = trim(defaults($item, 'network', NETWORK_PHANTOM));
+			$item['network'] = trim(defaults($item, 'network', Protocol::PHANTOM));
 		}
 
 		$item['guid'] = self::guid($item, $notify);
-		$item['uri'] = notags(trim(defaults($item, 'uri', item_new_uri($a->get_hostname(), $item['uid'], $item['guid']))));
+		$item['uri'] = notags(trim(defaults($item, 'uri', self::newURI($item['uid'], $item['guid']))));
+
+		// Store URI data
+		$item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
 
 		// Store conversation data
 		$item = Conversation::insert($item);
@@ -415,7 +1305,7 @@ class Item extends BaseObject
 
 		// Converting the plink
 		/// @TODO Check if this is really still needed
-		if ($item['network'] == NETWORK_OSTATUS) {
+		if ($item['network'] == Protocol::OSTATUS) {
 			if (isset($item['plink'])) {
 				$item['plink'] = OStatus::convertHref($item['plink']);
 			} elseif (isset($item['uri'])) {
@@ -427,25 +1317,24 @@ class Item extends BaseObject
 			$item['parent-uri'] = $item['thr-parent'];
 		}
 
-		if (x($item, 'gravity')) {
+		if (isset($item['gravity'])) {
 			$item['gravity'] = intval($item['gravity']);
 		} elseif ($item['parent-uri'] === $item['uri']) {
-			$item['gravity'] = 0;
-		} elseif (activity_match($item['verb'],ACTIVITY_POST)) {
-			$item['gravity'] = 6;
+			$item['gravity'] = GRAVITY_PARENT;
+		} elseif (activity_match($item['verb'], ACTIVITY_POST)) {
+			$item['gravity'] = GRAVITY_COMMENT;
 		} else {
-			$item['gravity'] = 6;   // extensible catchall
+			$item['gravity'] = GRAVITY_UNKNOWN;   // Should not happen
+			logger('Unknown gravity for verb: ' . $item['verb'], LOGGER_DEBUG);
 		}
 
-		$item['type'] = defaults($item, 'type', 'remote');
-
 		$uid = intval($item['uid']);
 
 		// check for create date and expire time
 		$expire_interval = Config::get('system', 'dbclean-expire-days', 0);
 
-		$user = dba::selectFirst('user', ['expire'], ['uid' => $uid]);
-		if (DBM::is_result($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) {
+		$user = DBA::selectFirst('user', ['expire'], ['uid' => $uid]);
+		if (DBA::isResult($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) {
 			$expire_interval = $user['expire'];
 		}
 
@@ -463,12 +1352,12 @@ class Item extends BaseObject
 		 * We have to check several networks since Friendica posts could be repeated
 		 * via OStatus (maybe Diasporsa as well)
 		 */
-		if (in_array($item['network'], [NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS, ""])) {
+		if (in_array($item['network'], [Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS, ""])) {
 			$condition = ["`uri` = ? AND `uid` = ? AND `network` IN (?, ?, ?)",
 				trim($item['uri']), $item['uid'],
-				NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS];
-			$existing = dba::selectFirst('item', ['id', 'network'], $condition);
-			if (DBM::is_result($existing)) {
+				Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS];
+			$existing = self::selectFirst(['id', 'network'], $condition);
+			if (DBA::isResult($existing)) {
 				// We only log the entries with a different user id than 0. Otherwise we would have too many false positives
 				if ($uid != 0) {
 					logger("Item with uri ".$item['uri']." already existed for user ".$uid." with id ".$existing["id"]." target network ".$existing["network"]." - new network: ".$item['network']);
@@ -478,7 +1367,12 @@ class Item extends BaseObject
 			}
 		}
 
-		self::addLanguageInPostopts($item);
+		// Ensure to always have the same creation date.
+		$existing = self::selectfirst(['created', 'uri-hash'], ['uri' => $item['uri']]);
+		if (DBA::isResult($existing)) {
+			$item['created'] = $existing['created'];
+			$item['uri-hash'] = $existing['uri-hash'];
+		}
 
 		$item['wall']          = intval(defaults($item, 'wall', 0));
 		$item['extid']         = trim(defaults($item, 'extid', ''));
@@ -499,6 +1393,7 @@ class Item extends BaseObject
 		$item['visible']       = ((x($item, 'visible') !== false) ? intval($item['visible'])         : 1);
 		$item['deleted']       = 0;
 		$item['parent-uri']    = trim(defaults($item, 'parent-uri', $item['uri']));
+		$item['post-type']     = defaults($item, 'post-type', self::PT_ARTICLE);
 		$item['verb']          = trim(defaults($item, 'verb', ''));
 		$item['object-type']   = trim(defaults($item, 'object-type', ''));
 		$item['object']        = trim(defaults($item, 'object', ''));
@@ -510,7 +1405,6 @@ class Item extends BaseObject
 		$item['deny_cid']      = trim(defaults($item, 'deny_cid', ''));
 		$item['deny_gid']      = trim(defaults($item, 'deny_gid', ''));
 		$item['private']       = intval(defaults($item, 'private', 0));
-		$item['bookmark']      = intval(defaults($item, 'bookmark', 0));
 		$item['body']          = trim(defaults($item, 'body', ''));
 		$item['tag']           = trim(defaults($item, 'tag', ''));
 		$item['attach']        = trim(defaults($item, 'attach', ''));
@@ -522,11 +1416,17 @@ class Item extends BaseObject
 		$item['inform']        = trim(defaults($item, 'inform', ''));
 		$item['file']          = trim(defaults($item, 'file', ''));
 
+		// Unique identifier to be linked against item-activities and item-content
+		$item['uri-hash']      = defaults($item, 'uri-hash', self::itemHash($item['uri'], $item['created']));
+
 		// When there is no content then we don't post it
 		if ($item['body'].$item['title'] == '') {
+			logger('No body, no title.');
 			return 0;
 		}
 
+		self::addLanguageToItemArray($item);
+
 		// Items cannot be stored before they happen ...
 		if ($item['created'] > DateTimeFormat::utcNow()) {
 			$item['created'] = DateTimeFormat::utcNow();
@@ -537,10 +1437,6 @@ class Item extends BaseObject
 			$item['edited'] = DateTimeFormat::utcNow();
 		}
 
-		if (($item['author-link'] == "") && ($item['owner-link'] == "")) {
-			logger("Both author-link and owner-link are empty. Called by: " . System::callstack(), LOGGER_DEBUG);
-		}
-
 		$item['plink'] = defaults($item, 'plink', System::baseUrl() . '/display/' . urlencode($item['guid']));
 
 		// The contact-id should be set before "self::insert" was called - but there seems to be issues sometimes
@@ -566,22 +1462,17 @@ class Item extends BaseObject
 			return 0;
 		}
 
-		if ($item['network'] == NETWORK_PHANTOM) {
+		if ($item['network'] == Protocol::PHANTOM) {
 			logger('Missing network. Called by: '.System::callstack(), LOGGER_DEBUG);
 
-			$contact = Contact::getDetailsByURL($item['author-link'], $item['uid']);
-			if (!empty($contact['network'])) {
-				$item['network'] = $contact["network"];
-			} else {
-				$item['network'] = NETWORK_DFRN;
-			}
+			$item['network'] = Protocol::DFRN;
 			logger("Set network to " . $item["network"] . " for " . $item["uri"], LOGGER_DEBUG);
 		}
 
 		// Checking if there is already an item with the same guid
 		logger('Checking for an item for user '.$item['uid'].' on network '.$item['network'].' with the guid '.$item['guid'], LOGGER_DEBUG);
 		$condition = ['guid' => $item['guid'], 'network' => $item['network'], 'uid' => $item['uid']];
-		if (dba::exists('item', $condition)) {
+		if (self::exists($condition)) {
 			logger('found item with guid '.$item['guid'].' for user '.$item['uid'].' on network '.$item['network'], LOGGER_DEBUG);
 			return 0;
 		}
@@ -614,9 +1505,9 @@ class Item extends BaseObject
 				'wall', 'private', 'forum_mode', 'origin'];
 			$condition = ['uri' => $item['parent-uri'], 'uid' => $item['uid']];
 			$params = ['order' => ['id' => false]];
-			$parent = dba::selectFirst('item', $fields, $condition, $params);
+			$parent = self::selectFirst($fields, $condition, $params);
 
-			if (DBM::is_result($parent)) {
+			if (DBA::isResult($parent)) {
 				// is the new message multi-level threaded?
 				// even though we don't support it now, preserve the info
 				// and re-attach to the conversation parent.
@@ -628,9 +1519,9 @@ class Item extends BaseObject
 						'parent-uri' => $item['parent-uri'],
 						'uid' => $item['uid']];
 					$params = ['order' => ['id' => false]];
-					$toplevel_parent = dba::selectFirst('item', $fields, $condition, $params);
+					$toplevel_parent = self::selectFirst($fields, $condition, $params);
 
-					if (DBM::is_result($toplevel_parent)) {
+					if (DBA::isResult($toplevel_parent)) {
 						$parent = $toplevel_parent;
 					}
 				}
@@ -664,12 +1555,13 @@ class Item extends BaseObject
 
 				// If its a post from myself then tag the thread as "mention"
 				logger("Checking if parent ".$parent_id." has to be tagged as mention for user ".$item['uid'], LOGGER_DEBUG);
-				$user = dba::selectFirst('user', ['nickname'], ['uid' => $item['uid']]);
-				if (DBM::is_result($user)) {
+				$user = DBA::selectFirst('user', ['nickname'], ['uid' => $item['uid']]);
+				if (DBA::isResult($user)) {
 					$self = normalise_link(System::baseUrl() . '/profile/' . $user['nickname']);
-					logger("'myself' is ".$self." for parent ".$parent_id." checking against ".$item['author-link']." and ".$item['owner-link'], LOGGER_DEBUG);
-					if ((normalise_link($item['author-link']) == $self) || (normalise_link($item['owner-link']) == $self)) {
-						dba::update('thread', ['mention' => true], ['iid' => $parent_id]);
+					$self_id = Contact::getIdForURL($self, 0, true);
+					logger("'myself' is ".$self_id." for parent ".$parent_id." checking against ".$item['author-id']." and ".$item['owner-id'], LOGGER_DEBUG);
+					if (($item['author-id'] == $self_id) || ($item['owner-id'] == $self_id)) {
+						DBA::update('thread', ['mention' => true], ['iid' => $parent_id]);
 						logger("tagged thread ".$parent_id." as mention for user ".$self, LOGGER_DEBUG);
 					}
 				}
@@ -682,7 +1574,7 @@ class Item extends BaseObject
 					logger('$force_parent=true, reply converted to top-level post.');
 					$parent_id = 0;
 					$item['parent-uri'] = $item['uri'];
-					$item['gravity'] = 0;
+					$item['gravity'] = GRAVITY_PARENT;
 				} else {
 					logger('item parent '.$item['parent-uri'].' for '.$item['uid'].' was not found - ignoring item');
 					return 0;
@@ -692,17 +1584,20 @@ class Item extends BaseObject
 			}
 		}
 
+		$item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']);
+		$item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']);
+
 		$condition = ["`uri` = ? AND `network` IN (?, ?) AND `uid` = ?",
-			$item['uri'], $item['network'], NETWORK_DFRN, $item['uid']];
-		if (dba::exists('item', $condition)) {
+			$item['uri'], $item['network'], Protocol::DFRN, $item['uid']];
+		if (self::exists($condition)) {
 			logger('duplicated item with the same uri found. '.print_r($item,true));
 			return 0;
 		}
 
 		// On Friendica and Diaspora the GUID is unique
-		if (in_array($item['network'], [NETWORK_DFRN, NETWORK_DIASPORA])) {
+		if (in_array($item['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
 			$condition = ['guid' => $item['guid'], 'uid' => $item['uid']];
-			if (dba::exists('item', $condition)) {
+			if (self::exists($condition)) {
 				logger('duplicated item with the same guid found. '.print_r($item,true));
 				return 0;
 			}
@@ -710,7 +1605,7 @@ class Item extends BaseObject
 			// Check for an existing post with the same content. There seems to be a problem with OStatus.
 			$condition = ["`body` = ? AND `network` = ? AND `created` = ? AND `contact-id` = ? AND `uid` = ?",
 					$item['body'], $item['network'], $item['created'], $item['contact-id'], $item['uid']];
-			if (dba::exists('item', $condition)) {
+			if (self::exists($condition)) {
 				logger('duplicated item with the same body found. '.print_r($item,true));
 				return 0;
 			}
@@ -721,9 +1616,9 @@ class Item extends BaseObject
 			$item["global"] = true;
 
 			// Set the global flag on all items if this was a global item entry
-			dba::update('item', ['global' => true], ['uri' => $item["uri"]]);
+			self::update(['global' => true], ['uri' => $item["uri"]]);
 		} else {
-			$item["global"] = dba::exists('item', ['uid' => 0, 'uri' => $item["uri"]]);
+			$item["global"] = self::exists(['uid' => 0, 'uri' => $item["uri"]]);
 		}
 
 		// ACL settings
@@ -744,7 +1639,11 @@ class Item extends BaseObject
 		put_item_in_cache($item);
 
 		if ($notify) {
+			$item['edit'] = false;
+			$item['parent'] = $parent_id;
 			Addon::callHooks('post_local', $item);
+			unset($item['edit']);
+			unset($item['parent']);
 		} else {
 			Addon::callHooks('post_remote', $item);
 		}
@@ -764,7 +1663,7 @@ class Item extends BaseObject
 		 * An unique index would help - but the limitations of MySQL (maximum size of index values) prevent this.
 		 */
 		if ($item["uid"] == 0) {
-			if (dba::exists('item', ['uri' => trim($item['uri']), 'uid' => 0])) {
+			if (self::exists(['uri' => trim($item['uri']), 'uid' => 0])) {
 				logger('Global item already stored. URI: '.$item['uri'].' on network '.$item['network'], LOGGER_DEBUG);
 				return 0;
 			}
@@ -772,15 +1671,52 @@ class Item extends BaseObject
 
 		logger('' . print_r($item,true), LOGGER_DATA);
 
-		dba::transaction();
-		$ret = dba::insert('item', $item);
+		if (array_key_exists('tag', $item)) {
+			$tags = $item['tag'];
+			unset($item['tag']);
+		} else {
+			$tags = '';
+		}
+
+		if (array_key_exists('file', $item)) {
+			$files = $item['file'];
+			unset($item['file']);
+		} else {
+			$files = '';
+		}
+
+		// Creates or assigns the permission set
+		$item['psid'] = PermissionSet::fetchIDForPost($item);
+
+		// We are doing this outside of the transaction to avoid timing problems
+		if (!self::insertActivity($item)) {
+			self::insertContent($item);
+		}
+
+		$delivery_data = ['postopts' => defaults($item, 'postopts', ''),
+			'inform' => defaults($item, 'inform', '')];
+
+		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);
 
 		// When the item was successfully stored we fetch the ID of the item.
-		if (DBM::is_result($ret)) {
-			$current_post = dba::lastInsertId();
+		if (DBA::isResult($ret)) {
+			$current_post = DBA::lastInsertId();
 		} else {
 			// This can happen - for example - if there are locking timeouts.
-			dba::rollback();
+			DBA::rollback();
 
 			// Store the data into a spool file so that we can try again later.
 
@@ -796,6 +1732,10 @@ class Item extends BaseObject
 			$spoolpath = get_spoolpath();
 			if ($spoolpath != "") {
 				$spool = $spoolpath.'/'.$file;
+
+				// Ensure to have the removed data from above again in the item array
+				$item = array_merge($item, $delivery_data);
+
 				file_put_contents($spool, json_encode($item));
 				logger("Item wasn't stored - Item was spooled into file ".$file, LOGGER_DEBUG);
 			}
@@ -805,26 +1745,26 @@ class Item extends BaseObject
 		if ($current_post == 0) {
 			// This is one of these error messages that never should occur.
 			logger("couldn't find created item - we better quit now.");
-			dba::rollback();
+			DBA::rollback();
 			return 0;
 		}
 
 		// How much entries have we created?
 		// We wouldn't need this query when we could use an unique index - but MySQL has length problems with them.
-		$entries = dba::count('item', ['uri' => $item['uri'], 'uid' => $item['uid'], 'network' => $item['network']]);
+		$entries = DBA::count('item', ['uri' => $item['uri'], 'uid' => $item['uid'], 'network' => $item['network']]);
 
 		if ($entries > 1) {
 			// There are duplicates. We delete our just created entry.
 			logger('Duplicated post occurred. uri = ' . $item['uri'] . ' uid = ' . $item['uid']);
 
 			// Yes, we could do a rollback here - but we are having many users with MyISAM.
-			dba::delete('item', ['id' => $current_post]);
-			dba::commit();
+			DBA::delete('item', ['id' => $current_post]);
+			DBA::commit();
 			return 0;
 		} elseif ($entries == 0) {
 			// This really should never happen since we quit earlier if there were problems.
 			logger("Something is terribly wrong. We haven't found our created entry.");
-			dba::rollback();
+			DBA::rollback();
 			return 0;
 		}
 
@@ -836,17 +1776,17 @@ class Item extends BaseObject
 		}
 
 		// Set parent id
-		dba::update('item', ['parent' => $parent_id], ['id' => $current_post]);
+		self::update(['parent' => $parent_id], ['id' => $current_post]);
 
 		$item['id'] = $current_post;
 		$item['parent'] = $parent_id;
 
 		// update the commented timestamp on the parent
 		// Only update "commented" if it is really a comment
-		if (($item['verb'] == ACTIVITY_POST) || !Config::get("system", "like_no_comment")) {
-			dba::update('item', ['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
+		if (($item['gravity'] != GRAVITY_ACTIVITY) || !Config::get("system", "like_no_comment")) {
+			self::update(['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
 		} else {
-			dba::update('item', ['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
+			self::update(['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
 		}
 
 		if ($dsprsig) {
@@ -859,14 +1799,14 @@ class Item extends BaseObject
 				logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG);
 			}
 
-			dba::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
+			DBA::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
 						'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer]);
 		}
 
 		if (!empty($diaspora_signed_text)) {
 			// Formerly we stored the signed text, the signature and the author in different fields.
 			// We now store the raw data so that we are more flexible.
-			dba::insert('sign', ['iid' => $current_post, 'signed_text' => $diaspora_signed_text]);
+			DBA::insert('sign', ['iid' => $current_post, 'signed_text' => $diaspora_signed_text]);
 		}
 
 		$deleted = self::tagDeliver($item['uid'], $current_post);
@@ -876,8 +1816,8 @@ class Item extends BaseObject
 		 * in it.
 		 */
 		if (!$deleted && !$dontcache) {
-			$posted_item = dba::selectFirst('item', [], ['id' => $current_post]);
-			if (DBM::is_result($posted_item)) {
+			$posted_item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $current_post]);
+			if (DBA::isResult($posted_item)) {
 				if ($notify) {
 					Addon::callHooks('post_local_end', $posted_item);
 				} else {
@@ -894,14 +1834,23 @@ class Item extends BaseObject
 			self::updateThread($parent_id);
 		}
 
-		dba::commit();
+		$delivery_data['iid'] = $current_post;
+
+		self::insertDeliveryData($delivery_data);
+
+		DBA::commit();
 
 		/*
 		 * Due to deadlock issues with the "term" table we are doing these steps after the commit.
 		 * This is not perfect - but a workable solution until we found the reason for the problem.
 		 */
-		Term::insertFromTagFieldByItemId($current_post);
-		Term::insertFromFileFieldByItemId($current_post);
+		if (!empty($tags)) {
+			Term::insertFromTagFieldByItemId($current_post, $tags);
+		}
+
+		if (!empty($files)) {
+			Term::insertFromFileFieldByItemId($current_post, $files);
+		}
 
 		if ($item['parent-uri'] === $item['uri']) {
 			self::addShadow($current_post);
@@ -920,6 +1869,174 @@ class Item extends BaseObject
 		return $current_post;
 	}
 
+	/**
+	 * @brief Insert a new item delivery data entry
+	 *
+	 * @param array $item The item fields that are to be inserted
+	 */
+	private static function insertDeliveryData($delivery_data)
+	{
+		if (empty($delivery_data['iid']) || (empty($delivery_data['postopts']) && empty($delivery_data['inform']))) {
+			return;
+		}
+
+		DBA::insert('item-delivery-data', $delivery_data);
+	}
+
+	/**
+	 * @brief Update an existing item delivery data entry
+	 *
+	 * @param integer $id The item id that is to be updated
+	 * @param array $item The item fields that are to be inserted
+	 */
+	private static function updateDeliveryData($id, $delivery_data)
+	{
+		if (empty($id) || (empty($delivery_data['postopts']) && empty($delivery_data['inform']))) {
+			return;
+		}
+
+		DBA::update('item-delivery-data', $delivery_data, ['iid' => $id], true);
+	}
+
+	/**
+	 * @brief Insert a new item content entry
+	 *
+	 * @param array $item The item fields that are to be inserted
+	 */
+	private static function insertActivity(&$item)
+	{
+		$activity_index = self::activityToIndex($item['verb']);
+
+		if ($activity_index < 0) {
+			return false;
+		}
+
+		$fields = ['uri' => $item['uri'], 'activity' => $activity_index,
+			'uri-hash' => $item['uri-hash'], 'uri-id' => $item['uri-id']];
+
+		// We just remove everything that is content
+		foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
+			unset($item[$field]);
+		}
+
+		// To avoid timing problems, we are using locks.
+		$locked = Lock::acquire('item_insert_activity');
+		if (!$locked) {
+			logger("Couldn't acquire lock for URI " . $item['uri'] . " - proceeding anyway.");
+		}
+
+		// Do we already have this content?
+		$item_activity = DBA::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]);
+		if (DBA::isResult($item_activity)) {
+			$item['iaid'] = $item_activity['id'];
+			logger('Fetched activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')');
+		} elseif (DBA::insert('item-activity', $fields)) {
+			$item['iaid'] = DBA::lastInsertId();
+			logger('Inserted activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')');
+		} else {
+			// This shouldn't happen.
+			logger('Could not insert activity for URI ' . $item['uri'] . ' - should not happen');
+			return false;
+		}
+		if ($locked) {
+			Lock::release('item_insert_activity');
+		}
+		return true;
+	}
+
+	/**
+	 * @brief Insert a new item content entry
+	 *
+	 * @param array $item The item fields that are to be inserted
+	 */
+	private static function insertContent(&$item)
+	{
+		$fields = ['uri' => $item['uri'], 'uri-plink-hash' => $item['uri-hash'],
+			'uri-id' => $item['uri-id']];
+
+		foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
+			if (isset($item[$field])) {
+				$fields[$field] = $item[$field];
+				unset($item[$field]);
+			}
+		}
+
+		// To avoid timing problems, we are using locks.
+		$locked = Lock::acquire('item_insert_content');
+		if (!$locked) {
+			logger("Couldn't acquire lock for URI " . $item['uri'] . " - proceeding anyway.");
+		}
+
+		// Do we already have this content?
+		$item_content = DBA::selectFirst('item-content', ['id'], ['uri-plink-hash' => $item['uri-hash']]);
+		if (DBA::isResult($item_content)) {
+			$item['icid'] = $item_content['id'];
+			logger('Fetched content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')');
+		} elseif (DBA::insert('item-content', $fields)) {
+			$item['icid'] = DBA::lastInsertId();
+			logger('Inserted content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')');
+		} else {
+			// This shouldn't happen.
+			logger('Could not insert content for URI ' . $item['uri'] . ' - should not happen');
+		}
+		if ($locked) {
+			Lock::release('item_insert_content');
+		}
+	}
+
+	/**
+	 * @brief Update existing item content entries
+	 *
+	 * @param array $item The item fields that are to be changed
+	 * @param array $condition The condition for finding the item content entries
+	 */
+	private static function updateActivity($item, $condition)
+	{
+		if (empty($item['verb'])) {
+			return false;
+		}
+		$activity_index = self::activityToIndex($item['verb']);
+
+		if ($activity_index < 0) {
+			return false;
+		}
+
+		$fields = ['activity' => $activity_index];
+
+		logger('Update activity for ' . json_encode($condition));
+
+		DBA::update('item-activity', $fields, $condition, true);
+
+		return true;
+	}
+
+	/**
+	 * @brief Update existing item content entries
+	 *
+	 * @param array $item The item fields that are to be changed
+	 * @param array $condition The condition for finding the item content entries
+	 */
+	private static function updateContent($item, $condition)
+	{
+		// We have to select only the fields from the "item-content" table
+		$fields = [];
+		foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
+			if (isset($item[$field])) {
+				$fields[$field] = $item[$field];
+			}
+		}
+
+		if (empty($fields)) {
+			// when there are no fields at all, just use the condition
+			// This is to ensure that we always store content.
+			$fields = $condition;
+		}
+
+		logger('Update content for ' . json_encode($condition));
+
+		DBA::update('item-content', $fields, $condition, true);
+	}
+
 	/**
 	 * @brief Distributes public items to the receivers
 	 *
@@ -929,45 +2046,47 @@ class Item extends BaseObject
 	public static function distribute($itemid, $signed_text = '')
 	{
 		$condition = ["`id` IN (SELECT `parent` FROM `item` WHERE `id` = ?)", $itemid];
-		$parent = dba::selectFirst('item', ['owner-id'], $condition);
-		if (!DBM::is_result($parent)) {
+		$parent = self::selectFirst(['owner-id'], $condition);
+		if (!DBA::isResult($parent)) {
 			return;
 		}
 
 		// Only distribute public items from native networks
 		$condition = ['id' => $itemid, 'uid' => 0,
-			'network' => [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""],
+			'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""],
 			'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => false];
-		$item = dba::selectFirst('item', [], ['id' => $itemid]);
-		if (!DBM::is_result($item)) {
+		$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
+		if (!DBA::isResult($item)) {
 			return;
 		}
 
+		$origin = $item['origin'];
+
 		unset($item['id']);
 		unset($item['parent']);
 		unset($item['mention']);
 		unset($item['wall']);
 		unset($item['origin']);
 		unset($item['starred']);
-		unset($item['rendered-hash']);
-		unset($item['rendered-html']);
 
 		$users = [];
 
 		$condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)",
-			$parent['owner-id'], CONTACT_IS_SHARING,  CONTACT_IS_FRIEND];
-		$contacts = dba::select('contact', ['uid'], $condition);
-		while ($contact = dba::fetch($contacts)) {
+			$parent['owner-id'], Contact::SHARING,  Contact::FRIEND];
+
+		$contacts = DBA::select('contact', ['uid'], $condition);
+
+		while ($contact = DBA::fetch($contacts)) {
 			$users[$contact['uid']] = $contact['uid'];
 		}
 
 		$origin_uid = 0;
 
 		if ($item['uri'] != $item['parent-uri']) {
-			$parents = dba::select('item', ['uid', 'origin'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]);
-			while ($parent = dba::fetch($parents)) {
+			$parents = self::select(['uid', 'origin'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]);
+			while ($parent = self::fetch($parents)) {
 				$users[$parent['uid']] = $parent['uid'];
-				if ($parent['origin'] && !$item['origin']) {
+				if ($parent['origin'] && !$origin) {
 					$origin_uid = $parent['uid'];
 				}
 			}
@@ -1000,25 +2119,19 @@ class Item extends BaseObject
 		}
 
 		if (empty($item['contact-id'])) {
-			$self = dba::selectFirst('contact', ['id'], ['self' => true, 'uid' => $uid]);
-			if (!DBM::is_result($self)) {
+			$self = DBA::selectFirst('contact', ['id'], ['self' => true, 'uid' => $uid]);
+			if (!DBA::isResult($self)) {
 				return;
 			}
 			$item['contact-id'] = $self['id'];
 		}
 
-		if (in_array($item['type'], ["net-comment", "wall-comment"])) {
-			$item['type'] = 'remote-comment';
-		} elseif ($item['type'] == 'wall') {
-			$item['type'] = 'remote';
-		}
-
 		/// @todo Handling of "event-id"
 
 		$notify = false;
 		if ($item['uri'] == $item['parent-uri']) {
-			$contact = dba::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]);
-			if (DBM::is_result($contact)) {
+			$contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]);
+			if (DBA::isResult($contact)) {
 				$notify = self::isRemoteSelf($contact, $item);
 			}
 		}
@@ -1043,11 +2156,11 @@ class Item extends BaseObject
 	 */
 	public static function addShadow($itemid)
 	{
-		$fields = ['uid', 'private', 'moderated', 'visible', 'deleted', 'network'];
+		$fields = ['uid', 'private', 'moderated', 'visible', 'deleted', 'network', 'uri'];
 		$condition = ['id' => $itemid, 'parent' => [0, $itemid]];
-		$item = dba::selectFirst('item', $fields, $condition);
+		$item = self::selectFirst($fields, $condition);
 
-		if (!DBM::is_result($item)) {
+		if (!DBA::isResult($item)) {
 			return;
 		}
 
@@ -1062,42 +2175,36 @@ class Item extends BaseObject
 		}
 
 		// is it an entry from a connector? Only add an entry for natively connected networks
-		if (!in_array($item["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
+		if (!in_array($item["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
 			return;
 		}
 
-		$item = dba::selectFirst('item', [], ['id' => $itemid]);
+		if (self::exists(['uri' => $item['uri'], 'uid' => 0])) {
+			return;
+		}
 
-		if (DBM::is_result($item) && ($item["allow_cid"] == '') && ($item["allow_gid"] == '') &&
-			($item["deny_cid"] == '') && ($item["deny_gid"] == '')) {
+		$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
 
-			if (!dba::exists('item', ['uri' => $item['uri'], 'uid' => 0])) {
-				// Preparing public shadow (removing user specific data)
-				$item['uid'] = 0;
-				unset($item['id']);
-				unset($item['parent']);
-				unset($item['wall']);
-				unset($item['mention']);
-				unset($item['origin']);
-				unset($item['starred']);
-				unset($item['rendered-hash']);
-				unset($item['rendered-html']);
-				if ($item['uri'] == $item['parent-uri']) {
-					$item['contact-id'] = Contact::getIdForURL($item['owner-link']);
-				} else {
-					$item['contact-id'] = Contact::getIdForURL($item['author-link']);
-				}
-
-				if (in_array($item['type'], ["net-comment", "wall-comment"])) {
-					$item['type'] = 'remote-comment';
-				} elseif ($item['type'] == 'wall') {
-					$item['type'] = 'remote';
-				}
-
-				$public_shadow = self::insert($item, false, false, true);
-
-				logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
+		if (DBA::isResult($item)) {
+			// Preparing public shadow (removing user specific data)
+			$item['uid'] = 0;
+			unset($item['id']);
+			unset($item['parent']);
+			unset($item['wall']);
+			unset($item['mention']);
+			unset($item['origin']);
+			unset($item['starred']);
+			unset($item['postopts']);
+			unset($item['inform']);
+			if ($item['uri'] == $item['parent-uri']) {
+				$item['contact-id'] = $item['owner-id'];
+			} else {
+				$item['contact-id'] = $item['author-id'];
 			}
+
+			$public_shadow = self::insert($item, false, false, true);
+
+			logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
 		}
 	}
 
@@ -1110,8 +2217,8 @@ class Item extends BaseObject
 	 */
 	public static function addShadowPost($itemid)
 	{
-		$item = dba::selectFirst('item', [], ['id' => $itemid]);
-		if (!DBM::is_result($item)) {
+		$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
+		if (!DBA::isResult($item)) {
 			return;
 		}
 
@@ -1122,16 +2229,17 @@ class Item extends BaseObject
 		}
 
 		// Is this a shadow entry?
-		if ($item['uid'] == 0)
+		if ($item['uid'] == 0) {
 			return;
+		}
 
 		// Is there a shadow parent?
-		if (!dba::exists('item', ['uri' => $item['parent-uri'], 'uid' => 0])) {
+		if (!self::exists(['uri' => $item['parent-uri'], 'uid' => 0])) {
 			return;
 		}
 
 		// Is there already a shadow entry?
-		if (dba::exists('item', ['uri' => $item['uri'], 'uid' => 0])) {
+		if (self::exists(['uri' => $item['uri'], 'uid' => 0])) {
 			return;
 		}
 
@@ -1147,63 +2255,35 @@ class Item extends BaseObject
 		unset($item['mention']);
 		unset($item['origin']);
 		unset($item['starred']);
-		unset($item['rendered-hash']);
-		unset($item['rendered-html']);
+		unset($item['postopts']);
+		unset($item['inform']);
 		$item['contact-id'] = Contact::getIdForURL($item['author-link']);
 
-		if (in_array($item['type'], ["net-comment", "wall-comment"])) {
-			$item['type'] = 'remote-comment';
-		} elseif ($item['type'] == 'wall') {
-			$item['type'] = 'remote';
-		}
-
 		$public_shadow = self::insert($item, false, false, true);
 
 		logger("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, LOGGER_DEBUG);
 
 		// If this was a comment to a Diaspora post we don't get our comment back.
 		// This means that we have to distribute the comment by ourselves.
-		if ($origin) {
-			if (dba::exists('item', ['id' => $parent, 'network' => NETWORK_DIASPORA])) {
-				self::distribute($public_shadow);
-			}
+		if ($origin && self::exists(['id' => $parent, 'network' => Protocol::DIASPORA])) {
+			self::distribute($public_shadow);
 		}
 	}
 
 	 /**
-	 * Adds a "lang" specification in a "postopts" element of given $arr,
-	 * if possible and not already present.
+	 * Adds a language specification in a "language" element of given $arr.
 	 * Expects "body" element to exist in $arr.
 	 */
-	private static function addLanguageInPostopts(&$item)
+	private static function addLanguageToItemArray(&$item)
 	{
-		if (!empty($item['postopts'])) {
-			if (strstr($item['postopts'], 'lang=')) {
-				// do not override
-				return;
-			}
-			$postopts = $item['postopts'];
-		} else {
-			$postopts = "";
-		}
+		$naked_body = BBCode::toPlaintext($item['body'], false);
 
-		$naked_body = Text\BBCode::toPlaintext($item['body'], false);
+		$ld = new Text_LanguageDetect();
+		$ld->setNameMode(2);
+		$languages = $ld->detect($naked_body, 3);
 
-		$languages = (new Text_LanguageDetect())->detect($naked_body, 3);
-
-		if (sizeof($languages) > 0) {
-			if ($postopts != '') {
-				$postopts .= '&'; // arbitrary separator, to be reviewed
-			}
-
-			$postopts .= 'lang=';
-			$sep = "";
-
-			foreach ($languages as $language => $score) {
-				$postopts .= $sep . $language . ";" . $score;
-				$sep = ':';
-			}
-			$item['postopts'] = $postopts;
+		if (is_array($languages)) {
+			$item['language'] = json_encode($languages);
 		}
 	}
 
@@ -1235,6 +2315,29 @@ class Item extends BaseObject
 		return $guid_prefix.$host_hash;
 	}
 
+	/**
+	 * generate an unique URI
+	 *
+	 * @param integer $uid User id
+	 * @param string $guid An existing GUID (Otherwise it will be generated)
+	 *
+	 * @return string
+	 */
+	public static function newURI($uid, $guid = "")
+	{
+		if ($guid == "") {
+			$guid = System::createGUID(32);
+		}
+
+		$hostname = self::getApp()->get_hostname();
+
+		$user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]);
+
+		$uri = "urn:X-dfrn:" . $hostname . ':' . $user['nickname'] . ':' . $guid;
+
+		return $uri;
+	}
+
 	/**
 	 * @brief Set "success_update" and "last-item" to the date of the last time we heard from this contact
 	 *
@@ -1247,37 +2350,37 @@ class Item extends BaseObject
 	private static function updateContact($arr)
 	{
 		// Unarchive the author
-		$contact = dba::selectFirst('contact', [], ['id' => $arr["author-id"]]);
-		if (DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', [], ['id' => $arr["author-id"]]);
+		if (DBA::isResult($contact)) {
 			Contact::unmarkForArchival($contact);
 		}
 
 		// Unarchive the contact if it's not our own contact
-		$contact = dba::selectFirst('contact', [], ['id' => $arr["contact-id"], 'self' => false]);
-		if (DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', [], ['id' => $arr["contact-id"], 'self' => false]);
+		if (DBA::isResult($contact)) {
 			Contact::unmarkForArchival($contact);
 		}
 
-		$update = (!$arr['private'] && (($arr["author-link"] === $arr["owner-link"]) || ($arr["parent-uri"] === $arr["uri"])));
+		$update = (!$arr['private'] && ((defaults($arr, 'author-link', '') === defaults($arr, 'owner-link', '')) || ($arr["parent-uri"] === $arr["uri"])));
 
 		// Is it a forum? Then we don't care about the rules from above
-		if (!$update && ($arr["network"] == NETWORK_DFRN) && ($arr["parent-uri"] === $arr["uri"])) {
-			if (dba::exists('contact', ['id' => $arr['contact-id'], 'forum' => true])) {
+		if (!$update && ($arr["network"] == Protocol::DFRN) && ($arr["parent-uri"] === $arr["uri"])) {
+			if (DBA::exists('contact', ['id' => $arr['contact-id'], 'forum' => true])) {
 				$update = true;
 			}
 		}
 
 		if ($update) {
-			dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
+			DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
 				['id' => $arr['contact-id']]);
 		}
 		// Now do the same for the system wide contacts with uid=0
 		if (!$arr['private']) {
-			dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
+			DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
 				['id' => $arr['owner-id']]);
 
 			if ($arr['owner-id'] != $arr['author-id']) {
-				dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
+				DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']],
 					['id' => $arr['author-id']]);
 			}
 		}
@@ -1353,14 +2456,20 @@ class Item extends BaseObject
 
 	public static function getGuidById($id)
 	{
-		$item = dba::selectFirst('item', ['guid'], ['id' => $id]);
-		if (DBM::is_result($item)) {
+		$item = self::selectFirst(['guid'], ['id' => $id]);
+		if (DBA::isResult($item)) {
 			return $item['guid'];
 		} else {
 			return '';
 		}
 	}
 
+	/**
+	 * This function is only used for the old Friendica app on Android that doesn't like paths with guid
+	 * @param string $guid item guid
+	 * @param int    $uid  user id
+	 * @return array with id and nick of the item with the given guid
+	 */
 	public static function getIdAndNickByGuid($guid, $uid = 0)
 	{
 		$nick = "";
@@ -1372,28 +2481,28 @@ class Item extends BaseObject
 
 		// Does the given user have this item?
 		if ($uid) {
-			$item = dba::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item`
-				INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
-				WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-					AND `item`.`guid` = ? AND `item`.`uid` = ?", $guid, $uid);
-			if (DBM::is_result($item)) {
-				$id = $item["id"];
-				$nick = $item["nickname"];
+			$item = self::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
+			if (DBA::isResult($item)) {
+				$user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]);
+				if (!DBA::isResult($user)) {
+					return;
+				}
+				$id = $item['id'];
+				$nick = $user['nickname'];
 			}
 		}
 
 		// Or is it anywhere on the server?
 		if ($nick == "") {
-			$item = dba::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item`
-				INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
-				WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-					AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-					AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
-					AND NOT `item`.`private` AND `item`.`wall`
-					AND `item`.`guid` = ?", $guid);
-			if (DBM::is_result($item)) {
-				$id = $item["id"];
-				$nick = $item["nickname"];
+			$condition = ["`guid` = ? AND `uid` != 0", $guid];
+			$item = self::selectFirst(['id', 'uid'], $condition);
+			if (DBA::isResult($item)) {
+				$user = DBA::selectFirst('user', ['nickname'], ['uid' => $item['uid']]);
+				if (!DBA::isResult($user)) {
+					return;
+				}
+				$id = $item['id'];
+				$nick = $user['nickname'];
 			}
 		}
 		return ["nick" => $nick, "id" => $id];
@@ -1409,16 +2518,16 @@ class Item extends BaseObject
 	{
 		$mention = false;
 
-		$user = dba::selectFirst('user', [], ['uid' => $uid]);
-		if (!DBM::is_result($user)) {
+		$user = DBA::selectFirst('user', [], ['uid' => $uid]);
+		if (!DBA::isResult($user)) {
 			return;
 		}
 
-		$community_page = (($user['page-flags'] == PAGE_COMMUNITY) ? true : false);
-		$prvgroup = (($user['page-flags'] == PAGE_PRVGROUP) ? true : false);
+		$community_page = (($user['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
+		$prvgroup = (($user['page-flags'] == Contact::PAGE_PRVGROUP) ? true : false);
 
-		$item = dba::selectFirst('item', [], ['id' => $item_id]);
-		if (!DBM::is_result($item)) {
+		$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]);
+		if (!DBA::isResult($item)) {
 			return;
 		}
 
@@ -1446,7 +2555,7 @@ class Item extends BaseObject
 				// mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment)
 				// delete it!
 				logger("no-mention top-level post to community or private group. delete.");
-				dba::delete('item', ['id' => $item_id]);
+				DBA::delete('item', ['id' => $item_id]);
 				return true;
 			}
 			return;
@@ -1470,8 +2579,8 @@ class Item extends BaseObject
 		}
 
 		// now change this copy of the post to a forum head message and deliver to all the tgroup members
-		$self = dba::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]);
-		if (!DBM::is_result($self)) {
+		$self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]);
+		if (!DBA::isResult($self)) {
 			return;
 		}
 
@@ -1481,13 +2590,13 @@ class Item extends BaseObject
 
 		$private = ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) ? 1 : 0;
 
+		$psid = PermissionSet::fetchIDForPost($user);
+
 		$forum_mode = ($prvgroup ? 2 : 1);
 
 		$fields = ['wall' => true, 'origin' => true, 'forum_mode' => $forum_mode, 'contact-id' => $self['id'],
-			'owner-id' => $owner_id, 'owner-name' => $self['name'], 'owner-link' => $self['url'],
-			'owner-avatar' => $self['thumb'], 'private' => $private, 'allow_cid' => $user['allow_cid'],
-			'allow_gid' => $user['allow_gid'], 'deny_cid' => $user['deny_cid'], 'deny_gid' => $user['deny_gid']];
-		dba::update('item', $fields, ['id' => $item_id]);
+			'owner-id' => $owner_id, 'private' => $private, 'psid' => $psid];
+		self::update($fields, ['id' => $item_id]);
 
 		self::updateThread($item_id);
 
@@ -1503,7 +2612,7 @@ class Item extends BaseObject
 		}
 
 		// Prevent the forwarding of posts that are forwarded
-		if ($datarray["extid"] == NETWORK_DFRN) {
+		if (!empty($datarray["extid"]) && ($datarray["extid"] == Protocol::DFRN)) {
 			logger('Already forwarded', LOGGER_DEBUG);
 			return false;
 		}
@@ -1520,7 +2629,7 @@ class Item extends BaseObject
 			return false;
 		}
 
-		if (($contact['network'] != NETWORK_FEED) && $datarray['private']) {
+		if (($contact['network'] != Protocol::FEED) && $datarray['private']) {
 			logger('Not public', LOGGER_DEBUG);
 			return false;
 		}
@@ -1528,9 +2637,9 @@ class Item extends BaseObject
 		$datarray2 = $datarray;
 		logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG);
 		if ($contact['remote_self'] == 2) {
-			$self = dba::selectFirst('contact', ['id', 'name', 'url', 'thumb'],
+			$self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'],
 					['uid' => $contact['uid'], 'self' => true]);
-			if (DBM::is_result($self)) {
+			if (DBA::isResult($self)) {
 				$datarray['contact-id'] = $self["id"];
 
 				$datarray['owner-name'] = $self["name"];
@@ -1549,13 +2658,13 @@ class Item extends BaseObject
 				unset($datarray['author-id']);
 			}
 
-			if ($contact['network'] != NETWORK_FEED) {
-				$datarray["guid"] = get_guid(32);
+			if ($contact['network'] != Protocol::FEED) {
+				$datarray["guid"] = System::createGUID(32);
 				unset($datarray["plink"]);
-				$datarray["uri"] = item_new_uri($a->get_hostname(), $contact['uid'], $datarray["guid"]);
+				$datarray["uri"] = self::newURI($contact['uid'], $datarray["guid"]);
 				$datarray["parent-uri"] = $datarray["uri"];
 				$datarray["thr-parent"] = $datarray["uri"];
-				$datarray["extid"] = NETWORK_DFRN;
+				$datarray["extid"] = Protocol::DFRN;
 				$urlpart = parse_url($datarray2['author-link']);
 				$datarray["app"] = $urlpart["host"];
 			} else {
@@ -1563,7 +2672,7 @@ class Item extends BaseObject
 			}
 		}
 
-		if ($contact['network'] != NETWORK_FEED) {
+		if ($contact['network'] != Protocol::FEED) {
 			// Store the original post
 			$result = self::insert($datarray2, false, false);
 			logger('remote-self post original item - Contact '.$contact['url'].' return '.$result.' Item '.print_r($datarray2, true), LOGGER_DEBUG);
@@ -1623,8 +2732,8 @@ class Item extends BaseObject
 					$res = substr($i, $x + 1);
 					$i = substr($i, 0, $x);
 					$fields = ['data', 'type', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
-					$photo = dba::selectFirst('photo', $fields, ['resource-id' => $i, 'scale' => $res, 'uid' => $uid]);
-					if (DBM::is_result($photo)) {
+					$photo = DBA::selectFirst('photo', $fields, ['resource-id' => $i, 'scale' => $res, 'uid' => $uid]);
+					if (DBA::isResult($photo)) {
 						/*
 						 * Check to see if we should replace this photo link with an embedded image
 						 * 1. No need to do so if the photo is public
@@ -1691,17 +2800,8 @@ class Item extends BaseObject
 
 	private static function hasPermissions($obj)
 	{
-		return (
-			(
-				x($obj, 'allow_cid')
-			) || (
-				x($obj, 'allow_gid')
-			) || (
-				x($obj, 'deny_cid')
-			) || (
-				x($obj, 'deny_gid')
-			)
-		);
+		return !empty($obj['allow_cid']) || !empty($obj['allow_gid']) ||
+			!empty($obj['deny_cid']) || !empty($obj['deny_gid']);
 	}
 
 	private static function samePermissions($obj1, $obj2)
@@ -1767,82 +2867,87 @@ class Item extends BaseObject
 			return;
 		}
 
+		$condition = ["`uid` = ? AND NOT `deleted` AND `id` = `parent` AND `gravity` = ?",
+			$uid, GRAVITY_PARENT];
+
 		/*
 		 * $expire_network_only = save your own wall posts
 		 * and just expire conversations started by others
 		 */
-		$expire_network_only = PConfig::get($uid,'expire', 'network_only');
-		$sql_extra = (intval($expire_network_only) ? " AND wall = 0 " : "");
+		$expire_network_only = PConfig::get($uid, 'expire', 'network_only', false);
+
+		if ($expire_network_only) {
+			$condition[0] .= " AND NOT `wall`";
+		}
 
 		if ($network != "") {
-			$sql_extra .= sprintf(" AND network = '%s' ", dbesc($network));
+			$condition[0] .= " AND `network` = ?";
+			$condition[] = $network;
 
 			/*
 			 * There is an index "uid_network_received" but not "uid_network_created"
 			 * This avoids the creation of another index just for one purpose.
 			 * And it doesn't really matter wether to look at "received" or "created"
 			 */
-			$range = "AND `received` < UTC_TIMESTAMP() - INTERVAL %d DAY ";
+			$condition[0] .= " AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY";
+			$condition[] = $days;
 		} else {
-			$range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY ";
+			$condition[0] .= " AND `created` < UTC_TIMESTAMP() - INTERVAL ? DAY";
+			$condition[] = $days;
 		}
 
-		$r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item`
-			WHERE `uid` = %d $range
-			AND `id` = `parent`
-			$sql_extra
-			AND `deleted` = 0",
-			intval($uid),
-			intval($days)
-		);
+		$items = self::select(['file', 'resource-id', 'starred', 'type', 'id', 'post-type'], $condition);
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($items)) {
 			return;
 		}
 
-		$expire_items = PConfig::get($uid, 'expire', 'items', 1);
+		$expire_items = PConfig::get($uid, 'expire', 'items', true);
 
 		// Forcing expiring of items - but not notes and marked items
 		if ($force) {
 			$expire_items = true;
 		}
 
-		$expire_notes = PConfig::get($uid, 'expire', 'notes', 1);
-		$expire_starred = PConfig::get($uid, 'expire', 'starred', 1);
-		$expire_photos = PConfig::get($uid, 'expire', 'photos', 0);
+		$expire_notes = PConfig::get($uid, 'expire', 'notes', true);
+		$expire_starred = PConfig::get($uid, 'expire', 'starred', true);
+		$expire_photos = PConfig::get($uid, 'expire', 'photos', false);
 
-		logger('User '.$uid.': expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
-
-		foreach ($r as $item) {
+		$expired = 0;
 
+		while ($item = Item::fetch($items)) {
 			// don't expire filed items
 
-			if (strpos($item['file'],'[') !== false) {
+			if (strpos($item['file'], '[') !== false) {
 				continue;
 			}
 
 			// Only expire posts, not photos and photo comments
 
-			if ($expire_photos == 0 && strlen($item['resource-id'])) {
+			if (!$expire_photos && strlen($item['resource-id'])) {
 				continue;
-			} elseif ($expire_starred == 0 && intval($item['starred'])) {
+			} elseif (!$expire_starred && intval($item['starred'])) {
 				continue;
-			} elseif ($expire_notes == 0 && $item['type'] == 'note') {
+			} elseif (!$expire_notes && (($item['type'] == 'note') || ($item['post-type'] == Item::PT_PERSONAL_NOTE))) {
 				continue;
-			} elseif ($expire_items == 0 && $item['type'] != 'note') {
+			} elseif (!$expire_items && ($item['type'] != 'note') && ($item['post-type'] != Item::PT_PERSONAL_NOTE)) {
 				continue;
 			}
 
 			self::deleteById($item['id'], PRIORITY_LOW);
+
+			++$expired;
 		}
+		DBA::close($items);
+		logger('User ' . $uid . ": expired $expired items; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
 	}
 
 	public static function firstPostDate($uid, $wall = false)
 	{
 		$condition = ['uid' => $uid, 'wall' => $wall, 'deleted' => false, 'visible' => true, 'moderated' => false];
 		$params = ['order' => ['created' => false]];
-		$thread = dba::selectFirst('thread', ['created'], $condition, $params);
-		if (DBM::is_result($thread)) {
+		$thread = DBA::selectFirst('thread', ['created'], $condition, $params);
+		if (DBA::isResult($thread)) {
 			return substr(DateTimeFormat::local($thread['created']), 0, 10);
 		}
 		return false;
@@ -1871,27 +2976,22 @@ class Item extends BaseObject
 		switch ($verb) {
 			case 'like':
 			case 'unlike':
-				$bodyverb = L10n::t('%1$s likes %2$s\'s %3$s');
 				$activity = ACTIVITY_LIKE;
 				break;
 			case 'dislike':
 			case 'undislike':
-				$bodyverb = L10n::t('%1$s doesn\'t like %2$s\'s %3$s');
 				$activity = ACTIVITY_DISLIKE;
 				break;
 			case 'attendyes':
 			case 'unattendyes':
-				$bodyverb = L10n::t('%1$s is attending %2$s\'s %3$s');
 				$activity = ACTIVITY_ATTEND;
 				break;
 			case 'attendno':
 			case 'unattendno':
-				$bodyverb = L10n::t('%1$s is not attending %2$s\'s %3$s');
 				$activity = ACTIVITY_ATTENDNO;
 				break;
 			case 'attendmaybe':
 			case 'unattendmaybe':
-				$bodyverb = L10n::t('%1$s may attend %2$s\'s %3$s');
 				$activity = ACTIVITY_ATTENDMAYBE;
 				break;
 			default:
@@ -1904,12 +3004,14 @@ class Item extends BaseObject
 
 		logger('like: verb ' . $verb . ' item ' . $item_id);
 
-		$item = dba::selectFirst('item', [], ['`id` = ? OR `uri` = ?', $item_id, $item_id]);
-		if (!DBM::is_result($item)) {
+		$item = self::selectFirst(self::ITEM_FIELDLIST, ['`id` = ? OR `uri` = ?', $item_id, $item_id]);
+		if (!DBA::isResult($item)) {
 			logger('like: unknown item ' . $item_id);
 			return false;
 		}
 
+		$item_uri = $item['uri'];
+
 		$uid = $item['uid'];
 		if (($uid == 0) && local_user()) {
 			$uid = local_user();
@@ -1921,8 +3023,8 @@ class Item extends BaseObject
 		}
 
 		// Retrieves the local post owner
-		$owner_self_contact = dba::selectFirst('contact', [], ['uid' => $uid, 'self' => true]);
-		if (!DBM::is_result($owner_self_contact)) {
+		$owner_self_contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'self' => true]);
+		if (!DBA::isResult($owner_self_contact)) {
 			logger('like: unknown owner ' . $uid);
 			return false;
 		}
@@ -1930,8 +3032,8 @@ class Item extends BaseObject
 		// Retrieve the current logged in user's public contact
 		$author_id = public_contact();
 
-		$author_contact = dba::selectFirst('contact', [], ['id' => $author_id]);
-		if (!DBM::is_result($author_contact)) {
+		$author_contact = DBA::selectFirst('contact', ['url'], ['id' => $author_id]);
+		if (!DBA::isResult($author_contact)) {
 			logger('like: unknown author ' . $author_id);
 			return false;
 		}
@@ -1942,8 +3044,8 @@ class Item extends BaseObject
 			$item_contact = $owner_self_contact;
 		} else {
 			$item_contact_id = Contact::getIdForURL($author_contact['url'], $uid, true);
-			$item_contact = dba::selectFirst('contact', [], ['id' => $item_contact_id]);
-			if (!DBM::is_result($item_contact)) {
+			$item_contact = DBA::selectFirst('contact', [], ['id' => $item_contact_id]);
+			if (!DBA::isResult($item_contact)) {
 				logger('like: unknown item contact ' . $item_contact_id);
 				return false;
 			}
@@ -1953,39 +3055,25 @@ class Item extends BaseObject
 		// event participation are essentially radio toggles. If you make a subsequent choice,
 		// we need to eradicate your first choice.
 		if ($event_verb_flag) {
-			$verbs = "'" . dbesc(ACTIVITY_ATTEND) . "', '" . dbesc(ACTIVITY_ATTENDNO) . "', '" . dbesc(ACTIVITY_ATTENDMAYBE) . "'";
+			$verbs = [ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
+
+			// Translate to the index based activity index
+			$activities = [];
+			foreach ($verbs as $verb) {
+				$activities[] = self::activityToIndex($verb);
+			}
 		} else {
-			$verbs = "'".dbesc($activity)."'";
+			$activities = self::activityToIndex($activity);
 		}
 
-		/// @todo This query is expected to be a performance eater due to the "OR" - it has to be changed totally
-		$existing_like = q("SELECT `id`, `guid`, `verb` FROM `item`
-			WHERE `verb` IN ($verbs)
-			AND `deleted` = 0
-			AND `author-id` = %d
-			AND `uid` = %d
-			AND (`parent` = '%s' OR `parent-uri` = '%s' OR `thr-parent` = '%s')
-			LIMIT 1",
-			intval($author_contact['id']),
-			intval($item['uid']),
-			dbesc($item_id), dbesc($item_id), dbesc($item['uri'])
-		);
+		$condition = ['activity' => $activities, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY,
+			'author-id' => $author_id, 'uid' => $item['uid'], 'thr-parent' => $item_uri];
+
+		$like_item = self::selectFirst(['id', 'guid', 'verb'], $condition);
 
 		// If it exists, mark it as deleted
-		if (DBM::is_result($existing_like)) {
-			$like_item = $existing_like[0];
-
-			// Already voted, undo it
-			$fields = ['deleted' => true, 'unseen' => true, 'changed' => DateTimeFormat::utcNow()];
-			dba::update('item', $fields, ['id' => $like_item['id']]);
-
-			// Clean up the Diaspora signatures for this like
-			// Go ahead and do it even if Diaspora support is disabled. We still want to clean up
-			// if it had been enabled in the past
-			dba::delete('sign', ['iid' => $like_item['id']]);
-
-			$like_item_id = $like_item['id'];
-			Worker::add(PRIORITY_HIGH, "Notifier", "like", $like_item_id);
+		if (DBA::isResult($like_item)) {
+			self::deleteById($like_item['id']);
 
 			if (!$event_verb_flag || $like_item['verb'] == $activity) {
 				return true;
@@ -1997,55 +3085,25 @@ class Item extends BaseObject
 			return true;
 		}
 
-		// Else or if event verb different from existing row, create a new item row
-		$post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status'));
-		if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
-			$post_type = L10n::t('event');
-		}
 		$objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ;
-		$link = xmlify('<link rel="alternate" type="text/html" href="' . System::baseUrl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . '" />' . "\n") ;
-		$body = $item['body'];
-
-		$obj = <<< EOT
-
-		<object>
-			<type>$objtype</type>
-			<local>1</local>
-			<id>{$item['uri']}</id>
-			<link>$link</link>
-			<title></title>
-			<content>$body</content>
-		</object>
-EOT;
-
-		$ulink = '[url=' . $author_contact['url'] . ']' . $author_contact['name'] . '[/url]';
-		$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
-		$plink = '[url=' . System::baseUrl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
 
 		$new_item = [
-			'guid'          => get_guid(32),
-			'uri'           => item_new_uri(self::getApp()->get_hostname(), $item['uid']),
+			'guid'          => System::createGUID(32),
+			'uri'           => self::newURI($item['uid']),
 			'uid'           => $item['uid'],
 			'contact-id'    => $item_contact_id,
-			'type'          => 'activity',
 			'wall'          => $item['wall'],
 			'origin'        => 1,
-			'gravity'       => GRAVITY_LIKE,
+			'network'       => Protocol::DFRN,
+			'gravity'       => GRAVITY_ACTIVITY,
 			'parent'        => $item['id'],
 			'parent-uri'    => $item['uri'],
 			'thr-parent'    => $item['uri'],
 			'owner-id'      => $item['owner-id'],
-			'owner-name'    => $item['owner-name'],
-			'owner-link'    => $item['owner-link'],
-			'owner-avatar'  => $item['owner-avatar'],
-			'author-id'     => $author_contact['id'],
-			'author-name'   => $author_contact['name'],
-			'author-link'   => $author_contact['url'],
-			'author-avatar' => $author_contact['thumb'],
-			'body'          => sprintf($bodyverb, $ulink, $alink, $plink),
+			'author-id'     => $author_id,
+			'body'          => $activity,
 			'verb'          => $activity,
 			'object-type'   => $objtype,
-			'object'        => $obj,
 			'allow_cid'     => $item['allow_cid'],
 			'allow_gid'     => $item['allow_gid'],
 			'deny_cid'      => $item['deny_cid'],
@@ -2076,19 +3134,19 @@ EOT;
 	private static function addThread($itemid, $onlyshadow = false)
 	{
 		$fields = ['uid', 'created', 'edited', 'commented', 'received', 'changed', 'wall', 'private', 'pubmail',
-			'moderated', 'visible', 'spam', 'starred', 'bookmark', 'contact-id',
+			'moderated', 'visible', 'starred', 'contact-id', 'post-type',
 			'deleted', 'origin', 'forum_mode', 'mention', 'network', 'author-id', 'owner-id'];
 		$condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
-		$item = dba::selectFirst('item', $fields, $condition);
+		$item = self::selectFirst($fields, $condition);
 
-		if (!DBM::is_result($item)) {
+		if (!DBA::isResult($item)) {
 			return;
 		}
 
 		$item['iid'] = $itemid;
 
 		if (!$onlyshadow) {
-			$result = dba::insert('thread', $item);
+			$result = DBA::insert('thread', $item);
 
 			logger("Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
 		}
@@ -2096,13 +3154,13 @@ EOT;
 
 	private static function updateThread($itemid, $setmention = false)
 	{
-		$fields = ['uid', 'guid', 'title', 'body', 'created', 'edited', 'commented', 'received', 'changed',
-			'wall', 'private', 'pubmail', 'moderated', 'visible', 'spam', 'starred', 'bookmark', 'contact-id',
-			'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id', 'rendered-html', 'rendered-hash'];
+		$fields = ['uid', 'guid', 'created', 'edited', 'commented', 'received', 'changed', 'post-type',
+			'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'contact-id',
+			'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id'];
 		$condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
 
-		$item = dba::selectFirst('item', $fields, $condition);
-		if (!DBM::is_result($item)) {
+		$item = self::selectFirst($fields, $condition);
+		if (!DBA::isResult($item)) {
 			return;
 		}
 
@@ -2115,46 +3173,32 @@ EOT;
 		$fields = [];
 
 		foreach ($item as $field => $data) {
-			if (!in_array($field, ["guid", "title", "body", "rendered-html", "rendered-hash"])) {
+			if (!in_array($field, ["guid"])) {
 				$fields[$field] = $data;
 			}
 		}
 
-		$result = dba::update('thread', $fields, ['iid' => $itemid]);
+		$result = DBA::update('thread', $fields, ['iid' => $itemid]);
 
 		logger("Update thread for item ".$itemid." - guid ".$item["guid"]." - ".(int)$result, LOGGER_DEBUG);
-
-		// Updating a shadow item entry
-		$items = dba::selectFirst('item', ['id'], ['guid' => $item['guid'], 'uid' => 0]);
-
-		if (!DBM::is_result($items)) {
-			return;
-		}
-
-		$fields = ['title' => $item['title'], 'body' => $item['body'],
-			'rendered-html' => $item['rendered-html'], 'rendered-hash' => $item['rendered-hash']];
-		$result = dba::update('item', $fields, ['id' => $items['id']]);
-
-		logger("Updating public shadow for post ".$items["id"]." - guid ".$item["guid"]." Result: ".print_r($result, true), LOGGER_DEBUG);
 	}
 
 	private static function deleteThread($itemid, $itemuri = "")
 	{
-		$item = dba::selectFirst('thread', ['uid'], ['iid' => $itemid]);
-		if (!DBM::is_result($item)) {
+		$item = DBA::selectFirst('thread', ['uid'], ['iid' => $itemid]);
+		if (!DBA::isResult($item)) {
 			logger('No thread found for id '.$itemid, LOGGER_DEBUG);
 			return;
 		}
 
-		// Using dba::delete at this time could delete the associated item entries
-		$result = dba::e("DELETE FROM `thread` WHERE `iid` = ?", $itemid);
+		$result = DBA::delete('thread', ['iid' => $itemid], ['cascade' => false]);
 
 		logger("deleteThread: Deleted thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG);
 
 		if ($itemuri != "") {
 			$condition = ["`uri` = ? AND NOT `deleted` AND NOT (`uid` IN (?, 0))", $itemuri, $item["uid"]];
-			if (!dba::exists('item', $condition)) {
-				dba::delete('item', ['uri' => $itemuri, 'uid' => 0]);
+			if (!self::exists($condition)) {
+				DBA::delete('item', ['uri' => $itemuri, 'uid' => 0]);
 				logger("deleteThread: Deleted shadow for item ".$itemuri, LOGGER_DEBUG);
 			}
 		}
diff --git a/src/Model/ItemContent.php b/src/Model/ItemContent.php
index 21dbd34d0..c51f471d8 100644
--- a/src/Model/ItemContent.php
+++ b/src/Model/ItemContent.php
@@ -9,6 +9,7 @@ namespace Friendica\Model;
 use Friendica\BaseObject;
 use Friendica\Content\Text;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 
 require_once 'boot.php';
 require_once 'include/items.php';
@@ -68,14 +69,13 @@ class ItemContent extends BaseObject
 		} else {// Try to guess the correct target network
 			switch ($htmlmode) {
 				case 8:
-					$abstract = Text\BBCode::getAbstract($item['body'], NETWORK_TWITTER);
+					$abstract = Text\BBCode::getAbstract($item['body'], Protocol::TWITTER);
 					break;
+
 				case 7:
-					$abstract = Text\BBCode::getAbstract($item['body'], NETWORK_STATUSNET);
-					break;
-				case 6:
-					$abstract = Text\BBCode::getAbstract($item['body'], NETWORK_APPNET);
+					$abstract = Text\BBCode::getAbstract($item['body'], Protocol::STATUSNET);
 					break;
+
 				default: // We don't know the exact target.
 					// We fetch an abstract since there is a posting limit.
 					if ($limit > 0) {
@@ -93,7 +93,7 @@ class ItemContent extends BaseObject
 			}
 		}
 
-		$html = Text\BBCode::convert($post['text'] . $post['after'], false, $htmlmode);
+		$html = Text\BBCode::convert($post['text'] . defaults($post, 'after', ''), false, $htmlmode);
 		$msg = Text\HTML::toPlaintext($html, 0, true);
 		$msg = trim(html_entity_decode($msg, ENT_QUOTES, 'UTF-8'));
 
@@ -102,7 +102,7 @@ class ItemContent extends BaseObject
 			if ($post['type'] == 'link') {
 				$link = $post['url'];
 			} elseif ($post['type'] == 'text') {
-				$link = $post['url'];
+				$link = defaults($post, 'url', '');
 			} elseif ($post['type'] == 'video') {
 				$link = $post['url'];
 			} elseif ($post['type'] == 'photo') {
diff --git a/src/Model/ItemURI.php b/src/Model/ItemURI.php
new file mode 100644
index 000000000..559babb76
--- /dev/null
+++ b/src/Model/ItemURI.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file src/Model/ItemURI.php
+ */
+
+namespace Friendica\Model;
+
+use Friendica\BaseObject;
+use Friendica\Database\DBA;
+
+require_once 'boot.php';
+
+class ItemURI extends BaseObject
+{
+	/**
+	 * @brief Insert an item-uri record and return its id
+	 *
+	 * @param array $fields Item-uri fields
+	 *
+	 * @return integer item-uri id
+	 */
+	public static function insert($fields)
+	{
+		if (!DBA::exists('item-uri', ['uri' => $fields['uri']])) {
+			DBA::insert('item-uri', $fields, true);
+		}
+
+		$itemuri = DBA::selectFirst('item-uri', ['id'], ['uri' => $fields['uri']]);
+
+		if (!DBA::isResult($itemuri)) {
+			// This shouldn't happen
+			return null;
+		}
+
+		return $itemuri['id'];
+	}
+
+	/**
+	 * @brief Searched for an id of a given uri. Adds it, if not existing yet.
+	 *
+	 * @param string $uri
+	 *
+	 * @return integer item-uri id
+	 */
+	public static function getIdByURI($uri)
+	{
+		$itemuri = DBA::selectFirst('item-uri', ['id'], ['uri' => $uri]);
+
+		if (!DBA::isResult($itemuri)) {
+			return self::insert(['uri' => $uri]);
+		}
+
+		return $itemuri['id'];
+	}
+}
diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 81494e7eb..24a174b6b 100644
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -8,10 +8,9 @@ namespace Friendica\Model;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
-use dba;
 
 require_once 'include/dba.php';
 
@@ -40,14 +39,14 @@ class Mail
 			$subject = L10n::t('[no subject]');
 		}
 
-		$me = dba::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
-		$contact = dba::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]);
+		$me = DBA::selectFirst('contact', [], ['uid' => local_user(), 'self' => true]);
+		$contact = DBA::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]);
 
 		if (!(count($me) && (count($contact)))) {
 			return -2;
 		}
 
-		$guid = get_guid(32);
+		$guid = System::createGUID(32);
 		$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
 		$convid = 0;
@@ -57,13 +56,11 @@ class Mail
 
 		if (strlen($replyto)) {
 			$reply = true;
-			$r = q("SELECT `convid` FROM `mail` WHERE `uid` = %d AND (`uri` = '%s' OR `parent-uri` = '%s') LIMIT 1",
-				intval(local_user()),
-				dbesc($replyto),
-				dbesc($replyto)
-			);
-			if (DBM::is_result($r)) {
-				$convid = $r[0]['convid'];
+			$condition = ["`uid` = ? AND (`uri` = ? OR `parent-uri` = ?)",
+				local_user(), $replyto, $replyto];
+			$mail = DBA::selectFirst('mail', ['convid'], $condition);
+			if (DBA::isResult($mail)) {
+				$convid = $mail['convid'];
 			}
 		}
 
@@ -76,7 +73,7 @@ class Mail
 			$recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host);
 			$sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
 
-			$conv_guid = get_guid(32);
+			$conv_guid = System::createGUID(32);
 			$convuri = $recip_handle . ':' . $conv_guid;
 
 			$handles = $recip_handle . ';' . $sender_handle;
@@ -84,8 +81,8 @@ class Mail
 			$fields = ['uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle,
 				'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(),
 				'subject' => $subject, 'recips' => $handles];
-			if (dba::insert('conv', $fields)) {
-				$convid = dba::lastInsertId();
+			if (DBA::insert('conv', $fields)) {
+				$convid = DBA::lastInsertId();
 			}
 		}
 
@@ -99,7 +96,7 @@ class Mail
 		}
 
 		$post_id = null;
-		$success = dba::insert(
+		$success = DBA::insert(
 			'mail',
 			[
 				'uid' => local_user(),
@@ -121,7 +118,7 @@ class Mail
 		);
 
 		if ($success) {
-			$post_id = dba::lastInsertId();
+			$post_id = DBA::lastInsertId();
 		}
 
 		/**
@@ -145,7 +142,7 @@ class Mail
 					}
 					$image_uri = substr($image, strrpos($image, '/') + 1);
 					$image_uri = substr($image_uri, 0, strpos($image_uri, '-'));
-					dba::update('photo', ['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_uri, 'album' => 'Wall Photos', 'uid' => local_user()]);
+					DBA::update('photo', ['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_uri, 'album' => 'Wall Photos', 'uid' => local_user()]);
 				}
 			}
 		}
@@ -174,7 +171,7 @@ class Mail
 			$subject = L10n::t('[no subject]');
 		}
 
-		$guid = get_guid(32);
+		$guid = System::createGUID(32);
 		$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
 
 		$me = Probe::uri($replyto);
@@ -183,7 +180,7 @@ class Mail
 			return -2;
 		}
 
-		$conv_guid = get_guid(32);
+		$conv_guid = System::createGUID(32);
 
 		$recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
 
@@ -198,8 +195,8 @@ class Mail
 		$fields = ['uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle,
 			'created' => DateTimeFormat::utcNow(), 'updated' => DateTimeFormat::utcNow(),
 			'subject' => $subject, 'recips' => $handles];
-		if (dba::insert('conv', $fields)) {
-			$convid = dba::lastInsertId();
+		if (DBA::insert('conv', $fields)) {
+			$convid = DBA::lastInsertId();
 		}
 
 		if (!$convid) {
@@ -207,7 +204,7 @@ class Mail
 			return -4;
 		}
 
-		dba::insert(
+		DBA::insert(
 			'mail',
 			[
 				'uid' => $recipient['uid'],
diff --git a/src/Model/OpenWebAuthToken.php b/src/Model/OpenWebAuthToken.php
new file mode 100644
index 000000000..7c14cd304
--- /dev/null
+++ b/src/Model/OpenWebAuthToken.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * @file src/Model/OpenWebAuthToken.php
+ */
+namespace Friendica\Model;
+
+use Friendica\Database\DBA;
+use Friendica\Util\DateTimeFormat;
+
+/**
+ * Methods to deal with entries of the 'openwebauth-token' table.
+ */
+class OpenWebAuthToken
+{
+	/**
+	 * Create an entry in the 'openwebauth-token' table.
+	 *
+	 * @param string $type   Verify type.
+	 * @param int    $uid    The user ID.
+	 * @param string $token
+	 * @param string $meta
+	 *
+	 * @return boolean
+	 */
+	public static function create($type, $uid, $token, $meta)
+	{
+		$fields = [
+			"type" => $type,
+			"uid" => $uid,
+			"token" => $token,
+			"meta" => $meta,
+			"created" => DateTimeFormat::utcNow()
+		];
+		return DBA::insert("openwebauth-token", $fields);
+	}
+
+	/**
+	 * Get the "meta" field of an entry in the openwebauth-token table.
+	 *
+	 * @param string $type   Verify type.
+	 * @param int    $uid    The user ID.
+	 * @param string $token
+	 *
+	 * @return string|boolean The meta enry or false if not found.
+	 */
+	public static function getMeta($type, $uid, $token)
+	{
+		$condition = ["type" => $type, "uid" => $uid, "token" => $token];
+
+		$entry = DBA::selectFirst("openwebauth-token", ["id", "meta"], $condition);
+		if (DBA::isResult($entry)) {
+			DBA::delete("openwebauth-token", ["id" => $entry["id"]]);
+
+			return $entry["meta"];
+		}
+		return false;
+	}
+
+	/**
+	 * Purge entries of a verify-type older than interval.
+	 *
+	 * @param string $type     Verify type.
+	 * @param string $interval SQL compatible time interval
+	 */
+	public static function purge($type, $interval)
+	{
+		$condition = ["`type` = ? AND `created` < ?", $type, DateTimeFormat::utcNow() . " - INTERVAL " . $interval];
+		DBA::delete("openwebauth-token", $condition);
+	}
+
+}
diff --git a/src/Model/PermissionSet.php b/src/Model/PermissionSet.php
new file mode 100644
index 000000000..6506c7094
--- /dev/null
+++ b/src/Model/PermissionSet.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * @file src/Model/PermissionSet.php
+ */
+namespace Friendica\Model;
+
+use Friendica\BaseObject;
+use Friendica\Database\DBA;
+
+require_once 'include/dba.php';
+
+/**
+ * @brief functions for interacting with the permission set of an object (item, photo, event, ...)
+ */
+class PermissionSet extends BaseObject
+{
+	/**
+	 * Fetch the id of a given permission set. Generate a new one when needed
+	 *
+	 * @param array $postarray The array from an item, picture or event post
+	 * @return id
+	 */
+	public static function fetchIDForPost(&$postarray)
+	{
+		$condition = ['uid' => $postarray['uid'],
+			'allow_cid' => self::sortPermissions(defaults($postarray, 'allow_cid', '')),
+			'allow_gid' => self::sortPermissions(defaults($postarray, 'allow_gid', '')),
+			'deny_cid' => self::sortPermissions(defaults($postarray, 'deny_cid', '')),
+			'deny_gid' => self::sortPermissions(defaults($postarray, 'deny_gid', ''))];
+
+		$set = DBA::selectFirst('permissionset', ['id'], $condition);
+
+		if (!DBA::isResult($set)) {
+			DBA::insert('permissionset', $condition, true);
+
+			$set = DBA::selectFirst('permissionset', ['id'], $condition);
+		}
+
+		$postarray['allow_cid'] = null;
+		$postarray['allow_gid'] = null;
+		$postarray['deny_cid'] = null;
+		$postarray['deny_gid'] = null;
+
+		return $set['id'];
+	}
+
+	private static function sortPermissions($permissionlist)
+	{
+		$cleaned_list = trim($permissionlist, '<>');
+
+		if (empty($cleaned_list)) {
+			return $permissionlist;
+		}
+
+		$elements = explode('><', $cleaned_list);
+
+		if (count($elements) <= 1) {
+			return $permissionlist;
+		}
+
+		asort($elements);
+
+		return '<' . implode('><', $elements) . '>';
+	}
+
+	/**
+	 * @brief Returns a permission set for a given contact
+	 *
+	 * @param integer $uid        User id whom the items belong
+	 * @param integer $contact_id Contact id of the visitor
+	 * @param array   $groups     Possibly previously fetched group ids for that contact
+	 *
+	 * @return array of permission set ids.
+	 */
+
+	static public function get($uid, $contact_id, $groups = null)
+	{
+		if (empty($groups) && DBA::exists('contact', ['id' => $contact_id, 'uid' => $uid, 'blocked' => false])) {
+			$groups = Group::getIdsByContactId($contact_id);
+		}
+
+		if (empty($groups) || !is_array($groups)) {
+			return [];
+		}
+		$group_str = '<<>>'; // should be impossible to match
+
+		foreach ($groups as $g) {
+			$group_str .= '|<' . intval($g) . '>';
+		}
+
+		$contact_str = '<' . $contact_id . '>';
+
+		$condition = ["`uid` = ? AND (`allow_cid` = '' OR`allow_cid` REGEXP ?)
+			AND (`deny_cid` = '' OR NOT `deny_cid` REGEXP ?)
+			AND (`allow_gid` = '' OR `allow_gid` REGEXP ?)
+			AND (`deny_gid` = '' OR NOT `deny_gid` REGEXP ?)",
+			$uid, $contact_str, $contact_str, $group_str, $group_str];
+
+		$ret = DBA::select('permissionset', ['id'], $condition);
+		$set = [];
+		while ($permission = DBA::fetch($ret)) {
+			$set[] = $permission['id'];
+		}
+		DBA::close($ret);
+
+		return $set;
+	}
+}
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index c622421cc..555df80e6 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -10,11 +10,10 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use dba;
 
 require_once 'include/dba.php';
 
@@ -41,14 +40,14 @@ class Photo
 	 */
 	public static function store(Image $Image, $uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '', $desc = '')
 	{
-		$photo = dba::selectFirst('photo', ['guid'], ["`resource-id` = ? AND `guid` != ?", $rid, '']);
-		if (DBM::is_result($photo)) {
+		$photo = DBA::selectFirst('photo', ['guid'], ["`resource-id` = ? AND `guid` != ?", $rid, '']);
+		if (DBA::isResult($photo)) {
 			$guid = $photo['guid'];
 		} else {
-			$guid = get_guid();
+			$guid = System::createGUID();
 		}
 
-		$existing_photo = dba::selectFirst('photo', ['id'], ['resource-id' => $rid, 'uid' => $uid, 'contact-id' => $cid, 'scale' => $scale]);
+		$existing_photo = DBA::selectFirst('photo', ['id'], ['resource-id' => $rid, 'uid' => $uid, 'contact-id' => $cid, 'scale' => $scale]);
 
 		$fields = [
 			'uid' => $uid,
@@ -73,10 +72,10 @@ class Photo
 			'desc' => $desc
 		];
 
-		if (DBM::is_result($existing_photo)) {
-			$r = dba::update('photo', $fields, ['id' => $existing_photo['id']]);
+		if (DBA::isResult($existing_photo)) {
+			$r = DBA::update('photo', $fields, ['id' => $existing_photo['id']]);
 		} else {
-			$r = dba::insert('photo', $fields);
+			$r = DBA::insert('photo', $fields);
 		}
 
 		return $r;
@@ -94,7 +93,7 @@ class Photo
 		$thumb = '';
 		$micro = '';
 
-		$photo = dba::selectFirst(
+		$photo = DBA::selectFirst(
 			'photo', ['resource-id'], ['uid' => $uid, 'contact-id' => $cid, 'scale' => 4, 'album' => 'Contact Photos']
 		);
 		if (x($photo['resource-id'])) {
@@ -240,8 +239,8 @@ class Photo
 					WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra
 					GROUP BY `album` ORDER BY `created` DESC",
 					intval($uid),
-					dbesc('Contact Photos'),
-					dbesc(L10n::t('Contact Photos'))
+					DBA::escape('Contact Photos'),
+					DBA::escape(L10n::t('Contact Photos'))
 				);
 			} else {
 				// This query doesn't do the count and is much faster
@@ -249,8 +248,8 @@ class Photo
 					FROM `photo` USE INDEX (`uid_album_scale_created`)
 					WHERE `uid` = %d  AND `album` != '%s' AND `album` != '%s' $sql_extra",
 					intval($uid),
-					dbesc('Contact Photos'),
-					dbesc(L10n::t('Contact Photos'))
+					DBA::escape('Contact Photos'),
+					DBA::escape(L10n::t('Contact Photos'))
 				);
 			}
 			Cache::set($key, $albums, CACHE_DAY);
@@ -275,6 +274,6 @@ class Photo
 	 */
 	public static function newResource()
 	{
-		return get_guid(32, false);
+		return system::createGUID(32, false);
 	}
 }
diff --git a/src/Model/Process.php b/src/Model/Process.php
index 75d898065..40f0c52bd 100644
--- a/src/Model/Process.php
+++ b/src/Model/Process.php
@@ -5,8 +5,8 @@
 namespace Friendica\Model;
 
 use Friendica\BaseObject;
+use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
-use dba;
 
 require_once 'include/dba.php';
 
@@ -30,13 +30,13 @@ class Process extends BaseObject
 			$pid = getmypid();
 		}
 
-		dba::transaction();
+		DBA::transaction();
 
-		if (!dba::exists('process', ['pid' => $pid])) {
-			$return = dba::insert('process', ['pid' => $pid, 'command' => $command, 'created' => DateTimeFormat::utcNow()]);
+		if (!DBA::exists('process', ['pid' => $pid])) {
+			$return = DBA::insert('process', ['pid' => $pid, 'command' => $command, 'created' => DateTimeFormat::utcNow()]);
 		}
 
-		dba::commit();
+		DBA::commit();
 
 		return $return;
 	}
@@ -53,7 +53,7 @@ class Process extends BaseObject
 			$pid = getmypid();
 		}
 
-		return dba::delete('process', ['pid' => $pid]);
+		return DBA::delete('process', ['pid' => $pid]);
 	}
 
 	/**
@@ -61,15 +61,15 @@ class Process extends BaseObject
 	 */
 	public static function deleteInactive()
 	{
-		dba::transaction();
+		DBA::transaction();
 
-		$processes = dba::select('process', ['pid']);
-		while($process = dba::fetch($processes)) {
+		$processes = DBA::select('process', ['pid']);
+		while($process = DBA::fetch($processes)) {
 			if (!posix_kill($process['pid'], 0)) {
 				self::deleteByPid($process['pid']);
 			}
 		}
 
-		dba::commit();
+		DBA::commit();
 	}
 }
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index a2e374e51..3a014517d 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -13,18 +13,18 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
-use dba;
 
 require_once 'include/dba.php';
-require_once 'mod/proxy.php';
 
 class Profile
 {
@@ -39,11 +39,11 @@ class Profile
 	{
 		$location = '';
 
-		if ($profile['locality']) {
+		if (!empty($profile['locality'])) {
 			$location .= $profile['locality'];
 		}
 
-		if ($profile['region'] && ($profile['locality'] != $profile['region'])) {
+		if (!empty($profile['region']) && (defaults($profile, 'locality', '') != $profile['region'])) {
 			if ($location) {
 				$location .= ', ';
 			}
@@ -51,7 +51,7 @@ class Profile
 			$location .= $profile['region'];
 		}
 
-		if ($profile['country-name']) {
+		if (!empty($profile['country-name'])) {
 			if ($location) {
 				$location .= ', ';
 			}
@@ -88,30 +88,27 @@ class Profile
 	 * @param array   $profiledata  array
 	 * @param boolean $show_connect Show connect link
 	 */
-	public static function load(App $a, $nickname, $profile = 0, $profiledata = [], $show_connect = true)
+	public static function load(App $a, $nickname, $profile = 0, array $profiledata = [], $show_connect = true)
 	{
-		$user = dba::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]);
+		$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]);
 
-		if (!DBM::is_result($user) && empty($profiledata)) {
+		if (!DBA::isResult($user) && empty($profiledata)) {
 			logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
 			notice(L10n::t('Requested account is not available.') . EOL);
 			$a->error = 404;
 			return;
 		}
 
-		if (empty($a->page['aside'])) {
-			$a->page['aside'] = '';
-		}
-
-		if ($profiledata) {
+		if (count($profiledata) > 0) {
+			// Add profile data to sidebar
 			$a->page['aside'] .= self::sidebar($profiledata, true, $show_connect);
 
-			if (!DBM::is_result($user)) {
+			if (!DBA::isResult($user)) {
 				return;
 			}
 		}
 
-		$pdata = self::getByNickname($nickname, $user[0]['uid'], $profile);
+		$pdata = self::getByNickname($nickname, $user['uid'], $profile);
 
 		if (empty($pdata) && empty($profiledata)) {
 			logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
@@ -120,15 +117,17 @@ class Profile
 			return;
 		}
 
+		if (empty($pdata)) {
+			$pdata = ['uid' => 0, 'profile_uid' => 0, 'is-default' => false,'name' => $nickname];
+		}
+
 		// fetch user tags if this isn't the default profile
 
 		if (!$pdata['is-default']) {
-			$x = q(
-				"SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
-				intval($pdata['profile_uid'])
-			);
-			if ($x && count($x)) {
-				$pdata['pub_keywords'] = $x[0]['pub_keywords'];
+			$condition = ['uid' => $pdata['profile_uid'], 'is-default' => true];
+			$profile = DBA::selectFirst('profile', ['pub_keywords'], $condition);
+			if (DBA::isResult($profile)) {
+				$pdata['pub_keywords'] = $profile['pub_keywords'];
 			}
 		}
 
@@ -136,9 +135,9 @@ class Profile
 		$a->profile_uid = $pdata['profile_uid'];
 
 		$a->profile['mobile-theme'] = PConfig::get($a->profile['profile_uid'], 'system', 'mobile_theme');
-		$a->profile['network'] = NETWORK_DFRN;
+		$a->profile['network'] = Protocol::DFRN;
 
-		$a->page['title'] = $a->profile['name'] . ' @ ' . $a->config['sitename'];
+		$a->page['title'] = $a->profile['name'] . ' @ ' . Config::get('config', 'sitename');
 
 		if (!$profiledata && !PConfig::get(local_user(), 'system', 'always_my_theme')) {
 			$_SESSION['theme'] = $a->profile['theme'];
@@ -199,11 +198,11 @@ class Profile
 	 */
 	public static function getByNickname($nickname, $uid = 0, $profile_id = 0)
 	{
-		if (remote_user() && count($_SESSION['remote'])) {
+		if (remote_user() && !empty($_SESSION['remote'])) {
 			foreach ($_SESSION['remote'] as $visitor) {
 				if ($visitor['uid'] == $uid) {
-					$contact = dba::selectFirst('contact', ['profile-id'], ['id' => $visitor['cid']]);
-					if (DBM::is_result($contact)) {
+					$contact = DBA::selectFirst('contact', ['profile-id'], ['id' => $visitor['cid']]);
+					if (DBA::isResult($contact)) {
 						$profile_id = $contact['profile-id'];
 					}
 					break;
@@ -214,7 +213,7 @@ class Profile
 		$profile = null;
 
 		if ($profile_id) {
-			$profile = dba::fetch_first(
+			$profile = DBA::fetchFirst(
 				"SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` AS `contact_photo`,
 					`contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
 					`profile`.`uid` AS `profile_uid`, `profile`.*,
@@ -227,8 +226,8 @@ class Profile
 				intval($profile_id)
 			);
 		}
-		if (!DBM::is_result($profile)) {
-			$profile = dba::fetch_first(
+		if (!DBA::isResult($profile)) {
+			$profile = DBA::fetchFirst(
 				"SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` as `contact_photo`,
 					`contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
 					`profile`.`uid` AS `profile_uid`, `profile`.*,
@@ -280,7 +279,7 @@ class Profile
 
 		$profile['picdate'] = urlencode(defaults($profile, 'picdate', ''));
 
-		if (($profile['network'] != '') && ($profile['network'] != NETWORK_DFRN)) {
+		if (($profile['network'] != '') && ($profile['network'] != Protocol::DFRN)) {
 			$profile['network_name'] = format_network_name($profile['network'], $profile['url']);
 		} else {
 			$profile['network_name'] = '';
@@ -293,7 +292,7 @@ class Profile
 		$connect = $profile['uid'] != local_user() ? L10n::t('Connect') : false;
 
 		// don't show connect link to authenticated visitors either
-		if (remote_user() && count($_SESSION['remote'])) {
+		if (remote_user() && !empty($_SESSION['remote'])) {
 			foreach ($_SESSION['remote'] as $visitor) {
 				if ($visitor['uid'] == $profile['uid']) {
 					$connect = false;
@@ -306,6 +305,8 @@ class Profile
 			$connect = false;
 		}
 
+		$profile_url = '';
+
 		// Is the local user already connected to that user?
 		if ($connect && local_user()) {
 			if (isset($profile['url'])) {
@@ -314,12 +315,12 @@ class Profile
 				$profile_url = normalise_link(System::baseUrl() . '/profile/' . $profile['nickname']);
 			}
 
-			if (dba::exists('contact', ['pending' => false, 'uid' => local_user(), 'nurl' => $profile_url])) {
+			if (DBA::exists('contact', ['pending' => false, 'uid' => local_user(), 'nurl' => $profile_url])) {
 				$connect = false;
 			}
 		}
 
-		if ($connect && ($profile['network'] != NETWORK_DFRN) && !isset($profile['remoteconnect'])) {
+		if ($connect && ($profile['network'] != Protocol::DFRN) && !isset($profile['remoteconnect'])) {
 			$connect = false;
 		}
 
@@ -328,39 +329,42 @@ class Profile
 			$remoteconnect = $profile['remoteconnect'];
 		}
 
-		if ($connect && ($profile['network'] == NETWORK_DFRN) && !isset($remoteconnect)) {
+		if ($connect && ($profile['network'] == Protocol::DFRN) && !isset($remoteconnect)) {
 			$subscribe_feed = L10n::t('Atom feed');
 		} else {
 			$subscribe_feed = false;
 		}
 
+		$wallmessage = false;
+		$wallmessage_link = false;
+
+		// See issue https://github.com/friendica/friendica/issues/3838
+		// Either we remove the message link for remote users or we enable creating messages from remote users
 		if (remote_user() || (self::getMyURL() && x($profile, 'unkmail') && ($profile['uid'] != local_user()))) {
 			$wallmessage = L10n::t('Message');
-			$wallmessage_link = 'wallmessage/' . $profile['nickname'];
 
 			if (remote_user()) {
 				$r = q(
 					"SELECT `url` FROM `contact` WHERE `uid` = %d AND `id` = '%s' AND `rel` = %d",
 					intval($profile['uid']),
 					intval(remote_user()),
-					intval(CONTACT_IS_FRIEND)
+					intval(Contact::FRIEND)
 				);
 			} else {
 				$r = q(
 					"SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d",
 					intval($profile['uid']),
-					dbesc(normalise_link(self::getMyURL())),
-					intval(CONTACT_IS_FRIEND)
+					DBA::escape(normalise_link(self::getMyURL())),
+					intval(Contact::FRIEND)
 				);
 			}
 			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'];
 			}
-		} else {
-			$wallmessage = false;
-			$wallmessage_link = false;
 		}
 
 		// show edit profile to yourself
@@ -377,7 +381,7 @@ class Profile
 				'entries' => [],
 			];
 
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				foreach ($r as $rr) {
 					$profile['menu']['entries'][] = [
 						'photo' => $rr['thumb'],
@@ -436,9 +440,9 @@ class Profile
 				'fullname' => $profile['name'],
 				'firstname' => $firstname,
 				'lastname' => $lastname,
-				'photo300' => $profile['contact_photo'],
-				'photo100' => $profile['contact_thumb'],
-				'photo50' => $profile['contact_micro'],
+				'photo300' => defaults($profile, 'contact_photo', ''),
+				'photo100' => defaults($profile, 'contact_thumb', ''),
+				'photo50' => defaults($profile, 'contact_micro', ''),
 			];
 		} else {
 			$diaspora = false;
@@ -455,7 +459,7 @@ class Profile
 					"SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
 					intval($a->profile['uid'])
 				);
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					$updated = date('c', strtotime($r[0]['updated']));
 				}
 
@@ -466,11 +470,11 @@ class Profile
 						AND NOT `hidden` AND NOT `archive`
 						AND `network` IN ('%s', '%s', '%s', '')",
 					intval($profile['uid']),
-					dbesc(NETWORK_DFRN),
-					dbesc(NETWORK_DIASPORA),
-					dbesc(NETWORK_OSTATUS)
+					DBA::escape(Protocol::DFRN),
+					DBA::escape(Protocol::DIASPORA),
+					DBA::escape(Protocol::OSTATUS)
 				);
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					$contacts = intval($r[0]['total']);
 				}
 			}
@@ -488,15 +492,15 @@ class Profile
 
 		if (isset($p['address'])) {
 			$p['address'] = BBCode::convert($p['address']);
-		} else {
+		} elseif (isset($p['location'])) {
 			$p['address'] = BBCode::convert($p['location']);
 		}
 
 		if (isset($p['photo'])) {
-			$p['photo'] = proxy_url($p['photo'], false, PROXY_SIZE_SMALL);
+			$p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL);
 		}
 
-		$p['url'] = self::magicLink($p['url']);
+		$p['url'] = Contact::magicLink(defaults($p, 'url', $profile_url));
 
 		$tpl = get_markup_template('profile_vcard.tpl');
 		$o .= replace_macros($tpl, [
@@ -549,7 +553,7 @@ class Profile
 		$cachekey = 'get_birthdays:' . local_user();
 		$r = Cache::get($cachekey);
 		if (is_null($r)) {
-			$s = dba::p(
+			$s = DBA::p(
 				"SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
 				INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
 				WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
@@ -558,15 +562,15 @@ class Profile
 				DateTimeFormat::utc('now + 6 days'),
 				DateTimeFormat::utcNow()
 			);
-			if (DBM::is_result($s)) {
-				$r = dba::inArray($s);
+			if (DBA::isResult($s)) {
+				$r = DBA::toArray($s);
 				Cache::set($cachekey, $r, CACHE_HOUR);
 			}
 		}
 
 		$total = 0;
 		$classtoday = '';
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$now = strtotime('now');
 			$cids = [];
 
@@ -594,12 +598,8 @@ class Profile
 					$cids[] = $rr['cid'];
 
 					$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
-					$url = $rr['url'];
-					if ($rr['network'] === NETWORK_DFRN) {
-						$url = System::baseUrl() . '/redir/' . $rr['cid'];
-					}
 
-					$rr['link'] = $url;
+					$rr['link'] = Contact::magicLink($rr['url']);
 					$rr['title'] = $rr['name'];
 					$rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : '');
 					$rr['startime'] = null;
@@ -639,40 +639,29 @@ class Profile
 		$bd_format = L10n::t('g A l F d'); // 8 AM Friday January 18
 		$classtoday = '';
 
-		$s = dba::p(
-			"SELECT `event`.*
-			FROM `event`
-			INNER JOIN `item`
-				ON `item`.`uid` = `event`.`uid`
-				AND `item`.`parent-uri` = `event`.`uri`
-			WHERE `event`.`uid` = ?
-			AND `event`.`type` != 'birthday'
-			AND `event`.`start` < ?
-			AND `event`.`start` >= ?
-			AND `item`.`author-id` = ?
-			AND (`item`.`verb` = ? OR `item`.`verb` = ?)
-			AND `item`.`visible`
-			AND NOT `item`.`deleted`
-			ORDER BY  `event`.`start` ASC",
-			local_user(),
-			DateTimeFormat::utc('now + 7 days'),
-			DateTimeFormat::utc('now - 1 days'),
-			public_contact(),
-			ACTIVITY_ATTEND,
-			ACTIVITY_ATTENDMAYBE
-		);
+		$condition = ["`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?",
+			local_user(), DateTimeFormat::utc('now + 7 days'), DateTimeFormat::utc('now - 1 days')];
+		$s = DBA::select('event', [], $condition, ['order' => ['start']]);
 
 		$r = [];
 
-		if (DBM::is_result($s)) {
+		if (DBA::isResult($s)) {
 			$istoday = false;
+			$total = 0;
 
-			while ($rr = dba::fetch($s)) {
-				if (strlen($rr['name'])) {
-					$total ++;
+			while ($rr = DBA::fetch($s)) {
+				$condition = ['parent-uri' => $rr['uri'], 'uid' => $rr['uid'], 'author-id' => public_contact(),
+					'activity' => [Item::activityToIndex(ACTIVITY_ATTEND), Item::activityToIndex(ACTIVITY_ATTENDMAYBE)],
+					'visible' => true, 'deleted' => false];
+				if (!Item::exists($condition)) {
+					continue;
 				}
 
-				$strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d');
+				if (strlen($rr['summary'])) {
+					$total++;
+				}
+
+				$strt = DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d');
 				if ($strt === DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) {
 					$istoday = true;
 				}
@@ -688,7 +677,7 @@ class Profile
 					$description = L10n::t('[No description]');
 				}
 
-				$strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC');
+				$strt = DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC');
 
 				if (substr($strt, 0, 10) < DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) {
 					continue;
@@ -704,7 +693,7 @@ class Profile
 
 				$r[] = $rr;
 			}
-			dba::close($s);
+			DBA::close($s);
 			$classtoday = (($istoday) ? 'event-today' : '');
 		}
 		$tpl = get_markup_template('events_reminder.tpl');
@@ -713,7 +702,7 @@ class Profile
 			'$classtoday' => $classtoday,
 			'$count' => count($r),
 			'$event_reminders' => L10n::t('Event Reminders'),
-			'$event_title' => L10n::t('Events this week:'),
+			'$event_title' => L10n::t('Upcoming events the next 7 days:'),
 			'$events' => $r,
 		]);
 	}
@@ -950,6 +939,16 @@ class Profile
 			];
 		}
 
+		if (!empty($_SESSION['new_member']) && $is_owner) {
+			$tabs[] = [
+				'label' => L10n::t('Tips for New Members'),
+				'url'   => System::baseUrl() . '/newmember',
+				'sel'   => false,
+				'title' => L10n::t('Tips for New Members'),
+				'id'    => 'newmember-tab',
+			];
+		}
+
 		if (!$is_owner && empty($a->profile['hide-friends'])) {
 			$tabs[] = [
 				'label' => L10n::t('Contacts'),
@@ -982,48 +981,131 @@ class Profile
 		return null;
 	}
 
+	/**
+	 * Process the 'zrl' parameter and initiate the remote authentication.
+	 *
+	 * This method checks if the visitor has a public contact entry and
+	 * redirects the visitor to his/her instance to start the magic auth (Authentication)
+	 * process.
+	 *
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/channel.php
+	 *
+	 * @param App $a Application instance.
+	 */
 	public static function zrlInit(App $a)
 	{
 		$my_url = self::getMyURL();
 		$my_url = Network::isUrlValid($my_url);
+
 		if ($my_url) {
-			// Is it a DDoS attempt?
-			// The check fetches the cached value from gprobe to reduce the load for this system
-			$urlparts = parse_url($my_url);
+			if (!local_user()) {
+				// Is it a DDoS attempt?
+				// The check fetches the cached value from gprobe to reduce the load for this system
+				$urlparts = parse_url($my_url);
 
-			$result = Cache::get('gprobe:' . $urlparts['host']);
-			if ((!is_null($result)) && (in_array($result['network'], [NETWORK_FEED, NETWORK_PHANTOM]))) {
-				logger('DDoS attempt detected for ' . $urlparts['host'] . ' by ' . $_SERVER['REMOTE_ADDR'] . '. server data: ' . print_r($_SERVER, true), LOGGER_DEBUG);
-				return;
+				$result = Cache::get('gprobe:' . $urlparts['host']);
+				if ((!is_null($result)) && (in_array($result['network'], [Protocol::FEED, Protocol::PHANTOM]))) {
+					logger('DDoS attempt detected for ' . $urlparts['host'] . ' by ' . $_SERVER['REMOTE_ADDR'] . '. server data: ' . print_r($_SERVER, true), LOGGER_DEBUG);
+					return;
+				}
+
+				Worker::add(PRIORITY_LOW, 'GProbe', $my_url);
+				$arr = ['zrl' => $my_url, 'url' => $a->cmd];
+				Addon::callHooks('zrl_init', $arr);
+
+				// Try to find the public contact entry of the visitor.
+				$cid = Contact::getIdForURL($my_url);
+				if (!$cid) {
+					logger('No contact record found for ' . $my_url, LOGGER_DEBUG);
+					return;
+				}
+
+				$contact = DBA::selectFirst('contact',['id', 'url'], ['id' => $cid]);
+
+				if (DBA::isResult($contact) && remote_user() && remote_user() == $contact['id']) {
+					// The visitor is already authenticated.
+					return;
+				}
+
+				logger('Not authenticated. Invoking reverse magic-auth for ' . $my_url, LOGGER_DEBUG);
+
+				// Try to avoid recursion - but send them home to do a proper magic auth.
+				$query = str_replace(array('?zrl=', '&zid='), array('?rzrl=', '&rzrl='), $a->query_string);
+				// The other instance needs to know where to redirect.
+				$dest = urlencode(System::baseUrl() . '/' . $query);
+
+				// We need to extract the basebath from the profile url
+				// to redirect the visitors '/magic' module.
+				// Note: We should have the basepath of a contact also in the contact table.
+				$urlarr = explode('/profile/', $contact['url']);
+				$basepath = $urlarr[0];
+
+				if ($basepath != System::baseUrl() && !strstr($dest, '/magic') && !strstr($dest, '/rmagic')) {
+					$magic_path = $basepath . '/magic' . '?f=&owa=1&dest=' . $dest;
+					$serverret = Network::curl($magic_path);
+					if (!empty($serverret['success'])) {
+						goaway($magic_path);
+					}
+				}
 			}
-
-			Worker::add(PRIORITY_LOW, 'GProbe', $my_url);
-			$arr = ['zrl' => $my_url, 'url' => $a->cmd];
-			Addon::callHooks('zrl_init', $arr);
 		}
 	}
 
 	/**
-	 * @brief Returns a magic link to authenticate remote visitors
+	 * OpenWebAuth authentication.
 	 *
-	 * @param string $contact_url The address of the contact profile
-	 * @param integer $uid The user id, "local_user" is the default
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/zid.php
 	 *
-	 * @return string with "redir" link
+	 * @param string $token
 	 */
-	public static function magicLink($contact_url, $uid = -1)
+	public static function openWebAuthInit($token)
 	{
-		if ($uid == -1) {
-			$uid = local_user();
+		$a = get_app();
+
+		// Clean old OpenWebAuthToken entries.
+		OpenWebAuthToken::purge('owt', '3 MINUTE');
+
+		// Check if the token we got is the same one
+		// we have stored in the database.
+		$visitor_handle = OpenWebAuthToken::getMeta('owt', 0, $token);
+
+		if($visitor_handle === false) {
+			return;
 		}
-		$condition = ['pending' => false, 'uid' => $uid,
-				'nurl' => normalise_link($contact_url),
-				'network' => NETWORK_DFRN, 'self' => false];
-		$contact = dba::selectFirst('contact', ['id'], $condition);
-		if (DBM::is_result($contact)) {
-			return System::baseUrl() . '/redir/' . $contact['id'];
+
+		// Try to find the public contact entry of the visitor.
+		$cid = Contact::getIdForURL($visitor_handle);
+		if(!$cid) {
+			logger('owt: unable to finger ' . $visitor_handle, LOGGER_DEBUG);
+			return;
 		}
-		return self::zrl($contact_url);
+
+		$visitor = DBA::selectFirst('contact', [], ['id' => $cid]);
+
+		// Authenticate the visitor.
+		$_SESSION['authenticated'] = 1;
+		$_SESSION['visitor_id'] = $visitor['id'];
+		$_SESSION['visitor_handle'] = $visitor['addr'];
+		$_SESSION['visitor_home'] = $visitor['url'];
+		$_SESSION['my_url'] = $visitor['url'];
+
+		$arr = [
+			'visitor' => $visitor,
+			'url' => $a->query_string
+		];
+		/**
+		 * @hooks magic_auth_success
+		 *   Called when a magic-auth was successful.
+		 *   * \e array \b visitor
+		 *   * \e string \b url
+		 */
+		Addon::callHooks('magic_auth_success', $arr);
+
+		$a->contact = $arr['visitor'];
+
+		info(L10n::t('OpenWebAuth: %1$s welcomes %2$s', $a->get_hostname(), $visitor['name']));
+
+		logger('OpenWebAuth: auth success from ' . $visitor['addr'], LOGGER_DEBUG);
 	}
 
 	public static function zrl($s, $force = false)
@@ -1069,4 +1151,26 @@ class Profile
 
 		return $uid;
 	}
+
+	/**
+	* Stip zrl parameter from a string.
+	*
+	* @param string $s The input string.
+	* @return string The zrl.
+	*/
+	public static function stripZrls($s)
+	{
+		return preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is', '', $s);
+	}
+
+	/**
+	* Stip query parameter from a string.
+	*
+	* @param string $s The input string.
+	* @return string The query parameter.
+	*/
+	public static function stripQueryParam($s, $param)
+	{
+		return preg_replace('/[\?&]' . $param . '=(.*?)(&|$)/ism', '$2', $s);
+	}
 }
diff --git a/src/Model/PushSubscriber.php b/src/Model/PushSubscriber.php
index 925a461e2..9680d359d 100644
--- a/src/Model/PushSubscriber.php
+++ b/src/Model/PushSubscriber.php
@@ -5,9 +5,8 @@
 namespace Friendica\Model;
 
 use Friendica\Core\Worker;
+use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Database\DBM;
-use dba;
 
 require_once 'include/dba.php';
 
@@ -22,7 +21,7 @@ class PushSubscriber
 	public static function publishFeed($uid, $default_priority = PRIORITY_HIGH)
 	{
 		$condition = ['push' => 0, 'uid' => $uid];
-		dba::update('push_subscriber', ['push' => 1, 'next_try' => NULL_DATE], $condition);
+		DBA::update('push_subscriber', ['push' => 1, 'next_try' => NULL_DATE], $condition);
 
 		self::requeue($default_priority);
 	}
@@ -36,9 +35,9 @@ class PushSubscriber
 	{
 		// We'll push to each subscriber that has push > 0,
 		// i.e. there has been an update (set in notifier.php).
-		$subscribers = dba::select('push_subscriber', ['id', 'push', 'callback_url', 'nickname'], ["`push` > 0 AND `next_try` < UTC_TIMESTAMP()"]);
+		$subscribers = DBA::select('push_subscriber', ['id', 'push', 'callback_url', 'nickname'], ["`push` > 0 AND `next_try` < UTC_TIMESTAMP()"]);
 
-		while ($subscriber = dba::fetch($subscribers)) {
+		while ($subscriber = DBA::fetch($subscribers)) {
 			// We always handle retries with low priority
 			if ($subscriber['push'] > 1) {
 				$priority = PRIORITY_LOW;
@@ -50,7 +49,7 @@ class PushSubscriber
 			Worker::add($priority, 'PubSubPublish', (int)$subscriber['id']);
 		}
 
-		dba::close($subscribers);
+		DBA::close($subscribers);
 	}
 
 	/**
@@ -66,15 +65,15 @@ class PushSubscriber
 	public static function renew($uid, $nick, $subscribe, $hub_callback, $hub_topic, $hub_secret)
 	{
 		// fetch the old subscription if it exists
-		$subscriber = dba::selectFirst('push_subscriber', ['last_update', 'push'], ['callback_url' => $hub_callback]);
+		$subscriber = DBA::selectFirst('push_subscriber', ['last_update', 'push'], ['callback_url' => $hub_callback]);
 
 		// delete old subscription if it exists
-		dba::delete('push_subscriber', ['callback_url' => $hub_callback]);
+		DBA::delete('push_subscriber', ['callback_url' => $hub_callback]);
 
 		if ($subscribe) {
 			// if we are just updating an old subscription, keep the
 			// old values for last_update but reset the push
-			if (DBM::is_result($subscriber)) {
+			if (DBA::isResult($subscriber)) {
 				$last_update = $subscriber['last_update'];
 				$push_flag = min($subscriber['push'], 1);
 			} else {
@@ -87,7 +86,7 @@ class PushSubscriber
 				'topic' => $hub_topic, 'nickname' => $nick, 'push' => $push_flag,
 				'last_update' => $last_update, 'renewed' => DateTimeFormat::utcNow(),
 				'secret' => $hub_secret];
-			dba::insert('push_subscriber', $fields);
+			DBA::insert('push_subscriber', $fields);
 
 			logger("Successfully subscribed [$hub_callback] for $nick");
 		} else {
@@ -103,8 +102,8 @@ class PushSubscriber
 	 */
 	public static function delay($id)
 	{
-		$subscriber = dba::selectFirst('push_subscriber', ['push', 'callback_url', 'renewed', 'nickname'], ['id' => $id]);
-		if (!DBM::is_result($subscriber)) {
+		$subscriber = DBA::selectFirst('push_subscriber', ['push', 'callback_url', 'renewed', 'nickname'], ['id' => $id]);
+		if (!DBA::isResult($subscriber)) {
 			return;
 		}
 
@@ -115,10 +114,10 @@ class PushSubscriber
 			$days = round((time() -  strtotime($subscriber['renewed'])) / (60 * 60 * 24));
 
 			if ($days > 60) {
-				dba::update('push_subscriber', ['push' => -1, 'next_try' => NULL_DATE], ['id' => $id]);
+				DBA::update('push_subscriber', ['push' => -1, 'next_try' => NULL_DATE], ['id' => $id]);
 				logger('Delivery error: Subscription ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as ended.', LOGGER_DEBUG);
 			} else {
-				dba::update('push_subscriber', ['push' => 0, 'next_try' => NULL_DATE], ['id' => $id]);
+				DBA::update('push_subscriber', ['push' => 0, 'next_try' => NULL_DATE], ['id' => $id]);
 				logger('Delivery error: Giving up ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' for now.', LOGGER_DEBUG);
 			}
 		} else {
@@ -128,7 +127,7 @@ class PushSubscriber
 
 			$retrial = $retrial + 1;
 
-			dba::update('push_subscriber', ['push' => $retrial, 'next_try' => $next], ['id' => $id]);
+			DBA::update('push_subscriber', ['push' => $retrial, 'next_try' => $next], ['id' => $id]);
 			logger('Delivery error: Next try (' . $retrial . ') ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' at ' . $next, LOGGER_DEBUG);
 		}
 	}
@@ -141,14 +140,14 @@ class PushSubscriber
 	 */
 	public static function reset($id, $last_update)
 	{
-		$subscriber = dba::selectFirst('push_subscriber', ['callback_url', 'nickname'], ['id' => $id]);
-		if (!DBM::is_result($subscriber)) {
+		$subscriber = DBA::selectFirst('push_subscriber', ['callback_url', 'nickname'], ['id' => $id]);
+		if (!DBA::isResult($subscriber)) {
 			return;
 		}
 
 		// set last_update to the 'created' date of the last item, and reset push=0
 		$fields = ['push' => 0, 'next_try' => NULL_DATE, 'last_update' => $last_update];
-		dba::update('push_subscriber', $fields, ['id' => $id]);
+		DBA::update('push_subscriber', $fields, ['id' => $id]);
 		logger('Subscriber ' . $subscriber['callback_url'] . ' for ' . $subscriber['nickname'] . ' is marked as vital', LOGGER_DEBUG);
 	}
 }
diff --git a/src/Model/Queue.php b/src/Model/Queue.php
index 8b9e801c3..0284d72b7 100644
--- a/src/Model/Queue.php
+++ b/src/Model/Queue.php
@@ -5,9 +5,8 @@
 namespace Friendica\Model;
 
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
-use dba;
 
 require_once 'include/dba.php';
 
@@ -19,8 +18,8 @@ class Queue
 	public static function updateTime($id)
 	{
 		logger('queue: requeue item ' . $id);
-		$queue = dba::selectFirst('queue', ['retrial'], ['id' => $id]);
-		if (!DBM::is_result($queue)) {
+		$queue = DBA::selectFirst('queue', ['retrial'], ['id' => $id]);
+		if (!DBA::isResult($queue)) {
 			return;
 		}
 
@@ -34,7 +33,7 @@ class Queue
 		$delay = (($retrial + 3) ** 4) + (rand(1, 30) * ($retrial + 1));
 		$next = DateTimeFormat::utc('now + ' . $delay . ' seconds');
 
-		dba::update('queue', ['last' => DateTimeFormat::utcNow(), 'retrial' => $retrial + 1, 'next' => $next], ['id' => $id]);
+		DBA::update('queue', ['last' => DateTimeFormat::utcNow(), 'retrial' => $retrial + 1, 'next' => $next], ['id' => $id]);
 	}
 
 	/**
@@ -43,7 +42,7 @@ class Queue
 	public static function removeItem($id)
 	{
 		logger('queue: remove queue item ' . $id);
-		dba::delete('queue', ['id' => $id]);
+		DBA::delete('queue', ['id' => $id]);
 	}
 
 	/**
@@ -61,7 +60,7 @@ class Queue
 			intval($cid)
 		);
 
-		$was_delayed = DBM::is_result($r);
+		$was_delayed = DBA::isResult($r);
 
 		// We set "term-date" to a current date if the communication has problems.
 		// If the communication works again we reset this value.
@@ -69,7 +68,7 @@ class Queue
 			$r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` <= '1000-01-01' LIMIT 1",
 				intval($cid)
 			);
-			$was_delayed = !DBM::is_result($r);
+			$was_delayed = !DBA::isResult($r);
 		}
 
 		return $was_delayed;
@@ -99,7 +98,7 @@ class Queue
 			intval($cid)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			if ($batch &&  ($r[0]['total'] > $batch_queue)) {
 				logger('too many queued items for batch server ' . $cid . ' - discarding message');
 				return;
@@ -109,7 +108,7 @@ class Queue
 			}
 		}
 
-		dba::insert('queue', [
+		DBA::insert('queue', [
 			'cid'     => $cid,
 			'network' => $network,
 			'guid'     => $guid,
diff --git a/src/Model/Term.php b/src/Model/Term.php
index e5490fa7c..a81241cb4 100644
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -5,8 +5,7 @@
 namespace Friendica\Model;
 
 use Friendica\Core\System;
-use Friendica\Database\DBM;
-use dba;
+use Friendica\Database\DBA;
 
 require_once 'boot.php';
 require_once 'include/conversation.php';
@@ -14,7 +13,42 @@ require_once 'include/dba.php';
 
 class Term
 {
-	public static function insertFromTagFieldByItemId($itemid)
+	public static function tagTextFromItemId($itemid)
+	{
+		$tag_text = '';
+		$condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]];
+		$tags = DBA::select('term', [], $condition);
+		while ($tag = DBA::fetch($tags)) {
+			if ($tag_text != '') {
+				$tag_text .= ',';
+			}
+
+			if ($tag['type'] == 1) {
+				$tag_text .= '#';
+			} else {
+				$tag_text .= '@';
+			}
+			$tag_text .= '[url=' . $tag['url'] . ']' . $tag['term'] . '[/url]';
+		}
+		return $tag_text;
+	}
+
+	public static function fileTextFromItemId($itemid)
+	{
+		$file_text = '';
+		$condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]];
+		$tags = DBA::select('term', [], $condition);
+		while ($tag = DBA::fetch($tags)) {
+			if ($tag['type'] == TERM_CATEGORY) {
+				$file_text .= '<' . $tag['term'] . '>';
+			} else {
+				$file_text .= '[' . $tag['term'] . ']';
+			}
+		}
+		return $file_text;
+	}
+
+	public static function insertFromTagFieldByItemId($itemid, $tags)
 	{
 		$profile_base = System::baseUrl();
 		$profile_data = parse_url($profile_base);
@@ -22,14 +56,16 @@ class Term
 		$profile_base_friendica = $profile_data['host'] . $profile_path . '/profile/';
 		$profile_base_diaspora = $profile_data['host'] . $profile_path . '/u/';
 
-		$fields = ['guid', 'uid', 'id', 'edited', 'deleted', 'created', 'received', 'title', 'body', 'tag', 'parent'];
-		$message = dba::selectFirst('item', $fields, ['id' => $itemid]);
-		if (!DBM::is_result($message)) {
+		$fields = ['guid', 'uid', 'id', 'edited', 'deleted', 'created', 'received', 'title', 'body', 'parent'];
+		$message = Item::selectFirst($fields, ['id' => $itemid]);
+		if (!DBA::isResult($message)) {
 			return;
 		}
 
+		$message['tag'] = $tags;
+
 		// Clean up all tags
-		dba::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]]);
+		DBA::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]]);
 
 		if ($message['deleted']) {
 			return;
@@ -56,14 +92,14 @@ class Term
 		$pattern = '/\W\#([^\[].*?)[\s\'".,:;\?!\[\]\/]/ism';
 		if (preg_match_all($pattern, $data, $matches)) {
 			foreach ($matches[1] as $match) {
-				$tags['#' . strtolower($match)] = '';
+				$tags['#' . $match] = '';
 			}
 		}
 
 		$pattern = '/\W([\#@])\[url\=(.*?)\](.*?)\[\/url\]/ism';
 		if (preg_match_all($pattern, $data, $matches, PREG_SET_ORDER)) {
 			foreach ($matches as $match) {
-				$tags[$match[1] . strtolower(trim($match[3], ',.:;[]/\"?!'))] = $match[2];
+				$tags[$match[1] . trim($match[3], ',.:;[]/\"?!')] = $match[2];
 			}
 		}
 
@@ -91,12 +127,12 @@ class Term
 
 			if ($message['uid'] == 0) {
 				$global = true;
-				dba::update('term', ['global' => true], ['otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
+				DBA::update('term', ['global' => true], ['otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
 			} else {
-				$global = dba::exists('term', ['uid' => 0, 'otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
+				$global = DBA::exists('term', ['uid' => 0, 'otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
 			}
 
-			dba::insert('term', [
+			DBA::insert('term', [
 				'uid'      => $message['uid'],
 				'oid'      => $itemid,
 				'otype'    => TERM_OBJ_POST,
@@ -114,8 +150,9 @@ class Term
 				$users = q("SELECT `uid` FROM `contact` WHERE self AND (`url` = '%s' OR `nurl` = '%s')", $link, $link);
 				foreach ($users AS $user) {
 					if ($user['uid'] == $message['uid']) {
-						dba::update('item', ['mention' => true], ['id' => $itemid]);
-						dba::update('thread', ['mention' => true], ['iid' => $message['parent']]);
+						/// @todo This function is called frim Item::update - so we mustn't call that function here
+						DBA::update('item', ['mention' => true], ['id' => $itemid]);
+						DBA::update('thread', ['mention' => true], ['iid' => $message['parent']]);
 					}
 				}
 			}
@@ -126,23 +163,25 @@ class Term
 	 * @param integer $itemid item id
 	 * @return void
 	 */
-	public static function insertFromFileFieldByItemId($itemid)
+	public static function insertFromFileFieldByItemId($itemid, $files)
 	{
-		$message = dba::selectFirst('item', ['uid', 'deleted', 'file'], ['id' => $itemid]);
-		if (!DBM::is_result($message)) {
+		$message = Item::selectFirst(['uid', 'deleted'], ['id' => $itemid]);
+		if (!DBA::isResult($message)) {
 			return;
 		}
 
 		// Clean up all tags
-		dba::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]]);
+		DBA::delete('term', ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_FILE, TERM_CATEGORY]]);
 
 		if ($message["deleted"]) {
 			return;
 		}
 
+		$message['file'] = $files;
+
 		if (preg_match_all("/\[(.*?)\]/ism", $message["file"], $files)) {
 			foreach ($files[1] as $file) {
-				dba::insert('term', [
+				DBA::insert('term', [
 					'uid' => $message["uid"],
 					'oid' => $itemid,
 					'otype' => TERM_OBJ_POST,
@@ -154,7 +193,7 @@ class Term
 
 		if (preg_match_all("/\<(.*?)\>/ism", $message["file"], $files)) {
 			foreach ($files[1] as $file) {
-				dba::insert('term', [
+				DBA::insert('term', [
 					'uid' => $message["uid"],
 					'oid' => $itemid,
 					'otype' => TERM_OBJ_POST,
@@ -182,21 +221,23 @@ class Term
 
 		$searchpath = System::baseUrl() . "/search?tag=";
 
-		$taglist = dba::select(
+		$taglist = DBA::select(
 			'term',
 			['type', 'term', 'url'],
 			["`otype` = ? AND `oid` = ? AND `type` IN (?, ?)", TERM_OBJ_POST, $item['id'], TERM_HASHTAG, TERM_MENTION],
 			['order' => ['tid']]
 		);
 
-		while ($tag = dba::fetch($taglist)) {
+		while ($tag = DBA::fetch($taglist)) {
 			if ($tag["url"] == "") {
-				$tag["url"] = $searchpath . strtolower($tag["term"]);
+				$tag["url"] = $searchpath . $tag["term"];
 			}
 
 			$orig_tag = $tag["url"];
 
-			$tag["url"] = best_link_url($item, $sp, $tag["url"]);
+			$author = ['uid' => 0, 'id' => $item['author-id'],
+				'network' => $item['author-network'], 'url' => $item['author-link']];
+			$tag["url"] = Contact::magicLinkByContact($author, $tag['url']);
 
 			if ($tag["type"] == TERM_HASHTAG) {
 				if ($orig_tag != $tag["url"]) {
@@ -212,7 +253,7 @@ class Term
 
 			$return['tags'][] = $prefix . "<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
 		}
-		dba::close($taglist);
+		DBA::close($taglist);
 
 		return $return;
 	}
diff --git a/src/Model/User.php b/src/Model/User.php
index 39c544c3a..d65e7d8f9 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -6,22 +6,19 @@
 namespace Friendica\Model;
 
 use DivineOmega\PasswordExposed\PasswordStatus;
+use Exception;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
-use Friendica\Model\Contact;
-use Friendica\Model\Group;
-use Friendica\Model\Photo;
+use Friendica\Database\DBA;
 use Friendica\Object\Image;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use dba;
-use Exception;
 use LightOpenID;
 use function password_exposed;
 
@@ -41,7 +38,7 @@ class User
 	 * @return boolean|array
 	 */
 	public static function getOwnerDataById($uid) {
-		$r = dba::fetch_first("SELECT
+		$r = DBA::fetchFirst("SELECT
 			`contact`.*,
 			`user`.`prvkey` AS `uprvkey`,
 			`user`.`timezone`,
@@ -59,12 +56,29 @@ class User
 			LIMIT 1",
 			$uid
 		);
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return false;
 		}
 		return $r;
 	}
 
+	/**
+	 * @brief Get owner data by nick name
+	 *
+	 * @param int $nick
+	 * @return boolean|array
+	 */
+	public static function getOwnerDataByNick($nick)
+	{
+		$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nick]);
+
+		if (!DBA::isResult($user)) {
+			return false;
+		}
+
+		return self::getOwnerDataById($user['uid']);
+	}
+
 	/**
 	 * @brief Returns the default group for a given user and network
 	 *
@@ -77,7 +91,7 @@ class User
 	{
 		$default_group = 0;
 
-		if ($network == NETWORK_OSTATUS) {
+		if ($network == Protocol::OSTATUS) {
 			$default_group = PConfig::get($uid, "ostatus", "default_group");
 		}
 
@@ -85,9 +99,9 @@ class User
 			return $default_group;
 		}
 
-		$user = dba::selectFirst('user', ['def_gid'], ['uid' => $uid]);
+		$user = DBA::selectFirst('user', ['def_gid'], ['uid' => $uid]);
 
-		if (DBM::is_result($user)) {
+		if (DBA::isResult($user)) {
 			$default_group = $user["def_gid"];
 		}
 
@@ -186,7 +200,7 @@ class User
 			}
 		} elseif (is_int($user_info) || is_string($user_info)) {
 			if (is_int($user_info)) {
-				$user = dba::selectFirst('user', ['uid', 'password', 'legacy_password'],
+				$user = DBA::selectFirst('user', ['uid', 'password', 'legacy_password'],
 					[
 						'uid' => $user_info,
 						'blocked' => 0,
@@ -196,21 +210,14 @@ class User
 					]
 				);
 			} else {
-				$user = dba::fetch_first('SELECT `uid`, `password`, `legacy_password`
-					FROM `user`
-					WHERE (`email` = ? OR `username` = ? OR `nickname` = ?)
-					AND `blocked` = 0
-					AND `account_expired` = 0
-					AND `account_removed` = 0
-					AND `verified` = 1
-					LIMIT 1',
-					$user_info,
-					$user_info,
-					$user_info
-				);
+				$fields = ['uid', 'password', 'legacy_password'];
+				$condition = ["(`email` = ? OR `username` = ? OR `nickname` = ?)
+					AND NOT `blocked` AND NOT `account_expired` AND NOT `account_removed` AND `verified`",
+					$user_info, $user_info, $user_info];
+				$user = DBA::selectFirst('user', $fields, $condition);
 			}
 
-			if (!DBM::is_result($user)) {
+			if (!DBA::isResult($user)) {
 				throw new Exception(L10n::t('User not found'));
 			}
 		}
@@ -293,7 +300,37 @@ class User
 			'pwdreset_time' => null,
 			'legacy_password' => false
 		];
-		return dba::update('user', $fields, ['uid' => $uid]);
+		return DBA::update('user', $fields, ['uid' => $uid]);
+	}
+
+	/**
+	 * @brief Checks if a nickname is in the list of the forbidden nicknames
+	 *
+	 * Check if a nickname is forbidden from registration on the node by the
+	 * admin. Forbidden nicknames (e.g. role namess) can be configured in the
+	 * admin panel.
+	 *
+	 * @param string $nickname The nickname that should be checked
+	 * @return boolean True is the nickname is blocked on the node
+	 */
+	public static function isNicknameBlocked($nickname)
+	{
+		$forbidden_nicknames = Config::get('system', 'forbidden_nicknames', '');
+
+		// if the config variable is empty return false
+		if (empty($forbidden_nicknames)) {
+			return false;
+		}
+
+		// check if the nickname is in the list of blocked nicknames
+		$forbidden = explode(',', $forbidden_nicknames);
+		$forbidden = array_map('trim', $forbidden);
+		if (in_array(strtolower($nickname), $forbidden)) {
+			return true;
+		}
+
+		// else return false
+		return false;
 	}
 
 	/**
@@ -320,20 +357,20 @@ class User
 		$using_invites = Config::get('system', 'invitation_only');
 		$num_invites   = Config::get('system', 'number_invites');
 
-		$invite_id  = x($data, 'invite_id')  ? notags(trim($data['invite_id']))  : '';
-		$username   = x($data, 'username')   ? notags(trim($data['username']))   : '';
-		$nickname   = x($data, 'nickname')   ? notags(trim($data['nickname']))   : '';
-		$email      = x($data, 'email')      ? notags(trim($data['email']))      : '';
-		$openid_url = x($data, 'openid_url') ? notags(trim($data['openid_url'])) : '';
-		$photo      = x($data, 'photo')      ? notags(trim($data['photo']))      : '';
-		$password   = x($data, 'password')   ? trim($data['password'])           : '';
-		$password1  = x($data, 'password1')  ? trim($data['password1'])          : '';
-		$confirm    = x($data, 'confirm')    ? trim($data['confirm'])            : '';
-		$blocked    = x($data, 'blocked')    ? intval($data['blocked'])          : 0;
-		$verified   = x($data, 'verified')   ? intval($data['verified'])         : 0;
-		$language   = x($data, 'language')   ? notags(trim($data['language'])) : 'en';
+		$invite_id  = !empty($data['invite_id'])  ? notags(trim($data['invite_id']))  : '';
+		$username   = !empty($data['username'])   ? notags(trim($data['username']))   : '';
+		$nickname   = !empty($data['nickname'])   ? notags(trim($data['nickname']))   : '';
+		$email      = !empty($data['email'])      ? notags(trim($data['email']))      : '';
+		$openid_url = !empty($data['openid_url']) ? notags(trim($data['openid_url'])) : '';
+		$photo      = !empty($data['photo'])      ? notags(trim($data['photo']))      : '';
+		$password   = !empty($data['password'])   ? trim($data['password'])           : '';
+		$password1  = !empty($data['password1'])  ? trim($data['password1'])          : '';
+		$confirm    = !empty($data['confirm'])    ? trim($data['confirm'])            : '';
+		$blocked    = !empty($data['blocked'])    ? intval($data['blocked'])          : 0;
+		$verified   = !empty($data['verified'])   ? intval($data['verified'])         : 0;
+		$language   = !empty($data['language'])   ? notags(trim($data['language']))   : 'en';
 
-		$publish = x($data, 'profile_publish_reg') && intval($data['profile_publish_reg']) ? 1 : 0;
+		$publish = !empty($data['profile_publish_reg']) && intval($data['profile_publish_reg']) ? 1 : 0;
 		$netpublish = strlen(Config::get('system', 'directory')) ? $publish : 0;
 
 		if ($password1 != $confirm) {
@@ -347,12 +384,12 @@ class User
 				throw new Exception(L10n::t('An invitation is required.'));
 			}
 
-			if (!dba::exists('register', ['hash' => $invite_id])) {
+			if (!DBA::exists('register', ['hash' => $invite_id])) {
 				throw new Exception(L10n::t('Invitation could not be verified.'));
 			}
 		}
 
-		if (!x($username) || !x($email) || !x($nickname)) {
+		if (empty($username) || empty($email) || empty($nickname)) {
 			if ($openid_url) {
 				if (!Network::isUrlValid($openid_url)) {
 					throw new Exception(L10n::t('Invalid OpenID url'));
@@ -409,15 +446,18 @@ class User
 		if (!valid_email($email) || !Network::isEmailDomainValid($email)) {
 			throw new Exception(L10n::t('Not a valid email address.'));
 		}
+		if (self::isNicknameBlocked($nickname)) {
+			throw new Exception(L10n::t('The nickname was blocked from registration by the nodes admin.'));
+		}
 
-		if (Config::get('system', 'block_extended_register', false) && dba::exists('user', ['email' => $email])) {
+		if (Config::get('system', 'block_extended_register', false) && DBA::exists('user', ['email' => $email])) {
 			throw new Exception(L10n::t('Cannot use that email.'));
 		}
 
 		// Disallow somebody creating an account using openid that uses the admin email address,
 		// since openid bypasses email verification. We'll allow it if there is not yet an admin account.
-		if (x($a->config, 'admin_email') && strlen($openid_url)) {
-			$adminlist = explode(',', str_replace(' ', '', strtolower($a->config['admin_email'])));
+		if (Config::get('config', 'admin_email') && strlen($openid_url)) {
+			$adminlist = explode(',', str_replace(' ', '', strtolower(Config::get('config', 'admin_email'))));
 			if (in_array(strtolower($email), $adminlist)) {
 				throw new Exception(L10n::t('Cannot use that email.'));
 			}
@@ -430,8 +470,8 @@ class User
 		}
 
 		// Check existing and deleted accounts for this nickname.
-		if (dba::exists('user', ['nickname' => $nickname])
-			|| dba::exists('userd', ['username' => $nickname])
+		if (DBA::exists('user', ['nickname' => $nickname])
+			|| DBA::exists('userd', ['username' => $nickname])
 		) {
 			throw new Exception(L10n::t('Nickname is already registered. Please choose another.'));
 		}
@@ -454,8 +494,8 @@ class User
 		$sprvkey = $sres['prvkey'];
 		$spubkey = $sres['pubkey'];
 
-		$insert_result = dba::insert('user', [
-			'guid'     => generate_user_guid(),
+		$insert_result = DBA::insert('user', [
+			'guid'     => System::createGUID(32),
 			'username' => $username,
 			'password' => $new_password_encoded,
 			'email'    => $email,
@@ -474,8 +514,8 @@ class User
 		]);
 
 		if ($insert_result) {
-			$uid = dba::lastInsertId();
-			$user = dba::selectFirst('user', [], ['uid' => $uid]);
+			$uid = DBA::lastInsertId();
+			$user = DBA::selectFirst('user', [], ['uid' => $uid]);
 		} else {
 			throw new Exception(L10n::t('An error occurred during registration. Please try again.'));
 		}
@@ -486,14 +526,14 @@ class User
 
 		// if somebody clicked submit twice very quickly, they could end up with two accounts
 		// due to race condition. Remove this one.
-		$user_count = dba::count('user', ['nickname' => $nickname]);
+		$user_count = DBA::count('user', ['nickname' => $nickname]);
 		if ($user_count > 1) {
-			dba::delete('user', ['uid' => $uid]);
+			DBA::delete('user', ['uid' => $uid]);
 
 			throw new Exception(L10n::t('Nickname is already registered. Please choose another.'));
 		}
 
-		$insert_result = dba::insert('profile', [
+		$insert_result = DBA::insert('profile', [
 			'uid' => $uid,
 			'name' => $username,
 			'photo' => System::baseUrl() . "/photo/profile/{$uid}.jpg",
@@ -504,14 +544,14 @@ class User
 			'profile-name' => L10n::t('default')
 		]);
 		if (!$insert_result) {
-			dba::delete('user', ['uid' => $uid]);
+			DBA::delete('user', ['uid' => $uid]);
 
 			throw new Exception(L10n::t('An error occurred creating your default profile. Please try again.'));
 		}
 
 		// Create the self contact
 		if (!Contact::createSelfFromUserId($uid)) {
-			dba::delete('user', ['uid' => $uid]);
+			DBA::delete('user', ['uid' => $uid]);
 
 			throw new Exception(L10n::t('An error occurred creating your self contact. Please try again.'));
 		}
@@ -520,7 +560,7 @@ class User
 		// right away as a default group for new contacts.
 		$def_gid = Group::create($uid, L10n::t('Friends'));
 		if (!$def_gid) {
-			dba::delete('user', ['uid' => $uid]);
+			DBA::delete('user', ['uid' => $uid]);
 
 			throw new Exception(L10n::t('An error occurred creating your default contact group. Please try again.'));
 		}
@@ -530,7 +570,7 @@ class User
 			$fields['allow_gid'] = '<' . $def_gid . '>';
 		}
 
-		dba::update('user', $fields, ['uid' => $uid]);
+		DBA::update('user', $fields, ['uid' => $uid]);
 
 		// if we have no OpenID photo try to look up an avatar
 		if (!strlen($photo)) {
@@ -575,7 +615,7 @@ class User
 				}
 
 				if (!$photo_failure) {
-					dba::update('photo', ['profile' => 1], ['resource-id' => $hash]);
+					DBA::update('photo', ['profile' => 1], ['resource-id' => $hash]);
 				}
 			}
 		}
@@ -622,7 +662,7 @@ class User
 	 * @param string $password
 	 * @return NULL|boolean from notification() and email() inherited
 	 */
-	public static function sendRegisterOpenEmail($email, $sitename, $siteurl, $username, $password)
+	public static function sendRegisterOpenEmail($email, $sitename, $siteurl, $username, $password, $user)
 	{
 		$preamble = deindent(L10n::t('
 			Dear %1$s,
@@ -660,6 +700,8 @@ class User
 		$body = sprintf($body, $email, $sitename, $siteurl, $username, $password);
 
 		return notification([
+			'uid' => $user['uid'],
+			'language' => $user['language'],
 			'type' => SYSTEM_EMAIL,
 			'to_email' => $email,
 			'subject'=> L10n::t('Registration details for %s', $sitename),
@@ -679,20 +721,24 @@ class User
 
 		logger('Removing user: ' . $uid);
 
-		$user = dba::selectFirst('user', [], ['uid' => $uid]);
+		$user = DBA::selectFirst('user', [], ['uid' => $uid]);
 
 		Addon::callHooks('remove_user', $user);
 
 		// save username (actually the nickname as it is guaranteed
 		// unique), so it cannot be re-registered in the future.
-		dba::insert('userd', ['username' => $user['nickname']]);
+		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::utcNow()], ['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
-		Worker::add(PRIORITY_LOW, "Directory", $user['url']);
+		$self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
+		Worker::add(PRIORITY_LOW, "Directory", $self['url']);
+
+		// Remove the user relevant data
+		Worker::add(PRIORITY_LOW, "RemoveUser", $uid);
 
 		if ($uid == local_user()) {
 			unset($_SESSION['authenticated']);
diff --git a/src/Module/Feed.php b/src/Module/Feed.php
index 2be12f13e..5df68f223 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/Hashtag.php b/src/Module/Hashtag.php
index c35a6440c..bfe1eee7d 100644
--- a/src/Module/Hashtag.php
+++ b/src/Module/Hashtag.php
@@ -6,7 +6,7 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\System;
-use dba;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 require_once 'include/text.php';
@@ -26,14 +26,14 @@ class Hashtag extends BaseModule
 			System::jsonExit($result);
 		}
 
-		$taglist = dba::p("SELECT DISTINCT(`term`) FROM `term` WHERE `term` LIKE ? AND `type` = ? ORDER BY `term`",
+		$taglist = DBA::p("SELECT DISTINCT(`term`) FROM `term` WHERE `term` LIKE ? AND `type` = ? ORDER BY `term`",
 			$t . '%',
 			intval(TERM_HASHTAG)
 		);
-		while ($tag = dba::fetch($taglist)) {
+		while ($tag = DBA::fetch($taglist)) {
 			$result[] = ['text' => $tag['term']];
 		}
-		dba::close($taglist);
+		DBA::close($taglist);
 
 		System::jsonExit($result);
 	}
diff --git a/src/Module/Login.php b/src/Module/Login.php
index 7d6470620..fadfb2066 100644
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -4,16 +4,15 @@
  */
 namespace Friendica\Module;
 
+use Exception;
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use dba;
-use Exception;
 use LightOpenID;
 
 require_once 'boot.php';
@@ -23,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
 {
@@ -43,7 +42,7 @@ class Login extends BaseModule
 			goaway(self::getApp()->get_baseurl());
 		}
 
-		return self::form(self::getApp()->get_baseurl(), $a->config['register_policy'] != REGISTER_CLOSED);
+		return self::form(self::getApp()->get_baseurl(), intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED);
 	}
 
 	public static function post()
@@ -135,7 +134,7 @@ class Login extends BaseModule
 					throw new Exception(L10n::t('Login failed.'));
 				}
 			} else {
-				$record = dba::selectFirst('user', [],
+				$record = DBA::selectFirst('user', [],
 					['uid' => User::getIdFromPasswordAuthentication($username, $password)]
 				);
 			}
@@ -176,7 +175,7 @@ class Login extends BaseModule
 			$data = json_decode($_COOKIE["Friendica"]);
 			if (isset($data->uid)) {
 
-				$user = dba::selectFirst('user', [],
+				$user = DBA::selectFirst('user', [],
 					[
 						'uid'             => $data->uid,
 						'blocked'         => false,
@@ -185,7 +184,7 @@ class Login extends BaseModule
 						'verified'        => true,
 					]
 				);
-				if (DBM::is_result($user)) {
+				if (DBA::isResult($user)) {
 					if ($data->hash != cookie_hash($user)) {
 						logger("Hash for user " . $data->uid . " doesn't fit.");
 						nuke_session();
@@ -212,11 +211,9 @@ class Login extends BaseModule
 
 		if (isset($_SESSION) && x($_SESSION, 'authenticated')) {
 			if (x($_SESSION, 'visitor_id') && !x($_SESSION, 'uid')) {
-				$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
-					intval($_SESSION['visitor_id'])
-				);
-				if (DBM::is_result($r)) {
-					self::getApp()->contact = $r[0];
+				$contact = DBA::selectFirst('contact', [], ['id' => $_SESSION['visitor_id']]);
+				if (DBA::isResult($contact)) {
+					self::getApp()->contact = $contact;
 				}
 			}
 
@@ -231,7 +228,7 @@ class Login extends BaseModule
 					goaway(self::getApp()->get_baseurl());
 				}
 
-				$user = dba::selectFirst('user', [],
+				$user = DBA::selectFirst('user', [],
 					[
 						'uid'             => $_SESSION['uid'],
 						'blocked'         => false,
@@ -240,7 +237,7 @@ class Login extends BaseModule
 						'verified'        => true,
 					]
 				);
-				if (!DBM::is_result($user)) {
+				if (!DBA::isResult($user)) {
 					nuke_session();
 					goaway(self::getApp()->get_baseurl());
 				}
@@ -248,7 +245,7 @@ class Login extends BaseModule
 				// Make sure to refresh the last login time for the user if the user
 				// stays logged in for a long time, e.g. with "Remember Me"
 				$login_refresh = false;
-				if (!x($_SESSION['last_login_date'])) {
+				if (empty($_SESSION['last_login_date'])) {
 					$_SESSION['last_login_date'] = DateTimeFormat::utcNow();
 				}
 				if (strcmp(DateTimeFormat::utc('now - 12 hours'), $_SESSION['last_login_date']) > 0) {
@@ -266,7 +263,7 @@ class Login extends BaseModule
 	 * @param string $return_url The url relative to the base the user should be sent
 	 *							 back to after login completes
 	 * @param bool $register If $register == true provide a registration link.
-	 *						 This will most always depend on the value of $a->config['register_policy'].
+	 *						 This will most always depend on the value of config.register_policy.
 	 * @param array $hiddens  optional
 	 *
 	 * @return string Returns the complete html for inserting into the page
diff --git a/src/Module/Logout.php b/src/Module/Logout.php
index 7c5391a6b..bfa917a39 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/Magic.php b/src/Module/Magic.php
new file mode 100644
index 000000000..cf77482e5
--- /dev/null
+++ b/src/Module/Magic.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * @file src/Module/Magic.php
+ */
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Util\HTTPSignature;
+use Friendica\Util\Network;
+
+/**
+ * Magic Auth (remote authentication) module.
+ *
+ * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/Zotlabs/Module/Magic.php
+ */
+class Magic extends BaseModule
+{
+	public static function init()
+	{
+		$a = self::getApp();
+		$ret = ['success' => false, 'url' => '', 'message' => ''];
+		logger('magic mdule: invoked', LOGGER_DEBUG);
+
+		logger('args: ' . print_r($_REQUEST, true), LOGGER_DATA);
+
+		$addr = ((x($_REQUEST, 'addr')) ? $_REQUEST['addr'] : '');
+		$dest = ((x($_REQUEST, 'dest')) ? $_REQUEST['dest'] : '');
+		$test = ((x($_REQUEST, 'test')) ? intval($_REQUEST['test']) : 0);
+		$owa  = ((x($_REQUEST, 'owa'))  ? intval($_REQUEST['owa'])  : 0);
+
+		// NOTE: I guess $dest isn't just the profile url (could be also
+		// other profile pages e.g. photo). We need to find a solution
+		// to be able to redirct to other pages than the contact profile.
+		$cid = Contact::getIdForURL($dest);
+
+		if (!$cid && !empty($addr)) {
+			$cid = Contact::getIdForURL($addr);
+		}
+
+		if (!$cid) {
+			logger('No contact record found: ' . print_r($_REQUEST, true), LOGGER_DEBUG);
+			goaway($dest);
+		}
+
+		$contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
+
+		// Redirect if the contact is already authenticated on this site.
+		if (!empty($a->contact) && array_key_exists('id', $a->contact) && strpos($contact['nurl'], normalise_link(self::getApp()->get_baseurl())) !== false) {
+			if ($test) {
+				$ret['success'] = true;
+				$ret['message'] .= 'Local site - you are already authenticated.' . EOL;
+				return $ret;
+			}
+
+			logger('Contact is already authenticated', LOGGER_DEBUG);
+			goaway($dest);
+		}
+
+		if (local_user()) {
+			$user = $a->user;
+
+			// OpenWebAuth
+			if ($owa) {
+				// Extract the basepath
+				// NOTE: we need another solution because this does only work
+				// for friendica contacts :-/ . We should have the basepath
+				// of a contact also in the contact table.
+				$exp = explode('/profile/', $contact['url']);
+				$basepath = $exp[0];
+
+				$headers = [];
+				$headers['Accept'] = 'application/x-dfrn+json';
+				$headers['X-Open-Web-Auth'] = random_string();
+
+				// Create a header that is signed with the local users private key.
+				$headers = HTTPSignature::createSig(
+					'',
+					$headers,
+					$user['prvkey'],
+					'acct:' . $user['nickname'] . '@' . $a->get_hostname() . ($a->urlpath ? '/' . $a->urlpath : ''),
+					false,
+					true,
+					'sha512'
+				);
+
+				// Try to get an authentication token from the other instance.
+				$x = Network::curl($basepath . '/owa', false, $redirects, ['headers' => $headers]);
+
+				if ($x['success']) {
+					$j = json_decode($x['body'], true);
+
+					if ($j['success']) {
+						$token = '';
+						if ($j['encrypted_token']) {
+							// The token is encrypted. If the local user is really the one the other instance
+							// thinks he/she is, the token can be decrypted with the local users public key.
+							openssl_private_decrypt(base64url_decode($j['encrypted_token']), $token, $user['prvkey']);
+						} else {
+							$token = $j['token'];
+						}
+						$x = strpbrk($dest, '?&');
+						$args = (($x) ? '&owt=' . $token : '?f=&owt=' . $token);
+
+						goaway($dest . $args);
+					}
+				}
+				goaway($dest);
+			}
+		}
+
+		if ($test) {
+			$ret['message'] = 'Not authenticated or invalid arguments' . EOL;
+			return $ret;
+		}
+
+		goaway($dest);
+	}
+}
diff --git a/src/Module/Oembed.php b/src/Module/Oembed.php
index 570e28124..452162ff2 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/Module/Owa.php b/src/Module/Owa.php
new file mode 100644
index 000000000..1d6b1332d
--- /dev/null
+++ b/src/Module/Owa.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * @file src/Module/Owa.php
+ */
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\OpenWebAuthToken;
+use Friendica\Util\HTTPSignature;
+
+/**
+ * @brief OpenWebAuth verifier and token generator
+ *
+ * See https://macgirvin.com/wiki/mike/OpenWebAuth/Home
+ * Requests to this endpoint should be signed using HTTP Signatures
+ * using the 'Authorization: Signature' authentication method
+ * If the signature verifies a token is returned.
+ *
+ * This token may be exchanged for an authenticated cookie.
+ *
+ * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/Zotlabs/Module/Owa.php
+ */
+class Owa extends BaseModule
+{
+	public static function init()
+	{
+
+		$ret = [ 'success' => false ];
+
+		foreach (['REDIRECT_REMOTE_USER', 'HTTP_AUTHORIZATION'] as $head) {
+			if (array_key_exists($head, $_SERVER) && substr(trim($_SERVER[$head]), 0, 9) === 'Signature') {
+				if ($head !== 'HTTP_AUTHORIZATION') {
+					$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER[$head];
+					continue;
+				}
+
+				$sigblock = HTTPSignature::parseSigheader($_SERVER[$head]);
+				if ($sigblock) {
+					$keyId = $sigblock['keyId'];
+
+					if ($keyId) {
+						// Try to find the public contact entry of the handle.
+						$handle = str_replace('acct:', '', $keyId);
+
+						$cid       = Contact::getIdForURL($handle);
+						$fields    = ['id', 'url', 'addr', 'pubkey'];
+						$condition = ['id' => $cid];
+
+						$contact = DBA::selectFirst('contact', $fields, $condition);
+
+						if (DBA::isResult($contact)) {
+							// Try to verify the signed header with the public key of the contact record
+							// we have found.
+							$verified = HTTPSignature::verify('', $contact['pubkey']);
+
+							if ($verified && $verified['header_signed'] && $verified['header_valid']) {
+								logger('OWA header: ' . print_r($verified, true), LOGGER_DATA);
+								logger('OWA success: ' . $contact['addr'], LOGGER_DATA);
+
+								$ret['success'] = true;
+								$token = random_string(32);
+
+								// Store the generated token in the databe.
+								OpenWebAuthToken::create('owt', 0, $token, $contact['addr']);
+
+								$result = '';
+
+								// Encrypt the token with the public contacts publik key.
+								// Only the specific public contact will be able to encrypt it.
+								// At a later time, we will compare weather the token we're getting
+								// is really the same token we have stored in the database.
+								openssl_public_encrypt($token, $result, $contact['pubkey']);
+								$ret['encrypted_token'] = base64url_encode($result);
+							} else {
+								logger('OWA fail: ' . $contact['id'] . ' ' . $contact['addr'] . ' ' . $contact['url'], LOGGER_DEBUG);
+							}
+						} else {
+							logger('Contact not found: ' . $handle, LOGGER_DEBUG);
+						}
+					}
+				}
+			}
+		}
+		System::jsonExit($ret, 'application/x-dfrn+json');
+	}
+}
diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
new file mode 100644
index 000000000..0de45b332
--- /dev/null
+++ b/src/Module/Proxy.php
@@ -0,0 +1,273 @@
+<?php
+/**
+ * @file src/Module/Proxy.php
+ * @brief Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
+ */
+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;
+use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
+
+require_once 'include/security.php';
+
+/**
+ * @brief Module Proxy
+ */
+class Proxy extends BaseModule
+{
+
+	/**
+	 * @brief Initializer method for this class.
+	 *
+	 * Sets application instance and checks if /proxy/ path is writable.
+	 *
+	 * @param \Friendica\App $app Application instance
+	 */
+	public static function init()
+	{
+		// Set application instance here
+		$a = self::getApp();
+
+		/*
+		 * Pictures are stored in one of the following ways:
+		 *
+		 * 1. If a folder "proxy" exists and is writeable, then use this for caching
+		 * 2. If a cache path is defined, use this
+		 * 3. If everything else failed, cache into the database
+		 *
+		 * Question: Do we really need these three methods?
+		 */
+		if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+			header('HTTP/1.1 304 Not Modified');
+			header('Last-Modified: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
+			header('Etag: ' . $_SERVER['HTTP_IF_NONE_MATCH']);
+			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + (31536000)) . ' GMT');
+			header('Cache-Control: max-age=31536000');
+
+			if (function_exists('header_remove')) {
+				header_remove('Last-Modified');
+				header_remove('Expires');
+				header_remove('Cache-Control');
+			}
+
+			/// @TODO Stop here?
+			exit();
+		}
+
+		if (function_exists('header_remove')) {
+			header_remove('Pragma');
+			header_remove('pragma');
+		}
+
+		$thumb = false;
+		$size = 1024;
+		$sizetype = '';
+		$basepath = $a->get_basepath();
+
+		// If the cache path isn't there, try to create it
+		if (!is_dir($basepath . '/proxy') && is_writable($basepath)) {
+			mkdir($basepath . '/proxy');
+		}
+
+		// Checking if caching into a folder in the webroot is activated and working
+		$direct_cache = (is_dir($basepath . '/proxy') && is_writable($basepath . '/proxy'));
+
+		// Look for filename in the arguments
+		if ((isset($a->argv[1]) || isset($a->argv[2]) || isset($a->argv[3])) && !isset($_REQUEST['url'])) {
+			if (isset($a->argv[3])) {
+				$url = $a->argv[3];
+			} elseif (isset($a->argv[2])) {
+				$url = $a->argv[2];
+			} else {
+				$url = $a->argv[1];
+			}
+
+			if (isset($a->argv[3]) && ($a->argv[3] == 'thumb')) {
+				$size = 200;
+			}
+
+			// thumb, small, medium and large.
+			if (substr($url, -6) == ':micro') {
+				$size = 48;
+				$sizetype = ':micro';
+				$url = substr($url, 0, -6);
+			} elseif (substr($url, -6) == ':thumb') {
+				$size = 80;
+				$sizetype = ':thumb';
+				$url = substr($url, 0, -6);
+			} elseif (substr($url, -6) == ':small') {
+				$size = 175;
+				$url = substr($url, 0, -6);
+				$sizetype = ':small';
+			} elseif (substr($url, -7) == ':medium') {
+				$size = 600;
+				$url = substr($url, 0, -7);
+				$sizetype = ':medium';
+			} elseif (substr($url, -6) == ':large') {
+				$size = 1024;
+				$url = substr($url, 0, -6);
+				$sizetype = ':large';
+			}
+
+			$pos = strrpos($url, '=.');
+			if ($pos) {
+				$url = substr($url, 0, $pos + 1);
+			}
+
+			$url = str_replace(['.jpg', '.jpeg', '.gif', '.png'], ['','','',''], $url);
+
+			$url = base64_decode(strtr($url, '-_', '+/'), true);
+
+			if ($url) {
+				$_REQUEST['url'] = $url;
+			}
+		} else {
+			$direct_cache = false;
+		}
+
+		if (empty($_REQUEST['url'])) {
+			System::httpExit(400, ["title" => L10n::t('Bad Request.')]);
+		}
+
+		if (!$direct_cache) {
+			$urlhash = 'pic:' . sha1($_REQUEST['url']);
+
+			$cachefile = get_cachefile(hash('md5', $_REQUEST['url']));
+			if ($cachefile != '' && file_exists($cachefile)) {
+				$img_str = file_get_contents($cachefile);
+				$mime = mime_content_type($cachefile);
+
+				header('Content-type: ' . $mime);
+				header('Last-Modified: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
+				header('Etag: "' . md5($img_str) . '"');
+				header('Expires: ' . gmdate('D, d M Y H:i:s', time() + (31536000)) . ' GMT');
+				header('Cache-Control: max-age=31536000');
+
+				// reduce quality - if it isn't a GIF
+				if ($mime != 'image/gif') {
+					$image = new Image($img_str, $mime);
+
+					if ($image->isValid()) {
+						$img_str = $image->asString();
+					}
+				}
+
+				echo $img_str;
+				exit();
+			}
+		} else {
+			$cachefile = '';
+		}
+
+		$valid = true;
+		$photo = null;
+
+		if (!$direct_cache && ($cachefile == '')) {
+			$photo = DBA::selectFirst('photo', ['data', 'desc'], ['resource-id' => $urlhash]);
+
+			if (DBA::isResult($photo)) {
+				$img_str = $photo['data'];
+				$mime = $photo['desc'];
+
+				if ($mime == '') {
+					$mime = 'image/jpeg';
+				}
+			}
+		}
+
+		if (!DBA::isResult($photo)) {
+			// It shouldn't happen but it does - spaces in URL
+			$_REQUEST['url'] = str_replace(' ', '+', $_REQUEST['url']);
+			$redirects = 0;
+			$img_str = Network::fetchUrl($_REQUEST['url'], true, $redirects, 10);
+
+			$tempfile = tempnam(get_temppath(), 'cache');
+			file_put_contents($tempfile, $img_str);
+			$mime = mime_content_type($tempfile);
+			unlink($tempfile);
+
+			// If there is an error then return a blank image
+			if ((substr($a->get_curl_code(), 0, 1) == '4') || (!$img_str)) {
+				$img_str = file_get_contents('images/blank.png');
+				$mime = 'image/png';
+				$cachefile = ''; // Clear the cachefile so that the dummy isn't stored
+				$valid = false;
+				$image = new Image($img_str, 'image/png');
+
+				if ($image->isValid()) {
+					$image->scaleDown(10);
+					$img_str = $image->asString();
+				}
+			} elseif ($mime != 'image/jpeg' && !$direct_cache && $cachefile == '') {
+				$image = @imagecreatefromstring($img_str);
+
+				if ($image === FALSE) {
+					die();
+				}
+
+				$fields = ['uid' => 0, 'contact-id' => 0, 'guid' => System::createGUID(), 'resource-id' => $urlhash, 'created' => DateTimeFormat::utcNow(), 'edited' => DateTimeFormat::utcNow(),
+					'filename' => basename($_REQUEST['url']), 'type' => '', 'album' => '', 'height' => imagesy($image), 'width' => imagesx($image),
+					'datasize' => 0, 'data' => $img_str, 'scale' => 100, 'profile' => 0,
+					'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '', 'desc' => $mime];
+				DBA::insert('photo', $fields);
+			} else {
+				$image = new Image($img_str, $mime);
+
+				if ($image->isValid() && !$direct_cache && ($cachefile == '')) {
+					Photo::store($image, 0, 0, $urlhash, $_REQUEST['url'], '', 100);
+				}
+			}
+		}
+
+		$img_str_orig = $img_str;
+
+		// reduce quality - if it isn't a GIF
+		if ($mime != 'image/gif') {
+			$image = new Image($img_str, $mime);
+
+			if ($image->isValid()) {
+				$image->scaleDown($size);
+				$img_str = $image->asString();
+			}
+		}
+
+		/*
+		 * If there is a real existing directory then put the cache file there
+		 * advantage: real file access is really fast
+		 * Otherwise write in cachefile
+		 */
+		if ($valid && $direct_cache) {
+			file_put_contents($basepath . '/proxy/' . ProxyUtils::proxifyUrl($_REQUEST['url'], true), $img_str_orig);
+
+			if ($sizetype != '') {
+				file_put_contents($basepath . '/proxy/' . ProxyUtils::proxifyUrl($_REQUEST['url'], true) . $sizetype, $img_str);
+			}
+		} elseif ($cachefile != '') {
+			file_put_contents($cachefile, $img_str_orig);
+		}
+
+		header('Content-type: ' . $mime);
+
+		// Only output the cache headers when the file is valid
+		if ($valid) {
+			header('Last-Modified: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
+			header('Etag: "' . md5($img_str) . '"');
+			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + (31536000)) . ' GMT');
+			header('Cache-Control: max-age=31536000');
+		}
+
+		echo $img_str;
+
+		exit();
+	}
+
+}
diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php
index 8af267be3..64ac4e7be 100644
--- a/src/Network/FKOAuth1.php
+++ b/src/Network/FKOAuth1.php
@@ -7,10 +7,8 @@ namespace Friendica\Network;
 use Friendica\Core\Addon;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
-use Friendica\Network\FKOAuthDataStore;
+use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
-use dba;
 use OAuthServer;
 use OAuthSignatureMethod_HMAC_SHA1;
 use OAuthSignatureMethod_PLAINTEXT;
@@ -38,9 +36,9 @@ class FKOAuth1 extends OAuthServer
 	{
 		logger("FKOAuth1::loginUser $uid");
 		$a = get_app();
-		$record = dba::selectFirst('user', [], ['uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1]);
+		$record = DBA::selectFirst('user', [], ['uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1]);
 
-		if (!DBM::is_result($record)) {
+		if (!DBA::isResult($record)) {
 			logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
 			header('HTTP/1.0 401 Unauthorized');
 			die('This api requires login');
@@ -61,14 +59,14 @@ class FKOAuth1 extends OAuthServer
 			$a->timezone = $a->user['timezone'];
 		}
 
-		$contact = dba::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => 1]);
-		if (DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', [], ['uid' => $_SESSION['uid'], 'self' => 1]);
+		if (DBA::isResult($contact)) {
 			$a->contact = $contact;
 			$a->cid = $contact['id'];
 			$_SESSION['cid'] = $a->cid;
 		}
 
-		dba::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]);
+		DBA::update('user', ['login_date' => DateTimeFormat::utcNow()], ['uid' => $_SESSION['uid']]);
 
 		Addon::callHooks('logged_in', $a->user);
 	}
diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index 7a3329776..8453ac829 100644
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -10,8 +10,7 @@
 namespace Friendica\Network;
 
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
-use dba;
+use Friendica\Database\DBA;
 use OAuthConsumer;
 use OAuthDataStore;
 use OAuthToken;
@@ -42,10 +41,10 @@ class FKOAuthDataStore extends OAuthDataStore
 	{
 		logger(__function__ . ":" . $consumer_key);
 
-		$s = dba::select('clients', ['client_id', 'pw', 'redirect_uri'], ['client_id' => $consumer_key]);
-		$r = dba::inArray($s);
+		$s = DBA::select('clients', ['client_id', 'pw', 'redirect_uri'], ['client_id' => $consumer_key]);
+		$r = DBA::toArray($s);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return new OAuthConsumer($r[0]['client_id'], $r[0]['pw'], $r[0]['redirect_uri']);
 		}
 
@@ -62,10 +61,10 @@ class FKOAuthDataStore extends OAuthDataStore
 	{
 		logger(__function__ . ":" . $consumer . ", " . $token_type . ", " . $token);
 
-		$s = dba::select('tokens', ['id', 'secret', 'scope', 'expires', 'uid'], ['client_id' => $consumer->key, 'scope' => $token_type, 'id' => $token]);
-		$r = dba::inArray($s);
+		$s = DBA::select('tokens', ['id', 'secret', 'scope', 'expires', 'uid'], ['client_id' => $consumer->key, 'scope' => $token_type, 'id' => $token]);
+		$r = DBA::toArray($s);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$ot = new OAuthToken($r[0]['id'], $r[0]['secret']);
 			$ot->scope = $r[0]['scope'];
 			$ot->expires = $r[0]['expires'];
@@ -85,8 +84,8 @@ class FKOAuthDataStore extends OAuthDataStore
 	 */
 	public function lookup_nonce($consumer, $token, $nonce, $timestamp)
 	{
-		$token = dba::selectFirst('tokens', ['id', 'secret'], ['client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp]);
-		if (DBM::is_result($token)) {
+		$token = DBA::selectFirst('tokens', ['id', 'secret'], ['client_id' => $consumer->key, 'id' => $nonce, 'expires' => $timestamp]);
+		if (DBA::isResult($token)) {
 			return new OAuthToken($token['id'], $token['secret']);
 		}
 
@@ -110,7 +109,7 @@ class FKOAuthDataStore extends OAuthDataStore
 			$k = $consumer;
 		}
 
-		$r = dba::insert(
+		$r = DBA::insert(
 			'tokens',
 			[
 				'id' => $key,
@@ -151,7 +150,7 @@ class FKOAuthDataStore extends OAuthDataStore
 		if (is_null($verifier) || ($uverifier !== false)) {
 			$key = self::genToken();
 			$sec = self::genToken();
-			$r = dba::insert(
+			$r = DBA::insert(
 				'tokens',
 				[
 					'id' => $key,
@@ -167,7 +166,7 @@ class FKOAuthDataStore extends OAuthDataStore
 			}
 		}
 
-		dba::delete('tokens', ['id' => $token->key]);
+		DBA::delete('tokens', ['id' => $token->key]);
 
 		if (!is_null($ret) && !is_null($uverifier)) {
 			Config::delete("oauth", $verifier);
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 5f665814b..75231f44f 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -9,21 +9,21 @@ namespace Friendica\Network;
  * @brief Functions for probing URL
  */
 
-use Friendica\App;
-use Friendica\Core\System;
+use DOMDocument;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\Feed;
 use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
-use Friendica\Util\DateTimeFormat;
-use dba;
-use DOMXPath;
-use DOMDocument;
+use DomXPath;
 
 require_once 'include/dba.php';
 
@@ -109,6 +109,7 @@ class Probe
 		$redirects = 0;
 
 		logger("Probing for ".$host, LOGGER_DEBUG);
+		$xrd = null;
 
 		$ret = Network::curl($ssl_url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
 		if ($ret['success']) {
@@ -119,7 +120,7 @@ class Probe
 
 		if (!is_object($xrd)) {
 			$ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
-			if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+			if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 				logger("Probing timeout for ".$url, LOGGER_DEBUG);
 				return false;
 			}
@@ -231,7 +232,7 @@ class Probe
 
 		if (!$lrdd) {
 			$parts = @parse_url($uri);
-			if (!$parts) {
+			if (!$parts || empty($parts["host"]) || empty($parts["path"])) {
 				return [];
 			}
 
@@ -334,7 +335,7 @@ class Probe
 		}
 
 		if (x($data, "photo")) {
-			$data["baseurl"] = Network::getUrlMatch(normalise_link($data["baseurl"]), normalise_link($data["photo"]));
+			$data["baseurl"] = Network::getUrlMatch(normalise_link(defaults($data, "baseurl", "")), normalise_link($data["photo"]));
 		} else {
 			$data["photo"] = System::baseUrl().'/images/person-175.jpg';
 		}
@@ -362,20 +363,20 @@ class Probe
 		}
 
 		if (empty($data["network"])) {
-			$data["network"] = NETWORK_PHANTOM;
+			$data["network"] = Protocol::PHANTOM;
 		}
 
 		$data = self::rearrangeData($data);
 
 		// Only store into the cache if the value seems to be valid
-		if (!in_array($data['network'], [NETWORK_PHANTOM, NETWORK_MAIL])) {
+		if (!in_array($data['network'], [Protocol::PHANTOM, Protocol::MAIL])) {
 			Cache::set("Probe::uri:".$network.":".$uri, $data, CACHE_DAY);
 
 			/// @todo temporary fix - we need a real contact update function that updates only changing fields
 			/// The biggest problem is the avatar picture that could have a reduced image size.
 			/// It should only be updated if the existing picture isn't existing anymore.
 			/// We only update the contact when it is no probing for a specific network.
-			if (($data['network'] != NETWORK_FEED)
+			if (($data['network'] != Protocol::FEED)
 				&& ($network == "")
 				&& $data["name"]
 				&& $data["nick"]
@@ -398,7 +399,7 @@ class Probe
 				// This doesn't cover the case when a community isn't a community anymore
 				if (!empty($data['community']) && $data['community']) {
 					$fields['community'] = $data['community'];
-					$fields['contact-type'] = ACCOUNT_TYPE_COMMUNITY;
+					$fields['contact-type'] = Contact::ACCOUNT_TYPE_COMMUNITY;
 				}
 
 				$fieldnames = [];
@@ -411,11 +412,11 @@ class Probe
 					}
 				}
 
-				$fields['updated'] = DBM::date();
+				$fields['updated'] = DateTimeFormat::utcNow();
 
 				$condition = ['nurl' => normalise_link($data["url"])];
 
-				$old_fields = dba::selectFirst('gcontact', $fieldnames, $condition);
+				$old_fields = DBA::selectFirst('gcontact', $fieldnames, $condition);
 
 				// When the gcontact doesn't exist, the value "true" will trigger an insert.
 				// In difference to the public contacts we want to have every contact
@@ -428,7 +429,7 @@ class Probe
 					$fields['created'] = DateTimeFormat::utcNow();
 				}
 
-				dba::update('gcontact', $fields, $condition, $old_fields);
+				DBA::update('gcontact', $fields, $condition, $old_fields);
 
 				$fields = ['name' => $data['name'],
 						'nick' => $data['nick'],
@@ -448,7 +449,7 @@ class Probe
 						'pubkey' => $data['pubkey'],
 						'priority' => $data['priority'],
 						'writable' => true,
-						'rel' => CONTACT_IS_SHARING];
+						'rel' => Contact::SHARING];
 
 				$fieldnames = [];
 
@@ -466,13 +467,13 @@ class Probe
 				// This won't trigger an insert. This is intended, since we only need
 				// public contacts for everyone we store items from.
 				// We don't need to store every contact on the planet.
-				$old_fields = dba::selectFirst('contact', $fieldnames, $condition);
+				$old_fields = DBA::selectFirst('contact', $fieldnames, $condition);
 
 				$fields['name-date'] = DateTimeFormat::utcNow();
 				$fields['uri-date'] = DateTimeFormat::utcNow();
 				$fields['success_update'] = DateTimeFormat::utcNow();
 
-				dba::update('contact', $fields, $condition, $old_fields);
+				DBA::update('contact', $fields, $condition, $old_fields);
 			}
 		}
 
@@ -568,7 +569,7 @@ class Probe
 			}
 
 			if ($host == 'twitter.com') {
-				return ["network" => NETWORK_TWITTER];
+				return ["network" => Protocol::TWITTER];
 			}
 			$lrdd = self::hostMeta($host);
 
@@ -599,7 +600,7 @@ class Probe
 				return self::mail($uri, $uid);
 			}
 
-			if ($network == NETWORK_MAIL) {
+			if ($network == Protocol::MAIL) {
 				return self::mail($uri, $uid);
 			}
 			// Remove "acct:" from the URI
@@ -609,7 +610,7 @@ class Probe
 			$nick = substr($uri, 0, strpos($uri, '@'));
 
 			if (strpos($uri, '@twitter.com')) {
-				return ["network" => NETWORK_TWITTER];
+				return ["network" => Protocol::TWITTER];
 			}
 			$lrdd = self::hostMeta($host);
 
@@ -670,19 +671,19 @@ class Probe
 
 		logger("Probing ".$uri, LOGGER_DEBUG);
 
-		if (in_array($network, ["", NETWORK_DFRN])) {
+		if (in_array($network, ["", Protocol::DFRN])) {
 			$result = self::dfrn($webfinger);
 		}
-		if ((!$result && ($network == "")) || ($network == NETWORK_DIASPORA)) {
+		if ((!$result && ($network == "")) || ($network == Protocol::DIASPORA)) {
 			$result = self::diaspora($webfinger);
 		}
-		if ((!$result && ($network == "")) || ($network == NETWORK_OSTATUS)) {
+		if ((!$result && ($network == "")) || ($network == Protocol::OSTATUS)) {
 			$result = self::ostatus($webfinger);
 		}
-		if ((!$result && ($network == "")) || ($network == NETWORK_PUMPIO)) {
+		if ((!$result && ($network == "")) || ($network == Protocol::PUMPIO)) {
 			$result = self::pumpio($webfinger, $addr);
 		}
-		if ((!$result && ($network == "")) || ($network == NETWORK_FEED)) {
+		if ((!$result && ($network == "")) || ($network == Protocol::FEED)) {
 			$result = self::feed($uri);
 		} else {
 			// We overwrite the detected nick with our try if the previois routines hadn't detected it.
@@ -696,6 +697,14 @@ class Probe
 			}
 		}
 
+		if (empty($result["network"])) {
+			$result["network"] = Protocol::PHANTOM;
+		}
+
+		if (empty($result["url"])) {
+			$result["url"] = $uri;
+		}
+
 		logger($uri." is ".$result["network"], LOGGER_DEBUG);
 
 		if (empty($result["baseurl"])) {
@@ -723,7 +732,7 @@ class Probe
 		$redirects = 0;
 
 		$ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 			return false;
 		}
 		$data = $ret['body'];
@@ -790,7 +799,7 @@ class Probe
 	private static function pollNoscrape($noscrape_url, $data)
 	{
 		$ret = Network::curl($noscrape_url);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 			return false;
 		}
 		$content = $ret['body'];
@@ -917,7 +926,6 @@ class Probe
 			|| !isset($data["confirm"])
 			|| !isset($data["request"])
 			|| !isset($data["poll"])
-			|| !isset($data["poco"])
 			|| !isset($data["name"])
 			|| !isset($data["photo"])
 		) {
@@ -925,13 +933,19 @@ class Probe
 		}
 
 		$prof_data = [];
+
+		if (empty($data["addr"]) || empty($data["nick"])) {
+			$probe_data = self::uri($profile_link);
+			$data["addr"] = defaults($data, "addr", $probe_data["addr"]);
+			$data["nick"] = defaults($data, "nick", $probe_data["nick"]);
+		}
+
 		$prof_data["addr"]         = $data["addr"];
 		$prof_data["nick"]         = $data["nick"];
 		$prof_data["dfrn-request"] = $data["request"];
 		$prof_data["dfrn-confirm"] = $data["confirm"];
 		$prof_data["dfrn-notify"]  = $data["notify"];
 		$prof_data["dfrn-poll"]    = $data["poll"];
-		$prof_data["dfrn-poco"]    = $data["poco"];
 		$prof_data["photo"]        = $data["photo"];
 		$prof_data["fn"]           = $data["name"];
 		$prof_data["key"]          = $data["pubkey"];
@@ -953,23 +967,23 @@ class Probe
 		$hcard_url = "";
 		$data = [];
 		foreach ($webfinger["links"] as $link) {
-			if (($link["rel"] == NAMESPACE_DFRN) && ($link["href"] != "")) {
-				$data["network"] = NETWORK_DFRN;
-			} elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
+			if (($link["rel"] == NAMESPACE_DFRN) && !empty($link["href"])) {
+				$data["network"] = Protocol::DFRN;
+			} 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"))
@@ -979,9 +993,11 @@ class Probe
 			}
 		}
 
-		if (is_array($webfinger["aliases"])) {
+		if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
 			foreach ($webfinger["aliases"] as $alias) {
-				if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) {
+				if (empty($data["url"]) && !strstr($alias, "@")) {
+					$data["url"] = $alias;
+				} elseif (!strstr($alias, "@") && normalise_link($alias) != normalise_link($data["url"])) {
 					$data["alias"] = $alias;
 				} elseif (substr($alias, 0, 5) == 'acct:') {
 					$data["addr"] = substr($alias, 5);
@@ -989,7 +1005,7 @@ class Probe
 			}
 		}
 
-		if (substr($webfinger["subject"], 0, 5) == "acct:") {
+		if (!empty($webfinger["subject"]) && (substr($webfinger["subject"], 0, 5) == "acct:")) {
 			$data["addr"] = substr($webfinger["subject"], 5);
 		}
 
@@ -1028,7 +1044,7 @@ class Probe
 	private static function pollHcard($hcard_url, $data, $dfrn = false)
 	{
 		$ret = Network::curl($hcard_url);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 			return false;
 		}
 		$content = $ret['body'];
@@ -1048,13 +1064,17 @@ class Probe
 			return false;
 		}
 
+		if (!isset($data["baseurl"])) {
+			$data["baseurl"] = "";
+		}
+
 		if ($vcards->length > 0) {
 			$vcard = $vcards->item(0);
 
 			// We have to discard the guid from the hcard in favour of the guid from lrdd
 			// Reason: Hubzilla doesn't use the value "uid" in the hcard like Diaspora does.
 			$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */
-			if (($search->length > 0) && ($data["guid"] == "")) {
+			if (($search->length > 0) && empty($data["guid"])) {
 				$data["guid"] = $search->item(0)->nodeValue;
 			}
 
@@ -1088,21 +1108,23 @@ class Probe
 		}
 
 		$avatar = [];
-		$photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
-		foreach ($photos as $photo) {
-			$attr = [];
-			foreach ($photo->attributes as $attribute) {
-				$attr[$attribute->name] = trim($attribute->value);
-			}
+		if (!empty($vcard)) {
+			$photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
+			foreach ($photos as $photo) {
+				$attr = [];
+				foreach ($photo->attributes as $attribute) {
+					$attr[$attribute->name] = trim($attribute->value);
+				}
 
-			if (isset($attr["src"]) && isset($attr["width"])) {
-				$avatar[$attr["width"]] = $attr["src"];
-			}
+				if (isset($attr["src"]) && isset($attr["width"])) {
+					$avatar[$attr["width"]] = $attr["src"];
+				}
 
-			// We don't have a width. So we just take everything that we got.
-			// This is a Hubzilla workaround which doesn't send a width.
-			if ((sizeof($avatar) == 0) && !empty($attr["src"])) {
-				$avatar[] = $attr["src"];
+				// We don't have a width. So we just take everything that we got.
+				// This is a Hubzilla workaround which doesn't send a width.
+				if ((sizeof($avatar) == 0) && !empty($attr["src"])) {
+					$avatar[] = $attr["src"];
+				}
 			}
 		}
 
@@ -1127,7 +1149,7 @@ class Probe
 			}
 
 			// Older Friendica versions had used the "uid" field differently than newer versions
-			if ($data["nick"] == $data["guid"]) {
+			if (!empty($data["nick"]) && !empty($data["guid"]) && ($data["nick"] == $data["guid"])) {
 				unset($data["guid"]);
 			}
 		}
@@ -1148,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"))
@@ -1176,7 +1198,7 @@ class Probe
 			return false;
 		}
 
-		if (is_array($webfinger["aliases"])) {
+		if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
 			foreach ($webfinger["aliases"] as $alias) {
 				if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) {
 					$data["alias"] = $alias;
@@ -1203,10 +1225,12 @@ class Probe
 			&& isset($data["pubkey"])
 			&& ($hcard_url != "")
 		) {
-			$data["network"] = NETWORK_DIASPORA;
+			$data["network"] = Protocol::DIASPORA;
 
 			// The Diaspora handle must always be lowercase
-			$data["addr"] = strtolower($data["addr"]);
+			if (!empty($data["addr"])) {
+				$data["addr"] = strtolower($data["addr"]);
+			}
 
 			// We have to overwrite the detected value for "notify" since Hubzilla doesn't send it
 			$data["notify"] = $data["baseurl"] . "/receive/users/" . $data["guid"];
@@ -1230,7 +1254,7 @@ class Probe
 	{
 		$data = [];
 
-		if (is_array($webfinger["aliases"])) {
+		if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
 			foreach ($webfinger["aliases"] as $alias) {
 				if (strstr($alias, "@") && !strstr(normalise_link($alias), "http://")) {
 					$data["addr"] = str_replace('acct:', '', $alias);
@@ -1238,7 +1262,7 @@ class Probe
 			}
 		}
 
-		if (is_string($webfinger["subject"]) && strstr($webfinger["subject"], "@")
+		if (!empty($webfinger["subject"]) && strstr($webfinger["subject"], "@")
 			&& !strstr(normalise_link($webfinger["subject"]), "http://")
 		) {
 			$data["addr"] = str_replace('acct:', '', $webfinger["subject"]);
@@ -1248,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:') {
@@ -1267,7 +1291,7 @@ class Probe
 						}
 					} elseif (normalise_link($pubkey) == 'http://') {
 						$ret = Network::curl($pubkey);
-						if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+						if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 							return false;
 						}
 						$pubkey = $ret['body'];
@@ -1288,7 +1312,7 @@ class Probe
 			&& isset($data["poll"])
 			&& isset($data["url"])
 		) {
-			$data["network"] = NETWORK_OSTATUS;
+			$data["network"] = Protocol::OSTATUS;
 		} else {
 			return false;
 		}
@@ -1299,36 +1323,39 @@ class Probe
 
 		// Fetch all additional data from the feed
 		$ret = Network::curl($data["poll"]);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 			return false;
 		}
 		$feed = $ret['body'];
+		$dummy1 = null;
+		$dummy2 = null;
+		$dummy2 = null;
 		$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
 		if (!$feed_data) {
 			return false;
 		}
 
-		if ($feed_data["header"]["author-name"] != "") {
+		if (!empty($feed_data["header"]["author-name"])) {
 			$data["name"] = $feed_data["header"]["author-name"];
 		}
-		if ($feed_data["header"]["author-nick"] != "") {
+		if (!empty($feed_data["header"]["author-nick"])) {
 			$data["nick"] = $feed_data["header"]["author-nick"];
 		}
-		if ($feed_data["header"]["author-avatar"] != "") {
+		if (!empty($feed_data["header"]["author-avatar"])) {
 			$data["photo"] = self::fixAvatar($feed_data["header"]["author-avatar"], $data["url"]);
 		}
-		if ($feed_data["header"]["author-id"] != "") {
+		if (!empty($feed_data["header"]["author-id"])) {
 			$data["alias"] = $feed_data["header"]["author-id"];
 		}
-		if ($feed_data["header"]["author-location"] != "") {
+		if (!empty($feed_data["header"]["author-location"])) {
 			$data["location"] = $feed_data["header"]["author-location"];
 		}
-		if ($feed_data["header"]["author-about"] != "") {
+		if (!empty($feed_data["header"]["author-about"])) {
 			$data["about"] = $feed_data["header"]["author-about"];
 		}
 		// OStatus has serious issues when the the url doesn't fit (ssl vs. non ssl)
 		// So we take the value that we just fetched, although the other one worked as well
-		if ($feed_data["header"]["author-link"] != "") {
+		if (!empty($feed_data["header"]["author-link"])) {
 			$data["url"] = $feed_data["header"]["author-link"];
 		}
 
@@ -1370,16 +1397,16 @@ class Probe
 			}
 		}
 
-		$data["location"] = $xpath->query("//p[contains(@class, 'p-locality')]")->item(0)->nodeValue;
+		$data["location"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'p-locality')]");
 
 		if ($data["location"] == '') {
-			$data["location"] = $xpath->query("//p[contains(@class, 'location')]")->item(0)->nodeValue;
+			$data["location"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'location')]");
 		}
 
-		$data["about"] = $xpath->query("//p[contains(@class, 'p-note')]")->item(0)->nodeValue;
+		$data["about"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'p-note')]");
 
 		if ($data["about"] == '') {
-			$data["about"] = $xpath->query("//p[contains(@class, 'summary')]")->item(0)->nodeValue;
+			$data["about"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'summary')]");
 		}
 
 		$avatar = $xpath->query("//img[contains(@class, 'u-photo')]")->item(0);
@@ -1409,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"];
@@ -1429,7 +1456,7 @@ class Probe
 			// So we unset all data that isn't used at the moment
 			unset($data["dialback"]);
 
-			$data["network"] = NETWORK_PUMPIO;
+			$data["network"] = Protocol::PUMPIO;
 		} else {
 			return false;
 		}
@@ -1506,10 +1533,11 @@ class Probe
 	private static function feed($url, $probe = true)
 	{
 		$ret = Network::curl($url);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 			return false;
 		}
 		$feed = $ret['body'];
+		$dummy1 = $dummy2 = $dummy3 = null;
 		$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
 
 		if (!$feed_data) {
@@ -1526,32 +1554,32 @@ class Probe
 			return self::feed($feed_url, false);
 		}
 
-		if ($feed_data["header"]["author-name"] != "") {
+		if (!empty($feed_data["header"]["author-name"])) {
 			$data["name"] = $feed_data["header"]["author-name"];
 		}
 
-		if ($feed_data["header"]["author-nick"] != "") {
+		if (!empty($feed_data["header"]["author-nick"])) {
 			$data["nick"] = $feed_data["header"]["author-nick"];
 		}
 
-		if ($feed_data["header"]["author-avatar"] != "") {
+		if (!empty($feed_data["header"]["author-avatar"])) {
 			$data["photo"] = $feed_data["header"]["author-avatar"];
 		}
 
-		if ($feed_data["header"]["author-id"] != "") {
+		if (!empty($feed_data["header"]["author-id"])) {
 			$data["alias"] = $feed_data["header"]["author-id"];
 		}
 
 		$data["url"] = $url;
 		$data["poll"] = $url;
 
-		if ($feed_data["header"]["author-link"] != "") {
+		if (!empty($feed_data["header"]["author-link"])) {
 			$data["baseurl"] = $feed_data["header"]["author-link"];
 		} else {
 			$data["baseurl"] = $data["url"];
 		}
 
-		$data["network"] = NETWORK_FEED;
+		$data["network"] = Protocol::FEED;
 
 		return $data;
 	}
@@ -1574,18 +1602,22 @@ class Probe
 			return false;
 		}
 
-		$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
+		$user = DBA::selectFirst('user', ['prvkey'], ['uid' => $uid]);
 
-		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
+		$condition = ["`uid` = ? AND `server` != ''", $uid];
+		$fields = ['pass', 'user', 'server', 'port', 'ssltype', 'mailbox'];
+		$mailacct = DBA::selectFirst('mailacct', $fields, $condition);
 
-		if (DBM::is_result($x) && DBM::is_result($r)) {
-			$mailbox = Email::constructMailboxName($r[0]);
-			$password = '';
-			openssl_private_decrypt(hex2bin($r[0]['pass']), $password, $x[0]['prvkey']);
-			$mbox = Email::connect($mailbox, $r[0]['user'], $password);
-			if (!$mbox) {
-				return false;
-			}
+		if (!DBA::isResult($user) || !DBA::isResult($mailacct)) {
+			return false;
+		}
+
+		$mailbox = Email::constructMailboxName($mailacct);
+		$password = '';
+		openssl_private_decrypt(hex2bin($mailacct['pass']), $password, $user['prvkey']);
+		$mbox = Email::connect($mailbox, $mailacct['user'], $password);
+		if (!$mbox) {
+			return false;
 		}
 
 		$msgs = Email::poll($mbox, $uri);
@@ -1599,7 +1631,7 @@ class Probe
 
 		$data = [];
 		$data["addr"]    = $uri;
-		$data["network"] = NETWORK_MAIL;
+		$data["network"] = Protocol::MAIL;
 		$data["name"]    = substr($uri, 0, strpos($uri, '@'));
 		$data["nick"]    = $data["name"];
 		$data["photo"]   = Network::lookupAvatarByEmail($uri);
@@ -1636,7 +1668,6 @@ class Probe
 		if (!empty($mbox)) {
 			imap_close($mbox);
 		}
-
 		return $data;
 	}
 
diff --git a/src/Object/Image.php b/src/Object/Image.php
index 9692b8471..620929df5 100644
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -10,7 +10,8 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Util\Network;
 use Exception;
@@ -731,8 +732,11 @@ class Image
 			$headers=[];
 			$h = explode("\n", $a->get_curl_headers());
 			foreach ($h as $l) {
-				list($k,$v) = array_map("trim", explode(":", trim($l), 2));
-				$headers[$k] = $v;
+				$data = array_map("trim", explode(":", trim($l), 2));
+				if (count($data) > 1) {
+					list($k,$v) = $data;
+					$headers[$k] = $v;
+				}
 			}
 			if (array_key_exists('Content-Type', $headers))
 				$type = $headers['Content-Type'];
@@ -779,20 +783,29 @@ class Image
 
 		if (is_null($data) || !$data || !is_array($data)) {
 			$img_str = Network::fetchUrl($url, true, $redirects, 4);
+
+			if (!$img_str) {
+				return false;
+			}
+
 			$filesize = strlen($img_str);
 
-			if (function_exists("getimagesizefromstring")) {
-				$data = getimagesizefromstring($img_str);
-			} else {
-				$tempfile = tempnam(get_temppath(), "cache");
+			try {
+				if (function_exists("getimagesizefromstring")) {
+					$data = @getimagesizefromstring($img_str);
+				} else {
+					$tempfile = tempnam(get_temppath(), "cache");
 
-				$a = get_app();
-				$stamp1 = microtime(true);
-				file_put_contents($tempfile, $img_str);
-				$a->save_timestamp($stamp1, "file");
+					$a = get_app();
+					$stamp1 = microtime(true);
+					file_put_contents($tempfile, $img_str);
+					$a->save_timestamp($stamp1, "file");
 
-				$data = getimagesize($tempfile);
-				unlink($tempfile);
+					$data = getimagesize($tempfile);
+					unlink($tempfile);
+				}
+			} catch (Exception $e) {
+				return false;
 			}
 
 			if ($data) {
@@ -875,7 +888,7 @@ class Image
 			intval($uid)
 		);
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG);
 			return([]);
 		}
@@ -884,7 +897,7 @@ class Image
 
 		/// @TODO
 		/// $default_cid      = $r[0]['id'];
-		/// $community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+		/// $community_page   = (($r[0]['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
 
 		if ((strlen($imagedata) == 0) && ($url == "")) {
 			logger("No image data and no url provided", LOGGER_DEBUG);
diff --git a/src/Object/OEmbed.php b/src/Object/OEmbed.php
new file mode 100644
index 000000000..20f27ae0b
--- /dev/null
+++ b/src/Object/OEmbed.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Friendica\Object;
+
+/**
+ * OEmbed data object
+ *
+ * @see https://oembed.com/#section2.3
+ *
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
+ */
+class OEmbed
+{
+	public $embed_url        = '';
+
+	public $type             = '';
+	public $title            = '';
+	public $author_name      = '';
+	public $author_url       = '';
+	public $provider_name    = '';
+	public $provider_url     = '';
+	public $cache_age        = '';
+	public $thumbnail_url    = '';
+	public $thumbnail_width  = '';
+	public $thumbnail_height = '';
+	public $html             = '';
+	public $url              = '';
+	public $width            = '';
+	public $height           = '';
+
+	public function __construct($embed_url)
+	{
+		$this->embed_url = $embed_url;
+	}
+
+	public function parseJSON($json_string)
+	{
+		$properties = json_decode($json_string, true);
+
+		if (empty($properties)) {
+			return;
+		}
+
+		foreach ($properties as $key => $value) {
+			if (property_exists(__CLASS__, $key)) {
+				$this->{$key} = $value;
+			}
+		}
+	}
+}
diff --git a/src/Object/Post.php b/src/Object/Post.php
index b47bbd69f..038ca270d 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -11,12 +11,14 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
-use Friendica\Model\Profile;
+use Friendica\Model\Item;
+use Friendica\Model\Term;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
-use dba;
 
 require_once 'include/dba.php';
 require_once 'include/text.php';
@@ -71,8 +73,10 @@ class Post extends BaseObject
 		}
 
 		$this->writable = $this->getDataValue('writable') || $this->getDataValue('self');
-		$this->redirect_url = 'redir/' . $this->getDataValue('cid');
-
+		$author = ['uid' => 0, 'id' => $this->getDataValue('author-id'),
+			'network' => $this->getDataValue('author-network'),
+			'url' => $this->getDataValue('author-link')];
+		$this->redirect_url = Contact::magicLinkbyContact($author);
 		if (!$this->isToplevel()) {
 			$this->threaded = true;
 		}
@@ -81,14 +85,14 @@ class Post extends BaseObject
 		if (!empty($data['children'])) {
 			foreach ($data['children'] as $item) {
 				// Only add will be displayed
-				if ($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+				if ($item['network'] === Protocol::MAIL && local_user() != $item['uid']) {
 					continue;
 				} elseif (!visible_activity($item)) {
 					continue;
 				}
 
 				// You can always comment on Diaspora and OStatus items
-				if (in_array($item['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA]) && (local_user() == $item['uid'])) {
+				if (in_array($item['network'], [Protocol::OSTATUS, Protocol::DIASPORA]) && (local_user() == $item['uid'])) {
 					$item['writable'] = true;
 				}
 
@@ -110,8 +114,6 @@ class Post extends BaseObject
 	 */
 	public function getTemplateData($conv_responses, $thread_level = 1)
 	{
-		require_once "mod/proxy.php";
-
 		$result = [];
 
 		$a = self::getApp();
@@ -148,6 +150,7 @@ class Post extends BaseObject
 			|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
 			? L10n::t('Private Message')
 			: false);
+
 		$shareable = in_array($conv->getProfileOwner(), [0, local_user()]) && $item['private'] != 1;
 
 		if (local_user() && link_compare($a->contact['url'], $item['author-link'])) {
@@ -177,14 +180,14 @@ class Post extends BaseObject
 		if (!$origin) {
 			/// @todo This shouldn't be done as query here, but better during the data creation.
 			// it is now done here, since during the RC phase we shouldn't make to intense changes.
-			$parent = dba::selectFirst('item', ['origin'], ['id' => $item['parent']]);
-			if (DBM::is_result($parent)) {
+			$parent = Item::selectFirst(['origin'], ['id' => $item['parent']]);
+			if (DBA::isResult($parent)) {
 				$origin = $parent['origin'];
 			}
 		}
 
 		// Showing the one or the other text, depending upon if we can only hide it or really delete it.
-		$delete = $origin ? L10n::t('Delete') : L10n::t('Remove from your stream');
+		$delete = $origin ? L10n::t('Delete globally') : L10n::t('Remove locally');
 
 		$drop = [
 			'dropping' => $dropping,
@@ -193,36 +196,22 @@ class Post extends BaseObject
 			'delete'   => $delete,
 		];
 
-		if (!local_user()) {
+		if (!local_user() || ($item['uid'] == 0)) {
 			$drop = false;
 		}
 
 		$filer = (($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) ? L10n::t("save to folder") : false);
 
-		$diff_author = !link_compare($item['url'], $item['author-link']);
-		$profile_name = htmlentities(((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
-		if ($item['author-link'] && (!$item['author-name'])) {
+		$profile_name = htmlentities($item['author-name']);
+		if (!empty($item['author-link']) && empty($item['author-name'])) {
 			$profile_name = $item['author-link'];
 		}
 
-		$sp = false;
-		$profile_link = best_link_url($item, $sp);
-		if ($profile_link === 'mailbox') {
-			$profile_link = '';
-		}
-
-		if ($sp) {
+		$author = ['uid' => 0, 'id' => $item['author-id'],
+			'network' => $item['author-network'], 'url' => $item['author-link']];
+		$profile_link = Contact::magicLinkbyContact($author);
+		if (strpos($profile_link, 'redir/') === 0) {
 			$sparkle = ' sparkle';
-		} else {
-			$profile_link = Profile::zrl($profile_link);
-		}
-
-		if (($item['network'] == NETWORK_FEED) || empty($item['author-thumb'])) {
-			$item['author-thumb'] = $item['author-avatar'];
-		}
-
-		if (($item['network'] == NETWORK_FEED) || empty($item['owner-thumb'])) {
-			$item['owner-thumb'] = $item['owner-avatar'];
 		}
 
 		$locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => ''];
@@ -264,6 +253,18 @@ class Post extends BaseObject
 		$tagger = '';
 
 		if ($this->isToplevel()) {
+			$thread = Item::selectFirstThreadForUser(local_user(), ['ignored'], ['iid' => $item['id']]);
+			if (DBA::isResult($thread)) {
+				$ignore = [
+					'do'        => L10n::t("ignore thread"),
+					'undo'      => L10n::t("unignore thread"),
+					'toggle'    => L10n::t("toggle ignore status"),
+					'classdo'   => $thread['ignored'] ? "hidden" : "",
+					'classundo' => $thread['ignored'] ? "" : "hidden",
+					'ignored'   => L10n::t('ignored'),
+				];
+			}
+
 			if ($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) {
 				$isstarred = (($item['starred']) ? "starred" : "unstarred");
 
@@ -276,18 +277,6 @@ class Post extends BaseObject
 					'starred'   => L10n::t('starred'),
 				];
 
-				$thread = dba::selectFirst('thread', ['ignored'], ['uid' => $item['uid'], 'iid' => $item['id']]);
-				if (DBM::is_result($thread)) {
-					$ignore = [
-						'do'        => L10n::t("ignore thread"),
-						'undo'      => L10n::t("unignore thread"),
-						'toggle'    => L10n::t("toggle ignore status"),
-						'classdo'   => $thread['ignored'] ? "hidden" : "",
-						'classundo' => $thread['ignored'] ? "" : "hidden",
-						'ignored'   => L10n::t('ignored'),
-					];
-				}
-
 				if (Feature::isEnabled($conv->getProfileOwner(), 'commtag')) {
 					$tagger = [
 						'add'   => L10n::t("add tag"),
@@ -335,27 +324,29 @@ class Post extends BaseObject
 		$owner_name_e = $this->getOwnerName();
 
 		// Disable features that aren't available in several networks
-		if (!in_array($item["item_network"], [NETWORK_DFRN, NETWORK_DIASPORA]) && isset($buttons["dislike"])) {
+		if (!in_array($item["network"], [Protocol::DFRN, Protocol::DIASPORA]) && isset($buttons["dislike"])) {
 			unset($buttons["dislike"]);
 			$isevent = false;
 			$tagger = '';
 		}
 
-		if (($item["item_network"] == NETWORK_FEED) && isset($buttons["like"])) {
+		if (($item["network"] == Protocol::FEED) && isset($buttons["like"])) {
 			unset($buttons["like"]);
 		}
 
-		if (($item["item_network"] == NETWORK_MAIL) && isset($buttons["like"])) {
+		if (($item["network"] == Protocol::MAIL) && isset($buttons["like"])) {
 			unset($buttons["like"]);
 		}
 
+		$tags = Term::populateTagsFromItem($item);
+
 		$tmp_item = [
 			'template'        => $this->getTemplate(),
 			'type'            => implode("", array_slice(explode("/", $item['verb']), -1)),
 			'suppress_tags'   => Config::get('system', 'suppress_tags'),
-			'tags'            => $item['tags'],
-			'hashtags'        => $item['hashtags'],
-			'mentions'        => $item['mentions'],
+			'tags'            => $tags['tags'],
+			'hashtags'        => $tags['hashtags'],
+			'mentions'        => $tags['mentions'],
 			'txt_cats'        => L10n::t('Categories:'),
 			'txt_folders'     => L10n::t('Filed under:'),
 			'has_cats'        => ((count($categories)) ? 'true' : ''),
@@ -368,8 +359,8 @@ class Post extends BaseObject
 			'guid'            => urlencode($item['guid']),
 			'isevent'         => $isevent,
 			'attend'          => $attend,
-			'linktitle'       => L10n::t('View %s\'s profile @ %s', $profile_name, defaults($item, 'author-link', $item['url'])),
-			'olinktitle'      => L10n::t('View %s\'s profile @ %s', htmlentities($this->getOwnerName()), defaults($item, 'owner-link', $item['url'])),
+			'linktitle'       => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
+			'olinktitle'      => L10n::t('View %s\'s profile @ %s', htmlentities($this->getOwnerName()), $item['owner-link']),
 			'to'              => L10n::t('to'),
 			'via'             => L10n::t('via'),
 			'wall'            => L10n::t('Wall-to-Wall'),
@@ -377,7 +368,7 @@ class Post extends BaseObject
 			'profile_url'     => $profile_link,
 			'item_photo_menu' => item_photo_menu($item),
 			'name'            => $name_e,
-			'thumb'           => $a->remove_baseurl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)),
+			'thumb'           => $a->remove_baseurl(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)),
 			'osparkle'        => $osparkle,
 			'sparkle'         => $sparkle,
 			'title'           => $title_e,
@@ -390,7 +381,7 @@ class Post extends BaseObject
 			'indent'          => $indent,
 			'shiny'           => $shiny,
 			'owner_url'       => $this->getOwnerUrl(),
-			'owner_photo'     => $a->remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
+			'owner_photo'     => $a->remove_baseurl(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
 			'owner_name'      => htmlentities($owner_name_e),
 			'plink'           => get_plink($item),
 			'edpost'          => Feature::isEnabled($conv->getProfileOwner(), 'edit_posts') ? $edpost : '',
@@ -410,8 +401,8 @@ class Post extends BaseObject
 			'wait'            => L10n::t('Please wait'),
 			'thread_level'    => $thread_level,
 			'edited'          => $edited,
-			'network'         => $item["item_network"],
-			'network_name'    => ContactSelector::networkToName($item['item_network'], $profile_link),
+			'network'         => $item["network"],
+			'network_name'    => ContactSelector::networkToName($item['network'], $profile_link),
 			'received'        => $item['received'],
 			'commented'       => $item['commented'],
 			'created_date'    => $item['created'],
@@ -499,7 +490,7 @@ class Post extends BaseObject
 		/*
 		 * Only add what will be displayed
 		 */
-		if ($item->getDataValue('network') === NETWORK_MAIL && local_user() != $item->getDataValue('uid')) {
+		if ($item->getDataValue('network') === Protocol::MAIL && local_user() != $item->getDataValue('uid')) {
 			return false;
 		} elseif (activity_match($item->getDataValue('verb'), ACTIVITY_LIKE) || activity_match($item->getDataValue('verb'), ACTIVITY_DISLIKE)) {
 			return false;
@@ -792,7 +783,7 @@ class Post extends BaseObject
 				'$return_path' => $a->query_string,
 				'$threaded'    => $this->isThreaded(),
 				'$jsreload'    => '',
-				'$type'        => $conv->getMode() === 'profile' ? 'wall-comment' : 'net-comment',
+				'$wall'        => ($conv->getMode() === 'profile'),
 				'$id'          => $this->getId(),
 				'$parent'      => $this->getId(),
 				'$qcomment'    => $qcomment,
@@ -847,7 +838,7 @@ class Post extends BaseObject
 					// This will have been stored in $a->page_contact by our calling page.
 					// Put this person as the wall owner of the wall-to-wall notice.
 
-					$this->owner_url = Profile::zrl($a->page_contact['url']);
+					$this->owner_url = Contact::magicLink($a->page_contact['url']);
 					$this->owner_photo = $a->page_contact['thumb'];
 					$this->owner_name = $a->page_contact['name'];
 					$this->wall_to_wall = true;
@@ -856,7 +847,7 @@ class Post extends BaseObject
 					$alias_linkmatch = (($this->getDataValue('alias')) && link_compare($this->getDataValue('alias'), $this->getDataValue('author-link')));
 					$owner_namematch = (($this->getDataValue('owner-name')) && $this->getDataValue('owner-name') == $this->getDataValue('author-name'));
 
-					if ((!$owner_linkmatch) && (!$alias_linkmatch) && (!$owner_namematch)) {
+					if (!$owner_linkmatch && !$alias_linkmatch && !$owner_namematch) {
 						// The author url doesn't match the owner (typically the contact)
 						// and also doesn't match the contact alias.
 						// The name match is a hack to catch several weird cases where URLs are
@@ -869,14 +860,11 @@ class Post extends BaseObject
 						$this->owner_photo = $this->getDataValue('owner-avatar');
 						$this->owner_name = $this->getDataValue('owner-name');
 						$this->wall_to_wall = true;
-						// If it is our contact, use a friendly redirect link
-						if ($this->getDataValue('network') === NETWORK_DFRN
-							&& link_compare($this->getDataValue('owner-link'), $this->getDataValue('url'))
-						) {
-							$this->owner_url = $this->getRedirectUrl();
-						} else {
-							$this->owner_url = Profile::zrl($this->getDataValue('owner-link'));
-						}
+
+						$owner = ['uid' => 0, 'id' => $this->getDataValue('owner-id'),
+							'network' => $this->getDataValue('owner-network'),
+							'url' => $this->getDataValue('owner-link')];
+						$this->owner_url = Contact::magicLinkbyContact($owner);
 					}
 				}
 			}
diff --git a/src/Object/Thread.php b/src/Object/Thread.php
index 799029a28..cd055ee5e 100644
--- a/src/Object/Thread.php
+++ b/src/Object/Thread.php
@@ -5,6 +5,7 @@
 namespace Friendica\Object;
 
 use Friendica\BaseObject;
+use Friendica\Core\Protocol;
 use Friendica\Object\Post;
 
 require_once 'boot.php';
@@ -70,6 +71,10 @@ class Thread extends BaseObject
 				$this->profile_owner = 0;
 				$this->writable = $writable;
 				break;
+			case 'contacts':
+				$this->profile_owner = 0;
+				$this->writable = $writable;
+				break;
 			default:
 				logger('[ERROR] Conversation::setMode : Unhandled mode ('. $mode .').', LOGGER_DEBUG);
 				return false;
@@ -143,7 +148,7 @@ class Thread extends BaseObject
 		/*
 		 * Only add will be displayed
 		 */
-		if ($item->getDataValue('network') === NETWORK_MAIL && local_user() != $item->getDataValue('uid')) {
+		if ($item->getDataValue('network') === Protocol::MAIL && local_user() != $item->getDataValue('uid')) {
 			logger('[WARN] Conversation::addThread : Thread is a mail ('. $item->getId() .').', LOGGER_DEBUG);
 			return false;
 		}
@@ -176,7 +181,7 @@ class Thread extends BaseObject
 		$i = 0;
 
 		foreach ($this->parents as $item) {
-			if ($item->getDataValue('network') === NETWORK_MAIL && local_user() != $item->getDataValue('uid')) {
+			if ($item->getDataValue('network') === Protocol::MAIL && local_user() != $item->getDataValue('uid')) {
 				continue;
 			}
 
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index ac147a762..1ab4d8f9e 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -8,6 +8,8 @@
  */
 namespace Friendica\Protocol;
 
+use DOMDocument;
+use DOMXPath;
 use Friendica\App;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Text\BBCode;
@@ -15,26 +17,22 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\Event;
 use Friendica\Model\GContact;
-use Friendica\Model\Group;
 use Friendica\Model\Item;
+use Friendica\Model\PermissionSet;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Object\Image;
-use Friendica\Protocol\OStatus;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
-use Friendica\Protocol\Diaspora;
-use dba;
-use DOMDocument;
-use DOMXPath;
 use HTMLPurifier;
 use HTMLPurifier_Config;
 
@@ -54,6 +52,46 @@ class DFRN
 	const REPLY = 1;		// Regular reply that is stored locally
 	const REPLY_RC = 2;	// Reply that will be relayed
 
+	/**
+	 * @brief Generates an array of contact and user for DFRN imports
+	 *
+	 * This array contains not only the receiver but also the sender of the message.
+	 *
+	 * @param integer $cid Contact id
+	 * @param integer $uid User id
+	 *
+	 * @return array importer
+	 */
+	public static function getImporter($cid, $uid = 0)
+	{
+		$condition = ['id' => $cid, 'blocked' => false, 'pending' => false];
+		$contact = DBA::selectFirst('contact', [], $condition);
+		if (!DBA::isResult($contact)) {
+			return [];
+		}
+
+		$contact['cpubkey'] = $contact['pubkey'];
+		$contact['cprvkey'] = $contact['prvkey'];
+		$contact['senderName'] = $contact['name'];
+
+		if ($uid != 0) {
+			$condition = ['uid' => $uid, 'account_expired' => false, 'account_removed' => false];
+			$user = DBA::selectFirst('user', [], $condition);
+			if (!DBA::isResult($user)) {
+				return [];
+			}
+
+			$user['importer_uid'] = $user['uid'];
+			$user['uprvkey'] = $user['prvkey'];
+		} else {
+			$user = ['importer_uid' => 0, 'uprvkey' => '', 'timezone' => 'UTC',
+				'nickname' => '', 'sprvkey' => '', 'spubkey' => '',
+				'page-flags' => 0, 'account-type' => 0, 'prvnets' => 0];
+		}
+
+		return array_merge($contact, $user);
+	}
+
 	/**
 	 * @brief Generates the atom entries for delivery.php
 	 *
@@ -63,7 +101,7 @@ class DFRN
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN entries
-	 * @todo Add type-hints
+	 * @todo Find proper type-hints
 	 */
 	public static function entries($items, $owner)
 	{
@@ -77,11 +115,16 @@ class DFRN
 		}
 
 		foreach ($items as $item) {
+			// These values aren't sent when sending from the queue.
+			/// @todo Check if we can set these values from the queue or if they are needed at all.
+			$item["entry:comment-allow"] = defaults($item, "entry:comment-allow", true);
+			$item["entry:cid"] = defaults($item, "entry:cid", 0);
+
 			$entry = self::entry($doc, "text", $item, $owner, $item["entry:comment-allow"], $item["entry:cid"]);
 			$root->appendChild($entry);
 		}
 
-		return(trim($doc->saveXML()));
+		return trim($doc->saveXML());
 	}
 
 	/**
@@ -120,20 +163,19 @@ class DFRN
 			}
 		}
 
-
-
 		// default permissions - anonymous user
 
-		$sql_extra = " AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' ";
+		$sql_extra = " AND NOT `item`.`private` ";
 
 		$r = q(
 			"SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
 			FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
 			WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
-			dbesc($owner_nick)
+			DBA::escape($owner_nick)
 		);
 
-		if (! DBM::is_result($r)) {
+		if (! DBA::isResult($r)) {
+			logger(sprintf('No contact found for nickname=%d', $owner_nick), LOGGER_WARNING);
 			killme();
 		}
 
@@ -147,15 +189,15 @@ class DFRN
 			$sql_extra = '';
 			switch ($direction) {
 				case (-1):
-					$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
+					$sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id));
 					$my_id = $dfrn_id;
 					break;
 				case 0:
-					$sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+					$sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
 					$my_id = '1:' . $dfrn_id;
 					break;
 				case 1:
-					$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+					$sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
 					$my_id = '0:' . $dfrn_id;
 					break;
 				default:
@@ -168,34 +210,21 @@ class DFRN
 				intval($owner_id)
 			);
 
-			if (! DBM::is_result($r)) {
+			if (! DBA::isResult($r)) {
+				logger(sprintf('No contact found for uid=%d', $owner_id), LOGGER_WARNING);
 				killme();
 			}
 
 			$contact = $r[0];
 			include_once 'include/security.php';
-			$groups = Group::getIdsByContactId($contact['id']);
 
-			if (count($groups)) {
-				for ($x = 0; $x < count($groups); $x ++)
-					$groups[$x] = '<' . intval($groups[$x]) . '>' ;
-				$gs = implode('|', $groups);
+			$set = PermissionSet::get($owner_id, $contact['id']);
+
+			if (!empty($set)) {
+				$sql_extra = " AND `item`.`psid` IN (" . implode(',', $set) .")";
 			} else {
-				$gs = '<<>>' ; // Impossible to match
+				$sql_extra = " AND NOT `item`.`private`";
 			}
-
-			$sql_extra = sprintf(
-				"
-				AND ( `allow_cid` = '' OR     `allow_cid` REGEXP '<%d>' )
-				AND ( `deny_cid`  = '' OR NOT `deny_cid`  REGEXP '<%d>' )
-				AND ( `allow_gid` = '' OR     `allow_gid` REGEXP '%s' )
-				AND ( `deny_gid`  = '' OR NOT `deny_gid`  REGEXP '%s')
-			",
-				intval($contact['id']),
-				intval($contact['id']),
-				dbesc($gs),
-				dbesc($gs)
-			);
 		}
 
 		if ($public_feed) {
@@ -211,7 +240,7 @@ class DFRN
 		if (isset($category)) {
 			$sql_post_table = sprintf(
 				"INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
-				dbesc(protect_sprintf($category)),
+				DBA::escape(protect_sprintf($category)),
 				intval(TERM_OBJ_POST),
 				intval(TERM_CATEGORY),
 				intval($owner_id)
@@ -219,40 +248,41 @@ class DFRN
 			//$sql_extra .= file_tag_file_query('item',$category,'category');
 		}
 
-		if ($public_feed) {
-			if (! $converse) {
-				$sql_extra .= " AND `contact`.`self` = 1 ";
-			}
+		if ($public_feed && ! $converse) {
+			$sql_extra .= " AND `contact`.`self` = 1 ";
 		}
 
 		$check_date = DateTimeFormat::utc($last_update);
 
 		$r = q(
-			"SELECT `item`.*, `item`.`id` AS `item_id`,
-			`contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
-			`contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
-			`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-			`sign`.`signed_text`, `sign`.`signature`, `sign`.`signer`
+			"SELECT `item`.`id`
 			FROM `item` USE INDEX (`uid_wall_changed`) $sql_post_table
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-			LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
-			WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0
-			AND `item`.`wall` AND `item`.`changed` > '%s'
+			WHERE `item`.`uid` = %d AND `item`.`wall` AND `item`.`changed` > '%s'
 			$sql_extra
 			ORDER BY `item`.`parent` ".$sort.", `item`.`created` ASC LIMIT 0, 300",
 			intval($owner_id),
-			dbesc($check_date),
-			dbesc($sort)
+			DBA::escape($check_date),
+			DBA::escape($sort)
 		);
 
+		$ids = [];
+		foreach ($r as $item) {
+			$ids[] = $item['id'];
+		}
+
+		if (!empty($ids)) {
+			$ret = Item::select(Item::DELIVER_FIELDLIST, ['id' => $ids]);
+			$items = Item::inArray($ret);
+		} else {
+			$items = [];
+		}
+
 		/*
 		 * Will check further below if this actually returned results.
 		 * We will provide an empty feed if that is the case.
 		 */
 
-		$items = $r;
-
 		$doc = new DOMDocument('1.0', 'utf-8');
 		$doc->formatOutput = true;
 
@@ -273,7 +303,7 @@ class DFRN
 		/// @TODO This hook can't work anymore
 		//	Addon::callHooks('atom_feed', $atom);
 
-		if (!DBM::is_result($items) || $onlyheader) {
+		if (!DBA::isResult($items) || $onlyheader) {
 			$atom = trim($doc->saveXML());
 
 			Addon::callHooks('atom_feed_end', $atom);
@@ -283,7 +313,7 @@ class DFRN
 
 		foreach ($items as $item) {
 			// prevent private email from leaking.
-			if ($item['network'] == NETWORK_MAIL) {
+			if ($item['network'] == Protocol::MAIL) {
 				continue;
 			}
 
@@ -321,33 +351,18 @@ class DFRN
 	public static function itemFeed($item_id, $conversation = false)
 	{
 		if ($conversation) {
-			$condition = '`item`.`parent`';
+			$condition = ['parent' => $item_id];
 		} else {
-			$condition = '`item`.`id`';
+			$condition = ['id' => $item_id];
 		}
 
-		$r = q(
-			"SELECT `item`.*, `item`.`id` AS `item_id`,
-			`contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
-			`contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
-			`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
-			`sign`.`signed_text`, `sign`.`signature`, `sign`.`signer`
-			FROM `item`
-			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
-			LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
-			WHERE %s = %d AND `item`.`visible` AND NOT `item`.`moderated` AND `item`.`parent` != 0
-			AND NOT `item`.`private`",
-			$condition,
-			intval($item_id)
-		);
-
-		if (!DBM::is_result($r)) {
+		$ret = Item::select(Item::DELIVER_FIELDLIST, $condition);
+		$items = Item::inArray($ret);
+		if (!DBA::isResult($items)) {
 			killme();
 		}
 
-		$items = $r;
-		$item = $r[0];
+		$item = $items[0];
 
 		if ($item['uid'] != 0) {
 			$owner = User::getOwnerDataById($item['uid']);
@@ -397,7 +412,7 @@ class DFRN
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN mail
-	 * @todo Add type-hints
+	 * @todo Find proper type-hints
 	 */
 	public static function mail($item, $owner)
 	{
@@ -423,7 +438,7 @@ class DFRN
 
 		$root->appendChild($mail);
 
-		return(trim($doc->saveXML()));
+		return trim($doc->saveXML());
 	}
 
 	/**
@@ -433,7 +448,7 @@ class DFRN
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN suggestions
-	 * @todo Add type-hints
+	 * @todo Find proper type-hints
 	 */
 	public static function fsuggest($item, $owner)
 	{
@@ -452,7 +467,7 @@ class DFRN
 
 		$root->appendChild($suggest);
 
-		return(trim($doc->saveXML()));
+		return trim($doc->saveXML());
 	}
 
 	/**
@@ -462,7 +477,7 @@ class DFRN
 	 * @param int   $uid   User ID
 	 *
 	 * @return string DFRN relocations
-	 * @todo Add type-hints
+	 * @todo Find proper type-hints
 	 */
 	public static function relocate($owner, $uid)
 	{
@@ -487,7 +502,6 @@ class DFRN
 			$photos[$p['scale']] = System::baseUrl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
 		}
 
-		unset($rp, $ext);
 
 		$doc = new DOMDocument('1.0', 'utf-8');
 		$doc->formatOutput = true;
@@ -511,7 +525,7 @@ class DFRN
 
 		$root->appendChild($relocate);
 
-		return(trim($doc->saveXML()));
+		return trim($doc->saveXML());
 	}
 
 	/**
@@ -524,7 +538,7 @@ class DFRN
 	 * @param bool   $public        Is it a header for public posts?
 	 *
 	 * @return object XML root object
-	 * @todo Add type-hints
+	 * @todo Find proper type-hints
 	 */
 	private static function addHeader($doc, $owner, $authorelement, $alternatelink = "", $public = false)
 	{
@@ -574,14 +588,14 @@ class DFRN
 		}
 
 		// For backward compatibility we keep this element
-		if ($owner['page-flags'] == PAGE_COMMUNITY) {
+		if ($owner['page-flags'] == Contact::PAGE_COMMUNITY) {
 			XML::addElement($doc, $root, "dfrn:community", 1);
 		}
 
 		// The former element is replaced by this one
 		XML::addElement($doc, $root, "dfrn:account_type", $owner["account-type"]);
 
-		/// @todo We need a way to transmit the different page flags like "PAGE_PRVGROUP"
+		/// @todo We need a way to transmit the different page flags like "Contact::PAGE_PRVGROUP"
 
 		XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
 
@@ -600,7 +614,7 @@ class DFRN
 	 * @param boolean $public        boolean
 	 *
 	 * @return object XML author object
-	 * @todo Add type-hints
+	 * @todo Find proper type-hints
 	 */
 	private static function addAuthor($doc, $owner, $authorelement, $public)
 	{
@@ -610,7 +624,7 @@ class DFRN
 				WHERE (`hidewall` OR NOT `net-publish`) AND `user`.`uid` = %d",
 			intval($owner['uid'])
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$hidewall = true;
 		} else {
 			$hidewall = false;
@@ -669,7 +683,7 @@ class DFRN
 				WHERE `profile`.`is-default` AND NOT `user`.`hidewall` AND `user`.`uid` = %d",
 			intval($owner['uid'])
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$profile = $r[0];
 
 			XML::addElement($doc, $author, "poco:displayName", $profile["name"]);
@@ -744,7 +758,7 @@ class DFRN
 	 * @param array  $item        Item elements
 	 *
 	 * @return object XML author object
-	 * @todo Add type-hints
+	 * @todo Find proper type-hints
 	 */
 	private static function addEntryAuthor($doc, $element, $contact_url, $item)
 	{
@@ -785,7 +799,7 @@ class DFRN
 	 * @param string $activity activity value
 	 *
 	 * @return object XML activity object
-	 * @todo Add type-hints
+	 * @todo Find proper type-hints
 	 */
 	private static function createActivity($doc, $element, $activity)
 	{
@@ -796,12 +810,15 @@ class DFRN
 			if (!$r) {
 				return false;
 			}
+
 			if ($r->type) {
 				XML::addElement($doc, $entry, "activity:object-type", $r->type);
 			}
+
 			if ($r->id) {
 				XML::addElement($doc, $entry, "id", $r->id);
 			}
+
 			if ($r->title) {
 				XML::addElement($doc, $entry, "title", $r->title);
 			}
@@ -848,7 +865,7 @@ class DFRN
 	 * @param array  $item Item element
 	 *
 	 * @return object XML attachment object
-	 * @todo Add type-hints
+	 * @todo Find proper type-hints
 	 */
 	private static function getAttachment($doc, $root, $item)
 	{
@@ -888,9 +905,9 @@ class DFRN
 	 * @param bool   $single  If set, the entry is created as an XML document with a single "entry" element
 	 *
 	 * @return object XML entry object
-	 * @todo Add type-hints
+	 * @todo Find proper type-hints
 	 */
-	private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false)
+	private static function entry($doc, $type, array $item, array $owner, $comment = false, $cid = 0, $single = false)
 	{
 		$mentioned = [];
 
@@ -920,7 +937,7 @@ class DFRN
 			$entry->setAttribute("xmlns:statusnet", NAMESPACE_STATUSNET);
 		}
 
-		if ($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
+		if ($item['private']) {
 			$body = Item::fixPrivatePhotos($item['body'], $owner['uid'], $item, $cid);
 		} else {
 			$body = $item['body'];
@@ -934,7 +951,7 @@ class DFRN
 			$htmlbody = $body;
 
 			if ($item['title'] != "") {
-				$htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
+				$htmlbody = "[b]" . $item['title'] . "[/b]\n\n" . $htmlbody;
 			}
 
 			$htmlbody = BBCode::convert($htmlbody, false, 7);
@@ -948,10 +965,10 @@ class DFRN
 
 		if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
 			$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
-			$parent = q("SELECT `guid`,`plink` FROM `item` WHERE `uri` = '%s' AND `uid` = %d", dbesc($parent_item), intval($item['uid']));
+			$parent = Item::selectFirst(['guid', 'plink'], ['uri' => $parent_item, 'uid' => $item['uid']]);
 			$attributes = ["ref" => $parent_item, "type" => "text/html",
-						"href" => $parent[0]['plink'],
-						"dfrn:diaspora_guid" => $parent[0]['guid']];
+						"href" => $parent['plink'],
+						"dfrn:diaspora_guid" => $parent['guid']];
 			XML::addElement($doc, $entry, "thr:in-reply-to", "", $attributes);
 		}
 
@@ -960,13 +977,13 @@ class DFRN
 		$conversation_uri = $conversation_href;
 
 		if (isset($parent_item)) {
-			$r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $item['parent-uri']);
-			if (DBM::is_result($r)) {
-				if ($r['conversation-uri'] != '') {
-					$conversation_uri = $r['conversation-uri'];
+			$conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $item['parent-uri']]);
+			if (DBA::isResult($conversation)) {
+				if ($conversation['conversation-uri'] != '') {
+					$conversation_uri = $conversation['conversation-uri'];
 				}
-				if ($r['conversation-href'] != '') {
-					$conversation_href = $r['conversation-href'];
+				if ($conversation['conversation-href'] != '') {
+					$conversation_href = $conversation['conversation-href'];
 				}
 			}
 		}
@@ -1014,15 +1031,15 @@ class DFRN
 			XML::addElement($doc, $entry, "georss:point", $item['coord']);
 		}
 
-		if (($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
-			XML::addElement($doc, $entry, "dfrn:private", (($item['private']) ? $item['private'] : 1));
+		if ($item['private']) {
+			XML::addElement($doc, $entry, "dfrn:private", ($item['private'] ? $item['private'] : 1));
 		}
 
 		if ($item['extid']) {
 			XML::addElement($doc, $entry, "dfrn:extid", $item['extid']);
 		}
 
-		if ($item['bookmark']) {
+		if ($item['post-type'] == Item::PT_PAGE) {
 			XML::addElement($doc, $entry, "dfrn:bookmark", "true");
 		}
 
@@ -1061,6 +1078,7 @@ class DFRN
 
 		$tags = Item::getFeedTags($item);
 
+		/// @TODO Combine this with similar below if() block?
 		if (count($tags)) {
 			foreach ($tags as $t) {
 				if (($type != 'html') || ($t[0] != "@")) {
@@ -1078,13 +1096,10 @@ class DFRN
 		}
 
 		foreach ($mentioned as $mention) {
-			$r = q(
-				"SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
-				intval($owner["uid"]),
-				dbesc(normalise_link($mention))
-			);
+			$condition = ['uid' => $owner["uid"], 'nurl' => normalise_link($mention)];
+			$contact = DBA::selectFirst('contact', ['forum', 'prv'], $condition);
 
-			if (DBM::is_result($r) && ($r[0]["forum"] || $r[0]["prv"])) {
+			if (DBA::isResult($contact) && ($contact["forum"] || $contact["prv"])) {
 				XML::addElement(
 					$doc,
 					$entry,
@@ -1149,15 +1164,17 @@ 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
-		$ret = self::transmit($owner, $contact, $atom);
-		if ($ret >= 200) {
-			logger('Delivery via Diaspora transport layer was successful with status ' . $ret);
-			return $ret;
+		if (!$dissolve && !$legacy_transport) {
+			$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']);
@@ -1196,7 +1213,7 @@ class DFRN
 
 		$ret = Network::curl($url);
 
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 			Contact::markForArchival($contact);
 			return -2; // timed out
 		}
@@ -1225,9 +1242,16 @@ class DFRN
 
 		$res = XML::parseString($xml);
 
-		if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {
+		if (!is_object($res) || (intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {
 			Contact::markForArchival($contact);
-			return ($res->status ? $res->status : 3);
+
+			if (empty($res->status)) {
+				$status = 3;
+			} else {
+				$status = $res->status;
+			}
+
+			return $status;
 		}
 
 		$postvars     = [];
@@ -1236,32 +1260,29 @@ class DFRN
 		$perm         = (($res->perm) ? $res->perm : null);
 		$dfrn_version = (float) (($res->dfrn_version) ? $res->dfrn_version : 2.0);
 		$rino_remote_version = intval($res->rino);
-		$page         = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0);
+		$page         = (($owner['page-flags'] == Contact::PAGE_COMMUNITY) ? 1 : 0);
 
 		logger("Remote rino version: ".$rino_remote_version." for ".$contact["url"], LOGGER_DEBUG);
 
-		if ($owner['page-flags'] == PAGE_PRVGROUP) {
+		if ($owner['page-flags'] == Contact::PAGE_PRVGROUP) {
 			$page = 2;
 		}
 
 		$final_dfrn_id = '';
 
 		if ($perm) {
-			if ((($perm == 'rw') && (! intval($contact['writable'])))
-				|| (($perm == 'r') && (intval($contact['writable'])))
+			if ((($perm == 'rw') && !intval($contact['writable']))
+				|| (($perm == 'r') && intval($contact['writable']))
 			) {
-				q(
-					"update contact set writable = %d where id = %d",
-					intval(($perm == 'rw') ? 1 : 0),
-					intval($contact['id'])
-				);
+				DBA::update('contact', ['writable' => ($perm == 'rw')], ['id' => $contact['id']]);
+
 				$contact['writable'] = (string) 1 - intval($contact['writable']);
 			}
 		}
 
 		if (($contact['duplex'] && strlen($contact['pubkey']))
-			|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
-			|| ($contact['rel'] == CONTACT_IS_SHARING && 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']);
@@ -1289,8 +1310,7 @@ class DFRN
 			$postvars['dissolve'] = '1';
 		}
 
-
-		if ((($contact['rel']) && ($contact['rel'] != CONTACT_IS_SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
+		if ((($contact['rel']) && ($contact['rel'] != Contact::SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == Contact::PAGE_COMMUNITY)) {
 			$postvars['data'] = $atom;
 			$postvars['perm'] = 'rw';
 		} else {
@@ -1313,6 +1333,7 @@ class DFRN
 					$key = openssl_random_pseudo_bytes(16);
 					$data = self::aesEncrypt($postvars['data'], $key);
 					break;
+
 				default:
 					logger("rino: invalid requested version '$rino_remote_version'");
 					Contact::markForArchival($contact);
@@ -1324,15 +1345,15 @@ class DFRN
 
 			if ($dfrn_version >= 2.1) {
 				if (($contact['duplex'] && strlen($contact['pubkey']))
-					|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
-					|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))
+					|| ($owner['page-flags'] == Contact::PAGE_COMMUNITY && strlen($contact['pubkey']))
+					|| ($contact['rel'] == Contact::SHARING && strlen($contact['pubkey']))
 				) {
 					openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']);
 				} else {
 					openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']);
 				}
 			} else {
-				if (($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
+				if (($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == Contact::PAGE_COMMUNITY)) {
 					openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']);
 				} else {
 					openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']);
@@ -1409,7 +1430,7 @@ class DFRN
 			if (empty($contact['addr'])) {
 				logger('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.');
 				if (Contact::updateFromProbe($contact['id'])) {
-					$new_contact = dba::selectFirst('contact', ['addr'], ['id' => $contact['id']]);
+					$new_contact = DBA::selectFirst('contact', ['addr'], ['id' => $contact['id']]);
 					$contact['addr'] = $new_contact['addr'];
 				}
 
@@ -1496,15 +1517,9 @@ class DFRN
 	private static function birthdayEvent($contact, $birthday)
 	{
 		// Check for duplicates
-		$r = q(
-			"SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
-			intval($contact['uid']),
-			intval($contact['id']),
-			dbesc(DateTimeFormat::utc($birthday)),
-			dbesc('birthday')
-		);
-
-		if (DBM::is_result($r)) {
+		$condition = ['uid' => $contact['uid'], 'cid' => $contact['id'],
+			'start' => DateTimeFormat::utc($birthday), 'type' => 'birthday'];
+		if (DBA::exists('event', $condition)) {
 			return;
 		}
 
@@ -1518,13 +1533,13 @@ class DFRN
 			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
 			intval($contact['uid']),
 			intval($contact['id']),
-			dbesc(DateTimeFormat::utcNow()),
-			dbesc(DateTimeFormat::utcNow()),
-			dbesc(DateTimeFormat::utc($birthday)),
-			dbesc(DateTimeFormat::utc($birthday . ' + 1 day ')),
-			dbesc($bdtext),
-			dbesc($bdtext2),
-			dbesc('birthday')
+			DBA::escape(DateTimeFormat::utcNow()),
+			DBA::escape(DateTimeFormat::utcNow()),
+			DBA::escape(DateTimeFormat::utc($birthday)),
+			DBA::escape(DateTimeFormat::utc($birthday . ' + 1 day ')),
+			DBA::escape($bdtext),
+			DBA::escape($bdtext2),
+			DBA::escape('birthday')
 		);
 	}
 
@@ -1544,18 +1559,16 @@ class DFRN
 	private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "")
 	{
 		$author = [];
-		$author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
-		$author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue;
+		$author["name"] = XML::getFirstNodeValue($xpath, $element."/atom:name/text()", $context);
+		$author["link"] = XML::getFirstNodeValue($xpath, $element."/atom:uri/text()", $context);
 
-		$contact_old = dba::fetch_first("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `avatar`, `name-date`, `uri-date`, `addr`,
-				`name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden`, `contact-type`
-				FROM `contact` WHERE `uid` = ? AND `nurl` = ? AND `network` != ?",
-			$importer["importer_uid"],
-			normalise_link($author["link"]),
-			NETWORK_STATUSNET
-		);
+		$fields = ['id', 'uid', 'url', 'network', 'avatar-date', 'avatar', 'name-date', 'uri-date', 'addr',
+			'name', 'nick', 'about', 'location', 'keywords', 'xmpp', 'bdyear', 'bd', 'hidden', 'contact-type'];
+		$condition = ["`uid` = ? AND `nurl` = ? AND `network` != ?",
+			$importer["importer_uid"], normalise_link($author["link"]), Protocol::STATUSNET];
+		$contact_old = DBA::selectFirst('contact', $fields, $condition);
 
-		if (DBM::is_result($contact_old)) {
+		if (DBA::isResult($contact_old)) {
 			$author["contact-id"] = $contact_old["id"];
 			$author["network"] = $contact_old["network"];
 		} else {
@@ -1563,6 +1576,7 @@ class DFRN
 				logger("Contact ".$author["link"]." wasn't found for user ".$importer["importer_uid"]." XML: ".$xml, LOGGER_DEBUG);
 			}
 
+			$author["contact-unknown"] = true;
 			$author["contact-id"] = $importer["id"];
 			$author["network"] = $importer["network"];
 			$onlyfetch = true;
@@ -1571,12 +1585,12 @@ class DFRN
 		// Until now we aren't serving different sizes - but maybe later
 		$avatarlist = [];
 		/// @todo check if "avatar" or "photo" would be the best field in the specification
-		$avatars = $xpath->query($element."/atom:link[@rel='avatar']", $context);
+		$avatars = $xpath->query($element . "/atom:link[@rel='avatar']", $context);
 		foreach ($avatars as $avatar) {
 			$href = "";
 			$width = 0;
 			foreach ($avatar->attributes as $attributes) {
-				/// @TODO Rewrite these similar if () to one switch
+				/// @TODO Rewrite these similar if() to one switch
 				if ($attributes->name == "href") {
 					$href = $attributes->textContent;
 				}
@@ -1591,12 +1605,27 @@ class DFRN
 				$avatarlist[$width] = $href;
 			}
 		}
+
 		if (count($avatarlist) > 0) {
 			krsort($avatarlist);
 			$author["avatar"] = current($avatarlist);
 		}
 
-		if (DBM::is_result($contact_old) && !$onlyfetch) {
+		if (empty($author['avatar']) && !empty($author['link'])) {
+			$cid = Contact::getIdForURL($author['link'], 0);
+			if (!empty($cid)) {
+				$contact = DBA::selectFirst('contact', ['avatar'], ['id' => $cid]);
+				if (DBA::isResult($contact)) {
+					$author['avatar'] = $contact['avatar'];
+				}
+			}
+		}
+
+		if (empty($author['avatar'])) {
+			logger('Empty author: ' . $xml);
+		}
+
+		if (DBA::isResult($contact_old) && !$onlyfetch) {
 			logger("Check if contact details for contact " . $contact_old["id"] . " (" . $contact_old["nick"] . ") have to be updated.", LOGGER_DEBUG);
 
 			$poco = ["url" => $contact_old["url"]];
@@ -1617,33 +1646,33 @@ class DFRN
 			}
 
 			// Update contact data
-			$value = $xpath->evaluate($element . "/dfrn:handle/text()", $context)->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, $element . "/dfrn:handle/text()", $context);
 			if ($value != "") {
 				$poco["addr"] = $value;
 			}
 
-			$value = $xpath->evaluate($element . "/poco:displayName/text()", $context)->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, $element . "/poco:displayName/text()", $context);
 			if ($value != "") {
 				$poco["name"] = $value;
 			}
 
-			$value = $xpath->evaluate($element . "/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, $element . "/poco:preferredUsername/text()", $context);
 			if ($value != "") {
 				$poco["nick"] = $value;
 			}
 
-			$value = $xpath->evaluate($element . "/poco:note/text()", $context)->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, $element . "/poco:note/text()", $context);
 			if ($value != "") {
 				$poco["about"] = $value;
 			}
 
-			$value = $xpath->evaluate($element . "/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, $element . "/poco:address/poco:formatted/text()", $context);
 			if ($value != "") {
 				$poco["location"] = $value;
 			}
 
 			/// @todo Only search for elements with "poco:type" = "xmpp"
-			$value = $xpath->evaluate($element . "/poco:ims/poco:value/text()", $context)->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, $element . "/poco:ims/poco:value/text()", $context);
 			if ($value != "") {
 				$poco["xmpp"] = $value;
 			}
@@ -1656,7 +1685,7 @@ class DFRN
 			/// - poco:country
 
 			// If the "hide" element is present then the profile isn't searchable.
-			$hide = intval($xpath->evaluate($element . "/dfrn:hide/text()", $context)->item(0)->nodeValue == "true");
+			$hide = intval(XML::getFirstNodeValue($xpath, $element . "/dfrn:hide/text()", $context) == "true");
 
 			logger("Hidden status for contact " . $contact_old["url"] . ": " . $hide, LOGGER_DEBUG);
 
@@ -1678,7 +1707,7 @@ class DFRN
 			}
 
 			// "dfrn:birthday" contains the birthday converted to UTC
-			$birthday = $xpath->evaluate($element . "/dfrn:birthday/text()", $context)->item(0)->nodeValue;
+			$birthday = XML::getFirstNodeValue($xpath, $element . "/poco:birthday/text()", $context);
 
 			if (strtotime($birthday) > time()) {
 				$bd_timestamp = strtotime($birthday);
@@ -1687,7 +1716,7 @@ class DFRN
 			}
 
 			// "poco:birthday" is the birthday in the format "yyyy-mm-dd"
-			$value = $xpath->evaluate($element . "/poco:birthday/text()", $context)->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, $element . "/poco:birthday/text()", $context);
 
 			if (!in_array($value, ["", "0000-00-00", "0001-01-01"])) {
 				$bdyear = date("Y");
@@ -1725,6 +1754,10 @@ class DFRN
 			// Update check for this field has to be done differently
 			$datefields = ["name-date", "uri-date"];
 			foreach ($datefields as $field) {
+				// The date fields arrives as '2018-07-17T10:44:45Z' - the database return '2018-07-17 10:44:45'
+				// The fields have to be in the same format to be comparable, since strtotime does add timezones.
+				$contact[$field] = DateTimeFormat::utc($contact[$field]);
+
 				if (strtotime($contact[$field]) > strtotime($contact_old[$field])) {
 					logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $contact_old[$field] . "'", LOGGER_DEBUG);
 					$update = true;
@@ -1746,11 +1779,11 @@ class DFRN
 					`addr` = '%s', `keywords` = '%s', `bdyear` = '%s', `bd` = '%s', `hidden` = %d,
 					`xmpp` = '%s', `name-date`  = '%s', `uri-date` = '%s'
 					WHERE `id` = %d AND `network` = '%s'",
-					dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]),	dbesc($contact["location"]),
-					dbesc($contact["addr"]), dbesc($contact["keywords"]), dbesc($contact["bdyear"]),
-					dbesc($contact["bd"]), intval($contact["hidden"]), dbesc($contact["xmpp"]),
-					dbesc(DBM::date($contact["name-date"])), dbesc(DBM::date($contact["uri-date"])),
-					intval($contact["id"]),	dbesc($contact["network"])
+					DBA::escape($contact["name"]), DBA::escape($contact["nick"]), DBA::escape($contact["about"]),	DBA::escape($contact["location"]),
+					DBA::escape($contact["addr"]), DBA::escape($contact["keywords"]), DBA::escape($contact["bdyear"]),
+					DBA::escape($contact["bd"]), intval($contact["hidden"]), DBA::escape($contact["xmpp"]),
+					DBA::escape(DateTimeFormat::utc($contact["name-date"])), DBA::escape(DateTimeFormat::utc($contact["uri-date"])),
+					intval($contact["id"]),	DBA::escape($contact["network"])
 				);
 			}
 
@@ -1863,7 +1896,9 @@ class DFRN
 		$msg["seen"] = 0;
 		$msg["replied"] = 0;
 
-		dba::insert('mail', $msg);
+		DBA::insert('mail', $msg);
+
+		$msg["id"] = DBA::lastInsertId();
 
 		// send notifications.
 		/// @TODO Arange this mess
@@ -1914,13 +1949,6 @@ class DFRN
 
 		// Does our member already have a friend matching this description?
 
-		$r = q(
-			"SELECT `id` FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
-			dbesc($suggest["name"]),
-			dbesc(normalise_link($suggest["url"])),
-			intval($suggest["uid"])
-		);
-
 		/*
 		 * The valid result means the friend we're about to send a friend
 		 * suggestion already has them in their contact, which means no further
@@ -1928,62 +1956,51 @@ class DFRN
 		 *
 		 * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
 		 */
-		if (DBM::is_result($r)) {
+		$condition = ['name' => $suggest["name"], 'nurl' => normalise_link($suggest["url"]),
+			'uid' => $suggest["uid"]];
+		if (DBA::exists('contact', $condition)) {
 			return false;
 		}
 
 		// Do we already have an fcontact record for this person?
 
 		$fid = 0;
-		$r = q(
-			"SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
-			dbesc($suggest["url"]),
-			dbesc($suggest["name"]),
-			dbesc($suggest["request"])
-		);
-		if (DBM::is_result($r)) {
-			$fid = $r[0]["id"];
+		$condition = ['url' => $suggest["url"], 'name' => $suggest["name"], 'request' => $suggest["request"]];
+		$fcontact = DBA::selectFirst('fcontact', ['id'], $condition);
+		if (DBA::isResult($fcontact)) {
+			$fid = $fcontact["id"];
 
-			// OK, we do. Do we already have an introduction for this person ?
-			$r = q(
-				"SELECT `id` FROM `intro` WHERE `uid` = %d AND `fid` = %d LIMIT 1",
-				intval($suggest["uid"]),
-				intval($fid)
-			);
-
-			/*
-			 * The valid result means the friend we're about to send a friend
-			 * suggestion already has them in their contact, which means no further
-			 * action is required.
-			 *
-			 * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
-			 */
-			if (DBM::is_result($r)) {
+			// OK, we do. Do we already have an introduction for this person?
+			if (DBA::exists('intro', ['uid' => $suggest["uid"], 'fid' => $fid])) {
+				/*
+				 * The valid result means the friend we're about to send a friend
+				 * suggestion already has them in their contact, which means no further
+				 * action is required.
+				 *
+				 * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
+				 */
 				return false;
 			}
 		}
 		if (!$fid) {
 			$r = q(
 				"INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
-				dbesc($suggest["name"]),
-				dbesc($suggest["url"]),
-				dbesc($suggest["photo"]),
-				dbesc($suggest["request"])
+				DBA::escape($suggest["name"]),
+				DBA::escape($suggest["url"]),
+				DBA::escape($suggest["photo"]),
+				DBA::escape($suggest["request"])
 			);
 		}
-		$r = q(
-			"SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
-			dbesc($suggest["url"]),
-			dbesc($suggest["name"]),
-			dbesc($suggest["request"])
-		);
+
+		$condition = ['url' => $suggest["url"], 'name' => $suggest["name"], 'request' => $suggest["request"]];
+		$fcontact = DBA::selectFirst('fcontact', ['id'], $condition);
 
 		/*
 		 * If no record in fcontact is found, below INSERT statement will not
 		 * link an introduction to it.
 		 */
-		if (!DBM::is_result($r)) {
-			// database record did not get created. Quietly give up.
+		if (!DBA::isResult($fcontact)) {
+			// Database record did not get created. Quietly give up.
 			killme();
 		}
 
@@ -1997,9 +2014,9 @@ class DFRN
 			intval($suggest["uid"]),
 			intval($fid),
 			intval($suggest["cid"]),
-			dbesc($suggest["body"]),
-			dbesc($hash),
-			dbesc(DateTimeFormat::utcNow()),
+			DBA::escape($suggest["body"]),
+			DBA::escape($hash),
+			DBA::escape(DateTimeFormat::utcNow()),
 			intval(0)
 		);
 
@@ -2063,12 +2080,12 @@ class DFRN
 
 		// update contact
 		$r = q(
-			"SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;",
+			"SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d",
 			intval($importer["id"]),
 			intval($importer["importer_uid"])
 		);
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			logger("Query failed to execute, no result returned in " . __FUNCTION__);
 			return false;
 		}
@@ -2082,7 +2099,7 @@ class DFRN
 			'url' => $relocate["url"], 'nurl' => normalise_link($relocate["url"]),
 			'addr' => $relocate["addr"], 'connect' => $relocate["addr"],
 			'notify' => $relocate["notify"], 'server_url' => $relocate["server_url"]];
-		dba::update('gcontact', $fields, ['nurl' => normalise_link($old["url"])]);
+		DBA::update('gcontact', $fields, ['nurl' => normalise_link($old["url"])]);
 
 		// Update the contact table. We try to find every entry.
 		$fields = ['name' => $relocate["name"], 'avatar' => $relocate["avatar"],
@@ -2091,19 +2108,13 @@ class DFRN
 			'confirm' => $relocate["confirm"], 'notify' => $relocate["notify"],
 			'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]];
 		$condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])];
-		dba::update('contact', $fields, $condition);
+
+		DBA::update('contact', $fields, $condition);
 
 		Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
 
 		logger('Contacts are updated.');
 
-		// update items
-		// This is an extreme performance killer
-		Item::update(['owner-link' => $relocate["url"]], ['owner-link' => $old["url"], 'uid' => $importer["importer_uid"]]);
-		Item::update(['author-link' => $relocate["url"]], ['author-link' => $old["url"], 'uid' => $importer["importer_uid"]]);
-
-		logger('Items are updated.');
-
 		/// @TODO
 		/// merge with current record, current contents have priority
 		/// update record, set url-updated
@@ -2158,7 +2169,7 @@ class DFRN
 		if ($item["parent-uri"] != $item["uri"]) {
 			$community = false;
 
-			if ($importer["page-flags"] == PAGE_COMMUNITY || $importer["page-flags"] == PAGE_PRVGROUP) {
+			if ($importer["page-flags"] == Contact::PAGE_COMMUNITY || $importer["page-flags"] == Contact::PAGE_PRVGROUP) {
 				$sql_extra = "";
 				$community = true;
 				logger("possible community action");
@@ -2171,13 +2182,8 @@ class DFRN
 
 			$is_a_remote_action = false;
 
-			$r = q(
-				"SELECT `item`.`parent-uri` FROM `item`
-				WHERE `item`.`uri` = '%s'
-				LIMIT 1",
-				dbesc($item["parent-uri"])
-			);
-			if (DBM::is_result($r)) {
+			$parent = Item::selectFirst(['parent-uri'], ['uri' => $item["parent-uri"]]);
+			if (DBA::isResult($parent)) {
 				$r = q(
 					"SELECT `item`.`forum_mode`, `item`.`wall` FROM `item`
 					INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -2185,12 +2191,12 @@ class DFRN
 					AND `item`.`uid` = %d
 					$sql_extra
 					LIMIT 1",
-					dbesc($r[0]["parent-uri"]),
-					dbesc($r[0]["parent-uri"]),
-					dbesc($r[0]["parent-uri"]),
+					DBA::escape($parent["parent-uri"]),
+					DBA::escape($parent["parent-uri"]),
+					DBA::escape($parent["parent-uri"]),
 					intval($importer["importer_uid"])
 				);
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					$is_a_remote_action = true;
 				}
 			}
@@ -2247,6 +2253,13 @@ 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(
 					[
@@ -2258,10 +2271,9 @@ class DFRN
 					"uid"          => $importer["importer_uid"],
 					"item"         => $item,
 					"link"         => System::baseUrl()."/display/".urlencode(Item::getGuidById($posted_id)),
-					"source_name"  => stripslashes($item["author-name"]),
-					"source_link"  => $item["author-link"],
-					"source_photo" => ((link_compare($item["author-link"], $importer["url"]))
-						? $importer["thumb"] : $item["author-avatar"]),
+					"source_name"  => $author["name"],
+					"source_link"  => $author["url"],
+					"source_photo" => $author["thumb"],
 					"verb"         => $item["verb"],
 					"otype"        => "person",
 					"activity"     => $verb,
@@ -2323,29 +2335,18 @@ class DFRN
 				|| ($item["verb"] == ACTIVITY_ATTENDMAYBE)
 			) {
 				$is_like = true;
-				$item["type"] = "activity";
-				$item["gravity"] = GRAVITY_LIKE;
+				$item["gravity"] = GRAVITY_ACTIVITY;
 				// only one like or dislike per person
 				// splitted into two queries for performance issues
-				$r = q(
-					"SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `parent-uri` = '%s' AND NOT `deleted` LIMIT 1",
-					intval($item["uid"]),
-					dbesc($item["author-link"]),
-					dbesc($item["verb"]),
-					dbesc($item["parent-uri"])
-				);
-				if (DBM::is_result($r)) {
+				$condition = ['uid' => $item["uid"], 'author-id' => $item["author-id"], 'gravity' => GRAVITY_ACTIVITY,
+					'verb' => $item["verb"], 'parent-uri' => $item["parent-uri"]];
+				if (Item::exists($condition)) {
 					return false;
 				}
 
-				$r = q(
-					"SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1",
-					intval($item["uid"]),
-					dbesc($item["author-link"]),
-					dbesc($item["verb"]),
-					dbesc($item["parent-uri"])
-				);
-				if (DBM::is_result($r)) {
+				$condition = ['uid' => $item["uid"], 'author-id' => $item["author-id"], 'gravity' => GRAVITY_ACTIVITY,
+					'verb' => $item["verb"], 'thr-parent' => $item["parent-uri"]];
+				if (Item::exists($condition)) {
 					return false;
 				}
 			} else {
@@ -2357,22 +2358,18 @@ class DFRN
 				$xt = XML::parseString($item["target"], false);
 
 				if ($xt->type == ACTIVITY_OBJ_NOTE) {
-					$r = q(
-						"SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-						dbesc($xt->id),
-						intval($importer["importer_uid"])
-					);
+					$item_tag = Item::selectFirst(['id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
 
-					if (!DBM::is_result($r)) {
+					if (!DBA::isResult($item_tag)) {
 						logger("Query failed to execute, no result returned in " . __FUNCTION__);
 						return false;
 					}
 
 					// extract tag, if not duplicate, add to parent item
 					if ($xo->content) {
-						if (!stristr($r[0]["tag"], trim($xo->content))) {
-							$tag = $r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
-							Item::update(['tag' => $tag], ['id' => $r[0]["id"]]);
+						if (!stristr($item_tag["tag"], trim($xo->content))) {
+							$tag = $item_tag["tag"] . (strlen($item_tag["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
+							Item::update(['tag' => $tag], ['id' => $item_tag["id"]]);
 						}
 					}
 				}
@@ -2413,8 +2410,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]';
@@ -2441,44 +2441,47 @@ class DFRN
 
 		$item = $header;
 
-		$item["protocol"] = PROTOCOL_DFRN;
+		$item["protocol"] = Conversation::PARCEL_DFRN;
 
 		$item["source"] = $xml;
 
 		// Get the uri
-		$item["uri"] = $xpath->query("atom:id/text()", $entry)->item(0)->nodeValue;
+		$item["uri"] = XML::getFirstNodeValue($xpath, "atom:id/text()", $entry);
 
-		$item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue;
+		$item["edited"] = XML::getFirstNodeValue($xpath, "atom:updated/text()", $entry);
 
-		$current = dba::selectFirst('item',
-			['id', 'uid', 'edited', 'body'],
+		$current = Item::selectFirst(['id', 'uid', 'edited', 'body'],
 			['uri' => $item["uri"], 'uid' => $importer["importer_uid"]]
 		);
 		// Is there an existing item?
-		if (DBM::is_result($current) && !self::isEditedTimestampNewer($current, $item)) {
+		if (DBA::isResult($current) && !self::isEditedTimestampNewer($current, $item)) {
 			logger("Item ".$item["uri"]." (".$item['edited'].") already existed.", LOGGER_DEBUG);
 			return;
 		}
 
 		// Fetch the owner
-		$owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", true);
+		$owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", true, $xml);
+
+		$owner_unknown = (isset($owner["contact-unknown"]) && $owner["contact-unknown"]);
 
 		$item["owner-name"] = $owner["name"];
 		$item["owner-link"] = $owner["link"];
 		$item["owner-avatar"] = $owner["avatar"];
+		$item["owner-id"] = Contact::getIdForURL($owner["link"], 0);
 
 		// fetch the author
-		$author = self::fetchauthor($xpath, $entry, $importer, "atom:author", true);
+		$author = self::fetchauthor($xpath, $entry, $importer, "atom:author", true, $xml);
 
 		$item["author-name"] = $author["name"];
 		$item["author-link"] = $author["link"];
 		$item["author-avatar"] = $author["avatar"];
+		$item["author-id"] = Contact::getIdForURL($author["link"], 0);
 
-		$item["title"] = $xpath->query("atom:title/text()", $entry)->item(0)->nodeValue;
+		$item["title"] = XML::getFirstNodeValue($xpath, "atom:title/text()", $entry);
 
-		$item["created"] = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
+		$item["created"] = XML::getFirstNodeValue($xpath, "atom:published/text()", $entry);
 
-		$item["body"] = $xpath->query("dfrn:env/text()", $entry)->item(0)->nodeValue;
+		$item["body"] = XML::getFirstNodeValue($xpath, "dfrn:env/text()", $entry);
 		$item["body"] = str_replace([' ',"\t","\r","\n"], ['','','',''], $item["body"]);
 		// make sure nobody is trying to sneak some html tags by us
 		$item["body"] = notags(base64url_decode($item["body"]));
@@ -2511,19 +2514,16 @@ class DFRN
 		// We don't need the content element since "dfrn:env" is always present
 		//$item["body"] = $xpath->query("atom:content/text()", $entry)->item(0)->nodeValue;
 
-		$item["location"] = $xpath->query("dfrn:location/text()", $entry)->item(0)->nodeValue;
+		$item["location"] = XML::getFirstNodeValue($xpath, "dfrn:location/text()", $entry);
 
-		$georsspoint = $xpath->query("georss:point", $entry);
-		if ($georsspoint) {
-			$item["coord"] = $georsspoint->item(0)->nodeValue;
-		}
+		$item["coord"] = XML::getFirstNodeValue($xpath, "georss:point", $entry);
 
-		$item["private"] = $xpath->query("dfrn:private/text()", $entry)->item(0)->nodeValue;
+		$item["private"] = XML::getFirstNodeValue($xpath, "dfrn:private/text()", $entry);
 
-		$item["extid"] = $xpath->query("dfrn:extid/text()", $entry)->item(0)->nodeValue;
+		$item["extid"] = XML::getFirstNodeValue($xpath, "dfrn:extid/text()", $entry);
 
-		if ($xpath->query("dfrn:bookmark/text()", $entry)->item(0)->nodeValue == "true") {
-			$item["bookmark"] = true;
+		if (XML::getFirstNodeValue($xpath, "dfrn:bookmark/text()", $entry) == "true") {
+			$item["post-type"] = Item::PT_PAGE;
 		}
 
 		$notice_info = $xpath->query("statusnet:notice_info", $entry);
@@ -2535,18 +2535,18 @@ class DFRN
 			}
 		}
 
-		$item["guid"] = $xpath->query("dfrn:diaspora_guid/text()", $entry)->item(0)->nodeValue;
+		$item["guid"] = XML::getFirstNodeValue($xpath, "dfrn:diaspora_guid/text()", $entry);
 
 		// We store the data from "dfrn:diaspora_signature" in a different table, this is done in "Item::insert"
-		$dsprsig = unxmlify($xpath->query("dfrn:diaspora_signature/text()", $entry)->item(0)->nodeValue);
+		$dsprsig = unxmlify(XML::getFirstNodeValue($xpath, "dfrn:diaspora_signature/text()", $entry));
 		if ($dsprsig != "") {
 			$item["dsprsig"] = $dsprsig;
 		}
 
-		$item["verb"] = $xpath->query("activity:verb/text()", $entry)->item(0)->nodeValue;
+		$item["verb"] = XML::getFirstNodeValue($xpath, "activity:verb/text()", $entry);
 
-		if ($xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue != "") {
-			$item["object-type"] = $xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue;
+		if (XML::getFirstNodeValue($xpath, "activity:object-type/text()", $entry) != "") {
+			$item["object-type"] = XML::getFirstNodeValue($xpath, "activity:object-type/text()", $entry);
 		}
 
 		$object = $xpath->query("activity:object", $entry)->item(0);
@@ -2583,8 +2583,10 @@ class DFRN
 						$termhash = array_shift($parts);
 						$termurl = implode(":", $parts);
 
-						if (strlen($item["tag"])) {
+						if (!empty($item["tag"])) {
 							$item["tag"] .= ",";
+						} else {
+							$item["tag"] = "";
 						}
 
 						$item["tag"] .= $termhash . "[url=" . $termurl . "]" . $term . "[/url]";
@@ -2600,7 +2602,7 @@ class DFRN
 			self::parseLinks($links, $item);
 		}
 
-		$item['conversation-uri'] = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue;
+		$item['conversation-uri'] = XML::getFirstNodeValue($xpath, 'ostatus:conversation/text()', $entry);
 
 		$conv = $xpath->query('ostatus:conversation', $entry);
 		if (is_object($conv->item(0))) {
@@ -2653,7 +2655,6 @@ class DFRN
 		}
 
 		if ($entrytype == DFRN::REPLY_RC) {
-			$item["type"] = "remote-comment";
 			$item["wall"] = 1;
 		} elseif ($entrytype == DFRN::TOP_LEVEL) {
 			if (!isset($item["object-type"])) {
@@ -2661,7 +2662,7 @@ class DFRN
 			}
 
 			// Is it an event?
-			if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
+			if (($item["object-type"] == ACTIVITY_OBJ_EVENT) && !$owner_unknown) {
 				logger("Item ".$item["uri"]." seems to contain an event.", LOGGER_DEBUG);
 				$ev = Event::fromBBCode($item["body"]);
 				if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
@@ -2672,14 +2673,12 @@ class DFRN
 					$ev["edited"]  = $item["edited"];
 					$ev["private"] = $item["private"];
 					$ev["guid"]    = $item["guid"];
+					$ev["plink"]   = $item["plink"];
 
-					$r = q(
-						"SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
-						dbesc($item["uri"]),
-						intval($importer["importer_uid"])
-					);
-					if (DBM::is_result($r)) {
-						$ev["id"] = $r[0]["id"];
+					$condition = ['uri' => $item["uri"], 'uid' => $importer["importer_uid"]];
+					$event = DBA::selectFirst('event', ['id'], $condition);
+					if (DBA::isResult($event)) {
+						$ev["id"] = $event["id"];
 					}
 
 					$event_id = Event::store($ev);
@@ -2694,12 +2693,19 @@ class DFRN
 			return;
 		}
 
+		// This check is done here to be able to receive connection requests in "processVerbs"
+		if (($entrytype == DFRN::TOP_LEVEL) && $owner_unknown) {
+			logger("Item won't be stored because user " . $importer["importer_uid"] . " doesn't follow " . $item["owner-link"] . ".", LOGGER_DEBUG);
+			return;
+		}
+
+
 		// Update content if 'updated' changes
-		if (DBM::is_result($current)) {
+		if (DBA::isResult($current)) {
 			if (self::updateContent($current, $item, $importer, $entrytype)) {
 				logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
 			} else {
-				logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
+				logger("Item " . $item["uri"] . " already existed.", LOGGER_DEBUG);
 			}
 			return;
 		}
@@ -2730,12 +2736,11 @@ class DFRN
 				 * but we're going to unconditionally correct it here so that the post will always be owned by our contact.
 				 */
 				logger('Correcting item owner.', LOGGER_DEBUG);
-				$item["owner-name"]   = $importer["senderName"];
-				$item["owner-link"]   = $importer["url"];
-				$item["owner-avatar"] = $importer["thumb"];
+				$item["owner-link"] = $importer["url"];
+				$item["owner-id"] = Contact::getIdForURL($importer["url"], 0);
 			}
 
-			if (($importer["rel"] == CONTACT_IS_FOLLOWER) && (!self::tgroupCheck($importer["importer_uid"], $item))) {
+			if (($importer["rel"] == Contact::FOLLOWER) && (!self::tgroupCheck($importer["importer_uid"], $item))) {
 				logger("Contact ".$importer["id"]." is only follower and tgroup check was negative.", LOGGER_DEBUG);
 				return;
 			}
@@ -2775,6 +2780,7 @@ class DFRN
 	{
 		logger("Processing deletions");
 		$uri = null;
+
 		foreach ($deletion->attributes as $attributes) {
 			if ($attributes->name == "ref") {
 				$uri = $attributes->textContent;
@@ -2785,13 +2791,18 @@ class DFRN
 			return false;
 		}
 
-		$condition = ["`uri` = ? AND `uid` = ? AND NOT `file` LIKE '%[%'", $uri, $importer["importer_uid"]];
-		$item = dba::selectFirst('item', ['id', 'parent', 'contact-id'], $condition);
-		if (!DBM::is_result($item)) {
+		$condition = ['uri' => $uri, 'uid' => $importer["importer_uid"]];
+		$item = Item::selectFirst(['id', 'parent', 'contact-id', 'file', 'deleted'], $condition);
+		if (!DBA::isResult($item)) {
 			logger("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found.", LOGGER_DEBUG);
 			return;
 		}
 
+		if (strstr($item['file'], '[')) {
+			logger("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " is filed. So it won't be deleted.", LOGGER_DEBUG);
+			return;
+		}
+
 		// When it is a starting post it has to belong to the person that wants to delete it
 		if (($item['id'] == $item['parent']) && ($item['contact-id'] != $importer["id"])) {
 			logger("Item with uri " . $uri . " don't belong to contact " . $importer["id"] . " - ignoring deletion.", LOGGER_DEBUG);
@@ -2801,7 +2812,7 @@ class DFRN
 		// Comments can be deleted by the thread owner or comment owner
 		if (($item['id'] != $item['parent']) && ($item['contact-id'] != $importer["id"])) {
 			$condition = ['id' => $item['parent'], 'contact-id' => $importer["id"]];
-			if (!dba::exists('item', $condition)) {
+			if (!Item::exists($condition)) {
 				logger("Item with uri " . $uri . " wasn't found or mustn't be deleted by contact " . $importer["id"] . " - ignoring deletion.", LOGGER_DEBUG);
 				return;
 			}
@@ -2848,8 +2859,7 @@ class DFRN
 
 		$header = [];
 		$header["uid"] = $importer["importer_uid"];
-		$header["network"] = NETWORK_DFRN;
-		$header["type"] = "remote";
+		$header["network"] = Protocol::DFRN;
 		$header["wall"] = 0;
 		$header["origin"] = 0;
 		$header["contact-id"] = $importer["id"];
@@ -2869,23 +2879,23 @@ class DFRN
 		logger("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
 
 		// is it a public forum? Private forums aren't exposed with this method
-		$forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()")->item(0)->nodeValue);
+		$forum = intval(XML::getFirstNodeValue($xpath, "/atom:feed/dfrn:community/text()"));
 
 		// The account type is new since 3.5.1
 		if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) {
-			$accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()")->item(0)->nodeValue);
+			$accounttype = intval(XML::getFirstNodeValue($xpath, "/atom:feed/dfrn:account_type/text()"));
 
 			if ($accounttype != $importer["contact-type"]) {
-				dba::update('contact', ['contact-type' => $accounttype], ['id' => $importer["id"]]);
+				DBA::update('contact', ['contact-type' => $accounttype], ['id' => $importer["id"]]);
 			}
 			// A forum contact can either have set "forum" or "prv" - but not both
-			if (($accounttype == ACCOUNT_TYPE_COMMUNITY) && (($forum != $importer["forum"]) || ($forum == $importer["prv"]))) {
+			if (($accounttype == Contact::ACCOUNT_TYPE_COMMUNITY) && (($forum != $importer["forum"]) || ($forum == $importer["prv"]))) {
 				$condition = ['(`forum` != ? OR `prv` != ?) AND `id` = ?', $forum, !$forum, $importer["id"]];
-				dba::update('contact', ['forum' => $forum, 'prv' => !$forum], $condition);
+				DBA::update('contact', ['forum' => $forum, 'prv' => !$forum], $condition);
 			}
 		} elseif ($forum != $importer["forum"]) { // Deprecated since 3.5.1
 			$condition = ['`forum` != ? AND `id` = ?', $forum, $importer["id"]];
-			dba::update('contact', ['forum' => $forum], $condition);
+			DBA::update('contact', ['forum' => $forum], $condition);
 		}
 
 
@@ -2921,7 +2931,7 @@ class DFRN
 			$newentries = [];
 			$entries = $xpath->query("/atom:feed/atom:entry");
 			foreach ($entries as $entry) {
-				$created = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
+				$created = XML::getFirstNodeValue($xpath, "atom:published/text()", $entry);
 				$newentries[strtotime($created)] = $entry;
 			}
 
@@ -2971,23 +2981,23 @@ class DFRN
 			/// @todo Why is there a query for "url" *and* "nurl"? Especially this normalising is strange.
 			$r = q("SELECT `id` FROM `contact` WHERE `uid` = (SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1)
 					AND `nick` = '%s' AND NOT `self` AND (`url` LIKE '%%%s%%' OR `nurl` LIKE '%%%s%%') AND NOT `blocked` AND NOT `pending` LIMIT 1",
-				dbesc($contact_nick),
-				dbesc($a->user['nickname']),
-				dbesc($baseurl),
-				dbesc($nurl)
+				DBA::escape($contact_nick),
+				DBA::escape($a->user['nickname']),
+				DBA::escape($baseurl),
+				DBA::escape($nurl)
 			);
-			if ((! DBM::is_result($r)) || $r[0]['id'] == remote_user()) {
+			if ((! DBA::isResult($r)) || $r[0]['id'] == remote_user()) {
 				return;
 			}
 
 			$r = q("SELECT * FROM contact WHERE nick = '%s'
 					AND network = '%s' AND uid = %d  AND url LIKE '%%%s%%' LIMIT 1",
-				dbesc($contact_nick),
-				dbesc(NETWORK_DFRN),
+				DBA::escape($contact_nick),
+				DBA::escape(Protocol::DFRN),
 				intval(local_user()),
-				dbesc($baseurl)
+				DBA::escape($baseurl)
 			);
-			if (! DBM::is_result($r)) {
+			if (! DBA::isResult($r)) {
 				return;
 			}
 
@@ -3013,7 +3023,7 @@ class DFRN
 
 			$sec = random_string();
 
-			dba::insert('profile_check', ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id, 'sec' => $sec, 'expire' => time() + 45]);
+			DBA::insert('profile_check', ['uid' => local_user(), 'cid' => $cid, 'dfrn_id' => $dfrn_id, 'sec' => $sec, 'expire' => time() + 45]);
 
 			$url = curPageURL();
 
@@ -3051,23 +3061,21 @@ class DFRN
 			return false;
 		}
 
-		$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
-			intval($uid)
-		);
-		if (!DBM::is_result($u)) {
+		$user = DBA::selectFirst('user', ['page-flags', 'nickname'], ['uid' => $uid]);
+		if (!DBA::isResult($user)) {
 			return false;
 		}
 
-		$community_page = ($u[0]['page-flags'] == PAGE_COMMUNITY);
-		$prvgroup = ($u[0]['page-flags'] == PAGE_PRVGROUP);
+		$community_page = ($user['page-flags'] == Contact::PAGE_COMMUNITY);
+		$prvgroup = ($user['page-flags'] == Contact::PAGE_PRVGROUP);
 
-		$link = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
+		$link = normalise_link(System::baseUrl() . '/profile/' . $user['nickname']);
 
 		/*
 		 * Diaspora uses their own hardwired link URL in @-tags
 		 * instead of the one we supply with webfinger
 		 */
-		$dlink = normalise_link(System::baseUrl() . '/u/' . $u[0]['nickname']);
+		$dlink = normalise_link(System::baseUrl() . '/u/' . $user['nickname']);
 
 		$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER);
 		if ($cnt) {
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 2bb846134..27cfdccd8 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -16,10 +16,12 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
@@ -29,10 +31,9 @@ use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Map;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
-use Friendica\Util\Map;
-use dba;
 use SimpleXMLElement;
 
 require_once 'include/dba.php';
@@ -54,13 +55,14 @@ class Diaspora
 	 *
 	 * @return array of relay servers
 	 */
-	public static function relayList($item_id, $contacts = [])
+	public static function relayList($item_id, array $contacts = [])
 	{
 		$serverlist = [];
 
 		// Fetching relay servers
 		$serverdata = Config::get("system", "relay_server");
-		if ($serverdata != "") {
+
+		if (!empty($serverdata)) {
 			$servers = explode(",", $serverdata);
 			foreach ($servers as $server) {
 				$serverlist[$server] = trim($server);
@@ -69,38 +71,38 @@ class Diaspora
 
 		if (Config::get("system", "relay_directly", false)) {
 			// We distribute our stuff based on the parent to ensure that the thread will be complete
-			$parent = dba::selectFirst('item', ['parent'], ['id' => $item_id]);
-			if (!DBM::is_result($parent)) {
+			$parent = Item::selectFirst(['parent'], ['id' => $item_id]);
+			if (!DBA::isResult($parent)) {
 				return;
 			}
 
 			// Servers that want to get all content
-			$servers = dba::select('gserver', ['url'], ['relay-subscribe' => true, 'relay-scope' => 'all']);
-			while ($server = dba::fetch($servers)) {
+			$servers = DBA::select('gserver', ['url'], ['relay-subscribe' => true, 'relay-scope' => 'all']);
+			while ($server = DBA::fetch($servers)) {
 				$serverlist[$server['url']] = $server['url'];
 			}
 
 			// All tags of the current post
 			$condition = ['otype' => TERM_OBJ_POST, 'type' => TERM_HASHTAG, 'oid' => $parent['parent']];
-			$tags = dba::select('term', ['term'], $condition);
+			$tags = DBA::select('term', ['term'], $condition);
 			$taglist = [];
-			while ($tag = dba::fetch($tags)) {
+			while ($tag = DBA::fetch($tags)) {
 				$taglist[] = $tag['term'];
 			}
 
 			// All servers who wants content with this tag
 			$tagserverlist = [];
 			if (!empty($taglist)) {
-				$tagserver = dba::select('gserver-tag', ['gserver-id'], ['tag' => $taglist]);
-				while ($server = dba::fetch($tagserver)) {
+				$tagserver = DBA::select('gserver-tag', ['gserver-id'], ['tag' => $taglist]);
+				while ($server = DBA::fetch($tagserver)) {
 					$tagserverlist[] = $server['gserver-id'];
 				}
 			}
 
 			// All adresses with the given id
 			if (!empty($tagserverlist)) {
-				$servers = dba::select('gserver', ['url'], ['relay-subscribe' => true, 'relay-scope' => 'tags', 'id' => $tagserverlist]);
-				while ($server = dba::fetch($servers)) {
+				$servers = DBA::select('gserver', ['url'], ['relay-subscribe' => true, 'relay-scope' => 'tags', 'id' => $tagserverlist]);
+				while ($server = DBA::fetch($servers)) {
 					$serverlist[$server['url']] = $server['url'];
 				}
 			}
@@ -144,10 +146,10 @@ class Diaspora
 
 		// Fetch the relay contact
 		$condition = ['uid' => 0, 'nurl' => normalise_link($server_url),
-			'contact-type' => ACCOUNT_TYPE_RELAY];
-		$contact = dba::selectFirst('contact', $fields, $condition);
+			'contact-type' => Contact::ACCOUNT_TYPE_RELAY];
+		$contact = DBA::selectFirst('contact', $fields, $condition);
 
-		if (DBM::is_result($contact)) {
+		if (DBA::isResult($contact)) {
 			if ($contact['archive'] || $contact['blocked']) {
 				return false;
 			}
@@ -155,8 +157,8 @@ class Diaspora
 		} else {
 			self::setRelayContact($server_url);
 
-			$contact = dba::selectFirst('contact', $fields, $condition);
-			if (DBM::is_result($contact)) {
+			$contact = DBA::selectFirst('contact', $fields, $condition);
+			if (DBA::isResult($contact)) {
 				return $contact;
 			}
 		}
@@ -171,25 +173,25 @@ class Diaspora
 	 * @param string $server_url The url of the server
 	 * @param array $network_fields Optional network specific fields
 	 */
-	public static function setRelayContact($server_url, $network_fields = [])
+	public static function setRelayContact($server_url, array $network_fields = [])
 	{
 		$fields = ['created' => DateTimeFormat::utcNow(),
 			'name' => 'relay', 'nick' => 'relay',
-			'url' => $server_url, 'network' => NETWORK_DIASPORA,
+			'url' => $server_url, 'network' => Protocol::DIASPORA,
 			'batch' => $server_url . '/receive/public',
-			'rel' => CONTACT_IS_FOLLOWER, 'blocked' => false,
+			'rel' => Contact::FOLLOWER, 'blocked' => false,
 			'pending' => false, 'writable' => true];
 
 		$fields = array_merge($fields, $network_fields);
 
 		$condition = ['uid' => 0, 'nurl' => normalise_link($server_url),
-			'contact-type' => ACCOUNT_TYPE_RELAY];
+			'contact-type' => Contact::ACCOUNT_TYPE_RELAY];
 
-		if (dba::exists('contact', $condition)) {
+		if (DBA::exists('contact', $condition)) {
 			unset($fields['created']);
 		}
 
-		dba::update('contact', $fields, $condition, true);
+		DBA::update('contact', $fields, $condition, true);
 	}
 
 	/**
@@ -204,15 +206,15 @@ class Diaspora
 	 *
 	 * @return array of relay servers
 	 */
-	public static function participantsForThread($thread, $contacts)
+	public static function participantsForThread($thread, array $contacts)
 	{
-		$r = dba::p("SELECT `contact`.`batch`, `contact`.`id`, `contact`.`name`, `contact`.`network`,
+		$r = DBA::p("SELECT `contact`.`batch`, `contact`.`id`, `contact`.`name`, `contact`.`network`,
 				`fcontact`.`batch` AS `fbatch`, `fcontact`.`network` AS `fnetwork` FROM `participation`
 				INNER JOIN `contact` ON `contact`.`id` = `participation`.`cid`
 				INNER JOIN `fcontact` ON `fcontact`.`id` = `participation`.`fid`
 				WHERE `participation`.`iid` = ?", $thread);
 
-		while ($contact = dba::fetch($r)) {
+		while ($contact = DBA::fetch($r)) {
 			if (!empty($contact['fnetwork'])) {
 				$contact['network'] = $contact['fnetwork'];
 			}
@@ -234,7 +236,7 @@ class Diaspora
 				$contacts[] = $contact;
 			}
 		}
-		dba::close($r);
+		DBA::close($r);
 
 		return $contacts;
 	}
@@ -363,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($importer, $raw)
+	public static function decodeRaw(array $importer, $raw, $no_exit = false)
 	{
 		$data = json_decode($raw);
 
@@ -386,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);
@@ -401,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);
@@ -423,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),
@@ -454,7 +477,7 @@ class Diaspora
 	 * 'author' -> author diaspora handle
 	 * 'key' -> author public key (converted to pkcs#8)
 	 */
-	public static function decode($importer, $xml)
+	public static function decode(array $importer, $xml)
 	{
 		$public = false;
 		$basedom = XML::parseString($xml);
@@ -604,7 +627,7 @@ class Diaspora
 			return false;
 		}
 
-		$importer = ["uid" => 0, "page-flags" => PAGE_FREELOVE];
+		$importer = ["uid" => 0, "page-flags" => Contact::PAGE_FREELOVE];
 		$success = self::dispatch($importer, $msg, $fields);
 
 		return $success;
@@ -619,7 +642,7 @@ class Diaspora
 	 *
 	 * @return int The message id of the generated message, "true" or "false" if there was an error
 	 */
-	public static function dispatch($importer, $msg, $fields = null)
+	public static function dispatch(array $importer, $msg, $fields = null)
 	{
 		// The sender is the handle of the contact that sent the message.
 		// This will often be different with relayed messages (for example "like" and "comment")
@@ -898,8 +921,8 @@ class Diaspora
 	{
 		$update = false;
 
-		$person = dba::selectFirst('fcontact', [], ['network' => NETWORK_DIASPORA, 'addr' => $handle]);
-		if (DBM::is_result($person)) {
+		$person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
+		if (DBA::isResult($person)) {
 			logger("In cache " . print_r($person, true), LOGGER_DEBUG);
 
 			// update record occasionally so it doesn't get stale
@@ -913,18 +936,18 @@ class Diaspora
 			}
 		}
 
-		if (!DBM::is_result($person) || $update) {
+		if (!DBA::isResult($person) || $update) {
 			logger("create or refresh", LOGGER_DEBUG);
-			$r = Probe::uri($handle, NETWORK_DIASPORA);
+			$r = Probe::uri($handle, Protocol::DIASPORA);
 
 			// Note that Friendica contacts will return a "Diaspora person"
 			// if Diaspora connectivity is enabled on their server
-			if ($r && ($r["network"] === NETWORK_DIASPORA)) {
+			if ($r && ($r["network"] === Protocol::DIASPORA)) {
 				self::updateFContact($r);
 
 				// Fetch the updated or added contact
-				$person = dba::selectFirst('fcontact', [], ['network' => NETWORK_DIASPORA, 'addr' => $handle]);
-				if (!DBM::is_result($person)) {
+				$person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
+				if (!DBA::isResult($person)) {
 					$person = $r;
 				}
 			}
@@ -950,7 +973,7 @@ class Diaspora
 
 		$condition = ['url' => $arr["url"], 'network' => $arr["network"]];
 
-		dba::update('fcontact', $fields, $condition, true);
+		DBA::update('fcontact', $fields, $condition, true);
 	}
 
 	/**
@@ -968,13 +991,10 @@ class Diaspora
 		logger("contact id is ".$contact_id." - pcontact id is ".$pcontact_id, LOGGER_DEBUG);
 
 		if ($pcontact_id != 0) {
-			$r = q(
-				"SELECT `addr` FROM `contact` WHERE `id` = %d AND `addr` != ''",
-				intval($pcontact_id)
-			);
+			$contact = DBA::selectFirst('contact', ['addr'], ['id' => $pcontact_id]);
 
-			if (DBM::is_result($r)) {
-				return strtolower($r[0]["addr"]);
+			if (DBA::isResult($contact) && !empty($contact["addr"])) {
+				return strtolower($contact["addr"]);
 			}
 		}
 
@@ -983,7 +1003,7 @@ class Diaspora
 			intval($contact_id)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$contact = $r[0];
 
 			logger("contact 'self' = ".$contact['self']." 'url' = ".$contact['url'], LOGGER_DEBUG);
@@ -1016,11 +1036,11 @@ class Diaspora
 
 		$r = q(
 			"SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
-			dbesc(NETWORK_DIASPORA),
-			dbesc($fcontact_guid)
+			DBA::escape(Protocol::DIASPORA),
+			DBA::escape($fcontact_guid)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return $r[0]['url'];
 		}
 
@@ -1039,46 +1059,26 @@ class Diaspora
 	 */
 	private static function contactByHandle($uid, $handle)
 	{
-		// First do a direct search on the contact table
-		$r = q(
-			"SELECT * FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
-			intval($uid),
-			dbesc($handle)
-		);
-
-		if (DBM::is_result($r)) {
-			return $r[0];
-		} else {
-			/*
-			 * We haven't found it?
-			 * We use another function for it that will possibly create a contact entry.
-			 */
-			$cid = Contact::getIdForURL($handle, $uid);
-
-			if ($cid > 0) {
-				/// @TODO Contact retrieval should be encapsulated into an "entity" class like `Contact`
-				$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
-
-				if (DBM::is_result($r)) {
-					return $r[0];
-				}
-			}
+		$cid = Contact::getIdForURL($handle, $uid);
+		if (!$cid) {
+			$handle_parts = explode("@", $handle);
+			$nurl_sql = "%%://" . $handle_parts[1] . "%%/profile/" . $handle_parts[0];
+			$cid = Contact::getIdForURL($nurl_sql, $uid);
 		}
 
-		$handle_parts = explode("@", $handle);
-		$nurl_sql = "%%://".$handle_parts[1]."%%/profile/".$handle_parts[0];
-		$r = q(
-			"SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` LIKE '%s' LIMIT 1",
-			dbesc(NETWORK_DFRN),
-			intval($uid),
-			dbesc($nurl_sql)
-		);
-		if (DBM::is_result($r)) {
-			return $r[0];
+		if (!$cid) {
+			logger("Haven't found a contact for user " . $uid . " and handle " . $handle, LOGGER_DEBUG);
+			return false;
 		}
 
-		logger("Haven't found contact for user ".$uid." and handle ".$handle, LOGGER_DEBUG);
-		return false;
+		$contact = DBA::selectFirst('contact', [], ['id' => $cid]);
+		if (!DBA::isResult($contact)) {
+			// This here shouldn't happen at all
+			logger("Haven't found a contact for user " . $uid . " and handle " . $handle, LOGGER_DEBUG);
+			return false;
+		}
+
+		return $contact;
 	}
 
 	/**
@@ -1090,7 +1090,7 @@ class Diaspora
 	 *
 	 * @return bool is the contact allowed to post?
 	 */
-	private static function postAllow($importer, $contact, $is_comment = false)
+	private static function postAllow(array $importer, array $contact, $is_comment = false)
 	{
 		/*
 		 * Perhaps we were already sharing with this person. Now they're sharing with us.
@@ -1099,14 +1099,14 @@ class Diaspora
 		 */
 		// It is deactivated by now, due to side effects. See issue https://github.com/friendica/friendica/pull/4033
 		// It is not removed by now. Possibly the code is needed?
-		//if (!$is_comment && $contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
-		//	dba::update(
+		//if (!$is_comment && $contact["rel"] == Contact::FOLLOWER && in_array($importer["page-flags"], array(Contact::PAGE_FREELOVE))) {
+		//	DBA::update(
 		//		'contact',
-		//		array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
+		//		array('rel' => Contact::FRIEND, 'writable' => true),
 		//		array('id' => $contact["id"], 'uid' => $contact["uid"])
 		//	);
 		//
-		//	$contact["rel"] = CONTACT_IS_FRIEND;
+		//	$contact["rel"] = Contact::FRIEND;
 		//	logger("defining user ".$contact["nick"]." as friend");
 		//}
 
@@ -1115,11 +1115,11 @@ class Diaspora
 			// Maybe blocked, don't accept.
 			return false;
 			// We are following this person?
-		} elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) {
+		} elseif (($contact["rel"] == Contact::SHARING) || ($contact["rel"] == Contact::FRIEND)) {
 			// Yes, then it is fine.
 			return true;
 			// Is it a post to a community?
-		} elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && in_array($importer["page-flags"], [PAGE_COMMUNITY, PAGE_PRVGROUP])) {
+		} elseif (($contact["rel"] == Contact::FOLLOWER) && in_array($importer["page-flags"], [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP])) {
 			// That's good
 			return true;
 			// Is the message a global user or a comment?
@@ -1140,13 +1140,15 @@ class Diaspora
 	 *
 	 * @return array The contact data
 	 */
-	private static function allowedContactByHandle($importer, $handle, $is_comment = false)
+	private static function allowedContactByHandle(array $importer, $handle, $is_comment = false)
 	{
 		$contact = self::contactByHandle($importer["uid"], $handle);
 		if (!$contact) {
 			logger("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
 			// If a contact isn't found, we accept it anyway if it is a comment
-			if ($is_comment) {
+			if ($is_comment && ($importer["uid"] != 0)) {
+				return self::contactByHandle(0, $handle);
+			} elseif ($is_comment) {
 				return $importer;
 			} else {
 				return false;
@@ -1170,15 +1172,10 @@ class Diaspora
 	 */
 	private static function messageExists($uid, $guid)
 	{
-		$r = q(
-			"SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
-			intval($uid),
-			dbesc($guid)
-		);
-
-		if (DBM::is_result($r)) {
+		$item = Item::selectFirst(['id'], ['uid' => $uid, 'guid' => $guid]);
+		if (DBA::isResult($item)) {
 			logger("message ".$guid." already exists for user ".$uid);
-			return $r[0]["id"];
+			return $item["id"];
 		}
 
 		return false;
@@ -1190,7 +1187,7 @@ class Diaspora
 	 * @param array $item The item array
 	 * @return void
 	 */
-	private static function fetchGuid($item)
+	private static function fetchGuid(array $item)
 	{
 		$expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
 		preg_replace_callback(
@@ -1272,6 +1269,11 @@ class Diaspora
 	private static function storeByGuid($guid, $server, $uid = 0)
 	{
 		$serverparts = parse_url($server);
+
+		if (empty($serverparts["host"]) || empty($serverparts["scheme"])) {
+			return false;
+		}
+
 		$server = $serverparts["scheme"]."://".$serverparts["host"];
 
 		logger("Trying to fetch item ".$guid." from ".$server, LOGGER_DEBUG);
@@ -1354,7 +1356,7 @@ class Diaspora
 		$author = "";
 
 		// Fetch the author - for the old and the new Diaspora version
-		if ($source_xml->post->status_message->diaspora_handle) {
+		if ($source_xml->post->status_message && $source_xml->post->status_message->diaspora_handle) {
 			$author = (string)$source_xml->post->status_message->diaspora_handle;
 		} elseif ($source_xml->author && ($source_xml->getName() == "status_message")) {
 			$author = (string)$source_xml->author;
@@ -1383,45 +1385,36 @@ class Diaspora
 	 *
 	 * @return array the item record
 	 */
-	private static function parentItem($uid, $guid, $author, $contact)
+	private static function parentItem($uid, $guid, $author, array $contact)
 	{
-		$r = q(
-			"SELECT `id`, `parent`, `body`, `wall`, `uri`, `guid`, `private`, `origin`,
-				`author-name`, `author-link`, `author-avatar`,
-				`owner-name`, `owner-link`, `owner-avatar`
-			FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
-			intval($uid),
-			dbesc($guid)
-		);
+		$fields = ['id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin',
+			'author-name', 'author-link', 'author-avatar',
+			'owner-name', 'owner-link', 'owner-avatar'];
+		$condition = ['uid' => $uid, 'guid' => $guid];
+		$item = Item::selectFirst($fields, $condition);
 
-		if (!$r) {
-			$result = self::storeByGuid($guid, $contact["url"], $uid);
+		if (!DBA::isResult($item)) {
+			$person = self::personByHandle($author);
+			$result = self::storeByGuid($guid, $person["url"], $uid);
 
-			if (!$result) {
-				$person = self::personByHandle($author);
-				$result = self::storeByGuid($guid, $person["url"], $uid);
+			// We don't have an url for items that arrived at the public dispatcher
+			if (!$result && !empty($contact["url"])) {
+				$result = self::storeByGuid($guid, $contact["url"], $uid);
 			}
 
 			if ($result) {
 				logger("Fetched missing item ".$guid." - result: ".$result, LOGGER_DEBUG);
 
-				$r = q(
-					"SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
-						`author-name`, `author-link`, `author-avatar`,
-						`owner-name`, `owner-link`, `owner-avatar`
-					FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
-					intval($uid),
-					dbesc($guid)
-				);
+				$item = Item::selectFirst($fields, $condition);
 			}
 		}
 
-		if (!$r) {
+		if (!DBA::isResult($item)) {
 			logger("parent item not found: parent: ".$guid." - user: ".$uid);
 			return false;
 		} else {
 			logger("parent item found: parent: ".$guid." - user: ".$uid);
-			return $r[0];
+			return $item;
 		}
 	}
 
@@ -1439,13 +1432,13 @@ class Diaspora
 	private static function authorContactByUrl($def_contact, $person, $uid)
 	{
 		$condition = ['nurl' => normalise_link($person["url"]), 'uid' => $uid];
-		$contact = dba::selectFirst('contact', ['id', 'network'], $condition);
-		if (DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', ['id', 'network'], $condition);
+		if (DBA::isResult($contact)) {
 			$cid = $contact["id"];
 			$network = $contact["network"];
 		} else {
 			$cid = $def_contact["id"];
-			$network = NETWORK_DIASPORA;
+			$network = Protocol::DIASPORA;
 		}
 
 		return ["cid" => $cid, "network" => $network];
@@ -1485,7 +1478,7 @@ class Diaspora
 			}
 		}
 
-		if ($contact["network"] == NETWORK_DFRN) {
+		if ($contact["network"] == Protocol::DFRN) {
 			return str_replace("/profile/" . $contact["nick"] . "/", "/display/" . $guid, $contact["url"] . "/");
 		}
 
@@ -1508,7 +1501,7 @@ class Diaspora
 	 *
 	 * @return bool Success
 	 */
-	private static function receiveAccountMigration($importer, $data)
+	private static function receiveAccountMigration(array $importer, $data)
 	{
 		$old_handle = notags(unxmlify($data->author));
 		$new_handle = notags(unxmlify($data->profile->author));
@@ -1535,7 +1528,7 @@ class Diaspora
 
 		// change the technical stuff in contact and gcontact
 		$data = Probe::uri($new_handle);
-		if ($data['network'] == NETWORK_PHANTOM) {
+		if ($data['network'] == Protocol::PHANTOM) {
 			logger('Account for '.$new_handle." couldn't be probed.");
 			return false;
 		}
@@ -1546,7 +1539,7 @@ class Diaspora
 				'notify' => $data['notify'], 'poll' => $data['poll'],
 				'network' => $data['network']];
 
-		dba::update('contact', $fields, ['addr' => $old_handle]);
+		DBA::update('contact', $fields, ['addr' => $old_handle]);
 
 		$fields = ['url' => $data['url'], 'nurl' => normalise_link($data['url']),
 				'name' => $data['name'], 'nick' => $data['nick'],
@@ -1554,17 +1547,10 @@ class Diaspora
 				'notify' => $data['notify'], 'photo' => $data['photo'],
 				'server_url' => $data['baseurl'], 'network' => $data['network']];
 
-		dba::update('gcontact', $fields, ['addr' => $old_handle]);
+		DBA::update('gcontact', $fields, ['addr' => $old_handle]);
 
 		logger('Contacts are updated.');
 
-		// update items
-		// This is an extreme performance killer
-		Item::update(['owner-link' => $data["url"]], ['owner-link' => $contact["url"], 'uid' => $importer["uid"]]);
-		Item::update(['author-link' => $data["url"]], ['author-link' => $contact["url"], 'uid' => $importer["uid"]]);
-
-		logger('Items are updated.');
-
 		return true;
 	}
 
@@ -1579,12 +1565,12 @@ class Diaspora
 	{
 		$author = notags(unxmlify($data->author));
 
-		$contacts = dba::select('contact', ['id'], ['addr' => $author]);
-		while ($contact = dba::fetch($contacts)) {
+		$contacts = DBA::select('contact', ['id'], ['addr' => $author]);
+		while ($contact = DBA::fetch($contacts)) {
 			Contact::remove($contact["id"]);
 		}
 
-		dba::delete('gcontact', ['addr' => $author]);
+		DBA::delete('gcontact', ['addr' => $author]);
 
 		logger('Removed contacts for ' . $author);
 
@@ -1602,11 +1588,21 @@ class Diaspora
 	 */
 	private static function getUriFromGuid($author, $guid, $onlyfound = false)
 	{
-		$r = q("SELECT `uri` FROM `item` WHERE `guid` = '%s' LIMIT 1", dbesc($guid));
-		if (DBM::is_result($r)) {
-			return $r[0]["uri"];
+		$item = Item::selectFirst(['uri'], ['guid' => $guid]);
+		if (DBA::isResult($item)) {
+			return $item["uri"];
 		} elseif (!$onlyfound) {
-			return $author.":".$guid;
+			$contact = Contact::getDetailsByAddr($author, 0);
+			if (!empty($contact['network'])) {
+				$prefix = 'urn:X-' . $contact['network'] . ':';
+			} else {
+				// This fallback should happen most unlikely
+				$prefix = 'urn:X-dspr:';
+			}
+
+			$author_parts = explode('@', $author);
+
+			return $prefix . $author_parts[1] . ':' . $author_parts[0] . ':'. $guid;
 		}
 
 		return "";
@@ -1622,9 +1618,9 @@ class Diaspora
 	 */
 	private static function getGuidFromUri($uri, $uid)
 	{
-		$r = q("SELECT `guid` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($uri), intval($uid));
-		if (DBM::is_result($r)) {
-			return $r[0]["guid"];
+		$item = Item::selectFirst(['guid'], ['uri' => $uri, 'uid' => $uid]);
+		if (DBA::isResult($item)) {
+			return $item["guid"];
 		} else {
 			return false;
 		}
@@ -1639,12 +1635,11 @@ class Diaspora
 	 */
 	private static function importerForGuid($guid)
 	{
-		$item = dba::fetch_first("SELECT `uid` FROM `item` WHERE `origin` AND `guid` = ? LIMIT 1", $guid);
-
-		if (DBM::is_result($item)) {
+		$item = Item::selectFirst(['uid'], ['origin' => true, 'guid' => $guid]);
+		if (DBA::isResult($item)) {
 			logger("Found user ".$item['uid']." as owner of item ".$guid, LOGGER_DEBUG);
-			$contact = dba::fetch_first("SELECT * FROM `contact` WHERE `self` AND `uid` = ?", $item['uid']);
-			if (DBM::is_result($contact)) {
+			$contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $item['uid']]);
+			if (DBA::isResult($contact)) {
 				return $contact;
 			}
 		}
@@ -1661,7 +1656,7 @@ class Diaspora
 	 *
 	 * @return int The message id of the generated comment or "false" if there was an error
 	 */
-	private static function receiveComment($importer, $sender, $data, $xml)
+	private static function receiveComment(array $importer, $sender, $data, $xml)
 	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
@@ -1711,18 +1706,15 @@ class Diaspora
 		$datarray["contact-id"] = $author_contact["cid"];
 		$datarray["network"]  = $author_contact["network"];
 
-		$datarray["author-name"] = $person["name"];
 		$datarray["author-link"] = $person["url"];
-		$datarray["author-avatar"] = ((x($person, "thumb")) ? $person["thumb"] : $person["photo"]);
+		$datarray["author-id"] = Contact::getIdForURL($person["url"], 0);
 
-		$datarray["owner-name"] = $contact["name"];
 		$datarray["owner-link"] = $contact["url"];
-		$datarray["owner-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
+		$datarray["owner-id"] = Contact::getIdForURL($contact["url"], 0);
 
 		$datarray["guid"] = $guid;
 		$datarray["uri"] = self::getUriFromGuid($author, $guid);
 
-		$datarray["type"] = "remote-comment";
 		$datarray["verb"] = ACTIVITY_POST;
 		$datarray["gravity"] = GRAVITY_COMMENT;
 
@@ -1734,7 +1726,7 @@ class Diaspora
 
 		$datarray["object-type"] = ACTIVITY_OBJ_COMMENT;
 
-		$datarray["protocol"] = PROTOCOL_DIASPORA;
+		$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
 		$datarray["source"] = $xml;
 
 		$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
@@ -1781,7 +1773,7 @@ class Diaspora
 	 *
 	 * @return bool "true" if it was successful
 	 */
-	private static function receiveConversationMessage($importer, $contact, $data, $msg, $mesg, $conversation)
+	private static function receiveConversationMessage(array $importer, array $contact, $data, $msg, $mesg, $conversation)
 	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
@@ -1812,14 +1804,9 @@ class Diaspora
 
 		$person = self::personByHandle($msg_author);
 
-		dba::lock('mail');
+		DBA::lock('mail');
 
-		$r = q(
-			"SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
-			dbesc($msg_guid),
-			intval($importer["uid"])
-		);
-		if (DBM::is_result($r)) {
+		if (DBA::exists('mail', ['guid' => $msg_guid, 'uid' => $importer["uid"]])) {
 			logger("duplicate message already delivered.", LOGGER_DEBUG);
 			return false;
 		}
@@ -1828,24 +1815,24 @@ class Diaspora
 			"INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
 			VALUES (%d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
 			intval($importer["uid"]),
-			dbesc($msg_guid),
+			DBA::escape($msg_guid),
 			intval($conversation["id"]),
-			dbesc($person["name"]),
-			dbesc($person["photo"]),
-			dbesc($person["url"]),
+			DBA::escape($person["name"]),
+			DBA::escape($person["photo"]),
+			DBA::escape($person["url"]),
 			intval($contact["id"]),
-			dbesc($subject),
-			dbesc($body),
+			DBA::escape($subject),
+			DBA::escape($body),
 			0,
 			0,
-			dbesc($message_uri),
-			dbesc($author.":".$guid),
-			dbesc($msg_created_at)
+			DBA::escape($message_uri),
+			DBA::escape($author.":".$guid),
+			DBA::escape($msg_created_at)
 		);
 
-		dba::unlock();
+		DBA::unlock();
 
-		dba::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
+		DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
 
 		notification(
 			[
@@ -1855,10 +1842,10 @@ class Diaspora
 			"to_name" => $importer["username"],
 			"to_email" => $importer["email"],
 			"uid" =>$importer["uid"],
-			"item" => ["subject" => $subject, "body" => $body],
+			"item" => ["id" => $conversation["id"], "title" => $subject, "subject" => $subject, "body" => $body],
 			"source_name" => $person["name"],
 			"source_link" => $person["url"],
-			"source_photo" => $person["thumb"],
+			"source_photo" => $person["photo"],
 			"verb" => ACTIVITY_POST,
 			"otype" => "mail"]
 		);
@@ -1874,7 +1861,7 @@ class Diaspora
 	 *
 	 * @return bool Success
 	 */
-	private static function receiveConversation($importer, $msg, $data)
+	private static function receiveConversation(array $importer, $msg, $data)
 	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
@@ -1894,37 +1881,21 @@ class Diaspora
 			return false;
 		}
 
-		$conversation = null;
-
-		$c = q(
-			"SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
-			intval($importer["uid"]),
-			dbesc($guid)
-		);
-		if ($c)
-			$conversation = $c[0];
-		else {
+		$conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]);
+		if (!DBA::isResult($conversation)) {
 			$r = q(
 				"INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
 				VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s')",
 				intval($importer["uid"]),
-				dbesc($guid),
-				dbesc($author),
-				dbesc($created_at),
-				dbesc(DateTimeFormat::utcNow()),
-				dbesc($subject),
-				dbesc($participants)
+				DBA::escape($guid),
+				DBA::escape($author),
+				DBA::escape($created_at),
+				DBA::escape(DateTimeFormat::utcNow()),
+				DBA::escape($subject),
+				DBA::escape($participants)
 			);
 			if ($r) {
-				$c = q(
-					"SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
-					intval($importer["uid"]),
-					dbesc($guid)
-				);
-			}
-
-			if ($c) {
-				$conversation = $c[0];
+				$conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]);
 			}
 		}
 		if (!$conversation) {
@@ -1939,50 +1910,6 @@ class Diaspora
 		return true;
 	}
 
-	/**
-	 * @brief Creates the body for a "like" message
-	 *
-	 * @param array  $contact     The contact that send us the "like"
-	 * @param array  $parent_item The item array of the parent item
-	 * @param string $guid        message guid
-	 *
-	 * @return string the body
-	 */
-	private static function constructLikeBody($contact, $parent_item, $guid)
-	{
-		$bodyverb = L10n::t('%1$s likes %2$s\'s %3$s');
-
-		$ulink = "[url=".$contact["url"]."]".$contact["name"]."[/url]";
-		$alink = "[url=".$parent_item["author-link"]."]".$parent_item["author-name"]."[/url]";
-		$plink = "[url=".System::baseUrl()."/display/".urlencode($guid)."]".L10n::t("status")."[/url]";
-
-		return sprintf($bodyverb, $ulink, $alink, $plink);
-	}
-
-	/**
-	 * @brief Creates a XML object for a "like"
-	 *
-	 * @param array $importer    Array of the importer user
-	 * @param array $parent_item The item array of the parent item
-	 *
-	 * @return string The XML
-	 */
-	private static function constructLikeObject($importer, $parent_item)
-	{
-		$objtype = ACTIVITY_OBJ_NOTE;
-		$link = '<link rel="alternate" type="text/html" href="'.System::baseUrl()."/display/".$importer["nickname"]."/".$parent_item["id"].'" />';
-		$parent_body = $parent_item["body"];
-
-		$xmldata = ["object" => ["type" => $objtype,
-						"local" => "1",
-						"id" => $parent_item["uri"],
-						"link" => $link,
-						"title" => "",
-						"content" => $parent_body]];
-
-		return XML::fromArray($xmldata, $xml, true);
-	}
-
 	/**
 	 * @brief Processes "like" messages
 	 *
@@ -1992,7 +1919,7 @@ class Diaspora
 	 *
 	 * @return int The message id of the generated like or "false" if there was an error
 	 */
-	private static function receiveLike($importer, $sender, $data)
+	private static function receiveLike(array $importer, $sender, $data)
 	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
@@ -2040,36 +1967,35 @@ class Diaspora
 
 		$datarray = [];
 
-		$datarray["protocol"] = PROTOCOL_DIASPORA;
+		$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
 
 		$datarray["uid"] = $importer["uid"];
 		$datarray["contact-id"] = $author_contact["cid"];
 		$datarray["network"]  = $author_contact["network"];
 
-		$datarray["author-name"] = $person["name"];
 		$datarray["author-link"] = $person["url"];
-		$datarray["author-avatar"] = ((x($person, "thumb")) ? $person["thumb"] : $person["photo"]);
+		$datarray["author-id"] = Contact::getIdForURL($person["url"], 0);
 
-		$datarray["owner-name"] = $contact["name"];
 		$datarray["owner-link"] = $contact["url"];
-		$datarray["owner-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
+		$datarray["owner-id"] = Contact::getIdForURL($contact["url"], 0);
 
 		$datarray["guid"] = $guid;
 		$datarray["uri"] = self::getUriFromGuid($author, $guid);
 
-		$datarray["type"] = "activity";
 		$datarray["verb"] = $verb;
-		$datarray["gravity"] = GRAVITY_LIKE;
+		$datarray["gravity"] = GRAVITY_ACTIVITY;
 		$datarray["parent-uri"] = $parent_item["uri"];
 
 		$datarray["object-type"] = ACTIVITY_OBJ_NOTE;
-		$datarray["object"] = self::constructLikeObject($importer, $parent_item);
 
-		$datarray["body"] = self::constructLikeBody($contact, $parent_item, $guid);
+		$datarray["body"] = $verb;
+
+		// Diaspora doesn't provide a date for likes
+		$datarray["changed"] = $datarray["created"] = $datarray["edited"] = DateTimeFormat::utcNow();
 
 		// like on comments have the comment as parent. So we need to fetch the toplevel parent
 		if ($parent_item["id"] != $parent_item["parent"]) {
-			$toplevel = dba::selectFirst('item', ['origin'], ['id' => $parent_item["parent"]]);
+			$toplevel = Item::selectFirst(['origin'], ['id' => $parent_item["parent"]]);
 			$origin = $toplevel["origin"];
 		} else {
 			$origin = $parent_item["origin"];
@@ -2105,7 +2031,7 @@ class Diaspora
 	 *
 	 * @return bool Success?
 	 */
-	private static function receiveMessage($importer, $data)
+	private static function receiveMessage(array $importer, $data)
 	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
@@ -2120,14 +2046,10 @@ class Diaspora
 
 		$conversation = null;
 
-		$c = q(
-			"SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
-			intval($importer["uid"]),
-			dbesc($conversation_guid)
-		);
-		if ($c) {
-			$conversation = $c[0];
-		} else {
+		$condition = ['uid' => $importer["uid"], 'guid' => $conversation_guid];
+		$conversation = DBA::selectFirst('conv', [], $condition);
+
+		if (!DBA::isResult($conversation)) {
 			logger("conversation not available.");
 			return false;
 		}
@@ -2144,14 +2066,9 @@ class Diaspora
 
 		$body = self::replacePeopleGuid($body, $person["url"]);
 
-		dba::lock('mail');
+		DBA::lock('mail');
 
-		$r = q(
-			"SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
-			dbesc($guid),
-			intval($importer["uid"])
-		);
-		if (DBM::is_result($r)) {
+		if (DBA::exists('mail', ['guid' => $guid, 'uid' => $importer["uid"]])) {
 			logger("duplicate message already delivered.", LOGGER_DEBUG);
 			return false;
 		}
@@ -2160,24 +2077,24 @@ class Diaspora
 			"INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
 				VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
 			intval($importer["uid"]),
-			dbesc($guid),
+			DBA::escape($guid),
 			intval($conversation["id"]),
-			dbesc($person["name"]),
-			dbesc($person["photo"]),
-			dbesc($person["url"]),
+			DBA::escape($person["name"]),
+			DBA::escape($person["photo"]),
+			DBA::escape($person["url"]),
 			intval($contact["id"]),
-			dbesc($conversation["subject"]),
-			dbesc($body),
+			DBA::escape($conversation["subject"]),
+			DBA::escape($body),
 			0,
 			1,
-			dbesc($message_uri),
-			dbesc($author.":".$conversation["guid"]),
-			dbesc($created_at)
+			DBA::escape($message_uri),
+			DBA::escape($author.":".$conversation["guid"]),
+			DBA::escape($created_at)
 		);
 
-		dba::unlock();
+		DBA::unlock();
 
-		dba::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
+		DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
 		return true;
 	}
 
@@ -2189,7 +2106,7 @@ class Diaspora
 	 *
 	 * @return bool always true
 	 */
-	private static function receiveParticipation($importer, $data)
+	private static function receiveParticipation(array $importer, $data)
 	{
 		$author = strtolower(notags(unxmlify($data->author)));
 		$parent_guid = notags(unxmlify($data->parent_guid));
@@ -2206,8 +2123,8 @@ class Diaspora
 			return false;
 		}
 
-		$item = dba::selectFirst('item', ['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => false]);
-		if (!DBM::is_result($item)) {
+		$item = Item::selectFirst(['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => false]);
+		if (!DBA::isResult($item)) {
 			logger('Item not found, no origin or private: '.$parent_guid);
 			return false;
 		}
@@ -2222,16 +2139,16 @@ class Diaspora
 
 		logger('Received participation for ID: '.$item['id'].' - Contact: '.$contact_id.' - Server: '.$server, LOGGER_DEBUG);
 
-		if (!dba::exists('participation', ['iid' => $item['id'], 'server' => $server])) {
-			dba::insert('participation', ['iid' => $item['id'], 'cid' => $contact_id, 'fid' => $person['id'], 'server' => $server]);
+		if (!DBA::exists('participation', ['iid' => $item['id'], 'server' => $server])) {
+			DBA::insert('participation', ['iid' => $item['id'], 'cid' => $contact_id, 'fid' => $person['id'], 'server' => $server]);
 		}
 
 		// Send all existing comments and likes to the requesting server
-		$comments = dba::p("SELECT `item`.`id`, `item`.`verb`, `contact`.`self`
-				FROM `item`
-				INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-				WHERE `item`.`parent` = ? AND `item`.`id` != `item`.`parent`", $item['id']);
-		while ($comment = dba::fetch($comments)) {
+		$comments = Item::select(['id', 'parent', 'verb', 'self'], ['parent' => $item['id']]);
+		while ($comment = Item::fetch($comments)) {
+			if ($comment['id'] == $comment['parent']) {
+				continue;
+			}
 			if ($comment['verb'] == ACTIVITY_POST) {
 				$cmd = $comment['self'] ? 'comment-new' : 'comment-import';
 			} else {
@@ -2240,7 +2157,7 @@ class Diaspora
 			logger("Send ".$cmd." for item ".$comment['id']." to contact ".$contact_id, LOGGER_DEBUG);
 			Worker::add(PRIORITY_HIGH, 'Delivery', $cmd, $comment['id'], $contact_id);
 		}
-		dba::close($comments);
+		DBA::close($comments);
 
 		return true;
 	}
@@ -2253,7 +2170,7 @@ class Diaspora
 	 *
 	 * @return bool always true
 	 */
-	private static function receivePhoto($importer, $data)
+	private static function receivePhoto(array $importer, $data)
 	{
 		// There doesn't seem to be a reason for this function,
 		// since the photo data is transmitted in the status message as well
@@ -2268,7 +2185,7 @@ class Diaspora
 	 *
 	 * @return bool always true
 	 */
-	private static function receivePollParticipation($importer, $data)
+	private static function receivePollParticipation(array $importer, $data)
 	{
 		// We don't support polls by now
 		return true;
@@ -2282,7 +2199,7 @@ class Diaspora
 	 *
 	 * @return bool Success
 	 */
-	private static function receiveProfile($importer, $data)
+	private static function receiveProfile(array $importer, $data)
 	{
 		$author = strtolower(notags(unxmlify($data->author)));
 
@@ -2351,9 +2268,9 @@ class Diaspora
 			$fields['bd'] = $birthday;
 		}
 
-		dba::update('contact', $fields, ['id' => $contact['id']]);
+		DBA::update('contact', $fields, ['id' => $contact['id']]);
 
-		$gcontact = ["url" => $contact["url"], "network" => NETWORK_DIASPORA, "generation" => 2,
+		$gcontact = ["url" => $contact["url"], "network" => Protocol::DIASPORA, "generation" => 2,
 					"photo" => $image_url, "name" => $name, "location" => $location,
 					"about" => $about, "birthday" => $birthday, "gender" => $gender,
 					"addr" => $author, "nick" => $nick, "keywords" => $keywords,
@@ -2375,14 +2292,14 @@ class Diaspora
 	 * @param array $contact  The contact that send the request
 	 * @return void
 	 */
-	private static function receiveRequestMakeFriend($importer, $contact)
+	private static function receiveRequestMakeFriend(array $importer, array $contact)
 	{
 		$a = get_app();
 
-		if ($contact["rel"] == CONTACT_IS_SHARING) {
-			dba::update(
+		if ($contact["rel"] == Contact::SHARING) {
+			DBA::update(
 				'contact',
-				['rel' => CONTACT_IS_FRIEND, 'writable' => true],
+				['rel' => Contact::FRIEND, 'writable' => true],
 				['id' => $contact["id"], 'uid' => $importer["uid"]]
 			);
 		}
@@ -2396,7 +2313,7 @@ class Diaspora
 	 *
 	 * @return bool Success
 	 */
-	private static function receiveContactRequest($importer, $data)
+	private static function receiveContactRequest(array $importer, $data)
 	{
 		$author = unxmlify($data->author);
 		$recipient = unxmlify($data->recipient);
@@ -2433,11 +2350,11 @@ class Diaspora
 
 				// If we are now friends, we are sending a share message.
 				// Normally we needn't to do so, but the first message could have been vanished.
-				if (in_array($contact["rel"], [CONTACT_IS_FRIEND])) {
-					$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
-					if ($u) {
+				if (in_array($contact["rel"], [Contact::FRIEND])) {
+					$user = DBA::selectFirst('user', [], ['uid' => $importer["uid"]]);
+					if (DBA::isResult($user)) {
 						logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
-						$ret = self::sendShare($u[0], $contact);
+						$ret = self::sendShare($user, $contact);
 					}
 				}
 				return true;
@@ -2448,7 +2365,7 @@ class Diaspora
 			}
 		}
 
-		if (!$following && $sharing && in_array($importer["page-flags"], [PAGE_SOAPBOX, PAGE_NORMAL])) {
+		if (!$following && $sharing && in_array($importer["page-flags"], [Contact::PAGE_SOAPBOX, Contact::PAGE_NORMAL])) {
 			logger("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.", LOGGER_DEBUG);
 			return false;
 		} elseif (!$following && !$sharing) {
@@ -2464,7 +2381,7 @@ class Diaspora
 
 		$ret = self::personByHandle($author);
 
-		if (!$ret || ($ret["network"] != NETWORK_DIASPORA)) {
+		if (!$ret || ($ret["network"] != Protocol::DIASPORA)) {
 			logger("Cannot resolve diaspora handle ".$author." for ".$recipient);
 			return false;
 		}
@@ -2475,18 +2392,18 @@ class Diaspora
 			"INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
 			VALUES (%d, '%s', '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d)",
 			intval($importer["uid"]),
-			dbesc($ret["network"]),
-			dbesc($ret["addr"]),
+			DBA::escape($ret["network"]),
+			DBA::escape($ret["addr"]),
 			DateTimeFormat::utcNow(),
-			dbesc($ret["url"]),
-			dbesc(normalise_link($ret["url"])),
-			dbesc($batch),
-			dbesc($ret["name"]),
-			dbesc($ret["nick"]),
-			dbesc($ret["photo"]),
-			dbesc($ret["pubkey"]),
-			dbesc($ret["notify"]),
-			dbesc($ret["poll"]),
+			DBA::escape($ret["url"]),
+			DBA::escape(normalise_link($ret["url"])),
+			DBA::escape($batch),
+			DBA::escape($ret["name"]),
+			DBA::escape($ret["nick"]),
+			DBA::escape($ret["photo"]),
+			DBA::escape($ret["pubkey"]),
+			DBA::escape($ret["notify"]),
+			DBA::escape($ret["poll"]),
 			1,
 			2
 		);
@@ -2506,7 +2423,7 @@ class Diaspora
 
 		Contact::updateAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
 
-		if (in_array($importer["page-flags"], [PAGE_NORMAL, PAGE_PRVGROUP])) {
+		if (in_array($importer["page-flags"], [Contact::PAGE_NORMAL, Contact::PAGE_PRVGROUP])) {
 			logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
 
 			$hash = random_string().(string)time();   // Generate a confirm_key
@@ -2518,9 +2435,9 @@ class Diaspora
 				intval($contact_record["id"]),
 				0,
 				0,
-				dbesc(L10n::t("Sharing notification from Diaspora network")),
-				dbesc($hash),
-				dbesc(DateTimeFormat::utcNow())
+				DBA::escape(L10n::t("Sharing notification from Diaspora network")),
+				DBA::escape($hash),
+				DBA::escape(DateTimeFormat::utcNow())
 			);
 		} else {
 			// automatic friend approval
@@ -2529,16 +2446,17 @@ class Diaspora
 
 			Contact::updateAvatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
 
-			// technically they are sharing with us (CONTACT_IS_SHARING),
-			// but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
-			// we are going to change the relationship and make them a follower.
-
-			if (($importer["page-flags"] == PAGE_FREELOVE) && $sharing && $following) {
-				$new_relation = CONTACT_IS_FRIEND;
-			} elseif (($importer["page-flags"] == PAGE_FREELOVE) && $sharing) {
-				$new_relation = CONTACT_IS_SHARING;
+			/*
+			 * technically they are sharing with us (Contact::SHARING),
+			 * but if our page-type is Profile::PAGE_COMMUNITY or Profile::PAGE_SOAPBOX
+			 * we are going to change the relationship and make them a follower.
+			 */
+			if (($importer["page-flags"] == Contact::PAGE_FREELOVE) && $sharing && $following) {
+				$new_relation = Contact::FRIEND;
+			} elseif (($importer["page-flags"] == Contact::PAGE_FREELOVE) && $sharing) {
+				$new_relation = Contact::SHARING;
 			} else {
-				$new_relation = CONTACT_IS_FOLLOWER;
+				$new_relation = Contact::FOLLOWER;
 			}
 
 			$r = q(
@@ -2551,15 +2469,15 @@ class Diaspora
 				WHERE `id` = %d
 				",
 				intval($new_relation),
-				dbesc(DateTimeFormat::utcNow()),
-				dbesc(DateTimeFormat::utcNow()),
+				DBA::escape(DateTimeFormat::utcNow()),
+				DBA::escape(DateTimeFormat::utcNow()),
 				intval($contact_record["id"])
 			);
 
-			$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
-			if ($u) {
+			$user = DBA::selectFirst('user', [], ['uid' => $importer["uid"]]);
+			if (DBA::isResult($user)) {
 				logger("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
-				$ret = self::sendShare($u[0], $contact_record);
+				$ret = self::sendShare($user, $contact_record);
 
 				// Send the profile data, maybe it weren't transmitted before
 				self::sendProfile($importer["uid"], [$contact_record]);
@@ -2589,9 +2507,9 @@ class Diaspora
 		$fields = ['body', 'tag', 'app', 'created', 'object-type', 'uri', 'guid',
 			'author-name', 'author-link', 'author-avatar'];
 		$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false];
-		$item = dba::selectfirst('item', $fields, $condition);
+		$item = Item::selectFirst($fields, $condition);
 
-		if (DBM::is_result($item)) {
+		if (DBA::isResult($item)) {
 			logger("reshared message ".$guid." already exists on system.");
 
 			// Maybe it is already a reshared item?
@@ -2613,7 +2531,7 @@ class Diaspora
 			}
 		}
 
-		if (!DBM::is_result($item)) {
+		if (!DBA::isResult($item)) {
 			if (empty($orig_author)) {
 				logger('Empty author for guid ' . $guid . '. Quitting.');
 				return false;
@@ -2633,9 +2551,9 @@ class Diaspora
 				$fields = ['body', 'tag', 'app', 'created', 'object-type', 'uri', 'guid',
 					'author-name', 'author-link', 'author-avatar'];
 				$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false];
-				$item = dba::selectfirst('item', $fields, $condition);
+				$item = Item::selectFirst($fields, $condition);
 
-				if (DBM::is_result($item)) {
+				if (DBA::isResult($item)) {
 					// If it is a reshared post from another network then reformat to avoid display problems with two share elements
 					if (self::isReshare($item["body"], false)) {
 						$item["body"] = Markdown::toBBCode(BBCode::toMarkdown($item["body"]));
@@ -2658,7 +2576,7 @@ class Diaspora
 	 *
 	 * @return int the message id
 	 */
-	private static function receiveReshare($importer, $data, $xml)
+	private static function receiveReshare(array $importer, $data, $xml)
 	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
@@ -2689,15 +2607,13 @@ class Diaspora
 
 		$datarray["uid"] = $importer["uid"];
 		$datarray["contact-id"] = $contact["id"];
-		$datarray["network"]  = NETWORK_DIASPORA;
+		$datarray["network"]  = Protocol::DIASPORA;
 
-		$datarray["author-name"] = $contact["name"];
 		$datarray["author-link"] = $contact["url"];
-		$datarray["author-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
+		$datarray["author-id"] = Contact::getIdForURL($contact["url"], 0);
 
-		$datarray["owner-name"] = $datarray["author-name"];
 		$datarray["owner-link"] = $datarray["author-link"];
-		$datarray["owner-avatar"] = $datarray["author-avatar"];
+		$datarray["owner-id"] = $datarray["author-id"];
 
 		$datarray["guid"] = $guid;
 		$datarray["uri"] = $datarray["parent-uri"] = self::getUriFromGuid($author, $guid);
@@ -2705,7 +2621,7 @@ class Diaspora
 		$datarray["verb"] = ACTIVITY_POST;
 		$datarray["gravity"] = GRAVITY_PARENT;
 
-		$datarray["protocol"] = PROTOCOL_DIASPORA;
+		$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
 		$datarray["source"] = $xml;
 
 		$prefix = share_header(
@@ -2752,7 +2668,7 @@ class Diaspora
 	 *
 	 * @return bool success
 	 */
-	private static function itemRetraction($importer, $contact, $data)
+	private static function itemRetraction(array $importer, array $contact, $data)
 	{
 		$author = notags(unxmlify($data->author));
 		$target_guid = notags(unxmlify($data->target_guid));
@@ -2769,23 +2685,29 @@ class Diaspora
 		}
 
 		// Fetch items that are about to be deleted
-		$fields = ['uid', 'id', 'parent', 'parent-uri', 'author-link'];
+		$fields = ['uid', 'id', 'parent', 'parent-uri', 'author-link', 'file'];
 
 		// When we receive a public retraction, we delete every item that we find.
 		if ($importer['uid'] == 0) {
-			$condition = ["`guid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid];
+			$condition = ['guid' => $target_guid, 'deleted' => false];
 		} else {
-			$condition = ["`guid` = ? AND `uid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid, $importer['uid']];
+			$condition = ['guid' => $target_guid, 'deleted' => false, 'uid' => $importer['uid']];
 		}
-		$r = dba::select('item', $fields, $condition);
-		if (!DBM::is_result($r)) {
+
+		$r = Item::select($fields, $condition);
+		if (!DBA::isResult($r)) {
 			logger("Target guid ".$target_guid." was not found on this system for user ".$importer['uid'].".");
 			return false;
 		}
 
-		while ($item = dba::fetch($r)) {
+		while ($item = Item::fetch($r)) {
+			if (strstr($item['file'], '[')) {
+				logger("Target guid " . $target_guid . " for user " . $item['uid'] . " is filed. So it won't be deleted.", LOGGER_DEBUG);
+				continue;
+			}
+
 			// Fetch the parent item
-			$parent = dba::selectFirst('item', ['author-link'], ['id' => $item["parent"]]);
+			$parent = Item::selectFirst(['author-link'], ['id' => $item["parent"]]);
 
 			// Only delete it if the parent author really fits
 			if (!link_compare($parent["author-link"], $contact["url"]) && !link_compare($item["author-link"], $contact["url"])) {
@@ -2810,7 +2732,7 @@ class Diaspora
 	 *
 	 * @return bool Success
 	 */
-	private static function receiveRetraction($importer, $sender, $data)
+	private static function receiveRetraction(array $importer, $sender, $data)
 	{
 		$target_type = notags(unxmlify($data->target_type));
 
@@ -2820,6 +2742,10 @@ class Diaspora
 			return false;
 		}
 
+		if (!$contact) {
+			$contact = [];
+		}
+
 		logger("Got retraction for ".$target_type.", sender ".$sender." and user ".$importer["uid"], LOGGER_DEBUG);
 
 		switch ($target_type) {
@@ -2851,7 +2777,7 @@ class Diaspora
 	 *
 	 * @return int The message id of the newly created item
 	 */
-	private static function receiveStatusMessage($importer, $data, $xml)
+	private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml)
 	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
@@ -2909,15 +2835,13 @@ class Diaspora
 
 		$datarray["uid"] = $importer["uid"];
 		$datarray["contact-id"] = $contact["id"];
-		$datarray["network"] = NETWORK_DIASPORA;
+		$datarray["network"] = Protocol::DIASPORA;
 
-		$datarray["author-name"] = $contact["name"];
 		$datarray["author-link"] = $contact["url"];
-		$datarray["author-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
+		$datarray["author-id"] = Contact::getIdForURL($contact["url"], 0);
 
-		$datarray["owner-name"] = $datarray["author-name"];
 		$datarray["owner-link"] = $datarray["author-link"];
-		$datarray["owner-avatar"] = $datarray["author-avatar"];
+		$datarray["owner-id"] = $datarray["author-id"];
 
 		$datarray["guid"] = $guid;
 		$datarray["uri"] = $datarray["parent-uri"] = self::getUriFromGuid($author, $guid);
@@ -2925,7 +2849,7 @@ class Diaspora
 		$datarray["verb"] = ACTIVITY_POST;
 		$datarray["gravity"] = GRAVITY_PARENT;
 
-		$datarray["protocol"] = PROTOCOL_DIASPORA;
+		$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
 		$datarray["source"] = $xml;
 
 		$datarray["body"] = self::replacePeopleGuid($body, $contact["url"]);
@@ -2973,9 +2897,9 @@ class Diaspora
 	 *
 	 * @return string the handle in the format user@domain.tld
 	 */
-	private static function myHandle($contact)
+	private static function myHandle(array $contact)
 	{
-		if ($contact["addr"] != "") {
+		if (!empty($contact["addr"])) {
 			return $contact["addr"];
 		}
 
@@ -2987,7 +2911,7 @@ class Diaspora
 			$nick = $contact["nick"];
 		}
 
-		return $nick."@".substr(System::baseUrl(), strpos(System::baseUrl(), "://") + 3);
+		return $nick . "@" . substr(System::baseUrl(), strpos(System::baseUrl(), "://") + 3);
 	}
 
 
@@ -3002,7 +2926,7 @@ class Diaspora
 	 *
 	 * @return string The encrypted data
 	 */
-	public static function encodePrivateData($msg, $user, $contact, $prvkey, $pubkey)
+	public static function encodePrivateData($msg, array $user, array $contact, $prvkey, $pubkey)
 	{
 		logger("Message: ".$msg, LOGGER_DATA);
 
@@ -3040,7 +2964,7 @@ class Diaspora
 	 *
 	 * @return string The envelope
 	 */
-	public static function buildMagicEnvelope($msg, $user)
+	public static function buildMagicEnvelope($msg, array $user)
 	{
 		$b64url_data = base64url_encode($msg);
 		$data = str_replace(["\n", "\r", " ", "\t"], ["", "", "", ""], $b64url_data);
@@ -3083,7 +3007,7 @@ class Diaspora
 	 *
 	 * @return string The message that will be transmitted to other servers
 	 */
-	public static function buildMessage($msg, $user, $contact, $prvkey, $pubkey, $public = false)
+	public static function buildMessage($msg, array $user, array $contact, $prvkey, $pubkey, $public = false)
 	{
 		// The message is put into an envelope with the sender's signature
 		$envelope = self::buildMagicEnvelope($msg, $user);
@@ -3127,7 +3051,7 @@ class Diaspora
 	 *
 	 * @return int Result of the transmission
 	 */
-	public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run = false, $guid = "", $no_queue = false)
+	public static function transmit(array $owner, array $contact, $envelope, $public_batch, $queue_run = false, $guid = "", $no_queue = false)
 	{
 		$a = get_app();
 
@@ -3173,10 +3097,10 @@ class Diaspora
 		logger("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code);
 
 		if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
-			if (!$no_queue && ($contact['contact-type'] != ACCOUNT_TYPE_RELAY)) {
+			if (!$no_queue && !empty($contact['contact-type']) && ($contact['contact-type'] != Contact::ACCOUNT_TYPE_RELAY)) {
 				logger("queue message");
 				// queue message for redelivery
-				Queue::add($contact["id"], NETWORK_DIASPORA, $envelope, $public_batch, $guid);
+				Queue::add($contact["id"], Protocol::DIASPORA, $envelope, $public_batch, $guid);
 			}
 
 			// The message could not be delivered. We mark the contact as "dead"
@@ -3218,7 +3142,7 @@ class Diaspora
 	 *
 	 * @return int Result of the transmission
 	 */
-	private static function buildAndTransmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false)
+	private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "", $spool = false)
 	{
 		$msg = self::buildPostXml($type, $message);
 
@@ -3226,14 +3150,14 @@ class Diaspora
 		logger('send guid '.$guid, LOGGER_DEBUG);
 
 		// Fallback if the private key wasn't transmitted in the expected field
-		if ($owner['uprvkey'] == "") {
+		if (empty($owner['uprvkey'])) {
 			$owner['uprvkey'] = $owner['prvkey'];
 		}
 
 		$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
 
 		if ($spool) {
-			Queue::add($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch, $guid);
+			Queue::add($contact['id'], Protocol::DIASPORA, $envelope, $public_batch, $guid);
 			return true;
 		} else {
 			$return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);
@@ -3252,7 +3176,7 @@ class Diaspora
 	 *
 	 * @return int The result of the transmission
 	 */
-	private static function sendParticipation($contact, $item)
+	private static function sendParticipation(array $contact, array $item)
 	{
 		// Don't send notifications for private postings
 		if ($item['private']) {
@@ -3271,7 +3195,7 @@ class Diaspora
 		// If the item belongs to a user, we take this user id.
 		if ($item['uid'] == 0) {
 			$condition = ['verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false];
-			$first_user = dba::selectFirst('user', ['uid'], $condition);
+			$first_user = DBA::selectFirst('user', ['uid'], $condition);
 			$owner = User::getOwnerDataById($first_user['uid']);
 		} else {
 			$owner = User::getOwnerDataById($item['uid']);
@@ -3280,7 +3204,7 @@ class Diaspora
 		$author = self::myHandle($owner);
 
 		$message = ["author" => $author,
-				"guid" => get_guid(32),
+				"guid" => System::createGUID(32),
 				"parent_type" => "Post",
 				"parent_guid" => $item["guid"]];
 
@@ -3301,7 +3225,7 @@ class Diaspora
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function sendAccountMigration($owner, $contact, $uid)
+	public static function sendAccountMigration(array $owner, array $contact, $uid)
 	{
 		$old_handle = PConfig::get($uid, 'system', 'previous_addr');
 		$profile = self::createProfileData($uid);
@@ -3326,7 +3250,7 @@ class Diaspora
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function sendShare($owner, $contact)
+	public static function sendShare(array $owner, array $contact)
 	{
 		/**
 		 * @todo support the different possible combinations of "following" and "sharing"
@@ -3337,13 +3261,15 @@ class Diaspora
 
 		/*
 		switch ($contact["rel"]) {
-			case CONTACT_IS_FRIEND:
+			case Contact::FRIEND:
 				$following = true;
 				$sharing = true;
-			case CONTACT_IS_SHARING:
+
+			case Contact::SHARING:
 				$following = false;
 				$sharing = true;
-			case CONTACT_IS_FOLLOWER:
+
+			case Contact::FOLLOWER:
 				$following = true;
 				$sharing = false;
 		}
@@ -3367,7 +3293,7 @@ class Diaspora
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function sendUnshare($owner, $contact)
+	public static function sendUnshare(array $owner, array $contact)
 	{
 		$message = ["author" => self::myHandle($owner),
 				"recipient" => $contact["addr"],
@@ -3412,19 +3338,19 @@ class Diaspora
 
 		$guid = "";
 		preg_match("/guid='(.*?)'/ism", $attributes, $matches);
-		if ($matches[1] != "") {
+		if (!empty($matches[1])) {
 			$guid = $matches[1];
 		}
 
 		preg_match('/guid="(.*?)"/ism', $attributes, $matches);
-		if ($matches[1] != "") {
+		if (!empty($matches[1])) {
 			$guid = $matches[1];
 		}
 
 		if (($guid != "") && $complete) {
-			$condition = ['guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]];
-			$item = dba::selectFirst('item', ['contact-id'], $condition);
-			if (DBM::is_result($item)) {
+			$condition = ['guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
+			$item = Item::selectFirst(['contact-id'], $condition);
+			if (DBA::isResult($item)) {
 				$ret= [];
 				$ret["root_handle"] = self::handleFromContact($item["contact-id"]);
 				$ret["root_guid"] = $guid;
@@ -3442,12 +3368,12 @@ class Diaspora
 
 		$profile = "";
 		preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-		if ($matches[1] != "") {
+		if (!empty($matches[1])) {
 			$profile = $matches[1];
 		}
 
 		preg_match('/profile="(.*?)"/ism', $attributes, $matches);
-		if ($matches[1] != "") {
+		if (!empty($matches[1])) {
 			$profile = $matches[1];
 		}
 
@@ -3477,7 +3403,7 @@ class Diaspora
 	private static function buildEvent($event_id)
 	{
 		$r = q("SELECT `guid`, `uid`, `start`, `finish`, `nofinish`, `summary`, `desc`, `location`, `adjust` FROM `event` WHERE `id` = %d", intval($event_id));
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return [];
 		}
 
@@ -3486,14 +3412,14 @@ class Diaspora
 		$eventdata = [];
 
 		$r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d", intval($event['uid']));
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return [];
 		}
 
 		$user = $r[0];
 
 		$r = q("SELECT `addr`, `nick` FROM `contact` WHERE `uid` = %d AND `self`", intval($event['uid']));
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return [];
 		}
 
@@ -3559,7 +3485,7 @@ class Diaspora
 	 * 'type' -> Message type ("status_message" or "reshare")
 	 * 'message' -> Array of XML elements of the status
 	 */
-	public static function buildStatus($item, $owner)
+	public static function buildStatus(array $item, array $owner)
 	{
 		$cachekey = "diaspora:buildStatus:".$item['guid'];
 
@@ -3570,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);
 
@@ -3605,7 +3531,7 @@ class Diaspora
 
 			if ($item["attach"]) {
 				$cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER);
-				if (cnt) {
+				if ($cnt) {
 					$body .= "\n".L10n::t("Attachments:")."\n";
 					foreach ($matches as $mtch) {
 						$body .= "[".$mtch[3]."](".$mtch[1].")\n";
@@ -3673,7 +3599,7 @@ class Diaspora
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function sendStatus($item, $owner, $contact, $public_batch = false)
+	public static function sendStatus(array $item, array $owner, array $contact, $public_batch = false)
 	{
 		$status = self::buildStatus($item, $owner);
 
@@ -3688,18 +3614,13 @@ class Diaspora
 	 *
 	 * @return array The data for a "like"
 	 */
-	private static function constructLike($item, $owner)
+	private static function constructLike(array $item, array $owner)
 	{
-		$p = q(
-			"SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
-			dbesc($item["thr-parent"])
-		);
-		if (!DBM::is_result($p)) {
+		$parent = Item::selectFirst(['guid', 'uri', 'parent-uri'], ['uri' => $item["thr-parent"]]);
+		if (!DBA::isResult($parent)) {
 			return false;
 		}
 
-		$parent = $p[0];
-
 		$target_type = ($parent["uri"] === $parent["parent-uri"] ? "Post" : "Comment");
 		$positive = null;
 		if ($item['verb'] === ACTIVITY_LIKE) {
@@ -3724,18 +3645,13 @@ class Diaspora
 	 *
 	 * @return array The data for an "EventParticipation"
 	 */
-	private static function constructAttend($item, $owner)
+	private static function constructAttend(array $item, array $owner)
 	{
-		$p = q(
-			"SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
-			dbesc($item["thr-parent"])
-		);
-		if (!DBM::is_result($p)) {
+		$parent = Item::selectFirst(['guid', 'uri', 'parent-uri'], ['uri' => $item["thr-parent"]]);
+		if (!DBA::isResult($parent)) {
 			return false;
 		}
 
-		$parent = $p[0];
-
 		switch ($item['verb']) {
 			case ACTIVITY_ATTEND:
 				$attend_answer = 'accepted';
@@ -3766,7 +3682,7 @@ class Diaspora
 	 *
 	 * @return array The data for a comment
 	 */
-	private static function constructComment($item, $owner)
+	private static function constructComment(array $item, array $owner)
 	{
 		$cachekey = "diaspora:constructComment:".$item['guid'];
 
@@ -3775,18 +3691,11 @@ class Diaspora
 			return $result;
 		}
 
-		$p = q(
-			"SELECT `guid` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
-			intval($item["parent"]),
-			intval($item["parent"])
-		);
-
-		if (!DBM::is_result($p)) {
+		$parent = Item::selectFirst(['guid'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
+		if (!DBA::isResult($parent)) {
 			return false;
 		}
 
-		$parent = $p[0];
-
 		$text = html_entity_decode(BBCode::toMarkdown($item["body"]));
 		$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
 
@@ -3817,7 +3726,7 @@ class Diaspora
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function sendFollowup($item, $owner, $contact, $public_batch = false)
+	public static function sendFollowup(array $item, array $owner, array $contact, $public_batch = false)
 	{
 		if (in_array($item['verb'], [ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE])) {
 			$message = self::constructAttend($item, $owner);
@@ -3847,7 +3756,7 @@ class Diaspora
 	 *
 	 * @return string The message
 	 */
-	private static function messageFromSignature($item, $signature)
+	private static function messageFromSignature(array $item, array $signature)
 	{
 		// Split the signed text
 		$signed_parts = explode(";", $signature['signed_text']);
@@ -3897,7 +3806,7 @@ class Diaspora
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function sendRelay($item, $owner, $contact, $public_batch = false)
+	public static function sendRelay(array $item, array $owner, array $contact, $public_batch = false)
 	{
 		if ($item["deleted"]) {
 			return self::sendRetraction($item, $owner, $contact, $public_batch, true);
@@ -3910,19 +3819,13 @@ class Diaspora
 		logger("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG);
 
 		// fetch the original signature
-
-		$r = q(
-			"SELECT `signed_text`, `signature`, `signer` FROM `sign` WHERE `iid` = %d LIMIT 1",
-			intval($item["id"])
-		);
-
-		if (!$r) {
+		$fields = ['signed_text', 'signature', 'signer'];
+		$signature = DBA::selectFirst('sign', $fields, ['iid' => $item["id"]]);
+		if (!DBA::isResult($signature)) {
 			logger("Couldn't fetch signatur for item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG);
 			return false;
 		}
 
-		$signature = $r[0];
-
 		// Old way - is used by the internal Friendica functions
 		/// @todo Change all signatur storing functions to the new format
 		if ($signature['signed_text'] && $signature['signature'] && $signature['signer']) {
@@ -3967,7 +3870,7 @@ class Diaspora
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function sendRetraction($item, $owner, $contact, $public_batch = false, $relay = false)
+	public static function sendRetraction(array $item, array $owner, array $contact, $public_batch = false, $relay = false)
 	{
 		$itemaddr = self::handleFromContact($item["contact-id"], $item["author-id"]);
 
@@ -3999,21 +3902,15 @@ class Diaspora
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function sendMail($item, $owner, $contact)
+	public static function sendMail(array $item, array $owner, array $contact)
 	{
 		$myaddr = self::myHandle($owner);
 
-		$r = q(
-			"SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-			intval($item["convid"]),
-			intval($item["uid"])
-		);
-
-		if (!DBM::is_result($r)) {
+		$cnv = DBA::selectFirst('conv', [], ['id' => $item["convid"], 'uid' => $item["uid"]]);
+		if (!DBA::isResult($cnv)) {
 			logger("conversation not found.");
 			return;
 		}
-		$cnv = $r[0];
 
 		$conv = [
 			"author" => $cnv["creator"],
@@ -4168,7 +4065,7 @@ class Diaspora
 				$arr = explode(' ', $profile['pub_keywords']);
 				if (count($arr)) {
 					for ($x = 0; $x < 5; $x ++) {
-						if (trim($arr[$x])) {
+						if (!empty($arr[$x])) {
 							$tags .= '#'. trim($arr[$x]) .' ';
 						}
 					}
@@ -4214,9 +4111,9 @@ class Diaspora
 			$recips = q(
 				"SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
 				AND `uid` = %d AND `rel` != %d",
-				dbesc(NETWORK_DIASPORA),
+				DBA::escape(Protocol::DIASPORA),
 				intval($uid),
-				intval(CONTACT_IS_SHARING)
+				intval(Contact::SHARING)
 			);
 		}
 
@@ -4240,7 +4137,7 @@ class Diaspora
 	 *
 	 * @return bool Success
 	 */
-	public static function storeLikeSignature($contact, $post_id)
+	public static function storeLikeSignature(array $contact, $post_id)
 	{
 		// Is the contact the owner? Then fetch the private key
 		if (!$contact['self'] || ($contact['uid'] == 0)) {
@@ -4248,23 +4145,23 @@ class Diaspora
 			return false;
 		}
 
-		$r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid']));
-		if (!DBM::is_result($r)) {
+		$user = DBA::selectFirst('user', ['prvkey'], ['uid' => $contact["uid"]]);
+		if (!DBA::isResult($user)) {
 			return false;
 		}
 
-		$contact["uprvkey"] = $r[0]['prvkey'];
+		$contact["uprvkey"] = $user['prvkey'];
 
-		$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($post_id));
-		if (!DBM::is_result($r)) {
+		$item = Item::selectFirst([], ['id' => $post_id]);
+		if (!DBA::isResult($item)) {
 			return false;
 		}
 
-		if (!in_array($r[0]["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
+		if (!in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
 			return false;
 		}
 
-		$message = self::constructLike($r[0], $contact);
+		$message = self::constructLike($item, $contact);
 		if ($message === false) {
 			return false;
 		}
@@ -4275,7 +4172,7 @@ class Diaspora
 		 * Now store the signature more flexible to dynamically support new fields.
 		 * This will break Diaspora compatibility with Friendica versions prior to 3.5.
 		 */
-		dba::insert('sign', ['iid' => $post_id, 'signed_text' => json_encode($message)]);
+		DBA::insert('sign', ['iid' => $post_id, 'signed_text' => json_encode($message)]);
 
 		logger('Stored diaspora like signature');
 		return true;
@@ -4291,7 +4188,7 @@ class Diaspora
 	 *
 	 * @return bool Success
 	 */
-	public static function storeCommentSignature($item, $contact, $uprvkey, $message_id)
+	public static function storeCommentSignature(array $item, array $contact, $uprvkey, $message_id)
 	{
 		if ($uprvkey == "") {
 			logger('No private key, so not storing comment signature', LOGGER_DEBUG);
@@ -4311,7 +4208,7 @@ class Diaspora
 		 * Now store the signature more flexible to dynamically support new fields.
 		 * This will break Diaspora compatibility with Friendica versions prior to 3.5.
 		 */
-		dba::insert('sign', ['iid' => $message_id, 'signed_text' => json_encode($message)]);
+		DBA::insert('sign', ['iid' => $message_id, 'signed_text' => json_encode($message)]);
 
 		logger('Stored diaspora comment signature');
 		return true;
diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index c3825a16b..00122e2ea 100644
--- a/src/Protocol/Email.php
+++ b/src/Protocol/Email.php
@@ -5,6 +5,7 @@
 namespace Friendica\Protocol;
 
 use Friendica\Content\Text\HTML;
+use Friendica\Core\Protocol;
 
 /**
  * @brief Email class
@@ -25,6 +26,16 @@ class Email
 
 		$mbox = @imap_open($mailbox, $username, $password);
 
+		$errors = imap_errors();
+		if (!empty($errors)) {
+			logger('IMAP Errors occured: ' . json_encode($errors));
+		}
+
+		$alerts = imap_alerts();
+		if (!empty($alerts)) {
+			logger('IMAP Alerts occured: ' . json_encode($alerts));
+		}
+
 		return $mbox;
 	}
 
@@ -298,7 +309,7 @@ class Email
 	}
 
 	/**
-	 * Function send is used by NETWORK_EMAIL and NETWORK_EMAIL2 code
+	 * Function send is used by Protocol::EMAIL and Protocol::EMAIL2 code
 	 * (not to notify the user, but to send items to email contacts)
 	 *
 	 * @param string $addr    address
diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index c04e40b5e..0709a9550 100644
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -6,15 +6,15 @@
  */
 namespace Friendica\Protocol;
 
-use Friendica\Database\DBM;
-use Friendica\Core\System;
-use Friendica\Model\Item;
-use Friendica\Util\Network;
-use Friendica\Content\Text\HTML;
-
-use dba;
 use DOMDocument;
 use DOMXPath;
+use Friendica\Content\Text\HTML;
+use Friendica\Core\Protocol;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
+use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 require_once 'include/dba.php';
 require_once 'include/items.php';
@@ -44,7 +44,7 @@ class Feed {
 		} else {
 			logger("Test Atom/RSS feed", LOGGER_DEBUG);
 		}
-		if ($xml == "") {
+		if (empty($xml)) {
 			logger('XML is empty.', LOGGER_DEBUG);
 			return;
 		}
@@ -73,18 +73,18 @@ class Feed {
 
 		// Is it RDF?
 		if ($xpath->query('/rdf:RDF/rss:channel')->length > 0) {
-			$author["author-link"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:link/text()')->item(0)->nodeValue;
-			$author["author-name"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:title/text()')->item(0)->nodeValue;
+			$author["author-link"] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:link/text()');
+			$author["author-name"] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:title/text()');
 
-			if ($author["author-name"] == "") {
-				$author["author-name"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:description/text()')->item(0)->nodeValue;
+			if (empty($author["author-name"])) {
+				$author["author-name"] = XML::getFirstNodeValue($xpath, '/rdf:RDF/rss:channel/rss:description/text()');
 			}
 			$entries = $xpath->query('/rdf:RDF/rss:item');
 		}
 
 		// Is it Atom?
 		if ($xpath->query('/atom:feed')->length > 0) {
-			$alternate = $xpath->query("atom:link[@rel='alternate']")->item(0)->attributes;
+			$alternate = XML::getFirstAttributes($xpath, "atom:link[@rel='alternate']");
 			if (is_object($alternate)) {
 				foreach ($alternate AS $attribute) {
 					if ($attribute->name == "href") {
@@ -93,11 +93,8 @@ class Feed {
 				}
 			}
 
-			if ($author["author-link"] == "") {
-				$author["author-link"] = $author["author-id"];
-			}
-			if ($author["author-link"] == "") {
-				$self = $xpath->query("atom:link[@rel='self']")->item(0)->attributes;
+			if (empty($author["author-link"])) {
+				$self = XML::getFirstAttributes($xpath, "atom:link[@rel='self']");
 				if (is_object($self)) {
 					foreach ($self AS $attribute) {
 						if ($attribute->name == "href") {
@@ -107,39 +104,39 @@ class Feed {
 				}
 			}
 
-			if ($author["author-link"] == "") {
-				$author["author-link"] = $xpath->evaluate('/atom:feed/atom:id/text()')->item(0)->nodeValue;
+			if (empty($author["author-link"])) {
+				$author["author-link"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:id/text()');
 			}
-			$author["author-avatar"] = $xpath->evaluate('/atom:feed/atom:logo/text()')->item(0)->nodeValue;
+			$author["author-avatar"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:logo/text()');
 
-			$author["author-name"] = $xpath->evaluate('/atom:feed/atom:title/text()')->item(0)->nodeValue;
+			$author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:title/text()');
 
-			if ($author["author-name"] == "") {
-				$author["author-name"] = $xpath->evaluate('/atom:feed/atom:subtitle/text()')->item(0)->nodeValue;
+			if (empty($author["author-name"])) {
+				$author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:subtitle/text()');
 			}
-			if ($author["author-name"] == "") {
-				$author["author-name"] = $xpath->evaluate('/atom:feed/atom:author/atom:name/text()')->item(0)->nodeValue;
+			if (empty($author["author-name"])) {
+				$author["author-name"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:name/text()');
 			}
-			$value = $xpath->evaluate('atom:author/poco:displayName/text()')->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()');
 			if ($value != "") {
 				$author["author-name"] = $value;
 			}
 			if ($simulate) {
-				$author["author-id"] = $xpath->evaluate('/atom:feed/atom:author/atom:uri/text()')->item(0)->nodeValue;
+				$author["author-id"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:author/atom:uri/text()');
 
-				$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()')->item(0)->nodeValue;
+				$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()');
 				if ($value != "") {
 					$author["author-nick"] = $value;
 				}
-				$value = $xpath->evaluate('atom:author/poco:address/poco:formatted/text()')->item(0)->nodeValue;
+				$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:address/poco:formatted/text()');
 				if ($value != "") {
 					$author["author-location"] = $value;
 				}
-				$value = $xpath->evaluate('atom:author/poco:note/text()')->item(0)->nodeValue;
+				$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:note/text()');
 				if ($value != "") {
 					$author["author-about"] = $value;
 				}
-				$avatar = $xpath->evaluate("atom:author/atom:link[@rel='avatar']")->item(0)->attributes;
+				$avatar = XML::getFirstAttributes($xpath, "atom:author/atom:link[@rel='avatar']");
 				if (is_object($avatar)) {
 					foreach ($avatar AS $attribute) {
 						if ($attribute->name == "href") {
@@ -149,29 +146,29 @@ class Feed {
 				}
 			}
 
-			$author["edited"] = $author["created"] = $xpath->query('/atom:feed/atom:updated/text()')->item(0)->nodeValue;
+			$author["edited"] = $author["created"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:updated/text()');
 
-			$author["app"] = $xpath->evaluate('/atom:feed/atom:generator/text()')->item(0)->nodeValue;
+			$author["app"] = XML::getFirstNodeValue($xpath, '/atom:feed/atom:generator/text()');
 
 			$entries = $xpath->query('/atom:feed/atom:entry');
 		}
 
 		// Is it RSS?
 		if ($xpath->query('/rss/channel')->length > 0) {
-			$author["author-link"] = $xpath->evaluate('/rss/channel/link/text()')->item(0)->nodeValue;
+			$author["author-link"] = XML::getFirstNodeValue($xpath, '/rss/channel/link/text()');
 
-			$author["author-name"] = $xpath->evaluate('/rss/channel/title/text()')->item(0)->nodeValue;
-			$author["author-avatar"] = $xpath->evaluate('/rss/channel/image/url/text()')->item(0)->nodeValue;
+			$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/title/text()');
+			$author["author-avatar"] = XML::getFirstNodeValue($xpath, '/rss/channel/image/url/text()');
 
-			if ($author["author-name"] == "") {
-				$author["author-name"] = $xpath->evaluate('/rss/channel/copyright/text()')->item(0)->nodeValue;
+			if (empty($author["author-name"])) {
+				$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/copyright/text()');
 			}
-			if ($author["author-name"] == "") {
-				$author["author-name"] = $xpath->evaluate('/rss/channel/description/text()')->item(0)->nodeValue;
+			if (empty($author["author-name"])) {
+				$author["author-name"] = XML::getFirstNodeValue($xpath, '/rss/channel/description/text()');
 			}
-			$author["edited"] = $author["created"] = $xpath->query('/rss/channel/pubDate/text()')->item(0)->nodeValue;
+			$author["edited"] = $author["created"] = XML::getFirstNodeValue($xpath, '/rss/channel/pubDate/text()');
 
-			$author["app"] = $xpath->evaluate('/rss/channel/generator/text()')->item(0)->nodeValue;
+			$author["app"] = XML::getFirstNodeValue($xpath, '/rss/channel/generator/text()');
 
 			$entries = $xpath->query('/rss/channel/item');
 		}
@@ -179,7 +176,7 @@ class Feed {
 		if (!$simulate) {
 			$author["author-link"] = $contact["url"];
 
-			if ($author["author-name"] == "") {
+			if (empty($author["author-name"])) {
 				$author["author-name"] = $contact["name"];
 			}
 			$author["author-avatar"] = $contact["thumb"];
@@ -191,8 +188,7 @@ class Feed {
 
 		$header = [];
 		$header["uid"] = $importer["uid"];
-		$header["network"] = NETWORK_FEED;
-		$header["type"] = "remote";
+		$header["network"] = Protocol::FEED;
 		$header["wall"] = 0;
 		$header["origin"] = 0;
 		$header["gravity"] = GRAVITY_PARENT;
@@ -214,9 +210,9 @@ class Feed {
 
 			$item = array_merge($header, $author);
 
-			$alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
+			$alternate = XML::getFirstAttributes($xpath, "atom:link[@rel='alternate']", $entry);
 			if (!is_object($alternate)) {
-				$alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
+				$alternate = XML::getFirstAttributes($xpath, "atom:link", $entry);
 			}
 			if (is_object($alternate)) {
 				foreach ($alternate AS $attribute) {
@@ -225,19 +221,19 @@ class Feed {
 					}
 				}
 			}
-			if ($item["plink"] == "") {
-				$item["plink"] = $xpath->evaluate('link/text()', $entry)->item(0)->nodeValue;
+			if (empty($item["plink"])) {
+				$item["plink"] = XML::getFirstNodeValue($xpath, 'link/text()', $entry);
 			}
-			if ($item["plink"] == "") {
-				$item["plink"] = $xpath->evaluate('rss:link/text()', $entry)->item(0)->nodeValue;
+			if (empty($item["plink"])) {
+				$item["plink"] = XML::getFirstNodeValue($xpath, 'rss:link/text()', $entry);
 			}
 
-			$item["uri"] = $xpath->evaluate('atom:id/text()', $entry)->item(0)->nodeValue;
+			$item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
 
-			if ($item["uri"] == "") {
-				$item["uri"] = $xpath->evaluate('guid/text()', $entry)->item(0)->nodeValue;
+			if (empty($item["uri"])) {
+				$item["uri"] = XML::getFirstNodeValue($xpath, 'guid/text()', $entry);
 			}
-			if ($item["uri"] == "") {
+			if (empty($item["uri"])) {
 				$item["uri"] = $item["plink"];
 			}
 
@@ -249,53 +245,58 @@ class Feed {
 
 			if (!$simulate) {
 				$condition = ["`uid` = ? AND `uri` = ? AND `network` IN (?, ?)",
-					$importer["uid"], $item["uri"], NETWORK_FEED, NETWORK_DFRN];
-				$previous = dba::selectFirst('item', ['id'], $condition);
-				if (DBM::is_result($previous)) {
+					$importer["uid"], $item["uri"], Protocol::FEED, Protocol::DFRN];
+				$previous = Item::selectFirst(['id'], $condition);
+				if (DBA::isResult($previous)) {
 					logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$previous["id"], LOGGER_DEBUG);
 					continue;
 				}
 			}
 
-			$item["title"] = $xpath->evaluate('atom:title/text()', $entry)->item(0)->nodeValue;
+			$item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
 
-			if ($item["title"] == "") {
-				$item["title"] = $xpath->evaluate('title/text()', $entry)->item(0)->nodeValue;
+			if (empty($item["title"])) {
+				$item["title"] = XML::getFirstNodeValue($xpath, 'title/text()', $entry);
 			}
-			if ($item["title"] == "") {
-				$item["title"] = $xpath->evaluate('rss:title/text()', $entry)->item(0)->nodeValue;
+			if (empty($item["title"])) {
+				$item["title"] = XML::getFirstNodeValue($xpath, 'rss:title/text()', $entry);
 			}
-			$published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
+			$published = XML::getFirstNodeValue($xpath, 'atom:published/text()', $entry);
 
-			if ($published == "") {
-				$published = $xpath->query('pubDate/text()', $entry)->item(0)->nodeValue;
+			if (empty($published)) {
+				$published = XML::getFirstNodeValue($xpath, 'pubDate/text()', $entry);
 			}
-			if ($published == "") {
-				$published = $xpath->query('dc:date/text()', $entry)->item(0)->nodeValue;
+			if (empty($published)) {
+				$published = XML::getFirstNodeValue($xpath, 'dc:date/text()', $entry);
 			}
-			$updated = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
+			$updated = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry);
 
-			if ($updated == "") {
+			if (empty($updated) && !empty($published)) {
 				$updated = $published;
 			}
+
+			if (empty($published) && !empty($updated)) {
+				$published = $updated;
+			}
+
 			if ($published != "") {
 				$item["created"] = $published;
 			}
 			if ($updated != "") {
 				$item["edited"] = $updated;
 			}
-			$creator = $xpath->query('author/text()', $entry)->item(0)->nodeValue;
+			$creator = XML::getFirstNodeValue($xpath, 'author/text()', $entry);
 
-			if ($creator == "") {
-				$creator = $xpath->query('atom:author/atom:name/text()', $entry)->item(0)->nodeValue;
+			if (empty($creator)) {
+				$creator = XML::getFirstNodeValue($xpath, 'atom:author/atom:name/text()', $entry);
 			}
-			if ($creator == "") {
-				$creator = $xpath->query('dc:creator/text()', $entry)->item(0)->nodeValue;
+			if (empty($creator)) {
+				$creator = XML::getFirstNodeValue($xpath, 'dc:creator/text()', $entry);
 			}
 			if ($creator != "") {
 				$item["author-name"] = $creator;
 			}
-			$creator = $xpath->query('dc:creator/text()', $entry)->item(0)->nodeValue;
+			$creator = XML::getFirstNodeValue($xpath, 'dc:creator/text()', $entry);
 
 			if ($creator != "") {
 				$item["author-name"] = $creator;
@@ -323,8 +324,10 @@ class Feed {
 						$type = $attribute->textContent;
 					}
 				}
-				if (strlen($item["attach"])) {
+				if (!empty($item["attach"])) {
 					$item["attach"] .= ',';
+				} else {
+					$item["attach"] = '';
 				}
 
 				$attachments[] = ["link" => $href, "type" => $type, "length" => $length];
@@ -344,16 +347,16 @@ class Feed {
 				$tags .= $taglink;
 			}
 
-			$body = trim($xpath->evaluate('atom:content/text()', $entry)->item(0)->nodeValue);
+			$body = trim(XML::getFirstNodeValue($xpath, 'atom:content/text()', $entry));
 
-			if ($body == "") {
-				$body = trim($xpath->evaluate('content:encoded/text()', $entry)->item(0)->nodeValue);
+			if (empty($body)) {
+				$body = trim(XML::getFirstNodeValue($xpath, 'content:encoded/text()', $entry));
 			}
-			if ($body == "") {
-				$body = trim($xpath->evaluate('description/text()', $entry)->item(0)->nodeValue);
+			if (empty($body)) {
+				$body = trim(XML::getFirstNodeValue($xpath, 'description/text()', $entry));
 			}
-			if ($body == "") {
-				$body = trim($xpath->evaluate('atom:summary/text()', $entry)->item(0)->nodeValue);
+			if (empty($body)) {
+				$body = trim(XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry));
 			}
 
 			// remove the content of the title if it is identically to the body
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index e91d81f58..ece265c99 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -4,33 +4,34 @@
  */
 namespace Friendica\Protocol;
 
+use DOMDocument;
+use DOMXPath;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Lock;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Model\GContact;
 use Friendica\Model\Item;
+use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Lock;
 use Friendica\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\XML;
-use dba;
-use DOMDocument;
-use DOMXPath;
 
 require_once 'include/dba.php';
 require_once 'include/items.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
 require_once 'include/api.php';
-require_once 'mod/proxy.php';
 
 /**
  * @brief This class contain functions for the OStatus protocol
@@ -51,52 +52,64 @@ class OStatus
 	 *
 	 * @return array Array of author related entries for the item
 	 */
-	private static function fetchAuthor($xpath, $context, $importer, &$contact, $onlyfetch)
+	private static function fetchAuthor(DOMXPath $xpath, $context, array $importer, array &$contact = null, $onlyfetch)
 	{
 		$author = [];
-		$author["author-link"] = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue;
-		$author["author-name"] = $xpath->evaluate('atom:author/atom:name/text()', $context)->item(0)->nodeValue;
-		$addr = $xpath->evaluate('atom:author/atom:email/text()', $context)->item(0)->nodeValue;
+		$author["author-link"] = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()', $context);
+		$author["author-name"] = XML::getFirstNodeValue($xpath, 'atom:author/atom:name/text()', $context);
+		$addr = XML::getFirstNodeValue($xpath, 'atom:author/atom:email/text()', $context);
 
 		$aliaslink = $author["author-link"];
 
-		$alternate = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0)->attributes;
-		if (is_object($alternate)) {
-			foreach ($alternate as $attributes) {
+		$alternate_item = $xpath->query("atom:author/atom:link[@rel='alternate']", $context)->item(0);
+		if (is_object($alternate_item)) {
+			foreach ($alternate_item->attributes as $attributes) {
 				if (($attributes->name == "href") && ($attributes->textContent != "")) {
 					$author["author-link"] = $attributes->textContent;
 				}
 			}
 		}
+		$author["author-id"] = Contact::getIdForURL($author["author-link"]);
+
 		$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, NETWORK_STATUSNET,
-					CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
-			$contact = dba::selectFirst('contact', [], $condition);
+					$importer["uid"], $aliaslink, Protocol::STATUSNET,
+					Contact::SHARING, Contact::FRIEND];
+			$contact = DBA::selectFirst('contact', [], $condition);
 		}
 
-		if (!DBM::is_result($contact) && $author["author-link"] != '') {
+		if (!DBA::isResult($contact) && $author["author-link"] != '') {
 			if ($aliaslink == "") {
 				$aliaslink = $author["author-link"];
 			}
 
 			$condition = ["`uid` = ? AND `nurl` IN (?, ?) AND `network` != ? AND `rel` IN (?, ?)",
 					$importer["uid"], normalise_link($author["author-link"]), normalise_link($aliaslink),
-					NETWORK_STATUSNET, CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
-			$contact = dba::selectFirst('contact', [], $condition);
+					Protocol::STATUSNET, Contact::SHARING, Contact::FRIEND];
+			$contact = DBA::selectFirst('contact', [], $condition);
 		}
 
-		if (!DBM::is_result($contact) && ($addr != '')) {
+		if (!DBA::isResult($contact) && ($addr != '')) {
 			$condition = ["`uid` = ? AND `addr` = ? AND `network` != ? AND `rel` IN (?, ?)",
-					$importer["uid"], $addr, NETWORK_STATUSNET,
-					CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
-			$contact = dba::selectFirst('contact', [], $condition);
+					$importer["uid"], $addr, Protocol::STATUSNET,
+					Contact::SHARING, Contact::FRIEND];
+			$contact = DBA::selectFirst('contact', [], $condition);
 		}
 
-		if (DBM::is_result($contact)) {
+		if (DBA::isResult($contact)) {
 			if ($contact['blocked']) {
 				$contact['id'] = -1;
 			}
@@ -125,17 +138,15 @@ class OStatus
 			$author["author-avatar"] = Probe::fixAvatar(current($avatarlist), $author["author-link"]);
 		}
 
-		$displayname = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
+		$displayname = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()', $context);
 		if ($displayname != "") {
 			$author["author-name"] = $displayname;
 		}
 
-		$author["owner-name"] = $author["author-name"];
-		$author["owner-link"] = $author["author-link"];
-		$author["owner-avatar"] = $author["author-avatar"];
+		$author["owner-id"] = $author["author-id"];
 
 		// Only update the contacts if it is an OStatus contact
-		if (DBM::is_result($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == NETWORK_OSTATUS)) {
+		if (DBA::isResult($contact) && ($contact['id'] > 0) && !$onlyfetch && ($contact["network"] == Protocol::OSTATUS)) {
 
 			// Update contact data
 			$current = $contact;
@@ -154,34 +165,34 @@ class OStatus
 			$contact['url'] = $author["author-link"];
 			$contact['nurl'] = normalise_link($contact['url']);
 
-			$value = $xpath->evaluate('atom:author/atom:uri/text()', $context)->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()', $context);
 			if ($value != "") {
 				$contact["alias"] = $value;
 			}
 
-			$value = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:displayName/text()', $context);
 			if ($value != "") {
 				$contact["name"] = $value;
 			}
 
-			$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $context);
 			if ($value != "") {
 				$contact["nick"] = $value;
 			}
 
-			$value = $xpath->evaluate('atom:author/poco:note/text()', $context)->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:note/text()', $context);
 			if ($value != "") {
 				$contact["about"] = HTML::toBBCode($value);
 			}
 
-			$value = $xpath->evaluate('atom:author/poco:address/poco:formatted/text()', $context)->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:address/poco:formatted/text()', $context);
 			if ($value != "") {
 				$contact["location"] = $value;
 			}
 
 			$contact['name-date'] = DateTimeFormat::utcNow();
 
-			dba::update('contact', $contact, ['id' => $contact["id"]], $current);
+			DBA::update('contact', $contact, ['id' => $contact["id"]], $current);
 
 			if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) {
 				logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG);
@@ -193,7 +204,7 @@ class OStatus
 
 			if ($cid) {
 				$fields = ['url', 'nurl', 'name', 'nick', 'alias', 'about', 'location'];
-				$old_contact = dba::selectFirst('contact', $fields, ['id' => $cid]);
+				$old_contact = DBA::selectFirst('contact', $fields, ['id' => $cid]);
 
 				// Update it with the current values
 				$fields = ['url' => $author["author-link"], 'name' => $contact["name"],
@@ -202,18 +213,24 @@ class OStatus
 						'about' => $contact["about"], 'location' => $contact["location"],
 						'success_update' => DateTimeFormat::utcNow(), 'last-update' => DateTimeFormat::utcNow()];
 
-				dba::update('contact', $fields, ['id' => $cid], $old_contact);
+				DBA::update('contact', $fields, ['id' => $cid], $old_contact);
 
 				// Update the avatar
-				Contact::updateAvatar($author["author-avatar"], 0, $cid);
+				if (!empty($author["author-avatar"])) {
+					Contact::updateAvatar($author["author-avatar"], 0, $cid);
+				}
 			}
 
 			$contact["generation"] = 2;
 			$contact["hide"] = false; // OStatus contacts are never hidden
-			$contact["photo"] = $author["author-avatar"];
+			if (!empty($author["author-avatar"])) {
+				$contact["photo"] = $author["author-avatar"];
+			}
 			$gcid = GContact::update($contact);
 
 			GContact::link($gcid, $contact["uid"], $contact["id"]);
+		} elseif ($contact["network"] != Protocol::DFRN) {
+			$contact = null;
 		}
 
 		return $author;
@@ -227,7 +244,7 @@ class OStatus
 	 *
 	 * @return array Array of author related entries for the item
 	 */
-	public static function salmonAuthor($xml, $importer)
+	public static function salmonAuthor($xml, array $importer)
 	{
 		if ($xml == "") {
 			return;
@@ -281,7 +298,7 @@ class OStatus
 	 * @param string $hub      Called by reference, returns the fetched hub data
 	 * @return void
 	 */
-	public static function import($xml, $importer, &$contact, &$hub)
+	public static function import($xml, array $importer, array &$contact = null, &$hub)
 	{
 		self::process($xml, $importer, $contact, $hub);
 	}
@@ -298,14 +315,14 @@ class OStatus
 	 *
 	 * @return boolean Could the XML be processed?
 	 */
-	private static function process($xml, $importer, &$contact, &$hub, $stored = false, $initialize = true)
+	private static function process($xml, array $importer, array &$contact = null, &$hub, $stored = false, $initialize = true)
 	{
 		if ($initialize) {
 			self::$itemlist = [];
 			self::$conv_list = [];
 		}
 
-		logger("Import OStatus message", LOGGER_DEBUG);
+		logger('Import OStatus message for user ' . $importer['uid'], LOGGER_DEBUG);
 
 		if ($xml == "") {
 			return false;
@@ -324,23 +341,29 @@ class OStatus
 		$xpath->registerNamespace('statusnet', NAMESPACE_STATUSNET);
 
 		$hub = "";
-		$hub_attributes = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0)->attributes;
-		if (is_object($hub_attributes)) {
-			foreach ($hub_attributes as $hub_attribute) {
-				if ($hub_attribute->name == "href") {
-					$hub = $hub_attribute->textContent;
-					logger("Found hub ".$hub, LOGGER_DEBUG);
+		$hub_items = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0);
+		if (is_object($hub_items)) {
+			$hub_attributes = $hub_items->attributes;
+			if (is_object($hub_attributes)) {
+				foreach ($hub_attributes as $hub_attribute) {
+					if ($hub_attribute->name == "href") {
+						$hub = $hub_attribute->textContent;
+						logger("Found hub ".$hub, LOGGER_DEBUG);
+					}
 				}
 			}
 		}
 
 		$header = [];
 		$header["uid"] = $importer["uid"];
-		$header["network"] = NETWORK_OSTATUS;
-		$header["type"] = "remote";
+		$header["network"] = Protocol::OSTATUS;
 		$header["wall"] = 0;
 		$header["origin"] = 0;
-		$header["gravity"] = GRAVITY_PARENT;
+		$header["gravity"] = GRAVITY_COMMENT;
+
+		if (!is_object($doc->firstChild) || empty($doc->firstChild->tagName)) {
+			return false;
+		}
 
 		$first_child = $doc->firstChild->tagName;
 
@@ -358,7 +381,7 @@ class OStatus
 			$doc2->formatOutput = true;
 			$xml2 = $doc2->saveXML();
 
-			$header["protocol"] = PROTOCOL_OSTATUS_SALMON;
+			$header["protocol"] = Conversation::PARCEL_SALMON;
 			$header["source"] = $xml2;
 		} elseif (!$initialize) {
 			return false;
@@ -389,7 +412,7 @@ class OStatus
 				$author = self::fetchAuthor($xpath, $entry, $importer, $contact, $stored);
 			}
 
-			$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $entry)->item(0)->nodeValue;
+			$value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $entry);
 			if ($value != "") {
 				$nickname = $value;
 			} else {
@@ -398,9 +421,9 @@ class OStatus
 
 			$item = array_merge($header, $author);
 
-			$item["uri"] = $xpath->query('atom:id/text()', $entry)->item(0)->nodeValue;
+			$item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
 
-			$item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
+			$item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $entry);
 
 			// Delete a message
 			if (in_array($item["verb"], ['qvitter-delete-notice', ACTIVITY_DELETE, 'delete'])) {
@@ -415,7 +438,7 @@ class OStatus
 			}
 
 			// Deletions come with the same uri, so we check for duplicates after processing deletions
-			if (dba::exists('item', ['uid' => $importer["uid"], 'uri' => $item["uri"]])) {
+			if (Item::exists(['uid' => $importer["uid"], 'uri' => $item["uri"]])) {
 				logger('Post with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', LOGGER_DEBUG);
 				continue;
 			} else {
@@ -440,6 +463,7 @@ class OStatus
 			}
 
 			if ($item["verb"] == NAMESPACE_OSTATUS."/unfollow") {
+				$dummy = null;
 				Contact::removeFollower($importer, $contact, $item, $dummy);
 				continue;
 			}
@@ -450,7 +474,8 @@ class OStatus
 
 				$item["verb"] = ACTIVITY_LIKE;
 				$item["parent-uri"] = $orig_uri;
-				$item["gravity"] = GRAVITY_LIKE;
+				$item["gravity"] = GRAVITY_ACTIVITY;
+				$item["object-type"] = ACTIVITY_OBJ_NOTE;
 			}
 
 			// http://activitystrea.ms/schema/1.0/rsvp-yes
@@ -488,7 +513,7 @@ class OStatus
 					}
 				} else {
 					// But we will only import complete threads
-					$valid = dba::exists('item', ['uid' => $importer["uid"], 'uri' => self::$itemlist[0]['parent-uri']]);
+					$valid = Item::exists(['uid' => $importer["uid"], 'uri' => self::$itemlist[0]['parent-uri']]);
 					if ($valid) {
 						logger("Item with uri ".self::$itemlist[0]["uri"]." belongs to parent ".self::$itemlist[0]['parent-uri']." of user ".$importer["uid"].". It will be imported.", LOGGER_DEBUG);
 					}
@@ -505,16 +530,16 @@ class OStatus
 						}
 					}
 					foreach (self::$itemlist as $item) {
-						$found = dba::exists('item', ['uid' => $importer["uid"], 'uri' => $item["uri"]]);
+						$found = Item::exists(['uid' => $importer["uid"], 'uri' => $item["uri"]]);
 						if ($found) {
 							logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already exists.", LOGGER_DEBUG);
 						} elseif ($item['contact-id'] < 0) {
 							logger("Item with uri ".$item["uri"]." is from a blocked contact.", LOGGER_DEBUG);
 						} else {
 							// We are having duplicated entries. Hopefully this solves it.
-							if (Lock::set('ostatus_process_item_insert')) {
+							if (Lock::acquire('ostatus_process_item_insert')) {
 								$ret = Item::insert($item);
-								Lock::remove('ostatus_process_item_insert');
+								Lock::release('ostatus_process_item_insert');
 								logger("Item with uri ".$item["uri"]." for user ".$importer["uid"].' stored. Return value: '.$ret);
 							} else {
 								$ret = Item::insert($item);
@@ -531,13 +556,14 @@ class OStatus
 	}
 
 	/**
-	 * @param object $item item
+	 * Removes notice item from database
+	 * @param array $item item
 	 * @return void
 	 */
-	private static function deleteNotice($item)
+	private static function deleteNotice(array $item)
 	{
-		$condition = ['uid' => $item['uid'], 'author-link' => $item['author-link'], 'uri' => $item['uri']];
-		if (!dba::exists('item', $condition)) {
+		$condition = ['uid' => $item['uid'], 'author-id' => $item['author-id'], 'uri' => $item['uri']];
+		if (!Item::exists($condition)) {
 			logger('Item from '.$item['author-link'].' with uri '.$item['uri'].' for user '.$item['uid']." wasn't found. We don't delete it.");
 			return;
 		}
@@ -556,21 +582,20 @@ class OStatus
 	 * @param array  $importer user record of the importing user
 	 * @return void
 	 */
-	private static function processPost($xpath, $entry, &$item, $importer)
+	private static function processPost(DOMXPath $xpath, $entry, array &$item, array $importer)
 	{
-		$item["body"] = HTML::toBBCode($xpath->query('atom:content/text()', $entry)->item(0)->nodeValue);
-		$item["object-type"] = $xpath->query('activity:object-type/text()', $entry)->item(0)->nodeValue;
+		$item["body"] = HTML::toBBCode(XML::getFirstNodeValue($xpath, 'atom:content/text()', $entry));
+		$item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $entry);
 		if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) || ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
-			$item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
-			$item["body"] = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
+			$item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
+			$item["body"] = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry);
 		} elseif ($item["object-type"] == ACTIVITY_OBJ_QUESTION) {
-			$item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
+			$item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
 		}
 
-		$item["created"] = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
-		$item["edited"] = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
-		$conversation = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue;
-		$item['conversation-uri'] = $conversation;
+		$item["created"] = XML::getFirstNodeValue($xpath, 'atom:published/text()', $entry);
+		$item["edited"] = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $entry);
+		$item['conversation-uri'] = XML::getFirstNodeValue($xpath, 'ostatus:conversation/text()', $entry);
 
 		$conv = $xpath->query('ostatus:conversation', $entry);
 		if (is_object($conv->item(0))) {
@@ -609,9 +634,12 @@ class OStatus
 				foreach ($category->attributes as $attributes) {
 					if ($attributes->name == "term") {
 						$term = $attributes->textContent;
-						if (strlen($item["tag"])) {
+						if (!empty($item["tag"])) {
 							$item["tag"] .= ',';
+						} else {
+							$item["tag"] = '';
 						}
+
 						$item["tag"] .= "#[url=".System::baseUrl()."/search?tag=".$term."]".$term."[/url]";
 					}
 				}
@@ -658,7 +686,7 @@ class OStatus
 
 		// Mastodon Content Warning
 		if (($item["verb"] == ACTIVITY_POST) && $xpath->evaluate('boolean(atom:summary)', $entry)) {
-			$clear_text = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
+			$clear_text = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $entry);
 			if (!empty($clear_text)) {
 				$item['content-warning'] = HTML::toBBCode($clear_text);
 			}
@@ -673,18 +701,16 @@ class OStatus
 		}
 
 		if (isset($item["parent-uri"])) {
-			if (!dba::exists('item', ['uid' => $importer["uid"], 'uri' => $item['parent-uri']])) {
+			if (!Item::exists(['uid' => $importer["uid"], 'uri' => $item['parent-uri']])) {
 				if ($related != '') {
 					self::fetchRelated($related, $item["parent-uri"], $importer);
 				}
 			} else {
 				logger('Reply with URI '.$item["uri"].' already existed for user '.$importer["uid"].'.', LOGGER_DEBUG);
 			}
-
-			$item["type"] = 'remote-comment';
-			$item["gravity"] = GRAVITY_COMMENT;
 		} else {
 			$item["parent-uri"] = $item["uri"];
+			$item["gravity"] = GRAVITY_PARENT;
 		}
 
 		if (($item['author-link'] != '') && !empty($item['protocol'])) {
@@ -783,9 +809,9 @@ class OStatus
 
 			$conv_data = [];
 
-			$conv_data['protocol'] = PROTOCOL_SPLITTED_CONV;
-			$conv_data['network'] = NETWORK_OSTATUS;
-			$conv_data['uri'] = $xpath->query('atom:id/text()', $entry)->item(0)->nodeValue;
+			$conv_data['protocol'] = Conversation::PARCEL_SPLIT_CONVERSATION;
+			$conv_data['network'] = Protocol::OSTATUS;
+			$conv_data['uri'] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
 
 			$inreplyto = $xpath->query('thr:in-reply-to', $entry);
 			if (is_object($inreplyto->item(0))) {
@@ -796,8 +822,7 @@ class OStatus
 				}
 			}
 
-			$conv = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue;
-			$conv_data['conversation-uri'] = $conv;
+			$conv_data['conversation-uri'] = XML::getFirstNodeValue($xpath, 'ostatus:conversation/text()', $entry);
 
 			$conv = $xpath->query('ostatus:conversation', $entry);
 			if (is_object($conv->item(0))) {
@@ -825,10 +850,10 @@ class OStatus
 
 			$conv_data['source'] = $doc2->saveXML();
 
-			$condition = ['item-uri' => $conv_data['uri'],'protocol' => PROTOCOL_OSTATUS_FEED];
-			if (dba::exists('conversation', $condition)) {
+			$condition = ['item-uri' => $conv_data['uri'],'protocol' => Conversation::PARCEL_FEED];
+			if (DBA::exists('conversation', $condition)) {
 				logger('Delete deprecated entry for URI '.$conv_data['uri'], LOGGER_DEBUG);
-				dba::delete('conversation', ['item-uri' => $conv_data['uri']]);
+				DBA::delete('conversation', ['item-uri' => $conv_data['uri']]);
 			}
 
 			logger('Store conversation data for uri '.$conv_data['uri'], LOGGER_DEBUG);
@@ -847,10 +872,10 @@ class OStatus
 	 * @param array  $item The item array
 	 * @return void
 	 */
-	private static function fetchSelf($self, &$item)
+	private static function fetchSelf($self, array &$item)
 	{
-		$condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $self, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON];
-		if (dba::exists('conversation', $condition)) {
+		$condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $self, Conversation::PARCEL_DFRN, Conversation::PARCEL_SALMON];
+		if (DBA::exists('conversation', $condition)) {
 			logger('Conversation '.$item['uri'].' is already stored.', LOGGER_DEBUG);
 			return;
 		}
@@ -868,7 +893,7 @@ class OStatus
 		$doc->formatOutput = true;
 		$xml = $doc->saveXML();
 
-		$item["protocol"] = PROTOCOL_OSTATUS_SALMON;
+		$item["protocol"] = Conversation::PARCEL_SALMON;
 		$item["source"] = $xml;
 
 		logger('Conversation '.$item['uri'].' is now fetched.', LOGGER_DEBUG);
@@ -884,18 +909,18 @@ class OStatus
 	 */
 	private static function fetchRelated($related, $related_uri, $importer)
 	{
-		$condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON];
-		$conversation = dba::selectFirst('conversation', ['source', 'protocol'], $condition);
-		if (DBM::is_result($conversation)) {
+		$condition = ['`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, Conversation::PARCEL_DFRN, Conversation::PARCEL_SALMON];
+		$conversation = DBA::selectFirst('conversation', ['source', 'protocol'], $condition);
+		if (DBA::isResult($conversation)) {
 			$stored = true;
 			$xml = $conversation['source'];
 			if (self::process($xml, $importer, $contact, $hub, $stored, false)) {
 				logger('Got valid cached XML for URI '.$related_uri, LOGGER_DEBUG);
 				return;
 			}
-			if ($conversation['protocol'] == PROTOCOL_OSTATUS_SALMON) {
+			if ($conversation['protocol'] == Conversation::PARCEL_SALMON) {
 				logger('Delete invalid cached XML for URI '.$related_uri, LOGGER_DEBUG);
-				dba::delete('conversation', ['item-uri' => $related_uri]);
+				DBA::delete('conversation', ['item-uri' => $related_uri]);
 			}
 		}
 
@@ -964,9 +989,9 @@ class OStatus
 
 		// Finally we take the data that we fetched from "ostatus:conversation"
 		if ($xml == '') {
-			$condition = ['item-uri' => $related_uri, 'protocol' => PROTOCOL_SPLITTED_CONV];
-			$conversation = dba::selectFirst('conversation', ['source'], $condition);
-			if (DBM::is_result($conversation)) {
+			$condition = ['item-uri' => $related_uri, 'protocol' => Conversation::PARCEL_SPLIT_CONVERSATION];
+			$conversation = DBA::selectFirst('conversation', ['source'], $condition);
+			if (DBA::isResult($conversation)) {
 				$stored = true;
 				logger('Got cached XML from conversation for URI '.$related_uri, LOGGER_DEBUG);
 				$xml = $conversation['source'];
@@ -991,32 +1016,32 @@ class OStatus
 	 *
 	 * @return array with data from links
 	 */
-	private static function processRepeatedItem($xpath, $entry, &$item, $importer)
+	private static function processRepeatedItem(DOMXPath $xpath, $entry, array &$item, array $importer)
 	{
-		$activityobjects = $xpath->query('activity:object', $entry)->item(0);
+		$activityobject = $xpath->query('activity:object', $entry)->item(0);
 
-		if (!is_object($activityobjects)) {
+		if (!is_object($activityobject)) {
 			return [];
 		}
 
 		$link_data = [];
 
-		$orig_uri = $xpath->query('atom:id/text()', $activityobjects)->item(0)->nodeValue;
+		$orig_uri = XML::getFirstNodeValue($xpath, 'atom:id/text()', $activityobject);
 
-		$links = $xpath->query("atom:link", $activityobjects);
+		$links = $xpath->query("atom:link", $activityobject);
 		if ($links) {
 			$link_data = self::processLinks($links, $item);
 		}
 
-		$orig_body = $xpath->query('atom:content/text()', $activityobjects)->item(0)->nodeValue;
-		$orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue;
-		$orig_edited = $xpath->query('atom:updated/text()', $activityobjects)->item(0)->nodeValue;
+		$orig_body = XML::getFirstNodeValue($xpath, 'atom:content/text()', $activityobject);
+		$orig_created = XML::getFirstNodeValue($xpath, 'atom:published/text()', $activityobject);
+		$orig_edited = XML::getFirstNodeValue($xpath, 'atom:updated/text()', $activityobject);
 
-		$orig_author = self::fetchAuthor($xpath, $activityobjects, $importer, $dummy, false);
+		$orig_author = self::fetchAuthor($xpath, $activityobject, $importer, $dummy, false);
 
 		$item["author-name"] = $orig_author["author-name"];
 		$item["author-link"] = $orig_author["author-link"];
-		$item["author-avatar"] = $orig_author["author-avatar"];
+		$item["author-id"] = $orig_author["author-id"];
 
 		$item["body"] = HTML::toBBCode($orig_body);
 		$item["created"] = $orig_created;
@@ -1024,11 +1049,19 @@ class OStatus
 
 		$item["uri"] = $orig_uri;
 
-		$item["verb"] = $xpath->query('activity:verb/text()', $activityobjects)->item(0)->nodeValue;
+		$item["verb"] = XML::getFirstNodeValue($xpath, 'activity:verb/text()', $activityobject);
 
-		$item["object-type"] = $xpath->query('activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
+		$item["object-type"] = XML::getFirstNodeValue($xpath, 'activity:object-type/text()', $activityobject);
 
-		$inreplyto = $xpath->query('thr:in-reply-to', $activityobjects);
+		// Mastodon Content Warning
+		if (($item["verb"] == ACTIVITY_POST) && $xpath->evaluate('boolean(atom:summary)', $activityobject)) {
+			$clear_text = XML::getFirstNodeValue($xpath, 'atom:summary/text()', $activityobject);
+			if (!empty($clear_text)) {
+				$item['content-warning'] = HTML::toBBCode($clear_text);
+			}
+		}
+
+		$inreplyto = $xpath->query('thr:in-reply-to', $activityobject);
 		if (is_object($inreplyto->item(0))) {
 			foreach ($inreplyto->item(0)->attributes as $attributes) {
 				if ($attributes->name == "ref") {
@@ -1048,14 +1081,14 @@ class OStatus
 	 *
 	 * @return array with data from the links
 	 */
-	private static function processLinks($links, &$item)
+	private static function processLinks($links, array &$item)
 	{
 		$link_data = ['add_body' => '', 'self' => ''];
 
 		foreach ($links as $link) {
 			$attribute = self::readAttributes($link);
 
-			if (($attribute['rel'] != "") && ($attribute['href'] != "")) {
+			if (!empty($attribute['rel']) && !empty($attribute['href'])) {
 				switch ($attribute['rel']) {
 					case "alternate":
 						$item["plink"] = $attribute['href'];
@@ -1077,13 +1110,15 @@ class OStatus
 						if ($filetype == 'image') {
 							$link_data['add_body'] .= "\n[img]".$attribute['href'].'[/img]';
 						} else {
-							if (strlen($item["attach"])) {
+							if (!empty($item["attach"])) {
 								$item["attach"] .= ',';
+							} else {
+								$item["attach"] = '';
 							}
 							if (!isset($attribute['length'])) {
 								$attribute['length'] = "0";
 							}
-							$item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.$attribute['title'].'"[/attach]';
+							$item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.defaults($attribute, 'title', '').'"[/attach]';
 						}
 						break;
 					case "related":
@@ -1097,7 +1132,7 @@ class OStatus
 						}
 						break;
 					case "self":
-						if ($item["plink"] == '') {
+						if (empty($item["plink"])) {
 							$item["plink"] = $attribute['href'];
 						}
 						$link_data['self'] = $attribute['href'];
@@ -1148,7 +1183,7 @@ class OStatus
 	 *
 	 * @return string The guid if the post is a reshare
 	 */
-	private static function getResharedGuid($item)
+	private static function getResharedGuid(array $item)
 	{
 		$body = trim($item["body"]);
 
@@ -1171,12 +1206,12 @@ class OStatus
 
 		$guid = "";
 		preg_match("/guid='(.*?)'/ism", $attributes, $matches);
-		if ($matches[1] != "") {
+		if (!empty($matches[1])) {
 			$guid = $matches[1];
 		}
 
 		preg_match('/guid="(.*?)"/ism', $attributes, $matches);
-		if ($matches[1] != "") {
+		if (!empty($matches[1])) {
 			$guid = $matches[1];
 		}
 
@@ -1202,7 +1237,7 @@ class OStatus
 			}
 
 			// Is it a remote picture? Then make a smaller preview here
-			$preview = proxy_url($preview, false, PROXY_SIZE_SMALL);
+			$preview = ProxyUtils::proxifyUrl($preview, false, ProxyUtils::SIZE_SMALL);
 
 			// Is it a local picture? Then make it smaller here
 			$preview = str_replace(["-0.jpg", "-0.png"], ["-2.jpg", "-2.png"], $preview);
@@ -1229,7 +1264,7 @@ class OStatus
 	 *
 	 * @return object header root element
 	 */
-	private static function addHeader($doc, $owner, $filter)
+	private static function addHeader(DOMDocument $doc, array $owner, $filter)
 	{
 		$a = get_app();
 
@@ -1256,7 +1291,7 @@ class OStatus
 		XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes);
 		XML::addElement($doc, $root, "id", System::baseUrl() . "/profile/" . $owner["nick"]);
 		XML::addElement($doc, $root, "title", $title);
-		XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], $a->config["sitename"]));
+		XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], Config::get('config', 'sitename')));
 		XML::addElement($doc, $root, "logo", $owner["photo"]);
 		XML::addElement($doc, $root, "updated", DateTimeFormat::utcNow(DateTimeFormat::ATOM));
 
@@ -1287,10 +1322,10 @@ class OStatus
 			"rel" => "self", "type" => "application/atom+xml"];
 		XML::addElement($doc, $root, "link", "", $attributes);
 
-		if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
+		if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
 			$condition = ['uid' => $owner['uid'], 'self' => false, 'pending' => false,
 					'archive' => false, 'hidden' => false, 'blocked' => false];
-			$members = dba::count('contact', $condition);
+			$members = DBA::count('contact', $condition);
 			XML::addElement($doc, $root, "statusnet:group_info", "", ["member_count" => $members]);
 		}
 
@@ -1305,7 +1340,7 @@ class OStatus
 	 * @param object $nick nick
 	 * @return void
 	 */
-	public static function hublinks($doc, $root, $nick)
+	public static function hublinks(DOMDocument $doc, $root, $nick)
 	{
 		$h = System::baseUrl() . '/pubsubhubbub/'.$nick;
 		XML::addElement($doc, $root, "link", "", ["href" => $h, "rel" => "hub"]);
@@ -1319,20 +1354,22 @@ class OStatus
 	 * @param array  $item Data of the item that is to be posted
 	 * @return void
 	 */
-	private static function getAttachment($doc, $root, $item)
+	private static function getAttachment(DOMDocument $doc, $root, $item)
 	{
 		$o = "";
 		$siteinfo = BBCode::getAttachedData($item["body"]);
 
 		switch ($siteinfo["type"]) {
 			case 'photo':
-				$imgdata = Image::getInfoFromURL($siteinfo["image"]);
-				if ($imgdata) {
-					$attributes = ["rel" => "enclosure",
-							"href" => $siteinfo["image"],
-							"type" => $imgdata["mime"],
-							"length" => intval($imgdata["size"])];
-					XML::addElement($doc, $root, "link", "", $attributes);
+				if (!empty($siteinfo["image"])) {
+					$imgdata = Image::getInfoFromURL($siteinfo["image"]);
+					if ($imgdata) {
+						$attributes = ["rel" => "enclosure",
+								"href" => $siteinfo["image"],
+								"type" => $imgdata["mime"],
+								"length" => intval($imgdata["size"])];
+						XML::addElement($doc, $root, "link", "", $attributes);
+					}
 				}
 				break;
 			case 'video':
@@ -1340,7 +1377,7 @@ class OStatus
 						"href" => $siteinfo["url"],
 						"type" => "text/html; charset=UTF-8",
 						"length" => "",
-						"title" => $siteinfo["title"]];
+						"title" => defaults($siteinfo, "title", $siteinfo["url"])];
 				XML::addElement($doc, $root, "link", "", $attributes);
 				break;
 			default:
@@ -1386,15 +1423,16 @@ class OStatus
 	 *
 	 * @param object $doc   XML document
 	 * @param array  $owner Contact data of the poster
+	 * @param bool   $show_profile Whether to show profile
 	 *
 	 * @return object author element
 	 */
-	private static function addAuthor($doc, $owner, $show_profile = true)
+	private static function addAuthor(DOMDocument $doc, array $owner, $show_profile = true)
 	{
-		$profile = dba::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid'], 'is-default' => true]);
+		$profile = DBA::selectFirst('profile', ['homepage', 'publish'], ['uid' => $owner['uid'], 'is-default' => true]);
 		$author = $doc->createElement("author");
 		XML::addElement($doc, $author, "id", $owner["url"]);
-		if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
+		if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
 			XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_GROUP);
 		} else {
 			XML::addElement($doc, $author, "activity:object-type", ACTIVITY_OBJ_PERSON);
@@ -1439,7 +1477,7 @@ class OStatus
 			}
 		}
 
-		if (DBM::is_result($profile) && !$show_profile) {
+		if (DBA::isResult($profile) && !$show_profile) {
 			if (trim($profile["homepage"]) != "") {
 				$urls = $doc->createElement("poco:urls");
 				XML::addElement($doc, $urls, "poco:type", "homepage");
@@ -1472,9 +1510,9 @@ class OStatus
 	 *
 	 * @return string activity
 	 */
-	private static function constructVerb($item)
+	private static function constructVerb(array $item)
 	{
-		if ($item['verb']) {
+		if (!empty($item['verb'])) {
 			return $item['verb'];
 		}
 
@@ -1488,7 +1526,7 @@ class OStatus
 	 *
 	 * @return string Object type
 	 */
-	private static function constructObjecttype($item)
+	private static function constructObjecttype(array $item)
 	{
 		if (in_array($item['object-type'], [ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT]))
 			return $item['object-type'];
@@ -1505,7 +1543,7 @@ class OStatus
 	 *
 	 * @return object Entry element
 	 */
-	private static function entry($doc, $item, $owner, $toplevel = false)
+	private static function entry(DOMDocument $doc, array $item, array $owner, $toplevel = false)
 	{
 		$xml = null;
 
@@ -1535,7 +1573,7 @@ class OStatus
 	 *
 	 * @return object Source element
 	 */
-	private static function sourceEntry($doc, $contact)
+	private static function sourceEntry(DOMDocument $doc, array $contact)
 	{
 		$source = $doc->createElement("source");
 		XML::addElement($doc, $source, "id", $contact["poll"]);
@@ -1556,31 +1594,28 @@ class OStatus
 	 *
 	 * @return array Contact array
 	 */
-	private static function contactEntry($url, $owner)
+	private static function contactEntry($url, array $owner)
 	{
 		$r = q(
 			"SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` IN (0, %d) ORDER BY `uid` DESC LIMIT 1",
-			dbesc(normalise_link($url)),
+			DBA::escape(normalise_link($url)),
 			intval($owner["uid"])
 		);
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$contact = $r[0];
 			$contact["uid"] = -1;
 		}
 
-		if (!DBM::is_result($r)) {
-			$r = q(
-				"SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-				dbesc(normalise_link($url))
-			);
-			if (DBM::is_result($r)) {
-				$contact = $r[0];
+		if (!DBA::isResult($r)) {
+			$gcontact = DBA::selectFirst('gcontact', [], ['nurl' => normalise_link($url)]);
+			if (DBA::isResult($r)) {
+				$contact = $gcontact;
 				$contact["uid"] = -1;
 				$contact["success_update"] = $contact["updated"];
 			}
 		}
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			$contact = owner;
 		}
 
@@ -1597,6 +1632,8 @@ class OStatus
 			$contact["alias"] = $contact["url"];
 		}
 
+		$contact['account-type'] = $owner['account-type'];
+
 		return $contact;
 	}
 
@@ -1611,7 +1648,7 @@ class OStatus
 	 *
 	 * @return object Entry element
 	 */
-	private static function reshareEntry($doc, $item, $owner, $repeated_guid, $toplevel)
+	private static function reshareEntry(DOMDocument $doc, array $item, array $owner, $repeated_guid, $toplevel)
 	{
 		if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
 			logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
@@ -1619,22 +1656,14 @@ class OStatus
 
 		$title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
 
-		$r = q(
-			"SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' AND NOT `private` AND `network` IN ('%s', '%s', '%s') LIMIT 1",
-			intval($owner["uid"]),
-			dbesc($repeated_guid),
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_DIASPORA),
-			dbesc(NETWORK_OSTATUS)
-		);
-		if (DBM::is_result($r)) {
-			$repeated_item = $r[0];
-		} else {
+		$condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => false,
+			'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]];
+		$repeated_item = Item::selectFirst([], $condition);
+		if (!DBA::isResult($repeated_item)) {
 			return false;
 		}
-		$contact = self::contactEntry($repeated_item['author-link'], $owner);
 
-		$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
+		$contact = self::contactEntry($repeated_item['author-link'], $owner);
 
 		$title = $owner["nick"]." repeated a notice by ".$contact["nick"];
 
@@ -1682,7 +1711,7 @@ class OStatus
 	 *
 	 * @return object Entry element with "like"
 	 */
-	private static function likeEntry($doc, $item, $owner, $toplevel)
+	private static function likeEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
 	{
 		if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
 			logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
@@ -1695,16 +1724,15 @@ class OStatus
 
 		$as_object = $doc->createElement("activity:object");
 
-		$parent = q(
-			"SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
-			dbesc($item["thr-parent"]),
-			intval($item["uid"])
-		);
-		$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
+		$parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]);
 
-		XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent[0]));
+		if (!$parent) {
+			$parent = [];
+		}
 
-		self::entryContent($doc, $as_object, $parent[0], $owner, "New entry");
+		XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent));
+
+		self::entryContent($doc, $as_object, $parent, $owner, "New entry");
 
 		$entry->appendChild($as_object);
 
@@ -1722,12 +1750,12 @@ class OStatus
 	 *
 	 * @return object author element
 	 */
-	private static function addPersonObject($doc, $owner, $contact)
+	private static function addPersonObject(DOMDocument $doc, array $owner, array $contact)
 	{
 		$object = $doc->createElement("activity:object");
 		XML::addElement($doc, $object, "activity:object-type", ACTIVITY_OBJ_PERSON);
 
-		if ($contact['network'] == NETWORK_PHANTOM) {
+		if ($contact['network'] == Protocol::PHANTOM) {
 			XML::addElement($doc, $object, "id", $contact['url']);
 			return $object;
 		}
@@ -1768,7 +1796,7 @@ class OStatus
 	 *
 	 * @return object Entry element
 	 */
-	private static function followEntry($doc, $item, $owner, $toplevel)
+	private static function followEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
 	{
 		$item["id"] = $item["parent"] = 0;
 		$item["created"] = $item["edited"] = date("c");
@@ -1782,14 +1810,11 @@ class OStatus
 			$item['follow'] = $contact['alias'];
 		}
 
-		$r = q(
-			"SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
-			intval($owner['uid']),
-			dbesc(normalise_link($contact["url"]))
-		);
+		$condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($contact["url"])];
+		$user_contact = DBA::selectFirst('contact', ['id'], $condition);
 
-		if (DBM::is_result($r)) {
-			$connect_id = $r[0]['id'];
+		if (DBA::isResult($user_contact)) {
+			$connect_id = $user_contact['id'];
 		} else {
 			$connect_id = 0;
 		}
@@ -1833,7 +1858,7 @@ class OStatus
 	 *
 	 * @return object Entry element
 	 */
-	private static function noteEntry($doc, $item, $owner, $toplevel)
+	private static function noteEntry(DOMDocument $doc, array $item, array $owner, $toplevel)
 	{
 		if (($item["id"] != $item["parent"]) && (normalise_link($item["author-link"]) != normalise_link($owner["url"]))) {
 			logger("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", LOGGER_DEBUG);
@@ -1860,14 +1885,14 @@ class OStatus
 	 *
 	 * @return string The title for the element
 	 */
-	private static function entryHeader($doc, &$entry, $owner, $item, $toplevel)
+	private static function entryHeader(DOMDocument $doc, &$entry, array $owner, array $item, $toplevel)
 	{
 		/// @todo Check if this title stuff is really needed (I guess not)
 		if (!$toplevel) {
 			$entry = $doc->createElement("entry");
 			$title = sprintf("New note by %s", $owner["nick"]);
 
-			if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
+			if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
 				$contact = self::contactEntry($item['author-link'], $owner);
 				$author = self::addAuthor($doc, $contact, false);
 				$entry->appendChild($author);
@@ -1904,7 +1929,7 @@ class OStatus
 	 * @param bool   $complete Add the "status_net" element?
 	 * @return void
 	 */
-	private static function entryContent($doc, $entry, $item, $owner, $title, $verb = "", $complete = true)
+	private static function entryContent(DOMDocument $doc, $entry, array $item, array $owner, $title, $verb = "", $complete = true)
 	{
 		if ($verb == "") {
 			$verb = self::constructVerb($item);
@@ -1947,27 +1972,24 @@ class OStatus
 	 * @param bool   $complete default true
 	 * @return void
 	 */
-	private static function entryFooter($doc, $entry, $item, $owner, $complete = true)
+	private static function entryFooter(DOMDocument $doc, $entry, array $item, array $owner, $complete = true)
 	{
 		$mentioned = [];
 
 		if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
-			$parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"]));
+			$parent = Item::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item["parent"]]);
 			$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
 
-			$thrparent = q(
-				"SELECT `guid`, `author-link`, `owner-link`, `plink` FROM `item` WHERE `uid` = %d AND `uri` = '%s'",
-				intval($owner["uid"]),
-				dbesc($parent_item)
-			);
-			if ($thrparent) {
-				$mentioned[$thrparent[0]["author-link"]] = $thrparent[0]["author-link"];
-				$mentioned[$thrparent[0]["owner-link"]] = $thrparent[0]["owner-link"];
-				$parent_plink = $thrparent[0]["plink"];
+			$thrparent = Item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $parent_item]);
+
+			if (DBA::isResult($thrparent)) {
+				$mentioned[$thrparent["author-link"]] = $thrparent["author-link"];
+				$mentioned[$thrparent["owner-link"]] = $thrparent["owner-link"];
+				$parent_plink = $thrparent["plink"];
 			} else {
-				$mentioned[$parent[0]["author-link"]] = $parent[0]["author-link"];
-				$mentioned[$parent[0]["owner-link"]] = $parent[0]["owner-link"];
-				$parent_plink = System::baseUrl()."/display/".$parent[0]["guid"];
+				$mentioned[$parent["author-link"]] = $parent["author-link"];
+				$mentioned[$parent["owner-link"]] = $parent["owner-link"];
+				$parent_plink = System::baseUrl()."/display/".$parent["guid"];
 			}
 
 			$attributes = [
@@ -1986,13 +2008,13 @@ class OStatus
 			$conversation_uri = $conversation_href;
 
 			if (isset($parent_item)) {
-				$r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $parent_item);
-				if (DBM::is_result($r)) {
-					if ($r['conversation-uri'] != '') {
-						$conversation_uri = $r['conversation-uri'];
+				$conversation = DBA::selectFirst('conversation', ['conversation-uri', 'conversation-href'], ['item-uri' => $parent_item]);
+				if (DBA::isResult($conversation)) {
+					if ($conversation['conversation-uri'] != '') {
+						$conversation_uri = $conversation['conversation-uri'];
 					}
-					if ($r['conversation-href'] != '') {
-						$conversation_href = $r['conversation-href'];
+					if ($conversation['conversation-href'] != '') {
+						$conversation_href = $conversation['conversation-href'];
 					}
 				}
 			}
@@ -2027,9 +2049,9 @@ class OStatus
 
 		foreach ($mentioned as $mention) {
 			$condition = ['uid' => $owner['uid'], 'nurl' => normalise_link($mention)];
-			$contact = dba::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition);
-			if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == ACCOUNT_TYPE_COMMUNITY) ||
-				($contact['self'] && ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY))) {
+			$contact = DBA::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition);
+			if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) ||
+				($contact['self'] && ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY))) {
 				XML::addElement($doc, $entry, "link", "",
 					[
 						"rel" => "mentioned",
@@ -2046,10 +2068,12 @@ class OStatus
 			}
 		}
 
-		if ($owner['account-type'] == ACCOUNT_TYPE_COMMUNITY) {
-			XML::addElement($doc, $entry, "link", "", ["rel" => "mentioned",
-									"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
-									"href" => $owner['url']]);
+		if ($owner['account-type'] == Contact::ACCOUNT_TYPE_COMMUNITY) {
+			XML::addElement($doc, $entry, "link", "", [
+				"rel" => "mentioned",
+				"ostatus:object-type" => "http://activitystrea.ms/schema/1.0/group",
+				"href" => $owner['url']
+			]);
 		}
 
 		if (!$item["private"]) {
@@ -2116,25 +2140,23 @@ class OStatus
 	{
 		$stamp = microtime(true);
 
+		$owner = User::getOwnerDataByNick($owner_nick);
+		if (!$owner) {
+			return;
+		}
+
 		$cachekey = "ostatus:feed:" . $owner_nick . ":" . $filter . ":" . $last_update;
 
 		$previous_created = $last_update;
 
-		$result = Cache::get($cachekey);
-		if (!$nocache && !is_null($result)) {
-			logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created . ' (cached)', LOGGER_DEBUG);
-			$last_update = $result['last_update'];
-			return $result['feed'];
-		}
-
-		$owner = dba::fetch_first(
-			"SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
-				FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-				WHERE `contact`.`self` AND `user`.`nickname` = ? LIMIT 1",
-			$owner_nick
-		);
-		if (!DBM::is_result($owner)) {
-			return;
+		// Don't cache when the last item was posted less then 15 minutes ago (Cache duration)
+		if ((time() - strtotime($owner['last-item'])) < 15*60) {
+			$result = Cache::get($cachekey);
+			if (!$nocache && !is_null($result)) {
+				logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created . ' (cached)', LOGGER_DEBUG);
+				$last_update = $result['last_update'];
+				return $result['feed'];
+			}
 		}
 
 		if (!strlen($last_update)) {
@@ -2144,37 +2166,30 @@ class OStatus
 		$check_date = DateTimeFormat::utc($last_update);
 		$authorid = Contact::getIdForURL($owner["url"], 0, true);
 
-		$sql_extra = '';
-		if ($filter === 'posts') {
-			$sql_extra .= ' AND `item`.`id` = `item`.`parent` ';
-		}
+		$condition = ["`uid` = ? AND `created` > ? AND NOT `deleted`
+			AND NOT `private` AND `visible` AND `wall` AND `parent-network` IN (?, ?)",
+			$owner["uid"], $check_date, Protocol::OSTATUS, Protocol::DFRN];
 
 		if ($filter === 'comments') {
-			$sql_extra .= sprintf(" AND `item`.`object-type` = '%s' ", dbesc(ACTIVITY_OBJ_COMMENT));
+			$condition[0] .= " AND `object-type` = ? ";
+			$condition[] = ACTIVITY_OBJ_COMMENT;
 		}
 
-		if ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY) {
-			$sql_extra .= sprintf(" AND `item`.`contact-id` = %d AND `item`.`author-id` = %d ", intval($owner["id"]), intval($authorid));
+		if ($owner['account-type'] != Contact::ACCOUNT_TYPE_COMMUNITY) {
+			$condition[0] .= " AND `contact-id` = ? AND `author-id` = ?";
+			$condition[] = $owner["id"];
+			$condition[] = $authorid;
 		}
 
-		$items = q(
-			"SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`)
-				STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent`
-				WHERE `item`.`uid` = %d
-				AND `item`.`created` > '%s'
-				AND NOT `item`.`deleted`
-				AND NOT `item`.`private`
-				AND `item`.`visible`
-				AND `item`.`wall`
-				AND `thread`.`network` IN ('%s', '%s')
-				$sql_extra
-				ORDER BY `item`.`created` DESC LIMIT %d",
-			intval($owner["uid"]),
-			dbesc($check_date),
-			dbesc(NETWORK_OSTATUS),
-			dbesc(NETWORK_DFRN),
-			intval($max_items)
-		);
+		$params = ['order' => ['created' => true], 'limit' => $max_items];
+
+		if ($filter === 'posts') {
+			$ret = Item::selectThread([], $condition, $params);
+		} else {
+			$ret = Item::select([], $condition, $params);
+		}
+
+		$items = Item::inArray($ret);
 
 		$doc = new DOMDocument('1.0', 'utf-8');
 		$doc->formatOutput = true;
@@ -2211,7 +2226,7 @@ class OStatus
 	 *
 	 * @return string XML for the salmon
 	 */
-	public static function salmon($item, $owner)
+	public static function salmon(array $item, array $owner)
 	{
 		$doc = new DOMDocument('1.0', 'utf-8');
 		$doc->formatOutput = true;
diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 35052fe67..2939f69e5 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -9,20 +9,20 @@
 
 namespace Friendica\Protocol;
 
+use DOMDocument;
+use DOMXPath;
+use Exception;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Config;
+use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use Friendica\Protocol\Diaspora;
-use dba;
-use DOMDocument;
-use DOMXPath;
-use Exception;
+use Friendica\Util\XML;
 
 require_once 'include/dba.php';
 
@@ -67,8 +67,8 @@ class PortableContact
 
 		if ($cid) {
 			if (!$url || !$uid) {
-				$contact = dba::selectFirst('contact', ['poco', 'uid'], ['id' => $cid]);
-				if (DBM::is_result($contact)) {
+				$contact = DBA::selectFirst('contact', ['poco', 'uid'], ['id' => $cid]);
+				if (DBA::isResult($contact)) {
 					$url = $contact['poco'];
 					$uid = $contact['uid'];
 				}
@@ -96,16 +96,16 @@ class PortableContact
 			return;
 		}
 
-		$j = json_decode($s);
+		$j = json_decode($s, true);
 
 		logger('load: json: ' . print_r($j, true), LOGGER_DATA);
 
-		if (! isset($j->entry)) {
+		if (!isset($j['entry'])) {
 			return;
 		}
 
 		$total = 0;
-		foreach ($j->entry as $entry) {
+		foreach ($j['entry'] as $entry) {
 			$total ++;
 			$profile_url = '';
 			$profile_photo = '';
@@ -120,61 +120,63 @@ class PortableContact
 			$contact_type = -1;
 			$generation = 0;
 
-			$name = $entry->displayName;
+			if (!empty($entry['displayName'])) {
+				$name = $entry['displayName'];
+			}
 
-			if (isset($entry->urls)) {
-				foreach ($entry->urls as $url) {
-					if ($url->type == 'profile') {
-						$profile_url = $url->value;
+			if (isset($entry['urls'])) {
+				foreach ($entry['urls'] as $url) {
+					if ($url['type'] == 'profile') {
+						$profile_url = $url['value'];
 						continue;
 					}
-					if ($url->type == 'webfinger') {
-						$connect_url = str_replace('acct:', '', $url->value);
+					if ($url['type'] == 'webfinger') {
+						$connect_url = str_replace('acct:', '', $url['value']);
 						continue;
 					}
 				}
 			}
-			if (isset($entry->photos)) {
-				foreach ($entry->photos as $photo) {
-					if ($photo->type == 'profile') {
-						$profile_photo = $photo->value;
+			if (isset($entry['photos'])) {
+				foreach ($entry['photos'] as $photo) {
+					if ($photo['type'] == 'profile') {
+						$profile_photo = $photo['value'];
 						continue;
 					}
 				}
 			}
 
-			if (isset($entry->updated)) {
-				$updated = date(DateTimeFormat::MYSQL, strtotime($entry->updated));
+			if (isset($entry['updated'])) {
+				$updated = date(DateTimeFormat::MYSQL, strtotime($entry['updated']));
 			}
 
-			if (isset($entry->network)) {
-				$network = $entry->network;
+			if (isset($entry['network'])) {
+				$network = $entry['network'];
 			}
 
-			if (isset($entry->currentLocation)) {
-				$location = $entry->currentLocation;
+			if (isset($entry['currentLocation'])) {
+				$location = $entry['currentLocation'];
 			}
 
-			if (isset($entry->aboutMe)) {
-				$about = HTML::toBBCode($entry->aboutMe);
+			if (isset($entry['aboutMe'])) {
+				$about = HTML::toBBCode($entry['aboutMe']);
 			}
 
-			if (isset($entry->gender)) {
-				$gender = $entry->gender;
+			if (isset($entry['gender'])) {
+				$gender = $entry['gender'];
 			}
 
-			if (isset($entry->generation) && ($entry->generation > 0)) {
-				$generation = ++$entry->generation;
+			if (isset($entry['generation']) && ($entry['generation'] > 0)) {
+				$generation = ++$entry['generation'];
 			}
 
-			if (isset($entry->tags)) {
-				foreach ($entry->tags as $tag) {
+			if (isset($entry['tags'])) {
+				foreach ($entry['tags'] as $tag) {
 					$keywords = implode(", ", $tag);
 				}
 			}
 
-			if (isset($entry->contactType) && ($entry->contactType >= 0)) {
-				$contact_type = $entry->contactType;
+			if (isset($entry['contactType']) && ($entry['contactType'] >= 0)) {
+				$contact_type = $entry['contactType'];
 			}
 
 			$gcontact = ["url" => $profile_url,
@@ -202,7 +204,7 @@ class PortableContact
 		logger("load: loaded $total entries", LOGGER_DEBUG);
 
 		$condition = ["`cid` = ? AND `uid` = ? AND `zcid` = ? AND `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY", $cid, $uid, $zcid];
-		dba::delete('glink', $condition);
+		DBA::delete('glink', $condition);
 	}
 
 	public static function reachable($profile, $server = "", $network = "", $force = false)
@@ -227,7 +229,7 @@ class PortableContact
 			$friendica = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$1$2", $profile);
 			if ($friendica != $profile) {
 				$server_url = $friendica;
-				$network = NETWORK_DFRN;
+				$network = Protocol::DFRN;
 			}
 		}
 
@@ -235,7 +237,7 @@ class PortableContact
 			$diaspora = preg_replace("=(https?://)(.*)/u/(.*)=ism", "$1$2", $profile);
 			if ($diaspora != $profile) {
 				$server_url = $diaspora;
-				$network = NETWORK_DIASPORA;
+				$network = Protocol::DIASPORA;
 			}
 		}
 
@@ -243,7 +245,7 @@ class PortableContact
 			$red = preg_replace("=(https?://)(.*)/channel/(.*)=ism", "$1$2", $profile);
 			if ($red != $profile) {
 				$server_url = $red;
-				$network = NETWORK_DIASPORA;
+				$network = Protocol::DIASPORA;
 			}
 		}
 
@@ -252,7 +254,7 @@ class PortableContact
 			$mastodon = preg_replace("=(https?://)(.*)/users/(.*)=ism", "$1$2", $profile);
 			if ($mastodon != $profile) {
 				$server_url = $mastodon;
-				$network = NETWORK_OSTATUS;
+				$network = Protocol::OSTATUS;
 			}
 		}
 
@@ -261,7 +263,7 @@ class PortableContact
 			$ostatus = preg_replace("=(https?://)(.*)/user/(.*)=ism", "$1$2", $profile);
 			if ($ostatus != $profile) {
 				$server_url = $ostatus;
-				$network = NETWORK_OSTATUS;
+				$network = Protocol::OSTATUS;
 			}
 		}
 
@@ -270,7 +272,7 @@ class PortableContact
 			$base = preg_replace("=(https?://)(.*?)/(.*)=ism", "$1$2", $profile);
 			if ($base != $profile) {
 				$server_url = $base;
-				$network = NETWORK_PHANTOM;
+				$network = Protocol::PHANTOM;
 			}
 		}
 
@@ -280,10 +282,10 @@ class PortableContact
 
 		$r = q(
 			"SELECT `id` FROM `gserver` WHERE `nurl` = '%s' AND `last_contact` > `last_failure`",
-			dbesc(normalise_link($server_url))
+			DBA::escape(normalise_link($server_url))
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			return $server_url;
 		}
 
@@ -305,10 +307,10 @@ class PortableContact
 	{
 		$gcontacts = q(
 			"SELECT * FROM `gcontact` WHERE `nurl` = '%s'",
-			dbesc(normalise_link($profile))
+			DBA::escape(normalise_link($profile))
 		);
 
-		if (!DBM::is_result($gcontacts)) {
+		if (!DBA::isResult($gcontacts)) {
 			return false;
 		}
 
@@ -331,7 +333,7 @@ class PortableContact
 			$server_url = normalise_link(self::detectServer($profile));
 		}
 
-		if (!in_array($gcontacts[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_FEED, NETWORK_OSTATUS, ""])) {
+		if (!in_array($gcontacts[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::FEED, Protocol::OSTATUS, ""])) {
 			logger("Profile ".$profile.": Network type ".$gcontacts[0]["network"]." can't be checked", LOGGER_DEBUG);
 			return false;
 		}
@@ -340,7 +342,7 @@ class PortableContact
 			if (!self::checkServer($server_url, $gcontacts[0]["network"], $force)) {
 				if ($force) {
 					$fields = ['last_failure' => DateTimeFormat::utcNow()];
-					dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
+					DBA::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 				}
 
 				logger("Profile ".$profile.": Server ".$server_url." wasn't reachable.", LOGGER_DEBUG);
@@ -349,10 +351,10 @@ class PortableContact
 			$contact['server_url'] = $server_url;
 		}
 
-		if (in_array($gcontacts[0]["network"], ["", NETWORK_FEED])) {
+		if (in_array($gcontacts[0]["network"], ["", Protocol::FEED])) {
 			$server = q(
 				"SELECT `network` FROM `gserver` WHERE `nurl` = '%s' AND `network` != ''",
-				dbesc(normalise_link($server_url))
+				DBA::escape(normalise_link($server_url))
 			);
 
 			if ($server) {
@@ -365,7 +367,7 @@ class PortableContact
 		// noscrape is really fast so we don't cache the call.
 		if (($server_url != "") && ($gcontacts[0]["nick"] != "")) {
 			//  Use noscrape if possible
-			$server = q("SELECT `noscrape`, `network` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", dbesc(normalise_link($server_url)));
+			$server = q("SELECT `noscrape`, `network` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", DBA::escape(normalise_link($server_url)));
 
 			if ($server) {
 				$noscraperet = Network::curl($server[0]["noscrape"]."/".$gcontacts[0]["nick"]);
@@ -419,9 +421,9 @@ class PortableContact
 
 						GContact::update($contact);
 
-						if (trim($noscrape["updated"]) != "") {
+						if (!empty($noscrape["updated"])) {
 							$fields = ['last_contact' => DateTimeFormat::utcNow()];
-							dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
+							DBA::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 
 							logger("Profile ".$profile." was last updated at ".$noscrape["updated"]." (noscrape)", LOGGER_DEBUG);
 
@@ -444,12 +446,12 @@ class PortableContact
 
 		// Is the profile link the alternate OStatus link notation? (http://domain.tld/user/4711)
 		// Then check the other link and delete this one
-		if (($data["network"] == NETWORK_OSTATUS) && self::alternateOStatusUrl($profile)
+		if (($data["network"] == Protocol::OSTATUS) && self::alternateOStatusUrl($profile)
 			&& (normalise_link($profile) == normalise_link($data["alias"]))
 			&& (normalise_link($profile) != normalise_link($data["url"]))
 		) {
 			// Delete the old entry
-			dba::delete('gcontact', ['nurl' => normalise_link($profile)]);
+			DBA::delete('gcontact', ['nurl' => normalise_link($profile)]);
 
 			$gcontact = array_merge($gcontacts[0], $data);
 
@@ -468,9 +470,9 @@ class PortableContact
 			return false;
 		}
 
-		if (($data["poll"] == "") || (in_array($data["network"], [NETWORK_FEED, NETWORK_PHANTOM]))) {
+		if (($data["poll"] == "") || (in_array($data["network"], [Protocol::FEED, Protocol::PHANTOM]))) {
 			$fields = ['last_failure' => DateTimeFormat::utcNow()];
-			dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
+			DBA::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 
 			logger("Profile ".$profile." wasn't reachable (profile)", LOGGER_DEBUG);
 			return false;
@@ -486,13 +488,14 @@ class PortableContact
 
 		if (!$feedret["success"]) {
 			$fields = ['last_failure' => DateTimeFormat::utcNow()];
-			dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
+			DBA::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 
 			logger("Profile ".$profile." wasn't reachable (no feed)", LOGGER_DEBUG);
 			return false;
 		}
 
 		$doc = new DOMDocument();
+		/// @TODO Avoid error supression here
 		@$doc->loadXML($feedret["body"]);
 
 		$xpath = new DOMXPath($doc);
@@ -528,11 +531,11 @@ class PortableContact
 			$fields['updated'] = $last_updated;
 		}
 
-		dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
+		DBA::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 
 		if (($gcontacts[0]["generation"] == 0)) {
 			$fields = ['generation' => 9];
-			dba::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
+			DBA::update('gcontact', $fields, ['nurl' => normalise_link($profile)]);
 		}
 
 		logger("Profile ".$profile." was last updated at ".$last_updated, LOGGER_DEBUG);
@@ -585,6 +588,7 @@ class PortableContact
 		return true;
 	}
 
+	/// @TODO Maybe move this out to an utilities class?
 	private static function toBoolean($val)
 	{
 		if (($val == "true") || ($val == 1)) {
@@ -599,34 +603,34 @@ class PortableContact
 	/**
 	 * @brief Detect server type (Hubzilla or Friendica) via the poco data
 	 *
-	 * @param object $data POCO data
+	 * @param array $data POCO data
 	 * @return array Server data
 	 */
-	private static function detectPocoData($data)
+	private static function detectPocoData(array $data)
 	{
 		$server = false;
 
-		if (!isset($data->entry)) {
+		if (!isset($data['entry'])) {
 			return false;
 		}
 
-		if (count($data->entry) == 0) {
+		if (count($data['entry']) == 0) {
 			return false;
 		}
 
-		if (!isset($data->entry[0]->urls)) {
+		if (!isset($data['entry'][0]['urls'])) {
 			return false;
 		}
 
-		if (count($data->entry[0]->urls) == 0) {
+		if (count($data['entry'][0]['urls']) == 0) {
 			return false;
 		}
 
-		foreach ($data->entry[0]->urls as $url) {
-			if ($url->type == 'zot') {
+		foreach ($data['entry'][0]['urls'] as $url) {
+			if ($url['type'] == 'zot') {
 				$server = [];
 				$server["platform"] = 'Hubzilla';
-				$server["network"] = NETWORK_DIASPORA;
+				$server["network"] = Protocol::DIASPORA;
 				return $server;
 			}
 		}
@@ -646,25 +650,24 @@ class PortableContact
 			return false;
 		}
 
-		$nodeinfo = json_decode($serverret['body']);
+		$nodeinfo = json_decode($serverret['body'], true);
 
-		if (!is_object($nodeinfo)) {
-			return false;
-		}
-
-		if (!is_array($nodeinfo->links)) {
+		if (!is_array($nodeinfo) || !isset($nodeinfo['links'])) {
 			return false;
 		}
 
 		$nodeinfo1_url = '';
 		$nodeinfo2_url = '';
 
-		foreach ($nodeinfo->links as $link) {
-			if ($link->rel == 'http://nodeinfo.diaspora.software/ns/schema/1.0') {
-				$nodeinfo1_url = $link->href;
+		foreach ($nodeinfo['links'] as $link) {
+			if (!is_array($link) || empty($link['rel'])) {
+				logger('Invalid nodeinfo format for ' . $server_url, LOGGER_DEBUG);
+				continue;
 			}
-			if ($link->rel == 'http://nodeinfo.diaspora.software/ns/schema/2.0') {
-				$nodeinfo2_url = $link->href;
+			if ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/1.0') {
+				$nodeinfo1_url = $link['href'];
+			} elseif ($link['rel'] == 'http://nodeinfo.diaspora.software/ns/schema/2.0') {
+				$nodeinfo2_url = $link['href'];
 			}
 		}
 
@@ -696,12 +699,14 @@ class PortableContact
 	private static function parseNodeinfo1($nodeinfo_url)
 	{
 		$serverret = Network::curl($nodeinfo_url);
+
 		if (!$serverret["success"]) {
 			return false;
 		}
 
-		$nodeinfo = json_decode($serverret['body']);
-		if (!is_object($nodeinfo)) {
+		$nodeinfo = json_decode($serverret['body'], true);
+
+		if (!is_array($nodeinfo)) {
 			return false;
 		}
 
@@ -709,39 +714,37 @@ class PortableContact
 
 		$server['register_policy'] = REGISTER_CLOSED;
 
-		if (is_bool($nodeinfo->openRegistrations) && $nodeinfo->openRegistrations) {
+		if (is_bool($nodeinfo['openRegistrations']) && $nodeinfo['openRegistrations']) {
 			$server['register_policy'] = REGISTER_OPEN;
 		}
 
-		if (is_object($nodeinfo->software)) {
-			if (isset($nodeinfo->software->name)) {
-				$server['platform'] = $nodeinfo->software->name;
+		if (is_array($nodeinfo['software'])) {
+			if (isset($nodeinfo['software']['name'])) {
+				$server['platform'] = $nodeinfo['software']['name'];
 			}
 
-			if (isset($nodeinfo->software->version)) {
-				$server['version'] = $nodeinfo->software->version;
+			if (isset($nodeinfo['software']['version'])) {
+				$server['version'] = $nodeinfo['software']['version'];
 				// Version numbers on Nodeinfo are presented with additional info, e.g.:
 				// 0.6.3.0-p1702cc1c, 0.6.99.0-p1b9ab160 or 3.4.3-2-1191.
 				$server['version'] = preg_replace("=(.+)-(.{4,})=ism", "$1", $server['version']);
 			}
 		}
 
-		if (is_object($nodeinfo->metadata)) {
-			if (isset($nodeinfo->metadata->nodeName)) {
-				$server['site_name'] = $nodeinfo->metadata->nodeName;
-			}
+		if (is_array($nodeinfo['metadata']) && isset($nodeinfo['metadata']['nodeName'])) {
+			$server['site_name'] = $nodeinfo['metadata']['nodeName'];
 		}
 
-		if (!empty($nodeinfo->usage->users->total)) {
-			$server['registered-users'] = $nodeinfo->usage->users->total;
+		if (!empty($nodeinfo['usage']['users']['total'])) {
+			$server['registered-users'] = $nodeinfo['usage']['users']['total'];
 		}
 
 		$diaspora = false;
 		$friendica = false;
 		$gnusocial = false;
 
-		if (is_array($nodeinfo->protocols->inbound)) {
-			foreach ($nodeinfo->protocols->inbound as $inbound) {
+		if (is_array($nodeinfo['protocols']['inbound'])) {
+			foreach ($nodeinfo['protocols']['inbound'] as $inbound) {
 				if ($inbound == 'diaspora') {
 					$diaspora = true;
 				}
@@ -755,13 +758,13 @@ class PortableContact
 		}
 
 		if ($gnusocial) {
-			$server['network'] = NETWORK_OSTATUS;
+			$server['network'] = Protocol::OSTATUS;
 		}
 		if ($diaspora) {
-			$server['network'] = NETWORK_DIASPORA;
+			$server['network'] = Protocol::DIASPORA;
 		}
 		if ($friendica) {
-			$server['network'] = NETWORK_DFRN;
+			$server['network'] = Protocol::DFRN;
 		}
 
 		if (!$server) {
@@ -784,8 +787,9 @@ class PortableContact
 			return false;
 		}
 
-		$nodeinfo = json_decode($serverret['body']);
-		if (!is_object($nodeinfo)) {
+		$nodeinfo = json_decode($serverret['body'], true);
+
+		if (!is_array($nodeinfo)) {
 			return false;
 		}
 
@@ -793,62 +797,56 @@ class PortableContact
 
 		$server['register_policy'] = REGISTER_CLOSED;
 
-		if (is_bool($nodeinfo->openRegistrations) && $nodeinfo->openRegistrations) {
+		if (is_bool($nodeinfo['openRegistrations']) && $nodeinfo['openRegistrations']) {
 			$server['register_policy'] = REGISTER_OPEN;
 		}
 
-		if (is_object($nodeinfo->software)) {
-			if (isset($nodeinfo->software->name)) {
-				$server['platform'] = $nodeinfo->software->name;
+		if (is_array($nodeinfo['software'])) {
+			if (isset($nodeinfo['software']['name'])) {
+				$server['platform'] = $nodeinfo['software']['name'];
 			}
 
-			if (isset($nodeinfo->software->version)) {
-				$server['version'] = $nodeinfo->software->version;
+			if (isset($nodeinfo['software']['version'])) {
+				$server['version'] = $nodeinfo['software']['version'];
 				// Version numbers on Nodeinfo are presented with additional info, e.g.:
 				// 0.6.3.0-p1702cc1c, 0.6.99.0-p1b9ab160 or 3.4.3-2-1191.
 				$server['version'] = preg_replace("=(.+)-(.{4,})=ism", "$1", $server['version']);
 			}
 		}
 
-		if (is_object($nodeinfo->metadata)) {
-			if (isset($nodeinfo->metadata->nodeName)) {
-				$server['site_name'] = $nodeinfo->metadata->nodeName;
-			}
+		if (is_array($nodeinfo['metadata']) && isset($nodeinfo['metadata']['nodeName'])) {
+			$server['site_name'] = $nodeinfo['metadata']['nodeName'];
 		}
 
-		if (!empty($nodeinfo->usage->users->total)) {
-			$server['registered-users'] = $nodeinfo->usage->users->total;
+		if (!empty($nodeinfo['usage']['users']['total'])) {
+			$server['registered-users'] = $nodeinfo['usage']['users']['total'];
 		}
 
 		$diaspora = false;
 		$friendica = false;
 		$gnusocial = false;
 
-		if (is_array($nodeinfo->protocols)) {
-			foreach ($nodeinfo->protocols as $protocol) {
+		if (!empty($nodeinfo['protocols'])) {
+			foreach ($nodeinfo['protocols'] as $protocol) {
 				if ($protocol == 'diaspora') {
 					$diaspora = true;
-				}
-				if ($protocol == 'friendica') {
+				} elseif ($protocol == 'friendica') {
 					$friendica = true;
-				}
-				if ($protocol == 'gnusocial') {
+				} elseif ($protocol == 'gnusocial') {
 					$gnusocial = true;
 				}
 			}
 		}
 
 		if ($gnusocial) {
-			$server['network'] = NETWORK_OSTATUS;
-		}
-		if ($diaspora) {
-			$server['network'] = NETWORK_DIASPORA;
-		}
-		if ($friendica) {
-			$server['network'] = NETWORK_DFRN;
+			$server['network'] = Protocol::OSTATUS;
+		} elseif ($diaspora) {
+			$server['network'] = Protocol::DIASPORA;
+		} elseif ($friendica) {
+			$server['network'] = Protocol::DFRN;
 		}
 
-		if (!$server) {
+		if (empty($server)) {
 			return false;
 		}
 
@@ -866,6 +864,7 @@ class PortableContact
 		$server = false;
 
 		$doc = new DOMDocument();
+		/// @TODO Acoid supressing error
 		@$doc->loadHTML($body);
 		$xpath = new DOMXPath($doc);
 
@@ -885,7 +884,7 @@ class PortableContact
 						$server = [];
 						$server["platform"] = $version_part[0];
 						$server["version"] = $version_part[1];
-						$server["network"] = NETWORK_DFRN;
+						$server["network"] = Protocol::DFRN;
 					}
 				}
 			}
@@ -905,7 +904,7 @@ class PortableContact
 					$server = [];
 					$server["platform"] = $attr['content'];
 					$server["version"] = "";
-					$server["network"] = NETWORK_DIASPORA;
+					$server["network"] = Protocol::DIASPORA;
 				}
 			}
 		}
@@ -914,7 +913,8 @@ class PortableContact
 			return false;
 		}
 
-		$server["site_name"] = $xpath->evaluate("//head/title/text()")->item(0)->nodeValue;
+		$server["site_name"] = XML::getFirstNodeValue($xpath, '//head/title/text()');
+
 		return $server;
 	}
 
@@ -928,12 +928,12 @@ class PortableContact
 			return false;
 		}
 
-		$gserver = dba::selectFirst('gserver', [], ['nurl' => normalise_link($server_url)]);
-		if (DBM::is_result($gserver)) {
+		$gserver = DBA::selectFirst('gserver', [], ['nurl' => normalise_link($server_url)]);
+		if (DBA::isResult($gserver)) {
 			if ($gserver["created"] <= NULL_DATE) {
 				$fields = ['created' => DateTimeFormat::utcNow()];
 				$condition = ['nurl' => normalise_link($server_url)];
-				dba::update('gserver', $fields, $condition);
+				DBA::update('gserver', $fields, $condition);
 			}
 			$poco = $gserver["poco"];
 			$noscrape = $gserver["noscrape"];
@@ -956,6 +956,7 @@ class PortableContact
 			if ($last_contact < NULL_DATE) {
 				$last_contact = NULL_DATE;
 			}
+
 			if ($last_failure < NULL_DATE) {
 				$last_failure = NULL_DATE;
 			}
@@ -987,7 +988,7 @@ class PortableContact
 		// Mastodon uses the "@" for user profiles.
 		// But this can be misunderstood.
 		if (parse_url($server_url, PHP_URL_USER) != '') {
-			dba::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
+			DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
 			return false;
 		}
 
@@ -1000,36 +1001,37 @@ class PortableContact
 
 		// Quit if there is a timeout.
 		// But we want to make sure to only quit if we are mostly sure that this server url fits.
-		if (DBM::is_result($gserver) && ($orig_server_url == $server_url) &&
-			($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
+		if (DBA::isResult($gserver) && ($orig_server_url == $server_url) &&
+			(!empty($serverret["errno"]) && ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT))) {
 			logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
-			dba::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
+			DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
 			return false;
 		}
 
 		// Maybe the page is unencrypted only?
 		$xmlobj = @simplexml_load_string($serverret["body"], 'SimpleXMLElement', 0, "http://docs.oasis-open.org/ns/xri/xrd-1.0");
-		if (!$serverret["success"] || ($serverret["body"] == "") || (@sizeof($xmlobj) == 0) || !is_object($xmlobj)) {
+		if (!$serverret["success"] || ($serverret["body"] == "") || empty($xmlobj) || !is_object($xmlobj)) {
 			$server_url = str_replace("https://", "http://", $server_url);
 
 			// We set the timeout to 20 seconds since this operation should be done in no time if the server was vital
 			$serverret = Network::curl($server_url."/.well-known/host-meta", false, $redirects, ['timeout' => 20]);
 
 			// Quit if there is a timeout
-			if ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+			if (!empty($serverret["errno"]) && ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 				logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
-				dba::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
+				DBA::update('gserver', ['last_failure' => DateTimeFormat::utcNow()], ['nurl' => normalise_link($server_url)]);
 				return false;
 			}
 
 			$xmlobj = @simplexml_load_string($serverret["body"], 'SimpleXMLElement', 0, "http://docs.oasis-open.org/ns/xri/xrd-1.0");
 		}
 
-		if (!$serverret["success"] || ($serverret["body"] == "") || (sizeof($xmlobj) == 0) || !is_object($xmlobj)) {
+		if (!$serverret["success"] || ($serverret["body"] == "") || empty($xmlobj) || !is_object($xmlobj)) {
 			// Workaround for bad configured servers (known nginx problem)
-			if (!in_array($serverret["debug"]["http_code"], ["403", "404"])) {
+			if (!empty($serverret["debug"]) && !in_array($serverret["debug"]["http_code"], ["403", "404"])) {
 				$failure = true;
 			}
+
 			$possible_failure = true;
 		}
 
@@ -1044,27 +1046,33 @@ class PortableContact
 
 		if (!$failure) {
 			// This will be too low, but better than no value at all.
-			$registered_users = dba::count('gcontact', ['server_url' => normalise_link($server_url)]);
+			$registered_users = DBA::count('gcontact', ['server_url' => normalise_link($server_url)]);
 		}
 
 		// Look for poco
 		if (!$failure) {
 			$serverret = Network::curl($server_url."/poco");
+
 			if ($serverret["success"]) {
-				$data = json_decode($serverret["body"]);
-				if (isset($data->totalResults)) {
-					$registered_users = $data->totalResults;
-					$poco = $server_url."/poco";
+				$data = json_decode($serverret["body"], true);
+
+				if (isset($data['totalResults'])) {
+					$registered_users = $data['totalResults'];
+					$poco = $server_url . "/poco";
 					$server = self::detectPocoData($data);
-					if ($server) {
+
+					if (!empty($server)) {
 						$platform = $server['platform'];
 						$network = $server['network'];
 						$version = '';
 						$site_name = '';
 					}
 				}
-				// There are servers out there who don't return 404 on a failure
-				// We have to be sure that don't misunderstand this
+
+				/*
+				 * There are servers out there who don't return 404 on a failure
+				 * We have to be sure that don't misunderstand this
+				 */
 				if (is_null($data)) {
 					$poco = "";
 					$noscrape = "";
@@ -1081,7 +1089,8 @@ class PortableContact
 				$failure = true;
 			} else {
 				$server = self::detectServerType($serverret["body"]);
-				if ($server) {
+
+				if (!empty($server)) {
 					$platform = $server['platform'];
 					$network = $server['network'];
 					$version = $server['version'];
@@ -1089,21 +1098,23 @@ class PortableContact
 				}
 
 				$lines = explode("\n", $serverret["header"]);
+
 				if (count($lines)) {
 					foreach ($lines as $line) {
 						$line = trim($line);
+
 						if (stristr($line, 'X-Diaspora-Version:')) {
 							$platform = "Diaspora";
 							$version = trim(str_replace("X-Diaspora-Version:", "", $line));
 							$version = trim(str_replace("x-diaspora-version:", "", $version));
-							$network = NETWORK_DIASPORA;
+							$network = Protocol::DIASPORA;
 							$versionparts = explode("-", $version);
 							$version = $versionparts[0];
 						}
 
 						if (stristr($line, 'Server: Mastodon')) {
 							$platform = "Mastodon";
-							$network = NETWORK_OSTATUS;
+							$network = Protocol::OSTATUS;
 						}
 					}
 				}
@@ -1115,44 +1126,49 @@ class PortableContact
 			// Will also return data for Friendica and GNU Social - but it will be overwritten later
 			// The "not implemented" is a special treatment for really, really old Friendica versions
 			$serverret = Network::curl($server_url."/api/statusnet/version.json");
+
 			if ($serverret["success"] && ($serverret["body"] != '{"error":"not implemented"}') &&
 				($serverret["body"] != '') && (strlen($serverret["body"]) < 30)) {
 				$platform = "StatusNet";
 				// Remove junk that some GNU Social servers return
 				$version = str_replace(chr(239).chr(187).chr(191), "", $serverret["body"]);
 				$version = trim($version, '"');
-				$network = NETWORK_OSTATUS;
+				$network = Protocol::OSTATUS;
 			}
 
 			// Test for GNU Social
 			$serverret = Network::curl($server_url."/api/gnusocial/version.json");
+
 			if ($serverret["success"] && ($serverret["body"] != '{"error":"not implemented"}') &&
 				($serverret["body"] != '') && (strlen($serverret["body"]) < 30)) {
 				$platform = "GNU Social";
 				// Remove junk that some GNU Social servers return
-				$version = str_replace(chr(239).chr(187).chr(191), "", $serverret["body"]);
+				$version = str_replace(chr(239) . chr(187) . chr(191), "", $serverret["body"]);
 				$version = trim($version, '"');
-				$network = NETWORK_OSTATUS;
+				$network = Protocol::OSTATUS;
 			}
 
 			// Test for Mastodon
 			$orig_version = $version;
-			$serverret = Network::curl($server_url."/api/v1/instance");
-			if ($serverret["success"] && ($serverret["body"] != '')) {
-				$data = json_decode($serverret["body"]);
+			$serverret = Network::curl($server_url . "/api/v1/instance");
 
-				if (isset($data->version)) {
+			if ($serverret["success"] && ($serverret["body"] != '')) {
+				$data = json_decode($serverret["body"], true);
+
+				if (isset($data['version'])) {
 					$platform = "Mastodon";
-					$version = $data->version;
-					$site_name = $data->title;
-					$info = $data->description;
-					$network = NETWORK_OSTATUS;
+					$version = defaults($data, 'version', '');
+					$site_name = defaults($data, 'title', '');
+					$info = defaults($data, 'description', '');
+					$network = Protocol::OSTATUS;
 				}
-				if (!empty($data->stats->user_count)) {
-					$registered_users = $data->stats->user_count;
+
+				if (!empty($data['stats']['user_count'])) {
+					$registered_users = $data['stats']['user_count'];
 				}
 			}
-			if (strstr($orig_version.$version, 'Pleroma')) {
+
+			if (strstr($orig_version . $version, 'Pleroma')) {
 				$platform = 'Pleroma';
 				$version = trim(str_replace('Pleroma', '', $version));
 			}
@@ -1160,78 +1176,105 @@ class PortableContact
 
 		if (!$failure) {
 			// Test for Hubzilla and Red
-			$serverret = Network::curl($server_url."/siteinfo.json");
+			$serverret = Network::curl($server_url . "/siteinfo.json");
+
 			if ($serverret["success"]) {
-				$data = json_decode($serverret["body"]);
-				if (isset($data->url)) {
-					$platform = $data->platform;
-					$version = $data->version;
-					$network = NETWORK_DIASPORA;
+				$data = json_decode($serverret["body"], true);
+
+				if (isset($data['url'])) {
+					$platform = $data['platform'];
+					$version = $data['version'];
+					$network = Protocol::DIASPORA;
 				}
-				if (!empty($data->site_name)) {
-					$site_name = $data->site_name;
+
+				if (!empty($data['site_name'])) {
+					$site_name = $data['site_name'];
 				}
-				if (!empty($data->channels_total)) {
-					$registered_users = $data->channels_total;
+
+				if (!empty($data['channels_total'])) {
+					$registered_users = $data['channels_total'];
 				}
-				switch ($data->register_policy) {
-					case "REGISTER_OPEN":
-						$register_policy = REGISTER_OPEN;
-						break;
-					case "REGISTER_APPROVE":
-						$register_policy = REGISTER_APPROVE;
-						break;
-					case "REGISTER_CLOSED":
-					default:
-						$register_policy = REGISTER_CLOSED;
-						break;
+
+				if (!empty($data['register_policy'])) {
+					switch ($data['register_policy']) {
+						case "REGISTER_OPEN":
+							$register_policy = REGISTER_OPEN;
+							break;
+
+						case "REGISTER_APPROVE":
+							$register_policy = REGISTER_APPROVE;
+							break;
+
+						case "REGISTER_CLOSED":
+						default:
+							$register_policy = REGISTER_CLOSED;
+							break;
+					}
 				}
 			} else {
 				// Test for Hubzilla, Redmatrix or Friendica
 				$serverret = Network::curl($server_url."/api/statusnet/config.json");
+
 				if ($serverret["success"]) {
-					$data = json_decode($serverret["body"]);
-					if (isset($data->site->server)) {
-						if (isset($data->site->platform)) {
-							$platform = $data->site->platform->PLATFORM_NAME;
-							$version = $data->site->platform->STD_VERSION;
-							$network = NETWORK_DIASPORA;
+					$data = json_decode($serverret["body"], true);
+
+					if (isset($data['site']['server'])) {
+						if (isset($data['site']['platform'])) {
+							$platform = $data['site']['platform']['PLATFORM_NAME'];
+							$version = $data['site']['platform']['STD_VERSION'];
+							$network = Protocol::DIASPORA;
 						}
-						if (isset($data->site->BlaBlaNet)) {
-							$platform = $data->site->BlaBlaNet->PLATFORM_NAME;
-							$version = $data->site->BlaBlaNet->STD_VERSION;
-							$network = NETWORK_DIASPORA;
+
+						if (isset($data['site']['BlaBlaNet'])) {
+							$platform = $data['site']['BlaBlaNet']['PLATFORM_NAME'];
+							$version = $data['site']['BlaBlaNet']['STD_VERSION'];
+							$network = Protocol::DIASPORA;
 						}
-						if (isset($data->site->hubzilla)) {
-							$platform = $data->site->hubzilla->PLATFORM_NAME;
-							$version = $data->site->hubzilla->RED_VERSION;
-							$network = NETWORK_DIASPORA;
+
+						if (isset($data['site']['hubzilla'])) {
+							$platform = $data['site']['hubzilla']['PLATFORM_NAME'];
+							$version = $data['site']['hubzilla']['RED_VERSION'];
+							$network = Protocol::DIASPORA;
 						}
-						if (isset($data->site->redmatrix)) {
-							if (isset($data->site->redmatrix->PLATFORM_NAME)) {
-								$platform = $data->site->redmatrix->PLATFORM_NAME;
-							} elseif (isset($data->site->redmatrix->RED_PLATFORM)) {
-								$platform = $data->site->redmatrix->RED_PLATFORM;
+
+						if (isset($data['site']['redmatrix'])) {
+							if (isset($data['site']['redmatrix']['PLATFORM_NAME'])) {
+								$platform = $data['site']['redmatrix']['PLATFORM_NAME'];
+							} elseif (isset($data['site']['redmatrix']['RED_PLATFORM'])) {
+								$platform = $data['site']['redmatrix']['RED_PLATFORM'];
 							}
 
-							$version = $data->site->redmatrix->RED_VERSION;
-							$network = NETWORK_DIASPORA;
-						}
-						if (isset($data->site->friendica)) {
-							$platform = $data->site->friendica->FRIENDICA_PLATFORM;
-							$version = $data->site->friendica->FRIENDICA_VERSION;
-							$network = NETWORK_DFRN;
+							$version = $data['site']['redmatrix']['RED_VERSION'];
+							$network = Protocol::DIASPORA;
 						}
 
-						$site_name = $data->site->name;
+						if (isset($data['site']['friendica'])) {
+							$platform = $data['site']['friendica']['FRIENDICA_PLATFORM'];
+							$version = $data['site']['friendica']['FRIENDICA_VERSION'];
+							$network = Protocol::DFRN;
+						}
 
-						$data->site->closed = self::toBoolean($data->site->closed);
-						$data->site->private = self::toBoolean($data->site->private);
-						$data->site->inviteonly = self::toBoolean($data->site->inviteonly);
+						$site_name = $data['site']['name'];
 
-						if (!$data->site->closed && !$data->site->private and $data->site->inviteonly) {
+						$private = false;
+						$inviteonly = false;
+						$closed = false;
+
+						if (!empty($data['site']['closed'])) {
+							$closed = self::toBoolean($data['site']['closed']);
+						}
+
+						if (!empty($data['site']['private'])) {
+							$private = self::toBoolean($data['site']['private']);
+						}
+
+						if (!empty($data['site']['inviteonly'])) {
+							$inviteonly = self::toBoolean($data['site']['inviteonly']);
+						}
+
+						if (!$closed && !$private and $inviteonly) {
 							$register_policy = REGISTER_APPROVE;
-						} elseif (!$data->site->closed && !$data->site->private) {
+						} elseif (!$closed && !$private) {
 							$register_policy = REGISTER_OPEN;
 						} else {
 							$register_policy = REGISTER_CLOSED;
@@ -1243,30 +1286,31 @@ class PortableContact
 
 		// Query statistics.json. Optional package for Diaspora, Friendica and Redmatrix
 		if (!$failure) {
-			$serverret = Network::curl($server_url."/statistics.json");
-			if ($serverret["success"]) {
-				$data = json_decode($serverret["body"]);
+			$serverret = Network::curl($server_url . "/statistics.json");
 
-				if (isset($data->version)) {
-					$version = $data->version;
+			if ($serverret["success"]) {
+				$data = json_decode($serverret["body"], true);
+
+				if (isset($data['version'])) {
+					$version = $data['version'];
 					// Version numbers on statistics.json are presented with additional info, e.g.:
 					// 0.6.3.0-p1702cc1c, 0.6.99.0-p1b9ab160 or 3.4.3-2-1191.
 					$version = preg_replace("=(.+)-(.{4,})=ism", "$1", $version);
 				}
 
-				if (!empty($data->name)) {
-					$site_name = $data->name;
+				if (!empty($data['name'])) {
+					$site_name = $data['name'];
 				}
 
-				if (!empty($data->network)) {
-					$platform = $data->network;
+				if (!empty($data['network'])) {
+					$platform = $data['network'];
 				}
 
 				if ($platform == "Diaspora") {
-					$network = NETWORK_DIASPORA;
+					$network = Protocol::DIASPORA;
 				}
 
-				if ($data->registrations_open) {
+				if (!empty($data['registrations_open']) && $data['registrations_open']) {
 					$register_policy = REGISTER_OPEN;
 				} else {
 					$register_policy = REGISTER_CLOSED;
@@ -1277,7 +1321,8 @@ class PortableContact
 		// Query nodeinfo. Working for (at least) Diaspora and Friendica.
 		if (!$failure) {
 			$server = self::fetchNodeinfo($server_url);
-			if ($server) {
+
+			if (!empty($server)) {
 				$register_policy = $server['register_policy'];
 
 				if (isset($server['platform'])) {
@@ -1304,37 +1349,32 @@ class PortableContact
 
 		// Check for noscrape
 		// Friendica servers could be detected as OStatus servers
-		if (!$failure && in_array($network, [NETWORK_DFRN, NETWORK_OSTATUS])) {
-			$serverret = Network::curl($server_url."/friendica/json");
+		if (!$failure && in_array($network, [Protocol::DFRN, Protocol::OSTATUS])) {
+			$serverret = Network::curl($server_url . "/friendica/json");
 
 			if (!$serverret["success"]) {
-				$serverret = Network::curl($server_url."/friendika/json");
+				$serverret = Network::curl($server_url . "/friendika/json");
 			}
 
 			if ($serverret["success"]) {
-				$data = json_decode($serverret["body"]);
+				$data = json_decode($serverret["body"], true);
 
-				if (isset($data->version)) {
-					$network = NETWORK_DFRN;
+				if (isset($data['version'])) {
+					$network = Protocol::DFRN;
 
-					$noscrape = defaults($data->no_scrape_url, '');
-					$version = $data->version;
-					$site_name = $data->site_name;
-					$info = $data->info;
-					$register_policy_str = $data->register_policy;
-					$platform = $data->platform;
-
-					switch ($register_policy_str) {
-						case "REGISTER_CLOSED":
-							$register_policy = REGISTER_CLOSED;
-							break;
-						case "REGISTER_APPROVE":
-							$register_policy = REGISTER_APPROVE;
-							break;
-						case "REGISTER_OPEN":
-							$register_policy = REGISTER_OPEN;
-							break;
+					if (!empty($data['no_scrape_url'])) {
+						$noscrape = $data['no_scrape_url'];
 					}
+
+					$version = $data['version'];
+
+					if (!empty($data['site_name'])) {
+						$site_name = $data['site_name'];
+					}
+
+					$info = $data['info'];
+					$register_policy = constant($data['register_policy']);
+					$platform = $data['platform'];
 				}
 			}
 		}
@@ -1363,7 +1403,7 @@ class PortableContact
 		}
 
 		// Check again if the server exists
-		$found = dba::exists('gserver', ['nurl' => normalise_link($server_url)]);
+		$found = DBA::exists('gserver', ['nurl' => normalise_link($server_url)]);
 
 		$version = strip_tags($version);
 		$site_name = strip_tags($site_name);
@@ -1377,14 +1417,14 @@ class PortableContact
 				'last_contact' => $last_contact, 'last_failure' => $last_failure];
 
 		if ($found) {
-			dba::update('gserver', $fields, ['nurl' => normalise_link($server_url)]);
+			DBA::update('gserver', $fields, ['nurl' => normalise_link($server_url)]);
 		} elseif (!$failure) {
 			$fields['nurl'] = normalise_link($server_url);
 			$fields['created'] = DateTimeFormat::utcNow();
-			dba::insert('gserver', $fields);
+			DBA::insert('gserver', $fields);
 		}
 
-		if (!$failure && in_array($fields['network'], [NETWORK_DFRN, NETWORK_DIASPORA])) {
+		if (!$failure && in_array($fields['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
 			self::discoverRelay($server_url);
 		}
 
@@ -1402,57 +1442,66 @@ class PortableContact
 	{
 		logger("Discover relay data for server " . $server_url, LOGGER_DEBUG);
 
-		$serverret = Network::curl($server_url."/.well-known/x-social-relay");
+		$serverret = Network::curl($server_url . "/.well-known/x-social-relay");
+
 		if (!$serverret["success"]) {
 			return;
 		}
 
-		$data = json_decode($serverret['body']);
-		if (!is_object($data)) {
+		$data = json_decode($serverret['body'], true);
+
+		if (!is_array($data)) {
 			return;
 		}
 
-		$gserver = dba::selectFirst('gserver', ['id', 'relay-subscribe', 'relay-scope'], ['nurl' => normalise_link($server_url)]);
-		if (!DBM::is_result($gserver)) {
+		$gserver = DBA::selectFirst('gserver', ['id', 'relay-subscribe', 'relay-scope'], ['nurl' => normalise_link($server_url)]);
+
+		if (!DBA::isResult($gserver)) {
 			return;
 		}
 
-		if (($gserver['relay-subscribe'] != $data->subscribe) || ($gserver['relay-scope'] != $data->scope)) {
-			$fields = ['relay-subscribe' => $data->subscribe, 'relay-scope' => $data->scope];
-			dba::update('gserver', $fields, ['id' => $gserver['id']]);
+		if (($gserver['relay-subscribe'] != $data['subscribe']) || ($gserver['relay-scope'] != $data['scope'])) {
+			$fields = ['relay-subscribe' => $data['subscribe'], 'relay-scope' => $data['scope']];
+			DBA::update('gserver', $fields, ['id' => $gserver['id']]);
 		}
 
-		dba::delete('gserver-tag', ['gserver-id' => $gserver['id']]);
-		if ($data->scope == 'tags') {
+		DBA::delete('gserver-tag', ['gserver-id' => $gserver['id']]);
+
+		if ($data['scope'] == 'tags') {
 			// Avoid duplicates
 			$tags = [];
-			foreach ($data->tags as $tag) {
+			foreach ($data['tags'] as $tag) {
 				$tag = mb_strtolower($tag);
-				$tags[$tag] = $tag;
+				if (strlen($tag) < 100) {
+					$tags[$tag] = $tag;
+				}
 			}
 
 			foreach ($tags as $tag) {
-				dba::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag], true);
+				DBA::insert('gserver-tag', ['gserver-id' => $gserver['id'], 'tag' => $tag], true);
 			}
 		}
 
 		// Create or update the relay contact
 		$fields = [];
-		if (isset($data->protocols)) {
-			if (isset($data->protocols->diaspora)) {
-				$fields['network'] = NETWORK_DIASPORA;
-				if (isset($data->protocols->diaspora->receive)) {
-					$fields['batch'] = $data->protocols->diaspora->receive;
-				} elseif (is_string($data->protocols->diaspora)) {
-					$fields['batch'] = $data->protocols->diaspora;
+		if (isset($data['protocols'])) {
+			if (isset($data['protocols']['diaspora'])) {
+				$fields['network'] = Protocol::DIASPORA;
+
+				if (isset($data['protocols']['diaspora']['receive'])) {
+					$fields['batch'] = $data['protocols']['diaspora']['receive'];
+				} elseif (is_string($data['protocols']['diaspora'])) {
+					$fields['batch'] = $data['protocols']['diaspora'];
 				}
 			}
-			if (isset($data->protocols->dfrn)) {
-				$fields['network'] = NETWORK_DFRN;
-				if (isset($data->protocols->dfrn->receive)) {
-					$fields['batch'] = $data->protocols->dfrn->receive;
-				} elseif (is_string($data->protocols->dfrn)) {
-					$fields['batch'] = $data->protocols->dfrn;
+
+			if (isset($data['protocols']['dfrn'])) {
+				$fields['network'] = Protocol::DFRN;
+
+				if (isset($data['protocols']['dfrn']['receive'])) {
+					$fields['batch'] = $data['protocols']['dfrn']['receive'];
+				} elseif (is_string($data['protocols']['dfrn'])) {
+					$fields['batch'] = $data['protocols']['dfrn'];
 				}
 			}
 		}
@@ -1470,12 +1519,12 @@ class PortableContact
 			WHERE `network` IN ('%s', '%s', '%s') AND `last_contact` > `last_failure`
 			ORDER BY `last_contact`
 			LIMIT 1000",
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_DIASPORA),
-			dbesc(NETWORK_OSTATUS)
+			DBA::escape(Protocol::DFRN),
+			DBA::escape(Protocol::DIASPORA),
+			DBA::escape(Protocol::OSTATUS)
 		);
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return false;
 		}
 
@@ -1489,21 +1538,24 @@ class PortableContact
 	 */
 	private static function fetchServerlist($poco)
 	{
-		$serverret = Network::curl($poco."/@server");
+		$serverret = Network::curl($poco . "/@server");
+
 		if (!$serverret["success"]) {
 			return;
 		}
-		$serverlist = json_decode($serverret['body']);
+
+		$serverlist = json_decode($serverret['body'], true);
 
 		if (!is_array($serverlist)) {
 			return;
 		}
 
 		foreach ($serverlist as $server) {
-			$server_url = str_replace("/index.php", "", $server->url);
+			$server_url = str_replace("/index.php", "", $server['url']);
 
-			$r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
-			if (!DBM::is_result($r)) {
+			$r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", DBA::escape(normalise_link($server_url)));
+
+			if (!DBA::isResult($r)) {
 				logger("Call server check for server ".$server_url, LOGGER_DEBUG);
 				Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", $server_url);
 			}
@@ -1516,6 +1568,7 @@ class PortableContact
 
 		if ($last) {
 			$next = $last + (24 * 60 * 60);
+
 			if ($next > time()) {
 				return;
 			}
@@ -1524,12 +1577,12 @@ class PortableContact
 		// Discover Friendica, Hubzilla and Diaspora servers
 		$serverdata = Network::fetchUrl("http://the-federation.info/pods.json");
 
-		if ($serverdata) {
-			$servers = json_decode($serverdata);
+		if (!empty($serverdata)) {
+			$servers = json_decode($serverdata, true);
 
-			if (is_array($servers->pods)) {
-				foreach ($servers->pods as $server) {
-					Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", "https://".$server->host);
+			if (!empty($servers['pods'])) {
+				foreach ($servers['pods'] as $server) {
+					Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", "https://" . $server['host']);
 				}
 			}
 		}
@@ -1537,14 +1590,17 @@ class PortableContact
 		// Disvover Mastodon servers
 		if (!Config::get('system', 'ostatus_disabled')) {
 			$accesstoken = Config::get('system', 'instances_social_key');
+
 			if (!empty($accesstoken)) {
 				$api = 'https://instances.social/api/1.0/instances/list?count=0';
 				$header = ['Authorization: Bearer '.$accesstoken];
 				$serverdata = Network::curl($api, false, $redirects, ['headers' => $header]);
+
 				if ($serverdata['success']) {
-					$servers = json_decode($serverdata['body']);
-					foreach ($servers->instances as $server) {
-						$url = (is_null($server->https_score) ? 'http' : 'https').'://'.$server->name;
+					$servers = json_decode($serverdata['body'], true);
+
+					foreach ($servers['instances'] as $server) {
+						$url = (is_null($server['https_score']) ? 'http' : 'https') . '://' . $server['name'];
 						Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", $url);
 					}
 				}
@@ -1559,10 +1615,10 @@ class PortableContact
 
 		//	$result = Network::curl($serverdata);
 		//	if ($result["success"]) {
-		//		$servers = json_decode($result["body"]);
+		//		$servers = json_decode($result["body"], true);
 
-		//		foreach($servers->data as $server)
-		//			self::checkServer($server->instance_address);
+		//		foreach($servers['data'] as $server)
+		//			self::checkServer($server['instance_address']);
 		//	}
 		//}
 
@@ -1572,7 +1628,8 @@ class PortableContact
 	public static function discoverSingleServer($id)
 	{
 		$r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `id` = %d", intval($id));
-		if (!DBM::is_result($r)) {
+
+		if (!DBA::isResult($r)) {
 			return false;
 		}
 
@@ -1582,18 +1639,22 @@ class PortableContact
 		self::fetchServerlist($server["poco"]);
 
 		// Fetch all users from the other server
-		$url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
+		$url = $server["poco"] . "/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
 
-		logger("Fetch all users from the server ".$server["url"], LOGGER_DEBUG);
+		logger("Fetch all users from the server " . $server["url"], LOGGER_DEBUG);
 
 		$retdata = Network::curl($url);
-		if ($retdata["success"]) {
-			$data = json_decode($retdata["body"]);
 
-			self::discoverServer($data, 2);
+		if ($retdata["success"] && !empty($retdata["body"])) {
+			$data = json_decode($retdata["body"], true);
+
+			if (!empty($data)) {
+				self::discoverServer($data, 2);
+			}
 
 			if (Config::get('system', 'poco_discovery') > 1) {
 				$timeframe = Config::get('system', 'poco_discovery_since');
+
 				if ($timeframe == 0) {
 					$timeframe = 30;
 				}
@@ -1606,19 +1667,24 @@ class PortableContact
 				$success = false;
 
 				$retdata = Network::curl($url);
-				if ($retdata["success"]) {
-					logger("Fetch all global contacts from the server ".$server["nurl"], LOGGER_DEBUG);
-					$success = self::discoverServer(json_decode($retdata["body"]));
+
+				if ($retdata["success"] && !empty($retdata["body"])) {
+					logger("Fetch all global contacts from the server " . $server["nurl"], LOGGER_DEBUG);
+					$data = json_decode($retdata["body"], true);
+
+					if (!empty($data)) {
+						$success = self::discoverServer($data);
+					}
 				}
 
 				if (!$success && (Config::get('system', 'poco_discovery') > 2)) {
-					logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG);
+					logger("Fetch contacts from users of the server " . $server["nurl"], LOGGER_DEBUG);
 					self::discoverServerUsers($data, $server);
 				}
 			}
 
 			$fields = ['last_poco_query' => DateTimeFormat::utcNow()];
-			dba::update('gserver', $fields, ['nurl' => $server["nurl"]]);
+			DBA::update('gserver', $fields, ['nurl' => $server["nurl"]]);
 
 			return true;
 		} else {
@@ -1627,7 +1693,7 @@ class PortableContact
 
 			// If we couldn't reach the server, we will try it some time later
 			$fields = ['last_poco_query' => DateTimeFormat::utcNow()];
-			dba::update('gserver', $fields, ['nurl' => $server["nurl"]]);
+			DBA::update('gserver', $fields, ['nurl' => $server["nurl"]]);
 
 			return false;
 		}
@@ -1640,73 +1706,88 @@ class PortableContact
 
 		$no_of_queries = 5;
 
-		$requery_days = intval(Config::get("system", "poco_requery_days"));
+		$requery_days = intval(Config::get('system', 'poco_requery_days'));
 
 		if ($requery_days == 0) {
 			$requery_days = 7;
 		}
-		$last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
 
-		$r = q("SELECT `id`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
-		if (DBM::is_result($r)) {
-			foreach ($r as $server) {
-				if (!self::checkServer($server["url"], $server["network"])) {
+		$last_update = date('c', time() - (60 * 60 * 24 * $requery_days));
+
+		$gservers = q("SELECT `id`, `url`, `nurl`, `network`
+			FROM `gserver`
+			WHERE `last_contact` >= `last_failure`
+			AND `poco` != ''
+			AND `last_poco_query` < '%s'
+			ORDER BY RAND()", DBA::escape($last_update)
+		);
+
+		if (DBA::isResult($gservers)) {
+			foreach ($gservers as $gserver) {
+				if (!self::checkServer($gserver['url'], $gserver['network'])) {
 					// The server is not reachable? Okay, then we will try it later
 					$fields = ['last_poco_query' => DateTimeFormat::utcNow()];
-					dba::update('gserver', $fields, ['nurl' => $server["nurl"]]);
+					DBA::update('gserver', $fields, ['nurl' => $gserver['nurl']]);
 					continue;
 				}
 
-				logger('Update directory from server '.$server['url'].' with ID '.$server['id'], LOGGER_DEBUG);
-				Worker::add(PRIORITY_LOW, "DiscoverPoCo", "update_server_directory", (int)$server['id']);
+				logger('Update directory from server ' . $gserver['url'] . ' with ID ' . $gserver['id'], LOGGER_DEBUG);
+				Worker::add(PRIORITY_LOW, 'DiscoverPoCo', 'update_server_directory', (int) $gserver['id']);
 
-				if (!$complete && (--$no_of_queries == 0)) {
+				if (!$complete && ( --$no_of_queries == 0)) {
 					break;
 				}
 			}
 		}
 	}
 
-	private static function discoverServerUsers($data, $server)
+	private static function discoverServerUsers(array $data, array $server)
 	{
-		if (!isset($data->entry)) {
+		if (!isset($data['entry'])) {
 			return;
 		}
 
-		foreach ($data->entry as $entry) {
-			$username = "";
-			if (isset($entry->urls)) {
-				foreach ($entry->urls as $url) {
-					if ($url->type == 'profile') {
-						$profile_url = $url->value;
-						$urlparts = parse_url($profile_url);
-						$username = end(explode("/", $urlparts["path"]));
+		foreach ($data['entry'] as $entry) {
+			$username = '';
+
+			if (isset($entry['urls'])) {
+				foreach ($entry['urls'] as $url) {
+					if ($url['type'] == 'profile') {
+						$profile_url = $url['value'];
+						$path_array = explode('/', parse_url($profile_url, PHP_URL_PATH));
+						$username = end($path_array);
 					}
 				}
 			}
-			if ($username != "") {
-				logger("Fetch contacts for the user ".$username." from the server ".$server["nurl"], LOGGER_DEBUG);
+
+			if ($username != '') {
+				logger('Fetch contacts for the user ' . $username . ' from the server ' . $server['nurl'], LOGGER_DEBUG);
 
 				// Fetch all contacts from a given user from the other server
-				$url = $server["poco"]."/".$username."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation";
+				$url = $server['poco'] . '/' . $username . '/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,contactType,generation';
 
 				$retdata = Network::curl($url);
-				if ($retdata["success"]) {
-					self::discoverServer(json_decode($retdata["body"]), 3);
+
+				if (!empty($retdata['success'])) {
+					$data = json_decode($retdata["body"], true);
+
+					if (!empty($data)) {
+						self::discoverServer($data, 3);
+					}
 				}
 			}
 		}
 	}
 
-	private static function discoverServer($data, $default_generation = 0)
+	private static function discoverServer(array $data, $default_generation = 0)
 	{
-		if (!isset($data->entry) || !count($data->entry)) {
+		if (empty($data['entry'])) {
 			return false;
 		}
 
 		$success = false;
 
-		foreach ($data->entry as $entry) {
+		foreach ($data['entry'] as $entry) {
 			$profile_url = '';
 			$profile_photo = '';
 			$connect_url = '';
@@ -1720,60 +1801,62 @@ class PortableContact
 			$contact_type = -1;
 			$generation = $default_generation;
 
-			$name = $entry->displayName;
+			if (!empty($entry['displayName'])) {
+				$name = $entry['displayName'];
+			}
 
-			if (isset($entry->urls)) {
-				foreach ($entry->urls as $url) {
-					if ($url->type == 'profile') {
-						$profile_url = $url->value;
+			if (isset($entry['urls'])) {
+				foreach ($entry['urls'] as $url) {
+					if ($url['type'] == 'profile') {
+						$profile_url = $url['value'];
 						continue;
 					}
-					if ($url->type == 'webfinger') {
-						$connect_url = str_replace('acct:' , '', $url->value);
+					if ($url['type'] == 'webfinger') {
+						$connect_url = str_replace('acct:' , '', $url['value']);
 						continue;
 					}
 				}
 			}
 
-			if (isset($entry->photos)) {
-				foreach ($entry->photos as $photo) {
-					if ($photo->type == 'profile') {
-						$profile_photo = $photo->value;
+			if (isset($entry['photos'])) {
+				foreach ($entry['photos'] as $photo) {
+					if ($photo['type'] == 'profile') {
+						$profile_photo = $photo['value'];
 						continue;
 					}
 				}
 			}
 
-			if (isset($entry->updated)) {
-				$updated = date(DateTimeFormat::MYSQL, strtotime($entry->updated));
+			if (isset($entry['updated'])) {
+				$updated = date(DateTimeFormat::MYSQL, strtotime($entry['updated']));
 			}
 
-			if (isset($entry->network)) {
-				$network = $entry->network;
+			if (isset($entry['network'])) {
+				$network = $entry['network'];
 			}
 
-			if (isset($entry->currentLocation)) {
-				$location = $entry->currentLocation;
+			if (isset($entry['currentLocation'])) {
+				$location = $entry['currentLocation'];
 			}
 
-			if (isset($entry->aboutMe)) {
-				$about = HTML::toBBCode($entry->aboutMe);
+			if (isset($entry['aboutMe'])) {
+				$about = HTML::toBBCode($entry['aboutMe']);
 			}
 
-			if (isset($entry->gender)) {
-				$gender = $entry->gender;
+			if (isset($entry['gender'])) {
+				$gender = $entry['gender'];
 			}
 
-			if (isset($entry->generation) && ($entry->generation > 0)) {
-				$generation = ++$entry->generation;
+			if (isset($entry['generation']) && ($entry['generation'] > 0)) {
+				$generation = ++$entry['generation'];
 			}
 
-			if (isset($entry->contactType) && ($entry->contactType >= 0)) {
-				$contact_type = $entry->contactType;
+			if (isset($entry['contactType']) && ($entry['contactType'] >= 0)) {
+				$contact_type = $entry['contactType'];
 			}
 
-			if (isset($entry->tags)) {
-				foreach ($entry->tags as $tag) {
+			if (isset($entry['tags'])) {
+				foreach ($entry['tags'] as $tag) {
 					$keywords = implode(", ", $tag);
 				}
 			}
diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php
index 8c8e63763..f4c6a8ed2 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 c6e95ee06..1053ab08e 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/src/Util/Arrays.php b/src/Util/Arrays.php
new file mode 100644
index 000000000..b17dc8bfe
--- /dev/null
+++ b/src/Util/Arrays.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @file src/Util/Arrays.php
+ * @author Roland Haeder<https://f.haeder.net/profile/roland>
+ */
+namespace Friendica\Util;
+
+/**
+ * @brief Array utility class
+ */
+class Arrays
+{
+	/**
+	 * @brief Private constructor
+	 */
+	private function __construct () {
+		// Utitlities don't have instances
+	}
+
+	/**
+	 * @briefs Implodes recursively a multi-dimensional array where a normal implode() will fail.
+	 *
+	 * @param array  $array Array to implode
+	 * @param string $glue  Glue for imploded elements
+	 * @return string String with elements from array
+	 */
+	public static function recursiveImplode (array $array, $glue) {
+		// Init returned string
+		$string = '';
+
+		// Loop through all records
+		foreach ($array as $element) {
+			// Is an array found?
+			if (is_array($element)) {
+				// Invoke cursively
+				$string .= '{' . self::recursiveImplode($element, $glue) . '}' . $glue;
+			} else {
+				// Append normally
+				$string .= $element . $glue;
+			}
+		}
+
+		// Remove last glue
+		$string = trim($string, $glue);
+
+		// Return it
+		return $string;
+	}
+}
diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php
index b2fad9970..6a49626bd 100644
--- a/src/Util/Crypto.php
+++ b/src/Util/Crypto.php
@@ -4,6 +4,7 @@
  */
 namespace Friendica\Util;
 
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use ASN_BASE;
 use ASNValue;
@@ -246,4 +247,232 @@ class Crypto
 
 		return $response;
 	}
+
+	/**
+	 * Encrypt a string with 'aes-256-cbc' cipher method.
+	 * 
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
+	 * 
+	 * @param string $data
+	 * @param string $key   The key used for encryption.
+	 * @param string $iv    A non-NULL Initialization Vector.
+	 * 
+	 * @return string|boolean Encrypted string or false on failure.
+	 */
+	private static function encryptAES256CBC($data, $key, $iv)
+	{
+		return openssl_encrypt($data, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
+	}
+
+	/**
+	 * Decrypt a string with 'aes-256-cbc' cipher method.
+	 * 
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
+	 * 
+	 * @param string $data
+	 * @param string $key   The key used for decryption.
+	 * @param string $iv    A non-NULL Initialization Vector.
+	 * 
+	 * @return string|boolean Decrypted string or false on failure.
+	 */
+	private static function decryptAES256CBC($data, $key, $iv)
+	{
+		return openssl_decrypt($data, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
+	}
+
+	/**
+	 * Encrypt a string with 'aes-256-ctr' cipher method.
+	 * 
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
+	 * 
+	 * @param string $data
+	 * @param string $key   The key used for encryption.
+	 * @param string $iv    A non-NULL Initialization Vector.
+	 * 
+	 * @return string|boolean Encrypted string or false on failure.
+	 */
+	private static function encryptAES256CTR($data, $key, $iv)
+	{
+		$key = substr($key, 0, 32);
+		$iv = substr($iv, 0, 16);
+		return openssl_encrypt($data, 'aes-256-ctr', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
+	}
+
+	/**
+	 * Decrypt a string with 'aes-256-ctr' cipher method.
+	 * 
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
+	 * 
+	 * @param string $data
+	 * @param string $key   The key used for decryption.
+	 * @param string $iv    A non-NULL Initialization Vector.
+	 * 
+	 * @return string|boolean Decrypted string or false on failure.
+	 */
+	private static function decryptAES256CTR($data, $key, $iv)
+	{
+		$key = substr($key, 0, 32);
+		$iv = substr($iv, 0, 16);
+		return openssl_decrypt($data, 'aes-256-ctr', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
+	}
+
+	/**
+	 * 
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
+	 * 
+	 * @param string $data
+	 * @param string $pubkey The public key.
+	 * @param string $alg    The algorithm used for encryption.
+	 * 
+	 * @return array
+	 */
+	public static function encapsulate($data, $pubkey, $alg = 'aes256cbc')
+	{
+		if ($alg === 'aes256cbc') {
+			return self::encapsulateAes($data, $pubkey);
+		}
+		return self::encapsulateOther($data, $pubkey, $alg);
+	}
+
+	/**
+	 * 
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
+	 * 
+	 * @param type $data
+	 * @param type $pubkey The public key.
+	 * @param type $alg    The algorithm used for encryption.
+	 * 
+	 * @return array
+	 */
+	private static function encapsulateOther($data, $pubkey, $alg)
+	{
+		if (!$pubkey) {
+			logger('no key. data: '.$data);
+		}
+		$fn = 'encrypt' . strtoupper($alg);
+		if (method_exists(__CLASS__, $fn)) {
+			$result = ['encrypted' => true];
+			$key = random_bytes(256);
+			$iv  = random_bytes(256);
+			$result['data'] = base64url_encode(self::$fn($data, $key, $iv), true);
+
+			// log the offending call so we can track it down
+			if (!openssl_public_encrypt($key, $k, $pubkey)) {
+				$x = debug_backtrace();
+				logger('RSA failed. ' . print_r($x[0], true));
+			}
+
+			$result['alg'] = $alg;
+			$result['key'] = base64url_encode($k, true);
+			openssl_public_encrypt($iv, $i, $pubkey);
+			$result['iv'] = base64url_encode($i, true);
+
+			return $result;
+		} else {
+			$x = ['data' => $data, 'pubkey' => $pubkey, 'alg' => $alg, 'result' => $data];
+			Addon::callHooks('other_encapsulate', $x);
+
+			return $x['result'];
+		}
+	}
+
+	/**
+	 * 
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
+	 * 
+	 * @param string $data
+	 * @param string $pubkey
+	 * 
+	 * @return array
+	 */
+	private static function encapsulateAes($data, $pubkey)
+	{
+		if (!$pubkey) {
+			logger('aes_encapsulate: no key. data: ' . $data);
+		}
+
+		$key = random_bytes(32);
+		$iv  = random_bytes(16);
+		$result = ['encrypted' => true];
+		$result['data'] = base64url_encode(self::encryptAES256CBC($data, $key, $iv), true);
+
+		// log the offending call so we can track it down
+		if (!openssl_public_encrypt($key, $k, $pubkey)) {
+			$x = debug_backtrace();
+			logger('aes_encapsulate: RSA failed. ' . print_r($x[0], true));
+		}
+
+		$result['alg'] = 'aes256cbc';
+		$result['key'] = base64url_encode($k, true);
+		openssl_public_encrypt($iv, $i, $pubkey);
+		$result['iv'] = base64url_encode($i, true);
+
+		return $result;
+	}
+
+	/**
+	 * 
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
+	 * 
+	 * @param string $data
+	 * @param string $prvkey  The private key used for decryption.
+	 * 
+	 * @return string|boolean The decrypted string or false on failure.
+	 */
+	public static function unencapsulate($data, $prvkey)
+	{
+		if (!$data) {
+			return;
+		}
+
+		$alg = ((array_key_exists('alg', $data)) ? $data['alg'] : 'aes256cbc');
+		if ($alg === 'aes256cbc') {
+			return self::encapsulateAes($data, $prvkey);
+		}
+		return self::encapsulateOther($data, $prvkey, $alg);
+	}
+
+	/**
+	 * 
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
+	 * 
+	 * @param string $data
+	 * @param string $prvkey  The private key used for decryption.
+	 * @param string $alg
+	 * 
+	 * @return string|boolean The decrypted string or false on failure.
+	 */
+	private static function unencapsulateOther($data, $prvkey, $alg)
+	{
+		$fn = 'decrypt' . strtoupper($alg);
+
+		if (method_exists(__CLASS__, $fn)) {
+			openssl_private_decrypt(base64url_decode($data['key']), $k, $prvkey);
+			openssl_private_decrypt(base64url_decode($data['iv']), $i, $prvkey);
+
+			return self::$fn(base64url_decode($data['data']), $k, $i);
+		} else {
+			$x = ['data' => $data, 'prvkey' => $prvkey, 'alg' => $alg, 'result' => $data];
+			Addon::callHooks('other_unencapsulate', $x);
+
+			return $x['result'];
+		}
+	}
+
+	/**
+	 * 
+	 * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/include/crypto.php
+	 * 
+	 * @param array  $data
+	 * @param string $prvkey  The private key used for decryption.
+	 * 
+	 * @return string|boolean The decrypted string or false on failure.
+	 */
+	private static function unencapsulateAes($data, $prvkey)
+	{
+		openssl_private_decrypt(base64url_decode($data['key']), $k, $prvkey);
+		openssl_private_decrypt(base64url_decode($data['iv']), $i, $prvkey);
+
+		return self::decryptAES256CBC(base64url_decode($data['data']), $k, $i);
+	}
 }
diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 7d35e5441..1dd513c42 100644
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -5,6 +5,7 @@
 namespace Friendica\Util;
 
 use Friendica\Core\Addon;
+use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Protocol\Email;
 
@@ -48,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" .
@@ -72,20 +73,28 @@ class Emailer
 		$multipartMessageBody .=
 			"--" . $mimeBoundary . "--\n";					// message ending
 
+		if (Config::get("system", "sendmail_params", true)) {
+			$sendmail_params = '-f ' . $params['fromEmail'];
+		} else {
+			$sendmail_params = null;
+		}
+
 		// send the message
 		$hookdata = [
 			'to' => $params['toEmail'],
 			'subject' => $messageSubject,
 			'body' => $multipartMessageBody,
-			'headers' => $messageHeader
+			'headers' => $messageHeader,
+			'parameters' => $sendmail_params
 		];
 		//echo "<pre>"; var_dump($hookdata); killme();
 		Addon::callHooks("emailer_send", $hookdata);
 		$res = mail(
-			$hookdata['to'],							// send to address
-			$hookdata['subject'],						// subject
-			$hookdata['body'], 	 						// message body
-			$hookdata['headers']						// message headers
+			$hookdata['to'],
+			$hookdata['subject'],
+			$hookdata['body'],
+			$hookdata['headers'],
+			$hookdata['parameters']
 		);
 		logger("header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG);
 		logger("return value " . (($res)?"true":"false"), LOGGER_DEBUG);
diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index d4436e32a..92f3f56f8 100644
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -36,10 +36,8 @@ namespace Friendica\Util;
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\User;
-use Friendica\Util\Network;
-use dba;
 
 require_once 'include/dba.php';
 
@@ -72,7 +70,7 @@ class ExAuth
 	{
 		while (!feof(STDIN)) {
 			// Quit if the database connection went down
-			if (!dba::connected()) {
+			if (!DBA::connected()) {
 				$this->writeLog(LOG_ERR, 'the database connection went down');
 				return;
 			}
@@ -145,7 +143,7 @@ class ExAuth
 		// Does the hostname match? So we try directly
 		if ($a->get_hostname() == $aCommand[2]) {
 			$this->writeLog(LOG_INFO, 'internal user check for ' . $sUser . '@' . $aCommand[2]);
-			$found = dba::exists('user', ['nickname' => $sUser]);
+			$found = DBA::exists('user', ['nickname' => $sUser]);
 		} else {
 			$found = false;
 		}
@@ -226,8 +224,8 @@ class ExAuth
 		if ($a->get_hostname() == $aCommand[2]) {
 			$this->writeLog(LOG_INFO, 'internal auth for ' . $sUser . '@' . $aCommand[2]);
 
-			$aUser = dba::selectFirst('user', ['uid', 'password', 'legacy_password'], ['nickname' => $sUser]);
-			if (DBM::is_result($aUser)) {
+			$aUser = DBA::selectFirst('user', ['uid', 'password', 'legacy_password'], ['nickname' => $sUser]);
+			if (DBA::isResult($aUser)) {
 				$uid = $aUser['uid'];
 				$success = User::authenticate($aUser, $aCommand[3]);
 				$Error = $success === false;
diff --git a/src/Util/HTTPHeaders.php b/src/Util/HTTPHeaders.php
new file mode 100644
index 000000000..9b0c4529d
--- /dev/null
+++ b/src/Util/HTTPHeaders.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @file src/Util/HTTPHeaders.php
+ */
+namespace Friendica\Util;
+
+/**
+ * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/Zotlabs/Web/HTTPHeaders.php
+ */
+class HTTPHeaders
+{
+	private $in_progress = [];
+	private $parsed = [];
+
+	function __construct($headers)
+	{
+		$lines = explode("\n", str_replace("\r", '', $headers));
+
+		if ($lines) {
+			foreach ($lines as $line) {
+				if (preg_match('/^\s+/', $line, $matches) && trim($line)) {
+					if (!empty($this->in_progress['k'])) {
+						$this->in_progress['v'] .= ' ' . ltrim($line);
+						continue;
+					}
+				} else {
+					if (!empty($this->in_progress['k'])) {
+						$this->parsed[] = [$this->in_progress['k'] => $this->in_progress['v']];
+						$this->in_progress = [];
+					}
+
+					$this->in_progress['k'] = strtolower(substr($line, 0, strpos($line, ':')));
+					$this->in_progress['v'] = ltrim(substr($line, strpos($line, ':') + 1));
+				}
+			}
+
+			if (!empty($this->in_progress['k'])) {
+				$this->parsed[$this->in_progress['k']] = $this->in_progress['v'];
+				$this->in_progress = [];
+			}
+		}
+	}
+
+	function fetch()
+	{
+		return $this->parsed;
+	}
+}
diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
new file mode 100644
index 000000000..911de4308
--- /dev/null
+++ b/src/Util/HTTPSignature.php
@@ -0,0 +1,408 @@
+<?php
+
+/**
+ * @file src/Util/HTTPSignature.php
+ */
+namespace Friendica\Util;
+
+use Friendica\Core\Config;
+use Friendica\Database\DBA;
+
+/**
+ * @brief Implements HTTP Signatures per draft-cavage-http-signatures-07.
+ *
+ * Ported from Hubzilla: https://framagit.org/hubzilla/core/blob/master/Zotlabs/Web/HTTPSig.php
+ *
+ * @see https://tools.ietf.org/html/draft-cavage-http-signatures-07
+ */
+
+class HTTPSignature
+{
+	/**
+	 * @brief RFC5843
+	 *
+	 * Disabled until Friendica's ActivityPub implementation
+	 * is ready.
+	 *
+	 * @see https://tools.ietf.org/html/rfc5843
+	 *
+	 * @param string  $body The value to create the digest for
+	 * @param boolean $set  (optional, default true)
+	 *   If set send a Digest HTTP header
+	 *
+	 * @return string The generated digest of $body
+	 */
+//	public static function generateDigest($body, $set = true)
+//	{
+//		$digest = base64_encode(hash('sha256', $body, true));
+//
+//		if($set) {
+//			header('Digest: SHA-256=' . $digest);
+//		}
+//		return $digest;
+//	}
+
+	// See draft-cavage-http-signatures-08
+	public static function verify($data, $key = '')
+	{
+		$body      = $data;
+		$headers   = null;
+		$spoofable = false;
+		$result = [
+			'signer'         => '',
+			'header_signed'  => false,
+			'header_valid'   => false,
+			'content_signed' => false,
+			'content_valid'  => false
+		];
+
+		// Decide if $data arrived via controller submission or curl.
+		if (is_array($data) && $data['header']) {
+			if (!$data['success']) {
+				return $result;
+			}
+
+			$h = new HTTPHeaders($data['header']);
+			$headers = $h->fetch();
+			$body = $data['body'];
+		} else {
+			$headers = [];
+			$headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']).' '.$_SERVER['REQUEST_URI'];
+
+			foreach ($_SERVER as $k => $v) {
+				if (strpos($k, 'HTTP_') === 0) {
+					$field = str_replace('_', '-', strtolower(substr($k, 5)));
+					$headers[$field] = $v;
+				}
+			}
+		}
+
+		$sig_block = null;
+
+		if (array_key_exists('signature', $headers)) {
+			$sig_block = self::parseSigheader($headers['signature']);
+		} elseif (array_key_exists('authorization', $headers)) {
+			$sig_block = self::parseSigheader($headers['authorization']);
+		}
+
+		if (!$sig_block) {
+			logger('no signature provided.');
+			return $result;
+		}
+
+		// Warning: This log statement includes binary data
+		// logger('sig_block: ' . print_r($sig_block,true), LOGGER_DATA);
+
+		$result['header_signed'] = true;
+
+		$signed_headers = $sig_block['headers'];
+		if (!$signed_headers) {
+			$signed_headers = ['date'];
+		}
+
+		$signed_data = '';
+		foreach ($signed_headers as $h) {
+			if (array_key_exists($h, $headers)) {
+				$signed_data .= $h . ': ' . $headers[$h] . "\n";
+			}
+			if (strpos($h, '.')) {
+				$spoofable = true;
+			}
+		}
+
+		$signed_data = rtrim($signed_data, "\n");
+
+		$algorithm = null;
+		if ($sig_block['algorithm'] === 'rsa-sha256') {
+			$algorithm = 'sha256';
+		}
+		if ($sig_block['algorithm'] === 'rsa-sha512') {
+			$algorithm = 'sha512';
+		}
+
+		if ($key && function_exists($key)) {
+			$result['signer'] = $sig_block['keyId'];
+			$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'];
+//			$key = self::getActivitypubKey($sig_block['keyId']);
+//		}
+
+		if (!$key) {
+			return $result;
+		}
+
+		$x = Crypto::rsaVerify($signed_data, $sig_block['signature'], $key, $algorithm);
+
+		logger('verified: ' . $x, LOGGER_DEBUG);
+
+		if (!$x) {
+			return $result;
+		}
+
+		if (!$spoofable) {
+			$result['header_valid'] = true;
+		}
+
+		if (in_array('digest', $signed_headers)) {
+			$result['content_signed'] = true;
+			$digest = explode('=', $headers['digest']);
+
+			if ($digest[0] === 'SHA-256') {
+				$hashalg = 'sha256';
+			}
+			if ($digest[0] === 'SHA-512') {
+				$hashalg = 'sha512';
+			}
+
+			// The explode operation will have stripped the '=' padding, so compare against unpadded base64.
+			if (rtrim(base64_encode(hash($hashalg, $body, true)), '=') === $digest[1]) {
+				$result['content_valid'] = true;
+			}
+		}
+
+		logger('Content_Valid: ' . $result['content_valid']);
+
+		return $result;
+	}
+
+	/**
+	 * Fetch the public key for Activity Pub contact.
+	 *
+	 * @param string|int The identifier (contact addr or contact ID).
+	 * @return string|boolean The public key or false on failure.
+	 */
+	private static function getActivitypubKey($id)
+	{
+		if (strpos($id, 'acct:') === 0) {
+			$contact = DBA::selectFirst('contact', ['pubkey'], ['uid' => 0, 'addr' => str_replace('acct:', '', $id)]);
+		} else {
+			$contact = DBA::selectFirst('contact', ['pubkey'], ['id' => $id, 'network' => 'activitypub']);
+		}
+
+		if (DBA::isResult($contact)) {
+			return $contact['pubkey'];
+		}
+
+		if(function_exists('as_fetch')) {
+			$r = as_fetch($id);
+		}
+
+		if ($r) {
+			$j = json_decode($r, true);
+
+			if (array_key_exists('publicKey', $j) && array_key_exists('publicKeyPem', $j['publicKey'])) {
+				if ((array_key_exists('id', $j['publicKey']) && $j['publicKey']['id'] !== $id) && $j['id'] !== $id) {
+					return false;
+				}
+
+				return $j['publicKey']['publicKeyPem'];
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * @brief
+	 *
+	 * @param string  $request
+	 * @param array   $head
+	 * @param string  $prvkey
+	 * @param string  $keyid (optional, default 'Key')
+	 * @param boolean $send_headers (optional, default false)
+	 *   If set send a HTTP header
+	 * @param boolean $auth (optional, default false)
+	 * @param string  $alg (optional, default 'sha256')
+	 * @param string  $crypt_key (optional, default null)
+	 * @param string  $crypt_algo (optional, default 'aes256ctr')
+	 *
+	 * @return array
+	 */
+	public static function createSig($request, $head, $prvkey, $keyid = 'Key', $send_headers = false, $auth = false, $alg = 'sha256', $crypt_key = null, $crypt_algo = 'aes256ctr')
+	{
+		$return_headers = [];
+
+		if ($alg === 'sha256') {
+			$algorithm = 'rsa-sha256';
+		}
+
+		if ($alg === 'sha512') {
+			$algorithm = 'rsa-sha512';
+		}
+
+		$x = self::sign($request, $head, $prvkey, $alg);
+
+		$headerval = 'keyId="' . $keyid . '",algorithm="' . $algorithm
+			. '",headers="' . $x['headers'] . '",signature="' . $x['signature'] . '"';
+
+		if ($crypt_key) {
+			$x = Crypto::encapsulate($headerval, $crypt_key, $crypt_algo);
+			$headerval = 'iv="' . $x['iv'] . '",key="' . $x['key'] . '",alg="' . $x['alg'] . '",data="' . $x['data'] . '"';
+		}
+
+		if ($auth) {
+			$sighead = 'Authorization: Signature ' . $headerval;
+		} else {
+			$sighead = 'Signature: ' . $headerval;
+		}
+
+		if ($head) {
+			foreach ($head as $k => $v) {
+				if ($send_headers) {
+					// This is for ActivityPub implementation.
+					// Since the Activity Pub implementation isn't
+					// ready at the moment, we comment it out.
+					// header($k . ': ' . $v);
+				} else {
+					$return_headers[] = $k . ': ' . $v;
+				}
+			}
+		}
+
+		if ($send_headers) {
+			// This is for ActivityPub implementation.
+			// Since the Activity Pub implementation isn't
+			// ready at the moment, we comment it out.
+			// header($sighead);
+		} else {
+			$return_headers[] = $sighead;
+		}
+
+		return $return_headers;
+	}
+
+	/**
+	 * @brief
+	 *
+	 * @param string $request
+	 * @param array  $head
+	 * @param string $prvkey
+	 * @param string $alg (optional) default 'sha256'
+	 *
+	 * @return array
+	 */
+	private static function sign($request, $head, $prvkey, $alg = 'sha256')
+	{
+		$ret = [];
+		$headers = '';
+		$fields  = '';
+
+		if ($request) {
+			$headers = '(request-target)' . ': ' . trim($request) . "\n";
+			$fields = '(request-target)';
+		}
+
+		if ($head) {
+			foreach ($head as $k => $v) {
+				$headers .= strtolower($k) . ': ' . trim($v) . "\n";
+				if ($fields) {
+					$fields .= ' ';
+				}
+				$fields .= strtolower($k);
+			}
+			// strip the trailing linefeed
+			$headers = rtrim($headers, "\n");
+		}
+
+		$sig = base64_encode(Crypto::rsaSign($headers, $prvkey, $alg));
+
+		$ret['headers']   = $fields;
+		$ret['signature'] = $sig;
+
+		return $ret;
+	}
+
+	/**
+	 * @brief
+	 *
+	 * @param string $header
+	 * @return array associate array with
+	 *   - \e string \b keyID
+	 *   - \e string \b algorithm
+	 *   - \e array  \b headers
+	 *   - \e string \b signature
+	 */
+	public static function parseSigheader($header)
+	{
+		$ret = [];
+		$matches = [];
+
+		// if the header is encrypted, decrypt with (default) site private key and continue
+		if (preg_match('/iv="(.*?)"/ism', $header, $matches)) {
+			$header = self::decryptSigheader($header);
+		}
+
+		if (preg_match('/keyId="(.*?)"/ism', $header, $matches)) {
+			$ret['keyId'] = $matches[1];
+		}
+
+		if (preg_match('/algorithm="(.*?)"/ism', $header, $matches)) {
+			$ret['algorithm'] = $matches[1];
+		}
+
+		if (preg_match('/headers="(.*?)"/ism', $header, $matches)) {
+			$ret['headers'] = explode(' ', $matches[1]);
+		}
+
+		if (preg_match('/signature="(.*?)"/ism', $header, $matches)) {
+			$ret['signature'] = base64_decode(preg_replace('/\s+/', '', $matches[1]));
+		}
+
+		if (($ret['signature']) && ($ret['algorithm']) && (!$ret['headers'])) {
+			$ret['headers'] = ['date'];
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @brief
+	 *
+	 * @param string $header
+	 * @param string $prvkey (optional), if not set use site private key
+	 *
+	 * @return array|string associative array, empty string if failue
+	 *   - \e string \b iv
+	 *   - \e string \b key
+	 *   - \e string \b alg
+	 *   - \e string \b data
+	 */
+	private static function decryptSigheader($header, $prvkey = null)
+	{
+		$iv = $key = $alg = $data = null;
+
+		if (!$prvkey) {
+			$prvkey = Config::get('system', 'prvkey');
+		}
+
+		$matches = [];
+
+		if (preg_match('/iv="(.*?)"/ism', $header, $matches)) {
+			$iv = $matches[1];
+		}
+
+		if (preg_match('/key="(.*?)"/ism', $header, $matches)) {
+			$key = $matches[1];
+		}
+
+		if (preg_match('/alg="(.*?)"/ism', $header, $matches)) {
+			$alg = $matches[1];
+		}
+
+		if (preg_match('/data="(.*?)"/ism', $header, $matches)) {
+			$data = $matches[1];
+		}
+
+		if ($iv && $key && $alg && $data) {
+			return Crypto::unencapsulate(['iv' => $iv, 'key' => $key, 'alg' => $alg, 'data' => $data], $prvkey);
+		}
+
+		return '';
+	}
+}
diff --git a/src/Util/Lock.php b/src/Util/Lock.php
deleted file mode 100644
index eba264ad9..000000000
--- a/src/Util/Lock.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-/**
- * @file src/Util/Lock.php
- */
-namespace Friendica\Util;
-
-/**
- * @file src/Util/Lock.php
- * @brief Functions for preventing parallel execution of functions
- */
-
-use Friendica\Core\Config;
-use Friendica\Database\DBM;
-use Memcache;
-use dba;
-
-require_once 'include/dba.php';
-
-/**
- * @brief This class contain Functions for preventing parallel execution of functions
- */
-class Lock
-{
-	private static $semaphore = [];
-
-	/**
-	 * @brief Check for memcache and open a connection if configured
-	 *
-	 * @return object|boolean The memcache object - or "false" if not successful
-	 */
-	private static function connectMemcache()
-	{
-		if (!function_exists('memcache_connect')) {
-			return false;
-		}
-
-		if (!Config::get('system', 'memcache')) {
-			return false;
-		}
-
-		$memcache_host = Config::get('system', 'memcache_host', '127.0.0.1');
-		$memcache_port = Config::get('system', 'memcache_port', 11211);
-
-		$memcache = new Memcache;
-
-		if (!$memcache->connect($memcache_host, $memcache_port)) {
-			return false;
-		}
-
-		return $memcache;
-	}
-
-	/**
-	 * @brief Creates a semaphore key
-	 *
-	 * @param string $fn_name Name of the lock
-	 *
-	 * @return ressource the semaphore key
-	 */
-	private static function semaphoreKey($fn_name)
-	{
-		$temp = get_temppath();
-
-		$file = $temp.'/'.$fn_name.'.sem';
-
-		if (!file_exists($file)) {
-			file_put_contents($file, $fn_name);
-		}
-
-		return ftok($file, 'f');
-	}
-
-	/**
-	 * @brief Sets a lock for a given name
-	 *
-	 * @param string  $fn_name Name of the lock
-	 * @param integer $timeout Seconds until we give up
-	 *
-	 * @return boolean Was the lock successful?
-	 */
-	public static function set($fn_name, $timeout = 120)
-	{
-		$got_lock = false;
-		$start = time();
-
-		// The second parameter for "sem_acquire" doesn't exist before 5.6.1
-		if (function_exists('sem_get') && version_compare(PHP_VERSION, '5.6.1', '>=')) {
-			self::$semaphore[$fn_name] = sem_get(self::semaphoreKey($fn_name));
-			if (self::$semaphore[$fn_name]) {
-				return sem_acquire(self::$semaphore[$fn_name], ($timeout == 0));
-			}
-		}
-
-		$memcache = self::connectMemcache();
-		if (is_object($memcache)) {
-			$cachekey = get_app()->get_hostname().";lock:".$fn_name;
-
-			do {
-				// We only lock to be sure that nothing happens at exactly the same time
-				dba::lock('locks');
-				$lock = $memcache->get($cachekey);
-
-				if (!is_bool($lock)) {
-					$pid = (int)$lock;
-
-					// When the process id isn't used anymore, we can safely claim the lock for us.
-					// Or we do want to lock something that was already locked by us.
-					if (!posix_kill($pid, 0) || ($pid == getmypid())) {
-						$lock = false;
-					}
-				}
-				if (is_bool($lock)) {
-					$memcache->set($cachekey, getmypid(), MEMCACHE_COMPRESSED, 300);
-					$got_lock = true;
-				}
-
-				dba::unlock();
-
-				if (!$got_lock && ($timeout > 0)) {
-					usleep(rand(10000, 200000));
-				}
-			} while (!$got_lock && ((time() - $start) < $timeout));
-
-			return $got_lock;
-		}
-
-		do {
-			dba::lock('locks');
-			$lock = dba::selectFirst('locks', ['locked', 'pid'], ['name' => $fn_name]);
-
-			if (DBM::is_result($lock)) {
-				if ($lock['locked']) {
-					// When the process id isn't used anymore, we can safely claim the lock for us.
-					if (!posix_kill($lock['pid'], 0)) {
-						$lock['locked'] = false;
-					}
-					// We want to lock something that was already locked by us? So we got the lock.
-					if ($lock['pid'] == getmypid()) {
-						$got_lock = true;
-					}
-				}
-				if (!$lock['locked']) {
-					dba::update('locks', ['locked' => true, 'pid' => getmypid()], ['name' => $fn_name]);
-					$got_lock = true;
-				}
-			} elseif (!DBM::is_result($lock)) {
-				dba::insert('locks', ['name' => $fn_name, 'locked' => true, 'pid' => getmypid()]);
-				$got_lock = true;
-			}
-
-			dba::unlock();
-
-			if (!$got_lock && ($timeout > 0)) {
-				usleep(rand(100000, 2000000));
-			}
-		} while (!$got_lock && ((time() - $start) < $timeout));
-
-		return $got_lock;
-	}
-
-	/**
-	 * @brief Removes a lock if it was set by us
-	 *
-	 * @param string $fn_name Name of the lock
-	 * @return mixed
-	 */
-	public static function remove($fn_name)
-	{
-		if (function_exists('sem_get') && version_compare(PHP_VERSION, '5.6.1', '>=')) {
-			if (empty(self::$semaphore[$fn_name])) {
-				return false;
-			} else {
-				$success = @sem_release(self::$semaphore[$fn_name]);
-				unset(self::$semaphore[$fn_name]);
-				return $success;
-			}
-		}
-
-		$memcache = self::connectMemcache();
-		if (is_object($memcache)) {
-			$cachekey = get_app()->get_hostname().";lock:".$fn_name;
-			$lock = $memcache->get($cachekey);
-
-			if (!is_bool($lock)) {
-				if ((int)$lock == getmypid()) {
-					$memcache->delete($cachekey);
-				}
-			}
-			return;
-		}
-
-		dba::update('locks', ['locked' => false, 'pid' => 0], ['name' => $fn_name, 'pid' => getmypid()]);
-		return;
-	}
-
-	/**
-	 * @brief Removes all lock that were set by us
-	 * @return void
-	 */
-	public static function removeAll()
-	{
-		$memcache = self::connectMemcache();
-		if (is_object($memcache)) {
-			// We cannot delete all cache entries, but this doesn't matter with memcache
-			return;
-		}
-
-		dba::update('locks', ['locked' => false, 'pid' => 0], ['pid' => getmypid()]);
-		return;
-	}
-}
diff --git a/src/Util/Network.php b/src/Util/Network.php
index c1ea6e354..0de966185 100644
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -18,12 +18,13 @@ use DomXPath;
 class Network
 {
 	/**
-	 * @brief Curl wrapper
+	 * Curl wrapper
 	 *
 	 * If binary flag is true, return binary results.
 	 * Set the cookiejar argument to a string (e.g. "/tmp/friendica-cookies.txt")
 	 * to preserve cookies from one request to the next.
 	 *
+	 * @brief Curl wrapper
 	 * @param string  $url            URL to fetch
 	 * @param boolean $binary         default false
 	 *                                TRUE if asked to return binary results (file download)
@@ -42,11 +43,12 @@ class Network
 	}
 
 	/**
-	 * @brief Curl wrapper with array of return values.
+	 * Curl wrapper with array of return values.
 	 *
 	 * Inner workings and parameters are the same as @ref fetchUrl but returns an array with
 	 * all the information collected during the fetch.
 	 *
+	 * @brief Curl wrapper with array of return values.
 	 * @param string  $url            URL to fetch
 	 * @param boolean $binary         default false
 	 *                                TRUE if asked to return binary results (file download)
@@ -101,7 +103,7 @@ class Network
 		$a = get_app();
 
 		$parts = parse_url($url);
-		$path_parts = explode('/', $parts['path']);
+		$path_parts = explode('/', defaults($parts, 'path', ''));
 		foreach ($path_parts as $part) {
 		        if (strlen($part) <> mb_strlen($part)) {
 				$parts2[] = rawurlencode($part);
@@ -218,7 +220,7 @@ class Network
 		}
 
 		if (curl_errno($ch) !== CURLE_OK) {
-			logger('error fetching ' . $url . ': ' . curl_error($ch), LOGGER_NORMAL);
+			logger('error fetching ' . $url . ': ' . curl_error($ch), LOGGER_INFO);
 		}
 
 		$ret['errno'] = curl_errno($ch);
@@ -250,7 +252,7 @@ class Network
 
 			$newurl = $curl_info['redirect_url'];
 
-			if (($new_location_info['path'] == '') && ($new_location_info['host'] != '')) {
+			if (empty($new_location_info['path']) && !empty($new_location_info['host'])) {
 				$newurl = $new_location_info['scheme'] . '://' . $new_location_info['host'] . $old_location_info['path'];
 			}
 
@@ -410,7 +412,7 @@ class Network
 			$matches = [];
 			$new_location_info = @parse_url($curl_info['redirect_url']);
 			$old_location_info = @parse_url($curl_info['url']);
-	
+
 			preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches);
 			$newurl = trim(array_pop($matches));
 
@@ -492,7 +494,11 @@ class Network
 
 		$h = substr($addr, strpos($addr, '@') + 1);
 
-		if (($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
+		// Concerning the @ see here: https://stackoverflow.com/questions/36280957/dns-get-record-a-temporary-server-error-occurred
+		if ($h && (@dns_get_record($h, DNS_A + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
+			return true;
+		}
+		if ($h && @dns_get_record($h, DNS_CNAME + DNS_MX)) {
 			return true;
 		}
 		return false;
@@ -554,21 +560,18 @@ class Network
 	 */
 	public static function isUrlBlocked($url)
 	{
-		$h = @parse_url($url);
-
-		if (! $h) {
-			return true;
-		}
-
-		$domain_blocklist = Config::get('system', 'blocklist', []);
-		if (! $domain_blocklist) {
+		$host = @parse_url($url, PHP_URL_HOST);
+		if (!$host) {
 			return false;
 		}
 
-		$host = strtolower($h['host']);
+		$domain_blocklist = Config::get('system', 'blocklist', []);
+		if (!$domain_blocklist) {
+			return false;
+		}
 
 		foreach ($domain_blocklist as $domain_block) {
-			if (strtolower($domain_block['domain']) == $host) {
+			if (strcasecmp($domain_block['domain'], $host) === 0) {
 				return true;
 			}
 		}
@@ -651,7 +654,7 @@ class Network
 	public static function stripTrackingQueryParams($url)
 	{
 		$urldata = parse_url($url);
-		if (is_string($urldata["query"])) {
+		if (!empty($urldata["query"])) {
 			$query = $urldata["query"];
 			parse_str($query, $querydata);
 
@@ -713,7 +716,7 @@ class Network
 		$url = self::stripTrackingQueryParams($url);
 
 		if ($depth > 10) {
-			return($url);
+			return $url;
 		}
 
 		$url = trim($url, "'");
@@ -736,16 +739,14 @@ class Network
 		$a->save_timestamp($stamp1, "network");
 
 		if ($http_code == 0) {
-			return($url);
+			return $url;
 		}
 
-		if ((($curl_info['http_code'] == "301") || ($curl_info['http_code'] == "302"))
-			&& (($curl_info['redirect_url'] != "") || ($curl_info['location'] != ""))
-		) {
-			if ($curl_info['redirect_url'] != "") {
-				return(self::finalUrl($curl_info['redirect_url'], ++$depth, $fetchbody));
-			} else {
-				return(self::finalUrl($curl_info['location'], ++$depth, $fetchbody));
+		if (in_array($http_code, ['301', '302'])) {
+			if (!empty($curl_info['redirect_url'])) {
+				return self::finalUrl($curl_info['redirect_url'], ++$depth, $fetchbody);
+			} elseif (!empty($curl_info['location'])) {
+				return self::finalUrl($curl_info['location'], ++$depth, $fetchbody);
 			}
 		}
 
@@ -756,12 +757,12 @@ class Network
 
 		// if the file is too large then exit
 		if ($curl_info["download_content_length"] > 1000000) {
-			return($url);
+			return $url;
 		}
 
 		// if it isn't a HTML file then exit
-		if (($curl_info["content_type"] != "") && !strstr(strtolower($curl_info["content_type"]), "html")) {
-			return($url);
+		if (!empty($curl_info["content_type"]) && !strstr(strtolower($curl_info["content_type"]), "html")) {
+			return $url;
 		}
 
 		$stamp1 = microtime(true);
@@ -780,7 +781,7 @@ class Network
 		$a->save_timestamp($stamp1, "network");
 
 		if (trim($body) == "") {
-			return($url);
+			return $url;
 		}
 
 		// Check for redirect in meta elements
@@ -803,7 +804,7 @@ class Network
 				$pathinfo = explode(";", $path);
 				foreach ($pathinfo as $value) {
 					if (substr(strtolower($value), 0, 4) == "url=") {
-						return(self::finalUrl(substr($value, 4), ++$depth));
+						return self::finalUrl(substr($value, 4), ++$depth);
 					}
 				}
 			}
@@ -835,14 +836,35 @@ class Network
 			return "";
 		}
 
+		if (empty($parts1["scheme"])) {
+			$parts1["scheme"] = '';
+		}
+		if (empty($parts2["scheme"])) {
+			$parts2["scheme"] = '';
+		}
+
 		if ($parts1["scheme"] != $parts2["scheme"]) {
 			return "";
 		}
 
+		if (empty($parts1["host"])) {
+			$parts1["host"] = '';
+		}
+		if (empty($parts2["host"])) {
+			$parts2["host"] = '';
+		}
+
 		if ($parts1["host"] != $parts2["host"]) {
 			return "";
 		}
 
+		if (empty($parts1["port"])) {
+			$parts1["port"] = '';
+		}
+		if (empty($parts2["port"])) {
+			$parts2["port"] = '';
+		}
+
 		if ($parts1["port"] != $parts2["port"]) {
 			return "";
 		}
@@ -853,14 +875,21 @@ class Network
 			$match .= ":".$parts1["port"];
 		}
 
+		if (empty($parts1["path"])) {
+			$parts1["path"] = '';
+		}
+		if (empty($parts2["path"])) {
+			$parts2["path"] = '';
+		}
+
 		$pathparts1 = explode("/", $parts1["path"]);
 		$pathparts2 = explode("/", $parts2["path"]);
 
 		$i = 0;
 		$path = "";
 		do {
-			$path1 = $pathparts1[$i];
-			$path2 = $pathparts2[$i];
+			$path1 = defaults($pathparts1, $i, '');
+			$path2 = defaults($pathparts2, $i, '');
 
 			if ($path1 == $path2) {
 				$path .= $path1."/";
diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index b267c6108..00eac1390 100644
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -5,15 +5,12 @@
  */
 namespace Friendica\Util;
 
+use DOMDocument;
+use DOMXPath;
 use Friendica\Content\OEmbed;
 use Friendica\Core\Addon;
+use Friendica\Database\DBA;
 use Friendica\Object\Image;
-use Friendica\Util\Network;
-use Friendica\Util\XML;
-
-use dba;
-use DOMXPath;
-use DOMDocument;
 
 require_once 'include/dba.php';
 
@@ -50,7 +47,7 @@ class ParseUrl
 			return false;
 		}
 
-		$parsed_url = dba::selectFirst('parsed_url', ['content'],
+		$parsed_url = DBA::selectFirst('parsed_url', ['content'],
 			['url' => normalise_link($url), 'guessing' => !$no_guessing, 'oembed' => $do_oembed]
 		);
 		if (!empty($parsed_url['content'])) {
@@ -60,7 +57,7 @@ class ParseUrl
 
 		$data = self::getSiteinfo($url, $no_guessing, $do_oembed);
 
-		dba::insert(
+		DBA::insert(
 			'parsed_url',
 			[
 				'url' => normalise_link($url), 'guessing' => !$no_guessing,
@@ -121,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, "'");
@@ -135,218 +132,223 @@ 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 (!in_array($oembed_data->type, ["error", "rich", ""])) {
-				$siteinfo["type"] = $oembed_data->type;
-			}
+			if (!empty($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 (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;
+					}
 				}
 			}
 		}
 
 		// 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;
 				}
 			}
 
-			$attr["content"] = trim(html_entity_decode($attr["content"], ENT_QUOTES, "UTF-8"));
-
-			if ($attr["content"] != "") {
-				switch (strtolower($attr["name"])) {
-					case "fulltitle":
-						$siteinfo["title"] = trim($attr["content"]);
-						break;
-					case "description":
-						$siteinfo["text"] = trim($attr["content"]);
-						break;
-					case "thumbnail":
-						$siteinfo["image"] = $attr["content"];
-						break;
-					case "twitter:image":
-						$siteinfo["image"] = $attr["content"];
-						break;
-					case "twitter:image:src":
-						$siteinfo["image"] = $attr["content"];
-						break;
-					case "twitter:card":
-						if (($siteinfo["type"] == "") || ($attr["content"] == "photo")) {
-							$siteinfo["type"] = $attr["content"];
-						}
-						break;
-					case "twitter:description":
-						$siteinfo["text"] = trim($attr["content"]);
-						break;
-					case "twitter:title":
-						$siteinfo["title"] = trim($attr["content"]);
-						break;
-					case "dc.title":
-						$siteinfo["title"] = trim($attr["content"]);
-						break;
-					case "dc.description":
-						$siteinfo["text"] = trim($attr["content"]);
-						break;
-					case "keywords":
-						$keywords = explode(",", $attr["content"]);
-						break;
-					case "news_keywords":
-						$keywords = explode(",", $attr["content"]);
-						break;
-				}
+			if (empty($meta_tag['content'])) {
+				continue;
 			}
-			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':
+					// Detect photo pages
+					if ($meta_tag['content'] == 'summary_large_image') {
+						$siteinfo['type'] = 'photo';
+					}
+					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 (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;
 				}
 			}
 
-			$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'));
 
-			if ($attr["content"] != "") {
-				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]");
+		// Prevent to have a photo type without an image
+		if ((empty($siteinfo['image']) || !empty($siteinfo['text'])) && ($siteinfo['type'] == 'photo')) {
+			$siteinfo['type'] = 'link';
+		}
+
+		if (empty($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)) {
@@ -358,70 +360,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 ($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;
 	}
 
 	/**
@@ -483,21 +487,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"];
 		}
 
diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
new file mode 100644
index 000000000..3473e8d16
--- /dev/null
+++ b/src/Util/Proxy.php
@@ -0,0 +1,213 @@
+<?php
+
+namespace Friendica\Util;
+
+use Friendica\BaseModule;
+use Friendica\BaseObject;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+
+require_once 'include/security.php';
+
+/**
+ * @brief Proxy utilities class
+ */
+class Proxy
+{
+
+	/**
+	 * Default time to keep images in proxy storage
+	 */
+	const DEFAULT_TIME = 86400; // 1 Day
+
+	/**
+	 * Sizes constants
+	 */
+	const SIZE_MICRO  = 'micro';
+	const SIZE_THUMB  = 'thumb';
+	const SIZE_SMALL  = 'small';
+	const SIZE_MEDIUM = 'medium';
+	const SIZE_LARGE  = 'large';
+
+	/**
+	 * Accepted extensions
+	 *
+	 * @var array
+	 * @todo Make this configurable?
+	 */
+	private static $extensions = [
+		'jpg',
+		'jpeg',
+		'gif',
+		'png',
+	];
+
+	/**
+	 * @brief Private constructor
+	 */
+	private function __construct () {
+		// No instances from utilities classes
+	}
+
+	/**
+	 * @brief Transform a remote URL into a local one.
+	 *
+	 * This function only performs the URL replacement on http URL and if the
+	 * provided URL isn't local, "the isn't deactivated" (sic) and if the config
+	 * system.proxy_disabled is set to false.
+	 *
+	 * @param string $url       The URL to proxyfy
+	 * @param bool   $writemode Returns a local path the remote URL should be saved to
+	 * @param string $size      One of the ProxyUtils::SIZE_* constants
+	 *
+	 * @return string The proxyfied URL or relative path
+	 */
+	public static function proxifyUrl($url, $writemode = false, $size = '')
+	{
+		// Get application instance
+		$a = BaseObject::getApp();
+
+		// Trim URL first
+		$url = trim($url);
+
+		// Is no http in front of it?
+		/// @TODO To weak test for being a valid URL
+		if (substr($url, 0, 4) !== 'http') {
+			return $url;
+		}
+
+		// Only continue if it isn't a local image and the isn't deactivated
+		if (self::isLocalImage($url)) {
+			$url = str_replace(normalise_link(System::baseUrl()) . '/', System::baseUrl() . '/', $url);
+			return $url;
+		}
+
+		// Is the proxy disabled?
+		if (Config::get('system', 'proxy_disabled')) {
+			return $url;
+		}
+
+		// Image URL may have encoded ampersands for display which aren't desirable for proxy
+		$url = html_entity_decode($url, ENT_NOQUOTES, 'utf-8');
+
+		// Creating a sub directory to reduce the amount of files in the cache directory
+		$basepath = $a->get_basepath() . '/proxy';
+
+		$shortpath = hash('md5', $url);
+		$longpath = substr($shortpath, 0, 2);
+
+		if (is_dir($basepath) && $writemode && !is_dir($basepath . '/' . $longpath)) {
+			mkdir($basepath . '/' . $longpath);
+			chmod($basepath . '/' . $longpath, 0777);
+		}
+
+		$longpath .= '/' . strtr(base64_encode($url), '+/', '-_');
+
+		// Extract the URL extension
+		$extension = pathinfo(parse_url($url, PHP_URL_PATH), PATHINFO_EXTENSION);
+
+		if (in_array($extension, self::$extensions)) {
+			$shortpath .= '.' . $extension;
+			$longpath .= '.' . $extension;
+		}
+
+		$proxypath = System::baseUrl() . '/proxy/' . $longpath;
+
+		if ($size != '') {
+			$size = ':' . $size;
+		}
+
+		// Too long files aren't supported by Apache
+		// Writemode in combination with long files shouldn't be possible
+		if ((strlen($proxypath) > 250) && $writemode) {
+			return $shortpath;
+		} elseif (strlen($proxypath) > 250) {
+			return System::baseUrl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
+		} elseif ($writemode) {
+			return $longpath;
+		} else {
+			return $proxypath . $size;
+		}
+	}
+
+	/**
+	 * @brief "Proxifies" HTML code's image tags
+	 *
+	 * "Proxifies", means replaces image URLs in given HTML code with those from
+	 * proxy storage directory.
+	 *
+	 * @param string $html Un-proxified HTML code
+	 *
+	 * @return string Proxified HTML code
+	 */
+	public static function proxifyHtml($html)
+	{
+		$html = str_replace(normalise_link(System::baseUrl()) . '/', System::baseUrl() . '/', $html);
+
+		return preg_replace_callback('/(<img [^>]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', 'self::replaceUrl', $html);
+	}
+
+	/**
+	 * @brief Checks if the URL is a local URL.
+	 *
+	 * @param string $url
+	 * @return boolean
+	 */
+	private static function isLocalImage($url)
+	{
+		if (substr($url, 0, 1) == '/') {
+			return true;
+		}
+
+		if (strtolower(substr($url, 0, 5)) == 'data:') {
+			return true;
+		}
+
+		// links normalised - bug #431
+		$baseurl = normalise_link(System::baseUrl());
+		$url = normalise_link($url);
+
+		return (substr($url, 0, strlen($baseurl)) == $baseurl);
+	}
+
+	/**
+	 * @brief Return the array of query string parameters from a URL
+	 *
+	 * @param string $url URL to parse
+	 * @return array Associative array of query string parameters
+	 */
+	private static function parseQuery($url)
+	{
+		$query = parse_url($url, PHP_URL_QUERY);
+		$query = html_entity_decode($query);
+
+		parse_str($query, $arr);
+
+		return $arr;
+	}
+
+	/**
+	 * @brief Call-back method to replace the UR
+	 *
+	 * @param array $matches Matches from preg_replace_callback()
+	 * @return string Proxified HTML image tag
+	 */
+	private static function replaceUrl(array $matches)
+	{
+		// if the picture seems to be from another picture cache then take the original source
+		$queryvar = self::parseQuery($matches[2]);
+
+		if (!empty($queryvar['url']) && substr($queryvar['url'], 0, 4) == 'http') {
+			$matches[2] = urldecode($queryvar['url']);
+		}
+
+		// Following line changed per bug #431
+		if (self::isLocalImage($matches[2])) {
+			return $matches[1] . $matches[2] . $matches[3];
+		}
+
+		// Return proxified HTML
+		return $matches[1] . self::proxifyUrl(htmlspecialchars_decode($matches[2])) . $matches[3];
+	}
+
+}
diff --git a/src/Util/XML.php b/src/Util/XML.php
index 8dc540324..e06a92d25 100644
--- a/src/Util/XML.php
+++ b/src/Util/XML.php
@@ -431,4 +431,34 @@ class XML
 		}
 		return $x;
 	}
+
+	public static function getFirstNodeValue($xpath, $element, $context = null)
+	{
+		$result = $xpath->evaluate($element, $context);
+		if (!is_object($result)) {
+			return '';
+		}
+
+		$first_item = $result->item(0);
+		if (!is_object($first_item)) {
+			return '';
+		}
+
+		return $first_item->nodeValue;
+	}
+
+	public static function getFirstAttributes($xpath, $element, $context = null)
+	{
+		$result = $xpath->query($element, $context);
+		if (!is_object($result)) {
+			return false;
+		}
+
+		$first_item = $result->item(0);
+		if (!is_object($first_item)) {
+			return false;
+		}
+
+		return $first_item->attributes;
+	}
 }
diff --git a/src/Worker/CheckVersion.php b/src/Worker/CheckVersion.php
index a6056ccbc..3aec6cac1 100644
--- a/src/Worker/CheckVersion.php
+++ b/src/Worker/CheckVersion.php
@@ -8,6 +8,7 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Config;
+use Friendica\Database\DBA;
 use Friendica\Util\Network;
 
 /**
@@ -16,10 +17,10 @@ use Friendica\Util\Network;
  * Checking the upstream version is optional (opt-in) and can be done to either
  * the master or the develop branch in the repository.
  */
-class CheckVersion {
-	public static function execute() {
-		global $a;
-
+class CheckVersion
+{
+	public static function execute()
+	{
 		logger('checkversion: start');
 
 		$checkurl = Config::get('system', 'check_new_version_url', 'none');
@@ -38,7 +39,7 @@ class CheckVersion {
 		logger("Checking VERSION from: ".$checked_url, LOGGER_DEBUG);
 
 		// fetch the VERSION file
-		$gitversion = dbesc(trim(Network::fetchUrl($checked_url)));
+		$gitversion = DBA::escape(trim(Network::fetchUrl($checked_url)));
 		logger("Upstream VERSION is: ".$gitversion, LOGGER_DEBUG);
 
 		Config::set('system', 'git_friendica_version', $gitversion);
diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index e425c0350..61077ae73 100644
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -4,18 +4,22 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
-use dba;
 
 require_once 'include/dba.php';
 
-Class Cron {
-	public static function execute($parameter = '', $generation = 0) {
-		global $a;
+class Cron
+{
+	public static function execute($parameter = '', $generation = 0)
+	{
+		$a = BaseObject::getApp();
 
 		// Poll contacts with specific parameters
 		if (!empty($parameter)) {
@@ -99,16 +103,23 @@ Class Cron {
 		if (Config::get('system', 'last_cron_hourly', 0) + 3600 < time()) {
 
 			// Delete all done workerqueue entries
-			dba::delete('workerqueue', ['`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 1 HOUR']);
+			DBA::delete('workerqueue', ['`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 1 HOUR']);
 
 			// Optimizing this table only last seconds
 			if (Config::get('system', 'optimize_workerqueue', false)) {
-				dba::e("OPTIMIZE TABLE `workerqueue`");
+				DBA::e("OPTIMIZE TABLE `workerqueue`");
 			}
 
 			Config::set('system', 'last_cron_hourly', time());
 		}
 
+		// Ensure to have a .htaccess file.
+		// this is a precaution for systems that update automatically
+		$basepath = $a->get_basepath();
+		if (!file_exists($basepath . '/.htaccess')) {
+			copy($basepath . '/.htaccess-dist', $basepath . '/.htaccess');
+		}
+
 		// Poll contacts
 		self::pollContacts($parameter, $generation);
 
@@ -178,14 +189,14 @@ Class Cron {
 					AND `contact`.`network` IN ('%s', '%s', '%s', '%s', '%s') $sql_extra
 					AND NOT `contact`.`self` AND NOT `contact`.`blocked`
 				WHERE NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql",
-			dbesc(NETWORK_DFRN),
-			dbesc(NETWORK_OSTATUS),
-			dbesc(NETWORK_DIASPORA),
-			dbesc(NETWORK_FEED),
-			dbesc(NETWORK_MAIL)
+			DBA::escape(Protocol::DFRN),
+			DBA::escape(Protocol::OSTATUS),
+			DBA::escape(Protocol::DIASPORA),
+			DBA::escape(Protocol::FEED),
+			DBA::escape(Protocol::MAIL)
 		);
 
-		if (!DBM::is_result($contacts)) {
+		if (!DBA::isResult($contacts)) {
 			return;
 		}
 
@@ -196,11 +207,11 @@ Class Cron {
 			}
 
 			// Friendica and OStatus are checked once a day
-			if (in_array($contact['network'], [NETWORK_DFRN, NETWORK_OSTATUS])) {
+			if (in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS])) {
 				$contact['priority'] = 2;
 			}
 
-			if ($contact['subhub'] && in_array($contact['network'], [NETWORK_DFRN, NETWORK_OSTATUS])) {
+			if ($contact['subhub'] && in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS])) {
 				/*
 				 * We should be getting everything via a hub. But just to be sure, let's check once a day.
 				 * (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately)
@@ -212,7 +223,7 @@ Class Cron {
 			}
 
 			// Check Diaspora contacts or followers once a week
-			if (($contact["network"] == NETWORK_DIASPORA) || ($contact["rel"] == CONTACT_IS_FOLLOWER)) {
+			if (($contact["network"] == Protocol::DIASPORA) || ($contact["rel"] == Contact::FOLLOWER)) {
 				$contact['priority'] = 4;
 			}
 
@@ -267,7 +278,7 @@ Class Cron {
 				}
 			}
 
-			if (($contact['network'] == NETWORK_FEED) && ($contact['priority'] <= 3)) {
+			if (($contact['network'] == Protocol::FEED) && ($contact['priority'] <= 3)) {
 				$priority = PRIORITY_MEDIUM;
 			} elseif ($contact['archive']) {
 				$priority = PRIORITY_NEGLIGIBLE;
diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index e843b5920..098bce4d9 100644
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -5,9 +5,11 @@
 namespace Friendica\Worker;
 
 use Friendica\App;
+use Friendica\BaseObject;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Database\PostUpdate;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
@@ -15,7 +17,7 @@ use Friendica\Model\Photo;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
-use dba;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/dba.php';
 require_once 'mod/nodeinfo.php';
@@ -24,7 +26,7 @@ class CronJobs
 {
 	public static function execute($command = '')
 	{
-		global $a;
+		$a = BaseObject::getApp();
 
 		// No parameter set? So return
 		if ($command == '') {
@@ -91,7 +93,7 @@ class CronJobs
 	private static function updatePhotoAlbums()
 	{
 		$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed`");
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return;
 		}
 
@@ -107,18 +109,24 @@ class CronJobs
 	{
 		// expire any expired regular accounts. Don't expire forums.
 		$condition = ["NOT `account_expired` AND `account_expires_on` > ? AND `account_expires_on` < UTC_TIMESTAMP() AND `page-flags` = 0", NULL_DATE];
-		dba::update('user', ['account_expired' => true], $condition);
+		DBA::update('user', ['account_expired' => true], $condition);
 
 		// Remove any freshly expired account
-		$users = dba::select('user', ['uid'], ['account_expired' => true, 'account_removed' => false]);
-		while ($user = dba::fetch($users)) {
+		$users = DBA::select('user', ['uid'], ['account_expired' => true, 'account_removed' => false]);
+		while ($user = DBA::fetch($users)) {
 			User::remove($user['uid']);
 		}
 
 		// delete user records for recently removed accounts
-		$users = dba::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"]);
-		while ($user = dba::fetch($users)) {
-			dba::delete('user', ['uid' => $user['uid']]);
+		$users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY"]);
+		while ($user = DBA::fetch($users)) {
+			// Delete the contacts of this user
+			$self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]);
+			if (DBA::isResult($self)) {
+				DBA::delete('contact', ['nurl' => $self['nurl'], 'self' => false]);
+			}
+
+			DBA::delete('user', ['uid' => $user['uid']]);
 		}
 	}
 
@@ -159,18 +167,20 @@ class CronJobs
 			clear_cache($a->get_basepath(), $a->get_basepath() . "/proxy");
 
 			$cachetime = Config::get('system', 'proxy_cache_time');
+
 			if (!$cachetime) {
-				$cachetime = PROXY_DEFAULT_TIME;
+				$cachetime = ProxyUtils::DEFAULT_TIME;
 			}
+
 			$condition = ['`uid` = 0 AND `resource-id` LIKE "pic:%" AND `created` < NOW() - INTERVAL ? SECOND', $cachetime];
-			dba::delete('photo', $condition);
+			DBA::delete('photo', $condition);
 		}
 
 		// Delete the cached OEmbed entries that are older than three month
-		dba::delete('oembed', ["`created` < NOW() - INTERVAL 3 MONTH"]);
+		DBA::delete('oembed', ["`created` < NOW() - INTERVAL 3 MONTH"]);
 
 		// Delete the cached "parse_url" entries that are older than three month
-		dba::delete('parsed_url', ["`created` < NOW() - INTERVAL 3 MONTH"]);
+		DBA::delete('parsed_url', ["`created` < NOW() - INTERVAL 3 MONTH"]);
 
 		// Maximum table size in megabyte
 		$max_tablesize = intval(Config::get('system', 'optimize_max_tablesize')) * 1000000;
@@ -210,7 +220,7 @@ class CronJobs
 
 				// So optimize it
 				logger("Optimize Table " . $table["Name"], LOGGER_DEBUG);
-				q("OPTIMIZE TABLE `%s`", dbesc($table["Name"]));
+				q("OPTIMIZE TABLE `%s`", DBA::escape($table["Name"]));
 			}
 		}
 
@@ -228,12 +238,12 @@ class CronJobs
 
 		$r = q("SELECT `id`, `url` FROM `contact`
 			WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '')
-				ORDER BY RAND() LIMIT 50", dbesc(NETWORK_DIASPORA));
-		if (!DBM::is_result($r)) {
+				ORDER BY RAND() LIMIT 50", DBA::escape(Protocol::DIASPORA));
+		if (!DBA::isResult($r)) {
 			return;
 		}
 
-		foreach ($r AS $contact) {
+		foreach ($r as $contact) {
 			// Quit the loop after 3 minutes
 			if (time() > ($starttime + 180)) {
 				return;
@@ -244,13 +254,13 @@ class CronJobs
 			}
 
 			$data = Probe::uri($contact["url"]);
-			if ($data["network"] != NETWORK_DIASPORA) {
+			if ($data["network"] != Protocol::DIASPORA) {
 				continue;
 			}
 
 			logger("Repair contact " . $contact["id"] . " " . $contact["url"], LOGGER_DEBUG);
 			q("UPDATE `contact` SET `batch` = '%s', `notify` = '%s', `poll` = '%s', pubkey = '%s' WHERE `id` = %d",
-				dbesc($data["batch"]), dbesc($data["notify"]), dbesc($data["poll"]), dbesc($data["pubkey"]),
+				DBA::escape($data["batch"]), DBA::escape($data["notify"]), DBA::escape($data["poll"]), DBA::escape($data["pubkey"]),
 				intval($contact["id"]));
 		}
 	}
@@ -264,23 +274,19 @@ class CronJobs
 		// Sometimes there seem to be issues where the "self" contact vanishes.
 		// We haven't found the origin of the problem by now.
 		$r = q("SELECT `uid` FROM `user` WHERE NOT EXISTS (SELECT `uid` FROM `contact` WHERE `contact`.`uid` = `user`.`uid` AND `contact`.`self`)");
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r AS $user) {
 				logger('Create missing self contact for user ' . $user['uid']);
 				Contact::createSelfFromUserId($user['uid']);
 			}
 		}
 
-		// Set the parent if it wasn't set. (Shouldn't happen - but does sometimes)
-		// This call is very "cheap" so we can do it at any time without a problem
-		q("UPDATE `item` INNER JOIN `item` AS `parent` ON `parent`.`uri` = `item`.`parent-uri` AND `parent`.`uid` = `item`.`uid` SET `item`.`parent` = `parent`.`id` WHERE `item`.`parent` = 0");
-
 		// There was an issue where the nick vanishes from the contact table
 		q("UPDATE `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid` SET `nick` = `nickname` WHERE `self` AND `nick`=''");
 
 		// Update the global contacts for local users
 		$r = q("SELECT `uid` FROM `user` WHERE `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`");
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r AS $user) {
 				GContact::updateForUser($user["uid"]);
 			}
diff --git a/src/Worker/DBClean.php b/src/Worker/DBClean.php
index 20691c178..ca0da954c 100644
--- a/src/Worker/DBClean.php
+++ b/src/Worker/DBClean.php
@@ -8,7 +8,7 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
-use dba;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 
@@ -60,8 +60,6 @@ class DBClean {
 	 * 10:	Old conversations.
 	 */
 	private static function removeOrphans($stage) {
-		global $db;
-
 		$count = 0;
 
 		// We split the deletion in many small tasks
@@ -83,22 +81,22 @@ class DBClean {
 			$last_id = Config::get('system', 'dbclean-last-id-1', 0);
 
 			logger("Deleting old global item entries from item table without user copy. Last ID: ".$last_id);
-			$r = dba::p("SELECT `id` FROM `item` WHERE `uid` = 0 AND
+			$r = DBA::p("SELECT `id` FROM `item` WHERE `uid` = 0 AND
 						NOT EXISTS (SELECT `guid` FROM `item` AS `i` WHERE `item`.`guid` = `i`.`guid` AND `i`.`uid` != 0) AND
 						`received` < UTC_TIMESTAMP() - INTERVAL ? DAY AND `id` >= ?
-					ORDER BY `id` LIMIT ".intval($limit), $days_unclaimed, $last_id);
-			$count = dba::num_rows($r);
+					ORDER BY `id` LIMIT ?", $days_unclaimed, $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found global item orphans: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('item', ['id' => $orphan["id"]]);
+					DBA::delete('item', ['id' => $orphan["id"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 1, $last_id);
 			} else {
 				logger("No global item orphans found");
 			}
-			dba::close($r);
+			DBA::close($r);
 			logger("Done deleting ".$count." old global item entries from item table without user copy. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-1', $last_id);
@@ -106,21 +104,21 @@ class DBClean {
 			$last_id = Config::get('system', 'dbclean-last-id-2', 0);
 
 			logger("Deleting items without parents. Last ID: ".$last_id);
-			$r = dba::p("SELECT `id` FROM `item`
+			$r = DBA::p("SELECT `id` FROM `item`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` AS `i` WHERE `item`.`parent` = `i`.`id`)
-					AND `id` >= ? ORDER BY `id` LIMIT ".intval($limit), $last_id);
-			$count = dba::num_rows($r);
+					AND `id` >= ? ORDER BY `id` LIMIT ?", $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found item orphans without parents: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('item', ['id' => $orphan["id"]]);
+					DBA::delete('item', ['id' => $orphan["id"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 2, $last_id);
 			} else {
 				logger("No item orphans without parents found");
 			}
-			dba::close($r);
+			DBA::close($r);
 			logger("Done deleting ".$count." items without parents. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-2', $last_id);
@@ -132,21 +130,21 @@ class DBClean {
 			$last_id = Config::get('system', 'dbclean-last-id-3', 0);
 
 			logger("Deleting orphaned data from thread table. Last ID: ".$last_id);
-			$r = dba::p("SELECT `iid` FROM `thread`
+			$r = DBA::p("SELECT `iid` FROM `thread`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `thread`.`iid`) AND `iid` >= ?
-					ORDER BY `iid` LIMIT ".intval($limit), $last_id);
-			$count = dba::num_rows($r);
+					ORDER BY `iid` LIMIT ?", $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found thread orphans: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["iid"];
-					dba::delete('thread', ['iid' => $orphan["iid"]]);
+					DBA::delete('thread', ['iid' => $orphan["iid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 3, $last_id);
 			} else {
 				logger("No thread orphans found");
 			}
-			dba::close($r);
+			DBA::close($r);
 			logger("Done deleting ".$count." orphaned data from thread table. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-3', $last_id);
@@ -158,21 +156,21 @@ class DBClean {
 			$last_id = Config::get('system', 'dbclean-last-id-4', 0);
 
 			logger("Deleting orphaned data from notify table. Last ID: ".$last_id);
-			$r = dba::p("SELECT `iid`, `id` FROM `notify`
+			$r = DBA::p("SELECT `iid`, `id` FROM `notify`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `notify`.`iid`) AND `id` >= ?
-					ORDER BY `id` LIMIT ".intval($limit), $last_id);
-			$count = dba::num_rows($r);
+					ORDER BY `id` LIMIT ?", $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found notify orphans: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('notify', ['iid' => $orphan["iid"]]);
+					DBA::delete('notify', ['iid' => $orphan["iid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 4, $last_id);
 			} else {
 				logger("No notify orphans found");
 			}
-			dba::close($r);
+			DBA::close($r);
 			logger("Done deleting ".$count." orphaned data from notify table. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-4', $last_id);
@@ -184,21 +182,21 @@ class DBClean {
 			$last_id = Config::get('system', 'dbclean-last-id-5', 0);
 
 			logger("Deleting orphaned data from notify-threads table. Last ID: ".$last_id);
-			$r = dba::p("SELECT `id` FROM `notify-threads`
+			$r = DBA::p("SELECT `id` FROM `notify-threads`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `notify-threads`.`master-parent-item`) AND `id` >= ?
-					ORDER BY `id` LIMIT ".intval($limit), $last_id);
-			$count = dba::num_rows($r);
+					ORDER BY `id` LIMIT ?", $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found notify-threads orphans: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('notify-threads', ['id' => $orphan["id"]]);
+					DBA::delete('notify-threads', ['id' => $orphan["id"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 5, $last_id);
 			} else {
 				logger("No notify-threads orphans found");
 			}
-			dba::close($r);
+			DBA::close($r);
 			logger("Done deleting ".$count." orphaned data from notify-threads table. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-5', $last_id);
@@ -210,21 +208,21 @@ class DBClean {
 			$last_id = Config::get('system', 'dbclean-last-id-6', 0);
 
 			logger("Deleting orphaned data from sign table. Last ID: ".$last_id);
-			$r = dba::p("SELECT `iid`, `id` FROM `sign`
+			$r = DBA::p("SELECT `iid`, `id` FROM `sign`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `sign`.`iid`) AND `id` >= ?
-					ORDER BY `id` LIMIT ".intval($limit), $last_id);
-			$count = dba::num_rows($r);
+					ORDER BY `id` LIMIT ?", $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found sign orphans: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('sign', ['iid' => $orphan["iid"]]);
+					DBA::delete('sign', ['iid' => $orphan["iid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 6, $last_id);
 			} else {
 				logger("No sign orphans found");
 			}
-			dba::close($r);
+			DBA::close($r);
 			logger("Done deleting ".$count." orphaned data from sign table. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-6', $last_id);
@@ -236,21 +234,21 @@ class DBClean {
 			$last_id = Config::get('system', 'dbclean-last-id-7', 0);
 
 			logger("Deleting orphaned data from term table. Last ID: ".$last_id);
-			$r = dba::p("SELECT `oid`, `tid` FROM `term`
+			$r = DBA::p("SELECT `oid`, `tid` FROM `term`
 					WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `term`.`oid`) AND `tid` >= ?
-					ORDER BY `tid` LIMIT ".intval($limit), $last_id);
-			$count = dba::num_rows($r);
+					ORDER BY `tid` LIMIT ?", $last_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found term orphans: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["tid"];
-					dba::delete('term', ['oid' => $orphan["oid"]]);
+					DBA::delete('term', ['oid' => $orphan["oid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 7, $last_id);
 			} else {
 				logger("No term orphans found");
 			}
-			dba::close($r);
+			DBA::close($r);
 			logger("Done deleting ".$count." orphaned data from term table. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-7', $last_id);
@@ -266,7 +264,7 @@ class DBClean {
 			$last_id = Config::get('system', 'dbclean-last-id-8', 0);
 
 			logger("Deleting expired threads. Last ID: ".$last_id);
-			$r = dba::p("SELECT `thread`.`iid` FROM `thread`
+			$r = DBA::p("SELECT `thread`.`iid` FROM `thread`
 	                                INNER JOIN `contact` ON `thread`.`contact-id` = `contact`.`id` AND NOT `notify_new_posts`
 	                                WHERE `thread`.`received` < UTC_TIMESTAMP() - INTERVAL ? DAY
 	                                        AND NOT `thread`.`mention` AND NOT `thread`.`starred`
@@ -278,18 +276,18 @@ class DBClean {
 	                                                                OR (`item`.`attach` != '') OR `item`.`wall` OR `item`.`origin`)
 	                                                                AND `item`.`parent` = `thread`.`iid`)
 	                                ORDER BY `thread`.`iid` LIMIT 1000", $days, $last_id);
-			$count = dba::num_rows($r);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found expired threads: ".$count);
-				while ($thread = dba::fetch($r)) {
+				while ($thread = DBA::fetch($r)) {
 					$last_id = $thread["iid"];
-					dba::delete('thread', ['iid' => $thread["iid"]]);
+					DBA::delete('thread', ['iid' => $thread["iid"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 8, $last_id);
 			} else {
 				logger("No expired threads found");
 			}
-			dba::close($r);
+			DBA::close($r);
 			logger("Done deleting ".$count." expired threads. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-8', $last_id);
@@ -302,44 +300,45 @@ class DBClean {
 			$till_id = Config::get('system', 'dbclean-last-id-8', 0);
 
 			logger("Deleting old global item entries from expired threads from ID ".$last_id." to ID ".$till_id);
-			$r = dba::p("SELECT `id` FROM `item` WHERE `uid` = 0 AND
+			$r = DBA::p("SELECT `id` FROM `item` WHERE `uid` = 0 AND
 						NOT EXISTS (SELECT `guid` FROM `item` AS `i` WHERE `item`.`guid` = `i`.`guid` AND `i`.`uid` != 0) AND
 						`received` < UTC_TIMESTAMP() - INTERVAL 90 DAY AND `id` >= ? AND `id` <= ?
-					ORDER BY `id` LIMIT ".intval($limit), $last_id, $till_id);
-			$count = dba::num_rows($r);
+					ORDER BY `id` LIMIT ?", $last_id, $till_id, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found global item entries from expired threads: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["id"];
-					dba::delete('item', ['id' => $orphan["id"]]);
+					DBA::delete('item', ['id' => $orphan["id"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 9, $last_id);
 			} else {
 				logger("No global item entries from expired threads");
 			}
-			dba::close($r);
+			DBA::close($r);
 			logger("Done deleting ".$count." old global item entries from expired threads. Last ID: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-9', $last_id);
 		} elseif ($stage == 10) {
 			$last_id = Config::get('system', 'dbclean-last-id-10', 0);
+			$days = intval(Config::get('system', 'dbclean_expire_conversation', 90));
 
 			logger("Deleting old conversations. Last created: ".$last_id);
-			$r = dba::p("SELECT `received`, `item-uri` FROM `conversation`
-					WHERE `received` < UTC_TIMESTAMP() - INTERVAL 90 DAY
-					ORDER BY `received` LIMIT ".intval($limit));
-			$count = dba::num_rows($r);
+			$r = DBA::p("SELECT `received`, `item-uri` FROM `conversation`
+					WHERE `received` < UTC_TIMESTAMP() - INTERVAL ? DAY
+					ORDER BY `received` LIMIT ?", $days, $limit);
+			$count = DBA::numRows($r);
 			if ($count > 0) {
 				logger("found old conversations: ".$count);
-				while ($orphan = dba::fetch($r)) {
+				while ($orphan = DBA::fetch($r)) {
 					$last_id = $orphan["received"];
-					dba::delete('conversation', ['item-uri' => $orphan["item-uri"]]);
+					DBA::delete('conversation', ['item-uri' => $orphan["item-uri"]]);
 				}
 				Worker::add(PRIORITY_MEDIUM, 'DBClean', 10, $last_id);
 			} else {
 				logger("No old conversations found");
 			}
-			dba::close($r);
+			DBA::close($r);
 			logger("Done deleting ".$count." conversations. Last created: ".$last_id);
 
 			Config::set('system', 'dbclean-last-id-10', $last_id);
diff --git a/src/Worker/DBUpdate.php b/src/Worker/DBUpdate.php
index 5f85c8ebe..ed8e409e9 100644
--- a/src/Worker/DBUpdate.php
+++ b/src/Worker/DBUpdate.php
@@ -7,9 +7,11 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Config;
 
-class DBUpdate {
-	public static function execute() {
-		$a = get_app();
+class DBUpdate
+{
+	public static function execute()
+	{
+		$a = \Friendica\BaseObject::getApp();
 
 		// We are deleting the latest dbupdate entry.
 		// This is done to avoid endless loops because the update was interupted.
diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index f91d0c198..3a93d92f7 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -7,8 +7,9 @@ namespace Friendica\Worker;
 use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Queue;
@@ -16,7 +17,6 @@ use Friendica\Model\User;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
-use dba;
 
 require_once 'include/items.php';
 
@@ -39,36 +39,33 @@ class Delivery extends BaseObject
 		$public_message = false;
 
 		if ($cmd == self::MAIL) {
-			$target_item = dba::selectFirst('mail', [], ['id' => $item_id]);
-			if (!DBM::is_result($target_item)) {
+			$target_item = DBA::selectFirst('mail', [], ['id' => $item_id]);
+			if (!DBA::isResult($target_item)) {
 				return;
 			}
 			$uid = $target_item['uid'];
+			$items = [];
 		} elseif ($cmd == self::SUGGESTION) {
-			$target_item = dba::selectFirst('fsuggest', [], ['id' => $item_id]);
-			if (!DBM::is_result($target_item)) {
+			$target_item = DBA::selectFirst('fsuggest', [], ['id' => $item_id]);
+			if (!DBA::isResult($target_item)) {
 				return;
 			}
 			$uid = $target_item['uid'];
 		} elseif ($cmd == self::RELOCATION) {
 			$uid = $item_id;
 		} else {
-			$item = dba::selectFirst('item', ['parent'], ['id' => $item_id]);
-			if (!DBM::is_result($item) || empty($item['parent'])) {
+			$item = Item::selectFirst(['parent'], ['id' => $item_id]);
+			if (!DBA::isResult($item) || empty($item['parent'])) {
 				return;
 			}
 			$parent_id = intval($item['parent']);
 
-			$itemdata = dba::p("SELECT `item`.*, `contact`.`uid` AS `cuid`,
-							`sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
-						FROM `item`
-						INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-						LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`
-						WHERE `item`.`id` IN (?, ?) AND `visible` AND NOT `moderated`
-						ORDER BY `item`.`id`",
-					$item_id, $parent_id);
+			$condition = ['id' => [$item_id, $parent_id], 'moderated' => false];
+			$params = ['order' => ['id']];
+			$itemdata = Item::select([], $condition, $params);
+
 			$items = [];
-			while ($item = dba::fetch($itemdata)) {
+			while ($item = Item::fetch($itemdata)) {
 				if ($item['id'] == $parent_id) {
 					$parent = $item;
 				}
@@ -77,9 +74,19 @@ class Delivery extends BaseObject
 				}
 				$items[] = $item;
 			}
-			dba::close($itemdata);
+			DBA::close($itemdata);
 
-			$uid = $target_item['cuid'];
+			if (empty($target_item)) {
+				logger('Item ' . $item_id . "wasn't found. Quitting here.");
+				return;
+			}
+
+			if (empty($parent)) {
+				logger('Parent ' . $parent_id . ' for item ' . $item_id . "wasn't found. Quitting here.");
+				return;
+			}
+
+			$uid = $target_item['contact-uid'];
 
 			// avoid race condition with deleting entries
 			if ($items[0]['deleted']) {
@@ -131,38 +138,42 @@ class Delivery extends BaseObject
 			}
 		}
 
+		if (empty($items)) {
+			logger('No delivery data for  ' . $cmd . ' - Item ID: ' .$item_id . ' - Contact ID: ' . $contact_id);
+		}
+
 		$owner = User::getOwnerDataById($uid);
-		if (!DBM::is_result($owner)) {
+		if (!DBA::isResult($owner)) {
 			return;
 		}
 
 		// We don't deliver our items to blocked or pending contacts, and not to ourselves either
-		$contact = dba::selectFirst('contact', [],
+		$contact = DBA::selectFirst('contact', [],
 			['id' => $contact_id, 'blocked' => false, 'pending' => false, 'self' => false]
 		);
-		if (!DBM::is_result($contact)) {
+		if (!DBA::isResult($contact)) {
 			return;
 		}
 
 		// Transmit via Diaspora if the thread had started as Diaspora post
 		// This is done since the uri wouldn't match (Diaspora doesn't transmit it)
-		if (isset($parent) && ($parent['network'] == NETWORK_DIASPORA) && ($contact['network'] == NETWORK_DFRN)) {
-			$contact['network'] = NETWORK_DIASPORA;
+		if (isset($parent) && ($parent['network'] == Protocol::DIASPORA) && ($contact['network'] == Protocol::DFRN)) {
+			$contact['network'] = Protocol::DIASPORA;
 		}
 
 		logger("Delivering " . $cmd . " followup=$followup - via network " . $contact['network']);
 
 		switch ($contact['network']) {
 
-			case NETWORK_DFRN:
+			case Protocol::DFRN:
 				self::deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
 				break;
 
-			case NETWORK_DIASPORA:
+			case Protocol::DIASPORA:
 				self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
 				break;
 
-			case NETWORK_OSTATUS:
+			case Protocol::OSTATUS:
 				// Do not send to otatus if we are not configured to send to public networks
 				if ($owner['prvnets']) {
 					break;
@@ -175,7 +186,7 @@ class Delivery extends BaseObject
 				// This is done in "notifier.php" (See "url_recipients" and "push_notify")
 				break;
 
-			case NETWORK_MAIL:
+			case Protocol::MAIL:
 				self::deliverMail($cmd, $contact, $owner, $target_item);
 				break;
 
@@ -209,7 +220,7 @@ class Delivery extends BaseObject
 		} elseif ($cmd == self::SUGGESTION) {
 			$item = $target_item;
 			$atom = DFRN::fsuggest($item, $owner);
-			dba::delete('fsuggest', ['id' => $item['id']]);
+			DBA::delete('fsuggest', ['id' => $item['id']]);
 		} elseif ($cmd == self::RELOCATION) {
 			$atom = DFRN::relocate($owner, $owner['uid']);
 		} elseif ($followup) {
@@ -236,8 +247,8 @@ class Delivery extends BaseObject
 
 		if (link_compare($basepath, System::baseUrl())) {
 			$condition = ['nurl' => normalise_link($contact['url']), 'self' => true];
-			$target_self = dba::selectFirst('contact', ['uid'], $condition);
-			if (!DBM::is_result($target_self)) {
+			$target_self = DBA::selectFirst('contact', ['uid'], $condition);
+			if (!DBA::isResult($target_self)) {
 				return;
 			}
 			$target_uid = $target_self['uid'];
@@ -252,28 +263,21 @@ class Delivery extends BaseObject
 				}
 			}
 
-			// We now have some contact, so we fetch it
-			$target_importer = dba::fetch_first("SELECT *, `name` as `senderName`
-							FROM `contact`
-							WHERE NOT `blocked` AND `id` = ? LIMIT 1",
-							$cid);
-
-			// This should never fail
-			if (!DBM::is_result($target_importer)) {
+			$target_importer = DFRN::getImporter($cid, $target_uid);
+			if (empty($target_importer)) {
+				// This should never happen
 				return;
 			}
 
-			// Set the user id. This is important if this is a public contact
-			$target_importer['importer_uid']  = $target_uid;
 			DFRN::import($atom, $target_importer);
 			return;
 		}
 
 		// We don't have a relationship with contacts on a public post.
 		// Se we transmit with the new method and via Diaspora as a fallback
-		if (($items[0]['uid'] == 0) || ($contact['uid'] == 0)) {
+		if (!empty($items) && (($items[0]['uid'] == 0) || ($contact['uid'] == 0))) {
 			// Transmit in public if it's a relay post
-			$public_dfrn = ($contact['contact-type'] == ACCOUNT_TYPE_RELAY);
+			$public_dfrn = ($contact['contact-type'] == Contact::ACCOUNT_TYPE_RELAY);
 
 			$deliver_status = DFRN::transmit($owner, $contact, $atom, $public_dfrn);
 
@@ -288,15 +292,17 @@ 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);
 
 		if ($deliver_status < 0) {
 			logger('Delivery failed: queuing message ' . $target_item["guid"] );
-			Queue::add($contact['id'], NETWORK_DFRN, $atom, false, $target_item['guid']);
+			Queue::add($contact['id'], Protocol::DFRN, $atom, false, $target_item['guid']);
 		}
 
 		if (($deliver_status >= 200) && ($deliver_status <= 299)) {
@@ -305,6 +311,10 @@ class Delivery extends BaseObject
 		} else {
 			// The message could not be delivered. We mark the contact as "dead"
 			Contact::markForArchival($contact);
+
+			// Transmit via Diaspora when all other methods (legacy DFRN and new one) are failing.
+			// This is a fallback for systems that don't know the new methods.
+			self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
 		}
 	}
 
@@ -323,7 +333,7 @@ class Delivery extends BaseObject
 	private static function deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
 	{
 		// We don't treat Forum posts as "wall-to-wall" to be able to post them via Diaspora
-		$walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY);
+		$walltowall = $top_level && ($owner['id'] != $items[0]['contact-id']) & ($owner['account-type'] != Contact::ACCOUNT_TYPE_COMMUNITY);
 
 		if ($public_message) {
 			$loc = 'public batch ' . $contact['batch'];
@@ -399,16 +409,16 @@ class Delivery extends BaseObject
 			return;
 		}
 
-		$local_user = dba::selectFirst('user', [], ['uid' => $owner['uid']]);
-		if (!DBM::is_result($local_user)) {
+		$local_user = DBA::selectFirst('user', [], ['uid' => $owner['uid']]);
+		if (!DBA::isResult($local_user)) {
 			return;
 		}
 
 		logger('Deliver ' . $target_item["guid"] . ' via mail to ' . $contact['addr']);
 
 		$reply_to = '';
-		$mailacct = dba::selectFirst('mailacct', ['reply_to'], ['uid' => $owner['uid']]);
-		if (DBM::is_result($mailacct) && !empty($mailacct['reply_to'])) {
+		$mailacct = DBA::selectFirst('mailacct', ['reply_to'], ['uid' => $owner['uid']]);
+		if (DBA::isResult($mailacct) && !empty($mailacct['reply_to'])) {
 			$reply_to = $mailacct['reply_to'];
 		}
 
@@ -416,7 +426,7 @@ class Delivery extends BaseObject
 
 		// only expose our real email address to true friends
 
-		if (($contact['rel'] == CONTACT_IS_FRIEND) && !$contact['blocked']) {
+		if (($contact['rel'] == Contact::FRIEND) && !$contact['blocked']) {
 			if ($reply_to) {
 				$headers  = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $reply_to.'>' . "\n";
 				$headers .= 'Sender: ' . $local_user['email'] . "\n";
@@ -436,25 +446,30 @@ class Delivery extends BaseObject
 			if (($target_item["thr-parent"] != "") && ($target_item["thr-parent"] != $target_item["parent-uri"])) {
 				$headers .= " <".Email::iri2msgid($target_item["thr-parent"]).">";
 			}
+
 			$headers .= "\n";
 
 			if (empty($target_item['title'])) {
 				$condition = ['uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
-				$title = dba::selectFirst('item', ['title'], $condition);
-				if (DBM::is_result($title) && ($title['title'] != '')) {
+				$title = Item::selectFirst(['title'], $condition);
+
+				if (DBA::isResult($title) && ($title['title'] != '')) {
 					$subject = $title['title'];
 				} else {
 					$condition = ['parent-uri' => $target_item['parent-uri'], 'uid' => $owner['uid']];
-					$title = dba::selectFirst('item', ['title'], $condition);
-					if (DBM::is_result($title) && ($title['title'] != '')) {
+					$title = Item::selectFirst(['title'], $condition);
+
+					if (DBA::isResult($title) && ($title['title'] != '')) {
 						$subject = $title['title'];
 					}
 				}
 			}
+
 			if (strncasecmp($subject, 'RE:', 3)) {
 				$subject = 'Re: ' . $subject;
 			}
 		}
+
 		Email::send($addr, $subject, $headers, $target_item);
 	}
 }
diff --git a/src/Worker/Directory.php b/src/Worker/Directory.php
index a59461037..63f2e3b67 100644
--- a/src/Worker/Directory.php
+++ b/src/Worker/Directory.php
@@ -9,7 +9,7 @@ namespace Friendica\Worker;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Util\Network;
 
 class Directory
@@ -48,7 +48,7 @@ class Directory
 				WHERE `contact`.`self` AND `profile`.`net-publish` AND `profile`.`is-default` AND
 					NOT `user`.`account_expired` AND `user`.`verified`");
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r AS $user) {
 				Worker::add(PRIORITY_LOW, 'Directory', $user['url']);
 			}
diff --git a/src/Worker/DiscoverPoCo.php b/src/Worker/DiscoverPoCo.php
index f0335bc8e..e6fc8391f 100644
--- a/src/Worker/DiscoverPoCo.php
+++ b/src/Worker/DiscoverPoCo.php
@@ -6,16 +6,17 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\GContact;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
-use dba;
 
-class DiscoverPoCo {
+class DiscoverPoCo
+{
 	/// @todo Clean up this mess of a parameter hell and split it in several classes
 	public static function execute($command = '', $param1 = '', $param2 = '', $param3 = '', $param4 = '')
 	{
@@ -118,7 +119,7 @@ class DiscoverPoCo {
 	private static function updateServer() {
 		$r = q("SELECT `url`, `created`, `last_failure`, `last_contact` FROM `gserver` ORDER BY rand()");
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return;
 		}
 
@@ -147,8 +148,8 @@ class DiscoverPoCo {
 				WHERE `last_contact` < UTC_TIMESTAMP - INTERVAL 1 MONTH AND
 					`last_failure` < UTC_TIMESTAMP - INTERVAL 1 MONTH AND
 					`network` IN ('%s', '%s', '%s', '%s', '') ORDER BY rand()",
-				dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA),
-				dbesc(NETWORK_OSTATUS), dbesc(NETWORK_FEED));
+				DBA::escape(Protocol::DFRN), DBA::escape(Protocol::DIASPORA),
+				DBA::escape(Protocol::OSTATUS), DBA::escape(Protocol::FEED));
 
 		if (!$users) {
 			return;
@@ -159,20 +160,15 @@ class DiscoverPoCo {
 
 			$urlparts = parse_url($user["url"]);
 			if (!isset($urlparts["scheme"])) {
-				dba::update('gcontact', ['network' => NETWORK_PHANTOM],
+				DBA::update('gcontact', ['network' => Protocol::PHANTOM],
 					['nurl' => normalise_link($user["url"])]);
 				continue;
 			 }
 
-			if (in_array($urlparts["host"], ["www.facebook.com", "facebook.com", "twitter.com",
-								"identi.ca", "alpha.app.net"])) {
-				$networks = ["www.facebook.com" => NETWORK_FACEBOOK,
-						"facebook.com" => NETWORK_FACEBOOK,
-						"twitter.com" => NETWORK_TWITTER,
-						"identi.ca" => NETWORK_PUMPIO,
-						"alpha.app.net" => NETWORK_APPNET];
+			if (in_array($urlparts["host"], ["twitter.com", "identi.ca"])) {
+				$networks = ["twitter.com" => Protocol::TWITTER, "identi.ca" => Protocol::PUMPIO];
 
-				dba::update('gcontact', ['network' => $networks[$urlparts["host"]]],
+				DBA::update('gcontact', ['network' => $networks[$urlparts["host"]]],
 					['nurl' => normalise_link($user["url"])]);
 				continue;
 			}
@@ -187,7 +183,7 @@ class DiscoverPoCo {
 				$server_url = $user["server_url"];
 			}
 
-			if ((($server_url == "") && ($user["network"] == NETWORK_FEED)) || $force_update || PortableContact::checkServer($server_url, $user["network"])) {
+			if ((($server_url == "") && ($user["network"] == Protocol::FEED)) || $force_update || PortableContact::checkServer($server_url, $user["network"])) {
 				logger('Check profile '.$user["url"]);
 				Worker::add(PRIORITY_LOW, "DiscoverPoCo", "check_profile", $user["url"]);
 
@@ -195,7 +191,7 @@ class DiscoverPoCo {
 					return;
 				}
 			} else {
-				dba::update('gcontact', ['last_failure' => DateTimeFormat::utcNow()],
+				DBA::update('gcontact', ['last_failure' => DateTimeFormat::utcNow()],
 					['nurl' => normalise_link($user["url"])]);
 			}
 
@@ -220,11 +216,11 @@ class DiscoverPoCo {
 		$x = Network::fetchUrl(get_server()."/lsearch?p=1&n=500&search=".urlencode($search));
 		$j = json_decode($x);
 
-		if (count($j->results)) {
+		if (!empty($j->results)) {
 			foreach ($j->results as $jj) {
 				// Check if the contact already exists
 				$exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($jj->url));
-				if (DBM::is_result($exists)) {
+				if (DBA::isResult($exists)) {
 					logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG);
 
 					if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) &&
@@ -246,7 +242,7 @@ class DiscoverPoCo {
 				}
 
 				$data = Probe::uri($jj->url);
-				if ($data["network"] == NETWORK_DFRN) {
+				if ($data["network"] == Protocol::DFRN) {
 					logger("Profile ".$jj->url." is reachable (".$search.")", LOGGER_DEBUG);
 					logger("Add profile ".$jj->url." to local directory (".$search.")", LOGGER_DEBUG);
 
@@ -276,8 +272,6 @@ class DiscoverPoCo {
 		// It is not removed since I hope that there will be a successor.
 		return false;
 
-		$a = get_app();
-
 		$url = "http://gstools.org/api/users_search/".urlencode($search);
 
 		$result = Network::curl($url);
@@ -295,7 +289,7 @@ class DiscoverPoCo {
 		/// @TODO find all those and convert to all lower-case which is a keyword then
 		foreach ($contacts->data AS $user) {
 			$contact = Probe::uri($user->site_address."/".$user->name);
-			if ($contact["network"] != NETWORK_PHANTOM) {
+			if ($contact["network"] != Protocol::PHANTOM) {
 				$contact["about"] = $user->description;
 				GContact::update($contact);
 			}
diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index cf6e78cb7..b6096b584 100644
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -6,18 +6,20 @@
 
 namespace Friendica\Worker;
 
+use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
-use dba;
 
 require_once 'include/dba.php';
 
-class Expire {
-	public static function execute($param = '', $hook_name = '') {
-		global $a;
+class Expire
+{
+	public static function execute($param = '', $hook_name = '')
+	{
+		$a = BaseObject::getApp();
 
 		require_once 'include/items.php';
 
@@ -26,22 +28,35 @@ class Expire {
 		if ($param == 'delete') {
 			logger('Delete expired items', LOGGER_DEBUG);
 			// physically remove anything that has been deleted for more than two months
-			$r = dba::p("SELECT `id` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
-			while ($row = dba::fetch($r)) {
-				dba::delete('item', ['id' => $row['id']]);
+			$condition = ["`deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY"];
+			$rows = DBA::select('item', ['id'],  $condition);
+			while ($row = DBA::fetch($rows)) {
+				DBA::delete('item', ['id' => $row['id']]);
 			}
-			dba::close($r);
+			DBA::close($rows);
 
-			logger('Delete expired items - done', LOGGER_DEBUG);
+			// Normally we shouldn't have orphaned data at all.
+			// If we do have some, then we have to check why.
+			logger('Deleting orphaned item activities - start', LOGGER_DEBUG);
+			$condition = ["NOT EXISTS (SELECT `iaid` FROM `item` WHERE `item`.`iaid` = `item-activity`.`id`)"];
+			DBA::delete('item-activity', $condition);
+			logger('Orphaned item activities deleted: ' . DBA::affectedRows(), LOGGER_DEBUG);
+
+			logger('Deleting orphaned item content - start', LOGGER_DEBUG);
+			$condition = ["NOT EXISTS (SELECT `icid` FROM `item` WHERE `item`.`icid` = `item-content`.`id`)"];
+			DBA::delete('item-content', $condition);
+			logger('Orphaned item content deleted: ' . DBA::affectedRows(), LOGGER_DEBUG);
 
 			// make this optional as it could have a performance impact on large sites
 			if (intval(Config::get('system', 'optimize_items'))) {
-				dba::e("OPTIMIZE TABLE `item`");
+				DBA::e("OPTIMIZE TABLE `item`");
 			}
+
+			logger('Delete expired items - done', LOGGER_DEBUG);
 			return;
 		} elseif (intval($param) > 0) {
-			$user = dba::selectFirst('user', ['uid', 'username', 'expire'], ['uid' => $param]);
-			if (DBM::is_result($user)) {
+			$user = DBA::selectFirst('user', ['uid', 'username', 'expire'], ['uid' => $param]);
+			if (DBA::isResult($user)) {
 				logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - interval: '.$user['expire'], LOGGER_DEBUG);
 				Item::expire($user['uid'], $user['expire']);
 				logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - done ', LOGGER_DEBUG);
@@ -62,13 +77,13 @@ class Expire {
 		Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
 				'Expire', 'delete');
 
-		$r = dba::p("SELECT `uid`, `username` FROM `user` WHERE `expire` != 0");
-		while ($row = dba::fetch($r)) {
+		$r = DBA::p("SELECT `uid`, `username` FROM `user` WHERE `expire` != 0");
+		while ($row = DBA::fetch($r)) {
 			logger('Calling expiry for user '.$row['uid'].' ('.$row['username'].')', LOGGER_DEBUG);
 			Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
 					'Expire', (int)$row['uid']);
 		}
-		dba::close($r);
+		DBA::close($r);
 
 		logger('expire: calling hooks');
 
diff --git a/src/Worker/ForkHook.php b/src/Worker/ForkHook.php
index 6c138bace..3654bdd3c 100644
--- a/src/Worker/ForkHook.php
+++ b/src/Worker/ForkHook.php
@@ -7,9 +7,11 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Addon;
 
-Class ForkHook {
-	public static function execute($name, $hook, $data) {
-		global $a;
+Class ForkHook
+{
+	public static function execute($name, $hook, $data)
+	{
+		$a = \Friendica\BaseObject::getApp();
 
 		Addon::callSingleHook($a, $name, $hook, $data);
 	}
diff --git a/src/Worker/GProbe.php b/src/Worker/GProbe.php
index d6c0ae122..116ca2070 100644
--- a/src/Worker/GProbe.php
+++ b/src/Worker/GProbe.php
@@ -6,7 +6,8 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Cache;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\GContact;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
@@ -20,18 +21,18 @@ class GProbe {
 
 		$r = q(
 			"SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
-			dbesc(normalise_link($url))
+			DBA::escape(normalise_link($url))
 		);
 
 		logger("gprobe start for ".normalise_link($url), LOGGER_DEBUG);
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			// Is it a DDoS attempt?
 			$urlparts = parse_url($url);
 
 			$result = Cache::get("gprobe:".$urlparts["host"]);
 			if (!is_null($result)) {
-				if (in_array($result["network"], [NETWORK_FEED, NETWORK_PHANTOM])) {
+				if (in_array($result["network"], [Protocol::FEED, Protocol::PHANTOM])) {
 					logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
 					return;
 				}
@@ -43,18 +44,18 @@ class GProbe {
 				Cache::set("gprobe:".$urlparts["host"], $arr);
 			}
 
-			if (!in_array($arr["network"], [NETWORK_FEED, NETWORK_PHANTOM])) {
+			if (!in_array($arr["network"], [Protocol::FEED, Protocol::PHANTOM])) {
 				GContact::update($arr);
 			}
 
 			$r = q(
 				"SELECT `id`, `url`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 1",
-				dbesc(normalise_link($url))
+				DBA::escape(normalise_link($url))
 			);
 		}
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			// Check for accessibility and do a poco discovery
-			if (PortableContact::lastUpdated($r[0]['url'], true) && ($r[0]["network"] == NETWORK_DFRN)) {
+			if (PortableContact::lastUpdated($r[0]['url'], true) && ($r[0]["network"] == Protocol::DFRN)) {
 				PortableContact::loadWorker(0, 0, $r[0]['id'], str_replace('/profile/', '/poco/', $r[0]['url']));
 			}
 		}
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 11a6f6f68..61eaba388 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -4,20 +4,21 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
-use Friendica\Model\User;
+use Friendica\Model\Item;
 use Friendica\Model\PushSubscriber;
+use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
-use Friendica\Worker\Delivery;
-use dba;
 
 require_once 'include/dba.php';
 require_once 'include/items.php';
@@ -47,9 +48,11 @@ require_once 'include/items.php';
  * and ITEM_ID is the id of the item in the database that needs to be sent to others.
  */
 
-class Notifier {
-	public static function execute($cmd, $item_id) {
-		global $a;
+class Notifier
+{
+	public static function execute($cmd, $item_id)
+	{
+		$a = BaseObject::getApp();
 
 		logger('notifier: invoked: '.$cmd.': '.$item_id, LOGGER_DEBUG);
 
@@ -62,16 +65,16 @@ class Notifier {
 
 		if ($cmd == Delivery::MAIL) {
 			$normal_mode = false;
-			$message = dba::selectFirst('mail', ['uid', 'contact-id'], ['id' => $item_id]);
-			if (!DBM::is_result($message)) {
+			$message = DBA::selectFirst('mail', ['uid', 'contact-id'], ['id' => $item_id]);
+			if (!DBA::isResult($message)) {
 				return;
 			}
 			$uid = $message['uid'];
 			$recipients[] = $message['contact-id'];
 		} elseif ($cmd == Delivery::SUGGESTION) {
 			$normal_mode = false;
-			$suggest = dba::selectFirst('fsuggest', ['uid', 'cid'], ['id' => $item_id]);
-			if (!DBM::is_result($suggest)) {
+			$suggest = DBA::selectFirst('fsuggest', ['uid', 'cid'], ['id' => $item_id]);
+			if (!DBA::isResult($suggest)) {
 				return;
 			}
 			$uid = $suggest['uid'];
@@ -93,7 +96,7 @@ class Notifier {
 				return;
 			}
 			foreach ($r as $contact) {
-				Contact::terminateFriendship($user, $contact);
+				Contact::terminateFriendship($user, $contact, true);
 			}
 			return;
 		} elseif ($cmd == Delivery::RELOCATION) {
@@ -101,30 +104,30 @@ class Notifier {
 			$uid = $item_id;
 
 			$recipients_relocate = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND `network` IN ('%s', '%s')",
-						intval($uid), NETWORK_DFRN, NETWORK_DIASPORA);
+						intval($uid), Protocol::DFRN, Protocol::DIASPORA);
 		} else {
 			// find ancestors
-			$target_item = dba::fetch_first("SELECT `item`.*, `contact`.`uid` AS `cuid` FROM `item`
-						INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-						WHERE `item`.`id` = ? AND `visible` AND NOT `moderated`", $item_id);
+			$condition = ['id' => $item_id, 'visible' => true, 'moderated' => false];
+			$target_item = Item::selectFirst([], $condition);
 
-			if (!DBM::is_result($target_item) || !intval($target_item['parent'])) {
+			if (!DBA::isResult($target_item) || !intval($target_item['parent'])) {
 				return;
 			}
 
 			$parent_id = intval($target_item['parent']);
-			$uid = $target_item['cuid'];
+			$uid = $target_item['contact-uid'];
 			$updated = $target_item['edited'];
 
-			$items = q("SELECT `item`.*, `sign`.`signed_text`,`sign`.`signature`,`sign`.`signer`
-				FROM `item` LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id` WHERE `parent` = %d AND visible AND NOT moderated ORDER BY `id` ASC",
-				intval($parent_id)
-			);
+			$condition = ['parent' => $parent_id, 'visible' => true, 'moderated' => false];
+			$params = ['order' => ['id']];
+			$ret = Item::select([], $condition, $params);
 
-			if (!count($items)) {
+			if (!DBA::isResult($ret)) {
 				return;
 			}
 
+			$items = Item::inArray($ret);
+
 			// avoid race condition with deleting entries
 			if ($items[0]['deleted']) {
 				foreach ($items as $item) {
@@ -164,10 +167,11 @@ class Notifier {
 		if (!in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION, Delivery::RELOCATION])) {
 			$parent = $items[0];
 
-			$thr_parent = q("SELECT `network`, `author-link`, `owner-link` FROM `item` WHERE `uri` = '%s' AND `uid` = %d",
-				dbesc($target_item["thr-parent"]), intval($target_item["uid"]));
+			$fields = ['network', 'author-id', 'owner-id'];
+			$condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]];
+			$thr_parent = Item::selectFirst($fields, $condition);
 
-			logger('GUID: '.$target_item["guid"].': Parent is '.$parent['network'].'. Thread parent is '.$thr_parent[0]['network'], LOGGER_DEBUG);
+			logger('GUID: '.$target_item["guid"].': Parent is '.$parent['network'].'. Thread parent is '.$thr_parent['network'], LOGGER_DEBUG);
 
 			// This is IMPORTANT!!!!
 
@@ -213,29 +217,21 @@ class Notifier {
 			}
 
 			// Special treatment for forum posts
-			if (($target_item['author-link'] != $target_item['owner-link']) &&
-				($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 (!DBM::is_result($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;
 				$public_message = false; // not public
-				$conversant_str = dbesc($parent['contact-id']);
+				$conversant_str = DBA::escape($parent['contact-id']);
 				$recipients = [$parent['contact-id']];
 				$recipients_followup  = [$parent['contact-id']];
 
@@ -247,17 +243,17 @@ class Notifier {
 						$target_item['deny_cid'].$target_item['deny_gid']) == 0))
 					$push_notify = true;
 
-				if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
+				if (($thr_parent && ($thr_parent['network'] == Protocol::OSTATUS)) || ($parent['network'] == Protocol::OSTATUS)) {
 					$push_notify = true;
 
-					if ($parent["network"] == NETWORK_OSTATUS) {
+					if ($parent["network"] == Protocol::OSTATUS) {
 						// Distribute the message to the DFRN contacts as if this wasn't a followup since OStatus can't relay comments
 						// Currently it is work at progress
 						$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s' AND NOT `blocked` AND NOT `pending` AND NOT `archive`",
 							intval($uid),
-							dbesc(NETWORK_DFRN)
+							DBA::escape(Protocol::DFRN)
 						);
-						if (DBM::is_result($r)) {
+						if (DBA::isResult($r)) {
 							foreach ($r as $rr) {
 								$recipients_followup[] = $rr['id'];
 							}
@@ -328,42 +324,26 @@ class Notifier {
 				$deny = array_unique(array_merge($deny_people,$deny_groups));
 				$recipients = array_diff($recipients,$deny);
 
-				$conversant_str = dbesc(implode(', ',$conversants));
+				$conversant_str = DBA::escape(implode(', ',$conversants));
 			}
 
 			// If the thread parent is OStatus then do some magic to distribute the messages.
 			// We have not only to look at the parent, since it could be a Friendica thread.
-			if (($thr_parent && ($thr_parent[0]['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
+			if (($thr_parent && ($thr_parent['network'] == Protocol::OSTATUS)) || ($parent['network'] == Protocol::OSTATUS)) {
 				$diaspora_delivery = false;
 
-				logger('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent[0]['author-link']." - Owner: ".$thr_parent[0]['owner-link'], LOGGER_DEBUG);
+				logger('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent['author-id']." - Owner: ".$thr_parent['owner-id'], LOGGER_DEBUG);
 
 				// Send a salmon to the parent author
-				$r = q("SELECT `url`, `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
-					dbesc(normalise_link($thr_parent[0]['author-link'])),
-					intval($uid));
-				if (DBM::is_result($r)) {
-					$probed_contact = $r[0];
-				} else {
-					$probed_contact = Probe::uri($thr_parent[0]['author-link']);
-				}
-
-				if ($probed_contact["notify"] != "") {
+				$probed_contact = DBA::selectFirst('contact', ['url', 'notify'], ['id' => $thr_parent['author-id']]);
+				if (DBA::isResult($probed_contact) && !empty($probed_contact["notify"])) {
 					logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]);
 					$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
 				}
 
 				// Send a salmon to the parent owner
-				$r = q("SELECT `url`, `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
-					dbesc(normalise_link($thr_parent[0]['owner-link'])),
-					intval($uid));
-				if (DBM::is_result($r)) {
-					$probed_contact = $r[0];
-				} else {
-					$probed_contact = Probe::uri($thr_parent[0]['owner-link']);
-				}
-
-				if ($probed_contact["notify"] != "") {
+				$probed_contact = DBA::selectFirst('contact', ['url', 'notify'], ['id' => $thr_parent['owner-id']]);
+				if (DBA::isResult($probed_contact) && !empty($probed_contact["notify"])) {
 					logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]);
 					$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
 				}
@@ -383,24 +363,24 @@ class Notifier {
 				}
 
 				// It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora
-				$networks = [NETWORK_OSTATUS, NETWORK_DFRN];
+				$networks = [Protocol::OSTATUS, Protocol::DFRN];
 			} else {
-				$networks = [NETWORK_OSTATUS, NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_MAIL];
+				$networks = [Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA, Protocol::MAIL];
 			}
 		} else {
 			$public_message = false;
 		}
 
 		// If this is a public message and pubmail is set on the parent, include all your email contacts
-		if (function_exists('imap_open') && !Config::get('system','imap_disabled')) {
+		if (!empty($target_item) && function_exists('imap_open') && !Config::get('system','imap_disabled')) {
 			if (!strlen($target_item['allow_cid']) && !strlen($target_item['allow_gid'])
 				&& !strlen($target_item['deny_cid']) && !strlen($target_item['deny_gid'])
 				&& intval($target_item['pubmail'])) {
 				$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
 					intval($uid),
-					dbesc(NETWORK_MAIL)
+					DBA::escape(Protocol::MAIL)
 				);
-				if (DBM::is_result($r)) {
+				if (DBA::isResult($r)) {
 					foreach ($r as $rr) {
 						$recipients[] = $rr['id'];
 					}
@@ -419,14 +399,14 @@ class Notifier {
 			if (!empty($networks)) {
 				$condition['network'] = $networks;
 			}
-			$contacts = dba::select('contact', ['id', 'url', 'network'], $condition);
-			$r = dba::inArray($contacts);
+			$contacts = DBA::select('contact', ['id', 'url', 'network'], $condition);
+			$r = DBA::toArray($contacts);
 		}
 
 		// delivery loop
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r as $contact) {
-				logger("Deliver ".$target_item["guid"]." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
+				logger("Deliver ".$item_id." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
 
 				Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
 						'Delivery', $cmd, $item_id, (int)$contact['id']);
@@ -453,9 +433,9 @@ class Notifier {
 				$r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network`
 					FROM `contact` WHERE `network` = '%s' AND `batch` != ''
 					AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch`",
-					dbesc(NETWORK_DIASPORA),
+					DBA::escape(Protocol::DIASPORA),
 					intval($owner['uid']),
-					intval(CONTACT_IS_SHARING)
+					intval(Contact::SHARING)
 				);
 
 				// Fetch the participation list
@@ -468,20 +448,21 @@ class Notifier {
 				}
 			}
 
-			$condition = ['network' => NETWORK_DFRN, 'uid' => $owner['uid'], 'blocked' => false,
-				'pending' => false, 'archive' => false, 'rel' => [CONTACT_IS_FOLLOWER, CONTACT_IS_FRIEND]];
-			$r2 = dba::inArray(dba::select('contact', ['id', 'name', 'network'], $condition));
+			$condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false,
+				'pending' => false, 'archive' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
+
+			$r2 = DBA::toArray(DBA::select('contact', ['id', 'name', 'network'], $condition));
 
 			$r = array_merge($r2, $r1);
 
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
 
 				foreach ($r as $rr) {
 					// except for Diaspora batch jobs
 					// Don't deliver to folks who have already been delivered to
 
-					if (($rr['network'] !== NETWORK_DIASPORA) && (in_array($rr['id'], $conversants))) {
+					if (($rr['network'] !== Protocol::DIASPORA) && (in_array($rr['id'], $conversants))) {
 						logger('notifier: already delivered id=' . $rr['id']);
 						continue;
 					}
@@ -515,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']);
+	}
 }
diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index e42612cd3..01b63e98e 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -4,10 +4,12 @@
  */
 namespace Friendica\Worker;
 
+use Friendica\BaseObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Protocol\Email;
@@ -15,14 +17,14 @@ use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
-use dba;
 
 require_once 'include/dba.php';
 
 class OnePoll
 {
-	public static function execute($contact_id = 0, $command = '') {
-		global $a;
+	public static function execute($contact_id = 0, $command = '')
+	{
+		$a = BaseObject::getApp();
 
 		require_once 'include/items.php';
 
@@ -45,8 +47,8 @@ class OnePoll
 
 		$d = DateTimeFormat::utcNow();
 
-		$contact = dba::selectFirst('contact', [], ['id' => $contact_id]);
-		if (!DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
+		if (!DBA::isResult($contact)) {
 			logger('Contact not found or cannot be used.');
 			return;
 		}
@@ -59,7 +61,7 @@ class OnePoll
 				WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
 				intval($contact['id'])
 			);
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				if (!$r[0]['total']) {
 					PortableContact::loadWorker($contact['id'], $importer_uid, 0, $contact['poco']);
 				}
@@ -67,9 +69,10 @@ class OnePoll
 		}
 
 		// Diaspora users, archived users and followers are only checked if they still exist.
-		if ($contact['archive'] || ($contact["network"] == NETWORK_DIASPORA) || ($contact["rel"] == CONTACT_IS_FOLLOWER)) {
+		if ($contact['archive'] || ($contact["network"] == Protocol::DIASPORA) || ($contact["rel"] == Contact::FOLLOWER)) {
 			$last_updated = PortableContact::lastUpdated($contact["url"], true);
 			$updated = DateTimeFormat::utcNow();
+
 			if ($last_updated) {
 				logger('Contact '.$contact['id'].' had last update on '.$last_updated, LOGGER_DEBUG);
 
@@ -86,6 +89,7 @@ class OnePoll
 				Contact::markForArchival($contact);
 				logger('Contact '.$contact['id'].' is marked for archival', LOGGER_DEBUG);
 			}
+
 			return;
 		}
 
@@ -111,12 +115,12 @@ class OnePoll
 		);
 
 		// Update the contact entry
-		if (($contact['network'] === NETWORK_OSTATUS) || ($contact['network'] === NETWORK_DIASPORA) || ($contact['network'] === NETWORK_DFRN)) {
+		if (($contact['network'] === Protocol::OSTATUS) || ($contact['network'] === Protocol::DIASPORA) || ($contact['network'] === Protocol::DFRN)) {
 			if (!PortableContact::reachable($contact['url'])) {
 				logger("Skipping probably dead contact ".$contact['url']);
 
 				// set the last-update so we don't keep polling
-				dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 				return;
 			}
 
@@ -125,7 +129,7 @@ class OnePoll
 				logger('Contact is marked dead');
 
 				// set the last-update so we don't keep polling
-				dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 				return;
 			} else {
 				Contact::unmarkForArchival($contact);
@@ -136,7 +140,7 @@ class OnePoll
 			logger('Ignore public contacts');
 
 			// set the last-update so we don't keep polling
-			dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+			DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 			return;
 		}
 
@@ -144,11 +148,11 @@ class OnePoll
 			intval($importer_uid)
 		);
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			logger('No self contact for user '.$importer_uid);
 
 			// set the last-update so we don't keep polling
-			dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+			DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 			return;
 		}
 
@@ -157,7 +161,7 @@ class OnePoll
 
 		logger("poll: ({$contact['network']}-{$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
 
-		if ($contact['network'] === NETWORK_DFRN) {
+		if ($contact['network'] === Protocol::DFRN) {
 			$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
 			if (intval($contact['duplex']) && $contact['dfrn-id']) {
 				$idtosend = '0:' . $orig_id;
@@ -173,7 +177,7 @@ class OnePoll
 
 			if (!intval($contact['writable'])) {
 				$fields = ['writable' => true];
-				dba::update('contact', $fields, ['id' => $contact['id']]);
+				DBA::update('contact', $fields, ['id' => $contact['id']]);
 			}
 
 			$url = $contact['poll'] . '?dfrn_id=' . $idtosend
@@ -183,9 +187,9 @@ class OnePoll
 
 			$ret = Network::curl($url);
 
-			if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+			if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 				// set the last-update so we don't keep polling
-				dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 				Contact::markForArchival($contact);
 				return;
 			}
@@ -196,7 +200,6 @@ class OnePoll
 
 			logger('handshake with url ' . $url . ' returns xml: ' . $handshake_xml, LOGGER_DATA);
 
-
 			if (!strlen($handshake_xml) || ($html_code >= 400) || !$html_code) {
 				logger("$url appears to be dead - marking for death ");
 
@@ -241,13 +244,13 @@ class OnePoll
 
 			if ((intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {
 				// set the last-update so we don't keep polling
-				dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 				return;
 			}
 
 			if (((float)$res->dfrn_version > 2.21) && ($contact['poco'] == '')) {
 				$fields = ['poco' => str_replace('/profile/', '/poco/', $contact['url'])];
-				dba::update('contact', $fields, ['id' => $contact['id']]);
+				DBA::update('contact', $fields, ['id' => $contact['id']]);
 			}
 
 			$postvars = [];
@@ -276,7 +279,7 @@ class OnePoll
 				logger('ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);
 
 				// set the last-update so we don't keep polling
-				dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 				Contact::markForArchival($contact);
 				return;
 			}
@@ -287,31 +290,31 @@ class OnePoll
 
 			$xml = Network::post($contact['poll'], $postvars);
 
-		} elseif (($contact['network'] === NETWORK_OSTATUS)
-			|| ($contact['network'] === NETWORK_DIASPORA)
-			|| ($contact['network'] === NETWORK_FEED)) {
+		} elseif (($contact['network'] === Protocol::OSTATUS)
+			|| ($contact['network'] === Protocol::DIASPORA)
+			|| ($contact['network'] === Protocol::FEED)) {
 
 			// Upgrading DB fields from an older Friendica version
 			// Will only do this once per notify-enabled OStatus contact
 			// or if relationship changes
 
-			$stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0);
+			$stat_writeable = ((($contact['notify']) && ($contact['rel'] == Contact::FOLLOWER || $contact['rel'] == Contact::FRIEND)) ? 1 : 0);
 
 			// Contacts from OStatus are always writable
-			if ($contact['network'] === NETWORK_OSTATUS) {
+			if ($contact['network'] === Protocol::OSTATUS) {
 				$stat_writeable = 1;
 			}
 
 			if ($stat_writeable != $contact['writable']) {
 				$fields = ['writable' => $stat_writeable];
-				dba::update('contact', $fields, ['id' => $contact['id']]);
+				DBA::update('contact', $fields, ['id' => $contact['id']]);
 			}
 
 			// Are we allowed to import from this person?
 
-			if ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['blocked']) {
+			if ($contact['rel'] == Contact::FOLLOWER || $contact['blocked']) {
 				// set the last-update so we don't keep polling
-				dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 				return;
 			}
 
@@ -319,23 +322,22 @@ class OnePoll
 			$ret = Network::curl($contact['poll'], false, $redirects, ['cookiejar' => $cookiejar]);
 			unlink($cookiejar);
 
-			if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+			if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 				// set the last-update so we don't keep polling
-				dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 				Contact::markForArchival($contact);
 				return;
 			}
 
 			$xml = $ret['body'];
 
-		} elseif ($contact['network'] === NETWORK_MAIL) {
-
+		} elseif ($contact['network'] === Protocol::MAIL) {
 			logger("Mail: Fetching for ".$contact['addr'], LOGGER_DEBUG);
 
 			$mail_disabled = ((function_exists('imap_open') && (! Config::get('system', 'imap_disabled'))) ? 0 : 1);
 			if ($mail_disabled) {
 				// set the last-update so we don't keep polling
-				dba::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
+				DBA::update('contact', ['last-update' => DateTimeFormat::utcNow()], ['id' => $contact['id']]);
 				Contact::markForArchival($contact);
 				return;
 			}
@@ -343,11 +345,11 @@ class OnePoll
 			logger("Mail: Enabled", LOGGER_DEBUG);
 
 			$mbox = null;
-			$user = dba::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]);
+			$user = DBA::selectFirst('user', ['prvkey'], ['uid' => $importer_uid]);
 
 			$condition = ["`server` != '' AND `uid` = ?", $importer_uid];
-			$mailconf = dba::selectFirst('mailacct', [], $condition);
-			if (DBM::is_result($user) && DBM::is_result($mailconf)) {
+			$mailconf = DBA::selectFirst('mailacct', [], $condition);
+			if (DBA::isResult($user) && DBA::isResult($mailconf)) {
 				$mailbox = Email::constructMailboxName($mailconf);
 				$password = '';
 				openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $user['prvkey']);
@@ -356,7 +358,7 @@ class OnePoll
 				logger("Mail: Connect to " . $mailconf['user']);
 				if ($mbox) {
 					$fields = ['last_check' => DateTimeFormat::utcNow()];
-					dba::update('mailacct', $fields, ['id' => $mailconf['id']]);
+					DBA::update('mailacct', $fields, ['id' => $mailconf['id']]);
 					logger("Mail: Connected to " . $mailconf['user']);
 				} else {
 					logger("Mail: Connection error ".$mailconf['user']." ".print_r(imap_errors(), true));
@@ -370,6 +372,7 @@ class OnePoll
 					logger("Mail: Parsing ".count($msgs)." mails from ".$contact['addr']." for ".$mailconf['user'], LOGGER_DEBUG);
 
 					$metas = Email::messageMeta($mbox, implode(',', $msgs));
+
 					if (count($metas) != count($msgs)) {
 						logger("for " . $mailconf['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG);
 					} else {
@@ -381,7 +384,7 @@ class OnePoll
 							$datarray = [];
 							$datarray['verb'] = ACTIVITY_POST;
 							$datarray['object-type'] = ACTIVITY_OBJ_NOTE;
-							$datarray['network'] = NETWORK_MAIL;
+							$datarray['network'] = Protocol::MAIL;
 							// $meta = Email::messageMeta($mbox, $msg_uid);
 
 							$datarray['uri'] = Email::msgid2iri(trim($meta->message_id, '<>'));
@@ -389,8 +392,8 @@ class OnePoll
 							// Have we seen it before?
 							$fields = ['deleted', 'id'];
 							$condition = ['uid' => $importer_uid, 'uri' => $datarray['uri']];
-							$item = dba::selectFirst('item', $fields, $condition);
-							if (DBM::is_result($item)) {
+							$item = Item::selectFirst($fields, $condition);
+							if (DBA::isResult($item)) {
 								logger("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG);
 
 								// Only delete when mails aren't automatically moved or deleted
@@ -435,15 +438,13 @@ class OnePoll
 								$refs_arr = explode(' ', $raw_refs);
 								if (count($refs_arr)) {
 									for ($x = 0; $x < count($refs_arr); $x ++) {
-										$refs_arr[$x] = "'" . Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''],dbesc($refs_arr[$x]))) . "'";
+										$refs_arr[$x] = Email::msgid2iri(str_replace(['<', '>', ' '],['', '', ''], $refs_arr[$x]));
 									}
 								}
-								$qstr = implode(',', $refs_arr);
-								$r = q("SELECT `parent-uri` FROM `item` USE INDEX (`uid_uri`) WHERE `uri` IN ($qstr) AND `uid` = %d LIMIT 1",
-									intval($importer_uid)
-								);
-								if (DBM::is_result($r)) {
-									$datarray['parent-uri'] = $r[0]['parent-uri'];  // Set the parent as the top-level item
+								$condition = ['uri' => $refs_arr, 'uid' => $importer_uid];
+								$parent = Item::selectFirst(['parent-uri'], $condition);
+								if (DBA::isResult($parent)) {
+									$datarray['parent-uri'] = $parent['parent-uri'];  // Set the parent as the top-level item
 								}
 							}
 
@@ -472,12 +473,11 @@ class OnePoll
 
 							// If it seems to be a reply but a header couldn't be found take the last message with matching subject
 							if (empty($datarray['parent-uri']) && $reply) {
-								$r = q("SELECT `parent-uri` FROM `item` WHERE `title` = \"%s\" AND `uid` = %d AND `network` = '%s' ORDER BY `created` DESC LIMIT 1",
-									dbesc(protect_sprintf($datarray['title'])),
-									intval($importer_uid),
-									dbesc(NETWORK_MAIL));
-								if (DBM::is_result($r)) {
-									$datarray['parent-uri'] = $r[0]['parent-uri'];
+								$condition = ['title' => $datarray['title'], 'uid' => importer_uid, 'network' => Protocol::MAIL];
+								$params = ['order' => ['created' => true]];
+								$parent = Item::selectFirst(['parent-uri'], $condition, $params);
+								if (DBA::isResult($parent)) {
+									$datarray['parent-uri'] = $parent['parent-uri'];
 								}
 							}
 
@@ -530,7 +530,7 @@ class OnePoll
 							if ($datarray['parent-uri'] === $datarray['uri']) {
 								$datarray['private'] = 1;
 							}
-							if (($contact['network'] === NETWORK_MAIL) && (!PConfig::get($importer_uid, 'system', 'allow_public_email_replies'))) {
+							if (($contact['network'] === Protocol::MAIL) && (!PConfig::get($importer_uid, 'system', 'allow_public_email_replies'))) {
 								$datarray['private'] = 1;
 								$datarray['allow_cid'] = '<' . $contact['id'] . '>';
 							}
@@ -585,16 +585,16 @@ class OnePoll
 			consume_feed($xml, $importer, $contact, $hub);
 
 			// do it a second time for DFRN so that any children find their parents.
-			if ($contact['network'] === NETWORK_DFRN) {
+			if ($contact['network'] === Protocol::DFRN) {
 				consume_feed($xml, $importer, $contact, $hub);
 			}
 
 			$hubmode = 'subscribe';
-			if ($contact['network'] === NETWORK_DFRN || $contact['blocked']) {
+			if ($contact['network'] === Protocol::DFRN || $contact['blocked']) {
 				$hubmode = 'unsubscribe';
 			}
 
-			if (($contact['network'] === NETWORK_OSTATUS ||  $contact['network'] == NETWORK_FEED) && (! $contact['hub-verify'])) {
+			if (($contact['network'] === Protocol::OSTATUS ||  $contact['network'] == Protocol::FEED) && (! $contact['hub-verify'])) {
 				$hub_update = true;
 			}
 
@@ -604,15 +604,18 @@ class OnePoll
 
 			logger("Contact ".$contact['id']." returned hub: ".$hub." Network: ".$contact['network']." Relation: ".$contact['rel']." Update: ".$hub_update);
 
-			if (strlen($hub) && $hub_update && (($contact['rel'] != CONTACT_IS_FOLLOWER) || $contact['network'] == NETWORK_FEED)) {
+			if (strlen($hub) && $hub_update && (($contact['rel'] != Contact::FOLLOWER) || $contact['network'] == Protocol::FEED)) {
 				logger('hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']);
 				$hubs = explode(',', $hub);
+
 				if (count($hubs)) {
 					foreach ($hubs as $h) {
 						$h = trim($h);
+
 						if (!strlen($h)) {
 							continue;
 						}
+
 						subscribe_to_hub($h, $importer, $contact, $hubmode);
 					}
 				}
@@ -621,23 +624,24 @@ class OnePoll
 			$updated = DateTimeFormat::utcNow();
 
 			self::updateContact($contact, ['last-update' => $updated, 'success_update' => $updated]);
-			dba::update('gcontact', ['last_contact' => $updated], ['nurl' => $contact['nurl']]);
+			DBA::update('gcontact', ['last_contact' => $updated], ['nurl' => $contact['nurl']]);
 			Contact::unmarkForArchival($contact);
-		} elseif (in_array($contact["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_FEED])) {
+		} elseif (in_array($contact["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::FEED])) {
 			$updated = DateTimeFormat::utcNow();
 
 			self::updateContact($contact, ['last-update' => $updated, 'failure_update' => $updated]);
-			dba::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]);
+			DBA::update('gcontact', ['last_failure' => $updated], ['nurl' => $contact['nurl']]);
 			Contact::markForArchival($contact);
 		} else {
 			$updated = DateTimeFormat::utcNow();
-			dba::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
+			DBA::update('contact', ['last-update' => $updated], ['id' => $contact['id']]);
 		}
 
 		return;
 	}
 
-	private static function RemoveReply($subject) {
+	private static function RemoveReply($subject)
+	{
 		while (in_array(strtolower(substr($subject, 0, 3)), ["re:", "aw:"])) {
 			$subject = trim(substr($subject, 4));
 		}
@@ -651,8 +655,9 @@ class OnePoll
 	 * @param array $contact The personal contact entry
 	 * @param array $fields The fields that are updated
 	 */
-	private static function updateContact($contact, $fields) {
-		dba::update('contact', $fields, ['id' => $contact['id']]);
-		dba::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
+	private static function updateContact(array $contact, array $fields)
+	{
+		DBA::update('contact', $fields, ['id' => $contact['id']]);
+		DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $contact['nurl']]);
 	}
 }
diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php
index 0a60e5a59..1e18b4ccf 100644
--- a/src/Worker/PubSubPublish.php
+++ b/src/Worker/PubSubPublish.php
@@ -5,17 +5,17 @@
 
 namespace Friendica\Worker;
 
-use Friendica\App;
+use Friendica\BaseObject;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\PushSubscriber;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Network;
-use Friendica\Model\PushSubscriber;
-use dba;
 
 require_once 'include/items.php';
 
-class PubSubPublish {
+class PubSubPublish
+{
 	public static function execute($pubsubpublish_id = 0)
 	{
 		if ($pubsubpublish_id == 0) {
@@ -25,11 +25,12 @@ class PubSubPublish {
 		self::publish($pubsubpublish_id);
 	}
 
-	private static function publish($id) {
-		global $a;
+	private static function publish($id)
+	{
+		$a = BaseObject::getApp();
 
-		$subscriber = dba::selectFirst('push_subscriber', [], ['id' => $id]);
-		if (!DBM::is_result($subscriber)) {
+		$subscriber = DBA::selectFirst('push_subscriber', [], ['id' => $id]);
+		if (!DBA::isResult($subscriber)) {
 			return;
 		}
 
diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index 89ec28262..b27a776c7 100644
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -7,15 +7,17 @@ namespace Friendica\Worker;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
-use Friendica\Model\Queue as QueueModel;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\PushSubscriber;
+use Friendica\Model\Queue as QueueModel;
+use Friendica\Model\User;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
-use dba;
 
 require_once 'include/dba.php';
 require_once 'include/items.php';
@@ -24,8 +26,6 @@ class Queue
 {
 	public static function execute($queue_id = 0)
 	{
-		global $a;
-
 		$cachekey_deadguy = 'queue_run:deadguy:';
 		$cachekey_server = 'queue_run:server:';
 
@@ -37,11 +37,11 @@ class Queue
 			// Handling the pubsubhubbub requests
 			PushSubscriber::requeue();
 
-			$r = dba::inArray(dba::p("SELECT `id` FROM `queue` WHERE `next` < UTC_TIMESTAMP() ORDER BY `batch`, `cid`"));
+			$r = DBA::toArray(DBA::p("SELECT `id` FROM `queue` WHERE `next` < UTC_TIMESTAMP() ORDER BY `batch`, `cid`"));
 
 			Addon::callHooks('queue_predeliver', $r);
 
-			if (DBM::is_result($r)) {
+			if (DBA::isResult($r)) {
 				foreach ($r as $q_item) {
 					logger('Call queue for id ' . $q_item['id']);
 					Worker::add(['priority' => PRIORITY_LOW, 'dont_fork' => true], "Queue", (int) $q_item['id']);
@@ -53,13 +53,13 @@ class Queue
 
 
 		// delivering
-		$q_item = dba::selectFirst('queue', [], ['id' => $queue_id]);
-		if (!DBM::is_result($q_item)) {
+		$q_item = DBA::selectFirst('queue', [], ['id' => $queue_id]);
+		if (!DBA::isResult($q_item)) {
 			return;
 		}
 
-		$contact = dba::selectFirst('contact', [], ['id' => $q_item['cid']]);
-		if (!DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', [], ['id' => $q_item['cid']]);
+		if (!DBA::isResult($contact)) {
 			QueueModel::removeItem($q_item['id']);
 			return;
 		}
@@ -98,20 +98,20 @@ class Queue
 			}
 		}
 
-		$user = dba::selectFirst('user', [], ['uid' => $contact['uid']]);
-		if (!DBM::is_result($user)) {
+		$user = DBA::selectFirst('user', [], ['uid' => $contact['uid']]);
+		if (!DBA::isResult($user)) {
 			QueueModel::removeItem($q_item['id']);
 			return;
 		}
 
 		$data   = $q_item['content'];
 		$public = $q_item['batch'];
-		$owner  = $user;
+		$owner  = User::getOwnerDataById($user['uid']);
 
 		$deliver_status = 0;
 
 		switch ($contact['network']) {
-			case NETWORK_DFRN:
+			case Protocol::DFRN:
 				logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
 				$deliver_status = DFRN::deliver($owner, $contact, $data);
 
@@ -122,7 +122,8 @@ class Queue
 					Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
 				}
 				break;
-			case NETWORK_OSTATUS:
+
+			case Protocol::OSTATUS:
 				logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
 				$deliver_status = Salmon::slapper($owner, $contact['notify'], $data);
 
@@ -133,12 +134,13 @@ class Queue
 					QueueModel::removeItem($q_item['id']);
 				}
 				break;
-			case NETWORK_DIASPORA:
+
+			case Protocol::DIASPORA:
 				logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name'] . ' <' . $contact['url'] . '>');
 				$deliver_status = Diaspora::transmit($owner, $contact, $data, $public, true, 'Queue:' . $q_item['id'], true);
 
 				if ((($deliver_status >= 200) && ($deliver_status <= 299)) ||
-					($contact['contact-type'] == ACCOUNT_TYPE_RELAY)) {
+					($contact['contact-type'] == Contact::ACCOUNT_TYPE_RELAY)) {
 					QueueModel::removeItem($q_item['id']);
 				} else {
 					QueueModel::updateTime($q_item['id']);
diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php
index 9a7a25777..8f986eab1 100644
--- a/src/Worker/RemoveContact.php
+++ b/src/Worker/RemoveContact.php
@@ -5,21 +5,22 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
-use dba;
+use Friendica\Database\DBA;
+use Friendica\Core\Protocol;
 
 require_once 'include/dba.php';
 
 class RemoveContact {
 	public static function execute($id) {
 
-		// Only delete if the contact doesn't exist (anymore)
-		$r = dba::exists('contact', ['id' => $id]);
-		if ($r) {
+		// 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;
 		}
 
-		// Now we delete all the depending table entries
-		dba::delete('contact', ['id' => $id]);
+		// Now we delete the contact and all depending tables
+		DBA::delete('contact', ['id' => $id]);
 	}
 }
diff --git a/src/Worker/RemoveUser.php b/src/Worker/RemoveUser.php
new file mode 100644
index 000000000..dfa5ccc09
--- /dev/null
+++ b/src/Worker/RemoveUser.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @file src/Worker/RemoveUser.php
+ * @brief Removes orphaned data from deleted users
+ */
+namespace Friendica\Worker;
+
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
+
+require_once 'include/dba.php';
+
+class RemoveUser {
+	public static function execute($uid)
+	{
+		// Only delete if the user is archived
+		$condition = ['account_removed' => true, 'uid' => $uid];
+		if (!DBA::exists('user', $condition)) {
+			return;
+		}
+
+		// Now we delete all user items
+		Item::delete(['uid' => $uid], PRIORITY_LOW);
+	}
+}
diff --git a/src/Worker/TagUpdate.php b/src/Worker/TagUpdate.php
index f6a141ad6..3dac20b6c 100644
--- a/src/Worker/TagUpdate.php
+++ b/src/Worker/TagUpdate.php
@@ -2,38 +2,38 @@
 
 namespace Friendica\Worker;
 
-use dba;
+use Friendica\Database\DBA;
 
 class TagUpdate
 {
 	public static function execute()
 	{
-		$messages = dba::p("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1 AND `term`.`guid` = ''");
+		$messages = DBA::p("SELECT `oid`,`item`.`guid`, `item`.`created`, `item`.`received` FROM `term` INNER JOIN `item` ON `item`.`id`=`term`.`oid` WHERE `term`.`otype` = 1 AND `term`.`guid` = ''");
 
-		logger('fetched messages: ' . dba::num_rows($messages));
-		while ($message = dba::fetch($messages)) {
+		logger('fetched messages: ' . DBA::numRows($messages));
+		while ($message = DBA::fetch($messages)) {
 			if ($message['uid'] == 0) {
 				$global = true;
 
-				dba::update('term', ['global' => true], ['otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
+				DBA::update('term', ['global' => true], ['otype' => TERM_OBJ_POST, 'guid' => $message['guid']]);
 			} else {
-				$global = (dba::count('term', ['uid' => 0, 'otype' => TERM_OBJ_POST, 'guid' => $message['guid']]) > 0);
+				$global = (DBA::count('term', ['uid' => 0, 'otype' => TERM_OBJ_POST, 'guid' => $message['guid']]) > 0);
 			}
 
 			$fields = ['guid' => $message['guid'], 'created' => $message['created'],
 				'received' => $message['received'], 'global' => $global];
-			dba::update('term', $fields, ['otype' => TERM_OBJ_POST, 'oid' => $message['oid']]);
+			DBA::update('term', $fields, ['otype' => TERM_OBJ_POST, 'oid' => $message['oid']]);
 		}
 
-		dba::close($messages);
+		DBA::close($messages);
 
-		$messages = dba::p("SELECT `guid` FROM `item` WHERE `uid` = 0");
+		$messages = DBA::select('item', ['guid'], ['uid' => 0]);
 
-		logger('fetched messages: ' . dba::num_rows($messages));
-		while ($message = dba::fetch(messages)) {
-			dba::update('item', ['global' => true], ['guid' => $message['guid']]);
+		logger('fetched messages: ' . DBA::numRows($messages));
+		while ($message = DBA::fetch(messages)) {
+			DBA::update('item', ['global' => true], ['guid' => $message['guid']]);
 		}
 
-		dba::close($messages);
+		DBA::close($messages);
 	}
 }
diff --git a/src/Worker/UpdateGContact.php b/src/Worker/UpdateGContact.php
index 98a62818e..f2919e4a7 100644
--- a/src/Worker/UpdateGContact.php
+++ b/src/Worker/UpdateGContact.php
@@ -6,7 +6,8 @@
 
 namespace Friendica\Worker;
 
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
@@ -15,8 +16,6 @@ class UpdateGContact
 {
 	public static function execute($contact_id)
 	{
-		global $a;
-
 		logger('update_gcontact: start');
 
 		if (empty($contact_id)) {
@@ -26,23 +25,23 @@ class UpdateGContact
 
 		$r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
 
-		if (!DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			return;
 		}
 
-		if (!in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
+		if (!in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
 			return;
 		}
 
 		$data = Probe::uri($r[0]["url"]);
 
-		if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
+		if (!in_array($data["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
 			if ($r[0]["server_url"] != "") {
 				PortableContact::checkServer($r[0]["server_url"], $r[0]["network"]);
 			}
 
 			q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `id` = %d",
-				dbesc(DateTimeFormat::utcNow()), intval($contact_id));
+				DBA::escape(DateTimeFormat::utcNow()), intval($contact_id));
 			return;
 		}
 
@@ -65,26 +64,26 @@ class UpdateGContact
 
 		q("UPDATE `gcontact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s'
 					WHERE `id` = %d",
-					dbesc($data["name"]),
-					dbesc($data["nick"]),
-					dbesc($data["addr"]),
-					dbesc($data["photo"]),
+					DBA::escape($data["name"]),
+					DBA::escape($data["nick"]),
+					DBA::escape($data["addr"]),
+					DBA::escape($data["photo"]),
 			intval($contact_id)
 		);
 
 		q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s'
 					WHERE `uid` = 0 AND `addr` = '' AND `nurl` = '%s'",
-					dbesc($data["name"]),
-					dbesc($data["nick"]),
-					dbesc($data["addr"]),
-					dbesc($data["photo"]),
-					dbesc(normalise_link($data["url"]))
+					DBA::escape($data["name"]),
+					DBA::escape($data["nick"]),
+					DBA::escape($data["addr"]),
+					DBA::escape($data["photo"]),
+					DBA::escape(normalise_link($data["url"]))
 		);
 
 		q("UPDATE `contact` SET `addr` = '%s'
 					WHERE `uid` != 0 AND `addr` = '' AND `nurl` = '%s'",
-					dbesc($data["addr"]),
-					dbesc(normalise_link($data["url"]))
+					DBA::escape($data["addr"]),
+					DBA::escape(normalise_link($data["url"]))
 		);
 	}
 }
diff --git a/tests/ApiTest.php b/tests/ApiTest.php
new file mode 100644
index 000000000..a3e1ced68
--- /dev/null
+++ b/tests/ApiTest.php
@@ -0,0 +1,3701 @@
+<?php
+/**
+ * ApiTest class.
+ */
+
+namespace Friendica\Test;
+
+use Friendica\BaseObject;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
+use Friendica\Core\System;
+use Friendica\Network\HTTPException;
+
+/**
+ * Tests for the API functions.
+ *
+ * Functions that use header() need to be tested in a separate process.
+ * @see https://phpunit.de/manual/5.7/en/appendixes.annotations.html#appendixes.annotations.runTestsInSeparateProcesses
+ */
+class ApiTest extends DatabaseTest
+{
+
+	/**
+	 * Create variables used by tests.
+	 */
+	protected function setUp()
+	{
+		parent::setUp();
+
+		// Reusable App object
+		$this->app = BaseObject::getApp();
+
+		// User data that the test database is populated with
+		$this->selfUser = [
+			'id' => 42,
+			'name' => 'Self contact',
+			'nick' => 'selfcontact',
+			'nurl' => 'http://localhost/profile/selfcontact'
+		];
+		$this->friendUser = [
+			'id' => 44,
+			'name' => 'Friend contact',
+			'nick' => 'friendcontact',
+			'nurl' => 'http://localhost/profile/friendcontact'
+		];
+		$this->otherUser = [
+			'id' => 43,
+			'name' => 'othercontact',
+			'nick' => 'othercontact',
+			'nurl' => 'http://localhost/profile/othercontact'
+		];
+
+		// User ID that we know is not in the database
+		$this->wrongUserId = 666;
+
+		// Most API require login so we force the session
+		$_SESSION = [
+			'allow_api' => true,
+			'authenticated' => true,
+			'uid' => $this->selfUser['id']
+		];
+
+		// Default config
+		Config::set('config', 'hostname', 'localhost');
+		Config::set('system', 'throttle_limit_day', 100);
+		Config::set('system', 'throttle_limit_week', 100);
+		Config::set('system', 'throttle_limit_month', 100);
+		Config::set('system', 'theme', 'system_theme');
+	}
+
+	/**
+	 * Cleanup variables used by tests.
+	 */
+	protected function tearDown()
+	{
+		parent::tearDown();
+
+		$app = get_app();
+		$app->argc = 1;
+		$app->argv = ['home'];
+	}
+
+	/**
+	 * Assert that an user array contains expected keys.
+	 * @param array $user User array
+	 * @return void
+	 */
+	private function assertSelfUser(array $user)
+	{
+		$this->assertEquals($this->selfUser['id'], $user['uid']);
+		$this->assertEquals($this->selfUser['id'], $user['cid']);
+		$this->assertEquals(1, $user['self']);
+		$this->assertEquals('Friendica', $user['location']);
+		$this->assertEquals($this->selfUser['name'], $user['name']);
+		$this->assertEquals($this->selfUser['nick'], $user['screen_name']);
+		$this->assertEquals('dfrn', $user['network']);
+		$this->assertTrue($user['verified']);
+	}
+
+	/**
+	 * Assert that an user array contains expected keys.
+	 * @param array $user User array
+	 * @return void
+	 */
+	private function assertOtherUser(array $user)
+	{
+		$this->assertEquals($this->otherUser['id'], $user['id']);
+		$this->assertEquals($this->otherUser['id'], $user['id_str']);
+		$this->assertEquals(0, $user['self']);
+		$this->assertEquals($this->otherUser['name'], $user['name']);
+		$this->assertEquals($this->otherUser['nick'], $user['screen_name']);
+		$this->assertFalse($user['verified']);
+	}
+
+	/**
+	 * Assert that a status array contains expected keys.
+	 * @param array $status Status array
+	 * @return void
+	 */
+	private function assertStatus(array $status)
+	{
+		$this->assertInternalType('string', $status['text']);
+		$this->assertInternalType('int', $status['id']);
+		// We could probably do more checks here.
+	}
+
+	/**
+	 * Assert that a list array contains expected keys.
+	 * @param array $list List array
+	 * @return void
+	 */
+	private function assertList(array $list)
+	{
+		$this->assertInternalType('string', $list['name']);
+		$this->assertInternalType('int', $list['id']);
+		$this->assertInternalType('string', $list['id_str']);
+		$this->assertContains($list['mode'], ['public', 'private']);
+		// We could probably do more checks here.
+	}
+
+	/**
+	 * Assert that the string is XML and contain the root element.
+	 * @param string $result       XML string
+	 * @param string $root_element Root element name
+	 * @return void
+	 */
+	private function assertXml($result, $root_element)
+	{
+		$this->assertStringStartsWith('<?xml version="1.0"?>', $result);
+		$this->assertContains('<'.$root_element, $result);
+		// We could probably do more checks here.
+	}
+
+	/**
+	 * Get the path to a temporary empty PNG image.
+	 * @return string Path
+	 */
+	private function getTempImage()
+	{
+		$tmpFile = tempnam(sys_get_temp_dir(), 'tmp_file');
+		file_put_contents(
+			$tmpFile,
+			base64_decode(
+				// Empty 1x1 px PNG image
+				'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8/5+hHgAHggJ/PchI7wAAAABJRU5ErkJggg=='
+			)
+		);
+
+		return $tmpFile;
+	}
+
+	/**
+	 * Test the api_user() function.
+	 * @return void
+	 */
+	public function testApiUser()
+	{
+		$this->assertEquals($this->selfUser['id'], api_user());
+	}
+
+	/**
+	 * Test the api_user() function with an unallowed user.
+	 * @return void
+	 */
+	public function testApiUserWithUnallowedUser()
+	{
+		$_SESSION = ['allow_api' => false];
+		$this->assertEquals(false, api_user());
+	}
+
+	/**
+	 * Test the api_source() function.
+	 * @return void
+	 */
+	public function testApiSource()
+	{
+		$this->assertEquals('api', api_source());
+	}
+
+	/**
+	 * Test the api_source() function with a Twidere user agent.
+	 * @return void
+	 */
+	public function testApiSourceWithTwidere()
+	{
+		$_SERVER['HTTP_USER_AGENT'] = 'Twidere';
+		$this->assertEquals('Twidere', api_source());
+	}
+
+	/**
+	 * Test the api_source() function with a GET parameter.
+	 * @return void
+	 */
+	public function testApiSourceWithGet()
+	{
+		$_GET['source'] = 'source_name';
+		$this->assertEquals('source_name', api_source());
+	}
+
+	/**
+	 * Test the api_date() function.
+	 * @return void
+	 */
+	public function testApiDate()
+	{
+		$this->assertEquals('Wed Oct 10 00:00:00 +0000 1990', api_date('1990-10-10'));
+	}
+
+	/**
+	 * Test the api_register_func() function.
+	 * @return void
+	 */
+	public function testApiRegisterFunc()
+	{
+		global $API;
+		$this->assertNull(
+			api_register_func(
+				'api_path',
+				function () {
+				},
+				true,
+				'method'
+			)
+		);
+		$this->assertTrue($API['api_path']['auth']);
+		$this->assertEquals('method', $API['api_path']['method']);
+		$this->assertTrue(is_callable($API['api_path']['func']));
+	}
+
+	/**
+	 * Test the api_login() function without any login.
+	 * @return void
+	 * @runInSeparateProcess
+	 * @expectedException Friendica\Network\HTTPException\UnauthorizedException
+	 */
+	public function testApiLoginWithoutLogin()
+	{
+		api_login($this->app);
+	}
+
+	/**
+	 * Test the api_login() function with a bad login.
+	 * @return void
+	 * @runInSeparateProcess
+	 * @expectedException Friendica\Network\HTTPException\UnauthorizedException
+	 */
+	public function testApiLoginWithBadLogin()
+	{
+		$_SERVER['PHP_AUTH_USER'] = 'user@server';
+		api_login($this->app);
+	}
+
+	/**
+	 * Test the api_login() function with oAuth.
+	 * @return void
+	 */
+	public function testApiLoginWithOauth()
+	{
+		$this->markTestIncomplete('Can we test this easily?');
+	}
+
+	/**
+	 * Test the api_login() function with authentication provided by an addon.
+	 * @return void
+	 */
+	public function testApiLoginWithAddonAuth()
+	{
+		$this->markTestIncomplete('Can we test this easily?');
+	}
+
+	/**
+	 * Test the api_login() function with a correct login.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiLoginWithCorrectLogin()
+	{
+		$_SERVER['PHP_AUTH_USER'] = 'Test user';
+		$_SERVER['PHP_AUTH_PW'] = 'password';
+		api_login($this->app);
+	}
+
+	/**
+	 * Test the api_login() function with a remote user.
+	 * @return void
+	 * @runInSeparateProcess
+	 * @expectedException Friendica\Network\HTTPException\UnauthorizedException
+	 */
+	public function testApiLoginWithRemoteUser()
+	{
+		$_SERVER['REDIRECT_REMOTE_USER'] = '123456dXNlcjpwYXNzd29yZA==';
+		api_login($this->app);
+	}
+
+	/**
+	 * Test the api_check_method() function.
+	 * @return void
+	 */
+	public function testApiCheckMethod()
+	{
+		$this->assertFalse(api_check_method('method'));
+	}
+
+	/**
+	 * Test the api_check_method() function with a correct method.
+	 * @return void
+	 */
+	public function testApiCheckMethodWithCorrectMethod()
+	{
+		$_SERVER['REQUEST_METHOD'] = 'method';
+		$this->assertTrue(api_check_method('method'));
+	}
+
+	/**
+	 * Test the api_check_method() function with a wildcard.
+	 * @return void
+	 */
+	public function testApiCheckMethodWithWildcard()
+	{
+		$this->assertTrue(api_check_method('*'));
+	}
+
+	/**
+	 * Test the api_call() function.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiCall()
+	{
+		global $API;
+		$API['api_path'] = [
+			'method' => 'method',
+			'func' => function () {
+				return ['data' => ['some_data']];
+			}
+		];
+		$_SERVER['REQUEST_METHOD'] = 'method';
+		$_GET['callback'] = 'callback_name';
+
+		$this->app->query_string = 'api_path';
+		$this->assertEquals(
+			'callback_name(["some_data"])',
+			api_call($this->app)
+		);
+	}
+
+	/**
+	 * Test the api_call() function with the profiled enabled.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiCallWithProfiler()
+	{
+		global $API;
+		$API['api_path'] = [
+			'method' => 'method',
+			'func' => function () {
+				return ['data' => ['some_data']];
+			}
+		];
+		$_SERVER['REQUEST_METHOD'] = 'method';
+		Config::set('system', 'profiler', true);
+		Config::set('rendertime', 'callstack', true);
+		$this->app->callstack = [
+			'database' => ['some_function' => 200],
+			'database_write' => ['some_function' => 200],
+			'cache' => ['some_function' => 200],
+			'cache_write' => ['some_function' => 200],
+			'network' => ['some_function' => 200]
+		];
+
+		$this->app->query_string = 'api_path';
+		$this->assertEquals(
+			'["some_data"]',
+			api_call($this->app)
+		);
+	}
+
+	/**
+	 * Test the api_call() function without any result.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiCallWithNoResult()
+	{
+		global $API;
+		$API['api_path'] = [
+			'method' => 'method',
+			'func' => function () {
+				return false;
+			}
+		];
+		$_SERVER['REQUEST_METHOD'] = 'method';
+
+		$this->app->query_string = 'api_path';
+		$this->assertEquals(
+			'{"status":{"error":"Internal Server Error","code":"500 Internal Server Error","request":"api_path"}}',
+			api_call($this->app)
+		);
+	}
+
+	/**
+	 * Test the api_call() function with an unimplemented API.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiCallWithUninplementedApi()
+	{
+		$this->assertEquals(
+			'{"status":{"error":"Not Implemented","code":"501 Not Implemented","request":""}}',
+			api_call($this->app)
+		);
+	}
+
+	/**
+	 * Test the api_call() function with a JSON result.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiCallWithJson()
+	{
+		global $API;
+		$API['api_path'] = [
+			'method' => 'method',
+			'func' => function () {
+				return ['data' => ['some_data']];
+			}
+		];
+		$_SERVER['REQUEST_METHOD'] = 'method';
+
+		$this->app->query_string = 'api_path.json';
+		$this->assertEquals(
+			'["some_data"]',
+			api_call($this->app)
+		);
+	}
+
+	/**
+	 * Test the api_call() function with an XML result.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiCallWithXml()
+	{
+		global $API;
+		$API['api_path'] = [
+			'method' => 'method',
+			'func' => function () {
+				return 'some_data';
+			}
+		];
+		$_SERVER['REQUEST_METHOD'] = 'method';
+
+		$this->app->query_string = 'api_path.xml';
+		$this->assertEquals(
+			'some_data',
+			api_call($this->app)
+		);
+	}
+
+	/**
+	 * Test the api_call() function with an RSS result.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiCallWithRss()
+	{
+		global $API;
+		$API['api_path'] = [
+			'method' => 'method',
+			'func' => function () {
+				return 'some_data';
+			}
+		];
+		$_SERVER['REQUEST_METHOD'] = 'method';
+
+		$this->app->query_string = 'api_path.rss';
+		$this->assertEquals(
+			'<?xml version="1.0" encoding="UTF-8"?>'."\n".
+				'some_data',
+			api_call($this->app)
+		);
+	}
+
+	/**
+	 * Test the api_call() function with an Atom result.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiCallWithAtom()
+	{
+		global $API;
+		$API['api_path'] = [
+			'method' => 'method',
+			'func' => function () {
+				return 'some_data';
+			}
+		];
+		$_SERVER['REQUEST_METHOD'] = 'method';
+
+		$this->app->query_string = 'api_path.atom';
+		$this->assertEquals(
+			'<?xml version="1.0" encoding="UTF-8"?>'."\n".
+				'some_data',
+			api_call($this->app)
+		);
+	}
+
+	/**
+	 * Test the api_call() function with an unallowed method.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiCallWithWrongMethod()
+	{
+		global $API;
+		$API['api_path'] = ['method' => 'method'];
+
+		$this->app->query_string = 'api_path';
+		$this->assertEquals(
+			'{"status":{"error":"Method Not Allowed","code":"405 Method Not Allowed","request":"api_path"}}',
+			api_call($this->app)
+		);
+	}
+
+	/**
+	 * Test the api_call() function with an unauthorized user.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiCallWithWrongAuth()
+	{
+		global $API;
+		$API['api_path'] = [
+			'method' => 'method',
+			'auth' => true
+		];
+		$_SERVER['REQUEST_METHOD'] = 'method';
+		$_SESSION['authenticated'] = false;
+
+		$this->app->query_string = 'api_path';
+		$this->assertEquals(
+			'{"status":{"error":"This API requires login","code":"401 Unauthorized","request":"api_path"}}',
+			api_call($this->app)
+		);
+	}
+
+	/**
+	 * Test the api_error() function with a JSON result.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiErrorWithJson()
+	{
+		$this->assertEquals(
+			'{"status":{"error":"error_message","code":"200 Friendica\\\\Network\\\\HTTP","request":""}}',
+			api_error('json', new HTTPException('error_message'))
+		);
+	}
+
+	/**
+	 * Test the api_error() function with an XML result.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiErrorWithXml()
+	{
+		$this->assertEquals(
+			'<?xml version="1.0"?>'."\n".
+			'<status xmlns="http://api.twitter.com" xmlns:statusnet="http://status.net/schema/api/1/" '.
+				'xmlns:friendica="http://friendi.ca/schema/api/1/" '.
+				'xmlns:georss="http://www.georss.org/georss">'."\n".
+			'  <error>error_message</error>'."\n".
+			'  <code>200 Friendica\Network\HTTP</code>'."\n".
+			'  <request/>'."\n".
+			'</status>'."\n",
+			api_error('xml', new HTTPException('error_message'))
+		);
+	}
+
+	/**
+	 * Test the api_error() function with an RSS result.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiErrorWithRss()
+	{
+		$this->assertEquals(
+			'<?xml version="1.0"?>'."\n".
+			'<status xmlns="http://api.twitter.com" xmlns:statusnet="http://status.net/schema/api/1/" '.
+				'xmlns:friendica="http://friendi.ca/schema/api/1/" '.
+				'xmlns:georss="http://www.georss.org/georss">'."\n".
+			'  <error>error_message</error>'."\n".
+			'  <code>200 Friendica\Network\HTTP</code>'."\n".
+			'  <request/>'."\n".
+			'</status>'."\n",
+			api_error('rss', new HTTPException('error_message'))
+		);
+	}
+
+	/**
+	 * Test the api_error() function with an Atom result.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiErrorWithAtom()
+	{
+		$this->assertEquals(
+			'<?xml version="1.0"?>'."\n".
+			'<status xmlns="http://api.twitter.com" xmlns:statusnet="http://status.net/schema/api/1/" '.
+				'xmlns:friendica="http://friendi.ca/schema/api/1/" '.
+				'xmlns:georss="http://www.georss.org/georss">'."\n".
+			'  <error>error_message</error>'."\n".
+			'  <code>200 Friendica\Network\HTTP</code>'."\n".
+			'  <request/>'."\n".
+			'</status>'."\n",
+			api_error('atom', new HTTPException('error_message'))
+		);
+	}
+
+	/**
+	 * Test the api_rss_extra() function.
+	 * @return void
+	 */
+	public function testApiRssExtra()
+	{
+		$user_info = ['url' => 'user_url', 'lang' => 'en'];
+		$result = api_rss_extra($this->app, [], $user_info);
+		$this->assertEquals($user_info, $result['$user']);
+		$this->assertEquals($user_info['url'], $result['$rss']['alternate']);
+		$this->assertArrayHasKey('self', $result['$rss']);
+		$this->assertArrayHasKey('base', $result['$rss']);
+		$this->assertArrayHasKey('updated', $result['$rss']);
+		$this->assertArrayHasKey('atom_updated', $result['$rss']);
+		$this->assertArrayHasKey('language', $result['$rss']);
+		$this->assertArrayHasKey('logo', $result['$rss']);
+	}
+
+	/**
+	 * Test the api_rss_extra() function without any user info.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiRssExtraWithoutUserInfo()
+	{
+		$result = api_rss_extra($this->app, [], null);
+		$this->assertInternalType('array', $result['$user']);
+		$this->assertArrayHasKey('alternate', $result['$rss']);
+		$this->assertArrayHasKey('self', $result['$rss']);
+		$this->assertArrayHasKey('base', $result['$rss']);
+		$this->assertArrayHasKey('updated', $result['$rss']);
+		$this->assertArrayHasKey('atom_updated', $result['$rss']);
+		$this->assertArrayHasKey('language', $result['$rss']);
+		$this->assertArrayHasKey('logo', $result['$rss']);
+	}
+
+	/**
+	 * Test the api_unique_id_to_nurl() function.
+	 * @return void
+	 */
+	public function testApiUniqueIdToNurl()
+	{
+		$this->assertFalse(api_unique_id_to_nurl($this->wrongUserId));
+	}
+
+	/**
+	 * Test the api_unique_id_to_nurl() function with a correct ID.
+	 * @return void
+	 */
+	public function testApiUniqueIdToNurlWithCorrectId()
+	{
+		$this->assertEquals($this->otherUser['nurl'], api_unique_id_to_nurl($this->otherUser['id']));
+	}
+
+	/**
+	 * Test the api_get_user() function.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiGetUser()
+	{
+		$user = api_get_user($this->app);
+		$this->assertSelfUser($user);
+		$this->assertEquals('708fa0', $user['profile_sidebar_fill_color']);
+		$this->assertEquals('6fdbe8', $user['profile_link_color']);
+		$this->assertEquals('ededed', $user['profile_background_color']);
+	}
+
+	/**
+	 * Test the api_get_user() function with a Frio schema.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiGetUserWithFrioSchema()
+	{
+		PConfig::set($this->selfUser['id'], 'frio', 'schema', 'red');
+		$user = api_get_user($this->app);
+		$this->assertSelfUser($user);
+		$this->assertEquals('708fa0', $user['profile_sidebar_fill_color']);
+		$this->assertEquals('6fdbe8', $user['profile_link_color']);
+		$this->assertEquals('ededed', $user['profile_background_color']);
+	}
+
+	/**
+	 * Test the api_get_user() function with a custom Frio schema.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiGetUserWithCustomFrioSchema()
+	{
+		$ret1 = PConfig::set($this->selfUser['id'], 'frio', 'schema', '---');
+		$ret2 = PConfig::set($this->selfUser['id'], 'frio', 'nav_bg', '#123456');
+		$ret3 = PConfig::set($this->selfUser['id'], 'frio', 'link_color', '#123456');
+		$ret4 = PConfig::set($this->selfUser['id'], 'frio', 'background_color', '#123456');
+		$user = api_get_user($this->app);
+		$this->assertSelfUser($user);
+		$this->assertEquals('123456', $user['profile_sidebar_fill_color']);
+		$this->assertEquals('123456', $user['profile_link_color']);
+		$this->assertEquals('123456', $user['profile_background_color']);
+	}
+
+	/**
+	 * Test the api_get_user() function with an empty Frio schema.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiGetUserWithEmptyFrioSchema()
+	{
+		PConfig::set($this->selfUser['id'], 'frio', 'schema', '---');
+		$user = api_get_user($this->app);
+		$this->assertSelfUser($user);
+		$this->assertEquals('708fa0', $user['profile_sidebar_fill_color']);
+		$this->assertEquals('6fdbe8', $user['profile_link_color']);
+		$this->assertEquals('ededed', $user['profile_background_color']);
+	}
+
+	/**
+	 * Test the api_get_user() function with an user that is not allowed to use the API.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiGetUserWithoutApiUser()
+	{
+		$_SERVER['PHP_AUTH_USER'] = 'Test user';
+		$_SERVER['PHP_AUTH_PW'] = 'password';
+		$_SESSION['allow_api'] = false;
+		$this->assertFalse(api_get_user($this->app));
+	}
+
+	/**
+	 * Test the api_get_user() function with an user ID in a GET parameter.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiGetUserWithGetId()
+	{
+		$_GET['user_id'] = $this->otherUser['id'];
+		$this->assertOtherUser(api_get_user($this->app));
+	}
+
+	/**
+	 * Test the api_get_user() function with a wrong user ID in a GET parameter.
+	 * @return void
+	 * @runInSeparateProcess
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiGetUserWithWrongGetId()
+	{
+		$_GET['user_id'] = $this->wrongUserId;
+		$this->assertOtherUser(api_get_user($this->app));
+	}
+
+	/**
+	 * Test the api_get_user() function with an user name in a GET parameter.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiGetUserWithGetName()
+	{
+		$_GET['screen_name'] = $this->selfUser['nick'];
+		$this->assertSelfUser(api_get_user($this->app));
+	}
+
+	/**
+	 * Test the api_get_user() function with a profile URL in a GET parameter.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiGetUserWithGetUrl()
+	{
+		$_GET['profileurl'] = $this->selfUser['nurl'];
+		$this->assertSelfUser(api_get_user($this->app));
+	}
+
+	/**
+	 * Test the api_get_user() function with an user ID in the API path.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiGetUserWithNumericCalledApi()
+	{
+		global $called_api;
+		$called_api = ['api_path'];
+		$this->app->argv[1] = $this->otherUser['id'].'.json';
+		$this->assertOtherUser(api_get_user($this->app));
+	}
+
+	/**
+	 * Test the api_get_user() function with the $called_api global variable.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiGetUserWithCalledApi()
+	{
+		global $called_api;
+		$called_api = ['api', 'api_path'];
+		$this->assertSelfUser(api_get_user($this->app));
+	}
+
+	/**
+	 * Test the api_get_user() function with a valid user.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiGetUserWithCorrectUser()
+	{
+		$this->assertOtherUser(api_get_user($this->app, $this->otherUser['id']));
+	}
+
+	/**
+	 * Test the api_get_user() function with a wrong user ID.
+	 * @return void
+	 * @runInSeparateProcess
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiGetUserWithWrongUser()
+	{
+		$this->assertOtherUser(api_get_user($this->app, $this->wrongUserId));
+	}
+
+	/**
+	 * Test the api_get_user() function with a 0 user ID.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiGetUserWithZeroUser()
+	{
+		$this->assertSelfUser(api_get_user($this->app, 0));
+	}
+
+	/**
+	 * Test the api_item_get_user() function.
+	 * @return void
+	 * @runInSeparateProcess
+	 */
+	public function testApiItemGetUser()
+	{
+		$users = api_item_get_user($this->app, []);
+		$this->assertSelfUser($users[0]);
+	}
+
+	/**
+	 * Test the api_item_get_user() function with a different item parent.
+	 * @return void
+	 */
+	public function testApiItemGetUserWithDifferentParent()
+	{
+		$users = api_item_get_user($this->app, ['thr-parent' => 'item_parent', 'uri' => 'item_uri']);
+		$this->assertSelfUser($users[0]);
+		$this->assertEquals($users[0], $users[1]);
+	}
+
+	/**
+	 * Test the api_walk_recursive() function.
+	 * @return void
+	 */
+	public function testApiWalkRecursive()
+	{
+		$array = ['item1'];
+		$this->assertEquals(
+			$array,
+			api_walk_recursive(
+				$array,
+				function () {
+					// Should we test this with a callback that actually does something?
+					return true;
+				}
+			)
+		);
+	}
+
+	/**
+	 * Test the api_walk_recursive() function with an array.
+	 * @return void
+	 */
+	public function testApiWalkRecursiveWithArray()
+	{
+		$array = [['item1'], ['item2']];
+		$this->assertEquals(
+			$array,
+			api_walk_recursive(
+				$array,
+				function () {
+					// Should we test this with a callback that actually does something?
+					return true;
+				}
+			)
+		);
+	}
+
+	/**
+	 * Test the api_reformat_xml() function.
+	 * @return void
+	 */
+	public function testApiReformatXml()
+	{
+		$item = true;
+		$key = '';
+		$this->assertTrue(api_reformat_xml($item, $key));
+		$this->assertEquals('true', $item);
+	}
+
+	/**
+	 * Test the api_reformat_xml() function with a statusnet_api key.
+	 * @return void
+	 */
+	public function testApiReformatXmlWithStatusnetKey()
+	{
+		$item = '';
+		$key = 'statusnet_api';
+		$this->assertTrue(api_reformat_xml($item, $key));
+		$this->assertEquals('statusnet:api', $key);
+	}
+
+	/**
+	 * Test the api_reformat_xml() function with a friendica_api key.
+	 * @return void
+	 */
+	public function testApiReformatXmlWithFriendicaKey()
+	{
+		$item = '';
+		$key = 'friendica_api';
+		$this->assertTrue(api_reformat_xml($item, $key));
+		$this->assertEquals('friendica:api', $key);
+	}
+
+	/**
+	 * Test the api_create_xml() function.
+	 * @return void
+	 */
+	public function testApiCreateXml()
+	{
+		$this->assertEquals(
+			'<?xml version="1.0"?>'."\n".
+			'<root_element xmlns="http://api.twitter.com" xmlns:statusnet="http://status.net/schema/api/1/" '.
+				'xmlns:friendica="http://friendi.ca/schema/api/1/" '.
+				'xmlns:georss="http://www.georss.org/georss">'."\n".
+				'  <data>some_data</data>'."\n".
+			'</root_element>'."\n",
+			api_create_xml(['data' => ['some_data']], 'root_element')
+		);
+	}
+
+	/**
+	 * Test the api_create_xml() function without any XML namespace.
+	 * @return void
+	 */
+	public function testApiCreateXmlWithoutNamespaces()
+	{
+		$this->assertEquals(
+			'<?xml version="1.0"?>'."\n".
+			'<ok>'."\n".
+				'  <data>some_data</data>'."\n".
+			'</ok>'."\n",
+			api_create_xml(['data' => ['some_data']], 'ok')
+		);
+	}
+
+	/**
+	 * Test the api_format_data() function.
+	 * @return void
+	 */
+	public function testApiFormatData()
+	{
+		$data = ['some_data'];
+		$this->assertEquals($data, api_format_data('root_element', 'json', $data));
+	}
+
+	/**
+	 * Test the api_format_data() function with an XML result.
+	 * @return void
+	 */
+	public function testApiFormatDataWithXml()
+	{
+		$this->assertEquals(
+			'<?xml version="1.0"?>'."\n".
+			'<root_element xmlns="http://api.twitter.com" xmlns:statusnet="http://status.net/schema/api/1/" '.
+				'xmlns:friendica="http://friendi.ca/schema/api/1/" '.
+				'xmlns:georss="http://www.georss.org/georss">'."\n".
+				'  <data>some_data</data>'."\n".
+			'</root_element>'."\n",
+			api_format_data('root_element', 'xml', ['data' => ['some_data']])
+		);
+	}
+
+	/**
+	 * Test the api_account_verify_credentials() function.
+	 * @return void
+	 */
+	public function testApiAccountVerifyCredentials()
+	{
+		$this->assertArrayHasKey('user', api_account_verify_credentials('json'));
+	}
+
+	/**
+	 * Test the api_account_verify_credentials() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiAccountVerifyCredentialsWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_account_verify_credentials('json');
+	}
+
+	/**
+	 * Test the requestdata() function.
+	 * @return void
+	 */
+	public function testRequestdata()
+	{
+		$this->assertNull(requestdata('variable_name'));
+	}
+
+	/**
+	 * Test the requestdata() function with a POST parameter.
+	 * @return void
+	 */
+	public function testRequestdataWithPost()
+	{
+		$_POST['variable_name'] = 'variable_value';
+		$this->assertEquals('variable_value', requestdata('variable_name'));
+	}
+
+	/**
+	 * Test the requestdata() function with a GET parameter.
+	 * @return void
+	 */
+	public function testRequestdataWithGet()
+	{
+		$_GET['variable_name'] = 'variable_value';
+		$this->assertEquals('variable_value', requestdata('variable_name'));
+	}
+
+	/**
+	 * Test the api_statuses_mediap() function.
+	 * @return void
+	 */
+	public function testApiStatusesMediap()
+	{
+		$this->app->argc = 2;
+
+		$_FILES = [
+			'media' => [
+				'id' => 666,
+				'size' => 666,
+				'width' => 666,
+				'height' => 666,
+				'tmp_name' => $this->getTempImage(),
+				'name' => 'spacer.png',
+				'type' => 'image/png'
+			]
+		];
+		$_GET['status'] = '<b>Status content</b>';
+
+		$result = api_statuses_mediap('json');
+		$this->assertStatus($result['status']);
+	}
+
+	/**
+	 * Test the api_statuses_mediap() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiStatusesMediapWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_statuses_mediap('json');
+	}
+
+	/**
+	 * Test the api_statuses_update() function.
+	 * @return void
+	 */
+	public function testApiStatusesUpdate()
+	{
+		$_GET['status'] = 'Status content';
+		$_GET['in_reply_to_status_id'] = -1;
+		$_GET['lat'] = 48;
+		$_GET['long'] = 7;
+		$_FILES = [
+			'media' => [
+				'id' => 666,
+				'size' => 666,
+				'width' => 666,
+				'height' => 666,
+				'tmp_name' => $this->getTempImage(),
+				'name' => 'spacer.png',
+				'type' => 'image/png'
+			]
+		];
+
+		$result = api_statuses_update('json');
+		$this->assertStatus($result['status']);
+	}
+
+	/**
+	 * Test the api_statuses_update() function with an HTML status.
+	 * @return void
+	 */
+	public function testApiStatusesUpdateWithHtml()
+	{
+		$_GET['htmlstatus'] = '<b>Status content</b>';
+
+		$result = api_statuses_update('json');
+		$this->assertStatus($result['status']);
+	}
+
+	/**
+	 * Test the api_statuses_update() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiStatusesUpdateWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_statuses_update('json');
+	}
+
+	/**
+	 * Test the api_statuses_update() function with a parent status.
+	 * @return void
+	 */
+	public function testApiStatusesUpdateWithParent()
+	{
+		$this->markTestIncomplete('This triggers an exit() somewhere and kills PHPUnit.');
+	}
+
+	/**
+	 * Test the api_statuses_update() function with a media_ids parameter.
+	 * @return void
+	 */
+	public function testApiStatusesUpdateWithMediaIds()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_statuses_update() function with the throttle limit reached.
+	 * @return void
+	 */
+	public function testApiStatusesUpdateWithDayThrottleReached()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_media_upload() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiMediaUpload()
+	{
+		api_media_upload();
+	}
+
+	/**
+	 * Test the api_media_upload() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiMediaUploadWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_media_upload();
+	}
+
+	/**
+	 * Test the api_media_upload() function with an invalid uploaded media.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\InternalServerErrorException
+	 */
+	public function testApiMediaUploadWithMedia()
+	{
+		$_FILES = [
+			'media' => [
+				'id' => 666,
+				'tmp_name' => 'tmp_name'
+			]
+		];
+		api_media_upload();
+	}
+
+	/**
+	 * Test the api_media_upload() function with an valid uploaded media.
+	 * @return void
+	 */
+	public function testApiMediaUploadWithValidMedia()
+	{
+		$_FILES = [
+			'media' => [
+				'id' => 666,
+				'size' => 666,
+				'width' => 666,
+				'height' => 666,
+				'tmp_name' => $this->getTempImage(),
+				'name' => 'spacer.png',
+				'type' => 'image/png'
+			]
+		];
+		$app = get_app();
+		$app->argc = 2;
+
+		$result = api_media_upload();
+		$this->assertEquals('image/png', $result['media']['image']['image_type']);
+		$this->assertEquals(1, $result['media']['image']['w']);
+		$this->assertEquals(1, $result['media']['image']['h']);
+	}
+
+	/**
+	 * Test the api_status_show() function.
+	 * @return void
+	 */
+	public function testApiStatusShow()
+	{
+		$result = api_status_show('json');
+		$this->assertStatus($result['status']);
+	}
+
+	/**
+	 * Test the api_status_show() function with an XML result.
+	 * @return void
+	 */
+	public function testApiStatusShowWithXml()
+	{
+		$result = api_status_show('xml');
+		$this->assertXml($result, 'statuses');
+	}
+
+	/**
+	 * Test the api_status_show() function with a raw result.
+	 * @return void
+	 */
+	public function testApiStatusShowWithRaw()
+	{
+		$this->assertStatus(api_status_show('raw'));
+	}
+
+	/**
+	 * Test the api_users_show() function.
+	 * @return void
+	 */
+	public function testApiUsersShow()
+	{
+		$result = api_users_show('json');
+		// We can't use assertSelfUser() here because the user object is missing some properties.
+		$this->assertEquals($this->selfUser['id'], $result['user']['cid']);
+		$this->assertEquals('Friendica', $result['user']['location']);
+		$this->assertEquals($this->selfUser['name'], $result['user']['name']);
+		$this->assertEquals($this->selfUser['nick'], $result['user']['screen_name']);
+		$this->assertEquals('dfrn', $result['user']['network']);
+		$this->assertTrue($result['user']['verified']);
+	}
+
+	/**
+	 * Test the api_users_show() function with an XML result.
+	 * @return void
+	 */
+	public function testApiUsersShowWithXml()
+	{
+		$result = api_users_show('xml');
+		$this->assertXml($result, 'statuses');
+	}
+
+	/**
+	 * Test the api_users_search() function.
+	 * @return void
+	 */
+	public function testApiUsersSearch()
+	{
+		$_GET['q'] = 'othercontact';
+		$result = api_users_search('json');
+		$this->assertOtherUser($result['users'][0]);
+	}
+
+	/**
+	 * Test the api_users_search() function with an XML result.
+	 * @return void
+	 */
+	public function testApiUsersSearchWithXml()
+	{
+		$_GET['q'] = 'othercontact';
+		$result = api_users_search('xml');
+		$this->assertXml($result, 'users');
+	}
+
+	/**
+	 * Test the api_users_search() function without a GET q parameter.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiUsersSearchWithoutQuery()
+	{
+		api_users_search('json');
+	}
+
+	/**
+	 * Test the api_users_lookup() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\NotFoundException
+	 */
+	public function testApiUsersLookup()
+	{
+		api_users_lookup('json');
+	}
+
+	/**
+	 * Test the api_users_lookup() function with an user ID.
+	 * @return void
+	 */
+	public function testApiUsersLookupWithUserId()
+	{
+		$_REQUEST['user_id'] = $this->otherUser['id'];
+		$result = api_users_lookup('json');
+		$this->assertOtherUser($result['users'][0]);
+	}
+
+	/**
+	 * Test the api_search() function.
+	 * @return void
+	 */
+	public function testApiSearch()
+	{
+		$_REQUEST['q'] = 'reply';
+		$_REQUEST['max_id'] = 10;
+		$result = api_search('json');
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+			$this->assertContains('reply', $status['text'], null, true);
+		}
+	}
+
+	/**
+	 * Test the api_search() function a count parameter.
+	 * @return void
+	 */
+	public function testApiSearchWithCount()
+	{
+		$_REQUEST['q'] = 'reply';
+		$_REQUEST['count'] = 20;
+		$result = api_search('json');
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+			$this->assertContains('reply', $status['text'], null, true);
+		}
+	}
+
+	/**
+	 * Test the api_search() function with an rpp parameter.
+	 * @return void
+	 */
+	public function testApiSearchWithRpp()
+	{
+		$_REQUEST['q'] = 'reply';
+		$_REQUEST['rpp'] = 20;
+		$result = api_search('json');
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+			$this->assertContains('reply', $status['text'], null, true);
+		}
+	}
+
+
+	/**
+	 * Test the api_search() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiSearchWithUnallowedUser()
+	{
+		$_SESSION['allow_api'] = false;
+		$_GET['screen_name'] = $this->selfUser['nick'];
+		api_search('json');
+	}
+
+	/**
+	 * Test the api_search() function without any GET query parameter.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiSearchWithoutQuery()
+	{
+		api_search('json');
+	}
+
+	/**
+	 * Test the api_statuses_home_timeline() function.
+	 * @return void
+	 */
+	public function testApiStatusesHomeTimeline()
+	{
+		$_REQUEST['max_id'] = 10;
+		$_REQUEST['exclude_replies'] = true;
+		$_REQUEST['conversation_id'] = 1;
+		$result = api_statuses_home_timeline('json');
+		$this->assertNotEmpty($result['status']);
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_statuses_home_timeline() function with a negative page parameter.
+	 * @return void
+	 */
+	public function testApiStatusesHomeTimelineWithNegativePage()
+	{
+		$_REQUEST['page'] = -2;
+		$result = api_statuses_home_timeline('json');
+		$this->assertNotEmpty($result['status']);
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_statuses_home_timeline() with an unallowed user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiStatusesHomeTimelineWithUnallowedUser()
+	{
+		$_SESSION['allow_api'] = false;
+		$_GET['screen_name'] = $this->selfUser['nick'];
+		api_statuses_home_timeline('json');
+	}
+
+	/**
+	 * Test the api_statuses_home_timeline() function with an RSS result.
+	 * @return void
+	 */
+	public function testApiStatusesHomeTimelineWithRss()
+	{
+		$result = api_statuses_home_timeline('rss');
+		$this->assertXml($result, 'statuses');
+	}
+
+	/**
+	 * Test the api_statuses_public_timeline() function.
+	 * @return void
+	 */
+	public function testApiStatusesPublicTimeline()
+	{
+		$_REQUEST['max_id'] = 10;
+		$_REQUEST['conversation_id'] = 1;
+		$result = api_statuses_public_timeline('json');
+		$this->assertNotEmpty($result['status']);
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_statuses_public_timeline() function with the exclude_replies parameter.
+	 * @return void
+	 */
+	public function testApiStatusesPublicTimelineWithExcludeReplies()
+	{
+		$_REQUEST['max_id'] = 10;
+		$_REQUEST['exclude_replies'] = true;
+		$result = api_statuses_public_timeline('json');
+		$this->assertNotEmpty($result['status']);
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_statuses_public_timeline() function with a negative page parameter.
+	 * @return void
+	 */
+	public function testApiStatusesPublicTimelineWithNegativePage()
+	{
+		$_REQUEST['page'] = -2;
+		$result = api_statuses_public_timeline('json');
+		$this->assertNotEmpty($result['status']);
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_statuses_public_timeline() function with an unallowed user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiStatusesPublicTimelineWithUnallowedUser()
+	{
+		$_SESSION['allow_api'] = false;
+		$_GET['screen_name'] = $this->selfUser['nick'];
+		api_statuses_public_timeline('json');
+	}
+
+	/**
+	 * Test the api_statuses_public_timeline() function with an RSS result.
+	 * @return void
+	 */
+	public function testApiStatusesPublicTimelineWithRss()
+	{
+		$result = api_statuses_public_timeline('rss');
+		$this->assertXml($result, 'statuses');
+	}
+
+	/**
+	 * Test the api_statuses_networkpublic_timeline() function.
+	 * @return void
+	 */
+	public function testApiStatusesNetworkpublicTimeline()
+	{
+		$_REQUEST['max_id'] = 10;
+		$result = api_statuses_networkpublic_timeline('json');
+		$this->assertNotEmpty($result['status']);
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_statuses_networkpublic_timeline() function with a negative page parameter.
+	 * @return void
+	 */
+	public function testApiStatusesNetworkpublicTimelineWithNegativePage()
+	{
+		$_REQUEST['page'] = -2;
+		$result = api_statuses_networkpublic_timeline('json');
+		$this->assertNotEmpty($result['status']);
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_statuses_networkpublic_timeline() function with an unallowed user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiStatusesNetworkpublicTimelineWithUnallowedUser()
+	{
+		$_SESSION['allow_api'] = false;
+		$_GET['screen_name'] = $this->selfUser['nick'];
+		api_statuses_networkpublic_timeline('json');
+	}
+
+	/**
+	 * Test the api_statuses_networkpublic_timeline() function with an RSS result.
+	 * @return void
+	 */
+	public function testApiStatusesNetworkpublicTimelineWithRss()
+	{
+		$result = api_statuses_networkpublic_timeline('rss');
+		$this->assertXml($result, 'statuses');
+	}
+
+	/**
+	 * Test the api_statuses_show() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiStatusesShow()
+	{
+		api_statuses_show('json');
+	}
+
+	/**
+	 * Test the api_statuses_show() function with an ID.
+	 * @return void
+	 */
+	public function testApiStatusesShowWithId()
+	{
+		$this->app->argv[3] = 1;
+		$result = api_statuses_show('json');
+		$this->assertStatus($result['status']);
+	}
+
+	/**
+	 * Test the api_statuses_show() function with the conversation parameter.
+	 * @return void
+	 */
+	public function testApiStatusesShowWithConversation()
+	{
+		$this->app->argv[3] = 1;
+		$_REQUEST['conversation'] = 1;
+		$result = api_statuses_show('json');
+		$this->assertNotEmpty($result['status']);
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_statuses_show() function with an unallowed user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiStatusesShowWithUnallowedUser()
+	{
+		$_SESSION['allow_api'] = false;
+		$_GET['screen_name'] = $this->selfUser['nick'];
+		api_statuses_show('json');
+	}
+
+	/**
+	 * Test the api_conversation_show() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiConversationShow()
+	{
+		api_conversation_show('json');
+	}
+
+	/**
+	 * Test the api_conversation_show() function with an ID.
+	 * @return void
+	 */
+	public function testApiConversationShowWithId()
+	{
+		$this->app->argv[3] = 1;
+		$_REQUEST['max_id'] = 10;
+		$_REQUEST['page'] = -2;
+		$result = api_conversation_show('json');
+		$this->assertNotEmpty($result['status']);
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_conversation_show() function with an unallowed user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiConversationShowWithUnallowedUser()
+	{
+		$_SESSION['allow_api'] = false;
+		$_GET['screen_name'] = $this->selfUser['nick'];
+		api_conversation_show('json');
+	}
+
+	/**
+	 * Test the api_statuses_repeat() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiStatusesRepeat()
+	{
+		api_statuses_repeat('json');
+	}
+
+	/**
+	 * Test the api_statuses_repeat() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiStatusesRepeatWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_statuses_repeat('json');
+	}
+
+	/**
+	 * Test the api_statuses_repeat() function with an ID.
+	 * @return void
+	 */
+	public function testApiStatusesRepeatWithId()
+	{
+		$this->app->argv[3] = 1;
+		$result = api_statuses_repeat('json');
+		$this->assertStatus($result['status']);
+
+		// Also test with a shared status
+		$this->app->argv[3] = 5;
+		$result = api_statuses_repeat('json');
+		$this->assertStatus($result['status']);
+	}
+
+	/**
+	 * Test the api_statuses_destroy() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiStatusesDestroy()
+	{
+		api_statuses_destroy('json');
+	}
+
+	/**
+	 * Test the api_statuses_destroy() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiStatusesDestroyWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_statuses_destroy('json');
+	}
+
+	/**
+	 * Test the api_statuses_destroy() function with an ID.
+	 * @return void
+	 */
+	public function testApiStatusesDestroyWithId()
+	{
+		$this->app->argv[3] = 1;
+		$result = api_statuses_destroy('json');
+		$this->assertStatus($result['status']);
+	}
+
+	/**
+	 * Test the api_statuses_mentions() function.
+	 * @return void
+	 */
+	public function testApiStatusesMentions()
+	{
+		$this->app->user = ['nickname' => $this->selfUser['nick']];
+		$_REQUEST['max_id'] = 10;
+		$result = api_statuses_mentions('json');
+		$this->assertEmpty($result['status']);
+		// We should test with mentions in the database.
+	}
+
+	/**
+	 * Test the api_statuses_mentions() function with a negative page parameter.
+	 * @return void
+	 */
+	public function testApiStatusesMentionsWithNegativePage()
+	{
+		$_REQUEST['page'] = -2;
+		$result = api_statuses_mentions('json');
+		$this->assertEmpty($result['status']);
+	}
+
+	/**
+	 * Test the api_statuses_mentions() function with an unallowed user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiStatusesMentionsWithUnallowedUser()
+	{
+		$_SESSION['allow_api'] = false;
+		$_GET['screen_name'] = $this->selfUser['nick'];
+		api_statuses_mentions('json');
+	}
+
+	/**
+	 * Test the api_statuses_mentions() function with an RSS result.
+	 * @return void
+	 */
+	public function testApiStatusesMentionsWithRss()
+	{
+		$result = api_statuses_mentions('rss');
+		$this->assertXml($result, 'statuses');
+	}
+
+	/**
+	 * Test the api_statuses_user_timeline() function.
+	 * @return void
+	 */
+	public function testApiStatusesUserTimeline()
+	{
+		$_REQUEST['max_id'] = 10;
+		$_REQUEST['exclude_replies'] = true;
+		$_REQUEST['conversation_id'] = 1;
+		$result = api_statuses_user_timeline('json');
+		$this->assertNotEmpty($result['status']);
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_statuses_user_timeline() function with a negative page parameter.
+	 * @return void
+	 */
+	public function testApiStatusesUserTimelineWithNegativePage()
+	{
+		$_REQUEST['page'] = -2;
+		$result = api_statuses_user_timeline('json');
+		$this->assertNotEmpty($result['status']);
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_statuses_user_timeline() function with an RSS result.
+	 * @return void
+	 */
+	public function testApiStatusesUserTimelineWithRss()
+	{
+		$result = api_statuses_user_timeline('rss');
+		$this->assertXml($result, 'statuses');
+	}
+
+	/**
+	 * Test the api_statuses_user_timeline() function with an unallowed user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiStatusesUserTimelineWithUnallowedUser()
+	{
+		$_SESSION['allow_api'] = false;
+		$_GET['screen_name'] = $this->selfUser['nick'];
+		api_statuses_user_timeline('json');
+	}
+
+	/**
+	 * Test the api_favorites_create_destroy() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFavoritesCreateDestroy()
+	{
+		$this->app->argv = ['api', '1.1', 'favorites', 'create'];
+		$this->app->argc = count($this->app->argv);
+		api_favorites_create_destroy('json');
+	}
+
+	/**
+	 * Test the api_favorites_create_destroy() function with an invalid ID.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFavoritesCreateDestroyWithInvalidId()
+	{
+		$this->app->argv = ['api', '1.1', 'favorites', 'create', '12.json'];
+		$this->app->argc = count($this->app->argv);
+		api_favorites_create_destroy('json');
+	}
+
+	/**
+	 * Test the api_favorites_create_destroy() function with an invalid action.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFavoritesCreateDestroyWithInvalidAction()
+	{
+		$this->app->argv = ['api', '1.1', 'favorites', 'change.json'];
+		$this->app->argc = count($this->app->argv);
+		$_REQUEST['id'] = 1;
+		api_favorites_create_destroy('json');
+	}
+
+	/**
+	 * Test the api_favorites_create_destroy() function with the create action.
+	 * @return void
+	 */
+	public function testApiFavoritesCreateDestroyWithCreateAction()
+	{
+		$this->app->argv = ['api', '1.1', 'favorites', 'create.json'];
+		$this->app->argc = count($this->app->argv);
+		$_REQUEST['id'] = 3;
+		$result = api_favorites_create_destroy('json');
+		$this->assertStatus($result['status']);
+	}
+
+	/**
+	 * Test the api_favorites_create_destroy() function with the create action and an RSS result.
+	 * @return void
+	 */
+	public function testApiFavoritesCreateDestroyWithCreateActionAndRss()
+	{
+		$this->app->argv = ['api', '1.1', 'favorites', 'create.rss'];
+		$this->app->argc = count($this->app->argv);
+		$_REQUEST['id'] = 3;
+		$result = api_favorites_create_destroy('rss');
+		$this->assertXml($result, 'status');
+	}
+
+	/**
+	 * Test the api_favorites_create_destroy() function with the destroy action.
+	 * @return void
+	 */
+	public function testApiFavoritesCreateDestroyWithDestroyAction()
+	{
+		$this->app->argv = ['api', '1.1', 'favorites', 'destroy.json'];
+		$this->app->argc = count($this->app->argv);
+		$_REQUEST['id'] = 3;
+		$result = api_favorites_create_destroy('json');
+		$this->assertStatus($result['status']);
+	}
+
+	/**
+	 * Test the api_favorites_create_destroy() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiFavoritesCreateDestroyWithoutAuthenticatedUser()
+	{
+		$this->app->argv = ['api', '1.1', 'favorites', 'create.json'];
+		$this->app->argc = count($this->app->argv);
+		$_SESSION['authenticated'] = false;
+		api_favorites_create_destroy('json');
+	}
+
+	/**
+	 * Test the api_favorites() function.
+	 * @return void
+	 */
+	public function testApiFavorites()
+	{
+		$_REQUEST['page'] = -1;
+		$_REQUEST['max_id'] = 10;
+		$result = api_favorites('json');
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_favorites() function with an RSS result.
+	 * @return void
+	 */
+	public function testApiFavoritesWithRss()
+	{
+		$result = api_favorites('rss');
+		$this->assertXml($result, 'statuses');
+	}
+
+	/**
+	 * Test the api_favorites() function with an unallowed user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiFavoritesWithUnallowedUser()
+	{
+		$_SESSION['allow_api'] = false;
+		$_GET['screen_name'] = $this->selfUser['nick'];
+		api_favorites('json');
+	}
+
+	/**
+	 * Test the api_format_messages() function.
+	 * @return void
+	 */
+	public function testApiFormatMessages()
+	{
+		$result = api_format_messages(
+			['id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
+			['id' => 2, 'screen_name' => 'recipient_name'],
+			['id' => 3, 'screen_name' => 'sender_name']
+		);
+		$this->assertEquals('item_title'."\n".'item_body', $result['text']);
+		$this->assertEquals(1, $result['id']);
+		$this->assertEquals(2, $result['recipient_id']);
+		$this->assertEquals(3, $result['sender_id']);
+		$this->assertEquals('recipient_name', $result['recipient_screen_name']);
+		$this->assertEquals('sender_name', $result['sender_screen_name']);
+	}
+
+	/**
+	 * Test the api_format_messages() function with HTML.
+	 * @return void
+	 */
+	public function testApiFormatMessagesWithHtmlText()
+	{
+		$_GET['getText'] = 'html';
+		$result = api_format_messages(
+			['id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
+			['id' => 2, 'screen_name' => 'recipient_name'],
+			['id' => 3, 'screen_name' => 'sender_name']
+		);
+		$this->assertEquals('item_title', $result['title']);
+		$this->assertEquals('<strong>item_body</strong>', $result['text']);
+	}
+
+	/**
+	 * Test the api_format_messages() function with plain text.
+	 * @return void
+	 */
+	public function testApiFormatMessagesWithPlainText()
+	{
+		$_GET['getText'] = 'plain';
+		$result = api_format_messages(
+			['id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
+			['id' => 2, 'screen_name' => 'recipient_name'],
+			['id' => 3, 'screen_name' => 'sender_name']
+		);
+		$this->assertEquals('item_title', $result['title']);
+		$this->assertEquals('item_body', $result['text']);
+	}
+
+	/**
+	 * Test the api_format_messages() function with the getUserObjects GET parameter set to false.
+	 * @return void
+	 */
+	public function testApiFormatMessagesWithoutUserObjects()
+	{
+		$_GET['getUserObjects'] = 'false';
+		$result = api_format_messages(
+			['id' => 1, 'title' => 'item_title', 'body' => '[b]item_body[/b]'],
+			['id' => 2, 'screen_name' => 'recipient_name'],
+			['id' => 3, 'screen_name' => 'sender_name']
+		);
+		$this->assertTrue(!isset($result['sender']));
+		$this->assertTrue(!isset($result['recipient']));
+	}
+
+	/**
+	 * Test the api_convert_item() function.
+	 * @return void
+	 */
+	public function testApiConvertItem()
+	{
+		$result = api_convert_item(
+			[
+				'network' => 'feed',
+				'title' => 'item_title',
+				// We need a long string to test that it is correctly cut
+				'body' => 'perspiciatis impedit voluptatem quis molestiae ea qui '.
+				'reiciendis dolorum aut ducimus sunt consequatur inventore dolor '.
+				'officiis pariatur doloremque nemo culpa aut quidem qui dolore '.
+				'laudantium atque commodi alias voluptatem non possimus aperiam '.
+				'ipsum rerum consequuntur aut amet fugit quia aliquid praesentium '.
+				'repellendus quibusdam et et inventore mollitia rerum sit autem '.
+				'pariatur maiores ipsum accusantium perferendis vel sit possimus '.
+				'veritatis nihil distinctio qui eum repellat officia illum quos '.
+				'impedit quam iste esse unde qui suscipit aut facilis ut inventore '.
+				'omnis exercitationem quo magnam consequatur maxime aut illum '.
+				'soluta quaerat natus unde aspernatur et sed beatae nihil ullam '.
+				'temporibus corporis ratione blanditiis perspiciatis impedit '.
+				'voluptatem quis molestiae ea qui reiciendis dolorum aut ducimus '.
+				'sunt consequatur inventore dolor officiis pariatur doloremque '.
+				'nemo culpa aut quidem qui dolore laudantium atque commodi alias '.
+				'voluptatem non possimus aperiam ipsum rerum consequuntur aut '.
+				'amet fugit quia aliquid praesentium repellendus quibusdam et et '.
+				'inventore mollitia rerum sit autem pariatur maiores ipsum accusantium '.
+				'perferendis vel sit possimus veritatis nihil distinctio qui eum '.
+				'repellat officia illum quos impedit quam iste esse unde qui '.
+				'suscipit aut facilis ut inventore omnis exercitationem quo magnam '.
+				'consequatur maxime aut illum soluta quaerat natus unde aspernatur '.
+				'et sed beatae nihil ullam temporibus corporis ratione blanditiis',
+				'plink' => 'item_plink'
+			]
+		);
+		$this->assertStringStartsWith('item_title', $result['text']);
+		$this->assertStringStartsWith('<h4>item_title</h4><br>perspiciatis impedit voluptatem', $result['html']);
+	}
+
+	/**
+	 * Test the api_convert_item() function with an empty item body.
+	 * @return void
+	 */
+	public function testApiConvertItemWithoutBody()
+	{
+		$result = api_convert_item(
+			[
+				'network' => 'feed',
+				'title' => 'item_title',
+				'body' => '',
+				'plink' => 'item_plink'
+			]
+		);
+		$this->assertEquals('item_title', $result['text']);
+		$this->assertEquals('<h4>item_title</h4><br>item_plink', $result['html']);
+	}
+
+	/**
+	 * Test the api_convert_item() function with the title in the body.
+	 * @return void
+	 */
+	public function testApiConvertItemWithTitleInBody()
+	{
+		$result = api_convert_item(
+			[
+				'title' => 'item_title',
+				'body' => 'item_title item_body'
+			]
+		);
+		$this->assertEquals('item_title item_body', $result['text']);
+		$this->assertEquals('<h4>item_title</h4><br>item_title item_body', $result['html']);
+	}
+
+	/**
+	 * Test the api_get_attachments() function.
+	 * @return void
+	 */
+	public function testApiGetAttachments()
+	{
+		$body = 'body';
+		$this->assertEmpty(api_get_attachments($body));
+	}
+
+	/**
+	 * Test the api_get_attachments() function with an img tag.
+	 * @return void
+	 */
+	public function testApiGetAttachmentsWithImage()
+	{
+		$body = '[img]http://via.placeholder.com/1x1.png[/img]';
+		$this->assertInternalType('array', api_get_attachments($body));
+	}
+
+	/**
+	 * Test the api_get_attachments() function with an img tag and an AndStatus user agent.
+	 * @return void
+	 */
+	public function testApiGetAttachmentsWithImageAndAndStatus()
+	{
+		$_SERVER['HTTP_USER_AGENT'] = 'AndStatus';
+		$body = '[img]http://via.placeholder.com/1x1.png[/img]';
+		$this->assertInternalType('array', api_get_attachments($body));
+	}
+
+	/**
+	 * Test the api_get_entitities() function.
+	 * @return void
+	 */
+	public function testApiGetEntitities()
+	{
+		$text = 'text';
+		$this->assertInternalType('array', api_get_entitities($text, 'bbcode'));
+	}
+
+	/**
+	 * Test the api_get_entitities() function with the include_entities parameter.
+	 * @return void
+	 */
+	public function testApiGetEntititiesWithIncludeEntities()
+	{
+		$_REQUEST['include_entities'] = 'true';
+		$text = 'text';
+		$result = api_get_entitities($text, 'bbcode');
+		$this->assertInternalType('array', $result['hashtags']);
+		$this->assertInternalType('array', $result['symbols']);
+		$this->assertInternalType('array', $result['urls']);
+		$this->assertInternalType('array', $result['user_mentions']);
+	}
+
+	/**
+	 * Test the api_format_items_embeded_images() function.
+	 * @return void
+	 */
+	public function testApiFormatItemsEmbededImages()
+	{
+		$this->assertEquals(
+			'text ' . System::baseUrl() . '/display/item_guid',
+			api_format_items_embeded_images(['guid' => 'item_guid'], 'text data:image/foo')
+		);
+	}
+
+	/**
+	 * Test the api_contactlink_to_array() function.
+	 * @return void
+	 */
+	public function testApiContactlinkToArray()
+	{
+		$this->assertEquals(
+			[
+				'name' => 'text',
+				'url' => '',
+			],
+			api_contactlink_to_array('text')
+		);
+	}
+
+	/**
+	 * Test the api_contactlink_to_array() function with an URL.
+	 * @return void
+	 */
+	public function testApiContactlinkToArrayWithUrl()
+	{
+		$this->assertEquals(
+			[
+				'name' => ['link_text'],
+				'url' => ['url'],
+			],
+			api_contactlink_to_array('text <a href="url">link_text</a>')
+		);
+	}
+
+	/**
+	 * Test the api_format_items_activities() function.
+	 * @return void
+	 */
+	public function testApiFormatItemsActivities()
+	{
+		$item = ['uid' => 0, 'uri' => ''];
+		$result = api_format_items_activities($item);
+		$this->assertArrayHasKey('like', $result);
+		$this->assertArrayHasKey('dislike', $result);
+		$this->assertArrayHasKey('attendyes', $result);
+		$this->assertArrayHasKey('attendno', $result);
+		$this->assertArrayHasKey('attendmaybe', $result);
+	}
+
+	/**
+	 * Test the api_format_items_activities() function with an XML result.
+	 * @return void
+	 */
+	public function testApiFormatItemsActivitiesWithXml()
+	{
+		$item = ['uid' => 0, 'uri' => ''];
+		$result = api_format_items_activities($item, 'xml');
+		$this->assertArrayHasKey('friendica:like', $result);
+		$this->assertArrayHasKey('friendica:dislike', $result);
+		$this->assertArrayHasKey('friendica:attendyes', $result);
+		$this->assertArrayHasKey('friendica:attendno', $result);
+		$this->assertArrayHasKey('friendica:attendmaybe', $result);
+	}
+
+	/**
+	 * Test the api_format_items_profiles() function.
+	 * @return void
+	 */
+	public function testApiFormatItemsProfiles()
+	{
+		$profile_row = [
+			'id' => 'profile_id',
+			'profile-name' => 'profile_name',
+			'is-default' => true,
+			'hide-friends' => true,
+			'photo' => 'profile_photo',
+			'thumb' => 'profile_thumb',
+			'publish' => true,
+			'net-publish' => true,
+			'pdesc' => 'description',
+			'dob' => 'date_of_birth',
+			'address' => 'address',
+			'locality' => 'city',
+			'region' => 'region',
+			'postal-code' => 'postal_code',
+			'country-name' => 'country',
+			'hometown' => 'hometown',
+			'gender' => 'gender',
+			'marital' => 'marital',
+			'with' => 'marital_with',
+			'howlong' => 'marital_since',
+			'sexual' => 'sexual',
+			'politic' => 'politic',
+			'religion' => 'religion',
+			'pub_keywords' => 'public_keywords',
+			'prv_keywords' => 'private_keywords',
+
+			'likes' => 'likes',
+			'dislikes' => 'dislikes',
+			'about' => 'about',
+			'music' => 'music',
+			'book' => 'book',
+			'tv' => 'tv',
+			'film' => 'film',
+			'interest' => 'interest',
+			'romance' => 'romance',
+			'work' => 'work',
+			'education' => 'education',
+			'contact' => 'social_networks',
+			'homepage' => 'homepage'
+		];
+		$result = api_format_items_profiles($profile_row);
+		$this->assertEquals(
+			[
+				'profile_id' => 'profile_id',
+				'profile_name' => 'profile_name',
+				'is_default' => true,
+				'hide_friends' => true,
+				'profile_photo' => 'profile_photo',
+				'profile_thumb' => 'profile_thumb',
+				'publish' => true,
+				'net_publish' => true,
+				'description' => 'description',
+				'date_of_birth' => 'date_of_birth',
+				'address' => 'address',
+				'city' => 'city',
+				'region' => 'region',
+				'postal_code' => 'postal_code',
+				'country' => 'country',
+				'hometown' => 'hometown',
+				'gender' => 'gender',
+				'marital' => 'marital',
+				'marital_with' => 'marital_with',
+				'marital_since' => 'marital_since',
+				'sexual' => 'sexual',
+				'politic' => 'politic',
+				'religion' => 'religion',
+				'public_keywords' => 'public_keywords',
+				'private_keywords' => 'private_keywords',
+
+				'likes' => 'likes',
+				'dislikes' => 'dislikes',
+				'about' => 'about',
+				'music' => 'music',
+				'book' => 'book',
+				'tv' => 'tv',
+				'film' => 'film',
+				'interest' => 'interest',
+				'romance' => 'romance',
+				'work' => 'work',
+				'education' => 'education',
+				'social_networks' => 'social_networks',
+				'homepage' => 'homepage',
+				'users' => null
+			],
+			$result
+		);
+	}
+
+	/**
+	 * Test the api_format_items() function.
+	 * @return void
+	 */
+	public function testApiFormatItems()
+	{
+		$items = [
+			[
+				'item_network' => 'item_network',
+				'source' => 'web',
+				'coord' => '5 7',
+				'body' => '',
+				'verb' => '',
+				'author-id' => 43,
+				'author-network' => Protocol::DFRN,
+				'author-link' => 'http://localhost/profile/othercontact',
+				'plink' => '',
+			]
+		];
+		$result = api_format_items($items, ['id' => 0], true);
+		foreach ($result as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_format_items() function with an XML result.
+	 * @return void
+	 */
+	public function testApiFormatItemsWithXml()
+	{
+		$items = [
+			[
+				'coord' => '5 7',
+				'body' => '',
+				'verb' => '',
+				'author-id' => 43,
+				'author-network' => Protocol::DFRN,
+				'author-link' => 'http://localhost/profile/othercontact',
+				'plink' => '',
+			]
+		];
+		$result = api_format_items($items, ['id' => 0], true, 'xml');
+		foreach ($result as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_format_items() function.
+	 * @return void
+	 */
+	public function testApiAccountRateLimitStatus()
+	{
+		$result = api_account_rate_limit_status('json');
+		$this->assertEquals(150, $result['hash']['remaining_hits']);
+		$this->assertEquals(150, $result['hash']['hourly_limit']);
+		$this->assertInternalType('int', $result['hash']['reset_time_in_seconds']);
+	}
+
+	/**
+	 * Test the api_format_items() function with an XML result.
+	 * @return void
+	 */
+	public function testApiAccountRateLimitStatusWithXml()
+	{
+		$result = api_account_rate_limit_status('xml');
+		$this->assertXml($result, 'hash');
+	}
+
+	/**
+	 * Test the api_help_test() function.
+	 * @return void
+	 */
+	public function testApiHelpTest()
+	{
+		$result = api_help_test('json');
+		$this->assertEquals(['ok' => 'ok'], $result);
+	}
+
+	/**
+	 * Test the api_help_test() function with an XML result.
+	 * @return void
+	 */
+	public function testApiHelpTestWithXml()
+	{
+		$result = api_help_test('xml');
+		$this->assertXml($result, 'ok');
+	}
+
+	/**
+	 * Test the api_lists_list() function.
+	 * @return void
+	 */
+	public function testApiListsList()
+	{
+		$result = api_lists_list('json');
+		$this->assertEquals(['lists_list' => []], $result);
+	}
+
+	/**
+	 * Test the api_lists_ownerships() function.
+	 * @return void
+	 */
+	public function testApiListsOwnerships()
+	{
+		$result = api_lists_ownerships('json');
+		foreach ($result['lists']['lists'] as $list) {
+			$this->assertList($list);
+		}
+	}
+
+	/**
+	 * Test the api_lists_ownerships() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiListsOwnershipsWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_lists_ownerships('json');
+	}
+
+	/**
+	 * Test the api_lists_statuses() function.
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 * @return void
+	 */
+	public function testApiListsStatuses()
+	{
+		api_lists_statuses('json');
+	}
+
+	/**
+	 * Test the api_lists_statuses() function with a list ID.
+	 * @return void
+	 */
+	public function testApiListsStatusesWithListId()
+	{
+		$_REQUEST['list_id'] = 1;
+		$_REQUEST['page'] = -1;
+		$_REQUEST['max_id'] = 10;
+		$result = api_lists_statuses('json');
+		foreach ($result['status'] as $status) {
+			$this->assertStatus($status);
+		}
+	}
+
+	/**
+	 * Test the api_lists_statuses() function with a list ID and a RSS result.
+	 * @return void
+	 */
+	public function testApiListsStatusesWithListIdAndRss()
+	{
+		$_REQUEST['list_id'] = 1;
+		$result = api_lists_statuses('rss');
+		$this->assertXml($result, 'statuses');
+	}
+
+	/**
+	 * Test the api_lists_statuses() function with an unallowed user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiListsStatusesWithUnallowedUser()
+	{
+		$_SESSION['allow_api'] = false;
+		$_GET['screen_name'] = $this->selfUser['nick'];
+		api_lists_statuses('json');
+	}
+
+	/**
+	 * Test the api_statuses_f() function.
+	 * @return void
+	 */
+	public function testApiStatusesFWithFriends()
+	{
+		$_GET['page'] = -1;
+		$result = api_statuses_f('friends');
+		$this->assertArrayHasKey('user', $result);
+	}
+
+	/**
+	 * Test the api_statuses_f() function.
+	 * @return void
+	 */
+	public function testApiStatusesFWithFollowers()
+	{
+		$result = api_statuses_f('followers');
+		$this->assertArrayHasKey('user', $result);
+	}
+
+	/**
+	 * Test the api_statuses_f() function.
+	 * @return void
+	 */
+	public function testApiStatusesFWithBlocks()
+	{
+		$result = api_statuses_f('blocks');
+		$this->assertArrayHasKey('user', $result);
+	}
+
+	/**
+	 * Test the api_statuses_f() function.
+	 * @return void
+	 */
+	public function testApiStatusesFWithIncoming()
+	{
+		$result = api_statuses_f('incoming');
+		$this->assertArrayHasKey('user', $result);
+	}
+
+	/**
+	 * Test the api_statuses_f() function an undefined cursor GET variable.
+	 * @return void
+	 */
+	public function testApiStatusesFWithUndefinedCursor()
+	{
+		$_GET['cursor'] = 'undefined';
+		$this->assertFalse(api_statuses_f('friends'));
+	}
+
+	/**
+	 * Test the api_statuses_friends() function.
+	 * @return void
+	 */
+	public function testApiStatusesFriends()
+	{
+		$result = api_statuses_friends('json');
+		$this->assertArrayHasKey('user', $result);
+	}
+
+	/**
+	 * Test the api_statuses_friends() function an undefined cursor GET variable.
+	 * @return void
+	 */
+	public function testApiStatusesFriendsWithUndefinedCursor()
+	{
+		$_GET['cursor'] = 'undefined';
+		$this->assertFalse(api_statuses_friends('json'));
+	}
+
+	/**
+	 * Test the api_statuses_followers() function.
+	 * @return void
+	 */
+	public function testApiStatusesFollowers()
+	{
+		$result = api_statuses_followers('json');
+		$this->assertArrayHasKey('user', $result);
+	}
+
+	/**
+	 * Test the api_statuses_followers() function an undefined cursor GET variable.
+	 * @return void
+	 */
+	public function testApiStatusesFollowersWithUndefinedCursor()
+	{
+		$_GET['cursor'] = 'undefined';
+		$this->assertFalse(api_statuses_followers('json'));
+	}
+
+	/**
+	 * Test the api_blocks_list() function.
+	 * @return void
+	 */
+	public function testApiBlocksList()
+	{
+		$result = api_blocks_list('json');
+		$this->assertArrayHasKey('user', $result);
+	}
+
+	/**
+	 * Test the api_blocks_list() function an undefined cursor GET variable.
+	 * @return void
+	 */
+	public function testApiBlocksListWithUndefinedCursor()
+	{
+		$_GET['cursor'] = 'undefined';
+		$this->assertFalse(api_blocks_list('json'));
+	}
+
+	/**
+	 * Test the api_friendships_incoming() function.
+	 * @return void
+	 */
+	public function testApiFriendshipsIncoming()
+	{
+		$result = api_friendships_incoming('json');
+		$this->assertArrayHasKey('id', $result);
+	}
+
+	/**
+	 * Test the api_friendships_incoming() function an undefined cursor GET variable.
+	 * @return void
+	 */
+	public function testApiFriendshipsIncomingWithUndefinedCursor()
+	{
+		$_GET['cursor'] = 'undefined';
+		$this->assertFalse(api_friendships_incoming('json'));
+	}
+
+	/**
+	 * Test the api_statusnet_config() function.
+	 * @return void
+	 */
+	public function testApiStatusnetConfig()
+	{
+		$result = api_statusnet_config('json');
+		$this->assertEquals('localhost', $result['config']['site']['server']);
+		$this->assertEquals('default', $result['config']['site']['theme']);
+		$this->assertEquals(System::baseUrl() . '/images/friendica-64.png', $result['config']['site']['logo']);
+		$this->assertTrue($result['config']['site']['fancy']);
+		$this->assertEquals('en', $result['config']['site']['language']);
+		$this->assertEquals('UTC', $result['config']['site']['timezone']);
+		$this->assertEquals(200000, $result['config']['site']['textlimit']);
+		$this->assertEquals('false', $result['config']['site']['private']);
+		$this->assertEquals('false', $result['config']['site']['ssl']);
+		$this->assertEquals(30, $result['config']['site']['shorturllength']);
+	}
+
+	/**
+	 * Test the api_statusnet_version() function.
+	 * @return void
+	 */
+	public function testApiStatusnetVersion()
+	{
+		$result = api_statusnet_version('json');
+		$this->assertEquals('0.9.7', $result['version']);
+	}
+
+	/**
+	 * Test the api_ff_ids() function.
+	 * @return void
+	 */
+	public function testApiFfIds()
+	{
+		$result = api_ff_ids('json');
+		$this->assertNull($result);
+	}
+
+	/**
+	 * Test the api_ff_ids() function with a result.
+	 * @return void
+	 */
+	public function testApiFfIdsWithResult()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_ff_ids() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiFfIdsWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_ff_ids('json');
+	}
+
+	/**
+	 * Test the api_friends_ids() function.
+	 * @return void
+	 */
+	public function testApiFriendsIds()
+	{
+		$result = api_friends_ids('json');
+		$this->assertNull($result);
+	}
+
+	/**
+	 * Test the api_followers_ids() function.
+	 * @return void
+	 */
+	public function testApiFollowersIds()
+	{
+		$result = api_followers_ids('json');
+		$this->assertNull($result);
+	}
+
+	/**
+	 * Test the api_direct_messages_new() function.
+	 * @return void
+	 */
+	public function testApiDirectMessagesNew()
+	{
+		$result = api_direct_messages_new('json');
+		$this->assertNull($result);
+	}
+
+	/**
+	 * Test the api_direct_messages_new() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiDirectMessagesNewWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_direct_messages_new('json');
+	}
+
+	/**
+	 * Test the api_direct_messages_new() function with an user ID.
+	 * @return void
+	 */
+	public function testApiDirectMessagesNewWithUserId()
+	{
+		$_POST['text'] = 'message_text';
+		$_POST['user_id'] = $this->otherUser['id'];
+		$result = api_direct_messages_new('json');
+		$this->assertEquals(['direct_message' => ['error' => -1]], $result);
+	}
+
+	/**
+	 * Test the api_direct_messages_new() function with a screen name.
+	 * @return void
+	 */
+	public function testApiDirectMessagesNewWithScreenName()
+	{
+		$_POST['text'] = 'message_text';
+		$_POST['screen_name'] = $this->friendUser['nick'];
+		$result = api_direct_messages_new('json');
+		$this->assertEquals(1, $result['direct_message']['id']);
+		$this->assertContains('message_text', $result['direct_message']['text']);
+		$this->assertEquals('selfcontact', $result['direct_message']['sender_screen_name']);
+		$this->assertEquals(1, $result['direct_message']['friendica_seen']);
+	}
+
+	/**
+	 * Test the api_direct_messages_new() function with a title.
+	 * @return void
+	 */
+	public function testApiDirectMessagesNewWithTitle()
+	{
+		$_POST['text'] = 'message_text';
+		$_POST['screen_name'] = $this->friendUser['nick'];
+		$_REQUEST['title'] = 'message_title';
+		$result = api_direct_messages_new('json');
+		$this->assertEquals(1, $result['direct_message']['id']);
+		$this->assertContains('message_text', $result['direct_message']['text']);
+		$this->assertContains('message_title', $result['direct_message']['text']);
+		$this->assertEquals('selfcontact', $result['direct_message']['sender_screen_name']);
+		$this->assertEquals(1, $result['direct_message']['friendica_seen']);
+	}
+
+	/**
+	 * Test the api_direct_messages_new() function with an RSS result.
+	 * @return void
+	 */
+	public function testApiDirectMessagesNewWithRss()
+	{
+		$_POST['text'] = 'message_text';
+		$_POST['screen_name'] = $this->friendUser['nick'];
+		$result = api_direct_messages_new('rss');
+		$this->assertXml($result, 'direct-messages');
+	}
+
+	/**
+	 * Test the api_direct_messages_destroy() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiDirectMessagesDestroy()
+	{
+		api_direct_messages_destroy('json');
+	}
+
+	/**
+	 * Test the api_direct_messages_destroy() function with the friendica_verbose GET param.
+	 * @return void
+	 */
+	public function testApiDirectMessagesDestroyWithVerbose()
+	{
+		$_GET['friendica_verbose'] = 'true';
+		$result = api_direct_messages_destroy('json');
+		$this->assertEquals(
+			[
+				'$result' => [
+					'result' => 'error',
+					'message' => 'message id or parenturi not specified'
+				]
+			],
+			$result
+		);
+	}
+
+	/**
+	 * Test the api_direct_messages_destroy() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiDirectMessagesDestroyWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_direct_messages_destroy('json');
+	}
+
+	/**
+	 * Test the api_direct_messages_destroy() function with a non-zero ID.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiDirectMessagesDestroyWithId()
+	{
+		$_REQUEST['id'] = 1;
+		api_direct_messages_destroy('json');
+	}
+
+	/**
+	 * Test the api_direct_messages_destroy() with a non-zero ID and the friendica_verbose GET param.
+	 * @return void
+	 */
+	public function testApiDirectMessagesDestroyWithIdAndVerbose()
+	{
+		$_REQUEST['id'] = 1;
+		$_REQUEST['friendica_parenturi'] = 'parent_uri';
+		$_GET['friendica_verbose'] = 'true';
+		$result = api_direct_messages_destroy('json');
+		$this->assertEquals(
+			[
+				'$result' => [
+					'result' => 'error',
+					'message' => 'message id not in database'
+				]
+			],
+			$result
+		);
+	}
+
+	/**
+	 * Test the api_direct_messages_destroy() function with a non-zero ID.
+	 * @return void
+	 */
+	public function testApiDirectMessagesDestroyWithCorrectId()
+	{
+		$this->markTestIncomplete('We need to add a dataset for this.');
+	}
+
+	/**
+	 * Test the api_direct_messages_box() function.
+	 * @return void
+	 */
+	public function testApiDirectMessagesBoxWithSentbox()
+	{
+		$_REQUEST['page'] = -1;
+		$_REQUEST['max_id'] = 10;
+		$result = api_direct_messages_box('json', 'sentbox', 'false');
+		$this->assertArrayHasKey('direct_message', $result);
+	}
+
+	/**
+	 * Test the api_direct_messages_box() function.
+	 * @return void
+	 */
+	public function testApiDirectMessagesBoxWithConversation()
+	{
+		$result = api_direct_messages_box('json', 'conversation', 'false');
+		$this->assertArrayHasKey('direct_message', $result);
+	}
+
+	/**
+	 * Test the api_direct_messages_box() function.
+	 * @return void
+	 */
+	public function testApiDirectMessagesBoxWithAll()
+	{
+		$result = api_direct_messages_box('json', 'all', 'false');
+		$this->assertArrayHasKey('direct_message', $result);
+	}
+
+	/**
+	 * Test the api_direct_messages_box() function.
+	 * @return void
+	 */
+	public function testApiDirectMessagesBoxWithInbox()
+	{
+		$result = api_direct_messages_box('json', 'inbox', 'false');
+		$this->assertArrayHasKey('direct_message', $result);
+	}
+
+	/**
+	 * Test the api_direct_messages_box() function.
+	 * @return void
+	 */
+	public function testApiDirectMessagesBoxWithVerbose()
+	{
+		$result = api_direct_messages_box('json', 'sentbox', 'true');
+		$this->assertEquals(
+			[
+				'$result' => [
+					'result' => 'error',
+					'message' => 'no mails available'
+				]
+			],
+			$result
+		);
+	}
+
+	/**
+	 * Test the api_direct_messages_box() function with a RSS result.
+	 * @return void
+	 */
+	public function testApiDirectMessagesBoxWithRss()
+	{
+		$result = api_direct_messages_box('rss', 'sentbox', 'false');
+		$this->assertXml($result, 'direct-messages');
+	}
+
+	/**
+	 * Test the api_direct_messages_box() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiDirectMessagesBoxWithUnallowedUser()
+	{
+		$_SESSION['allow_api'] = false;
+		$_GET['screen_name'] = $this->selfUser['nick'];
+		api_direct_messages_box('json', 'sentbox', 'false');
+	}
+
+	/**
+	 * Test the api_direct_messages_sentbox() function.
+	 * @return void
+	 */
+	public function testApiDirectMessagesSentbox()
+	{
+		$result = api_direct_messages_sentbox('json');
+		$this->assertArrayHasKey('direct_message', $result);
+	}
+
+	/**
+	 * Test the api_direct_messages_inbox() function.
+	 * @return void
+	 */
+	public function testApiDirectMessagesInbox()
+	{
+		$result = api_direct_messages_inbox('json');
+		$this->assertArrayHasKey('direct_message', $result);
+	}
+
+	/**
+	 * Test the api_direct_messages_all() function.
+	 * @return void
+	 */
+	public function testApiDirectMessagesAll()
+	{
+		$result = api_direct_messages_all('json');
+		$this->assertArrayHasKey('direct_message', $result);
+	}
+
+	/**
+	 * Test the api_direct_messages_conversation() function.
+	 * @return void
+	 */
+	public function testApiDirectMessagesConversation()
+	{
+		$result = api_direct_messages_conversation('json');
+		$this->assertArrayHasKey('direct_message', $result);
+	}
+
+	/**
+	 * Test the api_oauth_request_token() function.
+	 * @return void
+	 */
+	public function testApiOauthRequestToken()
+	{
+		$this->markTestIncomplete('killme() kills phpunit as well');
+	}
+
+	/**
+	 * Test the api_oauth_access_token() function.
+	 * @return void
+	 */
+	public function testApiOauthAccessToken()
+	{
+		$this->markTestIncomplete('killme() kills phpunit as well');
+	}
+
+	/**
+	 * Test the api_fr_photoalbum_delete() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFrPhotoalbumDelete()
+	{
+		api_fr_photoalbum_delete('json');
+	}
+
+	/**
+	 * Test the api_fr_photoalbum_delete() function with an album name.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFrPhotoalbumDeleteWithAlbum()
+	{
+		$_REQUEST['album'] = 'album_name';
+		api_fr_photoalbum_delete('json');
+	}
+
+	/**
+	 * Test the api_fr_photoalbum_delete() function with an album name.
+	 * @return void
+	 */
+	public function testApiFrPhotoalbumDeleteWithValidAlbum()
+	{
+		$this->markTestIncomplete('We need to add a dataset for this.');
+	}
+
+	/**
+	 * Test the api_fr_photoalbum_delete() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFrPhotoalbumUpdate()
+	{
+		api_fr_photoalbum_update('json');
+	}
+
+	/**
+	 * Test the api_fr_photoalbum_delete() function with an album name.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFrPhotoalbumUpdateWithAlbum()
+	{
+		$_REQUEST['album'] = 'album_name';
+		api_fr_photoalbum_update('json');
+	}
+
+	/**
+	 * Test the api_fr_photoalbum_delete() function with an album name.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFrPhotoalbumUpdateWithAlbumAndNewAlbum()
+	{
+		$_REQUEST['album'] = 'album_name';
+		$_REQUEST['album_new'] = 'album_name';
+		api_fr_photoalbum_update('json');
+	}
+
+	/**
+	 * Test the api_fr_photoalbum_update() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiFrPhotoalbumUpdateWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_fr_photoalbum_update('json');
+	}
+
+	/**
+	 * Test the api_fr_photoalbum_delete() function with an album name.
+	 * @return void
+	 */
+	public function testApiFrPhotoalbumUpdateWithValidAlbum()
+	{
+		$this->markTestIncomplete('We need to add a dataset for this.');
+	}
+
+	/**
+	 * Test the api_fr_photos_list() function.
+	 * @return void
+	 */
+	public function testApiFrPhotosList()
+	{
+		$result = api_fr_photos_list('json');
+		$this->assertArrayHasKey('photo', $result);
+	}
+
+	/**
+	 * Test the api_fr_photos_list() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiFrPhotosListWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_fr_photos_list('json');
+	}
+
+	/**
+	 * Test the api_fr_photo_create_update() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFrPhotoCreateUpdate()
+	{
+		api_fr_photo_create_update('json');
+	}
+
+	/**
+	 * Test the api_fr_photo_create_update() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiFrPhotoCreateUpdateWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_fr_photo_create_update('json');
+	}
+
+	/**
+	 * Test the api_fr_photo_create_update() function with an album name.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFrPhotoCreateUpdateWithAlbum()
+	{
+		$_REQUEST['album'] = 'album_name';
+		api_fr_photo_create_update('json');
+	}
+
+	/**
+	 * Test the api_fr_photo_create_update() function with the update mode.
+	 * @return void
+	 */
+	public function testApiFrPhotoCreateUpdateWithUpdate()
+	{
+		$this->markTestIncomplete('We need to create a dataset for this');
+	}
+
+	/**
+	 * Test the api_fr_photo_create_update() function with an uploaded file.
+	 * @return void
+	 */
+	public function testApiFrPhotoCreateUpdateWithFile()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_fr_photo_delete() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFrPhotoDelete()
+	{
+		api_fr_photo_delete('json');
+	}
+
+	/**
+	 * Test the api_fr_photo_delete() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiFrPhotoDeleteWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_fr_photo_delete('json');
+	}
+
+	/**
+	 * Test the api_fr_photo_delete() function with a photo ID.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFrPhotoDeleteWithPhotoId()
+	{
+		$_REQUEST['photo_id'] = 1;
+		api_fr_photo_delete('json');
+	}
+
+	/**
+	 * Test the api_fr_photo_delete() function with a correct photo ID.
+	 * @return void
+	 */
+	public function testApiFrPhotoDeleteWithCorrectPhotoId()
+	{
+		$this->markTestIncomplete('We need to create a dataset for this.');
+	}
+
+	/**
+	 * Test the api_fr_photo_detail() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFrPhotoDetail()
+	{
+		api_fr_photo_detail('json');
+	}
+
+	/**
+	 * Test the api_fr_photo_detail() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiFrPhotoDetailWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_fr_photo_detail('json');
+	}
+
+	/**
+	 * Test the api_fr_photo_detail() function with a photo ID.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\NotFoundException
+	 */
+	public function testApiFrPhotoDetailWithPhotoId()
+	{
+		$_REQUEST['photo_id'] = 1;
+		api_fr_photo_detail('json');
+	}
+
+	/**
+	 * Test the api_fr_photo_detail() function with a correct photo ID.
+	 * @return void
+	 */
+	public function testApiFrPhotoDetailCorrectPhotoId()
+	{
+		$this->markTestIncomplete('We need to create a dataset for this.');
+	}
+
+	/**
+	 * Test the api_account_update_profile_image() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiAccountUpdateProfileImage()
+	{
+		api_account_update_profile_image('json');
+	}
+
+	/**
+	 * Test the api_account_update_profile_image() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiAccountUpdateProfileImageWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_account_update_profile_image('json');
+	}
+
+	/**
+	 * Test the api_account_update_profile_image() function with an uploaded file.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiAccountUpdateProfileImageWithUpload()
+	{
+		$this->markTestIncomplete();
+	}
+
+
+	/**
+	 * Test the api_account_update_profile() function.
+	 * @return void
+	 */
+	public function testApiAccountUpdateProfile()
+	{
+		$_POST['name'] = 'new_name';
+		$_POST['description'] = 'new_description';
+		$result = api_account_update_profile('json');
+		// We can't use assertSelfUser() here because the user object is missing some properties.
+		$this->assertEquals($this->selfUser['id'], $result['user']['cid']);
+		$this->assertEquals('Friendica', $result['user']['location']);
+		$this->assertEquals($this->selfUser['nick'], $result['user']['screen_name']);
+		$this->assertEquals('dfrn', $result['user']['network']);
+		$this->assertEquals('new_name', $result['user']['name']);
+		$this->assertEquals('new_description', $result['user']['description']);
+	}
+
+	/**
+	 * Test the check_acl_input() function.
+	 * @return void
+	 */
+	public function testCheckAclInput()
+	{
+		$result = check_acl_input('<aclstring>');
+		// Where does this result come from?
+		$this->assertEquals(1, $result);
+	}
+
+	/**
+	 * Test the check_acl_input() function with an empty ACL string.
+	 * @return void
+	 */
+	public function testCheckAclInputWithEmptyAclString()
+	{
+		$result = check_acl_input(' ');
+		$this->assertFalse($result);
+	}
+
+	/**
+	 * Test the save_media_to_database() function.
+	 * @return void
+	 */
+	public function testSaveMediaToDatabase()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the post_photo_item() function.
+	 * @return void
+	 */
+	public function testPostPhotoItem()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the prepare_photo_data() function.
+	 * @return void
+	 */
+	public function testPreparePhotoData()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_friendica_remoteauth() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFriendicaRemoteauth()
+	{
+		api_friendica_remoteauth();
+	}
+
+	/**
+	 * Test the api_friendica_remoteauth() function with an URL.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFriendicaRemoteauthWithUrl()
+	{
+		$_GET['url'] = 'url';
+		$_GET['c_url'] = 'url';
+		api_friendica_remoteauth();
+	}
+
+	/**
+	 * Test the api_friendica_remoteauth() function with a correct URL.
+	 * @return void
+	 */
+	public function testApiFriendicaRemoteauthWithCorrectUrl()
+	{
+		$this->markTestIncomplete("We can't use an assertion here because of goaway().");
+		$_GET['url'] = 'url';
+		$_GET['c_url'] = $this->selfUser['nurl'];
+		api_friendica_remoteauth();
+	}
+
+	/**
+	 * Test the api_share_as_retweet() function.
+	 * @return void
+	 */
+	public function testApiShareAsRetweet()
+	{
+		$item = ['body' => ''];
+		$result = api_share_as_retweet($item);
+		$this->assertFalse($result);
+	}
+
+	/**
+	 * Test the api_share_as_retweet() function with a valid item.
+	 * @return void
+	 */
+	public function testApiShareAsRetweetWithValidItem()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_get_nick() function.
+	 * @return void
+	 */
+	public function testApiGetNick()
+	{
+		$result = api_get_nick($this->otherUser['nurl']);
+		$this->assertEquals('othercontact', $result);
+	}
+
+	/**
+	 * Test the api_get_nick() function with a wrong URL.
+	 * @return void
+	 */
+	public function testApiGetNickWithWrongUrl()
+	{
+		$result = api_get_nick('wrong_url');
+		$this->assertFalse($result);
+	}
+
+	/**
+	 * Test the api_in_reply_to() function.
+	 * @return void
+	 */
+	public function testApiInReplyTo()
+	{
+		$result = api_in_reply_to(['id' => 0, 'parent' => 0, 'uri' => '', 'thr-parent' => '']);
+		$this->assertArrayHasKey('status_id', $result);
+		$this->assertArrayHasKey('user_id', $result);
+		$this->assertArrayHasKey('status_id_str', $result);
+		$this->assertArrayHasKey('user_id_str', $result);
+		$this->assertArrayHasKey('screen_name', $result);
+	}
+
+	/**
+	 * Test the api_in_reply_to() function with a valid item.
+	 * @return void
+	 */
+	public function testApiInReplyToWithValidItem()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_clean_plain_items() function.
+	 * @return void
+	 */
+	public function testApiCleanPlainItems()
+	{
+		$_REQUEST['include_entities'] = 'true';
+		$result = api_clean_plain_items('some_text [url="some_url"]some_text[/url]');
+		$this->assertEquals('some_text [url="some_url"]"some_url"[/url]', $result);
+	}
+
+	/**
+	 * Test the api_clean_attachments() function.
+	 * @return void
+	 */
+	public function testApiCleanAttachments()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_best_nickname() function.
+	 * @return void
+	 */
+	public function testApiBestNickname()
+	{
+		$contacts = [];
+		$result = api_best_nickname($contacts);
+		$this->assertNull($result);
+	}
+
+	/**
+	 * Test the api_best_nickname() function with contacts.
+	 * @return void
+	 */
+	public function testApiBestNicknameWithContacts()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_friendica_group_show() function.
+	 * @return void
+	 */
+	public function testApiFriendicaGroupShow()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_friendica_group_delete() function.
+	 * @return void
+	 */
+	public function testApiFriendicaGroupDelete()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_lists_destroy() function.
+	 * @return void
+	 */
+	public function testApiListsDestroy()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the group_create() function.
+	 * @return void
+	 */
+	public function testGroupCreate()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_friendica_group_create() function.
+	 * @return void
+	 */
+	public function testApiFriendicaGroupCreate()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_lists_create() function.
+	 * @return void
+	 */
+	public function testApiListsCreate()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_friendica_group_update() function.
+	 * @return void
+	 */
+	public function testApiFriendicaGroupUpdate()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_lists_update() function.
+	 * @return void
+	 */
+	public function testApiListsUpdate()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_friendica_activity() function.
+	 * @return void
+	 */
+	public function testApiFriendicaActivity()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_friendica_notification() function.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFriendicaNotification()
+	{
+		api_friendica_notification('json');
+	}
+
+	/**
+	 * Test the api_friendica_notification() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiFriendicaNotificationWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_friendica_notification('json');
+	}
+
+	/**
+	 * Test the api_friendica_notification() function with an argument count.
+	 * @return void
+	 */
+	public function testApiFriendicaNotificationWithArgumentCount()
+	{
+		$this->app->argv = ['api', 'friendica', 'notification'];
+		$this->app->argc = count($this->app->argv);
+		$result = api_friendica_notification('json');
+		$this->assertEquals(['note' => false], $result);
+	}
+
+	/**
+	 * Test the api_friendica_notification() function with an XML result.
+	 * @return void
+	 */
+	public function testApiFriendicaNotificationWithXmlResult()
+	{
+		$this->app->argv = ['api', 'friendica', 'notification'];
+		$this->app->argc = count($this->app->argv);
+		$result = api_friendica_notification('xml');
+		$this->assertXml($result, 'notes');
+	}
+
+	/**
+	 * Test the api_friendica_notification_seen() function.
+	 * @return void
+	 */
+	public function testApiFriendicaNotificationSeen()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_friendica_direct_messages_setseen() function.
+	 * @return void
+	 */
+	public function testApiFriendicaDirectMessagesSetseen()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_friendica_direct_messages_search() function.
+	 * @return void
+	 */
+	public function testApiFriendicaDirectMessagesSearch()
+	{
+		$this->markTestIncomplete();
+	}
+
+	/**
+	 * Test the api_friendica_profile_show() function.
+	 * @return void
+	 */
+	public function testApiFriendicaProfileShow()
+	{
+		$result = api_friendica_profile_show('json');
+		// We can't use assertSelfUser() here because the user object is missing some properties.
+		$this->assertEquals($this->selfUser['id'], $result['$result']['friendica_owner']['cid']);
+		$this->assertEquals('Friendica', $result['$result']['friendica_owner']['location']);
+		$this->assertEquals($this->selfUser['name'], $result['$result']['friendica_owner']['name']);
+		$this->assertEquals($this->selfUser['nick'], $result['$result']['friendica_owner']['screen_name']);
+		$this->assertEquals('dfrn', $result['$result']['friendica_owner']['network']);
+		$this->assertTrue($result['$result']['friendica_owner']['verified']);
+		$this->assertFalse($result['$result']['multi_profiles']);
+	}
+
+	/**
+	 * Test the api_friendica_profile_show() function with a profile ID.
+	 * @return void
+	 */
+	public function testApiFriendicaProfileShowWithProfileId()
+	{
+		$this->markTestIncomplete('We need to add a dataset for this.');
+	}
+
+	/**
+	 * Test the api_friendica_profile_show() function with a wrong profile ID.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\BadRequestException
+	 */
+	public function testApiFriendicaProfileShowWithWrongProfileId()
+	{
+		$_REQUEST['profile_id'] = 666;
+		api_friendica_profile_show('json');
+	}
+
+	/**
+	 * Test the api_friendica_profile_show() function without an authenticated user.
+	 * @return void
+	 * @expectedException Friendica\Network\HTTPException\ForbiddenException
+	 */
+	public function testApiFriendicaProfileShowWithoutAuthenticatedUser()
+	{
+		$_SESSION['authenticated'] = false;
+		api_friendica_profile_show('json');
+	}
+
+	/**
+	 * Test the api_saved_searches_list() function.
+	 * @return void
+	 */
+	public function testApiSavedSearchesList()
+	{
+		$result = api_saved_searches_list('json');
+		$this->assertEquals(1, $result['terms'][0]['id']);
+		$this->assertEquals(1, $result['terms'][0]['id_str']);
+		$this->assertEquals('Saved search', $result['terms'][0]['name']);
+		$this->assertEquals('Saved search', $result['terms'][0]['query']);
+	}
+}
diff --git a/tests/BaseObjectTest.php b/tests/BaseObjectTest.php
index b7b90b138..b3d018958 100644
--- a/tests/BaseObjectTest.php
+++ b/tests/BaseObjectTest.php
@@ -7,14 +7,12 @@ namespace Friendica\Test;
 
 use Friendica\App;
 use Friendica\BaseObject;
-// backward compatibility
-if (!class_exists('\PHPUnit\Framework\TestCase')) {
-    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
-}
+use PHPUnit\Framework\TestCase;
+
 /**
  * Tests for the BaseObject class.
  */
-class BaseObjectTest extends \PHPUnit\Framework\TestCase
+class BaseObjectTest extends TestCase
 {
 
 	/**
diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
new file mode 100644
index 000000000..9844699b0
--- /dev/null
+++ b/tests/DatabaseTest.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * DatabaseTest class.
+ */
+
+namespace Friendica\Test;
+
+use Friendica\Database\DBA;
+use PHPUnit\DbUnit\DataSet\YamlDataSet;
+use PHPUnit\DbUnit\TestCaseTrait;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Extensions_Database_DB_IDatabaseConnection;
+
+/**
+ * Abstract class used by tests that need a database.
+ */
+abstract class DatabaseTest extends TestCase
+{
+
+	use TestCaseTrait;
+
+	/**
+	 * Get database connection.
+	 *
+	 * This function is executed before each test in order to get a database connection that can be used by tests.
+	 * If no prior connection is available, it tries to create one using the USER, PASS and DB environment variables.
+	 *
+	 * If it could not connect to the database, the test is skipped.
+	 *
+	 * @return PHPUnit_Extensions_Database_DB_IDatabaseConnection
+	 * @see https://phpunit.de/manual/5.7/en/database.html
+	 */
+	protected function getConnection()
+	{
+		if (!getenv('MYSQL_DATABASE')) {
+			$this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
+		}
+
+		if (!DBA::connected()) {
+			$this->markTestSkipped('Could not connect to the database.');
+		}
+
+		return $this->createDefaultDBConnection(DBA::getConnection(), getenv('MYSQL_DATABASE'));
+	}
+
+	/**
+	 * Get dataset to populate the database with.
+	 * @return YamlDataSet
+	 * @see https://phpunit.de/manual/5.7/en/database.html
+	 */
+	protected function getDataSet()
+	{
+		return new YamlDataSet(__DIR__ . '/datasets/api.yml');
+	}
+}
diff --git a/tests/TextTest.php b/tests/TextTest.php
index 3cda2342f..ac1b7d775 100644
--- a/tests/TextTest.php
+++ b/tests/TextTest.php
@@ -5,15 +5,12 @@
 
 namespace Friendica\Test;
 
-// backward compatibility
-if (!class_exists('\PHPUnit\Framework\TestCase')) {
-    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
-}
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests for text functions.
  */
-class TextTest extends \PHPUnit\Framework\TestCase
+class TextTest extends TestCase
 {
 
 	/**
diff --git a/tests/Util/Intercept.php b/tests/Util/Intercept.php
new file mode 100644
index 000000000..9435a5950
--- /dev/null
+++ b/tests/Util/Intercept.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Friendica\Test\Util;
+
+use php_user_filter;
+
+/**
+ * Output Interceptor for STDOUT to prevent outputing to the console
+ * Instead the $cache variable will get filled with the output
+ *
+ * @package Friendica\Test\Util
+ */
+class Intercept extends php_user_filter
+{
+	/**
+	 * @var string The cache which holds the current output of STDOUT
+	 */
+	public static $cache = '';
+
+	public function filter($in, $out, &$consumed, $closing)
+	{
+		while ($bucket = stream_bucket_make_writeable($in)) {
+			self::$cache .= $bucket->data;
+			$consumed += $bucket->datalen;
+			stream_bucket_append($out, $bucket);
+		}
+		return PSFS_FEED_ME;
+	}
+
+	/**
+	 * Registers the interceptor and prevents therefore the output to STDOUT
+	 */
+	public static function setUp() {
+		stream_filter_register("intercept", Intercept::class);
+		stream_filter_append(STDOUT, "intercept");
+		stream_filter_append(STDERR, "intercept");
+	}
+
+	/**
+	 * Resets the cache
+	 */
+	public static function reset() {
+		self::$cache = '';
+	}
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 000000000..4bc3e932f
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * This file is loaded by PHPUnit before any test.
+ */
+
+use Friendica\App;
+use PHPUnit\DbUnit\DataSet\YamlDataSet;
+use PHPUnit\DbUnit\TestCaseTrait;
+use PHPUnit\Framework\TestCase;
+
+require_once __DIR__.'/../boot.php';
+require_once __DIR__.'/../include/api.php';
+
+new App(dirname(__DIR__));
+
+\Friendica\Core\Config::set('system', 'url', 'http://localhost');
+\Friendica\Core\Config::set('system', 'hostname', 'localhost');
+\Friendica\Core\Config::set('system', 'worker_dont_fork', true);
+
+// Backward compatibility
+if (!class_exists(TestCase::class)) {
+	class_alias(PHPUnit_Framework_TestCase::class, TestCase::class);
+}
+if (!trait_exists(TestCaseTrait::class)) {
+	class_alias(PHPUnit_Extensions_Database_TestCase_Trait::class, TestCaseTrait::class);
+}
+if (!class_exists(YamlDataSet::class)) {
+	class_alias(PHPUnit_Extensions_Database_DataSet_YamlDataSet::class, YamlDataSet::class);
+}
diff --git a/tests/datasets/api.yml b/tests/datasets/api.yml
new file mode 100644
index 000000000..124c6b0d5
--- /dev/null
+++ b/tests/datasets/api.yml
@@ -0,0 +1,218 @@
+---
+# Empty these tables
+cache:
+conversation:
+pconfig:
+photo:
+workerqueue:
+mail:
+
+# Base test config to avoid notice messages
+config:
+    -
+        cat: system
+        k: url
+        v: http://localhost
+    -
+        cat: system
+        k: hostname
+        v: localhost
+    -
+        cat: system
+        k: worker_dont_fork
+        v: 1
+
+# Populate tables with test data
+user:
+    -
+        uid: 42
+        username: Test user
+        nickname: selfcontact
+        verified: 1
+        password: $2y$10$DLRNTRmJgKe1cSrFJ5Jb0edCqvXlA9sh/RHdSnfxjbR.04yZRm4Qm
+        theme: frio
+
+contact:
+    -
+        id: 42
+        uid: 42
+        name: Self contact
+        nick: selfcontact
+        self: 1
+        nurl: http://localhost/profile/selfcontact
+        url: http://localhost/profile/selfcontact
+        about: User used in tests
+        pending: 0
+        blocked: 0
+        rel: 1
+        network: dfrn
+    -
+        id: 43
+        uid: 0
+        # Having the same name and nick allows us to test
+        # the fallback to api_get_nick() in api_get_user()
+        name: othercontact
+        nick: othercontact
+        self: 0
+        nurl: http://localhost/profile/othercontact
+        url: http://localhost/profile/othercontact
+        pending: 0
+        blocked: 0
+        rel: 0
+        network: dfrn
+    -
+        id: 44
+        uid: 42
+        name: Friend contact
+        nick: friendcontact
+        self: 0
+        nurl: http://localhost/profile/friendcontact
+        url: http://localhost/profile/friendcontact
+        pending: 0
+        blocked: 0
+        rel: 2
+        network: dfrn
+
+item:
+    -
+        id: 1
+        visible: 1
+        contact-id: 42
+        author-id: 42
+        owner-id: 45
+        uid: 42
+        verb: http://activitystrea.ms/schema/1.0/post
+        unseen: 1
+        body: Parent status
+        parent: 1
+        author-link: http://localhost/profile/selfcontact
+        wall: 1
+        starred: 1
+        origin: 1
+        allow_cid: ''
+        allow_gid: ''
+        deny_cid: ''
+        deny_gid: ''
+    -
+        id: 2
+        visible: 1
+        contact-id: 42
+        author-id: 42
+        owner-id: 45
+        uid: 42
+        verb: http://activitystrea.ms/schema/1.0/post
+        unseen: 0
+        body: Reply
+        parent: 1
+        author-link: http://localhost/profile/selfcontact
+        wall: 1
+        starred: 0
+        origin: 1
+    -
+        id: 3
+        visible: 1
+        contact-id: 43
+        author-id: 43
+        owner-id: 42
+        uid: 42
+        verb: http://activitystrea.ms/schema/1.0/post
+        unseen: 0
+        body: Other user status
+        parent: 3
+        author-link: http://localhost/profile/othercontact
+        wall: 1
+        starred: 0
+        origin: 1
+    -
+        id: 4
+        visible: 1
+        contact-id: 44
+        author-id: 44
+        owner-id: 42
+        uid: 42
+        verb: http://activitystrea.ms/schema/1.0/post
+        unseen: 0
+        body: Friend user reply
+        parent: 1
+        author-link: http://localhost/profile/othercontact
+        wall: 1
+        starred: 0
+        origin: 1
+    -
+        id: 5
+        visible: 1
+        contact-id: 42
+        author-id: 42
+        owner-id: 42
+        uid: 42
+        verb: http://activitystrea.ms/schema/1.0/post
+        unseen: 0
+        body: '[share]Shared status[/share]'
+        parent: 1
+        author-link: http://localhost/profile/othercontact
+        wall: 1
+        starred: 0
+        origin: 1
+        allow_cid: ''
+        allow_gid: ''
+        deny_cid: ''
+        deny_gid: ''
+    -
+        id: 6
+        visible: 1
+        contact-id: 44
+        author-id: 44
+        owner-id: 42
+        uid: 42
+        verb: http://activitystrea.ms/schema/1.0/post
+        unseen: 0
+        body: Friend user status
+        parent: 6
+        author-link: http://localhost/profile/othercontact
+        wall: 1
+        starred: 0
+        origin: 1
+
+thread:
+    -
+        iid: 1
+        visible: 1
+        contact-id: 42
+        author-id: 42
+        owner-id: 42
+        uid: 42
+        wall: 1
+    -
+        iid: 3
+        visible: 1
+        contact-id: 43
+        author-id: 43
+        owner-id: 43
+        uid: 0
+        wall: 1
+    -
+        iid: 6
+        visible: 1
+        contact-id: 44
+        author-id: 44
+        owner-id: 44
+        uid: 0
+        wall: 1
+
+group:
+    -
+        id: 1
+        uid: 42
+        visible: 1
+        name: Visible list
+    -
+        id: 2
+        uid: 42
+        visible: 0
+        name: Private list
+
+search:
+    -
+        id: 1
+        term: Saved search
+        uid: 42
diff --git a/tests/src/Core/Cache/ArrayCacheDriverTest.php b/tests/src/Core/Cache/ArrayCacheDriverTest.php
new file mode 100644
index 000000000..0cad6e9c7
--- /dev/null
+++ b/tests/src/Core/Cache/ArrayCacheDriverTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Friendica\Test\src\Core\Cache;
+
+
+use Friendica\Core\Cache\ArrayCache;
+
+class ArrayCacheDriverTest extends MemoryCacheTest
+{
+	/**
+	 * @var \Friendica\Core\Cache\IMemoryCacheDriver
+	 */
+	private $cache;
+
+	protected function getInstance()
+	{
+		$this->cache = new ArrayCache();
+		return $this->cache;
+	}
+
+	public function tearDown()
+	{
+		$this->cache->clear(false);
+		parent::tearDown();
+	}
+
+	public function testTTL()
+	{
+		// Array Cache doesn't support TTL
+		return true;
+	}
+}
diff --git a/tests/src/Core/Cache/CacheTest.php b/tests/src/Core/Cache/CacheTest.php
new file mode 100644
index 000000000..105142f0b
--- /dev/null
+++ b/tests/src/Core/Cache/CacheTest.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace Friendica\Test\src\Core\Cache;
+
+use Friendica\Core\Config;
+use Friendica\Test\DatabaseTest;
+use Friendica\Util\DateTimeFormat;
+
+abstract class CacheTest extends DatabaseTest
+{
+	/**
+	 * @var \Friendica\Core\Cache\ICacheDriver
+	 */
+	protected $instance;
+
+	abstract protected function getInstance();
+
+	protected function setUp()
+	{
+		parent::setUp();
+		$this->instance = $this->getInstance();
+
+		// Reusable App object
+		$this->app = \Friendica\BaseObject::getApp();
+
+		// Default config
+		Config::set('config', 'hostname', 'localhost');
+		Config::set('system', 'throttle_limit_day', 100);
+		Config::set('system', 'throttle_limit_week', 100);
+		Config::set('system', 'throttle_limit_month', 100);
+		Config::set('system', 'theme', 'system_theme');
+	}
+
+	/**
+	 * @small
+	 */
+	function testSimple() {
+		$this->assertNull($this->instance->get('value1'));
+
+		$value = 'foobar';
+		$this->instance->set('value1', $value);
+		$received = $this->instance->get('value1');
+		$this->assertEquals($value, $received, 'Value received from cache not equal to the original');
+
+		$value = 'ipsum lorum';
+		$this->instance->set('value1', $value);
+		$received = $this->instance->get('value1');
+		$this->assertEquals($value, $received, 'Value not overwritten by second set');
+
+		$value2 = 'foobar';
+		$this->instance->set('value2', $value2);
+		$received2 = $this->instance->get('value2');
+		$this->assertEquals($value, $received, 'Value changed while setting other variable');
+		$this->assertEquals($value2, $received2, 'Second value not equal to original');
+
+		$this->assertNull($this->instance->get('not_set'), 'Unset value not equal to null');
+
+		$this->assertTrue($this->instance->delete('value1'));
+		$this->assertNull($this->instance->get('value1'));
+	}
+
+	/**
+	 * @small
+	 */
+	function testClear() {
+		$value = 'ipsum lorum';
+		$this->instance->set('1_value1', $value . '1');
+		$this->instance->set('1_value2', $value . '2');
+		$this->instance->set('2_value1', $value . '3');
+		$this->instance->set('3_value1', $value . '4');
+
+		$this->assertEquals([
+			'1_value1' => 'ipsum lorum1',
+			'1_value2' => 'ipsum lorum2',
+			'2_value1' => 'ipsum lorum3',
+			'3_value1' => 'ipsum lorum4',
+		], [
+			'1_value1' => $this->instance->get('1_value1'),
+			'1_value2' => $this->instance->get('1_value2'),
+			'2_value1' => $this->instance->get('2_value1'),
+			'3_value1' => $this->instance->get('3_value1'),
+		]);
+
+		$this->assertTrue($this->instance->clear(false));
+
+		$this->assertEquals([
+			'1_value1' => null,
+			'1_value2' => null,
+			'2_value1' => null,
+			'3_value1' => null,
+		], [
+			'1_value1' => $this->instance->get('1_value1'),
+			'1_value2' => $this->instance->get('1_value2'),
+			'2_value1' => $this->instance->get('2_value1'),
+			'3_value1' => $this->instance->get('3_value1'),
+		]);
+	}
+
+	/**
+	 * @medium
+	 */
+	function testTTL() {
+		$this->assertNull($this->instance->get('value1'));
+
+		$value = 'foobar';
+		$this->instance->set('value1', $value, 1);
+		$received = $this->instance->get('value1');
+		$this->assertEquals($value, $received, 'Value received from cache not equal to the original');
+
+		sleep(2);
+
+		$this->assertNull($this->instance->get('value1'));
+	}
+
+	/**
+	 * @small
+	 */
+	function testDifferentTypesInCache() {
+		// String test
+		$value = "foobar";
+		$this->instance->set('stringVal', $value);
+		$received = $this->instance->get('stringVal');
+		$this->assertEquals($value, $received, 'Value type changed from ' . gettype($value) . ' to ' . gettype($received));
+
+		// Integer test
+		$value = 1;
+		$this->instance->set('intVal', $value);
+		$received = $this->instance->get('intVal');
+		$this->assertEquals($value, $received, 'Value type changed from ' . gettype($value) . ' to ' . gettype($received));
+
+		// Boolean test
+		$value = true;
+		$this->instance->set('boolValTrue', $value);
+		$received = $this->instance->get('boolValTrue');
+		$this->assertEquals($value, $received, 'Value type changed from ' . gettype($value) . ' to ' . gettype($received));
+
+		$value = false;
+		$this->instance->set('boolValFalse', $value);
+		$received = $this->instance->get('boolValFalse');
+		$this->assertEquals($value, $received, 'Value type changed from ' . gettype($value) . ' to ' . gettype($received));
+
+		// float
+		$value = 4.6634234;
+		$this->instance->set('decVal', $value);
+		$received = $this->instance->get('decVal');
+		$this->assertEquals($value, $received, 'Value type changed from ' . gettype($value) . ' to ' . gettype($received));
+
+		// array
+		$value = array('1', '2', '3', '4', '5');
+		$this->instance->set('arrayVal', $value);
+		$received = $this->instance->get('arrayVal');
+		$this->assertEquals($value, $received, 'Value type changed from ' . gettype($value) . ' to ' . gettype($received));
+
+		// object
+		$value = new DateTimeFormat();
+		$this->instance->set('objVal', $value);
+		$received = $this->instance->get('objVal');
+		$this->assertEquals($value, $received, 'Value type changed from ' . gettype($value) . ' to ' . gettype($received));
+
+		// null
+		$value = null;
+		$this->instance->set('objVal', $value);
+		$received = $this->instance->get('objVal');
+		$this->assertEquals($value, $received, 'Value type changed from ' . gettype($value) . ' to ' . gettype($received));
+	}
+}
diff --git a/tests/src/Core/Cache/DatabaseCacheDriverTest.php b/tests/src/Core/Cache/DatabaseCacheDriverTest.php
new file mode 100644
index 000000000..5df00fc91
--- /dev/null
+++ b/tests/src/Core/Cache/DatabaseCacheDriverTest.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Friendica\Test\src\Core\Cache;
+
+use Friendica\Core\Cache\CacheDriverFactory;
+
+class DatabaseCacheDriverTest extends CacheTest
+{
+	/**
+	 * @var \Friendica\Core\Cache\IMemoryCacheDriver
+	 */
+	private $cache;
+
+	protected function getInstance()
+	{
+		$this->cache = CacheDriverFactory::create('database');
+		return $this->cache;
+	}
+
+	public function tearDown()
+	{
+		$this->cache->clear(false);
+		parent::tearDown();
+	}
+}
diff --git a/tests/src/Core/Cache/MemcacheCacheDriverTest.php b/tests/src/Core/Cache/MemcacheCacheDriverTest.php
new file mode 100644
index 000000000..62f744003
--- /dev/null
+++ b/tests/src/Core/Cache/MemcacheCacheDriverTest.php
@@ -0,0 +1,31 @@
+<?php
+
+
+namespace Friendica\Test\src\Core\Cache;
+
+
+use Friendica\Core\Cache\CacheDriverFactory;
+
+/**
+ * @requires extension memcache
+ */
+class MemcacheCacheDriverTest extends MemoryCacheTest
+{
+	/**
+	 * @var \Friendica\Core\Cache\IMemoryCacheDriver
+	 */
+	private $cache;
+
+	protected function getInstance()
+	{
+		$this->cache = CacheDriverFactory::create('memcache');
+		return $this->cache;
+
+	}
+
+	public function tearDown()
+	{
+		$this->cache->clear(false);
+		parent::tearDown();
+	}
+}
diff --git a/tests/src/Core/Cache/MemcachedCacheDriverTest.php b/tests/src/Core/Cache/MemcachedCacheDriverTest.php
new file mode 100644
index 000000000..5a07814a3
--- /dev/null
+++ b/tests/src/Core/Cache/MemcachedCacheDriverTest.php
@@ -0,0 +1,30 @@
+<?php
+
+
+namespace Friendica\Test\src\Core\Cache;
+
+
+use Friendica\Core\Cache\CacheDriverFactory;
+
+/**
+ * @requires extension memcached
+ */
+class MemcachedCacheDriverTest extends MemoryCacheTest
+{
+	/**
+	 * @var \Friendica\Core\Cache\IMemoryCacheDriver
+	 */
+	private $cache;
+
+	protected function getInstance()
+	{
+		$this->cache = CacheDriverFactory::create('memcached');
+		return $this->cache;
+	}
+
+	public function tearDown()
+	{
+		$this->cache->clear(false);
+		parent::tearDown();
+	}
+}
diff --git a/tests/src/Core/Cache/MemoryCacheTest.php b/tests/src/Core/Cache/MemoryCacheTest.php
new file mode 100644
index 000000000..0f3f6192b
--- /dev/null
+++ b/tests/src/Core/Cache/MemoryCacheTest.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace Friendica\Test\src\Core\Cache;
+
+use Friendica\Core\Cache\IMemoryCacheDriver;
+
+abstract class MemoryCacheTest extends CacheTest
+{
+	/**
+	 * @var \Friendica\Core\Cache\IMemoryCacheDriver
+	 */
+	protected $instance;
+
+	function setUp()
+	{
+		parent::setUp();
+		if (!($this->instance instanceof IMemoryCacheDriver)) {
+			throw new \Exception('MemoryCacheTest unsupported');
+		}
+	}
+
+	/**
+	 * @small
+	 */
+	function testCompareSet() {
+		$this->assertNull($this->instance->get('value1'));
+
+		$value = 'foobar';
+		$this->instance->add('value1', $value);
+		$received = $this->instance->get('value1');
+		$this->assertEquals($value, $received, 'Value received from cache not equal to the original');
+
+		$newValue = 'ipsum lorum';
+		$this->instance->compareSet('value1', $value, $newValue);
+		$received = $this->instance->get('value1');
+		$this->assertEquals($newValue, $received, 'Value not overwritten by compareSet');
+	}
+
+	/**
+	 * @small
+	 */
+	function testNegativeCompareSet() {
+		$this->assertNull($this->instance->get('value1'));
+
+		$value = 'foobar';
+		$this->instance->add('value1', $value);
+		$received = $this->instance->get('value1');
+		$this->assertEquals($value, $received, 'Value received from cache not equal to the original');
+
+		$newValue = 'ipsum lorum';
+		$this->instance->compareSet('value1', 'wrong', $newValue);
+		$received = $this->instance->get('value1');
+		$this->assertNotEquals($newValue, $received, 'Value was wrongly overwritten by compareSet');
+		$this->assertEquals($value, $received, 'Value was wrongly overwritten by any other value');
+	}
+
+	/**
+	 * @small
+	 */
+	function testCompareDelete() {
+		$this->assertNull($this->instance->get('value1'));
+
+		$value = 'foobar';
+		$this->instance->add('value1', $value);
+		$received = $this->instance->get('value1');
+		$this->assertEquals($value, $received, 'Value received from cache not equal to the original');
+		$this->instance->compareDelete('value1', $value);
+		$this->assertNull($this->instance->get('value1'), 'Value was not deleted by compareDelete');
+	}
+
+	/**
+	 * @small
+	 */
+	function testNegativeCompareDelete() {
+		$this->assertNull($this->instance->get('value1'));
+
+		$value = 'foobar';
+		$this->instance->add('value1', $value);
+		$received = $this->instance->get('value1');
+		$this->assertEquals($value, $received, 'Value received from cache not equal to the original');
+		$this->instance->compareDelete('value1', 'wrong');
+		$this->assertNotNull($this->instance->get('value1'), 'Value was wrongly compareDeleted');
+
+		$this->instance->compareDelete('value1', $value);
+		$this->assertNull($this->instance->get('value1'), 'Value was wrongly NOT deleted by compareDelete');
+	}
+
+	/**
+	 * @small
+	 */
+	function testAdd() {
+		$this->assertNull($this->instance->get('value1'));
+
+		$value = 'foobar';
+		$this->instance->add('value1', $value);
+
+		$newValue = 'ipsum lorum';
+		$this->instance->add('value1', $newValue);
+		$received = $this->instance->get('value1');
+		$this->assertNotEquals($newValue, $received, 'Value was wrongly overwritten by add');
+		$this->assertEquals($value, $received, 'Value was wrongly overwritten by any other value');
+
+		$this->instance->delete('value1');
+		$this->instance->add('value1', $newValue);
+		$received = $this->instance->get('value1');
+		$this->assertEquals($newValue, $received, 'Value was not overwritten by add');
+		$this->assertNotEquals($value, $received, 'Value was not overwritten by any other value');
+	}
+}
\ No newline at end of file
diff --git a/tests/src/Core/Cache/RedisCacheDriverTest.php b/tests/src/Core/Cache/RedisCacheDriverTest.php
new file mode 100644
index 000000000..460c1184b
--- /dev/null
+++ b/tests/src/Core/Cache/RedisCacheDriverTest.php
@@ -0,0 +1,30 @@
+<?php
+
+
+namespace Friendica\Test\src\Core\Cache;
+
+
+use Friendica\Core\Cache\CacheDriverFactory;
+
+/**
+ * @requires extension redis
+ */
+class RedisCacheDriverTest extends MemoryCacheTest
+{
+	/**
+	 * @var \Friendica\Core\Cache\IMemoryCacheDriver
+	 */
+	private $cache;
+
+	protected function getInstance()
+	{
+		$this->cache = CacheDriverFactory::create('redis');
+		return $this->cache;
+	}
+
+	public function tearDown()
+	{
+		$this->cache->clear(false);
+		parent::tearDown();
+	}
+}
diff --git a/tests/src/Core/Console/AutomaticInstallationConsoleTest.php b/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
new file mode 100644
index 000000000..79e379dcb
--- /dev/null
+++ b/tests/src/Core/Console/AutomaticInstallationConsoleTest.php
@@ -0,0 +1,333 @@
+<?php
+
+namespace Friendica\Test\src\Core\Console;
+
+use org\bovigo\vfs\vfsStream;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @requires PHP 7.0
+ */
+class AutomaticInstallationConsoleTest extends ConsoleTest
+{
+	private $db_host;
+	private $db_port;
+	private $db_data;
+	private $db_user;
+	private $db_pass;
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		if ($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.ini.php')) {
+			$this->root->getChild('config')
+				->removeChild('local.ini.php');
+		}
+
+		$this->db_host = getenv('MYSQL_HOST');
+		$this->db_port = (!empty(getenv('MYSQL_PORT'))) ? getenv('MYSQL_PORT') : null;
+		$this->db_data = getenv('MYSQL_DATABASE');
+		$this->db_user = getenv('MYSQL_USERNAME') . getenv('MYSQL_USER');
+		$this->db_pass = getenv('MYSQL_PASSWORD');
+	}
+
+	private function assertConfig($family, $key, $value)
+	{
+		$config = $this->execute(['config', $family, $key]);
+		$this->assertEquals($family . "." . $key . " => " . $value . "\n", $config);
+	}
+
+	private function assertFinished($txt, $withconfig = false, $copyfile = false)
+	{
+		$cfg = '';
+
+		if ($withconfig) {
+			$cfg = <<<CFG
+
+
+Creating config file...
+CFG;
+		}
+
+		if ($copyfile) {
+			$cfg = <<<CFG
+
+
+Copying config file...
+CFG;
+		}
+
+		$finished = <<<FIN
+Initializing setup...{$cfg}
+
+ Complete!
+
+
+Checking basic setup...
+
+ NOTICE: Not checking .htaccess/URL-Rewrite during CLI installation.
+
+ Complete!
+
+
+Checking database...
+
+ Complete!
+
+
+Inserting data into database...
+
+ Complete!
+
+
+Installing theme
+
+ Complete
+
+
+
+Installation is finished
+
+
+FIN;
+		$this->assertEquals($finished, $txt);
+	}
+
+	private function assertStuckDB($txt)
+	{
+		$finished = <<<FIN
+Initializing setup...
+
+Creating config file...
+
+ Complete!
+
+
+Checking basic setup...
+
+ NOTICE: Not checking .htaccess/URL-Rewrite during CLI installation.
+
+ Complete!
+
+
+Checking database...
+
+[Error] --------
+MySQL Connection: Failed, please check your MySQL settings and credentials.
+
+
+FIN;
+
+		$this->assertEquals($finished, $txt);
+	}
+
+	/**
+	 * @medium
+	 */
+	public function testWithConfig()
+	{
+		$config = <<<CONF
+<?php return <<<INI
+
+[database]
+hostname = 
+username = 
+password = 
+database = 
+charset = utf8mb4
+
+
+; ****************************************************************
+; The configuration below will be overruled by the admin panel.
+; Changes made below will only have an effect if the database does
+; not contain any configuration for the friendica system.
+; ****************************************************************
+
+[config]
+admin_email =
+
+sitename = Friendica Social Network
+
+register_policy = REGISTER_OPEN
+register_text =
+
+[system]
+default_timezone = UTC
+
+language = en
+INI;
+// Keep this line
+
+CONF;
+
+		vfsStream::newFile('prepared.ini.php')
+			->at($this->root)
+			->setContent($config);
+
+		$txt = $this->execute(['autoinstall', '-f', 'prepared.ini.php']);
+
+		$this->assertFinished($txt, false, true);
+
+		$this->assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.ini.php'));
+	}
+
+	/**
+	 * @medium
+	 */
+	public function testWithEnvironmentAndSave()
+	{
+		$this->assertTrue(putenv('FRIENDICA_ADMIN_MAIL=admin@friendica.local'));
+		$this->assertTrue(putenv('FRIENDICA_TZ=Europe/Berlin'));
+		$this->assertTrue(putenv('FRIENDICA_LANG=de'));
+
+		$txt = $this->execute(['autoinstall', '--savedb']);
+
+		$this->assertFinished($txt, true);
+
+		$this->assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.ini.php'));
+
+		$this->assertConfig('database', 'hostname', $this->db_host . (!empty($this->db_port) ? ':' . $this->db_port : ''));
+		$this->assertConfig('database', 'username', $this->db_user);
+		$this->assertConfig('database', 'database', $this->db_data);
+		$this->assertConfig('config', 'admin_email', 'admin@friendica.local');
+		$this->assertConfig('system', 'default_timezone', 'Europe/Berlin');
+		$this->assertConfig('system', 'language', 'de');
+	}
+
+
+	/**
+	 * @medium
+	 */
+	public function testWithEnvironmentWithoutSave()
+	{
+		$this->assertTrue(putenv('FRIENDICA_ADMIN_MAIL=admin@friendica.local'));
+		$this->assertTrue(putenv('FRIENDICA_TZ=Europe/Berlin'));
+		$this->assertTrue(putenv('FRIENDICA_LANG=de'));
+
+		$txt = $this->execute(['autoinstall']);
+
+		$this->assertFinished($txt, true);
+
+		$this->assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.ini.php'));
+
+		$this->assertConfig('database', 'hostname', '');
+		$this->assertConfig('database', 'username', '');
+		$this->assertConfig('database', 'database', '');
+		$this->assertConfig('config', 'admin_email', 'admin@friendica.local');
+		$this->assertConfig('system', 'default_timezone', 'Europe/Berlin');
+		$this->assertConfig('system', 'language', 'de');
+	}
+
+	/**
+	 * @medium
+	 */
+	public function testWithArguments()
+	{
+		$args = ['autoinstall'];
+		array_push($args, '--dbhost');
+		array_push($args, $this->db_host);
+		array_push($args, '--dbuser');
+		array_push($args, $this->db_user);
+		if (!empty($this->db_pass)) {
+			array_push($args, '--dbpass');
+			array_push($args, $this->db_pass);
+		}
+		if (!empty($this->db_port)) {
+			array_push($args, '--dbport');
+			array_push($args, $this->db_port);
+		}
+		array_push($args, '--dbdata');
+		array_push($args, $this->db_data);
+
+		array_push($args, '--admin');
+		array_push($args, 'admin@friendica.local');
+		array_push($args, '--tz');
+		array_push($args, 'Europe/Berlin');
+		array_push($args, '--lang');
+		array_push($args, 'de');
+
+		$txt = $this->execute($args);
+
+		$this->assertFinished($txt, true);
+
+		$this->assertTrue($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.ini.php'));
+
+		$this->assertConfig('database', 'hostname', $this->db_host . (!empty($this->db_port) ? ':' . $this->db_port : ''));
+		$this->assertConfig('database', 'username', $this->db_user);
+		$this->assertConfig('database', 'database', $this->db_data);
+		$this->assertConfig('config', 'admin_email', 'admin@friendica.local');
+		$this->assertConfig('system', 'default_timezone', 'Europe/Berlin');
+		$this->assertConfig('system', 'language', 'de');
+	}
+
+	public function testNoDatabaseConnection()
+	{
+		$this->assertTrue(putenv('MYSQL_USERNAME='));
+		$this->assertTrue(putenv('MYSQL_PASSWORD='));
+		$this->assertTrue(putenv('MYSQL_DATABASE='));
+
+		$txt = $this->execute(['autoinstall']);
+
+		$this->assertStuckDB($txt);
+	}
+
+	public function testGetHelp()
+	{
+		// Usable to purposely fail if new commands are added without taking tests into account
+		$theHelp = <<<HELP
+Installation - Install Friendica automatically
+Synopsis
+	bin/console autoinstall [-h|--help|-?] [-v] [-a] [-f]
+
+Description
+    Installs Friendica with data based on the local.ini.php file or environment variables
+
+Notes
+    Not checking .htaccess/URL-Rewrite during CLI installation.
+
+Options
+    -h|--help|-?           Show help information
+    -v                     Show more debug information.
+    -a                     All setup checks are required (except .htaccess)
+    -f|--file <config>     prepared config file (e.g. "config/local.ini.php" itself) which will override every other config option - except the environment variables)
+    -s|--savedb            Save the DB credentials to the file (if environment variables is used)
+    -H|--dbhost <host>     The host of the mysql/mariadb database (env MYSQL_HOST)
+    -p|--dbport <port>     The port of the mysql/mariadb database (env MYSQL_PORT)
+    -d|--dbdata <database> The name of the mysql/mariadb database (env MYSQL_DATABASE)
+    -U|--dbuser <username> The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME)
+    -P|--dbpass <password> The password of the mysql/mariadb database login (env MYSQL_PASSWORD)
+    -b|--phppath <path>    The path of the PHP binary (env FRIENDICA_PHP_PATH) 
+    -A|--admin <mail>      The admin email address of Friendica (env FRIENDICA_ADMIN_MAIL)
+    -T|--tz <timezone>     The timezone of Friendica (env FRIENDICA_TZ)
+    -L|--lang <language>   The language of Friendica (env FRIENDICA_LANG)
+ 
+Environment variables
+   MYSQL_HOST                  The host of the mysql/mariadb database (mandatory if mysql and environment is used)
+   MYSQL_PORT                  The port of the mysql/mariadb database
+   MYSQL_USERNAME|MYSQL_USER   The username of the mysql/mariadb database login (MYSQL_USERNAME is for mysql, MYSQL_USER for mariadb)
+   MYSQL_PASSWORD              The password of the mysql/mariadb database login
+   MYSQL_DATABASE              The name of the mysql/mariadb database
+   FRIENDICA_PHP_PATH          The path of the PHP binary
+   FRIENDICA_ADMIN_MAIL        The admin email address of Friendica (this email will be used for admin access)
+   FRIENDICA_TZ                The timezone of Friendica
+   FRIENDICA_LANG              The langauge of Friendica
+   
+Examples
+	bin/console autoinstall -f 'input.ini.php
+		Installs Friendica with the prepared 'input.ini.php' file
+
+	bin/console autoinstall --savedb
+		Installs Friendica with environment variables and saves them to the 'config/local.ini.php' file
+
+	bin/console autoinstall -h localhost -p 3365 -U user -P passwort1234 -d friendica
+		Installs Friendica with a local mysql database with credentials
+
+HELP;
+
+		$txt = $this->execute(['autoinstall', '-h']);
+
+		$this->assertEquals($txt, $theHelp);
+	}
+}
diff --git a/tests/src/Core/Console/ConfigConsoleTest.php b/tests/src/Core/Console/ConfigConsoleTest.php
new file mode 100644
index 000000000..c4fd21777
--- /dev/null
+++ b/tests/src/Core/Console/ConfigConsoleTest.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Friendica\Test\src\Core\Console;
+
+use Friendica\Database\DBA;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @requires PHP 7.0
+ */
+class ConfigConsoleTest extends ConsoleTest
+{
+	public function tearDown()
+	{
+		DBA::delete('config', ['k' => 'test']);
+
+		parent::tearDown();
+	}
+
+	private function assertGet($family, $key, $value) {
+		$config = $this->execute(['config', $family, $key]);
+		$this->assertEquals($family . "." . $key . " => " . $value . "\n", $config);
+	}
+
+	private function assertSet($family, $key, $value) {
+		$config = $this->execute(['config', $family, $key, $value]);
+		$this->assertEquals($family . "." . $key . " <= " . $value . "\n", $config);
+	}
+
+	function testSetGetKeyValue() {
+		$this->assertSet( 'config', 'test', 'now');
+		$this->assertGet('config', 'test', 'now');
+		$this->assertSet('config', 'test', '');
+		$this->assertGet('config', 'test', '');
+		DBA::delete('config', ['k' => 'test']);
+		$this->assertGet('config', 'test', null);
+	}
+
+	function testSetArrayValue() {
+		$testArray = [1, 2, 3];
+		DBA::insert('config', ['cat' => 'config', 'k' => 'test', 'v' => serialize($testArray)]);
+
+		$txt = $this->execute(['config', 'config', 'test', 'now']);
+
+		$this->assertEquals("[Error] config.test is an array and can't be set using this command.\n", $txt);
+	}
+
+	function testTooManyArguments() {
+		$txt = $this->execute(['config', 'config', 'test', 'it', 'now']);
+		$assertion = '[Warning] Too many arguments';
+		$firstline = substr($txt, 0, strlen($assertion));
+
+		$this->assertEquals($assertion, $firstline);
+	}
+
+	function testVerbose() {
+		$this->assertSet('test', 'it', 'now');
+		$executable = $this->getExecutablePath();
+		$assertion = <<<CONF
+Executable: {$executable}
+Arguments: array (
+  0 => 'config',
+  1 => 'test',
+)
+Options: array (
+  'v' => 1,
+)
+Command: config
+Executable: {$executable}
+Class: Friendica\Core\Console\Config
+Arguments: array (
+  0 => 'test',
+)
+Options: array (
+  'v' => 1,
+)
+[test]
+it => now
+
+CONF;
+		$txt = $this->execute(['config', 'test', '-v']);
+
+		$this->assertEquals($assertion, $txt);
+	}
+}
diff --git a/tests/src/Core/Console/ConsoleTest.php b/tests/src/Core/Console/ConsoleTest.php
new file mode 100644
index 000000000..0cc5c6335
--- /dev/null
+++ b/tests/src/Core/Console/ConsoleTest.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Friendica\Test\src\Core\Console;
+
+use Friendica\App;
+use Friendica\BaseObject;
+use Friendica\Database\DBA;
+use Friendica\Test\Util\Intercept;
+use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\vfsStreamDirectory;
+use PHPUnit\Framework\TestCase;
+
+abstract class ConsoleTest extends TestCase
+{
+	/**
+	 * @var MultiUseConsole Extension of the basic Friendica Console for testing purpose
+	 */
+	private $console;
+	/**
+	 * @var App The Friendica App
+	 */
+	protected $app;
+
+	/**
+	 * @var vfsStreamDirectory The Stream Directory
+	 */
+	protected $root;
+
+	protected $stdout;
+
+	protected function setUp()
+	{
+		parent::setUp();
+
+		Intercept::setUp();
+
+		if (!getenv('MYSQL_DATABASE')) {
+			$this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
+		}
+
+		$this->setUpVfsDir();
+
+		// Reusable App object
+		$this->app = new App($this->root->url());
+		BaseObject::setApp($this->app);
+		$this->console = new MultiUseConsole();
+	}
+
+	public function execute($args) {
+		DBA::disconnect();
+		$this->app->reload();
+
+		array_unshift($args, $this->getExecutablePath());
+		Intercept::reset();
+		$this->console->reset();
+		$this->console->parseTestArgv($args);
+		$this->console->execute();
+
+		$returnStr = Intercept::$cache;
+		Intercept::reset();
+		return $returnStr;
+	}
+
+	/**
+	 * @return string returns the path to the console executable during tests
+	 */
+	protected function getExecutablePath() {
+		return $this->root->getChild('bin' . DIRECTORY_SEPARATOR . 'console.php')->url();
+	}
+
+	private function setUpVfsDir() {
+		// the used directories inside the App class
+		$structure = [
+			'config' => [],
+			'bin' => []
+		];
+
+		// create a virtual directory and copy all needed files and folders to it
+		$this->root = vfsStream::setup('friendica', null, $structure);
+
+		$this->setConfigFile('config.ini.php');
+		$this->setConfigFile('settings.ini.php');
+		$this->setConfigFile('local.ini.php');
+		$this->setConfigFile('dbstructure.json');
+
+		// fake console.php for setting an executable
+		vfsStream::newFile('console.php')
+			->at($this->root->getChild('bin'))
+			->setContent('<? php');
+	}
+
+	private function setConfigFile($filename)
+	{
+		$file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
+			'..' . DIRECTORY_SEPARATOR .
+			'..' . DIRECTORY_SEPARATOR .
+			'..' . DIRECTORY_SEPARATOR .
+			'config' . DIRECTORY_SEPARATOR .
+			$filename;
+
+		if (file_exists($file)) {
+			vfsStream::newFile($filename)
+				->at($this->root->getChild('config'))
+				->setContent(file_get_contents($file));
+		}
+	}
+}
diff --git a/tests/src/Core/Console/MultiUseConsole.php b/tests/src/Core/Console/MultiUseConsole.php
new file mode 100644
index 000000000..ddcbfebc3
--- /dev/null
+++ b/tests/src/Core/Console/MultiUseConsole.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Friendica\Test\src\Core\Console;
+
+use Friendica\Core\Console;
+
+/**
+ * Adds two methods to the Friendica\Core\Console so we can reuse it during tests
+ *
+ * @package Friendica\Test\src\Core\Console
+ */
+class MultiUseConsole extends Console
+{
+	public function reset() {
+		$this->args = [];
+		$this->options = [];
+	}
+
+	public function parseTestArgv($argv)
+	{
+		$this->parseArgv($argv);
+	}
+}
diff --git a/tests/src/Core/Lock/ArrayCacheLockDriverTest.php b/tests/src/Core/Lock/ArrayCacheLockDriverTest.php
new file mode 100644
index 000000000..dc044f5c5
--- /dev/null
+++ b/tests/src/Core/Lock/ArrayCacheLockDriverTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Friendica\Test\src\Core\Lock;
+
+
+use Friendica\Core\Cache\ArrayCache;
+use Friendica\Core\Lock\CacheLockDriver;
+
+class ArrayCacheLockDriverTest extends LockTest
+{
+	/**
+	 * @var \Friendica\Core\Cache\IMemoryCacheDriver
+	 */
+	private $cache;
+
+	protected function getInstance()
+	{
+		$this->cache = new ArrayCache();
+		return new CacheLockDriver($this->cache);
+	}
+
+	public function tearDown()
+	{
+		$this->cache->clear();
+		parent::tearDown();
+	}
+
+	public function testLockTTL()
+	{
+		// ArrayCache doesn't support TTL
+		return true;
+	}
+}
diff --git a/tests/src/Core/Lock/DatabaseLockDriverTest.php b/tests/src/Core/Lock/DatabaseLockDriverTest.php
new file mode 100644
index 000000000..270d20079
--- /dev/null
+++ b/tests/src/Core/Lock/DatabaseLockDriverTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Friendica\Test\src\Core\Lock;
+
+use Friendica\Core\Lock\DatabaseLockDriver;
+use Friendica\Database\DBA;
+
+class DatabaseLockDriverTest extends LockTest
+{
+	protected function getInstance()
+	{
+		return new DatabaseLockDriver();
+	}
+
+	public function tearDown()
+	{
+		DBA::delete('locks', [ 'id > 0']);
+		parent::tearDown();
+	}
+}
diff --git a/tests/src/Core/Lock/LockTest.php b/tests/src/Core/Lock/LockTest.php
new file mode 100644
index 000000000..9698f0bde
--- /dev/null
+++ b/tests/src/Core/Lock/LockTest.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace Friendica\Test\src\Core\Lock;
+
+use Friendica\BaseObject;
+use Friendica\Core\Config;
+use Friendica\Test\DatabaseTest;
+
+abstract class LockTest extends DatabaseTest
+{
+	/**
+	 * @var \Friendica\Core\Lock\ILockDriver
+	 */
+	protected $instance;
+
+	abstract protected function getInstance();
+
+	protected function setUp()
+	{
+		parent::setUp();
+		$this->instance = $this->getInstance();
+
+		// Reusable App object
+		$this->app = BaseObject::getApp();
+
+		// Default config
+		Config::set('config', 'hostname', 'localhost');
+		Config::set('system', 'throttle_limit_day', 100);
+		Config::set('system', 'throttle_limit_week', 100);
+		Config::set('system', 'throttle_limit_month', 100);
+		Config::set('system', 'theme', 'system_theme');
+	}
+
+	/**
+	 * @small
+	 */
+	public function testLock() {
+		$this->instance->acquireLock('foo', 1);
+		$this->assertTrue($this->instance->isLocked('foo'));
+		$this->assertFalse($this->instance->isLocked('bar'));
+	}
+
+	/**
+	 * @small
+	 */
+	public function testDoubleLock() {
+		$this->instance->acquireLock('foo', 1);
+		$this->assertTrue($this->instance->isLocked('foo'));
+		// We already locked it
+		$this->assertTrue($this->instance->acquireLock('foo', 1));
+	}
+
+	/**
+	 * @small
+	 */
+	public function testReleaseLock() {
+		$this->instance->acquireLock('foo', 1);
+		$this->assertTrue($this->instance->isLocked('foo'));
+		$this->instance->releaseLock('foo');
+		$this->assertFalse($this->instance->isLocked('foo'));
+	}
+
+	/**
+	 * @small
+	 */
+	public function testReleaseAll() {
+		$this->instance->acquireLock('foo', 1);
+		$this->instance->acquireLock('bar', 1);
+		$this->instance->acquireLock('nice', 1);
+
+		$this->assertTrue($this->instance->isLocked('foo'));
+		$this->assertTrue($this->instance->isLocked('bar'));
+		$this->assertTrue($this->instance->isLocked('nice'));
+
+		$this->instance->releaseAll();
+
+		$this->assertFalse($this->instance->isLocked('foo'));
+		$this->assertFalse($this->instance->isLocked('bar'));
+		$this->assertFalse($this->instance->isLocked('nice'));
+	}
+
+	/**
+	 * @small
+	 */
+	public function testReleaseAfterUnlock() {
+		$this->instance->acquireLock('foo', 1);
+		$this->instance->acquireLock('bar', 1);
+		$this->instance->acquireLock('nice', 1);
+
+		$this->instance->releaseLock('foo');
+
+		$this->assertFalse($this->instance->isLocked('foo'));
+		$this->assertTrue($this->instance->isLocked('bar'));
+		$this->assertTrue($this->instance->isLocked('nice'));
+
+		$this->instance->releaseAll();
+
+		$this->assertFalse($this->instance->isLocked('bar'));
+		$this->assertFalse($this->instance->isLocked('nice'));
+	}
+
+	/**
+	 * @medium
+	 */
+	function testLockTTL() {
+
+		// TODO [nupplaphil] - Because of the Datetime-Utils for the database, we have to wait a FULL second between the checks to invalidate the db-locks/cache
+		$this->instance->acquireLock('foo', 1, 1);
+		$this->instance->acquireLock('bar', 1, 3);
+
+		$this->assertTrue($this->instance->isLocked('foo'));
+		$this->assertTrue($this->instance->isLocked('bar'));
+
+		sleep(2);
+
+		$this->assertFalse($this->instance->isLocked('foo'));
+		$this->assertTrue($this->instance->isLocked('bar'));
+
+		sleep(2);
+
+		$this->assertFalse($this->instance->isLocked('foo'));
+		$this->assertFalse($this->instance->isLocked('bar'));
+	}
+}
diff --git a/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php b/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
new file mode 100644
index 000000000..c54cf9c59
--- /dev/null
+++ b/tests/src/Core/Lock/MemcacheCacheLockDriverTest.php
@@ -0,0 +1,31 @@
+<?php
+
+
+namespace Friendica\Test\src\Core\Lock;
+
+
+use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Core\Lock\CacheLockDriver;
+
+/**
+ * @requires extension Memcache
+ */
+class MemcacheCacheLockDriverTest extends LockTest
+{
+	/**
+	 * @var \Friendica\Core\Cache\IMemoryCacheDriver
+	 */
+	private $cache;
+
+	protected function getInstance()
+	{
+		$this->cache = CacheDriverFactory::create('memcache');
+		return new CacheLockDriver($this->cache);
+	}
+
+	public function tearDown()
+	{
+		$this->cache->clear();
+		parent::tearDown();
+	}
+}
diff --git a/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php b/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
new file mode 100644
index 000000000..27886261b
--- /dev/null
+++ b/tests/src/Core/Lock/MemcachedCacheLockDriverTest.php
@@ -0,0 +1,31 @@
+<?php
+
+
+namespace Friendica\Test\src\Core\Lock;
+
+
+use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Core\Lock\CacheLockDriver;
+
+/**
+ * @requires extension memcached
+ */
+class MemcachedCacheLockDriverTest extends LockTest
+{
+	/**
+	 * @var \Friendica\Core\Cache\IMemoryCacheDriver
+	 */
+	private $cache;
+
+	protected function getInstance()
+	{
+		$this->cache = CacheDriverFactory::create('memcached');
+		return new CacheLockDriver($this->cache);
+	}
+
+	public function tearDown()
+	{
+		$this->cache->clear();
+		parent::tearDown();
+	}
+}
diff --git a/tests/src/Core/Lock/RedisCacheLockDriverTest.php b/tests/src/Core/Lock/RedisCacheLockDriverTest.php
new file mode 100644
index 000000000..eaafbf4e4
--- /dev/null
+++ b/tests/src/Core/Lock/RedisCacheLockDriverTest.php
@@ -0,0 +1,32 @@
+<?php
+
+
+namespace Friendica\Test\src\Core\Lock;
+
+
+use Friendica\Core\Cache\CacheDriverFactory;
+use Friendica\Core\Lock\CacheLockDriver;
+
+/**
+ * @requires extension redis
+ */
+class RedisCacheLockDriverTest extends LockTest
+{
+	/**
+	 * @var \Friendica\Core\Cache\IMemoryCacheDriver
+	 */
+	private $cache;
+
+	protected function getInstance()
+	{
+		$this->cache = CacheDriverFactory::create('redis');
+		return new CacheLockDriver($this->cache);
+
+	}
+
+	public function tearDown()
+	{
+		$this->cache->clear();
+		parent::tearDown();
+	}
+}
diff --git a/tests/src/Core/Lock/SemaphoreLockDriverTest.php b/tests/src/Core/Lock/SemaphoreLockDriverTest.php
new file mode 100644
index 000000000..cd4b91573
--- /dev/null
+++ b/tests/src/Core/Lock/SemaphoreLockDriverTest.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Friendica\Test\src\Core\Lock;
+
+
+use Friendica\Core\Lock\SemaphoreLockDriver;
+
+class SemaphoreLockDriverTest extends LockTest
+{
+	/**
+	 * @var \Friendica\Core\Lock\SemaphoreLockDriver
+	 */
+	private $semaphoreLockDriver;
+
+	protected function getInstance()
+	{
+		$this->semaphoreLockDriver = new SemaphoreLockDriver();
+		return $this->semaphoreLockDriver;
+	}
+
+	public function tearDown()
+	{
+		$this->semaphoreLockDriver->releaseAll();
+		parent::tearDown();
+	}
+
+	function testLockTTL()
+	{
+		// Semaphore doesn't work with TTL
+		return true;
+	}
+}
diff --git a/tests/src/Core/SystemTest.php b/tests/src/Core/SystemTest.php
new file mode 100644
index 000000000..b85bce44c
--- /dev/null
+++ b/tests/src/Core/SystemTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Friendica\Test\src\Core;
+
+use Friendica\Core\System;
+use PHPUnit\Framework\TestCase;
+
+class SystemTest extends TestCase
+{
+	private function assertGuid($guid, $length, $prefix = '')
+	{
+		print $guid;
+		$length -= strlen($prefix);
+		$this->assertRegExp("/^" . $prefix . "[a-z0-9]{" . $length . "}?$/", $guid);
+	}
+
+	function testGuidWithoutParameter()
+	{
+		$guid = System::createGUID();
+		$this->assertGuid($guid, 16);
+	}
+
+	function testGuidWithSize32() {
+		$guid = System::createGUID(32);
+		$this->assertGuid($guid, 32);
+	}
+
+	function testGuidWithSize64() {
+		$guid = System::createGUID(64);
+		$this->assertGuid($guid, 64);
+	}
+
+	function testGuidWithPrefix() {
+		$guid = System::createGUID(23, 'test');
+		$this->assertGuid($guid, 23, 'test');
+	}
+}
\ No newline at end of file
diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php
new file mode 100644
index 000000000..17ac55fd7
--- /dev/null
+++ b/tests/src/Database/DBATest.php
@@ -0,0 +1,40 @@
+<?php
+namespace Friendica\Test\Database;
+
+use Friendica\BaseObject;
+use Friendica\Core\Config;
+use Friendica\Database\DBA;
+use Friendica\Test\DatabaseTest;
+
+class DBATest extends DatabaseTest
+{
+	public function setUp()
+	{
+		parent::setUp();
+
+		// Reusable App object
+		$this->app = BaseObject::getApp();
+
+		// Default config
+		Config::set('config', 'hostname', 'localhost');
+		Config::set('system', 'throttle_limit_day', 100);
+		Config::set('system', 'throttle_limit_week', 100);
+		Config::set('system', 'throttle_limit_month', 100);
+		Config::set('system', 'theme', 'system_theme');
+	}
+
+	/**
+	 * @small
+	 */
+	public function testExists() {
+
+		$this->assertTrue(DBA::exists('config', []));
+		$this->assertFalse(DBA::exists('notable', []));
+
+		$this->assertTrue(DBA::exists('config', null));
+		$this->assertFalse(DBA::exists('notable', null));
+
+		$this->assertTrue(DBA::exists('config', ['k' => 'hostname']));
+		$this->assertFalse(DBA::exists('config', ['k' => 'nonsense']));
+	}
+}
diff --git a/tests/src/Database/DBStructureTest.php b/tests/src/Database/DBStructureTest.php
new file mode 100644
index 000000000..268bf8eed
--- /dev/null
+++ b/tests/src/Database/DBStructureTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Friendica\Test\Database;
+
+use Friendica\BaseObject;
+use Friendica\Core\Config;
+use Friendica\Database\DBStructure;
+use Friendica\Test\DatabaseTest;
+
+class DBStructureTest extends DatabaseTest
+{
+	public function setUp()
+	{
+		parent::setUp();
+
+		// Reusable App object
+		$this->app = BaseObject::getApp();
+
+		// Default config
+		Config::set('config', 'hostname', 'localhost');
+		Config::set('system', 'throttle_limit_day', 100);
+		Config::set('system', 'throttle_limit_week', 100);
+		Config::set('system', 'throttle_limit_month', 100);
+		Config::set('system', 'theme', 'system_theme');
+	}
+
+	/**
+	 * @small
+	 */
+	public function testExists() {
+		$this->assertTrue(DBStructure::existsTable('config'));
+
+		$this->assertFalse(DBStructure::existsTable('notatable'));
+
+		$this->assertTrue(DBStructure::existsColumn('config', ['k']));
+		$this->assertFalse(DBStructure::existsColumn('config', ['nonsense']));
+		$this->assertFalse(DBStructure::existsColumn('config', ['k', 'nonsense']));
+	}
+
+	/**
+	 * @small
+	 */
+	public function testRename() {
+		$fromColumn = 'k';
+		$toColumn = 'key';
+		$fromType = 'varbinary(255) not null';
+		$toType = 'varbinary(255) not null comment \'Test To Type\'';
+
+		$this->assertTrue(DBStructure::rename('config', [ $fromColumn => [ $toColumn, $toType ]]));
+		$this->assertTrue(DBStructure::existsColumn('config', [ $toColumn ]));
+		$this->assertFalse(DBStructure::existsColumn('config', [ $fromColumn ]));
+
+		$this->assertTrue(DBStructure::rename('config', [ $toColumn => [ $fromColumn, $fromType ]]));
+		$this->assertTrue(DBStructure::existsColumn('config', [ $fromColumn ]));
+		$this->assertFalse(DBStructure::existsColumn('config', [ $toColumn ]));
+	}
+
+	/**
+	 * @small
+	 */
+	public function testChangePrimaryKey() {
+		$oldID = 'client_id';
+		$newID = 'pw';
+
+		$this->assertTrue(DBStructure::rename('clients', [ $newID ], DBStructure::RENAME_PRIMARY_KEY));
+		$this->assertTrue(DBStructure::rename('clients', [ $oldID ], DBStructure::RENAME_PRIMARY_KEY));
+	}
+}
diff --git a/tests/src/Util/ArraysTest.php b/tests/src/Util/ArraysTest.php
new file mode 100644
index 000000000..2028cfc90
--- /dev/null
+++ b/tests/src/Util/ArraysTest.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * @file tests/src/Util/Arrays.php
+ * @author Roland Haeder<https://f.haeder.net/profile/roland>
+ */
+namespace Friendica\Test\Util;
+
+use Friendica\Util\Arrays;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @brief Array utility testing class
+ */
+class ArraysTest extends TestCase
+{
+	/**
+	 * @brief Tests if an empty array and an empty delimiter returns an empty string.
+	 */
+	public function testEmptyArrayEmptyDelimiter()
+	{
+		$str = Arrays::recursiveImplode([], '');
+		$this->assertEmpty($str);
+	}
+
+	/**
+	 * @brief Tests if an empty array and a non-empty delimiter returns an empty string.
+	 */
+	public function testEmptyArrayNonEmptyDelimiter()
+	{
+		$str = Arrays::recursiveImplode([], ',');
+		$this->assertEmpty($str);
+	}
+
+	/**
+	 * @brief Tests if a non-empty array and an empty delimiter returns the value (1).
+	 */
+	public function testNonEmptyArrayEmptyDelimiter()
+	{
+		$str = Arrays::recursiveImplode([1], '');
+		$this->assertSame($str, '1');
+	}
+
+	/**
+	 * @brief Tests if a non-empty array and an empty delimiter returns the value (12).
+	 */
+	public function testNonEmptyArray2EmptyDelimiter()
+	{
+		$str = Arrays::recursiveImplode([1, 2], '');
+		$this->assertSame($str, '12');
+	}
+
+	/**
+	 * @brief Tests if a non-empty array and a non-empty delimiter returns the value (1).
+	 */
+	public function testNonEmptyArrayNonEmptyDelimiter()
+	{
+		$str = Arrays::recursiveImplode([1], ',');
+		$this->assertSame($str, '1');
+	}
+
+	/**
+	 * @brief Tests if a non-empty array and a non-empty delimiter returns the value (1,2).
+	 */
+	public function testNonEmptyArray2NonEmptyDelimiter()
+	{
+		$str = Arrays::recursiveImplode([1, 2], ',');
+		$this->assertSame($str, '1,2');
+	}
+
+	/**
+	 * @brief Tests if a 2-dim array and an empty delimiter returns the expected string.
+	 */
+	public function testEmptyMultiArray2EmptyDelimiter()
+	{
+		$str = Arrays::recursiveImplode([[1], []], '');
+		$this->assertSame($str, '{1}{}');
+	}
+
+	/**
+	 * @brief Tests if a 2-dim array and an empty delimiter returns the expected string.
+	 */
+	public function testEmptyMulti2Array2EmptyDelimiter()
+	{
+		$str = Arrays::recursiveImplode([[1], [2]], '');
+		$this->assertSame($str, '{1}{2}');
+	}
+
+	/**
+	 * @brief Tests if a 2-dim array and a non-empty delimiter returns the expected string.
+	 */
+	public function testEmptyMultiArray2NonEmptyDelimiter()
+	{
+		$str = Arrays::recursiveImplode([[1], []], ',');
+		$this->assertSame($str, '{1},{}');
+	}
+
+	/**
+	 * @brief Tests if a 2-dim array and a non-empty delimiter returns the expected string.
+	 */
+	public function testEmptyMulti2Array2NonEmptyDelimiter()
+	{
+		$str = Arrays::recursiveImplode([[1], [2]], ',');
+		$this->assertSame($str, '{1},{2}');
+	}
+
+	/**
+	 * @brief Tests if a 3-dim array and a non-empty delimiter returns the expected string.
+	 */
+	public function testEmptyMulti3Array2NonEmptyDelimiter()
+	{
+		$str = Arrays::recursiveImplode([[1], [2, [3]]], ',');
+		$this->assertSame($str, '{1},{2,{3}}');
+	}
+}
diff --git a/update.php b/update.php
index c39212152..56f285f2d 100644
--- a/update.php
+++ b/update.php
@@ -2,13 +2,14 @@
 
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
-use Friendica\Core\L10n;
+use Friendica\Util\DateTimeFormat;
 
 require_once 'include/dba.php';
 
@@ -32,6 +33,8 @@ require_once 'include/dba.php';
  * 1. Create a function "update_4712()" here in the update.php
  * 2. Apply the needed structural changes in src/Database/DBStructure.php
  * 3. Set DB_UPDATE_VERSION in boot.php to 4712.
+ *
+ * If you need to run a script before the database update, name the function "pre_update_4712()"
  */
 
 function update_1178() {
@@ -46,10 +49,10 @@ function update_1178() {
 		$profile["pub_keywords"] = profile_clean_keywords($profile["pub_keywords"]);
 
 		$r = q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d",
-				dbesc($profile["about"]),
-				dbesc($profile["locality"]),
-				dbesc($profile["pub_keywords"]),
-				dbesc($profile["gender"]),
+				DBA::escape($profile["about"]),
+				DBA::escape($profile["locality"]),
+				DBA::escape($profile["pub_keywords"]),
+				DBA::escape($profile["gender"]),
 				intval($profile["uid"])
 			);
 	}
@@ -85,7 +88,6 @@ function update_1189() {
 }
 
 function update_1191() {
-
 	Config::set('system', 'maintenance', 1);
 
 	if (Addon::isEnabled('forumlist')) {
@@ -110,11 +112,11 @@ function update_1191() {
 
 	// select old formlist addon entries
 	$r = q("SELECT `uid`, `cat`, `k`, `v` FROM `pconfig` WHERE `cat` = '%s' ",
-		dbesc('forumlist')
+		DBA::escape('forumlist')
 	);
 
 	// convert old forumlist addon entries in new config entries
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
 			$uid = $rr['uid'];
 			$family = $rr['cat'];
@@ -143,26 +145,25 @@ function update_1191() {
 	Config::set('system', 'maintenance', 0);
 
 	return UPDATE_SUCCESS;
-
 }
 
 function update_1203() {
 	$r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)",
-		dbesc(ACCOUNT_TYPE_COMMUNITY), dbesc(PAGE_COMMUNITY), dbesc(PAGE_PRVGROUP));
+		DBA::escape(Contact::ACCOUNT_TYPE_COMMUNITY), DBA::escape(Contact::PAGE_COMMUNITY), DBA::escape(Contact::PAGE_PRVGROUP));
 }
 
 function update_1244() {
 	// Sets legacy_password for all legacy hashes
-	dba::update('user', ['legacy_password' => true], ['SUBSTR(password, 1, 4) != "$2y$"']);
+	DBA::update('user', ['legacy_password' => true], ['SUBSTR(password, 1, 4) != "$2y$"']);
 
 	// All legacy hashes are re-hashed using the new secure hashing function
-	$stmt = dba::select('user', ['uid', 'password'], ['legacy_password' => true]);
-	while($user = dba::fetch($stmt)) {
-		dba::update('user', ['password' => User::hashPassword($user['password'])], ['uid' => $user['uid']]);
+	$stmt = DBA::select('user', ['uid', 'password'], ['legacy_password' => true]);
+	while($user = DBA::fetch($stmt)) {
+		DBA::update('user', ['password' => User::hashPassword($user['password'])], ['uid' => $user['uid']]);
 	}
 
 	// Logged in users are forcibly logged out
-	dba::delete('session', ['1 = 1']);
+	DBA::delete('session', ['1 = 1']);
 
 	return UPDATE_SUCCESS;
 }
@@ -181,7 +182,7 @@ function update_1245() {
 
 function update_1247() {
 	// Removing hooks with the old name
-	dba::e("DELETE FROM `hook`
+	DBA::e("DELETE FROM `hook`
 WHERE `hook` LIKE 'plugin_%'");
 
 	// Make sure we install the new renamed ones
@@ -190,11 +191,11 @@ WHERE `hook` LIKE 'plugin_%'");
 
 function update_1260() {
 	Config::set('system', 'maintenance', 1);
-	Config::set('system', 'maintenance_reason', L10n::t('%s: Updating author-id and owner-id in item and thread table. ', DBM::date().' '.date('e')));
+	Config::set('system', 'maintenance_reason', L10n::t('%s: Updating author-id and owner-id in item and thread table. ', DateTimeFormat::utcNow().' '.date('e')));
 
-	$items = dba::p("SELECT `id`, `owner-link`, `owner-name`, `owner-avatar`, `network` FROM `item`
+	$items = DBA::p("SELECT `id`, `owner-link`, `owner-name`, `owner-avatar`, `network` FROM `item`
 		WHERE `owner-id` = 0 AND `owner-link` != ''");
-	while ($item = dba::fetch($items)) {
+	while ($item = DBA::fetch($items)) {
 		$contact = ['url' => $item['owner-link'], 'name' => $item['owner-name'],
 			'photo' => $item['owner-avatar'], 'network' => $item['network']];
 		$cid = Contact::getIdForURL($item['owner-link'], 0, false, $contact);
@@ -203,14 +204,14 @@ function update_1260() {
 		}
 		Item::update(['owner-id' => $cid], ['id' => $item['id']]);
 	}
-	dba::close($items);
+	DBA::close($items);
 
-	dba::e("UPDATE `thread` INNER JOIN `item` ON `thread`.`iid` = `item`.`id`
+	DBA::e("UPDATE `thread` INNER JOIN `item` ON `thread`.`iid` = `item`.`id`
 		SET `thread`.`owner-id` = `item`.`owner-id` WHERE `thread`.`owner-id` = 0");
 
-	$items = dba::p("SELECT `id`, `author-link`, `author-name`, `author-avatar`, `network` FROM `item`
+	$items = DBA::p("SELECT `id`, `author-link`, `author-name`, `author-avatar`, `network` FROM `item`
 		WHERE `author-id` = 0 AND `author-link` != ''");
-	while ($item = dba::fetch($items)) {
+	while ($item = DBA::fetch($items)) {
 		$contact = ['url' => $item['author-link'], 'name' => $item['author-name'],
 			'photo' => $item['author-avatar'], 'network' => $item['network']];
 		$cid = Contact::getIdForURL($item['author-link'], 0, false, $contact);
@@ -219,9 +220,9 @@ function update_1260() {
 		}
 		Item::update(['author-id' => $cid], ['id' => $item['id']]);
 	}
-	dba::close($items);
+	DBA::close($items);
 
-	dba::e("UPDATE `thread` INNER JOIN `item` ON `thread`.`iid` = `item`.`id`
+	DBA::e("UPDATE `thread` INNER JOIN `item` ON `thread`.`iid` = `item`.`id`
 		SET `thread`.`author-id` = `item`.`author-id` WHERE `thread`.`author-id` = 0");
 
 	Config::set('system', 'maintenance', 0);
@@ -230,6 +231,18 @@ function update_1260() {
 
 function update_1261() {
 	// This fixes the results of an issue in the develop branch of 2018-05.
-	dba::update('contact', ['blocked' => false, 'pending' => false], ['uid' => 0, 'blocked' => true, 'pending' => true]);
+	DBA::update('contact', ['blocked' => false, 'pending' => false], ['uid' => 0, 'blocked' => true, 'pending' => true]);
+	return UPDATE_SUCCESS;
+}
+
+function update_1278() {
+	Config::set('system', 'maintenance', 1);
+	Config::set('system', 'maintenance_reason', L10n::t('%s: Updating post-type.', DateTimeFormat::utcNow().' '.date('e')));
+
+	Item::update(['post-type' => Item::PT_PAGE], ['bookmark' => true]);
+	Item::update(['post-type' => Item::PT_PERSONAL_NOTE], ['type' => 'note']);
+
+	Config::set('system', 'maintenance', 0);
+
 	return UPDATE_SUCCESS;
 }
diff --git a/util/Doxyfile b/util/Doxyfile
index 373d17255..aef230792 100644
--- a/util/Doxyfile
+++ b/util/Doxyfile
@@ -2,8 +2,8 @@ INPUT = README.md index.php boot.php testargs.php update.php mod/ object/ includ
 RECURSIVE = YES
 PROJECT_NAME = "Friendica"
 PROJECT_LOGO = images/friendica-64.jpg
-EXCLUDE = .htconfig.php library/ doc/ .git/ log/ util/zotsh/easywebdav/ addon/ report/ privacy_image_cache/ photo/ proxy/ local/
-EXCLUDE_PATTERNS = *smarty3* *strings.php*.log *.out *test* 
+EXCLUDE = .htconfig.php config/ library/ doc/ .git/ log/ util/zotsh/easywebdav/ addon/ report/ privacy_image_cache/ photo/ proxy/ local/
+EXCLUDE_PATTERNS = *smarty3* *strings.php*.log *.out *test*
 OUTPUT_DIRECTORY = doc
 GENERATE_HTML = YES
 HTML_OUTPUT = html/
diff --git a/util/credits.txt b/util/credits.txt
index f88d1f793..ff430c927 100644
--- a/util/credits.txt
+++ b/util/credits.txt
@@ -4,6 +4,8 @@ Abrax
 Adam Clark
 Adam Jurkiewicz
 Adam Magness
+Aditoo
+Aditoo17
 AgnesElisa
 Albert
 Alberto Díaz Tormo
@@ -22,6 +24,7 @@ André Lohan
 Andy H3
 Andy Hee
 AndyHee
+Angristan
 Anthronaut
 Arian - Cazare Muncitori
 Athalbert
@@ -89,6 +92,7 @@ Gregory Smith
 Haakon Meland Eriksen
 Hans Meine
 hauke
+Hauke
 Hauke Altmann
 Hauke Zühl
 Herbert Thielen
@@ -96,6 +100,7 @@ hoergen
 Hubert Kościański
 Hypolite Petovan
 Ilmari
+ImgBotApp
 irhen
 Jak
 Jakob
@@ -110,7 +115,6 @@ Josef Moravek
 juanman
 julia.domagalska
 Karel
-Karel Vandecandelaere
 Karolina
 Keith Fernie
 Klaus Weidenbach
@@ -120,6 +124,7 @@ Lea1995polish
 Leberwurscht
 Leonard Lausen
 Lionel Triay
+Lorem Ipsum
 Ludovic Grossard
 maase2
 Magdalena Gazda
@@ -144,6 +149,7 @@ Michael Vogel
 Michal Šupler
 Michalina
 Mike Macgirvin
+miqrogroove
 mytbk
 Nicola Spanti
 Olaf Conradi
@@ -152,13 +158,17 @@ Olivier
 Olivier Mehani
 Olivier Migeot
 Paolo Wave
+Pascal
+Pascal Deklerck
 Pavel Morozov
-Perig Gouanvic
+PerigGouanvic
 peturisfeld
+Philipp
 Philipp Holzer
 Pierre Rudloff
 Piotr Blonkowski
 pokerazor
+R C
 Rabuzarus
 Radek
 Rafael Garau
@@ -172,6 +182,7 @@ Ricardo Pereira
 RJ Madsen
 Roland Häder
 Rui Andrada
+RyDroid
 S.Krumbholz
 Sakałoŭ Alaksiej
 Sam
@@ -187,6 +198,7 @@ Simó Albert i Beltran
 soko1
 St John Karp
 Stanislav N.
+Steffen K9
 StefOfficiel
 Sveinn í Felli
 Sven Anders
@@ -203,6 +215,7 @@ thorsten23
 Tino
 Tobias Diekershoff
 Tobias Hößl
+tomacat
 tomamplius
 tomtom84
 Tony Baldwin
@@ -213,18 +226,21 @@ Tubuntu
 Tupambae.org
 U-SOUND\mike
 ufic
+Unknown
 Vasudev Kamath
 Vasya Novikov
 vislav
+VVelox
 Vít Šesták 'v6ak'
 Waldemar Stoczkowski
 Yasen Pramatarov
 ylms
 Zach Prezkuta
+Zane C. Bowers-Hadley
 Zered
 zotlabs
 zottel
 Zvi ben Yaakov (a.k.a rdc)
 Михаил
 Олексій Замковий
-朱陈锬
+朱陈锬
\ No newline at end of file
diff --git a/util/htconfig.vagrant.php b/util/htconfig.vagrant.php
deleted file mode 100644
index 623b587ef..000000000
--- a/util/htconfig.vagrant.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-// Set the following for your MySQL installation
-// Copy or rename this file to .htconfig.php
-
-$db_host = 'localhost';
-$db_user = 'friendica';
-$db_pass = 'friendica';
-$db_data = 'friendica';
-
-// If you are using a subdirectory of your domain you will need to put the
-// relative path (from the root of your domain) here.
-// For instance if your URL is 'http://example.com/directory/subdirectory',
-// set path to 'directory/subdirectory'.
-
-$a->path = '';
-
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-$default_timezone = 'Europe/Berlin';
-
-// What is your site name?
-
-$a->config['sitename'] = "My Friend Network";
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-$a->config['register_policy'] = REGISTER_OPEN;
-$a->config['register_text'] = '';
-$a->config['admin_email'] = 'admin@friendica.local';
-
-// Maximum size of an imported message, 0 is unlimited
-
-$a->config['max_import_size'] = 200000;
-
-// maximum size of uploaded photos
-
-$a->config['system']['maximagesize'] = 800000;
-
-// Location of PHP command line processor
-
-$a->config['php_path'] = '/usr/bin/php';
-
-
-// Server-to-server private message encryption (RINO) is allowed by default.
-// set to 0 to disable, 1 to enable
-
-$a->config['system']['rino_encrypt'] = 1;
-
-// default system theme
-
-$a->config['system']['theme'] = 'duepuntozero';
-
-// By default allow pseudonyms
-
-$a->config['system']['no_regfullname'] = true;
-
-//Deny public access to the local directory
-//$a->config['system']['block_local_dir'] = false;
-
-// Location of the global directory
-$a->config['system']['directory'] = 'https://dir.friendica.social';
-
-// turn on friendica's log
-$a->config['system']['debugging'] = true;
-$a->config['system']['logfile'] = 'logfile.out';
-$a->config['system']['loglevel'] = LOGGER_DEBUG;
-
-// display php errors
-ini_set('display_errors', '1');
diff --git a/util/local.ini.vagrant.php b/util/local.ini.vagrant.php
new file mode 100644
index 000000000..9d3a5f430
--- /dev/null
+++ b/util/local.ini.vagrant.php
@@ -0,0 +1,41 @@
+<?php return <<<INI
+
+; If automatic system installation fails:
+
+; Copy this file to local.ini.php
+
+; Why local.ini.php? Because it contains sensitive information which could
+; give somebody complete control of your database. Apache's default
+; configuration will interpret any .php file as a script and won't show the values
+
+; Then set the following for your MySQL installation
+
+[database]
+hostname = localhost
+username = friendica
+password = friendica
+database = friendica
+charset = utf8mb4
+
+
+; ****************************************************************
+; The configuration below will be overruled by the admin panel.
+; Changes made below will only have an effect if the database does
+; not contain any configuration for the friendica system.
+; ****************************************************************
+
+[config]
+admin_email = admin@friendica.local
+
+sitename = Friendica Social Network
+
+register_policy = REGISTER_OPEN
+register_text =
+
+[system]
+default_timezone = UTC
+
+language = en
+
+INI;
+// Keep this line
\ No newline at end of file
diff --git a/util/messages.po b/util/messages.po
index a9f5ec1c8..0495cbb86 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-30 05:30+0200\n"
+"POT-Creation-Date: 2018-08-25 15:34+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,721 +18,533 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 
-#: include/enotify.php:31
-msgid "Friendica Notification"
+#: index.php:261 mod/apps.php:14
+msgid "You must be logged in to use addons. "
 msgstr ""
 
-#: include/enotify.php:34
-msgid "Thank You,"
+#: index.php:308 mod/fetch.php:20 mod/fetch.php:47 mod/fetch.php:54
+#: mod/help.php:62
+msgid "Not Found"
 msgstr ""
 
-#: include/enotify.php:37
-#, php-format
-msgid "%s Administrator"
+#: 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 ""
 
-#: include/enotify.php:39
-#, php-format
-msgid "%1$s, %2$s Administrator"
+#: index.php:431 mod/group.php:83 mod/profperm.php:29
+msgid "Permission denied"
 msgstr ""
 
-#: include/enotify.php:95
-#, php-format
-msgid "[Friendica:Notify] New mail received at %s"
+#: 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 ""
 
-#: include/enotify.php:97
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
+#: index.php:460
+msgid "toggle mobile"
 msgstr ""
 
-#: include/enotify.php:98
-msgid "a private message"
+#: view/theme/duepuntozero/config.php:54 src/Model/User.php:544
+msgid "default"
 msgstr ""
 
-#: include/enotify.php:98
-#, php-format
-msgid "%1$s sent you %2$s."
+#: view/theme/duepuntozero/config.php:55
+msgid "greenzero"
 msgstr ""
 
-#: include/enotify.php:100
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: view/theme/duepuntozero/config.php:56
+msgid "purplezero"
 msgstr ""
 
-#: include/enotify.php:138
-#, php-format
-msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
+#: view/theme/duepuntozero/config.php:57
+msgid "easterbunny"
 msgstr ""
 
-#: include/enotify.php:146
-#, php-format
-msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
+#: view/theme/duepuntozero/config.php:58
+msgid "darkzero"
 msgstr ""
 
-#: include/enotify.php:156
-#, php-format
-msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
+#: view/theme/duepuntozero/config.php:59
+msgid "comix"
 msgstr ""
 
-#: include/enotify.php:168
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+#: view/theme/duepuntozero/config.php:60
+msgid "slackr"
 msgstr ""
 
-#: include/enotify.php:170
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
+#: 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 ""
 
-#: include/enotify.php:173 include/enotify.php:188 include/enotify.php:203
-#: include/enotify.php:218 include/enotify.php:237 include/enotify.php:252
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: 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 ""
 
-#: include/enotify.php:180
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
+#: view/theme/duepuntozero/config.php:74
+msgid "Variations"
 msgstr ""
 
-#: include/enotify.php:182
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
+#: view/theme/quattro/config.php:76
+msgid "Alignment"
 msgstr ""
 
-#: include/enotify.php:183
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
+#: view/theme/quattro/config.php:76
+msgid "Left"
 msgstr ""
 
-#: include/enotify.php:195
-#, php-format
-msgid "[Friendica:Notify] %s tagged you"
+#: view/theme/quattro/config.php:76
+msgid "Center"
 msgstr ""
 
-#: include/enotify.php:197
-#, php-format
-msgid "%1$s tagged you at %2$s"
+#: view/theme/quattro/config.php:77
+msgid "Color scheme"
 msgstr ""
 
-#: include/enotify.php:198
-#, php-format
-msgid "%1$s [url=%2$s]tagged you[/url]."
+#: view/theme/quattro/config.php:78
+msgid "Posts font size"
 msgstr ""
 
-#: include/enotify.php:210
-#, php-format
-msgid "[Friendica:Notify] %s shared a new post"
+#: view/theme/quattro/config.php:79
+msgid "Textareas font size"
 msgstr ""
 
-#: include/enotify.php:212
-#, php-format
-msgid "%1$s shared a new post at %2$s"
+#: view/theme/vier/config.php:75
+msgid "Comma separated list of helper forums"
 msgstr ""
 
-#: include/enotify.php:213
-#, php-format
-msgid "%1$s [url=%2$s]shared a post[/url]."
+#: view/theme/vier/config.php:115 src/Core/ACL.php:298
+msgid "don't show"
 msgstr ""
 
-#: include/enotify.php:225
-#, php-format
-msgid "[Friendica:Notify] %1$s poked you"
+#: view/theme/vier/config.php:115 src/Core/ACL.php:297
+msgid "show"
 msgstr ""
 
-#: include/enotify.php:227
-#, php-format
-msgid "%1$s poked you at %2$s"
+#: view/theme/vier/config.php:122
+msgid "Set style"
 msgstr ""
 
-#: include/enotify.php:228
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
+#: view/theme/vier/config.php:123
+msgid "Community Pages"
 msgstr ""
 
-#: include/enotify.php:244
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
+#: view/theme/vier/config.php:124 view/theme/vier/theme.php:149
+msgid "Community Profiles"
 msgstr ""
 
-#: include/enotify.php:246
-#, php-format
-msgid "%1$s tagged your post at %2$s"
+#: view/theme/vier/config.php:125
+msgid "Help or @NewHere ?"
 msgstr ""
 
-#: include/enotify.php:247
-#, php-format
-msgid "%1$s tagged [url=%2$s]your post[/url]"
+#: view/theme/vier/config.php:126 view/theme/vier/theme.php:386
+msgid "Connect Services"
 msgstr ""
 
-#: include/enotify.php:259
-msgid "[Friendica:Notify] Introduction received"
+#: view/theme/vier/config.php:127
+msgid "Find Friends"
 msgstr ""
 
-#: include/enotify.php:261
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
+#: view/theme/vier/config.php:128 view/theme/vier/theme.php:179
+msgid "Last users"
 msgstr ""
 
-#: include/enotify.php:262
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+#: view/theme/vier/theme.php:197 src/Content/Widget.php:59
+msgid "Find People"
 msgstr ""
 
-#: include/enotify.php:267 include/enotify.php:313
-#, php-format
-msgid "You may visit their profile at %s"
+#: view/theme/vier/theme.php:198 src/Content/Widget.php:60
+msgid "Enter name or interest"
 msgstr ""
 
-#: include/enotify.php:269
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
+#: 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 ""
 
-#: include/enotify.php:277
-msgid "[Friendica:Notify] A new person is sharing with you"
+#: view/theme/vier/theme.php:200 src/Content/Widget.php:62
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: include/enotify.php:279 include/enotify.php:280
-#, php-format
-msgid "%1$s is sharing with you at %2$s"
+#: view/theme/vier/theme.php:201 mod/directory.php:214 mod/contacts.php:842
+#: src/Content/Widget.php:63
+msgid "Find"
 msgstr ""
 
-#: include/enotify.php:287
-msgid "[Friendica:Notify] You have a new follower"
+#: view/theme/vier/theme.php:202 mod/suggest.php:117 src/Content/Widget.php:64
+msgid "Friend Suggestions"
 msgstr ""
 
-#: include/enotify.php:289 include/enotify.php:290
-#, php-format
-msgid "You have a new follower at %2$s : %1$s"
+#: view/theme/vier/theme.php:203 src/Content/Widget.php:65
+msgid "Similar Interests"
 msgstr ""
 
-#: include/enotify.php:302
-msgid "[Friendica:Notify] Friend suggestion received"
+#: view/theme/vier/theme.php:204 src/Content/Widget.php:66
+msgid "Random Profile"
 msgstr ""
 
-#: include/enotify.php:304
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
+#: view/theme/vier/theme.php:205 src/Content/Widget.php:67
+msgid "Invite Friends"
 msgstr ""
 
-#: include/enotify.php:305
-#, php-format
-msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+#: view/theme/vier/theme.php:206 mod/directory.php:207
+#: src/Content/Widget.php:68
+msgid "Global Directory"
 msgstr ""
 
-#: include/enotify.php:311
-msgid "Name:"
+#: view/theme/vier/theme.php:208 src/Content/Widget.php:70
+msgid "Local Directory"
 msgstr ""
 
-#: include/enotify.php:312
-msgid "Photo:"
-msgstr ""
-
-#: include/enotify.php:315
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr ""
-
-#: include/enotify.php:323 include/enotify.php:338
-msgid "[Friendica:Notify] Connection accepted"
-msgstr ""
-
-#: include/enotify.php:325 include/enotify.php:340
-#, php-format
-msgid "'%1$s' has accepted your connection request at %2$s"
-msgstr ""
-
-#: include/enotify.php:326 include/enotify.php:341
-#, php-format
-msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
-msgstr ""
-
-#: include/enotify.php:331
-msgid ""
-"You are now mutual friends and may exchange status updates, photos, and "
-"email without restriction."
-msgstr ""
-
-#: include/enotify.php:333
-#, php-format
-msgid "Please visit %s if you wish to make any changes to this relationship."
-msgstr ""
-
-#: include/enotify.php:346
-#, 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 ""
-
-#: include/enotify.php:348
-#, 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
-#, php-format
-msgid "Please visit %s  if you wish to make any changes to this relationship."
-msgstr ""
-
-#: include/enotify.php:360 mod/removeme.php:45
-msgid "[Friendica System Notify]"
-msgstr ""
-
-#: include/enotify.php:360
-msgid "registration request"
-msgstr ""
-
-#: include/enotify.php:362
-#, php-format
-msgid "You've received a registration request from '%1$s' at %2$s"
-msgstr ""
-
-#: include/enotify.php:363
-#, php-format
-msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
-msgstr ""
-
-#: include/enotify.php:368
-#, php-format
-msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
-msgstr ""
-
-#: include/enotify.php:374
-#, php-format
-msgid "Please visit %s to approve or reject the request."
-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:440
-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:303
-msgid "newer"
-msgstr ""
-
-#: include/text.php:304
-msgid "older"
-msgstr ""
-
-#: include/text.php:309
-msgid "first"
-msgstr ""
-
-#: include/text.php:310
-msgid "prev"
-msgstr ""
-
-#: include/text.php:344
-msgid "next"
-msgstr ""
-
-#: include/text.php:345
-msgid "last"
-msgstr ""
-
-#: include/text.php:399
-msgid "Loading more entries..."
-msgstr ""
-
-#: include/text.php:400
-msgid "The end"
-msgstr ""
-
-#: include/text.php:885
-msgid "No contacts"
-msgstr ""
-
-#: include/text.php:909
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/text.php:922
-msgid "View Contacts"
-msgstr ""
-
-#: include/text.php:1011 mod/filer.php:35 mod/editpost.php:110 mod/notes.php:67
-msgid "Save"
-msgstr ""
-
-#: include/text.php:1011
-msgid "Follow"
-msgstr ""
-
-#: include/text.php:1017 mod/search.php:155 src/Content/Nav.php:142
-msgid "Search"
-msgstr ""
-
-#: include/text.php:1020 src/Content/Nav.php:58
-msgid "@name, !forum, #tags, content"
-msgstr ""
-
-#: include/text.php:1026 src/Content/Nav.php:145
-msgid "Full Text"
-msgstr ""
-
-#: include/text.php:1027 src/Content/Widget/TagCloud.php:54
-#: src/Content/Nav.php:146
-msgid "Tags"
-msgstr ""
-
-#: include/text.php:1028 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:1031 view/theme/vier/theme.php:253
-#: src/Content/ForumManager.php:125 src/Content/Nav.php:151
+#: view/theme/vier/theme.php:251 include/text.php:909 src/Content/Nav.php:151
+#: src/Content/ForumManager.php:125
 msgid "Forums"
 msgstr ""
 
-#: include/text.php:1075
-msgid "poke"
+#: view/theme/vier/theme.php:253 src/Content/ForumManager.php:127
+msgid "External link to forum"
 msgstr ""
 
-#: include/text.php:1075
-msgid "poked"
+#: 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 ""
 
-#: include/text.php:1076
-msgid "ping"
+#: view/theme/vier/theme.php:289
+msgid "Quick Start"
 msgstr ""
 
-#: include/text.php:1076
-msgid "pinged"
+#: view/theme/vier/theme.php:295 mod/help.php:56 src/Content/Nav.php:134
+msgid "Help"
 msgstr ""
 
-#: include/text.php:1077
-msgid "prod"
+#: view/theme/frio/config.php:102
+msgid "Custom"
 msgstr ""
 
-#: include/text.php:1077
-msgid "prodded"
+#: view/theme/frio/config.php:114
+msgid "Note"
 msgstr ""
 
-#: include/text.php:1078
-msgid "slap"
+#: view/theme/frio/config.php:114
+msgid "Check image permissions if all users are allowed to see the image"
 msgstr ""
 
-#: include/text.php:1078
-msgid "slapped"
+#: view/theme/frio/config.php:121
+msgid "Select color scheme"
 msgstr ""
 
-#: include/text.php:1079
-msgid "finger"
+#: view/theme/frio/config.php:122
+msgid "Navigation bar background color"
 msgstr ""
 
-#: include/text.php:1079
-msgid "fingered"
+#: view/theme/frio/config.php:123
+msgid "Navigation bar icon color "
 msgstr ""
 
-#: include/text.php:1080
-msgid "rebuff"
+#: view/theme/frio/config.php:124
+msgid "Link color"
 msgstr ""
 
-#: include/text.php:1080
-msgid "rebuffed"
+#: view/theme/frio/config.php:125
+msgid "Set the background color"
 msgstr ""
 
-#: include/text.php:1094 mod/settings.php:935 src/Model/Event.php:379
-msgid "Monday"
+#: view/theme/frio/config.php:126
+msgid "Content background opacity"
 msgstr ""
 
-#: include/text.php:1094 src/Model/Event.php:380
-msgid "Tuesday"
+#: view/theme/frio/config.php:127
+msgid "Set the background image"
 msgstr ""
 
-#: include/text.php:1094 src/Model/Event.php:381
-msgid "Wednesday"
+#: view/theme/frio/config.php:128
+msgid "Background image style"
 msgstr ""
 
-#: include/text.php:1094 src/Model/Event.php:382
-msgid "Thursday"
+#: view/theme/frio/config.php:133
+msgid "Login page background image"
 msgstr ""
 
-#: include/text.php:1094 src/Model/Event.php:383
-msgid "Friday"
+#: view/theme/frio/config.php:137
+msgid "Login page background color"
 msgstr ""
 
-#: include/text.php:1094 src/Model/Event.php:384
-msgid "Saturday"
+#: view/theme/frio/config.php:137
+msgid "Leave background image and color empty for theme defaults"
 msgstr ""
 
-#: include/text.php:1094 mod/settings.php:935 src/Model/Event.php:378
-msgid "Sunday"
+#: view/theme/frio/theme.php:248
+msgid "Guest"
 msgstr ""
 
-#: include/text.php:1098 src/Model/Event.php:399
-msgid "January"
+#: view/theme/frio/theme.php:253
+msgid "Visitor"
 msgstr ""
 
-#: include/text.php:1098 src/Model/Event.php:400
-msgid "February"
+#: view/theme/frio/theme.php:266 src/Module/Login.php:309
+#: src/Content/Nav.php:97
+msgid "Logout"
 msgstr ""
 
-#: include/text.php:1098 src/Model/Event.php:401
-msgid "March"
+#: view/theme/frio/theme.php:266 src/Content/Nav.php:97
+msgid "End this session"
 msgstr ""
 
-#: include/text.php:1098 src/Model/Event.php:402
-msgid "April"
+#: 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 ""
 
-#: include/text.php:1098 include/text.php:1115 src/Model/Event.php:390
-#: src/Model/Event.php:403
-msgid "May"
+#: view/theme/frio/theme.php:269 src/Content/Nav.php:100
+#: src/Content/Nav.php:186
+msgid "Your posts and conversations"
 msgstr ""
 
-#: include/text.php:1098 src/Model/Event.php:404
-msgid "June"
+#: 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 ""
 
-#: include/text.php:1098 src/Model/Event.php:405
-msgid "July"
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:101
+msgid "Your profile page"
 msgstr ""
 
-#: include/text.php:1098 src/Model/Event.php:406
-msgid "August"
+#: view/theme/frio/theme.php:271 mod/fbrowser.php:35 src/Model/Profile.php:891
+#: src/Content/Nav.php:102
+msgid "Photos"
 msgstr ""
 
-#: include/text.php:1098 src/Model/Event.php:407
-msgid "September"
+#: view/theme/frio/theme.php:271 src/Content/Nav.php:102
+msgid "Your photos"
 msgstr ""
 
-#: include/text.php:1098 src/Model/Event.php:408
-msgid "October"
+#: view/theme/frio/theme.php:272 src/Model/Profile.php:899
+#: src/Model/Profile.php:902 src/Content/Nav.php:103
+msgid "Videos"
 msgstr ""
 
-#: include/text.php:1098 src/Model/Event.php:409
-msgid "November"
+#: view/theme/frio/theme.php:272 src/Content/Nav.php:103
+msgid "Your videos"
 msgstr ""
 
-#: include/text.php:1098 src/Model/Event.php:410
-msgid "December"
+#: 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 ""
 
-#: include/text.php:1112 src/Model/Event.php:371
-msgid "Mon"
+#: view/theme/frio/theme.php:273 src/Content/Nav.php:104
+msgid "Your events"
 msgstr ""
 
-#: include/text.php:1112 src/Model/Event.php:372
-msgid "Tue"
+#: view/theme/frio/theme.php:276 mod/admin.php:771
+#: src/Core/NotificationsManager.php:179 src/Content/Nav.php:183
+msgid "Network"
 msgstr ""
 
-#: include/text.php:1112 src/Model/Event.php:373
-msgid "Wed"
+#: view/theme/frio/theme.php:276 src/Content/Nav.php:183
+msgid "Conversations from your friends"
 msgstr ""
 
-#: include/text.php:1112 src/Model/Event.php:374
-msgid "Thu"
+#: 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 ""
 
-#: include/text.php:1112 src/Model/Event.php:375
-msgid "Fri"
+#: view/theme/frio/theme.php:278 mod/message.php:127 src/Content/Nav.php:196
+msgid "Messages"
 msgstr ""
 
-#: include/text.php:1112 src/Model/Event.php:376
-msgid "Sat"
+#: view/theme/frio/theme.php:278 src/Content/Nav.php:196
+msgid "Private mail"
 msgstr ""
 
-#: include/text.php:1112 src/Model/Event.php:370
-msgid "Sun"
+#: 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 ""
 
-#: include/text.php:1115 src/Model/Event.php:386
-msgid "Jan"
+#: view/theme/frio/theme.php:279 src/Content/Nav.php:207
+msgid "Account settings"
 msgstr ""
 
-#: include/text.php:1115 src/Model/Event.php:387
-msgid "Feb"
+#: 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 ""
 
-#: include/text.php:1115 src/Model/Event.php:388
-msgid "Mar"
+#: view/theme/frio/theme.php:280 src/Content/Nav.php:213
+msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: include/text.php:1115 src/Model/Event.php:389
-msgid "Apr"
+#: view/theme/frio/theme.php:367 include/conversation.php:866
+msgid "Follow Thread"
 msgstr ""
 
-#: include/text.php:1115 src/Model/Event.php:392
-msgid "Jul"
+#: view/theme/frio/php/Image.php:24
+msgid "Top Banner"
 msgstr ""
 
-#: include/text.php:1115 src/Model/Event.php:393
-msgid "Aug"
+#: 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 ""
 
-#: include/text.php:1115
-msgid "Sep"
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
 msgstr ""
 
-#: include/text.php:1115 src/Model/Event.php:395
-msgid "Oct"
+#: view/theme/frio/php/Image.php:25
+msgid ""
+"Resize image to fill entire screen, clipping either the right or the bottom."
 msgstr ""
 
-#: include/text.php:1115 src/Model/Event.php:396
-msgid "Nov"
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
 msgstr ""
 
-#: include/text.php:1115 src/Model/Event.php:397
-msgid "Dec"
+#: view/theme/frio/php/Image.php:26
+msgid ""
+"Resize image to repeat it on a single row, either vertical or horizontal."
 msgstr ""
 
-#: include/text.php:1255
+#: 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 "Content warning: %s"
+msgid "%s: Updating author-id and owner-id in item and thread table. "
 msgstr ""
 
-#: include/text.php:1325 mod/videos.php:380
-msgid "View Video"
+#: update.php:240
+#, php-format
+msgid "%s: Updating post-type."
 msgstr ""
 
-#: include/text.php:1342
-msgid "bytes"
+#: 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/text.php:1375 include/text.php:1386 include/text.php:1419
-msgid "Click to open/close"
+#: include/items.php:393
+msgid "Do you really want to delete this item?"
 msgstr ""
 
-#: include/text.php:1534
-msgid "View on separate page"
+#: 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/text.php:1535
-msgid "view on separate page"
+#: 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/text.php:1540 include/text.php:1547 src/Model/Event.php:594
-msgid "link to source"
+#: include/items.php:483 src/Content/Feature.php:96
+msgid "Archives"
 msgstr ""
 
-#: include/text.php:1749 include/conversation.php:144
-#: include/conversation.php:282 src/Model/Item.php:2003
+#: include/conversation.php:151 include/conversation.php:287
+#: include/text.php:1611
 msgid "event"
 msgstr ""
 
-#: include/text.php:1751 include/conversation.php:152
-#: include/conversation.php:290 mod/subthread.php:97 mod/tagger.php:72
-#: src/Model/Item.php:2001
-msgid "photo"
-msgstr ""
-
-#: include/text.php:1753
-msgid "activity"
-msgstr ""
-
-#: include/text.php:1755 src/Object/Post.php:437 src/Object/Post.php:449
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/text.php:1758
-msgid "post"
-msgstr ""
-
-#: include/text.php:1915
-msgid "Item filed"
-msgstr ""
-
-#: 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] ""
-msgstr[1] ""
-
-#: 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] ""
-msgstr[1] ""
-
-#: include/api.php:1250
-#, php-format
-msgid "Monthly posting limit of %d post reached. The post was rejected."
-msgstr ""
-
-#: include/api.php:4522 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:1672 src/Model/User.php:553
-#: src/Model/User.php:561 src/Model/User.php:569
-msgid "Profile Photos"
-msgstr ""
-
-#: include/conversation.php:147 include/conversation.php:157
-#: include/conversation.php:285 include/conversation.php:294
-#: mod/subthread.php:97 mod/tagger.php:72 src/Model/Item.php:2001
-#: src/Protocol/Diaspora.php:1957
+#: 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:164 src/Model/Item.php:1874
-#: src/Protocol/Diaspora.php:1953
+#: 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 ""
 
-#: include/conversation.php:167 src/Model/Item.php:1879
+#: include/conversation.php:173
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: include/conversation.php:170
+#: include/conversation.php:175
 #, php-format
 msgid "%1$s attends %2$s's %3$s"
 msgstr ""
 
-#: include/conversation.php:173
+#: include/conversation.php:177
 #, php-format
 msgid "%1$s doesn't attend %2$s's %3$s"
 msgstr ""
 
-#: include/conversation.php:176
+#: include/conversation.php:179
 #, php-format
 msgid "%1$s attends maybe %2$s's %3$s"
 msgstr ""
 
-#: include/conversation.php:209
+#: include/conversation.php:214
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: include/conversation.php:250
+#: include/conversation.php:255
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr ""
 
-#: include/conversation.php:304 mod/tagger.php:110
+#: include/conversation.php:309 mod/tagger.php:108
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
@@ -746,557 +558,3295 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: include/conversation.php:613 mod/profiles.php:355 mod/photos.php:1489
+#: include/conversation.php:545 mod/profiles.php:352 mod/photos.php:1507
 msgid "Likes"
 msgstr ""
 
-#: include/conversation.php:613 mod/profiles.php:359 mod/photos.php:1489
+#: include/conversation.php:545 mod/profiles.php:356 mod/photos.php:1507
 msgid "Dislikes"
 msgstr ""
 
-#: include/conversation.php:614 include/conversation.php:1644
-#: mod/photos.php:1490
+#: include/conversation.php:546 include/conversation.php:1492
+#: mod/photos.php:1508
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:614 mod/photos.php:1490
+#: include/conversation.php:546 mod/photos.php:1508
 msgid "Not attending"
 msgstr ""
 
-#: include/conversation.php:614 mod/photos.php:1490
+#: include/conversation.php:546 mod/photos.php:1508
 msgid "Might attend"
 msgstr ""
 
-#: include/conversation.php:726 mod/photos.php:1557 src/Object/Post.php:192
+#: include/conversation.php:626 mod/photos.php:1564 src/Object/Post.php:195
 msgid "Select"
 msgstr ""
 
-#: include/conversation.php:727 mod/contacts.php:830 mod/contacts.php:1035
-#: mod/admin.php:1822 mod/photos.php:1558 mod/settings.php:730
-#: src/Object/Post.php:187
+#: 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:765 src/Object/Post.php:371 src/Object/Post.php:372
+#: include/conversation.php:661 src/Object/Post.php:362 src/Object/Post.php:363
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: include/conversation.php:777 src/Object/Post.php:359
+#: include/conversation.php:673 src/Object/Post.php:350
 msgid "Categories:"
 msgstr ""
 
-#: include/conversation.php:778 src/Object/Post.php:360
+#: include/conversation.php:674 src/Object/Post.php:351
 msgid "Filed under:"
 msgstr ""
 
-#: include/conversation.php:785 src/Object/Post.php:385
+#: include/conversation.php:681 src/Object/Post.php:376
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: include/conversation.php:800
+#: include/conversation.php:696
 msgid "View in context"
 msgstr ""
 
-#: include/conversation.php:802 include/conversation.php:1317
-#: mod/wallmessage.php:145 mod/editpost.php:125 mod/message.php:245
-#: mod/message.php:414 mod/photos.php:1461 src/Object/Post.php:410
+#: 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:873
+#: include/conversation.php:762
 msgid "remove"
 msgstr ""
 
-#: include/conversation.php:877
+#: include/conversation.php:766
 msgid "Delete Selected Items"
 msgstr ""
 
-#: include/conversation.php:1022 view/theme/frio/theme.php:352
-msgid "Follow Thread"
-msgstr ""
-
-#: include/conversation.php:1023 src/Model/Contact.php:662
+#: include/conversation.php:867 src/Model/Contact.php:937
 msgid "View Status"
 msgstr ""
 
-#: include/conversation.php:1024 include/conversation.php:1040
-#: 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
+#: 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:1025 src/Model/Contact.php:664
+#: include/conversation.php:869 src/Model/Contact.php:939
 msgid "View Photos"
 msgstr ""
 
-#: include/conversation.php:1026 src/Model/Contact.php:665
+#: include/conversation.php:870 src/Model/Contact.php:931
+#: src/Model/Contact.php:940
 msgid "Network Posts"
 msgstr ""
 
-#: include/conversation.php:1027 src/Model/Contact.php:666
+#: include/conversation.php:871 src/Model/Contact.php:932
+#: src/Model/Contact.php:941
 msgid "View Contact"
 msgstr ""
 
-#: include/conversation.php:1028 src/Model/Contact.php:668
+#: include/conversation.php:872 src/Model/Contact.php:943
 msgid "Send PM"
 msgstr ""
 
-#: include/conversation.php:1032 src/Model/Contact.php:669
+#: include/conversation.php:876 src/Model/Contact.php:944
 msgid "Poke"
 msgstr ""
 
-#: include/conversation.php:1037 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:1156
+#: include/conversation.php:999
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: include/conversation.php:1159
+#: include/conversation.php:1002
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: include/conversation.php:1162
+#: include/conversation.php:1005
 #, php-format
 msgid "%s attends."
 msgstr ""
 
-#: include/conversation.php:1165
+#: include/conversation.php:1008
 #, php-format
 msgid "%s doesn't attend."
 msgstr ""
 
-#: include/conversation.php:1168
+#: include/conversation.php:1011
 #, php-format
 msgid "%s attends maybe."
 msgstr ""
 
-#: include/conversation.php:1179
+#: include/conversation.php:1022
 msgid "and"
 msgstr ""
 
-#: include/conversation.php:1185
+#: include/conversation.php:1028
 #, php-format
 msgid "and %d other people"
 msgstr ""
 
-#: include/conversation.php:1194
+#: include/conversation.php:1037
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr ""
 
-#: include/conversation.php:1195
+#: include/conversation.php:1038
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: include/conversation.php:1198
+#: include/conversation.php:1041
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr ""
 
-#: include/conversation.php:1199
+#: include/conversation.php:1042
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: include/conversation.php:1202
+#: include/conversation.php:1045
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend"
 msgstr ""
 
-#: include/conversation.php:1203
+#: include/conversation.php:1046
 #, php-format
 msgid "%s attend."
 msgstr ""
 
-#: include/conversation.php:1206
+#: include/conversation.php:1049
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't attend"
 msgstr ""
 
-#: include/conversation.php:1207
+#: include/conversation.php:1050
 #, php-format
 msgid "%s don't attend."
 msgstr ""
 
-#: include/conversation.php:1210
+#: include/conversation.php:1053
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend maybe"
 msgstr ""
 
-#: include/conversation.php:1211
+#: include/conversation.php:1054
 #, php-format
 msgid "%s attend maybe."
 msgstr ""
 
-#: include/conversation.php:1241 include/conversation.php:1257
+#: include/conversation.php:1084 include/conversation.php:1100
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: include/conversation.php:1242 include/conversation.php:1258
-#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:181
-#: mod/message.php:188 mod/message.php:324 mod/message.php:331
+#: 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 ""
 
-#: include/conversation.php:1243 include/conversation.php:1259
+#: include/conversation.php:1086 include/conversation.php:1102
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: include/conversation.php:1244 include/conversation.php:1260
+#: include/conversation.php:1087 include/conversation.php:1103
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: include/conversation.php:1245 include/conversation.php:1261
+#: include/conversation.php:1088 include/conversation.php:1104
 msgid "Tag term:"
 msgstr ""
 
-#: include/conversation.php:1246 include/conversation.php:1262 mod/filer.php:34
+#: include/conversation.php:1089 include/conversation.php:1105 mod/filer.php:34
 msgid "Save to Folder:"
 msgstr ""
 
-#: include/conversation.php:1247 include/conversation.php:1263
+#: include/conversation.php:1090 include/conversation.php:1106
 msgid "Where are you right now?"
 msgstr ""
 
-#: include/conversation.php:1248
+#: include/conversation.php:1091
 msgid "Delete item(s)?"
 msgstr ""
 
-#: include/conversation.php:1295
+#: include/conversation.php:1138
 msgid "New Post"
 msgstr ""
 
-#: include/conversation.php:1298
+#: include/conversation.php:1141
 msgid "Share"
 msgstr ""
 
-#: include/conversation.php:1299 mod/wallmessage.php:143 mod/editpost.php:111
-#: mod/message.php:243 mod/message.php:411
+#: 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:1300 mod/editpost.php:112
+#: include/conversation.php:1143 mod/editpost.php:102
 msgid "upload photo"
 msgstr ""
 
-#: include/conversation.php:1301 mod/editpost.php:113
+#: include/conversation.php:1144 mod/editpost.php:103
 msgid "Attach file"
 msgstr ""
 
-#: include/conversation.php:1302 mod/editpost.php:114
+#: include/conversation.php:1145 mod/editpost.php:104
 msgid "attach file"
 msgstr ""
 
-#: include/conversation.php:1303 mod/wallmessage.php:144 mod/editpost.php:115
-#: mod/message.php:244 mod/message.php:412
+#: 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:1304 mod/editpost.php:116
+#: include/conversation.php:1147 mod/editpost.php:106
 msgid "web link"
 msgstr ""
 
-#: include/conversation.php:1305 mod/editpost.php:117
+#: include/conversation.php:1148 mod/editpost.php:107
 msgid "Insert video link"
 msgstr ""
 
-#: include/conversation.php:1306 mod/editpost.php:118
+#: include/conversation.php:1149 mod/editpost.php:108
 msgid "video link"
 msgstr ""
 
-#: include/conversation.php:1307 mod/editpost.php:119
+#: include/conversation.php:1150 mod/editpost.php:109
 msgid "Insert audio link"
 msgstr ""
 
-#: include/conversation.php:1308 mod/editpost.php:120
+#: include/conversation.php:1151 mod/editpost.php:110
 msgid "audio link"
 msgstr ""
 
-#: include/conversation.php:1309 mod/editpost.php:121
+#: include/conversation.php:1152 mod/editpost.php:111
 msgid "Set your location"
 msgstr ""
 
-#: include/conversation.php:1310 mod/editpost.php:122
+#: include/conversation.php:1153 mod/editpost.php:112
 msgid "set location"
 msgstr ""
 
-#: include/conversation.php:1311 mod/editpost.php:123
+#: include/conversation.php:1154 mod/editpost.php:113
 msgid "Clear browser location"
 msgstr ""
 
-#: include/conversation.php:1312 mod/editpost.php:124
+#: include/conversation.php:1155 mod/editpost.php:114
 msgid "clear location"
 msgstr ""
 
-#: include/conversation.php:1314 mod/editpost.php:138
+#: include/conversation.php:1157 mod/editpost.php:129
 msgid "Set title"
 msgstr ""
 
-#: include/conversation.php:1316 mod/editpost.php:140
+#: include/conversation.php:1159 mod/editpost.php:131
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: include/conversation.php:1318 mod/editpost.php:126
+#: include/conversation.php:1161 mod/editpost.php:116
 msgid "Permission settings"
 msgstr ""
 
-#: include/conversation.php:1319 mod/editpost.php:155
+#: include/conversation.php:1162 mod/editpost.php:146
 msgid "permissions"
 msgstr ""
 
-#: include/conversation.php:1327 mod/editpost.php:135
+#: include/conversation.php:1171 mod/editpost.php:126
 msgid "Public post"
 msgstr ""
 
-#: include/conversation.php:1331 mod/editpost.php:146 mod/events.php:528
-#: mod/photos.php:1480 mod/photos.php:1519 mod/photos.php:1592
-#: src/Object/Post.php:813
+#: 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:1335 include/items.php:387 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:1340
+#: include/conversation.php:1184
 msgid "Post to Groups"
 msgstr ""
 
-#: include/conversation.php:1341
+#: include/conversation.php:1185
 msgid "Post to Contacts"
 msgstr ""
 
-#: include/conversation.php:1342
+#: include/conversation.php:1186
 msgid "Private post"
 msgstr ""
 
-#: include/conversation.php:1347 mod/editpost.php:153 src/Model/Profile.php:338
+#: include/conversation.php:1191 mod/editpost.php:144 src/Model/Profile.php:344
 msgid "Message"
 msgstr ""
 
-#: include/conversation.php:1348 mod/editpost.php:154
+#: include/conversation.php:1192 mod/editpost.php:145
 msgid "Browser"
 msgstr ""
 
-#: include/conversation.php:1615
+#: include/conversation.php:1463
 msgid "View all"
 msgstr ""
 
-#: include/conversation.php:1638
+#: include/conversation.php:1486
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:1641
+#: include/conversation.php:1489
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:1647
+#: include/conversation.php:1495
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/conversation.php:1650 src/Content/ContactSelector.php:125
+#: include/conversation.php:1498 src/Content/ContactSelector.php:122
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/items.php:342 mod/notice.php:22 mod/viewsrc.php:21 mod/admin.php:277
-#: mod/admin.php:1878 mod/admin.php:2126 mod/display.php:72 mod/display.php:255
-#: mod/display.php:356
-msgid "Item not found."
+#: include/security.php:83
+msgid "Welcome "
 msgstr ""
 
-#: include/items.php:382
-msgid "Do you really want to delete this item?"
+#: include/security.php:84
+msgid "Please upload a profile photo."
 msgstr ""
 
-#: include/items.php:384 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"
+#: include/security.php:86
+msgid "Welcome back "
 msgstr ""
 
-#: include/items.php:401 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/group.php:26
-#: mod/dfrn_confirm.php:68 mod/notifications.php:73 mod/profiles.php:182
-#: mod/profiles.php:513 mod/events.php:194 mod/item.php:160 mod/network.php:32
-#: mod/notes.php:30 mod/photos.php:174 mod/photos.php:1039 mod/register.php:54
-#: mod/settings.php:43 mod/settings.php:142 mod/settings.php:659 index.php:436
-msgid "Permission denied."
+#: 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/items.php:471 src/Content/Feature.php:96
-msgid "Archives"
+#: include/enotify.php:52
+msgid "Friendica Notification"
 msgstr ""
 
-#: include/items.php:477 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"
+#: include/enotify.php:55
+msgid "Thank You,"
 msgstr ""
 
-#: mod/allfriends.php:51
-msgid "No friends to display."
+#: include/enotify.php:58
+#, php-format
+msgid "%1$s, %2$s Administrator"
 msgstr ""
 
-#: 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/enotify.php:60
+#, php-format
+msgid "%s Administrator"
+msgstr ""
+
+#: include/enotify.php:123
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr ""
+
+#: include/enotify.php:125
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
+msgstr ""
+
+#: include/enotify.php:126
+msgid "a private message"
+msgstr ""
+
+#: include/enotify.php:126
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr ""
+
+#: include/enotify.php:128
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr ""
+
+#: include/enotify.php:161
+#, php-format
+msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
+msgstr ""
+
+#: include/enotify.php:169
+#, php-format
+msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
+msgstr ""
+
+#: include/enotify.php:179
+#, php-format
+msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
+msgstr ""
+
+#: include/enotify.php:191
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+msgstr ""
+
+#: include/enotify.php:193
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr ""
+
+#: 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 ""
+
+#: include/enotify.php:203
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr ""
+
+#: include/enotify.php:205
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr ""
+
+#: include/enotify.php:206
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr ""
+
+#: include/enotify.php:218
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr ""
+
+#: include/enotify.php:220
+#, php-format
+msgid "%1$s tagged you at %2$s"
+msgstr ""
+
+#: include/enotify.php:221
+#, php-format
+msgid "%1$s [url=%2$s]tagged you[/url]."
+msgstr ""
+
+#: include/enotify.php:233
+#, php-format
+msgid "[Friendica:Notify] %s shared a new post"
+msgstr ""
+
+#: include/enotify.php:235
+#, php-format
+msgid "%1$s shared a new post at %2$s"
+msgstr ""
+
+#: include/enotify.php:236
+#, php-format
+msgid "%1$s [url=%2$s]shared a post[/url]."
+msgstr ""
+
+#: include/enotify.php:248
+#, php-format
+msgid "[Friendica:Notify] %1$s poked you"
+msgstr ""
+
+#: include/enotify.php:250
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr ""
+
+#: include/enotify.php:251
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
+msgstr ""
+
+#: include/enotify.php:268
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr ""
+
+#: include/enotify.php:270
+#, php-format
+msgid "%1$s tagged your post at %2$s"
+msgstr ""
+
+#: include/enotify.php:271
+#, php-format
+msgid "%1$s tagged [url=%2$s]your post[/url]"
+msgstr ""
+
+#: include/enotify.php:283
+msgid "[Friendica:Notify] Introduction received"
+msgstr ""
+
+#: include/enotify.php:285
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr ""
+
+#: include/enotify.php:286
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr ""
+
+#: include/enotify.php:291 include/enotify.php:337
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr ""
+
+#: include/enotify.php:293
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr ""
+
+#: include/enotify.php:300
+msgid "[Friendica:Notify] A new person is sharing with you"
+msgstr ""
+
+#: include/enotify.php:302 include/enotify.php:303
+#, php-format
+msgid "%1$s is sharing with you at %2$s"
+msgstr ""
+
+#: include/enotify.php:310
+msgid "[Friendica:Notify] You have a new follower"
+msgstr ""
+
+#: include/enotify.php:312 include/enotify.php:313
+#, php-format
+msgid "You have a new follower at %2$s : %1$s"
+msgstr ""
+
+#: include/enotify.php:326
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr ""
+
+#: include/enotify.php:328
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr ""
+
+#: include/enotify.php:329
+#, php-format
+msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+msgstr ""
+
+#: include/enotify.php:335
+msgid "Name:"
+msgstr ""
+
+#: include/enotify.php:336
+msgid "Photo:"
+msgstr ""
+
+#: include/enotify.php:339
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr ""
+
+#: include/enotify.php:347 include/enotify.php:362
+msgid "[Friendica:Notify] Connection accepted"
+msgstr ""
+
+#: include/enotify.php:349 include/enotify.php:364
+#, php-format
+msgid "'%1$s' has accepted your connection request at %2$s"
+msgstr ""
+
+#: include/enotify.php:350 include/enotify.php:365
+#, php-format
+msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
+msgstr ""
+
+#: include/enotify.php:355
+msgid ""
+"You are now mutual friends and may exchange status updates, photos, and "
+"email without restriction."
+msgstr ""
+
+#: include/enotify.php:357
+#, php-format
+msgid "Please visit %s if you wish to make any changes to this relationship."
+msgstr ""
+
+#: 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 ""
+
+#: 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:374
+#, php-format
+msgid "Please visit %s  if you wish to make any changes to this relationship."
+msgstr ""
+
+#: include/enotify.php:384 mod/removeme.php:47
+msgid "[Friendica System Notify]"
+msgstr ""
+
+#: include/enotify.php:384
+msgid "registration request"
+msgstr ""
+
+#: include/enotify.php:386
+#, php-format
+msgid "You've received a registration request from '%1$s' at %2$s"
+msgstr ""
+
+#: include/enotify.php:387
+#, php-format
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
+msgstr ""
+
+#: include/enotify.php:392
+#, php-format
+msgid ""
+"Full Name:\t%s\n"
+"Site Location:\t%s\n"
+"Login Name:\t%s (%s)"
+msgstr ""
+
+#: include/enotify.php:398
+#, php-format
+msgid "Please visit %s to approve or reject the request."
+msgstr ""
+
+#: include/text.php:302
+msgid "newer"
+msgstr ""
+
+#: include/text.php:303
+msgid "older"
+msgstr ""
+
+#: include/text.php:308
+msgid "first"
+msgstr ""
+
+#: include/text.php:309
+msgid "prev"
+msgstr ""
+
+#: include/text.php:343
+msgid "next"
+msgstr ""
+
+#: include/text.php:344
+msgid "last"
+msgstr ""
+
+#: include/text.php:398
+msgid "Loading more entries..."
+msgstr ""
+
+#: include/text.php:399
+msgid "The end"
+msgstr ""
+
+#: include/text.php:767
+msgid "No contacts"
+msgstr ""
+
+#: include/text.php:791
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/text.php:804
+msgid "View Contacts"
+msgstr ""
+
+#: include/text.php:889 mod/filer.php:35 mod/editpost.php:100 mod/notes.php:54
+msgid "Save"
+msgstr ""
+
+#: include/text.php:889
+msgid "Follow"
+msgstr ""
+
+#: include/text.php:895 mod/search.php:162 src/Content/Nav.php:142
+msgid "Search"
+msgstr ""
+
+#: include/text.php:898 src/Content/Nav.php:58
+msgid "@name, !forum, #tags, content"
+msgstr ""
+
+#: include/text.php:904 src/Content/Nav.php:145
+msgid "Full Text"
+msgstr ""
+
+#: include/text.php:905 src/Content/Nav.php:146
+#: src/Content/Widget/TagCloud.php:53
+msgid "Tags"
+msgstr ""
+
+#: include/text.php:953
+msgid "poke"
+msgstr ""
+
+#: include/text.php:953
+msgid "poked"
+msgstr ""
+
+#: include/text.php:954
+msgid "ping"
+msgstr ""
+
+#: include/text.php:954
+msgid "pinged"
+msgstr ""
+
+#: include/text.php:955
+msgid "prod"
+msgstr ""
+
+#: include/text.php:955
+msgid "prodded"
+msgstr ""
+
+#: include/text.php:956
+msgid "slap"
+msgstr ""
+
+#: include/text.php:956
+msgid "slapped"
+msgstr ""
+
+#: include/text.php:957
+msgid "finger"
+msgstr ""
+
+#: include/text.php:957
+msgid "fingered"
+msgstr ""
+
+#: include/text.php:958
+msgid "rebuff"
+msgstr ""
+
+#: include/text.php:958
+msgid "rebuffed"
+msgstr ""
+
+#: include/text.php:972 mod/settings.php:941 src/Model/Event.php:388
+msgid "Monday"
+msgstr ""
+
+#: include/text.php:972 src/Model/Event.php:389
+msgid "Tuesday"
+msgstr ""
+
+#: include/text.php:972 src/Model/Event.php:390
+msgid "Wednesday"
+msgstr ""
+
+#: include/text.php:972 src/Model/Event.php:391
+msgid "Thursday"
+msgstr ""
+
+#: include/text.php:972 src/Model/Event.php:392
+msgid "Friday"
+msgstr ""
+
+#: include/text.php:972 src/Model/Event.php:393
+msgid "Saturday"
+msgstr ""
+
+#: include/text.php:972 mod/settings.php:941 src/Model/Event.php:387
+msgid "Sunday"
+msgstr ""
+
+#: include/text.php:976 src/Model/Event.php:408
+msgid "January"
+msgstr ""
+
+#: include/text.php:976 src/Model/Event.php:409
+msgid "February"
+msgstr ""
+
+#: include/text.php:976 src/Model/Event.php:410
+msgid "March"
+msgstr ""
+
+#: include/text.php:976 src/Model/Event.php:411
+msgid "April"
+msgstr ""
+
+#: include/text.php:976 include/text.php:993 src/Model/Event.php:399
+#: src/Model/Event.php:412
+msgid "May"
+msgstr ""
+
+#: include/text.php:976 src/Model/Event.php:413
+msgid "June"
+msgstr ""
+
+#: include/text.php:976 src/Model/Event.php:414
+msgid "July"
+msgstr ""
+
+#: include/text.php:976 src/Model/Event.php:415
+msgid "August"
+msgstr ""
+
+#: include/text.php:976 src/Model/Event.php:416
+msgid "September"
+msgstr ""
+
+#: include/text.php:976 src/Model/Event.php:417
+msgid "October"
+msgstr ""
+
+#: include/text.php:976 src/Model/Event.php:418
+msgid "November"
+msgstr ""
+
+#: include/text.php:976 src/Model/Event.php:419
+msgid "December"
+msgstr ""
+
+#: include/text.php:990 src/Model/Event.php:380
+msgid "Mon"
+msgstr ""
+
+#: include/text.php:990 src/Model/Event.php:381
+msgid "Tue"
+msgstr ""
+
+#: include/text.php:990 src/Model/Event.php:382
+msgid "Wed"
+msgstr ""
+
+#: include/text.php:990 src/Model/Event.php:383
+msgid "Thu"
+msgstr ""
+
+#: include/text.php:990 src/Model/Event.php:384
+msgid "Fri"
+msgstr ""
+
+#: include/text.php:990 src/Model/Event.php:385
+msgid "Sat"
+msgstr ""
+
+#: include/text.php:990 src/Model/Event.php:379
+msgid "Sun"
+msgstr ""
+
+#: include/text.php:993 src/Model/Event.php:395
+msgid "Jan"
+msgstr ""
+
+#: include/text.php:993 src/Model/Event.php:396
+msgid "Feb"
+msgstr ""
+
+#: include/text.php:993 src/Model/Event.php:397
+msgid "Mar"
+msgstr ""
+
+#: include/text.php:993 src/Model/Event.php:398
+msgid "Apr"
+msgstr ""
+
+#: include/text.php:993 src/Model/Event.php:401
+msgid "Jul"
+msgstr ""
+
+#: include/text.php:993 src/Model/Event.php:402
+msgid "Aug"
+msgstr ""
+
+#: include/text.php:993
+msgid "Sep"
+msgstr ""
+
+#: include/text.php:993 src/Model/Event.php:404
+msgid "Oct"
+msgstr ""
+
+#: include/text.php:993 src/Model/Event.php:405
+msgid "Nov"
+msgstr ""
+
+#: include/text.php:993 src/Model/Event.php:406
+msgid "Dec"
+msgstr ""
+
+#: include/text.php:1139
+#, php-format
+msgid "Content warning: %s"
+msgstr ""
+
+#: include/text.php:1204 mod/videos.php:375
+msgid "View Video"
+msgstr ""
+
+#: include/text.php:1221
+msgid "bytes"
+msgstr ""
+
+#: include/text.php:1254 include/text.php:1265 include/text.php:1300
+msgid "Click to open/close"
+msgstr ""
+
+#: include/text.php:1415
+msgid "View on separate page"
+msgstr ""
+
+#: include/text.php:1416
+msgid "view on separate page"
+msgstr ""
+
+#: include/text.php:1421 include/text.php:1428 src/Model/Event.php:609
+msgid "link to source"
+msgstr ""
+
+#: include/text.php:1615
+msgid "activity"
+msgstr ""
+
+#: include/text.php:1617 src/Object/Post.php:428 src/Object/Post.php:440
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/text.php:1620
+msgid "post"
+msgstr ""
+
+#: include/text.php:1775
+msgid "Item filed"
+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] ""
+msgstr[1] ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: include/api.php:1166
+#, php-format
+msgid "Monthly posting limit of %d post reached. The post was rejected."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: mod/crepair.php:163
+msgid "Account URL"
+msgstr ""
+
+#: mod/crepair.php:164
+msgid "Friend Request URL"
+msgstr ""
+
+#: mod/crepair.php:165
+msgid "Friend Confirm URL"
+msgstr ""
+
+#: mod/crepair.php:166
+msgid "Notification Endpoint URL"
+msgstr ""
+
+#: mod/crepair.php:167
+msgid "Poll/Feed URL"
+msgstr ""
+
+#: mod/crepair.php:168
+msgid "New photo from this URL"
+msgstr ""
+
+#: mod/wallmessage.php:49 mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: mod/install.php:121
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr ""
+
+#: mod/install.php:122 mod/install.php:166 mod/install.php:274
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: mod/dirfind.php:64
+#, php-format
+msgid "Forum Search - %s"
+msgstr ""
+
+#: 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"
+#: 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:"
+#: 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?"
+"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 ""
+
+#: mod/settings.php:679 mod/settings.php:705
+msgid "Consumer Secret"
+msgstr ""
+
+#: mod/settings.php:680 mod/settings.php:706
+msgid "Redirect"
+msgstr ""
+
+#: mod/settings.php:681 mod/settings.php:707
+msgid "Icon url"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: mod/settings.php:804
+msgid "GNU Social (OStatus)"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: mod/settings.php:850
+msgid "Your legacy GNU Social account"
+msgstr ""
+
+#: 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 ""
+
+#: mod/settings.php:853
+msgid "Repair OStatus subscriptions"
+msgstr ""
+
+#: 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 ""
+
+#: mod/settings.php:862
+msgid "IMAP port:"
+msgstr ""
+
+#: 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 ""
+
+#: mod/settings.php:914
+#, php-format
+msgid "%s - (Experimental)"
+msgstr ""
+
+#: 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 ""
+
+#: mod/settings.php:966
+msgid "Minimum of 10 seconds. Enter -1 to disable it."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: mod/settings.php:1092
+msgid "(Optional) Allow this OpenID to login to this account."
+msgstr ""
+
+#: 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. "
+#: mod/settings.php:1106
+msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: mod/apps.php:19
-msgid "Applications"
+#: 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."
+#: 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."
+#: 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."
+#: 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 ""
+
+#: 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 ""
+
+#: mod/settings.php:1137
+msgid "Profile is <strong>not published</strong>."
+msgstr ""
+
+#: mod/settings.php:1143
+#, php-format
+msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: mod/ping.php:305
+msgid "{0} sent you a message"
+msgstr ""
+
+#: mod/ping.php:321
+msgid "{0} requested registration"
+msgstr ""
+
+#: 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 ""
+
+#: 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"
+#: 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!"
+"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] ""
+msgstr[1] ""
+
+#: mod/network.php:551
+msgid "Messages in this group won't be send to these receivers."
 msgstr ""
 
-#: mod/fbrowser.php:34 view/theme/frio/theme.php:261 src/Content/Nav.php:102
-#: src/Model/Profile.php:902
-msgid "Photos"
+#: mod/network.php:620
+msgid "No such group"
 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:1647 mod/photos.php:1661 src/Model/Photo.php:244
-#: src/Model/Photo.php:253
-msgid "Contact Photos"
+#: mod/network.php:641 mod/group.php:247
+msgid "Group is empty"
 msgstr ""
 
-#: mod/fbrowser.php:105 mod/fbrowser.php:136 mod/profile_photo.php:250
-msgid "Upload"
+#: mod/network.php:645
+#, php-format
+msgid "Group: %s"
 msgstr ""
 
-#: mod/fbrowser.php:131
-msgid "Files"
+#: mod/network.php:671
+msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: 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"
+#: mod/network.php:674
+msgid "Invalid contact."
 msgstr ""
 
-#: mod/hcard.php:18
+#: 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 ""
+
+#: mod/repair_ostatus.php:21
+msgid "Resubscribing to OStatus contacts"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: mod/register.php:222
+msgid "Your OpenID (optional): "
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: mod/message.php:418
+msgid "Send Reply"
+msgstr ""
+
+#: mod/message.php:469
+#, php-format
+msgid "Unknown sender - %s"
+msgstr ""
+
+#: mod/message.php:471
+#, php-format
+msgid "You and %s"
+msgstr ""
+
+#: mod/message.php:473
+#, php-format
+msgid "%s and You"
+msgstr ""
+
+#: mod/message.php:501
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/hcard.php:19
 msgid "No profile"
 msgstr ""
 
+#: mod/ostatus_subscribe.php:22
+msgid "Subscribing to OStatus contacts"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
 
-#: mod/lockview.php:38 mod/lockview.php:46
-msgid "Remote privacy information not available."
+#: mod/suggest.php:38
+msgid "Do you really want to delete this suggestion?"
 msgstr ""
 
-#: mod/lockview.php:55
-msgid "Visible to:"
+#: mod/suggest.php:74
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
 msgstr ""
 
-#: mod/maintenance.php:24
-msgid "System down for maintenance"
+#: 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 ""
+
+#: mod/friendica.php:88
+msgid "Bug reports and issues: please visit"
+msgstr ""
+
+#: mod/friendica.php:88
+msgid "the bugtracker at github"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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
@@ -1330,11 +3880,6 @@ msgid ""
 "join."
 msgstr ""
 
-#: mod/newmember.php:19 mod/admin.php:1930 mod/admin.php:2199
-#: 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 ""
@@ -1354,14 +3899,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 ""
 
@@ -1444,7 +3982,7 @@ msgid ""
 "hours."
 msgstr ""
 
-#: mod/newmember.php:43 src/Model/Group.php:414
+#: mod/newmember.php:43 src/Model/Group.php:402
 msgid "Groups"
 msgstr ""
 
@@ -1484,1233 +4022,15 @@ msgid ""
 "features and resources."
 msgstr ""
 
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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/update_community.php:27 mod/update_display.php:27
-#: mod/update_notes.php:40 mod/update_profile.php:39 mod/update_network.php:33
-msgid "[Embedded content - reload page to view]"
-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 ""
-
-#: 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 ""
-
-#: 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/profiles.php:579
-#: mod/events.php:530 mod/photos.php:1068 mod/photos.php:1148
-#: mod/photos.php:1433 mod/photos.php:1479 mod/photos.php:1518
-#: mod/photos.php:1591 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: mod/localtime.php:39
-#, php-format
-msgid "UTC time: %s"
-msgstr ""
-
-#: mod/localtime.php:42
-#, php-format
-msgid "Current timezone: %s"
-msgstr ""
-
-#: mod/localtime.php:46
-#, php-format
-msgid "Converted localtime: %s"
-msgstr ""
-
-#: 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 ""
-
-#: mod/ping.php:307
-msgid "{0} sent you a message"
-msgstr ""
-
-#: mod/ping.php:322
-msgid "{0} requested registration"
-msgstr ""
-
-#: 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/dfrn_request.php:602 mod/community.php:27
-#: 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 ""
-
-#: mod/regmod.php:102
-msgid "Please login."
-msgstr ""
-
-#: mod/subthread.php:113
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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] ""
-msgstr[1] ""
-
-#: 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 ""
-
-#: mod/contacts.php:523
-#, php-format
-msgid "You are sharing with %s"
-msgstr ""
-
-#: mod/contacts.php:527
-#, php-format
-msgid "%s is sharing with you"
-msgstr ""
-
-#: 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 ""
-
-#: 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:1283 mod/admin.php:1445
-#: mod/admin.php:1455
-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 ""
-
-#: 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 ""
-
-#: 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:1824
-msgid "Unblock"
-msgstr ""
-
-#: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:488 mod/admin.php:1823
-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 ""
-
-#: 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/notifications.php:256 mod/admin.php:494 mod/admin.php:504
-msgid "Profile URL"
-msgstr ""
-
-#: mod/contacts.php:660 mod/directory.php:148 mod/notifications.php:246
-#: mod/events.php:518 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 ""
-
-#: 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:1358 mod/events.php:532
-#: 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:1476 mod/photos.php:1515
-#: mod/photos.php:1588 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:1353 mod/admin.php:1989
-#: mod/admin.php:2242 mod/admin.php:2316 mod/admin.php:2463
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: mod/dirfind.php:60
-#, php-format
-msgid "Forum Search - %s"
-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 ""
-
-#: mod/follow.php:90
-msgid "OStatus support is disabled. Contact can't be added."
-msgstr ""
-
-#: 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 ""
-
-#: 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"
@@ -2728,7 +4048,7 @@ msgid ""
 "\t\tissued this request."
 msgstr ""
 
-#: mod/lostpass.php:56
+#: mod/lostpass.php:57
 #, php-format
 msgid ""
 "\n"
@@ -2746,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 ""
 
-#: 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 ""
 
-#: mod/lostpass.php:149
+#: mod/lostpass.php:152
 #, php-format
 msgid ""
 "\n"
@@ -2816,7 +4136,7 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: mod/lostpass.php:155
+#: mod/lostpass.php:158
 #, php-format
 msgid ""
 "\n"
@@ -2831,7 +4151,7 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: mod/lostpass.php:169
+#: mod/lostpass.php:174
 #, php-format
 msgid "Your password has been changed at %s"
 msgstr ""
@@ -2912,542 +4232,1821 @@ msgstr ""
 msgid "HTML"
 msgstr ""
 
-#: mod/friendica.php:77
-msgid "This is Friendica, version"
+#: mod/admin.php:109
+msgid "Theme settings updated."
 msgstr ""
 
-#: mod/friendica.php:78
-msgid "running at web location"
+#: mod/admin.php:182 src/Content/Nav.php:175
+msgid "Information"
 msgstr ""
 
-#: mod/friendica.php:82
+#: mod/admin.php:183
+msgid "Overview"
+msgstr ""
+
+#: mod/admin.php:184 mod/admin.php:723
+msgid "Federation Statistics"
+msgstr ""
+
+#: mod/admin.php:185
+msgid "Configuration"
+msgstr ""
+
+#: mod/admin.php:186 mod/admin.php:1425
+msgid "Site"
+msgstr ""
+
+#: mod/admin.php:187 mod/admin.php:1354 mod/admin.php:1896 mod/admin.php:1913
+msgid "Users"
+msgstr ""
+
+#: mod/admin.php:189 mod/admin.php:2283 mod/admin.php:2327
+msgid "Themes"
+msgstr ""
+
+#: mod/admin.php:192
+msgid "Database"
+msgstr ""
+
+#: mod/admin.php:193
+msgid "DB updates"
+msgstr ""
+
+#: mod/admin.php:194 mod/admin.php:766
+msgid "Inspect Queue"
+msgstr ""
+
+#: mod/admin.php:195
+msgid "Inspect worker Queue"
+msgstr ""
+
+#: mod/admin.php:196
+msgid "Tools"
+msgstr ""
+
+#: mod/admin.php:197
+msgid "Contact Blocklist"
+msgstr ""
+
+#: mod/admin.php:198 mod/admin.php:372
+msgid "Server Blocklist"
+msgstr ""
+
+#: mod/admin.php:199 mod/admin.php:531
+msgid "Delete Item"
+msgstr ""
+
+#: mod/admin.php:200 mod/admin.php:201 mod/admin.php:2402
+msgid "Logs"
+msgstr ""
+
+#: mod/admin.php:202 mod/admin.php:2469
+msgid "View Logs"
+msgstr ""
+
+#: mod/admin.php:204
+msgid "Diagnostics"
+msgstr ""
+
+#: mod/admin.php:205
+msgid "PHP Info"
+msgstr ""
+
+#: mod/admin.php:206
+msgid "probe address"
+msgstr ""
+
+#: mod/admin.php:207
+msgid "check webfinger"
+msgstr ""
+
+#: mod/admin.php:226 src/Content/Nav.php:218
+msgid "Admin"
+msgstr ""
+
+#: mod/admin.php:227
+msgid "Addon Features"
+msgstr ""
+
+#: mod/admin.php:228
+msgid "User registrations waiting for confirmation"
+msgstr ""
+
+#: 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:311
+msgid "Display Terms of Service"
+msgstr ""
+
+#: mod/admin.php:311
 msgid ""
-"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
-"about the Friendica project."
+"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/friendica.php:86
-msgid "Bug reports and issues: please visit"
+#: mod/admin.php:312
+msgid "Display Privacy Statement"
 msgstr ""
 
-#: mod/friendica.php:86
-msgid "the bugtracker at github"
-msgstr ""
-
-#: mod/friendica.php:89
+#: mod/admin.php:312
+#, php-format
 msgid ""
-"Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
+"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/friendica.php:103
-msgid "Installed addons/apps:"
+#: mod/admin.php:313
+msgid "Privacy Statement Preview"
 msgstr ""
 
-#: mod/friendica.php:117
-msgid "No installed addons/apps"
+#: mod/admin.php:315
+msgid "The Terms of Service"
 msgstr ""
 
-#: mod/friendica.php:122
+#: 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:363
+msgid "The blocked domain"
+msgstr ""
+
+#: mod/admin.php:364 mod/admin.php:377
+msgid "The reason why you blocked this domain."
+msgstr ""
+
+#: mod/admin.php:365
+msgid "Delete domain"
+msgstr ""
+
+#: mod/admin.php:365
+msgid "Check to delete this entry from the blocklist"
+msgstr ""
+
+#: 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 ""
+
+#: 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:375
+msgid "Add new entry to block list"
+msgstr ""
+
+#: mod/admin.php:376
+msgid "Server Domain"
+msgstr ""
+
+#: 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:377
+msgid "Block reason"
+msgstr ""
+
+#: mod/admin.php:378
+msgid "Add Entry"
+msgstr ""
+
+#: mod/admin.php:379
+msgid "Save changes to the blocklist"
+msgstr ""
+
+#: mod/admin.php:380
+msgid "Current Entries in the Blocklist"
+msgstr ""
+
+#: mod/admin.php:383
+msgid "Delete entry from blocklist"
+msgstr ""
+
+#: mod/admin.php:386
+msgid "Delete entry from blocklist?"
+msgstr ""
+
+#: mod/admin.php:412
+msgid "Server added to blocklist."
+msgstr ""
+
+#: mod/admin.php:428
+msgid "Site blocklist updated."
+msgstr ""
+
+#: mod/admin.php:451 src/Core/Console/GlobalCommunityBlock.php:68
+msgid "The contact has been blocked from the node"
+msgstr ""
+
+#: mod/admin.php:453 src/Core/Console/GlobalCommunityBlock.php:65
 #, php-format
-msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
+msgid "Could not find any contact entry for this URL (%s)"
 msgstr ""
 
-#: mod/friendica.php:127
-msgid "On this server the following remote servers are blocked."
-msgstr ""
-
-#: mod/friendica.php:128 mod/dfrn_request.php:347 mod/admin.php:357
-#: mod/admin.php:375 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
+#: mod/admin.php:460
 #, php-format
-msgid "%s : Not a valid email address."
-msgstr ""
-
-#: mod/invite.php:87
-msgid "Please join us on Friendica"
-msgstr ""
-
-#: 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 ""
-
-#: mod/invite.php:104
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
+msgid "%s contact unblocked"
+msgid_plural "%s contacts unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/invite.php:122
-msgid "You have no more invitations available"
+#: mod/admin.php:489
+msgid "Remote Contact Blocklist"
 msgstr ""
 
-#: mod/invite.php:130
+#: 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:491
+msgid "Block Remote Contact"
+msgstr ""
+
+#: mod/admin.php:492 mod/admin.php:1898
+msgid "select all"
+msgstr ""
+
+#: mod/admin.php:493
+msgid "select none"
+msgstr ""
+
+#: 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:498
+msgid "Blocked Remote Contacts"
+msgstr ""
+
+#: mod/admin.php:499
+msgid "Block New Remote Contact"
+msgstr ""
+
+#: mod/admin.php:500
+msgid "Photo"
+msgstr ""
+
+#: mod/admin.php:500 mod/profiles.php:391
+msgid "Address"
+msgstr ""
+
+#: mod/admin.php:508
 #, 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 ""
-
-#: mod/invite.php:132
-#, php-format
-msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
-msgstr ""
-
-#: mod/invite.php: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 ""
-
-#: 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 ""
-
-#: mod/invite.php:140
-#, php-format
-msgid "To accept this invitation, please visit and register at %s."
-msgstr ""
-
-#: 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 ""
-
-#: mod/invite.php:151
-msgid "You will need to supply this invitation code: $invite_code"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: mod/crepair.php:158 mod/admin.php:494 mod/admin.php:1806 mod/admin.php:1817
-#: mod/admin.php:1830 mod/admin.php:1846 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 ""
-
-#: mod/crepair.php:161
-msgid "Account URL"
-msgstr ""
-
-#: mod/crepair.php:162
-msgid "Friend Request URL"
-msgstr ""
-
-#: mod/crepair.php:163
-msgid "Friend Confirm URL"
-msgstr ""
-
-#: mod/crepair.php:164
-msgid "Notification Endpoint URL"
-msgstr ""
-
-#: mod/crepair.php:165
-msgid "Poll/Feed URL"
-msgstr ""
-
-#: mod/crepair.php:166
-msgid "New photo from this URL"
-msgstr ""
-
-#: mod/dfrn_poll.php:123 mod/dfrn_poll.php:539
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: mod/install.php:108
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr ""
-
-#: mod/install.php:109 mod/install.php:155 mod/install.php:267
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: mod/install.php:265
-msgid "<h1>What next</h1>"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: mod/message.php:401
-msgid "Send Reply"
-msgstr ""
-
-#: mod/message.php:452
-#, php-format
-msgid "Unknown sender - %s"
-msgstr ""
-
-#: mod/message.php:454
-#, php-format
-msgid "You and %s"
-msgstr ""
-
-#: mod/message.php:456
-#, php-format
-msgid "%s and You"
-msgstr ""
-
-#: mod/message.php:484
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
+msgid "%s total blocked contact"
+msgid_plural "%s total blocked contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/group.php:36
-msgid "Group created."
+#: mod/admin.php:510
+msgid "URL of the remote contact to block."
 msgstr ""
 
-#: mod/group.php:42
-msgid "Could not create group."
+#: mod/admin.php:532
+msgid "Delete this Item"
 msgstr ""
 
-#: mod/group.php:56 mod/group.php:157
-msgid "Group not found."
+#: 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/group.php:70
-msgid "Group name changed."
+#: 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/group.php:97
-msgid "Save Group"
+#: mod/admin.php:535
+msgid "GUID"
 msgstr ""
 
-#: mod/group.php:102
-msgid "Create a group of contacts/friends."
+#: mod/admin.php:535
+msgid "The GUID of the item you want to delete."
 msgstr ""
 
-#: mod/group.php:103 mod/group.php:199 src/Model/Group.php:421
-msgid "Group Name: "
+#: mod/admin.php:569
+msgid "Item marked for deletion."
 msgstr ""
 
-#: mod/group.php:127
-msgid "Group removed."
+#: mod/admin.php:640
+msgid "unknown"
 msgstr ""
 
-#: mod/group.php:129
-msgid "Unable to remove group."
+#: 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/group.php:192
-msgid "Delete Group"
+#: 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/group.php:198
-msgid "Group Editor"
+#: 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/group.php:203
-msgid "Edit Group Name"
+#: mod/admin.php:768 mod/admin.php:809
+msgid "ID"
 msgstr ""
 
-#: mod/group.php:213
-msgid "Members"
+#: mod/admin.php:769
+msgid "Recipient Name"
 msgstr ""
 
-#: mod/group.php:216 mod/network.php:639
-msgid "Group is empty"
+#: mod/admin.php:770
+msgid "Recipient Profile"
 msgstr ""
 
-#: mod/group.php:229
-msgid "Remove contact from group"
+#: mod/admin.php:772 mod/admin.php:811
+msgid "Created"
 msgstr ""
 
-#: mod/group.php:253
-msgid "Add contact to group"
+#: mod/admin.php:773
+msgid "Last Tried"
+msgstr ""
+
+#: 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: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 "
+"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 ""
+
+#: 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 ""
+
+#: 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:860
+msgid "The worker was never executed. Please check your database structure!"
+msgstr ""
+
+#: 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: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:883
+msgid "Automatic Follower Account"
+msgstr ""
+
+#: mod/admin.php:884
+msgid "Public Forum Account"
+msgstr ""
+
+#: mod/admin.php:885
+msgid "Automatic Friend Account"
+msgstr ""
+
+#: mod/admin.php:886
+msgid "Blog Account"
+msgstr ""
+
+#: mod/admin.php:887
+msgid "Private Forum Account"
+msgstr ""
+
+#: mod/admin.php:909
+msgid "Message queues"
+msgstr ""
+
+#: mod/admin.php:915
+msgid "Summary"
+msgstr ""
+
+#: mod/admin.php:917
+msgid "Registered users"
+msgstr ""
+
+#: mod/admin.php:919
+msgid "Pending registrations"
+msgstr ""
+
+#: mod/admin.php:920
+msgid "Version"
+msgstr ""
+
+#: mod/admin.php:925
+msgid "Active addons"
+msgstr ""
+
+#: mod/admin.php:956
+msgid "Can not parse base url. Must have at least <scheme>://<domain>"
+msgstr ""
+
+#: mod/admin.php:1289
+msgid "Site settings updated."
+msgstr ""
+
+#: mod/admin.php:1345
+msgid "No community page for local users"
+msgstr ""
+
+#: mod/admin.php:1346
+msgid "No community page"
+msgstr ""
+
+#: mod/admin.php:1347
+msgid "Public postings from users of this site"
+msgstr ""
+
+#: mod/admin.php:1348
+msgid "Public postings from the federated network"
+msgstr ""
+
+#: mod/admin.php:1349
+msgid "Public postings from local users and the federated network"
+msgstr ""
+
+#: 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:1356
+msgid "Users, Global Contacts/fallback"
+msgstr ""
+
+#: mod/admin.php:1360
+msgid "One month"
+msgstr ""
+
+#: mod/admin.php:1361
+msgid "Three months"
+msgstr ""
+
+#: mod/admin.php:1362
+msgid "Half a year"
+msgstr ""
+
+#: mod/admin.php:1363
+msgid "One year"
+msgstr ""
+
+#: mod/admin.php:1368
+msgid "Multi user instance"
+msgstr ""
+
+#: mod/admin.php:1394
+msgid "Closed"
+msgstr ""
+
+#: mod/admin.php:1395
+msgid "Requires approval"
+msgstr ""
+
+#: mod/admin.php:1396
+msgid "Open"
+msgstr ""
+
+#: mod/admin.php:1400
+msgid "No SSL policy, links will track page SSL state"
+msgstr ""
+
+#: mod/admin.php:1401
+msgid "Force all links to use SSL"
+msgstr ""
+
+#: mod/admin.php:1402
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr ""
+
+#: mod/admin.php:1406
+msgid "Don't check"
+msgstr ""
+
+#: mod/admin.php:1407
+msgid "check the stable version"
+msgstr ""
+
+#: mod/admin.php:1408
+msgid "check the development version"
+msgstr ""
+
+#: mod/admin.php:1427
+msgid "Republish users to directory"
+msgstr ""
+
+#: mod/admin.php:1429
+msgid "File upload"
+msgstr ""
+
+#: mod/admin.php:1430
+msgid "Policies"
+msgstr ""
+
+#: 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:1433
+msgid "Performance"
+msgstr ""
+
+#: mod/admin.php:1434
+msgid "Worker"
+msgstr ""
+
+#: mod/admin.php:1435
+msgid "Message Relay"
+msgstr ""
+
+#: mod/admin.php:1436
+msgid ""
+"Relocate - WARNING: advanced function. Could make this server unreachable."
+msgstr ""
+
+#: mod/admin.php:1439
+msgid "Site name"
+msgstr ""
+
+#: mod/admin.php:1440
+msgid "Host name"
+msgstr ""
+
+#: mod/admin.php:1441
+msgid "Sender Email"
+msgstr ""
+
+#: mod/admin.php:1441
+msgid ""
+"The email address your server shall use to send notification emails from."
+msgstr ""
+
+#: mod/admin.php:1442
+msgid "Banner/Logo"
+msgstr ""
+
+#: mod/admin.php:1443
+msgid "Shortcut icon"
+msgstr ""
+
+#: mod/admin.php:1443
+msgid "Link to an icon that will be used for browsers."
+msgstr ""
+
+#: mod/admin.php:1444
+msgid "Touch icon"
+msgstr ""
+
+#: mod/admin.php:1444
+msgid "Link to an icon that will be used for tablets and mobiles."
+msgstr ""
+
+#: mod/admin.php:1445
+msgid "Additional Info"
+msgstr ""
+
+#: 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:1446
+msgid "System language"
+msgstr ""
+
+#: mod/admin.php:1447
+msgid "System theme"
+msgstr ""
+
+#: mod/admin.php:1447
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr ""
+
+#: mod/admin.php:1448
+msgid "Mobile system theme"
+msgstr ""
+
+#: mod/admin.php:1448
+msgid "Theme for mobile devices"
+msgstr ""
+
+#: mod/admin.php:1449
+msgid "SSL link policy"
+msgstr ""
+
+#: mod/admin.php:1449
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr ""
+
+#: mod/admin.php:1450
+msgid "Force SSL"
+msgstr ""
+
+#: mod/admin.php:1450
+msgid ""
+"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
+"to endless loops."
+msgstr ""
+
+#: mod/admin.php:1451
+msgid "Hide help entry from navigation menu"
+msgstr ""
+
+#: 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 ""
+
+#: mod/admin.php:1452
+msgid "Single user instance"
+msgstr ""
+
+#: mod/admin.php:1452
+msgid "Make this instance multi-user or single-user for the named user"
+msgstr ""
+
+#: mod/admin.php:1453
+msgid "Maximum image size"
+msgstr ""
+
+#: mod/admin.php:1453
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr ""
+
+#: mod/admin.php:1454
+msgid "Maximum image length"
+msgstr ""
+
+#: mod/admin.php:1454
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
+msgstr ""
+
+#: mod/admin.php:1455
+msgid "JPEG image quality"
+msgstr ""
+
+#: mod/admin.php:1455
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
+msgstr ""
+
+#: mod/admin.php:1457
+msgid "Register policy"
+msgstr ""
+
+#: mod/admin.php:1458
+msgid "Maximum Daily Registrations"
+msgstr ""
+
+#: 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:1459
+msgid "Register text"
+msgstr ""
+
+#: mod/admin.php:1459
+msgid ""
+"Will be displayed prominently on the registration page. You can use BBCode "
+"here."
+msgstr ""
+
+#: 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 ""
+
+#: mod/admin.php:1461
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr ""
+
+#: mod/admin.php:1462
+msgid "Allowed friend domains"
+msgstr ""
+
+#: 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:1463
+msgid "Allowed email domains"
+msgstr ""
+
+#: 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:1464
+msgid "No OEmbed rich content"
+msgstr ""
+
+#: 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:1465
+msgid "Allowed OEmbed domains"
+msgstr ""
+
+#: 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:1466
+msgid "Block public"
+msgstr ""
+
+#: 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:1467
+msgid "Force publish"
+msgstr ""
+
+#: mod/admin.php:1467
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr ""
+
+#: mod/admin.php:1467
+msgid "Enabling this may violate privacy laws like the GDPR"
+msgstr ""
+
+#: mod/admin.php:1468
+msgid "Global directory URL"
+msgstr ""
+
+#: 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:1469
+msgid "Private posts by default for new users"
+msgstr ""
+
+#: 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:1470
+msgid "Don't include post content in email notifications"
+msgstr ""
+
+#: 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:1471
+msgid "Disallow public access to addons listed in the apps menu."
+msgstr ""
+
+#: mod/admin.php:1471
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
+msgstr ""
+
+#: mod/admin.php:1472
+msgid "Don't embed private images in posts"
+msgstr ""
+
+#: 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 ""
+
+#: 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: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:1475
+msgid "Block multiple registrations"
+msgstr ""
+
+#: mod/admin.php:1475
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr ""
+
+#: mod/admin.php:1476
+msgid "OpenID support"
+msgstr ""
+
+#: mod/admin.php:1476
+msgid "OpenID support for registration and logins."
+msgstr ""
+
+#: mod/admin.php:1477
+msgid "Fullname check"
+msgstr ""
+
+#: 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:1478
+msgid "Community pages for visitors"
+msgstr ""
+
+#: mod/admin.php:1478
+msgid ""
+"Which community pages should be available for visitors. Local users always "
+"see both pages."
+msgstr ""
+
+#: mod/admin.php:1479
+msgid "Posts per user on community page"
+msgstr ""
+
+#: 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:1480
+msgid "Enable OStatus support"
+msgstr ""
+
+#: 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 ""
+
+#: mod/admin.php:1481
+msgid "Only import OStatus threads from our contacts"
+msgstr ""
+
+#: 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:1482
+msgid "OStatus support can only be enabled if threading is enabled."
+msgstr ""
+
+#: mod/admin.php:1484
+msgid ""
+"Diaspora support can't be enabled because Friendica was installed into a sub "
+"directory."
+msgstr ""
+
+#: mod/admin.php:1485
+msgid "Enable Diaspora support"
+msgstr ""
+
+#: mod/admin.php:1485
+msgid "Provide built-in Diaspora network compatibility."
+msgstr ""
+
+#: mod/admin.php:1486
+msgid "Only allow Friendica contacts"
+msgstr ""
+
+#: mod/admin.php:1486
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr ""
+
+#: mod/admin.php:1487
+msgid "Verify SSL"
+msgstr ""
+
+#: 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 ""
+
+#: mod/admin.php:1488
+msgid "Proxy user"
+msgstr ""
+
+#: mod/admin.php:1489
+msgid "Proxy URL"
+msgstr ""
+
+#: mod/admin.php:1490
+msgid "Network timeout"
+msgstr ""
+
+#: mod/admin.php:1490
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr ""
+
+#: mod/admin.php:1491
+msgid "Maximum Load Average"
+msgstr ""
+
+#: mod/admin.php:1491
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr ""
+
+#: mod/admin.php:1492
+msgid "Maximum Load Average (Frontend)"
+msgstr ""
+
+#: mod/admin.php:1492
+msgid "Maximum system load before the frontend quits service - default 50."
+msgstr ""
+
+#: mod/admin.php:1493
+msgid "Minimal Memory"
+msgstr ""
+
+#: 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:1494
+msgid "Maximum table size for optimization"
+msgstr ""
+
+#: mod/admin.php:1494
+msgid ""
+"Maximum table size (in MB) for the automatic optimization. Enter -1 to "
+"disable it."
+msgstr ""
+
+#: mod/admin.php:1495
+msgid "Minimum level of fragmentation"
+msgstr ""
+
+#: mod/admin.php:1495
+msgid ""
+"Minimum fragmenation level to start the automatic optimization - default "
+"value is 30%."
+msgstr ""
+
+#: mod/admin.php:1497
+msgid "Periodical check of global contacts"
+msgstr ""
+
+#: 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:1498
+msgid "Days between requery"
+msgstr ""
+
+#: mod/admin.php:1498
+msgid "Number of days after which a server is requeried for his contacts."
+msgstr ""
+
+#: mod/admin.php:1499
+msgid "Discover contacts from other servers"
+msgstr ""
+
+#: 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 ""
+
+#: mod/admin.php:1500
+msgid "Timeframe for fetching global contacts"
+msgstr ""
+
+#: 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:1501
+msgid "Search the local directory"
+msgstr ""
+
+#: 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:1503
+msgid "Publish server information"
+msgstr ""
+
+#: 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 ""
+
+#: mod/admin.php:1505
+msgid "Check upstream version"
+msgstr ""
+
+#: 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 ""
+
+#: mod/admin.php:1506
+msgid "Suppress Tags"
+msgstr ""
+
+#: mod/admin.php:1506
+msgid "Suppress showing a list of hashtags at the end of the posting."
+msgstr ""
+
+#: mod/admin.php:1507
+msgid "Clean database"
+msgstr ""
+
+#: mod/admin.php:1507
+msgid ""
+"Remove old remote items, orphaned database records and old content from some "
+"other helper tables."
+msgstr ""
+
+#: mod/admin.php:1508
+msgid "Lifespan of remote items"
+msgstr ""
+
+#: 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:1509
+msgid "Lifespan of unclaimed items"
+msgstr ""
+
+#: 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 ""
+
+#: mod/admin.php:1510
+msgid "Path to item cache"
+msgstr ""
+
+#: mod/admin.php:1510
+msgid "The item caches buffers generated bbcode and external images."
+msgstr ""
+
+#: mod/admin.php:1511
+msgid "Cache duration in seconds"
+msgstr ""
+
+#: 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 ""
+
+#: mod/admin.php:1512
+msgid "Maximum numbers of comments per post"
+msgstr ""
+
+#: mod/admin.php:1512
+msgid "How much comments should be shown for each post? Default value is 100."
+msgstr ""
+
+#: mod/admin.php:1513
+msgid "Temp path"
+msgstr ""
+
+#: 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:1514
+msgid "Base path to installation"
+msgstr ""
+
+#: 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:1515
+msgid "Disable picture proxy"
+msgstr ""
+
+#: 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:1516
+msgid "Only search in tags"
+msgstr ""
+
+#: mod/admin.php:1516
+msgid "On large systems the text search can slow down the system extremely."
+msgstr ""
+
+#: mod/admin.php:1518
+msgid "New base url"
+msgstr ""
+
+#: 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:1520
+msgid "RINO Encryption"
+msgstr ""
+
+#: mod/admin.php:1520
+msgid "Encryption layer between nodes."
+msgstr ""
+
+#: mod/admin.php:1520
+msgid "Enabled"
+msgstr ""
+
+#: mod/admin.php:1522
+msgid "Maximum number of parallel workers"
+msgstr ""
+
+#: 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 ""
+
+#: mod/admin.php:1523
+msgid "Don't use 'proc_open' with the worker"
+msgstr ""
+
+#: 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:1524
+msgid "Enable fastlane"
+msgstr ""
+
+#: 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:1525
+msgid "Enable frontend worker"
+msgstr ""
+
+#: 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 ""
+
+#: mod/admin.php:1527
+msgid "Subscribe to relay"
+msgstr ""
+
+#: 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:1528
+msgid "Relay server"
+msgstr ""
+
+#: 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:1529
+msgid "Direct relay transfer"
+msgstr ""
+
+#: mod/admin.php:1529
+msgid ""
+"Enables the direct transfer to other servers without using the relay servers"
+msgstr ""
+
+#: mod/admin.php:1530
+msgid "Relay scope"
+msgstr ""
+
+#: 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:1530
+msgid "all"
+msgstr ""
+
+#: mod/admin.php:1530
+msgid "tags"
+msgstr ""
+
+#: mod/admin.php:1531
+msgid "Server tags"
+msgstr ""
+
+#: mod/admin.php:1531
+msgid "Comma separated list of tags for the 'tags' subscription."
+msgstr ""
+
+#: mod/admin.php:1532
+msgid "Allow user tags"
+msgstr ""
+
+#: 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:1535
+msgid "Start Relocation"
+msgstr ""
+
+#: mod/admin.php:1561
+msgid "Update has been marked successful"
+msgstr ""
+
+#: mod/admin.php:1568
+#, php-format
+msgid "Database structure update %s was successfully applied."
+msgstr ""
+
+#: mod/admin.php:1571
+#, php-format
+msgid "Executing of database structure update %s failed with error: %s"
+msgstr ""
+
+#: mod/admin.php:1587
+#, php-format
+msgid "Executing %s failed with error: %s"
+msgstr ""
+
+#: mod/admin.php:1589
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr ""
+
+#: mod/admin.php:1592
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr ""
+
+#: mod/admin.php:1595
+#, php-format
+msgid "There was no additional update function %s that needed to be called."
+msgstr ""
+
+#: mod/admin.php:1618
+msgid "No failed updates."
+msgstr ""
+
+#: mod/admin.php:1619
+msgid "Check database structure"
+msgstr ""
+
+#: mod/admin.php:1624
+msgid "Failed Updates"
+msgstr ""
+
+#: mod/admin.php:1625
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr ""
+
+#: mod/admin.php:1626
+msgid "Mark success (if update was manually applied)"
+msgstr ""
+
+#: mod/admin.php:1627
+msgid "Attempt to execute this update step automatically"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: mod/admin.php:1706 src/Model/User.php:707
+#, php-format
+msgid "Registration details for %s"
+msgstr ""
+
+#: mod/admin.php:1716
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/admin.php:1722
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/admin.php:1769
+#, php-format
+msgid "User '%s' deleted"
+msgstr ""
+
+#: mod/admin.php:1777
+#, php-format
+msgid "User '%s' unblocked"
+msgstr ""
+
+#: mod/admin.php:1777
+#, php-format
+msgid "User '%s' blocked"
+msgstr ""
+
+#: mod/admin.php:1838
+msgid "Private Forum"
+msgstr ""
+
+#: 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:1890 mod/admin.php:1915
+msgid "Register date"
+msgstr ""
+
+#: mod/admin.php:1890 mod/admin.php:1915
+msgid "Last login"
+msgstr ""
+
+#: mod/admin.php:1890 mod/admin.php:1915
+msgid "Last item"
+msgstr ""
+
+#: mod/admin.php:1890
+msgid "Type"
+msgstr ""
+
+#: mod/admin.php:1897
+msgid "Add User"
+msgstr ""
+
+#: mod/admin.php:1899
+msgid "User registrations waiting for confirm"
+msgstr ""
+
+#: mod/admin.php:1900
+msgid "User waiting for permanent deletion"
+msgstr ""
+
+#: mod/admin.php:1901
+msgid "Request date"
+msgstr ""
+
+#: mod/admin.php:1902
+msgid "No registrations."
+msgstr ""
+
+#: mod/admin.php:1903
+msgid "Note from the user"
+msgstr ""
+
+#: mod/admin.php:1905
+msgid "Deny"
+msgstr ""
+
+#: mod/admin.php:1908
+msgid "User blocked"
+msgstr ""
+
+#: mod/admin.php:1910
+msgid "Site admin"
+msgstr ""
+
+#: mod/admin.php:1911
+msgid "Account expired"
+msgstr ""
+
+#: mod/admin.php:1914
+msgid "New User"
+msgstr ""
+
+#: mod/admin.php:1915
+msgid "Deleted since"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: mod/admin.php:1931
+msgid "Name of the new user."
+msgstr ""
+
+#: mod/admin.php:1932
+msgid "Nickname"
+msgstr ""
+
+#: mod/admin.php:1932
+msgid "Nickname of the new user."
+msgstr ""
+
+#: mod/admin.php:1933
+msgid "Email address of the new user."
+msgstr ""
+
+#: mod/admin.php:1975
+#, php-format
+msgid "Addon %s disabled."
+msgstr ""
+
+#: mod/admin.php:1979
+#, php-format
+msgid "Addon %s enabled."
+msgstr ""
+
+#: mod/admin.php:1989 mod/admin.php:2238
+msgid "Disable"
+msgstr ""
+
+#: mod/admin.php:1992 mod/admin.php:2241
+msgid "Enable"
+msgstr ""
+
+#: mod/admin.php:2014 mod/admin.php:2284
+msgid "Toggle"
+msgstr ""
+
+#: mod/admin.php:2022 mod/admin.php:2293
+msgid "Author: "
+msgstr ""
+
+#: mod/admin.php:2023 mod/admin.php:2294
+msgid "Maintainer: "
+msgstr ""
+
+#: mod/admin.php:2075
+msgid "Reload active addons"
+msgstr ""
+
+#: 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 ""
+
+#: mod/admin.php:2200
+msgid "No themes found."
+msgstr ""
+
+#: mod/admin.php:2275
+msgid "Screenshot"
+msgstr ""
+
+#: mod/admin.php:2329
+msgid "Reload active themes"
+msgstr ""
+
+#: mod/admin.php:2334
+#, php-format
+msgid "No themes found on the system. They should be placed in %1$s"
+msgstr ""
+
+#: mod/admin.php:2335
+msgid "[Experimental]"
+msgstr ""
+
+#: mod/admin.php:2336
+msgid "[Unsupported]"
+msgstr ""
+
+#: mod/admin.php:2360
+msgid "Log settings updated."
+msgstr ""
+
+#: mod/admin.php:2393
+msgid "PHP log currently enabled."
+msgstr ""
+
+#: mod/admin.php:2395
+msgid "PHP log currently disabled."
+msgstr ""
+
+#: mod/admin.php:2404
+msgid "Clear"
+msgstr ""
+
+#: mod/admin.php:2408
+msgid "Enable Debugging"
+msgstr ""
+
+#: mod/admin.php:2409
+msgid "Log file"
+msgstr ""
+
+#: mod/admin.php:2409
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr ""
+
+#: mod/admin.php:2410
+msgid "Log level"
+msgstr ""
+
+#: mod/admin.php:2412
+msgid "PHP logging"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: mod/admin.php:2540
+#, php-format
+msgid "Lock feature %s"
+msgstr ""
+
+#: mod/admin.php:2548
+msgid "Manage Additional Features"
 msgstr ""
 
 #: mod/openid.php:29
@@ -3459,450 +6058,1269 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: 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/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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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
+#: mod/dfrn_request.php:112 mod/dfrn_request.php:353
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: mod/dfrn_request.php:116 mod/dfrn_request.php:359
+#: mod/dfrn_request.php:116 mod/dfrn_request.php:357
 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: mod/dfrn_request.php:119 mod/dfrn_request.php:362
+#: mod/dfrn_request.php:119 mod/dfrn_request.php:360
 msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: mod/dfrn_request.php:123 mod/dfrn_request.php:366
+#: 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] ""
 msgstr[1] ""
 
-#: mod/dfrn_request.php:162
+#: mod/dfrn_request.php:161
 msgid "Introduction complete."
 msgstr ""
 
-#: mod/dfrn_request.php:199
+#: mod/dfrn_request.php:197
 msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: mod/dfrn_request.php:226
+#: mod/dfrn_request.php:224
 msgid "Profile unavailable."
 msgstr ""
 
-#: mod/dfrn_request.php:248
+#: mod/dfrn_request.php:246
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: mod/dfrn_request.php:249
+#: mod/dfrn_request.php:247
 msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: mod/dfrn_request.php:250
+#: mod/dfrn_request.php:248
 msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: mod/dfrn_request.php:276
+#: mod/dfrn_request.php:274
 msgid "Invalid locator"
 msgstr ""
 
-#: mod/dfrn_request.php:312
+#: mod/dfrn_request.php:310
 msgid "You have already introduced yourself here."
 msgstr ""
 
-#: mod/dfrn_request.php:315
+#: mod/dfrn_request.php:313
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: mod/dfrn_request.php:335
+#: mod/dfrn_request.php:333
 msgid "Invalid profile URL."
 msgstr ""
 
-#: mod/dfrn_request.php:341 src/Model/Contact.php:1276
+#: mod/dfrn_request.php:339 src/Model/Contact.php:1577
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: mod/dfrn_request.php:435
+#: 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:473
+#: mod/dfrn_request.php:470
 msgid ""
 "Remote subscription can't be done for your network. Please subscribe "
 "directly on your system."
 msgstr ""
 
-#: mod/dfrn_request.php:489
+#: mod/dfrn_request.php:486
 msgid "Please login to confirm introduction."
 msgstr ""
 
-#: mod/dfrn_request.php:497
+#: mod/dfrn_request.php:494
 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 
-#: mod/dfrn_request.php:511 mod/dfrn_request.php:528
+#: mod/dfrn_request.php:508 mod/dfrn_request.php:525
 msgid "Confirm"
 msgstr ""
 
-#: mod/dfrn_request.php:523
+#: mod/dfrn_request.php:520
 msgid "Hide this contact"
 msgstr ""
 
-#: mod/dfrn_request.php:526
+#: mod/dfrn_request.php:523
 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 
-#: mod/dfrn_request.php:527
+#: mod/dfrn_request.php:524
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: mod/dfrn_request.php:637
+#: mod/dfrn_request.php:634
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 
-#: mod/dfrn_request.php:640
+#: 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 ""
 
-#: mod/dfrn_request.php:645
+#: mod/dfrn_request.php:642
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: mod/dfrn_request.php:646
+#: mod/dfrn_request.php:643
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@gnusocial.de"
 msgstr ""
 
-#: mod/dfrn_request.php:651 src/Content/ContactSelector.php:79
+#: 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 ""
+
+#: 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 ""
 
-#: mod/dfrn_request.php:652
+#: mod/dfrn_request.php:649
 msgid "GNU Social (Pleroma, Mastodon)"
 msgstr ""
 
-#: mod/dfrn_request.php:653
+#: mod/dfrn_request.php:650
 msgid "Diaspora (Socialhome, Hubzilla)"
 msgstr ""
 
-#: mod/dfrn_request.php:654
+#: mod/dfrn_request.php:651
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search "
 "bar."
 msgstr ""
 
-#: mod/notifications.php:37
-msgid "Invalid request identifier."
+#: mod/api.php:85 mod/api.php:107
+msgid "Authorize application connection"
 msgstr ""
 
-#: mod/notifications.php:46 mod/notifications.php:182 mod/notifications.php:229
-msgid "Discard"
+#: mod/api.php:86
+msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: mod/notifications.php:98 src/Content/Nav.php:191
-msgid "Notifications"
+#: mod/api.php:95
+msgid "Please login to continue."
 msgstr ""
 
-#: mod/notifications.php:107
-msgid "Network Notifications"
+#: 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/notifications.php:119
-msgid "Personal Notifications"
+#: mod/profile_photo.php:55
+msgid "Image uploaded but image cropping failed."
 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
+#: mod/profile_photo.php:87 mod/profile_photo.php:96 mod/profile_photo.php:105
+#: mod/profile_photo.php:313
 #, php-format
-msgid "suggested by %s"
+msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: mod/notifications.php:178 mod/notifications.php:262 mod/admin.php:1820
-msgid "Approve"
+#: mod/profile_photo.php:124
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
 
-#: mod/notifications.php:197
-msgid "Claims to be known to you: "
+#: mod/profile_photo.php:132
+msgid "Unable to process image"
 msgstr ""
 
-#: mod/notifications.php:198
-msgid "yes"
+#: mod/profile_photo.php:244
+msgid "Upload File:"
 msgstr ""
 
-#: mod/notifications.php:198
-msgid "no"
+#: mod/profile_photo.php:245
+msgid "Select a profile:"
 msgstr ""
 
-#: mod/notifications.php:199 mod/notifications.php:204
-msgid "Shall your connection be bidirectional or not?"
+#: mod/profile_photo.php:247 mod/fbrowser.php:106 mod/fbrowser.php:137
+msgid "Upload"
 msgstr ""
 
-#: mod/notifications.php:200 mod/notifications.php:205
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
-"Accepting %s as a friend allows %s to subscribe to your posts, and you will "
-"also receive updates from them in your news feed."
+"This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: mod/notifications.php:201
+#: mod/item.php:811
+#, php-format
+msgid "You may visit them online at %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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:79 mod/profile.php:82 src/Protocol/OStatus.php:1275
+#, php-format
+msgid "%s's timeline"
+msgstr ""
+
+#: mod/profile.php:80 src/Protocol/OStatus.php:1276
+#, php-format
+msgid "%s's posts"
+msgstr ""
+
+#: mod/profile.php:81 src/Protocol/OStatus.php:1277
+#, php-format
+msgid "%s's comments"
+msgstr ""
+
+#: mod/allfriends.php:53
+msgid "No friends to display."
+msgstr ""
+
+#: mod/contacts.php:162
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] ""
+msgstr[1] ""
+
+#: 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 ""
+
+#: mod/contacts.php:523
+#, php-format
+msgid "You are sharing with %s"
+msgstr ""
+
+#: mod/contacts.php:528
+#, php-format
+msgid "%s is sharing with you"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
-"Accepting %s as a subscriber allows them to subscribe to your posts, but you "
-"will not receive updates from them in your news feed."
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: mod/notifications.php:206
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: mod/follow.php:90
+msgid "OStatus support is disabled. Contact can't be added."
+msgstr ""
+
+#: 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 ""
+
+#: mod/credits.php:18
+msgid "Credits"
+msgstr ""
+
+#: mod/credits.php:19
+msgid ""
+"Friendica is a community project, that would not be possible without the "
+"help of many people. Here is a list of those who have contributed to the "
+"code or the translation of Friendica. Thank you all!"
+msgstr ""
+
+#: mod/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 ""
+
+#: 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 ""
+
+#: mod/localtime.php:39
+#, php-format
+msgid "UTC time: %s"
+msgstr ""
+
+#: mod/localtime.php:42
+#, php-format
+msgid "Current timezone: %s"
+msgstr ""
+
+#: mod/localtime.php:46
+#, php-format
+msgid "Converted localtime: %s"
+msgstr ""
+
+#: 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 ""
+
+#: mod/invite.php:88
+msgid "Please join us on Friendica"
+msgstr ""
+
+#: 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 ""
+
+#: mod/invite.php:105
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/invite.php:123
+msgid "You have no more invitations available"
+msgstr ""
+
+#: mod/invite.php:131
 #, 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."
+"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 ""
 
-#: 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
+#: mod/invite.php:133
 #, php-format
-msgid "No more %s notifications."
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
 msgstr ""
 
-#: mod/profiles.php:58
+#: 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 ""
+
+#: 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 ""
+
+#: mod/invite.php:141
+#, php-format
+msgid "To accept this invitation, please visit and register at %s."
+msgstr ""
+
+#: 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 ""
+
+#: mod/invite.php:152
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
 
-#: 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:394 mod/admin.php:494
-msgid "Address"
-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 ""
 
@@ -3938,11 +7356,6 @@ msgstr ""
 msgid "Additional information"
 msgstr ""
 
-#: mod/profiles.php:594 mod/network.php:962
-#: src/Core/NotificationsManager.php:185
-msgid "Personal"
-msgstr ""
-
 #: mod/profiles.php:595
 msgid "Relation"
 msgstr ""
@@ -3959,7 +7372,7 @@ msgstr ""
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: mod/profiles.php:601 src/Model/Profile.php:780
+#: mod/profiles.php:601 src/Model/Profile.php:769
 msgid "Sexual Preference:"
 msgstr ""
 
@@ -3971,10 +7384,6 @@ msgstr ""
 msgid "Profile Name:"
 msgstr ""
 
-#: mod/profiles.php:607 mod/events.php:508 mod/events.php:520
-msgid "Required"
-msgstr ""
-
 #: mod/profiles.php:609
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
@@ -4043,11 +7452,11 @@ msgstr ""
 msgid "Homepage URL:"
 msgstr ""
 
-#: 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 ""
 
@@ -4071,11 +7480,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 ""
 
@@ -4115,11 +7524,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 ""
 
@@ -4127,3645 +7536,268 @@ 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/admin.php:107
-msgid "Theme settings updated."
-msgstr ""
-
-#: mod/admin.php:180 src/Content/Nav.php:175
-msgid "Information"
-msgstr ""
-
-#: mod/admin.php:181
-msgid "Overview"
-msgstr ""
-
-#: mod/admin.php:182 mod/admin.php:717
-msgid "Federation Statistics"
-msgstr ""
-
-#: mod/admin.php:183
-msgid "Configuration"
-msgstr ""
-
-#: mod/admin.php:184 mod/admin.php:1352
-msgid "Site"
-msgstr ""
-
-#: mod/admin.php:185 mod/admin.php:1284 mod/admin.php:1812 mod/admin.php:1828
-msgid "Users"
-msgstr ""
-
-#: mod/admin.php:186 mod/admin.php:1928 mod/admin.php:1988 mod/settings.php:87
-msgid "Addons"
-msgstr ""
-
-#: mod/admin.php:187 mod/admin.php:2197 mod/admin.php:2241
-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
-msgid "Database"
-msgstr ""
-
-#: mod/admin.php:191
-msgid "DB updates"
-msgstr ""
-
-#: mod/admin.php:192 mod/admin.php:752
-msgid "Inspect Queue"
-msgstr ""
-
-#: mod/admin.php:193
-msgid "Tools"
-msgstr ""
-
-#: mod/admin.php:194
-msgid "Contact Blocklist"
-msgstr ""
-
-#: mod/admin.php:195 mod/admin.php:366
-msgid "Server Blocklist"
-msgstr ""
-
-#: mod/admin.php:196 mod/admin.php:525
-msgid "Delete Item"
-msgstr ""
-
-#: mod/admin.php:197 mod/admin.php:198 mod/admin.php:2315
-msgid "Logs"
-msgstr ""
-
-#: mod/admin.php:199 mod/admin.php:2382
-msgid "View Logs"
-msgstr ""
-
-#: mod/admin.php:201
-msgid "Diagnostics"
-msgstr ""
-
-#: mod/admin.php:202
-msgid "PHP Info"
-msgstr ""
-
-#: mod/admin.php:203
-msgid "probe address"
-msgstr ""
-
-#: mod/admin.php:204
-msgid "check webfinger"
-msgstr ""
-
-#: mod/admin.php:223 src/Content/Nav.php:218
-msgid "Admin"
-msgstr ""
-
-#: mod/admin.php:224
-msgid "Addon Features"
-msgstr ""
-
-#: mod/admin.php:225
-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:1351
-#: mod/admin.php:1811 mod/admin.php:1927 mod/admin.php:1987 mod/admin.php:2196
-#: mod/admin.php:2240 mod/admin.php:2314 mod/admin.php:2381
-msgid "Administration"
-msgstr ""
-
-#: mod/admin.php:305
-msgid "Display Terms of Service"
-msgstr ""
-
-#: mod/admin.php:305
-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
-msgid "Display Privacy Statement"
-msgstr ""
-
-#: mod/admin.php:306
-#, 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
-msgid "Privacy Statement Preview"
-msgstr ""
-
-#: mod/admin.php:309
-msgid "The Terms of Service"
-msgstr ""
-
-#: mod/admin.php:309
-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
-msgid "The blocked domain"
-msgstr ""
-
-#: mod/admin.php:358 mod/admin.php:371
-msgid "The reason why you blocked this domain."
-msgstr ""
-
-#: mod/admin.php:359
-msgid "Delete domain"
-msgstr ""
-
-#: mod/admin.php:359
-msgid "Check to delete this entry from the blocklist"
-msgstr ""
-
-#: mod/admin.php:367
-msgid ""
-"This page can be used to define a black list of servers from the federated "
-"network that are not allowed to interact with your node. For all entered "
-"domains you should also give a reason why you have blocked the remote server."
-msgstr ""
-
-#: mod/admin.php:368
-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
-msgid "Add new entry to block list"
-msgstr ""
-
-#: mod/admin.php:370
-msgid "Server Domain"
-msgstr ""
-
-#: mod/admin.php:370
-msgid ""
-"The domain of the new server to add to the block list. Do not include the "
-"protocol."
-msgstr ""
-
-#: mod/admin.php:371
-msgid "Block reason"
-msgstr ""
-
-#: mod/admin.php:372
-msgid "Add Entry"
-msgstr ""
-
-#: mod/admin.php:373
-msgid "Save changes to the blocklist"
-msgstr ""
-
-#: mod/admin.php:374
-msgid "Current Entries in the Blocklist"
-msgstr ""
-
-#: mod/admin.php:377
-msgid "Delete entry from blocklist"
-msgstr ""
-
-#: mod/admin.php:380
-msgid "Delete entry from blocklist?"
-msgstr ""
-
-#: mod/admin.php:406
-msgid "Server added to blocklist."
-msgstr ""
-
-#: mod/admin.php:422
-msgid "Site blocklist updated."
-msgstr ""
-
-#: mod/admin.php:445 src/Core/Console/GlobalCommunityBlock.php:72
-msgid "The contact has been blocked from the node"
-msgstr ""
-
-#: mod/admin.php:447 src/Core/Console/GlobalCommunityBlock.php:69
-#, php-format
-msgid "Could not find any contact entry for this URL (%s)"
-msgstr ""
-
-#: mod/admin.php:454
-#, php-format
-msgid "%s contact unblocked"
-msgid_plural "%s contacts unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/admin.php:483
-msgid "Remote Contact Blocklist"
-msgstr ""
-
-#: mod/admin.php:484
-msgid ""
-"This page allows you to prevent any message from a remote contact to reach "
-"your node."
-msgstr ""
-
-#: mod/admin.php:485
-msgid "Block Remote Contact"
-msgstr ""
-
-#: mod/admin.php:486 mod/admin.php:1814
-msgid "select all"
-msgstr ""
-
-#: mod/admin.php:487
-msgid "select none"
-msgstr ""
-
-#: mod/admin.php:490
-msgid "No remote contact is blocked from this node."
-msgstr ""
-
-#: mod/admin.php:492
-msgid "Blocked Remote Contacts"
-msgstr ""
-
-#: mod/admin.php:493
-msgid "Block New Remote Contact"
-msgstr ""
-
-#: mod/admin.php:494
-msgid "Photo"
-msgstr ""
-
-#: mod/admin.php:502
-#, php-format
-msgid "%s total blocked contact"
-msgid_plural "%s total blocked contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/admin.php:504
-msgid "URL of the remote contact to block."
-msgstr ""
-
-#: mod/admin.php:526
-msgid "Delete this Item"
-msgstr ""
-
-#: mod/admin.php:527
-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
-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
-msgid "GUID"
-msgstr ""
-
-#: mod/admin.php:529
-msgid "The GUID of the item you want to delete."
-msgstr ""
-
-#: mod/admin.php:563
-msgid "Item marked for deletion."
-msgstr ""
-
-#: mod/admin.php:634
-msgid "unknown"
-msgstr ""
-
-#: mod/admin.php:710
-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
-msgid ""
-"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
-"will improve the data displayed here."
-msgstr ""
-
-#: mod/admin.php:723
-#, php-format
-msgid ""
-"Currently this node is aware of %d nodes with %d registered users from the "
-"following platforms:"
-msgstr ""
-
-#: mod/admin.php:754
-msgid "ID"
-msgstr ""
-
-#: mod/admin.php:755
-msgid "Recipient Name"
-msgstr ""
-
-#: mod/admin.php:756
-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
-msgid "Created"
-msgstr ""
-
-#: mod/admin.php:759
-msgid "Last Tried"
-msgstr ""
-
-#: mod/admin.php:760
-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
-#, 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 ""
-
-#: mod/admin.php:791
-#, php-format
-msgid ""
-"There is a new version of Friendica available for download. Your current "
-"version is %1$s, upstream version is %2$s"
-msgstr ""
-
-#: mod/admin.php:801
-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
-msgid "The worker was never executed. Please check your database structure!"
-msgstr ""
-
-#: mod/admin.php:810
-#, 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
-msgid "Normal Account"
-msgstr ""
-
-#: mod/admin.php:816
-msgid "Automatic Follower Account"
-msgstr ""
-
-#: mod/admin.php:817
-msgid "Public Forum Account"
-msgstr ""
-
-#: mod/admin.php:818
-msgid "Automatic Friend Account"
-msgstr ""
-
-#: mod/admin.php:819
-msgid "Blog Account"
-msgstr ""
-
-#: mod/admin.php:820
-msgid "Private Forum Account"
-msgstr ""
-
-#: mod/admin.php:842
-msgid "Message queues"
-msgstr ""
-
-#: mod/admin.php:848
-msgid "Summary"
-msgstr ""
-
-#: mod/admin.php:850
-msgid "Registered users"
-msgstr ""
-
-#: mod/admin.php:852
-msgid "Pending registrations"
-msgstr ""
-
-#: mod/admin.php:853
-msgid "Version"
-msgstr ""
-
-#: mod/admin.php:858
-msgid "Active addons"
-msgstr ""
-
-#: mod/admin.php:889
-msgid "Can not parse base url. Must have at least <scheme>://<domain>"
-msgstr ""
-
-#: mod/admin.php:1219
-msgid "Site settings updated."
-msgstr ""
-
-#: mod/admin.php:1246 mod/settings.php:897
-msgid "No special theme for mobile devices"
-msgstr ""
-
-#: mod/admin.php:1275
-msgid "No community page for local users"
-msgstr ""
-
-#: mod/admin.php:1276
-msgid "No community page"
-msgstr ""
-
-#: mod/admin.php:1277
-msgid "Public postings from users of this site"
-msgstr ""
-
-#: mod/admin.php:1278
-msgid "Public postings from the federated network"
-msgstr ""
-
-#: mod/admin.php:1279
-msgid "Public postings from local users and the federated network"
-msgstr ""
-
-#: mod/admin.php:1285
-msgid "Users, Global Contacts"
-msgstr ""
-
-#: mod/admin.php:1286
-msgid "Users, Global Contacts/fallback"
-msgstr ""
-
-#: mod/admin.php:1290
-msgid "One month"
-msgstr ""
-
-#: mod/admin.php:1291
-msgid "Three months"
-msgstr ""
-
-#: mod/admin.php:1292
-msgid "Half a year"
-msgstr ""
-
-#: mod/admin.php:1293
-msgid "One year"
-msgstr ""
-
-#: mod/admin.php:1298
-msgid "Multi user instance"
-msgstr ""
-
-#: mod/admin.php:1321
-msgid "Closed"
-msgstr ""
-
-#: mod/admin.php:1322
-msgid "Requires approval"
-msgstr ""
-
-#: mod/admin.php:1323
-msgid "Open"
-msgstr ""
-
-#: mod/admin.php:1327
-msgid "No SSL policy, links will track page SSL state"
-msgstr ""
-
-#: mod/admin.php:1328
-msgid "Force all links to use SSL"
-msgstr ""
-
-#: mod/admin.php:1329
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
-msgstr ""
-
-#: mod/admin.php:1333
-msgid "Don't check"
-msgstr ""
-
-#: mod/admin.php:1334
-msgid "check the stable version"
-msgstr ""
-
-#: mod/admin.php:1335
-msgid "check the development version"
-msgstr ""
-
-#: mod/admin.php:1354
-msgid "Republish users to directory"
-msgstr ""
-
-#: mod/admin.php:1355 mod/register.php:267
-msgid "Registration"
-msgstr ""
-
-#: mod/admin.php:1356
-msgid "File upload"
-msgstr ""
-
-#: mod/admin.php:1357
-msgid "Policies"
-msgstr ""
-
-#: mod/admin.php:1359
-msgid "Auto Discovered Contact Directory"
-msgstr ""
-
-#: mod/admin.php:1360
-msgid "Performance"
-msgstr ""
-
-#: mod/admin.php:1361
-msgid "Worker"
-msgstr ""
-
-#: mod/admin.php:1362
-msgid "Message Relay"
-msgstr ""
-
-#: mod/admin.php:1363
-msgid ""
-"Relocate - WARNING: advanced function. Could make this server unreachable."
-msgstr ""
-
-#: mod/admin.php:1366
-msgid "Site name"
-msgstr ""
-
-#: mod/admin.php:1367
-msgid "Host name"
-msgstr ""
-
-#: mod/admin.php:1368
-msgid "Sender Email"
-msgstr ""
-
-#: mod/admin.php:1368
-msgid ""
-"The email address your server shall use to send notification emails from."
-msgstr ""
-
-#: mod/admin.php:1369
-msgid "Banner/Logo"
-msgstr ""
-
-#: mod/admin.php:1370
-msgid "Shortcut icon"
-msgstr ""
-
-#: mod/admin.php:1370
-msgid "Link to an icon that will be used for browsers."
-msgstr ""
-
-#: mod/admin.php:1371
-msgid "Touch icon"
-msgstr ""
-
-#: mod/admin.php:1371
-msgid "Link to an icon that will be used for tablets and mobiles."
-msgstr ""
-
-#: mod/admin.php:1372
-msgid "Additional Info"
-msgstr ""
-
-#: mod/admin.php:1372
-#, php-format
-msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at %s/servers."
-msgstr ""
-
-#: mod/admin.php:1373
-msgid "System language"
-msgstr ""
-
-#: mod/admin.php:1374
-msgid "System theme"
-msgstr ""
-
-#: mod/admin.php:1374
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr ""
-
-#: mod/admin.php:1375
-msgid "Mobile system theme"
-msgstr ""
-
-#: mod/admin.php:1375
-msgid "Theme for mobile devices"
-msgstr ""
-
-#: mod/admin.php:1376
-msgid "SSL link policy"
-msgstr ""
-
-#: mod/admin.php:1376
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr ""
-
-#: mod/admin.php:1377
-msgid "Force SSL"
-msgstr ""
-
-#: mod/admin.php:1377
-msgid ""
-"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
-"to endless loops."
-msgstr ""
-
-#: mod/admin.php:1378
-msgid "Hide help entry from navigation menu"
-msgstr ""
-
-#: mod/admin.php:1378
-msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
-msgstr ""
-
-#: mod/admin.php:1379
-msgid "Single user instance"
-msgstr ""
-
-#: mod/admin.php:1379
-msgid "Make this instance multi-user or single-user for the named user"
-msgstr ""
-
-#: mod/admin.php:1380
-msgid "Maximum image size"
-msgstr ""
-
-#: mod/admin.php:1380
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr ""
-
-#: mod/admin.php:1381
-msgid "Maximum image length"
-msgstr ""
-
-#: mod/admin.php:1381
-msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
-msgstr ""
-
-#: mod/admin.php:1382
-msgid "JPEG image quality"
-msgstr ""
-
-#: mod/admin.php:1382
-msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
-msgstr ""
-
-#: mod/admin.php:1384
-msgid "Register policy"
-msgstr ""
-
-#: mod/admin.php:1385
-msgid "Maximum Daily Registrations"
-msgstr ""
-
-#: mod/admin.php:1385
-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:1386
-msgid "Register text"
-msgstr ""
-
-#: mod/admin.php:1386
-msgid ""
-"Will be displayed prominently on the registration page. You can use BBCode "
-"here."
-msgstr ""
-
-#: mod/admin.php:1387
-msgid "Accounts abandoned after x days"
-msgstr ""
-
-#: mod/admin.php:1387
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr ""
-
-#: mod/admin.php:1388
-msgid "Allowed friend domains"
-msgstr ""
-
-#: mod/admin.php:1388
-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:1389
-msgid "Allowed email domains"
-msgstr ""
-
-#: mod/admin.php:1389
-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:1390
-msgid "No OEmbed rich content"
-msgstr ""
-
-#: mod/admin.php:1390
-msgid ""
-"Don't show the rich content (e.g. embedded PDF), except from the domains "
-"listed below."
-msgstr ""
-
-#: mod/admin.php:1391
-msgid "Allowed OEmbed domains"
-msgstr ""
-
-#: mod/admin.php:1391
-msgid ""
-"Comma separated list of domains which oembed content is allowed to be "
-"displayed. Wildcards are accepted."
-msgstr ""
-
-#: mod/admin.php:1392
-msgid "Block public"
-msgstr ""
-
-#: mod/admin.php:1392
-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:1393
-msgid "Force publish"
-msgstr ""
-
-#: mod/admin.php:1393
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr ""
-
-#: mod/admin.php:1393
-msgid "Enabling this may violate privacy laws like the GDPR"
-msgstr ""
-
-#: mod/admin.php:1394
-msgid "Global directory URL"
-msgstr ""
-
-#: mod/admin.php:1394
-msgid ""
-"URL to the global directory. If this is not set, the global directory is "
-"completely unavailable to the application."
-msgstr ""
-
-#: mod/admin.php:1395
-msgid "Private posts by default for new users"
-msgstr ""
-
-#: mod/admin.php:1395
-msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
-msgstr ""
-
-#: mod/admin.php:1396
-msgid "Don't include post content in email notifications"
-msgstr ""
-
-#: mod/admin.php:1396
-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:1397
-msgid "Disallow public access to addons listed in the apps menu."
-msgstr ""
-
-#: mod/admin.php:1397
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
-msgstr ""
-
-#: mod/admin.php:1398
-msgid "Don't embed private images in posts"
-msgstr ""
-
-#: mod/admin.php:1398
-msgid ""
-"Don't replace locally-hosted private photos in posts with an embedded copy "
-"of the image. This means that contacts who receive posts containing private "
-"photos will have to authenticate and load each image, which may take a while."
-msgstr ""
-
-#: mod/admin.php:1399
-msgid "Allow Users to set remote_self"
-msgstr ""
-
-#: mod/admin.php:1399
-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:1400
-msgid "Block multiple registrations"
-msgstr ""
-
-#: mod/admin.php:1400
-msgid "Disallow users to register additional accounts for use as pages."
-msgstr ""
-
-#: mod/admin.php:1401
-msgid "OpenID support"
-msgstr ""
-
-#: mod/admin.php:1401
-msgid "OpenID support for registration and logins."
-msgstr ""
-
-#: mod/admin.php:1402
-msgid "Fullname check"
-msgstr ""
-
-#: mod/admin.php:1402
-msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr ""
-
-#: mod/admin.php:1403
-msgid "Community pages for visitors"
-msgstr ""
-
-#: mod/admin.php:1403
-msgid ""
-"Which community pages should be available for visitors. Local users always "
-"see both pages."
-msgstr ""
-
-#: mod/admin.php:1404
-msgid "Posts per user on community page"
-msgstr ""
-
-#: mod/admin.php:1404
-msgid ""
-"The maximum number of posts per user on the community page. (Not valid for "
-"'Global Community')"
-msgstr ""
-
-#: mod/admin.php:1405
-msgid "Enable OStatus support"
-msgstr ""
-
-#: mod/admin.php:1405
-msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
-msgstr ""
-
-#: mod/admin.php:1406
-msgid "Only import OStatus threads from our contacts"
-msgstr ""
-
-#: mod/admin.php:1406
-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:1407
-msgid "OStatus support can only be enabled if threading is enabled."
-msgstr ""
-
-#: mod/admin.php:1409
-msgid ""
-"Diaspora support can't be enabled because Friendica was installed into a sub "
-"directory."
-msgstr ""
-
-#: mod/admin.php:1410
-msgid "Enable Diaspora support"
-msgstr ""
-
-#: mod/admin.php:1410
-msgid "Provide built-in Diaspora network compatibility."
-msgstr ""
-
-#: mod/admin.php:1411
-msgid "Only allow Friendica contacts"
-msgstr ""
-
-#: mod/admin.php:1411
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
-msgstr ""
-
-#: mod/admin.php:1412
-msgid "Verify SSL"
-msgstr ""
-
-#: mod/admin.php:1412
-msgid ""
-"If you wish, you can turn on strict certificate checking. This will mean you "
-"cannot connect (at all) to self-signed SSL sites."
-msgstr ""
-
-#: mod/admin.php:1413
-msgid "Proxy user"
-msgstr ""
-
-#: mod/admin.php:1414
-msgid "Proxy URL"
-msgstr ""
-
-#: mod/admin.php:1415
-msgid "Network timeout"
-msgstr ""
-
-#: mod/admin.php:1415
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr ""
-
-#: mod/admin.php:1416
-msgid "Maximum Load Average"
-msgstr ""
-
-#: mod/admin.php:1416
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr ""
-
-#: mod/admin.php:1417
-msgid "Maximum Load Average (Frontend)"
-msgstr ""
-
-#: mod/admin.php:1417
-msgid "Maximum system load before the frontend quits service - default 50."
-msgstr ""
-
-#: mod/admin.php:1418
-msgid "Minimal Memory"
-msgstr ""
-
-#: mod/admin.php:1418
-msgid ""
-"Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
-"default 0 (deactivated)."
-msgstr ""
-
-#: mod/admin.php:1419
-msgid "Maximum table size for optimization"
-msgstr ""
-
-#: mod/admin.php:1419
-msgid ""
-"Maximum table size (in MB) for the automatic optimization. Enter -1 to "
-"disable it."
-msgstr ""
-
-#: mod/admin.php:1420
-msgid "Minimum level of fragmentation"
-msgstr ""
-
-#: mod/admin.php:1420
-msgid ""
-"Minimum fragmenation level to start the automatic optimization - default "
-"value is 30%."
-msgstr ""
-
-#: mod/admin.php:1422
-msgid "Periodical check of global contacts"
-msgstr ""
-
-#: mod/admin.php:1422
-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:1423
-msgid "Days between requery"
-msgstr ""
-
-#: mod/admin.php:1423
-msgid "Number of days after which a server is requeried for his contacts."
-msgstr ""
-
-#: mod/admin.php:1424
-msgid "Discover contacts from other servers"
-msgstr ""
-
-#: mod/admin.php:1424
-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 ""
-
-#: mod/admin.php:1425
-msgid "Timeframe for fetching global contacts"
-msgstr ""
-
-#: mod/admin.php:1425
-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:1426
-msgid "Search the local directory"
-msgstr ""
-
-#: mod/admin.php:1426
-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:1428
-msgid "Publish server information"
-msgstr ""
-
-#: mod/admin.php:1428
-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 ""
-
-#: mod/admin.php:1430
-msgid "Check upstream version"
-msgstr ""
-
-#: mod/admin.php:1430
-msgid ""
-"Enables checking for new Friendica versions at github. If there is a new "
-"version, you will be informed in the admin panel overview."
-msgstr ""
-
-#: mod/admin.php:1431
-msgid "Suppress Tags"
-msgstr ""
-
-#: mod/admin.php:1431
-msgid "Suppress showing a list of hashtags at the end of the posting."
-msgstr ""
-
-#: mod/admin.php:1432
-msgid "Clean database"
-msgstr ""
-
-#: mod/admin.php:1432
-msgid ""
-"Remove old remote items, orphaned database records and old content from some "
-"other helper tables."
-msgstr ""
-
-#: mod/admin.php:1433
-msgid "Lifespan of remote items"
-msgstr ""
-
-#: mod/admin.php:1433
-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:1434
-msgid "Lifespan of unclaimed items"
-msgstr ""
-
-#: mod/admin.php:1434
-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 ""
-
-#: mod/admin.php:1435
-msgid "Path to item cache"
-msgstr ""
-
-#: mod/admin.php:1435
-msgid "The item caches buffers generated bbcode and external images."
-msgstr ""
-
-#: mod/admin.php:1436
-msgid "Cache duration in seconds"
-msgstr ""
-
-#: mod/admin.php:1436
-msgid ""
-"How long should the cache files be hold? Default value is 86400 seconds (One "
-"day). To disable the item cache, set the value to -1."
-msgstr ""
-
-#: mod/admin.php:1437
-msgid "Maximum numbers of comments per post"
-msgstr ""
-
-#: mod/admin.php:1437
-msgid "How much comments should be shown for each post? Default value is 100."
-msgstr ""
-
-#: mod/admin.php:1438
-msgid "Temp path"
-msgstr ""
-
-#: mod/admin.php:1438
-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:1439
-msgid "Base path to installation"
-msgstr ""
-
-#: mod/admin.php:1439
-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:1440
-msgid "Disable picture proxy"
-msgstr ""
-
-#: mod/admin.php:1440
-msgid ""
-"The picture proxy increases performance and privacy. It shouldn't be used on "
-"systems with very low bandwith."
-msgstr ""
-
-#: mod/admin.php:1441
-msgid "Only search in tags"
-msgstr ""
-
-#: mod/admin.php:1441
-msgid "On large systems the text search can slow down the system extremely."
-msgstr ""
-
-#: mod/admin.php:1443
-msgid "New base url"
-msgstr ""
-
-#: mod/admin.php:1443
-msgid ""
-"Change base url for this server. Sends relocate message to all Friendica and "
-"Diaspora* contacts of all users."
-msgstr ""
-
-#: mod/admin.php:1445
-msgid "RINO Encryption"
-msgstr ""
-
-#: mod/admin.php:1445
-msgid "Encryption layer between nodes."
-msgstr ""
-
-#: mod/admin.php:1445
-msgid "Enabled"
-msgstr ""
-
-#: mod/admin.php:1447
-msgid "Maximum number of parallel workers"
-msgstr ""
-
-#: mod/admin.php:1447
-msgid ""
-"On shared hosters set this to 2. On larger systems, values of 10 are great. "
-"Default value is 4."
-msgstr ""
-
-#: mod/admin.php:1448
-msgid "Don't use 'proc_open' with the worker"
-msgstr ""
-
-#: mod/admin.php:1448
-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:1449
-msgid "Enable fastlane"
-msgstr ""
-
-#: mod/admin.php:1449
-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:1450
-msgid "Enable frontend worker"
-msgstr ""
-
-#: mod/admin.php:1450
-#, 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 ""
-
-#: mod/admin.php:1452
-msgid "Subscribe to relay"
-msgstr ""
-
-#: mod/admin.php:1452
-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:1453
-msgid "Relay server"
-msgstr ""
-
-#: mod/admin.php:1453
-msgid ""
-"Address of the relay server where public posts should be send to. For "
-"example https://relay.diasp.org"
-msgstr ""
-
-#: mod/admin.php:1454
-msgid "Direct relay transfer"
-msgstr ""
-
-#: mod/admin.php:1454
-msgid ""
-"Enables the direct transfer to other servers without using the relay servers"
-msgstr ""
-
-#: mod/admin.php:1455
-msgid "Relay scope"
-msgstr ""
-
-#: mod/admin.php:1455
-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:1455
-msgid "all"
-msgstr ""
-
-#: mod/admin.php:1455
-msgid "tags"
-msgstr ""
-
-#: mod/admin.php:1456
-msgid "Server tags"
-msgstr ""
-
-#: mod/admin.php:1456
-msgid "Comma separated list of tags for the 'tags' subscription."
-msgstr ""
-
-#: mod/admin.php:1457
-msgid "Allow user tags"
-msgstr ""
-
-#: mod/admin.php:1457
-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:1485
-msgid "Update has been marked successful"
-msgstr ""
-
-#: mod/admin.php:1492
-#, php-format
-msgid "Database structure update %s was successfully applied."
-msgstr ""
-
-#: mod/admin.php:1495
-#, php-format
-msgid "Executing of database structure update %s failed with error: %s"
-msgstr ""
-
-#: mod/admin.php:1508
-#, php-format
-msgid "Executing %s failed with error: %s"
-msgstr ""
-
-#: mod/admin.php:1510
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr ""
-
-#: mod/admin.php:1513
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr ""
-
-#: mod/admin.php:1516
-#, php-format
-msgid "There was no additional update function %s that needed to be called."
-msgstr ""
-
-#: mod/admin.php:1536
-msgid "No failed updates."
-msgstr ""
-
-#: mod/admin.php:1537
-msgid "Check database structure"
-msgstr ""
-
-#: mod/admin.php:1542
-msgid "Failed Updates"
-msgstr ""
-
-#: mod/admin.php:1543
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
-msgstr ""
-
-#: mod/admin.php:1544
-msgid "Mark success (if update was manually applied)"
-msgstr ""
-
-#: mod/admin.php:1545
-msgid "Attempt to execute this update step automatically"
-msgstr ""
-
-#: mod/admin.php:1584
-#, 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 ""
-
-#: mod/admin.php:1587
-#, 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 ""
-
-#: mod/admin.php:1621 src/Model/User.php:663
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: mod/admin.php:1631
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/admin.php:1637
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/admin.php:1684
-#, php-format
-msgid "User '%s' deleted"
-msgstr ""
-
-#: mod/admin.php:1692
-#, php-format
-msgid "User '%s' unblocked"
-msgstr ""
-
-#: mod/admin.php:1692
-#, php-format
-msgid "User '%s' blocked"
-msgstr ""
-
-#: mod/admin.php:1749 mod/settings.php:1058
-msgid "Normal Account Page"
-msgstr ""
-
-#: mod/admin.php:1750 mod/settings.php:1062
-msgid "Soapbox Page"
-msgstr ""
-
-#: mod/admin.php:1751 mod/settings.php:1066
-msgid "Public Forum"
-msgstr ""
-
-#: mod/admin.php:1752 mod/settings.php:1070
-msgid "Automatic Friend Page"
-msgstr ""
-
-#: mod/admin.php:1753
-msgid "Private Forum"
-msgstr ""
-
-#: mod/admin.php:1756 mod/settings.php:1042
-msgid "Personal Page"
-msgstr ""
-
-#: mod/admin.php:1757 mod/settings.php:1046
-msgid "Organisation Page"
-msgstr ""
-
-#: mod/admin.php:1758 mod/settings.php:1050
-msgid "News Page"
-msgstr ""
-
-#: mod/admin.php:1759 mod/settings.php:1054
-msgid "Community Forum"
-msgstr ""
-
-#: mod/admin.php:1806 mod/admin.php:1817 mod/admin.php:1830 mod/admin.php:1848
-#: src/Content/ContactSelector.php:82
-msgid "Email"
-msgstr ""
-
-#: mod/admin.php:1806 mod/admin.php:1830
-msgid "Register date"
-msgstr ""
-
-#: mod/admin.php:1806 mod/admin.php:1830
-msgid "Last login"
-msgstr ""
-
-#: mod/admin.php:1806 mod/admin.php:1830
-msgid "Last item"
-msgstr ""
-
-#: mod/admin.php:1806
-msgid "Type"
-msgstr ""
-
-#: mod/admin.php:1813
-msgid "Add User"
-msgstr ""
-
-#: mod/admin.php:1815
-msgid "User registrations waiting for confirm"
-msgstr ""
-
-#: mod/admin.php:1816
-msgid "User waiting for permanent deletion"
-msgstr ""
-
-#: mod/admin.php:1817
-msgid "Request date"
-msgstr ""
-
-#: mod/admin.php:1818
-msgid "No registrations."
-msgstr ""
-
-#: mod/admin.php:1819
-msgid "Note from the user"
-msgstr ""
-
-#: mod/admin.php:1821
-msgid "Deny"
-msgstr ""
-
-#: mod/admin.php:1825
-msgid "Site admin"
-msgstr ""
-
-#: mod/admin.php:1826
-msgid "Account expired"
-msgstr ""
-
-#: mod/admin.php:1829
-msgid "New User"
-msgstr ""
-
-#: mod/admin.php:1830
-msgid "Deleted since"
-msgstr ""
-
-#: mod/admin.php:1835
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: mod/admin.php:1836
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr ""
-
-#: mod/admin.php:1846
-msgid "Name of the new user."
-msgstr ""
-
-#: mod/admin.php:1847
-msgid "Nickname"
-msgstr ""
-
-#: mod/admin.php:1847
-msgid "Nickname of the new user."
-msgstr ""
-
-#: mod/admin.php:1848
-msgid "Email address of the new user."
-msgstr ""
-
-#: mod/admin.php:1890
-#, php-format
-msgid "Addon %s disabled."
-msgstr ""
-
-#: mod/admin.php:1894
-#, php-format
-msgid "Addon %s enabled."
-msgstr ""
-
-#: mod/admin.php:1904 mod/admin.php:2153
-msgid "Disable"
-msgstr ""
-
-#: mod/admin.php:1907 mod/admin.php:2156
-msgid "Enable"
-msgstr ""
-
-#: mod/admin.php:1929 mod/admin.php:2198
-msgid "Toggle"
-msgstr ""
-
-#: mod/admin.php:1937 mod/admin.php:2207
-msgid "Author: "
-msgstr ""
-
-#: mod/admin.php:1938 mod/admin.php:2208
-msgid "Maintainer: "
-msgstr ""
-
-#: mod/admin.php:1990
-msgid "Reload active addons"
-msgstr ""
-
-#: mod/admin.php:1995
-#, 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 ""
-
-#: mod/admin.php:2115
-msgid "No themes found."
-msgstr ""
-
-#: mod/admin.php:2189
-msgid "Screenshot"
-msgstr ""
-
-#: mod/admin.php:2243
-msgid "Reload active themes"
-msgstr ""
-
-#: mod/admin.php:2248
-#, php-format
-msgid "No themes found on the system. They should be placed in %1$s"
-msgstr ""
-
-#: mod/admin.php:2249
-msgid "[Experimental]"
-msgstr ""
-
-#: mod/admin.php:2250
-msgid "[Unsupported]"
-msgstr ""
-
-#: mod/admin.php:2274
-msgid "Log settings updated."
-msgstr ""
-
-#: mod/admin.php:2306
-msgid "PHP log currently enabled."
-msgstr ""
-
-#: mod/admin.php:2308
-msgid "PHP log currently disabled."
-msgstr ""
-
-#: mod/admin.php:2317
-msgid "Clear"
-msgstr ""
-
-#: mod/admin.php:2321
-msgid "Enable Debugging"
-msgstr ""
-
-#: mod/admin.php:2322
-msgid "Log file"
-msgstr ""
-
-#: mod/admin.php:2322
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr ""
-
-#: mod/admin.php:2323
-msgid "Log level"
-msgstr ""
-
-#: mod/admin.php:2325
-msgid "PHP logging"
-msgstr ""
-
-#: mod/admin.php:2326
-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 "
-"'display_errors' is to enable these options, set to '0' to disable them."
-msgstr ""
-
-#: mod/admin.php:2357
-#, php-format
-msgid ""
-"Error trying to open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see "
-"if file %1$s exist and is readable."
-msgstr ""
-
-#: mod/admin.php:2361
-#, php-format
-msgid ""
-"Couldn't open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see if file "
-"%1$s is readable."
-msgstr ""
-
-#: mod/admin.php:2452 mod/admin.php:2453 mod/settings.php:767
-msgid "Off"
-msgstr ""
-
-#: mod/admin.php:2452 mod/admin.php:2453 mod/settings.php:767
-msgid "On"
-msgstr ""
-
-#: mod/admin.php:2453
-#, php-format
-msgid "Lock feature %s"
-msgstr ""
-
-#: mod/admin.php:2461
-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/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:506
-msgid "Event details"
-msgstr ""
-
-#: mod/events.php:507
-msgid "Starting date and Title are required."
-msgstr ""
-
-#: mod/events.php:508 mod/events.php:509
-msgid "Event Starts:"
-msgstr ""
-
-#: mod/events.php:510 mod/events.php:526
-msgid "Finish date/time is not known or not relevant"
-msgstr ""
-
-#: mod/events.php:512 mod/events.php:513
-msgid "Event Finishes:"
-msgstr ""
-
-#: mod/events.php:514 mod/events.php:527
-msgid "Adjust for viewer timezone"
-msgstr ""
-
-#: mod/events.php:516
-msgid "Description:"
-msgstr ""
-
-#: mod/events.php:520 mod/events.php:522
-msgid "Title:"
-msgstr ""
-
-#: mod/events.php:523 mod/events.php:524
-msgid "Share this event"
-msgstr ""
-
-#: mod/events.php:531 src/Model/Profile.php:862
-msgid "Basic"
-msgstr ""
-
-#: mod/events.php:533 mod/photos.php:1086 mod/photos.php:1429
-#: src/Core/ACL.php:318
-msgid "Permissions"
-msgstr ""
-
-#: mod/events.php:552
-msgid "Failed to remove event"
-msgstr ""
-
-#: mod/events.php:554
-msgid "Event removed"
-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 ""
-
-#: mod/item.php:806
-#, php-format
-msgid "You may visit them online at %s"
-msgstr ""
-
-#: 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 ""
-
-#: 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] ""
-msgstr[1] ""
-
-#: 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 ""
-
-#: 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: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/photos.php:108 src/Model/Profile.php:905
+#: mod/photos.php:112 src/Model/Profile.php:894
 msgid "Photo Albums"
 msgstr ""
 
-#: mod/photos.php:109 mod/photos.php:1701
+#: mod/photos.php:113 mod/photos.php:1708
 msgid "Recent Photos"
 msgstr ""
 
-#: mod/photos.php:112 mod/photos.php:1198 mod/photos.php:1703
+#: mod/photos.php:116 mod/photos.php:1230 mod/photos.php:1710
 msgid "Upload New Photos"
 msgstr ""
 
-#: mod/photos.php:126 mod/settings.php:51
-msgid "everybody"
-msgstr ""
-
-#: mod/photos.php:184
+#: mod/photos.php:190
 msgid "Contact information unavailable"
 msgstr ""
 
-#: mod/photos.php:204
+#: mod/photos.php:209
 msgid "Album not found."
 msgstr ""
 
-#: mod/photos.php:234 mod/photos.php:245 mod/photos.php:1149
+#: mod/photos.php:239 mod/photos.php:252 mod/photos.php:1181
 msgid "Delete Album"
 msgstr ""
 
-#: mod/photos.php:243
+#: mod/photos.php:250
 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:1434
+#: mod/photos.php:312 mod/photos.php:324 mod/photos.php:1453
 msgid "Delete Photo"
 msgstr ""
 
-#: mod/photos.php:312
+#: mod/photos.php:322
 msgid "Do you really want to delete this photo?"
 msgstr ""
 
-#: mod/photos.php:655
+#: mod/photos.php:679
 msgid "a photo"
 msgstr ""
 
-#: mod/photos.php:655
+#: mod/photos.php:679
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: mod/photos.php:757
+#: mod/photos.php:782
 msgid "Image upload didn't complete, please try again"
 msgstr ""
 
-#: mod/photos.php:760
+#: mod/photos.php:785
 msgid "Image file is missing"
 msgstr ""
 
-#: mod/photos.php:765
+#: mod/photos.php:790
 msgid ""
 "Server can't accept new file upload at this time, please contact your "
 "administrator"
 msgstr ""
 
-#: mod/photos.php:791
+#: mod/photos.php:816
 msgid "Image file is empty."
 msgstr ""
 
-#: mod/photos.php:928
+#: mod/photos.php:953
 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
+#: mod/photos.php:1104
 msgid "Upload Photos"
 msgstr ""
 
-#: mod/photos.php:1082 mod/photos.php:1144
+#: mod/photos.php:1108 mod/photos.php:1176
 msgid "New album name: "
 msgstr ""
 
-#: mod/photos.php:1083
-msgid "or existing album name: "
+#: mod/photos.php:1109
+msgid "or select existing album:"
 msgstr ""
 
-#: mod/photos.php:1084
+#: mod/photos.php:1110
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: mod/photos.php:1094 mod/photos.php:1437 mod/settings.php:1218
-msgid "Show to Groups"
-msgstr ""
-
-#: mod/photos.php:1095 mod/photos.php:1438 mod/settings.php:1219
-msgid "Show to Contacts"
-msgstr ""
-
-#: mod/photos.php:1155
+#: mod/photos.php:1187
 msgid "Edit Album"
 msgstr ""
 
-#: mod/photos.php:1160
+#: mod/photos.php:1192
 msgid "Show Newest First"
 msgstr ""
 
-#: mod/photos.php:1162
+#: mod/photos.php:1194
 msgid "Show Oldest First"
 msgstr ""
 
-#: mod/photos.php:1183 mod/photos.php:1686
+#: mod/photos.php:1215 mod/photos.php:1693
 msgid "View Photo"
 msgstr ""
 
-#: mod/photos.php:1224
+#: mod/photos.php:1256
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: mod/photos.php:1226
+#: mod/photos.php:1258
 msgid "Photo not available"
 msgstr ""
 
-#: mod/photos.php:1289
+#: mod/photos.php:1333
 msgid "View photo"
 msgstr ""
 
-#: mod/photos.php:1289
+#: mod/photos.php:1333
 msgid "Edit photo"
 msgstr ""
 
-#: mod/photos.php:1290
+#: mod/photos.php:1334
 msgid "Use as profile photo"
 msgstr ""
 
-#: mod/photos.php:1296 src/Object/Post.php:149
+#: mod/photos.php:1340 src/Object/Post.php:151
 msgid "Private Message"
 msgstr ""
 
-#: mod/photos.php:1315
+#: mod/photos.php:1360
 msgid "View Full Size"
 msgstr ""
 
-#: mod/photos.php:1402
+#: mod/photos.php:1421
 msgid "Tags: "
 msgstr ""
 
-#: mod/photos.php:1405
+#: mod/photos.php:1424
 msgid "[Remove any tag]"
 msgstr ""
 
-#: mod/photos.php:1420
+#: mod/photos.php:1439
 msgid "New album name"
 msgstr ""
 
-#: mod/photos.php:1421
+#: mod/photos.php:1440
 msgid "Caption"
 msgstr ""
 
-#: mod/photos.php:1422
+#: mod/photos.php:1441
 msgid "Add a Tag"
 msgstr ""
 
-#: mod/photos.php:1422
+#: mod/photos.php:1441
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: mod/photos.php:1423
+#: mod/photos.php:1442
 msgid "Do not rotate"
 msgstr ""
 
-#: mod/photos.php:1424
+#: mod/photos.php:1443
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: mod/photos.php:1425
+#: mod/photos.php:1444
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: mod/photos.php:1459 src/Object/Post.php:304
+#: mod/photos.php:1478 src/Object/Post.php:293
 msgid "I like this (toggle)"
 msgstr ""
 
-#: mod/photos.php:1460 src/Object/Post.php:305
+#: mod/photos.php:1479 src/Object/Post.php:294
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: mod/photos.php:1478 mod/photos.php:1517 mod/photos.php:1590
-#: src/Object/Post.php:407 src/Object/Post.php:803
+#: 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:1622
+#: mod/photos.php:1627
 msgid "Map"
 msgstr ""
 
-#: mod/photos.php:1692 mod/videos.php:387
-msgid "View Album"
-msgstr ""
-
-#: mod/profile.php:37 src/Model/Profile.php:118
-msgid "Requested profile is not available."
-msgstr ""
-
-#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1250
-#, php-format
-msgid "%s's timeline"
-msgstr ""
-
-#: mod/profile.php:79 src/Protocol/OStatus.php:1251
-#, php-format
-msgid "%s's posts"
-msgstr ""
-
-#: mod/profile.php:80 src/Protocol/OStatus.php:1252
-#, php-format
-msgid "%s's comments"
-msgstr ""
-
-#: mod/profile.php:195
-msgid "Tips for New Members"
-msgstr ""
-
-#: mod/register.php:100
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr ""
-
-#: mod/register.php:104
+#: 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."
+"<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."
+#: 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 ""
-
-#: 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 ""
-
-#: mod/register.php:223
-msgid "Your OpenID (optional): "
-msgstr ""
-
-#: 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 ""
-
-#: 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"
+msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: mod/removeme.php:78 mod/removeme.php:81
-msgid "Remove My Account"
+#: src/Database/DBStructure.php:33
+msgid "There are no tables on MyISAM."
 msgstr ""
 
-#: 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 ""
-
-#: 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:339
-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 ""
-
-#: mod/settings.php:673 mod/settings.php:699
-msgid "Consumer Secret"
-msgstr ""
-
-#: mod/settings.php:674 mod/settings.php:700
-msgid "Redirect"
-msgstr ""
-
-#: mod/settings.php:675 mod/settings.php:701
-msgid "Icon url"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: mod/settings.php:798
-msgid "GNU Social (OStatus)"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: mod/settings.php:844
-msgid "Your legacy GNU Social account"
-msgstr ""
-
-#: 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 ""
-
-#: mod/settings.php:847
-msgid "Repair OStatus subscriptions"
-msgstr ""
-
-#: 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 ""
-
-#: mod/settings.php:856
-msgid "IMAP port:"
-msgstr ""
-
-#: 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 ""
-
-#: mod/settings.php:908
-#, php-format
-msgid "%s - (Experimental)"
-msgstr ""
-
-#: 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 ""
-
-#: mod/settings.php:960
-msgid "Minimum of 10 seconds. Enter -1 to disable it."
-msgstr ""
-
-#: 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 ""
-
-#: 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 "Bandwith 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 ""
-
-#: mod/settings.php:1086
-msgid "(Optional) Allow this OpenID to login to this account."
-msgstr ""
-
-#: 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."
+"The error message is\n"
+"[pre]%s[/pre]"
 msgstr ""
 
-#: 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"
+"\n"
+"Error %d occurred during database update:\n"
+"%s\n"
 msgstr ""
 
-#: mod/settings.php:1111
-msgid "Hide your profile details from anonymous viewers?"
+#: 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 ""
-
-#: 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 ""
-
-#: mod/settings.php:1131
-msgid "Profile is <strong>not published</strong>."
-msgstr ""
-
-#: mod/settings.php:1137
+#: src/Database/DBStructure.php:211
 #, php-format
-msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
+msgid "%s: Database update"
 msgstr ""
 
-#: 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"
-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 ""
-
-#: 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/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:502
-msgid "default"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:55
-msgid "greenzero"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:56
-msgid "purplezero"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:57
-msgid "easterbunny"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:58
-msgid "darkzero"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:59
-msgid "comix"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:60
-msgid "slackr"
-msgstr ""
-
-#: 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 ""
-
-#: src/Core/UserImport.php:118
+#: src/Database/DBStructure.php:473
 #, php-format
-msgid "User '%s' already exists on this server!"
+msgid "%s: updating %s table."
 msgstr ""
 
-#: 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] ""
-msgstr[1] ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: src/Core/NotificationsManager.php:267
-#, php-format
-msgid "%s created a new post"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:281
-#, php-format
-msgid "%s liked %s's post"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:294
-#, php-format
-msgid "%s disliked %s's post"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:307
-#, php-format
-msgid "%s is attending %s's event"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:320
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:333
-#, php-format
-msgid "%s may attend %s's event"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:350
-#, php-format
-msgid "%s is now friends with %s"
-msgstr ""
-
-#: 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 ""
 
-#: 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 href='https://"
@@ -7773,223 +7805,633 @@ msgid ""
 "worker'>'Setup the worker'</a>"
 msgstr ""
 
-#: src/Core/Install.php:162
+#: src/Core/Install.php:143
 msgid "PHP executable path"
 msgstr ""
 
-#: 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 ""
 
-#: src/Core/Install.php:167
+#: src/Core/Install.php:148
 msgid "Command line PHP"
 msgstr ""
 
-#: 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 ""
 
-#: src/Core/Install.php:177
+#: src/Core/Install.php:158
 msgid "Found PHP version: "
 msgstr ""
 
-#: src/Core/Install.php:179
+#: src/Core/Install.php:160
 msgid "PHP cli binary"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: src/Core/Install.php:245
+#: src/Core/Install.php:226
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: src/Core/Install.php:246
+#: src/Core/Install.php:227
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: src/Core/Install.php:247
+#: src/Core/Install.php:228
 msgid "PDO or MySQLi PHP module"
 msgstr ""
 
-#: src/Core/Install.php:248
+#: src/Core/Install.php:229
 msgid "mb_string PHP module"
 msgstr ""
 
-#: src/Core/Install.php:249
+#: src/Core/Install.php:230
 msgid "XML PHP module"
 msgstr ""
 
-#: src/Core/Install.php:250
+#: src/Core/Install.php:231
 msgid "iconv PHP module"
 msgstr ""
 
-#: src/Core/Install.php:251
+#: src/Core/Install.php:232
 msgid "POSIX PHP module"
 msgstr ""
 
-#: 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 ""
 
-#: src/Core/Install.php:255
+#: src/Core/Install.php:236
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: src/Core/Install.php:263
+#: src/Core/Install.php:244
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Install.php:267
+#: src/Core/Install.php:248
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: src/Core/Install.php:271
+#: src/Core/Install.php:252
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: 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 ""
 
-#: src/Core/Install.php:283
+#: src/Core/Install.php:264
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: src/Core/Install.php:287
+#: src/Core/Install.php:268
 msgid "Error: iconv PHP module required but not installed."
 msgstr ""
 
-#: 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 ""
 
-#: 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."
+"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."
+"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 ""
 
-#: src/Core/Install.php:326
-msgid ".htconfig.php is writable"
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: src/Core/Install.php:350
+#: src/Core/Install.php:331
 msgid "view/smarty3 is writable"
 msgstr ""
 
-#: src/Core/Install.php:375
+#: src/Core/Install.php:356
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr ""
 
-#: 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 ""
 
-#: src/Core/Install.php:408
+#: src/Core/Install.php:389
 msgid "ImageMagick PHP extension is not installed"
 msgstr ""
 
-#: src/Core/Install.php:410
+#: src/Core/Install.php:391
 msgid "ImageMagick PHP extension is installed"
 msgstr ""
 
-#: src/Core/Install.php:412
+#: src/Core/Install.php:393
 msgid "ImageMagick supports GIF"
 msgstr ""
 
-#: 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 ""
+
+#: 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 ""
+
+#: src/Core/NotificationsManager.php:273
+#, php-format
+msgid "%s created a new post"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:287
+#, php-format
+msgid "%s liked %s's post"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:300
+#, php-format
+msgid "%s disliked %s's post"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:313
+#, php-format
+msgid "%s is attending %s's event"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:326
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:339
+#, php-format
+msgid "%s may attend %s's event"
+msgstr ""
+
+#: src/Core/NotificationsManager.php:360
+#, php-format
+msgid "%s is now friends with %s"
+msgstr ""
+
+#: 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 ""
+
+#: src/Core/UserImport.php:114
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: src/Protocol/OStatus.php:1814
+msgid "following"
+msgstr ""
+
+#: src/Protocol/OStatus.php:1817
+#, php-format
+msgid "%s stopped following %s."
+msgstr ""
+
+#: 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 ""
+
+#: src/Protocol/DFRN.php:1526 src/Model/Contact.php:1957
+#, php-format
+msgid "Happy Birthday %s"
+msgstr ""
+
+#: src/Protocol/Diaspora.php:2417
+msgid "Sharing notification from Diaspora network"
+msgstr ""
+
+#: src/Protocol/Diaspora.php:3514
+msgid "Attachments:"
+msgstr ""
+
+#: src/Util/Temporal.php:147 src/Model/Profile.php:745
 msgid "Birthday:"
 msgstr ""
 
@@ -8054,362 +8496,445 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:426
-msgid "view full size"
+#: 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"
+#: 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/Content/Text/BBCode.php:1548 src/Content/Text/BBCode.php:1570
-msgid "$1 wrote:"
+#: src/Model/Contact.php:1403
+msgid "News"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1630 src/Content/Text/BBCode.php:1631
-msgid "Encrypted content"
+#: src/Model/Contact.php:1407
+msgid "Forum"
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1750
-msgid "Invalid source protocol"
+#: src/Model/Contact.php:1587
+msgid "Connect URL missing."
 msgstr ""
 
-#: src/Content/Text/BBCode.php:1761
-msgid "Invalid link protocol"
+#: 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/OEmbed.php:253
-msgid "Embedding disabled"
+#: src/Model/Contact.php:1635
+msgid ""
+"This site is not configured to allow communications with other networks."
 msgstr ""
 
-#: src/Content/OEmbed.php:373
-msgid "Embedded content"
+#: src/Model/Contact.php:1636 src/Model/Contact.php:1650
+msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: src/Content/Widget/CalendarExport.php:61
-msgid "Export"
+#: src/Model/Contact.php:1648
+msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: src/Content/Widget/CalendarExport.php:62
-msgid "Export calendar as ical"
+#: src/Model/Contact.php:1653
+msgid "An author or name was not found."
 msgstr ""
 
-#: src/Content/Widget/CalendarExport.php:63
-msgid "Export calendar as csv"
+#: src/Model/Contact.php:1656
+msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: src/Content/ContactSelector.php:55
-msgid "Frequently"
+#: src/Model/Contact.php:1659
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
 msgstr ""
 
-#: src/Content/ContactSelector.php:56
-msgid "Hourly"
+#: src/Model/Contact.php:1660
+msgid "Use mailto: in front of address to force email check."
 msgstr ""
 
-#: src/Content/ContactSelector.php:57
-msgid "Twice daily"
+#: src/Model/Contact.php:1666
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
 msgstr ""
 
-#: src/Content/ContactSelector.php:58
-msgid "Daily"
+#: 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:59
-msgid "Weekly"
+#: src/Model/Contact.php:1722
+msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: src/Content/ContactSelector.php:60
-msgid "Monthly"
+#: src/Model/Event.php:59 src/Model/Event.php:76 src/Model/Event.php:428
+#: src/Model/Event.php:897
+msgid "Starts:"
 msgstr ""
 
-#: src/Content/ContactSelector.php:80
-msgid "OStatus"
+#: src/Model/Event.php:62 src/Model/Event.php:82 src/Model/Event.php:429
+#: src/Model/Event.php:901
+msgid "Finishes:"
 msgstr ""
 
-#: src/Content/ContactSelector.php:81
-msgid "RSS/Atom"
+#: src/Model/Event.php:377
+msgid "all-day"
 msgstr ""
 
-#: src/Content/ContactSelector.php:84
-msgid "Facebook"
+#: src/Model/Event.php:400
+msgid "Jun"
 msgstr ""
 
-#: src/Content/ContactSelector.php:85
-msgid "Zot!"
+#: src/Model/Event.php:403
+msgid "Sept"
 msgstr ""
 
-#: src/Content/ContactSelector.php:86
-msgid "LinkedIn"
+#: src/Model/Event.php:426
+msgid "No events to display"
 msgstr ""
 
-#: src/Content/ContactSelector.php:87
-msgid "XMPP/IM"
+#: src/Model/Event.php:550
+msgid "l, F j"
 msgstr ""
 
-#: src/Content/ContactSelector.php:88
-msgid "MySpace"
+#: src/Model/Event.php:581
+msgid "Edit event"
 msgstr ""
 
-#: src/Content/ContactSelector.php:89
-msgid "Google+"
+#: src/Model/Event.php:582
+msgid "Duplicate event"
 msgstr ""
 
-#: src/Content/ContactSelector.php:90
-msgid "pump.io"
+#: src/Model/Event.php:583
+msgid "Delete event"
 msgstr ""
 
-#: src/Content/ContactSelector.php:91
-msgid "Twitter"
+#: src/Model/Event.php:830
+msgid "D g:i A"
 msgstr ""
 
-#: src/Content/ContactSelector.php:92
-msgid "Diaspora Connector"
+#: src/Model/Event.php:831
+msgid "g:i A"
 msgstr ""
 
-#: src/Content/ContactSelector.php:93
-msgid "GNU Social Connector"
+#: src/Model/Event.php:916 src/Model/Event.php:918
+msgid "Show map"
 msgstr ""
 
-#: src/Content/ContactSelector.php:94
-msgid "pnut"
+#: src/Model/Event.php:917
+msgid "Hide map"
 msgstr ""
 
-#: src/Content/ContactSelector.php:95
-msgid "App.net"
+#: src/Model/User.php:168
+msgid "Login failed"
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Male"
+#: src/Model/User.php:199
+msgid "Not enough information to authenticate"
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Female"
+#: src/Model/User.php:384
+msgid "An invitation is required."
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Currently Male"
+#: src/Model/User.php:388
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Currently Female"
+#: src/Model/User.php:395
+msgid "Invalid OpenID url"
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Mostly Male"
+#: src/Model/User.php:414
+msgid "Please enter the required information."
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Mostly Female"
+#: src/Model/User.php:427
+msgid "Please use a shorter name."
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Transgender"
+#: src/Model/User.php:430
+msgid "Name too short."
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Intersex"
+#: src/Model/User.php:438
+msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Transsexual"
+#: src/Model/User.php:443
+msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Hermaphrodite"
+#: src/Model/User.php:447
+msgid "Not a valid email address."
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Neuter"
+#: src/Model/User.php:450
+msgid "The nickname was blocked from registration by the nodes admin."
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Non-specific"
+#: src/Model/User.php:454 src/Model/User.php:462
+msgid "Cannot use that email."
 msgstr ""
 
-#: src/Content/ContactSelector.php:125
-msgid "Other"
+#: src/Model/User.php:469
+msgid "Your nickname can only contain a-z, 0-9 and _."
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
-msgid "Males"
+#: src/Model/User.php:476 src/Model/User.php:533
+msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
-msgid "Females"
+#: src/Model/User.php:486
+msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
-msgid "Gay"
+#: src/Model/User.php:520 src/Model/User.php:524
+msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
-msgid "Lesbian"
+#: src/Model/User.php:549
+msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: src/Content/ContactSelector.php:147
-msgid "No Preference"
+#: src/Model/User.php:556
+msgid "An error occurred creating your self contact. Please try again."
 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:519
+#: src/Model/User.php:561 src/Content/ContactSelector.php:166
 msgid "Friends"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Friends/Benefits"
+#: 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"
+#: 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"
+#: src/Model/User.php:649
+#, php-format
+msgid "Registration at %s"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Married"
+#: 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 ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Imaginarily married"
+#: 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"
+#: 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 ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Cohabiting"
+#: src/Model/Group.php:329
+msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Common law"
+#: src/Model/Group.php:362
+msgid "Everybody"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Happy"
+#: src/Model/Group.php:382
+msgid "edit"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Not looking"
+#: src/Model/Group.php:406
+msgid "Edit group"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Swinger"
+#: src/Model/Group.php:409
+msgid "Create a new group"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Betrayed"
+#: src/Model/Group.php:411
+msgid "Edit groups"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Separated"
+#: src/Model/Profile.php:97
+msgid "Requested account is not available."
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Unstable"
+#: 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"
+#: src/Model/Profile.php:333
+msgid "Atom feed"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Imaginarily divorced"
+#: src/Model/Profile.php:372
+msgid "Manage/edit profiles"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Widowed"
+#: src/Model/Profile.php:550 src/Model/Profile.php:639
+msgid "g A l F d"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Uncertain"
+#: src/Model/Profile.php:551
+msgid "F d"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "It's complicated"
+#: src/Model/Profile.php:604 src/Model/Profile.php:690
+msgid "[today]"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Don't care"
+#: src/Model/Profile.php:615
+msgid "Birthday Reminders"
 msgstr ""
 
-#: src/Content/ContactSelector.php:169
-msgid "Ask me"
+#: 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 ""
+
+#: src/Model/Profile.php:737
+msgid "j F"
+msgstr ""
+
+#: src/Model/Profile.php:752
+msgid "Age:"
+msgstr ""
+
+#: src/Model/Profile.php:765
+#, php-format
+msgid "for %1$d %2$s"
+msgstr ""
+
+#: 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
@@ -8431,33 +8956,329 @@ msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: 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] ""
 msgstr[1] ""
 
+#: 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 ""
+
+#: src/Content/ContactSelector.php:80
+msgid "RSS/Atom"
+msgstr ""
+
+#: src/Content/ContactSelector.php:83
+msgid "Zot!"
+msgstr ""
+
+#: src/Content/ContactSelector.php:84
+msgid "LinkedIn"
+msgstr ""
+
+#: src/Content/ContactSelector.php:85
+msgid "XMPP/IM"
+msgstr ""
+
+#: src/Content/ContactSelector.php:86
+msgid "MySpace"
+msgstr ""
+
+#: src/Content/ContactSelector.php:87
+msgid "Google+"
+msgstr ""
+
+#: src/Content/ContactSelector.php:88
+msgid "pump.io"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
@@ -8765,10 +9586,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 ""
@@ -8785,767 +9602,47 @@ msgstr ""
 msgid "Site map"
 msgstr ""
 
-#: src/Database/DBStructure.php:32
-msgid "There are no tables on MyISAM."
+#: src/Content/Widget/CalendarExport.php:65
+msgid "Export"
 msgstr ""
 
-#: 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."
+#: src/Content/Widget/CalendarExport.php:66
+msgid "Export calendar as ical"
 msgstr ""
 
-#: src/Database/DBStructure.php:80
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
+#: src/Content/Widget/CalendarExport.php:67
+msgid "Export calendar as csv"
 msgstr ""
 
-#: src/Database/DBStructure.php:191
-#, php-format
-msgid ""
-"\n"
-"Error %d occurred during database update:\n"
-"%s\n"
+#: src/Content/OEmbed.php:256
+msgid "Embedding disabled"
 msgstr ""
 
-#: src/Database/DBStructure.php:194
-msgid "Errors encountered performing database changes: "
+#: src/Content/OEmbed.php:376
+msgid "Embedded content"
 msgstr ""
 
-#: src/Database/DBStructure.php:210
-#, php-format
-msgid "%s: Database update"
+#: src/Content/Text/BBCode.php:423
+msgid "view full size"
 msgstr ""
 
-#: src/Database/DBStructure.php:460
-#, php-format
-msgid "%s: updating %s table."
+#: src/Content/Text/BBCode.php:853 src/Content/Text/BBCode.php:1626
+#: src/Content/Text/BBCode.php:1627
+msgid "Image/photo"
 msgstr ""
 
-#: src/Model/Mail.php:40 src/Model/Mail.php:174
-msgid "[no subject]"
+#: src/Content/Text/BBCode.php:1553 src/Content/Text/BBCode.php:1575
+msgid "$1 wrote:"
 msgstr ""
 
-#: src/Model/Event.php:53 src/Model/Event.php:70 src/Model/Event.php:419
-#: src/Model/Event.php:882
-msgid "Starts:"
+#: src/Content/Text/BBCode.php:1635 src/Content/Text/BBCode.php:1636
+msgid "Encrypted content"
 msgstr ""
 
-#: src/Model/Event.php:56 src/Model/Event.php:76 src/Model/Event.php:420
-#: src/Model/Event.php:886
-msgid "Finishes:"
+#: src/Content/Text/BBCode.php:1755
+msgid "Invalid source protocol"
 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 ""
-
-#: 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/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 ""
-
-#: 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/User.php:154
-msgid "Login failed"
-msgstr ""
-
-#: src/Model/User.php:185
-msgid "Not enough information to authenticate"
-msgstr ""
-
-#: src/Model/User.php:346
-msgid "An invitation is required."
-msgstr ""
-
-#: src/Model/User.php:350
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: src/Model/User.php:357
-msgid "Invalid OpenID url"
-msgstr ""
-
-#: src/Model/User.php:370 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 ""
-
-#: src/Model/User.php:370 src/Module/Login.php:101
-msgid "The error message was:"
-msgstr ""
-
-#: src/Model/User.php:376
-msgid "Please enter the required information."
-msgstr ""
-
-#: src/Model/User.php:389
-msgid "Please use a shorter name."
-msgstr ""
-
-#: src/Model/User.php:392
-msgid "Name too short."
-msgstr ""
-
-#: src/Model/User.php:400
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr ""
-
-#: src/Model/User.php:405
-msgid "Your email domain is not among those allowed on this site."
-msgstr ""
-
-#: src/Model/User.php:409
-msgid "Not a valid email address."
-msgstr ""
-
-#: src/Model/User.php:413 src/Model/User.php:421
-msgid "Cannot use that email."
-msgstr ""
-
-#: src/Model/User.php:428
-msgid "Your nickname can only contain a-z, 0-9 and _."
-msgstr ""
-
-#: src/Model/User.php:435 src/Model/User.php:491
-msgid "Nickname is already registered. Please choose another."
-msgstr ""
-
-#: src/Model/User.php:445
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr ""
-
-#: src/Model/User.php:478 src/Model/User.php:482
-msgid "An error occurred during registration. Please try again."
-msgstr ""
-
-#: src/Model/User.php:507
-msgid "An error occurred creating your default profile. Please try again."
-msgstr ""
-
-#: src/Model/User.php:514
-msgid "An error occurred creating your self contact. Please try again."
-msgstr ""
-
-#: src/Model/User.php:523
-msgid ""
-"An error occurred creating your default contact group. Please try again."
-msgstr ""
-
-#: src/Model/User.php:597
-#, 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:607
-#, php-format
-msgid "Registration at %s"
-msgstr ""
-
-#: src/Model/User.php:625
-#, 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 ""
-
-#: src/Model/User.php:629
-#, 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/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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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:1513
-#, php-format
-msgid "%s's birthday"
-msgstr ""
-
-#: src/Model/Contact.php:1647 src/Protocol/DFRN.php:1514
-#, php-format
-msgid "Happy Birthday %s"
-msgstr ""
-
-#: src/Model/Item.php:1884
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr ""
-
-#: src/Model/Item.php:1889
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr ""
-
-#: src/Model/Item.php:1894
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: src/Model/Profile.php:547
-msgid "F d"
-msgstr ""
-
-#: 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 ""
-
-#: src/Model/Profile.php:748
-msgid "j F"
-msgstr ""
-
-#: src/Model/Profile.php:763
-msgid "Age:"
-msgstr ""
-
-#: src/Model/Profile.php:776
-#, php-format
-msgid "for %1$d %2$s"
-msgstr ""
-
-#: 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/Protocol/Diaspora.php:2521
-msgid "Sharing notification from Diaspora network"
-msgstr ""
-
-#: src/Protocol/Diaspora.php:3609
-msgid "Attachments:"
-msgstr ""
-
-#: src/Protocol/OStatus.php:1798
-#, php-format
-msgid "%s is now following %s."
-msgstr ""
-
-#: src/Protocol/OStatus.php:1799
-msgid "following"
-msgstr ""
-
-#: src/Protocol/OStatus.php:1802
-#, php-format
-msgid "%s stopped following %s."
-msgstr ""
-
-#: 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 ""
-
-#: 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 "Remove from your stream"
-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] ""
-msgstr[1] ""
-
-#: 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 ""
-
-#: update.php:193
-#, php-format
-msgid "%s: Updating author-id and owner-id in item and thread table. "
-msgstr ""
-
-#: boot.php:796
-#, php-format
-msgid "Update %s failed. See error logs."
+#: src/Content/Text/BBCode.php:1766
+msgid "Invalid link protocol"
 msgstr ""
diff --git a/view/custom_tinymce.css b/view/custom_tinymce.css
deleted file mode 100644
index 7932653b6..000000000
--- a/view/custom_tinymce.css
+++ /dev/null
@@ -1,41 +0,0 @@
-body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:14px; margin:8px;}
-body {background:#FFF;}
-body.mceForceColors {background:#FFF; color:#000;}
-h1 {font-size: 2em}
-h2 {font-size: 1.5em}
-h3 {font-size: 1.17em}
-h4 {font-size: 1em}
-h5 {font-size: .83em}
-h6 {font-size: .75em}
-.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
-a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !important; background:url(img/items.gif) no-repeat 0 0;}
-td.mceSelected, th.mceSelected {background-color:#3399ff !important}
-img {border:0;}
-table {cursor:default}
-table td, table th {cursor:text}
-ins {border-bottom:1px solid green; text-decoration: none; color:green}
-del {color:red; text-decoration:line-through}
-cite {border-bottom:1px dashed blue}
-acronym {border-bottom:1px dotted #CCC; cursor:help}
-abbr {border-bottom:1px dashed #CCC; cursor:help}
-
-/* IE */
-* html body {
-scrollbar-3dlight-color:#F0F0EE;
-scrollbar-arrow-color:#676662;
-scrollbar-base-color:#F0F0EE;
-scrollbar-darkshadow-color:#DDD;
-scrollbar-face-color:#E0E0DD;
-scrollbar-highlight-color:#F0F0EE;
-scrollbar-shadow-color:#F0F0EE;
-scrollbar-track-color:#F5F5F5;
-}
-
-img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}
-font[face=mceinline] {font-family:inherit !important}
-
-
-object {
-	display: block; width: 400px; 
-	background: #cccccc url(../images/plugin.png) no-repeat center center;
-}
diff --git a/view/global.css b/view/global.css
index 0e6a36e2c..e266ceb53 100644
--- a/view/global.css
+++ b/view/global.css
@@ -207,10 +207,8 @@ blockquote.shared_content {
 }
 
 #newmember-tips {
+  margin-top: -3px;
   font-size: 1.2em;
-  float: right;
-  margin-top: -32px;
-  padding-right: 10px;
 }
 
 /* headers */
@@ -250,7 +248,6 @@ span.oembed, h4 {
 }
 
 code {
-  display: block;
   background-color: #eee;
   color: #666;
   padding: 1em;
@@ -608,3 +605,7 @@ img.invalid-src:after { vertical-align: top;}
 .tag-cloud {
   word-wrap: break-word;
 }
+
+#register-explicid-content {
+  font-weight: bold;
+}
diff --git a/view/js/acl.js b/view/js/acl.js
index 257e2c158..1f6d25d5a 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -42,9 +42,6 @@ function ACL(backend_url, preset, automention, is_mobile){
 	/* add/remove mentions  */
 	this.element = $("#profile-jot-text");
 	this.htmlelm = this.element.get()[0];
-
-	/* startup! */
-	this.get(0,100);
 }
 
 ACL.prototype.remove_mention = function(id) {
@@ -344,7 +341,7 @@ ACL.prototype.populate = function(data){
 
 /**
  * @brief Deselect previous selected contact.
- * 
+ *
  * @param {int} id The contact ID.
  * @returns {void}
  */
diff --git a/view/js/addon-hooks.js b/view/js/addon-hooks.js
new file mode 100644
index 000000000..3e1cb4849
--- /dev/null
+++ b/view/js/addon-hooks.js
@@ -0,0 +1,41 @@
+/**
+ * @file addon-hooks.js
+ * @brief Provide a way for add-ons to register a JavaScript hook
+ */
+
+var addon_hooks = {};
+
+/**
+ * @brief Register a JavaScript hook to be called from other Javascript files
+ * @pre the .js file from which the hook will be called is included in the document response
+ * @param type which type of hook i.e. where should it be called along with other hooks of the same type
+ * @param hookfnstr name of the JavaScript function name that needs to be called
+ */
+function Addon_registerHook(type, hookfnstr)
+{
+	if (!addon_hooks.hasOwnProperty(type)) {
+		addon_hooks[type] = [];
+	}
+
+	addon_hooks[type].push(hookfnstr);
+}
+
+/**
+ * @brief Call all registered hooks of a certain type, i.e. at the same point of the JavaScript code execution
+ * @param typeOfHook string indicating which type of hooks to be called among the registered hooks
+ */
+function callAddonHooks(typeOfHook)
+{
+	if (typeof addon_hooks !== 'undefined') {
+		var myTypeOfHooks = addon_hooks[typeOfHook];
+		if (typeof myTypeOfHooks !== 'undefined') {
+			for (addon_hook_idx = 0; addon_hook_idx < myTypeOfHooks.length; addon_hook_idx++) {
+				var hookfnstr = myTypeOfHooks[addon_hook_idx];
+				var hookfn = window[hookfnstr];
+				if (typeof hookfn === "function") {
+					hookfn();
+				}
+			}
+		}
+	}
+}
diff --git a/view/js/ajaxupload.js b/view/js/ajaxupload.js
index 1c34b11b9..131ab078e 100644
--- a/view/js/ajaxupload.js
+++ b/view/js/ajaxupload.js
@@ -380,7 +380,8 @@
                 'cursor' : 'pointer'
             });            
 
-            var div = document.createElement("div");                        
+            var div = document.createElement("div");
+            div.setAttribute('class', 'ajaxbutton-wrapper');
             addStyles(div, {
                 'display' : 'block',
                 'position' : 'absolute',
diff --git a/view/js/main.js b/view/js/main.js
index 475e81087..83086c82b 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);
 	});
 
@@ -302,7 +307,14 @@ $(function() {
 		$('#nav-notifications-menu').perfectScrollbar('update');
 	});
 
-	NavUpdate();
+	// Asynchronous calls are deferred until the very end of the page load to ease on slower connections
+	window.addEventListener("load", function(){
+		NavUpdate();
+		if (typeof acl !== 'undefined') {
+			acl.get(0, 100);
+		}
+	});
+
 	// Allow folks to stop the ajax page updates with the pause/break key
 	$(document).keydown(function(event) {
 		if (event.keyCode == '8') {
@@ -378,7 +390,7 @@ function NavUpdate() {
 				$('nav').trigger('nav-update', data.result);
 
 				// start live update
-				['network', 'profile', 'community', 'notes', 'display'].forEach(function (src) {
+				['network', 'profile', 'community', 'notes', 'display', 'contacts'].forEach(function (src) {
 					if ($('#live-' + src).length) {
 						liveUpdate(src);
 					}
@@ -395,6 +407,47 @@ function NavUpdate() {
 	timer = setTimeout(NavUpdate, updateInterval);
 }
 
+function updateConvItems(data) {
+	// add a new thread
+	$('.toplevel_item',data).each(function() {
+		var ident = $(this).attr('id');
+
+		// Add new top-level item.
+		if ($('#' + ident).length == 0 && profile_page == 1) {
+			$('#' + prev).after($(this));
+
+		// Replace already existing thread.
+		} else {
+			// Find out if the hidden comments are open, so we can keep it that way
+			// if a new comment has been posted
+			var id = $('.hide-comments-total', this).attr('id');
+			if (typeof id != 'undefined') {
+				id = id.split('-')[3];
+				var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
+			}
+
+			$('#' + ident).replaceWith($(this));
+
+			if (typeof id != 'undefined') {
+				if (commentsOpen) {
+					showHideComments(id);
+				}
+			}
+		}
+		prev = ident;
+	});
+
+	$('.like-rotator').hide();
+	if (commentBusy) {
+		commentBusy = false;
+		$('body').css('cursor', 'auto');
+	}
+	/* autocomplete @nicknames */
+	$(".comment-edit-form  textarea").editor_autocomplete(baseurl+"/acl");
+	/* autocomplete bbcode */
+	$(".comment-edit-form  textarea").bbco_autocomplete('bbcode');
+}
+
 function liveUpdate(src) {
 	if ((src == null) || stopped || !profile_uid) {
 		$('.like-rotator').hide(); return;
@@ -418,6 +471,9 @@ function liveUpdate(src) {
 	if ($(document).scrollTop() == 0) {
 		force_update = true;
 	}
+
+	var orgHeight = $("section").height();
+
 	var udargs = ((netargs.length) ? '/' + netargs : '');
 	var update_url = 'update_' + src + udargs + '&p=' + profile_uid + '&page=' + profile_page + '&force=' + ((force_update) ? 1 : 0) + '&item=' + update_item;
 
@@ -426,50 +482,17 @@ function liveUpdate(src) {
 		force_update = false;
 		update_item = 0;
 
-		// add a new thread
-		$('.toplevel_item',data).each(function() {
-			var ident = $(this).attr('id');
+		$('.wall-item-body', data).imagesLoaded(function() {
+			updateConvItems(data);
 
-			if ($('#' + ident).length == 0 && profile_page == 1) {
-				$('img',this).each(function() {
-					$(this).attr('src',$(this).attr('dst'));
-				});
-				$('#' + prev).after($(this));
-			} else {
-				// Find out if the hidden comments are open, so we can keep it that way
-				// if a new comment has been posted
-				var id = $('.hide-comments-total', this).attr('id');
-				if (typeof id != 'undefined') {
-					id = id.split('-')[3];
-					var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
-				}
-
-				$('img',this).each(function() {
-					$(this).attr('src',$(this).attr('dst'));
-				});
-				$('html').height($('html').height());
-				$('#' + ident).replaceWith($(this));
-
-				if (typeof id != 'undefined') {
-					if (commentsOpen) {
-						showHideComments(id);
-					}
-				}
-				$('html').height('auto');
-			}
-			prev = ident;
+			// Update the scroll position.
+			$(window).scrollTop($(window).scrollTop() + $("section").height() - orgHeight);
 		});
 
-		$('.like-rotator').hide();
-		if (commentBusy) {
-			commentBusy = false;
-			$('body').css('cursor', 'auto');
-		}
-		/* autocomplete @nicknames */
-		$(".comment-edit-form  textarea").editor_autocomplete(baseurl+"/acl");
-		/* autocomplete bbcode */
-		$(".comment-edit-form  textarea").bbco_autocomplete('bbcode');
+		callAddonHooks("postprocess_liveupdate");
+
 	});
+
 }
 
 function imgbright(node) {
diff --git a/view/lang/cs/messages.po b/view/lang/cs/messages.po
index b5f46180a..7b87e7d32 100644
--- a/view/lang/cs/messages.po
+++ b/view/lang/cs/messages.po
@@ -3,3202 +3,4068 @@
 # This file is distributed under the same license as the Friendica package.
 # 
 # Translators:
+# Aditoo, 2018
 # Josef Moravek <josef.moravek@bydleni.cz>, 2014
+# Aditoo, 2018
 # michal_s <msupler@gmail.com>, 2011-2015
 # michal_s <msupler@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-19 07:46+0100\n"
-"PO-Revision-Date: 2016-12-19 10:01+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"POT-Creation-Date: 2018-08-25 15:34+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-
-#: include/contact_widgets.php:6
-msgid "Add New Contact"
-msgstr "Přidat nový kontakt"
-
-#: include/contact_widgets.php:7
-msgid "Enter address or web location"
-msgstr "Zadejte adresu nebo umístění webu"
-
-#: include/contact_widgets.php:8
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Příklad: jan@příklad.cz, http://příklad.cz/jana"
-
-#: include/contact_widgets.php:10 include/identity.php:218
-#: mod/allfriends.php:82 mod/dirfind.php:201 mod/match.php:87
-#: mod/suggest.php:101
-msgid "Connect"
-msgstr "Spojit"
-
-#: include/contact_widgets.php:24
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "Pozvánka %d k dispozici"
-msgstr[1] "Pozvánky %d k dispozici"
-msgstr[2] "Pozvánky %d k dispozici"
-
-#: include/contact_widgets.php:30
-msgid "Find People"
-msgstr "Nalézt lidi"
-
-#: include/contact_widgets.php:31
-msgid "Enter name or interest"
-msgstr "Zadejte jméno nebo zájmy"
-
-#: include/contact_widgets.php:32 include/Contact.php:354
-#: include/conversation.php:981 mod/allfriends.php:66 mod/dirfind.php:204
-#: mod/match.php:72 mod/suggest.php:83 mod/contacts.php:602 mod/follow.php:103
-msgid "Connect/Follow"
-msgstr "Připojit / Následovat"
-
-#: include/contact_widgets.php:33
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Příklady: Robert Morgenstein, rybaření"
-
-#: include/contact_widgets.php:34 mod/directory.php:204 mod/contacts.php:798
-msgid "Find"
-msgstr "Najít"
-
-#: include/contact_widgets.php:35 mod/suggest.php:114
-#: view/theme/vier/theme.php:203
-msgid "Friend Suggestions"
-msgstr "Návrhy přátel"
-
-#: include/contact_widgets.php:36 view/theme/vier/theme.php:202
-msgid "Similar Interests"
-msgstr "Podobné zájmy"
-
-#: include/contact_widgets.php:37
-msgid "Random Profile"
-msgstr "Náhodný Profil"
-
-#: include/contact_widgets.php:38 view/theme/vier/theme.php:204
-msgid "Invite Friends"
-msgstr "Pozvat přátele"
-
-#: include/contact_widgets.php:108
-msgid "Networks"
-msgstr "Sítě"
-
-#: include/contact_widgets.php:111
-msgid "All Networks"
-msgstr "Všechny sítě"
-
-#: include/contact_widgets.php:141 include/features.php:110
-msgid "Saved Folders"
-msgstr "Uložené složky"
-
-#: include/contact_widgets.php:144 include/contact_widgets.php:176
-msgid "Everything"
-msgstr "Všechno"
-
-#: include/contact_widgets.php:173
-msgid "Categories"
-msgstr "Kategorie"
-
-#: include/contact_widgets.php:237
-#, 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ů"
-
-#: include/contact_widgets.php:242 include/ForumManager.php:119
-#: include/items.php:2245 mod/content.php:624 object/Item.php:432
-#: view/theme/vier/theme.php:260 boot.php:972
-msgid "show more"
-msgstr "zobrazit více"
-
-#: include/ForumManager.php:114 include/nav.php:131 include/text.php:1025
-#: view/theme/vier/theme.php:255
-msgid "Forums"
-msgstr "Fóra"
-
-#: include/ForumManager.php:116 view/theme/vier/theme.php:257
-msgid "External link to forum"
-msgstr ""
-
-#: include/profile_selectors.php:6
-msgid "Male"
-msgstr "Muž"
-
-#: include/profile_selectors.php:6
-msgid "Female"
-msgstr "Žena"
-
-#: include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr "V současné době muž"
-
-#: include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr "V současné době žena"
-
-#: include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr "Většinou muž"
-
-#: include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr "Většinou žena"
-
-#: include/profile_selectors.php:6
-msgid "Transgender"
-msgstr "Transgender"
-
-#: include/profile_selectors.php:6
-msgid "Intersex"
-msgstr "Intersex"
-
-#: include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr "Transexuál"
-
-#: include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr "Hermafrodit"
-
-#: include/profile_selectors.php:6
-msgid "Neuter"
-msgstr "Neutrál"
-
-#: include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr "Nespecifikováno"
-
-#: include/profile_selectors.php:6
-msgid "Other"
-msgstr "Jiné"
-
-#: include/profile_selectors.php:6 include/conversation.php:1487
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: include/profile_selectors.php:23
-msgid "Males"
-msgstr "Muži"
-
-#: include/profile_selectors.php:23
-msgid "Females"
-msgstr "Ženy"
-
-#: include/profile_selectors.php:23
-msgid "Gay"
-msgstr "Gay"
-
-#: include/profile_selectors.php:23
-msgid "Lesbian"
-msgstr "Lesbička"
-
-#: include/profile_selectors.php:23
-msgid "No Preference"
-msgstr "Bez preferencí"
-
-#: include/profile_selectors.php:23
-msgid "Bisexual"
-msgstr "Bisexuál"
-
-#: include/profile_selectors.php:23
-msgid "Autosexual"
-msgstr "Autosexuál"
-
-#: include/profile_selectors.php:23
-msgid "Abstinent"
-msgstr "Abstinent"
-
-#: include/profile_selectors.php:23
-msgid "Virgin"
-msgstr "panic/panna"
-
-#: include/profile_selectors.php:23
-msgid "Deviant"
-msgstr "Deviant"
-
-#: include/profile_selectors.php:23
-msgid "Fetish"
-msgstr "Fetišista"
-
-#: include/profile_selectors.php:23
-msgid "Oodles"
-msgstr "Hodně"
-
-#: include/profile_selectors.php:23
-msgid "Nonsexual"
-msgstr "Nesexuální"
-
-#: include/profile_selectors.php:42
-msgid "Single"
-msgstr "Svobodný"
-
-#: include/profile_selectors.php:42
-msgid "Lonely"
-msgstr "Osamnělý"
-
-#: include/profile_selectors.php:42
-msgid "Available"
-msgstr "Dostupný"
-
-#: include/profile_selectors.php:42
-msgid "Unavailable"
-msgstr "Nedostupný"
-
-#: include/profile_selectors.php:42
-msgid "Has crush"
-msgstr "Zamilovaný"
-
-#: include/profile_selectors.php:42
-msgid "Infatuated"
-msgstr "Zabouchnutý"
-
-#: include/profile_selectors.php:42
-msgid "Dating"
-msgstr "Seznamující se"
-
-#: include/profile_selectors.php:42
-msgid "Unfaithful"
-msgstr "Nevěrný"
-
-#: include/profile_selectors.php:42
-msgid "Sex Addict"
-msgstr "Závislý na sexu"
-
-#: include/profile_selectors.php:42 include/user.php:280 include/user.php:284
-msgid "Friends"
-msgstr "Přátelé"
-
-#: include/profile_selectors.php:42
-msgid "Friends/Benefits"
-msgstr "Přátelé / výhody"
-
-#: include/profile_selectors.php:42
-msgid "Casual"
-msgstr "Ležérní"
-
-#: include/profile_selectors.php:42
-msgid "Engaged"
-msgstr "Zadaný"
-
-#: include/profile_selectors.php:42
-msgid "Married"
-msgstr "Ženatý/vdaná"
-
-#: include/profile_selectors.php:42
-msgid "Imaginarily married"
-msgstr "Pomyslně ženatý/vdaná"
-
-#: include/profile_selectors.php:42
-msgid "Partners"
-msgstr "Partneři"
-
-#: include/profile_selectors.php:42
-msgid "Cohabiting"
-msgstr "Žijící ve společné domácnosti"
-
-#: include/profile_selectors.php:42
-msgid "Common law"
-msgstr "Zvykové právo"
-
-#: include/profile_selectors.php:42
-msgid "Happy"
-msgstr "Šťastný"
-
-#: include/profile_selectors.php:42
-msgid "Not looking"
-msgstr "Nehledající"
-
-#: include/profile_selectors.php:42
-msgid "Swinger"
-msgstr "Swinger"
-
-#: include/profile_selectors.php:42
-msgid "Betrayed"
-msgstr "Zrazen"
-
-#: include/profile_selectors.php:42
-msgid "Separated"
-msgstr "Odloučený"
-
-#: include/profile_selectors.php:42
-msgid "Unstable"
-msgstr "Nestálý"
-
-#: include/profile_selectors.php:42
-msgid "Divorced"
-msgstr "Rozvedený(á)"
-
-#: include/profile_selectors.php:42
-msgid "Imaginarily divorced"
-msgstr "Pomyslně rozvedený"
-
-#: include/profile_selectors.php:42
-msgid "Widowed"
-msgstr "Ovdovělý(á)"
-
-#: include/profile_selectors.php:42
-msgid "Uncertain"
-msgstr "Nejistý"
-
-#: include/profile_selectors.php:42
-msgid "It's complicated"
-msgstr "Je to složité"
-
-#: include/profile_selectors.php:42
-msgid "Don't care"
-msgstr "Nezajímá"
-
-#: include/profile_selectors.php:42
-msgid "Ask me"
-msgstr "Zeptej se mě"
-
-#: include/dba_pdo.php:72 include/dba.php:56
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "Nelze nalézt záznam v DNS pro databázový server '%s'"
-
-#: include/auth.php:45
-msgid "Logged out."
-msgstr "Odhlášen."
-
-#: include/auth.php:116 include/auth.php:178 mod/openid.php:100
-msgid "Login failed."
-msgstr "Přihlášení se nezdařilo."
-
-#: include/auth.php:132 include/user.php:75
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Zaznamenali jsme problém s Vaším přihlášením prostřednictvím Vámi zadaným OpenID. Prosím ověřte si, že jste ID zadali správně. "
-
-#: include/auth.php:132 include/user.php:75
-msgid "The error message was:"
-msgstr "Chybová zpráva byla:"
-
-#: include/group.php:25
-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 "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."
-
-#: include/group.php:209
-msgid "Default privacy group for new contacts"
-msgstr "Defaultní soukromá skrupina pro nové kontakty."
-
-#: include/group.php:242
-msgid "Everybody"
-msgstr "Všichni"
-
-#: include/group.php:265
-msgid "edit"
-msgstr "editovat"
-
-#: include/group.php:286 mod/newmember.php:61
-msgid "Groups"
-msgstr "Skupiny"
-
-#: include/group.php:288
-msgid "Edit groups"
-msgstr ""
-
-#: include/group.php:290
-msgid "Edit group"
-msgstr "Editovat skupinu"
-
-#: include/group.php:291
-msgid "Create a new group"
-msgstr "Vytvořit novou skupinu"
-
-#: include/group.php:292 mod/group.php:94 mod/group.php:178
-msgid "Group Name: "
-msgstr "Název skupiny: "
-
-#: include/group.php:294
-msgid "Contacts not in any group"
-msgstr "Kontakty, které nejsou v žádné skupině"
-
-#: include/group.php:296 mod/network.php:201
-msgid "add"
-msgstr "přidat"
-
-#: include/contact_selectors.php:32
-msgid "Unknown | Not categorised"
-msgstr "Neznámé | Nezařazeno"
-
-#: include/contact_selectors.php:33
-msgid "Block immediately"
-msgstr "Okamžitě blokovat "
-
-#: include/contact_selectors.php:34
-msgid "Shady, spammer, self-marketer"
-msgstr "pochybný, spammer, self-makerter"
-
-#: include/contact_selectors.php:35
-msgid "Known to me, but no opinion"
-msgstr "Znám ho ale, ale bez rozhodnutí"
-
-#: include/contact_selectors.php:36
-msgid "OK, probably harmless"
-msgstr "OK, pravděpodobně neškodný"
-
-#: include/contact_selectors.php:37
-msgid "Reputable, has my trust"
-msgstr "Renomovaný, má mou důvěru"
-
-#: include/contact_selectors.php:56 mod/admin.php:890
-msgid "Frequently"
-msgstr "Často"
-
-#: include/contact_selectors.php:57 mod/admin.php:891
-msgid "Hourly"
-msgstr "každou hodinu"
-
-#: include/contact_selectors.php:58 mod/admin.php:892
-msgid "Twice daily"
-msgstr "Dvakrát denně"
-
-#: include/contact_selectors.php:59 mod/admin.php:893
-msgid "Daily"
-msgstr "denně"
-
-#: include/contact_selectors.php:60
-msgid "Weekly"
-msgstr "Týdenně"
-
-#: include/contact_selectors.php:61
-msgid "Monthly"
-msgstr "Měsíčně"
-
-#: include/contact_selectors.php:76 mod/dfrn_request.php:868
-msgid "Friendica"
-msgstr "Friendica"
-
-#: include/contact_selectors.php:77
-msgid "OStatus"
-msgstr "OStatus"
-
-#: include/contact_selectors.php:78
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: include/contact_selectors.php:79 include/contact_selectors.php:86
-#: mod/admin.php:1396 mod/admin.php:1409 mod/admin.php:1422 mod/admin.php:1440
-msgid "Email"
-msgstr "E-mail"
-
-#: include/contact_selectors.php:80 mod/settings.php:842
-#: mod/dfrn_request.php:870
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: include/contact_selectors.php:81
-msgid "Facebook"
-msgstr "Facebook"
-
-#: include/contact_selectors.php:82
-msgid "Zot!"
-msgstr "Zot!"
-
-#: include/contact_selectors.php:83
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: include/contact_selectors.php:84
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: include/contact_selectors.php:85
-msgid "MySpace"
-msgstr "MySpace"
-
-#: include/contact_selectors.php:87
-msgid "Google+"
-msgstr "Google+"
-
-#: include/contact_selectors.php:88
-msgid "pump.io"
-msgstr "pump.io"
-
-#: include/contact_selectors.php:89
-msgid "Twitter"
-msgstr "Twitter"
-
-#: include/contact_selectors.php:90
-msgid "Diaspora Connector"
-msgstr "Diaspora konektor"
-
-#: include/contact_selectors.php:91
-msgid "GNU Social"
-msgstr ""
-
-#: include/contact_selectors.php:92
-msgid "App.net"
-msgstr "App.net"
-
-#: include/contact_selectors.php:103
-msgid "Hubzilla/Redmatrix"
-msgstr ""
-
-#: include/acl_selectors.php:327
-msgid "Post to Email"
-msgstr "Poslat příspěvek na e-mail"
-
-#: include/acl_selectors.php:332
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr "Kontektory deaktivovány, od \"%s\" je aktivován."
-
-#: include/acl_selectors.php:333 mod/settings.php:1181
-msgid "Hide your profile details from unknown viewers?"
-msgstr "Skrýt Vaše profilové detaily před neznámými uživateli?"
-
-#: include/acl_selectors.php:338
-msgid "Visible to everybody"
-msgstr "Viditelné pro všechny"
-
-#: include/acl_selectors.php:339 view/theme/vier/config.php:103
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+
+#: index.php:261 mod/apps.php:14
+msgid "You must be logged in to use addons. "
+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 "Nenalezeno"
+
+#: 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 "Stránka nenalezena"
+
+#: index.php:431 mod/group.php:83 mod/profperm.php:29
+msgid "Permission denied"
+msgstr "Nedostatečné oprávnění"
+
+#: 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 "Přístup odmítnut."
+
+#: index.php:460
+msgid "toggle mobile"
+msgstr "přepínat mobilní zobrazení"
+
+#: view/theme/duepuntozero/config.php:54 src/Model/User.php:544
+msgid "default"
+msgstr "výchozí"
+
+#: 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 "Odeslat"
+
+#: 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 "Nastavení motivu"
+
+#: view/theme/duepuntozero/config.php:74
+msgid "Variations"
+msgstr "Variace"
+
+#: view/theme/quattro/config.php:76
+msgid "Alignment"
+msgstr "Zarovnání"
+
+#: view/theme/quattro/config.php:76
+msgid "Left"
+msgstr "Vlevo"
+
+#: view/theme/quattro/config.php:76
+msgid "Center"
+msgstr "Uprostřed"
+
+#: view/theme/quattro/config.php:77
+msgid "Color scheme"
+msgstr "Barevné schéma"
+
+#: view/theme/quattro/config.php:78
+msgid "Posts font size"
+msgstr "Velikost písma u příspěvků"
+
+#: view/theme/quattro/config.php:79
+msgid "Textareas font size"
+msgstr "Velikost písma textů"
+
+#: view/theme/vier/config.php:75
+msgid "Comma separated list of helper forums"
+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 "nezobrazit"
+
+#: view/theme/vier/config.php:115 src/Core/ACL.php:297
 msgid "show"
 msgstr "zobrazit"
 
-#: include/acl_selectors.php:340 view/theme/vier/config.php:103
-msgid "don't show"
-msgstr "nikdy nezobrazit"
-
-#: include/acl_selectors.php:346 mod/editpost.php:133
-msgid "CC: email addresses"
-msgstr "skrytá kopie: e-mailové adresy"
-
-#: include/acl_selectors.php:347 mod/editpost.php:140
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Příklad: bob@example.com, mary@example.com"
-
-#: include/acl_selectors.php:349 mod/events.php:509 mod/photos.php:1156
-#: mod/photos.php:1535
-msgid "Permissions"
-msgstr "Oprávnění:"
-
-#: include/acl_selectors.php:350
-msgid "Close"
-msgstr "Zavřít"
-
-#: include/like.php:163 include/conversation.php:130
-#: include/conversation.php:266 include/text.php:1804 mod/subthread.php:87
-#: mod/tagger.php:62
-msgid "photo"
-msgstr "fotografie"
-
-#: include/like.php:163 include/diaspora.php:1406 include/conversation.php:125
-#: include/conversation.php:134 include/conversation.php:261
-#: include/conversation.php:270 mod/subthread.php:87 mod/tagger.php:62
-msgid "status"
-msgstr "Stav"
-
-#: include/like.php:165 include/conversation.php:122
-#: include/conversation.php:258 include/text.php:1802
-msgid "event"
-msgstr "událost"
-
-#: include/like.php:182 include/diaspora.php:1402 include/conversation.php:141
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s má rád %2$s' na %3$s"
-
-#: include/like.php:184 include/conversation.php:144
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s nemá rád %2$s na %3$s"
-
-#: include/like.php:186
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr ""
-
-#: include/like.php:188
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr ""
-
-#: include/like.php:190
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr ""
-
-#: include/message.php:15 include/message.php:173
-msgid "[no subject]"
-msgstr "[bez předmětu]"
-
-#: include/message.php:145 include/Photo.php:1040 include/Photo.php:1056
-#: include/Photo.php:1064 include/Photo.php:1089 mod/wall_upload.php:218
-#: mod/wall_upload.php:232 mod/wall_upload.php:239 mod/item.php:478
-msgid "Wall Photos"
-msgstr "Fotografie na zdi"
-
-#: include/plugin.php:526 include/plugin.php:528
-msgid "Click here to upgrade."
-msgstr "Klikněte zde pro aktualizaci."
-
-#: include/plugin.php:534
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Tato akce překročí limit nastavené Vaším předplatným."
-
-#: include/plugin.php:539
-msgid "This action is not available under your subscription plan."
-msgstr "Tato akce není v rámci Vašeho předplatného dostupná."
-
-#: include/uimport.php:94
-msgid "Error decoding account file"
-msgstr "Chyba dekódování uživatelského účtu"
-
-#: include/uimport.php:100
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "Chyba! V datovém souboru není označení verze! Je to opravdu soubor s účtem Friendica?"
-
-#: include/uimport.php:116 include/uimport.php:127
-msgid "Error! Cannot check nickname"
-msgstr "Chyba! Nelze ověřit přezdívku"
-
-#: include/uimport.php:120 include/uimport.php:131
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "Uživatel '%s' již na tomto serveru existuje!"
-
-#: include/uimport.php:153
-msgid "User creation error"
-msgstr "Chyba vytváření uživatele"
-
-#: include/uimport.php:173
-msgid "User profile creation error"
-msgstr "Chyba vytváření uživatelského účtu"
-
-#: include/uimport.php:222
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] "%d kontakt nenaimporován"
-msgstr[1] "%d kontaktů nenaimporováno"
-msgstr[2] "%d kontakty nenaimporovány"
-
-#: include/uimport.php:292
-msgid "Done. You can now login with your username and password"
-msgstr "Hotovo. Nyní  se můžete přihlásit se svými uživatelským účtem a heslem"
-
-#: include/datetime.php:57 include/datetime.php:59 mod/profiles.php:705
-msgid "Miscellaneous"
-msgstr "Různé"
-
-#: include/datetime.php:183 include/identity.php:629
-msgid "Birthday:"
-msgstr "Narozeniny:"
-
-#: include/datetime.php:185 mod/profiles.php:728
-msgid "Age: "
-msgstr "Věk: "
-
-#: include/datetime.php:187
-msgid "YYYY-MM-DD or MM-DD"
-msgstr ""
-
-#: include/datetime.php:341
-msgid "never"
-msgstr "nikdy"
-
-#: include/datetime.php:347
-msgid "less than a second ago"
-msgstr "méně než před sekundou"
-
-#: include/datetime.php:350
-msgid "year"
-msgstr "rok"
-
-#: include/datetime.php:350
-msgid "years"
-msgstr "let"
-
-#: include/datetime.php:351 include/event.php:480 mod/cal.php:284
-#: mod/events.php:389
-msgid "month"
-msgstr "měsíc"
-
-#: include/datetime.php:351
-msgid "months"
-msgstr "měsíců"
-
-#: include/datetime.php:352 include/event.php:481 mod/cal.php:285
-#: mod/events.php:390
-msgid "week"
-msgstr "týdnem"
-
-#: include/datetime.php:352
-msgid "weeks"
-msgstr "týdny"
-
-#: include/datetime.php:353 include/event.php:482 mod/cal.php:286
-#: mod/events.php:391
-msgid "day"
-msgstr "den"
-
-#: include/datetime.php:353
-msgid "days"
-msgstr "dnů"
-
-#: include/datetime.php:354
-msgid "hour"
-msgstr "hodina"
-
-#: include/datetime.php:354
-msgid "hours"
-msgstr "hodin"
-
-#: include/datetime.php:355
-msgid "minute"
-msgstr "minuta"
-
-#: include/datetime.php:355
-msgid "minutes"
-msgstr "minut"
-
-#: include/datetime.php:356
-msgid "second"
-msgstr "sekunda"
-
-#: include/datetime.php:356
-msgid "seconds"
-msgstr "sekund"
-
-#: include/datetime.php:365
-#, php-format
-msgid "%1$d %2$s ago"
-msgstr "před %1$d %2$s"
-
-#: include/datetime.php:572
-#, php-format
-msgid "%s's birthday"
-msgstr "%s má narozeniny"
-
-#: include/datetime.php:573 include/dfrn.php:1109
-#, php-format
-msgid "Happy Birthday %s"
-msgstr "Veselé narozeniny %s"
-
-#: include/enotify.php:24
-msgid "Friendica Notification"
-msgstr "Friendica Notifikace"
-
-#: include/enotify.php:27
-msgid "Thank You,"
-msgstr "Děkujeme, "
-
-#: include/enotify.php:30
-#, php-format
-msgid "%s Administrator"
-msgstr "%s Administrátor"
-
-#: include/enotify.php:32
-#, php-format
-msgid "%1$s, %2$s Administrator"
-msgstr ""
-
-#: include/enotify.php:43 include/delivery.php:457
-msgid "noreply"
-msgstr "neodpovídat"
-
-#: include/enotify.php:70
-#, php-format
-msgid "%s <!item_type!>"
-msgstr "%s <!item_type!>"
-
-#: include/enotify.php:83
-#, php-format
-msgid "[Friendica:Notify] New mail received at %s"
-msgstr "[Friendica:Upozornění] Obdržena nová zpráva na %s"
-
-#: include/enotify.php:85
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr "%1$s Vám poslal novou soukromou zprávu na %2$s."
-
-#: include/enotify.php:86
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s Vám poslal %2$s."
-
-#: include/enotify.php:86
-msgid "a private message"
-msgstr "soukromá zpráva"
-
-#: include/enotify.php:88
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Prosím navštivte %s pro zobrazení Vašich soukromých zpráv a možnost na ně odpovědět."
-
-#: include/enotify.php:134
-#, php-format
-msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
-msgstr "%1$s okomentoval na [url=%2$s]%3$s[/url]"
-
-#: include/enotify.php:141
-#, php-format
-msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
-msgstr "%1$s okomentoval na [url=%2$s]%3$s's %4$s[/url]"
-
-#: include/enotify.php:149
-#, php-format
-msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
-msgstr "%1$s okomentoval na [url=%2$s]Váš %3$s[/url]"
-
-#: include/enotify.php:159
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Friendica:Upozornění] Komentář ke konverzaci #%1$d od %2$s"
-
-#: include/enotify.php:161
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr "Uživatel %s okomentoval vámi sledovanou položku/konverzaci."
-
-#: include/enotify.php:164 include/enotify.php:178 include/enotify.php:192
-#: include/enotify.php:206 include/enotify.php:224 include/enotify.php:238
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Prosím navštivte %s pro zobrazení konverzace a možnosti odpovědět."
-
-#: include/enotify.php:171
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
-msgstr "[Friendica:Upozornění] %s umístěn na Vaši profilovou zeď"
-
-#: include/enotify.php:173
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr "%1$s přidal příspěvek na Vaši profilovou zeď na %2$s"
-
-#: include/enotify.php:174
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
-msgstr "%1$s napřidáno na [url=%2$s]na Vaši zeď[/url]"
-
-#: include/enotify.php:185
-#, php-format
-msgid "[Friendica:Notify] %s tagged you"
-msgstr "[Friendica:Upozornění] %s Vás označil"
-
-#: include/enotify.php:187
-#, php-format
-msgid "%1$s tagged you at %2$s"
-msgstr "%1$s Vás označil na %2$s"
-
-#: include/enotify.php:188
-#, php-format
-msgid "%1$s [url=%2$s]tagged you[/url]."
-msgstr "%1$s [url=%2$s]Vás označil[/url]."
-
-#: include/enotify.php:199
-#, php-format
-msgid "[Friendica:Notify] %s shared a new post"
-msgstr "[Friendica:Notify] %s nasdílel nový příspěvek"
-
-#: include/enotify.php:201
-#, php-format
-msgid "%1$s shared a new post at %2$s"
-msgstr "%1$s nasdílel nový příspěvek na %2$s"
-
-#: include/enotify.php:202
-#, php-format
-msgid "%1$s [url=%2$s]shared a post[/url]."
-msgstr "%1$s [url=%2$s]nasdílel příspěvek[/url]."
-
-#: include/enotify.php:213
-#, php-format
-msgid "[Friendica:Notify] %1$s poked you"
-msgstr "[Friendica:Upozornění] %1$s Vás šťouchnul"
-
-#: include/enotify.php:215
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr "%1$s Vás šťouchnul na %2$s"
-
-#: include/enotify.php:216
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr "Uživatel %1$s [url=%2$s]Vás šťouchnul[/url]."
-
-#: include/enotify.php:231
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
-msgstr "[Friendica:Upozornění] %s označil Váš příspěvek"
-
-#: include/enotify.php:233
-#, php-format
-msgid "%1$s tagged your post at %2$s"
-msgstr "%1$s označil Váš příspěvek na %2$s"
-
-#: include/enotify.php:234
-#, php-format
-msgid "%1$s tagged [url=%2$s]your post[/url]"
-msgstr "%1$s označil [url=%2$s]Váš příspěvek[/url]"
-
-#: include/enotify.php:245
-msgid "[Friendica:Notify] Introduction received"
-msgstr "[Friendica:Upozornění] Obdrženo přestavení"
-
-#: include/enotify.php:247
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
-msgstr "Obdržel jste žádost o spojení od '%1$s' na %2$s"
-
-#: include/enotify.php:248
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
-msgstr "Obdržel jste [url=%1$s]žádost o spojení[/url] od %2$s."
-
-#: include/enotify.php:252 include/enotify.php:295
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Můžete navštívit jejich profil na %s"
-
-#: include/enotify.php:254
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr "Prosím navštivte %s pro schválení či zamítnutí představení."
-
-#: include/enotify.php:262
-msgid "[Friendica:Notify] A new person is sharing with you"
-msgstr "[Friendica:Upozornění] Nový člověk s vámi sdílí"
-
-#: include/enotify.php:264 include/enotify.php:265
-#, php-format
-msgid "%1$s is sharing with you at %2$s"
-msgstr "uživatel %1$s sdílí s vámi ma %2$s"
-
-#: include/enotify.php:271
-msgid "[Friendica:Notify] You have a new follower"
-msgstr "[Friendica:Upozornění] Máte nového následovníka"
-
-#: include/enotify.php:273 include/enotify.php:274
-#, php-format
-msgid "You have a new follower at %2$s : %1$s"
-msgstr "Máte nového následovníka na %2$s : %1$s"
-
-#: include/enotify.php:285
-msgid "[Friendica:Notify] Friend suggestion received"
-msgstr "[Friendica:Upozornění] Obdržen návrh na přátelství"
-
-#: include/enotify.php:287
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr "Obdržel jste návrh přátelství od '%1$s' na %2$s"
-
-#: include/enotify.php:288
-#, php-format
-msgid ""
-"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
-msgstr "Obdržel jste [url=%1$s]návrh přátelství[/url] s %2$s from %3$s."
-
-#: include/enotify.php:293
-msgid "Name:"
-msgstr "Jméno:"
-
-#: include/enotify.php:294
-msgid "Photo:"
-msgstr "Foto:"
-
-#: include/enotify.php:297
-#, 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í."
-
-#: include/enotify.php:305 include/enotify.php:319
-msgid "[Friendica:Notify] Connection accepted"
-msgstr "[Friendica:Upozornění] Spojení akceptováno"
-
-#: include/enotify.php:307 include/enotify.php:321
-#, php-format
-msgid "'%1$s' has accepted your connection request at %2$s"
-msgstr "'%1$s' akceptoval váš požadavek na spojení na %2$s"
-
-#: include/enotify.php:308 include/enotify.php:322
-#, php-format
-msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
-msgstr "%2$s akceptoval váš [url=%1$s]požadavek na spojení[/url]."
-
-#: include/enotify.php:312
-msgid ""
-"You are now mutual friends and may exchange status updates, photos, and "
-"email without restriction."
-msgstr ""
-
-#: include/enotify.php:314
-#, php-format
-msgid "Please visit %s if you wish to make any changes to this relationship."
-msgstr ""
-
-#: include/enotify.php:326
-#, 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' vás přijal jako \"fanouška\", což omezuje některé formy komunikace - jako jsou soukromé zprávy a některé interakce na profilech. Pokud se jedná o celebritu, případně o komunitní stránky, pak bylo toto nastavení provedeno automaticky.."
-
-#: include/enotify.php:328
-#, 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:330
-#, php-format
-msgid "Please visit %s  if you wish to make any changes to this relationship."
-msgstr "Prosím navštivte %s  pokud chcete změnit tento vztah."
-
-#: include/enotify.php:340
-msgid "[Friendica System:Notify] registration request"
-msgstr "[Systém Friendica :Upozornění] registrační požadavek"
-
-#: include/enotify.php:342
-#, php-format
-msgid "You've received a registration request from '%1$s' at %2$s"
-msgstr "Obdržel jste požadavek na registraci od '%1$s' na %2$s"
-
-#: include/enotify.php:343
-#, php-format
-msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
-msgstr "Obdržel jste [url=%1$s]požadavek na registraci[/url] od '%2$s'."
-
-#: include/enotify.php:347
-#, php-format
-msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
-msgstr "Plné jméno:\t%1$s\\nUmístění webu:\t%2$s\\nPřihlašovací účet:\t%3$s (%4$s)"
-
-#: include/enotify.php:350
-#, php-format
-msgid "Please visit %s to approve or reject the request."
-msgstr "Prosím navštivte %s k odsouhlasení nebo k zamítnutí požadavku."
-
-#: include/event.php:16 include/bb2diaspora.php:152 mod/localtime.php:12
-msgid "l F d, Y \\@ g:i A"
-msgstr "l F d, Y \\@ g:i A"
-
-#: include/event.php:33 include/event.php:51 include/event.php:487
-#: include/bb2diaspora.php:158
-msgid "Starts:"
-msgstr "Začíná:"
-
-#: include/event.php:36 include/event.php:57 include/event.php:488
-#: include/bb2diaspora.php:166
-msgid "Finishes:"
-msgstr "Končí:"
-
-#: include/event.php:39 include/event.php:63 include/event.php:489
-#: include/bb2diaspora.php:174 include/identity.php:328
-#: mod/notifications.php:232 mod/directory.php:137 mod/events.php:494
-#: mod/contacts.php:628
-msgid "Location:"
-msgstr "Místo:"
-
-#: include/event.php:441
-msgid "Sun"
-msgstr ""
-
-#: include/event.php:442
-msgid "Mon"
-msgstr ""
-
-#: include/event.php:443
-msgid "Tue"
-msgstr ""
-
-#: include/event.php:444
-msgid "Wed"
-msgstr ""
-
-#: include/event.php:445
-msgid "Thu"
-msgstr ""
-
-#: include/event.php:446
-msgid "Fri"
-msgstr ""
-
-#: include/event.php:447
-msgid "Sat"
-msgstr ""
-
-#: include/event.php:448 include/text.php:1130 mod/settings.php:972
-msgid "Sunday"
-msgstr "Neděle"
-
-#: include/event.php:449 include/text.php:1130 mod/settings.php:972
-msgid "Monday"
-msgstr "Pondělí"
-
-#: include/event.php:450 include/text.php:1130
-msgid "Tuesday"
-msgstr "Úterý"
-
-#: include/event.php:451 include/text.php:1130
-msgid "Wednesday"
-msgstr "Středa"
-
-#: include/event.php:452 include/text.php:1130
-msgid "Thursday"
-msgstr "Čtvrtek"
-
-#: include/event.php:453 include/text.php:1130
-msgid "Friday"
-msgstr "Pátek"
-
-#: include/event.php:454 include/text.php:1130
-msgid "Saturday"
-msgstr "Sobota"
-
-#: include/event.php:455
-msgid "Jan"
-msgstr ""
-
-#: include/event.php:456
-msgid "Feb"
-msgstr ""
-
-#: include/event.php:457
-msgid "Mar"
-msgstr ""
-
-#: include/event.php:458
-msgid "Apr"
-msgstr ""
-
-#: include/event.php:459 include/event.php:471 include/text.php:1134
-msgid "May"
-msgstr "Května"
-
-#: include/event.php:460
-msgid "Jun"
-msgstr ""
-
-#: include/event.php:461
-msgid "Jul"
-msgstr ""
-
-#: include/event.php:462
-msgid "Aug"
-msgstr ""
-
-#: include/event.php:463
-msgid "Sept"
-msgstr ""
-
-#: include/event.php:464
-msgid "Oct"
-msgstr ""
-
-#: include/event.php:465
-msgid "Nov"
-msgstr ""
-
-#: include/event.php:466
-msgid "Dec"
-msgstr ""
-
-#: include/event.php:467 include/text.php:1134
-msgid "January"
-msgstr "Ledna"
-
-#: include/event.php:468 include/text.php:1134
-msgid "February"
-msgstr "Února"
-
-#: include/event.php:469 include/text.php:1134
-msgid "March"
-msgstr "Března"
-
-#: include/event.php:470 include/text.php:1134
-msgid "April"
-msgstr "Dubna"
-
-#: include/event.php:472 include/text.php:1134
-msgid "June"
-msgstr "Června"
-
-#: include/event.php:473 include/text.php:1134
-msgid "July"
-msgstr "Července"
-
-#: include/event.php:474 include/text.php:1134
-msgid "August"
-msgstr "Srpna"
-
-#: include/event.php:475 include/text.php:1134
-msgid "September"
-msgstr "Září"
-
-#: include/event.php:476 include/text.php:1134
-msgid "October"
-msgstr "Října"
-
-#: include/event.php:477 include/text.php:1134
-msgid "November"
-msgstr "Listopadu"
-
-#: include/event.php:478 include/text.php:1134
-msgid "December"
-msgstr "Prosinec"
-
-#: include/event.php:479 mod/cal.php:283 mod/events.php:388
-msgid "today"
-msgstr ""
-
-#: include/event.php:483
-msgid "all-day"
-msgstr ""
-
-#: include/event.php:485
-msgid "No events to display"
-msgstr ""
-
-#: include/event.php:574
-msgid "l, F j"
-msgstr "l, F j"
-
-#: include/event.php:593
-msgid "Edit event"
-msgstr "Editovat událost"
-
-#: include/event.php:615 include/text.php:1532 include/text.php:1539
-msgid "link to source"
-msgstr "odkaz na zdroj"
-
-#: include/event.php:850
-msgid "Export"
-msgstr ""
-
-#: include/event.php:851
-msgid "Export calendar as ical"
-msgstr ""
-
-#: include/event.php:852
-msgid "Export calendar as csv"
-msgstr ""
-
-#: include/nav.php:35 mod/navigation.php:19
-msgid "Nothing new here"
-msgstr "Zde není nic nového"
-
-#: include/nav.php:39 mod/navigation.php:23
-msgid "Clear notifications"
-msgstr "Smazat notifikace"
-
-#: include/nav.php:40 include/text.php:1015
-msgid "@name, !forum, #tags, content"
-msgstr ""
-
-#: include/nav.php:78 view/theme/frio/theme.php:246 boot.php:1792
-msgid "Logout"
-msgstr "Odhlásit se"
-
-#: include/nav.php:78 view/theme/frio/theme.php:246
-msgid "End this session"
-msgstr "Konec této relace"
-
-#: include/nav.php:81 include/identity.php:714 mod/contacts.php:637
-#: mod/contacts.php:833 view/theme/frio/theme.php:249
-msgid "Status"
-msgstr "Stav"
-
-#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:249
-msgid "Your posts and conversations"
-msgstr "Vaše příspěvky a konverzace"
-
-#: include/nav.php:82 include/identity.php:605 include/identity.php:691
-#: include/identity.php:722 mod/profperm.php:104 mod/newmember.php:32
-#: mod/contacts.php:639 mod/contacts.php:841 view/theme/frio/theme.php:250
-msgid "Profile"
-msgstr "Profil"
-
-#: include/nav.php:82 view/theme/frio/theme.php:250
-msgid "Your profile page"
-msgstr "Vaše profilová stránka"
-
-#: include/nav.php:83 include/identity.php:730 mod/fbrowser.php:32
-#: view/theme/frio/theme.php:251
-msgid "Photos"
-msgstr "Fotografie"
-
-#: include/nav.php:83 view/theme/frio/theme.php:251
-msgid "Your photos"
-msgstr "Vaše fotky"
-
-#: include/nav.php:84 include/identity.php:738 include/identity.php:741
-#: view/theme/frio/theme.php:252
-msgid "Videos"
-msgstr "Videa"
-
-#: include/nav.php:84 view/theme/frio/theme.php:252
-msgid "Your videos"
-msgstr "Vaše videa"
-
-#: include/nav.php:85 include/nav.php:149 include/identity.php:750
-#: include/identity.php:761 mod/cal.php:275 mod/events.php:379
-#: view/theme/frio/theme.php:253 view/theme/frio/theme.php:257
-msgid "Events"
-msgstr "Události"
-
-#: include/nav.php:85 view/theme/frio/theme.php:253
-msgid "Your events"
-msgstr "Vaše události"
-
-#: include/nav.php:86
-msgid "Personal notes"
-msgstr "Osobní poznámky"
-
-#: include/nav.php:86
-msgid "Your personal notes"
-msgstr "Vaše osobní poznámky"
-
-#: include/nav.php:95 mod/bookmarklet.php:12 boot.php:1793
-msgid "Login"
-msgstr "Přihlásit se"
-
-#: include/nav.php:95
-msgid "Sign in"
-msgstr "Přihlásit se"
-
-#: include/nav.php:105 include/nav.php:161
-#: include/NotificationsManager.php:174
-msgid "Home"
-msgstr "Domů"
-
-#: include/nav.php:105
-msgid "Home Page"
-msgstr "Domácí stránka"
-
-#: include/nav.php:109 mod/register.php:289 boot.php:1768
-msgid "Register"
-msgstr "Registrovat"
-
-#: include/nav.php:109
-msgid "Create an account"
-msgstr "Vytvořit účet"
-
-#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:298
+#: view/theme/vier/config.php:122
+msgid "Set style"
+msgstr "Nastavit styl"
+
+#: view/theme/vier/config.php:123
+msgid "Community Pages"
+msgstr "Komunitní stránky"
+
+#: view/theme/vier/config.php:124 view/theme/vier/theme.php:149
+msgid "Community Profiles"
+msgstr "Komunitní profily"
+
+#: view/theme/vier/config.php:125
+msgid "Help or @NewHere ?"
+msgstr "Pomoc nebo @ProNováčky ?"
+
+#: view/theme/vier/config.php:126 view/theme/vier/theme.php:386
+msgid "Connect Services"
+msgstr "Připojit služby"
+
+#: view/theme/vier/config.php:127
+msgid "Find Friends"
+msgstr "Najít přátele"
+
+#: view/theme/vier/config.php:128 view/theme/vier/theme.php:179
+msgid "Last users"
+msgstr "Poslední uživatelé"
+
+#: view/theme/vier/theme.php:197 src/Content/Widget.php:59
+msgid "Find People"
+msgstr "Najít lidi"
+
+#: view/theme/vier/theme.php:198 src/Content/Widget.php:60
+msgid "Enter name or interest"
+msgstr "Zadejte jméno nebo zájmy"
+
+#: 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 "Spojit se/sledovat"
+
+#: view/theme/vier/theme.php:200 src/Content/Widget.php:62
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Příklady: Josef Dvořák, rybaření"
+
+#: view/theme/vier/theme.php:201 mod/directory.php:214 mod/contacts.php:842
+#: src/Content/Widget.php:63
+msgid "Find"
+msgstr "Najít"
+
+#: view/theme/vier/theme.php:202 mod/suggest.php:117 src/Content/Widget.php:64
+msgid "Friend Suggestions"
+msgstr "Návrhy přátel"
+
+#: view/theme/vier/theme.php:203 src/Content/Widget.php:65
+msgid "Similar Interests"
+msgstr "Podobné zájmy"
+
+#: view/theme/vier/theme.php:204 src/Content/Widget.php:66
+msgid "Random Profile"
+msgstr "Náhodný profil"
+
+#: view/theme/vier/theme.php:205 src/Content/Widget.php:67
+msgid "Invite Friends"
+msgstr "Pozvat přátele"
+
+#: view/theme/vier/theme.php:206 mod/directory.php:207
+#: src/Content/Widget.php:68
+msgid "Global Directory"
+msgstr "Globální adresář"
+
+#: view/theme/vier/theme.php:208 src/Content/Widget.php:70
+msgid "Local Directory"
+msgstr "Místní adresář"
+
+#: view/theme/vier/theme.php:251 include/text.php:909 src/Content/Nav.php:151
+#: src/Content/ForumManager.php:125
+msgid "Forums"
+msgstr "Fóra"
+
+#: view/theme/vier/theme.php:253 src/Content/ForumManager.php:127
+msgid "External link to forum"
+msgstr "Externí odkaz na fórum"
+
+#: 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 "zobrazit více"
+
+#: view/theme/vier/theme.php:289
+msgid "Quick Start"
+msgstr "Rychlý začátek"
+
+#: view/theme/vier/theme.php:295 mod/help.php:56 src/Content/Nav.php:134
 msgid "Help"
 msgstr "Nápověda"
 
-#: include/nav.php:115
-msgid "Help and documentation"
-msgstr "Nápověda a dokumentace"
+#: view/theme/frio/config.php:102
+msgid "Custom"
+msgstr "Vlastní"
 
-#: include/nav.php:119
-msgid "Apps"
-msgstr "Aplikace"
+#: view/theme/frio/config.php:114
+msgid "Note"
+msgstr "Poznámka"
 
-#: include/nav.php:119
-msgid "Addon applications, utilities, games"
-msgstr "Doplňkové aplikace, nástroje, hry"
+#: view/theme/frio/config.php:114
+msgid "Check image permissions if all users are allowed to see the image"
+msgstr "Zkontrolovat povolení u obrázku, jestli všichni uživatelé mají povolení obrázek vidět"
 
-#: include/nav.php:123 include/text.php:1012 mod/search.php:149
-msgid "Search"
-msgstr "Vyhledávání"
+#: view/theme/frio/config.php:121
+msgid "Select color scheme"
+msgstr "Vybrat barevné schéma"
 
-#: include/nav.php:123
-msgid "Search site content"
-msgstr "Hledání na stránkách tohoto webu"
+#: view/theme/frio/config.php:122
+msgid "Navigation bar background color"
+msgstr "Barva pozadí navigační lišty"
 
-#: include/nav.php:126 include/text.php:1020
-msgid "Full Text"
-msgstr "Celý text"
+#: view/theme/frio/config.php:123
+msgid "Navigation bar icon color "
+msgstr "Barva ikon navigační lišty"
 
-#: include/nav.php:127 include/text.php:1021
-msgid "Tags"
-msgstr "Štítky:"
+#: view/theme/frio/config.php:124
+msgid "Link color"
+msgstr "Barva odkazů"
 
-#: include/nav.php:128 include/nav.php:192 include/identity.php:783
-#: include/identity.php:786 include/text.php:1022 mod/contacts.php:792
-#: mod/contacts.php:853 mod/viewcontacts.php:116 view/theme/frio/theme.php:260
-msgid "Contacts"
-msgstr "Kontakty"
+#: view/theme/frio/config.php:125
+msgid "Set the background color"
+msgstr "Nastavit barvu pozadí"
 
-#: include/nav.php:143 include/nav.php:145 mod/community.php:36
-msgid "Community"
-msgstr "Komunita"
+#: view/theme/frio/config.php:126
+msgid "Content background opacity"
+msgstr "Průhlednost pozadí obsahu"
 
-#: include/nav.php:143
-msgid "Conversations on this site"
-msgstr "Konverzace na tomto webu"
+#: view/theme/frio/config.php:127
+msgid "Set the background image"
+msgstr "Nastavit obrázek na pozadí"
 
-#: include/nav.php:145
-msgid "Conversations on the network"
-msgstr "Konverzace v síti"
+#: view/theme/frio/config.php:128
+msgid "Background image style"
+msgstr "Styl obrázku na pozadí"
 
-#: include/nav.php:149 include/identity.php:753 include/identity.php:764
-#: view/theme/frio/theme.php:257
-msgid "Events and Calendar"
-msgstr "Události a kalendář"
+#: view/theme/frio/config.php:133
+msgid "Login page background image"
+msgstr "Obrázek na pozadí přihlašovací stránky"
 
-#: include/nav.php:152
-msgid "Directory"
-msgstr "Adresář"
+#: view/theme/frio/config.php:137
+msgid "Login page background color"
+msgstr "Barva pozadí přihlašovací stránky"
 
-#: include/nav.php:152
-msgid "People directory"
-msgstr "Adresář"
+#: view/theme/frio/config.php:137
+msgid "Leave background image and color empty for theme defaults"
+msgstr "Nechat obrázek a barvu pozadí prázdnou pro výchozí nastavení motivů"
 
-#: include/nav.php:154
-msgid "Information"
-msgstr "Informace"
+#: view/theme/frio/theme.php:248
+msgid "Guest"
+msgstr "Host"
 
-#: include/nav.php:154
-msgid "Information about this friendica instance"
-msgstr "Informace o této instanci Friendica"
+#: view/theme/frio/theme.php:253
+msgid "Visitor"
+msgstr "Návštěvník"
 
-#: include/nav.php:158 include/NotificationsManager.php:160 mod/admin.php:411
-#: view/theme/frio/theme.php:256
+#: view/theme/frio/theme.php:266 src/Module/Login.php:309
+#: src/Content/Nav.php:97
+msgid "Logout"
+msgstr "Odhlásit se"
+
+#: view/theme/frio/theme.php:266 src/Content/Nav.php:97
+msgid "End this session"
+msgstr "Konec této relace"
+
+#: 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 "Stav"
+
+#: view/theme/frio/theme.php:269 src/Content/Nav.php:100
+#: src/Content/Nav.php:186
+msgid "Your posts and conversations"
+msgstr "Vaše příspěvky a konverzace"
+
+#: 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 "Profil"
+
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:101
+msgid "Your profile page"
+msgstr "Vaše profilová stránka"
+
+#: view/theme/frio/theme.php:271 mod/fbrowser.php:35 src/Model/Profile.php:891
+#: src/Content/Nav.php:102
+msgid "Photos"
+msgstr "Fotky"
+
+#: view/theme/frio/theme.php:271 src/Content/Nav.php:102
+msgid "Your photos"
+msgstr "Vaše fotky"
+
+#: view/theme/frio/theme.php:272 src/Model/Profile.php:899
+#: src/Model/Profile.php:902 src/Content/Nav.php:103
+msgid "Videos"
+msgstr "Videa"
+
+#: view/theme/frio/theme.php:272 src/Content/Nav.php:103
+msgid "Your videos"
+msgstr "Vaše videa"
+
+#: 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 "Události"
+
+#: view/theme/frio/theme.php:273 src/Content/Nav.php:104
+msgid "Your events"
+msgstr "Vaše události"
+
+#: view/theme/frio/theme.php:276 mod/admin.php:771
+#: src/Core/NotificationsManager.php:179 src/Content/Nav.php:183
 msgid "Network"
 msgstr "Síť"
 
-#: include/nav.php:158 view/theme/frio/theme.php:256
+#: view/theme/frio/theme.php:276 src/Content/Nav.php:183
 msgid "Conversations from your friends"
 msgstr "Konverzace od Vašich přátel"
 
-#: include/nav.php:159
-msgid "Network Reset"
-msgstr "Síťový Reset"
+#: 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 "Události a kalendář"
 
-#: include/nav.php:159
-msgid "Load Network page with no filters"
-msgstr "Načíst stránku Síť bez filtrů"
-
-#: include/nav.php:166 include/NotificationsManager.php:181
-msgid "Introductions"
-msgstr "Představení"
-
-#: include/nav.php:166
-msgid "Friend Requests"
-msgstr "Žádosti přátel"
-
-#: include/nav.php:169 mod/notifications.php:96
-msgid "Notifications"
-msgstr "Upozornění"
-
-#: include/nav.php:170
-msgid "See all notifications"
-msgstr "Zobrazit všechny upozornění"
-
-#: include/nav.php:171 mod/settings.php:902
-msgid "Mark as seen"
-msgstr "Označit jako přečtené"
-
-#: include/nav.php:171
-msgid "Mark all system notifications seen"
-msgstr "Označit všechny upozornění systému jako přečtené"
-
-#: include/nav.php:175 mod/message.php:190 view/theme/frio/theme.php:258
+#: view/theme/frio/theme.php:278 mod/message.php:127 src/Content/Nav.php:196
 msgid "Messages"
 msgstr "Zprávy"
 
-#: include/nav.php:175 view/theme/frio/theme.php:258
+#: view/theme/frio/theme.php:278 src/Content/Nav.php:196
 msgid "Private mail"
 msgstr "Soukromá pošta"
 
-#: include/nav.php:176
-msgid "Inbox"
-msgstr "Doručená pošta"
-
-#: include/nav.php:177
-msgid "Outbox"
-msgstr "Odeslaná pošta"
-
-#: include/nav.php:178 mod/message.php:16
-msgid "New Message"
-msgstr "Nová zpráva"
-
-#: include/nav.php:181
-msgid "Manage"
-msgstr "Spravovat"
-
-#: include/nav.php:181
-msgid "Manage other pages"
-msgstr "Spravovat jiné stránky"
-
-#: include/nav.php:184 mod/settings.php:81
-msgid "Delegations"
-msgstr "Delegace"
-
-#: include/nav.php:184 mod/delegate.php:130
-msgid "Delegate Page Management"
-msgstr "Správa delegátů stránky"
-
-#: include/nav.php:186 mod/newmember.php:22 mod/settings.php:111
-#: mod/admin.php:1524 mod/admin.php:1782 view/theme/frio/theme.php:259
+#: 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 "Nastavení"
 
-#: include/nav.php:186 view/theme/frio/theme.php:259
+#: view/theme/frio/theme.php:279 src/Content/Nav.php:207
 msgid "Account settings"
 msgstr "Nastavení účtu"
 
-#: include/nav.php:189 include/identity.php:282
-msgid "Profiles"
-msgstr "Profily"
+#: 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 "Kontakty"
 
-#: include/nav.php:189
-msgid "Manage/Edit Profiles"
-msgstr "Spravovat/Editovat Profily"
-
-#: include/nav.php:192 view/theme/frio/theme.php:260
+#: view/theme/frio/theme.php:280 src/Content/Nav.php:213
 msgid "Manage/edit friends and contacts"
 msgstr "Spravovat/upravit přátelé a kontakty"
 
-#: include/nav.php:197 mod/admin.php:186
-msgid "Admin"
-msgstr "Administrace"
+#: view/theme/frio/theme.php:367 include/conversation.php:866
+msgid "Follow Thread"
+msgstr "Sledovat vlákno"
 
-#: include/nav.php:197
-msgid "Site setup and configuration"
-msgstr "Nastavení webu a konfigurace"
+#: view/theme/frio/php/Image.php:24
+msgid "Top Banner"
+msgstr "Vrchní banner"
 
-#: include/nav.php:200
-msgid "Navigation"
-msgstr "Navigace"
+#: 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 "Změnit velikost obrázku na šířku obrazovky a ukázat pod ním barvu pozadí na dlouhých stránkách."
 
-#: include/nav.php:200
-msgid "Site map"
-msgstr "Mapa webu"
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
+msgstr "Celá obrazovka"
 
-#: include/photos.php:53 mod/fbrowser.php:41 mod/fbrowser.php:62
-#: mod/photos.php:180 mod/photos.php:1086 mod/photos.php:1211
-#: mod/photos.php:1232 mod/photos.php:1795 mod/photos.php:1807
-msgid "Contact Photos"
-msgstr "Fotogalerie kontaktu"
+#: view/theme/frio/php/Image.php:25
+msgid ""
+"Resize image to fill entire screen, clipping either the right or the bottom."
+msgstr "Změnit velikost obrázku, aby zaplnil celou obrazovku, a odštěpit buď pravou, nebo dolní část"
 
-#: include/security.php:22
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
+msgstr "Mozaika s jedinou řadou"
+
+#: view/theme/frio/php/Image.php:26
+msgid ""
+"Resize image to repeat it on a single row, either vertical or horizontal."
+msgstr "Změnit velikost obrázku a opakovat jej v jediné řadě, buď svislé, nebo vodorovné"
+
+#: view/theme/frio/php/Image.php:27
+msgid "Mosaic"
+msgstr "Mozaika"
+
+#: view/theme/frio/php/Image.php:27
+msgid "Repeat image to fill the screen."
+msgstr "Opakovat obrázek, aby zaplnil obrazovku"
+
+#: update.php:194
+#, php-format
+msgid "%s: Updating author-id and owner-id in item and thread table. "
+msgstr "%s: Aktualizuji author-id a owner-id v tabulce položek a vláken."
+
+#: update.php:240
+#, php-format
+msgid "%s: Updating post-type."
+msgstr "%s: Aktualizuji post-type."
+
+#: 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 "Položka nenalezena."
+
+#: include/items.php:393
+msgid "Do you really want to delete this item?"
+msgstr "Opravdu chcete smazat tuto položku?"
+
+#: 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 "Ano"
+
+#: 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 "Zrušit"
+
+#: include/items.php:483 src/Content/Feature.php:96
+msgid "Archives"
+msgstr "Archivy"
+
+#: include/conversation.php:151 include/conversation.php:287
+#: include/text.php:1611
+msgid "event"
+msgstr "událost"
+
+#: 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 "stav"
+
+#: include/conversation.php:159 include/conversation.php:295
+#: include/text.php:1613 mod/tagger.php:70 mod/subthread.php:87
+msgid "photo"
+msgstr "fotka"
+
+#: include/conversation.php:171
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "Uživateli %1$s se líbí %3$s uživatele %2$s"
+
+#: include/conversation.php:173
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "Uživateli %1$s se nelíbí %3$s uživatele  %2$s"
+
+#: include/conversation.php:175
+#, php-format
+msgid "%1$s attends %2$s's %3$s"
+msgstr "%1$s se účastní %3$s uživatele %2$s"
+
+#: include/conversation.php:177
+#, php-format
+msgid "%1$s doesn't attend %2$s's %3$s"
+msgstr "%1$s se neúčastní %3$s uživatele %2$s"
+
+#: include/conversation.php:179
+#, php-format
+msgid "%1$s attends maybe %2$s's %3$s"
+msgstr "%1$s se možná účastní %3$s uživatele %2$s"
+
+#: include/conversation.php:214
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr "%1$s se nyní přátelí s uživatelem %2$s"
+
+#: include/conversation.php:255
+#, php-format
+msgid "%1$s poked %2$s"
+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 štítkem %4$s"
+
+#: include/conversation.php:331
+msgid "post/item"
+msgstr "příspěvek/položka"
+
+#: include/conversation.php:332
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr "%1$s označil/a %3$s uživatele %2$s jako oblíbené"
+
+#: include/conversation.php:545 mod/profiles.php:352 mod/photos.php:1507
+msgid "Likes"
+msgstr "Libí se"
+
+#: include/conversation.php:545 mod/profiles.php:356 mod/photos.php:1507
+msgid "Dislikes"
+msgstr "Nelibí se"
+
+#: include/conversation.php:546 include/conversation.php:1492
+#: mod/photos.php:1508
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "Účastní se"
+msgstr[1] "Účastní se"
+msgstr[2] "Účastní se"
+msgstr[3] "Účastní se"
+
+#: include/conversation.php:546 mod/photos.php:1508
+msgid "Not attending"
+msgstr "Neúčastní se"
+
+#: include/conversation.php:546 mod/photos.php:1508
+msgid "Might attend"
+msgstr "Mohl/a by se zúčastnit"
+
+#: include/conversation.php:626 mod/photos.php:1564 src/Object/Post.php:195
+msgid "Select"
+msgstr "Vybrat"
+
+#: 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 "Odstranit"
+
+#: include/conversation.php:661 src/Object/Post.php:362
+#: src/Object/Post.php:363
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Zobrazit profil uživatele %s na %s"
+
+#: include/conversation.php:673 src/Object/Post.php:350
+msgid "Categories:"
+msgstr "Kategorie:"
+
+#: include/conversation.php:674 src/Object/Post.php:351
+msgid "Filed under:"
+msgstr "Vyplněn pod:"
+
+#: include/conversation.php:681 src/Object/Post.php:376
+#, php-format
+msgid "%s from %s"
+msgstr "%s z %s"
+
+#: include/conversation.php:696
+msgid "View in context"
+msgstr "Zobrazit v kontextu"
+
+#: 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 "Čekejte prosím"
+
+#: include/conversation.php:762
+msgid "remove"
+msgstr "odstranit"
+
+#: include/conversation.php:766
+msgid "Delete Selected Items"
+msgstr "Smazat vybrané položky"
+
+#: include/conversation.php:867 src/Model/Contact.php:937
+msgid "View Status"
+msgstr "Zobrazit stav"
+
+#: 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 "Zobrazit profil"
+
+#: include/conversation.php:869 src/Model/Contact.php:939
+msgid "View Photos"
+msgstr "Zobrazit fotky"
+
+#: include/conversation.php:870 src/Model/Contact.php:931
+#: src/Model/Contact.php:940
+msgid "Network Posts"
+msgstr "Zobrazit Příspěvky sítě"
+
+#: include/conversation.php:871 src/Model/Contact.php:932
+#: src/Model/Contact.php:941
+msgid "View Contact"
+msgstr "Zobrazit kontakt"
+
+#: include/conversation.php:872 src/Model/Contact.php:943
+msgid "Send PM"
+msgstr "Poslat soukromou zprávu"
+
+#: include/conversation.php:876 src/Model/Contact.php:944
+msgid "Poke"
+msgstr "Šťouchnout"
+
+#: include/conversation.php:999
+#, php-format
+msgid "%s likes this."
+msgstr "Uživateli %s se tohle líbí."
+
+#: include/conversation.php:1002
+#, php-format
+msgid "%s doesn't like this."
+msgstr "Uživateli %s se tohle nelíbí."
+
+#: include/conversation.php:1005
+#, php-format
+msgid "%s attends."
+msgstr "%s se účastní."
+
+#: include/conversation.php:1008
+#, php-format
+msgid "%s doesn't attend."
+msgstr "%s se neúčastní."
+
+#: include/conversation.php:1011
+#, php-format
+msgid "%s attends maybe."
+msgstr "%s se možná účastní."
+
+#: include/conversation.php:1022
+msgid "and"
+msgstr "a"
+
+#: include/conversation.php:1028
+#, php-format
+msgid "and %d other people"
+msgstr "a dalších %d lidí"
+
+#: include/conversation.php:1037
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
+msgstr "<span  %1$s>%2$d lidem</span> se tohle líbí"
+
+#: include/conversation.php:1038
+#, php-format
+msgid "%s like this."
+msgstr "Uživatelům %s se tohle líbí."
+
+#: include/conversation.php:1041
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
+msgstr "<span  %1$s>%2$d lidem</span> se tohle nelíbí"
+
+#: include/conversation.php:1042
+#, php-format
+msgid "%s don't like this."
+msgstr "Uživatelům %s se tohle nelíbí."
+
+#: include/conversation.php:1045
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend"
+msgstr "<span  %1$s>%2$d lidí</span> se účastní"
+
+#: include/conversation.php:1046
+#, php-format
+msgid "%s attend."
+msgstr "%s se účastní."
+
+#: include/conversation.php:1049
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't attend"
+msgstr "<span  %1$s>%2$d lidí</span> se neúčastní"
+
+#: include/conversation.php:1050
+#, php-format
+msgid "%s don't attend."
+msgstr "%s se neúčastní"
+
+#: include/conversation.php:1053
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend maybe"
+msgstr "<span  %1$s>%2$d lidí</span> se možná účastní"
+
+#: include/conversation.php:1054
+#, php-format
+msgid "%s attend maybe."
+msgstr "%s se možná účastní"
+
+#: include/conversation.php:1084 include/conversation.php:1100
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Viditelné pro <strong>všechny</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 "Zadejte prosím URL odkaz:"
+
+#: include/conversation.php:1086 include/conversation.php:1102
+msgid "Please enter a video link/URL:"
+msgstr "Prosím zadejte URL adresu videa:"
+
+#: include/conversation.php:1087 include/conversation.php:1103
+msgid "Please enter an audio link/URL:"
+msgstr "Prosím zadejte URL adresu zvukového záznamu:"
+
+#: include/conversation.php:1088 include/conversation.php:1104
+msgid "Tag term:"
+msgstr "Štítek:"
+
+#: include/conversation.php:1089 include/conversation.php:1105
+#: mod/filer.php:34
+msgid "Save to Folder:"
+msgstr "Uložit do složky:"
+
+#: include/conversation.php:1090 include/conversation.php:1106
+msgid "Where are you right now?"
+msgstr "Kde právě jste?"
+
+#: include/conversation.php:1091
+msgid "Delete item(s)?"
+msgstr "Smazat položku(y)?"
+
+#: include/conversation.php:1138
+msgid "New Post"
+msgstr "Nový příspěvek"
+
+#: include/conversation.php:1141
+msgid "Share"
+msgstr "Sdílet"
+
+#: include/conversation.php:1142 mod/wallmessage.php:143 mod/message.php:261
+#: mod/message.php:428 mod/editpost.php:101
+msgid "Upload photo"
+msgstr "Nahrát fotku"
+
+#: include/conversation.php:1143 mod/editpost.php:102
+msgid "upload photo"
+msgstr "nahrát fotku"
+
+#: include/conversation.php:1144 mod/editpost.php:103
+msgid "Attach file"
+msgstr "Přiložit soubor"
+
+#: include/conversation.php:1145 mod/editpost.php:104
+msgid "attach file"
+msgstr "přiložit soubor"
+
+#: 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 "Vložit webový odkaz"
+
+#: include/conversation.php:1147 mod/editpost.php:106
+msgid "web link"
+msgstr "webový odkaz"
+
+#: include/conversation.php:1148 mod/editpost.php:107
+msgid "Insert video link"
+msgstr "Vložit odkaz na video"
+
+#: include/conversation.php:1149 mod/editpost.php:108
+msgid "video link"
+msgstr "odkaz na video"
+
+#: include/conversation.php:1150 mod/editpost.php:109
+msgid "Insert audio link"
+msgstr "Vložit odkaz na audio"
+
+#: include/conversation.php:1151 mod/editpost.php:110
+msgid "audio link"
+msgstr "odkaz na audio"
+
+#: include/conversation.php:1152 mod/editpost.php:111
+msgid "Set your location"
+msgstr "Nastavit vaši polohu"
+
+#: include/conversation.php:1153 mod/editpost.php:112
+msgid "set location"
+msgstr "nastavit polohu"
+
+#: include/conversation.php:1154 mod/editpost.php:113
+msgid "Clear browser location"
+msgstr "Vymazat polohu v prohlížeči"
+
+#: include/conversation.php:1155 mod/editpost.php:114
+msgid "clear location"
+msgstr "vymazat polohu"
+
+#: include/conversation.php:1157 mod/editpost.php:129
+msgid "Set title"
+msgstr "Nastavit nadpis"
+
+#: include/conversation.php:1159 mod/editpost.php:131
+msgid "Categories (comma-separated list)"
+msgstr "Kategorie (seznam, oddělujte čárkou)"
+
+#: include/conversation.php:1161 mod/editpost.php:116
+msgid "Permission settings"
+msgstr "Nastavení oprávnění"
+
+#: include/conversation.php:1162 mod/editpost.php:146
+msgid "permissions"
+msgstr "oprávnění"
+
+#: include/conversation.php:1171 mod/editpost.php:126
+msgid "Public post"
+msgstr "Veřejný příspěvek"
+
+#: 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 "Náhled"
+
+#: include/conversation.php:1184
+msgid "Post to Groups"
+msgstr "Zveřejnit ve skupinách"
+
+#: include/conversation.php:1185
+msgid "Post to Contacts"
+msgstr "Zveřejnit v kontaktech"
+
+#: include/conversation.php:1186
+msgid "Private post"
+msgstr "Soukromý příspěvek"
+
+#: include/conversation.php:1191 mod/editpost.php:144
+#: src/Model/Profile.php:344
+msgid "Message"
+msgstr "Zpráva"
+
+#: include/conversation.php:1192 mod/editpost.php:145
+msgid "Browser"
+msgstr "Prohlížeč"
+
+#: include/conversation.php:1463
+msgid "View all"
+msgstr "Zobrazit vše"
+
+#: include/conversation.php:1486
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Líbí se"
+msgstr[1] "Líbí se"
+msgstr[2] "Líbí se"
+msgstr[3] "Líbí se"
+
+#: include/conversation.php:1489
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "Nelíbí se"
+msgstr[1] "Nelíbí se"
+msgstr[2] "Nelíbí se"
+msgstr[3] "Nelíbí se"
+
+#: include/conversation.php:1495
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "Neúčastní se"
+msgstr[1] "Neúčastní se"
+msgstr[2] "Neúčastní se"
+msgstr[3] "Neúčastní se"
+
+#: include/conversation.php:1498 src/Content/ContactSelector.php:122
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] "Nerozhodnut"
+msgstr[1] "Nerozhodnutí"
+msgstr[2] "Nerozhodnutých"
+msgstr[3] "Nerozhodnuti"
+
+#: include/security.php:83
 msgid "Welcome "
 msgstr "Vítejte "
 
-#: include/security.php:23
+#: include/security.php:84
 msgid "Please upload a profile photo."
-msgstr "Prosím nahrejte profilovou fotografii"
+msgstr "Prosím nahrajte profilovou fotku."
 
-#: include/security.php:26
+#: include/security.php:86
 msgid "Welcome back "
 msgstr "Vítejte zpět "
 
-#: include/security.php:373
+#: 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 "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."
 
-#: include/NotificationsManager.php:153
-msgid "System"
-msgstr "Systém"
+#: include/enotify.php:52
+msgid "Friendica Notification"
+msgstr "Oznámení Friendica"
 
-#: include/NotificationsManager.php:167 mod/profiles.php:703
-#: mod/network.php:845
-msgid "Personal"
-msgstr "Osobní"
+#: include/enotify.php:55
+msgid "Thank You,"
+msgstr "Děkuji,"
 
-#: include/NotificationsManager.php:234 include/NotificationsManager.php:244
+#: include/enotify.php:58
 #, php-format
-msgid "%s commented on %s's post"
-msgstr "%s okomentoval příspěvek uživatele %s'"
+msgid "%1$s, %2$s Administrator"
+msgstr "%1$s, administrátor %2$s"
 
-#: include/NotificationsManager.php:243
+#: include/enotify.php:60
 #, php-format
-msgid "%s created a new post"
-msgstr "%s vytvořil nový příspěvek"
+msgid "%s Administrator"
+msgstr "Administrátor %s"
 
-#: include/NotificationsManager.php:256
+#: include/enotify.php:123
 #, php-format
-msgid "%s liked %s's post"
-msgstr "Uživateli %s se líbí příspěvek uživatele %s"
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr "[Friendica:Oznámení] Obdržena nová zpráva na %s"
 
-#: include/NotificationsManager.php:267
+#: include/enotify.php:125
 #, php-format
-msgid "%s disliked %s's post"
-msgstr "Uživateli %s se nelíbí příspěvek uživatele %s"
+msgid "%1$s sent you a new private message at %2$s."
+msgstr "%1$s Vám poslal/a novou soukromou zprávu na %2$s."
 
-#: include/NotificationsManager.php:278
+#: include/enotify.php:126
+msgid "a private message"
+msgstr "soukromou zprávu"
+
+#: include/enotify.php:126
 #, php-format
-msgid "%s is attending %s's event"
-msgstr ""
+msgid "%1$s sent you %2$s."
+msgstr "%1$s Vám poslal %2$s."
 
-#: include/NotificationsManager.php:289
+#: include/enotify.php:128
 #, php-format
-msgid "%s is not attending %s's event"
-msgstr ""
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Prosím navštivte %s pro zobrazení Vašich soukromých zpráv a možnost na ně odpovědět."
 
-#: include/NotificationsManager.php:300
+#: include/enotify.php:161
 #, php-format
-msgid "%s may attend %s's event"
-msgstr ""
+msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
+msgstr "%1$s okomentoval/a [url=%2$s]%3$s[/url]"
 
-#: include/NotificationsManager.php:315
+#: include/enotify.php:169
 #, php-format
-msgid "%s is now friends with %s"
-msgstr "%s se nyní přátelí s %s"
+msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
+msgstr "%1$s okomentoval/a [url=%2$s]%4$s od %3$s[/url]"
 
-#: include/NotificationsManager.php:748
-msgid "Friend Suggestion"
-msgstr "Návrh přátelství"
+#: include/enotify.php:179
+#, php-format
+msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
+msgstr "%1$s okomentoval/a [url=%2$s]Váš/Vaši %3$s[/url]"
 
-#: include/NotificationsManager.php:781
-msgid "Friend/Connect Request"
-msgstr "Přítel / žádost o připojení"
+#: include/enotify.php:191
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Friendica:Oznámení] Komentář ke konverzaci #%1$d od %2$s"
 
-#: include/NotificationsManager.php:781
-msgid "New Follower"
-msgstr "Nový následovník"
+#: include/enotify.php:193
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s okomentoval/a Vámi sledovanou položku/konverzaci."
 
-#: include/dbstructure.php:26
+#: 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 "Prosím navštivte %s pro zobrazení konverzace a možnosti odpovědět."
+
+#: include/enotify.php:203
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica:Oznámení] %s přidal/a příspěvek na Vaši profilovou zeď"
+
+#: include/enotify.php:205
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "%1$s přidal/a příspěvek na Vaši profilovou zeď na %2$s"
+
+#: include/enotify.php:206
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr "%1$s přidal/a příspěvek na [url=%2$s]Vaši zeď[/url]"
+
+#: include/enotify.php:218
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr "[Friendica:Oznámení] %s Vás označil/a"
+
+#: include/enotify.php:220
+#, php-format
+msgid "%1$s tagged you at %2$s"
+msgstr "%1$s Vás označil/a na %2$s"
+
+#: include/enotify.php:221
+#, php-format
+msgid "%1$s [url=%2$s]tagged you[/url]."
+msgstr "%1$s [url=%2$s]Vás označil/a[/url]."
+
+#: include/enotify.php:233
+#, php-format
+msgid "[Friendica:Notify] %s shared a new post"
+msgstr "[Friendica:Oznámení] %s sdílel/a nový příspěvek"
+
+#: include/enotify.php:235
+#, php-format
+msgid "%1$s shared a new post at %2$s"
+msgstr "%1$s sdílel/a nový příspěvek na %2$s"
+
+#: include/enotify.php:236
+#, php-format
+msgid "%1$s [url=%2$s]shared a post[/url]."
+msgstr "%1$s [url=%2$s]sdílel/a příspěvek[/url]."
+
+#: include/enotify.php:248
+#, php-format
+msgid "[Friendica:Notify] %1$s poked you"
+msgstr "[Friendica:Oznámení] %1$s Vás šťouchnul/a"
+
+#: include/enotify.php:250
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr "%1$s Vás šťouchnul/a na %2$s"
+
+#: include/enotify.php:251
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
+msgstr "%1$s [url=%2$s]Vás šťouchnul/a[/url]."
+
+#: include/enotify.php:268
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+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"
+
+#: include/enotify.php:271
+#, php-format
+msgid "%1$s tagged [url=%2$s]your post[/url]"
+msgstr "%1$s označil/a [url=%2$s]Váš příspěvek[/url]"
+
+#: include/enotify.php:283
+msgid "[Friendica:Notify] Introduction received"
+msgstr "[Friendica:Oznámení] Obdrženo představení"
+
+#: include/enotify.php:285
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr "Obdržel/a jste představení od uživatele \"%1$s\" na %2$s"
+
+#: include/enotify.php:286
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr "Obdržel/a jste [url=%1$s]představení[/url] od uživatele %2$s."
+
+#: include/enotify.php:291 include/enotify.php:337
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Můžete navštívit jejich profil na %s"
+
+#: include/enotify.php:293
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "Prosím navštivte %s pro schválení či zamítnutí představení."
+
+#: include/enotify.php:300
+msgid "[Friendica:Notify] A new person is sharing with you"
+msgstr "[Friendica:Oznámení] Nový člověk s vámi sdílí"
+
+#: include/enotify.php:302 include/enotify.php:303
+#, php-format
+msgid "%1$s is sharing with you at %2$s"
+msgstr "Uživatel %1$s s vámi sdílí na %2$s"
+
+#: include/enotify.php:310
+msgid "[Friendica:Notify] You have a new follower"
+msgstr "[Friendica:Oznámení] Máte nového sledovatele"
+
+#: include/enotify.php:312 include/enotify.php:313
+#, php-format
+msgid "You have a new follower at %2$s : %1$s"
+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 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 přátelství od uživatele \"%1$s\" na %2$s"
+
+#: include/enotify.php:329
 #, php-format
 msgid ""
-"\n"
-"\t\t\tThe friendica developers released update %s recently,\n"
-"\t\t\tbut when I tried to install it, something went terribly wrong.\n"
-"\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n"
-"\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
-msgstr "\n\t\t\tThe friendica vývojáři uvolnili nedávno aktualizaci %s,\n\t\t\tale při pokusu o její instalaci se něco velmi nepovedlo.\n\t\t\tJe třeba to opravit a já to sám nedokážu. Prosím kontaktuj\n\t\t\tfriendica vývojáře, pokud mi s tím nepomůžeš ty sám. Moje databáze může být poškozena."
+"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 přátelství[/url] s uživatelem %2$s od uživatele %3$s."
 
-#: include/dbstructure.php:31
+#: include/enotify.php:335
+msgid "Name:"
+msgstr "Jméno:"
+
+#: include/enotify.php:336
+msgid "Photo:"
+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í návrhu."
+
+#: include/enotify.php:347 include/enotify.php:362
+msgid "[Friendica:Notify] Connection accepted"
+msgstr "[Friendica:Oznámení] Spojení přijato"
+
+#: include/enotify.php:349 include/enotify.php:364
+#, php-format
+msgid "'%1$s' has accepted your connection request at %2$s"
+msgstr "\"%1$s\" přijal/a Váš požadavek na spojení na %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$s přijal/a Váš [url=%1$s]požadavek na spojení[/url]."
+
+#: include/enotify.php:355
+msgid ""
+"You are now mutual friends and may exchange status updates, photos, and "
+"email without restriction."
+msgstr "Jste nyní vzájemní přátelé a můžete si vyměňovat stavové zprávy, fotky a e-maily bez omezení."
+
+#: include/enotify.php:357
+#, php-format
+msgid "Please visit %s if you wish to make any changes to this relationship."
+msgstr "Pokud chcete provést změny s tímto vztahem, prosím navštivte %s."
+
+#: include/enotify.php:370
 #, php-format
 msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "Chybová zpráva je\n[pre]%s[/pre]"
+"'%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\" 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."
 
-#: include/dbstructure.php:183
-msgid "Errors encountered creating database tables."
-msgstr "Při vytváření databázových tabulek došlo k chybám."
-
-#: include/dbstructure.php:260
-msgid "Errors encountered performing database changes."
-msgstr "Při provádění databázových změn došlo k chybám."
-
-#: include/delivery.php:446
-msgid "(no subject)"
-msgstr "(Bez předmětu)"
-
-#: include/diaspora.php:1958
-msgid "Sharing notification from Diaspora network"
-msgstr "Sdílení oznámení ze sítě Diaspora"
-
-#: include/diaspora.php:2864
-msgid "Attachments:"
-msgstr "Přílohy:"
-
-#: include/network.php:595
-msgid "view full size"
-msgstr "zobrazit v plné velikosti"
-
-#: include/Contact.php:340 include/Contact.php:353 include/Contact.php:398
-#: include/conversation.php:968 include/conversation.php:984
-#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203
-#: mod/match.php:71 mod/suggest.php:82
-msgid "View Profile"
-msgstr "Zobrazit Profil"
-
-#: include/Contact.php:397 include/conversation.php:967
-msgid "View Status"
-msgstr "Zobrazit Status"
-
-#: include/Contact.php:399 include/conversation.php:969
-msgid "View Photos"
-msgstr "Zobrazit Fotky"
-
-#: include/Contact.php:400 include/conversation.php:970
-msgid "Network Posts"
-msgstr "Zobrazit Příspěvky sítě"
-
-#: include/Contact.php:401 include/conversation.php:971
-msgid "View Contact"
-msgstr ""
-
-#: include/Contact.php:402
-msgid "Drop Contact"
-msgstr "Odstranit kontakt"
-
-#: include/Contact.php:403 include/conversation.php:972
-msgid "Send PM"
-msgstr "Poslat soukromou zprávu"
-
-#: include/Contact.php:404 include/conversation.php:976
-msgid "Poke"
-msgstr "Šťouchnout"
-
-#: include/Contact.php:775
-msgid "Organisation"
-msgstr ""
-
-#: include/Contact.php:778
-msgid "News"
-msgstr ""
-
-#: include/Contact.php:781
-msgid "Forum"
-msgstr ""
-
-#: include/api.php:1018
+#: include/enotify.php:372
 #, php-format
-msgid "Daily posting limit of %d posts reached. The post was rejected."
-msgstr "Bylo dosaženo denního limitu %d odeslaných příspěvků. Příspěvek byl odmítnut."
-
-#: include/api.php:1038
-#, php-format
-msgid "Weekly posting limit of %d posts reached. The post was rejected."
-msgstr "Bylo týdenního limitu %d odeslaných příspěvků. Příspěvek byl odmítnut."
-
-#: include/api.php:1059
-#, php-format
-msgid "Monthly posting limit of %d posts reached. The post was rejected."
-msgstr "Bylo dosaženo měsíčního limitu %d odeslaných příspěvků. Příspěvek byl odmítnut."
-
-#: include/bbcode.php:350 include/bbcode.php:1057 include/bbcode.php:1058
-msgid "Image/photo"
-msgstr "Obrázek/fotografie"
-
-#: include/bbcode.php:467
-#, 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"
-
-#: include/bbcode.php:1017 include/bbcode.php:1037
-msgid "$1 wrote:"
-msgstr "$1 napsal:"
-
-#: include/bbcode.php:1066 include/bbcode.php:1067
-msgid "Encrypted content"
-msgstr "Šifrovaný obsah"
-
-#: include/bbcode.php:1169
-msgid "Invalid source protocol"
-msgstr ""
-
-#: include/bbcode.php:1179
-msgid "Invalid link protocol"
-msgstr ""
-
-#: include/conversation.php:147
-#, php-format
-msgid "%1$s attends %2$s's %3$s"
-msgstr ""
-
-#: include/conversation.php:150
-#, php-format
-msgid "%1$s doesn't attend %2$s's %3$s"
-msgstr ""
-
-#: include/conversation.php:153
-#, php-format
-msgid "%1$s attends maybe %2$s's %3$s"
-msgstr ""
-
-#: include/conversation.php:185 mod/dfrn_confirm.php:477
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr "%1$s je nyní přítel s %2$s"
-
-#: include/conversation.php:219
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s šťouchnul %2$s"
-
-#: include/conversation.php:239 mod/mood.php:62
-#, php-format
-msgid "%1$s is currently %2$s"
-msgstr "%1$s je právě %2$s"
-
-#: include/conversation.php:278 mod/tagger.php:95
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s označen uživatelem %2$s %3$s s %4$s"
-
-#: include/conversation.php:303
-msgid "post/item"
-msgstr "příspěvek/položka"
-
-#: include/conversation.php:304
-#, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
-msgstr "uživatel %1$s označil %2$s's %3$s jako oblíbeného"
-
-#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:346
-#: mod/photos.php:1607
-msgid "Likes"
-msgstr "Libí se mi"
-
-#: include/conversation.php:585 mod/content.php:372 mod/profiles.php:350
-#: mod/photos.php:1607
-msgid "Dislikes"
-msgstr "Nelibí se mi"
-
-#: include/conversation.php:586 include/conversation.php:1481
-#: mod/content.php:373 mod/photos.php:1608
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
-msgid "Not attending"
-msgstr ""
-
-#: include/conversation.php:586 mod/content.php:373 mod/photos.php:1608
-msgid "Might attend"
-msgstr ""
-
-#: include/conversation.php:708 mod/content.php:453 mod/content.php:758
-#: mod/photos.php:1681 object/Item.php:133
-msgid "Select"
-msgstr "Vybrat"
-
-#: include/conversation.php:709 mod/group.php:171 mod/content.php:454
-#: mod/content.php:759 mod/photos.php:1682 mod/settings.php:741
-#: mod/admin.php:1414 mod/contacts.php:808 mod/contacts.php:1007
-#: object/Item.php:134
-msgid "Delete"
-msgstr "Odstranit"
-
-#: include/conversation.php:753 mod/content.php:487 mod/content.php:910
-#: mod/content.php:911 object/Item.php:367 object/Item.php:368
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Zobrazit profil uživatele %s na %s"
-
-#: include/conversation.php:765 object/Item.php:355
-msgid "Categories:"
-msgstr "Kategorie:"
-
-#: include/conversation.php:766 object/Item.php:356
-msgid "Filed under:"
-msgstr "Vyplněn pod:"
-
-#: include/conversation.php:773 mod/content.php:497 mod/content.php:923
-#: object/Item.php:381
-#, php-format
-msgid "%s from %s"
-msgstr "%s od %s"
-
-#: include/conversation.php:789 mod/content.php:513
-msgid "View in context"
-msgstr "Pohled v kontextu"
-
-#: include/conversation.php:791 include/conversation.php:1264
-#: mod/editpost.php:124 mod/wallmessage.php:156 mod/message.php:356
-#: mod/message.php:548 mod/content.php:515 mod/content.php:948
-#: mod/photos.php:1570 object/Item.php:406
-msgid "Please wait"
-msgstr "Čekejte prosím"
-
-#: include/conversation.php:870
-msgid "remove"
-msgstr "odstranit"
-
-#: include/conversation.php:874
-msgid "Delete Selected Items"
-msgstr "Smazat vybrané položky"
-
-#: include/conversation.php:966
-msgid "Follow Thread"
-msgstr "Následovat vlákno"
-
-#: include/conversation.php:1097
-#, php-format
-msgid "%s likes this."
-msgstr "%s se to líbí."
-
-#: include/conversation.php:1100
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s se to nelíbí."
-
-#: include/conversation.php:1103
-#, php-format
-msgid "%s attends."
-msgstr ""
-
-#: include/conversation.php:1106
-#, php-format
-msgid "%s doesn't attend."
-msgstr ""
-
-#: include/conversation.php:1109
-#, php-format
-msgid "%s attends maybe."
-msgstr ""
-
-#: include/conversation.php:1119
-msgid "and"
-msgstr "a"
-
-#: include/conversation.php:1125
-#, php-format
-msgid ", and %d other people"
-msgstr ", a %d dalších lidí"
-
-#: include/conversation.php:1134
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this"
-msgstr "<span  %1$s>%2$d lidem</span> se to líbí"
-
-#: include/conversation.php:1135
-#, php-format
-msgid "%s like this."
-msgstr ""
-
-#: include/conversation.php:1138
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this"
-msgstr "<span  %1$s>%2$d lidem</span> se to nelíbí"
-
-#: include/conversation.php:1139
-#, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: include/conversation.php:1142
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend"
-msgstr ""
-
-#: include/conversation.php:1143
-#, php-format
-msgid "%s attend."
-msgstr ""
-
-#: include/conversation.php:1146
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't attend"
-msgstr ""
-
-#: include/conversation.php:1147
-#, php-format
-msgid "%s don't attend."
-msgstr ""
-
-#: include/conversation.php:1150
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend maybe"
-msgstr ""
-
-#: include/conversation.php:1151
-#, php-format
-msgid "%s anttend maybe."
-msgstr ""
-
-#: include/conversation.php:1190 include/conversation.php:1208
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Viditelné pro <strong>všechny</strong>"
-
-#: include/conversation.php:1191 include/conversation.php:1209
-#: mod/wallmessage.php:127 mod/wallmessage.php:135 mod/message.php:291
-#: mod/message.php:299 mod/message.php:442 mod/message.php:450
-msgid "Please enter a link URL:"
-msgstr "Zadejte prosím URL odkaz:"
-
-#: include/conversation.php:1192 include/conversation.php:1210
-msgid "Please enter a video link/URL:"
-msgstr "Prosím zadejte URL adresu videa:"
-
-#: include/conversation.php:1193 include/conversation.php:1211
-msgid "Please enter an audio link/URL:"
-msgstr "Prosím zadejte URL adresu zvukového záznamu:"
-
-#: include/conversation.php:1194 include/conversation.php:1212
-msgid "Tag term:"
-msgstr "Štítek:"
-
-#: include/conversation.php:1195 include/conversation.php:1213
-#: mod/filer.php:30
-msgid "Save to Folder:"
-msgstr "Uložit do složky:"
-
-#: include/conversation.php:1196 include/conversation.php:1214
-msgid "Where are you right now?"
-msgstr "Kde právě jste?"
-
-#: include/conversation.php:1197
-msgid "Delete item(s)?"
-msgstr "Smazat položku(y)?"
-
-#: include/conversation.php:1245 mod/photos.php:1569
-msgid "Share"
-msgstr "Sdílet"
-
-#: include/conversation.php:1246 mod/editpost.php:110 mod/wallmessage.php:154
-#: mod/message.php:354 mod/message.php:545
-msgid "Upload photo"
-msgstr "Nahrát fotografii"
-
-#: include/conversation.php:1247 mod/editpost.php:111
-msgid "upload photo"
-msgstr "nahrát fotky"
-
-#: include/conversation.php:1248 mod/editpost.php:112
-msgid "Attach file"
-msgstr "Přiložit soubor"
-
-#: include/conversation.php:1249 mod/editpost.php:113
-msgid "attach file"
-msgstr "přidat soubor"
-
-#: include/conversation.php:1250 mod/editpost.php:114 mod/wallmessage.php:155
-#: mod/message.php:355 mod/message.php:546
-msgid "Insert web link"
-msgstr "Vložit webový odkaz"
-
-#: include/conversation.php:1251 mod/editpost.php:115
-msgid "web link"
-msgstr "webový odkaz"
-
-#: include/conversation.php:1252 mod/editpost.php:116
-msgid "Insert video link"
-msgstr "Zadejte odkaz na video"
-
-#: include/conversation.php:1253 mod/editpost.php:117
-msgid "video link"
-msgstr "odkaz na video"
-
-#: include/conversation.php:1254 mod/editpost.php:118
-msgid "Insert audio link"
-msgstr "Zadejte odkaz na zvukový záznam"
-
-#: include/conversation.php:1255 mod/editpost.php:119
-msgid "audio link"
-msgstr "odkaz na audio"
-
-#: include/conversation.php:1256 mod/editpost.php:120
-msgid "Set your location"
-msgstr "Nastavte vaši polohu"
-
-#: include/conversation.php:1257 mod/editpost.php:121
-msgid "set location"
-msgstr "nastavit místo"
-
-#: include/conversation.php:1258 mod/editpost.php:122
-msgid "Clear browser location"
-msgstr "Odstranit adresu v prohlížeči"
-
-#: include/conversation.php:1259 mod/editpost.php:123
-msgid "clear location"
-msgstr "vymazat místo"
-
-#: include/conversation.php:1261 mod/editpost.php:137
-msgid "Set title"
-msgstr "Nastavit titulek"
-
-#: include/conversation.php:1263 mod/editpost.php:139
-msgid "Categories (comma-separated list)"
-msgstr "Kategorie (čárkou oddělený seznam)"
-
-#: include/conversation.php:1265 mod/editpost.php:125
-msgid "Permission settings"
-msgstr "Nastavení oprávnění"
-
-#: include/conversation.php:1266 mod/editpost.php:154
-msgid "permissions"
-msgstr "oprávnění"
-
-#: include/conversation.php:1274 mod/editpost.php:134
-msgid "Public post"
-msgstr "Veřejný příspěvek"
-
-#: include/conversation.php:1279 mod/editpost.php:145 mod/content.php:737
-#: mod/events.php:504 mod/photos.php:1591 mod/photos.php:1639
-#: mod/photos.php:1725 object/Item.php:729
-msgid "Preview"
-msgstr "Náhled"
-
-#: include/conversation.php:1283 include/items.php:1974 mod/fbrowser.php:101
-#: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/editpost.php:148
-#: mod/message.php:220 mod/suggest.php:32 mod/photos.php:235
-#: mod/photos.php:322 mod/settings.php:679 mod/settings.php:705
-#: mod/videos.php:128 mod/contacts.php:445 mod/dfrn_request.php:876
-#: mod/follow.php:121
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: include/conversation.php:1289
-msgid "Post to Groups"
-msgstr "Zveřejnit na Groups"
-
-#: include/conversation.php:1290
-msgid "Post to Contacts"
-msgstr "Zveřejnit na Groups"
-
-#: include/conversation.php:1291
-msgid "Private post"
-msgstr "Soukromý příspěvek"
-
-#: include/conversation.php:1296 include/identity.php:256 mod/editpost.php:152
-msgid "Message"
-msgstr "Zpráva"
-
-#: include/conversation.php:1297 mod/editpost.php:153
-msgid "Browser"
-msgstr ""
-
-#: include/conversation.php:1453
-msgid "View all"
-msgstr ""
-
-#: include/conversation.php:1475
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: include/conversation.php:1478
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: include/conversation.php:1484
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: include/dfrn.php:1108
-#, php-format
-msgid "%s\\'s birthday"
-msgstr ""
-
-#: include/features.php:70
-msgid "General Features"
-msgstr "Obecné funkčnosti"
-
-#: include/features.php:72
-msgid "Multiple Profiles"
-msgstr "Vícenásobné profily"
-
-#: include/features.php:72
-msgid "Ability to create multiple profiles"
-msgstr "Schopnost vytvořit vícenásobné profily"
-
-#: include/features.php:73
-msgid "Photo Location"
-msgstr ""
-
-#: include/features.php:73
 msgid ""
-"Photo metadata is normally stripped. This extracts the location (if present)"
-" prior to stripping metadata and links it to a map."
-msgstr ""
+"'%1$s' may choose to extend this into a two-way or more permissive "
+"relationship in the future."
+msgstr "\"%1$s\" se může rozhodnout tento vztah v budoucnosti rozšířit do obousměrného či jiného liberálnějšího vztahu."
 
-#: include/features.php:74
-msgid "Export Public Calendar"
-msgstr ""
-
-#: include/features.php:74
-msgid "Ability for visitors to download the public calendar"
-msgstr ""
-
-#: include/features.php:79
-msgid "Post Composition Features"
-msgstr "Nastavení vytváření příspěvků"
-
-#: include/features.php:80
-msgid "Richtext Editor"
-msgstr "Richtext Editor"
-
-#: include/features.php:80
-msgid "Enable richtext editor"
-msgstr "Povolit richtext editor"
-
-#: include/features.php:81
-msgid "Post Preview"
-msgstr "Náhled příspěvku"
-
-#: include/features.php:81
-msgid "Allow previewing posts and comments before publishing them"
-msgstr "Povolit náhledy příspěvků a komentářů před jejich zveřejněním"
-
-#: include/features.php:82
-msgid "Auto-mention Forums"
-msgstr "Automaticky zmíněná Fóra"
-
-#: include/features.php:82
-msgid ""
-"Add/remove mention when a forum page is selected/deselected in ACL window."
-msgstr ""
-
-#: include/features.php:87
-msgid "Network Sidebar Widgets"
-msgstr "Síťové postranní widgety"
-
-#: include/features.php:88
-msgid "Search by Date"
-msgstr "Vyhledávat dle Data"
-
-#: include/features.php:88
-msgid "Ability to select posts by date ranges"
-msgstr "Možnost označit příspěvky dle časového intervalu"
-
-#: include/features.php:89 include/features.php:119
-msgid "List Forums"
-msgstr ""
-
-#: include/features.php:89
-msgid "Enable widget to display the forums your are connected with"
-msgstr ""
-
-#: include/features.php:90
-msgid "Group Filter"
-msgstr "Skupinový Filtr"
-
-#: include/features.php:90
-msgid "Enable widget to display Network posts only from selected group"
-msgstr "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené skupiny"
-
-#: include/features.php:91
-msgid "Network Filter"
-msgstr "Síťový Filtr"
-
-#: include/features.php:91
-msgid "Enable widget to display Network posts only from selected network"
-msgstr "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené sítě"
-
-#: include/features.php:92 mod/search.php:34 mod/network.php:200
-msgid "Saved Searches"
-msgstr "Uložená hledání"
-
-#: include/features.php:92
-msgid "Save search terms for re-use"
-msgstr "Uložit kritéria vyhledávání pro znovupoužití"
-
-#: include/features.php:97
-msgid "Network Tabs"
-msgstr "Síťové záložky"
-
-#: include/features.php:98
-msgid "Network Personal Tab"
-msgstr "Osobní síťový záložka "
-
-#: include/features.php:98
-msgid "Enable tab to display only Network posts that you've interacted on"
-msgstr "Povolit záložku pro zobrazení pouze síťových příspěvků, na které jste reagoval "
-
-#: include/features.php:99
-msgid "Network New Tab"
-msgstr "Nová záložka síť"
-
-#: include/features.php:99
-msgid "Enable tab to display only new Network posts (from the last 12 hours)"
-msgstr "Povolit záložku pro zobrazení pouze nových příspěvků (za posledních 12 hodin)"
-
-#: include/features.php:100
-msgid "Network Shared Links Tab"
-msgstr "záložka Síťové sdílené odkazy "
-
-#: include/features.php:100
-msgid "Enable tab to display only Network posts with links in them"
-msgstr "Povolit záložky pro zobrazování pouze Síťových příspěvků s vazbou na ně"
-
-#: include/features.php:105
-msgid "Post/Comment Tools"
-msgstr "Nástroje Příspěvků/Komentářů"
-
-#: include/features.php:106
-msgid "Multiple Deletion"
-msgstr "Násobné mazání"
-
-#: include/features.php:106
-msgid "Select and delete multiple posts/comments at once"
-msgstr "Označit a smazat více "
-
-#: include/features.php:107
-msgid "Edit Sent Posts"
-msgstr "Editovat Odeslané příspěvky"
-
-#: include/features.php:107
-msgid "Edit and correct posts and comments after sending"
-msgstr "Editovat a opravit příspěvky a komentáře po odeslání"
-
-#: include/features.php:108
-msgid "Tagging"
-msgstr "Štítkování"
-
-#: include/features.php:108
-msgid "Ability to tag existing posts"
-msgstr "Schopnost přidat štítky ke stávajícím příspvěkům"
-
-#: include/features.php:109
-msgid "Post Categories"
-msgstr "Kategorie příspěvků"
-
-#: include/features.php:109
-msgid "Add categories to your posts"
-msgstr "Přidat kategorie k Vašim příspěvkům"
-
-#: include/features.php:110
-msgid "Ability to file posts under folders"
-msgstr "Možnost řadit příspěvky do složek"
-
-#: include/features.php:111
-msgid "Dislike Posts"
-msgstr "Označit příspěvky jako neoblíbené"
-
-#: include/features.php:111
-msgid "Ability to dislike posts/comments"
-msgstr "Možnost označit příspěvky/komentáře jako neoblíbené"
-
-#: include/features.php:112
-msgid "Star Posts"
-msgstr "Příspěvky s hvězdou"
-
-#: include/features.php:112
-msgid "Ability to mark special posts with a star indicator"
-msgstr "Možnost označit příspěvky s indikátorem hvězdy"
-
-#: include/features.php:113
-msgid "Mute Post Notifications"
-msgstr "Utlumit upozornění na přísvěvky"
-
-#: include/features.php:113
-msgid "Ability to mute notifications for a thread"
-msgstr "Možnost stlumit upozornění pro vlákno"
-
-#: include/features.php:118
-msgid "Advanced Profile Settings"
-msgstr ""
-
-#: include/features.php:119
-msgid "Show visitors public community forums at the Advanced Profile Page"
-msgstr ""
-
-#: include/follow.php:81 mod/dfrn_request.php:509
-msgid "Disallowed profile URL."
-msgstr "Nepovolené URL profilu."
-
-#: include/follow.php:86
-msgid "Connect URL missing."
-msgstr "Chybí URL adresa."
-
-#: include/follow.php:113
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "Tento web není nakonfigurován tak, aby umožňoval komunikaci s ostatními sítěmi."
-
-#: include/follow.php:114 include/follow.php:134
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "Nenalezen žádný kompatibilní komunikační protokol nebo kanál."
-
-#: include/follow.php:132
-msgid "The profile address specified does not provide adequate information."
-msgstr "Uvedená adresa profilu neposkytuje dostatečné informace."
-
-#: include/follow.php:136
-msgid "An author or name was not found."
-msgstr "Autor nebo jméno nenalezeno"
-
-#: include/follow.php:138
-msgid "No browser URL could be matched to this address."
-msgstr "Této adrese neodpovídá žádné URL prohlížeče."
-
-#: include/follow.php:140
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr "Není možné namapovat adresu identity ve stylu @ s žádným možným protokolem ani emailovým kontaktem."
-
-#: include/follow.php:141
-msgid "Use mailto: in front of address to force email check."
-msgstr "Použite mailo: před adresou k vynucení emailové kontroly."
-
-#: include/follow.php:147
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr "Zadaná adresa profilu patří do sítě, která  byla na tomto serveru zakázána."
-
-#: include/follow.php:157
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr "Omezený profil. Tato osoba nebude schopna od Vás přijímat přímé / osobní sdělení."
-
-#: include/follow.php:258
-msgid "Unable to retrieve contact information."
-msgstr "Nepodařilo se získat kontaktní informace."
-
-#: include/identity.php:42
-msgid "Requested account is not available."
-msgstr "Požadovaný účet není dostupný."
-
-#: include/identity.php:51 mod/profile.php:21
-msgid "Requested profile is not available."
-msgstr "Požadovaný profil není k dispozici."
-
-#: include/identity.php:95 include/identity.php:311 include/identity.php:688
-msgid "Edit profile"
-msgstr "Upravit profil"
-
-#: include/identity.php:251
-msgid "Atom feed"
-msgstr ""
-
-#: include/identity.php:282
-msgid "Manage/edit profiles"
-msgstr "Spravovat/upravit profily"
-
-#: include/identity.php:287 include/identity.php:313 mod/profiles.php:795
-msgid "Change profile photo"
-msgstr "Změnit profilovou fotografii"
-
-#: include/identity.php:288 mod/profiles.php:796
-msgid "Create New Profile"
-msgstr "Vytvořit nový profil"
-
-#: include/identity.php:298 mod/profiles.php:785
-msgid "Profile Image"
-msgstr "Profilový obrázek"
-
-#: include/identity.php:301 mod/profiles.php:787
-msgid "visible to everybody"
-msgstr "viditelné pro všechny"
-
-#: include/identity.php:302 mod/profiles.php:691 mod/profiles.php:788
-msgid "Edit visibility"
-msgstr "Upravit viditelnost"
-
-#: include/identity.php:330 include/identity.php:616 mod/notifications.php:238
-#: mod/directory.php:139
-msgid "Gender:"
-msgstr "Pohlaví:"
-
-#: include/identity.php:333 include/identity.php:636 mod/directory.php:141
-msgid "Status:"
-msgstr "Status:"
-
-#: include/identity.php:335 include/identity.php:647 mod/directory.php:143
-msgid "Homepage:"
-msgstr "Domácí stránka:"
-
-#: include/identity.php:337 include/identity.php:657 mod/notifications.php:234
-#: mod/directory.php:145 mod/contacts.php:632
-msgid "About:"
-msgstr "O mě:"
-
-#: include/identity.php:339 mod/contacts.php:630
-msgid "XMPP:"
-msgstr ""
-
-#: include/identity.php:422 mod/notifications.php:246 mod/contacts.php:50
-msgid "Network:"
-msgstr "Síť:"
-
-#: include/identity.php:451 include/identity.php:535
-msgid "g A l F d"
-msgstr "g A l F d"
-
-#: include/identity.php:452 include/identity.php:536
-msgid "F d"
-msgstr "d. F"
-
-#: include/identity.php:497 include/identity.php:582
-msgid "[today]"
-msgstr "[Dnes]"
-
-#: include/identity.php:509
-msgid "Birthday Reminders"
-msgstr "Připomínka narozenin"
-
-#: include/identity.php:510
-msgid "Birthdays this week:"
-msgstr "Narozeniny tento týden:"
-
-#: include/identity.php:569
-msgid "[No description]"
-msgstr "[Žádný popis]"
-
-#: include/identity.php:593
-msgid "Event Reminders"
-msgstr "Připomenutí událostí"
-
-#: include/identity.php:594
-msgid "Events this week:"
-msgstr "Události tohoto týdne:"
-
-#: include/identity.php:614 mod/settings.php:1279
-msgid "Full Name:"
-msgstr "Celé jméno:"
-
-#: include/identity.php:621
-msgid "j F, Y"
-msgstr "j F, Y"
-
-#: include/identity.php:622
-msgid "j F"
-msgstr "j F"
-
-#: include/identity.php:633
-msgid "Age:"
-msgstr "Věk:"
-
-#: include/identity.php:642
+#: include/enotify.php:374
 #, php-format
-msgid "for %1$d %2$s"
-msgstr "pro %1$d %2$s"
+msgid "Please visit %s  if you wish to make any changes to this relationship."
+msgstr "Prosím navštivte %s  pokud chcete změnit tento vztah."
 
-#: include/identity.php:645 mod/profiles.php:710
-msgid "Sexual Preference:"
-msgstr "Sexuální preference:"
+#: include/enotify.php:384 mod/removeme.php:47
+msgid "[Friendica System Notify]"
+msgstr "[Systémové oznámení Friendica]"
 
-#: include/identity.php:649 mod/profiles.php:737
-msgid "Hometown:"
-msgstr "Rodné město"
+#: include/enotify.php:384
+msgid "registration request"
+msgstr "žádost o registraci"
 
-#: include/identity.php:651 mod/notifications.php:236 mod/contacts.php:634
-#: mod/follow.php:134
-msgid "Tags:"
-msgstr "Štítky:"
-
-#: include/identity.php:653 mod/profiles.php:738
-msgid "Political Views:"
-msgstr "Politické přesvědčení:"
-
-#: include/identity.php:655
-msgid "Religion:"
-msgstr "Náboženství:"
-
-#: include/identity.php:659
-msgid "Hobbies/Interests:"
-msgstr "Koníčky/zájmy:"
-
-#: include/identity.php:661 mod/profiles.php:742
-msgid "Likes:"
-msgstr "Líbí se:"
-
-#: include/identity.php:663 mod/profiles.php:743
-msgid "Dislikes:"
-msgstr "Nelibí se:"
-
-#: include/identity.php:666
-msgid "Contact information and Social Networks:"
-msgstr "Kontaktní informace a sociální sítě:"
-
-#: include/identity.php:668
-msgid "Musical interests:"
-msgstr "Hudební vkus:"
-
-#: include/identity.php:670
-msgid "Books, literature:"
-msgstr "Knihy, literatura:"
-
-#: include/identity.php:672
-msgid "Television:"
-msgstr "Televize:"
-
-#: include/identity.php:674
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/tanec/kultura/zábava:"
-
-#: include/identity.php:676
-msgid "Love/Romance:"
-msgstr "Láska/romance"
-
-#: include/identity.php:678
-msgid "Work/employment:"
-msgstr "Práce/zaměstnání:"
-
-#: include/identity.php:680
-msgid "School/education:"
-msgstr "Škola/vzdělávání:"
-
-#: include/identity.php:684
-msgid "Forums:"
-msgstr ""
-
-#: include/identity.php:692 mod/events.php:507
-msgid "Basic"
-msgstr ""
-
-#: include/identity.php:693 mod/events.php:508 mod/admin.php:959
-#: mod/contacts.php:870
-msgid "Advanced"
-msgstr "Pokročilé"
-
-#: include/identity.php:717 mod/contacts.php:836 mod/follow.php:142
-msgid "Status Messages and Posts"
-msgstr "Statusové zprávy a příspěvky "
-
-#: include/identity.php:725 mod/contacts.php:844
-msgid "Profile Details"
-msgstr "Detaily profilu"
-
-#: include/identity.php:733 mod/photos.php:87
-msgid "Photo Albums"
-msgstr "Fotoalba"
-
-#: include/identity.php:772 mod/notes.php:46
-msgid "Personal Notes"
-msgstr "Osobní poznámky"
-
-#: include/identity.php:775
-msgid "Only You Can See This"
-msgstr "Toto můžete vidět jen Vy"
-
-#: include/items.php:1575 mod/dfrn_confirm.php:730 mod/dfrn_request.php:746
-msgid "[Name Withheld]"
-msgstr "[Jméno odepřeno]"
-
-#: include/items.php:1930 mod/viewsrc.php:15 mod/notice.php:15
-#: mod/display.php:103 mod/display.php:279 mod/display.php:478
-#: mod/admin.php:234 mod/admin.php:1471 mod/admin.php:1705
-msgid "Item not found."
-msgstr "Položka nenalezena."
-
-#: include/items.php:1969
-msgid "Do you really want to delete this item?"
-msgstr "Opravdu chcete smazat tuto položku?"
-
-#: include/items.php:1971 mod/api.php:105 mod/message.php:217
-#: mod/profiles.php:648 mod/profiles.php:651 mod/profiles.php:677
-#: mod/suggest.php:29 mod/register.php:245 mod/settings.php:1163
-#: mod/settings.php:1169 mod/settings.php:1177 mod/settings.php:1181
-#: mod/settings.php:1186 mod/settings.php:1192 mod/settings.php:1198
-#: mod/settings.php:1204 mod/settings.php:1230 mod/settings.php:1231
-#: mod/settings.php:1232 mod/settings.php:1233 mod/settings.php:1234
-#: mod/contacts.php:442 mod/dfrn_request.php:862 mod/follow.php:110
-msgid "Yes"
-msgstr "Ano"
-
-#: include/items.php:2134 mod/notes.php:22 mod/uimport.php:23
-#: mod/nogroup.php:25 mod/invite.php:15 mod/invite.php:101
-#: mod/repair_ostatus.php:9 mod/delegate.php:12 mod/attach.php:33
-#: mod/editpost.php:10 mod/group.php:19 mod/wallmessage.php:9
-#: mod/wallmessage.php:33 mod/wallmessage.php:79 mod/wallmessage.php:103
-#: mod/api.php:26 mod/api.php:31 mod/ostatus_subscribe.php:9
-#: mod/message.php:46 mod/message.php:182 mod/manage.php:96
-#: mod/crepair.php:100 mod/fsuggest.php:78 mod/mood.php:114 mod/poke.php:150
-#: mod/profile_photo.php:19 mod/profile_photo.php:175
-#: mod/profile_photo.php:186 mod/profile_photo.php:199 mod/regmod.php:110
-#: mod/notifications.php:71 mod/profiles.php:166 mod/profiles.php:605
-#: mod/allfriends.php:12 mod/cal.php:304 mod/common.php:18 mod/dirfind.php:11
-#: mod/display.php:475 mod/events.php:190 mod/suggest.php:58
-#: mod/photos.php:159 mod/photos.php:1072 mod/register.php:42
-#: mod/settings.php:22 mod/settings.php:128 mod/settings.php:665
-#: mod/wall_attach.php:67 mod/wall_attach.php:70 mod/wall_upload.php:77
-#: mod/wall_upload.php:80 mod/contacts.php:350 mod/dfrn_confirm.php:61
-#: mod/follow.php:11 mod/follow.php:73 mod/follow.php:155 mod/item.php:199
-#: mod/item.php:211 mod/network.php:4 mod/viewcontacts.php:45 index.php:401
-msgid "Permission denied."
-msgstr "Přístup odmítnut."
-
-#: include/items.php:2239
-msgid "Archives"
-msgstr "Archív"
-
-#: include/oembed.php:264
-msgid "Embedded content"
-msgstr "vložený obsah"
-
-#: include/oembed.php:272
-msgid "Embedding disabled"
-msgstr "Vkládání zakázáno"
-
-#: include/ostatus.php:1825
+#: include/enotify.php:386
 #, php-format
-msgid "%s is now following %s."
-msgstr ""
+msgid "You've received a registration request from '%1$s' at %2$s"
+msgstr "Obdržel/a jste žádost o registraci od uživatele \"%1$s\" na %2$s"
 
-#: include/ostatus.php:1826
-msgid "following"
-msgstr "následující"
-
-#: include/ostatus.php:1829
+#: include/enotify.php:387
 #, php-format
-msgid "%s stopped following %s."
-msgstr ""
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
+msgstr "Obdržel/a jste [url=%1$s]žádost o registraci[/url] od uživatele \"%2$s\"."
 
-#: include/ostatus.php:1830
-msgid "stopped following"
-msgstr "následování zastaveno"
+#: include/enotify.php:392
+#, php-format
+msgid ""
+"Full Name:\t%s\n"
+"Site Location:\t%s\n"
+"Login Name:\t%s (%s)"
+msgstr "Celé jméno:\t\t%s\nAdresa stránky:\t\t%s\nPřihlašovací jméno:\t%s (%s)"
 
-#: include/text.php:304
+#: include/enotify.php:398
+#, php-format
+msgid "Please visit %s to approve or reject the request."
+msgstr "Prosím navštivte %s k odsouhlasení nebo k zamítnutí požadavku."
+
+#: include/text.php:302
 msgid "newer"
 msgstr "novější"
 
-#: include/text.php:306
+#: include/text.php:303
 msgid "older"
 msgstr "starší"
 
-#: include/text.php:311
-msgid "prev"
-msgstr "předchozí"
-
-#: include/text.php:313
+#: include/text.php:308
 msgid "first"
 msgstr "první"
 
-#: include/text.php:345
-msgid "last"
-msgstr "poslední"
+#: include/text.php:309
+msgid "prev"
+msgstr "předchozí"
 
-#: include/text.php:348
+#: include/text.php:343
 msgid "next"
 msgstr "další"
 
-#: include/text.php:403
-msgid "Loading more entries..."
-msgstr "Načítání více záznamů..."
+#: include/text.php:344
+msgid "last"
+msgstr "poslední"
 
-#: include/text.php:404
+#: include/text.php:398
+msgid "Loading more entries..."
+msgstr "Načítám více záznamů..."
+
+#: include/text.php:399
 msgid "The end"
 msgstr "Konec"
 
-#: include/text.php:889
+#: include/text.php:767
 msgid "No contacts"
 msgstr "Žádné kontakty"
 
-#: include/text.php:912
+#: include/text.php:791
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d kontakt"
-msgstr[1] "%d kontaktů"
-msgstr[2] "%d kontaktů"
+msgstr[1] "%d kontakty"
+msgstr[2] "%d kontaktu"
+msgstr[3] "%d kontaktů"
 
-#: include/text.php:925
+#: include/text.php:804
 msgid "View Contacts"
 msgstr "Zobrazit kontakty"
 
-#: include/text.php:1013 mod/notes.php:61 mod/filer.php:31
-#: mod/editpost.php:109
+#: include/text.php:889 mod/filer.php:35 mod/editpost.php:100 mod/notes.php:54
 msgid "Save"
 msgstr "Uložit"
 
-#: include/text.php:1076
+#: include/text.php:889
+msgid "Follow"
+msgstr "Sledovat"
+
+#: include/text.php:895 mod/search.php:162 src/Content/Nav.php:142
+msgid "Search"
+msgstr "Hledat"
+
+#: include/text.php:898 src/Content/Nav.php:58
+msgid "@name, !forum, #tags, content"
+msgstr "@jméno, !fórum, #štítky, obsah"
+
+#: include/text.php:904 src/Content/Nav.php:145
+msgid "Full Text"
+msgstr "Celý text"
+
+#: include/text.php:905 src/Content/Nav.php:146
+#: src/Content/Widget/TagCloud.php:53
+msgid "Tags"
+msgstr "Štítky"
+
+#: include/text.php:953
 msgid "poke"
 msgstr "šťouchnout"
 
-#: include/text.php:1076
+#: include/text.php:953
 msgid "poked"
-msgstr "šťouchnut"
+msgstr "šťouchnul/a"
 
-#: include/text.php:1077
+#: include/text.php:954
 msgid "ping"
 msgstr "cinknout"
 
-#: include/text.php:1077
+#: include/text.php:954
 msgid "pinged"
-msgstr "cinkut"
+msgstr "cinknul/a"
 
-#: include/text.php:1078
+#: include/text.php:955
 msgid "prod"
-msgstr "pobídnout"
+msgstr "dloubnout"
 
-#: include/text.php:1078
+#: include/text.php:955
 msgid "prodded"
-msgstr "pobídnut"
+msgstr "dloubnul/a"
 
-#: include/text.php:1079
+#: include/text.php:956
 msgid "slap"
-msgstr "dát facku"
+msgstr "uhodit"
 
-#: include/text.php:1079
+#: include/text.php:956
 msgid "slapped"
-msgstr "být uhozen"
+msgstr "uhodil/a"
 
-#: include/text.php:1080
+#: include/text.php:957
 msgid "finger"
-msgstr "osahávat"
+msgstr "osahat"
 
-#: include/text.php:1080
+#: include/text.php:957
 msgid "fingered"
-msgstr "osaháván"
+msgstr "osahal/a"
 
-#: include/text.php:1081
+#: include/text.php:958
 msgid "rebuff"
 msgstr "odmítnout"
 
-#: include/text.php:1081
+#: include/text.php:958
 msgid "rebuffed"
-msgstr "odmítnut"
+msgstr "odmítnul/a"
 
-#: include/text.php:1095
-msgid "happy"
-msgstr "šťasný"
+#: include/text.php:972 mod/settings.php:941 src/Model/Event.php:388
+msgid "Monday"
+msgstr "pondělí"
 
-#: include/text.php:1096
-msgid "sad"
-msgstr "smutný"
+#: include/text.php:972 src/Model/Event.php:389
+msgid "Tuesday"
+msgstr "úterý"
 
-#: include/text.php:1097
-msgid "mellow"
-msgstr "jemný"
+#: include/text.php:972 src/Model/Event.php:390
+msgid "Wednesday"
+msgstr "středa"
 
-#: include/text.php:1098
-msgid "tired"
-msgstr "unavený"
+#: include/text.php:972 src/Model/Event.php:391
+msgid "Thursday"
+msgstr "čtvrtek"
 
-#: include/text.php:1099
-msgid "perky"
-msgstr "emergický"
+#: include/text.php:972 src/Model/Event.php:392
+msgid "Friday"
+msgstr "pátek"
 
-#: include/text.php:1100
-msgid "angry"
-msgstr "nazlobený"
+#: include/text.php:972 src/Model/Event.php:393
+msgid "Saturday"
+msgstr "sobota"
 
-#: include/text.php:1101
-msgid "stupified"
-msgstr "otupen"
+#: include/text.php:972 mod/settings.php:941 src/Model/Event.php:387
+msgid "Sunday"
+msgstr "neděle"
 
-#: include/text.php:1102
-msgid "puzzled"
-msgstr "popletený"
+#: include/text.php:976 src/Model/Event.php:408
+msgid "January"
+msgstr "leden"
 
-#: include/text.php:1103
-msgid "interested"
-msgstr "zajímavý"
+#: include/text.php:976 src/Model/Event.php:409
+msgid "February"
+msgstr "únor"
 
-#: include/text.php:1104
-msgid "bitter"
-msgstr "hořký"
+#: include/text.php:976 src/Model/Event.php:410
+msgid "March"
+msgstr "březen"
 
-#: include/text.php:1105
-msgid "cheerful"
-msgstr "radnostný"
+#: include/text.php:976 src/Model/Event.php:411
+msgid "April"
+msgstr "duben"
 
-#: include/text.php:1106
-msgid "alive"
-msgstr "naživu"
+#: include/text.php:976 include/text.php:993 src/Model/Event.php:399
+#: src/Model/Event.php:412
+msgid "May"
+msgstr "květen"
 
-#: include/text.php:1107
-msgid "annoyed"
-msgstr "otráven"
+#: include/text.php:976 src/Model/Event.php:413
+msgid "June"
+msgstr "červen"
 
-#: include/text.php:1108
-msgid "anxious"
-msgstr "znepokojený"
+#: include/text.php:976 src/Model/Event.php:414
+msgid "July"
+msgstr "červenec"
 
-#: include/text.php:1109
-msgid "cranky"
-msgstr "mrzutý"
+#: include/text.php:976 src/Model/Event.php:415
+msgid "August"
+msgstr "srpen"
 
-#: include/text.php:1110
-msgid "disturbed"
-msgstr "vyrušen"
+#: include/text.php:976 src/Model/Event.php:416
+msgid "September"
+msgstr "září"
 
-#: include/text.php:1111
-msgid "frustrated"
-msgstr "frustrovaný"
+#: include/text.php:976 src/Model/Event.php:417
+msgid "October"
+msgstr "říjen"
 
-#: include/text.php:1112
-msgid "motivated"
-msgstr "motivovaný"
+#: include/text.php:976 src/Model/Event.php:418
+msgid "November"
+msgstr "listopad"
 
-#: include/text.php:1113
-msgid "relaxed"
-msgstr "uvolněný"
+#: include/text.php:976 src/Model/Event.php:419
+msgid "December"
+msgstr "prosinec"
 
-#: include/text.php:1114
-msgid "surprised"
-msgstr "překvapený"
+#: include/text.php:990 src/Model/Event.php:380
+msgid "Mon"
+msgstr "pon"
 
-#: include/text.php:1324 mod/videos.php:380
+#: include/text.php:990 src/Model/Event.php:381
+msgid "Tue"
+msgstr "úte"
+
+#: include/text.php:990 src/Model/Event.php:382
+msgid "Wed"
+msgstr "stř"
+
+#: include/text.php:990 src/Model/Event.php:383
+msgid "Thu"
+msgstr "čtv"
+
+#: include/text.php:990 src/Model/Event.php:384
+msgid "Fri"
+msgstr "pát"
+
+#: include/text.php:990 src/Model/Event.php:385
+msgid "Sat"
+msgstr "sob"
+
+#: include/text.php:990 src/Model/Event.php:379
+msgid "Sun"
+msgstr "ned"
+
+#: include/text.php:993 src/Model/Event.php:395
+msgid "Jan"
+msgstr "led"
+
+#: include/text.php:993 src/Model/Event.php:396
+msgid "Feb"
+msgstr "úno"
+
+#: include/text.php:993 src/Model/Event.php:397
+msgid "Mar"
+msgstr "bře"
+
+#: include/text.php:993 src/Model/Event.php:398
+msgid "Apr"
+msgstr "dub"
+
+#: include/text.php:993 src/Model/Event.php:401
+msgid "Jul"
+msgstr "čvc"
+
+#: include/text.php:993 src/Model/Event.php:402
+msgid "Aug"
+msgstr "srp"
+
+#: include/text.php:993
+msgid "Sep"
+msgstr "zář"
+
+#: include/text.php:993 src/Model/Event.php:404
+msgid "Oct"
+msgstr "říj"
+
+#: include/text.php:993 src/Model/Event.php:405
+msgid "Nov"
+msgstr "lis"
+
+#: include/text.php:993 src/Model/Event.php:406
+msgid "Dec"
+msgstr "pro"
+
+#: include/text.php:1139
+#, php-format
+msgid "Content warning: %s"
+msgstr "Varování o obsahu: %s"
+
+#: include/text.php:1204 mod/videos.php:375
 msgid "View Video"
 msgstr "Zobrazit video"
 
-#: include/text.php:1356
+#: include/text.php:1221
 msgid "bytes"
 msgstr "bytů"
 
-#: include/text.php:1388 include/text.php:1400
+#: 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:1526
+#: include/text.php:1415
 msgid "View on separate page"
 msgstr "Zobrazit na separátní stránce"
 
-#: include/text.php:1527
+#: include/text.php:1416
 msgid "view on separate page"
-msgstr "Zobrazit na separátní stránce"
+msgstr "zobrazit na separátní stránce"
 
-#: include/text.php:1806
+#: include/text.php:1421 include/text.php:1428 src/Model/Event.php:609
+msgid "link to source"
+msgstr "odkaz na zdroj"
+
+#: include/text.php:1615
 msgid "activity"
 msgstr "aktivita"
 
-#: include/text.php:1808 mod/content.php:623 object/Item.php:431
-#: object/Item.php:444
+#: include/text.php:1617 src/Object/Post.php:428 src/Object/Post.php:440
 msgid "comment"
 msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] "komentář"
+msgstr[0] "komentář"
+msgstr[1] "komentáře"
+msgstr[2] "komentáře"
+msgstr[3] "komentářů"
 
-#: include/text.php:1809
+#: include/text.php:1620
 msgid "post"
 msgstr "příspěvek"
 
-#: include/text.php:1977
+#: include/text.php:1775
 msgid "Item filed"
 msgstr "Položka vyplněna"
 
-#: include/user.php:39 mod/settings.php:373
-msgid "Passwords do not match. Password unchanged."
-msgstr "Hesla se neshodují. Heslo nebylo změněno."
+#: 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] "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ě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/user.php:48
-msgid "An invitation is required."
-msgstr "Pozvánka je vyžadována."
+#: 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] "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ě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/user.php:53
-msgid "Invitation could not be verified."
-msgstr "Pozvánka nemohla být ověřena."
+#: include/api.php:1166
+#, php-format
+msgid "Monthly posting limit of %d post reached. The post was rejected."
+msgstr "Byl dosažen měsíční limit %d příspěvků. Příspěvek byl odmítnut."
 
-#: include/user.php:61
-msgid "Invalid OpenID url"
-msgstr "Neplatný odkaz OpenID"
-
-#: include/user.php:82
-msgid "Please enter the required information."
-msgstr "Zadejte prosím požadované informace."
-
-#: include/user.php:96
-msgid "Please use a shorter name."
-msgstr "Použijte prosím kratší jméno."
-
-#: include/user.php:98
-msgid "Name too short."
-msgstr "Jméno je příliš krátké."
-
-#: include/user.php:113
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "Nezdá se, že by to bylo vaše celé jméno (křestní jméno a příjmení)."
-
-#: include/user.php:118
-msgid "Your email domain is not among those allowed on this site."
-msgstr "Váš e-mailová doména není na tomto serveru mezi povolenými."
-
-#: include/user.php:121
-msgid "Not a valid email address."
-msgstr "Neplatná e-mailová adresa."
-
-#: include/user.php:134
-msgid "Cannot use that email."
-msgstr "Tento e-mail nelze použít."
-
-#: include/user.php:140
-msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
-msgstr "Vaše \"přezdívka\" může obsahovat pouze \"a-z\", \"0-9\", a \"_\"."
-
-#: include/user.php:147 include/user.php:245
-msgid "Nickname is already registered. Please choose another."
-msgstr "Přezdívka je již registrována. Prosím vyberte jinou."
-
-#: include/user.php:157
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
-msgstr "Tato přezdívka již zde byla použita a nemůže být využita znovu. Prosím vyberete si jinou."
-
-#: include/user.php:173
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "Závažná chyba: Generování bezpečnostních klíčů se nezdařilo."
-
-#: include/user.php:231
-msgid "An error occurred during registration. Please try again."
-msgstr "Došlo k chybě při registraci. Zkuste to prosím znovu."
-
-#: include/user.php:256 view/theme/duepuntozero/config.php:44
-msgid "default"
-msgstr "standardní"
-
-#: include/user.php:266
-msgid "An error occurred creating your default profile. Please try again."
-msgstr "Došlo k chybě při vytváření Vašeho výchozího profilu. Zkuste to prosím znovu."
-
-#: include/user.php:326 include/user.php:333 include/user.php:340
-#: mod/profile_photo.php:74 mod/profile_photo.php:81 mod/profile_photo.php:88
-#: mod/profile_photo.php:210 mod/profile_photo.php:302
-#: mod/profile_photo.php:311 mod/photos.php:66 mod/photos.php:180
-#: mod/photos.php:751 mod/photos.php:1211 mod/photos.php:1232
-#: mod/photos.php:1819
+#: 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 "Profilové fotografie"
+msgstr "Profilové fotky"
 
-#: include/user.php:414
+#: mod/crepair.php:89
+msgid "Contact settings applied."
+msgstr "Nastavení kontaktu změněno"
+
+#: mod/crepair.php:91
+msgid "Contact update failed."
+msgstr "Aktualizace kontaktu selhala."
+
+#: 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 "Kontakt nenalezen."
+
+#: 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>VAROVÁNÍ: Toto je velmi pokročilé</strong> a pokud zadáte nesprávné informace, Vaše komunikace s tímto kontaktem může přestat fungovat."
+
+#: 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 "Prosím použijte <strong>ihned</strong> v prohlížeči tlačítko \"zpět\" pokud si nejste jisti, co dělat na této stránce."
+
+#: mod/crepair.php:131 mod/crepair.php:133
+msgid "No mirroring"
+msgstr "Žádné zrcadlení"
+
+#: mod/crepair.php:131
+msgid "Mirror as forwarded posting"
+msgstr "Zrcadlit pro přeposlané příspěvky"
+
+#: mod/crepair.php:131 mod/crepair.php:133
+msgid "Mirror as my own posting"
+msgstr "Zrcadlit jako mé vlastní příspěvky"
+
+#: mod/crepair.php:146
+msgid "Return to contact editor"
+msgstr "Zpět k editoru kontaktu"
+
+#: mod/crepair.php:148
+msgid "Refetch contact data"
+msgstr "Znovu načíst data kontaktu"
+
+#: mod/crepair.php:151
+msgid "Remote Self"
+msgstr "Vzdálené zrcadlení"
+
+#: mod/crepair.php:154
+msgid "Mirror postings from this contact"
+msgstr "Zrcadlení příspěvků od tohoto kontaktu"
+
+#: mod/crepair.php:156
+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 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
+#: mod/admin.php:1931
+msgid "Name"
+msgstr "Jméno"
+
+#: mod/crepair.php:161
+msgid "Account Nickname"
+msgstr "Přezdívka účtu"
+
+#: mod/crepair.php:162
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@jménoštítku- upřednostněno před jménem/přezdívkou"
+
+#: mod/crepair.php:163
+msgid "Account URL"
+msgstr "URL adresa účtu"
+
+#: mod/crepair.php:164
+msgid "Friend Request URL"
+msgstr "URL žádosti o přátelství"
+
+#: mod/crepair.php:165
+msgid "Friend Confirm URL"
+msgstr "URL adresa pro potvrzení přátelství"
+
+#: mod/crepair.php:166
+msgid "Notification Endpoint URL"
+msgstr "URL adresa koncového bodu oznámení"
+
+#: mod/crepair.php:167
+msgid "Poll/Feed URL"
+msgstr "URL adresa poll/feed"
+
+#: mod/crepair.php:168
+msgid "New photo from this URL"
+msgstr "Nová fotka z této URL adresy"
+
+#: mod/wallmessage.php:49 mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "Došlo k překročení maximálního počtu zpráv na zeď během jednoho dne. Zpráva %s nedoručena."
+
+#: mod/wallmessage.php:57 mod/message.php:74
+msgid "No recipient selected."
+msgstr "Nevybrán příjemce."
+
+#: mod/wallmessage.php:60
+msgid "Unable to check your home location."
+msgstr "Nebylo možné zjistit polohu Vašeho domova."
+
+#: mod/wallmessage.php:63 mod/message.php:81
+msgid "Message could not be sent."
+msgstr "Zprávu se nepodařilo odeslat."
+
+#: mod/wallmessage.php:66 mod/message.php:84
+msgid "Message collection failure."
+msgstr "Sběr zpráv selhal."
+
+#: mod/wallmessage.php:69 mod/message.php:87
+msgid "Message sent."
+msgstr "Zpráva odeslána."
+
+#: mod/wallmessage.php:86 mod/wallmessage.php:95
+msgid "No recipient."
+msgstr "Žádný příjemce."
+
+#: mod/wallmessage.php:132 mod/message.php:249
+msgid "Send Private Message"
+msgstr "Odeslat soukromou zprávu"
+
+#: mod/wallmessage.php:133
 #, php-format
 msgid ""
-"\n"
-"\t\tDear %1$s,\n"
-"\t\t\tThank you for registering at %2$s. Your account is pending for approval by the administrator.\n"
-"\t"
-msgstr ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr "Pokud si přejete, aby uživatel %s mohl odpovědět, ověřte si zda-li máte povoleno na svém serveru zasílání soukromých zpráv od neznámých odesilatelů."
 
-#: include/user.php:424
-#, php-format
-msgid "Registration at %s"
-msgstr ""
+#: mod/wallmessage.php:134 mod/message.php:250 mod/message.php:419
+msgid "To:"
+msgstr "Adresát:"
 
-#: include/user.php:434
+#: mod/wallmessage.php:135 mod/message.php:254 mod/message.php:421
+msgid "Subject:"
+msgstr "Předmět:"
+
+#: mod/wallmessage.php:141 mod/message.php:258 mod/message.php:424
+#: mod/invite.php:150
+msgid "Your message:"
+msgstr "Vaše zpráva:"
+
+#: mod/lockview.php:42 mod/lockview.php:50
+msgid "Remote privacy information not available."
+msgstr "Vzdálené informace o soukromí nejsou k dispozici."
+
+#: mod/lockview.php:59
+msgid "Visible to:"
+msgstr "Viditelné pro:"
+
+#: mod/install.php:100
+msgid "Friendica Communications Server - Setup"
+msgstr "Komunikační server Friendica - Nastavení"
+
+#: mod/install.php:106
+msgid "Could not connect to database."
+msgstr "Nelze se připojit k databázi."
+
+#: mod/install.php:110
+msgid "Could not create table."
+msgstr "Nelze vytvořit tabulku."
+
+#: mod/install.php:116
+msgid "Your Friendica site database has been installed."
+msgstr "Vaše databáze Friendica  byla nainstalována."
+
+#: mod/install.php:121
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Nejspíše budete muset manuálně importovat soubor \"database.sql\" pomocí phpMyAdmin či MySQL."
+
+#: mod/install.php:122 mod/install.php:166 mod/install.php:274
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Přečtěte si prosím informace v souboru \"INSTALL.txt\"."
+
+#: mod/install.php:134
+msgid "Database already in use."
+msgstr "Databáze se již používá."
+
+#: mod/install.php:163
+msgid "System check"
+msgstr "Zkouška systému"
+
+#: mod/install.php:167 mod/cal.php:279 mod/events.php:394
+msgid "Next"
+msgstr "Dále"
+
+#: mod/install.php:168
+msgid "Check again"
+msgstr "Vyskoušet znovu"
+
+#: mod/install.php:187
+msgid "Database connection"
+msgstr "Databázové spojení"
+
+#: mod/install.php:188
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "Pro instalaci Friendica potřebujeme znát připojení k Vaší databázi."
+
+#: mod/install.php:189
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Pokud máte otázky k následujícím nastavením, obraťte se na svého poskytovatele hostingu nebo administrátora serveru."
+
+#: mod/install.php:190
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "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."
+
+#: mod/install.php:194
+msgid "Database Server Name"
+msgstr "Jméno databázového serveru"
+
+#: mod/install.php:195
+msgid "Database Login Name"
+msgstr "Přihlašovací jméno k databázi"
+
+#: mod/install.php:196
+msgid "Database Login Password"
+msgstr "Heslo k databázovému účtu "
+
+#: mod/install.php:196
+msgid "For security reasons the password must not be empty"
+msgstr "Z bezpečnostních důvodů nesmí být heslo prázdné."
+
+#: mod/install.php:197
+msgid "Database Name"
+msgstr "Jméno databáze"
+
+#: mod/install.php:198 mod/install.php:235
+msgid "Site administrator email address"
+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 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"
+msgstr "Prosím, vyberte výchozí časové pásmo pro váš server"
+
+#: mod/install.php:225
+msgid "Site settings"
+msgstr "Nastavení webu"
+
+#: mod/install.php:239
+msgid "System Language:"
+msgstr "Systémový jazyk"
+
+#: mod/install.php:239
+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ů."
+
+#: 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 v kořenovém adresáři Vašeho webového serveru."
+
+#: mod/install.php:272
+msgid "<h1>What next</h1>"
+msgstr "<h1>Co dál</h1>"
+
+#: mod/install.php:273
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"worker."
+msgstr "DŮLEŽITÉ: Budete si muset [manuálně] nastavit naplánovaný úkol pro pracovníka."
+
+#: mod/install.php:276
 #, php-format
 msgid ""
-"\n"
-"\t\tDear %1$s,\n"
-"\t\t\tThank you for registering at %2$s. Your account has been created.\n"
-"\t"
-msgstr "\n\t\tDrahý %1$s,\n\t\t\tDěkujeme Vám za registraci na %2$s. Váš účet byl vytvořen.\n\t"
+"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 "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."
 
-#: include/user.php:438
-#, php-format
+#: 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 "Profil nenalezen."
+
+#: mod/dfrn_confirm.php:128
 msgid ""
-"\n"
-"\t\tThe login details are as follows:\n"
-"\t\t\tSite Location:\t%3$s\n"
-"\t\t\tLogin Name:\t%1$s\n"
-"\t\t\tPassword:\t%5$s\n"
-"\n"
-"\t\tYou may change your password from your account \"Settings\" page after logging\n"
-"\t\tin.\n"
-"\n"
-"\t\tPlease take a few moments to review the other account settings on that page.\n"
-"\n"
-"\t\tYou may also wish to add some basic information to your default profile\n"
-"\t\t(on the \"Profiles\" page) so that other people can easily find you.\n"
-"\n"
-"\t\tWe recommend setting your full name, adding a profile photo,\n"
-"\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n"
-"\t\tperhaps what country you live in; if you do not wish to be more specific\n"
-"\t\tthan that.\n"
-"\n"
-"\t\tWe fully respect your right to privacy, and none of these items are necessary.\n"
-"\t\tIf you are new and do not know anybody here, they may help\n"
-"\t\tyou to make some new and interesting friends.\n"
-"\n"
-"\n"
-"\t\tThank you and welcome to %2$s."
-msgstr "\n\t\tVaše přihlašovací údaje jsou následující:\n\t\t\tAdresa webu:\t%3$s\n\t\t\tpřihlašovací jméno:\t%1$s\n\t\t\theslo:\t%5$s\n\n\t\tHeslo si můžete změnit na stránce \"Nastavení\" vašeho účtu poté, co se přihlásíte.\n\n\t\tProsím věnujte pár chvil revizi dalšího nastavení vašeho účtu na dané stránce.\n\n\t\tTaké su můžete přidat nějaké základní informace do svého výchozího profilu (na stránce \"Profily\"), takže ostatní lidé vás snáze najdou.\n\n\t\tDoporučujeme Vám uvést celé jméno a i foto. Přidáním nějakých \"klíčových slov\" (velmi užitečné pro hledání nových přátel) a možná také zemi, ve které žijete, pokud nechcete být více konkrétní.\n\n\t\tPlně resepktujeme vaše právo na soukromí a nic z výše uvedeného není povinné.\n\t\tPokud jste zde nový a neznáte zde nikoho, uvedením daných informací můžete získat nové přátele.\n\n\n\t\tDíky a vítejte na %2$s."
+"This may occasionally happen if contact was requested by both persons and it"
+" has already been approved."
+msgstr "To se může občas stát, pokud byl kontakt zažádán oběma osobami a již byl schválen."
 
-#: include/user.php:470 mod/admin.php:1213
+#: mod/dfrn_confirm.php:238
+msgid "Response from remote site was not understood."
+msgstr "Odpověď ze vzdáleného serveru nebyla srozumitelná."
+
+#: mod/dfrn_confirm.php:245 mod/dfrn_confirm.php:251
+msgid "Unexpected response from remote site: "
+msgstr "Neočekávaná odpověď od vzdáleného serveru:"
+
+#: mod/dfrn_confirm.php:260
+msgid "Confirmation completed successfully."
+msgstr "Potvrzení úspěšně dokončena."
+
+#: mod/dfrn_confirm.php:272
+msgid "Temporary failure. Please wait and try again."
+msgstr "Dočasné selhání. Prosím, vyčkejte a zkuste to znovu."
+
+#: mod/dfrn_confirm.php:275
+msgid "Introduction failed or was revoked."
+msgstr "Žádost o propojení selhala nebo byla zrušena."
+
+#: mod/dfrn_confirm.php:280
+msgid "Remote site reported: "
+msgstr "Vzdálený server oznámil:"
+
+#: mod/dfrn_confirm.php:392
+msgid "Unable to set contact photo."
+msgstr "Nelze nastavit fotku kontaktu."
+
+#: mod/dfrn_confirm.php:450
 #, php-format
-msgid "Registration details for %s"
-msgstr "Registrační údaje pro %s"
+msgid "No user record found for '%s' "
+msgstr "Pro \"%s\" nenalezen žádný uživatelský záznam "
 
-#: mod/oexchange.php:25
-msgid "Post successful."
-msgstr "Příspěvek úspěšně odeslán"
+#: mod/dfrn_confirm.php:460
+msgid "Our site encryption key is apparently messed up."
+msgstr "Náš šifrovací klíč zřejmě přestal správně fungovat."
 
-#: mod/viewsrc.php:7
-msgid "Access denied."
-msgstr "Přístup odmítnut"
+#: mod/dfrn_confirm.php:471
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr "Byla poskytnuta prázdná URL adresa nebo se nepodařilo URL adresu dešifrovat."
 
-#: mod/home.php:35
+#: mod/dfrn_confirm.php:487
+msgid "Contact record was not found for you on our site."
+msgstr "Záznam kontaktu nebyl nalezen pro Vás na našich stránkách."
+
+#: mod/dfrn_confirm.php:501
 #, php-format
-msgid "Welcome to %s"
-msgstr "Vítá Vás %s"
+msgid "Site public key not available in contact record for URL %s."
+msgstr "V adresáři není k dispozici veřejný klíč pro URL %s."
 
-#: mod/notify.php:60
-msgid "No more system notifications."
-msgstr "Žádné další systémová upozornění."
+#: 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 "Váš systém poskytl duplicitní ID vůči našemu systému. Pokuste se akci zopakovat."
 
-#: mod/notify.php:64 mod/notifications.php:111
-msgid "System Notifications"
-msgstr "Systémová upozornění"
+#: mod/dfrn_confirm.php:528
+msgid "Unable to set your contact credentials on our system."
+msgstr "Nelze nastavit Vaše přihlašovací údaje v našem systému."
 
-#: mod/search.php:25 mod/network.php:191
-msgid "Remove term"
-msgstr "Odstranit termín"
+#: mod/dfrn_confirm.php:584
+msgid "Unable to update your contact profile details on our system"
+msgstr "Nelze aktualizovat Váš profil v našem systému"
 
-#: mod/search.php:93 mod/search.php:99 mod/community.php:22
-#: mod/directory.php:37 mod/display.php:200 mod/photos.php:944
-#: mod/videos.php:194 mod/dfrn_request.php:791 mod/viewcontacts.php:35
+#: mod/dfrn_confirm.php:614 mod/dfrn_request.php:561
+#: src/Model/Contact.php:1891
+msgid "[Name Withheld]"
+msgstr "[Jméno odepřeno]"
+
+#: mod/dirfind.php:53
+#, php-format
+msgid "People Search - %s"
+msgstr "Vyhledávání lidí - %s"
+
+#: mod/dirfind.php:64
+#, php-format
+msgid "Forum Search - %s"
+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 se"
+
+#: mod/dirfind.php:265 mod/match.php:125
+msgid "No matches"
+msgstr "Žádné shody"
+
+#: mod/manage.php:180
+msgid "Manage Identities and/or Pages"
+msgstr "Správa identit a/nebo stránek"
+
+#: 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 "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."
+
+#: mod/manage.php:182
+msgid "Select an identity to manage: "
+msgstr "Vyberte identitu ke spravování: "
+
+#: mod/videos.php:138
+msgid "Do you really want to delete this video?"
+msgstr "Opravdu chcete smazat toto video?"
+
+#: mod/videos.php:143
+msgid "Delete Video"
+msgstr "Odstranit video"
+
+#: 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 "Veřejný přístup odepřen."
 
-#: mod/search.php:100
+#: mod/videos.php:206
+msgid "No videos selected"
+msgstr "Není vybráno žádné video"
+
+#: mod/videos.php:307 mod/photos.php:1050
+msgid "Access to this item is restricted."
+msgstr "Přístup k této položce je omezen."
+
+#: mod/videos.php:382 mod/photos.php:1699
+msgid "View Album"
+msgstr "Zobrazit album"
+
+#: mod/videos.php:390
+msgid "Recent Videos"
+msgstr "Nedávná videa"
+
+#: mod/videos.php:392
+msgid "Upload New Videos"
+msgstr "Nahrát nová videa"
+
+#: mod/webfinger.php:17 mod/probe.php:14
+msgid "Only logged in users are permitted to perform a probing."
+msgstr "Pouze přihlášení uživatelé mohou zkoušet adresy."
+
+#: 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 "Poloha:"
+
+#: mod/directory.php:156 mod/notifications.php:259 src/Model/Profile.php:420
+#: src/Model/Profile.php:732
+msgid "Gender:"
+msgstr "Pohlaví:"
+
+#: mod/directory.php:157 src/Model/Profile.php:421 src/Model/Profile.php:756
+msgid "Status:"
+msgstr "Stav:"
+
+#: mod/directory.php:158 src/Model/Profile.php:422 src/Model/Profile.php:773
+msgid "Homepage:"
+msgstr "Domovská stránka:"
+
+#: 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 "O mně:"
+
+#: mod/directory.php:209
+msgid "Find on this site"
+msgstr "Najít na tomto webu"
+
+#: mod/directory.php:211
+msgid "Results for:"
+msgstr "Výsledky pro:"
+
+#: mod/directory.php:213
+msgid "Site Directory"
+msgstr "Adresář serveru"
+
+#: mod/directory.php:218
+msgid "No entries (some entries may be hidden)."
+msgstr "Žádné záznamy (některé položky mohou být skryty)."
+
+#: mod/match.php:48
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Žádná klíčová slova k porovnání. Prosím, přidejte klíčová slova do Vašeho výchozího profilu."
+
+#: mod/match.php:104
+msgid "is interested in:"
+msgstr "se zajímá o:"
+
+#: mod/match.php:120
+msgid "Profile Match"
+msgstr "Shoda profilu"
+
+#: mod/settings.php:51 mod/photos.php:134
+msgid "everybody"
+msgstr "Žádost o připojení selhala nebo byla zrušena."
+
+#: mod/settings.php:56
+msgid "Account"
+msgstr "Účet"
+
+#: mod/settings.php:64 src/Model/Profile.php:372 src/Content/Nav.php:210
+msgid "Profiles"
+msgstr "Profily"
+
+#: mod/settings.php:72 mod/admin.php:190
+msgid "Additional features"
+msgstr "Dodatečné vlastnosti"
+
+#: mod/settings.php:80
+msgid "Display"
+msgstr "Zobrazení"
+
+#: mod/settings.php:87 mod/settings.php:840
+msgid "Social Networks"
+msgstr "Sociální sítě"
+
+#: mod/settings.php:94 mod/admin.php:188 mod/admin.php:2013 mod/admin.php:2073
+msgid "Addons"
+msgstr "Doplňky"
+
+#: mod/settings.php:101 src/Content/Nav.php:205
+msgid "Delegations"
+msgstr "Delegace"
+
+#: mod/settings.php:108
+msgid "Connected apps"
+msgstr "Připojené aplikace"
+
+#: mod/settings.php:115 mod/uexport.php:52
+msgid "Export personal data"
+msgstr "Exportovat osobní údaje"
+
+#: mod/settings.php:122
+msgid "Remove account"
+msgstr "Odstranit účet"
+
+#: mod/settings.php:174
+msgid "Missing some important data!"
+msgstr "Chybí některé důležité údaje!"
+
+#: mod/settings.php:176 mod/settings.php:701 mod/contacts.php:848
+msgid "Update"
+msgstr "Aktualizace"
+
+#: mod/settings.php:285
+msgid "Failed to connect with email account using the settings provided."
+msgstr "Nepodařilo se připojit k e-mailovému účtu pomocí dodaného nastavení."
+
+#: mod/settings.php:290
+msgid "Email settings updated."
+msgstr "Nastavení e-mailu aktualizována."
+
+#: mod/settings.php:306
+msgid "Features updated"
+msgstr "Vlastnosti aktualizovány"
+
+#: mod/settings.php:379
+msgid "Relocate message has been send to your contacts"
+msgstr "Správa o změně umístění byla odeslána vašim kontaktům"
+
+#: mod/settings.php:391 src/Model/User.php:377
+msgid "Passwords do not match. Password unchanged."
+msgstr "Hesla se neshodují. Heslo nebylo změněno."
+
+#: mod/settings.php:396
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Prázdné hesla nejsou povolena. Heslo nebylo změněno."
+
+#: 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 "Nové heslo bylo zveřejněno ve veřejném výpisu dat, prosím zvolte si jiné."
+
+#: mod/settings.php:407
+msgid "Wrong password."
+msgstr "Špatné heslo."
+
+#: mod/settings.php:414 src/Core/Console/NewPassword.php:89
+msgid "Password changed."
+msgstr "Heslo bylo změněno."
+
+#: mod/settings.php:416 src/Core/Console/NewPassword.php:86
+msgid "Password update failed. Please try again."
+msgstr "Aktualizace hesla se nezdařila. Zkuste to prosím znovu."
+
+#: mod/settings.php:500
+msgid " Please use a shorter name."
+msgstr "Prosím použijte kratší jméno."
+
+#: mod/settings.php:503
+msgid " Name too short."
+msgstr "Jméno je příliš krátké."
+
+#: mod/settings.php:511
+msgid "Wrong Password"
+msgstr "Špatné heslo"
+
+#: mod/settings.php:516
+msgid "Invalid email."
+msgstr "Neplatný e-mail."
+
+#: mod/settings.php:522
+msgid "Cannot change to that email."
+msgstr "Nelze změnit na tento e-mail."
+
+#: mod/settings.php:572
+msgid "Private forum has no privacy permissions. Using default privacy group."
+msgstr "Soukromé fórum nemá nastaveno zabezpečení. Používá se výchozí soukromá skupina."
+
+#: mod/settings.php:575
+msgid "Private forum has no privacy permissions and no default privacy group."
+msgstr "Soukromé fórum nemá nastaveno zabezpečení a ani žádnou defaultní výchozí skupinu."
+
+#: mod/settings.php:615
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
+
+#: mod/settings.php:674 mod/settings.php:700 mod/settings.php:734
+msgid "Add application"
+msgstr "Přidat aplikaci"
+
+#: 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 "Uložit nastavení"
+
+#: 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 "Přesměrování"
+
+#: mod/settings.php:681 mod/settings.php:707
+msgid "Icon url"
+msgstr "URL ikony"
+
+#: mod/settings.php:692
+msgid "You can't edit this application."
+msgstr "Nemůžete upravit tuto aplikaci."
+
+#: mod/settings.php:733
+msgid "Connected Apps"
+msgstr "Připojené aplikace"
+
+#: mod/settings.php:735 src/Object/Post.php:158 src/Object/Post.php:160
+msgid "Edit"
+msgstr "Upravit"
+
+#: mod/settings.php:737
+msgid "Client key starts with"
+msgstr "Klienský klíč začíná"
+
+#: mod/settings.php:738
+msgid "No name"
+msgstr "Bez názvu"
+
+#: mod/settings.php:739
+msgid "Remove authorization"
+msgstr "Odstranit oprávnění"
+
+#: mod/settings.php:750
+msgid "No Addon settings configured"
+msgstr "Žádná nastavení doplňků nenakonfigurována"
+
+#: mod/settings.php:759
+msgid "Addon Settings"
+msgstr "Nastavení doplňků"
+
+#: mod/settings.php:773 mod/admin.php:2539 mod/admin.php:2540
+msgid "Off"
+msgstr "Vyp"
+
+#: mod/settings.php:773 mod/admin.php:2539 mod/admin.php:2540
+msgid "On"
+msgstr "Zap"
+
+#: mod/settings.php:780
+msgid "Additional Features"
+msgstr "Dodatečné vlastnosti"
+
+#: mod/settings.php:803 src/Content/ContactSelector.php:82
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: mod/settings.php:803 mod/settings.php:804
+msgid "enabled"
+msgstr "povoleno"
+
+#: mod/settings.php:803 mod/settings.php:804
+msgid "disabled"
+msgstr "zakázáno"
+
+#: mod/settings.php:803 mod/settings.php:804
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
+msgstr "Vestavěná podpora pro připojení s %s je %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 "Přístup k e-mailu je na tomto serveru zakázán."
+
+#: mod/settings.php:845
+msgid "General Social Media Settings"
+msgstr "Obecná nastavení sociálních sítí"
+
+#: mod/settings.php:846
+msgid "Disable Content Warning"
+msgstr "Vypnout varování o obsahu"
+
+#: 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 "Uživatelé na sítích, jako je Mastodon nebo Pleroma, si mohou nastavit pole s varováním o obsahu, která ve výchozim nastavení skryje jejich příspěvek. Tato možnost vypíná automatické skrývání a nastavuje varování o obsahu jako titulek příspěvku. Toto se netýká žádného dalšího filtrování obsahu, které se rozhodnete nastavit."
+
+#: mod/settings.php:847
+msgid "Disable intelligent shortening"
+msgstr "Vypnout inteligentní zkracování"
+
+#: 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 "Normálně se systém snaží nalézt nejlepší odkaz pro přidání zkrácených příspěvků. Pokud je tato možnost aktivní, pak každý zkrácený příspěvek bude vždy ukazovat na originální příspěvek Friendica."
+
+#: mod/settings.php:848
+msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
+msgstr "Automaticky sledovat jakékoliv sledovatele/zmiňovatele na 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 "Pokud obdržíte zprávu od neznámého uživatele z OStatus, tato možnost rozhoduje o tom, co dělat. Pokud je zaškrtnuta, bude pro každého neznámého uživatele vytvořen nový kontakt."
+
+#: mod/settings.php:849
+msgid "Default group for OStatus contacts"
+msgstr "Výchozí skupina pro kontakty z OStatus"
+
+#: mod/settings.php:850
+msgid "Your legacy GNU Social account"
+msgstr "Váš starý účet na 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 "Pokud zde zadáte Vaše staré jméno účtu na GNU social/StatusNet (ve formátu uživatel@doména.tld), budou Vaše kontakty přidány automaticky. Toto pole bude po dokončení vyprázdněno."
+
+#: mod/settings.php:853
+msgid "Repair OStatus subscriptions"
+msgstr "Opravit odběry z OStatus"
+
+#: mod/settings.php:857
+msgid "Email/Mailbox Setup"
+msgstr "Nastavení e-mailu"
+
+#: 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 "Pokud chcete komunikovat pomocí této služby s Vašimi kontakty z e-mailu (volitelné), uveďte, jak se připojit k Vaší e-mailové schránce."
+
+#: mod/settings.php:859
+msgid "Last successful email check:"
+msgstr "Poslední úspěšná kontrola e-mailu:"
+
+#: mod/settings.php:861
+msgid "IMAP server name:"
+msgstr "Jméno IMAP serveru:"
+
+#: mod/settings.php:862
+msgid "IMAP port:"
+msgstr "IMAP port:"
+
+#: mod/settings.php:863
+msgid "Security:"
+msgstr "Zabezpečení:"
+
+#: mod/settings.php:863 mod/settings.php:868
+msgid "None"
+msgstr "Žádné"
+
+#: mod/settings.php:864
+msgid "Email login name:"
+msgstr "Přihlašovací jméno k e-mailu:"
+
+#: mod/settings.php:865
+msgid "Email password:"
+msgstr "Heslo k e-mailu:"
+
+#: mod/settings.php:866
+msgid "Reply-to address:"
+msgstr "Odpovědět na adresu:"
+
+#: mod/settings.php:867
+msgid "Send public posts to all email contacts:"
+msgstr "Poslat veřejné příspěvky na všechny e-mailové kontakty:"
+
+#: mod/settings.php:868
+msgid "Action after import:"
+msgstr "Akce po importu:"
+
+#: mod/settings.php:868 src/Content/Nav.php:193
+msgid "Mark as seen"
+msgstr "Označit jako přečtené"
+
+#: mod/settings.php:868
+msgid "Move to folder"
+msgstr "Přesunout do složky"
+
+#: mod/settings.php:869
+msgid "Move to folder:"
+msgstr "Přesunout do složky:"
+
+#: mod/settings.php:903 mod/admin.php:1316
+msgid "No special theme for mobile devices"
+msgstr "Žádný speciální motiv pro mobilní zařízení"
+
+#: mod/settings.php:912
+#, php-format
+msgid "%s - (Unsupported)"
+msgstr "%s - (Nepodporováno)"
+
+#: mod/settings.php:914
+#, php-format
+msgid "%s - (Experimental)"
+msgstr "%s - (Experimentální)"
+
+#: mod/settings.php:957
+msgid "Display Settings"
+msgstr "Nastavení zobrazení"
+
+#: mod/settings.php:963 mod/settings.php:987
+msgid "Display Theme:"
+msgstr "Motiv zobrazení:"
+
+#: mod/settings.php:964
+msgid "Mobile Theme:"
+msgstr "Mobilní motiv:"
+
+#: mod/settings.php:965
+msgid "Suppress warning of insecure networks"
+msgstr "Potlačit varování o nezabezpečených sítích"
+
+#: 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 "Zvolte, zda má systém potlačit zobrazování varování, že aktuální skupina obsahuje členy sítí, které nemohou přijímat soukromé příspěvky."
+
+#: mod/settings.php:966
+msgid "Update browser every xx seconds"
+msgstr "Aktualizovat prohlížeč každých xx sekund"
+
+#: mod/settings.php:966
+msgid "Minimum of 10 seconds. Enter -1 to disable it."
+msgstr "Minimum je 10 sekund. Zadáním hodnoty -1 funkci vypnete."
+
+#: mod/settings.php:967
+msgid "Number of items to display per page:"
+msgstr "Počet položek zobrazených na stránce:"
+
+#: mod/settings.php:967 mod/settings.php:968
+msgid "Maximum of 100 items"
+msgstr "Maximum 100 položek"
+
+#: mod/settings.php:968
+msgid "Number of items to display per page when viewed from mobile device:"
+msgstr "Počet položek ke zobrazení na stránce při zobrazení na mobilním zařízení:"
+
+#: mod/settings.php:969
+msgid "Don't show emoticons"
+msgstr "Nezobrazovat emotikony"
+
+#: mod/settings.php:970
+msgid "Calendar"
+msgstr "Kalendář"
+
+#: mod/settings.php:971
+msgid "Beginning of week:"
+msgstr "Začátek týdne:"
+
+#: mod/settings.php:972
+msgid "Don't show notices"
+msgstr "Nezobrazovat oznámění"
+
+#: mod/settings.php:973
+msgid "Infinite scroll"
+msgstr "Nekonečné posouvání"
+
+#: mod/settings.php:974
+msgid "Automatic updates only at the top of the network page"
+msgstr "Automatické aktualizace pouze na horní straně stránky Síť."
+
+#: mod/settings.php:974
+msgid ""
+"When disabled, the network page is updated all the time, which could be "
+"confusing while reading."
+msgstr "Pokud je tato funkce vypnuta, stránka Síť bude neustále aktualizována, což může být při čtení matoucí."
+
+#: mod/settings.php:975
+msgid "Bandwidth Saver Mode"
+msgstr "Režim šetření dat"
+
+#: mod/settings.php:975
+msgid ""
+"When enabled, embedded content is not displayed on automatic updates, they "
+"only show on page reload."
+msgstr "Pokud je toto zapnuto, nebude při automatických aktualizacích zobrazován vložený obsah, zobrazí se pouze při obnovení stránky."
+
+#: mod/settings.php:976
+msgid "Smart Threading"
+msgstr "Chytrá vlákna"
+
+#: 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 "Pokud je toto povoleno, bude potlačeno vnější odsazení vláken, která zároveň zůstanou tam, kde mají význam. Funguje pouze pokud je povoleno vláknování."
+
+#: mod/settings.php:978
+msgid "General Theme Settings"
+msgstr "Obecná nastavení motivu"
+
+#: mod/settings.php:979
+msgid "Custom Theme Settings"
+msgstr "Vlastní nastavení motivu"
+
+#: mod/settings.php:980
+msgid "Content Settings"
+msgstr "Nastavení obsahu"
+
+#: mod/settings.php:1000
+msgid "Unable to find your profile. Please contact your admin."
+msgstr "Nelze najít Váš účet. Prosím kontaktujte Vašeho administrátora."
+
+#: mod/settings.php:1039
+msgid "Account Types"
+msgstr "Typy účtů"
+
+#: mod/settings.php:1040
+msgid "Personal Page Subtypes"
+msgstr "Podtypy osobních stránek"
+
+#: mod/settings.php:1041
+msgid "Community Forum Subtypes"
+msgstr "Podtypy komunitních fór"
+
+#: mod/settings.php:1048 mod/admin.php:1841
+msgid "Personal Page"
+msgstr "Osobní stránka"
+
+#: mod/settings.php:1049
+msgid "Account for a personal profile."
+msgstr "Účet pro osobní profil."
+
+#: mod/settings.php:1052 mod/admin.php:1842
+msgid "Organisation Page"
+msgstr "Stránka organizace"
+
+#: mod/settings.php:1053
+msgid ""
+"Account for an organisation that automatically approves contact requests as "
+"\"Followers\"."
+msgstr "Účet pro organizaci, který automaticky potvrzuje žádosti o přidání kontaktu jako \"Sledovatele\"."
+
+#: mod/settings.php:1056 mod/admin.php:1843
+msgid "News Page"
+msgstr "Zpravodajská stránka"
+
+#: mod/settings.php:1057
+msgid ""
+"Account for a news reflector that automatically approves contact requests as"
+" \"Followers\"."
+msgstr "Účet pro zpravodaje, který automaticky potvrzuje žádosti o přidání kontaktu jako \"Sledovatele\"."
+
+#: mod/settings.php:1060 mod/admin.php:1844
+msgid "Community Forum"
+msgstr "Komunitní fórum"
+
+#: mod/settings.php:1061
+msgid "Account for community discussions."
+msgstr "Účet pro komunitní diskuze."
+
+#: mod/settings.php:1064 mod/admin.php:1834
+msgid "Normal Account Page"
+msgstr "Normální stránka účtu"
+
+#: mod/settings.php:1065
+msgid ""
+"Account for a regular personal profile that requires manual approval of "
+"\"Friends\" and \"Followers\"."
+msgstr "Účet pro běžný osobní profil, který vyžaduje manuální potvrzení \"Přátel\" a \"Sledovatelů\"."
+
+#: mod/settings.php:1068 mod/admin.php:1835
+msgid "Soapbox Page"
+msgstr "Propagační stránka"
+
+#: mod/settings.php:1069
+msgid ""
+"Account for a public profile that automatically approves contact requests as"
+" \"Followers\"."
+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"
+msgstr "Veřejné fórum"
+
+#: mod/settings.php:1073
+msgid "Automatically approves all contact requests."
+msgstr "Automaticky potvrzuje všechny žádosti o přidání kontaktu."
+
+#: mod/settings.php:1076 mod/admin.php:1837
+msgid "Automatic Friend Page"
+msgstr "Stránka s automatickými přátely"
+
+#: mod/settings.php:1077
+msgid ""
+"Account for a popular profile that automatically approves contact requests "
+"as \"Friends\"."
+msgstr "Účet pro populární profil, který automaticky potvrzuje žádosti o přidání kontaktu jako \"Přátele\"."
+
+#: mod/settings.php:1080
+msgid "Private Forum [Experimental]"
+msgstr "Soukromé fórum [Experimentální]"
+
+#: mod/settings.php:1081
+msgid "Requires manual approval of contact requests."
+msgstr "Vyžaduje manuální potvrzení žádostí o přidání kontaktu."
+
+#: mod/settings.php:1092
+msgid "OpenID:"
+msgstr "OpenID:"
+
+#: mod/settings.php:1092
+msgid "(Optional) Allow this OpenID to login to this account."
+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?"
+msgstr "Publikovat Váš výchozí profil v lokálním adresáři webu?"
+
+#: 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 "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
+#: 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 "Ne"
+
+#: mod/settings.php:1106
+msgid "Publish your default profile in the global social directory?"
+msgstr "Publikovat Váš výchozí profil v globální sociálním adresáři?"
+
+#: 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 "Váš profil bude publikován v globálních adresářich Friendica (např. <a href=\"%s\">%s</a>). Váš profil bude veřejně viditelný."
+
+#: mod/settings.php:1113
+msgid "Hide your contact/friend list from viewers of your default profile?"
+msgstr "Skrýt Váš seznam kontaktů/přátel před návštěvníky Vašeho výchozího profilu?"
+
+#: 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 "Váš seznam kontaktů nebude zobrazen na Vaší výchozí profilové stránce. Můžete se rozhodnout, jestli chcete zobrazit Váš seznam kontaktů zvlášť pro každý další profil, který si vytvoříte."
+
+#: mod/settings.php:1117
+msgid "Hide your profile details from anonymous viewers?"
+msgstr "Skrýt Vaše profilové detaily před anonymními návštěvníky?"
+
+#: 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 "Anonymní návštěvníci mohou pouze vidět Váš profilový obrázek, zobrazované jméno a přezdívku, kterou používáte na Vaší profilové stránce. Vaše veřejné příspěvky a odpovědi budou stále dostupné jinými způsoby."
+
+#: mod/settings.php:1121
+msgid "Allow friends to post to your profile page?"
+msgstr "Povolit přátelům umisťování příspěvků na vaši profilovou stránku?"
+
+#: mod/settings.php:1121
+msgid ""
+"Your contacts may write posts on your profile wall. These posts will be "
+"distributed to your contacts"
+msgstr "Vaše kontakty mohou psát příspěvky na Vaši profilovou zeď. Tyto příspěvky budou přeposílány Vašim kontaktům."
+
+#: mod/settings.php:1125
+msgid "Allow friends to tag your posts?"
+msgstr "Povolit přátelům označovat Vaše příspěvky?"
+
+#: mod/settings.php:1125
+msgid "Your contacts can add additional tags to your posts."
+msgstr "Vaše kontakty mohou přidávat k Vašim příspěvkům dodatečné štítky."
+
+#: mod/settings.php:1129
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Povolit, abychom vás navrhovali jako přátelé pro nové členy?"
+
+#: mod/settings.php:1129
+msgid ""
+"If you like, Friendica may suggest new members to add you as a contact."
+msgstr "Pokud budete chtít, může Friendica nabízet novým členům, aby si Vás přidali jako kontakt."
+
+#: mod/settings.php:1133
+msgid "Permit unknown people to send you private mail?"
+msgstr "Povolit neznámým lidem Vám zasílat soukromé zprávy?"
+
+#: mod/settings.php:1133
+msgid ""
+"Friendica network users may send you private messages even if they are not "
+"in your contact list."
+msgstr "Uživatelé sítě Friendica Vám mohou posílat soukromé zprávy, i pokud nejsou ve Vašich kontaktech."
+
+#: mod/settings.php:1137
+msgid "Profile is <strong>not published</strong>."
+msgstr "Profil <strong>není zveřejněn</strong>."
+
+#: mod/settings.php:1143
+#, php-format
+msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
+msgstr "Vaše adresa identity je <strong>\"%s\"</strong> nebo \"%s\"."
+
+#: mod/settings.php:1150
+msgid "Automatically expire posts after this many days:"
+msgstr "Automaticky expirovat příspěvky po zadaném počtu dní:"
+
+#: mod/settings.php:1150
+msgid "If empty, posts will not expire. Expired posts will be deleted"
+msgstr "Pokud je prázdné, příspěvky nebudou nikdy expirovat. Expirované příspěvky budou vymazány"
+
+#: mod/settings.php:1151
+msgid "Advanced expiration settings"
+msgstr "Pokročilé nastavení expirací"
+
+#: mod/settings.php:1152
+msgid "Advanced Expiration"
+msgstr "Nastavení expirací"
+
+#: mod/settings.php:1153
+msgid "Expire posts:"
+msgstr "Expirovat příspěvky:"
+
+#: mod/settings.php:1154
+msgid "Expire personal notes:"
+msgstr "Expirovat osobní poznámky:"
+
+#: mod/settings.php:1155
+msgid "Expire starred posts:"
+msgstr "Expirovat příspěvky s hvězdou:"
+
+#: mod/settings.php:1156
+msgid "Expire photos:"
+msgstr "Expirovat fotky:"
+
+#: mod/settings.php:1157
+msgid "Only expire posts by others:"
+msgstr "Příspěvky expirovat pouze ostatními:"
+
+#: mod/settings.php:1187
+msgid "Account Settings"
+msgstr "Nastavení účtu"
+
+#: mod/settings.php:1195
+msgid "Password Settings"
+msgstr "Nastavení hesla"
+
+#: mod/settings.php:1196 mod/register.php:275
+msgid "New Password:"
+msgstr "Nové heslo:"
+
+#: mod/settings.php:1197 mod/register.php:276
+msgid "Confirm:"
+msgstr "Potvrďte:"
+
+#: mod/settings.php:1197
+msgid "Leave password fields blank unless changing"
+msgstr "Pokud nechcete změnit heslo, položku hesla nevyplňujte"
+
+#: mod/settings.php:1198
+msgid "Current Password:"
+msgstr "Stávající heslo:"
+
+#: mod/settings.php:1198 mod/settings.php:1199
+msgid "Your current password to confirm the changes"
+msgstr "Vaše stávající heslo k potvrzení změn"
+
+#: mod/settings.php:1199
+msgid "Password:"
+msgstr "Heslo: "
+
+#: mod/settings.php:1203
+msgid "Basic Settings"
+msgstr "Základní nastavení"
+
+#: mod/settings.php:1204 src/Model/Profile.php:725
+msgid "Full Name:"
+msgstr "Celé jméno:"
+
+#: mod/settings.php:1205
+msgid "Email Address:"
+msgstr "E-mailová adresa:"
+
+#: mod/settings.php:1206
+msgid "Your Timezone:"
+msgstr "Vaše časové pásmo:"
+
+#: mod/settings.php:1207
+msgid "Your Language:"
+msgstr "Váš jazyk:"
+
+#: mod/settings.php:1207
+msgid ""
+"Set the language we use to show you friendica interface and to send you "
+"emails"
+msgstr "Nastavte jazyk, který máme používat pro rozhraní Friendica a pro posílání e-mailů"
+
+#: mod/settings.php:1208
+msgid "Default Post Location:"
+msgstr "Výchozí poloha příspěvků:"
+
+#: mod/settings.php:1209
+msgid "Use Browser Location:"
+msgstr "Používat polohu dle prohlížeče:"
+
+#: mod/settings.php:1212
+msgid "Security and Privacy Settings"
+msgstr "Nastavení zabezpečení a soukromí"
+
+#: mod/settings.php:1214
+msgid "Maximum Friend Requests/Day:"
+msgstr "Maximální počet žádostí o přátelství za den:"
+
+#: mod/settings.php:1214 mod/settings.php:1243
+msgid "(to prevent spam abuse)"
+msgstr "(ay se zabránilo spamu)"
+
+#: mod/settings.php:1215
+msgid "Default Post Permissions"
+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í)"
+
+#: mod/settings.php:1224 mod/photos.php:1126 mod/photos.php:1456
+msgid "Show to Groups"
+msgstr "Zobrazit ve Skupinách"
+
+#: mod/settings.php:1225 mod/photos.php:1127 mod/photos.php:1457
+msgid "Show to Contacts"
+msgstr "Zobrazit v Kontaktech"
+
+#: mod/settings.php:1226
+msgid "Default Private Post"
+msgstr "Výchozí Soukromý příspěvek"
+
+#: mod/settings.php:1227
+msgid "Default Public Post"
+msgstr "Výchozí Veřejný příspěvek"
+
+#: mod/settings.php:1231
+msgid "Default Permissions for New Posts"
+msgstr "Výchozí oprávnění pro nové příspěvky"
+
+#: mod/settings.php:1243
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Maximum soukromých zpráv od neznámých lidí za den:"
+
+#: mod/settings.php:1246
+msgid "Notification Settings"
+msgstr "Nastavení oznámení"
+
+#: mod/settings.php:1247
+msgid "Send a notification email when:"
+msgstr "Poslat oznámení e-mailem, když:"
+
+#: mod/settings.php:1248
+msgid "You receive an introduction"
+msgstr "obdržíte představení"
+
+#: mod/settings.php:1249
+msgid "Your introductions are confirmed"
+msgstr "jsou Vaše představení potvrzena"
+
+#: mod/settings.php:1250
+msgid "Someone writes on your profile wall"
+msgstr "Vám někdo napíše na Vaši profilovou stránku"
+
+#: mod/settings.php:1251
+msgid "Someone writes a followup comment"
+msgstr "Vám někdo napíše následný komentář"
+
+#: mod/settings.php:1252
+msgid "You receive a private message"
+msgstr "obdržíte soukromou zprávu"
+
+#: mod/settings.php:1253
+msgid "You receive a friend suggestion"
+msgstr "obdržíte návrh přátelství"
+
+#: mod/settings.php:1254
+msgid "You are tagged in a post"
+msgstr "jste označen v příspěvku"
+
+#: mod/settings.php:1255
+msgid "You are poked/prodded/etc. in a post"
+msgstr "jste šťouchnut(a)/dloubnut(a)/apod. v příspěvku"
+
+#: mod/settings.php:1257
+msgid "Activate desktop notifications"
+msgstr "Aktivovat desktopová oznámení"
+
+#: mod/settings.php:1257
+msgid "Show desktop popup on new notifications"
+msgstr "Zobrazit desktopové zprávy při nových oznámeních."
+
+#: mod/settings.php:1259
+msgid "Text-only notification emails"
+msgstr "Pouze textové notifikační e-maily"
+
+#: mod/settings.php:1261
+msgid "Send text only notification emails, without the html part"
+msgstr "Posílat pouze textové notifikační e-maily, bez html části."
+
+#: mod/settings.php:1263
+msgid "Show detailled notifications"
+msgstr "Zobrazit detailní oznámení"
+
+#: mod/settings.php:1265
+msgid ""
+"Per default, notifications are condensed to a single notification per item. "
+"When enabled every notification is displayed."
+msgstr "Ve výchozím nastavení jsou oznámení zhuštěné na jediné oznámení pro každou položku. Pokud je toto povolené, budou zobrazována všechna oznámení."
+
+#: mod/settings.php:1267
+msgid "Advanced Account/Page Type Settings"
+msgstr "Pokročilé nastavení účtu/stránky"
+
+#: mod/settings.php:1268
+msgid "Change the behaviour of this account for special situations"
+msgstr "Změnit chování tohoto účtu ve speciálních situacích"
+
+#: mod/settings.php:1271
+msgid "Relocate"
+msgstr "Přemístit"
+
+#: 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 "Pokud jste přemístil/a tento profil z jiného serveru a nějaký z vašich kontaktů nedostává Vaše aktualizace, zkuste stisknout toto tlačítko."
+
+#: mod/settings.php:1273
+msgid "Resend relocate message to contacts"
+msgstr "Znovu odeslat správu o přemístění Vašim kontaktům"
+
+#: mod/ping.php:289
+msgid "{0} wants to be your friend"
+msgstr "{0} chce být Vaším přítelem"
+
+#: mod/ping.php:305
+msgid "{0} sent you a message"
+msgstr "{0} vám poslal/a zprávu"
+
+#: mod/ping.php:321
+msgid "{0} requested registration"
+msgstr "{0} požaduje registraci"
+
+#: mod/search.php:39 mod/network.php:194
+msgid "Remove term"
+msgstr "Odstranit termín"
+
+#: mod/search.php:48 mod/network.php:201 src/Content/Feature.php:100
+msgid "Saved Searches"
+msgstr "Uložená hledání"
+
+#: mod/search.php:112
 msgid "Only logged in users are permitted to perform a search."
-msgstr ""
+msgstr "Pouze přihlášení uživatelé mohou prohledávat tento server."
 
-#: mod/search.php:124
+#: mod/search.php:136
 msgid "Too Many Requests"
-msgstr ""
+msgstr "Příliš mnoho požadavků"
 
-#: mod/search.php:125
+#: mod/search.php:137
 msgid "Only one search per minute is permitted for not logged in users."
-msgstr ""
+msgstr "Nepřihlášení uživatelé mohou vyhledávat pouze jednou za minutu."
 
-#: mod/search.php:224 mod/community.php:66 mod/community.php:75
+#: mod/search.php:240 mod/community.php:161
 msgid "No results."
 msgstr "Žádné výsledky."
 
-#: mod/search.php:230
+#: mod/search.php:246
 #, php-format
 msgid "Items tagged with: %s"
-msgstr "Položky označené s: %s"
+msgstr "Položky označené štítkem: %s"
 
-#: mod/search.php:232 mod/contacts.php:797 mod/network.php:146
+#: mod/search.php:248 mod/contacts.php:841
 #, php-format
 msgid "Results for: %s"
-msgstr ""
+msgstr "Výsledky pro: %s"
 
-#: mod/friendica.php:70
-msgid "This is Friendica, version"
-msgstr "Toto je Friendica, verze"
+#: mod/common.php:93
+msgid "No contacts in common."
+msgstr "Žádné společné kontakty."
 
-#: mod/friendica.php:71
-msgid "running at web location"
-msgstr "běžící na webu"
+#: mod/common.php:142 mod/contacts.php:916
+msgid "Common Friends"
+msgstr "Společní přátelé"
 
-#: mod/friendica.php:73
+#: mod/bookmarklet.php:24 src/Module/Login.php:310 src/Content/Nav.php:114
+msgid "Login"
+msgstr "Přihlásit se"
+
+#: mod/bookmarklet.php:52
+msgid "The post was created"
+msgstr "Příspěvek byl vytvořen"
+
+#: mod/network.php:202 src/Model/Group.php:401
+msgid "add"
+msgstr "přidat"
+
+#: mod/network.php:548
+#, php-format
 msgid ""
-"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
-"more about the Friendica project."
-msgstr "Pro získání dalších informací o projektu Friendica navštivte prosím <a href=\"http://friendica.com\">Friendica.com</a>."
+"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] "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 č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/friendica.php:75
+#: mod/network.php:551
+msgid "Messages in this group won't be send to these receivers."
+msgstr "Zprávy v této skupině nebudou těmto příjemcům doručeny."
+
+#: mod/network.php:620
+msgid "No such group"
+msgstr "Žádná taková skupina"
+
+#: mod/network.php:641 mod/group.php:247
+msgid "Group is empty"
+msgstr "Skupina je prázdná"
+
+#: mod/network.php:645
+#, php-format
+msgid "Group: %s"
+msgstr "Skupina: %s"
+
+#: mod/network.php:671
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "Soukromé zprávy této osobě jsou vystaveny riziku prozrazení."
+
+#: mod/network.php:674
+msgid "Invalid contact."
+msgstr "Neplatný kontakt."
+
+#: mod/network.php:945
+msgid "Commented Order"
+msgstr "Dle komentářů"
+
+#: mod/network.php:948
+msgid "Sort by Comment Date"
+msgstr "Řadit podle data komentáře"
+
+#: mod/network.php:953
+msgid "Posted Order"
+msgstr "Dle data"
+
+#: mod/network.php:956
+msgid "Sort by Post Date"
+msgstr "Řadit podle data příspěvku"
+
+#: mod/network.php:964 mod/profiles.php:594
+#: src/Core/NotificationsManager.php:186
+msgid "Personal"
+msgstr "Osobní"
+
+#: mod/network.php:967
+msgid "Posts that mention or involve you"
+msgstr "Příspěvky, které Vás zmiňují nebo zahrnují"
+
+#: mod/network.php:975
+msgid "New"
+msgstr "Nové"
+
+#: mod/network.php:978
+msgid "Activity Stream - by date"
+msgstr "Proud aktivit - dle data"
+
+#: mod/network.php:986
+msgid "Shared Links"
+msgstr "Sdílené odkazy"
+
+#: mod/network.php:989
+msgid "Interesting Links"
+msgstr "Zajímavé odkazy"
+
+#: mod/network.php:997
+msgid "Starred"
+msgstr "S hvězdičkou"
+
+#: mod/network.php:1000
+msgid "Favourite Posts"
+msgstr "Oblíbené přízpěvky"
+
+#: mod/group.php:36
+msgid "Group created."
+msgstr "Skupina vytvořena."
+
+#: mod/group.php:42
+msgid "Could not create group."
+msgstr "Nelze vytvořit skupinu."
+
+#: mod/group.php:56 mod/group.php:187
+msgid "Group not found."
+msgstr "Skupina nenalezena."
+
+#: mod/group.php:70
+msgid "Group name changed."
+msgstr "Název skupiny byl změněn."
+
+#: mod/group.php:101
+msgid "Save Group"
+msgstr "Uložit skupinu"
+
+#: mod/group.php:102
+msgid "Filter"
+msgstr "Filtr"
+
+#: mod/group.php:107
+msgid "Create a group of contacts/friends."
+msgstr "Vytvořit skupinu kontaktů/přátel."
+
+#: mod/group.php:108 mod/group.php:134 mod/group.php:229
+#: src/Model/Group.php:410
+msgid "Group Name: "
+msgstr "Název skupiny: "
+
+#: mod/group.php:125 src/Model/Group.php:407
+msgid "Contacts not in any group"
+msgstr "Kontakty, které nejsou v žádné skupině"
+
+#: mod/group.php:157
+msgid "Group removed."
+msgstr "Skupina odstraněna. "
+
+#: mod/group.php:159
+msgid "Unable to remove group."
+msgstr "Nelze odstranit skupinu."
+
+#: mod/group.php:222
+msgid "Delete Group"
+msgstr "Odstranit skupinu"
+
+#: mod/group.php:233
+msgid "Edit Group Name"
+msgstr "Upravit název skupiny"
+
+#: mod/group.php:244
+msgid "Members"
+msgstr "Členové"
+
+#: mod/group.php:246 mod/contacts.php:739
+msgid "All Contacts"
+msgstr "Všechny kontakty"
+
+#: mod/group.php:260
+msgid "Remove contact from group"
+msgstr "Odebrat kontakt ze skupiny"
+
+#: mod/group.php:278 mod/profperm.php:118
+msgid "Click on a contact to add or remove."
+msgstr "Klikněte na kontakt pro přidání nebo odebrání"
+
+#: mod/group.php:292
+msgid "Add contact to group"
+msgstr "Přidat kontakt ke skupině"
+
+#: mod/delegate.php:39
+msgid "Parent user not found."
+msgstr "Rodičovský uživatel nenalezen."
+
+#: mod/delegate.php:146
+msgid "No parent user"
+msgstr "Žádný rodičovský uživatel"
+
+#: mod/delegate.php:161
+msgid "Parent Password:"
+msgstr "Rodičovské heslo:"
+
+#: mod/delegate.php:161
+msgid ""
+"Please enter the password of the parent account to legitimize your request."
+msgstr "Prosím vložte heslo rodičovského účtu k legitimizaci Vašeho požadavku."
+
+#: mod/delegate.php:166
+msgid "Parent User"
+msgstr "Rodičovský uživatel"
+
+#: 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 "Rodičovští uživatelé mají naprostou kontrolu nad tímto účtem, včetně nastavení účtu. Prosím překontrolujte, komu tento přístup dáváte."
+
+#: mod/delegate.php:171 src/Content/Nav.php:205
+msgid "Delegate Page Management"
+msgstr "Správa delegátů stránky"
+
+#: mod/delegate.php:172
+msgid "Delegates"
+msgstr "Delegáti"
+
+#: 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 "Delegáti jsou schopni řídit všechny aspekty tohoto účtu/stránky, kromě základních nastavení účtu. Prosím, nedelegujte svůj osobní účet nikomu, komu zcela nedůvěřujete."
+
+#: mod/delegate.php:175
+msgid "Existing Page Delegates"
+msgstr "Stávající delegáti stránky "
+
+#: mod/delegate.php:177
+msgid "Potential Delegates"
+msgstr "Potenciální delegáti"
+
+#: mod/delegate.php:179 mod/tagrm.php:90
+msgid "Remove"
+msgstr "Odstranit"
+
+#: mod/delegate.php:180
+msgid "Add"
+msgstr "Přidat"
+
+#: mod/delegate.php:181
+msgid "No entries."
+msgstr "Žádné záznamy."
+
+#: mod/uexport.php:44
+msgid "Export account"
+msgstr "Exportovat účet"
+
+#: 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 "Exportujte svůj účet a své kontakty. Použijte tuto funkci pro vytvoření  zálohy svého účtu a/nebo k přesunu na jiný server."
+
+#: mod/uexport.php:45
+msgid "Export all"
+msgstr "Exportovat vše"
+
+#: 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 "Exportujte své informace o účtu, kontakty a všechny své položky jako JSON. To může být velmi velký soubor a může to zabrat spoustu času. Tuto funkci použijte pro úplnou zálohu svého účtu (fotky se neexportují)"
+
+#: mod/repair_ostatus.php:21
+msgid "Resubscribing to OStatus contacts"
+msgstr "Znovu Vás registruji ke kontaktům OStatus"
+
+#: mod/repair_ostatus.php:37
+msgid "Error"
+msgstr "Chyba"
+
+#: mod/repair_ostatus.php:52 mod/ostatus_subscribe.php:65
+msgid "Done"
+msgstr "Hotovo"
+
+#: mod/repair_ostatus.php:58 mod/ostatus_subscribe.php:89
+msgid "Keep this window open until done."
+msgstr "Toto okno nechte otevřené až do konce."
+
+#: 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 "Přístup odmítnut."
+
+#: mod/viewcontacts.php:90
+msgid "No contacts."
+msgstr "Žádné kontakty."
+
+#: mod/viewcontacts.php:106 mod/contacts.php:639 mod/contacts.php:1052
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Navštivte profil uživatele %s [%s]"
+
+#: mod/unfollow.php:36
+msgid "Contact wasn't found or can't be unfollowed."
+msgstr "Kontakt nebyl nalezen, nebo u něj nemůže být zrušeno sledování."
+
+#: mod/unfollow.php:49
+msgid "Contact unfollowed"
+msgstr "Zrušeno sledování kontaktu"
+
+#: mod/unfollow.php:67 mod/dfrn_request.php:654 mod/follow.php:62
+msgid "Submit Request"
+msgstr "Odeslat žádost"
+
+#: mod/unfollow.php:76
+msgid "You aren't a friend of this contact."
+msgstr "nejste přítelem tohoto kontaktu"
+
+#: mod/unfollow.php:82
+msgid "Unfollowing is currently not supported by your network."
+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 se/Zrušit sledování"
+
+#: mod/unfollow.php:116 mod/dfrn_request.php:652 mod/follow.php:157
+msgid "Your Identity Address:"
+msgstr "Vaše adresa identity:"
+
+#: 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 profilu"
+
+#: mod/unfollow.php:135 mod/contacts.php:888 mod/follow.php:189
+#: src/Model/Profile.php:878
+msgid "Status Messages and Posts"
+msgstr "Stavové zprávy a příspěvky "
+
+#: 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 "[Vložený obsah - pro zobrazení obnovte stránku]"
+
+#: mod/register.php:99
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr "Registrace byla úspěšná. Zkontrolujte prosím svůj e-mail pro další instrukce."
+
+#: 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 "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í."
+
+#: mod/register.php:110
+msgid "Registration successful."
+msgstr "Registrace byla úspěšná."
+
+#: mod/register.php:115
+msgid "Your registration can not be processed."
+msgstr "Vaši registraci nelze zpracovat."
+
+#: mod/register.php:162
+msgid "Your registration is pending approval by the site owner."
+msgstr "Vaše registrace čeká na schválení vlastníkem serveru."
+
+#: 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 "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to  zítra znovu."
+
+#: mod/register.php:220
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr "Tento formulář můžete (volitelně) vyplnit s pomocí OpenID tím, že vyplníte své OpenID a kliknutete na tlačítko \"Zaregistrovat\"."
+
+#: 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 "Pokud nepoužíváte OpenID, nechte prosím toto pole prázdné a vyplňte zbylé položky."
+
+#: mod/register.php:222
+msgid "Your OpenID (optional): "
+msgstr "Vaše OpenID (nepovinné): "
+
+#: mod/register.php:234
+msgid "Include your profile in member directory?"
+msgstr "Chcete zahrnout Váš profil v adresáři členů?"
+
+#: mod/register.php:261
+msgid "Note for the admin"
+msgstr "Poznámka pro administrátora"
+
+#: mod/register.php:261
+msgid "Leave a message for the admin, why you want to join this node"
+msgstr "Zanechejte administrátorovi zprávu, proč se k tomuto serveru chcete připojit"
+
+#: mod/register.php:262
+msgid "Membership on this site is by invitation only."
+msgstr "Členství na tomto webu je pouze na pozvání."
+
+#: mod/register.php:263
+msgid "Your invitation code: "
+msgstr "Váš kód pozvánky: "
+
+#: mod/register.php:266 mod/admin.php:1428
+msgid "Registration"
+msgstr "Registrace"
+
+#: mod/register.php:272
+msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
+msgstr "Celé jméno (např. Jan Novák, skutečné či skutečně vypadající):"
+
+#: mod/register.php:273
+msgid ""
+"Your Email Address: (Initial information will be send there, so this has to "
+"be an existing address.)"
+msgstr "Vaše e-mailová adresa: (Budou sem poslány počáteční informace, musí to proto být existující adresa.)"
+
+#: mod/register.php:275
+msgid "Leave empty for an auto generated password."
+msgstr "Ponechte prázdné pro automatické vygenerovaní hesla."
+
+#: 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 "Vyberte si přezdívku pro Váš profil. Musí začínat textovým znakem. Vaše profilová adresa na této stránce bude mít tvar \"<strong>přezdívka@%s</strong>\"."
+
+#: mod/register.php:278
+msgid "Choose a nickname: "
+msgstr "Vyberte přezdívku:"
+
+#: mod/register.php:281 src/Module/Login.php:281 src/Content/Nav.php:128
+msgid "Register"
+msgstr "Registrovat"
+
+#: mod/register.php:287 mod/uimport.php:70
+msgid "Import"
+msgstr "Import"
+
+#: mod/register.php:288
+msgid "Import your profile to this friendica instance"
+msgstr "Importovat Váš profil do této instance 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 "Podmínky používání"
+
+#: mod/register.php:296
+msgid "Note: This node explicitly contains adult content"
+msgstr "Poznámka: Tento server explicitně obsahuje obsah pro dospělé"
+
+#: mod/notifications.php:35
+msgid "Invalid request identifier."
+msgstr "Neplatný identifikátor požadavku."
+
+#: mod/notifications.php:44 mod/notifications.php:183
+#: mod/notifications.php:235 mod/message.php:114
+msgid "Discard"
+msgstr "Odstranit"
+
+#: 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 "Ignorovat"
+
+#: mod/notifications.php:93 src/Content/Nav.php:191
+msgid "Notifications"
+msgstr "Oznámení"
+
+#: mod/notifications.php:101
+msgid "Network Notifications"
+msgstr "Síťová oznámení"
+
+#: mod/notifications.php:106 mod/notify.php:81
+msgid "System Notifications"
+msgstr "Systémová oznámení"
+
+#: mod/notifications.php:111
+msgid "Personal Notifications"
+msgstr "Osobní oznámení"
+
+#: mod/notifications.php:116
+msgid "Home Notifications"
+msgstr "Oznámení na domovské stránce"
+
+#: mod/notifications.php:148
+msgid "Show Ignored Requests"
+msgstr "Zobrazit ignorované žádosti"
+
+#: mod/notifications.php:148
+msgid "Hide Ignored Requests"
+msgstr "Skrýt ignorované žádosti"
+
+#: mod/notifications.php:161 mod/notifications.php:243
+msgid "Notification type:"
+msgstr "Typ oznámení:"
+
+#: mod/notifications.php:164
+msgid "Suggested by:"
+msgstr "Navrhl/a:"
+
+#: mod/notifications.php:176 mod/notifications.php:260 mod/contacts.php:666
+msgid "Hide this contact from others"
+msgstr "Skrýt tento kontakt před ostatními"
+
+#: mod/notifications.php:179 mod/notifications.php:269 mod/admin.php:1904
+msgid "Approve"
+msgstr "Schválit"
+
+#: mod/notifications.php:202
+msgid "Claims to be known to you: "
+msgstr "Vaši údajní známí: "
+
+#: mod/notifications.php:203
+msgid "yes"
+msgstr "ano"
+
+#: mod/notifications.php:203
+msgid "no"
+msgstr "ne"
+
+#: mod/notifications.php:204 mod/notifications.php:209
+msgid "Shall your connection be bidirectional or not?"
+msgstr "Má Vaše spojení být obousměrné, nebo ne?"
+
+#: 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 "Přijetí uživatele %s jako přítele dovolí uživateli %s odebírat Vaše příspěvky a Vy budete také přijímat aktualizace od něj ve Vašem kanále."
+
+#: 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 "Přijetí uživatele %s jako odběratele mu dovolí odebírat Vaše příspěvky, ale nebudete od něj přijímat aktualizace ve Vašem kanále."
+
+#: 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 "Přijetí uživatele %s jako sdílejícího mu dovolí odebírat Vaše příspěvky, ale nebudete od něj přijímat aktualizace ve Vašem kanále."
+
+#: mod/notifications.php:222
+msgid "Friend"
+msgstr "Přítel"
+
+#: mod/notifications.php:223
+msgid "Sharer"
+msgstr "Sdílející"
+
+#: mod/notifications.php:223
+msgid "Subscriber"
+msgstr "Odběratel"
+
+#: mod/notifications.php:257 mod/contacts.php:686 mod/follow.php:177
+#: src/Model/Profile.php:781
+msgid "Tags:"
+msgstr "Štítky:"
+
+#: mod/notifications.php:266 mod/contacts.php:76 src/Model/Profile.php:520
+msgid "Network:"
+msgstr "Síť:"
+
+#: mod/notifications.php:280
+msgid "No introductions."
+msgstr "Žádné představení."
+
+#: mod/notifications.php:318
+msgid "Show unread"
+msgstr "Zobrazit nepřečtené"
+
+#: mod/notifications.php:318
+msgid "Show all"
+msgstr "Zobrazit vše"
+
+#: mod/notifications.php:323
+#, php-format
+msgid "No more %s notifications."
+msgstr "Žádná další %s oznámení"
+
+#: mod/message.php:31 mod/message.php:120 src/Content/Nav.php:199
+msgid "New Message"
+msgstr "Nová zpráva"
+
+#: mod/message.php:78
+msgid "Unable to locate contact information."
+msgstr "Nepodařilo se najít kontaktní informace."
+
+#: mod/message.php:152
+msgid "Do you really want to delete this message?"
+msgstr "Opravdu chcete smazat tuto zprávu?"
+
+#: mod/message.php:169
+msgid "Message deleted."
+msgstr "Zpráva odstraněna."
+
+#: mod/message.php:184
+msgid "Conversation removed."
+msgstr "Konverzace odstraněna."
+
+#: mod/message.php:290
+msgid "No messages."
+msgstr "Žádné zprávy."
+
+#: mod/message.php:331
+msgid "Message not available."
+msgstr "Zpráva není k dispozici."
+
+#: mod/message.php:395
+msgid "Delete message"
+msgstr "Smazat zprávu"
+
+#: 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 "Odstranit konverzaci"
+
+#: mod/message.php:414
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Není k dispozici zabezpečená komunikace. <strong>Možná</strong> budete schopni reagovat z odesilatelovy profilové stránky."
+
+#: mod/message.php:418
+msgid "Send Reply"
+msgstr "Poslat odpověď"
+
+#: mod/message.php:469
+#, php-format
+msgid "Unknown sender - %s"
+msgstr "Neznámý odesilatel - %s"
+
+#: mod/message.php:471
+#, php-format
+msgid "You and %s"
+msgstr "Vy a %s"
+
+#: mod/message.php:473
+#, php-format
+msgid "%s and You"
+msgstr "%s a Vy"
+
+#: mod/message.php:501
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d zpráva"
+msgstr[1] "%d zprávy"
+msgstr[2] "%d zprávy"
+msgstr[3] "%d zpráv"
+
+#: mod/hcard.php:19
+msgid "No profile"
+msgstr "Žádný profil"
+
+#: mod/ostatus_subscribe.php:22
+msgid "Subscribing to OStatus contacts"
+msgstr "Registruji Vás ke kontaktům OStatus"
+
+#: mod/ostatus_subscribe.php:34
+msgid "No contact provided."
+msgstr "Nebyl poskytnut žádný kontakt."
+
+#: mod/ostatus_subscribe.php:41
+msgid "Couldn't fetch information for contact."
+msgstr "Nelze načíst informace pro kontakt."
+
+#: mod/ostatus_subscribe.php:51
+msgid "Couldn't fetch friends for contact."
+msgstr "Nelze načíst přátele pro kontakt."
+
+#: mod/ostatus_subscribe.php:79
+msgid "success"
+msgstr "úspěch"
+
+#: mod/ostatus_subscribe.php:81
+msgid "failed"
+msgstr "selhalo"
+
+#: mod/ostatus_subscribe.php:84 src/Object/Post.php:264
+msgid "ignored"
+msgstr "ignorován"
+
+#: mod/dfrn_poll.php:126 mod/dfrn_poll.php:549
+#, php-format
+msgid "%1$s welcomes %2$s"
+msgstr "%1$s vítá uživatele %2$s"
+
+#: mod/removeme.php:47
+msgid "User deleted their account"
+msgstr "Uživatel si smazal účet"
+
+#: 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 "Uživatel na vašem serveru Friendica smazal svůj účet. Prosím ujistěte se, ře jsou jeho data odstraněna ze záloh dat."
+
+#: mod/removeme.php:49
+#, php-format
+msgid "The user id is %d"
+msgstr "Uživatelské ID je %d"
+
+#: mod/removeme.php:81 mod/removeme.php:84
+msgid "Remove My Account"
+msgstr "Odstranit můj účet"
+
+#: mod/removeme.php:82
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr "Tímto bude kompletně odstraněn váš účet. Jakmile bude účet odstraněn, nebude už možné ho obnovit."
+
+#: mod/removeme.php:83
+msgid "Please enter your password for verification:"
+msgstr "Prosím, zadejte své heslo pro ověření:"
+
+#: mod/tagrm.php:43
+msgid "Tag removed"
+msgstr "Štítek odstraněn"
+
+#: mod/tagrm.php:77
+msgid "Remove Item Tag"
+msgstr "Odebrat štítek položky"
+
+#: mod/tagrm.php:79
+msgid "Select a tag to remove: "
+msgstr "Vyberte štítek k odebrání: "
+
+#: mod/home.php:39
+#, php-format
+msgid "Welcome to %s"
+msgstr "Vítejte na %s"
+
+#: mod/suggest.php:38
+msgid "Do you really want to delete this suggestion?"
+msgstr "Opravdu chcete smazat tento návrh?"
+
+#: mod/suggest.php:74
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Nejsou dostupné žádné návrhy. Pokud je toto nový server, zkuste to znovu za 24 hodin."
+
+#: mod/suggest.php:87 mod/suggest.php:107
+msgid "Ignore/Hide"
+msgstr "Ignorovat/skrýt"
+
+#: mod/filer.php:34
+msgid "- select -"
+msgstr "- vyberte -"
+
+#: 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 "Tohle je Friendica, verze %s, běžící na webové adrese %s. Verze databáze je %s, verze post update je %s."
+
+#: mod/friendica.php:84
+msgid ""
+"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
+"about the Friendica project."
+msgstr "Pro více informací o projektu Friendica, prosím, navštivte stránku <a href=\"https://friendi.ca\">Friendi.ca</a>"
+
+#: 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:75
+#: mod/friendica.php:88
 msgid "the bugtracker at github"
-msgstr ""
+msgstr "sledování chyb na GitHubu"
 
-#: mod/friendica.php:76
+#: mod/friendica.php:91
+msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
+msgstr "Návrhy, pochvaly atd., prosím, posílejte na adresu \"info\" zavináč \"friendi\"-tečka-\"ca\""
+
+#: mod/friendica.php:105
+msgid "Installed addons/apps:"
+msgstr "Nainstalované doplňky/aplikace:"
+
+#: mod/friendica.php:119
+msgid "No installed addons/apps"
+msgstr "Žádne nainstalované doplňky/aplikace"
+
+#: mod/friendica.php:124
+#, php-format
+msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
+msgstr "Přečtěte si o <a href=\"%1$s/tos\">Podmínkách používání</a> tohoto serveru."
+
+#: mod/friendica.php:129
+msgid "On this server the following remote servers are blocked."
+msgstr "Na tomto serveru jsou zablokovány následující vzdálené servery."
+
+#: 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 "Zablokovaná doména"
+
+#: mod/friendica.php:130 mod/admin.php:364 mod/admin.php:382
+msgid "Reason for the block"
+msgstr "Důvody pro zablokování"
+
+#: mod/display.php:303 mod/cal.php:144 mod/profile.php:175
+msgid "Access to this profile has been restricted."
+msgstr "Přístup na tento profil byl omezen."
+
+#: 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 "Neplatný požadavek."
+
+#: 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 "Velikost obrázku překročila limit %s"
+
+#: mod/wall_upload.php:209 mod/profile_photo.php:160 mod/photos.php:831
+msgid "Unable to process image."
+msgstr "Obrázek není možné zprocesovat"
+
+#: 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 "Fotky na zdi"
+
+#: mod/wall_upload.php:248 mod/profile_photo.php:305 mod/photos.php:860
+msgid "Image upload failed."
+msgstr "Nahrání obrázku selhalo."
+
+#: mod/newmember.php:11
+msgid "Welcome to Friendica"
+msgstr "Vítejte na Friendica"
+
+#: mod/newmember.php:12
+msgid "New Member Checklist"
+msgstr "Seznam doporučení pro nového člena"
+
+#: mod/newmember.php:14
 msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
-"dot com"
-msgstr "Návrhy, chválu, dary, apod. - prosím piště na \"info\" na Friendica - tečka com"
+"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 "Rádi bychom Vám nabídli několik tipů a odkazů, abychom Vám zpříjemnili zážitek. Kliknutím na jakoukoliv položku zobrazíte relevantní stránku. Odkaz na tuto stránku bude viditelný z Vaší domovské stránky po dobu dvou týdnů od Vaší první registrace a poté tiše zmizí."
 
-#: mod/friendica.php:90
-msgid "Installed plugins/addons/apps:"
-msgstr "Instalované pluginy/doplňky/aplikace:"
+#: mod/newmember.php:15
+msgid "Getting Started"
+msgstr "Začínáme"
 
-#: mod/friendica.php:103
-msgid "No installed plugins/addons/apps"
-msgstr "Nejsou žádné nainstalované doplňky/aplikace"
+#: mod/newmember.php:17
+msgid "Friendica Walk-Through"
+msgstr "Prohlídka Friendica "
 
-#: mod/lostpass.php:19
+#: 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 "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."
+
+#: mod/newmember.php:21
+msgid "Go to Your Settings"
+msgstr "Navštivte své nastavení"
+
+#: 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 "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 ""
+"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 "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."
+
+#: mod/newmember.php:26 mod/profile_photo.php:246 mod/profiles.php:598
+msgid "Upload Profile Photo"
+msgstr "Nahrát profilovou fotku"
+
+#: 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 "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í."
+
+#: mod/newmember.php:27
+msgid "Edit Your Profile"
+msgstr "Upravte si svůj profil"
+
+#: 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 "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."
+
+#: mod/newmember.php:28
+msgid "Profile Keywords"
+msgstr "Profilová klíčová slova"
+
+#: 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 "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í."
+
+#: mod/newmember.php:30
+msgid "Connecting"
+msgstr "Připojuji se"
+
+#: mod/newmember.php:36
+msgid "Importing Emails"
+msgstr "Importuji e-maily"
+
+#: 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 "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"
+
+#: mod/newmember.php:39
+msgid "Go to Your Contacts Page"
+msgstr "Navštivte Vaši stránku s kontakty"
+
+#: 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 "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>."
+
+#: mod/newmember.php:40
+msgid "Go to Your Site's Directory"
+msgstr "Navštivte adresář Vaší stránky"
+
+#: 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 "Stránka Adresář Vám pomůže najít další lidi na tomto serveru nebo v jiných propojených serverech. Najděte na jejich stránce odkaz <em>Spojit</em> nebo <em>Sledovat</em>. Uveďte svou vlastní adresu identity, je-li požadována."
+
+#: mod/newmember.php:41
+msgid "Finding New People"
+msgstr "Nalezení nových lidí"
+
+#: 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 "Na bočním panelu stránky s kontakty je několik nástrojů k nalezení nových přátel. Porovnáme lidi dle zájmů, najdeme lidi podle jména nebo zájmu a poskytneme Vám návrhy založené na přátelství v síti přátel. Na zcela novém serveru se návrhy přátelství nabínou obvykle během 24 hodin."
+
+#: mod/newmember.php:43 src/Model/Group.php:402
+msgid "Groups"
+msgstr "Skupiny"
+
+#: mod/newmember.php:45
+msgid "Group Your Contacts"
+msgstr "Seskupte si své kontakty"
+
+#: 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 "Jakmile získáte nějaké přátele, uspořádejte si je do soukromých konverzačních skupin na postranním panelu Vaší stránky Kontakty a pak můžete komunikovat s každou touto skupinu soukromě prostřednictvím stránky Síť."
+
+#: mod/newmember.php:48
+msgid "Why Aren't My Posts Public?"
+msgstr "Proč nejsou mé příspěvky veřejné?"
+
+#: 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 respektuje Vaše soukromí. Ve výchozím stavu jsou Vaše příspěvky viditelné pouze lidem, které označíte jako Vaše přátelé. Více informací naleznete v nápovědě na výše uvedeném odkazu"
+
+#: mod/newmember.php:52
+msgid "Getting Help"
+msgstr "Získání nápovědy"
+
+#: mod/newmember.php:54
+msgid "Go to the Help Section"
+msgstr "Navštivte sekci nápovědy"
+
+#: mod/newmember.php:54
+msgid ""
+"Our <strong>help</strong> pages may be consulted for detail on other program"
+" features and resources."
+msgstr "Na stránkách <strong>Nápověda</strong> naleznete nejen další podrobnosti o všech funkcích Friendika ale také další zdroje informací."
+
+#: mod/lostpass.php:28
 msgid "No valid account found."
 msgstr "Nenalezen žádný platný účet."
 
-#: mod/lostpass.php:35
+#: mod/lostpass.php:40
 msgid "Password reset request issued. Check your email."
 msgstr "Žádost o obnovení hesla vyřízena. Zkontrolujte Vaši e-mailovou schránku."
 
-#: mod/lostpass.php:42
+#: mod/lostpass.php:46
 #, php-format
 msgid ""
 "\n"
@@ -3208,17 +4074,17 @@ msgid ""
 "\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.\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\tDrahý %1$s,\n\t\t\tNa \"%2$s\" jsme obdrželi  požadavek na obnovu vašeho hesla \n\t\tpassword. Pro potvrzení žádosti prosím klikněte na zaslaný verifikační odkaz níže nebo si ho zkopírujte do adresní řádky prohlížeče.\n\n\t\tPokud jste tuto žádost nezasílaliI prosím na uvedený odkaz neklikejte a tento email smažte.\n\n\t\tVaše heslo nebude změněno dokud nebudeme moci oveřit, že jste autorem této žádosti."
+msgstr "\n\t\tVážený/á %1$s,\n\t\t\tPřed nedávnem jsme obdrželi na \"%2$s\" požadavek o obnovení\n\t\thesla k Vašemu účtu. Pro potvrzení tohoto požadavku, prosím klikněte na odkaz\n\t\tpro ověření dole, nebo ho zkopírujte do adresního řádku Vašeho prohlížeče.\n\n\t\tPokud jste o tuto změnu NEPOŽÁDAL/A, prosím NEKLIKEJTE na tento odkaz\n\t\ta ignorujte a/nebo smažte tento e-mail. Platnost požadavku brzy vyprší.\n\n\t\tVaše heslo nebude změněno, dokud nedokážeme ověřit, že jste tento\n\t\tpožadavek nevydal/a Vy."
 
-#: mod/lostpass.php:53
+#: mod/lostpass.php:57
 #, php-format
 msgid ""
 "\n"
-"\t\tFollow this link to verify your identity:\n"
+"\t\tFollow this link soon to verify your identity:\n"
 "\n"
 "\t\t%1$s\n"
 "\n"
@@ -3229,3825 +4095,1323 @@ msgid ""
 "\n"
 "\t\tSite Location:\t%2$s\n"
 "\t\tLogin Name:\t%3$s"
-msgstr "\n\t\tKlikněte na následující odkaz pro potvrzení Vaší identity:\n\n\t\t%1$s\n\n\t\tNásledně obdržíte zprávu obsahující nové heslo.\n\t\tHeslo si můžete si změnit na stránce nastavení účtu poté, co se přihlásíte.\n\n\t\tVaše přihlašovací údaje jsou následující:\n\n\t\tUmístění webu:\t%2$s\n\t\tPřihlašovací jméno:\t%3$s"
+msgstr "\n\t\tKlikněte na tento odkaz brzy pro ověření vaší identity:\n\n\t\t%1$s\n\n\t\tObdržíte poté následnou zprávu obsahující nové heslo.\n\t\tPo přihlášení můžete toto heslo změnit na stránce nastavení Vašeho účtu.\n\n\t\tZde jsou vaše přihlašovací detaily:\n\n\t\tAdresa stránky:\t\t%2$s\n\t\tPřihlašovací jméno:\t%3$s"
 
-#: mod/lostpass.php:72
+#: mod/lostpass.php:76
 #, php-format
 msgid "Password reset requested at %s"
-msgstr "Na %s bylo zažádáno o resetování hesla"
+msgstr "Na %s bylo zažádáno o obnovení hesla"
 
 #: mod/lostpass.php:92
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
-msgstr "Žádost nemohla být ověřena. (Možná jste ji odeslali již dříve.) Obnovení hesla se nezdařilo."
+msgstr "Žádost nemohla být ověřena. (Možná jste ji odeslal/a již dříve.) Obnovení hesla se nezdařilo."
 
-#: mod/lostpass.php:109 boot.php:1807
+#: mod/lostpass.php:105
+msgid "Request has expired, please make a new one."
+msgstr "Platnost požadavku vypršela, prosím vytvořte nový."
+
+#: mod/lostpass.php:120
+msgid "Forgot your Password?"
+msgstr "Zapomněl/a jste heslo?"
+
+#: mod/lostpass.php:121
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Zadejte svůj e-mailovou adresu a odešlete pro obnovení Vašeho hesla. Poté zkontrolujte svůj e-mail pro další instrukce."
+
+#: mod/lostpass.php:122 src/Module/Login.php:312
+msgid "Nickname or Email: "
+msgstr "Přezdívka nebo e-mail: "
+
+#: mod/lostpass.php:123
+msgid "Reset"
+msgstr "Obnovit"
+
+#: mod/lostpass.php:139 src/Module/Login.php:324
 msgid "Password Reset"
-msgstr "Obnovení hesla"
+msgstr "Obnovit heslo"
 
-#: mod/lostpass.php:110
+#: mod/lostpass.php:140
 msgid "Your password has been reset as requested."
-msgstr "Vaše heslo bylo na Vaše přání resetováno."
+msgstr "Vaše heslo bylo na Vaše přání obnoveno."
 
-#: mod/lostpass.php:111
+#: mod/lostpass.php:141
 msgid "Your new password is"
 msgstr "Někdo Vám napsal na Vaši profilovou stránku"
 
-#: mod/lostpass.php:112
+#: mod/lostpass.php:142
 msgid "Save or copy your new password - and then"
 msgstr "Uložte si nebo zkopírujte nové heslo - a pak"
 
-#: mod/lostpass.php:113
+#: mod/lostpass.php:143
 msgid "click here to login"
 msgstr "klikněte zde pro přihlášení"
 
-#: mod/lostpass.php:114
+#: mod/lostpass.php:144
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "Nezdá se, že by to bylo Vaše celé jméno (křestní jméno a příjmení)."
 
-#: mod/lostpass.php:125
+#: mod/lostpass.php:152
 #, php-format
 msgid ""
 "\n"
-"\t\t\t\tDear %1$s,\n"
-"\t\t\t\t\tYour password has been changed as requested. Please retain this\n"
-"\t\t\t\tinformation for your records (or change your password immediately to\n"
-"\t\t\t\tsomething that you will remember).\n"
-"\t\t\t"
-msgstr "\n\t\t\t\tDrahý %1$s,\n⇥⇥⇥⇥⇥Vaše heslo bylo na požádání změněno. Prosím uchovejte si tuto informaci (nebo si změntě heslo ihned na něco, co si budete pamatovat).\t"
+"\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\tVážený/á %1$s,\n\t\t\t\tVaše heslo bylo změněno, jak jste požádal/a. Prosím uchovejte\n\t\t\ttyto informace pro vaše záznamy (nebo si ihned změňte heslo na něco,\n\t\t\tco si zapamatujete).\n\t\t"
 
-#: mod/lostpass.php:131
+#: mod/lostpass.php:158
 #, php-format
 msgid ""
 "\n"
-"\t\t\t\tYour login details are as follows:\n"
+"\t\t\tYour login details are as follows:\n"
 "\n"
-"\t\t\t\tSite Location:\t%1$s\n"
-"\t\t\t\tLogin Name:\t%2$s\n"
-"\t\t\t\tPassword:\t%3$s\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\t\tYou may change that password from your account settings page after logging in.\n"
-"\t\t\t"
-msgstr "\n\t\t\t\tVaše přihlašovací údaje jsou následující:\n\n\t\t\t\tUmístění webu:\t%1$s\n\t\t\t\tPřihlašovací jméno:\t%2$s\n\t\t\t\tHeslo:\t%3$s\n\n\t\t\t\tHeslo si můžete si změnit na stránce  nastavení účtu poté, co se přihlásíte.\n\t\t\t"
+"\t\t\tYou may change that password from your account settings page after logging in.\n"
+"\t\t"
+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\tToto heslo si po přihlášení můžete změnit na stránce nastavení Vašeho účtu.\n\t\t"
 
-#: mod/lostpass.php:147
+#: mod/lostpass.php:174
 #, php-format
 msgid "Your password has been changed at %s"
 msgstr "Vaše heslo bylo změněno na %s"
 
-#: mod/lostpass.php:159
-msgid "Forgot your Password?"
-msgstr "Zapomněli jste heslo?"
+#: mod/babel.php:22
+msgid "Source input"
+msgstr "Zdrojový vstup"
 
-#: mod/lostpass.php:160
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Zadejte svůj e-mailovou adresu a odešlete žádost o zaslání Vašeho nového hesla. Poté zkontrolujte svůj e-mail pro další instrukce."
+#: mod/babel.php:28
+msgid "BBCode::toPlaintext"
+msgstr "BBCode::toPlaintext"
 
-#: mod/lostpass.php:161 boot.php:1795
-msgid "Nickname or Email: "
-msgstr "Přezdívka nebo e-mail: "
-
-#: mod/lostpass.php:162
-msgid "Reset"
-msgstr "Reset"
-
-#: mod/hcard.php:10
-msgid "No profile"
-msgstr "Žádný profil"
-
-#: mod/help.php:41
-msgid "Help:"
-msgstr "Nápověda:"
-
-#: mod/help.php:53 mod/p.php:16 mod/p.php:43 mod/p.php:52 mod/fetch.php:12
-#: mod/fetch.php:39 mod/fetch.php:48 index.php:288
-msgid "Not Found"
-msgstr "Nenalezen"
-
-#: mod/help.php:56 index.php:291
-msgid "Page not found."
-msgstr "Stránka nenalezena"
-
-#: mod/lockview.php:31 mod/lockview.php:39
-msgid "Remote privacy information not available."
-msgstr "Vzdálené soukromé informace nejsou k dispozici."
-
-#: mod/lockview.php:48
-msgid "Visible to:"
-msgstr "Viditelné pro:"
-
-#: mod/openid.php:24
-msgid "OpenID protocol error. No ID returned."
-msgstr "Chyba OpenID protokolu. Navrátilo se žádné ID."
-
-#: mod/openid.php:60
-msgid ""
-"Account not found and OpenID registration is not permitted on this site."
-msgstr "Nenalezen účet a OpenID registrace na tomto serveru není dovolena."
-
-#: mod/uimport.php:50 mod/register.php:198
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to  zítra znovu."
-
-#: mod/uimport.php:64 mod/register.php:295
-msgid "Import"
-msgstr "Import"
-
-#: mod/uimport.php:66
-msgid "Move account"
-msgstr "Přesunout účet"
-
-#: mod/uimport.php:67
-msgid "You can import an account from another Friendica server."
-msgstr "Můžete importovat účet z jiného Friendica serveru."
-
-#: mod/uimport.php:68
-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."
-
-#: mod/uimport.php:69
-msgid ""
-"This feature is experimental. We can't import contacts from the OStatus "
-"network (GNU Social/Statusnet) or from Diaspora"
-msgstr ""
-
-#: mod/uimport.php:70
-msgid "Account file"
-msgstr "Soubor s účtem"
-
-#: mod/uimport.php:70
-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\""
-
-#: mod/nogroup.php:41 mod/contacts.php:586 mod/contacts.php:930
-#: mod/viewcontacts.php:97
-#, php-format
-msgid "Visit %s's profile [%s]"
-msgstr "Navštivte profil uživatele %s [%s]"
-
-#: mod/nogroup.php:42 mod/contacts.php:931
-msgid "Edit contact"
-msgstr "Editovat kontakt"
-
-#: mod/nogroup.php:63
-msgid "Contacts who are not members of a group"
-msgstr "Kontakty, které nejsou členy skupiny"
-
-#: mod/uexport.php:29
-msgid "Export account"
-msgstr "Exportovat účet"
-
-#: mod/uexport.php:29
-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 "Exportujte svůj účet a své kontakty. Použijte tuto funkci pro vytvoření  zálohy svého účtu a/nebo k přesunu na jiný server."
-
-#: mod/uexport.php:30
-msgid "Export all"
-msgstr "Exportovat vše"
-
-#: mod/uexport.php:30
-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 "Exportujte své informace k účtu, kontakty a vše své položky jako json. To může být velmi velký soubor a může to zabrat spoustu času. Tuto funkci použijte pro úplnou zálohu svého účtu(fotografie se neexportují)"
-
-#: mod/uexport.php:37 mod/settings.php:95
-msgid "Export personal data"
-msgstr "Export osobních údajů"
-
-#: mod/invite.php:27
-msgid "Total invitation limit exceeded."
-msgstr "Celkový limit pozvánek byl překročen"
-
-#: mod/invite.php:49
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : není platná e-mailová adresa."
-
-#: mod/invite.php:73
-msgid "Please join us on Friendica"
-msgstr "Prosím přidejte se k nám na Friendice"
-
-#: mod/invite.php:84
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Limit pozvánek byl překročen. Prosím kontaktujte vašeho administrátora webu."
-
-#: mod/invite.php:89
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Doručení zprávy se nezdařilo."
-
-#: mod/invite.php:93
-#, php-format
-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ávy odeslány."
-
-#: mod/invite.php:112
-msgid "You have no more invitations available"
-msgstr "Nemáte k dispozici žádné další pozvánky"
-
-#: mod/invite.php:120
-#, 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 "Navštivte %s pro seznam veřejných serverů, na kterých se můžete přidat. Členové Friendica se mohou navzájem propojovat, stejně tak jako se mohou přiopojit se členy mnoha dalších sociálních sítí."
-
-#: mod/invite.php:122
-#, php-format
-msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
-msgstr "K akceptaci této pozvánky prosím navštivte a registrujte se na %s nebo na kterékoliv jiném veřejném Friendica serveru."
-
-#: mod/invite.php:123
-#, 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 servery jsou všechny propojené a vytváří tak rozsáhlou sociální síť s důrazem na soukromý a je pod kontrolou svých členů. Členové se mohou propojovat s mnoha dalšími tradičními sociálními sítěmi. Navštivte %s pro seznam alternativních Friendica serverů kde se můžete přidat."
-
-#: mod/invite.php:126
-msgid ""
-"Our apologies. This system is not currently configured to connect with other"
-" public sites or invite members."
-msgstr "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."
-
-#: mod/invite.php:132
-msgid "Send invitations"
-msgstr "Poslat pozvánky"
-
-#: mod/invite.php:133
-msgid "Enter email addresses, one per line:"
-msgstr "Zadejte e-mailové adresy, jednu na řádek:"
-
-#: mod/invite.php:134 mod/wallmessage.php:151 mod/message.php:351
-#: mod/message.php:541
-msgid "Your message:"
-msgstr "Vaše zpráva:"
-
-#: mod/invite.php:135
-msgid ""
-"You are cordially invited to join me and other close friends on Friendica - "
-"and help us to create a better social web."
-msgstr "Jste srdečně pozván se připojit ke mně a k mým blízkým přátelům na Friendica - a pomoci nám vytvořit lepší sociální síť."
-
-#: mod/invite.php:137
-msgid "You will need to supply this invitation code: $invite_code"
-msgstr "Budete muset zadat kód této pozvánky: $invite_code"
-
-#: mod/invite.php:137
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
-msgstr "Jakmile se zaregistrujete, prosím spojte se se mnou přes mou profilovu stránku na:"
-
-#: mod/invite.php:139
-msgid ""
-"For more information about the Friendica project and why we feel it is "
-"important, please visit http://friendica.com"
-msgstr "Pro více informací o Friendica projektu a o tom, proč je tak důležitý, prosím navštivte http://friendica.com"
-
-#: mod/invite.php:140 mod/localtime.php:45 mod/message.php:357
-#: mod/message.php:547 mod/manage.php:143 mod/crepair.php:154
-#: mod/content.php:728 mod/fsuggest.php:107 mod/mood.php:137 mod/poke.php:199
-#: mod/profiles.php:688 mod/events.php:506 mod/photos.php:1104
-#: mod/photos.php:1226 mod/photos.php:1539 mod/photos.php:1590
-#: mod/photos.php:1638 mod/photos.php:1724 mod/contacts.php:577
-#: mod/install.php:272 mod/install.php:312 object/Item.php:720
-#: view/theme/frio/config.php:59 view/theme/quattro/config.php:64
-#: view/theme/vier/config.php:107 view/theme/duepuntozero/config.php:59
-msgid "Submit"
-msgstr "Odeslat"
-
-#: mod/fbrowser.php:133
-msgid "Files"
-msgstr "Soubory"
-
-#: mod/profperm.php:19 mod/group.php:72 index.php:400
-msgid "Permission denied"
-msgstr "Nedostatečné oprávnění"
-
-#: mod/profperm.php:25 mod/profperm.php:56
-msgid "Invalid profile identifier."
-msgstr "Neplatný identifikátor profilu."
-
-#: mod/profperm.php:102
-msgid "Profile Visibility Editor"
-msgstr "Editor viditelnosti profilu "
-
-#: mod/profperm.php:106 mod/group.php:223
-msgid "Click on a contact to add or remove."
-msgstr "Klikněte na kontakt pro přidání nebo odebrání"
-
-#: mod/profperm.php:115
-msgid "Visible To"
-msgstr "Viditelný pro"
-
-#: mod/profperm.php:131
-msgid "All Contacts (with secure profile access)"
-msgstr "Všechny kontakty (se zabezpečeným přístupovým profilem )"
-
-#: mod/tagrm.php:41
-msgid "Tag removed"
-msgstr "Štítek odstraněn"
-
-#: mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr "Odebrat štítek položky"
-
-#: mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr "Vyberte štítek k odebrání: "
-
-#: mod/tagrm.php:93 mod/delegate.php:139
-msgid "Remove"
-msgstr "Odstranit"
-
-#: mod/repair_ostatus.php:14
-msgid "Resubscribing to OStatus contacts"
-msgstr ""
-
-#: mod/repair_ostatus.php:30
-msgid "Error"
-msgstr ""
-
-#: mod/repair_ostatus.php:44 mod/ostatus_subscribe.php:51
-msgid "Done"
-msgstr ""
-
-#: mod/repair_ostatus.php:50 mod/ostatus_subscribe.php:73
-msgid "Keep this window open until done."
-msgstr ""
-
-#: mod/delegate.php:101
-msgid "No potential page delegates located."
-msgstr "Žádní potenciální delegáti stránky nenalezeni."
-
-#: mod/delegate.php:132
-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 "Delegáti jsou schopni řídit všechny aspekty tohoto účtu / stránky, kromě základních nastavení účtu. Prosím, nepředávejte svůj osobní účet nikomu, komu úplně nevěříte.."
-
-#: mod/delegate.php:133
-msgid "Existing Page Managers"
-msgstr "Stávající správci stránky"
-
-#: mod/delegate.php:135
-msgid "Existing Page Delegates"
-msgstr "Stávající delegáti stránky "
-
-#: mod/delegate.php:137
-msgid "Potential Delegates"
-msgstr "Potenciální delegáti"
-
-#: mod/delegate.php:140
-msgid "Add"
-msgstr "Přidat"
-
-#: mod/delegate.php:141
-msgid "No entries."
-msgstr "Žádné záznamy."
-
-#: mod/credits.php:16
-msgid "Credits"
-msgstr ""
-
-#: mod/credits.php:17
-msgid ""
-"Friendica is a community project, that would not be possible without the "
-"help of many people. Here is a list of those who have contributed to the "
-"code or the translation of Friendica. Thank you all!"
-msgstr ""
-
-#: mod/filer.php:30
-msgid "- select -"
-msgstr "- vyber -"
-
-#: mod/subthread.php:103
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s následuje %3$s uživatele %2$s"
-
-#: mod/attach.php:8
-msgid "Item not available."
-msgstr "Položka není k dispozici."
-
-#: mod/attach.php:20
-msgid "Item was not found."
-msgstr "Položka nebyla nalezena."
-
-#: mod/apps.php:7 index.php:244
-msgid "You must be logged in to use addons. "
-msgstr "Musíte být přihlášeni pro použití rozšíření."
-
-#: mod/apps.php:11
-msgid "Applications"
-msgstr "Aplikace"
-
-#: mod/apps.php:14
-msgid "No installed applications."
-msgstr "Žádné nainstalované aplikace."
-
-#: mod/p.php:9
-msgid "Not Extended"
-msgstr "Nerozšířeně"
-
-#: mod/newmember.php:6
-msgid "Welcome to Friendica"
-msgstr "Vítejte na Friendica"
-
-#: mod/newmember.php:8
-msgid "New Member Checklist"
-msgstr "Seznam doporučení pro nového člena"
-
-#: mod/newmember.php:12
-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 "Rádi bychom vám nabídli několik tipů a odkazů pro začátek. Klikněte na jakoukoliv položku pro zobrazení relevantní stránky. Odkaz na tuto stránku bude viditelný z Vaší domovské stránky po dobu dvou týdnů od Vaší první registrace."
-
-#: mod/newmember.php:14
-msgid "Getting Started"
-msgstr "Začínáme"
-
-#: mod/newmember.php:18
-msgid "Friendica Walk-Through"
-msgstr "Prohlídka Friendica "
-
-#: mod/newmember.php:18
-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 "Na Vaší stránce <em>Rychlý Start</em> - naleznete stručné představení k Vašemu profilu a záložce Síť, k vytvoření spojení s novými kontakty a nalezení skupin, ke kterým se můžete připojit."
-
-#: mod/newmember.php:26
-msgid "Go to Your Settings"
-msgstr "Navštivte své nastavení"
-
-#: mod/newmember.php:26
-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.\nVě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é sociální síti."
-
-#: mod/newmember.php:28
-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 "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 potenciální přátelé věděli, jak vás přesně najít."
-
-#: mod/newmember.php:36 mod/profile_photo.php:250 mod/profiles.php:707
-msgid "Upload Profile Photo"
-msgstr "Nahrát profilovou fotografii"
-
-#: mod/newmember.php:36
-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 "Nahrajte si svou profilovou fotku, pokud jste tak již neučinili. Studie ukázaly, že lidé se skutečnými fotografiemi mají desetkrát častěji přátele než lidé, kteří nemají."
-
-#: mod/newmember.php:38
-msgid "Edit Your Profile"
-msgstr "Editujte Váš profil"
-
-#: mod/newmember.php:38
-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 "Upravit <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."
-
-#: mod/newmember.php:40
-msgid "Profile Keywords"
-msgstr "Profilová klíčová slova"
-
-#: mod/newmember.php:40
-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 "Nastavte si nějaká veřejné klíčová slova pro výchozí profil, která popisují Vaše zájmy. Friendika Vám může nalézt další lidi s podobnými zájmy a navrhnout přátelství."
-
-#: mod/newmember.php:44
-msgid "Connecting"
-msgstr "Probíhá pokus o připojení"
-
-#: mod/newmember.php:51
-msgid "Importing Emails"
-msgstr "Importování emaiů"
-
-#: mod/newmember.php:51
-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 "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"
-
-#: mod/newmember.php:53
-msgid "Go to Your Contacts Page"
-msgstr "Navštivte Vaši stránku s kontakty"
-
-#: mod/newmember.php:53
-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 "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>."
-
-#: mod/newmember.php:55
-msgid "Go to Your Site's Directory"
-msgstr "Navštivte lokální adresář Friendica"
-
-#: mod/newmember.php:55
-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 "Stránka Adresář Vám pomůže najít další lidi na tomto serveru nebo v jiných propojených serverech. Prostřednictvím odkazů <em>Připojení</em> nebo <em>Následovat</em> si prohlédněte jejich profilovou stránku. Uveďte svou vlastní adresu identity, je-li požadována."
-
-#: mod/newmember.php:57
-msgid "Finding New People"
-msgstr "Nalezení nových lidí"
-
-#: mod/newmember.php:57
-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 "Na bočním panelu stránky s kontakty je několik nástrojů k nalezení nových přátel. Porovnáme lidi dle zájmů, najdeme lidi podle jména nebo zájmu a poskytneme Vám návrhy založené na přátelství v síti přátel. Na zcela novém serveru se návrhy přátelství nabínou obvykle během 24 hodin."
-
-#: mod/newmember.php:65
-msgid "Group Your Contacts"
-msgstr "Seskupte si své kontakty"
-
-#: mod/newmember.php:65
-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 "Jakmile získáte nějaké přátele, uspořádejte si je do soukromých konverzačních skupin na postranním panelu Vaší stránky Kontakty a pak můžete komunikovat s každou touto skupinu soukromě prostřednictvím stránky Síť."
-
-#: mod/newmember.php:68
-msgid "Why Aren't My Posts Public?"
-msgstr "Proč nejsou mé příspěvky veřejné?"
-
-#: mod/newmember.php:68
-msgid ""
-"Friendica respects your privacy. By default, your posts will only show up to"
-" people you've added as friends. For more information, see the help section "
-"from the link above."
-msgstr "Friendica respektuje Vaše soukromí. Defaultně  jsou Vaše příspěvky viditelné pouze lidem, které označíte jako Vaše přátelé. Více informací naleznete v nápovědě na výše uvedeném odkazu"
-
-#: mod/newmember.php:73
-msgid "Getting Help"
-msgstr "Získání nápovědy"
-
-#: mod/newmember.php:77
-msgid "Go to the Help Section"
-msgstr "Navštivte sekci nápovědy"
-
-#: mod/newmember.php:77
-msgid ""
-"Our <strong>help</strong> pages may be consulted for detail on other program"
-" features and resources."
-msgstr "Na stránkách <strong>Nápověda</strong> naleznete nejen další podrobnosti o všech funkcích Friendika ale také další zdroje informací."
-
-#: mod/removeme.php:46 mod/removeme.php:49
-msgid "Remove My Account"
-msgstr "Odstranit můj účet"
-
-#: mod/removeme.php:47
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr "Tímto bude kompletně odstraněn váš účet. Jakmile bude účet odstraněn, nebude už možné ho obnovit."
-
-#: mod/removeme.php:48
-msgid "Please enter your password for verification:"
-msgstr "Prosím, zadejte své heslo pro ověření:"
-
-#: mod/editpost.php:17 mod/editpost.php:27
-msgid "Item not found"
-msgstr "Položka nenalezena"
-
-#: mod/editpost.php:40
-msgid "Edit post"
-msgstr "Upravit příspěvek"
-
-#: mod/localtime.php:24
-msgid "Time Conversion"
-msgstr "Časová konverze"
-
-#: mod/localtime.php:26
-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"
-
-#: mod/localtime.php:30
-#, php-format
-msgid "UTC time: %s"
-msgstr "UTC čas: %s"
-
-#: mod/localtime.php:33
-#, php-format
-msgid "Current timezone: %s"
-msgstr "Aktuální časové pásmo: %s"
-
-#: mod/localtime.php:36
-#, php-format
-msgid "Converted localtime: %s"
-msgstr "Převedený lokální čas : %s"
-
-#: mod/localtime.php:41
-msgid "Please select your timezone:"
-msgstr "Prosím, vyberte své časové pásmo:"
-
-#: mod/bookmarklet.php:41
-msgid "The post was created"
-msgstr "Příspěvek byl vytvořen"
-
-#: mod/group.php:29
-msgid "Group created."
-msgstr "Skupina vytvořena."
-
-#: mod/group.php:35
-msgid "Could not create group."
-msgstr "Nelze vytvořit skupinu."
-
-#: mod/group.php:47 mod/group.php:140
-msgid "Group not found."
-msgstr "Skupina nenalezena."
-
-#: mod/group.php:60
-msgid "Group name changed."
-msgstr "Název skupiny byl změněn."
-
-#: mod/group.php:87
-msgid "Save Group"
-msgstr "Uložit Skupinu"
-
-#: mod/group.php:93
-msgid "Create a group of contacts/friends."
-msgstr "Vytvořit skupinu kontaktů / přátel."
-
-#: mod/group.php:113
-msgid "Group removed."
-msgstr "Skupina odstraněna. "
-
-#: mod/group.php:115
-msgid "Unable to remove group."
-msgstr "Nelze odstranit skupinu."
-
-#: mod/group.php:177
-msgid "Group Editor"
-msgstr "Editor skupin"
-
-#: mod/group.php:190
-msgid "Members"
-msgstr "Členové"
-
-#: mod/group.php:192 mod/contacts.php:692
-msgid "All Contacts"
-msgstr "Všechny kontakty"
-
-#: mod/group.php:193 mod/content.php:130 mod/network.php:496
-msgid "Group is empty"
-msgstr "Skupina je prázdná"
-
-#: mod/wallmessage.php:42 mod/wallmessage.php:112
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr "Došlo k překročení maximálního počtu zpráv na zeď během jednoho dne. Zpráva %s nedoručena."
-
-#: mod/wallmessage.php:56 mod/message.php:71
-msgid "No recipient selected."
-msgstr "Nevybrán příjemce."
-
-#: mod/wallmessage.php:59
-msgid "Unable to check your home location."
-msgstr "Nebylo možné zjistit Vaši domácí lokaci."
-
-#: mod/wallmessage.php:62 mod/message.php:78
-msgid "Message could not be sent."
-msgstr "Zprávu se nepodařilo odeslat."
-
-#: mod/wallmessage.php:65 mod/message.php:81
-msgid "Message collection failure."
-msgstr "Sběr zpráv selhal."
-
-#: mod/wallmessage.php:68 mod/message.php:84
-msgid "Message sent."
-msgstr "Zpráva odeslána."
-
-#: mod/wallmessage.php:86 mod/wallmessage.php:95
-msgid "No recipient."
-msgstr "Žádný příjemce."
-
-#: mod/wallmessage.php:142 mod/message.php:341
-msgid "Send Private Message"
-msgstr "Odeslat soukromou zprávu"
-
-#: mod/wallmessage.php:143
-#, 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 "Pokud si přejete, aby uživatel %s mohl odpovědět, ověřte si zda-li máte povoleno na svém serveru zasílání soukromých zpráv od neznámých odesilatelů."
-
-#: mod/wallmessage.php:144 mod/message.php:342 mod/message.php:536
-msgid "To:"
-msgstr "Adresát:"
-
-#: mod/wallmessage.php:145 mod/message.php:347 mod/message.php:538
-msgid "Subject:"
-msgstr "Předmět:"
-
-#: mod/share.php:38
-msgid "link"
-msgstr "odkaz"
-
-#: mod/api.php:76 mod/api.php:102
-msgid "Authorize application connection"
-msgstr "Povolit připojení aplikacím"
-
-#: mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Vraťte se do vaší aplikace a zadejte tento bezpečnostní kód:"
-
-#: mod/api.php:89
-msgid "Please login to continue."
-msgstr "Pro pokračování se prosím přihlaste."
-
-#: mod/api.php:104
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "Chcete umožnit této aplikaci přístup k vašim příspěvkům a kontaktům a/nebo k vytváření Vašich nových příspěvků?"
-
-#: mod/api.php:106 mod/profiles.php:648 mod/profiles.php:652
-#: mod/profiles.php:677 mod/register.php:246 mod/settings.php:1163
-#: mod/settings.php:1169 mod/settings.php:1177 mod/settings.php:1181
-#: mod/settings.php:1186 mod/settings.php:1192 mod/settings.php:1198
-#: mod/settings.php:1204 mod/settings.php:1230 mod/settings.php:1231
-#: mod/settings.php:1232 mod/settings.php:1233 mod/settings.php:1234
-#: mod/dfrn_request.php:862 mod/follow.php:110
-msgid "No"
-msgstr "Ne"
-
-#: mod/babel.php:17
-msgid "Source (bbcode) text:"
-msgstr "Zdrojový text (bbcode):"
-
-#: mod/babel.php:23
-msgid "Source (Diaspora) text to convert to BBcode:"
-msgstr "Zdrojový (Diaspora) text k převedení do BB kódování:"
-
-#: mod/babel.php:31
-msgid "Source input: "
-msgstr "Zdrojový vstup: "
-
-#: mod/babel.php:35
-msgid "bb2html (raw HTML): "
-msgstr "bb2html (raw HTML): "
+#: mod/babel.php:34
+msgid "BBCode::convert (raw HTML)"
+msgstr "BBCode::convert (raw HTML)"
 
 #: mod/babel.php:39
-msgid "bb2html: "
-msgstr "bb2html: "
+msgid "BBCode::convert"
+msgstr "BBCode::convert"
 
-#: mod/babel.php:43
-msgid "bb2html2bb: "
-msgstr "bb2html2bb: "
-
-#: mod/babel.php:47
-msgid "bb2md: "
-msgstr "bb2md: "
+#: mod/babel.php:45
+msgid "BBCode::convert => HTML::toBBCode"
+msgstr "BBCode::convert => HTML::toBBCode"
 
 #: mod/babel.php:51
-msgid "bb2md2html: "
-msgstr "bb2md2html: "
+msgid "BBCode::toMarkdown"
+msgstr "BBCode::toMarkdown"
 
-#: mod/babel.php:55
-msgid "bb2dia2bb: "
-msgstr "bb2dia2bb: "
+#: mod/babel.php:57
+msgid "BBCode::toMarkdown => Markdown::convert"
+msgstr "BBCode::toMarkdown => Markdown::convert"
 
-#: mod/babel.php:59
-msgid "bb2md2html2bb: "
-msgstr "bb2md2html2bb: "
+#: mod/babel.php:63
+msgid "BBCode::toMarkdown => Markdown::toBBCode"
+msgstr "BBCode::toMarkdown => Markdown::toBBCode"
 
 #: mod/babel.php:69
-msgid "Source input (Diaspora format): "
-msgstr "Vstupní data (ve formátu Diaspora): "
+msgid "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
+msgstr "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
 
-#: mod/babel.php:74
-msgid "diaspora2bb: "
-msgstr "diaspora2bb: "
+#: mod/babel.php:76
+msgid "Source input \\x28Diaspora format\\x29"
+msgstr "Zdrojový vstup \\x28Formát Diaspora\\x29"
 
-#: mod/ostatus_subscribe.php:14
-msgid "Subscribing to OStatus contacts"
-msgstr ""
+#: mod/babel.php:82
+msgid "Markdown::toBBCode"
+msgstr "Markdown::toBBCode"
 
-#: mod/ostatus_subscribe.php:25
-msgid "No contact provided."
-msgstr ""
+#: mod/babel.php:89
+msgid "Raw HTML input"
+msgstr "Hrubý HTML vstup"
 
-#: mod/ostatus_subscribe.php:30
-msgid "Couldn't fetch information for contact."
-msgstr ""
+#: mod/babel.php:94
+msgid "HTML Input"
+msgstr "HTML vstup"
 
-#: mod/ostatus_subscribe.php:38
-msgid "Couldn't fetch friends for contact."
-msgstr ""
+#: mod/babel.php:100
+msgid "HTML::toBBCode"
+msgstr "HTML::toBBCode"
 
-#: mod/ostatus_subscribe.php:65
-msgid "success"
-msgstr ""
+#: mod/babel.php:106
+msgid "HTML::toPlaintext"
+msgstr "HTML::toPlaintext"
 
-#: mod/ostatus_subscribe.php:67
-msgid "failed"
-msgstr ""
+#: mod/babel.php:114
+msgid "Source text"
+msgstr "Zdrojový text"
 
-#: mod/ostatus_subscribe.php:69 mod/content.php:792 object/Item.php:245
-msgid "ignored"
-msgstr "ignorován"
+#: mod/babel.php:115
+msgid "BBCode"
+msgstr "BBCode"
 
-#: mod/dfrn_poll.php:104 mod/dfrn_poll.php:537
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr "%1$s vítá %2$s"
+#: mod/babel.php:116
+msgid "Markdown"
+msgstr "Markdown"
 
-#: mod/message.php:75
-msgid "Unable to locate contact information."
-msgstr "Nepodařilo se najít kontaktní informace."
+#: mod/babel.php:117
+msgid "HTML"
+msgstr "HTML"
 
-#: mod/message.php:215
-msgid "Do you really want to delete this message?"
-msgstr "Opravdu chcete smazat tuto zprávu?"
-
-#: mod/message.php:235
-msgid "Message deleted."
-msgstr "Zpráva odstraněna."
-
-#: mod/message.php:266
-msgid "Conversation removed."
-msgstr "Konverzace odstraněna."
-
-#: mod/message.php:383
-msgid "No messages."
-msgstr "Žádné zprávy."
-
-#: mod/message.php:426
-msgid "Message not available."
-msgstr "Zpráva není k dispozici."
-
-#: mod/message.php:503
-msgid "Delete message"
-msgstr "Smazat zprávu"
-
-#: mod/message.php:529 mod/message.php:609
-msgid "Delete conversation"
-msgstr "Odstranit konverzaci"
-
-#: mod/message.php:531
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Není k dispozici zabezpečená komunikace. <strong>Možná</strong> budete schopni reagovat z odesilatelovy profilové stránky."
-
-#: mod/message.php:535
-msgid "Send Reply"
-msgstr "Poslat odpověď"
-
-#: mod/message.php:579
-#, php-format
-msgid "Unknown sender - %s"
-msgstr "Neznámý odesilatel - %s"
-
-#: mod/message.php:581
-#, php-format
-msgid "You and %s"
-msgstr "Vy a %s"
-
-#: mod/message.php:583
-#, php-format
-msgid "%s and You"
-msgstr "%s a Vy"
-
-#: mod/message.php:612
-msgid "D, d M Y - g:i A"
-msgstr "D M R - g:i A"
-
-#: mod/message.php:615
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d zpráva"
-msgstr[1] "%d zprávy"
-msgstr[2] "%d zpráv"
-
-#: mod/manage.php:139
-msgid "Manage Identities and/or Pages"
-msgstr "Správa identit a / nebo stránek"
-
-#: mod/manage.php:140
-msgid ""
-"Toggle between different identities or community/group pages which share "
-"your account details or which you have been granted \"manage\" permissions"
-msgstr "Přepnutí 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."
-
-#: mod/manage.php:141
-msgid "Select an identity to manage: "
-msgstr "Vyberte identitu pro správu: "
-
-#: mod/crepair.php:87
-msgid "Contact settings applied."
-msgstr "Nastavení kontaktu změněno"
-
-#: mod/crepair.php:89
-msgid "Contact update failed."
-msgstr "Aktualizace kontaktu selhala."
-
-#: mod/crepair.php:114 mod/fsuggest.php:20 mod/fsuggest.php:92
-#: mod/dfrn_confirm.php:126
-msgid "Contact not found."
-msgstr "Kontakt nenalezen."
-
-#: mod/crepair.php:120
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
-" information your communications with this contact may stop working."
-msgstr "<strong>Varování: Toto je velmi pokročilé</strong> a pokud zadáte nesprávné informace, Vaše komunikace s tímto kontaktem může přestat fungovat."
-
-#: mod/crepair.php:121
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
-msgstr "Prosím použijte <strong>ihned</strong> v prohlížeči tlačítko \"zpět\" pokud si nejste jistí co dělat na této stránce."
-
-#: mod/crepair.php:134 mod/crepair.php:136
-msgid "No mirroring"
-msgstr "Žádné zrcadlení"
-
-#: mod/crepair.php:134
-msgid "Mirror as forwarded posting"
-msgstr "Zrcadlit pro přeposlané příspěvky"
-
-#: mod/crepair.php:134 mod/crepair.php:136
-msgid "Mirror as my own posting"
-msgstr "Zrcadlit jako mé vlastní příspěvky"
-
-#: mod/crepair.php:150
-msgid "Return to contact editor"
-msgstr "Návrat k editoru kontaktu"
-
-#: mod/crepair.php:152
-msgid "Refetch contact data"
-msgstr "Znovu načíst data kontaktu"
-
-#: mod/crepair.php:156
-msgid "Remote Self"
-msgstr "Remote Self"
-
-#: mod/crepair.php:159
-msgid "Mirror postings from this contact"
-msgstr "Zrcadlení správ od tohoto kontaktu"
-
-#: mod/crepair.php:161
-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 freindica bude přeposílat všechny nové příspěvky od tohoto kontaktu."
-
-#: mod/crepair.php:165 mod/settings.php:680 mod/settings.php:706
-#: mod/admin.php:1396 mod/admin.php:1409 mod/admin.php:1422 mod/admin.php:1438
-msgid "Name"
-msgstr "Jméno"
-
-#: mod/crepair.php:166
-msgid "Account Nickname"
-msgstr "Přezdívka účtu"
-
-#: mod/crepair.php:167
-msgid "@Tagname - overrides Name/Nickname"
-msgstr "@Tagname - upřednostněno před Jménem/Přezdívkou"
-
-#: mod/crepair.php:168
-msgid "Account URL"
-msgstr "URL adresa účtu"
-
-#: mod/crepair.php:169
-msgid "Friend Request URL"
-msgstr "Žádost o přátelství URL"
-
-#: mod/crepair.php:170
-msgid "Friend Confirm URL"
-msgstr "URL adresa potvrzení přátelství"
-
-#: mod/crepair.php:171
-msgid "Notification Endpoint URL"
-msgstr "Notifikační URL adresa"
-
-#: mod/crepair.php:172
-msgid "Poll/Feed URL"
-msgstr "Poll/Feed URL adresa"
-
-#: mod/crepair.php:173
-msgid "New photo from this URL"
-msgstr "Nové foto z této URL adresy"
-
-#: mod/content.php:119 mod/network.php:469
-msgid "No such group"
-msgstr "Žádná taková skupina"
-
-#: mod/content.php:135 mod/network.php:500
-#, php-format
-msgid "Group: %s"
-msgstr "Skupina: %s"
-
-#: mod/content.php:325 object/Item.php:95
-msgid "This entry was edited"
-msgstr "Tento záznam byl editován"
-
-#: mod/content.php:621 object/Item.php:429
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d komentář"
-msgstr[1] "%d komentářů"
-msgstr[2] "%d komentářů"
-
-#: mod/content.php:638 mod/photos.php:1379 object/Item.php:117
-msgid "Private Message"
-msgstr "Soukromá zpráva"
-
-#: mod/content.php:702 mod/photos.php:1567 object/Item.php:263
-msgid "I like this (toggle)"
-msgstr "Líbí se mi to (přepínač)"
-
-#: mod/content.php:702 object/Item.php:263
-msgid "like"
-msgstr "má rád"
-
-#: mod/content.php:703 mod/photos.php:1568 object/Item.php:264
-msgid "I don't like this (toggle)"
-msgstr "Nelíbí se mi to (přepínač)"
-
-#: mod/content.php:703 object/Item.php:264
-msgid "dislike"
-msgstr "nemá rád"
-
-#: mod/content.php:705 object/Item.php:266
-msgid "Share this"
-msgstr "Sdílet toto"
-
-#: mod/content.php:705 object/Item.php:266
-msgid "share"
-msgstr "sdílí"
-
-#: mod/content.php:725 mod/photos.php:1587 mod/photos.php:1635
-#: mod/photos.php:1721 object/Item.php:717
-msgid "This is you"
-msgstr "Nastavte Vaši polohu"
-
-#: mod/content.php:727 mod/content.php:945 mod/photos.php:1589
-#: mod/photos.php:1637 mod/photos.php:1723 object/Item.php:403
-#: object/Item.php:719 boot.php:971
-msgid "Comment"
-msgstr "Okomentovat"
-
-#: mod/content.php:729 object/Item.php:721
-msgid "Bold"
-msgstr "Tučné"
-
-#: mod/content.php:730 object/Item.php:722
-msgid "Italic"
-msgstr "Kurzíva"
-
-#: mod/content.php:731 object/Item.php:723
-msgid "Underline"
-msgstr "Podrtžené"
-
-#: mod/content.php:732 object/Item.php:724
-msgid "Quote"
-msgstr "Citovat"
-
-#: mod/content.php:733 object/Item.php:725
-msgid "Code"
-msgstr "Kód"
-
-#: mod/content.php:734 object/Item.php:726
-msgid "Image"
-msgstr "Obrázek"
-
-#: mod/content.php:735 object/Item.php:727
-msgid "Link"
-msgstr "Odkaz"
-
-#: mod/content.php:736 object/Item.php:728
-msgid "Video"
-msgstr "Video"
-
-#: mod/content.php:746 mod/settings.php:740 object/Item.php:122
-#: object/Item.php:124
-msgid "Edit"
-msgstr "Upravit"
-
-#: mod/content.php:771 object/Item.php:227
-msgid "add star"
-msgstr "přidat hvězdu"
-
-#: mod/content.php:772 object/Item.php:228
-msgid "remove star"
-msgstr "odebrat hvězdu"
-
-#: mod/content.php:773 object/Item.php:229
-msgid "toggle star status"
-msgstr "přepnout hvězdu"
-
-#: mod/content.php:776 object/Item.php:232
-msgid "starred"
-msgstr "označeno hvězdou"
-
-#: mod/content.php:777 mod/content.php:798 object/Item.php:252
-msgid "add tag"
-msgstr "přidat štítek"
-
-#: mod/content.php:787 object/Item.php:240
-msgid "ignore thread"
-msgstr "ignorovat vlákno"
-
-#: mod/content.php:788 object/Item.php:241
-msgid "unignore thread"
-msgstr "přestat ignorovat vlákno"
-
-#: mod/content.php:789 object/Item.php:242
-msgid "toggle ignore status"
-msgstr "přepnout stav Ignorování"
-
-#: mod/content.php:803 object/Item.php:137
-msgid "save to folder"
-msgstr "uložit do složky"
-
-#: mod/content.php:848 object/Item.php:201
-msgid "I will attend"
-msgstr ""
-
-#: mod/content.php:848 object/Item.php:201
-msgid "I will not attend"
-msgstr ""
-
-#: mod/content.php:848 object/Item.php:201
-msgid "I might attend"
-msgstr ""
-
-#: mod/content.php:912 object/Item.php:369
-msgid "to"
-msgstr "pro"
-
-#: mod/content.php:913 object/Item.php:371
-msgid "Wall-to-Wall"
-msgstr "Zeď-na-Zeď"
-
-#: mod/content.php:914 object/Item.php:372
-msgid "via Wall-To-Wall:"
-msgstr "přes Zeď-na-Zeď "
-
-#: mod/fsuggest.php:63
-msgid "Friend suggestion sent."
-msgstr "Návrhy přátelství odeslány "
-
-#: mod/fsuggest.php:97
-msgid "Suggest Friends"
-msgstr "Navrhněte přátelé"
-
-#: mod/fsuggest.php:99
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Navrhněte přátelé pro uživatele %s"
-
-#: mod/mood.php:133
-msgid "Mood"
-msgstr "Nálada"
-
-#: mod/mood.php:134
-msgid "Set your current mood and tell your friends"
-msgstr "Nastavte svou aktuální náladu a řekněte to Vašim přátelům"
-
-#: mod/poke.php:192
-msgid "Poke/Prod"
-msgstr "Šťouchanec"
-
-#: mod/poke.php:193
-msgid "poke, prod or do other things to somebody"
-msgstr "někoho šťouchnout nebo mu provést  jinou věc"
-
-#: mod/poke.php:194
-msgid "Recipient"
-msgstr "Příjemce"
-
-#: mod/poke.php:195
-msgid "Choose what you wish to do to recipient"
-msgstr "Vyberte, co si přejete příjemci udělat"
-
-#: mod/poke.php:198
-msgid "Make this post private"
-msgstr "Změnit tento příspěvek na soukromý"
-
-#: mod/profile_photo.php:44
-msgid "Image uploaded but image cropping failed."
-msgstr "Obrázek byl odeslán, ale jeho oříznutí se nesdařilo."
-
-#: mod/profile_photo.php:77 mod/profile_photo.php:84 mod/profile_photo.php:91
-#: mod/profile_photo.php:314
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr "Nepodařilo se snížit velikost obrázku [%s]."
-
-#: mod/profile_photo.php:124
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Znovu načtěte stránku (Shift+F5) nebo vymažte cache prohlížeče, pokud se nové fotografie nezobrazí okamžitě."
-
-#: mod/profile_photo.php:134
-msgid "Unable to process image"
-msgstr "Obrázek nelze zpracovat "
-
-#: mod/profile_photo.php:150 mod/photos.php:786 mod/wall_upload.php:151
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "Obrázek překročil limit velikosti %s"
-
-#: mod/profile_photo.php:159 mod/photos.php:826 mod/wall_upload.php:188
-msgid "Unable to process image."
-msgstr "Obrázek není možné zprocesovat"
-
-#: mod/profile_photo.php:248
-msgid "Upload File:"
-msgstr "Nahrát soubor:"
-
-#: mod/profile_photo.php:249
-msgid "Select a profile:"
-msgstr "Vybrat profil:"
-
-#: mod/profile_photo.php:251
-msgid "Upload"
-msgstr "Nahrát"
-
-#: mod/profile_photo.php:254
-msgid "or"
-msgstr "nebo"
-
-#: mod/profile_photo.php:254
-msgid "skip this step"
-msgstr "přeskočit tento krok "
-
-#: mod/profile_photo.php:254
-msgid "select a photo from your photo albums"
-msgstr "Vybrat fotografii z Vašich fotoalb"
-
-#: mod/profile_photo.php:268
-msgid "Crop Image"
-msgstr "Oříznout obrázek"
-
-#: mod/profile_photo.php:269
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Prosím, ořízněte tento obrázek pro optimální zobrazení."
-
-#: mod/profile_photo.php:271
-msgid "Done Editing"
-msgstr "Editace dokončena"
-
-#: mod/profile_photo.php:305
-msgid "Image uploaded successfully."
-msgstr "Obrázek byl úspěšně nahrán."
-
-#: mod/profile_photo.php:307 mod/photos.php:853 mod/wall_upload.php:221
-msgid "Image upload failed."
-msgstr "Nahrání obrázku selhalo."
-
-#: mod/regmod.php:55
-msgid "Account approved."
-msgstr "Účet schválen."
-
-#: mod/regmod.php:92
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registrace zrušena pro %s"
-
-#: mod/regmod.php:104
-msgid "Please login."
-msgstr "Přihlaste se, prosím."
-
-#: mod/notifications.php:35
-msgid "Invalid request identifier."
-msgstr "Neplatný identifikátor požadavku."
-
-#: mod/notifications.php:44 mod/notifications.php:180
-#: mod/notifications.php:252
-msgid "Discard"
-msgstr "Odstranit"
-
-#: mod/notifications.php:60 mod/notifications.php:179
-#: mod/notifications.php:251 mod/contacts.php:606 mod/contacts.php:806
-#: mod/contacts.php:991
-msgid "Ignore"
-msgstr "Ignorovat"
-
-#: mod/notifications.php:105
-msgid "Network Notifications"
-msgstr "Upozornění Sítě"
-
-#: mod/notifications.php:117
-msgid "Personal Notifications"
-msgstr "Osobní upozornění"
-
-#: mod/notifications.php:123
-msgid "Home Notifications"
-msgstr "Upozornění na vstupní straně"
-
-#: mod/notifications.php:152
-msgid "Show Ignored Requests"
-msgstr "Zobrazit ignorované žádosti"
-
-#: mod/notifications.php:152
-msgid "Hide Ignored Requests"
-msgstr "Skrýt ignorované žádosti"
-
-#: mod/notifications.php:164 mod/notifications.php:222
-msgid "Notification type: "
-msgstr "Typ oznámení: "
-
-#: mod/notifications.php:167
-#, php-format
-msgid "suggested by %s"
-msgstr "navrhl %s"
-
-#: mod/notifications.php:172 mod/notifications.php:239 mod/contacts.php:613
-msgid "Hide this contact from others"
-msgstr "Skrýt tento kontakt před ostatními"
-
-#: mod/notifications.php:173 mod/notifications.php:240
-msgid "Post a new friend activity"
-msgstr "Zveřejnit aktivitu nového přítele."
-
-#: mod/notifications.php:173 mod/notifications.php:240
-msgid "if applicable"
-msgstr "je-li použitelné"
-
-#: mod/notifications.php:176 mod/notifications.php:249 mod/admin.php:1412
-msgid "Approve"
-msgstr "Schválit"
-
-#: mod/notifications.php:195
-msgid "Claims to be known to you: "
-msgstr "Vaši údajní známí: "
-
-#: mod/notifications.php:196
-msgid "yes"
-msgstr "ano"
-
-#: mod/notifications.php:196
-msgid "no"
-msgstr "ne"
-
-#: mod/notifications.php:197
-msgid ""
-"Shall your connection be bidirectional or not? \"Friend\" implies that you "
-"allow to read and you subscribe to their posts. \"Fan/Admirer\" means that "
-"you allow to read but you do not want to read theirs. Approve as: "
-msgstr "Má být vaše propojení oboustanné nebo ne? \"Přítel\" implikuje, že dovolíte čtení a přihlašování se k jejich příspěvkům. \"Fanoušek/Obdivovatel\" znamená, že umožníte čtení, ale už nebudete číst jejich příspěvky: Odsouhlasit jako: "
-
-#: mod/notifications.php:200
-msgid ""
-"Shall your connection be bidirectional or not? \"Friend\" implies that you "
-"allow to read and you subscribe to their posts. \"Sharer\" means that you "
-"allow to read but you do not want to read theirs. Approve as: "
-msgstr "Má být vaše propojení oboustanné nebo ne? \"Přítel\" implikuje, že dovolíte čtení a vy budete přihlášen k odebírání jejich příspěvků. \"Sdíleč\" znamená, že umožníte čtení, ale už nebudete číst jejich příspěvky: Odsouhlasit jako: "
-
-#: mod/notifications.php:209
-msgid "Friend"
-msgstr "Přítel"
-
-#: mod/notifications.php:210
-msgid "Sharer"
-msgstr "Sdílené"
-
-#: mod/notifications.php:210
-msgid "Fan/Admirer"
-msgstr "Fanoušek / obdivovatel"
-
-#: mod/notifications.php:243 mod/contacts.php:624 mod/follow.php:126
-msgid "Profile URL"
-msgstr "URL profilu"
-
-#: mod/notifications.php:260
-msgid "No introductions."
-msgstr "Žádné představení."
-
-#: mod/notifications.php:299
-msgid "Show unread"
-msgstr ""
-
-#: mod/notifications.php:299
-msgid "Show all"
-msgstr ""
-
-#: mod/notifications.php:305
-#, php-format
-msgid "No more %s notifications."
-msgstr ""
-
-#: mod/profiles.php:19 mod/profiles.php:134 mod/profiles.php:180
-#: mod/profiles.php:617 mod/dfrn_confirm.php:70
-msgid "Profile not found."
-msgstr "Profil nenalezen"
-
-#: mod/profiles.php:38
-msgid "Profile deleted."
-msgstr "Profil smazán."
-
-#: mod/profiles.php:56 mod/profiles.php:90
-msgid "Profile-"
-msgstr "Profil-"
-
-#: mod/profiles.php:75 mod/profiles.php:118
-msgid "New profile created."
-msgstr "Nový profil vytvořen."
-
-#: mod/profiles.php:96
-msgid "Profile unavailable to clone."
-msgstr "Profil není možné naklonovat."
-
-#: mod/profiles.php:190
-msgid "Profile Name is required."
-msgstr "Jméno profilu je povinné."
-
-#: mod/profiles.php:338
-msgid "Marital Status"
-msgstr "Rodinný Stav"
-
-#: mod/profiles.php:342
-msgid "Romantic Partner"
-msgstr "Romatický partner"
-
-#: mod/profiles.php:354
-msgid "Work/Employment"
-msgstr "Práce/Zaměstnání"
-
-#: mod/profiles.php:357
-msgid "Religion"
-msgstr "Náboženství"
-
-#: mod/profiles.php:361
-msgid "Political Views"
-msgstr "Politické přesvědčení"
-
-#: mod/profiles.php:365
-msgid "Gender"
-msgstr "Pohlaví"
-
-#: mod/profiles.php:369
-msgid "Sexual Preference"
-msgstr "Sexuální orientace"
-
-#: mod/profiles.php:373
-msgid "XMPP"
-msgstr ""
-
-#: mod/profiles.php:377
-msgid "Homepage"
-msgstr "Domácí stránka"
-
-#: mod/profiles.php:381 mod/profiles.php:702
-msgid "Interests"
-msgstr "Zájmy"
-
-#: mod/profiles.php:385
-msgid "Address"
-msgstr "Adresa"
-
-#: mod/profiles.php:392 mod/profiles.php:698
-msgid "Location"
-msgstr "Lokace"
-
-#: mod/profiles.php:477
-msgid "Profile updated."
-msgstr "Profil aktualizován."
-
-#: mod/profiles.php:564
-msgid " and "
-msgstr " a "
-
-#: mod/profiles.php:572
-msgid "public profile"
-msgstr "veřejný profil"
-
-#: mod/profiles.php:575
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s změnil %2$s na &ldquo;%3$s&rdquo;"
-
-#: mod/profiles.php:576
-#, php-format
-msgid " - Visit %1$s's %2$s"
-msgstr " - Navštivte %2$s uživatele %1$s"
-
-#: mod/profiles.php:579
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s aktualizoval %2$s, změnou %3$s."
-
-#: mod/profiles.php:645
-msgid "Hide contacts and friends:"
-msgstr "Skrýt kontakty a přátele:"
-
-#: mod/profiles.php:650
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "Skrýt u tohoto profilu Vaše kontakty / seznam přátel před před dalšími uživateli zobrazující si tento profil?"
-
-#: mod/profiles.php:674
-msgid "Show more profile fields:"
-msgstr ""
-
-#: mod/profiles.php:686
-msgid "Profile Actions"
-msgstr ""
-
-#: mod/profiles.php:687
-msgid "Edit Profile Details"
-msgstr "Upravit podrobnosti profilu "
-
-#: mod/profiles.php:689
-msgid "Change Profile Photo"
-msgstr "Změna Profilové fotky"
-
-#: mod/profiles.php:690
-msgid "View this profile"
-msgstr "Zobrazit tento profil"
-
-#: mod/profiles.php:692
-msgid "Create a new profile using these settings"
-msgstr "Vytvořit nový profil pomocí tohoto nastavení"
-
-#: mod/profiles.php:693
-msgid "Clone this profile"
-msgstr "Klonovat tento profil"
-
-#: mod/profiles.php:694
-msgid "Delete this profile"
-msgstr "Smazat tento profil"
-
-#: mod/profiles.php:696
-msgid "Basic information"
-msgstr "Základní informace"
-
-#: mod/profiles.php:697
-msgid "Profile picture"
-msgstr "Profilový obrázek"
-
-#: mod/profiles.php:699
-msgid "Preferences"
-msgstr "Nastavení"
-
-#: mod/profiles.php:700
-msgid "Status information"
-msgstr "Statusové informace"
-
-#: mod/profiles.php:701
-msgid "Additional information"
-msgstr "Dodatečné informace"
-
-#: mod/profiles.php:704
-msgid "Relation"
-msgstr ""
-
-#: mod/profiles.php:708
-msgid "Your Gender:"
-msgstr "Vaše pohlaví:"
-
-#: mod/profiles.php:709
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
-msgstr "<span class=\"heart\">&hearts;</span> Rodinný stav:"
-
-#: mod/profiles.php:711
-msgid "Example: fishing photography software"
-msgstr "Příklad: fishing photography software"
-
-#: mod/profiles.php:716
-msgid "Profile Name:"
-msgstr "Jméno profilu:"
-
-#: mod/profiles.php:716 mod/events.php:484 mod/events.php:496
-msgid "Required"
-msgstr "Vyžadováno"
-
-#: mod/profiles.php:718
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
-msgstr "Toto je váš <strong>veřejný</strong> profil.<br />Ten <strong>může</strong> být viditelný kýmkoliv na internetu."
-
-#: mod/profiles.php:719
-msgid "Your Full Name:"
-msgstr "Vaše celé jméno:"
-
-#: mod/profiles.php:720
-msgid "Title/Description:"
-msgstr "Název / Popis:"
-
-#: mod/profiles.php:723
-msgid "Street Address:"
-msgstr "Ulice:"
-
-#: mod/profiles.php:724
-msgid "Locality/City:"
-msgstr "Město:"
-
-#: mod/profiles.php:725
-msgid "Region/State:"
-msgstr "Region / stát:"
-
-#: mod/profiles.php:726
-msgid "Postal/Zip Code:"
-msgstr "PSČ:"
-
-#: mod/profiles.php:727
-msgid "Country:"
-msgstr "Země:"
-
-#: mod/profiles.php:731
-msgid "Who: (if applicable)"
-msgstr "Kdo: (pokud je možné)"
-
-#: mod/profiles.php:731
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Příklady: jan123, Jan Novák, jan@seznam.cz"
-
-#: mod/profiles.php:732
-msgid "Since [date]:"
-msgstr "Od [data]:"
-
-#: mod/profiles.php:734
-msgid "Tell us about yourself..."
-msgstr "Řekněte nám něco o sobě ..."
-
-#: mod/profiles.php:735
-msgid "XMPP (Jabber) address:"
-msgstr ""
-
-#: mod/profiles.php:735
-msgid ""
-"The XMPP address will be propagated to your contacts so that they can follow"
-" you."
-msgstr ""
-
-#: mod/profiles.php:736
-msgid "Homepage URL:"
-msgstr "Odkaz na domovskou stránku:"
-
-#: mod/profiles.php:739
-msgid "Religious Views:"
-msgstr "Náboženské přesvědčení:"
-
-#: mod/profiles.php:740
-msgid "Public Keywords:"
-msgstr "Veřejná klíčová slova:"
-
-#: mod/profiles.php:740
-msgid "(Used for suggesting potential friends, can be seen by others)"
-msgstr "(Používá se pro doporučování potenciálních přátel, může být viděno ostatními)"
-
-#: mod/profiles.php:741
-msgid "Private Keywords:"
-msgstr "Soukromá klíčová slova:"
-
-#: mod/profiles.php:741
-msgid "(Used for searching profiles, never shown to others)"
-msgstr "(Používá se pro vyhledávání profilů, není nikdy zobrazeno ostatním)"
-
-#: mod/profiles.php:744
-msgid "Musical interests"
-msgstr "Hudební vkus"
-
-#: mod/profiles.php:745
-msgid "Books, literature"
-msgstr "Knihy, literatura"
-
-#: mod/profiles.php:746
-msgid "Television"
-msgstr "Televize"
-
-#: mod/profiles.php:747
-msgid "Film/dance/culture/entertainment"
-msgstr "Film/tanec/kultura/zábava"
-
-#: mod/profiles.php:748
-msgid "Hobbies/Interests"
-msgstr "Koníčky/zájmy"
-
-#: mod/profiles.php:749
-msgid "Love/romance"
-msgstr "Láska/romantika"
-
-#: mod/profiles.php:750
-msgid "Work/employment"
-msgstr "Práce/zaměstnání"
-
-#: mod/profiles.php:751
-msgid "School/education"
-msgstr "Škola/vzdělání"
-
-#: mod/profiles.php:752
-msgid "Contact information and Social Networks"
-msgstr "Kontaktní informace a sociální sítě"
-
-#: mod/profiles.php:794
-msgid "Edit/Manage Profiles"
-msgstr "Upravit / Spravovat profily"
-
-#: mod/allfriends.php:43
-msgid "No friends to display."
-msgstr "Žádní přátelé k zobrazení"
-
-#: mod/cal.php:149 mod/display.php:328 mod/profile.php:155
-msgid "Access to this profile has been restricted."
-msgstr "Přístup na tento profil byl omezen."
-
-#: mod/cal.php:276 mod/events.php:380
-msgid "View"
-msgstr ""
-
-#: mod/cal.php:277 mod/events.php:382
-msgid "Previous"
-msgstr "Předchozí"
-
-#: mod/cal.php:278 mod/events.php:383 mod/install.php:231
-msgid "Next"
-msgstr "Dále"
-
-#: mod/cal.php:287 mod/events.php:392
-msgid "list"
-msgstr ""
-
-#: mod/cal.php:297
-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:330
-msgid "calendar"
-msgstr ""
-
-#: mod/common.php:86
-msgid "No contacts in common."
-msgstr "Žádné společné kontakty."
-
-#: mod/common.php:134 mod/contacts.php:863
-msgid "Common Friends"
-msgstr "Společní přátelé"
-
-#: mod/community.php:27
-msgid "Not available."
-msgstr "Není k dispozici."
-
-#: mod/directory.php:197 view/theme/vier/theme.php:201
-msgid "Global Directory"
-msgstr "Globální adresář"
-
-#: mod/directory.php:199
-msgid "Find on this site"
-msgstr "Nalézt na tomto webu"
-
-#: mod/directory.php:201
-msgid "Results for:"
-msgstr ""
-
-#: mod/directory.php:203
-msgid "Site Directory"
-msgstr "Adresář serveru"
-
-#: mod/directory.php:210
-msgid "No entries (some entries may be hidden)."
-msgstr "Žádné záznamy (některé položky mohou být skryty)."
-
-#: mod/dirfind.php:36
-#, php-format
-msgid "People Search - %s"
-msgstr "Vyhledávání lidí - %s"
-
-#: mod/dirfind.php:47
-#, php-format
-msgid "Forum Search - %s"
-msgstr ""
-
-#: mod/dirfind.php:240 mod/match.php:107
-msgid "No matches"
-msgstr "Žádné shody"
-
-#: mod/display.php:473
-msgid "Item has been removed."
-msgstr "Položka byla odstraněna."
-
-#: mod/events.php:95 mod/events.php:97
-msgid "Event can not end before it has started."
-msgstr "Událost nemůže končit dříve, než začala."
-
-#: mod/events.php:104 mod/events.php:106
-msgid "Event title and start time are required."
-msgstr "Název události a datum začátku jsou vyžadovány."
-
-#: mod/events.php:381
-msgid "Create New Event"
-msgstr "Vytvořit novou událost"
-
-#: mod/events.php:482
-msgid "Event details"
-msgstr "Detaily události"
-
-#: mod/events.php:483
-msgid "Starting date and Title are required."
-msgstr "Počáteční datum a Název jsou vyžadovány."
-
-#: mod/events.php:484 mod/events.php:485
-msgid "Event Starts:"
-msgstr "Událost začíná:"
-
-#: mod/events.php:486 mod/events.php:502
-msgid "Finish date/time is not known or not relevant"
-msgstr "Datum/čas konce není zadán nebo není relevantní"
-
-#: mod/events.php:488 mod/events.php:489
-msgid "Event Finishes:"
-msgstr "Akce končí:"
-
-#: mod/events.php:490 mod/events.php:503
-msgid "Adjust for viewer timezone"
-msgstr "Nastavit časové pásmo pro uživatele s právem pro čtení"
-
-#: mod/events.php:492
-msgid "Description:"
-msgstr "Popis:"
-
-#: mod/events.php:496 mod/events.php:498
-msgid "Title:"
-msgstr "Název:"
-
-#: mod/events.php:499 mod/events.php:500
-msgid "Share this event"
-msgstr "Sdílet tuto událost"
-
-#: mod/maintenance.php:9
-msgid "System down for maintenance"
-msgstr "Systém vypnut z důvodů údržby"
-
-#: mod/match.php:33
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Žádná klíčová slova k porovnání. Prosím, přidejte klíčová slova do Vašeho výchozího profilu."
-
-#: mod/match.php:86
-msgid "is interested in:"
-msgstr "zajímá se o:"
-
-#: mod/match.php:100
-msgid "Profile Match"
-msgstr "Shoda profilu"
-
-#: mod/profile.php:179
-msgid "Tips for New Members"
-msgstr "Tipy pro nové členy"
-
-#: mod/suggest.php:27
-msgid "Do you really want to delete this suggestion?"
-msgstr "Opravdu chcete smazat tento návrh?"
-
-#: mod/suggest.php:71
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "Nejsou dostupné žádné návrhy. Pokud je toto nový server, zkuste to znovu za 24 hodin."
-
-#: mod/suggest.php:84 mod/suggest.php:104
-msgid "Ignore/Hide"
-msgstr "Ignorovat / skrýt"
-
-#: mod/update_community.php:19 mod/update_display.php:23
-#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
-msgid "[Embedded content - reload page to view]"
-msgstr "[Vložený obsah - obnovte stránku pro zobrazení]"
-
-#: mod/photos.php:88 mod/photos.php:1856
-msgid "Recent Photos"
-msgstr "Aktuální fotografie"
-
-#: mod/photos.php:91 mod/photos.php:1283 mod/photos.php:1858
-msgid "Upload New Photos"
-msgstr "Nahrát nové fotografie"
-
-#: mod/photos.php:105 mod/settings.php:36
-msgid "everybody"
-msgstr "Žádost o připojení selhala nebo byla zrušena."
-
-#: mod/photos.php:169
-msgid "Contact information unavailable"
-msgstr "Kontakt byl zablokován"
-
-#: mod/photos.php:190
-msgid "Album not found."
-msgstr "Album nenalezeno."
-
-#: mod/photos.php:220 mod/photos.php:232 mod/photos.php:1227
-msgid "Delete Album"
-msgstr "Smazat album"
-
-#: mod/photos.php:230
-msgid "Do you really want to delete this photo album and all its photos?"
-msgstr "Opravdu chcete smazat toto foto album a všechny jeho fotografie?"
-
-#: mod/photos.php:308 mod/photos.php:319 mod/photos.php:1540
-msgid "Delete Photo"
-msgstr "Smazat fotografii"
-
-#: mod/photos.php:317
-msgid "Do you really want to delete this photo?"
-msgstr "Opravdu chcete smazat tuto fotografii?"
-
-#: mod/photos.php:688
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
-msgstr "%1$s byl označen v %2$s uživatelem %3$s"
-
-#: mod/photos.php:688
-msgid "a photo"
-msgstr "fotografie"
-
-#: mod/photos.php:794
-msgid "Image file is empty."
-msgstr "Soubor obrázku je prázdný."
-
-#: mod/photos.php:954
-msgid "No photos selected"
-msgstr "Není vybrána žádná fotografie"
-
-#: mod/photos.php:1054 mod/videos.php:305
-msgid "Access to this item is restricted."
-msgstr "Přístup k této položce je omezen."
-
-#: mod/photos.php:1114
-#, php-format
-msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
-msgstr "Použil jste %1$.2f Mbajtů z %2$.2f Mbajtů úložiště fotografií."
-
-#: mod/photos.php:1148
-msgid "Upload Photos"
-msgstr "Nahrání fotografií "
-
-#: mod/photos.php:1152 mod/photos.php:1222
-msgid "New album name: "
-msgstr "Název nového alba: "
-
-#: mod/photos.php:1153
-msgid "or existing album name: "
-msgstr "nebo stávající název alba: "
-
-#: mod/photos.php:1154
-msgid "Do not show a status post for this upload"
-msgstr "Nezobrazovat stav pro tento upload"
-
-#: mod/photos.php:1165 mod/photos.php:1544 mod/settings.php:1300
-msgid "Show to Groups"
-msgstr "Zobrazit ve Skupinách"
-
-#: mod/photos.php:1166 mod/photos.php:1545 mod/settings.php:1301
-msgid "Show to Contacts"
-msgstr "Zobrazit v Kontaktech"
-
-#: mod/photos.php:1167
-msgid "Private Photo"
-msgstr "Soukromé Fotografie"
-
-#: mod/photos.php:1168
-msgid "Public Photo"
-msgstr "Veřejné Fotografie"
-
-#: mod/photos.php:1234
-msgid "Edit Album"
-msgstr "Edituj album"
-
-#: mod/photos.php:1240
-msgid "Show Newest First"
-msgstr "Zobrazit nejprve nejnovější:"
-
-#: mod/photos.php:1242
-msgid "Show Oldest First"
-msgstr "Zobrazit nejprve nejstarší:"
-
-#: mod/photos.php:1269 mod/photos.php:1841
-msgid "View Photo"
-msgstr "Zobraz fotografii"
-
-#: mod/photos.php:1315
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Oprávnění bylo zamítnuto. Přístup k této položce může být omezen."
-
-#: mod/photos.php:1317
-msgid "Photo not available"
-msgstr "Fotografie není k dispozici"
-
-#: mod/photos.php:1372
-msgid "View photo"
-msgstr "Zobrazit obrázek"
-
-#: mod/photos.php:1372
-msgid "Edit photo"
-msgstr "Editovat fotografii"
-
-#: mod/photos.php:1373
-msgid "Use as profile photo"
-msgstr "Použít jako profilovou fotografii"
-
-#: mod/photos.php:1398
-msgid "View Full Size"
-msgstr "Zobrazit v plné velikosti"
-
-#: mod/photos.php:1484
-msgid "Tags: "
-msgstr "Štítky: "
-
-#: mod/photos.php:1487
-msgid "[Remove any tag]"
-msgstr "[Odstranit všechny štítky]"
-
-#: mod/photos.php:1526
-msgid "New album name"
-msgstr "Nové jméno alba"
-
-#: mod/photos.php:1527
-msgid "Caption"
-msgstr "Titulek"
-
-#: mod/photos.php:1528
-msgid "Add a Tag"
-msgstr "Přidat štítek"
-
-#: mod/photos.php:1528
-msgid ""
-"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr "Příklad: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-
-#: mod/photos.php:1529
-msgid "Do not rotate"
-msgstr "Neotáčet"
-
-#: mod/photos.php:1530
-msgid "Rotate CW (right)"
-msgstr "Rotovat po směru hodinových ručiček (doprava)"
-
-#: mod/photos.php:1531
-msgid "Rotate CCW (left)"
-msgstr "Rotovat proti směru hodinových ručiček (doleva)"
-
-#: mod/photos.php:1546
-msgid "Private photo"
-msgstr "Soukromé fotografie"
-
-#: mod/photos.php:1547
-msgid "Public photo"
-msgstr "Veřejné fotografie"
-
-#: mod/photos.php:1770
-msgid "Map"
-msgstr ""
-
-#: mod/photos.php:1847 mod/videos.php:387
-msgid "View Album"
-msgstr "Zobrazit album"
-
-#: mod/register.php:93
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr "Registrace úspěšná. Zkontrolujte prosím svůj e-mail pro další instrukce."
-
-#: mod/register.php:98
-#, 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 "Nepovedlo se odeslat emailovou zprávu. Zde jsou detaily Vašeho účtu:<br> login: %s<br> heslo: %s<br><br>Své heslo můžete změnit po přihlášení."
-
-#: mod/register.php:105
-msgid "Registration successful."
-msgstr ""
-
-#: mod/register.php:111
-msgid "Your registration can not be processed."
-msgstr "Vaši registraci nelze zpracovat."
-
-#: mod/register.php:160
-msgid "Your registration is pending approval by the site owner."
-msgstr "Vaše registrace čeká na schválení vlastníkem serveru."
-
-#: mod/register.php:226
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr "Tento formulář můžete (volitelně) vyplnit s pomocí OpenID tím, že vyplníte své OpenID a kliknutete na tlačítko 'Zaregistrovat'."
-
-#: mod/register.php:227
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
-msgstr "Pokud nepoužíváte OpenID, nechte prosím toto pole prázdné a vyplňte zbylé položky."
-
-#: mod/register.php:228
-msgid "Your OpenID (optional): "
-msgstr "Vaše OpenID (nepovinné): "
-
-#: mod/register.php:242
-msgid "Include your profile in member directory?"
-msgstr "Toto je Váš <strong>veřejný</strong> profil.<br />Ten <strong>může</strong> být viditelný kýmkoliv na internetu."
-
-#: mod/register.php:267
-msgid "Note for the admin"
-msgstr ""
-
-#: mod/register.php:267
-msgid "Leave a message for the admin, why you want to join this node"
-msgstr ""
-
-#: mod/register.php:268
-msgid "Membership on this site is by invitation only."
-msgstr "Členství na tomto webu je pouze na pozvání."
-
-#: mod/register.php:269
-msgid "Your invitation ID: "
-msgstr "Vaše pozvání ID:"
-
-#: mod/register.php:272 mod/admin.php:956
-msgid "Registration"
-msgstr "Registrace"
-
-#: mod/register.php:280
-msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
-msgstr ""
-
-#: mod/register.php:281
-msgid "Your Email Address: "
-msgstr "Vaše e-mailová adresa:"
-
-#: mod/register.php:283 mod/settings.php:1271
-msgid "New Password:"
-msgstr "Nové heslo:"
-
-#: mod/register.php:283
-msgid "Leave empty for an auto generated password."
-msgstr "Ponechte prázdné pro automatické vygenerovaní hesla."
-
-#: mod/register.php:284 mod/settings.php:1272
-msgid "Confirm:"
-msgstr "Potvrďte:"
-
-#: mod/register.php:285
-msgid ""
-"Choose a profile nickname. This must begin with a text character. Your "
-"profile address on this site will then be "
-"'<strong>nickname@$sitename</strong>'."
-msgstr "Vyberte přezdívku k profilu. Ta musí začít s textovým znakem. Vaše profilová adresa na tomto webu pak bude \"<strong>přezdívka@$sitename</strong>\"."
-
-#: mod/register.php:286
-msgid "Choose a nickname: "
-msgstr "Vyberte přezdívku:"
-
-#: mod/register.php:296
-msgid "Import your profile to this friendica instance"
-msgstr "Import Vašeho profilu do této friendica instance"
-
-#: mod/settings.php:43 mod/admin.php:1396
-msgid "Account"
-msgstr "Účet"
-
-#: mod/settings.php:52 mod/admin.php:160
-msgid "Additional features"
-msgstr "Další funkčnosti"
-
-#: mod/settings.php:60
-msgid "Display"
-msgstr "Zobrazení"
-
-#: mod/settings.php:67 mod/settings.php:886
-msgid "Social Networks"
-msgstr "Sociální sítě"
-
-#: mod/settings.php:74 mod/admin.php:158 mod/admin.php:1522 mod/admin.php:1582
-msgid "Plugins"
-msgstr "Pluginy"
-
-#: mod/settings.php:88
-msgid "Connected apps"
-msgstr "Propojené aplikace"
-
-#: mod/settings.php:102
-msgid "Remove account"
-msgstr "Odstranit účet"
-
-#: mod/settings.php:155
-msgid "Missing some important data!"
-msgstr "Chybí některé důležité údaje!"
-
-#: mod/settings.php:158 mod/settings.php:704 mod/contacts.php:804
-msgid "Update"
-msgstr "Aktualizace"
-
-#: mod/settings.php:269
-msgid "Failed to connect with email account using the settings provided."
-msgstr "Nepodařilo se připojit k e-mailovému účtu pomocí dodaného nastavení."
-
-#: mod/settings.php:274
-msgid "Email settings updated."
-msgstr "Nastavení e-mailu aktualizována."
-
-#: mod/settings.php:289
-msgid "Features updated"
-msgstr "Aktualizované funkčnosti"
-
-#: mod/settings.php:359
-msgid "Relocate message has been send to your contacts"
-msgstr "Správa o změně umístění byla odeslána vašim kontaktům"
-
-#: mod/settings.php:378
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Prázdné hesla nejsou povolena. Heslo nebylo změněno."
-
-#: mod/settings.php:386
-msgid "Wrong password."
-msgstr "Špatné heslo."
-
-#: mod/settings.php:397
-msgid "Password changed."
-msgstr "Heslo bylo změněno."
-
-#: mod/settings.php:399
-msgid "Password update failed. Please try again."
-msgstr "Aktualizace hesla se nezdařila. Zkuste to prosím znovu."
-
-#: mod/settings.php:479
-msgid " Please use a shorter name."
-msgstr "Prosím použijte kratší jméno."
-
-#: mod/settings.php:481
-msgid " Name too short."
-msgstr "Jméno je příliš krátké."
-
-#: mod/settings.php:490
-msgid "Wrong Password"
-msgstr "Špatné heslo"
-
-#: mod/settings.php:495
-msgid " Not valid email."
-msgstr "Neplatný e-mail."
-
-#: mod/settings.php:501
-msgid " Cannot change to that email."
-msgstr "Nelze provést změnu na tento e-mail."
-
-#: mod/settings.php:557
-msgid "Private forum has no privacy permissions. Using default privacy group."
-msgstr "Soukromé fórum nemá nastaveno zabezpečení. Používá se defaultní soukromá skupina."
-
-#: mod/settings.php:561
-msgid "Private forum has no privacy permissions and no default privacy group."
-msgstr "Soukromé fórum nemá nastaveno zabezpečení a ani žádnou defaultní soukromou skupinu."
-
-#: mod/settings.php:601
-msgid "Settings updated."
-msgstr "Nastavení aktualizováno."
-
-#: mod/settings.php:677 mod/settings.php:703 mod/settings.php:739
-msgid "Add application"
-msgstr "Přidat aplikaci"
-
-#: mod/settings.php:678 mod/settings.php:788 mod/settings.php:835
-#: mod/settings.php:904 mod/settings.php:996 mod/settings.php:1264
-#: mod/admin.php:955 mod/admin.php:1583 mod/admin.php:1831 mod/admin.php:1905
-#: mod/admin.php:2055
-msgid "Save Settings"
-msgstr "Uložit Nastavení"
-
-#: mod/settings.php:681 mod/settings.php:707
-msgid "Consumer Key"
-msgstr "Consumer Key"
-
-#: mod/settings.php:682 mod/settings.php:708
-msgid "Consumer Secret"
-msgstr "Consumer Secret"
-
-#: mod/settings.php:683 mod/settings.php:709
-msgid "Redirect"
-msgstr "Přesměrování"
-
-#: mod/settings.php:684 mod/settings.php:710
-msgid "Icon url"
-msgstr "URL ikony"
-
-#: mod/settings.php:695
-msgid "You can't edit this application."
-msgstr "Nemůžete editovat tuto aplikaci."
-
-#: mod/settings.php:738
-msgid "Connected Apps"
-msgstr "Připojené aplikace"
-
-#: mod/settings.php:742
-msgid "Client key starts with"
-msgstr "Klienský klíč začíná"
-
-#: mod/settings.php:743
-msgid "No name"
-msgstr "Bez názvu"
-
-#: mod/settings.php:744
-msgid "Remove authorization"
-msgstr "Odstranit oprávnění"
-
-#: mod/settings.php:756
-msgid "No Plugin settings configured"
-msgstr "Žádný doplněk není nastaven"
-
-#: mod/settings.php:764
-msgid "Plugin Settings"
-msgstr "Nastavení doplňku"
-
-#: mod/settings.php:778 mod/admin.php:2044 mod/admin.php:2045
-msgid "Off"
-msgstr "Vypnuto"
-
-#: mod/settings.php:778 mod/admin.php:2044 mod/admin.php:2045
-msgid "On"
-msgstr "Zapnuto"
-
-#: mod/settings.php:786
-msgid "Additional Features"
-msgstr "Další Funkčnosti"
-
-#: mod/settings.php:796 mod/settings.php:800
-msgid "General Social Media Settings"
-msgstr "General Social Media nastavení"
-
-#: mod/settings.php:806
-msgid "Disable intelligent shortening"
-msgstr "Vypnout inteligentní zkracování"
-
-#: mod/settings.php:808
-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 "Normálně se systém snaží nalézt nejlepší link pro přidání zkrácených příspěvků. Pokud je tato volba aktivní, pak každý zkrácený příspěvek bude vždy ukazovat na originální friencika příspěvek"
-
-#: mod/settings.php:814
-msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
-msgstr "Automaticky následovat jakékoliv GNU Social (OStatus) následníky/přispivatele"
-
-#: mod/settings.php:816
-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:822
-msgid "Default group for OStatus contacts"
-msgstr ""
-
-#: mod/settings.php:828
-msgid "Your legacy GNU Social account"
-msgstr ""
-
-#: mod/settings.php:830
-msgid ""
-"If you enter your old GNU Social/Statusnet account name here (in the format "
-"user@domain.tld), your contacts will be added automatically. The field will "
-"be emptied when done."
-msgstr ""
-
-#: mod/settings.php:833
-msgid "Repair OStatus subscriptions"
-msgstr ""
-
-#: mod/settings.php:842 mod/settings.php:843
-#, php-format
-msgid "Built-in support for %s connectivity is %s"
-msgstr "Vestavěná podpora pro připojení s %s je %s"
-
-#: mod/settings.php:842 mod/settings.php:843
-msgid "enabled"
-msgstr "povoleno"
-
-#: mod/settings.php:842 mod/settings.php:843
-msgid "disabled"
-msgstr "zakázáno"
-
-#: mod/settings.php:843
-msgid "GNU Social (OStatus)"
-msgstr "GNU Social (OStatus)"
-
-#: mod/settings.php:879
-msgid "Email access is disabled on this site."
-msgstr "Přístup k elektronické poště je na tomto serveru zakázán."
-
-#: mod/settings.php:891
-msgid "Email/Mailbox Setup"
-msgstr "Nastavení e-mailu"
-
-#: mod/settings.php:892
-msgid ""
-"If you wish to communicate with email contacts using this service "
-"(optional), please specify how to connect to your mailbox."
-msgstr "Pokud chcete komunikovat pomocí této služby s Vašimi kontakty z e-mailu (volitelné), uveďte, jak se připojit k Vaší e-mailové schránce."
-
-#: mod/settings.php:893
-msgid "Last successful email check:"
-msgstr "Poslední úspěšná kontrola e-mailu:"
-
-#: mod/settings.php:895
-msgid "IMAP server name:"
-msgstr "jméno IMAP serveru:"
-
-#: mod/settings.php:896
-msgid "IMAP port:"
-msgstr "IMAP port:"
-
-#: mod/settings.php:897
-msgid "Security:"
-msgstr "Zabezpečení:"
-
-#: mod/settings.php:897 mod/settings.php:902
-msgid "None"
-msgstr "Žádný"
-
-#: mod/settings.php:898
-msgid "Email login name:"
-msgstr "přihlašovací jméno k e-mailu:"
-
-#: mod/settings.php:899
-msgid "Email password:"
-msgstr "heslo k Vašemu e-mailu:"
-
-#: mod/settings.php:900
-msgid "Reply-to address:"
-msgstr "Odpovědět na adresu:"
-
-#: mod/settings.php:901
-msgid "Send public posts to all email contacts:"
-msgstr "Poslat veřejné příspěvky na všechny e-mailové kontakty:"
-
-#: mod/settings.php:902
-msgid "Action after import:"
-msgstr "Akce po importu:"
-
-#: mod/settings.php:902
-msgid "Move to folder"
-msgstr "Přesunout do složky"
-
-#: mod/settings.php:903
-msgid "Move to folder:"
-msgstr "Přesunout do složky:"
-
-#: mod/settings.php:934 mod/admin.php:862
-msgid "No special theme for mobile devices"
-msgstr "žádné speciální téma pro mobilní zařízení"
-
-#: mod/settings.php:994
-msgid "Display Settings"
-msgstr "Nastavení Zobrazení"
-
-#: mod/settings.php:1000 mod/settings.php:1023
-msgid "Display Theme:"
-msgstr "Vybrat grafickou šablonu:"
-
-#: mod/settings.php:1001
-msgid "Mobile Theme:"
-msgstr "Téma pro mobilní zařízení:"
-
-#: mod/settings.php:1002
-msgid "Suppress warning of insecure networks"
-msgstr ""
-
-#: mod/settings.php:1002
-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:1003
-msgid "Update browser every xx seconds"
-msgstr "Aktualizovat prohlížeč každých xx sekund"
-
-#: mod/settings.php:1003
-msgid "Minimum of 10 seconds. Enter -1 to disable it."
-msgstr ""
-
-#: mod/settings.php:1004
-msgid "Number of items to display per page:"
-msgstr "Počet položek zobrazených na stránce:"
-
-#: mod/settings.php:1004 mod/settings.php:1005
-msgid "Maximum of 100 items"
-msgstr "Maximum 100 položek"
-
-#: mod/settings.php:1005
-msgid "Number of items to display per page when viewed from mobile device:"
-msgstr "Počet položek ke zobrazení na stránce při zobrazení na mobilním zařízení:"
-
-#: mod/settings.php:1006
-msgid "Don't show emoticons"
-msgstr "Nezobrazovat emotikony"
-
-#: mod/settings.php:1007
-msgid "Calendar"
-msgstr ""
-
-#: mod/settings.php:1008
-msgid "Beginning of week:"
-msgstr ""
-
-#: mod/settings.php:1009
-msgid "Don't show notices"
-msgstr "Nezobrazovat oznámění"
-
-#: mod/settings.php:1010
-msgid "Infinite scroll"
-msgstr "Nekonečné posouvání"
-
-#: mod/settings.php:1011
-msgid "Automatic updates only at the top of the network page"
-msgstr "Automatické aktualizace pouze na hlavní stránce Síť."
-
-#: mod/settings.php:1012
-msgid "Bandwith Saver Mode"
-msgstr ""
-
-#: mod/settings.php:1012
-msgid ""
-"When enabled, embedded content is not displayed on automatic updates, they "
-"only show on page reload."
-msgstr ""
-
-#: mod/settings.php:1014
-msgid "General Theme Settings"
-msgstr ""
-
-#: mod/settings.php:1015
-msgid "Custom Theme Settings"
-msgstr ""
-
-#: mod/settings.php:1016
-msgid "Content Settings"
-msgstr ""
-
-#: mod/settings.php:1017 view/theme/frio/config.php:61
-#: view/theme/quattro/config.php:66 view/theme/vier/config.php:109
-#: view/theme/duepuntozero/config.php:61
-msgid "Theme settings"
-msgstr "Nastavení téma"
-
-#: mod/settings.php:1099
-msgid "Account Types"
-msgstr ""
-
-#: mod/settings.php:1100
-msgid "Personal Page Subtypes"
-msgstr ""
-
-#: mod/settings.php:1101
-msgid "Community Forum Subtypes"
-msgstr ""
-
-#: mod/settings.php:1108
-msgid "Personal Page"
-msgstr ""
-
-#: mod/settings.php:1109
-msgid "This account is a regular personal profile"
-msgstr ""
-
-#: mod/settings.php:1112
-msgid "Organisation Page"
-msgstr ""
-
-#: mod/settings.php:1113
-msgid "This account is a profile for an organisation"
-msgstr ""
-
-#: mod/settings.php:1116
-msgid "News Page"
-msgstr ""
-
-#: mod/settings.php:1117
-msgid "This account is a news account/reflector"
-msgstr ""
-
-#: mod/settings.php:1120
-msgid "Community Forum"
-msgstr ""
-
-#: mod/settings.php:1121
-msgid ""
-"This account is a community forum where people can discuss with each other"
-msgstr ""
-
-#: mod/settings.php:1124
-msgid "Normal Account Page"
-msgstr "Normální stránka účtu"
-
-#: mod/settings.php:1125
-msgid "This account is a normal personal profile"
-msgstr "Tento účet je běžný osobní profil"
-
-#: mod/settings.php:1128
-msgid "Soapbox Page"
-msgstr "Stránka \"Soapbox\""
-
-#: mod/settings.php:1129
-msgid "Automatically approve all connection/friend requests as read-only fans"
-msgstr "Automaticky schválit všechna spojení / přátelství jako fanoušky s právem pouze ke čtení"
-
-#: mod/settings.php:1132
-msgid "Public Forum"
-msgstr ""
-
-#: mod/settings.php:1133
-msgid "Automatically approve all contact requests"
-msgstr ""
-
-#: mod/settings.php:1136
-msgid "Automatic Friend Page"
-msgstr "Automatická stránka přítele"
-
-#: mod/settings.php:1137
-msgid "Automatically approve all connection/friend requests as friends"
-msgstr "Automaticky schvalovat všechny žádosti o spojení / přátelství jako přátele"
-
-#: mod/settings.php:1140
-msgid "Private Forum [Experimental]"
-msgstr "Soukromé fórum [Experimentální]"
-
-#: mod/settings.php:1141
-msgid "Private forum - approved members only"
-msgstr "Soukromé fórum - pouze pro schválené členy"
-
-#: mod/settings.php:1153
-msgid "OpenID:"
-msgstr "OpenID:"
-
-#: mod/settings.php:1153
-msgid "(Optional) Allow this OpenID to login to this account."
-msgstr "(Volitelné) Povolit OpenID pro přihlášení k tomuto účtu."
-
-#: mod/settings.php:1163
-msgid "Publish your default profile in your local site directory?"
-msgstr "Publikovat Váš výchozí profil v místním adresáři webu?"
-
-#: mod/settings.php:1169
-msgid "Publish your default profile in the global social directory?"
-msgstr "Publikovat Váš výchozí profil v globální sociálním adresáři?"
-
-#: mod/settings.php:1177
-msgid "Hide your contact/friend list from viewers of your default profile?"
-msgstr "Skrýt Vaše kontaktní údaje a seznam přátel před návštěvníky ve Vašem výchozím profilu?"
-
-#: mod/settings.php:1181
-msgid ""
-"If enabled, posting public messages to Diaspora and other networks isn't "
-"possible."
-msgstr "Pokud je povoleno, není možné zasílání veřejných příspěvků do Diaspory a dalších sítí."
-
-#: mod/settings.php:1186
-msgid "Allow friends to post to your profile page?"
-msgstr "Povolit přátelům umisťování příspěvků na vaši profilovou stránku?"
-
-#: mod/settings.php:1192
-msgid "Allow friends to tag your posts?"
-msgstr "Povolit přátelům označovat Vaše příspěvky?"
-
-#: mod/settings.php:1198
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Chcete nám povolit abychom vás navrhovali jako přátelé pro nové členy?"
-
-#: mod/settings.php:1204
-msgid "Permit unknown people to send you private mail?"
-msgstr "Povolit neznámým lidem Vám zasílat soukromé zprávy?"
-
-#: mod/settings.php:1212
-msgid "Profile is <strong>not published</strong>."
-msgstr "Profil <strong>není zveřejněn</strong>."
-
-#: mod/settings.php:1220
-#, php-format
-msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
-msgstr "Vaše Identity adresa je <strong>\"%s\"</strong> nebo \"%s\"."
-
-#: mod/settings.php:1227
-msgid "Automatically expire posts after this many days:"
-msgstr "Automaticky expirovat příspěvky po zadaném počtu dní:"
-
-#: mod/settings.php:1227
-msgid "If empty, posts will not expire. Expired posts will be deleted"
-msgstr "Pokud je prázdné, příspěvky nebudou nikdy expirovat. Expirované příspěvky budou vymazány"
-
-#: mod/settings.php:1228
-msgid "Advanced expiration settings"
-msgstr "Pokročilé nastavení expirací"
-
-#: mod/settings.php:1229
-msgid "Advanced Expiration"
-msgstr "Nastavení expirací"
-
-#: mod/settings.php:1230
-msgid "Expire posts:"
-msgstr "Expirovat příspěvky:"
-
-#: mod/settings.php:1231
-msgid "Expire personal notes:"
-msgstr "Expirovat osobní poznámky:"
-
-#: mod/settings.php:1232
-msgid "Expire starred posts:"
-msgstr "Expirovat příspěvky s hvězdou:"
-
-#: mod/settings.php:1233
-msgid "Expire photos:"
-msgstr "Expirovat fotografie:"
-
-#: mod/settings.php:1234
-msgid "Only expire posts by others:"
-msgstr "Přízpěvky expirovat pouze ostatními:"
-
-#: mod/settings.php:1262
-msgid "Account Settings"
-msgstr "Nastavení účtu"
-
-#: mod/settings.php:1270
-msgid "Password Settings"
-msgstr "Nastavení hesla"
-
-#: mod/settings.php:1272
-msgid "Leave password fields blank unless changing"
-msgstr "Pokud nechcete změnit heslo, položku hesla nevyplňujte"
-
-#: mod/settings.php:1273
-msgid "Current Password:"
-msgstr "Stávající heslo:"
-
-#: mod/settings.php:1273 mod/settings.php:1274
-msgid "Your current password to confirm the changes"
-msgstr "Vaše stávající heslo k potvrzení změn"
-
-#: mod/settings.php:1274
-msgid "Password:"
-msgstr "Heslo: "
-
-#: mod/settings.php:1278
-msgid "Basic Settings"
-msgstr "Základní nastavení"
-
-#: mod/settings.php:1280
-msgid "Email Address:"
-msgstr "E-mailová adresa:"
-
-#: mod/settings.php:1281
-msgid "Your Timezone:"
-msgstr "Vaše časové pásmo:"
-
-#: mod/settings.php:1282
-msgid "Your Language:"
-msgstr ""
-
-#: mod/settings.php:1282
-msgid ""
-"Set the language we use to show you friendica interface and to send you "
-"emails"
-msgstr ""
-
-#: mod/settings.php:1283
-msgid "Default Post Location:"
-msgstr "Výchozí umístění příspěvků:"
-
-#: mod/settings.php:1284
-msgid "Use Browser Location:"
-msgstr "Používat umístění dle prohlížeče:"
-
-#: mod/settings.php:1287
-msgid "Security and Privacy Settings"
-msgstr "Nastavení zabezpečení a soukromí"
-
-#: mod/settings.php:1289
-msgid "Maximum Friend Requests/Day:"
-msgstr "Maximální počet žádostí o přátelství za den:"
-
-#: mod/settings.php:1289 mod/settings.php:1319
-msgid "(to prevent spam abuse)"
-msgstr "(Aby se zabránilo spamu)"
-
-#: mod/settings.php:1290
-msgid "Default Post Permissions"
-msgstr "Výchozí oprávnění pro příspěvek"
-
-#: mod/settings.php:1291
-msgid "(click to open/close)"
-msgstr "(Klikněte pro otevření/zavření)"
-
-#: mod/settings.php:1302
-msgid "Default Private Post"
-msgstr "Výchozí Soukromý příspěvek"
-
-#: mod/settings.php:1303
-msgid "Default Public Post"
-msgstr "Výchozí Veřejný příspěvek"
-
-#: mod/settings.php:1307
-msgid "Default Permissions for New Posts"
-msgstr "Výchozí oprávnění pro nové příspěvky"
-
-#: mod/settings.php:1319
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Maximum soukromých zpráv od neznámých lidí:"
-
-#: mod/settings.php:1322
-msgid "Notification Settings"
-msgstr "Nastavení notifikací"
-
-#: mod/settings.php:1323
-msgid "By default post a status message when:"
-msgstr "Defaultně posílat statusové zprávy když:"
-
-#: mod/settings.php:1324
-msgid "accepting a friend request"
-msgstr "akceptuji požadavek na přátelství"
-
-#: mod/settings.php:1325
-msgid "joining a forum/community"
-msgstr "připojující se k fóru/komunitě"
-
-#: mod/settings.php:1326
-msgid "making an <em>interesting</em> profile change"
-msgstr "provedení <em>zajímavé</em> profilové změny"
-
-#: mod/settings.php:1327
-msgid "Send a notification email when:"
-msgstr "Poslat notifikaci e-mailem, když"
-
-#: mod/settings.php:1328
-msgid "You receive an introduction"
-msgstr "obdržíte žádost o propojení"
-
-#: mod/settings.php:1329
-msgid "Your introductions are confirmed"
-msgstr "Vaše žádosti jsou potvrzeny"
-
-#: mod/settings.php:1330
-msgid "Someone writes on your profile wall"
-msgstr "někdo Vám napíše na Vaši profilovou stránku"
-
-#: mod/settings.php:1331
-msgid "Someone writes a followup comment"
-msgstr "někdo Vám napíše následný komentář"
-
-#: mod/settings.php:1332
-msgid "You receive a private message"
-msgstr "obdržíte soukromou zprávu"
-
-#: mod/settings.php:1333
-msgid "You receive a friend suggestion"
-msgstr "Obdržel jste návrh přátelství"
-
-#: mod/settings.php:1334
-msgid "You are tagged in a post"
-msgstr "Jste označen v příspěvku"
-
-#: mod/settings.php:1335
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Byl Jste šťouchnout v příspěvku"
-
-#: mod/settings.php:1337
-msgid "Activate desktop notifications"
-msgstr "Aktivovat upozornění na desktopu"
-
-#: mod/settings.php:1337
-msgid "Show desktop popup on new notifications"
-msgstr "Zobrazit dektopové zprávy nových upozornění."
-
-#: mod/settings.php:1339
-msgid "Text-only notification emails"
-msgstr "Pouze textové notifikační e-maily"
-
-#: mod/settings.php:1341
-msgid "Send text only notification emails, without the html part"
-msgstr "Posílat pouze textové notifikační e-maily, bez html části."
-
-#: mod/settings.php:1343
-msgid "Advanced Account/Page Type Settings"
-msgstr "Pokročilé nastavení účtu/stránky"
-
-#: mod/settings.php:1344
-msgid "Change the behaviour of this account for special situations"
-msgstr "Změnit chování tohoto účtu ve speciálních situacích"
-
-#: mod/settings.php:1347
-msgid "Relocate"
-msgstr "Změna umístění"
-
-#: mod/settings.php:1348
-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 "Pokud jste přemístil tento profil z jiného serveru a nějaký z vašich kontaktů nedostává Vaše aktualizace, zkuste stisknout toto tlačítko."
-
-#: mod/settings.php:1349
-msgid "Resend relocate message to contacts"
-msgstr "Znovu odeslat správu o změně umístění Vašim kontaktům"
-
-#: mod/videos.php:120
-msgid "Do you really want to delete this video?"
-msgstr "Opravdu chcete smazat toto video?"
-
-#: mod/videos.php:125
-msgid "Delete Video"
-msgstr "Odstranit video"
-
-#: mod/videos.php:204
-msgid "No videos selected"
-msgstr "Není vybráno žádné video"
-
-#: mod/videos.php:396
-msgid "Recent Videos"
-msgstr "Aktuální Videa"
-
-#: mod/videos.php:398
-msgid "Upload New Videos"
-msgstr "Nahrát nová videa"
-
-#: mod/wall_attach.php:17 mod/wall_attach.php:25 mod/wall_attach.php:76
-#: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86
-#: mod/wall_upload.php:122 mod/wall_upload.php:125
-msgid "Invalid request."
-msgstr "Neplatný požadavek."
-
-#: mod/wall_attach.php:94
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr "Omlouváme se, možná je Váš soubor větší než je povolené maximum dle nastavení PHP"
-
-#: mod/wall_attach.php:94
-msgid "Or - did you try to upload an empty file?"
-msgstr "Nebo - nenahrával jste prázdný soubor?"
-
-#: mod/wall_attach.php:105
-#, php-format
-msgid "File exceeds size limit of %s"
-msgstr "Velikost souboru přesáhla limit %s"
-
-#: mod/wall_attach.php:156 mod/wall_attach.php:172
-msgid "File upload failed."
-msgstr "Nahrání souboru se nezdařilo."
-
-#: mod/admin.php:92
+#: mod/admin.php:109
 msgid "Theme settings updated."
-msgstr "Nastavení téma zobrazení bylo aktualizováno."
+msgstr "Nastavení motivu bylo aktualizováno."
 
-#: mod/admin.php:156 mod/admin.php:954
+#: mod/admin.php:182 src/Content/Nav.php:175
+msgid "Information"
+msgstr "Informace"
+
+#: mod/admin.php:183
+msgid "Overview"
+msgstr "Přehled"
+
+#: mod/admin.php:184 mod/admin.php:723
+msgid "Federation Statistics"
+msgstr "Statistiky Federation"
+
+#: mod/admin.php:185
+msgid "Configuration"
+msgstr "Konfigurace"
+
+#: mod/admin.php:186 mod/admin.php:1425
 msgid "Site"
 msgstr "Web"
 
-#: mod/admin.php:157 mod/admin.php:898 mod/admin.php:1404 mod/admin.php:1420
+#: mod/admin.php:187 mod/admin.php:1354 mod/admin.php:1896 mod/admin.php:1913
 msgid "Users"
 msgstr "Uživatelé"
 
-#: mod/admin.php:159 mod/admin.php:1780 mod/admin.php:1830
+#: mod/admin.php:189 mod/admin.php:2283 mod/admin.php:2327
 msgid "Themes"
-msgstr "Témata"
+msgstr "Motivy"
 
-#: mod/admin.php:161
+#: mod/admin.php:192
+msgid "Database"
+msgstr "Databáze"
+
+#: mod/admin.php:193
 msgid "DB updates"
 msgstr "Aktualizace databáze"
 
-#: mod/admin.php:162 mod/admin.php:406
+#: mod/admin.php:194 mod/admin.php:766
 msgid "Inspect Queue"
-msgstr "Proskoumat frontu"
+msgstr "Prozkoumat frontu"
 
-#: mod/admin.php:163 mod/admin.php:372
-msgid "Federation Statistics"
-msgstr ""
+#: mod/admin.php:195
+msgid "Inspect worker Queue"
+msgstr "Prozkoumat frontu pro pracovníka"
 
-#: mod/admin.php:177 mod/admin.php:188 mod/admin.php:1904
+#: mod/admin.php:196
+msgid "Tools"
+msgstr "Nástroje"
+
+#: mod/admin.php:197
+msgid "Contact Blocklist"
+msgstr "Blokované kontakty"
+
+#: mod/admin.php:198 mod/admin.php:372
+msgid "Server Blocklist"
+msgstr "Blokované servery"
+
+#: mod/admin.php:199 mod/admin.php:531
+msgid "Delete Item"
+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:178 mod/admin.php:1972
+#: mod/admin.php:202 mod/admin.php:2469
 msgid "View Logs"
-msgstr ""
+msgstr "Zobrazit záznamy"
 
-#: mod/admin.php:179
+#: mod/admin.php:204
+msgid "Diagnostics"
+msgstr "Diagnostika"
+
+#: mod/admin.php:205
+msgid "PHP Info"
+msgstr "Info o PHP"
+
+#: mod/admin.php:206
 msgid "probe address"
 msgstr "vyzkoušet adresu"
 
-#: mod/admin.php:180
+#: mod/admin.php:207
 msgid "check webfinger"
 msgstr "vyzkoušet webfinger"
 
-#: mod/admin.php:187
-msgid "Plugin Features"
-msgstr "Funkčnosti rozšíření"
+#: mod/admin.php:226 src/Content/Nav.php:218
+msgid "Admin"
+msgstr "Administrátor"
 
-#: mod/admin.php:189
-msgid "diagnostics"
-msgstr "diagnostika"
+#: mod/admin.php:227
+msgid "Addon Features"
+msgstr "Vlastnosti doplňků"
 
-#: mod/admin.php:190
+#: mod/admin.php:228
 msgid "User registrations waiting for confirmation"
-msgstr "Registrace uživatele čeká na potvrzení"
+msgstr "Registrace uživatelů čekající na potvrzení"
 
-#: mod/admin.php:306
-msgid "unknown"
-msgstr ""
+#: 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 "Administrace"
+
+#: mod/admin.php:311
+msgid "Display Terms of Service"
+msgstr "Ukázat Podmínky používání"
+
+#: 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 "Povolte stránku Podmínky používání. Pokud je toto povoleno, bude na formulář pro registrací a stránku s obecnými informacemi přidán odkaz k podmínkám."
+
+#: mod/admin.php:312
+msgid "Display Privacy Statement"
+msgstr "Zobrazit Prohlášení o soukromí"
+
+#: 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 "Ukázat některé informace ohledně potřebných informací k provozování serveru podle například <a href=\"%s\" target=\"_blank\">Obecného nařízení o ochraně osobních údajů EU (GDPR)</a>"
+
+#: mod/admin.php:313
+msgid "Privacy Statement Preview"
+msgstr "Náhled Prohlášení o soukromí"
+
+#: mod/admin.php:315
+msgid "The Terms of Service"
+msgstr "Podmínky používání"
+
+#: 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 "Zde zadejte Podmínky používání Vašeho serveru. Můžete používat BBCode. Záhlaví sekcí by měly být označeny [h2] a níže."
+
+#: mod/admin.php:363
+msgid "The blocked domain"
+msgstr "Zablokovaná doména"
+
+#: mod/admin.php:364 mod/admin.php:377
+msgid "The reason why you blocked this domain."
+msgstr "Důvod, proč jste doménu zablokoval/a"
 
 #: mod/admin.php:365
+msgid "Delete domain"
+msgstr "Smazat doménu"
+
+#: mod/admin.php:365
+msgid "Check to delete this entry from the blocklist"
+msgstr "Zaškrtnutím odstraníte tuto položku z blokovacího seznamu"
+
+#: 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 "Tato stránka může být použita k definici \"černé listiny\" serverů z federované sítě, kterým není dovoleno interagovat s vaším serverem. Měl/a byste také pro všechny zadané domény uvést důvod, proč jste vzdálený server zablokoval/a."
+
+#: 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 "Seznam zablokovaných server bude zveřejněn na stránce /friendica, takže vaši uživatelé a lidé vyšetřující probém s komunikací mohou důvod najít snadno."
+
+#: mod/admin.php:375
+msgid "Add new entry to block list"
+msgstr "Přidat na blokovací seznam novou položku"
+
+#: mod/admin.php:376
+msgid "Server Domain"
+msgstr "Serverová doména"
+
+#: mod/admin.php:376
+msgid ""
+"The domain of the new server to add to the block list. Do not include the "
+"protocol."
+msgstr "Doména serveru, který má být přidán na blokovací seznam. Vynechejte protokol (\"http://\")."
+
+#: mod/admin.php:377
+msgid "Block reason"
+msgstr "Důvod zablokování"
+
+#: mod/admin.php:378
+msgid "Add Entry"
+msgstr "Přidat položku"
+
+#: mod/admin.php:379
+msgid "Save changes to the blocklist"
+msgstr "Uložit změny do blokovacího seznamu"
+
+#: mod/admin.php:380
+msgid "Current Entries in the Blocklist"
+msgstr "Aktuální položky v bokovacím seznamu"
+
+#: mod/admin.php:383
+msgid "Delete entry from blocklist"
+msgstr "Odstranit položku z blokovacího seznamu"
+
+#: mod/admin.php:386
+msgid "Delete entry from blocklist?"
+msgstr "Odstranit položku z blokovacího seznamu?"
+
+#: mod/admin.php:412
+msgid "Server added to blocklist."
+msgstr "Server přidán do blokovacího seznamu"
+
+#: mod/admin.php:428
+msgid "Site blocklist updated."
+msgstr "Blokovací seznam stránky aktualizován"
+
+#: mod/admin.php:451 src/Core/Console/GlobalCommunityBlock.php:68
+msgid "The contact has been blocked from the node"
+msgstr "Kontakt byl na serveru zablokován"
+
+#: mod/admin.php:453 src/Core/Console/GlobalCommunityBlock.php:65
+#, php-format
+msgid "Could not find any contact entry for this URL (%s)"
+msgstr "Nelze nalézt žádnou položku v kontaktech pro tuto URL adresu (%s)"
+
+#: mod/admin.php:460
+#, php-format
+msgid "%s contact unblocked"
+msgid_plural "%s contacts unblocked"
+msgstr[0] "%s kontakt odblokován"
+msgstr[1] "%s kontakty odblokovány"
+msgstr[2] "%s kontaktu odblokováno"
+msgstr[3] "%s kontaktů odblokováno"
+
+#: mod/admin.php:489
+msgid "Remote Contact Blocklist"
+msgstr "Blokované vzdálené kontakty"
+
+#: mod/admin.php:490
+msgid ""
+"This page allows you to prevent any message from a remote contact to reach "
+"your node."
+msgstr "Tato stránka Vám umožňuje zabránit jakýmkoliv zprávám ze vzdáleného kontaktu, aby se k vašemu serveru dostaly."
+
+#: mod/admin.php:491
+msgid "Block Remote Contact"
+msgstr "Zablokovat vzdálený kontakt"
+
+#: mod/admin.php:492 mod/admin.php:1898
+msgid "select all"
+msgstr "Vybrat vše"
+
+#: mod/admin.php:493
+msgid "select none"
+msgstr "nevybrat žádný"
+
+#: mod/admin.php:494 mod/admin.php:1907 mod/contacts.php:657
+#: mod/contacts.php:849 mod/contacts.php:1105
+msgid "Block"
+msgstr "Blokovat"
+
+#: mod/admin.php:495 mod/admin.php:1909 mod/contacts.php:657
+#: mod/contacts.php:849 mod/contacts.php:1105
+msgid "Unblock"
+msgstr "Odblokovat"
+
+#: mod/admin.php:496
+msgid "No remote contact is blocked from this node."
+msgstr "Žádný vzdálený kontakt není na tomto serveru zablokován."
+
+#: mod/admin.php:498
+msgid "Blocked Remote Contacts"
+msgstr "Zablokovat vzdálené kontakty"
+
+#: mod/admin.php:499
+msgid "Block New Remote Contact"
+msgstr "Zablokovat nový vzdálený kontakt"
+
+#: mod/admin.php:500
+msgid "Photo"
+msgstr "Fotka"
+
+#: mod/admin.php:500 mod/profiles.php:391
+msgid "Address"
+msgstr "Adresa"
+
+#: mod/admin.php:508
+#, php-format
+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ého kontaktu"
+msgstr[3] "Celkem %s zablokovaných kontaktů"
+
+#: mod/admin.php:510
+msgid "URL of the remote contact to block."
+msgstr "Adresa URL vzdáleného kontaktu k zablokování."
+
+#: mod/admin.php:532
+msgid "Delete this Item"
+msgstr "Smazat tuto položku"
+
+#: 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 "Na této stránce můžete smazat položku z Vašeho serveru. Pokud je položkou příspěvek nejvyššího stupně, bude smazáno celé vlákno."
+
+#: 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 "Budete muset znát číslo GUID položky. Můžete jej najít např. v adrese URL. Poslední část adresy http://priklad.cz/display/123456 je GUID, v tomto případě 123456"
+
+#: mod/admin.php:535
+msgid "GUID"
+msgstr "GUID"
+
+#: mod/admin.php:535
+msgid "The GUID of the item you want to delete."
+msgstr "Číslo GUID položky, kterou chcete smazat"
+
+#: mod/admin.php:569
+msgid "Item marked for deletion."
+msgstr "Položka označená ke smazání"
+
+#: mod/admin.php:640
+msgid "unknown"
+msgstr "neznámé"
+
+#: 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 ""
+msgstr "Tato stránka vám nabízí pár čísel pro známou část federované sociální sítě, které je Váš server Friendica součástí. Tato čísla nejsou kompletní, ale pouze odrážejí část sítě, které si je Váš server vědom."
 
-#: mod/admin.php:366
+#: mod/admin.php:717
 msgid ""
 "The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
 "will improve the data displayed here."
-msgstr ""
+msgstr "Funkce <em>Adresář automaticky objevených kontaktů</em> není zapnuta, zlepší zde zobrazená data."
 
-#: mod/admin.php:371 mod/admin.php:405 mod/admin.php:484 mod/admin.php:953
-#: mod/admin.php:1403 mod/admin.php:1521 mod/admin.php:1581 mod/admin.php:1779
-#: mod/admin.php:1829 mod/admin.php:1903 mod/admin.php:1971
-msgid "Administration"
-msgstr "Administrace"
-
-#: mod/admin.php:378
+#: mod/admin.php:729
 #, php-format
-msgid "Currently this node is aware of %d nodes from the following platforms:"
-msgstr ""
+msgid ""
+"Currently this node is aware of %d nodes with %d registered users from the "
+"following platforms:"
+msgstr "Aktuálně si je tento server vědom %d serverů s %d registrovanými uživateli z těchto platforem:"
 
-#: mod/admin.php:408
+#: mod/admin.php:768 mod/admin.php:809
 msgid "ID"
 msgstr "Identifikátor"
 
-#: mod/admin.php:409
+#: mod/admin.php:769
 msgid "Recipient Name"
 msgstr "Jméno příjemce"
 
-#: mod/admin.php:410
+#: mod/admin.php:770
 msgid "Recipient Profile"
 msgstr "Profil píjemce"
 
-#: mod/admin.php:412
+#: mod/admin.php:772 mod/admin.php:811
 msgid "Created"
 msgstr "Vytvořeno"
 
-#: mod/admin.php:413
+#: mod/admin.php:773
 msgid "Last Tried"
 msgstr "Naposled vyzkoušeno"
 
-#: mod/admin.php:414
+#: 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 ""
+msgstr "Na této stránce najdete obsah fronty odchozích příspěvků. Toto jsou příspěvky, u kterých počáteční doručení selhalo. Budou znovu poslány později, a pokud doručení selže trvale, budou nakonec smazány."
 
-#: mod/admin.php:439
+#: mod/admin.php:807
+msgid "Inspect Worker Queue"
+msgstr "Prozkoumat frontu pro pracovníka"
+
+#: mod/admin.php:810
+msgid "Job Parameters"
+msgstr "Parametry úlohy"
+
+#: mod/admin.php:812
+msgid "Priority"
+msgstr "Priorita"
+
+#: 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 "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."
+
+#: 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 "
-"<tt>convert_innodb.sql</tt> in the <tt>/util</tt> directory of your "
-"Friendica installation.<br />"
-msgstr ""
+"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 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:444
+#: mod/admin.php:844
+#, php-format
 msgid ""
-"You are using a MySQL version which does not support all features that "
-"Friendica uses. You should consider switching to MariaDB."
-msgstr ""
+"There is a new version of Friendica available for download. Your current "
+"version is %1$s, upstream version is %2$s"
+msgstr "Je dostupná ke stažení nová verze Friendica. Vaše aktuální verze je %1$s, upstreamová verze je %2$s"
 
-#: mod/admin.php:448 mod/admin.php:1352
+#: 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 "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."
+
+#: mod/admin.php:860
+msgid "The worker was never executed. Please check your database structure!"
+msgstr "Pracovník nebyl nikdy spuštěn. Prosím zkontrolujte strukturu Vaší databáze!"
+
+#: 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 "Pracovník byl naposledy spuštěn v %s UTC. Toto je více než jedna hodina. Prosím zkontrolujte si nastavení crontab."
+
+#: 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 "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>."
+
+#: 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> 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>."
+
+#: mod/admin.php:882
 msgid "Normal Account"
 msgstr "Normální účet"
 
-#: mod/admin.php:449 mod/admin.php:1353
-msgid "Soapbox Account"
-msgstr "Soapbox účet"
+#: mod/admin.php:883
+msgid "Automatic Follower Account"
+msgstr "Účet s automatickými sledovateli"
 
-#: mod/admin.php:450 mod/admin.php:1354
-msgid "Community/Celebrity Account"
-msgstr "Komunitní účet / Účet celebrity"
+#: mod/admin.php:884
+msgid "Public Forum Account"
+msgstr "Účet veřejného fóra"
 
-#: mod/admin.php:451 mod/admin.php:1355
+#: 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:452
+#: mod/admin.php:886
 msgid "Blog Account"
-msgstr "Účet Blogu"
+msgstr "Blogovací účet"
 
-#: mod/admin.php:453
-msgid "Private Forum"
-msgstr "Soukromé fórum"
+#: mod/admin.php:887
+msgid "Private Forum Account"
+msgstr "Účet soukromého fóra"
 
-#: mod/admin.php:479
+#: mod/admin.php:909
 msgid "Message queues"
 msgstr "Fronty zpráv"
 
-#: mod/admin.php:485
+#: mod/admin.php:915
 msgid "Summary"
 msgstr "Shrnutí"
 
-#: mod/admin.php:488
+#: mod/admin.php:917
 msgid "Registered users"
 msgstr "Registrovaní uživatelé"
 
-#: mod/admin.php:490
+#: mod/admin.php:919
 msgid "Pending registrations"
 msgstr "Čekající registrace"
 
-#: mod/admin.php:491
+#: mod/admin.php:920
 msgid "Version"
 msgstr "Verze"
 
-#: mod/admin.php:496
-msgid "Active plugins"
-msgstr "Aktivní pluginy"
+#: mod/admin.php:925
+msgid "Active addons"
+msgstr "Aktivní doplňky"
 
-#: mod/admin.php:521
+#: mod/admin.php:956
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
-msgstr "Nelze zpracovat výchozí url adresu. Musí obsahovat alespoň <schéma>://<doméma>"
+msgstr "Nelze zpracovat výchozí url adresu. Musí obsahovat alespoň <scheme>://<domain>"
 
-#: mod/admin.php:826
-msgid "RINO2 needs mcrypt php extension to work."
-msgstr ""
-
-#: mod/admin.php:834
+#: mod/admin.php:1289
 msgid "Site settings updated."
 msgstr "Nastavení webu aktualizováno."
 
-#: mod/admin.php:881
+#: mod/admin.php:1345
+msgid "No community page for local users"
+msgstr "Žádná komunitní stránka pro lokální uživatele"
+
+#: mod/admin.php:1346
 msgid "No community page"
 msgstr "Komunitní stránka neexistuje"
 
-#: mod/admin.php:882
+#: mod/admin.php:1347
 msgid "Public postings from users of this site"
 msgstr "Počet veřejných příspěvků od uživatele na této stránce"
 
-#: mod/admin.php:883
-msgid "Global community page"
-msgstr "Globální komunitní stránka"
+#: mod/admin.php:1348
+msgid "Public postings from the federated network"
+msgstr "Veřejné příspěvky z federované sítě"
 
-#: mod/admin.php:888 mod/contacts.php:530
-msgid "Never"
-msgstr "Nikdy"
+#: mod/admin.php:1349
+msgid "Public postings from local users and the federated network"
+msgstr "Veřejné příspěvky od lokálních uživatelů a z federované sítě"
 
-#: mod/admin.php:889
-msgid "At post arrival"
-msgstr "Při obdržení příspěvku"
-
-#: mod/admin.php:897 mod/contacts.php:557
+#: mod/admin.php:1353 mod/admin.php:1520 mod/admin.php:1530
+#: mod/contacts.php:577
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#: mod/admin.php:899
+#: mod/admin.php:1355
 msgid "Users, Global Contacts"
-msgstr "Uživatelé, Všechny kontakty"
+msgstr "Uživatelé, globální kontakty"
 
-#: mod/admin.php:900
+#: mod/admin.php:1356
 msgid "Users, Global Contacts/fallback"
-msgstr ""
+msgstr "Uživatelé, globální kontakty/fallback"
 
-#: mod/admin.php:904
+#: mod/admin.php:1360
 msgid "One month"
 msgstr "Jeden měsíc"
 
-#: mod/admin.php:905
+#: mod/admin.php:1361
 msgid "Three months"
 msgstr "Tři měsíce"
 
-#: mod/admin.php:906
+#: mod/admin.php:1362
 msgid "Half a year"
 msgstr "Půl roku"
 
-#: mod/admin.php:907
+#: mod/admin.php:1363
 msgid "One year"
 msgstr "Jeden rok"
 
-#: mod/admin.php:912
+#: mod/admin.php:1368
 msgid "Multi user instance"
-msgstr "Více uživatelská instance"
+msgstr "Víceuživatelská instance"
 
-#: mod/admin.php:935
+#: mod/admin.php:1394
 msgid "Closed"
 msgstr "Uzavřeno"
 
-#: mod/admin.php:936
+#: mod/admin.php:1395
 msgid "Requires approval"
 msgstr "Vyžaduje schválení"
 
-#: mod/admin.php:937
+#: mod/admin.php:1396
 msgid "Open"
-msgstr "Otevřená"
+msgstr "Otevřeno"
 
-#: mod/admin.php:941
+#: mod/admin.php:1400
 msgid "No SSL policy, links will track page SSL state"
-msgstr "Žádná SSL politika, odkazy budou následovat stránky SSL stav"
+msgstr "Žádná SSL politika, odkazy budou následovat SSL stav stránky"
 
-#: mod/admin.php:942
+#: mod/admin.php:1401
 msgid "Force all links to use SSL"
 msgstr "Vyžadovat u všech odkazů použití SSL"
 
-#: mod/admin.php:943
+#: mod/admin.php:1402
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Certifikát podepsaný sám sebou, použít SSL pouze pro lokální odkazy (nedoporučeno)"
 
-#: mod/admin.php:957
+#: mod/admin.php:1406
+msgid "Don't check"
+msgstr "Nekontrolovat"
+
+#: mod/admin.php:1407
+msgid "check the stable version"
+msgstr "kontrolovat stabilní verzi"
+
+#: mod/admin.php:1408
+msgid "check the development version"
+msgstr "kontrolovat vývojovou verzi"
+
+#: mod/admin.php:1427
+msgid "Republish users to directory"
+msgstr "Znovu publikovat uživatele do adresáře"
+
+#: mod/admin.php:1429
 msgid "File upload"
 msgstr "Nahrání souborů"
 
-#: mod/admin.php:958
+#: mod/admin.php:1430
 msgid "Policies"
 msgstr "Politiky"
 
-#: mod/admin.php:960
+#: mod/admin.php:1431 mod/contacts.php:926 mod/events.php:535
+#: src/Model/Profile.php:852
+msgid "Advanced"
+msgstr "Pokročilé"
+
+#: mod/admin.php:1432
 msgid "Auto Discovered Contact Directory"
-msgstr ""
+msgstr "Adresář automaticky objevených kontaktů"
 
-#: mod/admin.php:961
+#: mod/admin.php:1433
 msgid "Performance"
-msgstr "Výkonnost"
+msgstr "Výkon"
 
-#: mod/admin.php:962
+#: mod/admin.php:1434
 msgid "Worker"
-msgstr ""
+msgstr "Pracovník (worker)"
 
-#: mod/admin.php:963
+#: mod/admin.php:1435
+msgid "Message Relay"
+msgstr "Přeposílání zpráv"
+
+#: mod/admin.php:1436
 msgid ""
 "Relocate - WARNING: advanced function. Could make this server unreachable."
-msgstr "Změna umístění - Varování: pokročilá funkčnost. Tímto můžete znepřístupnit server."
+msgstr "Přemístit - VAROVÁNÍ: pokročilá funkce. Tímto můžete znepřístupnit server."
 
-#: mod/admin.php:966
+#: mod/admin.php:1439
 msgid "Site name"
 msgstr "Název webu"
 
-#: mod/admin.php:967
+#: mod/admin.php:1440
 msgid "Host name"
 msgstr "Jméno hostitele (host name)"
 
-#: mod/admin.php:968
+#: mod/admin.php:1441
 msgid "Sender Email"
-msgstr "Email ddesílatele"
+msgstr "E-mail odesílatele"
 
-#: mod/admin.php:968
+#: mod/admin.php:1441
 msgid ""
 "The email address your server shall use to send notification emails from."
-msgstr ""
+msgstr "E-mailová adresa, kterou bude Váš server používat pro posílání e-mailů s oznámeními."
 
-#: mod/admin.php:969
+#: mod/admin.php:1442
 msgid "Banner/Logo"
 msgstr "Banner/logo"
 
-#: mod/admin.php:970
+#: mod/admin.php:1443
 msgid "Shortcut icon"
-msgstr "Ikona zkratky"
+msgstr "Favikona"
 
-#: mod/admin.php:970
+#: mod/admin.php:1443
 msgid "Link to an icon that will be used for browsers."
-msgstr ""
+msgstr "Odkaz k ikoně, která bude použita pro prohlížeče."
 
-#: mod/admin.php:971
+#: mod/admin.php:1444
 msgid "Touch icon"
 msgstr "Dotyková ikona"
 
-#: mod/admin.php:971
+#: mod/admin.php:1444
 msgid "Link to an icon that will be used for tablets and mobiles."
-msgstr ""
+msgstr "Odkaz k ikoně, která bude použita pro tablety a mobilní zařízení."
 
-#: mod/admin.php:972
+#: mod/admin.php:1445
 msgid "Additional Info"
 msgstr "Dodatečné informace"
 
-#: mod/admin.php:972
+#: mod/admin.php:1445
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
-"listed at %s/siteinfo."
-msgstr ""
+"listed at %s/servers."
+msgstr "Pro veřejné servery: zde můžete přidat dodatečné informace, které budou vypsané na stránce %s/servers."
 
-#: mod/admin.php:973
+#: mod/admin.php:1446
 msgid "System language"
 msgstr "Systémový jazyk"
 
-#: mod/admin.php:974
+#: mod/admin.php:1447
 msgid "System theme"
-msgstr "Grafická šablona systému "
+msgstr "Systémový motiv"
 
-#: mod/admin.php:974
+#: mod/admin.php:1447
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
-msgstr "Defaultní systémové téma - může být změněno v uživatelských profilech - <a href='#' id='cnftheme'> změnit  theme settings</a>"
+msgstr "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>"
 
-#: mod/admin.php:975
+#: mod/admin.php:1448
 msgid "Mobile system theme"
-msgstr "Systémové téma zobrazení pro mobilní zařízení"
+msgstr "Mobilní systémový motiv"
 
-#: mod/admin.php:975
+#: mod/admin.php:1448
 msgid "Theme for mobile devices"
-msgstr "Téma zobrazení pro mobilní zařízení"
+msgstr "Motiv pro mobilní zařízení"
 
-#: mod/admin.php:976
+#: mod/admin.php:1449
 msgid "SSL link policy"
 msgstr "Politika SSL odkazů"
 
-#: mod/admin.php:976
+#: mod/admin.php:1449
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Určuje, zda-li budou generované odkazy používat SSL"
 
-#: mod/admin.php:977
+#: mod/admin.php:1450
 msgid "Force SSL"
 msgstr "Vynutit SSL"
 
-#: mod/admin.php:977
+#: mod/admin.php:1450
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
 msgstr "Vynutit SSL pro všechny ne-SSL žádosti - Upozornění: na některých systémech může dojít k nekonečnému zacyklení."
 
-#: mod/admin.php:978
-msgid "Old style 'Share'"
-msgstr "Sdílení \"postaru\""
-
-#: mod/admin.php:978
-msgid "Deactivates the bbcode element 'share' for repeating items."
-msgstr "Deaktivovat bbcode element \"share\" pro opakující se položky."
-
-#: mod/admin.php:979
+#: mod/admin.php:1451
 msgid "Hide help entry from navigation menu"
-msgstr "skrýt nápovědu z navigačního menu"
+msgstr "Skrýt nápovědu z navigačního menu"
 
-#: mod/admin.php:979
+#: 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 "Skryje menu ze stránek Nápověda z navigačního menu. Nápovědu můžete stále zobrazit přímo zadáním /help."
+msgstr "Skryje z navigačního menu položku pro stránky nápovědy. Nápovědu můžete stále zobrazit přímo zadáním /help."
 
-#: mod/admin.php:980
+#: mod/admin.php:1452
 msgid "Single user instance"
 msgstr "Jednouživatelská instance"
 
-#: mod/admin.php:980
+#: mod/admin.php:1452
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "Nastavit tuto instanci víceuživatelskou nebo jednouživatelskou pro pojmenovaného uživatele"
 
-#: mod/admin.php:981
+#: mod/admin.php:1453
 msgid "Maximum image size"
 msgstr "Maximální velikost obrázků"
 
-#: mod/admin.php:981
+#: mod/admin.php:1453
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
-msgstr "Maximální velikost v bajtech nahraných obrázků. Defaultní je 0, což znamená neomezeno."
+msgstr "Maximální velikost nahraných obrázků v bajtech. Výchozí hodnota je 0, což znamená bez omezení."
 
-#: mod/admin.php:982
+#: mod/admin.php:1454
 msgid "Maximum image length"
 msgstr "Maximální velikost obrázků"
 
-#: mod/admin.php:982
+#: mod/admin.php:1454
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
-msgstr "Maximální délka v pixelech delší stránky nahrávaných obrázků. Defaultně je -1, což označuje bez limitu"
+msgstr "Maximální délka delší stránky nahrávaných obrázků v pixelech. Výchozí hodnota je -1, což znamená bez omezení."
 
-#: mod/admin.php:983
+#: mod/admin.php:1455
 msgid "JPEG image quality"
-msgstr "JPEG kvalita obrázku"
+msgstr "Kvalita obrázků JPEG"
 
-#: mod/admin.php:983
+#: 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]. Defaultní 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:985
+#: mod/admin.php:1457
 msgid "Register policy"
 msgstr "Politika registrace"
 
-#: mod/admin.php:986
+#: mod/admin.php:1458
 msgid "Maximum Daily Registrations"
 msgstr "Maximální počet denních registrací"
 
-#: mod/admin.php:986
+#: 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 "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:987
+#: mod/admin.php:1459
 msgid "Register text"
-msgstr "Registrace textu"
+msgstr "Text při registraci"
 
-#: mod/admin.php:987
-msgid "Will be displayed prominently on the registration page."
-msgstr "Bude zřetelně zobrazeno na registrační stránce."
+#: mod/admin.php:1459
+msgid ""
+"Will be displayed prominently on the registration page. You can use BBCode "
+"here."
+msgstr "Bude zobrazen viditelně na stránce registrace. Zde můžete používat BBCode."
 
-#: mod/admin.php:988
+#: mod/admin.php:1460
+msgid "Forbidden Nicknames"
+msgstr "Zakázané přezdívky"
+
+#: 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 "Seznam přezdívek, které nelze registrovat, oddělených čárkami. Přednastaven je seznam častých přezdívek dle RFC 2142."
+
+#: 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:988
+#: mod/admin.php:1461
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
-msgstr "Neztrácejte systémové zdroje kontaktováním externích webů s opuštěnými účty. Zadejte 0 pro žádný časový limit."
+msgstr "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."
 
-#: mod/admin.php:989
+#: mod/admin.php:1462
 msgid "Allowed friend domains"
 msgstr "Povolené domény přátel"
 
-#: mod/admin.php:989
+#: 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 "Čá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:990
+#: mod/admin.php:1463
 msgid "Allowed email domains"
 msgstr "Povolené e-mailové domény"
 
-#: mod/admin.php:990
+#: 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 "Čá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:991
+#: mod/admin.php:1464
+msgid "No OEmbed rich content"
+msgstr "Žádný obohacený obsah oEmbed"
+
+#: mod/admin.php:1464
+msgid ""
+"Don't show the rich content (e.g. embedded PDF), except from the domains "
+"listed below."
+msgstr "Neukazovat obohacený obsah (např. vložené PDF dokumenty), kromě toho z domén vypsaných níže."
+
+#: mod/admin.php:1465
+msgid "Allowed OEmbed domains"
+msgstr "Povolené domény pro oEmbed"
+
+#: mod/admin.php:1465
+msgid ""
+"Comma separated list of domains which oembed content is allowed to be "
+"displayed. Wildcards are accepted."
+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"
-msgstr "Blokovat veřejnost"
+msgstr "Blokovat veřejný přístup"
 
-#: mod/admin.php:991
+#: 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 "Označemím přepínače zablokujete veřejný přístup ke všem jinak veřejně přístupným soukromým stránkám uživatelům, kteří nebudou přihlášeni."
+msgstr "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."
 
-#: mod/admin.php:992
+#: mod/admin.php:1467
 msgid "Force publish"
-msgstr "Publikovat"
+msgstr "Vynutit publikaci"
 
-#: mod/admin.php:992
+#: mod/admin.php:1467
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
-msgstr "Označením přepínače budou včechny profily na tomto webu uvedeny v adresáři webu."
+msgstr "Označením budou všechny profily na tomto serveru uvedeny v adresáři stránky."
 
-#: mod/admin.php:993
+#: mod/admin.php:1467
+msgid "Enabling this may violate privacy laws like the GDPR"
+msgstr "Povolení této funkce může porušit zákony o ochraně soukromí, jako je Obecné nařízení o ochraně osobních údajů (GDPR)"
+
+#: mod/admin.php:1468
 msgid "Global directory URL"
-msgstr ""
+msgstr "Adresa URL globálního adresáře"
 
-#: mod/admin.php:993
+#: 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 ""
+msgstr "Adresa URL globálního adresáře. Pokud toto není nastaveno, globální adresář bude aplikaci naprosto nedostupný."
 
-#: mod/admin.php:994
-msgid "Allow threaded items"
-msgstr "Povolit vícevláknové zpracování obsahu"
-
-#: mod/admin.php:994
-msgid "Allow infinite level threading for items on this site."
-msgstr "Povolit zpracování obsahu tohoto webu neomezeným počtem paralelních vláken."
-
-#: mod/admin.php:995
+#: mod/admin.php:1469
 msgid "Private posts by default for new users"
 msgstr "Nastavit pro nové uživatele příspěvky jako soukromé"
 
-#: mod/admin.php:995
+#: mod/admin.php:1469
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr "Nastavit defaultní práva pro příspěvky od všech nových členů na výchozí soukromou skupinu raději než jako veřejné."
 
-#: mod/admin.php:996
+#: mod/admin.php:1470
 msgid "Don't include post content in email notifications"
 msgstr "Nezahrnovat obsah příspěvků v emailových upozorněních"
 
-#: mod/admin.php:996
+#: 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 " V mailových upozorněních, které jsou odesílány z tohoto webu jako soukromé zprávy, nejsou z důvodů bezpečnosti obsaženy příspěvky/komentáře/soukromé zprávy apod. "
 
-#: mod/admin.php:997
+#: mod/admin.php:1471
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr "Zakázat veřejný přístup k rozšířením uvedeným v menu aplikace."
 
-#: mod/admin.php:997
+#: mod/admin.php:1471
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr "Označení této volby omezí rozšíření uvedená v menu aplikace pouze pro členy."
 
-#: mod/admin.php:998
+#: mod/admin.php:1472
 msgid "Don't embed private images in posts"
 msgstr "Nepovolit přidávání soukromých správ v příspěvcích"
 
-#: mod/admin.php:998
+#: 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 "Nereplikovat lokální soukromé fotografie v příspěvcích s přidáním kopie obrázku. To znamená, že kontakty, které obdrží příspěvek obsahující soukromé fotografie se budou muset přihlásit 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:999
+#: mod/admin.php:1473
+msgid "Explicit Content"
+msgstr "Explicitní obsah"
+
+#: 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 "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."
+
+#: mod/admin.php:1474
 msgid "Allow Users to set remote_self"
 msgstr "Umožnit uživatelům nastavit "
 
-#: mod/admin.php:999
+#: 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 "S tímto označením má každý uživatel možnost označit jakékoliv ze svých kontakt jako \"remote_self\" v nastavení v dialogu opravit kontakt. Tímto označením se budou zrcadlit všechny správy tohoto kontaktu v uživatelově proudu."
 
-#: mod/admin.php:1000
+#: mod/admin.php:1475
 msgid "Block multiple registrations"
 msgstr "Blokovat více registrací"
 
-#: mod/admin.php:1000
+#: mod/admin.php:1475
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Znemožnit uživatelům registraci dodatečných účtů k použití jako stránky."
 
-#: mod/admin.php:1001
+#: mod/admin.php:1476
 msgid "OpenID support"
-msgstr "podpora OpenID"
+msgstr "Podpora OpenID"
 
-#: mod/admin.php:1001
+#: mod/admin.php:1476
 msgid "OpenID support for registration and logins."
 msgstr "Podpora OpenID pro registraci a přihlašování."
 
-#: mod/admin.php:1002
+#: mod/admin.php:1477
 msgid "Fullname check"
-msgstr "kontrola úplného jména"
+msgstr "Kontrola úplného jména"
 
-#: mod/admin.php:1002
+#: mod/admin.php:1477
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr "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í."
 
-#: mod/admin.php:1003
-msgid "UTF-8 Regular expressions"
-msgstr "UTF-8 Regulární výrazy"
+#: mod/admin.php:1478
+msgid "Community pages for visitors"
+msgstr "Komunitní stránky pro návštěvníky"
 
-#: mod/admin.php:1003
-msgid "Use PHP UTF8 regular expressions"
-msgstr "Použít PHP UTF8 regulární výrazy."
-
-#: mod/admin.php:1004
-msgid "Community Page Style"
-msgstr "Styl komunitní stránky"
-
-#: mod/admin.php:1004
+#: mod/admin.php:1478
 msgid ""
-"Type of community page to show. 'Global community' shows every public "
-"posting from an open distributed network that arrived on this server."
-msgstr "Typ komunitní stránky k zobrazení. 'Glogální komunita' zobrazuje každý veřejný příspěvek z otevřené distribuované sítě, která dorazí na tento server."
+"Which community pages should be available for visitors. Local users always "
+"see both pages."
+msgstr "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."
 
-#: mod/admin.php:1005
+#: mod/admin.php:1479
 msgid "Posts per user on community page"
 msgstr "Počet příspěvků na komunitní stránce"
 
-#: mod/admin.php:1005
+#: mod/admin.php:1479
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
 msgstr "Maximální počet příspěvků na uživatele na komunitní sptránce. (neplatí pro 'Globální komunitu')"
 
-#: mod/admin.php:1006
+#: mod/admin.php:1480
 msgid "Enable OStatus support"
-msgstr "Zapnout podporu OStatus"
+msgstr "Zapnout podporu pro OStatus"
 
-#: mod/admin.php:1006
+#: 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 "Poskytnout zabudouvanou kompatibilitu s OStatus (StatusNet, GNU Social apod.). Veškerá komunikace s OStatus je veřejná, proto bude občas zobrazeno upozornění."
 
-#: mod/admin.php:1007
-msgid "OStatus conversation completion interval"
-msgstr "Interval dokončení konverzace OStatus"
-
-#: mod/admin.php:1007
-msgid ""
-"How often shall the poller check for new entries in OStatus conversations? "
-"This can be a very ressource task."
-msgstr "Jak často by mělo probíhat ověřování pro nové přísvěvky v konverzacích OStatus? Toto může být velmi výkonově náročný úkol."
-
-#: mod/admin.php:1008
+#: mod/admin.php:1481
 msgid "Only import OStatus threads from our contacts"
-msgstr ""
+msgstr "Pouze importovat vlákna z OStatus z našich kontaktů"
 
-#: mod/admin.php:1008
+#: 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 ""
+msgstr "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ý."
 
-#: mod/admin.php:1009
+#: mod/admin.php:1482
 msgid "OStatus support can only be enabled if threading is enabled."
-msgstr ""
+msgstr "Podpora pro OStatus může být zapnuta pouze, je-li povolen threading."
 
-#: mod/admin.php:1011
+#: mod/admin.php:1484
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub"
 " directory."
-msgstr ""
+msgstr "Podpora pro Diasporu nemůže být zapnuta, protože Friendica byla nainstalována do podadresáře."
 
-#: mod/admin.php:1012
+#: mod/admin.php:1485
 msgid "Enable Diaspora support"
-msgstr "Povolit podporu Diaspora"
+msgstr "Zapnout podporu pro Diaspora"
 
-#: mod/admin.php:1012
+#: mod/admin.php:1485
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Poskytnout zabudovanou kompatibilitu sitě Diaspora."
 
-#: mod/admin.php:1013
+#: mod/admin.php:1486
 msgid "Only allow Friendica contacts"
-msgstr "Povolit pouze Friendica kontakty"
+msgstr "Povolit pouze kontakty z Friendica"
 
-#: mod/admin.php:1013
+#: mod/admin.php:1486
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "Všechny kontakty musí používat Friendica protokol. Všchny jiné zabudované komunikační protokoly budou zablokované."
 
-#: mod/admin.php:1014
+#: mod/admin.php:1487
 msgid "Verify SSL"
 msgstr "Ověřit SSL"
 
-#: mod/admin.php:1014
+#: 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 "Pokud si přejete, můžete vynutit striktní ověřování certifikátů. To znamená že se nebudete moci připojit k žádnému serveru s vlastním SSL certifikátem."
 
-#: mod/admin.php:1015
+#: mod/admin.php:1488
 msgid "Proxy user"
 msgstr "Proxy uživatel"
 
-#: mod/admin.php:1016
+#: mod/admin.php:1489
 msgid "Proxy URL"
 msgstr "Proxy URL adresa"
 
-#: mod/admin.php:1017
+#: mod/admin.php:1490
 msgid "Network timeout"
-msgstr "čas síťového spojení vypršelo (timeout)"
+msgstr "Čas síťového spojení vypršel (timeout)"
 
-#: mod/admin.php:1017
+#: mod/admin.php:1490
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Hodnota ve vteřinách. Nastavte 0 pro neomezeno (není doporučeno)."
 
-#: mod/admin.php:1018
-msgid "Delivery interval"
-msgstr "Interval doručování"
-
-#: mod/admin.php:1018
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
-msgstr "Prodleva mezi doručovacími procesy běžícími na pozadí snižuje zátěž systému. Doporučené nastavení: 4-5 pro sdílené instalace, 2-3 pro virtuální soukromé servery, 0-1 pro velké dedikované servery."
-
-#: mod/admin.php:1019
-msgid "Poll interval"
-msgstr "Dotazovací interval"
-
-#: mod/admin.php:1019
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
-msgstr "Tímto nastavením ovlivníte prodlení mezi aktualizačními procesy běžícími na pozadí, čímž můžete snížit systémovou zátěž. Pokud 0, použijte doručovací interval."
-
-#: mod/admin.php:1020
+#: mod/admin.php:1491
 msgid "Maximum Load Average"
 msgstr "Maximální průměrné zatížení"
 
-#: mod/admin.php:1020
+#: mod/admin.php:1491
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
-msgstr "Maximální zatížení systému před pozastavením procesů zajišťujících doručování aktualizací - defaultně 50"
+msgstr "Maximální zatížení systému před pozastavením procesů zajišťujících doručování aktualizací - výchozí hodnota 50"
 
-#: mod/admin.php:1021
+#: mod/admin.php:1492
 msgid "Maximum Load Average (Frontend)"
 msgstr "Maximální průměrné zatížení (Frontend)"
 
-#: mod/admin.php:1021
+#: mod/admin.php:1492
 msgid "Maximum system load before the frontend quits service - default 50."
-msgstr "Maximální zatížení systému předtím, než frontend ukončí službu - defaultně 50"
+msgstr "Maximální zatížení systému předtím, než frontend ukončí službu - výchozí hodnota 50"
 
-#: mod/admin.php:1022
-msgid "Maximum table size for optimization"
-msgstr ""
+#: mod/admin.php:1493
+msgid "Minimal Memory"
+msgstr "Minimální paměť"
 
-#: mod/admin.php:1022
+#: mod/admin.php:1493
 msgid ""
-"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
-"Enter -1 to disable it."
-msgstr ""
+"Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
+"default 0 (deactivated)."
+msgstr "Minimální volná paměť v MB pro pracovníka. Potřebuje přístup do /proc/meminfo - výchozí hodnota 0 (deaktivováno)"
 
-#: mod/admin.php:1023
+#: mod/admin.php:1494
+msgid "Maximum table size for optimization"
+msgstr "Maximální velikost tabulky pro optimalizaci"
+
+#: mod/admin.php:1494
+msgid ""
+"Maximum table size (in MB) for the automatic optimization. Enter -1 to "
+"disable it."
+msgstr "Maximální velikost tabulky (v MB) pro automatickou optimalizaci. Zadáním -1 ji vypnete."
+
+#: mod/admin.php:1495
 msgid "Minimum level of fragmentation"
-msgstr ""
+msgstr "Minimální úroveň fragmentace"
 
-#: mod/admin.php:1023
+#: mod/admin.php:1495
 msgid ""
 "Minimum fragmenation level to start the automatic optimization - default "
 "value is 30%."
-msgstr ""
+msgstr "Minimální úroveň fragmentace pro spuštění automatické optimalizace - výchozí hodnota je 30%."
 
-#: mod/admin.php:1025
+#: mod/admin.php:1497
 msgid "Periodical check of global contacts"
 msgstr "Pravidelně ověřování globálních kontaktů"
 
-#: mod/admin.php:1025
+#: 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 ""
+msgstr "Pokud je toto povoleno, budou globální kontakty pravidelně kontrolovány pro zastaralá data a životnost kontaktů a serverů."
 
-#: mod/admin.php:1026
+#: mod/admin.php:1498
 msgid "Days between requery"
-msgstr ""
+msgstr "Dny mezi dotazy"
 
-#: mod/admin.php:1026
+#: mod/admin.php:1498
 msgid "Number of days after which a server is requeried for his contacts."
-msgstr ""
+msgstr "Počet dnů, po kterých je server znovu dotázán na své kontakty"
 
-#: mod/admin.php:1027
+#: mod/admin.php:1499
 msgid "Discover contacts from other servers"
 msgstr "Objevit kontakty z ostatních serverů"
 
-#: mod/admin.php:1027
+#: 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 "
@@ -7055,303 +5419,363 @@ msgid ""
 "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 ""
+msgstr "Periodicky dotazovat ostatní servery pro kontakty. Můžete si vybrat mezi možnostmi: \"uživatelé\" - uživatelé na vzdáleném systému, a \"globální kontakty\" - aktivní kontakty, které jsou známy na systému. Funkce fallback je určena pro servery Redmatrix a starší servery Friendica, kde globální kontakty nejsou dostupné. Fallback zvyšuje serverovou zátěž, doporučené nastavení je proto \"Uživatelé, globální kontakty\"."
 
-#: mod/admin.php:1028
+#: mod/admin.php:1500
 msgid "Timeframe for fetching global contacts"
-msgstr ""
+msgstr "Časový rámec pro načítání globálních kontaktů"
 
-#: mod/admin.php:1028
+#: 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 ""
+msgstr "Pokud je aktivováno objevování, tato hodnota definuje časový rámec pro aktivitu globálních kontaktů, které jsou načteny z jiných serverů."
 
-#: mod/admin.php:1029
+#: mod/admin.php:1501
 msgid "Search the local directory"
 msgstr "Hledat  v lokálním adresáři"
 
-#: mod/admin.php:1029
+#: 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 ""
+msgstr "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í."
 
-#: mod/admin.php:1031
+#: mod/admin.php:1503
 msgid "Publish server information"
 msgstr "Zveřejnit informace o serveru"
 
-#: mod/admin.php:1031
+#: 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 ""
+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:1033
-msgid "Use MySQL full text engine"
-msgstr "Použít fulltextový vyhledávací stroj MySQL"
+#: mod/admin.php:1505
+msgid "Check upstream version"
+msgstr "Zkontrolovat upstreamovou verzi"
 
-#: mod/admin.php:1033
+#: mod/admin.php:1505
 msgid ""
-"Activates the full text engine. Speeds up search - but can only search for "
-"four and more characters."
-msgstr "Aktivuje fulltextový vyhledávací stroj. Zrychluje vyhledávání ale pouze pro vyhledávání čtyř a více znaků"
+"Enables checking for new Friendica versions at github. If there is a new "
+"version, you will be informed in the admin panel overview."
+msgstr "Umožní kontrolovat nové verze Friendica na GitHubu. Pokud existuje nová verze, budete informován/a na přehledu administračního panelu."
 
-#: mod/admin.php:1034
-msgid "Suppress Language"
-msgstr "Potlačit Jazyk"
-
-#: mod/admin.php:1034
-msgid "Suppress language information in meta information about a posting."
-msgstr "Potlačit jazykové informace v meta informacích o příspěvcích"
-
-#: mod/admin.php:1035
+#: mod/admin.php:1506
 msgid "Suppress Tags"
 msgstr "Potlačit štítky"
 
-#: mod/admin.php:1035
+#: mod/admin.php:1506
 msgid "Suppress showing a list of hashtags at the end of the posting."
-msgstr "Potlačit zobrazení listu hastagů na konci zprávy."
+msgstr "Potlačit zobrazení seznamu hastagů na konci příspěvků."
 
-#: mod/admin.php:1036
+#: mod/admin.php:1507
+msgid "Clean database"
+msgstr "Vyčistit databázi"
+
+#: mod/admin.php:1507
+msgid ""
+"Remove old remote items, orphaned database records and old content from some"
+" other helper tables."
+msgstr "Odstranit staré vzdálené položky, osiřelé záznamy v databázi a starý obsah z některých dalších pomocných tabulek."
+
+#: mod/admin.php:1508
+msgid "Lifespan of remote items"
+msgstr "Životnost vzdálených položek"
+
+#: 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 "Pokud je zapnuto čištění databáze, tato funkce definuje počet dnů, po kterých budou smazány vzdálené položky. Vlastní položky a označené či vyplněné položky jsou vždy ponechány. Hodnota 0 tuto funkci vypíná."
+
+#: mod/admin.php:1509
+msgid "Lifespan of unclaimed items"
+msgstr "Životnost nevyžádaných položek"
+
+#: 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 "Pokud je zapnuto čištění databáze, tato funkce definuje počet dnů, po kterých budou smazány nevyžádané vzdálené položky (většinou obsah z přeposílacího serveru). Výchozí hodnota je 90 dní. Pokud je zadaná hodnota 0, výchozí hodnotou bude obecná hodnota životnosti vzdálených položek."
+
+#: mod/admin.php:1510
 msgid "Path to item cache"
-msgstr "Cesta k položkám vyrovnávací paměti"
+msgstr "Cesta k položkám v mezipaměti"
 
-#: mod/admin.php:1036
+#: mod/admin.php:1510
 msgid "The item caches buffers generated bbcode and external images."
-msgstr ""
+msgstr "V mezipaměti je uložen vygenerovaný BBCode a externí obrázky."
 
-#: mod/admin.php:1037
+#: mod/admin.php:1511
 msgid "Cache duration in seconds"
 msgstr "Doba platnosti vyrovnávací paměti v sekundách"
 
-#: mod/admin.php:1037
+#: 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 "Jak dlouho by měla vyrovnávací paměť držet data? Výchozí hodnota je 86400 sekund (Jeden den). Pro vypnutí funkce vyrovnávací paměti nastavte hodnotu na -1."
 
-#: mod/admin.php:1038
+#: mod/admin.php:1512
 msgid "Maximum numbers of comments per post"
 msgstr "Maximální počet komentářů k příspěvku"
 
-#: mod/admin.php:1038
+#: mod/admin.php:1512
 msgid "How much comments should be shown for each post? Default value is 100."
-msgstr "Kolik komentářů by mělo být zobrazeno k každému příspěvku? Defaultní hodnota je 100."
+msgstr "Kolik komentářů by mělo být zobrazeno k každému příspěvku? Výchozí hodnotou je 100."
 
-#: mod/admin.php:1039
-msgid "Path for lock file"
-msgstr "Cesta k souboru zámku"
-
-#: mod/admin.php:1039
-msgid ""
-"The lock file is used to avoid multiple pollers at one time. Only define a "
-"folder here."
-msgstr ""
-
-#: mod/admin.php:1040
+#: mod/admin.php:1513
 msgid "Temp path"
 msgstr "Cesta k dočasným souborům"
 
-#: mod/admin.php:1040
+#: 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 ""
+msgstr "Pokud máte omezený systém, kde webový server nemá přístup k systémové složce temp, zde zadejte jinou cestu."
 
-#: mod/admin.php:1041
+#: mod/admin.php:1514
 msgid "Base path to installation"
 msgstr "Základní cesta k instalaci"
 
-#: mod/admin.php:1041
+#: 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 ""
+msgstr "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."
 
-#: mod/admin.php:1042
+#: mod/admin.php:1515
 msgid "Disable picture proxy"
 msgstr "Vypnutí obrázkové proxy"
 
-#: mod/admin.php:1042
+#: mod/admin.php:1515
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
-" systems with very low bandwith."
-msgstr "Obrázková proxi zvyšuje výkonnost a soukromí. Neměla by být použita na systémech s pomalým připojením k síti."
+" systems with very low bandwidth."
+msgstr "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í."
 
-#: mod/admin.php:1043
-msgid "Enable old style pager"
-msgstr "Aktivovat \"old style\" stránkování "
-
-#: mod/admin.php:1043
-msgid ""
-"The old style pager has page numbers but slows down massively the page "
-"speed."
-msgstr " \"old style\" stránkování zobrazuje čísla stránek ale značně zpomaluje rychlost stránky."
-
-#: mod/admin.php:1044
+#: 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:1044
+#: mod/admin.php:1516
 msgid "On large systems the text search can slow down the system extremely."
 msgstr "Textové vyhledávání může u rozsáhlých systémů znamenat velmi citelné zpomalení systému."
 
-#: mod/admin.php:1046
+#: mod/admin.php:1518
 msgid "New base url"
 msgstr "Nová výchozí url adresa"
 
-#: mod/admin.php:1046
+#: mod/admin.php:1518
 msgid ""
-"Change base url for this server. Sends relocate message to all DFRN contacts"
-" of all users."
-msgstr ""
+"Change base url for this server. Sends relocate message to all Friendica and"
+" Diaspora* contacts of all users."
+msgstr "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ů."
 
-#: mod/admin.php:1048
+#: mod/admin.php:1520
 msgid "RINO Encryption"
 msgstr "RINO Šifrování"
 
-#: mod/admin.php:1048
+#: mod/admin.php:1520
 msgid "Encryption layer between nodes."
-msgstr "Šifrovací vrstva mezi nódy."
+msgstr "Šifrovací vrstva mezi servery."
 
-#: mod/admin.php:1049
-msgid "Embedly API key"
-msgstr ""
+#: mod/admin.php:1520
+msgid "Enabled"
+msgstr "Povoleno"
 
-#: mod/admin.php:1049
-msgid ""
-"<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
-"web pages. This is an optional parameter."
-msgstr ""
-
-#: mod/admin.php:1051
-msgid "Enable 'worker' background processing"
-msgstr ""
-
-#: mod/admin.php:1051
-msgid ""
-"The worker background processing limits the number of parallel background "
-"jobs to a maximum number and respects the system load."
-msgstr ""
-
-#: mod/admin.php:1052
+#: mod/admin.php:1522
 msgid "Maximum number of parallel workers"
-msgstr ""
+msgstr "Maximální počet paralelních pracovníků"
 
-#: mod/admin.php:1052
+#: 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."
-msgstr ""
+"On shared hosters set this to %d. On larger systems, values of %d are great."
+" Default value is %d."
+msgstr "Na sdílených hostinzích toto nastavte na hodnotu %d. Na větších systémech se hodí hodnoty kolem %d. Výchozí hodnotou je %d."
 
-#: mod/admin.php:1053
+#: mod/admin.php:1523
 msgid "Don't use 'proc_open' with the worker"
-msgstr ""
+msgstr "Nepoužívat \"proc_open\" s pracovníkem"
 
-#: mod/admin.php:1053
+#: 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 poller calls in your crontab."
-msgstr ""
+"frequency of worker calls in your crontab."
+msgstr "Toto zapněte, pokud Váš systém nedovoluje používání \"proc_open\". To se může stát na sdíleném hostingu. Pokud je toto povoleno, bude zvýšena častost vyvolávání pracovníka v crontabu."
 
-#: mod/admin.php:1054
+#: mod/admin.php:1524
 msgid "Enable fastlane"
-msgstr ""
+msgstr "Povolit fastlane"
 
-#: mod/admin.php:1054
+#: 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 ""
+msgstr "Pokud je toto povoleno, mechanismus fastlane spustí dodatečného pracovníka, pokud jsou procesy vyšší priority zablokované procesy nižší priority."
 
-#: mod/admin.php:1055
+#: mod/admin.php:1525
 msgid "Enable frontend worker"
-msgstr ""
+msgstr "Povolit frontendového pracovníka"
 
-#: mod/admin.php:1055
+#: mod/admin.php:1525
+#, php-format
 msgid ""
 "When enabled the Worker process is triggered when backend access is "
-"performed (e.g. messages being delivered). On smaller sites you might want "
-"to call yourdomain.tld/worker on a regular basis via an external cron job. "
+"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. The worker background process needs to be activated for "
-"this."
-msgstr ""
+" on your server."
+msgstr "Pokud je toto povoleno, bude proces pracovníka vyvolán, pokud je proveden backendový přístup \\x28např. když jsou doručovány zprávy\\x29. Na menších stránkách možná budete chtít pravidelně vyvolávat %s/worker přes externí úlohu cron. Tuto možnost byste měl/a zapnout pouze, pokud nemůžete na Vašem serveru používat cron/plánované úlohy."
 
-#: mod/admin.php:1084
+#: mod/admin.php:1527
+msgid "Subscribe to relay"
+msgstr "Odebírat ze serveru pro přeposílání"
+
+#: 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 "Umožňuje přijímat veřejné příspěvky z přeposílacího serveru. Budou zahrnuty ve vyhledávání, odebíraných štítcích a na globální komunitní stránce."
+
+#: mod/admin.php:1528
+msgid "Relay server"
+msgstr "Server pro přeposílání (relay)"
+
+#: mod/admin.php:1528
+msgid ""
+"Address of the relay server where public posts should be send to. For "
+"example https://relay.diasp.org"
+msgstr "Adresa přeposílacího serveru, kam budou posílány veřejné příspěvky. Příklad: https://relay.diasp.org"
+
+#: mod/admin.php:1529
+msgid "Direct relay transfer"
+msgstr "Přímý přenos na server pro přeposílání"
+
+#: mod/admin.php:1529
+msgid ""
+"Enables the direct transfer to other servers without using the relay servers"
+msgstr "Umožňuje přímý přenos na ostatní servery bez použití přeposílacích serverů"
+
+#: mod/admin.php:1530
+msgid "Relay scope"
+msgstr "Rozsah příspěvků z přeposílacího serveru"
+
+#: 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 "Může být buď \"vše\" nebo \"štítky\". \"vše\" znamená, že budou přijaty všechny veřejné příspěvky. \"štítky\" znamená, že budou přijaty pouze příspěvky s vybranými štítky."
+
+#: mod/admin.php:1530
+msgid "all"
+msgstr "vše"
+
+#: mod/admin.php:1530
+msgid "tags"
+msgstr "štítky"
+
+#: mod/admin.php:1531
+msgid "Server tags"
+msgstr "Serverové štítky"
+
+#: mod/admin.php:1531
+msgid "Comma separated list of tags for the 'tags' subscription."
+msgstr "Seznam štítků pro odběr \"tags\", oddělených čárkami."
+
+#: mod/admin.php:1532
+msgid "Allow user tags"
+msgstr "Povolit uživatelské štítky"
+
+#: 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 "Pokud je toto povoleno, budou štítky z uložených hledání vedle odběru \"relay_server_tags\" použity i pro odběr \"tags\"."
+
+#: mod/admin.php:1535
+msgid "Start Relocation"
+msgstr "Začít přemístění"
+
+#: mod/admin.php:1561
 msgid "Update has been marked successful"
 msgstr "Aktualizace byla označena jako úspěšná."
 
-#: mod/admin.php:1092
+#: mod/admin.php:1568
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr "Aktualizace struktury databáze %s byla úspěšně aplikována."
 
-#: mod/admin.php:1095
+#: mod/admin.php:1571
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr "Provádění aktualizace databáze %s skončilo chybou: %s"
 
-#: mod/admin.php:1107
+#: mod/admin.php:1587
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr "Vykonávání %s selhalo s chybou: %s"
 
-#: mod/admin.php:1110
+#: mod/admin.php:1589
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Aktualizace %s byla úspěšně aplikována."
 
-#: mod/admin.php:1114
+#: mod/admin.php:1592
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr "Aktualizace %s nevrátila žádný status. Není zřejmé, jestli byla úspěšná."
+msgstr "Aktualizace %s nevrátila žádný stav. Není zřejmé, jestli byla úspěšná."
 
-#: mod/admin.php:1116
+#: mod/admin.php:1595
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr "Nebyla nalezena žádná další aktualizační funkce %s která by měla být volána."
 
-#: mod/admin.php:1135
+#: mod/admin.php:1618
 msgid "No failed updates."
 msgstr "Žádné neúspěšné aktualizace."
 
-#: mod/admin.php:1136
+#: mod/admin.php:1619
 msgid "Check database structure"
 msgstr "Ověření struktury databáze"
 
-#: mod/admin.php:1141
+#: mod/admin.php:1624
 msgid "Failed Updates"
 msgstr "Neúspěšné aktualizace"
 
-#: mod/admin.php:1142
+#: mod/admin.php:1625
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "To nezahrnuje aktualizace do verze 1139, které nevracejí žádný status."
 
-#: mod/admin.php:1143
+#: mod/admin.php:1626
 msgid "Mark success (if update was manually applied)"
 msgstr "Označit za úspěšné (pokud byla aktualizace aplikována manuálně)"
 
-#: mod/admin.php:1144
+#: mod/admin.php:1627
 msgid "Attempt to execute this update step automatically"
 msgstr "Pokusit se provést tuto aktualizaci automaticky."
 
-#: mod/admin.php:1178
+#: 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\tDrahý %1$s,\n\t\t\t\tadministrátor webu %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:1181
+#: mod/admin.php:1669
 #, php-format
 msgid ""
 "\n"
@@ -7378,1543 +5802,3888 @@ msgid ""
 "\t\t\tIf you are new and do not know anybody here, they may help\n"
 "\t\t\tyou to make some new and interesting friends.\n"
 "\n"
+"\t\t\tIf you ever want to delete your account, you can do so at %1$s/removeme\n"
+"\n"
 "\t\t\tThank you and welcome to %4$s."
-msgstr "\n\t\t\tVaše přihlašovací údaje jsou následující:\n\n\t\t\tAdresa webu: \t%1$s\n\t\t\tpřihlašovací jméno:\t\t%2$s\n\t\t\theslo:\t\t%3$s\n\n\t\t\tHeslo si můžete změnit na stránce \"Nastavení\" vašeho účtu poté, co se přihlásíte.\n\n\t\t\tProsím věnujte pár chvil revizi dalšího nastavení vašeho účtu na dané stránce.\n\n\t\t\tTaké su můžete přidat nějaké základní informace do svého výchozího profilu (na stránce \"Profily\"), takže ostatní lidé vás snáze najdou. \n\n\t\t\tDoporučujeme Vám uvést celé jméno a i foto. Přidáním nějakých \"klíčových slov\" (velmi užitečné pro hledání nových přátel) a možná také zemi, ve které žijete, pokud nechcete být více konkrétní.\n\n\t\t\tPlně resepktujeme vaše právo na soukromí a nic z výše uvedeného není povinné. Pokud jste zde nový a neznáte zde nikoho, uvedením daných informací můžete získat nové přátele.\n\n\t\t\tDíky a vítejte 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:1225
+#: mod/admin.php:1706 src/Model/User.php:707
+#, php-format
+msgid "Registration details for %s"
+msgstr "Registrační údaje pro uživatele %s"
+
+#: mod/admin.php:1716
 #, php-format
 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:1232
+#: mod/admin.php:1722
 #, php-format
 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:1279
+#: mod/admin.php:1769
 #, php-format
 msgid "User '%s' deleted"
-msgstr "Uživatel '%s' smazán"
+msgstr "Uživatel \"%s\" smazán"
 
-#: mod/admin.php:1287
+#: mod/admin.php:1777
 #, php-format
 msgid "User '%s' unblocked"
-msgstr "Uživatel '%s' odblokován"
+msgstr "Uživatel \"%s\" odblokován"
 
-#: mod/admin.php:1287
+#: mod/admin.php:1777
 #, php-format
 msgid "User '%s' blocked"
-msgstr "Uživatel '%s' blokován"
+msgstr "Uživatel \"%s\" zablokován"
 
-#: mod/admin.php:1396 mod/admin.php:1422
+#: mod/admin.php:1838
+msgid "Private Forum"
+msgstr "Soukromé fórum"
+
+#: 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 "Datum registrace"
 
-#: mod/admin.php:1396 mod/admin.php:1422
+#: mod/admin.php:1890 mod/admin.php:1915
 msgid "Last login"
 msgstr "Datum posledního přihlášení"
 
-#: mod/admin.php:1396 mod/admin.php:1422
+#: mod/admin.php:1890 mod/admin.php:1915
 msgid "Last item"
 msgstr "Poslední položka"
 
-#: mod/admin.php:1405
+#: mod/admin.php:1890
+msgid "Type"
+msgstr "Typ"
+
+#: mod/admin.php:1897
 msgid "Add User"
-msgstr "Přidat Uživatele"
+msgstr "Přidat uživatele"
 
-#: mod/admin.php:1406
-msgid "select all"
-msgstr "Vybrat vše"
-
-#: mod/admin.php:1407
+#: mod/admin.php:1899
 msgid "User registrations waiting for confirm"
-msgstr "Registrace uživatele čeká na potvrzení"
+msgstr "Registrace uživatelů čekající na potvrzení"
 
-#: mod/admin.php:1408
+#: mod/admin.php:1900
 msgid "User waiting for permanent deletion"
-msgstr "Uživatel čeká na trvalé smazání"
+msgstr "Uživatel čekající na trvalé smazání"
 
-#: mod/admin.php:1409
+#: mod/admin.php:1901
 msgid "Request date"
 msgstr "Datum žádosti"
 
-#: mod/admin.php:1410
+#: mod/admin.php:1902
 msgid "No registrations."
 msgstr "Žádné registrace."
 
-#: mod/admin.php:1411
+#: mod/admin.php:1903
 msgid "Note from the user"
-msgstr ""
+msgstr "Poznámka od uživatele"
 
-#: mod/admin.php:1413
+#: mod/admin.php:1905
 msgid "Deny"
 msgstr "Odmítnout"
 
-#: mod/admin.php:1415 mod/contacts.php:605 mod/contacts.php:805
-#: mod/contacts.php:983
-msgid "Block"
-msgstr "Blokovat"
+#: mod/admin.php:1908
+msgid "User blocked"
+msgstr "Uživatel zablokován"
 
-#: mod/admin.php:1416 mod/contacts.php:605 mod/contacts.php:805
-#: mod/contacts.php:983
-msgid "Unblock"
-msgstr "Odblokovat"
-
-#: mod/admin.php:1417
+#: mod/admin.php:1910
 msgid "Site admin"
-msgstr "Site administrátor"
+msgstr "Administrátor webu"
 
-#: mod/admin.php:1418
+#: mod/admin.php:1911
 msgid "Account expired"
 msgstr "Účtu vypršela platnost"
 
-#: mod/admin.php:1421
+#: mod/admin.php:1914
 msgid "New User"
 msgstr "Nový uživatel"
 
-#: mod/admin.php:1422
+#: mod/admin.php:1915
 msgid "Deleted since"
 msgstr "Smazán od"
 
-#: mod/admin.php:1427
+#: 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 "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\\n Opravdu pokračovat?"
+msgstr "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?"
 
-#: mod/admin.php:1428
+#: 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 "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 pokračovat?"
+msgstr "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?"
 
-#: mod/admin.php:1438
+#: 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:1439
+#: mod/admin.php:1932
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: mod/admin.php:1439
+#: mod/admin.php:1932
 msgid "Nickname of the new user."
 msgstr "Přezdívka nového uživatele."
 
-#: mod/admin.php:1440
+#: mod/admin.php:1933
 msgid "Email address of the new user."
 msgstr "Emailová adresa nového uživatele."
 
-#: mod/admin.php:1483
+#: mod/admin.php:1975
 #, php-format
-msgid "Plugin %s disabled."
-msgstr "Plugin %s zakázán."
+msgid "Addon %s disabled."
+msgstr "Doplněk %s zakázán."
 
-#: mod/admin.php:1487
+#: mod/admin.php:1979
 #, php-format
-msgid "Plugin %s enabled."
-msgstr "Plugin %s povolen."
+msgid "Addon %s enabled."
+msgstr "Doplněk %s povolen."
 
-#: mod/admin.php:1498 mod/admin.php:1734
+#: mod/admin.php:1989 mod/admin.php:2238
 msgid "Disable"
 msgstr "Zakázat"
 
-#: mod/admin.php:1500 mod/admin.php:1736
+#: mod/admin.php:1992 mod/admin.php:2241
 msgid "Enable"
 msgstr "Povolit"
 
-#: mod/admin.php:1523 mod/admin.php:1781
+#: mod/admin.php:2014 mod/admin.php:2284
 msgid "Toggle"
 msgstr "Přepnout"
 
-#: mod/admin.php:1531 mod/admin.php:1790
+#: mod/admin.php:2022 mod/admin.php:2293
 msgid "Author: "
 msgstr "Autor: "
 
-#: mod/admin.php:1532 mod/admin.php:1791
+#: mod/admin.php:2023 mod/admin.php:2294
 msgid "Maintainer: "
 msgstr "Správce: "
 
-#: mod/admin.php:1584
-msgid "Reload active plugins"
-msgstr ""
+#: mod/admin.php:2075
+msgid "Reload active addons"
+msgstr "Znovu načíst aktivní doplňky"
 
-#: mod/admin.php:1589
+#: mod/admin.php:2080
 #, php-format
 msgid ""
-"There are currently no plugins available on your node. You can find the "
-"official plugin repository at %1$s and might find other interesting plugins "
-"in the open plugin registry at %2$s"
-msgstr ""
+"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 "Aktuálně nejsou na Vašem serveru k dispozici žádné doplňky. Oficiální repozitář doplňků najdete na %1$s a další zajímavé doplňky můžete najít v otevřeném registru doplňků na %2$s"
 
-#: mod/admin.php:1694
+#: mod/admin.php:2200
 msgid "No themes found."
-msgstr "Nenalezeny žádná témata."
+msgstr "Nenalezeny žádné motivy."
 
-#: mod/admin.php:1772
+#: mod/admin.php:2275
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
-#: mod/admin.php:1832
+#: mod/admin.php:2329
 msgid "Reload active themes"
-msgstr ""
+msgstr "Znovu načíst aktivní motivy"
 
-#: mod/admin.php:1837
+#: mod/admin.php:2334
 #, php-format
-msgid "No themes found on the system. They should be paced in %1$s"
-msgstr ""
+msgid "No themes found on the system. They should be placed in %1$s"
+msgstr "V systému nebyly nalezeny žádné motivy. Měly by být uloženy v %1$s"
 
-#: mod/admin.php:1838
+#: mod/admin.php:2335
 msgid "[Experimental]"
 msgstr "[Experimentální]"
 
-#: mod/admin.php:1839
+#: mod/admin.php:2336
 msgid "[Unsupported]"
 msgstr "[Nepodporováno]"
 
-#: mod/admin.php:1863
+#: mod/admin.php:2360
 msgid "Log settings updated."
-msgstr "Nastavení protokolu aktualizováno."
+msgstr "Nastavení záznamů aktualizována."
 
-#: mod/admin.php:1895
+#: mod/admin.php:2393
 msgid "PHP log currently enabled."
-msgstr ""
+msgstr "PHP záznamy jsou aktuálně povolené."
 
-#: mod/admin.php:1897
+#: mod/admin.php:2395
 msgid "PHP log currently disabled."
-msgstr ""
+msgstr "PHP záznamy jsou aktuálně zakázané."
 
-#: mod/admin.php:1906
+#: mod/admin.php:2404
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: mod/admin.php:1911
+#: mod/admin.php:2408
 msgid "Enable Debugging"
 msgstr "Povolit ladění"
 
-#: mod/admin.php:1912
+#: mod/admin.php:2409
 msgid "Log file"
-msgstr "Soubor s logem"
+msgstr "Soubor se záznamem"
 
-#: mod/admin.php:1912
+#: mod/admin.php:2409
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
-msgstr "Musí být editovatelné web serverem. Relativní cesta k vašemu kořenovému adresáři Friendica"
+msgstr "Musí být zapisovatelný webovým serverem. Relativní cesta k Vašemu kořenovému adresáři Friendica."
 
-#: mod/admin.php:1913
+#: mod/admin.php:2410
 msgid "Log level"
 msgstr "Úroveň auditu"
 
-#: mod/admin.php:1916
+#: mod/admin.php:2412
 msgid "PHP logging"
-msgstr ""
+msgstr "Záznamování PHP"
 
-#: mod/admin.php:1917
+#: 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 ""
+msgstr "Pro dočasné umožnění zaznamenávání PHP chyb a varování, můžete přidat do souboru index.php na vaší instalaci následující: Název souboru nastavený v řádku \"error_log\" je relativní ke kořenovému adresáři Friendica a webový server musí mít povolení na něj zapisovat. Možnost \"1\" pro \"log_errors\" a \"display_errors\" tyto funkce povoluje, nastavením hodnoty na \"0\" je zakážete. "
 
-#: mod/admin.php:2045
+#: 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 "Chyba při otevírání záznamu <strong>%1$s</strong>.\\r\\n<br/>Zkontrolujte, jestli soubor %1$s existuje a může se číst."
+
+#: 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 "Nelze otevřít záznam <strong>%1$s</strong>.\\r\\n<br/>Zkontrolujte, jestli se soubor %1$s může číst."
+
+#: mod/admin.php:2540
 #, php-format
 msgid "Lock feature %s"
-msgstr ""
+msgstr "Funkce zámku %s"
 
-#: mod/admin.php:2053
+#: mod/admin.php:2548
 msgid "Manage Additional Features"
-msgstr ""
+msgstr "Spravovat další funkce"
 
-#: mod/contacts.php:128
+#: mod/openid.php:29
+msgid "OpenID protocol error. No ID returned."
+msgstr "Chyba OpenID protokolu. Nebylo navráceno žádné ID."
+
+#: mod/openid.php:66
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr "Nenalezen účet a OpenID registrace na tomto serveru není dovolena."
+
+#: mod/openid.php:116 src/Module/Login.php:85 src/Module/Login.php:134
+msgid "Login failed."
+msgstr "Přihlášení se nezdařilo."
+
+#: mod/dfrn_request.php:94
+msgid "This introduction has already been accepted."
+msgstr "Toto pozvání již bylo přijato."
+
+#: mod/dfrn_request.php:112 mod/dfrn_request.php:353
+msgid "Profile location is not valid or does not contain profile information."
+msgstr "Adresa profilu není platná nebo neobsahuje profilové informace"
+
+#: mod/dfrn_request.php:116 mod/dfrn_request.php:357
+msgid "Warning: profile location has no identifiable owner name."
+msgstr "Varování: umístění profilu nemá žádné identifikovatelné jméno vlastníka"
+
+#: mod/dfrn_request.php:119 mod/dfrn_request.php:360
+msgid "Warning: profile location has no profile photo."
+msgstr "Varování: umístění profilu nemá žádnou profilovou fotku."
+
+#: mod/dfrn_request.php:123 mod/dfrn_request.php:364
 #, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+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é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/contacts.php:159 mod/contacts.php:368
-msgid "Could not access contact record."
-msgstr "Nelze získat přístup k záznamu kontaktu."
+#: mod/dfrn_request.php:161
+msgid "Introduction complete."
+msgstr "Představení dokončeno."
 
-#: mod/contacts.php:173
-msgid "Could not locate selected profile."
-msgstr "Nelze nalézt vybraný profil."
+#: mod/dfrn_request.php:197
+msgid "Unrecoverable protocol error."
+msgstr "Neopravitelná chyba protokolu"
 
-#: mod/contacts.php:206
-msgid "Contact updated."
-msgstr "Kontakt aktualizován."
+#: mod/dfrn_request.php:224
+msgid "Profile unavailable."
+msgstr "Profil není k dispozici."
 
-#: mod/contacts.php:208 mod/dfrn_request.php:583
+#: 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í."
+
+#: mod/dfrn_request.php:247
+msgid "Spam protection measures have been invoked."
+msgstr "Ochrana proti spamu byla aktivována"
+
+#: mod/dfrn_request.php:248
+msgid "Friends are advised to please try again in 24 hours."
+msgstr "Přátelům se doporučuje to zkusit znovu za 24 hodin."
+
+#: mod/dfrn_request.php:274
+msgid "Invalid locator"
+msgstr "Neplatný odkaz"
+
+#: mod/dfrn_request.php:310
+msgid "You have already introduced yourself here."
+msgstr "Již jste se zde představil/a."
+
+#: mod/dfrn_request.php:313
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr "Zřejmě jste s %s již přátelé."
+
+#: mod/dfrn_request.php:333
+msgid "Invalid profile URL."
+msgstr "Neplatné URL profilu."
+
+#: mod/dfrn_request.php:339 src/Model/Contact.php:1577
+msgid "Disallowed profile URL."
+msgstr "Nepovolené URL profilu."
+
+#: mod/dfrn_request.php:412 mod/contacts.php:235
 msgid "Failed to update contact record."
 msgstr "Nepodařilo se aktualizovat kontakt."
 
-#: mod/contacts.php:389
+#: mod/dfrn_request.php:432
+msgid "Your introduction has been sent."
+msgstr "Vaše žádost o propojení byla odeslána."
+
+#: mod/dfrn_request.php:470
+msgid ""
+"Remote subscription can't be done for your network. Please subscribe "
+"directly on your system."
+msgstr "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."
+
+#: mod/dfrn_request.php:486
+msgid "Please login to confirm introduction."
+msgstr "Pro potvrzení 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áš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"
+msgstr "Potvrdit"
+
+#: mod/dfrn_request.php:520
+msgid "Hide this contact"
+msgstr "Skrýt tento kontakt"
+
+#: mod/dfrn_request.php:523
+#, php-format
+msgid "Welcome home %s."
+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 Váš požadavek o spojení uživateli %s."
+
+#: mod/dfrn_request.php:634
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
+msgstr "Prosím zadejte Vaši \"adresu identity\" jedné z následujících podporovaných komunikačních sítí:"
+
+#: 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 "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>."
+
+#: mod/dfrn_request.php:642
+msgid "Friend/Connection Request"
+msgstr "Požadavek o přátelství/spojení"
+
+#: mod/dfrn_request.php:643
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@gnusocial.de"
+msgstr "Příklady: 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 "Odpovězte, prosím, následující:"
+
+#: mod/dfrn_request.php:645 mod/follow.php:150
+#, php-format
+msgid "Does %s know you?"
+msgstr "Zná Vás %s?"
+
+#: mod/dfrn_request.php:646 mod/follow.php:151
+msgid "Add a personal note:"
+msgstr "Přidat osobní poznámku:"
+
+#: 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 " - prosím nepoužívejte tento formulář.  Místo toho zadejte %s do Vašeho vyhledávacího pole Diaspora."
+
+#: mod/api.php:85 mod/api.php:107
+msgid "Authorize application connection"
+msgstr "Povolit připojení aplikacím"
+
+#: mod/api.php:86
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Vraťte se do vaší aplikace a zadejte tento bezpečnostní kód:"
+
+#: mod/api.php:95
+msgid "Please login to continue."
+msgstr "Pro pokračování se prosím přihlaste."
+
+#: 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 "Chcete umožnit této aplikaci přístup k vašim příspěvkům a kontaktům a/nebo k vytváření Vašich nových příspěvků?"
+
+#: mod/profile_photo.php:55
+msgid "Image uploaded but image cropping failed."
+msgstr "Obrázek byl odeslán, ale jeho oříznutí se nesdařilo."
+
+#: 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 "Nepodařilo se snížit velikost obrázku [%s]."
+
+#: mod/profile_photo.php:124
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Znovu načtěte stránku (Shift+F5) nebo vymažte cache prohlížeče, pokud se nová fotka nezobrazí okamžitě."
+
+#: mod/profile_photo.php:132
+msgid "Unable to process image"
+msgstr "Obrázek nelze zpracovat "
+
+#: mod/profile_photo.php:244
+msgid "Upload File:"
+msgstr "Nahrát soubor:"
+
+#: mod/profile_photo.php:245
+msgid "Select a profile:"
+msgstr "Vybrat profil:"
+
+#: mod/profile_photo.php:247 mod/fbrowser.php:106 mod/fbrowser.php:137
+msgid "Upload"
+msgstr "Nahrát"
+
+#: mod/profile_photo.php:250
+msgid "or"
+msgstr "nebo"
+
+#: mod/profile_photo.php:251
+msgid "skip this step"
+msgstr "tento krok přeskočte"
+
+#: mod/profile_photo.php:251
+msgid "select a photo from your photo albums"
+msgstr "si vyberte fotku z Vašich fotoalb"
+
+#: mod/profile_photo.php:264
+msgid "Crop Image"
+msgstr "Oříznout obrázek"
+
+#: mod/profile_photo.php:265
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Prosím, ořízněte tento obrázek pro optimální zobrazení."
+
+#: mod/profile_photo.php:267
+msgid "Done Editing"
+msgstr "Upravování dokončeno"
+
+#: mod/profile_photo.php:303
+msgid "Image uploaded successfully."
+msgstr "Obrázek byl úspěšně nahrán."
+
+#: mod/wall_attach.php:107
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr "Omlouváme se, možná je Váš soubor větší než je povolené maximum dle nastavení PHP"
+
+#: mod/wall_attach.php:107
+msgid "Or - did you try to upload an empty file?"
+msgstr "Nebo - nenahrával/a jste prázdný soubor?"
+
+#: mod/wall_attach.php:118
+#, php-format
+msgid "File exceeds size limit of %s"
+msgstr "Velikost souboru přesáhla limit %s"
+
+#: mod/wall_attach.php:142 mod/wall_attach.php:158
+msgid "File upload failed."
+msgstr "Nahrání souboru se nezdařilo."
+
+#: mod/item.php:117
+msgid "Unable to locate original post."
+msgstr "Nelze nalézt původní příspěvek."
+
+#: mod/item.php:285
+msgid "Empty post discarded."
+msgstr "Prázdný příspěvek odstraněn."
+
+#: mod/item.php:809
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social "
+"network."
+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 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 odesílatele odpovědí na tuto zprávu."
+
+#: mod/item.php:816
+#, php-format
+msgid "%s posted an update."
+msgstr "%s poslal/a aktualizaci."
+
+#: mod/help.php:49
+msgid "Help:"
+msgstr "Nápověda:"
+
+#: mod/uimport.php:72
+msgid "Move account"
+msgstr "Přesunout účet"
+
+#: mod/uimport.php:73
+msgid "You can import an account from another Friendica server."
+msgstr "Můžete importovat účet z jiného serveru 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 "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 ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (GNU Social/Statusnet) or from Diaspora"
+msgstr "Tato vlastnost je experimentální. Nemůžeme importovat kontakty za sítě OStatus (GNU social/StatusNet) nebo z Diaspory"
+
+#: mod/uimport.php:76
+msgid "Account file"
+msgstr "Soubor s účtem"
+
+#: mod/uimport.php:76
+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 \"Exportovat účet\""
+
+#: mod/profperm.php:35 mod/profperm.php:68
+msgid "Invalid profile identifier."
+msgstr "Neplatný identifikátor profilu."
+
+#: mod/profperm.php:114
+msgid "Profile Visibility Editor"
+msgstr "Editor viditelnosti profilu "
+
+#: mod/profperm.php:127
+msgid "Visible To"
+msgstr "Viditelný uživatelům"
+
+#: mod/profperm.php:143
+msgid "All Contacts (with secure profile access)"
+msgstr "Všem kontaktům (se zabezpečeným přístupem k profilu)"
+
+#: mod/cal.php:277 mod/events.php:391
+msgid "View"
+msgstr "Zobrazit"
+
+#: mod/cal.php:278 mod/events.php:393
+msgid "Previous"
+msgstr "Předchozí"
+
+#: mod/cal.php:282 mod/events.php:399 src/Model/Event.php:421
+msgid "today"
+msgstr "dnes"
+
+#: mod/cal.php:283 mod/events.php:400 src/Util/Temporal.php:304
+#: src/Model/Event.php:422
+msgid "month"
+msgstr "měsíc"
+
+#: mod/cal.php:284 mod/events.php:401 src/Util/Temporal.php:305
+#: src/Model/Event.php:423
+msgid "week"
+msgstr "týden"
+
+#: mod/cal.php:285 mod/events.php:402 src/Util/Temporal.php:306
+#: src/Model/Event.php:424
+msgid "day"
+msgstr "den"
+
+#: mod/cal.php:286 mod/events.php:403
+msgid "list"
+msgstr "seznam"
+
+#: mod/cal.php:299 src/Core/Console/NewPassword.php:68 src/Model/User.php:221
+msgid "User not found"
+msgstr "Uživatel nenalezen."
+
+#: mod/cal.php:315
+msgid "This calendar format is not supported"
+msgstr "Tento formát kalendáře není podporován."
+
+#: mod/cal.php:317
+msgid "No exportable data found"
+msgstr "Nenalezena žádná data pro export"
+
+#: mod/cal.php:334
+msgid "calendar"
+msgstr "kalendář"
+
+#: mod/regmod.php:70
+msgid "Account approved."
+msgstr "Účet schválen."
+
+#: mod/regmod.php:95
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registrace zrušena pro %s"
+
+#: mod/regmod.php:102
+msgid "Please login."
+msgstr "Přihlaste se, prosím."
+
+#: mod/editpost.php:26 mod/editpost.php:36
+msgid "Item not found"
+msgstr "Položka nenalezena"
+
+#: mod/editpost.php:43
+msgid "Edit post"
+msgstr "Upravit příspěvek"
+
+#: mod/editpost.php:125 src/Core/ACL.php:304
+msgid "CC: email addresses"
+msgstr "Skrytá kopie: e-mailové adresy"
+
+#: mod/editpost.php:132 src/Core/ACL.php:305
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Příklad: jan@priklad.cz, lucie@priklad.cz"
+
+#: mod/apps.php:19
+msgid "Applications"
+msgstr "Aplikace"
+
+#: mod/apps.php:22
+msgid "No installed applications."
+msgstr "Žádné nainstalované aplikace."
+
+#: mod/feedtest.php:21
+msgid "You must be logged in to use this module"
+msgstr "Pro používání tohoto modulu musíte být přihlášen/a"
+
+#: mod/feedtest.php:49
+msgid "Source URL"
+msgstr "Zdrojová adresa URL"
+
+#: mod/fsuggest.php:72
+msgid "Friend suggestion sent."
+msgstr "Návrhy přátelství odeslány "
+
+#: mod/fsuggest.php:101
+msgid "Suggest Friends"
+msgstr "Navrhnout přátele"
+
+#: mod/fsuggest.php:103
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "Navrhnout přítele pro uživatele %s"
+
+#: mod/maintenance.php:24
+msgid "System down for maintenance"
+msgstr "Systém vypnut z důvodů údržby"
+
+#: mod/profile.php:38 src/Model/Profile.php:115
+msgid "Requested profile is not available."
+msgstr "Požadovaný profil není dostupný."
+
+#: mod/profile.php:79 mod/profile.php:82 src/Protocol/OStatus.php:1275
+#, php-format
+msgid "%s's timeline"
+msgstr "Časová osa uživatele %s"
+
+#: mod/profile.php:80 src/Protocol/OStatus.php:1276
+#, php-format
+msgid "%s's posts"
+msgstr "Příspěvky uživatele %s"
+
+#: mod/profile.php:81 src/Protocol/OStatus.php:1277
+#, php-format
+msgid "%s's comments"
+msgstr "Komentáře uživatele %s"
+
+#: mod/allfriends.php:53
+msgid "No friends to display."
+msgstr "Žádní přátelé k zobrazení"
+
+#: mod/contacts.php:162
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] "%d kontakt upraven"
+msgstr[1] "%d kontakty upraveny"
+msgstr[2] "%d kontaktu upraveno"
+msgstr[3] "%d kontaktů upraveno"
+
+#: mod/contacts.php:189 mod/contacts.php:395
+msgid "Could not access contact record."
+msgstr "Nelze získat přístup k záznamu kontaktu."
+
+#: mod/contacts.php:199
+msgid "Could not locate selected profile."
+msgstr "Nelze nalézt vybraný profil."
+
+#: mod/contacts.php:233
+msgid "Contact updated."
+msgstr "Kontakt aktualizován."
+
+#: mod/contacts.php:416
 msgid "Contact has been blocked"
 msgstr "Kontakt byl zablokován"
 
-#: mod/contacts.php:389
+#: mod/contacts.php:416
 msgid "Contact has been unblocked"
 msgstr "Kontakt byl odblokován"
 
-#: mod/contacts.php:400
+#: mod/contacts.php:426
 msgid "Contact has been ignored"
 msgstr "Kontakt bude ignorován"
 
-#: mod/contacts.php:400
+#: mod/contacts.php:426
 msgid "Contact has been unignored"
 msgstr "Kontakt přestal být ignorován"
 
-#: mod/contacts.php:412
+#: mod/contacts.php:436
 msgid "Contact has been archived"
 msgstr "Kontakt byl archivován"
 
-#: mod/contacts.php:412
+#: mod/contacts.php:436
 msgid "Contact has been unarchived"
-msgstr "Kontakt byl vrácen z archívu."
+msgstr "Kontakt byl vrácen z archivu."
 
-#: mod/contacts.php:437
+#: mod/contacts.php:460
 msgid "Drop contact"
-msgstr ""
+msgstr "Zrušit kontakt"
 
-#: mod/contacts.php:440 mod/contacts.php:801
+#: mod/contacts.php:463 mod/contacts.php:845
 msgid "Do you really want to delete this contact?"
 msgstr "Opravdu chcete smazat tento kontakt?"
 
-#: mod/contacts.php:457
+#: mod/contacts.php:481
 msgid "Contact has been removed."
 msgstr "Kontakt byl odstraněn."
 
-#: mod/contacts.php:498
+#: mod/contacts.php:518
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr "Jste vzájemní přátelé s uživatelem %s"
 
-#: mod/contacts.php:502
+#: mod/contacts.php:523
 #, php-format
 msgid "You are sharing with %s"
 msgstr "Sdílíte s uživatelem %s"
 
-#: mod/contacts.php:507
+#: mod/contacts.php:528
 #, php-format
 msgid "%s is sharing with you"
-msgstr "uživatel %s sdílí s vámi"
+msgstr "%s s Vámi sdílí"
 
-#: mod/contacts.php:527
+#: mod/contacts.php:552
 msgid "Private communications are not available for this contact."
 msgstr "Soukromá komunikace není dostupná pro tento kontakt."
 
-#: mod/contacts.php:534
+#: mod/contacts.php:554
+msgid "Never"
+msgstr "Nikdy"
+
+#: mod/contacts.php:557
 msgid "(Update was successful)"
 msgstr "(Aktualizace byla úspěšná)"
 
-#: mod/contacts.php:534
+#: mod/contacts.php:557
 msgid "(Update was not successful)"
 msgstr "(Aktualizace nebyla úspěšná)"
 
-#: mod/contacts.php:536 mod/contacts.php:964
+#: mod/contacts.php:559 mod/contacts.php:1086
 msgid "Suggest friends"
-msgstr "Navrhněte přátelé"
+msgstr "Navrhnout přátele"
 
-#: mod/contacts.php:540
+#: mod/contacts.php:563
 #, php-format
 msgid "Network type: %s"
 msgstr "Typ sítě: %s"
 
-#: mod/contacts.php:553
+#: mod/contacts.php:568
 msgid "Communications lost with this contact!"
 msgstr "Komunikace s tímto kontaktem byla ztracena!"
 
-#: mod/contacts.php:556
+#: mod/contacts.php:574
 msgid "Fetch further information for feeds"
-msgstr "Načítat další informace pro kanál"
+msgstr "Načíst další informace pro kanál"
 
-#: mod/contacts.php:557
-msgid "Fetch information"
-msgstr "Načítat informace"
-
-#: mod/contacts.php:557
-msgid "Fetch information and keywords"
-msgstr "Načítat informace a klíčová slova"
-
-#: mod/contacts.php:575
-msgid "Contact"
-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 "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"
+msgstr "Načíst informace"
+
+#: mod/contacts.php:579
+msgid "Fetch keywords"
+msgstr "Načíst klíčová slova"
+
+#: mod/contacts.php:580
+msgid "Fetch information and keywords"
+msgstr "Načíst informace a klíčová slova"
+
+#: mod/contacts.php:617
 msgid "Profile Visibility"
 msgstr "Viditelnost profilu"
 
-#: mod/contacts.php:579
+#: mod/contacts.php:618
+msgid "Contact Information / Notes"
+msgstr "Kontaktní informace / poznámky"
+
+#: mod/contacts.php:619
+msgid "Contact Settings"
+msgstr "Nastavení kontaktů"
+
+#: mod/contacts.php:628
+msgid "Contact"
+msgstr "Kontakt"
+
+#: mod/contacts.php:632
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Vyberte prosím profil, který chcete zobrazit %s při zabezpečeném prohlížení vašeho profilu."
 
-#: mod/contacts.php:580
-msgid "Contact Information / Notes"
-msgstr "Kontaktní informace / poznámky"
+#: mod/contacts.php:634
+msgid "Their personal note"
+msgstr "Jejich osobní poznámka"
 
-#: mod/contacts.php:581
+#: mod/contacts.php:636
 msgid "Edit contact notes"
-msgstr "Editovat poznámky kontaktu"
+msgstr "Upravit poznámky kontaktu"
 
-#: mod/contacts.php:587
+#: mod/contacts.php:640
 msgid "Block/Unblock contact"
 msgstr "Blokovat / Odblokovat kontakt"
 
-#: mod/contacts.php:588
+#: mod/contacts.php:641
 msgid "Ignore contact"
 msgstr "Ignorovat kontakt"
 
-#: mod/contacts.php:589
+#: mod/contacts.php:642
 msgid "Repair URL settings"
 msgstr "Opravit nastavení adresy URL "
 
-#: mod/contacts.php:590
+#: mod/contacts.php:643
 msgid "View conversations"
 msgstr "Zobrazit konverzace"
 
-#: mod/contacts.php:596
+#: mod/contacts.php:648
 msgid "Last update:"
 msgstr "Poslední aktualizace:"
 
-#: mod/contacts.php:598
+#: mod/contacts.php:650
 msgid "Update public posts"
 msgstr "Aktualizovat veřejné příspěvky"
 
-#: mod/contacts.php:600 mod/contacts.php:974
+#: mod/contacts.php:652 mod/contacts.php:1096
 msgid "Update now"
 msgstr "Aktualizovat"
 
-#: mod/contacts.php:606 mod/contacts.php:806 mod/contacts.php:991
+#: mod/contacts.php:658 mod/contacts.php:850 mod/contacts.php:1113
 msgid "Unignore"
 msgstr "Přestat ignorovat"
 
-#: mod/contacts.php:610
+#: mod/contacts.php:662
 msgid "Currently blocked"
 msgstr "V současnosti zablokováno"
 
-#: mod/contacts.php:611
+#: mod/contacts.php:663
 msgid "Currently ignored"
 msgstr "V současnosti ignorováno"
 
-#: mod/contacts.php:612
+#: mod/contacts.php:664
 msgid "Currently archived"
 msgstr "Aktuálně archivován"
 
-#: mod/contacts.php:613
+#: mod/contacts.php:665
+msgid "Awaiting connection acknowledge"
+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/Libí se 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:614
+#: mod/contacts.php:667
 msgid "Notification for new posts"
 msgstr "Upozornění na nové příspěvky"
 
-#: mod/contacts.php:614
+#: mod/contacts.php:667
 msgid "Send a notification of every new post of this contact"
 msgstr "Poslat upozornění při každém novém příspěvku tohoto kontaktu"
 
-#: mod/contacts.php:617
+#: mod/contacts.php:670
 msgid "Blacklisted keywords"
 msgstr "Zakázaná klíčová slova"
 
-#: mod/contacts.php:617
+#: 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 "Čárkou oddělený seznam klíčových slov, které by neměly být převáděna na hashtagy, když je zvoleno \"Načítat 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:635
-msgid "Actions"
-msgstr ""
-
-#: mod/contacts.php:638
-msgid "Contact Settings"
-msgstr ""
-
-#: mod/contacts.php:684
-msgid "Suggestions"
-msgstr "Doporučení"
+#: mod/contacts.php:682 src/Model/Profile.php:424
+msgid "XMPP:"
+msgstr "XMPP:"
 
 #: mod/contacts.php:687
+msgid "Actions"
+msgstr "Akce"
+
+#: mod/contacts.php:731
+msgid "Suggestions"
+msgstr "Návrhy"
+
+#: mod/contacts.php:734
 msgid "Suggest potential friends"
 msgstr "Navrhnout potenciální přátele"
 
-#: mod/contacts.php:695
+#: mod/contacts.php:742
 msgid "Show all contacts"
 msgstr "Zobrazit všechny kontakty"
 
-#: mod/contacts.php:700
+#: mod/contacts.php:747
 msgid "Unblocked"
 msgstr "Odblokován"
 
-#: mod/contacts.php:703
+#: mod/contacts.php:750
 msgid "Only show unblocked contacts"
 msgstr "Zobrazit pouze neblokované kontakty"
 
-#: mod/contacts.php:709
+#: mod/contacts.php:755
 msgid "Blocked"
 msgstr "Blokován"
 
-#: mod/contacts.php:712
+#: mod/contacts.php:758
 msgid "Only show blocked contacts"
 msgstr "Zobrazit pouze blokované kontakty"
 
-#: mod/contacts.php:718
+#: mod/contacts.php:763
 msgid "Ignored"
 msgstr "Ignorován"
 
-#: mod/contacts.php:721
+#: mod/contacts.php:766
 msgid "Only show ignored contacts"
 msgstr "Zobrazit pouze ignorované kontakty"
 
-#: mod/contacts.php:727
+#: mod/contacts.php:771
 msgid "Archived"
 msgstr "Archivován"
 
-#: mod/contacts.php:730
+#: mod/contacts.php:774
 msgid "Only show archived contacts"
 msgstr "Zobrazit pouze archivované kontakty"
 
-#: mod/contacts.php:736
+#: mod/contacts.php:779
 msgid "Hidden"
 msgstr "Skrytý"
 
-#: mod/contacts.php:739
+#: mod/contacts.php:782
 msgid "Only show hidden contacts"
 msgstr "Zobrazit pouze skryté kontakty"
 
-#: mod/contacts.php:796
+#: mod/contacts.php:840
 msgid "Search your contacts"
 msgstr "Prohledat Vaše kontakty"
 
-#: mod/contacts.php:807 mod/contacts.php:999
+#: mod/contacts.php:851 mod/contacts.php:1122
 msgid "Archive"
 msgstr "Archivovat"
 
-#: mod/contacts.php:807 mod/contacts.php:999
+#: mod/contacts.php:851 mod/contacts.php:1122
 msgid "Unarchive"
-msgstr "Vrátit z archívu"
+msgstr "Vrátit z archivu"
 
-#: mod/contacts.php:810
+#: mod/contacts.php:854
 msgid "Batch Actions"
-msgstr ""
+msgstr "Souhrnné akce"
 
-#: mod/contacts.php:856
+#: mod/contacts.php:880
+msgid "Conversations started by this contact"
+msgstr "Konverzace, které tento kontakt začal"
+
+#: mod/contacts.php:885
+msgid "Posts and Comments"
+msgstr "Příspěvky a komentáře"
+
+#: mod/contacts.php:896 src/Model/Profile.php:886
+msgid "Profile Details"
+msgstr "Detaily profilu"
+
+#: mod/contacts.php:908
 msgid "View all contacts"
 msgstr "Zobrazit všechny kontakty"
 
-#: mod/contacts.php:866
+#: mod/contacts.php:919
 msgid "View all common friends"
-msgstr ""
+msgstr "Zobrazit všechny společné přátele"
 
-#: mod/contacts.php:873
+#: mod/contacts.php:929
 msgid "Advanced Contact Settings"
 msgstr "Pokročilé nastavení kontaktu"
 
-#: mod/contacts.php:907
+#: mod/contacts.php:1019
 msgid "Mutual Friendship"
 msgstr "Vzájemné přátelství"
 
-#: mod/contacts.php:911
+#: mod/contacts.php:1024
 msgid "is a fan of yours"
 msgstr "je Váš fanoušek"
 
-#: mod/contacts.php:915
+#: mod/contacts.php:1029
 msgid "you are a fan of"
 msgstr "jste fanouškem"
 
-#: mod/contacts.php:985
+#: 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 "Nastavte Vaši polohu"
+
+#: mod/contacts.php:1053
+msgid "Edit contact"
+msgstr "Upravit kontakt"
+
+#: mod/contacts.php:1107
 msgid "Toggle Blocked status"
-msgstr "Přepnout stav Blokováno"
+msgstr "Přepínat stav Blokováno"
 
-#: mod/contacts.php:993
+#: mod/contacts.php:1115
 msgid "Toggle Ignored status"
-msgstr "Přepnout stav Ignorováno"
+msgstr "Přepínat stav Ignorováno"
 
-#: mod/contacts.php:1001
+#: mod/contacts.php:1124
 msgid "Toggle Archive status"
-msgstr "Přepnout stav Archivováno"
+msgstr "Přepínat stav Archivováno"
 
-#: mod/contacts.php:1009
+#: mod/contacts.php:1132
 msgid "Delete contact"
 msgstr "Odstranit kontakt"
 
-#: mod/dfrn_confirm.php:127
-msgid ""
-"This may occasionally happen if contact was requested by both persons and it"
-" has already been approved."
-msgstr "To se může občas stát pokud kontakt byl zažádán oběma osobami a již byl schválen."
+#: mod/events.php:103 mod/events.php:105
+msgid "Event can not end before it has started."
+msgstr "Událost nemůže končit dříve, než začala."
 
-#: mod/dfrn_confirm.php:246
-msgid "Response from remote site was not understood."
-msgstr "Odpověď ze vzdáleného serveru nebyla srozumitelná."
+#: mod/events.php:112 mod/events.php:114
+msgid "Event title and start time are required."
+msgstr "Název události a datum začátku jsou vyžadovány."
 
-#: mod/dfrn_confirm.php:255 mod/dfrn_confirm.php:260
-msgid "Unexpected response from remote site: "
-msgstr "Neočekávaná odpověď od vzdáleného serveru:"
+#: mod/events.php:392
+msgid "Create New Event"
+msgstr "Vytvořit novou událost"
 
-#: mod/dfrn_confirm.php:269
-msgid "Confirmation completed successfully."
-msgstr "Potvrzení úspěšně dokončena."
+#: mod/events.php:509
+msgid "Event details"
+msgstr "Detaily události"
 
-#: mod/dfrn_confirm.php:271 mod/dfrn_confirm.php:285 mod/dfrn_confirm.php:292
-msgid "Remote site reported: "
-msgstr "Vzdálený server oznámil:"
+#: mod/events.php:510
+msgid "Starting date and Title are required."
+msgstr "Počáteční datum a Název jsou vyžadovány."
 
-#: mod/dfrn_confirm.php:283
-msgid "Temporary failure. Please wait and try again."
-msgstr "Dočasné selhání. Prosím, vyčkejte a zkuste to znovu."
+#: mod/events.php:511 mod/events.php:512
+msgid "Event Starts:"
+msgstr "Událost začíná:"
 
-#: mod/dfrn_confirm.php:290
-msgid "Introduction failed or was revoked."
-msgstr "Žádost o propojení selhala nebo byla zrušena."
+#: mod/events.php:511 mod/events.php:523 mod/profiles.php:607
+msgid "Required"
+msgstr "Vyžadováno"
 
-#: mod/dfrn_confirm.php:419
-msgid "Unable to set contact photo."
-msgstr "Nelze nastavit fotografii kontaktu."
+#: mod/events.php:513 mod/events.php:529
+msgid "Finish date/time is not known or not relevant"
+msgstr "Datum/čas konce není zadán nebo není relevantní"
 
-#: mod/dfrn_confirm.php:557
-#, php-format
-msgid "No user record found for '%s' "
-msgstr "Pro '%s' nenalezen žádný uživatelský záznam "
+#: mod/events.php:515 mod/events.php:516
+msgid "Event Finishes:"
+msgstr "Akce končí:"
 
-#: mod/dfrn_confirm.php:567
-msgid "Our site encryption key is apparently messed up."
-msgstr "Náš šifrovací klíč zřejmě přestal správně fungovat."
+#: mod/events.php:517 mod/events.php:530
+msgid "Adjust for viewer timezone"
+msgstr "Nastavit časové pásmo pro uživatele s právem pro čtení"
 
-#: mod/dfrn_confirm.php:578
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr "Byla poskytnuta prázdná URL adresa nebo se nepodařilo URL adresu dešifrovat."
+#: mod/events.php:519
+msgid "Description:"
+msgstr "Popis:"
 
-#: mod/dfrn_confirm.php:599
-msgid "Contact record was not found for you on our site."
-msgstr "Kontakt záznam nebyl nalezen pro vás na našich stránkách."
+#: mod/events.php:523 mod/events.php:525
+msgid "Title:"
+msgstr "Název:"
 
-#: mod/dfrn_confirm.php:613
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
-msgstr "V adresáři není k dispozici veřejný klíč pro URL %s."
+#: mod/events.php:526 mod/events.php:527
+msgid "Share this event"
+msgstr "Sdílet tuto událost"
 
-#: mod/dfrn_confirm.php:633
-msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
-msgstr "Váš systém poskytl duplicitní ID vůči našemu systému. Pokuste se akci zopakovat."
+#: mod/events.php:534 src/Model/Profile.php:851
+msgid "Basic"
+msgstr "Základní"
 
-#: mod/dfrn_confirm.php:644
-msgid "Unable to set your contact credentials on our system."
-msgstr "Nelze nastavit Vaše přihlašovací údaje v našem systému."
+#: mod/events.php:536 mod/photos.php:1112 mod/photos.php:1448
+#: src/Core/ACL.php:307
+msgid "Permissions"
+msgstr "Oprávnění:"
 
-#: mod/dfrn_confirm.php:703
-msgid "Unable to update your contact profile details on our system"
-msgstr "Nelze aktualizovat Váš profil v našem systému"
+#: mod/events.php:555
+msgid "Failed to remove event"
+msgstr "Odstranění události selhalo"
 
-#: mod/dfrn_confirm.php:775
-#, php-format
-msgid "%1$s has joined %2$s"
-msgstr "%1$s se připojil k %2$s"
+#: mod/events.php:557
+msgid "Event removed"
+msgstr "Událost odstraněna"
 
-#: mod/dfrn_request.php:101
-msgid "This introduction has already been accepted."
-msgstr "Toto pozvání již bylo přijato."
+#: mod/follow.php:45
+msgid "The contact could not be added."
+msgstr "Kontakt nemohl být přidán."
 
-#: mod/dfrn_request.php:124 mod/dfrn_request.php:520
-msgid "Profile location is not valid or does not contain profile information."
-msgstr "Adresa profilu není platná nebo neobsahuje profilové informace"
-
-#: mod/dfrn_request.php:129 mod/dfrn_request.php:525
-msgid "Warning: profile location has no identifiable owner name."
-msgstr "Varování: umístění profilu nemá žádné identifikovatelné jméno vlastníka"
-
-#: mod/dfrn_request.php:131 mod/dfrn_request.php:527
-msgid "Warning: profile location has no profile photo."
-msgstr "Varování: umístění profilu nemá žádnou profilovou fotografii."
-
-#: mod/dfrn_request.php:134 mod/dfrn_request.php:530
-#, 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 požadovaný parametr nebyl nalezen na daném místě"
-msgstr[1] "%d požadované parametry nebyly nalezeny na daném místě"
-msgstr[2] "%d požadované parametry nebyly nalezeny na daném místě"
-
-#: mod/dfrn_request.php:180
-msgid "Introduction complete."
-msgstr "Představení dokončeno."
-
-#: mod/dfrn_request.php:222
-msgid "Unrecoverable protocol error."
-msgstr "Neopravitelná chyba protokolu"
-
-#: mod/dfrn_request.php:250
-msgid "Profile unavailable."
-msgstr "Profil není k dispozici."
-
-#: mod/dfrn_request.php:277
-#, php-format
-msgid "%s has received too many connection requests today."
-msgstr "%s dnes obdržel příliš mnoho požadavků na připojení."
-
-#: mod/dfrn_request.php:278
-msgid "Spam protection measures have been invoked."
-msgstr "Ochrana proti spamu byla aktivována"
-
-#: mod/dfrn_request.php:279
-msgid "Friends are advised to please try again in 24 hours."
-msgstr "Přátelům se doporučuje to zkusit znovu za 24 hodin."
-
-#: mod/dfrn_request.php:341
-msgid "Invalid locator"
-msgstr "Neplatný odkaz"
-
-#: mod/dfrn_request.php:350
-msgid "Invalid email address."
-msgstr "Neplatná emailová adresa"
-
-#: mod/dfrn_request.php:375
-msgid "This account has not been configured for email. Request failed."
-msgstr "Tento účet nebyl nastaven pro email. Požadavek nesplněn."
-
-#: mod/dfrn_request.php:478
-msgid "You have already introduced yourself here."
-msgstr "Již jste se zde zavedli."
-
-#: mod/dfrn_request.php:482
-#, php-format
-msgid "Apparently you are already friends with %s."
-msgstr "Zřejmě jste již přátelé se %s."
-
-#: mod/dfrn_request.php:503
-msgid "Invalid profile URL."
-msgstr "Neplatné URL profilu."
-
-#: mod/dfrn_request.php:604
-msgid "Your introduction has been sent."
-msgstr "Vaše žádost o propojení byla odeslána."
-
-#: mod/dfrn_request.php:644
-msgid ""
-"Remote subscription can't be done for your network. Please subscribe "
-"directly on your system."
-msgstr ""
-
-#: mod/dfrn_request.php:664
-msgid "Please login to confirm introduction."
-msgstr "Prosím přihlašte se k potvrzení žádosti o propojení."
-
-#: mod/dfrn_request.php:674
-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."
-
-#: mod/dfrn_request.php:688 mod/dfrn_request.php:705
-msgid "Confirm"
-msgstr "Potvrdit"
-
-#: mod/dfrn_request.php:700
-msgid "Hide this contact"
-msgstr "Skrýt tento kontakt"
-
-#: mod/dfrn_request.php:703
-#, php-format
-msgid "Welcome home %s."
-msgstr "Vítejte doma %s."
-
-#: mod/dfrn_request.php:704
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr "Prosím potvrďte Vaši žádost o propojení %s."
-
-#: mod/dfrn_request.php:833
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"communications networks:"
-msgstr "Prosím zadejte Vaši adresu identity jedné z následujících podporovaných komunikačních sítí:"
-
-#: mod/dfrn_request.php:854
-#, php-format
-msgid ""
-"If you are not yet a member of the free social web, <a "
-"href=\"%s/siteinfo\">follow this link to find a public Friendica site and "
-"join us today</a>."
-msgstr ""
-
-#: mod/dfrn_request.php:859
-msgid "Friend/Connection Request"
-msgstr "Požadavek o přátelství / kontaktování"
-
-#: mod/dfrn_request.php:860
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
-msgstr "Příklady: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
-
-#: mod/dfrn_request.php:861 mod/follow.php:109
-msgid "Please answer the following:"
-msgstr "Odpovězte, prosím, následující:"
-
-#: mod/dfrn_request.php:862 mod/follow.php:110
-#, php-format
-msgid "Does %s know you?"
-msgstr "Zná Vás uživatel %s ?"
-
-#: mod/dfrn_request.php:866 mod/follow.php:111
-msgid "Add a personal note:"
-msgstr "Přidat osobní poznámku:"
-
-#: mod/dfrn_request.php:869
-msgid "StatusNet/Federated Social Web"
-msgstr "StatusNet / Federativní Sociální Web"
-
-#: mod/dfrn_request.php:871
-#, php-format
-msgid ""
-" - please do not use this form.  Instead, enter %s into your Diaspora search"
-" bar."
-msgstr " - prosím nepoužívejte tento formulář.  Místo toho zadejte %s do Vašeho Diaspora vyhledávacího pole."
-
-#: mod/dfrn_request.php:872 mod/follow.php:117
-msgid "Your Identity Address:"
-msgstr "Verze PHP pro příkazový řádek na Vašem systému nemá povolen \"register_argc_argv\"."
-
-#: mod/dfrn_request.php:875 mod/follow.php:19
-msgid "Submit Request"
-msgstr "Odeslat žádost"
-
-#: mod/follow.php:30
+#: mod/follow.php:73
 msgid "You already added this contact."
 msgstr "Již jste si tento kontakt přidali."
 
-#: mod/follow.php:39
+#: mod/follow.php:83
 msgid "Diaspora support isn't enabled. Contact can't be added."
-msgstr ""
+msgstr "Podpora pro Diasporu není zapnuta. Kontakt nemůže být přidán."
 
-#: mod/follow.php:46
+#: mod/follow.php:90
 msgid "OStatus support is disabled. Contact can't be added."
-msgstr ""
+msgstr "Podpora pro OStatus je vypnnuta. Kontakt nemůže být přidán."
 
-#: mod/follow.php:53
+#: mod/follow.php:97
 msgid "The network type couldn't be detected. Contact can't be added."
-msgstr ""
+msgstr "Typ sítě nemohl být detekován. Kontakt nemůže být přidán."
 
-#: mod/follow.php:180
-msgid "Contact added"
-msgstr "Kontakt přidán"
+#: 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 "Fotky kontaktu"
 
-#: mod/install.php:139
-msgid "Friendica Communications Server - Setup"
-msgstr "Friendica Komunikační server - Nastavení"
+#: mod/fbrowser.php:132
+msgid "Files"
+msgstr "Soubory"
 
-#: mod/install.php:145
-msgid "Could not connect to database."
-msgstr "Nelze se připojit k databázi."
+#: mod/oexchange.php:30
+msgid "Post successful."
+msgstr "Příspěvek úspěšně odeslán"
 
-#: mod/install.php:149
-msgid "Could not create table."
-msgstr "Nelze vytvořit tabulku."
+#: mod/subthread.php:103
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s následuje %3$s uživatele %2$s"
 
-#: mod/install.php:155
-msgid "Your Friendica site database has been installed."
-msgstr "Vaše databáze Friendica  byla nainstalována."
+#: mod/credits.php:18
+msgid "Credits"
+msgstr "Poděkování"
 
-#: mod/install.php:160
+#: mod/credits.php:19
 msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr "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."
+"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 je komunitní projekt, který by nebyl možný bez pomoci mnoha lidí. Zde je seznam těch, kteří přispěli ke kódu nebo k překladu Friendica. Děkujeme všem!"
 
-#: mod/install.php:161 mod/install.php:230 mod/install.php:607
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Přečtěte si prosím informace v souboru \"INSTALL.txt\"."
+#: mod/attach.php:16
+msgid "Item not available."
+msgstr "Položka není k dispozici."
 
-#: mod/install.php:173
-msgid "Database already in use."
-msgstr "Databáze se již používá."
+#: mod/attach.php:26
+msgid "Item was not found."
+msgstr "Položka nebyla nalezena."
 
-#: mod/install.php:227
-msgid "System check"
-msgstr "Testování systému"
+#: mod/notify.php:77
+msgid "No more system notifications."
+msgstr "Žádné další systémová upozornění."
 
-#: mod/install.php:232
-msgid "Check again"
-msgstr "Otestovat znovu"
+#: mod/community.php:71
+msgid "Community option not available."
+msgstr "Možnost komunity není dostupná."
 
-#: mod/install.php:251
-msgid "Database connection"
-msgstr "Databázové spojení"
+#: mod/community.php:88
+msgid "Not available."
+msgstr "Není k dispozici."
 
-#: mod/install.php:252
+#: mod/community.php:101
+msgid "Local Community"
+msgstr "Místní komunita"
+
+#: mod/community.php:104
+msgid "Posts from local users on this server"
+msgstr "Příspěvky od místních uživatelů na tomto serveru"
+
+#: mod/community.php:112
+msgid "Global Community"
+msgstr "Globální komunita"
+
+#: mod/community.php:115
+msgid "Posts from users of the whole federated network"
+msgstr "Příspěvky od uživatelů z celé federované sítě"
+
+#: mod/community.php:205
 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."
+"This community stream shows all public posts received by this node. They may"
+" not reflect the opinions of this node’s users."
+msgstr "Tento komunitní proud ukazuje všechny veřejné příspěvky, které tento server přijme. Nemusí odrážet názory uživatelů serveru."
 
-#: mod/install.php:253
+#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:829
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d. F, Y v g:i A"
+
+#: mod/localtime.php:33
+msgid "Time Conversion"
+msgstr "Časový převod"
+
+#: mod/localtime.php:35
 msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Pokud máte otázky k následujícím nastavením, obraťte se na svého poskytovatele hostingu nebo administrátora serveru, "
+"Friendica provides this service for sharing events with other networks and "
+"friends in unknown timezones."
+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/install.php:254
+#: mod/localtime.php:39
+#, php-format
+msgid "UTC time: %s"
+msgstr "UTC čas: %s"
+
+#: mod/localtime.php:42
+#, php-format
+msgid "Current timezone: %s"
+msgstr "Aktuální časové pásmo: %s"
+
+#: mod/localtime.php:46
+#, php-format
+msgid "Converted localtime: %s"
+msgstr "Převedený místní čas : %s"
+
+#: mod/localtime.php:52
+msgid "Please select your timezone:"
+msgstr "Prosím, vyberte své časové pásmo:"
+
+#: mod/poke.php:188
+msgid "Poke/Prod"
+msgstr "Šťouchnout/dloubnout"
+
+#: mod/poke.php:189
+msgid "poke, prod or do other things to somebody"
+msgstr "někoho šťouchnout, dloubnout, nebo mu provést jinou věc"
+
+#: mod/poke.php:190
+msgid "Recipient"
+msgstr "Příjemce"
+
+#: mod/poke.php:191
+msgid "Choose what you wish to do to recipient"
+msgstr "Vyberte, co si přejete příjemci udělat"
+
+#: mod/poke.php:194
+msgid "Make this post private"
+msgstr "Změnit tento příspěvek na soukromý"
+
+#: mod/invite.php:34
+msgid "Total invitation limit exceeded."
+msgstr "Celkový limit pozvánek byl překročen"
+
+#: mod/invite.php:56
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : není platná e-mailová adresa."
+
+#: mod/invite.php:88
+msgid "Please join us on Friendica"
+msgstr "Prosím přidejte se k nám na Friendice"
+
+#: mod/invite.php:97
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Limit pozvánek byl překročen. Prosím kontaktujte administrátora Vaší stránky."
+
+#: mod/invite.php:101
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Doručení zprávy se nezdařilo."
+
+#: mod/invite.php:105
+#, php-format
+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ávy odesláno."
+msgstr[3] "%d zpráv odesláno."
+
+#: mod/invite.php:123
+msgid "You have no more invitations available"
+msgstr "Nemáte k dispozici žádné další pozvánky"
+
+#: mod/invite.php:131
+#, php-format
 msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "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."
+"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 "Navštivte %s pro seznam veřejných serverů, na kterých se můžete přidat. Členové Friendica na jiných serverech se mohou spojit mezi sebou, jakožto i se členy mnoha dalších sociálních sítí."
 
-#: mod/install.php:258
-msgid "Database Server Name"
-msgstr "Jméno databázového serveru"
-
-#: mod/install.php:259
-msgid "Database Login Name"
-msgstr "Přihlašovací jméno k databázi"
-
-#: mod/install.php:260
-msgid "Database Login Password"
-msgstr "Heslo k databázovému účtu "
-
-#: mod/install.php:261
-msgid "Database Name"
-msgstr "Jméno databáze"
-
-#: mod/install.php:262 mod/install.php:303
-msgid "Site administrator email address"
-msgstr "Emailová adresa administrátora webu"
-
-#: mod/install.php:262 mod/install.php:303
+#: mod/invite.php:133
+#, php-format
 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í."
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr "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."
 
-#: mod/install.php:266 mod/install.php:306
-msgid "Please select a default timezone for your website"
-msgstr "Prosím, vyberte výchozí časové pásmo pro váš server"
-
-#: mod/install.php:293
-msgid "Site settings"
-msgstr "Nastavení webu"
-
-#: mod/install.php:307
-msgid "System Language:"
-msgstr ""
-
-#: mod/install.php:307
+#: mod/invite.php:134
+#, php-format
 msgid ""
-"Set the default language for your Friendica installation interface and to "
-"send emails."
-msgstr ""
+"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 "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."
 
-#: mod/install.php:347
+#: mod/invite.php:138
+msgid ""
+"Our apologies. This system is not currently configured to connect with other"
+" public sites or invite members."
+msgstr "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."
+
+#: 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 "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
+msgid "To accept this invitation, please visit and register at %s."
+msgstr "Pokud chcete tuto pozvánku přijmout, prosím navštivte %s a registrujte se tam."
+
+#: mod/invite.php:148
+msgid "Send invitations"
+msgstr "Poslat pozvánky"
+
+#: mod/invite.php:149
+msgid "Enter email addresses, one per line:"
+msgstr "Zadejte e-mailové adresy, jednu na řádek:"
+
+#: 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 "Jsi srdečně pozván/a se připojit ke mně a k mým blízkým přátelům na Friendica - a pomoci nám vytvořit lepší sociální web."
+
+#: mod/invite.php:152
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr "Budeš muset zadat tento pozvánkový kód: $invite_code"
+
+#: mod/invite.php:152
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr "Jakmile se zaregistruješ, prosím spoj se se mnou přes mou profilovu stránku na:"
+
+#: 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 "Pro více informací o projektu Friendica a proč si myslíme, že je důležitý, prosím navštivte http://friendi.ca"
+
+#: mod/notes.php:42 src/Model/Profile.php:933
+msgid "Personal Notes"
+msgstr "Osobní poznámky"
+
+#: mod/profiles.php:57
+msgid "Profile deleted."
+msgstr "Profil smazán."
+
+#: mod/profiles.php:73 mod/profiles.php:109
+msgid "Profile-"
+msgstr "Profil-"
+
+#: mod/profiles.php:92 mod/profiles.php:131
+msgid "New profile created."
+msgstr "Nový profil vytvořen."
+
+#: mod/profiles.php:115
+msgid "Profile unavailable to clone."
+msgstr "Profil není možné naklonovat."
+
+#: mod/profiles.php:203
+msgid "Profile Name is required."
+msgstr "Jméno profilu je povinné."
+
+#: mod/profiles.php:344
+msgid "Marital Status"
+msgstr "Rodinný stav"
+
+#: mod/profiles.php:348
+msgid "Romantic Partner"
+msgstr "Romatický partner"
+
+#: mod/profiles.php:360
+msgid "Work/Employment"
+msgstr "Práce/Zaměstnání"
+
+#: mod/profiles.php:363
+msgid "Religion"
+msgstr "Náboženství"
+
+#: mod/profiles.php:367
+msgid "Political Views"
+msgstr "Politické přesvědčení"
+
+#: mod/profiles.php:371
+msgid "Gender"
+msgstr "Pohlaví"
+
+#: mod/profiles.php:375
+msgid "Sexual Preference"
+msgstr "Sexuální orientace"
+
+#: mod/profiles.php:379
+msgid "XMPP"
+msgstr "XMPP"
+
+#: mod/profiles.php:383
+msgid "Homepage"
+msgstr "Domovská stránka"
+
+#: mod/profiles.php:387 mod/profiles.php:593
+msgid "Interests"
+msgstr "Zájmy"
+
+#: mod/profiles.php:398 mod/profiles.php:589
+msgid "Location"
+msgstr "Poloha"
+
+#: mod/profiles.php:481
+msgid "Profile updated."
+msgstr "Profil aktualizován."
+
+#: mod/profiles.php:538
+msgid "Hide contacts and friends:"
+msgstr "Skrýt kontakty a přátele:"
+
+#: mod/profiles.php:543
+msgid "Hide your contact/friend list from viewers of this profile?"
+msgstr "Skrýt u tohoto profilu Vaše kontakty / seznam přátel před před dalšími uživateli zobrazující si tento profil?"
+
+#: mod/profiles.php:563
+msgid "Show more profile fields:"
+msgstr "Zobrazit další profilová pole"
+
+#: mod/profiles.php:575
+msgid "Profile Actions"
+msgstr "Akce profilu"
+
+#: mod/profiles.php:576
+msgid "Edit Profile Details"
+msgstr "Upravit podrobnosti profilu "
+
+#: mod/profiles.php:578
+msgid "Change Profile Photo"
+msgstr "Změnit profilovou fotku"
+
+#: mod/profiles.php:580
+msgid "View this profile"
+msgstr "Zobrazit tento profil"
+
+#: mod/profiles.php:581
+msgid "View all profiles"
+msgstr "Zobrazit všechny profily"
+
+#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:393
+msgid "Edit visibility"
+msgstr "Upravit viditelnost"
+
+#: mod/profiles.php:583
+msgid "Create a new profile using these settings"
+msgstr "Vytvořit nový profil pomocí tohoto nastavení"
+
+#: mod/profiles.php:584
+msgid "Clone this profile"
+msgstr "Klonovat tento profil"
+
+#: mod/profiles.php:585
+msgid "Delete this profile"
+msgstr "Smazat tento profil"
+
+#: mod/profiles.php:587
+msgid "Basic information"
+msgstr "Základní informace"
+
+#: mod/profiles.php:588
+msgid "Profile picture"
+msgstr "Profilový obrázek"
+
+#: mod/profiles.php:590
+msgid "Preferences"
+msgstr "Nastavení"
+
+#: mod/profiles.php:591
+msgid "Status information"
+msgstr "Informace o stavu"
+
+#: mod/profiles.php:592
+msgid "Additional information"
+msgstr "Dodatečné informace"
+
+#: mod/profiles.php:595
+msgid "Relation"
+msgstr "Vztah"
+
+#: mod/profiles.php:596 src/Util/Temporal.php:81 src/Util/Temporal.php:83
+msgid "Miscellaneous"
+msgstr "Různé"
+
+#: mod/profiles.php:599
+msgid "Your Gender:"
+msgstr "Vaše pohlaví:"
+
+#: mod/profiles.php:600
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Rodinný stav:"
+
+#: mod/profiles.php:601 src/Model/Profile.php:769
+msgid "Sexual Preference:"
+msgstr "Sexuální orientace:"
+
+#: mod/profiles.php:602
+msgid "Example: fishing photography software"
+msgstr "Příklad: rybaření fotografování software"
+
+#: mod/profiles.php:607
+msgid "Profile Name:"
+msgstr "Jméno profilu:"
+
+#: 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 "Toto je váš <strong>veřejný</strong> profil.<br />Ten <strong>může</strong> být viditelný kýmkoliv na internetu."
+
+#: mod/profiles.php:610
+msgid "Your Full Name:"
+msgstr "Vaše celé jméno:"
+
+#: mod/profiles.php:611
+msgid "Title/Description:"
+msgstr "Název / Popis:"
+
+#: mod/profiles.php:614
+msgid "Street Address:"
+msgstr "Ulice:"
+
+#: mod/profiles.php:615
+msgid "Locality/City:"
+msgstr "Poloha/město:"
+
+#: mod/profiles.php:616
+msgid "Region/State:"
+msgstr "Region / stát:"
+
+#: mod/profiles.php:617
+msgid "Postal/Zip Code:"
+msgstr "PSČ:"
+
+#: mod/profiles.php:618
+msgid "Country:"
+msgstr "Země:"
+
+#: mod/profiles.php:619 src/Util/Temporal.php:149
+msgid "Age: "
+msgstr "Věk: "
+
+#: mod/profiles.php:622
+msgid "Who: (if applicable)"
+msgstr "Kdo: (pokud je možné)"
+
+#: mod/profiles.php:622
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Příklady: jan123, Jan Novák, jan@priklad.cz"
+
+#: mod/profiles.php:623
+msgid "Since [date]:"
+msgstr "Od [data]:"
+
+#: mod/profiles.php:625
+msgid "Tell us about yourself..."
+msgstr "Řekněte nám něco o sobě ..."
+
+#: mod/profiles.php:626
+msgid "XMPP (Jabber) address:"
+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šemi kontakty, aby vás mohly sledovat."
+
+#: mod/profiles.php:627
+msgid "Homepage URL:"
+msgstr "Odkaz na domovskou stránku:"
+
+#: mod/profiles.php:628 src/Model/Profile.php:777
+msgid "Hometown:"
+msgstr "Rodné město:"
+
+#: mod/profiles.php:629 src/Model/Profile.php:785
+msgid "Political Views:"
+msgstr "Politické přesvědčení:"
+
+#: mod/profiles.php:630
+msgid "Religious Views:"
+msgstr "Náboženské přesvědčení:"
+
+#: mod/profiles.php:631
+msgid "Public Keywords:"
+msgstr "Veřejná klíčová slova:"
+
+#: mod/profiles.php:631
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr "(Používá se pro doporučování potenciálních přátel, může být viděno ostatními)"
+
+#: mod/profiles.php:632
+msgid "Private Keywords:"
+msgstr "Soukromá klíčová slova:"
+
+#: mod/profiles.php:632
+msgid "(Used for searching profiles, never shown to others)"
+msgstr "(Používá se pro vyhledávání profilů, není nikdy zobrazeno ostatním)"
+
+#: mod/profiles.php:633 src/Model/Profile.php:801
+msgid "Likes:"
+msgstr "Líbí se:"
+
+#: mod/profiles.php:634 src/Model/Profile.php:805
+msgid "Dislikes:"
+msgstr "Nelibí se:"
+
+#: mod/profiles.php:635
+msgid "Musical interests"
+msgstr "Hudební vkus"
+
+#: mod/profiles.php:636
+msgid "Books, literature"
+msgstr "Knihy, literatura"
+
+#: mod/profiles.php:637
+msgid "Television"
+msgstr "Televize"
+
+#: mod/profiles.php:638
+msgid "Film/dance/culture/entertainment"
+msgstr "Film/tanec/kultura/zábava"
+
+#: mod/profiles.php:639
+msgid "Hobbies/Interests"
+msgstr "Koníčky/zájmy"
+
+#: mod/profiles.php:640
+msgid "Love/romance"
+msgstr "Láska/romantika"
+
+#: mod/profiles.php:641
+msgid "Work/employment"
+msgstr "Práce/zaměstnání"
+
+#: mod/profiles.php:642
+msgid "School/education"
+msgstr "Škola/vzdělání"
+
+#: mod/profiles.php:643
+msgid "Contact information and Social Networks"
+msgstr "Kontaktní informace a sociální sítě"
+
+#: mod/profiles.php:674 src/Model/Profile.php:389
+msgid "Profile Image"
+msgstr "Profilový obrázek"
+
+#: mod/profiles.php:676 src/Model/Profile.php:392
+msgid "visible to everybody"
+msgstr "viditelné pro všechny"
+
+#: mod/profiles.php:683
+msgid "Edit/Manage Profiles"
+msgstr "Upravit/spravovat profily"
+
+#: mod/profiles.php:684 src/Model/Profile.php:379 src/Model/Profile.php:401
+msgid "Change profile photo"
+msgstr "Změnit profilovou fotku"
+
+#: mod/profiles.php:685 src/Model/Profile.php:380
+msgid "Create New Profile"
+msgstr "Vytvořit nový profil"
+
+#: mod/photos.php:112 src/Model/Profile.php:894
+msgid "Photo Albums"
+msgstr "Fotoalba"
+
+#: mod/photos.php:113 mod/photos.php:1708
+msgid "Recent Photos"
+msgstr "Nedávné fotky"
+
+#: mod/photos.php:116 mod/photos.php:1230 mod/photos.php:1710
+msgid "Upload New Photos"
+msgstr "Nahrát nové fotky"
+
+#: mod/photos.php:190
+msgid "Contact information unavailable"
+msgstr "Kontakt byl zablokován"
+
+#: mod/photos.php:209
+msgid "Album not found."
+msgstr "Album nenalezeno."
+
+#: mod/photos.php:239 mod/photos.php:252 mod/photos.php:1181
+msgid "Delete Album"
+msgstr "Smazat album"
+
+#: mod/photos.php:250
+msgid "Do you really want to delete this photo album and all its photos?"
+msgstr "Opravdu chcete smazat toto fotoalbum a všechny jeho fotky?"
+
+#: mod/photos.php:312 mod/photos.php:324 mod/photos.php:1453
+msgid "Delete Photo"
+msgstr "Smazat fotku"
+
+#: mod/photos.php:322
+msgid "Do you really want to delete this photo?"
+msgstr "Opravdu chcete smazat tuto fotku?"
+
+#: mod/photos.php:679
+msgid "a photo"
+msgstr "fotce"
+
+#: mod/photos.php:679
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
+msgstr "%1$s byl označen ve %2$s uživatelem %3$s"
+
+#: mod/photos.php:782
+msgid "Image upload didn't complete, please try again"
+msgstr "Nahrávání obrázku nebylo dokončeno, zkuste to prosím znovu"
+
+#: mod/photos.php:785
+msgid "Image file is missing"
+msgstr "Chybí soubor obrázku"
+
+#: mod/photos.php:790
+msgid ""
+"Server can't accept new file upload at this time, please contact your "
+"administrator"
+msgstr "Server v tuto chvíli nemůže akceptovat nové nahrané soubory, prosím kontaktujte Vašeho administrátora"
+
+#: mod/photos.php:816
+msgid "Image file is empty."
+msgstr "Soubor obrázku je prázdný."
+
+#: mod/photos.php:953
+msgid "No photos selected"
+msgstr "Není vybrána žádná fotka"
+
+#: mod/photos.php:1104
+msgid "Upload Photos"
+msgstr "Nahrát fotky"
+
+#: mod/photos.php:1108 mod/photos.php:1176
+msgid "New album name: "
+msgstr "Název nového alba: "
+
+#: mod/photos.php:1109
+msgid "or select existing album:"
+msgstr "nebo si vyberte existující album:"
+
+#: mod/photos.php:1110
+msgid "Do not show a status post for this upload"
+msgstr "Nezobrazovat pro toto nahrání stavový příspěvek"
+
+#: mod/photos.php:1187
+msgid "Edit Album"
+msgstr "Upravit album"
+
+#: mod/photos.php:1192
+msgid "Show Newest First"
+msgstr "Zobrazit nejprve nejnovější:"
+
+#: mod/photos.php:1194
+msgid "Show Oldest First"
+msgstr "Zobrazit nejprve nejstarší:"
+
+#: mod/photos.php:1215 mod/photos.php:1693
+msgid "View Photo"
+msgstr "Zobrazit fotku"
+
+#: mod/photos.php:1256
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Oprávnění bylo zamítnuto. Přístup k této položce může být omezen."
+
+#: mod/photos.php:1258
+msgid "Photo not available"
+msgstr "Fotka není k dispozici"
+
+#: mod/photos.php:1333
+msgid "View photo"
+msgstr "Zobrazit fotku"
+
+#: mod/photos.php:1333
+msgid "Edit photo"
+msgstr "Upravit fotku"
+
+#: mod/photos.php:1334
+msgid "Use as profile photo"
+msgstr "Použít jako profilovou fotku"
+
+#: mod/photos.php:1340 src/Object/Post.php:151
+msgid "Private Message"
+msgstr "Soukromá zpráva"
+
+#: mod/photos.php:1360
+msgid "View Full Size"
+msgstr "Zobrazit v plné velikosti"
+
+#: mod/photos.php:1421
+msgid "Tags: "
+msgstr "Štítky: "
+
+#: mod/photos.php:1424
+msgid "[Remove any tag]"
+msgstr "[Odstranit všechny štítky]"
+
+#: mod/photos.php:1439
+msgid "New album name"
+msgstr "Nové jméno alba"
+
+#: mod/photos.php:1440
+msgid "Caption"
+msgstr "Titulek"
+
+#: mod/photos.php:1441
+msgid "Add a Tag"
+msgstr "Přidat štítek"
+
+#: mod/photos.php:1441
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Příklad: @jan, @Lucie_Nováková, @jakub@priklad.cz, #Morava, #taboreni"
+
+#: mod/photos.php:1442
+msgid "Do not rotate"
+msgstr "Neotáčet"
+
+#: mod/photos.php:1443
+msgid "Rotate CW (right)"
+msgstr "Otáčet po směru hodinových ručiček (doprava)"
+
+#: mod/photos.php:1444
+msgid "Rotate CCW (left)"
+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)"
+msgstr "Líbí se mi to (přepínač)"
+
+#: mod/photos.php:1479 src/Object/Post.php:294
+msgid "I don't like this (toggle)"
+msgstr "Nelíbí se mi to (přepínač)"
+
+#: 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 "Okomentovat"
+
+#: mod/photos.php:1627
+msgid "Map"
+msgstr "Mapa"
+
+#: 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> napsal/a následující <a href=\"%s\" target=\"_blank\">příspěvek</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> napsal/a následující <a href=\"%s\" target=\"_blank\">příspěvek</a>"
+
+#: boot.php:653
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "Aktualizace %s selhala. Zkontrolujte protokol chyb."
+
+#: src/Database/DBStructure.php:33
+msgid "There are no tables on MyISAM."
+msgstr "V MyISAM nejsou žádné tabulky."
+
+#: 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\tVývojáři Friendica nedávno vydali aktualizaci %s,\n\t\t\t\tale když jsem ji zkusil instalovat, něco se strašně pokazilo.\n\t\t\t\tToto se musí ihned opravit a nemůžu to udělat sám. Prosím, kontaktujte\n\t\t\t\tvývojáře Friendica, pokud to nedokážete sám. Moje databáze může být neplatná."
+
+#: src/Database/DBStructure.php:81
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr "Chybová zpráva je\n[pre]%s[/pre]"
+
+#: src/Database/DBStructure.php:192
+#, php-format
+msgid ""
+"\n"
+"Error %d occurred during database update:\n"
+"%s\n"
+msgstr "\nPři aktualizaci databáze se vyskytla chyba %d:\n%s\n"
+
+#: src/Database/DBStructure.php:195
+msgid "Errors encountered performing database changes: "
+msgstr "Při vykonávání změn v databázy se vyskytly chyby: "
+
+#: src/Database/DBStructure.php:211
+#, php-format
+msgid "%s: Database update"
+msgstr "%s: Aktualizace databáze"
+
+#: src/Database/DBStructure.php:473
+#, php-format
+msgid "%s: updating %s table."
+msgstr "%s: aktualizuji tabulku %s"
+
+#: src/Core/Install.php:138
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Nelze najít verzi PHP pro příkazový řádek v PATH webového serveru."
 
-#: mod/install.php:348
+#: src/Core/Install.php:139
 msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron. See <a "
+"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-poller'>'Setup the poller'</a>"
-msgstr ""
+"up-the-worker'>'Setup the worker'</a>"
+msgstr "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>"
 
-#: mod/install.php:352
+#: src/Core/Install.php:143
 msgid "PHP executable path"
-msgstr "Cesta k \"PHP executable\""
+msgstr "Cesta ke spustitelnému souboru PHP"
 
-#: mod/install.php:352
+#: 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."
 
-#: mod/install.php:357
+#: src/Core/Install.php:148
 msgid "Command line PHP"
 msgstr "Příkazový řádek PHP"
 
-#: mod/install.php:366
+#: src/Core/Install.php:157
 msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
 msgstr "PHP executable není php cli binary (může být verze cgi-fgci)"
 
-#: mod/install.php:367
+#: src/Core/Install.php:158
 msgid "Found PHP version: "
 msgstr "Nalezena PHP verze:"
 
-#: mod/install.php:369
+#: src/Core/Install.php:160
 msgid "PHP cli binary"
 msgstr "PHP cli binary"
 
-#: mod/install.php:380
+#: src/Core/Install.php:170
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
-msgstr "Vyberte prosím profil, který chcete zobrazit %s při zabezpečeném prohlížení Vašeho profilu."
+msgstr "Verze PHP pro příkazový řádek na Vašem systému nemá povoleno nastavení \"register_argc_argv\"."
 
-#: mod/install.php:381
+#: src/Core/Install.php:171
 msgid "This is required for message delivery to work."
 msgstr "Toto je nutné pro fungování doručování zpráv."
 
-#: mod/install.php:383
+#: src/Core/Install.php:173
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: mod/install.php:404
+#: src/Core/Install.php:201
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Chyba: funkce \"openssl_pkey_new\" na tomto systému není schopna generovat šifrovací klíče"
 
-#: mod/install.php:405
+#: src/Core/Install.php:202
 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\"."
 
-#: mod/install.php:407
+#: src/Core/Install.php:204
 msgid "Generate encryption keys"
-msgstr "Generovat kriptovací klíče"
+msgstr "Generovat šifrovací klíče"
 
-#: mod/install.php:414
+#: src/Core/Install.php:225
 msgid "libCurl PHP module"
-msgstr "libCurl PHP modul"
+msgstr "PHP modul libCurl"
 
-#: mod/install.php:415
+#: src/Core/Install.php:226
 msgid "GD graphics PHP module"
-msgstr "GD graphics PHP modul"
+msgstr "PHP modul GD graphics"
 
-#: mod/install.php:416
+#: src/Core/Install.php:227
 msgid "OpenSSL PHP module"
-msgstr "OpenSSL PHP modul"
+msgstr "PHP modul OpenSSL"
 
-#: mod/install.php:417
-msgid "mysqli PHP module"
-msgstr "mysqli PHP modul"
+#: src/Core/Install.php:228
+msgid "PDO or MySQLi PHP module"
+msgstr "PHP modul PDO nebo MySQLi"
 
-#: mod/install.php:418
+#: src/Core/Install.php:229
 msgid "mb_string PHP module"
-msgstr "mb_string PHP modul"
+msgstr "PHP modul mb_string"
 
-#: mod/install.php:419
-msgid "mcrypt PHP module"
-msgstr ""
-
-#: mod/install.php:420
+#: src/Core/Install.php:230
 msgid "XML PHP module"
-msgstr ""
+msgstr "PHP modul XML"
 
-#: mod/install.php:421
-msgid "iconv module"
-msgstr ""
+#: src/Core/Install.php:231
+msgid "iconv PHP module"
+msgstr "PHP modul iconv"
 
-#: mod/install.php:425 mod/install.php:427
+#: src/Core/Install.php:232
+msgid "POSIX PHP module"
+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"
 
-#: mod/install.php:425
+#: 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."
 
-#: mod/install.php:433
+#: 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."
 
-#: mod/install.php:437
+#: 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."
 
-#: mod/install.php:441
+#: 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."
 
-#: mod/install.php:445
-msgid "Error: mysqli PHP module required but not installed."
-msgstr "Chyba: požadovaný mysqli PHP modul 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."
 
-#: mod/install.php:449
+#: src/Core/Install.php:260
+msgid "Error: The MySQL driver for PDO is not installed."
+msgstr "Chyba: Ovladač MySQL pro PDO není nainstalován"
+
+#: src/Core/Install.php:264
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Chyba: PHP modul mb_string  je vyžadován, ale není nainstalován."
 
-#: mod/install.php:453
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr ""
-
-#: mod/install.php:457
+#: src/Core/Install.php:268
 msgid "Error: iconv PHP module required but not installed."
-msgstr ""
+msgstr "Chyba: PHP modul iconv je vyžadován, ale není nainstalován"
 
-#: mod/install.php:466
-msgid ""
-"If you are using php_cli, please make sure that mcrypt module is enabled in "
-"its config file"
-msgstr ""
+#: 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."
 
-#: mod/install.php:469
-msgid ""
-"Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 "
-"encryption layer."
-msgstr ""
-
-#: mod/install.php:471
-msgid "mcrypt_create_iv() function"
-msgstr ""
-
-#: mod/install.php:479
+#: src/Core/Install.php:282
 msgid "Error, XML PHP module required but not installed."
-msgstr ""
+msgstr "Chyba: PHP modul XML je vyžadován, ale není nainstalován"
 
-#: mod/install.php:494
+#: 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 "Webový instalátor musí být schopen vytvořit soubor s názvem \".htconfig.php\" v hlavním adresáři vašeho webového serveru ale nyní mu to není umožněno."
+"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 "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. "
 
-#: mod/install.php:495
+#: 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 "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."
 
-#: mod/install.php:496
+#: 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 "Na konci této procedury obd nás obdržíte text k uložení v souboru pojmenovaném .htconfig.php ve Vašem Friendica kořenovém adresáři."
+"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 v adresáři \"config\" na Vaší instalaci Friendica."
 
-#: mod/install.php:497
+#: 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 "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."
 
-#: mod/install.php:500
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php je editovatelné"
+#: src/Core/Install.php:307
+msgid "config/local.ini.php is writable"
+msgstr "Soubor config/local.ini.php je zapisovatelný"
 
-#: mod/install.php:510
+#: 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í."
 
-#: mod/install.php:511
+#: 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."
 
-#: mod/install.php:512
+#: 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"
 
-#: mod/install.php:513
+#: 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."
 
-#: mod/install.php:516
+#: src/Core/Install.php:331
 msgid "view/smarty3 is writable"
-msgstr "view/smarty3 je nastaven pro zápis"
+msgstr "Adresář view/smarty3 je zapisovatelný"
 
-#: mod/install.php:532
+#: 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."
 
-#: mod/install.php:534
+#: src/Core/Install.php:358
+msgid "Error message from Curl when fetching"
+msgstr "Chybová zpráva od Curl při načítání"
+
+#: src/Core/Install.php:362
 msgid "Url rewrite is working"
 msgstr "Url rewrite je funkční."
 
-#: mod/install.php:552
+#: src/Core/Install.php:389
 msgid "ImageMagick PHP extension is not installed"
-msgstr ""
+msgstr "PHP rozšíření ImageMagick není nainstalováno"
 
-#: mod/install.php:555
+#: src/Core/Install.php:391
 msgid "ImageMagick PHP extension is installed"
-msgstr ""
+msgstr "PHP rozšíření ImageMagick je nainstalováno"
 
-#: mod/install.php:557
+#: src/Core/Install.php:393
 msgid "ImageMagick supports GIF"
-msgstr ""
+msgstr "ImageMagick podporuje GIF"
 
-#: mod/install.php:566
-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 "Databázový konfigurační soubor \".htconfig.php\" nemohl být uložen. 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."
+#: src/Core/ACL.php:284
+msgid "Post to Email"
+msgstr "Poslat příspěvek na e-mail"
 
-#: mod/install.php:605
-msgid "<h1>What next</h1>"
-msgstr "<h1>Co dál<h1>"
+#: src/Core/ACL.php:290
+msgid "Hide your profile details from unknown viewers?"
+msgstr "Skrýt Vaše profilové detaily před neznámými návštěvníky?"
 
-#: mod/install.php:606
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"poller."
-msgstr "Webový instalátor musí být schopen vytvořit soubor s názvem \".htconfig.php\" v hlavním adresáři Vašeho webového serveru ale nyní mu to není umožněno."
-
-#: mod/item.php:116
-msgid "Unable to locate original post."
-msgstr "Nelze nalézt původní příspěvek."
-
-#: mod/item.php:341
-msgid "Empty post discarded."
-msgstr "Prázdný příspěvek odstraněn."
-
-#: mod/item.php:902
-msgid "System error. Post not saved."
-msgstr "Chyba systému. Příspěvek nebyl uložen."
-
-#: mod/item.php:992
+#: src/Core/ACL.php:289
 #, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social "
-"network."
-msgstr "Tato zpráva vám byla zaslána od %s, člena sociální sítě Friendica."
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr "Konektory deaktivovány, neboť je aktivován \"%s\"."
 
-#: mod/item.php:994
+#: src/Core/ACL.php:296
+msgid "Visible to everybody"
+msgstr "Viditelné pro všechny"
+
+#: src/Core/ACL.php:308
+msgid "Close"
+msgstr "Zavřít"
+
+#: src/Core/Console/ArchiveContact.php:65
 #, php-format
-msgid "You may visit them online at %s"
-msgstr "Můžete je navštívit online na adrese %s"
+msgid "Could not find any unarchived contact entry for this URL (%s)"
+msgstr "Nelze najít žádný nearchivovaný záznam kontaktu pro tuto URL adresu (%s)"
 
-#: mod/item.php:995
-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."
+#: src/Core/Console/ArchiveContact.php:70
+msgid "The contact entries have been archived"
+msgstr "Záznamy kontaktů byly archivovány"
 
-#: mod/item.php:999
+#: src/Core/Console/PostUpdate.php:32
+msgid "Execute pending post updates."
+msgstr "Provést čekající aktualizace příspěvků."
+
+#: src/Core/Console/PostUpdate.php:38
+msgid "All pending post updates are done."
+msgstr "Všechny čekající aktualizace příspěvků jsou hotové."
+
+#: src/Core/Console/NewPassword.php:73
+msgid "Enter new password: "
+msgstr "Zadejte nové heslo"
+
+#: src/Core/Console/NewPassword.php:78 src/Model/User.php:269
+msgid "Password can't be empty"
+msgstr "Heslo nemůže být prázdné"
+
+#: src/Core/NotificationsManager.php:172
+msgid "System"
+msgstr "Systém"
+
+#: src/Core/NotificationsManager.php:193 src/Content/Nav.php:124
+#: src/Content/Nav.php:186
+msgid "Home"
+msgstr "Domů"
+
+#: src/Core/NotificationsManager.php:200 src/Content/Nav.php:190
+msgid "Introductions"
+msgstr "Představení"
+
+#: src/Core/NotificationsManager.php:262 src/Core/NotificationsManager.php:274
 #, php-format
-msgid "%s posted an update."
-msgstr "%s poslal aktualizaci."
+msgid "%s commented on %s's post"
+msgstr "%s okomentoval/a příspěvek uživatele %s"
 
-#: mod/network.php:398
+#: src/Core/NotificationsManager.php:273
 #, 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] ""
-msgstr[1] ""
-msgstr[2] ""
+msgid "%s created a new post"
+msgstr "%s vytvořil nový příspěvek"
 
-#: mod/network.php:401
-msgid "Messages in this group won't be send to these receivers."
-msgstr ""
+#: src/Core/NotificationsManager.php:287
+#, php-format
+msgid "%s liked %s's post"
+msgstr "Uživateli %s se líbí příspěvek uživatele %s"
 
-#: mod/network.php:529
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr "Soukromé zprávy této osobě jsou vystaveny riziku prozrazení."
+#: src/Core/NotificationsManager.php:300
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "Uživateli %s se nelíbí příspěvek uživatele %s"
 
-#: mod/network.php:534
-msgid "Invalid contact."
-msgstr "Neplatný kontakt."
+#: src/Core/NotificationsManager.php:313
+#, php-format
+msgid "%s is attending %s's event"
+msgstr "%s se zúčastní události %s"
 
-#: mod/network.php:826
-msgid "Commented Order"
-msgstr "Dle komentářů"
+#: src/Core/NotificationsManager.php:326
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr "%s se nezúčastní události %s"
 
-#: mod/network.php:829
-msgid "Sort by Comment Date"
-msgstr "Řadit podle data komentáře"
+#: src/Core/NotificationsManager.php:339
+#, php-format
+msgid "%s may attend %s's event"
+msgstr "%s by se mohl/a zúčastnit události %s"
 
-#: mod/network.php:834
-msgid "Posted Order"
-msgstr "Dle data"
+#: src/Core/NotificationsManager.php:360
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s se nyní přátelí s uživatelem %s"
 
-#: mod/network.php:837
-msgid "Sort by Post Date"
-msgstr "Řadit podle data příspěvku"
+#: src/Core/NotificationsManager.php:626
+msgid "Friend Suggestion"
+msgstr "Návrh přátelství"
 
-#: mod/network.php:848
-msgid "Posts that mention or involve you"
-msgstr "Příspěvky, které Vás zmiňují nebo zahrnují"
+#: src/Core/NotificationsManager.php:656
+msgid "Friend/Connect Request"
+msgstr "Žádost o přátelství/spojení"
 
-#: mod/network.php:856
-msgid "New"
-msgstr "Nové"
+#: src/Core/NotificationsManager.php:656
+msgid "New Follower"
+msgstr "Nový sledovatel"
 
-#: mod/network.php:859
-msgid "Activity Stream - by date"
-msgstr "Proud aktivit - dle data"
+#: src/Core/UserImport.php:100
+msgid "Error decoding account file"
+msgstr "Chyba dekódování uživatelského účtu"
 
-#: mod/network.php:867
-msgid "Shared Links"
-msgstr "Sdílené odkazy"
+#: src/Core/UserImport.php:106
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Chyba! V souboru nejsou data o verzi! Je to opravdu soubor s účtem Friendica?"
 
-#: mod/network.php:870
-msgid "Interesting Links"
-msgstr "Zajímavé odkazy"
+#: src/Core/UserImport.php:114
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "Uživatel \"%s\" již na tomto serveru existuje!"
 
-#: mod/network.php:878
-msgid "Starred"
-msgstr "S hvězdičkou"
+#: src/Core/UserImport.php:147
+msgid "User creation error"
+msgstr "Chyba při vytváření uživatele"
 
-#: mod/network.php:881
-msgid "Favourite Posts"
-msgstr "Oblíbené přízpěvky"
+#: src/Core/UserImport.php:165
+msgid "User profile creation error"
+msgstr "Chyba vytváření uživatelského profilu"
 
-#: mod/ping.php:261
-msgid "{0} wants to be your friend"
-msgstr "{0} chce být Vaším přítelem"
+#: src/Core/UserImport.php:209
+#, php-format
+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 kontaktu nenaimportováno"
+msgstr[3] "%d kontaktů nenaimportováno"
 
-#: mod/ping.php:276
-msgid "{0} sent you a message"
-msgstr "{0} vám poslal zprávu"
+#: src/Core/UserImport.php:274
+msgid "Done. You can now login with your username and password"
+msgstr "Hotovo. Nyní  se můžete přihlásit se svým uživatelským jménem a heslem"
 
-#: mod/ping.php:291
-msgid "{0} requested registration"
-msgstr "{0} požaduje registraci"
+#: src/Worker/Delivery.php:423
+msgid "(no subject)"
+msgstr "(bez předmětu)"
 
-#: mod/viewcontacts.php:72
-msgid "No contacts."
-msgstr "Žádné kontakty."
+#: src/Object/Post.php:130
+msgid "This entry was edited"
+msgstr "Tato položka byla upravena"
 
-#: object/Item.php:370
+#: src/Object/Post.php:190
+msgid "Delete globally"
+msgstr "Smazat globálně"
+
+#: src/Object/Post.php:190
+msgid "Remove locally"
+msgstr "Odstranit lokálně"
+
+#: src/Object/Post.php:203
+msgid "save to folder"
+msgstr "uložit do složky"
+
+#: src/Object/Post.php:232
+msgid "I will attend"
+msgstr "zúčastním se"
+
+#: src/Object/Post.php:232
+msgid "I will not attend"
+msgstr "nezúčastním se"
+
+#: src/Object/Post.php:232
+msgid "I might attend"
+msgstr "mohl bych se zúčastnit"
+
+#: src/Object/Post.php:259
+msgid "ignore thread"
+msgstr "ignorovat vlákno"
+
+#: src/Object/Post.php:260
+msgid "unignore thread"
+msgstr "přestat ignorovat vlákno"
+
+#: src/Object/Post.php:261
+msgid "toggle ignore status"
+msgstr "přepínat stav ignorování"
+
+#: src/Object/Post.php:272
+msgid "add star"
+msgstr "přidat hvězdu"
+
+#: src/Object/Post.php:273
+msgid "remove star"
+msgstr "odebrat hvězdu"
+
+#: src/Object/Post.php:274
+msgid "toggle star status"
+msgstr "přepínat hvězdu"
+
+#: src/Object/Post.php:277
+msgid "starred"
+msgstr "označeno hvězdou"
+
+#: src/Object/Post.php:282
+msgid "add tag"
+msgstr "přidat štítek"
+
+#: src/Object/Post.php:293
+msgid "like"
+msgstr "líbí se mi"
+
+#: src/Object/Post.php:294
+msgid "dislike"
+msgstr "nelíbí se mi"
+
+#: src/Object/Post.php:297
+msgid "Share this"
+msgstr "Sdílet toto"
+
+#: src/Object/Post.php:297
+msgid "share"
+msgstr "sdílet"
+
+#: src/Object/Post.php:364
+msgid "to"
+msgstr "na"
+
+#: src/Object/Post.php:365
 msgid "via"
 msgstr "přes"
 
-#: view/theme/frio/php/Image.php:23
-msgid "Repeat the image"
-msgstr ""
+#: src/Object/Post.php:366
+msgid "Wall-to-Wall"
+msgstr "Ze zdi na zeď"
 
-#: view/theme/frio/php/Image.php:23
-msgid "Will repeat your image to fill the background."
-msgstr ""
+#: src/Object/Post.php:367
+msgid "via Wall-To-Wall:"
+msgstr "ze zdi na zeď"
 
-#: view/theme/frio/php/Image.php:25
-msgid "Stretch"
-msgstr ""
+#: src/Object/Post.php:426
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] "%d komentář"
+msgstr[1] "%d komentáře"
+msgstr[2] "%d komentáře"
+msgstr[3] "%d komentářů"
 
-#: view/theme/frio/php/Image.php:25
-msgid "Will stretch to width/height of the image."
-msgstr ""
+#: src/Object/Post.php:796
+msgid "Bold"
+msgstr "Tučné"
 
-#: view/theme/frio/php/Image.php:27
-msgid "Resize fill and-clip"
-msgstr ""
+#: src/Object/Post.php:797
+msgid "Italic"
+msgstr "Kurzíva"
 
-#: view/theme/frio/php/Image.php:27
-msgid "Resize to fill and retain aspect ratio."
-msgstr ""
+#: src/Object/Post.php:798
+msgid "Underline"
+msgstr "Podtržené"
 
-#: view/theme/frio/php/Image.php:29
-msgid "Resize best fit"
-msgstr ""
+#: src/Object/Post.php:799
+msgid "Quote"
+msgstr "Citace"
 
-#: view/theme/frio/php/Image.php:29
-msgid "Resize to best fit and retain aspect ratio."
-msgstr ""
+#: src/Object/Post.php:800
+msgid "Code"
+msgstr "Kód"
 
-#: view/theme/frio/config.php:42
-msgid "Default"
-msgstr ""
+#: src/Object/Post.php:801
+msgid "Image"
+msgstr "Obrázek"
 
-#: view/theme/frio/config.php:54
-msgid "Note: "
-msgstr ""
+#: src/Object/Post.php:802
+msgid "Link"
+msgstr "Odkaz"
 
-#: view/theme/frio/config.php:54
-msgid "Check image permissions if all users are allowed to visit the image"
-msgstr ""
+#: src/Object/Post.php:803
+msgid "Video"
+msgstr "Video"
 
-#: view/theme/frio/config.php:62
-msgid "Select scheme"
-msgstr ""
-
-#: view/theme/frio/config.php:63
-msgid "Navigation bar background color"
-msgstr ""
-
-#: view/theme/frio/config.php:64
-msgid "Navigation bar icon color "
-msgstr ""
-
-#: view/theme/frio/config.php:65
-msgid "Link color"
-msgstr ""
-
-#: view/theme/frio/config.php:66
-msgid "Set the background color"
-msgstr ""
-
-#: view/theme/frio/config.php:67
-msgid "Content background transparency"
-msgstr ""
-
-#: view/theme/frio/config.php:68
-msgid "Set the background image"
-msgstr ""
-
-#: view/theme/frio/theme.php:229
-msgid "Guest"
-msgstr ""
-
-#: view/theme/frio/theme.php:235
-msgid "Visitor"
-msgstr ""
-
-#: view/theme/quattro/config.php:67
-msgid "Alignment"
-msgstr "Zarovnání"
-
-#: view/theme/quattro/config.php:67
-msgid "Left"
-msgstr "Vlevo"
-
-#: view/theme/quattro/config.php:67
-msgid "Center"
-msgstr "Uprostřed"
-
-#: view/theme/quattro/config.php:68
-msgid "Color scheme"
-msgstr "Barevné schéma"
-
-#: view/theme/quattro/config.php:69
-msgid "Posts font size"
-msgstr "Velikost písma u příspěvků"
-
-#: view/theme/quattro/config.php:70
-msgid "Textareas font size"
-msgstr "Velikost písma textů"
-
-#: view/theme/vier/theme.php:152 view/theme/vier/config.php:112
-msgid "Community Profiles"
-msgstr "Komunitní profily"
-
-#: view/theme/vier/theme.php:181 view/theme/vier/config.php:116
-msgid "Last users"
-msgstr "Poslední uživatelé"
-
-#: view/theme/vier/theme.php:199 view/theme/vier/config.php:115
-msgid "Find Friends"
-msgstr "Nalézt Přátele"
-
-#: view/theme/vier/theme.php:200
-msgid "Local Directory"
-msgstr "Lokální Adresář"
-
-#: view/theme/vier/theme.php:291
-msgid "Quick Start"
-msgstr ""
-
-#: view/theme/vier/theme.php:373 view/theme/vier/config.php:114
-msgid "Connect Services"
-msgstr "Propojené služby"
-
-#: view/theme/vier/config.php:64
-msgid "Comma separated list of helper forums"
-msgstr ""
-
-#: view/theme/vier/config.php:110
-msgid "Set style"
-msgstr "Nastavit styl"
-
-#: view/theme/vier/config.php:111
-msgid "Community Pages"
-msgstr "Komunitní stránky"
-
-#: view/theme/vier/config.php:113
-msgid "Help or @NewHere ?"
-msgstr "Pomoc nebo @ProNováčky ?"
-
-#: view/theme/duepuntozero/config.php:45
-msgid "greenzero"
-msgstr "zelená nula"
-
-#: view/theme/duepuntozero/config.php:46
-msgid "purplezero"
-msgstr "fialová nula"
-
-#: view/theme/duepuntozero/config.php:47
-msgid "easterbunny"
-msgstr "velikonoční zajíček"
-
-#: view/theme/duepuntozero/config.php:48
-msgid "darkzero"
-msgstr "tmavá nula"
-
-#: view/theme/duepuntozero/config.php:49
-msgid "comix"
-msgstr "komiksová"
-
-#: view/theme/duepuntozero/config.php:50
-msgid "slackr"
-msgstr "flákač"
-
-#: view/theme/duepuntozero/config.php:62
-msgid "Variations"
-msgstr "Variace"
-
-#: boot.php:970
+#: src/App.php:785
 msgid "Delete this item?"
 msgstr "Odstranit tuto položku?"
 
-#: boot.php:973
+#: src/App.php:787
 msgid "show fewer"
 msgstr "zobrazit méně"
 
-#: boot.php:1655
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Aktualizace %s selhala. Zkontrolujte protokol chyb."
+#: src/App.php:1385
+msgid "No system theme config value set."
+msgstr "Není nastavena konfigurační hodnota systémového motivu."
 
-#: boot.php:1767
+#: src/Module/Logout.php:28
+msgid "Logged out."
+msgstr "Odhlášen."
+
+#: 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 "Zaznamenali jsme problém s Vaším přihlášením prostřednictvím Vámi zadaným OpenID. Prosím ověřte si, že jste ID zadali správně. "
+
+#: src/Module/Login.php:100 src/Model/User.php:408
+msgid "The error message was:"
+msgstr "Chybová zpráva byla:"
+
+#: src/Module/Login.php:280
 msgid "Create a New Account"
 msgstr "Vytvořit nový účet"
 
-#: boot.php:1796
+#: src/Module/Login.php:313
 msgid "Password: "
 msgstr "Heslo: "
 
-#: boot.php:1797
+#: src/Module/Login.php:314
 msgid "Remember me"
-msgstr "Pamatuj si mne"
+msgstr "Pamatovat si mě"
 
-#: boot.php:1800
+#: src/Module/Login.php:317
 msgid "Or login using OpenID: "
-msgstr "Nebo přihlášení pomocí OpenID: "
+msgstr "Nebo se přihlaste pomocí OpenID: "
 
-#: boot.php:1806
+#: src/Module/Login.php:323
 msgid "Forgot your password?"
-msgstr "Zapomněli jste své heslo?"
+msgstr "Zapomněl/a jste heslo?"
 
-#: boot.php:1809
+#: src/Module/Login.php:326
 msgid "Website Terms of Service"
-msgstr "Podmínky použití serveru"
+msgstr "Podmínky používání stránky"
 
-#: boot.php:1810
+#: src/Module/Login.php:327
 msgid "terms of service"
-msgstr "podmínky použití"
+msgstr "podmínky používání"
 
-#: boot.php:1812
+#: src/Module/Login.php:329
 msgid "Website Privacy Policy"
-msgstr "Pravidla ochrany soukromí serveru"
+msgstr "Zásady soukromí serveru"
 
-#: boot.php:1813
+#: src/Module/Login.php:330
 msgid "privacy policy"
-msgstr "Ochrana soukromí"
+msgstr "zásady soukromí"
 
-#: index.php:451
-msgid "toggle mobile"
-msgstr "přepnout mobil"
+#: 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 "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."
+
+#: 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 "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ů."
+
+#: 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 "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."
+
+#: src/Module/Tos.php:39 src/Module/Tos.php:73
+msgid "Privacy Statement"
+msgstr "Prohlášení o soukromí"
+
+#: src/Protocol/OStatus.php:1813
+#, php-format
+msgid "%s is now following %s."
+msgstr "%s nyní sleduje %s."
+
+#: src/Protocol/OStatus.php:1814
+msgid "following"
+msgstr "sleduje"
+
+#: src/Protocol/OStatus.php:1817
+#, php-format
+msgid "%s stopped following %s."
+msgstr "%s přestal/a sledovat uživatele %s."
+
+#: src/Protocol/OStatus.php:1818
+msgid "stopped following"
+msgstr "přestal/a sledovat"
+
+#: src/Protocol/DFRN.php:1525 src/Model/Contact.php:1956
+#, php-format
+msgid "%s's birthday"
+msgstr "%s má narozeniny"
+
+#: src/Protocol/DFRN.php:1526 src/Model/Contact.php:1957
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "Veselé narozeniny, %s"
+
+#: src/Protocol/Diaspora.php:2417
+msgid "Sharing notification from Diaspora network"
+msgstr "Oznámení o sdílení ze sítě Diaspora"
+
+#: src/Protocol/Diaspora.php:3514
+msgid "Attachments:"
+msgstr "Přílohy:"
+
+#: src/Util/Temporal.php:147 src/Model/Profile.php:745
+msgid "Birthday:"
+msgstr "Narozeniny:"
+
+#: src/Util/Temporal.php:151
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "RRRR-MM-DD nebo MM-DD"
+
+#: src/Util/Temporal.php:294
+msgid "never"
+msgstr "nikdy"
+
+#: src/Util/Temporal.php:300
+msgid "less than a second ago"
+msgstr "méně než před sekundou"
+
+#: src/Util/Temporal.php:303
+msgid "year"
+msgstr "rok"
+
+#: src/Util/Temporal.php:303
+msgid "years"
+msgstr "let"
+
+#: src/Util/Temporal.php:304
+msgid "months"
+msgstr "měsíců"
+
+#: src/Util/Temporal.php:305
+msgid "weeks"
+msgstr "týdnů"
+
+#: src/Util/Temporal.php:306
+msgid "days"
+msgstr "dní"
+
+#: src/Util/Temporal.php:307
+msgid "hour"
+msgstr "hodina"
+
+#: src/Util/Temporal.php:307
+msgid "hours"
+msgstr "hodin"
+
+#: src/Util/Temporal.php:308
+msgid "minute"
+msgstr "minuta"
+
+#: src/Util/Temporal.php:308
+msgid "minutes"
+msgstr "minut"
+
+#: src/Util/Temporal.php:309
+msgid "second"
+msgstr "sekunda"
+
+#: src/Util/Temporal.php:309
+msgid "seconds"
+msgstr "sekund"
+
+#: src/Util/Temporal.php:318
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr "před %1$d %2$s"
+
+#: src/Model/Mail.php:39 src/Model/Mail.php:171
+msgid "[no subject]"
+msgstr "[bez předmětu]"
+
+#: src/Model/Contact.php:942
+msgid "Drop Contact"
+msgstr "Odstranit kontakt"
+
+#: src/Model/Contact.php:1399
+msgid "Organisation"
+msgstr "Organizace"
+
+#: src/Model/Contact.php:1403
+msgid "News"
+msgstr "Zprávy"
+
+#: src/Model/Contact.php:1407
+msgid "Forum"
+msgstr "Fórum"
+
+#: src/Model/Contact.php:1587
+msgid "Connect URL missing."
+msgstr "Chybí URL adresa pro připojení."
+
+#: 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 "Kontakt nemohl být přidán. Prosím zkontrolujte relevantní přihlašovací údaje sítě na stránce Nastavení -> Sociální sítě."
+
+#: src/Model/Contact.php:1635
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Tento web není nakonfigurován tak, aby umožňoval komunikaci s ostatními sítěmi."
+
+#: src/Model/Contact.php:1636 src/Model/Contact.php:1650
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "Nenalezen žádný kompatibilní komunikační protokol nebo kanál."
+
+#: src/Model/Contact.php:1648
+msgid "The profile address specified does not provide adequate information."
+msgstr "Uvedená adresa profilu neposkytuje dostatečné informace."
+
+#: src/Model/Contact.php:1653
+msgid "An author or name was not found."
+msgstr "Autor nebo jméno nenalezeno"
+
+#: src/Model/Contact.php:1656
+msgid "No browser URL could be matched to this address."
+msgstr "Této adrese neodpovídá žádné URL prohlížeče."
+
+#: src/Model/Contact.php:1659
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr "Není možné namapovat adresu identity ve stylu @ s žádným možným protokolem ani emailovým kontaktem."
+
+#: src/Model/Contact.php:1660
+msgid "Use mailto: in front of address to force email check."
+msgstr "Použite mailo: před adresou k vynucení emailové kontroly."
+
+#: src/Model/Contact.php:1666
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "Zadaná adresa profilu patří do sítě, která  byla na tomto serveru zakázána."
+
+#: src/Model/Contact.php:1671
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Omezený profil. Tato osoba nebude schopna od Vás přijímat přímé/osobní sdělení."
+
+#: src/Model/Contact.php:1722
+msgid "Unable to retrieve contact information."
+msgstr "Nepodařilo se získat kontaktní informace."
+
+#: src/Model/Event.php:59 src/Model/Event.php:76 src/Model/Event.php:428
+#: src/Model/Event.php:897
+msgid "Starts:"
+msgstr "Začíná:"
+
+#: src/Model/Event.php:62 src/Model/Event.php:82 src/Model/Event.php:429
+#: src/Model/Event.php:901
+msgid "Finishes:"
+msgstr "Končí:"
+
+#: src/Model/Event.php:377
+msgid "all-day"
+msgstr "celodenní"
+
+#: src/Model/Event.php:400
+msgid "Jun"
+msgstr "čvn"
+
+#: src/Model/Event.php:403
+msgid "Sept"
+msgstr "září"
+
+#: src/Model/Event.php:426
+msgid "No events to display"
+msgstr "Žádné události k zobrazení"
+
+#: src/Model/Event.php:550
+msgid "l, F j"
+msgstr "l, j. F"
+
+#: src/Model/Event.php:581
+msgid "Edit event"
+msgstr "Upravit událost"
+
+#: src/Model/Event.php:582
+msgid "Duplicate event"
+msgstr "Duplikovat událost"
+
+#: src/Model/Event.php:583
+msgid "Delete event"
+msgstr "Smazat událost"
+
+#: 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 "Zobrazit mapu"
+
+#: src/Model/Event.php:917
+msgid "Hide map"
+msgstr "Skrýt mapu"
+
+#: src/Model/User.php:168
+msgid "Login failed"
+msgstr "Přihlášení selhalo"
+
+#: src/Model/User.php:199
+msgid "Not enough information to authenticate"
+msgstr "Není dost informací pro autentikaci"
+
+#: src/Model/User.php:384
+msgid "An invitation is required."
+msgstr "Je vyžadována pozvánka."
+
+#: src/Model/User.php:388
+msgid "Invitation could not be verified."
+msgstr "Pozvánka nemohla být ověřena."
+
+#: src/Model/User.php:395
+msgid "Invalid OpenID url"
+msgstr "Neplatný odkaz OpenID"
+
+#: src/Model/User.php:414
+msgid "Please enter the required information."
+msgstr "Zadejte prosím požadované informace."
+
+#: src/Model/User.php:427
+msgid "Please use a shorter name."
+msgstr "Použijte prosím kratší jméno."
+
+#: src/Model/User.php:430
+msgid "Name too short."
+msgstr "Jméno je příliš krátké."
+
+#: src/Model/User.php:438
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "Nezdá se, že by to bylo vaše celé jméno (křestní jméno a příjmení)."
+
+#: src/Model/User.php:443
+msgid "Your email domain is not among those allowed on this site."
+msgstr "Váš e-mailová doména není na tomto serveru mezi povolenými."
+
+#: src/Model/User.php:447
+msgid "Not a valid email address."
+msgstr "Neplatná e-mailová adresa."
+
+#: src/Model/User.php:450
+msgid "The nickname was blocked from registration by the nodes admin."
+msgstr "Administrátor serveru zablokoval registraci této přezdívky."
+
+#: src/Model/User.php:454 src/Model/User.php:462
+msgid "Cannot use that email."
+msgstr "Tento e-mail nelze použít."
+
+#: src/Model/User.php:469
+msgid "Your nickname can only contain a-z, 0-9 and _."
+msgstr "Uživatelské jméno může obsahovat pouze znaky a-z, 0-9 a _."
+
+#: src/Model/User.php:476 src/Model/User.php:533
+msgid "Nickname is already registered. Please choose another."
+msgstr "Přezdívka je již registrována. Prosím vyberte jinou."
+
+#: src/Model/User.php:486
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "ZÁVAŽNÁ CHYBA: Generování bezpečnostních klíčů se nezdařilo."
+
+#: src/Model/User.php:520 src/Model/User.php:524
+msgid "An error occurred during registration. Please try again."
+msgstr "Došlo k chybě při registraci. Zkuste to prosím znovu."
+
+#: src/Model/User.php:549
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "Došlo k chybě při vytváření Vašeho výchozího profilu. Zkuste to prosím znovu."
+
+#: src/Model/User.php:556
+msgid "An error occurred creating your self contact. Please try again."
+msgstr "Došlo k chybě při vytváření Vašeho kontaktu na sebe. Zkuste to prosím znovu."
+
+#: src/Model/User.php:561 src/Content/ContactSelector.php:166
+msgid "Friends"
+msgstr "Přátelé"
+
+#: src/Model/User.php:565
+msgid ""
+"An error occurred creating your default contact group. Please try again."
+msgstr "Došlo k chybě při vytváření Vaší výchozí skupiny kontaktů. Zkuste to prosím znovu."
+
+#: 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 "\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"
+
+#: src/Model/User.php:649
+#, php-format
+msgid "Registration at %s"
+msgstr "Registrace na %s"
+
+#: 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\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"
+
+#: 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\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 ""
+"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 "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."
+
+#: src/Model/Group.php:329
+msgid "Default privacy group for new contacts"
+msgstr "Výchozí soukromá skupina pro nové kontakty."
+
+#: src/Model/Group.php:362
+msgid "Everybody"
+msgstr "Všichni"
+
+#: src/Model/Group.php:382
+msgid "edit"
+msgstr "upravit"
+
+#: src/Model/Group.php:406
+msgid "Edit group"
+msgstr "Upravit skupinu"
+
+#: src/Model/Group.php:409
+msgid "Create a new group"
+msgstr "Vytvořit novou skupinu"
+
+#: src/Model/Group.php:411
+msgid "Edit groups"
+msgstr "Upravit skupiny"
+
+#: src/Model/Profile.php:97
+msgid "Requested account is not available."
+msgstr "Požadovaný účet není dostupný."
+
+#: src/Model/Profile.php:163 src/Model/Profile.php:399
+#: src/Model/Profile.php:846
+msgid "Edit profile"
+msgstr "Upravit profil"
+
+#: src/Model/Profile.php:333
+msgid "Atom feed"
+msgstr "Kanál Atom"
+
+#: src/Model/Profile.php:372
+msgid "Manage/edit profiles"
+msgstr "Spravovat/upravit profily"
+
+#: src/Model/Profile.php:550 src/Model/Profile.php:639
+msgid "g A l F d"
+msgstr "g A, l d. 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 "[dnes]"
+
+#: src/Model/Profile.php:615
+msgid "Birthday Reminders"
+msgstr "Připomínka narozenin"
+
+#: src/Model/Profile.php:616
+msgid "Birthdays this week:"
+msgstr "Narozeniny tento týden:"
+
+#: src/Model/Profile.php:677
+msgid "[No description]"
+msgstr "[Žádný popis]"
+
+#: src/Model/Profile.php:704
+msgid "Event Reminders"
+msgstr "Připomenutí událostí"
+
+#: src/Model/Profile.php:705
+msgid "Upcoming events the next 7 days:"
+msgstr "Nadcházející události v příštích 7 dnech:"
+
+#: src/Model/Profile.php:728
+msgid "Member since:"
+msgstr "Členem od:"
+
+#: 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 "Věk:"
+
+#: 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 "Náboženství:"
+
+#: src/Model/Profile.php:797
+msgid "Hobbies/Interests:"
+msgstr "Koníčky/zájmy:"
+
+#: src/Model/Profile.php:809
+msgid "Contact information and Social Networks:"
+msgstr "Kontaktní informace a sociální sítě:"
+
+#: src/Model/Profile.php:813
+msgid "Musical interests:"
+msgstr "Hudební vkus:"
+
+#: src/Model/Profile.php:817
+msgid "Books, literature:"
+msgstr "Knihy, literatura:"
+
+#: src/Model/Profile.php:821
+msgid "Television:"
+msgstr "Televize:"
+
+#: src/Model/Profile.php:825
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/tanec/kultura/zábava:"
+
+#: src/Model/Profile.php:829
+msgid "Love/Romance:"
+msgstr "Láska/romantika"
+
+#: src/Model/Profile.php:833
+msgid "Work/employment:"
+msgstr "Práce/zaměstnání:"
+
+#: src/Model/Profile.php:837
+msgid "School/education:"
+msgstr "Škola/vzdělávání:"
+
+#: src/Model/Profile.php:842
+msgid "Forums:"
+msgstr "Fóra"
+
+#: src/Model/Profile.php:936
+msgid "Only You Can See This"
+msgstr "Toto můžete vidět jen Vy"
+
+#: src/Model/Profile.php:944 src/Model/Profile.php:947
+msgid "Tips for New Members"
+msgstr "Tipy pro nové členy"
+
+#: src/Model/Profile.php:1106
+#, php-format
+msgid "OpenWebAuth: %1$s welcomes %2$s"
+msgstr "OpenWebAuth: %1$s vítá %2$s"
+
+#: src/Content/Widget.php:33
+msgid "Add New Contact"
+msgstr "Přidat nový kontakt"
+
+#: src/Content/Widget.php:34
+msgid "Enter address or web location"
+msgstr "Zadejte adresu nebo umístění webu"
+
+#: src/Content/Widget.php:35
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Příklad: jan@priklad.cz, http://priklad.cz/lucie"
+
+#: src/Content/Widget.php:53
+#, php-format
+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ánky k dispozici"
+msgstr[3] "%d pozvánek k dispozici"
+
+#: src/Content/Widget.php:157
+msgid "Networks"
+msgstr "Sítě"
+
+#: src/Content/Widget.php:160
+msgid "All Networks"
+msgstr "Všechny sítě"
+
+#: src/Content/Widget.php:198 src/Content/Feature.php:118
+msgid "Saved Folders"
+msgstr "Uložené složky"
+
+#: src/Content/Widget.php:201 src/Content/Widget.php:241
+msgid "Everything"
+msgstr "Všechno"
+
+#: src/Content/Widget.php:238
+msgid "Categories"
+msgstr "Kategorie"
+
+#: src/Content/Widget.php:305
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+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"
+msgstr "Často"
+
+#: src/Content/ContactSelector.php:55
+msgid "Hourly"
+msgstr "Hodinově"
+
+#: src/Content/ContactSelector.php:56
+msgid "Twice daily"
+msgstr "Dvakrát denně"
+
+#: src/Content/ContactSelector.php:57
+msgid "Daily"
+msgstr "Denně"
+
+#: src/Content/ContactSelector.php:58
+msgid "Weekly"
+msgstr "Týdně"
+
+#: src/Content/ContactSelector.php:59
+msgid "Monthly"
+msgstr "Měsíčně"
+
+#: 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 "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 "Muž"
+
+#: src/Content/ContactSelector.php:122
+msgid "Female"
+msgstr "Žena"
+
+#: src/Content/ContactSelector.php:122
+msgid "Currently Male"
+msgstr "V současnosti muž"
+
+#: src/Content/ContactSelector.php:122
+msgid "Currently Female"
+msgstr "V současnosti žena"
+
+#: src/Content/ContactSelector.php:122
+msgid "Mostly Male"
+msgstr "Z větší části muž"
+
+#: src/Content/ContactSelector.php:122
+msgid "Mostly Female"
+msgstr "Z větší části žena"
+
+#: src/Content/ContactSelector.php:122
+msgid "Transgender"
+msgstr "Transgender"
+
+#: src/Content/ContactSelector.php:122
+msgid "Intersex"
+msgstr "Intersexuál"
+
+#: src/Content/ContactSelector.php:122
+msgid "Transsexual"
+msgstr "Transsexuál"
+
+#: src/Content/ContactSelector.php:122
+msgid "Hermaphrodite"
+msgstr "Hermafrodit"
+
+#: src/Content/ContactSelector.php:122
+msgid "Neuter"
+msgstr "Střední rod"
+
+#: src/Content/ContactSelector.php:122
+msgid "Non-specific"
+msgstr "Nespecifikováno"
+
+#: src/Content/ContactSelector.php:122
+msgid "Other"
+msgstr "Jiné"
+
+#: src/Content/ContactSelector.php:144
+msgid "Males"
+msgstr "Muži"
+
+#: src/Content/ContactSelector.php:144
+msgid "Females"
+msgstr "Ženy"
+
+#: src/Content/ContactSelector.php:144
+msgid "Gay"
+msgstr "Gay"
+
+#: src/Content/ContactSelector.php:144
+msgid "Lesbian"
+msgstr "Lesba"
+
+#: src/Content/ContactSelector.php:144
+msgid "No Preference"
+msgstr "Bez preferencí"
+
+#: src/Content/ContactSelector.php:144
+msgid "Bisexual"
+msgstr "Bisexuál"
+
+#: src/Content/ContactSelector.php:144
+msgid "Autosexual"
+msgstr "Autosexuál"
+
+#: src/Content/ContactSelector.php:144
+msgid "Abstinent"
+msgstr "Abstinent"
+
+#: src/Content/ContactSelector.php:144
+msgid "Virgin"
+msgstr "Panic/panna"
+
+#: src/Content/ContactSelector.php:144
+msgid "Deviant"
+msgstr "Deviant"
+
+#: src/Content/ContactSelector.php:144
+msgid "Fetish"
+msgstr "Fetišista"
+
+#: src/Content/ContactSelector.php:144
+msgid "Oodles"
+msgstr "Hodně"
+
+#: src/Content/ContactSelector.php:144
+msgid "Nonsexual"
+msgstr "Nesexuální"
+
+#: src/Content/ContactSelector.php:166
+msgid "Single"
+msgstr "Svobodný/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Lonely"
+msgstr "Osamělý/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Available"
+msgstr "Dostupný/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unavailable"
+msgstr "Nedostupný/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Has crush"
+msgstr "Zamilovaný/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Infatuated"
+msgstr "Zabouchnutý/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Dating"
+msgstr "Chodím s někým"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unfaithful"
+msgstr "Nevěrný/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Sex Addict"
+msgstr "Posedlý/á sexem"
+
+#: src/Content/ContactSelector.php:166
+msgid "Friends/Benefits"
+msgstr "Přátelé/výhody"
+
+#: src/Content/ContactSelector.php:166
+msgid "Casual"
+msgstr "Ležérní"
+
+#: src/Content/ContactSelector.php:166
+msgid "Engaged"
+msgstr "Zadaný/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Married"
+msgstr "Ženatý/vdaná"
+
+#: src/Content/ContactSelector.php:166
+msgid "Imaginarily married"
+msgstr "Pomyslně ženatý/vdaná"
+
+#: src/Content/ContactSelector.php:166
+msgid "Partners"
+msgstr "Partneři"
+
+#: src/Content/ContactSelector.php:166
+msgid "Cohabiting"
+msgstr "Žiji ve společné domácnosti"
+
+#: src/Content/ContactSelector.php:166
+msgid "Common law"
+msgstr "Zvykové právo"
+
+#: src/Content/ContactSelector.php:166
+msgid "Happy"
+msgstr "Šťastný/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Not looking"
+msgstr "Nehledající"
+
+#: src/Content/ContactSelector.php:166
+msgid "Swinger"
+msgstr "Swinger"
+
+#: src/Content/ContactSelector.php:166
+msgid "Betrayed"
+msgstr "Zrazen/a"
+
+#: src/Content/ContactSelector.php:166
+msgid "Separated"
+msgstr "Odloučený/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unstable"
+msgstr "Nestálý/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Divorced"
+msgstr "Rozvedený/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Imaginarily divorced"
+msgstr "Pomyslně rozvedený/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Widowed"
+msgstr "Ovdovělý/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "Uncertain"
+msgstr "Nejistý/á"
+
+#: src/Content/ContactSelector.php:166
+msgid "It's complicated"
+msgstr "Je to složité"
+
+#: src/Content/ContactSelector.php:166
+msgid "Don't care"
+msgstr "Nezájem"
+
+#: src/Content/ContactSelector.php:166
+msgid "Ask me"
+msgstr "Zeptej se mě"
+
+#: src/Content/Feature.php:79
+msgid "General Features"
+msgstr "Obecné vlastnosti"
+
+#: src/Content/Feature.php:81
+msgid "Multiple Profiles"
+msgstr "Vícenásobné profily"
+
+#: src/Content/Feature.php:81
+msgid "Ability to create multiple profiles"
+msgstr "Schopnost vytvořit vícenásobné profily"
+
+#: src/Content/Feature.php:82
+msgid "Photo Location"
+msgstr "Poloha fotky"
+
+#: src/Content/Feature.php:82
+msgid ""
+"Photo metadata is normally stripped. This extracts the location (if present)"
+" prior to stripping metadata and links it to a map."
+msgstr "Metadata fotek jsou normálně odebrána. Tato funkce před odebrání metadat extrahuje polohu (pokud je k dispozici) a propojí jej s mapou."
+
+#: src/Content/Feature.php:83
+msgid "Export Public Calendar"
+msgstr "Exportovat veřejný kalendář"
+
+#: src/Content/Feature.php:83
+msgid "Ability for visitors to download the public calendar"
+msgstr "Umožnit návštěvníkům stáhnout si veřejný kalendář"
+
+#: src/Content/Feature.php:88
+msgid "Post Composition Features"
+msgstr "Nastavení vytváření příspěvků"
+
+#: src/Content/Feature.php:89
+msgid "Post Preview"
+msgstr "Náhled příspěvku"
+
+#: src/Content/Feature.php:89
+msgid "Allow previewing posts and comments before publishing them"
+msgstr "Povolit náhledy příspěvků a komentářů před jejich zveřejněním"
+
+#: src/Content/Feature.php:90
+msgid "Auto-mention Forums"
+msgstr "Automaticky zmiňovat fóra"
+
+#: src/Content/Feature.php:90
+msgid ""
+"Add/remove mention when a forum page is selected/deselected in ACL window."
+msgstr "Přidat/odstranit zmínku, když je stránka na fóru označena/odznačena v okně ACL."
+
+#: src/Content/Feature.php:95
+msgid "Network Sidebar"
+msgstr "Síťová postranní lišta"
+
+#: src/Content/Feature.php:96
+msgid "Ability to select posts by date ranges"
+msgstr "Možnost označit příspěvky dle časového intervalu"
+
+#: src/Content/Feature.php:97 src/Content/Feature.php:127
+msgid "List Forums"
+msgstr "Vypsat fóra"
+
+#: src/Content/Feature.php:97
+msgid "Enable widget to display the forums your are connected with"
+msgstr "Povolením widgetu zobrazíte fóra, se kterými jste spojen/a"
+
+#: src/Content/Feature.php:98
+msgid "Group Filter"
+msgstr "Skupinový filtr"
+
+#: src/Content/Feature.php:98
+msgid "Enable widget to display Network posts only from selected group"
+msgstr "Povolením widgetu zobrazíte příspěvky v Síti pouze ze zvolené skupiny"
+
+#: src/Content/Feature.php:99
+msgid "Network Filter"
+msgstr "Síťový filtr"
+
+#: src/Content/Feature.php:99
+msgid "Enable widget to display Network posts only from selected network"
+msgstr "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené sítě"
+
+#: src/Content/Feature.php:100
+msgid "Save search terms for re-use"
+msgstr "Uložit kritéria vyhledávání pro znovupoužití"
+
+#: src/Content/Feature.php:105
+msgid "Network Tabs"
+msgstr "Síťové záložky"
+
+#: src/Content/Feature.php:106
+msgid "Network Personal Tab"
+msgstr "Síťová záložka Osobní"
+
+#: src/Content/Feature.php:106
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr "Povolit záložku pro zobrazení pouze síťových příspěvků, na které jste reagoval/a"
+
+#: src/Content/Feature.php:107
+msgid "Network New Tab"
+msgstr "Síťová záložka Nové"
+
+#: src/Content/Feature.php:107
+msgid "Enable tab to display only new Network posts (from the last 12 hours)"
+msgstr "Povolit záložku pro zobrazení pouze nových příspěvků (za posledních 12 hodin)"
+
+#: src/Content/Feature.php:108
+msgid "Network Shared Links Tab"
+msgstr "Záložka Síťové sdílené odkazy "
+
+#: src/Content/Feature.php:108
+msgid "Enable tab to display only Network posts with links in them"
+msgstr "Povolit záložky pro zobrazování pouze Síťových příspěvků s vazbou na ně"
+
+#: src/Content/Feature.php:113
+msgid "Post/Comment Tools"
+msgstr "Nástroje příspěvků/komentářů"
+
+#: src/Content/Feature.php:114
+msgid "Multiple Deletion"
+msgstr "Vícenásobné mazání"
+
+#: src/Content/Feature.php:114
+msgid "Select and delete multiple posts/comments at once"
+msgstr "Označit a smazat vícero příspěvků/komentářů najednou"
+
+#: src/Content/Feature.php:115
+msgid "Edit Sent Posts"
+msgstr "Upravovat odeslané příspěvky"
+
+#: src/Content/Feature.php:115
+msgid "Edit and correct posts and comments after sending"
+msgstr "Editovat a opravit příspěvky a komentáře po odeslání"
+
+#: src/Content/Feature.php:116
+msgid "Tagging"
+msgstr "Štítkování"
+
+#: src/Content/Feature.php:116
+msgid "Ability to tag existing posts"
+msgstr "Schopnost přidávat štítky ke stávajícím příspěvkům"
+
+#: src/Content/Feature.php:117
+msgid "Post Categories"
+msgstr "Kategorie příspěvků"
+
+#: src/Content/Feature.php:117
+msgid "Add categories to your posts"
+msgstr "Přidat kategorie k Vašim příspěvkům"
+
+#: src/Content/Feature.php:118
+msgid "Ability to file posts under folders"
+msgstr "Možnost řadit příspěvky do složek"
+
+#: src/Content/Feature.php:119
+msgid "Dislike Posts"
+msgstr "Označit příspěvky jako neoblíbené"
+
+#: src/Content/Feature.php:119
+msgid "Ability to dislike posts/comments"
+msgstr "Možnost označovat příspěvky/komentáře jako neoblíbené"
+
+#: src/Content/Feature.php:120
+msgid "Star Posts"
+msgstr "Označit příspěvky hvězdou"
+
+#: src/Content/Feature.php:120
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Možnost označovat zvláštní příspěvky indikátorem hvězdy"
+
+#: src/Content/Feature.php:121
+msgid "Mute Post Notifications"
+msgstr "Ztlumit oznámení o příspěvcích"
+
+#: src/Content/Feature.php:121
+msgid "Ability to mute notifications for a thread"
+msgstr "Možnost ztlumit oznámení pro vlákno"
+
+#: src/Content/Feature.php:126
+msgid "Advanced Profile Settings"
+msgstr "Pokročilá nastavení profilu"
+
+#: src/Content/Feature.php:127
+msgid "Show visitors public community forums at the Advanced Profile Page"
+msgstr "Ukázat návštěvníkům veřejná komunitní fóra na stránce pokročilého profilu"
+
+#: src/Content/Feature.php:128
+msgid "Tag Cloud"
+msgstr "Štítkový oblak"
+
+#: src/Content/Feature.php:128
+msgid "Provide a personal tag cloud on your profile page"
+msgstr "Poskytne na Vaší profilové stránce osobní \"štítkový oblak\""
+
+#: src/Content/Feature.php:129
+msgid "Display Membership Date"
+msgstr "Zobrazit datum členství"
+
+#: src/Content/Feature.php:129
+msgid "Display membership date in profile"
+msgstr "Zobrazit v profilu datum připojení"
+
+#: src/Content/Nav.php:53
+msgid "Nothing new here"
+msgstr "Zde není nic nového"
+
+#: src/Content/Nav.php:57
+msgid "Clear notifications"
+msgstr "Smazat notifikace"
+
+#: src/Content/Nav.php:105
+msgid "Personal notes"
+msgstr "Osobní poznámky"
+
+#: src/Content/Nav.php:105
+msgid "Your personal notes"
+msgstr "Vaše osobní poznámky"
+
+#: src/Content/Nav.php:114
+msgid "Sign in"
+msgstr "Přihlásit se"
+
+#: src/Content/Nav.php:124
+msgid "Home Page"
+msgstr "Domovská stránka"
+
+#: src/Content/Nav.php:128
+msgid "Create an account"
+msgstr "Vytvořit účet"
+
+#: src/Content/Nav.php:134
+msgid "Help and documentation"
+msgstr "Nápověda a dokumentace"
+
+#: src/Content/Nav.php:138
+msgid "Apps"
+msgstr "Aplikace"
+
+#: src/Content/Nav.php:138
+msgid "Addon applications, utilities, games"
+msgstr "Doplňkové aplikace, nástroje, hry"
+
+#: src/Content/Nav.php:142
+msgid "Search site content"
+msgstr "Hledání na stránkách tohoto webu"
+
+#: src/Content/Nav.php:166
+msgid "Community"
+msgstr "Komunita"
+
+#: src/Content/Nav.php:166
+msgid "Conversations on this and other servers"
+msgstr "Konverzace na tomto a jiných serverech"
+
+#: src/Content/Nav.php:173
+msgid "Directory"
+msgstr "Adresář"
+
+#: src/Content/Nav.php:173
+msgid "People directory"
+msgstr "Adresář"
+
+#: src/Content/Nav.php:175
+msgid "Information about this friendica instance"
+msgstr "Informace o této instanci Friendica"
+
+#: src/Content/Nav.php:178
+msgid "Terms of Service of this Friendica instance"
+msgstr "Podmínky používání této instance Friendica"
+
+#: src/Content/Nav.php:184
+msgid "Network Reset"
+msgstr "Reset sítě"
+
+#: src/Content/Nav.php:184
+msgid "Load Network page with no filters"
+msgstr "Načíst stránku Síť bez filtrů"
+
+#: src/Content/Nav.php:190
+msgid "Friend Requests"
+msgstr "Žádosti přátel"
+
+#: src/Content/Nav.php:192
+msgid "See all notifications"
+msgstr "Zobrazit všechny upozornění"
+
+#: src/Content/Nav.php:193
+msgid "Mark all system notifications seen"
+msgstr "Označit všechny upozornění systému jako přečtené"
+
+#: src/Content/Nav.php:197
+msgid "Inbox"
+msgstr "Doručená pošta"
+
+#: src/Content/Nav.php:198
+msgid "Outbox"
+msgstr "Odeslaná pošta"
+
+#: src/Content/Nav.php:202
+msgid "Manage"
+msgstr "Spravovat"
+
+#: src/Content/Nav.php:202
+msgid "Manage other pages"
+msgstr "Spravovat jiné stránky"
+
+#: src/Content/Nav.php:210
+msgid "Manage/Edit Profiles"
+msgstr "Spravovat/Editovat Profily"
+
+#: src/Content/Nav.php:218
+msgid "Site setup and configuration"
+msgstr "Nastavení webu a konfigurace"
+
+#: src/Content/Nav.php:221
+msgid "Navigation"
+msgstr "Navigace"
+
+#: src/Content/Nav.php:221
+msgid "Site map"
+msgstr "Mapa webu"
+
+#: src/Content/Widget/CalendarExport.php:65
+msgid "Export"
+msgstr "Exportovat"
+
+#: src/Content/Widget/CalendarExport.php:66
+msgid "Export calendar as ical"
+msgstr "Exportovat kalendář jako ical"
+
+#: src/Content/Widget/CalendarExport.php:67
+msgid "Export calendar as csv"
+msgstr "Exportovat kalendář jako csv"
+
+#: src/Content/OEmbed.php:256
+msgid "Embedding disabled"
+msgstr "Vkládání zakázáno"
+
+#: src/Content/OEmbed.php:376
+msgid "Embedded content"
+msgstr "Vložený obsah"
+
+#: src/Content/Text/BBCode.php:423
+msgid "view full size"
+msgstr "zobrazit v plné velikosti"
+
+#: src/Content/Text/BBCode.php:853 src/Content/Text/BBCode.php:1626
+#: src/Content/Text/BBCode.php:1627
+msgid "Image/photo"
+msgstr "Obrázek/fotka"
+
+#: src/Content/Text/BBCode.php:1553 src/Content/Text/BBCode.php:1575
+msgid "$1 wrote:"
+msgstr "$1 napsal/a:"
+
+#: src/Content/Text/BBCode.php:1635 src/Content/Text/BBCode.php:1636
+msgid "Encrypted content"
+msgstr "Šifrovaný obsah"
+
+#: src/Content/Text/BBCode.php:1755
+msgid "Invalid source protocol"
+msgstr "Neplatný protokol zdroje"
+
+#: src/Content/Text/BBCode.php:1766
+msgid "Invalid link protocol"
+msgstr "Neplatný protokol odkazu"
diff --git a/view/lang/cs/strings.php b/view/lang/cs/strings.php
index efc9ecd34..753b0e51d 100644
--- a/view/lang/cs/strings.php
+++ b/view/lang/cs/strings.php
@@ -3,475 +3,167 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
 ;
-$a->strings["Add New Contact"] = "Přidat nový kontakt";
-$a->strings["Enter address or web location"] = "Zadejte adresu nebo umístění webu";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Příklad: jan@příklad.cz, http://příklad.cz/jana";
-$a->strings["Connect"] = "Spojit";
-$a->strings["%d invitation available"] = [
-	0 => "Pozvánka %d k dispozici",
-	1 => "Pozvánky %d k dispozici",
-	2 => "Pozvánky %d k dispozici",
-];
-$a->strings["Find People"] = "Nalézt lidi";
+$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"] = "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.";
+$a->strings["toggle mobile"] = "přepínat mobilní zobrazení";
+$a->strings["default"] = "výchozí";
+$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";
+$a->strings["Alignment"] = "Zarovnání";
+$a->strings["Left"] = "Vlevo";
+$a->strings["Center"] = "Uprostřed";
+$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"] = "nezobrazit";
+$a->strings["show"] = "zobrazit";
+$a->strings["Set style"] = "Nastavit styl";
+$a->strings["Community Pages"] = "Komunitní stránky";
+$a->strings["Community Profiles"] = "Komunitní profily";
+$a->strings["Help or @NewHere ?"] = "Pomoc nebo @ProNováčky ?";
+$a->strings["Connect Services"] = "Připojit služby";
+$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"] = "Připojit / Následovat";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Příklady: Robert Morgenstein, rybaření";
+$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";
 $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["Networks"] = "Sítě";
-$a->strings["All Networks"] = "Všechny sítě";
-$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ů",
-];
-$a->strings["show more"] = "zobrazit více";
+$a->strings["Global Directory"] = "Globální adresář";
+$a->strings["Local Directory"] = "Místní adresář";
 $a->strings["Forums"] = "Fóra";
-$a->strings["External link to forum"] = "";
-$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["Mostly Male"] = "Většinou muž";
-$a->strings["Mostly Female"] = "Většinou žena";
-$a->strings["Transgender"] = "Transgender";
-$a->strings["Intersex"] = "Intersex";
-$a->strings["Transsexual"] = "Transexuál";
-$a->strings["Hermaphrodite"] = "Hermafrodit";
-$a->strings["Neuter"] = "Neutrál";
-$a->strings["Non-specific"] = "Nespecifikováno";
-$a->strings["Other"] = "Jiné";
-$a->strings["Undecided"] = [
-	0 => "",
-	1 => "",
-	2 => "",
-];
-$a->strings["Males"] = "Muži";
-$a->strings["Females"] = "Ženy";
-$a->strings["Gay"] = "Gay";
-$a->strings["Lesbian"] = "Lesbička";
-$a->strings["No Preference"] = "Bez preferencí";
-$a->strings["Bisexual"] = "Bisexuál";
-$a->strings["Autosexual"] = "Autosexuál";
-$a->strings["Abstinent"] = "Abstinent";
-$a->strings["Virgin"] = "panic/panna";
-$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"] = "Přátelé";
-$a->strings["Friends/Benefits"] = "Přátelé / výhody";
-$a->strings["Casual"] = "Ležérní";
-$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["Common law"] = "Zvykové právo";
-$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["It's complicated"] = "Je to složité";
-$a->strings["Don't care"] = "Nezajímá";
-$a->strings["Ask me"] = "Zeptej se mě";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "Nelze nalézt záznam v DNS pro databázový server '%s'";
-$a->strings["Logged out."] = "Odhlášen.";
-$a->strings["Login failed."] = "Přihlášení se nezdařilo.";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Zaznamenali jsme problém s Vaším přihlášením prostřednictvím Vámi zadaným OpenID. Prosím ověřte si, že jste ID zadali správně. ";
-$a->strings["The error message was:"] = "Chybová zpráva byla:";
-$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"] = "Defaultní soukromá skrupina pro nové kontakty.";
-$a->strings["Everybody"] = "Všichni";
-$a->strings["edit"] = "editovat";
-$a->strings["Groups"] = "Skupiny";
-$a->strings["Edit groups"] = "";
-$a->strings["Edit group"] = "Editovat skupinu";
-$a->strings["Create a new group"] = "Vytvořit novou skupinu";
-$a->strings["Group Name: "] = "Název skupiny: ";
-$a->strings["Contacts not in any group"] = "Kontakty, které nejsou v žádné skupině";
-$a->strings["add"] = "přidat";
-$a->strings["Unknown | Not categorised"] = "Neznámé | Nezařazeno";
-$a->strings["Block immediately"] = "Okamžitě blokovat ";
-$a->strings["Shady, spammer, self-marketer"] = "pochybný, spammer, self-makerter";
-$a->strings["Known to me, but no opinion"] = "Znám ho ale, ale bez rozhodnutí";
-$a->strings["OK, probably harmless"] = "OK, pravděpodobně neškodný";
-$a->strings["Reputable, has my trust"] = "Renomovaný, má mou důvěru";
-$a->strings["Frequently"] = "Často";
-$a->strings["Hourly"] = "každou hodinu";
-$a->strings["Twice daily"] = "Dvakrát denně";
-$a->strings["Daily"] = "denně";
-$a->strings["Weekly"] = "Týdenně";
-$a->strings["Monthly"] = "Měsíčně";
-$a->strings["Friendica"] = "Friendica";
-$a->strings["OStatus"] = "OStatus";
-$a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Email"] = "E-mail";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["Facebook"] = "Facebook";
-$a->strings["Zot!"] = "Zot!";
-$a->strings["LinkedIn"] = "LinkedIn";
-$a->strings["XMPP/IM"] = "XMPP/IM";
-$a->strings["MySpace"] = "MySpace";
-$a->strings["Google+"] = "Google+";
-$a->strings["pump.io"] = "pump.io";
-$a->strings["Twitter"] = "Twitter";
-$a->strings["Diaspora Connector"] = "Diaspora konektor";
-$a->strings["GNU Social"] = "";
-$a->strings["App.net"] = "App.net";
-$a->strings["Hubzilla/Redmatrix"] = "";
-$a->strings["Post to Email"] = "Poslat příspěvek na e-mail";
-$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Kontektory deaktivovány, od \"%s\" je aktivován.";
-$a->strings["Hide your profile details from unknown viewers?"] = "Skrýt Vaše profilové detaily před neznámými uživateli?";
-$a->strings["Visible to everybody"] = "Viditelné pro všechny";
-$a->strings["show"] = "zobrazit";
-$a->strings["don't show"] = "nikdy nezobrazit";
-$a->strings["CC: email addresses"] = "skrytá kopie: e-mailové adresy";
-$a->strings["Example: bob@example.com, mary@example.com"] = "Příklad: bob@example.com, mary@example.com";
-$a->strings["Permissions"] = "Oprávnění:";
-$a->strings["Close"] = "Zavřít";
-$a->strings["photo"] = "fotografie";
-$a->strings["status"] = "Stav";
-$a->strings["event"] = "událost";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s má rád %2\$s' na %3\$s";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s nemá rád %2\$s na %3\$s";
-$a->strings["%1\$s is attending %2\$s's %3\$s"] = "";
-$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "";
-$a->strings["%1\$s may attend %2\$s's %3\$s"] = "";
-$a->strings["[no subject]"] = "[bez předmětu]";
-$a->strings["Wall Photos"] = "Fotografie na zdi";
-$a->strings["Click here to upgrade."] = "Klikněte zde pro aktualizaci.";
-$a->strings["This action exceeds the limits set by your subscription plan."] = "Tato akce překročí limit nastavené Vaším předplatným.";
-$a->strings["This action is not available under your subscription plan."] = "Tato akce není v rámci Vašeho předplatného dostupná.";
-$a->strings["Error decoding account file"] = "Chyba dekódování uživatelského účtu";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Chyba! V datovém souboru není označení verze! Je to opravdu soubor s účtem Friendica?";
-$a->strings["Error! Cannot check nickname"] = "Chyba! Nelze ověřit přezdívku";
-$a->strings["User '%s' already exists on this server!"] = "Uživatel '%s' již na tomto serveru existuje!";
-$a->strings["User creation error"] = "Chyba vytváření uživatele";
-$a->strings["User profile creation error"] = "Chyba vytváření uživatelského účtu";
-$a->strings["%d contact not imported"] = [
-	0 => "%d kontakt nenaimporován",
-	1 => "%d kontaktů nenaimporováno",
-	2 => "%d kontakty nenaimporovány",
-];
-$a->strings["Done. You can now login with your username and password"] = "Hotovo. Nyní  se můžete přihlásit se svými uživatelským účtem a heslem";
-$a->strings["Miscellaneous"] = "Různé";
-$a->strings["Birthday:"] = "Narozeniny:";
-$a->strings["Age: "] = "Věk: ";
-$a->strings["YYYY-MM-DD or MM-DD"] = "";
-$a->strings["never"] = "nikdy";
-$a->strings["less than a second ago"] = "méně než před sekundou";
-$a->strings["year"] = "rok";
-$a->strings["years"] = "let";
-$a->strings["month"] = "měsíc";
-$a->strings["months"] = "měsíců";
-$a->strings["week"] = "týdnem";
-$a->strings["weeks"] = "týdny";
-$a->strings["day"] = "den";
-$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["%s's birthday"] = "%s má narozeniny";
-$a->strings["Happy Birthday %s"] = "Veselé narozeniny %s";
-$a->strings["Friendica Notification"] = "Friendica Notifikace";
-$a->strings["Thank You,"] = "Děkujeme, ";
-$a->strings["%s Administrator"] = "%s Administrátor";
-$a->strings["%1\$s, %2\$s Administrator"] = "";
-$a->strings["noreply"] = "neodpovídat";
-$a->strings["%s <!item_type!>"] = "%s <!item_type!>";
-$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Upozornění] Obdržena nová zpráva na %s";
-$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s Vám poslal novou soukromou zprávu na %2\$s.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s Vám poslal %2\$s.";
-$a->strings["a private message"] = "soukromá zpráva";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "Prosím navštivte %s pro zobrazení Vašich soukromých zpráv a možnost na ně odpovědět.";
-$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s okomentoval na [url=%2\$s]%3\$s[/url]";
-$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s okomentoval na [url=%2\$s]%3\$s's %4\$s[/url]";
-$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s okomentoval na [url=%2\$s]Váš %3\$s[/url]";
-$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Upozornění] Komentář ke konverzaci #%1\$d od %2\$s";
-$a->strings["%s commented on an item/conversation you have been following."] = "Uživatel %s okomentoval vámi sledovanou položku/konverzaci.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Prosím navštivte %s pro zobrazení konverzace a možnosti odpovědět.";
-$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Upozornění] %s umístěn na Vaši profilovou zeď";
-$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s přidal příspěvek na Vaši profilovou zeď na %2\$s";
-$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s napřidáno na [url=%2\$s]na Vaši zeď[/url]";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Upozornění] %s Vás označil";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s Vás označil na %2\$s";
-$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]Vás označil[/url].";
-$a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Notify] %s nasdílel nový příspěvek";
-$a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s nasdílel nový příspěvek na %2\$s";
-$a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]nasdílel příspěvek[/url].";
-$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Upozornění] %1\$s Vás šťouchnul";
-$a->strings["%1\$s poked you at %2\$s"] = "%1\$s Vás šťouchnul na %2\$s";
-$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "Uživatel %1\$s [url=%2\$s]Vás šťouchnul[/url].";
-$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Upozornění] %s označil Váš příspěvek";
-$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s označil Váš příspěvek na %2\$s";
-$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s označil [url=%2\$s]Váš příspěvek[/url]";
-$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Upozornění] Obdrženo přestavení";
-$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Obdržel jste žádost o spojení od '%1\$s' na %2\$s";
-$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Obdržel jste [url=%1\$s]žádost o spojení[/url] od %2\$s.";
-$a->strings["You may visit their profile at %s"] = "Můžete navštívit jejich profil na %s";
-$a->strings["Please visit %s to approve or reject the introduction."] = "Prosím navštivte %s pro schválení či zamítnutí představení.";
-$a->strings["[Friendica:Notify] A new person is sharing with you"] = "[Friendica:Upozornění] Nový člověk s vámi sdílí";
-$a->strings["%1\$s is sharing with you at %2\$s"] = "uživatel %1\$s sdílí s vámi ma %2\$s";
-$a->strings["[Friendica:Notify] You have a new follower"] = "[Friendica:Upozornění] Máte nového následovníka";
-$a->strings["You have a new follower at %2\$s : %1\$s"] = "Máte nového následovníka na %2\$s : %1\$s";
-$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Upozornění] Obdržen návrh na přátelství";
-$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Obdržel jste návrh přátelství od '%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 jste [url=%1\$s]návrh přátelství[/url] s %2\$s from %3\$s.";
-$a->strings["Name:"] = "Jméno:";
-$a->strings["Photo:"] = "Foto:";
-$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["[Friendica:Notify] Connection accepted"] = "[Friendica:Upozornění] Spojení akceptováno";
-$a->strings["'%1\$s' has accepted your connection request at %2\$s"] = "'%1\$s' akceptoval váš požadavek na spojení na %2\$s";
-$a->strings["%2\$s has accepted your [url=%1\$s]connection request[/url]."] = "%2\$s akceptoval váš [url=%1\$s]požadavek na spojení[/url].";
-$a->strings["You are now mutual friends and may exchange status updates, photos, and email without restriction."] = "";
-$a->strings["Please visit %s if you wish to make any changes to this relationship."] = "";
-$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' vás přijal jako \"fanouška\", což omezuje některé formy komunikace - jako jsou soukromé zprávy a některé interakce na profilech. Pokud se jedná o celebritu, případně o komunitní stránky, pak bylo toto nastavení provedeno automaticky..";
-$a->strings["'%1\$s' may choose to extend this into a two-way or more permissive relationship in the future."] = "";
-$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] registration request"] = "[Systém Friendica :Upozornění] registrační požadavek";
-$a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Obdržel jste požadavek na registraci od '%1\$s' na %2\$s";
-$a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Obdržel jste [url=%1\$s]požadavek na registraci[/url] od '%2\$s'.";
-$a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"] = "Plné jméno:\t%1\$s\\nUmístění webu:\t%2\$s\\nPřihlašovací účet:\t%3\$s (%4\$s)";
-$a->strings["Please visit %s to approve or reject the request."] = "Prosím navštivte %s k odsouhlasení nebo k zamítnutí požadavku.";
-$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
-$a->strings["Starts:"] = "Začíná:";
-$a->strings["Finishes:"] = "Končí:";
-$a->strings["Location:"] = "Místo:";
-$a->strings["Sun"] = "";
-$a->strings["Mon"] = "";
-$a->strings["Tue"] = "";
-$a->strings["Wed"] = "";
-$a->strings["Thu"] = "";
-$a->strings["Fri"] = "";
-$a->strings["Sat"] = "";
-$a->strings["Sunday"] = "Neděle";
-$a->strings["Monday"] = "Pondělí";
-$a->strings["Tuesday"] = "Úterý";
-$a->strings["Wednesday"] = "Středa";
-$a->strings["Thursday"] = "Čtvrtek";
-$a->strings["Friday"] = "Pátek";
-$a->strings["Saturday"] = "Sobota";
-$a->strings["Jan"] = "";
-$a->strings["Feb"] = "";
-$a->strings["Mar"] = "";
-$a->strings["Apr"] = "";
-$a->strings["May"] = "Května";
-$a->strings["Jun"] = "";
-$a->strings["Jul"] = "";
-$a->strings["Aug"] = "";
-$a->strings["Sept"] = "";
-$a->strings["Oct"] = "";
-$a->strings["Nov"] = "";
-$a->strings["Dec"] = "";
-$a->strings["January"] = "Ledna";
-$a->strings["February"] = "Února";
-$a->strings["March"] = "Března";
-$a->strings["April"] = "Dubna";
-$a->strings["June"] = "Června";
-$a->strings["July"] = "Července";
-$a->strings["August"] = "Srpna";
-$a->strings["September"] = "Září";
-$a->strings["October"] = "Října";
-$a->strings["November"] = "Listopadu";
-$a->strings["December"] = "Prosinec";
-$a->strings["today"] = "";
-$a->strings["all-day"] = "";
-$a->strings["No events to display"] = "";
-$a->strings["l, F j"] = "l, F j";
-$a->strings["Edit event"] = "Editovat událost";
-$a->strings["link to source"] = "odkaz na zdroj";
-$a->strings["Export"] = "";
-$a->strings["Export calendar as ical"] = "";
-$a->strings["Export calendar as csv"] = "";
-$a->strings["Nothing new here"] = "Zde není nic nového";
-$a->strings["Clear notifications"] = "Smazat notifikace";
-$a->strings["@name, !forum, #tags, content"] = "";
+$a->strings["External link to forum"] = "Externí odkaz na fórum";
+$a->strings["show more"] = "zobrazit více";
+$a->strings["Quick Start"] = "Rychlý začátek";
+$a->strings["Help"] = "Nápověda";
+$a->strings["Custom"] = "Vlastní";
+$a->strings["Note"] = "Poznámka";
+$a->strings["Check image permissions if all users are allowed to see the image"] = "Zkontrolovat povolení u obrázku, jestli všichni uživatelé mají povolení obrázek vidět";
+$a->strings["Select color scheme"] = "Vybrat barevné schéma";
+$a->strings["Navigation bar background color"] = "Barva pozadí navigační lišty";
+$a->strings["Navigation bar icon color "] = "Barva ikon navigační lišty";
+$a->strings["Link color"] = "Barva odkazů";
+$a->strings["Set the background color"] = "Nastavit barvu pozadí";
+$a->strings["Content background opacity"] = "Průhlednost pozadí obsahu";
+$a->strings["Set the background image"] = "Nastavit obrázek na pozadí";
+$a->strings["Background image style"] = "Styl obrázku na pozadí";
+$a->strings["Login page background image"] = "Obrázek na pozadí přihlašovací stránky";
+$a->strings["Login page background color"] = "Barva pozadí přihlašovací stránky";
+$a->strings["Leave background image and color empty for theme defaults"] = "Nechat obrázek a barvu pozadí prázdnou pro výchozí nastavení motivů";
+$a->strings["Guest"] = "Host";
+$a->strings["Visitor"] = "Návštěvník";
 $a->strings["Logout"] = "Odhlásit se";
 $a->strings["End this session"] = "Konec této relace";
 $a->strings["Status"] = "Stav";
 $a->strings["Your posts and conversations"] = "Vaše příspěvky a konverzace";
 $a->strings["Profile"] = "Profil";
 $a->strings["Your profile page"] = "Vaše profilová stránka";
-$a->strings["Photos"] = "Fotografie";
+$a->strings["Photos"] = "Fotky";
 $a->strings["Your photos"] = "Vaše fotky";
 $a->strings["Videos"] = "Videa";
 $a->strings["Your videos"] = "Vaše videa";
 $a->strings["Events"] = "Události";
 $a->strings["Your events"] = "Vaše události";
-$a->strings["Personal notes"] = "Osobní poznámky";
-$a->strings["Your personal notes"] = "Vaše osobní poznámky";
-$a->strings["Login"] = "Přihlásit se";
-$a->strings["Sign in"] = "Přihlásit se";
-$a->strings["Home"] = "Domů";
-$a->strings["Home Page"] = "Domácí stránka";
-$a->strings["Register"] = "Registrovat";
-$a->strings["Create an account"] = "Vytvořit účet";
-$a->strings["Help"] = "Nápověda";
-$a->strings["Help and documentation"] = "Nápověda a dokumentace";
-$a->strings["Apps"] = "Aplikace";
-$a->strings["Addon applications, utilities, games"] = "Doplňkové aplikace, nástroje, hry";
-$a->strings["Search"] = "Vyhledávání";
-$a->strings["Search site content"] = "Hledání na stránkách tohoto webu";
-$a->strings["Full Text"] = "Celý text";
-$a->strings["Tags"] = "Štítky:";
-$a->strings["Contacts"] = "Kontakty";
-$a->strings["Community"] = "Komunita";
-$a->strings["Conversations on this site"] = "Konverzace na tomto webu";
-$a->strings["Conversations on the network"] = "Konverzace v síti";
-$a->strings["Events and Calendar"] = "Události a kalendář";
-$a->strings["Directory"] = "Adresář";
-$a->strings["People directory"] = "Adresář";
-$a->strings["Information"] = "Informace";
-$a->strings["Information about this friendica instance"] = "Informace o této instanci Friendica";
 $a->strings["Network"] = "Síť";
 $a->strings["Conversations from your friends"] = "Konverzace od Vašich přátel";
-$a->strings["Network Reset"] = "Síťový Reset";
-$a->strings["Load Network page with no filters"] = "Načíst stránku Síť bez filtrů";
-$a->strings["Introductions"] = "Představení";
-$a->strings["Friend Requests"] = "Žádosti přátel";
-$a->strings["Notifications"] = "Upozornění";
-$a->strings["See all notifications"] = "Zobrazit všechny upozornění";
-$a->strings["Mark as seen"] = "Označit jako přečtené";
-$a->strings["Mark all system notifications seen"] = "Označit všechny upozornění systému jako přečtené";
+$a->strings["Events and Calendar"] = "Události a kalendář";
 $a->strings["Messages"] = "Zprávy";
 $a->strings["Private mail"] = "Soukromá pošta";
-$a->strings["Inbox"] = "Doručená pošta";
-$a->strings["Outbox"] = "Odeslaná pošta";
-$a->strings["New Message"] = "Nová zpráva";
-$a->strings["Manage"] = "Spravovat";
-$a->strings["Manage other pages"] = "Spravovat jiné stránky";
-$a->strings["Delegations"] = "Delegace";
-$a->strings["Delegate Page Management"] = "Správa delegátů stránky";
 $a->strings["Settings"] = "Nastavení";
 $a->strings["Account settings"] = "Nastavení účtu";
-$a->strings["Profiles"] = "Profily";
-$a->strings["Manage/Edit Profiles"] = "Spravovat/Editovat Profily";
+$a->strings["Contacts"] = "Kontakty";
 $a->strings["Manage/edit friends and contacts"] = "Spravovat/upravit přátelé a kontakty";
-$a->strings["Admin"] = "Administrace";
-$a->strings["Site setup and configuration"] = "Nastavení webu a konfigurace";
-$a->strings["Navigation"] = "Navigace";
-$a->strings["Site map"] = "Mapa webu";
-$a->strings["Contact Photos"] = "Fotogalerie kontaktu";
-$a->strings["Welcome "] = "Vítejte ";
-$a->strings["Please upload a profile photo."] = "Prosím nahrejte profilovou fotografii";
-$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["System"] = "Systém";
-$a->strings["Personal"] = "Osobní";
-$a->strings["%s commented on %s's post"] = "%s okomentoval příspěvek uživatele %s'";
-$a->strings["%s created a new post"] = "%s vytvořil nový příspěvek";
-$a->strings["%s liked %s's post"] = "Uživateli %s se líbí příspěvek uživatele %s";
-$a->strings["%s disliked %s's post"] = "Uživateli %s se nelíbí příspěvek uživatele %s";
-$a->strings["%s is attending %s's event"] = "";
-$a->strings["%s is not attending %s's event"] = "";
-$a->strings["%s may attend %s's event"] = "";
-$a->strings["%s is now friends with %s"] = "%s se nyní přátelí s %s";
-$a->strings["Friend Suggestion"] = "Návrh přátelství";
-$a->strings["Friend/Connect Request"] = "Přítel / žádost o připojení";
-$a->strings["New Follower"] = "Nový následovník";
-$a->strings["\n\t\t\tThe friendica developers released update %s recently,\n\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\tThe friendica vývojáři uvolnili nedávno aktualizaci %s,\n\t\t\tale při pokusu o její instalaci se něco velmi nepovedlo.\n\t\t\tJe třeba to opravit a já to sám nedokážu. Prosím kontaktuj\n\t\t\tfriendica vývojáře, pokud mi s tím nepomůžeš ty sám. Moje databáze může být poškozena.";
-$a->strings["The error message is\n[pre]%s[/pre]"] = "Chybová zpráva je\n[pre]%s[/pre]";
-$a->strings["Errors encountered creating database tables."] = "Při vytváření databázových tabulek došlo k chybám.";
-$a->strings["Errors encountered performing database changes."] = "Při provádění databázových změn došlo k chybám.";
-$a->strings["(no subject)"] = "(Bez předmětu)";
-$a->strings["Sharing notification from Diaspora network"] = "Sdílení oznámení ze sítě Diaspora";
-$a->strings["Attachments:"] = "Přílohy:";
-$a->strings["view full size"] = "zobrazit v plné velikosti";
-$a->strings["View Profile"] = "Zobrazit Profil";
-$a->strings["View Status"] = "Zobrazit Status";
-$a->strings["View Photos"] = "Zobrazit Fotky";
-$a->strings["Network Posts"] = "Zobrazit Příspěvky sítě";
-$a->strings["View Contact"] = "";
-$a->strings["Drop Contact"] = "Odstranit kontakt";
-$a->strings["Send PM"] = "Poslat soukromou zprávu";
-$a->strings["Poke"] = "Šťouchnout";
-$a->strings["Organisation"] = "";
-$a->strings["News"] = "";
-$a->strings["Forum"] = "";
-$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Bylo dosaženo denního limitu %d odeslaných příspěvků. Příspěvek byl odmítnut.";
-$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Bylo týdenního limitu %d odeslaných příspěvků. Příspěvek byl odmítnut.";
-$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Bylo dosaženo měsíčního limitu %d odeslaných příspěvků. Příspěvek byl odmítnut.";
-$a->strings["Image/photo"] = "Obrázek/fotografie";
-$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
-$a->strings["$1 wrote:"] = "$1 napsal:";
-$a->strings["Encrypted content"] = "Šifrovaný obsah";
-$a->strings["Invalid source protocol"] = "";
-$a->strings["Invalid link protocol"] = "";
-$a->strings["%1\$s attends %2\$s's %3\$s"] = "";
-$a->strings["%1\$s doesn't attend %2\$s'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 je nyní přítel s %2\$s";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s šťouchnul %2\$s";
-$a->strings["%1\$s is currently %2\$s"] = "%1\$s je právě %2\$s";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s označen uživatelem %2\$s %3\$s s %4\$s";
+$a->strings["Follow Thread"] = "Sledovat vlákno";
+$a->strings["Top Banner"] = "Vrchní banner";
+$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Změnit velikost obrázku na šířku obrazovky a ukázat pod ním barvu pozadí na dlouhých stránkách.";
+$a->strings["Full screen"] = "Celá obrazovka";
+$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Změnit velikost obrázku, aby zaplnil celou obrazovku, a odštěpit buď pravou, nebo dolní část";
+$a->strings["Single row mosaic"] = "Mozaika s jedinou řadou";
+$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Změnit velikost obrázku a opakovat jej v jediné řadě, buď svislé, nebo vodorovné";
+$a->strings["Mosaic"] = "Mozaika";
+$a->strings["Repeat image to fill the screen."] = "Opakovat obrázek, aby zaplnil obrazovku";
+$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Aktualizuji author-id a owner-id v tabulce položek a vláken.";
+$a->strings["%s: Updating post-type."] = "%s: Aktualizuji post-type.";
+$a->strings["Item not found."] = "Položka nenalezena.";
+$a->strings["Do you really want to delete this item?"] = "Opravdu chcete smazat tuto položku?";
+$a->strings["Yes"] = "Ano";
+$a->strings["Cancel"] = "Zrušit";
+$a->strings["Archives"] = "Archivy";
+$a->strings["event"] = "událost";
+$a->strings["status"] = "stav";
+$a->strings["photo"] = "fotka";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "Uživateli %1\$s se líbí %3\$s uživatele %2\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "Uživateli %1\$s se nelíbí %3\$s uživatele  %2\$s";
+$a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s se účastní %3\$s uživatele %2\$s";
+$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s se neúčastní %3\$s uživatele %2\$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 š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"] = "uživatel %1\$s označil %2\$s's %3\$s jako oblíbeného";
-$a->strings["Likes"] = "Libí se mi";
-$a->strings["Dislikes"] = "Nelibí se mi";
+$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";
+$a->strings["Dislikes"] = "Nelibí se";
 $a->strings["Attending"] = [
-	0 => "",
-	1 => "",
-	2 => "",
+	0 => "Účastní se",
+	1 => "Účastní se",
+	2 => "Účastní se",
+	3 => "Účastní se",
 ];
-$a->strings["Not attending"] = "";
-$a->strings["Might attend"] = "";
+$a->strings["Not attending"] = "Neúčastní se";
+$a->strings["Might attend"] = "Mohl/a by se zúčastnit";
 $a->strings["Select"] = "Vybrat";
 $a->strings["Delete"] = "Odstranit";
 $a->strings["View %s's profile @ %s"] = "Zobrazit profil uživatele %s na %s";
 $a->strings["Categories:"] = "Kategorie:";
 $a->strings["Filed under:"] = "Vyplněn pod:";
-$a->strings["%s from %s"] = "%s od %s";
-$a->strings["View in context"] = "Pohled v kontextu";
+$a->strings["%s from %s"] = "%s z %s";
+$a->strings["View in context"] = "Zobrazit v kontextu";
 $a->strings["Please wait"] = "Čekejte prosím";
 $a->strings["remove"] = "odstranit";
 $a->strings["Delete Selected Items"] = "Smazat vybrané položky";
-$a->strings["Follow Thread"] = "Následovat vlákno";
-$a->strings["%s likes this."] = "%s se to líbí.";
-$a->strings["%s doesn't like this."] = "%s se to nelíbí.";
-$a->strings["%s attends."] = "";
-$a->strings["%s doesn't attend."] = "";
-$a->strings["%s attends maybe."] = "";
+$a->strings["View Status"] = "Zobrazit stav";
+$a->strings["View Profile"] = "Zobrazit profil";
+$a->strings["View Photos"] = "Zobrazit fotky";
+$a->strings["Network Posts"] = "Zobrazit Příspěvky sítě";
+$a->strings["View Contact"] = "Zobrazit kontakt";
+$a->strings["Send PM"] = "Poslat soukromou zprávu";
+$a->strings["Poke"] = "Šťouchnout";
+$a->strings["%s likes this."] = "Uživateli %s se tohle líbí.";
+$a->strings["%s doesn't like this."] = "Uživateli %s se tohle nelíbí.";
+$a->strings["%s attends."] = "%s se účastní.";
+$a->strings["%s doesn't attend."] = "%s se neúčastní.";
+$a->strings["%s attends maybe."] = "%s se možná účastní.";
 $a->strings["and"] = "a";
-$a->strings[", and %d other people"] = ", a %d dalších lidí";
-$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d lidem</span> se to líbí";
-$a->strings["%s like this."] = "";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d lidem</span> se to nelíbí";
-$a->strings["%s don't like this."] = "";
-$a->strings["<span  %1\$s>%2\$d people</span> attend"] = "";
-$a->strings["%s attend."] = "";
-$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "";
-$a->strings["%s don't attend."] = "";
-$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "";
-$a->strings["%s anttend maybe."] = "";
+$a->strings["and %d other people"] = "a dalších %d lidí";
+$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d lidem</span> se tohle líbí";
+$a->strings["%s like this."] = "Uživatelům %s se tohle líbí.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d lidem</span> se tohle nelíbí";
+$a->strings["%s don't like this."] = "Uživatelům %s se tohle nelíbí.";
+$a->strings["<span  %1\$s>%2\$d people</span> attend"] = "<span  %1\$s>%2\$d lidí</span> se účastní";
+$a->strings["%s attend."] = "%s se účastní.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span  %1\$s>%2\$d lidí</span> se neúčastní";
+$a->strings["%s don't attend."] = "%s se neúčastní";
+$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span  %1\$s>%2\$d lidí</span> se možná účastní";
+$a->strings["%s attend maybe."] = "%s se možná účastní";
 $a->strings["Visible to <strong>everybody</strong>"] = "Viditelné pro <strong>všechny</strong>";
 $a->strings["Please enter a link URL:"] = "Zadejte prosím URL odkaz:";
 $a->strings["Please enter a video link/URL:"] = "Prosím zadejte URL adresu videa:";
@@ -480,439 +172,246 @@ $a->strings["Tag term:"] = "Štítek:";
 $a->strings["Save to Folder:"] = "Uložit do složky:";
 $a->strings["Where are you right now?"] = "Kde právě jste?";
 $a->strings["Delete item(s)?"] = "Smazat položku(y)?";
+$a->strings["New Post"] = "Nový příspěvek";
 $a->strings["Share"] = "Sdílet";
-$a->strings["Upload photo"] = "Nahrát fotografii";
-$a->strings["upload photo"] = "nahrát fotky";
+$a->strings["Upload photo"] = "Nahrát fotku";
+$a->strings["upload photo"] = "nahrát fotku";
 $a->strings["Attach file"] = "Přiložit soubor";
-$a->strings["attach file"] = "přidat soubor";
+$a->strings["attach file"] = "přiložit soubor";
 $a->strings["Insert web link"] = "Vložit webový odkaz";
 $a->strings["web link"] = "webový odkaz";
-$a->strings["Insert video link"] = "Zadejte odkaz na video";
+$a->strings["Insert video link"] = "Vložit odkaz na video";
 $a->strings["video link"] = "odkaz na video";
-$a->strings["Insert audio link"] = "Zadejte odkaz na zvukový záznam";
+$a->strings["Insert audio link"] = "Vložit odkaz na audio";
 $a->strings["audio link"] = "odkaz na audio";
-$a->strings["Set your location"] = "Nastavte vaši polohu";
-$a->strings["set location"] = "nastavit místo";
-$a->strings["Clear browser location"] = "Odstranit adresu v prohlížeči";
-$a->strings["clear location"] = "vymazat místo";
-$a->strings["Set title"] = "Nastavit titulek";
-$a->strings["Categories (comma-separated list)"] = "Kategorie (čárkou oddělený seznam)";
+$a->strings["Set your location"] = "Nastavit vaši polohu";
+$a->strings["set location"] = "nastavit polohu";
+$a->strings["Clear browser location"] = "Vymazat polohu v prohlížeči";
+$a->strings["clear location"] = "vymazat polohu";
+$a->strings["Set title"] = "Nastavit nadpis";
+$a->strings["Categories (comma-separated list)"] = "Kategorie (seznam, oddělujte čárkou)";
 $a->strings["Permission settings"] = "Nastavení oprávnění";
 $a->strings["permissions"] = "oprávnění";
 $a->strings["Public post"] = "Veřejný příspěvek";
 $a->strings["Preview"] = "Náhled";
-$a->strings["Cancel"] = "Zrušit";
-$a->strings["Post to Groups"] = "Zveřejnit na Groups";
-$a->strings["Post to Contacts"] = "Zveřejnit na Groups";
+$a->strings["Post to Groups"] = "Zveřejnit ve skupinách";
+$a->strings["Post to Contacts"] = "Zveřejnit v kontaktech";
 $a->strings["Private post"] = "Soukromý příspěvek";
 $a->strings["Message"] = "Zpráva";
-$a->strings["Browser"] = "";
-$a->strings["View all"] = "";
+$a->strings["Browser"] = "Prohlížeč";
+$a->strings["View all"] = "Zobrazit vše";
 $a->strings["Like"] = [
-	0 => "",
-	1 => "",
-	2 => "",
+	0 => "Líbí se",
+	1 => "Líbí se",
+	2 => "Líbí se",
+	3 => "Líbí se",
 ];
 $a->strings["Dislike"] = [
-	0 => "",
-	1 => "",
-	2 => "",
+	0 => "Nelíbí se",
+	1 => "Nelíbí se",
+	2 => "Nelíbí se",
+	3 => "Nelíbí se",
 ];
 $a->strings["Not Attending"] = [
-	0 => "",
-	1 => "",
-	2 => "",
+	0 => "Neúčastní se",
+	1 => "Neúčastní se",
+	2 => "Neúčastní se",
+	3 => "Neúčastní se",
 ];
-$a->strings["%s\\'s birthday"] = "";
-$a->strings["General Features"] = "Obecné funkčnosti";
-$a->strings["Multiple Profiles"] = "Vícenásobné profily";
-$a->strings["Ability to create multiple profiles"] = "Schopnost vytvořit vícenásobné profily";
-$a->strings["Photo Location"] = "";
-$a->strings["Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map."] = "";
-$a->strings["Export Public Calendar"] = "";
-$a->strings["Ability for visitors to download the public calendar"] = "";
-$a->strings["Post Composition Features"] = "Nastavení vytváření příspěvků";
-$a->strings["Richtext Editor"] = "Richtext Editor";
-$a->strings["Enable richtext editor"] = "Povolit richtext editor";
-$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íněná Fóra";
-$a->strings["Add/remove mention when a forum page is selected/deselected in ACL window."] = "";
-$a->strings["Network Sidebar Widgets"] = "Síťové postranní widgety";
-$a->strings["Search by Date"] = "Vyhledávat dle Data";
-$a->strings["Ability to select posts by date ranges"] = "Možnost označit příspěvky dle časového intervalu";
-$a->strings["List Forums"] = "";
-$a->strings["Enable widget to display the forums your are connected with"] = "";
-$a->strings["Group Filter"] = "Skupinový Filtr";
-$a->strings["Enable widget to display Network posts only from selected group"] = "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené skupiny";
-$a->strings["Network Filter"] = "Síťový Filtr";
-$a->strings["Enable widget to display Network posts only from selected network"] = "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené sítě";
-$a->strings["Saved Searches"] = "Uložená hledání";
-$a->strings["Save search terms for re-use"] = "Uložit kritéria vyhledávání pro znovupoužití";
-$a->strings["Network Tabs"] = "Síťové záložky";
-$a->strings["Network Personal Tab"] = "Osobní síťový záložka ";
-$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Povolit záložku pro zobrazení pouze síťových příspěvků, na které jste reagoval ";
-$a->strings["Network New Tab"] = "Nová záložka síť";
-$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Povolit záložku pro zobrazení pouze nových příspěvků (za posledních 12 hodin)";
-$a->strings["Network Shared Links Tab"] = "záložka Síťové sdílené odkazy ";
-$a->strings["Enable tab to display only Network posts with links in them"] = "Povolit záložky pro zobrazování pouze Síťových příspěvků s vazbou na ně";
-$a->strings["Post/Comment Tools"] = "Nástroje Příspěvků/Komentářů";
-$a->strings["Multiple Deletion"] = "Násobné mazání";
-$a->strings["Select and delete multiple posts/comments at once"] = "Označit a smazat více ";
-$a->strings["Edit Sent Posts"] = "Editovat Odeslané příspěvky";
-$a->strings["Edit and correct posts and comments after sending"] = "Editovat a opravit příspěvky a komentáře po odeslání";
-$a->strings["Tagging"] = "Štítkování";
-$a->strings["Ability to tag existing posts"] = "Schopnost přidat štítky ke stávajícím příspvěkům";
-$a->strings["Post Categories"] = "Kategorie příspěvků";
-$a->strings["Add categories to your posts"] = "Přidat kategorie k Vašim příspěvkům";
-$a->strings["Ability to file posts under folders"] = "Možnost řadit příspěvky do složek";
-$a->strings["Dislike Posts"] = "Označit příspěvky jako neoblíbené";
-$a->strings["Ability to dislike posts/comments"] = "Možnost označit příspěvky/komentáře jako neoblíbené";
-$a->strings["Star Posts"] = "Příspěvky s hvězdou";
-$a->strings["Ability to mark special posts with a star indicator"] = "Možnost označit příspěvky s indikátorem hvězdy";
-$a->strings["Mute Post Notifications"] = "Utlumit upozornění na přísvěvky";
-$a->strings["Ability to mute notifications for a thread"] = "Možnost stlumit upozornění pro vlákno";
-$a->strings["Advanced Profile Settings"] = "";
-$a->strings["Show visitors public community forums at the Advanced Profile Page"] = "";
-$a->strings["Disallowed profile URL."] = "Nepovolené URL profilu.";
-$a->strings["Connect URL missing."] = "Chybí URL adresa.";
-$a->strings["This site is not configured to allow communications with other networks."] = "Tento web není nakonfigurován tak, aby umožňoval komunikaci s ostatními sítěmi.";
-$a->strings["No compatible communication protocols or feeds were discovered."] = "Nenalezen žádný kompatibilní komunikační protokol nebo kanál.";
-$a->strings["The profile address specified does not provide adequate information."] = "Uvedená adresa profilu neposkytuje dostatečné informace.";
-$a->strings["An author or name was not found."] = "Autor nebo jméno nenalezeno";
-$a->strings["No browser URL could be matched to this address."] = "Této adrese neodpovídá žádné URL prohlížeče.";
-$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Není možné namapovat adresu identity ve stylu @ s žádným možným protokolem ani emailovým kontaktem.";
-$a->strings["Use mailto: in front of address to force email check."] = "Použite mailo: před adresou k vynucení emailové kontroly.";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Zadaná adresa profilu patří do sítě, která  byla na tomto serveru zakázána.";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Omezený profil. Tato osoba nebude schopna od Vás přijímat přímé / osobní sdělení.";
-$a->strings["Unable to retrieve contact information."] = "Nepodařilo se získat kontaktní informace.";
-$a->strings["Requested account is not available."] = "Požadovaný účet není dostupný.";
-$a->strings["Requested profile is not available."] = "Požadovaný profil není k dispozici.";
-$a->strings["Edit profile"] = "Upravit profil";
-$a->strings["Atom feed"] = "";
-$a->strings["Manage/edit profiles"] = "Spravovat/upravit profily";
-$a->strings["Change profile photo"] = "Změnit profilovou fotografii";
-$a->strings["Create New Profile"] = "Vytvořit nový profil";
-$a->strings["Profile Image"] = "Profilový obrázek";
-$a->strings["visible to everybody"] = "viditelné pro všechny";
-$a->strings["Edit visibility"] = "Upravit viditelnost";
-$a->strings["Gender:"] = "Pohlaví:";
-$a->strings["Status:"] = "Status:";
-$a->strings["Homepage:"] = "Domácí stránka:";
-$a->strings["About:"] = "O mě:";
-$a->strings["XMPP:"] = "";
-$a->strings["Network:"] = "Síť:";
-$a->strings["g A l F d"] = "g A l F d";
-$a->strings["F d"] = "d. F";
-$a->strings["[today]"] = "[Dnes]";
-$a->strings["Birthday Reminders"] = "Připomínka narozenin";
-$a->strings["Birthdays this week:"] = "Narozeniny tento týden:";
-$a->strings["[No description]"] = "[Žádný popis]";
-$a->strings["Event Reminders"] = "Připomenutí událostí";
-$a->strings["Events this week:"] = "Události tohoto týdne:";
-$a->strings["Full Name:"] = "Celé jméno:";
-$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["Sexual Preference:"] = "Sexuální preference:";
-$a->strings["Hometown:"] = "Rodné město";
-$a->strings["Tags:"] = "Štítky:";
-$a->strings["Political Views:"] = "Politické přesvědčení:";
-$a->strings["Religion:"] = "Náboženství:";
-$a->strings["Hobbies/Interests:"] = "Koníčky/zájmy:";
-$a->strings["Likes:"] = "Líbí se:";
-$a->strings["Dislikes:"] = "Nelibí se:";
-$a->strings["Contact information and Social Networks:"] = "Kontaktní informace a sociální sítě:";
-$a->strings["Musical interests:"] = "Hudební vkus:";
-$a->strings["Books, literature:"] = "Knihy, literatura:";
-$a->strings["Television:"] = "Televize:";
-$a->strings["Film/dance/culture/entertainment:"] = "Film/tanec/kultura/zábava:";
-$a->strings["Love/Romance:"] = "Láska/romance";
-$a->strings["Work/employment:"] = "Práce/zaměstnání:";
-$a->strings["School/education:"] = "Škola/vzdělávání:";
-$a->strings["Forums:"] = "";
-$a->strings["Basic"] = "";
-$a->strings["Advanced"] = "Pokročilé";
-$a->strings["Status Messages and Posts"] = "Statusové zprávy a příspěvky ";
-$a->strings["Profile Details"] = "Detaily profilu";
-$a->strings["Photo Albums"] = "Fotoalba";
-$a->strings["Personal Notes"] = "Osobní poznámky";
-$a->strings["Only You Can See This"] = "Toto můžete vidět jen Vy";
-$a->strings["[Name Withheld]"] = "[Jméno odepřeno]";
-$a->strings["Item not found."] = "Položka nenalezena.";
-$a->strings["Do you really want to delete this item?"] = "Opravdu chcete smazat tuto položku?";
-$a->strings["Yes"] = "Ano";
-$a->strings["Permission denied."] = "Přístup odmítnut.";
-$a->strings["Archives"] = "Archív";
-$a->strings["Embedded content"] = "vložený obsah";
-$a->strings["Embedding disabled"] = "Vkládání zakázáno";
-$a->strings["%s is now following %s."] = "";
-$a->strings["following"] = "následující";
-$a->strings["%s stopped following %s."] = "";
-$a->strings["stopped following"] = "následování zastaveno";
+$a->strings["Undecided"] = [
+	0 => "Nerozhodnut",
+	1 => "Nerozhodnutí",
+	2 => "Nerozhodnutých",
+	3 => "Nerozhodnuti",
+];
+$a->strings["Welcome "] = "Vítejte ";
+$a->strings["Please upload a profile photo."] = "Prosím nahrajte profilovou fotku.";
+$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ě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";
+$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s Vám poslal/a novou soukromou zprávu na %2\$s.";
+$a->strings["a private message"] = "soukromou zprávu";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s Vám poslal %2\$s.";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Prosím navštivte %s pro zobrazení Vašich soukromých zpráv a možnost na ně odpovědět.";
+$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s okomentoval/a [url=%2\$s]%3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s okomentoval/a [url=%2\$s]%4\$s od %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s okomentoval/a [url=%2\$s]Váš/Vaši %3\$s[/url]";
+$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Oznámení] Komentář ke konverzaci #%1\$d od %2\$s";
+$a->strings["%s commented on an item/conversation you have been following."] = "%s okomentoval/a Vámi sledovanou položku/konverzaci.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Prosím navštivte %s pro zobrazení konverzace a možnosti odpovědět.";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Oznámení] %s přidal/a příspěvek na Vaši profilovou zeď";
+$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s přidal/a příspěvek na Vaši profilovou zeď na %2\$s";
+$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s přidal/a příspěvek na [url=%2\$s]Vaši zeď[/url]";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Oznámení] %s Vás označil/a";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s Vás označil/a na %2\$s";
+$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]Vás označil/a[/url].";
+$a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Oznámení] %s sdílel/a nový příspěvek";
+$a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s sdílel/a nový příspěvek na %2\$s";
+$a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]sdílel/a příspěvek[/url].";
+$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Oznámení] %1\$s Vás šťouchnul/a";
+$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 [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";
+$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Obdržel/a jste [url=%1\$s]představení[/url] od uživatele %2\$s.";
+$a->strings["You may visit their profile at %s"] = "Můžete navštívit jejich profil na %s";
+$a->strings["Please visit %s to approve or reject the introduction."] = "Prosím navštivte %s pro schválení či zamítnutí představení.";
+$a->strings["[Friendica:Notify] A new person is sharing with you"] = "[Friendica:Oznámení] Nový člověk s vámi sdílí";
+$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 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í 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].";
+$a->strings["You are now mutual friends and may exchange status updates, photos, and email without restriction."] = "Jste nyní vzájemní přátelé a můžete si vyměňovat stavové zprávy, fotky a e-maily bez omezení.";
+$a->strings["Please visit %s if you wish to make any changes to this relationship."] = "Pokud chcete provést změny s tímto vztahem, prosím navštivte %s.";
+$a->strings["'%1\$s' has chosen to accept you a fan, which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically."] = "\"%1\$s\" 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]"] = "[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\".";
+$a->strings["Full Name:\t%s\nSite Location:\t%s\nLogin Name:\t%s (%s)"] = "Celé jméno:\t\t%s\nAdresa stránky:\t\t%s\nPřihlašovací jméno:\t%s (%s)";
+$a->strings["Please visit %s to approve or reject the request."] = "Prosím navštivte %s k odsouhlasení nebo k zamítnutí požadavku.";
 $a->strings["newer"] = "novější";
 $a->strings["older"] = "starší";
-$a->strings["prev"] = "předchozí";
 $a->strings["first"] = "první";
-$a->strings["last"] = "poslední";
+$a->strings["prev"] = "předchozí";
 $a->strings["next"] = "další";
-$a->strings["Loading more entries..."] = "Načítání více záznamů...";
+$a->strings["last"] = "poslední";
+$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 kontaktů",
-	2 => "%d kontaktů",
+	1 => "%d kontakty",
+	2 => "%d kontaktu",
+	3 => "%d kontaktů",
 ];
 $a->strings["View Contacts"] = "Zobrazit kontakty";
 $a->strings["Save"] = "Uložit";
+$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["poke"] = "šťouchnout";
-$a->strings["poked"] = "šťouchnut";
+$a->strings["poked"] = "šťouchnul/a";
 $a->strings["ping"] = "cinknout";
-$a->strings["pinged"] = "cinkut";
-$a->strings["prod"] = "pobídnout";
-$a->strings["prodded"] = "pobídnut";
-$a->strings["slap"] = "dát facku";
-$a->strings["slapped"] = "být uhozen";
-$a->strings["finger"] = "osahávat";
-$a->strings["fingered"] = "osaháván";
+$a->strings["pinged"] = "cinknul/a";
+$a->strings["prod"] = "dloubnout";
+$a->strings["prodded"] = "dloubnul/a";
+$a->strings["slap"] = "uhodit";
+$a->strings["slapped"] = "uhodil/a";
+$a->strings["finger"] = "osahat";
+$a->strings["fingered"] = "osahal/a";
 $a->strings["rebuff"] = "odmítnout";
-$a->strings["rebuffed"] = "odmítnut";
-$a->strings["happy"] = "šťasný";
-$a->strings["sad"] = "smutný";
-$a->strings["mellow"] = "jemný";
-$a->strings["tired"] = "unavený";
-$a->strings["perky"] = "emergický";
-$a->strings["angry"] = "nazlobený";
-$a->strings["stupified"] = "otupen";
-$a->strings["puzzled"] = "popletený";
-$a->strings["interested"] = "zajímavý";
-$a->strings["bitter"] = "hořký";
-$a->strings["cheerful"] = "radnostný";
-$a->strings["alive"] = "naživu";
-$a->strings["annoyed"] = "otráven";
-$a->strings["anxious"] = "znepokojený";
-$a->strings["cranky"] = "mrzutý";
-$a->strings["disturbed"] = "vyrušen";
-$a->strings["frustrated"] = "frustrovaný";
-$a->strings["motivated"] = "motivovaný";
-$a->strings["relaxed"] = "uvolněný";
-$a->strings["surprised"] = "překvapený";
+$a->strings["rebuffed"] = "odmítnul/a";
+$a->strings["Monday"] = "pondělí";
+$a->strings["Tuesday"] = "úterý";
+$a->strings["Wednesday"] = "středa";
+$a->strings["Thursday"] = "čtvrtek";
+$a->strings["Friday"] = "pátek";
+$a->strings["Saturday"] = "sobota";
+$a->strings["Sunday"] = "neděle";
+$a->strings["January"] = "leden";
+$a->strings["February"] = "únor";
+$a->strings["March"] = "březen";
+$a->strings["April"] = "duben";
+$a->strings["May"] = "květen";
+$a->strings["June"] = "červen";
+$a->strings["July"] = "červenec";
+$a->strings["August"] = "srpen";
+$a->strings["September"] = "září";
+$a->strings["October"] = "říjen";
+$a->strings["November"] = "listopad";
+$a->strings["December"] = "prosinec";
+$a->strings["Mon"] = "pon";
+$a->strings["Tue"] = "úte";
+$a->strings["Wed"] = "stř";
+$a->strings["Thu"] = "čtv";
+$a->strings["Fri"] = "pát";
+$a->strings["Sat"] = "sob";
+$a->strings["Sun"] = "ned";
+$a->strings["Jan"] = "led";
+$a->strings["Feb"] = "úno";
+$a->strings["Mar"] = "bře";
+$a->strings["Apr"] = "dub";
+$a->strings["Jul"] = "čvc";
+$a->strings["Aug"] = "srp";
+$a->strings["Sep"] = "zář";
+$a->strings["Oct"] = "říj";
+$a->strings["Nov"] = "lis";
+$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["view on separate page"] = "zobrazit na separátní stránce";
+$a->strings["link to source"] = "odkaz na zdroj";
 $a->strings["activity"] = "aktivita";
 $a->strings["comment"] = [
-	0 => "",
-	1 => "",
-	2 => "komentář",
+	0 => "komentář",
+	1 => "komentáře",
+	2 => "komentáře",
+	3 => "komentářů",
 ];
 $a->strings["post"] = "příspěvek";
 $a->strings["Item filed"] = "Položka vyplněna";
-$a->strings["Passwords do not match. Password unchanged."] = "Hesla se neshodují. Heslo nebylo změněno.";
-$a->strings["An invitation is required."] = "Pozvánka je vyžadována.";
-$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.";
-$a->strings["Please use a shorter name."] = "Použijte prosím kratší jméno.";
-$a->strings["Name too short."] = "Jméno je příliš krátké.";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "Nezdá se, že by to bylo vaše celé jméno (křestní jméno a příjmení).";
-$a->strings["Your email domain is not among those allowed on this site."] = "Váš e-mailová doména není na tomto serveru mezi povolenými.";
-$a->strings["Not a valid email address."] = "Neplatná e-mailová adresa.";
-$a->strings["Cannot use that email."] = "Tento e-mail nelze použít.";
-$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."] = "Vaše \"přezdívka\" může obsahovat pouze \"a-z\", \"0-9\", a \"_\".";
-$a->strings["Nickname is already registered. Please choose another."] = "Přezdívka je již registrována. Prosím vyberte jinou.";
-$a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Tato přezdívka již zde byla použita a nemůže být využita znovu. Prosím vyberete si jinou.";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "Závažná chyba: Generování bezpečnostních klíčů se nezdařilo.";
-$a->strings["An error occurred during registration. Please try again."] = "Došlo k chybě při registraci. Zkuste to prosím znovu.";
-$a->strings["default"] = "standardní";
-$a->strings["An error occurred creating your default profile. Please try again."] = "Došlo k chybě při vytváření Vašeho výchozího profilu. Zkuste to prosím znovu.";
-$a->strings["Profile Photos"] = "Profilové fotografie";
-$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account is pending for approval by the administrator.\n\t"] = "";
-$a->strings["Registration at %s"] = "";
-$a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t"] = "\n\t\tDrahý %1\$s,\n\t\t\tDěkujeme Vám za registraci na %2\$s. Váš účet byl vytvořen.\n\t";
-$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\n\t\tVaše přihlašovací údaje jsou následující:\n\t\t\tAdresa webu:\t%3\$s\n\t\t\tpřihlašovací jméno:\t%1\$s\n\t\t\theslo:\t%5\$s\n\n\t\tHeslo si můžete změnit na stránce \"Nastavení\" vašeho účtu poté, co se přihlásíte.\n\n\t\tProsím věnujte pár chvil revizi dalšího nastavení vašeho účtu na dané stránce.\n\n\t\tTaké su můžete přidat nějaké základní informace do svého výchozího profilu (na stránce \"Profily\"), takže ostatní lidé vás snáze najdou.\n\n\t\tDoporučujeme Vám uvést celé jméno a i foto. Přidáním nějakých \"klíčových slov\" (velmi užitečné pro hledání nových přátel) a možná také zemi, ve které žijete, pokud nechcete být více konkrétní.\n\n\t\tPlně resepktujeme vaše právo na soukromí a nic z výše uvedeného není povinné.\n\t\tPokud jste zde nový a neznáte zde nikoho, uvedením daných informací můžete získat nové přátele.\n\n\n\t\tDíky a vítejte na %2\$s.";
-$a->strings["Registration details for %s"] = "Registrační údaje pro %s";
-$a->strings["Post successful."] = "Příspěvek úspěšně odeslán";
-$a->strings["Access denied."] = "Přístup odmítnut";
-$a->strings["Welcome to %s"] = "Vítá Vás %s";
-$a->strings["No more system notifications."] = "Žádné další systémová upozornění.";
-$a->strings["System Notifications"] = "Systémová upozornění";
-$a->strings["Remove term"] = "Odstranit termín";
-$a->strings["Public access denied."] = "Veřejný přístup odepřen.";
-$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."] = "Žádné výsledky.";
-$a->strings["Items tagged with: %s"] = "Položky označené s: %s";
-$a->strings["Results for: %s"] = "";
-$a->strings["This is Friendica, version"] = "Toto je Friendica, verze";
-$a->strings["running at web location"] = "běžící na webu";
-$a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Pro získání dalších informací o projektu Friendica navštivte prosím <a href=\"http://friendica.com\">Friendica.com</a>.";
-$a->strings["Bug reports and issues: please visit"] = "Pro hlášení chyb a námětů na změny navštivte:";
-$a->strings["the bugtracker at github"] = "";
-$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Návrhy, chválu, dary, apod. - prosím piště na \"info\" na Friendica - tečka com";
-$a->strings["Installed plugins/addons/apps:"] = "Instalované pluginy/doplňky/aplikace:";
-$a->strings["No installed plugins/addons/apps"] = "Nejsou žádné nainstalované doplňky/aplikace";
-$a->strings["No valid account found."] = "Nenalezen žádný platný účet.";
-$a->strings["Password reset request issued. Check your email."] = "Žádost o obnovení hesla vyřízena. Zkontrolujte Vaši e-mailovou schránku.";
-$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.\n\n\t\tYour password will not be changed unless we can verify that you\n\t\tissued this request."] = "\n\t\tDrahý %1\$s,\n\t\t\tNa \"%2\$s\" jsme obdrželi  požadavek na obnovu vašeho hesla \n\t\tpassword. Pro potvrzení žádosti prosím klikněte na zaslaný verifikační odkaz níže nebo si ho zkopírujte do adresní řádky prohlížeče.\n\n\t\tPokud jste tuto žádost nezasílaliI prosím na uvedený odkaz neklikejte a tento email smažte.\n\n\t\tVaše heslo nebude změněno dokud nebudeme moci oveřit, že jste autorem této žádosti.";
-$a->strings["\n\t\tFollow this link 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"] = "\n\t\tKlikněte na následující odkaz pro potvrzení Vaší identity:\n\n\t\t%1\$s\n\n\t\tNásledně obdržíte zprávu obsahující nové heslo.\n\t\tHeslo si můžete si změnit na stránce nastavení účtu poté, co se přihlásíte.\n\n\t\tVaše přihlašovací údaje jsou následující:\n\n\t\tUmístění webu:\t%2\$s\n\t\tPřihlašovací jméno:\t%3\$s";
-$a->strings["Password reset requested at %s"] = "Na %s bylo zažádáno o resetování hesla";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Žádost nemohla být ověřena. (Možná jste ji odeslali již dříve.) Obnovení hesla se nezdařilo.";
-$a->strings["Password Reset"] = "Obnovení hesla";
-$a->strings["Your password has been reset as requested."] = "Vaše heslo bylo na Vaše přání resetováno.";
-$a->strings["Your new password is"] = "Někdo Vám napsal na Vaši profilovou stránku";
-$a->strings["Save or copy your new password - and then"] = "Uložte si nebo zkopírujte nové heslo - a pak";
-$a->strings["click here to login"] = "klikněte zde pro přihlášení";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Nezdá se, že by to bylo Vaše celé jméno (křestní jméno a příjmení).";
-$a->strings["\n\t\t\t\tDear %1\$s,\n\t\t\t\t\tYour password has been changed as requested. Please retain this\n\t\t\t\tinformation for your records (or change your password immediately to\n\t\t\t\tsomething that you will remember).\n\t\t\t"] = "\n\t\t\t\tDrahý %1\$s,\n⇥⇥⇥⇥⇥Vaše heslo bylo na požádání změněno. Prosím uchovejte si tuto informaci (nebo si změntě heslo ihned na něco, co si budete pamatovat).\t";
-$a->strings["\n\t\t\t\tYour login details are as follows:\n\n\t\t\t\tSite Location:\t%1\$s\n\t\t\t\tLogin Name:\t%2\$s\n\t\t\t\tPassword:\t%3\$s\n\n\t\t\t\tYou may change that password from your account settings page after logging in.\n\t\t\t"] = "\n\t\t\t\tVaše přihlašovací údaje jsou následující:\n\n\t\t\t\tUmístění webu:\t%1\$s\n\t\t\t\tPřihlašovací jméno:\t%2\$s\n\t\t\t\tHeslo:\t%3\$s\n\n\t\t\t\tHeslo si můžete si změnit na stránce  nastavení účtu poté, co se přihlásíte.\n\t\t\t";
-$a->strings["Your password has been changed at %s"] = "Vaše heslo bylo změněno na %s";
-$a->strings["Forgot your Password?"] = "Zapomněli jste heslo?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Zadejte svůj e-mailovou adresu a odešlete žádost o zaslání Vašeho nového hesla. Poté zkontrolujte svůj e-mail pro další instrukce.";
-$a->strings["Nickname or Email: "] = "Přezdívka nebo e-mail: ";
-$a->strings["Reset"] = "Reset";
-$a->strings["No profile"] = "Žádný profil";
-$a->strings["Help:"] = "Nápověda:";
-$a->strings["Not Found"] = "Nenalezen";
-$a->strings["Page not found."] = "Stránka nenalezena";
-$a->strings["Remote privacy information not available."] = "Vzdálené soukromé informace nejsou k dispozici.";
-$a->strings["Visible to:"] = "Viditelné pro:";
-$a->strings["OpenID protocol error. No ID returned."] = "Chyba OpenID protokolu. Navrátilo se žádné ID.";
-$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Nenalezen účet a OpenID registrace na tomto serveru není dovolena.";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to  zítra znovu.";
-$a->strings["Import"] = "Import";
-$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 Friendica serveru.";
-$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["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "";
-$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["Visit %s's profile [%s]"] = "Navštivte profil uživatele %s [%s]";
-$a->strings["Edit contact"] = "Editovat kontakt";
-$a->strings["Contacts who are not members of a group"] = "Kontakty, které nejsou členy skupiny";
-$a->strings["Export account"] = "Exportovat účet";
-$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."] = "Exportujte svůj účet a své kontakty. Použijte tuto funkci pro vytvoření  zálohy svého účtu a/nebo k přesunu na jiný server.";
-$a->strings["Export all"] = "Exportovat vše";
-$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)"] = "Exportujte své informace k účtu, kontakty a vše své položky jako json. To může být velmi velký soubor a může to zabrat spoustu času. Tuto funkci použijte pro úplnou zálohu svého účtu(fotografie se neexportují)";
-$a->strings["Export personal data"] = "Export osobních údajů";
-$a->strings["Total invitation limit exceeded."] = "Celkový limit pozvánek byl překročen";
-$a->strings["%s : Not a valid email address."] = "%s : není platná e-mailová adresa.";
-$a->strings["Please join us on Friendica"] = "Prosím přidejte se k nám na Friendice";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limit pozvánek byl překročen. Prosím kontaktujte vašeho administrátora webu.";
-$a->strings["%s : Message delivery failed."] = "%s : Doručení zprávy se nezdařilo.";
-$a->strings["%d message sent."] = [
-	0 => "%d zpráva odeslána.",
-	1 => "%d zprávy odeslány.",
-	2 => "%d zprávy odeslány.",
+$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ě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["You have no more invitations available"] = "Nemáte k dispozici žádné další pozvánky";
-$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."] = "Navštivte %s pro seznam veřejných serverů, na kterých se můžete přidat. Členové Friendica se mohou navzájem propojovat, stejně tak jako se mohou přiopojit se členy mnoha dalších sociálních sítí.";
-$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "K akceptaci 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."] = "Friendica servery jsou všechny propojené a vytváří tak rozsáhlou sociální síť s důrazem na soukromý a je pod kontrolou svých členů. Členové se mohou propojovat s mnoha dalšími tradičními sociálními sítěmi. Navštivte %s pro seznam alternativních Friendica serverů kde 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["Send invitations"] = "Poslat pozvánky";
-$a->strings["Enter email addresses, one per line:"] = "Zadejte e-mailové adresy, jednu na řádek:";
-$a->strings["Your message:"] = "Vaše zpráva:";
-$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Jste srdečně pozván se připojit ke mně a k mým blízkým přátelům na Friendica - a pomoci nám vytvořit lepší sociální síť.";
-$a->strings["You will need to supply this invitation code: \$invite_code"] = "Budete muset zadat kód této pozvánky: \$invite_code";
-$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Jakmile se zaregistrujete, prosím spojte se se mnou přes mou profilovu stránku na:";
-$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendica.com"] = "Pro více informací o Friendica projektu a o tom, proč je tak důležitý, prosím navštivte http://friendica.com";
-$a->strings["Submit"] = "Odeslat";
-$a->strings["Files"] = "Soubory";
-$a->strings["Permission denied"] = "Nedostatečné oprávnění";
-$a->strings["Invalid profile identifier."] = "Neplatný identifikátor profilu.";
-$a->strings["Profile Visibility Editor"] = "Editor viditelnosti profilu ";
-$a->strings["Click on a contact to add or remove."] = "Klikněte na kontakt pro přidání nebo odebrání";
-$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["Tag removed"] = "Štítek odstraněn";
-$a->strings["Remove Item Tag"] = "Odebrat štítek položky";
-$a->strings["Select a tag to remove: "] = "Vyberte štítek k odebrání: ";
-$a->strings["Remove"] = "Odstranit";
-$a->strings["Resubscribing to OStatus contacts"] = "";
-$a->strings["Error"] = "";
-$a->strings["Done"] = "";
-$a->strings["Keep this window open until done."] = "";
-$a->strings["No potential page delegates located."] = "Žádní potenciální delegáti stránky nenalezeni.";
-$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."] = "Delegáti jsou schopni řídit všechny aspekty tohoto účtu / stránky, kromě základních nastavení účtu. Prosím, nepředávejte svůj osobní účet nikomu, komu úplně nevěříte..";
-$a->strings["Existing Page Managers"] = "Stávající správci stránky";
-$a->strings["Existing Page Delegates"] = "Stávající delegáti stránky ";
-$a->strings["Potential Delegates"] = "Potenciální delegáti";
-$a->strings["Add"] = "Přidat";
-$a->strings["No entries."] = "Žádné záznamy.";
-$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!"] = "";
-$a->strings["- select -"] = "- vyber -";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s následuje %3\$s uživatele %2\$s";
-$a->strings["Item not available."] = "Položka není k dispozici.";
-$a->strings["Item was not found."] = "Položka nebyla nalezena.";
-$a->strings["You must be logged in to use addons. "] = "Musíte být přihlášeni pro použití rozšíření.";
-$a->strings["Applications"] = "Aplikace";
-$a->strings["No installed applications."] = "Žádné nainstalované aplikace.";
-$a->strings["Not Extended"] = "Nerozšířeně";
-$a->strings["Welcome to Friendica"] = "Vítejte na Friendica";
-$a->strings["New Member Checklist"] = "Seznam doporučení pro nového člena";
-$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."] = "Rádi bychom vám nabídli několik tipů a odkazů pro začátek. Klikněte na jakoukoliv položku pro zobrazení relevantní stránky. Odkaz na tuto stránku bude viditelný z Vaší domovské stránky po dobu dvou týdnů od Vaší první registrace.";
-$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ý Start</em> - naleznete stručné představení k Vašemu profilu a záložce Síť, k vytvoření spojení s novými kontakty a nalezení skupin, 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.\nVě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é sociální síti.";
-$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 potenciální přátelé věděli, jak vás přesně najít.";
-$a->strings["Upload Profile Photo"] = "Nahrát profilovou fotografii";
-$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činili. Studie ukázaly, že lidé se skutečnými fotografiemi mají desetkrát častěji přátele než lidé, kteří nemají.";
-$a->strings["Edit Your Profile"] = "Editujte Váš 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."] = "Upravit <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. Friendika Vám může nalézt 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["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>.";
-$a->strings["Go to Your Site's Directory"] = "Navštivte lokální adresář Friendica";
-$a->strings["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."] = "Stránka Adresář Vám pomůže najít další lidi na tomto serveru nebo v jiných propojených serverech. Prostřednictvím odkazů <em>Připojení</em> nebo <em>Následovat</em> si prohlédněte jejich profilovou stránku. Uveďte svou vlastní adresu identity, je-li požadována.";
-$a->strings["Finding New People"] = "Nalezení nových lidí";
-$a->strings["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."] = "Na bočním panelu stránky s kontakty je několik nástrojů k nalezení nových přátel. Porovnáme lidi dle zájmů, najdeme lidi podle jména nebo zájmu a poskytneme Vám návrhy založené na přátelství v síti přátel. Na zcela novém serveru se návrhy přátelství nabínou obvykle během 24 hodin.";
-$a->strings["Group Your Contacts"] = "Seskupte si své kontakty";
-$a->strings["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."] = "Jakmile získáte nějaké přátele, uspořádejte si je do soukromých konverzačních skupin na postranním panelu Vaší stránky Kontakty a pak můžete komunikovat s každou touto skupinu soukromě prostřednictvím stránky Síť.";
-$a->strings["Why Aren't My Posts Public?"] = "Proč nejsou mé příspěvky veřejné?";
-$a->strings["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."] = "Friendica respektuje Vaše soukromí. Defaultně  jsou Vaše příspěvky viditelné pouze lidem, které označíte jako Vaše přátelé. Více informací naleznete v nápovědě na výše uvedeném odkazu";
-$a->strings["Getting Help"] = "Získání nápovědy";
-$a->strings["Go to the Help Section"] = "Navštivte sekci nápovědy";
-$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Na stránkách <strong>Nápověda</strong> naleznete nejen další podrobnosti o všech funkcích Friendika ale také další zdroje informací.";
-$a->strings["Remove My Account"] = "Odstranit můj účet";
-$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Tímto bude kompletně odstraněn váš účet. Jakmile bude účet odstraněn, nebude už možné ho obnovit.";
-$a->strings["Please enter your password for verification:"] = "Prosím, zadejte své heslo pro ověření:";
-$a->strings["Item not found"] = "Položka nenalezena";
-$a->strings["Edit post"] = "Upravit příspěvek";
-$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["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["Please select your timezone:"] = "Prosím, vyberte své časové pásmo:";
-$a->strings["The post was created"] = "Příspěvek byl vytvořen";
-$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["Create a group of contacts/friends."] = "Vytvořit skupinu kontaktů / přátel.";
-$a->strings["Group removed."] = "Skupina odstraněna. ";
-$a->strings["Unable to remove group."] = "Nelze odstranit skupinu.";
-$a->strings["Group Editor"] = "Editor skupin";
-$a->strings["Members"] = "Členové";
-$a->strings["All Contacts"] = "Všechny kontakty";
-$a->strings["Group is empty"] = "Skupina je prázdná";
+$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ě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.";
+$a->strings["Profile Photos"] = "Profilové fotky";
+$a->strings["Contact settings applied."] = "Nastavení kontaktu změněno";
+$a->strings["Contact update failed."] = "Aktualizace kontaktu selhala.";
+$a->strings["Contact not found."] = "Kontakt nenalezen.";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>VAROVÁNÍ: Toto je velmi pokročilé</strong> a pokud zadáte nesprávné informace, Vaše komunikace s tímto kontaktem může přestat fungovat.";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Prosím použijte <strong>ihned</strong> v prohlížeči tlačítko \"zpět\" pokud si nejste jisti, co dělat na této stránce.";
+$a->strings["No mirroring"] = "Žádné zrcadlení";
+$a->strings["Mirror as forwarded posting"] = "Zrcadlit pro přeposlané příspěvky";
+$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"] = "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 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";
+$a->strings["Account URL"] = "URL adresa účtu";
+$a->strings["Friend Request URL"] = "URL žádosti o přátelství";
+$a->strings["Friend Confirm URL"] = "URL adresa pro potvrzení přátelství";
+$a->strings["Notification Endpoint URL"] = "URL adresa koncového bodu oznámení";
+$a->strings["Poll/Feed URL"] = "URL adresa poll/feed";
+$a->strings["New photo from this URL"] = "Nová fotka z této URL adresy";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Došlo k překročení maximálního počtu zpráv na zeď během jednoho dne. Zpráva %s nedoručena.";
 $a->strings["No recipient selected."] = "Nevybrán příjemce.";
-$a->strings["Unable to check your home location."] = "Nebylo možné zjistit Vaši domácí lokaci.";
+$a->strings["Unable to check your home location."] = "Nebylo možné zjistit polohu Vašeho domova.";
 $a->strings["Message could not be sent."] = "Zprávu se nepodařilo odeslat.";
 $a->strings["Message collection failure."] = "Sběr zpráv selhal.";
 $a->strings["Message sent."] = "Zpráva odeslána.";
@@ -921,485 +420,234 @@ $a->strings["Send Private Message"] = "Odeslat soukromou zprávu";
 $a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Pokud si přejete, aby uživatel %s mohl odpovědět, ověřte si zda-li máte povoleno na svém serveru zasílání soukromých zpráv od neznámých odesilatelů.";
 $a->strings["To:"] = "Adresát:";
 $a->strings["Subject:"] = "Předmět:";
-$a->strings["link"] = "odkaz";
-$a->strings["Authorize application connection"] = "Povolit připojení aplikacím";
-$a->strings["Return to your app and insert this Securty Code:"] = "Vraťte se do vaší aplikace a zadejte tento bezpečnostní kód:";
-$a->strings["Please login to continue."] = "Pro pokračování se prosím přihlaste.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Chcete umožnit této aplikaci přístup k vašim příspěvkům a kontaktům a/nebo k vytváření Vašich nových příspěvků?";
-$a->strings["No"] = "Ne";
-$a->strings["Source (bbcode) text:"] = "Zdrojový text (bbcode):";
-$a->strings["Source (Diaspora) text to convert to BBcode:"] = "Zdrojový (Diaspora) text k převedení do BB kódování:";
-$a->strings["Source input: "] = "Zdrojový vstup: ";
-$a->strings["bb2html (raw HTML): "] = "bb2html (raw HTML): ";
-$a->strings["bb2html: "] = "bb2html: ";
-$a->strings["bb2html2bb: "] = "bb2html2bb: ";
-$a->strings["bb2md: "] = "bb2md: ";
-$a->strings["bb2md2html: "] = "bb2md2html: ";
-$a->strings["bb2dia2bb: "] = "bb2dia2bb: ";
-$a->strings["bb2md2html2bb: "] = "bb2md2html2bb: ";
-$a->strings["Source input (Diaspora format): "] = "Vstupní data (ve formátu Diaspora): ";
-$a->strings["diaspora2bb: "] = "diaspora2bb: ";
-$a->strings["Subscribing to OStatus contacts"] = "";
-$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"] = "ignorován";
-$a->strings["%1\$s welcomes %2\$s"] = "%1\$s vítá %2\$s";
-$a->strings["Unable to locate contact information."] = "Nepodařilo se najít kontaktní informace.";
-$a->strings["Do you really want to delete this message?"] = "Opravdu chcete smazat tuto zprávu?";
-$a->strings["Message deleted."] = "Zpráva odstraněna.";
-$a->strings["Conversation removed."] = "Konverzace odstraněna.";
-$a->strings["No messages."] = "Žádné zprávy.";
-$a->strings["Message not available."] = "Zpráva není k dispozici.";
-$a->strings["Delete message"] = "Smazat zprávu";
-$a->strings["Delete conversation"] = "Odstranit konverzaci";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Není k dispozici zabezpečená komunikace. <strong>Možná</strong> budete schopni reagovat z odesilatelovy profilové stránky.";
-$a->strings["Send Reply"] = "Poslat odpověď";
-$a->strings["Unknown sender - %s"] = "Neznámý odesilatel - %s";
-$a->strings["You and %s"] = "Vy a %s";
-$a->strings["%s and You"] = "%s a Vy";
-$a->strings["D, d M Y - g:i A"] = "D M R - g:i A";
-$a->strings["%d message"] = [
-	0 => "%d zpráva",
-	1 => "%d zprávy",
-	2 => "%d zpráv",
-];
-$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řepnutí 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["Contact settings applied."] = "Nastavení kontaktu změněno";
-$a->strings["Contact update failed."] = "Aktualizace kontaktu selhala.";
-$a->strings["Contact not found."] = "Kontakt nenalezen.";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>Varování: Toto je velmi pokročilé</strong> a pokud zadáte nesprávné informace, Vaše komunikace s tímto kontaktem může přestat fungovat.";
-$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Prosím použijte <strong>ihned</strong> v prohlížeči tlačítko \"zpět\" pokud si nejste jistí co dělat na této stránce.";
-$a->strings["No mirroring"] = "Žádné zrcadlení";
-$a->strings["Mirror as forwarded posting"] = "Zrcadlit pro přeposlané příspěvky";
-$a->strings["Mirror as my own posting"] = "Zrcadlit jako mé vlastní příspěvky";
-$a->strings["Return to contact editor"] = "Návrat k editoru kontaktu";
-$a->strings["Refetch contact data"] = "Znovu načíst data kontaktu";
-$a->strings["Remote Self"] = "Remote Self";
-$a->strings["Mirror postings from this contact"] = "Zrcadlení správ 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 freindica bude přeposílat 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"] = "@Tagname - upřednostněno před Jménem/Přezdívkou";
-$a->strings["Account URL"] = "URL adresa účtu";
-$a->strings["Friend Request URL"] = "Žádost o přátelství URL";
-$a->strings["Friend Confirm URL"] = "URL adresa potvrzení přátelství";
-$a->strings["Notification Endpoint URL"] = "Notifikační URL adresa";
-$a->strings["Poll/Feed URL"] = "Poll/Feed URL adresa";
-$a->strings["New photo from this URL"] = "Nové foto z této URL adresy";
-$a->strings["No such group"] = "Žádná taková skupina";
-$a->strings["Group: %s"] = "Skupina: %s";
-$a->strings["This entry was edited"] = "Tento záznam byl editován";
-$a->strings["%d comment"] = [
-	0 => "%d komentář",
-	1 => "%d komentářů",
-	2 => "%d komentářů",
-];
-$a->strings["Private Message"] = "Soukromá zpráva";
-$a->strings["I like this (toggle)"] = "Líbí se mi to (přepínač)";
-$a->strings["like"] = "má rád";
-$a->strings["I don't like this (toggle)"] = "Nelíbí se mi to (přepínač)";
-$a->strings["dislike"] = "nemá rád";
-$a->strings["Share this"] = "Sdílet toto";
-$a->strings["share"] = "sdílí";
-$a->strings["This is you"] = "Nastavte Vaši polohu";
-$a->strings["Comment"] = "Okomentovat";
-$a->strings["Bold"] = "Tučné";
-$a->strings["Italic"] = "Kurzíva";
-$a->strings["Underline"] = "Podrtžené";
-$a->strings["Quote"] = "Citovat";
-$a->strings["Code"] = "Kód";
-$a->strings["Image"] = "Obrázek";
-$a->strings["Link"] = "Odkaz";
-$a->strings["Video"] = "Video";
-$a->strings["Edit"] = "Upravit";
-$a->strings["add star"] = "přidat hvězdu";
-$a->strings["remove star"] = "odebrat hvězdu";
-$a->strings["toggle star status"] = "přepnout hvězdu";
-$a->strings["starred"] = "označeno hvězdou";
-$a->strings["add tag"] = "přidat štítek";
-$a->strings["ignore thread"] = "ignorovat vlákno";
-$a->strings["unignore thread"] = "přestat ignorovat vlákno";
-$a->strings["toggle ignore status"] = "přepnout stav Ignorování";
-$a->strings["save to folder"] = "uložit do složky";
-$a->strings["I will attend"] = "";
-$a->strings["I will not attend"] = "";
-$a->strings["I might attend"] = "";
-$a->strings["to"] = "pro";
-$a->strings["Wall-to-Wall"] = "Zeď-na-Zeď";
-$a->strings["via Wall-To-Wall:"] = "přes Zeď-na-Zeď ";
-$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["Mood"] = "Nálada";
-$a->strings["Set your current mood and tell your friends"] = "Nastavte svou aktuální náladu a řekněte to Vašim přátelům";
-$a->strings["Poke/Prod"] = "Šťouchanec";
-$a->strings["poke, prod or do other things to somebody"] = "někoho šťouchnout nebo mu provést  jinou věc";
-$a->strings["Recipient"] = "Příjemce";
-$a->strings["Choose what you wish to do to recipient"] = "Vyberte, co si přejete příjemci udělat";
-$a->strings["Make this post private"] = "Změnit tento příspěvek na soukromý";
-$a->strings["Image uploaded but image cropping failed."] = "Obrázek byl odeslán, ale jeho oříznutí se nesdařilo.";
-$a->strings["Image size reduction [%s] failed."] = "Nepodařilo se snížit velikost obrázku [%s].";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Znovu načtěte stránku (Shift+F5) nebo vymažte cache prohlížeče, pokud se nové fotografie nezobrazí okamžitě.";
-$a->strings["Unable to process image"] = "Obrázek nelze zpracovat ";
-$a->strings["Image exceeds size limit of %s"] = "Obrázek překročil limit velikosti %s";
-$a->strings["Unable to process image."] = "Obrázek není možné zprocesovat";
-$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["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"] = "Editace dokončena";
-$a->strings["Image uploaded successfully."] = "Obrázek byl úspěšně nahrán.";
-$a->strings["Image upload failed."] = "Nahrání obrázku selhalo.";
-$a->strings["Account approved."] = "Účet schválen.";
-$a->strings["Registration revoked for %s"] = "Registrace zrušena pro %s";
-$a->strings["Please login."] = "Přihlaste se, prosím.";
-$a->strings["Invalid request identifier."] = "Neplatný identifikátor požadavku.";
-$a->strings["Discard"] = "Odstranit";
-$a->strings["Ignore"] = "Ignorovat";
-$a->strings["Network Notifications"] = "Upozornění Sítě";
-$a->strings["Personal Notifications"] = "Osobní upozornění";
-$a->strings["Home Notifications"] = "Upozornění na vstupní straně";
-$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 %s"] = "navrhl %s";
-$a->strings["Hide this contact from others"] = "Skrýt tento kontakt před ostatními";
-$a->strings["Post a new friend activity"] = "Zveřejnit aktivitu nového přítele.";
-$a->strings["if applicable"] = "je-li použitelné";
-$a->strings["Approve"] = "Schválit";
-$a->strings["Claims to be known to you: "] = "Vaši údajní známí: ";
-$a->strings["yes"] = "ano";
-$a->strings["no"] = "ne";
-$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Fan/Admirer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Má být vaše propojení oboustanné nebo ne? \"Přítel\" implikuje, že dovolíte čtení a přihlašování se k jejich příspěvkům. \"Fanoušek/Obdivovatel\" znamená, že umožníte čtení, ale už nebudete číst jejich příspěvky: Odsouhlasit jako: ";
-$a->strings["Shall your connection be bidirectional or not? \"Friend\" implies that you allow to read and you subscribe to their posts. \"Sharer\" means that you allow to read but you do not want to read theirs. Approve as: "] = "Má být vaše propojení oboustanné nebo ne? \"Přítel\" implikuje, že dovolíte čtení a vy budete přihlášen k odebírání jejich příspěvků. \"Sdíleč\" znamená, že umožníte čtení, ale už nebudete číst jejich příspěvky: Odsouhlasit jako: ";
-$a->strings["Friend"] = "Přítel";
-$a->strings["Sharer"] = "Sdílené";
-$a->strings["Fan/Admirer"] = "Fanoušek / obdivovatel";
-$a->strings["Profile URL"] = "URL profilu";
-$a->strings["No introductions."] = "Žádné představení.";
-$a->strings["Show unread"] = "";
-$a->strings["Show all"] = "";
-$a->strings["No more %s notifications."] = "";
-$a->strings["Profile not found."] = "Profil nenalezen";
-$a->strings["Profile deleted."] = "Profil smazán.";
-$a->strings["Profile-"] = "Profil-";
-$a->strings["New profile created."] = "Nový profil vytvořen.";
-$a->strings["Profile unavailable to clone."] = "Profil není možné naklonovat.";
-$a->strings["Profile Name is required."] = "Jméno profilu je povinné.";
-$a->strings["Marital Status"] = "Rodinný Stav";
-$a->strings["Romantic Partner"] = "Romatický partner";
-$a->strings["Work/Employment"] = "Práce/Zaměstnání";
-$a->strings["Religion"] = "Náboženství";
-$a->strings["Political Views"] = "Politické přesvědčení";
-$a->strings["Gender"] = "Pohlaví";
-$a->strings["Sexual Preference"] = "Sexuální orientace";
-$a->strings["XMPP"] = "";
-$a->strings["Homepage"] = "Domácí stránka";
-$a->strings["Interests"] = "Zájmy";
-$a->strings["Address"] = "Adresa";
-$a->strings["Location"] = "Lokace";
-$a->strings["Profile updated."] = "Profil aktualizován.";
-$a->strings[" and "] = " a ";
-$a->strings["public profile"] = "veřejný profil";
-$a->strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s změnil %2\$s na &ldquo;%3\$s&rdquo;";
-$a->strings[" - Visit %1\$s's %2\$s"] = " - Navštivte %2\$s uživatele %1\$s";
-$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s aktualizoval %2\$s, změnou %3\$s.";
-$a->strings["Hide contacts and friends:"] = "Skrýt kontakty a přátele:";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Skrýt u tohoto profilu Vaše kontakty / seznam přátel před před dalšími uživateli zobrazující si tento profil?";
-$a->strings["Show more profile fields:"] = "";
-$a->strings["Profile Actions"] = "";
-$a->strings["Edit Profile Details"] = "Upravit podrobnosti profilu ";
-$a->strings["Change Profile Photo"] = "Změna Profilové fotky";
-$a->strings["View this profile"] = "Zobrazit tento profil";
-$a->strings["Create a new profile using these settings"] = "Vytvořit nový profil pomocí tohoto nastavení";
-$a->strings["Clone this profile"] = "Klonovat tento profil";
-$a->strings["Delete this profile"] = "Smazat tento profil";
-$a->strings["Basic information"] = "Základní informace";
-$a->strings["Profile picture"] = "Profilový obrázek";
-$a->strings["Preferences"] = "Nastavení";
-$a->strings["Status information"] = "Statusové informace";
-$a->strings["Additional information"] = "Dodatečné informace";
-$a->strings["Relation"] = "";
-$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["Example: fishing photography software"] = "Příklad: fishing photography software";
-$a->strings["Profile Name:"] = "Jméno profilu:";
-$a->strings["Required"] = "Vyžadováno";
-$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:"] = "Město:";
-$a->strings["Region/State:"] = "Region / stát:";
-$a->strings["Postal/Zip Code:"] = "PSČ:";
-$a->strings["Country:"] = "Země:";
-$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@seznam.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:"] = "";
-$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "";
-$a->strings["Homepage URL:"] = "Odkaz na domovskou stránku:";
-$a->strings["Religious Views:"] = "Náboženské přesvědčení:";
-$a->strings["Public Keywords:"] = "Veřejná klíčová slova:";
-$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Používá se pro doporučování potenciálních přátel, může být viděno ostatními)";
-$a->strings["Private Keywords:"] = "Soukromá klíčová slova:";
-$a->strings["(Used for searching profiles, never shown to others)"] = "(Používá se pro vyhledávání profilů, není nikdy zobrazeno ostatním)";
-$a->strings["Musical interests"] = "Hudební vkus";
-$a->strings["Books, literature"] = "Knihy, literatura";
-$a->strings["Television"] = "Televize";
-$a->strings["Film/dance/culture/entertainment"] = "Film/tanec/kultura/zábava";
-$a->strings["Hobbies/Interests"] = "Koníčky/zájmy";
-$a->strings["Love/romance"] = "Láska/romantika";
-$a->strings["Work/employment"] = "Práce/zaměstnání";
-$a->strings["School/education"] = "Škola/vzdělání";
-$a->strings["Contact information and Social Networks"] = "Kontaktní informace a sociální sítě";
-$a->strings["Edit/Manage Profiles"] = "Upravit / Spravovat profily";
-$a->strings["No friends to display."] = "Žádní přátelé k zobrazení";
-$a->strings["Access to this profile has been restricted."] = "Přístup na tento profil byl omezen.";
-$a->strings["View"] = "";
-$a->strings["Previous"] = "Předchozí";
+$a->strings["Your message:"] = "Vaše zpráva:";
+$a->strings["Remote privacy information not available."] = "Vzdálené informace o soukromí nejsou k dispozici.";
+$a->strings["Visible to:"] = "Viditelné pro:";
+$a->strings["Friendica Communications Server - Setup"] = "Komunikační server Friendica - Nastavení";
+$a->strings["Could not connect to database."] = "Nelze se připojit k databázi.";
+$a->strings["Could not create table."] = "Nelze vytvořit tabulku.";
+$a->strings["Your Friendica site database has been installed."] = "Vaše databáze Friendica  byla nainstalována.";
+$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"] = "Zkouška systému";
 $a->strings["Next"] = "Dále";
-$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["No contacts in common."] = "Žádné společné kontakty.";
-$a->strings["Common Friends"] = "Společní přátelé";
-$a->strings["Not available."] = "Není k dispozici.";
-$a->strings["Global Directory"] = "Globální adresář";
-$a->strings["Find on this site"] = "Nalézt na tomto webu";
-$a->strings["Results for:"] = "";
+$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ř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";
+$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"] = "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";
+$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.";
+$a->strings["Profile not found."] = "Profil nenalezen.";
+$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "To se může občas stát, pokud byl kontakt zažádán oběma osobami a již byl schválen.";
+$a->strings["Response from remote site was not understood."] = "Odpověď ze vzdáleného serveru nebyla srozumitelná.";
+$a->strings["Unexpected response from remote site: "] = "Neočekávaná odpověď od vzdáleného serveru:";
+$a->strings["Confirmation completed successfully."] = "Potvrzení úspěšně dokončena.";
+$a->strings["Temporary failure. Please wait and try again."] = "Dočasné selhání. Prosím, vyčkejte a zkuste to znovu.";
+$a->strings["Introduction failed or was revoked."] = "Žádost o propojení selhala nebo byla zrušena.";
+$a->strings["Remote site reported: "] = "Vzdálený server oznámil:";
+$a->strings["Unable to set contact photo."] = "Nelze nastavit fotku kontaktu.";
+$a->strings["No user record found for '%s' "] = "Pro \"%s\" nenalezen žádný uživatelský záznam ";
+$a->strings["Our site encryption key is apparently messed up."] = "Náš šifrovací klíč zřejmě přestal správně fungovat.";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Byla poskytnuta prázdná URL adresa nebo se nepodařilo URL adresu dešifrovat.";
+$a->strings["Contact record was not found for you on our site."] = "Záznam kontaktu nebyl nalezen pro Vás na našich stránkách.";
+$a->strings["Site public key not available in contact record for URL %s."] = "V adresáři není k dispozici veřejný klíč pro URL %s.";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Váš systém poskytl duplicitní ID vůči našemu systému. Pokuste se akci zopakovat.";
+$a->strings["Unable to set your contact credentials on our system."] = "Nelze nastavit Vaše přihlašovací údaje v našem systému.";
+$a->strings["Unable to update your contact profile details on our system"] = "Nelze aktualizovat Váš profil v našem systému";
+$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 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 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"] = "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:";
+$a->strings["Gender:"] = "Pohlaví:";
+$a->strings["Status:"] = "Stav:";
+$a->strings["Homepage:"] = "Domovská stránka:";
+$a->strings["About:"] = "O mně:";
+$a->strings["Find on this site"] = "Najít na tomto webu";
+$a->strings["Results for:"] = "Výsledky pro:";
 $a->strings["Site Directory"] = "Adresář serveru";
 $a->strings["No entries (some entries may be hidden)."] = "Žádné záznamy (některé položky mohou být skryty).";
-$a->strings["People Search - %s"] = "Vyhledávání lidí - %s";
-$a->strings["Forum Search - %s"] = "";
-$a->strings["No matches"] = "Žádné shody";
-$a->strings["Item has been removed."] = "Položka byla odstraněna.";
-$a->strings["Event can not end before it has started."] = "Událost nemůže končit dříve, než začala.";
-$a->strings["Event title and start time are required."] = "Název události a datum začátku jsou vyžadovány.";
-$a->strings["Create New Event"] = "Vytvořit novou událost";
-$a->strings["Event details"] = "Detaily události";
-$a->strings["Starting date and Title are required."] = "Počáteční datum a Název jsou vyžadovány.";
-$a->strings["Event Starts:"] = "Událost začíná:";
-$a->strings["Finish date/time is not known or not relevant"] = "Datum/čas konce není zadán nebo není relevantní";
-$a->strings["Event Finishes:"] = "Akce končí:";
-$a->strings["Adjust for viewer timezone"] = "Nastavit časové pásmo pro uživatele s právem pro čtení";
-$a->strings["Description:"] = "Popis:";
-$a->strings["Title:"] = "Název:";
-$a->strings["Share this event"] = "Sdílet tuto událost";
-$a->strings["System down for maintenance"] = "Systém vypnut z důvodů údržby";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "Žádná klíčová slova k porovnání. Prosím, přidejte klíčová slova do Vašeho výchozího profilu.";
-$a->strings["is interested in:"] = "zajímá se o:";
+$a->strings["is interested in:"] = "se zajímá o:";
 $a->strings["Profile Match"] = "Shoda profilu";
-$a->strings["Tips for New Members"] = "Tipy pro nové členy";
-$a->strings["Do you really want to delete this suggestion?"] = "Opravdu chcete smazat tento návrh?";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Nejsou dostupné žádné návrhy. Pokud je toto nový server, zkuste to znovu za 24 hodin.";
-$a->strings["Ignore/Hide"] = "Ignorovat / skrýt";
-$a->strings["[Embedded content - reload page to view]"] = "[Vložený obsah - obnovte stránku pro zobrazení]";
-$a->strings["Recent Photos"] = "Aktuální fotografie";
-$a->strings["Upload New Photos"] = "Nahrát nové fotografie";
 $a->strings["everybody"] = "Žádost o připojení selhala nebo byla zrušena.";
-$a->strings["Contact information unavailable"] = "Kontakt byl zablokován";
-$a->strings["Album not found."] = "Album nenalezeno.";
-$a->strings["Delete Album"] = "Smazat album";
-$a->strings["Do you really want to delete this photo album and all its photos?"] = "Opravdu chcete smazat toto foto album a všechny jeho fotografie?";
-$a->strings["Delete Photo"] = "Smazat fotografii";
-$a->strings["Do you really want to delete this photo?"] = "Opravdu chcete smazat tuto fotografii?";
-$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s byl označen v %2\$s uživatelem %3\$s";
-$a->strings["a photo"] = "fotografie";
-$a->strings["Image file is empty."] = "Soubor obrázku je prázdný.";
-$a->strings["No photos selected"] = "Není vybrána žádná fotografie";
-$a->strings["Access to this item is restricted."] = "Přístup k této položce je omezen.";
-$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Použil jste %1$.2f Mbajtů z %2$.2f Mbajtů úložiště fotografií.";
-$a->strings["Upload Photos"] = "Nahrání fotografií ";
-$a->strings["New album name: "] = "Název nového alba: ";
-$a->strings["or existing album name: "] = "nebo stávající název alba: ";
-$a->strings["Do not show a status post for this upload"] = "Nezobrazovat stav pro tento upload";
-$a->strings["Show to Groups"] = "Zobrazit ve Skupinách";
-$a->strings["Show to Contacts"] = "Zobrazit v Kontaktech";
-$a->strings["Private Photo"] = "Soukromé Fotografie";
-$a->strings["Public Photo"] = "Veřejné Fotografie";
-$a->strings["Edit Album"] = "Edituj album";
-$a->strings["Show Newest First"] = "Zobrazit nejprve nejnovější:";
-$a->strings["Show Oldest First"] = "Zobrazit nejprve nejstarší:";
-$a->strings["View Photo"] = "Zobraz fotografii";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Oprávnění bylo zamítnuto. Přístup k této položce může být omezen.";
-$a->strings["Photo not available"] = "Fotografie není k dispozici";
-$a->strings["View photo"] = "Zobrazit obrázek";
-$a->strings["Edit photo"] = "Editovat fotografii";
-$a->strings["Use as profile photo"] = "Použít jako profilovou fotografii";
-$a->strings["View Full Size"] = "Zobrazit v plné velikosti";
-$a->strings["Tags: "] = "Štítky: ";
-$a->strings["[Remove any tag]"] = "[Odstranit všechny štítky]";
-$a->strings["New album name"] = "Nové jméno alba";
-$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: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
-$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["Private photo"] = "Soukromé fotografie";
-$a->strings["Public photo"] = "Veřejné fotografie";
-$a->strings["Map"] = "";
-$a->strings["View Album"] = "Zobrazit album";
-$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["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> login: %s<br> heslo: %s<br><br>Své heslo můžete změnit po přihlášení.";
-$a->strings["Registration successful."] = "";
-$a->strings["Your registration can not be processed."] = "Vaši registraci nelze zpracovat.";
-$a->strings["Your registration is pending approval by the site owner."] = "Vaše registrace čeká na schválení vlastníkem serveru.";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Tento formulář můžete (volitelně) vyplnit s pomocí OpenID tím, že vyplníte své OpenID a kliknutete na tlačítko 'Zaregistrovat'.";
-$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Pokud nepoužíváte OpenID, nechte prosím toto pole prázdné a vyplňte zbylé položky.";
-$a->strings["Your OpenID (optional): "] = "Vaše OpenID (nepovinné): ";
-$a->strings["Include your profile in member directory?"] = "Toto je Váš <strong>veřejný</strong> profil.<br />Ten <strong>může</strong> být viditelný kýmkoliv na internetu.";
-$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."] = "Členství na tomto webu je pouze na pozvání.";
-$a->strings["Your invitation ID: "] = "Vaše pozvání ID:";
-$a->strings["Registration"] = "Registrace";
-$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "";
-$a->strings["Your Email Address: "] = "Vaše e-mailová adresa:";
-$a->strings["New Password:"] = "Nové heslo:";
-$a->strings["Leave empty for an auto generated password."] = "Ponechte prázdné pro automatické vygenerovaní hesla.";
-$a->strings["Confirm:"] = "Potvrďte:";
-$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Vyberte přezdívku k profilu. Ta musí začít s textovým znakem. Vaše profilová adresa na tomto webu pak bude \"<strong>přezdívka@\$sitename</strong>\".";
-$a->strings["Choose a nickname: "] = "Vyberte přezdívku:";
-$a->strings["Import your profile to this friendica instance"] = "Import Vašeho profilu do této friendica instance";
 $a->strings["Account"] = "Účet";
-$a->strings["Additional features"] = "Další funkčnosti";
+$a->strings["Profiles"] = "Profily";
+$a->strings["Additional features"] = "Dodatečné vlastnosti";
 $a->strings["Display"] = "Zobrazení";
 $a->strings["Social Networks"] = "Sociální sítě";
-$a->strings["Plugins"] = "Pluginy";
-$a->strings["Connected apps"] = "Propojené aplikace";
+$a->strings["Addons"] = "Doplňky";
+$a->strings["Delegations"] = "Delegace";
+$a->strings["Connected apps"] = "Připojené aplikace";
+$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";
 $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"] = "Aktualizované funkčnosti";
+$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.";
+$a->strings["The new password has been exposed in a public data dump, please choose another."] = "Nové heslo bylo zveřejněno ve veřejném výpisu dat, prosím zvolte si jiné.";
 $a->strings["Wrong password."] = "Špatné heslo.";
 $a->strings["Password changed."] = "Heslo bylo změněno.";
 $a->strings["Password update failed. Please try again."] = "Aktualizace hesla se nezdařila. Zkuste to prosím znovu.";
 $a->strings[" Please use a shorter name."] = "Prosím použijte kratší jméno.";
 $a->strings[" Name too short."] = "Jméno je příliš krátké.";
 $a->strings["Wrong Password"] = "Špatné heslo";
-$a->strings[" Not valid email."] = "Neplatný e-mail.";
-$a->strings[" Cannot change to that email."] = "Nelze provést změnu na tento e-mail.";
-$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Soukromé fórum nemá nastaveno zabezpečení. Používá se defaultní soukromá skupina.";
-$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Soukromé fórum nemá nastaveno zabezpečení a ani žádnou defaultní soukromou skupinu.";
+$a->strings["Invalid email."] = "Neplatný e-mail.";
+$a->strings["Cannot change to that email."] = "Nelze změnit na tento e-mail.";
+$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Soukromé fórum nemá nastaveno zabezpečení. Používá se výchozí soukromá skupina.";
+$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í";
 $a->strings["Icon url"] = "URL ikony";
-$a->strings["You can't edit this application."] = "Nemůžete editovat tuto aplikaci.";
+$a->strings["You can't edit this application."] = "Nemůžete upravit tuto aplikaci.";
 $a->strings["Connected Apps"] = "Připojené aplikace";
+$a->strings["Edit"] = "Upravit";
 $a->strings["Client key starts with"] = "Klienský klíč začíná";
 $a->strings["No name"] = "Bez názvu";
 $a->strings["Remove authorization"] = "Odstranit oprávnění";
-$a->strings["No Plugin settings configured"] = "Žádný doplněk není nastaven";
-$a->strings["Plugin Settings"] = "Nastavení doplňku";
-$a->strings["Off"] = "Vypnuto";
-$a->strings["On"] = "Zapnuto";
-$a->strings["Additional Features"] = "Další Funkčnosti";
-$a->strings["General Social Media Settings"] = "General Social Media nastavení";
-$a->strings["Disable intelligent shortening"] = "Vypnout inteligentní zkracování";
-$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."] = "Normálně se systém snaží nalézt nejlepší link pro přidání zkrácených příspěvků. Pokud je tato volba aktivní, pak každý zkrácený příspěvek bude vždy ukazovat na originální friencika příspěvek";
-$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "Automaticky následovat jakékoliv GNU Social (OStatus) následníky/přispivatele";
-$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"] = "";
-$a->strings["Your legacy GNU Social account"] = "";
-$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."] = "";
-$a->strings["Repair OStatus subscriptions"] = "";
-$a->strings["Built-in support for %s connectivity is %s"] = "Vestavěná podpora pro připojení s %s je %s";
+$a->strings["No Addon settings configured"] = "Žádná nastavení doplňků nenakonfigurována";
+$a->strings["Addon Settings"] = "Nastavení doplňků";
+$a->strings["Off"] = "Vyp";
+$a->strings["On"] = "Zap";
+$a->strings["Additional Features"] = "Dodatečné vlastnosti";
+$a->strings["Diaspora"] = "Diaspora";
 $a->strings["enabled"] = "povoleno";
 $a->strings["disabled"] = "zakázáno";
+$a->strings["Built-in support for %s connectivity is %s"] = "Vestavěná podpora pro připojení s %s je %s";
 $a->strings["GNU Social (OStatus)"] = "GNU Social (OStatus)";
-$a->strings["Email access is disabled on this site."] = "Přístup k elektronické poště je na tomto serveru zakázán.";
+$a->strings["Email access is disabled on this site."] = "Přístup k e-mailu je na tomto serveru zakázán.";
+$a->strings["General Social Media Settings"] = "Obecná nastavení sociálních sítí";
+$a->strings["Disable Content Warning"] = "Vypnout varování o obsahu";
+$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."] = "Uživatelé na sítích, jako je Mastodon nebo Pleroma, si mohou nastavit pole s varováním o obsahu, která ve výchozim nastavení skryje jejich příspěvek. Tato možnost vypíná automatické skrývání a nastavuje varování o obsahu jako titulek příspěvku. Toto se netýká žádného dalšího filtrování obsahu, které se rozhodnete nastavit.";
+$a->strings["Disable intelligent shortening"] = "Vypnout inteligentní zkracování";
+$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."] = "Normálně se systém snaží nalézt nejlepší odkaz pro přidání zkrácených příspěvků. Pokud je tato možnost aktivní, pak každý zkrácený příspěvek bude vždy ukazovat na originální příspěvek Friendica.";
+$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "Automaticky sledovat jakékoliv sledovatele/zmiňovatele na 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."] = "Pokud obdržíte zprávu od neznámého uživatele z OStatus, tato možnost rozhoduje o tom, co dělat. Pokud je zaškrtnuta, bude pro každého neznámého uživatele vytvořen nový kontakt.";
+$a->strings["Default group for OStatus contacts"] = "Výchozí skupina pro kontakty z OStatus";
+$a->strings["Your legacy GNU Social account"] = "Váš starý účet na 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."] = "Pokud zde zadáte Vaše staré jméno účtu na GNU social/StatusNet (ve formátu uživatel@doména.tld), budou Vaše kontakty přidány automaticky. Toto pole bude po dokončení vyprázdněno.";
+$a->strings["Repair OStatus subscriptions"] = "Opravit odběry z OStatus";
 $a->strings["Email/Mailbox Setup"] = "Nastavení e-mailu";
 $a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Pokud chcete komunikovat pomocí této služby s Vašimi kontakty z e-mailu (volitelné), uveďte, jak se připojit k Vaší e-mailové schránce.";
 $a->strings["Last successful email check:"] = "Poslední úspěšná kontrola e-mailu:";
-$a->strings["IMAP server name:"] = "jméno IMAP serveru:";
+$a->strings["IMAP server name:"] = "Jméno IMAP serveru:";
 $a->strings["IMAP port:"] = "IMAP port:";
 $a->strings["Security:"] = "Zabezpečení:";
-$a->strings["None"] = "Žádný";
-$a->strings["Email login name:"] = "přihlašovací jméno k e-mailu:";
-$a->strings["Email password:"] = "heslo k Vašemu e-mailu:";
+$a->strings["None"] = "Žádné";
+$a->strings["Email login name:"] = "Přihlašovací jméno k e-mailu:";
+$a->strings["Email password:"] = "Heslo k e-mailu:";
 $a->strings["Reply-to address:"] = "Odpovědět na adresu:";
 $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:";
+$a->strings["Mark as seen"] = "Označit jako přečtené";
 $a->strings["Move to folder"] = "Přesunout do složky";
 $a->strings["Move to folder:"] = "Přesunout do složky:";
-$a->strings["No special theme for mobile devices"] = "žádné speciální téma pro mobilní zařízení";
-$a->strings["Display Settings"] = "Nastavení Zobrazení";
-$a->strings["Display Theme:"] = "Vybrat grafickou šablonu:";
-$a->strings["Mobile Theme:"] = "Téma pro mobilní zařízení:";
-$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["No special theme for mobile devices"] = "Žádný speciální motiv pro mobilní zařízení";
+$a->strings["%s - (Unsupported)"] = "%s - (Nepodporováno)";
+$a->strings["%s - (Experimental)"] = "%s - (Experimentální)";
+$a->strings["Display Settings"] = "Nastavení zobrazení";
+$a->strings["Display Theme:"] = "Motiv zobrazení:";
+$a->strings["Mobile Theme:"] = "Mobilní motiv:";
+$a->strings["Suppress warning of insecure networks"] = "Potlačit varování o nezabezpečených sítích";
+$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Zvolte, zda má systém potlačit zobrazování varování, že aktuální skupina obsahuje členy sítí, které nemohou přijímat soukromé příspěvky.";
 $a->strings["Update browser every xx seconds"] = "Aktualizovat prohlížeč každých xx sekund";
-$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "";
+$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum je 10 sekund. Zadáním hodnoty -1 funkci vypnete.";
 $a->strings["Number of items to display per page:"] = "Počet položek zobrazených na stránce:";
 $a->strings["Maximum of 100 items"] = "Maximum 100 položek";
 $a->strings["Number of items to display per page when viewed from mobile device:"] = "Počet položek ke zobrazení na stránce při zobrazení na mobilním zařízení:";
 $a->strings["Don't show emoticons"] = "Nezobrazovat emotikony";
-$a->strings["Calendar"] = "";
-$a->strings["Beginning of week:"] = "";
+$a->strings["Calendar"] = "Kalendář";
+$a->strings["Beginning of week:"] = "Začátek týdne:";
 $a->strings["Don't show notices"] = "Nezobrazovat oznámění";
 $a->strings["Infinite scroll"] = "Nekonečné posouvání";
-$a->strings["Automatic updates only at the top of the network page"] = "Automatické aktualizace pouze na hlavní stránce Síť.";
-$a->strings["Bandwith Saver Mode"] = "";
-$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "";
-$a->strings["General Theme Settings"] = "";
-$a->strings["Custom Theme Settings"] = "";
-$a->strings["Content Settings"] = "";
-$a->strings["Theme settings"] = "Nastavení téma";
-$a->strings["Account Types"] = "";
-$a->strings["Personal Page Subtypes"] = "";
-$a->strings["Community Forum Subtypes"] = "";
-$a->strings["Personal Page"] = "";
-$a->strings["This account is a regular personal profile"] = "";
-$a->strings["Organisation Page"] = "";
-$a->strings["This account is a profile for an organisation"] = "";
-$a->strings["News Page"] = "";
-$a->strings["This account is a news account/reflector"] = "";
-$a->strings["Community Forum"] = "";
-$a->strings["This account is a community forum where people can discuss with each other"] = "";
+$a->strings["Automatic updates only at the top of the network page"] = "Automatické aktualizace pouze na horní straně stránky Síť.";
+$a->strings["When disabled, the network page is updated all the time, which could be confusing while reading."] = "Pokud je tato funkce vypnuta, stránka Síť bude neustále aktualizována, což může být při čtení matoucí.";
+$a->strings["Bandwidth Saver Mode"] = "Režim šetření dat";
+$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Pokud je toto zapnuto, nebude při automatických aktualizacích zobrazován vložený obsah, zobrazí se pouze při obnovení stránky.";
+$a->strings["Smart Threading"] = "Chytrá vlákna";
+$a->strings["When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled."] = "Pokud je toto povoleno, bude potlačeno vnější odsazení vláken, která zároveň zůstanou tam, kde mají význam. Funguje pouze pokud je povoleno vláknování.";
+$a->strings["General Theme Settings"] = "Obecná nastavení motivu";
+$a->strings["Custom Theme Settings"] = "Vlastní nastavení motivu";
+$a->strings["Content Settings"] = "Nastavení obsahu";
+$a->strings["Unable to find your profile. Please contact your admin."] = "Nelze najít Váš účet. Prosím kontaktujte Vašeho administrátora.";
+$a->strings["Account Types"] = "Typy účtů";
+$a->strings["Personal Page Subtypes"] = "Podtypy osobních stránek";
+$a->strings["Community Forum Subtypes"] = "Podtypy komunitních fór";
+$a->strings["Personal Page"] = "Osobní stránka";
+$a->strings["Account for a personal profile."] = "Účet pro osobní profil.";
+$a->strings["Organisation Page"] = "Stránka organizace";
+$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "Účet pro organizaci, který automaticky potvrzuje žádosti o přidání kontaktu jako \"Sledovatele\".";
+$a->strings["News Page"] = "Zpravodajská stránka";
+$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "Účet pro zpravodaje, který automaticky potvrzuje žádosti o přidání kontaktu jako \"Sledovatele\".";
+$a->strings["Community Forum"] = "Komunitní fórum";
+$a->strings["Account for community discussions."] = "Účet pro komunitní diskuze.";
 $a->strings["Normal Account Page"] = "Normální stránka účtu";
-$a->strings["This account is a normal personal profile"] = "Tento účet je běžný osobní profil";
-$a->strings["Soapbox Page"] = "Stránka \"Soapbox\"";
-$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Automaticky schválit všechna spojení / přátelství jako fanoušky s právem pouze ke čtení";
-$a->strings["Public Forum"] = "";
-$a->strings["Automatically approve all contact requests"] = "";
-$a->strings["Automatic Friend Page"] = "Automatická stránka přítele";
-$a->strings["Automatically approve all connection/friend requests as friends"] = "Automaticky schvalovat všechny žádosti o spojení / přátelství jako přátele";
+$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ý 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";
+$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "Účet pro populární profil, který automaticky potvrzuje žádosti o přidání kontaktu jako \"Přátele\".";
 $a->strings["Private Forum [Experimental]"] = "Soukromé fórum [Experimentální]";
-$a->strings["Private forum - approved members only"] = "Soukromé fórum - pouze pro schválené členy";
+$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["Publish your default profile in your local site directory?"] = "Publikovat Váš výchozí profil v místním adresáři webu?";
+$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\">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["Hide your contact/friend list from viewers of your default profile?"] = "Skrýt Vaše kontaktní údaje a seznam přátel před návštěvníky ve Vašem výchozím profilu?";
-$a->strings["If enabled, posting public messages to Diaspora and other networks isn't possible."] = "Pokud je povoleno, není možné zasílání veřejných příspěvků do Diaspory a dalších sítí.";
+$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ý.";
+$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Skrýt Váš seznam kontaktů/přátel před návštěvníky Vašeho výchozího profilu?";
+$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"] = "Váš seznam kontaktů nebude zobrazen na Vaší výchozí profilové stránce. Můžete se rozhodnout, jestli chcete zobrazit Váš seznam kontaktů zvlášť pro každý další profil, který si vytvoříte.";
+$a->strings["Hide your profile details from anonymous viewers?"] = "Skrýt Vaše profilové detaily před anonymními návštěvníky?";
+$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."] = "Anonymní návštěvníci mohou pouze vidět Váš profilový obrázek, zobrazované jméno a přezdívku, kterou používáte na Vaší profilové stránce. Vaše veřejné příspěvky a odpovědi budou stále dostupné jinými způsoby.";
 $a->strings["Allow friends to post to your profile page?"] = "Povolit přátelům umisťování příspěvků na vaši profilovou stránku?";
+$a->strings["Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"] = "Vaše kontakty mohou psát příspěvky na Vaši profilovou zeď. Tyto příspěvky budou přeposílány Vašim kontaktům.";
 $a->strings["Allow friends to tag your posts?"] = "Povolit přátelům označovat Vaše příspěvky?";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Chcete nám povolit abychom vás navrhovali jako přátelé pro nové členy?";
+$a->strings["Your contacts can add additional tags to your posts."] = "Vaše kontakty mohou přidávat k Vašim příspěvkům dodatečné štítky.";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Povolit, abychom vás navrhovali jako přátelé pro nové členy?";
+$a->strings["If you like, Friendica may suggest new members to add you as a contact."] = "Pokud budete chtít, může Friendica nabízet novým členům, aby si Vás přidali jako kontakt.";
 $a->strings["Permit unknown people to send you private mail?"] = "Povolit neznámým lidem Vám zasílat soukromé zprávy?";
+$a->strings["Friendica network users may send you private messages even if they are not in your contact list."] = "Uživatelé sítě Friendica Vám mohou posílat soukromé zprávy, i pokud nejsou ve Vašich kontaktech.";
 $a->strings["Profile is <strong>not published</strong>."] = "Profil <strong>není zveřejněn</strong>.";
-$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "Vaše Identity adresa je <strong>\"%s\"</strong> nebo \"%s\".";
+$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "Vaše adresa identity je <strong>\"%s\"</strong> nebo \"%s\".";
 $a->strings["Automatically expire posts after this many days:"] = "Automaticky expirovat příspěvky po zadaném počtu dní:";
 $a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Pokud je prázdné, příspěvky nebudou nikdy expirovat. Expirované příspěvky budou vymazány";
 $a->strings["Advanced expiration settings"] = "Pokročilé nastavení expirací";
@@ -1407,181 +655,539 @@ $a->strings["Advanced Expiration"] = "Nastavení expirací";
 $a->strings["Expire posts:"] = "Expirovat příspěvky:";
 $a->strings["Expire personal notes:"] = "Expirovat osobní poznámky:";
 $a->strings["Expire starred posts:"] = "Expirovat příspěvky s hvězdou:";
-$a->strings["Expire photos:"] = "Expirovat fotografie:";
-$a->strings["Only expire posts by others:"] = "Přízpěvky expirovat pouze ostatními:";
+$a->strings["Expire photos:"] = "Expirovat fotky:";
+$a->strings["Only expire posts by others:"] = "Příspěvky expirovat pouze ostatními:";
 $a->strings["Account Settings"] = "Nastavení účtu";
 $a->strings["Password Settings"] = "Nastavení hesla";
+$a->strings["New Password:"] = "Nové heslo:";
+$a->strings["Confirm:"] = "Potvrďte:";
 $a->strings["Leave password fields blank unless changing"] = "Pokud nechcete změnit heslo, položku hesla nevyplňujte";
 $a->strings["Current Password:"] = "Stávající heslo:";
 $a->strings["Your current password to confirm the changes"] = "Vaše stávající heslo k potvrzení změn";
 $a->strings["Password:"] = "Heslo: ";
 $a->strings["Basic Settings"] = "Základní nastavení";
+$a->strings["Full Name:"] = "Celé jméno:";
 $a->strings["Email Address:"] = "E-mailová adresa:";
 $a->strings["Your Timezone:"] = "Vaše časové pásmo:";
-$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:"] = "Výchozí umístění příspěvků:";
-$a->strings["Use Browser Location:"] = "Používat umístění dle prohlížeče:";
+$a->strings["Your Language:"] = "Váš jazyk:";
+$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "Nastavte jazyk, který máme používat pro rozhraní Friendica a pro posílání e-mailů";
+$a->strings["Default Post Location:"] = "Výchozí poloha příspěvků:";
+$a->strings["Use Browser Location:"] = "Používat polohu dle prohlížeče:";
 $a->strings["Security and Privacy Settings"] = "Nastavení zabezpečení a soukromí";
 $a->strings["Maximum Friend Requests/Day:"] = "Maximální počet žádostí o přátelství za den:";
-$a->strings["(to prevent spam abuse)"] = "(Aby se zabránilo spamu)";
+$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";
 $a->strings["Default Public Post"] = "Výchozí Veřejný příspěvek";
 $a->strings["Default Permissions for New Posts"] = "Výchozí oprávnění pro nové příspěvky";
-$a->strings["Maximum private messages per day from unknown people:"] = "Maximum soukromých zpráv od neznámých lidí:";
-$a->strings["Notification Settings"] = "Nastavení notifikací";
-$a->strings["By default post a status message when:"] = "Defaultně posílat statusové zprávy když:";
-$a->strings["accepting a friend request"] = "akceptuji požadavek na přátelství";
-$a->strings["joining a forum/community"] = "připojující se k fóru/komunitě";
-$a->strings["making an <em>interesting</em> profile change"] = "provedení <em>zajímavé</em> profilové změny";
-$a->strings["Send a notification email when:"] = "Poslat notifikaci e-mailem, když";
-$a->strings["You receive an introduction"] = "obdržíte žádost o propojení";
-$a->strings["Your introductions are confirmed"] = "Vaše žádosti jsou potvrzeny";
-$a->strings["Someone writes on your profile wall"] = "někdo Vám napíše na Vaši profilovou stránku";
-$a->strings["Someone writes a followup comment"] = "někdo Vám napíše následný komentář";
+$a->strings["Maximum private messages per day from unknown people:"] = "Maximum soukromých zpráv od neznámých lidí za den:";
+$a->strings["Notification Settings"] = "Nastavení oznámení";
+$a->strings["Send a notification email when:"] = "Poslat oznámení e-mailem, když:";
+$a->strings["You receive an introduction"] = "obdržíte představení";
+$a->strings["Your introductions are confirmed"] = "jsou Vaše představení potvrzena";
+$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žel jste 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"] = "Byl Jste šťouchnout v příspěvku";
-$a->strings["Activate desktop notifications"] = "Aktivovat upozornění na desktopu";
-$a->strings["Show desktop popup on new notifications"] = "Zobrazit dektopové zprávy nových upozornění.";
+$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í";
+$a->strings["Show desktop popup on new notifications"] = "Zobrazit desktopové zprávy při nových oznámeních.";
 $a->strings["Text-only notification emails"] = "Pouze textové notifikační e-maily";
 $a->strings["Send text only notification emails, without the html part"] = "Posílat pouze textové notifikační e-maily, bez html části.";
+$a->strings["Show detailled notifications"] = "Zobrazit detailní oznámení";
+$a->strings["Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed."] = "Ve výchozím nastavení jsou oznámení zhuštěné na jediné oznámení pro každou položku. Pokud je toto povolené, budou zobrazována všechna oznámení.";
 $a->strings["Advanced Account/Page Type Settings"] = "Pokročilé nastavení účtu/stránky";
 $a->strings["Change the behaviour of this account for special situations"] = "Změnit chování tohoto účtu ve speciálních situacích";
-$a->strings["Relocate"] = "Změna umístění";
-$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."] = "Pokud jste přemístil tento profil z jiného serveru a nějaký z vašich kontaktů nedostává Vaše aktualizace, zkuste stisknout toto tlačítko.";
-$a->strings["Resend relocate message to contacts"] = "Znovu odeslat správu o změně umístění Vašim kontaktům";
-$a->strings["Do you really want to delete this video?"] = "Opravdu chcete smazat toto video?";
-$a->strings["Delete Video"] = "Odstranit video";
-$a->strings["No videos selected"] = "Není vybráno žádné video";
-$a->strings["Recent Videos"] = "Aktuální Videa";
-$a->strings["Upload New Videos"] = "Nahrát nová videa";
+$a->strings["Relocate"] = "Přemístit";
+$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."] = "Pokud jste přemístil/a tento profil z jiného serveru a nějaký z vašich kontaktů nedostává Vaše aktualizace, zkuste stisknout toto tlačítko.";
+$a->strings["Resend relocate message to contacts"] = "Znovu odeslat správu o přemístění Vašim kontaktům";
+$a->strings["{0} wants to be your friend"] = "{0} chce být Vaším přítelem";
+$a->strings["{0} sent you a message"] = "{0} vám poslal/a zprávu";
+$a->strings["{0} requested registration"] = "{0} požaduje registraci";
+$a->strings["Remove term"] = "Odstranit termín";
+$a->strings["Saved Searches"] = "Uložená hledání";
+$a->strings["Only logged in users are permitted to perform a search."] = "Pouze přihlášení uživatelé mohou prohledávat tento server.";
+$a->strings["Too Many Requests"] = "Příliš mnoho požadavků";
+$a->strings["Only one search per minute is permitted for not logged in users."] = "Nepřihlášení uživatelé mohou vyhledávat pouze jednou za minutu.";
+$a->strings["No results."] = "Žádné výsledky.";
+$a->strings["Items tagged with: %s"] = "Položky označené štítkem: %s";
+$a->strings["Results for: %s"] = "Výsledky pro: %s";
+$a->strings["No contacts in common."] = "Žádné společné kontakty.";
+$a->strings["Common Friends"] = "Společní přátelé";
+$a->strings["Login"] = "Přihlásit se";
+$a->strings["The post was created"] = "Příspěvek byl vytvořen";
+$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 č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.";
+$a->strings["No such group"] = "Žádná taková skupina";
+$a->strings["Group is empty"] = "Skupina je prázdná";
+$a->strings["Group: %s"] = "Skupina: %s";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "Soukromé zprávy této osobě jsou vystaveny riziku prozrazení.";
+$a->strings["Invalid contact."] = "Neplatný kontakt.";
+$a->strings["Commented Order"] = "Dle komentářů";
+$a->strings["Sort by Comment Date"] = "Řadit podle data komentáře";
+$a->strings["Posted Order"] = "Dle data";
+$a->strings["Sort by Post Date"] = "Řadit podle data příspěvku";
+$a->strings["Personal"] = "Osobní";
+$a->strings["Posts that mention or involve you"] = "Příspěvky, které Vás zmiňují nebo zahrnují";
+$a->strings["New"] = "Nové";
+$a->strings["Activity Stream - by date"] = "Proud aktivit - dle data";
+$a->strings["Shared Links"] = "Sdílené odkazy";
+$a->strings["Interesting Links"] = "Zajímavé odkazy";
+$a->strings["Starred"] = "S hvězdičkou";
+$a->strings["Favourite Posts"] = "Oblíbené přízpěvky";
+$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["Filter"] = "Filtr";
+$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. ";
+$a->strings["Unable to remove group."] = "Nelze odstranit skupinu.";
+$a->strings["Delete Group"] = "Odstranit skupinu";
+$a->strings["Edit Group Name"] = "Upravit název skupiny";
+$a->strings["Members"] = "Členové";
+$a->strings["All Contacts"] = "Všechny kontakty";
+$a->strings["Remove contact from group"] = "Odebrat kontakt ze skupiny";
+$a->strings["Click on a contact to add or remove."] = "Klikněte na kontakt pro přidání nebo odebrání";
+$a->strings["Add contact to group"] = "Přidat kontakt ke skupině";
+$a->strings["Parent user not found."] = "Rodičovský uživatel nenalezen.";
+$a->strings["No parent user"] = "Žádný rodičovský uživatel";
+$a->strings["Parent Password:"] = "Rodičovské heslo:";
+$a->strings["Please enter the password of the parent account to legitimize your request."] = "Prosím vložte heslo rodičovského účtu k legitimizaci Vašeho požadavku.";
+$a->strings["Parent User"] = "Rodičovský uživatel";
+$a->strings["Parent users have total control about this account, including the account settings. Please double check whom you give this access."] = "Rodičovští uživatelé mají naprostou kontrolu nad tímto účtem, včetně nastavení účtu. Prosím překontrolujte, komu tento přístup dáváte.";
+$a->strings["Delegate Page Management"] = "Správa delegátů stránky";
+$a->strings["Delegates"] = "Delegáti";
+$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."] = "Delegáti jsou schopni řídit všechny aspekty tohoto účtu/stránky, kromě základních nastavení účtu. Prosím, nedelegujte svůj osobní účet nikomu, komu zcela nedůvěřujete.";
+$a->strings["Existing Page Delegates"] = "Stávající delegáti stránky ";
+$a->strings["Potential Delegates"] = "Potenciální delegáti";
+$a->strings["Remove"] = "Odstranit";
+$a->strings["Add"] = "Přidat";
+$a->strings["No entries."] = "Žádné záznamy.";
+$a->strings["Export account"] = "Exportovat účet";
+$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."] = "Exportujte svůj účet a své kontakty. Použijte tuto funkci pro vytvoření  zálohy svého účtu a/nebo k přesunu na jiný server.";
+$a->strings["Export all"] = "Exportovat vše";
+$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)"] = "Exportujte své informace o účtu, kontakty a všechny své položky jako JSON. To může být velmi velký soubor a může to zabrat spoustu času. Tuto funkci použijte pro úplnou zálohu svého účtu (fotky se neexportují)";
+$a->strings["Resubscribing to OStatus contacts"] = "Znovu Vás registruji ke kontaktům OStatus";
+$a->strings["Error"] = "Chyba";
+$a->strings["Done"] = "Hotovo";
+$a->strings["Keep this window open until done."] = "Toto okno nechte otevřené až do konce.";
+$a->strings["Access denied."] = "Přístup odmítnut.";
+$a->strings["No contacts."] = "Žádné kontakty.";
+$a->strings["Visit %s's profile [%s]"] = "Navštivte profil uživatele %s [%s]";
+$a->strings["Contact wasn't found or can't be unfollowed."] = "Kontakt nebyl nalezen, nebo u něj nemůže být zrušeno sledování.";
+$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 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 - 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.";
+$a->strings["Your registration is pending approval by the site owner."] = "Vaše registrace čeká na schválení vlastníkem serveru.";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to  zítra znovu.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Tento formulář můžete (volitelně) vyplnit s pomocí OpenID tím, že vyplníte své OpenID a kliknutete na tlačítko \"Zaregistrovat\".";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Pokud nepoužíváte OpenID, nechte prosím toto pole prázdné a vyplňte zbylé položky.";
+$a->strings["Your OpenID (optional): "] = "Vaše OpenID (nepovinné): ";
+$a->strings["Include your profile in member directory?"] = "Chcete zahrnout Váš profil v adresáři členů?";
+$a->strings["Note for the admin"] = "Poznámka pro administrátora";
+$a->strings["Leave a message for the admin, why you want to join this node"] = "Zanechejte administrátorovi zprávu, proč se k tomuto serveru chcete připojit";
+$a->strings["Membership on this site is by invitation only."] = "Členství na tomto webu je pouze na pozvání.";
+$a->strings["Your invitation code: "] = "Váš kód pozvánky: ";
+$a->strings["Registration"] = "Registrace";
+$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Celé jméno (např. Jan Novák, skutečné či skutečně vypadající):";
+$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Vaše e-mailová adresa: (Budou sem poslány počáteční informace, musí to proto být existující adresa.)";
+$a->strings["Leave empty for an auto generated password."] = "Ponechte prázdné pro automatické vygenerovaní hesla.";
+$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>'."] = "Vyberte si přezdívku pro Váš profil. Musí začínat textovým znakem. Vaše profilová adresa na této stránce bude mít tvar \"<strong>přezdívka@%s</strong>\".";
+$a->strings["Choose a nickname: "] = "Vyberte přezdívku:";
+$a->strings["Register"] = "Registrovat";
+$a->strings["Import"] = "Import";
+$a->strings["Import your profile to this friendica instance"] = "Importovat Váš profil do této instance Friendica";
+$a->strings["Terms of Service"] = "Podmínky používání";
+$a->strings["Note: This node explicitly contains adult content"] = "Poznámka: Tento server explicitně obsahuje obsah pro dospělé";
+$a->strings["Invalid request identifier."] = "Neplatný identifikátor požadavku.";
+$a->strings["Discard"] = "Odstranit";
+$a->strings["Ignore"] = "Ignorovat";
+$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";
+$a->strings["Notification type:"] = "Typ oznámení:";
+$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í: ";
+$a->strings["yes"] = "ano";
+$a->strings["no"] = "ne";
+$a->strings["Shall your connection be bidirectional or not?"] = "Má Vaše spojení být obousměrné, nebo ne?";
+$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."] = "Přijetí uživatele %s jako přítele dovolí uživateli %s odebírat Vaše příspěvky a Vy budete také přijímat aktualizace od něj ve Vašem kanále.";
+$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."] = "Přijetí uživatele %s jako odběratele mu dovolí odebírat Vaše příspěvky, ale nebudete od něj přijímat aktualizace ve Vašem kanále.";
+$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."] = "Přijetí uživatele %s jako sdílejícího mu dovolí odebírat Vaše příspěvky, ale nebudete od něj přijímat aktualizace ve Vašem kanále.";
+$a->strings["Friend"] = "Přítel";
+$a->strings["Sharer"] = "Sdílející";
+$a->strings["Subscriber"] = "Odběratel";
+$a->strings["Tags:"] = "Štítky:";
+$a->strings["Network:"] = "Síť:";
+$a->strings["No introductions."] = "Žádné představení.";
+$a->strings["Show unread"] = "Zobrazit nepřečtené";
+$a->strings["Show all"] = "Zobrazit vše";
+$a->strings["No more %s notifications."] = "Žádná další %s oznámení";
+$a->strings["New Message"] = "Nová zpráva";
+$a->strings["Unable to locate contact information."] = "Nepodařilo se najít kontaktní informace.";
+$a->strings["Do you really want to delete this message?"] = "Opravdu chcete smazat tuto zprávu?";
+$a->strings["Message deleted."] = "Zpráva odstraněna.";
+$a->strings["Conversation removed."] = "Konverzace odstraněna.";
+$a->strings["No messages."] = "Žádné zprávy.";
+$a->strings["Message not available."] = "Zpráva není k dispozici.";
+$a->strings["Delete message"] = "Smazat zprávu";
+$a->strings["D, d M Y - g:i A"] = "D d. M Y - g:i A";
+$a->strings["Delete conversation"] = "Odstranit konverzaci";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Není k dispozici zabezpečená komunikace. <strong>Možná</strong> budete schopni reagovat z odesilatelovy profilové stránky.";
+$a->strings["Send Reply"] = "Poslat odpověď";
+$a->strings["Unknown sender - %s"] = "Neznámý odesilatel - %s";
+$a->strings["You and %s"] = "Vy a %s";
+$a->strings["%s and You"] = "%s a Vy";
+$a->strings["%d message"] = [
+	0 => "%d zpráva",
+	1 => "%d zprávy",
+	2 => "%d zprávy",
+	3 => "%d zpráv",
+];
+$a->strings["No profile"] = "Žádný profil";
+$a->strings["Subscribing to OStatus contacts"] = "Registruji Vás ke kontaktům OStatus";
+$a->strings["No contact provided."] = "Nebyl poskytnut žádný kontakt.";
+$a->strings["Couldn't fetch information for contact."] = "Nelze načíst informace pro kontakt.";
+$a->strings["Couldn't fetch friends for contact."] = "Nelze načíst přátele pro kontakt.";
+$a->strings["success"] = "úspěch";
+$a->strings["failed"] = "selhalo";
+$a->strings["ignored"] = "ignorován";
+$a->strings["%1\$s welcomes %2\$s"] = "%1\$s vítá uživatele %2\$s";
+$a->strings["User deleted their account"] = "Uživatel si smazal účet";
+$a->strings["On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups."] = "Uživatel na vašem serveru Friendica smazal svůj účet. Prosím ujistěte se, ře jsou jeho data odstraněna ze záloh dat.";
+$a->strings["The user id is %d"] = "Uživatelské ID je %d";
+$a->strings["Remove My Account"] = "Odstranit můj účet";
+$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Tímto bude kompletně odstraněn váš účet. Jakmile bude účet odstraněn, nebude už možné ho obnovit.";
+$a->strings["Please enter your password for verification:"] = "Prosím, zadejte své heslo pro ověření:";
+$a->strings["Tag removed"] = "Štítek odstraněn";
+$a->strings["Remove Item Tag"] = "Odebrat štítek položky";
+$a->strings["Select a tag to remove: "] = "Vyberte štítek k odebrání: ";
+$a->strings["Welcome to %s"] = "Vítejte na %s";
+$a->strings["Do you really want to delete this suggestion?"] = "Opravdu chcete smazat tento návrh?";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Nejsou dostupné žádné návrhy. Pokud je toto nový server, zkuste to znovu za 24 hodin.";
+$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 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:";
+$a->strings["No installed addons/apps"] = "Žádne nainstalované doplňky/aplikace";
+$a->strings["Read about the <a href=\"%1\$s/tos\">Terms of Service</a> of this node."] = "Přečtěte si o <a href=\"%1\$s/tos\">Podmínkách používání</a> tohoto serveru.";
+$a->strings["On this server the following remote servers are blocked."] = "Na tomto serveru jsou zablokovány následující vzdálené servery.";
+$a->strings["Blocked domain"] = "Zablokovaná doména";
+$a->strings["Reason for the block"] = "Důvody pro zablokování";
+$a->strings["Access to this profile has been restricted."] = "Přístup na tento profil byl omezen.";
 $a->strings["Invalid request."] = "Neplatný požadavek.";
-$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Omlouváme se, možná je Váš soubor větší než je povolené maximum dle nastavení PHP";
-$a->strings["Or - did you try to upload an empty file?"] = "Nebo - nenahrával jste prázdný soubor?";
-$a->strings["File exceeds size limit of %s"] = "Velikost souboru přesáhla limit %s";
-$a->strings["File upload failed."] = "Nahrání souboru se nezdařilo.";
-$a->strings["Theme settings updated."] = "Nastavení téma zobrazení bylo aktualizováno.";
+$a->strings["Image exceeds size limit of %s"] = "Velikost obrázku překročila limit %s";
+$a->strings["Unable to process image."] = "Obrázek není možné zprocesovat";
+$a->strings["Wall Photos"] = "Fotky na zdi";
+$a->strings["Image upload failed."] = "Nahrání obrázku selhalo.";
+$a->strings["Welcome to Friendica"] = "Vítejte na Friendica";
+$a->strings["New Member Checklist"] = "Seznam doporučení pro nového člena";
+$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."] = "Rádi bychom Vám nabídli několik tipů a odkazů, abychom Vám zpříjemnili zážitek. Kliknutím na jakoukoliv položku zobrazíte relevantní stránku. Odkaz na tuto stránku bude viditelný z Vaší domovské stránky po dobu dvou týdnů od Vaší první registrace a poté tiše zmizí.";
+$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 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í.";
+$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"] = "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>.";
+$a->strings["Go to Your Site's Directory"] = "Navštivte adresář Vaší stránky";
+$a->strings["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."] = "Stránka Adresář Vám pomůže najít další lidi na tomto serveru nebo v jiných propojených serverech. Najděte na jejich stránce odkaz <em>Spojit</em> nebo <em>Sledovat</em>. Uveďte svou vlastní adresu identity, je-li požadována.";
+$a->strings["Finding New People"] = "Nalezení nových lidí";
+$a->strings["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."] = "Na bočním panelu stránky s kontakty je několik nástrojů k nalezení nových přátel. Porovnáme lidi dle zájmů, najdeme lidi podle jména nebo zájmu a poskytneme Vám návrhy založené na přátelství v síti přátel. Na zcela novém serveru se návrhy přátelství nabínou obvykle během 24 hodin.";
+$a->strings["Groups"] = "Skupiny";
+$a->strings["Group Your Contacts"] = "Seskupte si své kontakty";
+$a->strings["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."] = "Jakmile získáte nějaké přátele, uspořádejte si je do soukromých konverzačních skupin na postranním panelu Vaší stránky Kontakty a pak můžete komunikovat s každou touto skupinu soukromě prostřednictvím stránky Síť.";
+$a->strings["Why Aren't My Posts Public?"] = "Proč nejsou mé příspěvky veřejné?";
+$a->strings["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."] = "Friendica respektuje Vaše soukromí. Ve výchozím stavu jsou Vaše příspěvky viditelné pouze lidem, které označíte jako Vaše přátelé. Více informací naleznete v nápovědě na výše uvedeném odkazu";
+$a->strings["Getting Help"] = "Získání nápovědy";
+$a->strings["Go to the Help Section"] = "Navštivte sekci nápovědy";
+$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Na stránkách <strong>Nápověda</strong> naleznete nejen další podrobnosti o všech funkcích Friendika ale také další zdroje informací.";
+$a->strings["No valid account found."] = "Nenalezen žádný platný účet.";
+$a->strings["Password reset request issued. Check your email."] = "Žádost o obnovení hesla vyřízena. Zkontrolujte Vaši e-mailovou schránku.";
+$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."] = "\n\t\tVážený/á %1\$s,\n\t\t\tPřed nedávnem jsme obdrželi na \"%2\$s\" požadavek o obnovení\n\t\thesla k Vašemu účtu. Pro potvrzení tohoto požadavku, prosím klikněte na odkaz\n\t\tpro ověření dole, nebo ho zkopírujte do adresního řádku Vašeho prohlížeče.\n\n\t\tPokud jste o tuto změnu NEPOŽÁDAL/A, prosím NEKLIKEJTE na tento odkaz\n\t\ta ignorujte a/nebo smažte tento e-mail. Platnost požadavku brzy vyprší.\n\n\t\tVaše heslo nebude změněno, dokud nedokážeme ověřit, že jste tento\n\t\tpožadavek nevydal/a Vy.";
+$a->strings["\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"] = "\n\t\tKlikněte na tento odkaz brzy pro ověření vaší identity:\n\n\t\t%1\$s\n\n\t\tObdržíte poté následnou zprávu obsahující nové heslo.\n\t\tPo přihlášení můžete toto heslo změnit na stránce nastavení Vašeho účtu.\n\n\t\tZde jsou vaše přihlašovací detaily:\n\n\t\tAdresa stránky:\t\t%2\$s\n\t\tPřihlašovací jméno:\t%3\$s";
+$a->strings["Password reset requested at %s"] = "Na %s bylo zažádáno o obnovení hesla";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Žádost nemohla být ověřena. (Možná jste ji odeslal/a již dříve.) Obnovení hesla se nezdařilo.";
+$a->strings["Request has expired, please make a new one."] = "Platnost požadavku vypršela, prosím vytvořte nový.";
+$a->strings["Forgot your Password?"] = "Zapomněl/a jste heslo?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Zadejte svůj e-mailovou adresu a odešlete pro obnovení Vašeho hesla. Poté zkontrolujte svůj e-mail pro další instrukce.";
+$a->strings["Nickname or Email: "] = "Přezdívka nebo e-mail: ";
+$a->strings["Reset"] = "Obnovit";
+$a->strings["Password Reset"] = "Obnovit heslo";
+$a->strings["Your password has been reset as requested."] = "Vaše heslo bylo na Vaše přání obnoveno.";
+$a->strings["Your new password is"] = "Někdo Vám napsal na Vaši profilovou stránku";
+$a->strings["Save or copy your new password - and then"] = "Uložte si nebo zkopírujte nové heslo - a pak";
+$a->strings["click here to login"] = "klikněte zde pro přihlášení";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Nezdá se, že by to bylo Vaše celé jméno (křestní jméno a příjmení).";
+$a->strings["\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"] = "\n\t\t\tVážený/á %1\$s,\n\t\t\t\tVaše heslo bylo změněno, jak jste požádal/a. Prosím uchovejte\n\t\t\ttyto informace pro vaše záznamy (nebo si ihned změňte heslo na něco,\n\t\t\tco si zapamatujete).\n\t\t";
+$a->strings["\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"] = "\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\tToto heslo si po přihlášení můžete změnit na stránce nastavení Vašeho účtu.\n\t\t";
+$a->strings["Your password has been changed at %s"] = "Vaše heslo bylo změněno na %s";
+$a->strings["Source input"] = "Zdrojový vstup";
+$a->strings["BBCode::toPlaintext"] = "BBCode::toPlaintext";
+$a->strings["BBCode::convert (raw HTML)"] = "BBCode::convert (raw HTML)";
+$a->strings["BBCode::convert"] = "BBCode::convert";
+$a->strings["BBCode::convert => HTML::toBBCode"] = "BBCode::convert => HTML::toBBCode";
+$a->strings["BBCode::toMarkdown"] = "BBCode::toMarkdown";
+$a->strings["BBCode::toMarkdown => Markdown::convert"] = "BBCode::toMarkdown => Markdown::convert";
+$a->strings["BBCode::toMarkdown => Markdown::toBBCode"] = "BBCode::toMarkdown => Markdown::toBBCode";
+$a->strings["BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"] = "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode";
+$a->strings["Source input \\x28Diaspora format\\x29"] = "Zdrojový vstup \\x28Formát Diaspora\\x29";
+$a->strings["Markdown::toBBCode"] = "Markdown::toBBCode";
+$a->strings["Raw HTML input"] = "Hrubý HTML vstup";
+$a->strings["HTML Input"] = "HTML vstup";
+$a->strings["HTML::toBBCode"] = "HTML::toBBCode";
+$a->strings["HTML::toPlaintext"] = "HTML::toPlaintext";
+$a->strings["Source text"] = "Zdrojový text";
+$a->strings["BBCode"] = "BBCode";
+$a->strings["Markdown"] = "Markdown";
+$a->strings["HTML"] = "HTML";
+$a->strings["Theme settings updated."] = "Nastavení motivu bylo aktualizováno.";
+$a->strings["Information"] = "Informace";
+$a->strings["Overview"] = "Přehled";
+$a->strings["Federation Statistics"] = "Statistiky Federation";
+$a->strings["Configuration"] = "Konfigurace";
 $a->strings["Site"] = "Web";
 $a->strings["Users"] = "Uživatelé";
-$a->strings["Themes"] = "Témata";
+$a->strings["Themes"] = "Motivy";
+$a->strings["Database"] = "Databáze";
 $a->strings["DB updates"] = "Aktualizace databáze";
-$a->strings["Inspect Queue"] = "Proskoumat frontu";
-$a->strings["Federation Statistics"] = "";
-$a->strings["Logs"] = "Logy";
-$a->strings["View Logs"] = "";
+$a->strings["Inspect Queue"] = "Prozkoumat frontu";
+$a->strings["Inspect worker Queue"] = "Prozkoumat frontu pro pracovníka";
+$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"] = "Záznamy";
+$a->strings["View Logs"] = "Zobrazit záznamy";
+$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";
-$a->strings["Plugin Features"] = "Funkčnosti rozšíření";
-$a->strings["diagnostics"] = "diagnostika";
-$a->strings["User registrations waiting for confirmation"] = "Registrace uživatele čeká na potvrzení";
-$a->strings["unknown"] = "";
-$a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "";
-$a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "";
+$a->strings["Admin"] = "Administrátor";
+$a->strings["Addon Features"] = "Vlastnosti doplňků";
+$a->strings["User registrations waiting for confirmation"] = "Registrace uživatelů čekající na potvrzení";
 $a->strings["Administration"] = "Administrace";
-$a->strings["Currently this node is aware of %d nodes from the following platforms:"] = "";
+$a->strings["Display Terms of Service"] = "Ukázat Podmínky používání";
+$a->strings["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."] = "Povolte stránku Podmínky používání. Pokud je toto povoleno, bude na formulář pro registrací a stránku s obecnými informacemi přidán odkaz k podmínkám.";
+$a->strings["Display Privacy Statement"] = "Zobrazit Prohlášení o soukromí";
+$a->strings["Show some informations regarding the needed information to operate the node according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."] = "Ukázat některé informace ohledně potřebných informací k provozování serveru podle například <a href=\"%s\" target=\"_blank\">Obecného nařízení o ochraně osobních údajů EU (GDPR)</a>";
+$a->strings["Privacy Statement Preview"] = "Náhled Prohlášení o soukromí";
+$a->strings["The Terms of Service"] = "Podmínky používání";
+$a->strings["Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below."] = "Zde zadejte Podmínky používání Vašeho serveru. Můžete používat BBCode. Záhlaví sekcí by měly být označeny [h2] a níže.";
+$a->strings["The blocked domain"] = "Zablokovaná doména";
+$a->strings["The reason why you blocked this domain."] = "Důvod, proč jste doménu zablokoval/a";
+$a->strings["Delete domain"] = "Smazat doménu";
+$a->strings["Check to delete this entry from the blocklist"] = "Zaškrtnutím odstraníte tuto položku z blokovacího seznamu";
+$a->strings["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."] = "Tato stránka může být použita k definici \"černé listiny\" serverů z federované sítě, kterým není dovoleno interagovat s vaším serverem. Měl/a byste také pro všechny zadané domény uvést důvod, proč jste vzdálený server zablokoval/a.";
+$a->strings["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."] = "Seznam zablokovaných server bude zveřejněn na stránce /friendica, takže vaši uživatelé a lidé vyšetřující probém s komunikací mohou důvod najít snadno.";
+$a->strings["Add new entry to block list"] = "Přidat na blokovací seznam novou položku";
+$a->strings["Server Domain"] = "Serverová doména";
+$a->strings["The domain of the new server to add to the block list. Do not include the protocol."] = "Doména serveru, který má být přidán na blokovací seznam. Vynechejte protokol (\"http://\").";
+$a->strings["Block reason"] = "Důvod zablokování";
+$a->strings["Add Entry"] = "Přidat položku";
+$a->strings["Save changes to the blocklist"] = "Uložit změny do blokovacího seznamu";
+$a->strings["Current Entries in the Blocklist"] = "Aktuální položky v bokovacím seznamu";
+$a->strings["Delete entry from blocklist"] = "Odstranit položku z blokovacího seznamu";
+$a->strings["Delete entry from blocklist?"] = "Odstranit položku z blokovacího seznamu?";
+$a->strings["Server added to blocklist."] = "Server přidán do blokovacího seznamu";
+$a->strings["Site blocklist updated."] = "Blokovací seznam stránky aktualizován";
+$a->strings["The contact has been blocked from the node"] = "Kontakt byl na serveru zablokován";
+$a->strings["Could not find any contact entry for this URL (%s)"] = "Nelze nalézt žádnou položku v kontaktech pro tuto URL adresu (%s)";
+$a->strings["%s contact unblocked"] = [
+	0 => "%s kontakt odblokován",
+	1 => "%s kontakty odblokovány",
+	2 => "%s kontaktu odblokováno",
+	3 => "%s kontaktů odblokováno",
+];
+$a->strings["Remote Contact Blocklist"] = "Blokované vzdálené kontakty";
+$a->strings["This page allows you to prevent any message from a remote contact to reach your node."] = "Tato stránka Vám umožňuje zabránit jakýmkoliv zprávám ze vzdáleného kontaktu, aby se k vašemu serveru dostaly.";
+$a->strings["Block Remote Contact"] = "Zablokovat vzdálený kontakt";
+$a->strings["select all"] = "Vybrat vše";
+$a->strings["select none"] = "nevybrat žádný";
+$a->strings["Block"] = "Blokovat";
+$a->strings["Unblock"] = "Odblokovat";
+$a->strings["No remote contact is blocked from this node."] = "Žádný vzdálený kontakt není na tomto serveru zablokován.";
+$a->strings["Blocked Remote Contacts"] = "Zablokovat vzdálené kontakty";
+$a->strings["Block New Remote Contact"] = "Zablokovat nový vzdálený kontakt";
+$a->strings["Photo"] = "Fotka";
+$a->strings["Address"] = "Adresa";
+$a->strings["%s total blocked contact"] = [
+	0 => "Celkem %s zablokovaný kontakt",
+	1 => "Celkem %s zablokované kontakty",
+	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í.";
+$a->strings["Delete this Item"] = "Smazat tuto položku";
+$a->strings["On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted."] = "Na této stránce můžete smazat položku z Vašeho serveru. Pokud je položkou příspěvek nejvyššího stupně, bude smazáno celé vlákno.";
+$a->strings["You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456."] = "Budete muset znát číslo GUID položky. Můžete jej najít např. v adrese URL. Poslední část adresy http://priklad.cz/display/123456 je GUID, v tomto případě 123456";
+$a->strings["GUID"] = "GUID";
+$a->strings["The GUID of the item you want to delete."] = "Číslo GUID položky, kterou chcete smazat";
+$a->strings["Item marked for deletion."] = "Položka označená ke smazání";
+$a->strings["unknown"] = "neznámé";
+$a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "Tato stránka vám nabízí pár čísel pro známou část federované sociální sítě, které je Váš server Friendica součástí. Tato čísla nejsou kompletní, ale pouze odrážejí část sítě, které si je Váš server vědom.";
+$a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "Funkce <em>Adresář automaticky objevených kontaktů</em> není zapnuta, zlepší zde zobrazená data.";
+$a->strings["Currently this node is aware of %d nodes with %d registered users from the following platforms:"] = "Aktuálně si je tento server vědom %d serverů s %d registrovanými uživateli z těchto platforem:";
 $a->strings["ID"] = "Identifikátor";
 $a->strings["Recipient Name"] = "Jméno příjemce";
 $a->strings["Recipient Profile"] = "Profil píjemce";
 $a->strings["Created"] = "Vytvořeno";
 $a->strings["Last Tried"] = "Naposled vyzkoušeno";
-$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["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 <tt>convert_innodb.sql</tt> in the <tt>/util</tt> directory of your Friendica installation.<br />"] = "";
-$a->strings["You are using a MySQL version which does not support all features that Friendica uses. You should consider switching to MariaDB."] = "";
+$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."] = "Na této stránce najdete obsah fronty odchozích příspěvků. Toto jsou příspěvky, u kterých počáteční doručení selhalo. Budou znovu poslány později, a pokud doručení selže trvale, budou nakonec smazány.";
+$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 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!";
+$a->strings["The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings."] = "Pracovník byl naposledy spuštěn v %s UTC. Toto je více než jedna hodina. Prosím zkontrolujte si nastavení crontab.";
+$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["Soapbox Account"] = "Soapbox účet";
-$a->strings["Community/Celebrity Account"] = "Komunitní účet / Účet celebrity";
-$a->strings["Automatic Friend Account"] = "Účet s automatickým schvalováním přátel";
-$a->strings["Blog Account"] = "Účet Blogu";
-$a->strings["Private Forum"] = "Soukromé fórum";
+$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é";
 $a->strings["Pending registrations"] = "Čekající registrace";
 $a->strings["Version"] = "Verze";
-$a->strings["Active plugins"] = "Aktivní pluginy";
-$a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] = "Nelze zpracovat výchozí url adresu. Musí obsahovat alespoň <schéma>://<doméma>";
-$a->strings["RINO2 needs mcrypt php extension to work."] = "";
+$a->strings["Active addons"] = "Aktivní doplňky";
+$a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] = "Nelze zpracovat výchozí url adresu. Musí obsahovat alespoň <scheme>://<domain>";
 $a->strings["Site settings updated."] = "Nastavení webu aktualizováno.";
+$a->strings["No community page for local users"] = "Žádná komunitní stránka pro lokální uživatele";
 $a->strings["No community page"] = "Komunitní stránka neexistuje";
 $a->strings["Public postings from users of this site"] = "Počet veřejných příspěvků od uživatele na této stránce";
-$a->strings["Global community page"] = "Globální komunitní stránka";
-$a->strings["Never"] = "Nikdy";
-$a->strings["At post arrival"] = "Při obdržení příspěvku";
+$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/fallback"] = "";
+$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";
 $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á";
-$a->strings["No SSL policy, links will track page SSL state"] = "Žádná SSL politika, odkazy budou následovat stránky SSL stav";
+$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"] = "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["Auto Discovered Contact Directory"] = "";
-$a->strings["Performance"] = "Výkonnost";
-$a->strings["Worker"] = "";
-$a->strings["Relocate - WARNING: advanced function. Could make this server unreachable."] = "Změna umístění - Varování: pokročilá funkčnost. Tímto můžete znepřístupnit server.";
+$a->strings["Advanced"] = "Pokročilé";
+$a->strings["Auto Discovered Contact Directory"] = "Adresář automaticky objevených kontaktů";
+$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["The email address your server shall use to send notification emails from."] = "";
+$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["Link to an icon that will be used for browsers."] = "";
+$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."] = "";
+$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/siteinfo."] = "";
+$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"] = "Grafická šablona systému ";
-$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Defaultní systémové téma - může být změněno v uživatelských profilech - <a href='#' id='cnftheme'> změnit  theme settings</a>";
-$a->strings["Mobile system theme"] = "Systémové téma zobrazení pro mobilní zařízení";
-$a->strings["Theme for mobile devices"] = "Téma zobrazení pro mobilní zařízení";
+$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í";
 $a->strings["SSL link policy"] = "Politika SSL odkazů";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "Určuje, zda-li budou generované odkazy používat SSL";
 $a->strings["Force SSL"] = "Vynutit SSL";
 $a->strings["Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops."] = "Vynutit SSL pro všechny ne-SSL žádosti - Upozornění: na některých systémech může dojít k nekonečnému zacyklení.";
-$a->strings["Old style 'Share'"] = "Sdílení \"postaru\"";
-$a->strings["Deactivates the bbcode element 'share' for repeating items."] = "Deaktivovat bbcode element \"share\" pro opakující se položky.";
-$a->strings["Hide help entry from navigation menu"] = "skrýt nápovědu z navigačního menu";
-$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Skryje menu ze stránek Nápověda z navigačního menu. Nápovědu můžete stále zobrazit přímo zadáním /help.";
+$a->strings["Hide help entry from navigation menu"] = "Skrýt nápovědu z navigačního menu";
+$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Skryje z navigačního menu položku pro stránky nápovědy. Nápovědu můžete stále zobrazit přímo zadáním /help.";
 $a->strings["Single user instance"] = "Jednouživatelská instance";
 $a->strings["Make this instance multi-user or single-user for the named user"] = "Nastavit tuto instanci víceuživatelskou nebo jednouživatelskou pro pojmenovaného uživatele";
 $a->strings["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 v bajtech nahraných obrázků. Defaultní je 0, což znamená neomezeno.";
+$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 v pixelech delší stránky nahrávaných obrázků. Defaultně je -1, což označuje bez limitu";
-$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]. Defaultní je 100, což znamená plnou kvalitu.";
+$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"] = "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."] = "Bude zřetelně zobrazeno na registrační stránce.";
-$a->strings["Accounts abandoned after x days"] = "Účet je opuštěn po x dnech";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Neztrácejte systémové zdroje kontaktováním externích webů s opuštěnými účty. Zadejte 0 pro žádný časový limit.";
+$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"] = "Úč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["Block public"] = "Blokovat veřejnost";
-$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Označemím přepínače zablokujete veřejný přístup ke všem jinak veřejně přístupným soukromým stránkám uživatelům, kteří nebudou přihlášeni.";
-$a->strings["Force publish"] = "Publikovat";
-$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Označením přepínače budou včechny profily na tomto webu uvedeny v adresáři webu.";
-$a->strings["Global directory URL"] = "";
-$a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "";
-$a->strings["Allow threaded items"] = "Povolit vícevláknové zpracování obsahu";
-$a->strings["Allow infinite level threading for items on this site."] = "Povolit zpracování obsahu tohoto webu neomezeným počtem paralelních vláken.";
+$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."] = "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";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Označením budou všechny profily na tomto serveru uvedeny v adresáři stránky.";
+$a->strings["Enabling this may violate privacy laws like the GDPR"] = "Povolení této funkce může porušit zákony o ochraně soukromí, jako je Obecné nařízení o ochraně osobních údajů (GDPR)";
+$a->strings["Global directory URL"] = "Adresa URL globálního adresáře";
+$a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "Adresa URL globálního adresáře. Pokud toto není nastaveno, globální adresář bude aplikaci naprosto nedostupný.";
 $a->strings["Private posts by default for new users"] = "Nastavit pro nové uživatele příspěvky jako soukromé";
 $a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Nastavit defaultní práva pro příspěvky od všech nových členů na výchozí soukromou skupinu raději než jako veřejné.";
 $a->strings["Don't include post content in email notifications"] = "Nezahrnovat obsah příspěvků v emailových upozorněních";
@@ -1589,109 +1195,117 @@ $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."] = "Nereplikovat lokální soukromé fotografie v příspěvcích s přidáním kopie obrázku. To znamená, že kontakty, které obdrží příspěvek obsahující soukromé fotografie se budou muset přihlásit 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 ";
 $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."] = "S tímto označením má každý uživatel možnost označit jakékoliv ze svých kontakt jako \"remote_self\" v nastavení v dialogu opravit kontakt. Tímto označením se budou zrcadlit všechny správy tohoto kontaktu v uživatelově proudu.";
 $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"] = "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["UTF-8 Regular expressions"] = "UTF-8 Regulární výrazy";
-$a->strings["Use PHP UTF8 regular expressions"] = "Použít PHP UTF8 regulární výrazy.";
-$a->strings["Community Page Style"] = "Styl komunitní stránky";
-$a->strings["Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."] = "Typ komunitní stránky k zobrazení. 'Glogální komunita' zobrazuje každý veřejný příspěvek z otevřené distribuované sítě, která dorazí na tento server.";
+$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.";
 $a->strings["Posts per user on community page"] = "Počet příspěvků na komunitní stránce";
 $a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "Maximální počet příspěvků na uživatele na komunitní sptránce. (neplatí pro 'Globální komunitu')";
-$a->strings["Enable OStatus support"] = "Zapnout podporu OStatus";
+$a->strings["Enable OStatus support"] = "Zapnout podporu pro OStatus";
 $a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Poskytnout zabudouvanou kompatibilitu s OStatus (StatusNet, GNU Social apod.). Veškerá komunikace s OStatus je veřejná, proto bude občas zobrazeno upozornění.";
-$a->strings["OStatus conversation completion interval"] = "Interval dokončení konverzace OStatus";
-$a->strings["How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."] = "Jak často by mělo probíhat ověřování pro nové přísvěvky v konverzacích OStatus? Toto může být velmi výkonově náročný úkol.";
-$a->strings["Only import OStatus threads from our contacts"] = "";
-$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."] = "";
-$a->strings["OStatus support can only be enabled if threading is enabled."] = "";
-$a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "";
-$a->strings["Enable Diaspora support"] = "Povolit podporu Diaspora";
+$a->strings["Only import OStatus threads from our contacts"] = "Pouze importovat vlákna z OStatus z našich kontaktů";
+$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"] = "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 Friendica kontakty";
+$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é.";
 $a->strings["Verify SSL"] = "Ověřit SSL";
 $a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Pokud si přejete, můžete vynutit striktní ověřování certifikátů. To znamená že se nebudete moci připojit k žádnému serveru s vlastním SSL certifikátem.";
 $a->strings["Proxy user"] = "Proxy uživatel";
 $a->strings["Proxy URL"] = "Proxy URL adresa";
-$a->strings["Network timeout"] = "čas síťového spojení vypršelo (timeout)";
+$a->strings["Network timeout"] = "Čas síťového spojení vypršel (timeout)";
 $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Hodnota ve vteřinách. Nastavte 0 pro neomezeno (není doporučeno).";
-$a->strings["Delivery interval"] = "Interval doručování";
-$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Prodleva mezi doručovacími procesy běžícími na pozadí snižuje zátěž systému. Doporučené nastavení: 4-5 pro sdílené instalace, 2-3 pro virtuální soukromé servery, 0-1 pro velké dedikované servery.";
-$a->strings["Poll interval"] = "Dotazovací interval";
-$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Tímto nastavením ovlivníte prodlení mezi aktualizačními procesy běžícími na pozadí, čímž můžete snížit systémovou zátěž. Pokud 0, použijte doručovací interval.";
 $a->strings["Maximum Load Average"] = "Maximální průměrné zatížení";
-$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximální zatížení systému před pozastavením procesů zajišťujících doručování aktualizací - defaultně 50";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximální zatížení systému před pozastavením procesů zajišťujících doručování aktualizací - výchozí hodnota 50";
 $a->strings["Maximum Load Average (Frontend)"] = "Maximální průměrné zatížení (Frontend)";
-$a->strings["Maximum system load before the frontend quits service - default 50."] = "Maximální zatížení systému předtím, než frontend ukončí službu - defaultně 50";
-$a->strings["Maximum table size for optimization"] = "";
-$a->strings["Maximum table size (in MB) for the automatic optimization - default 100 MB. Enter -1 to disable it."] = "";
-$a->strings["Minimum level of fragmentation"] = "";
-$a->strings["Minimum fragmenation level to start the automatic optimization - default value is 30%."] = "";
+$a->strings["Maximum system load before the frontend quits service - default 50."] = "Maximální zatížení systému předtím, než frontend ukončí službu - výchozí hodnota 50";
+$a->strings["Minimal Memory"] = "Minimální paměť";
+$a->strings["Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated)."] = "Minimální volná paměť v MB pro pracovníka. Potřebuje přístup do /proc/meminfo - výchozí hodnota 0 (deaktivováno)";
+$a->strings["Maximum table size for optimization"] = "Maximální velikost tabulky pro optimalizaci";
+$a->strings["Maximum table size (in MB) for the automatic optimization. Enter -1 to disable it."] = "Maximální velikost tabulky (v MB) pro automatickou optimalizaci. Zadáním -1 ji vypnete.";
+$a->strings["Minimum level of fragmentation"] = "Minimální úroveň fragmentace";
+$a->strings["Minimum fragmenation level to start the automatic optimization - default value is 30%."] = "Minimální úroveň fragmentace pro spuštění automatické optimalizace - výchozí hodnota je 30%.";
 $a->strings["Periodical check of global contacts"] = "Pravidelně ověřování globálních kontaktů";
-$a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "";
-$a->strings["Days between requery"] = "";
-$a->strings["Number of days after which a server is requeried for his contacts."] = "";
+$a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "Pokud je toto povoleno, budou globální kontakty pravidelně kontrolovány pro zastaralá data a životnost kontaktů a serverů.";
+$a->strings["Days between requery"] = "Dny mezi dotazy";
+$a->strings["Number of days after which a server is requeried for his contacts."] = "Počet dnů, po kterých je server znovu dotázán na své kontakty";
 $a->strings["Discover contacts from other servers"] = "Objevit kontakty z ostatních serverů";
-$a->strings["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'."] = "";
-$a->strings["Timeframe for fetching global contacts"] = "";
-$a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "";
+$a->strings["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'."] = "Periodicky dotazovat ostatní servery pro kontakty. Můžete si vybrat mezi možnostmi: \"uživatelé\" - uživatelé na vzdáleném systému, a \"globální kontakty\" - aktivní kontakty, které jsou známy na systému. Funkce fallback je určena pro servery Redmatrix a starší servery Friendica, kde globální kontakty nejsou dostupné. Fallback zvyšuje serverovou zátěž, doporučené nastavení je proto \"Uživatelé, globální kontakty\".";
+$a->strings["Timeframe for fetching global contacts"] = "Časový rámec pro načítání globálních kontaktů";
+$a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "Pokud je aktivováno objevování, tato hodnota definuje časový rámec pro aktivitu globálních kontaktů, které jsou načteny z jiných serverů.";
 $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."] = "";
+$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."] = "";
-$a->strings["Use MySQL full text engine"] = "Použít fulltextový vyhledávací stroj MySQL";
-$a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "Aktivuje fulltextový vyhledávací stroj. Zrychluje vyhledávání ale pouze pro vyhledávání čtyř a více znaků";
-$a->strings["Suppress Language"] = "Potlačit Jazyk";
-$a->strings["Suppress language information in meta information about a posting."] = "Potlačit jazykové informace v meta informacích o příspěvcích";
+$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";
-$a->strings["Suppress showing a list of hashtags at the end of the posting."] = "Potlačit zobrazení listu hastagů na konci zprávy.";
-$a->strings["Path to item cache"] = "Cesta k položkám vyrovnávací paměti";
-$a->strings["The item caches buffers generated bbcode and external images."] = "";
+$a->strings["Suppress showing a list of hashtags at the end of the posting."] = "Potlačit zobrazení seznamu hastagů na konci příspěvků.";
+$a->strings["Clean database"] = "Vyčistit databázi";
+$a->strings["Remove old remote items, orphaned database records and old content from some other helper tables."] = "Odstranit staré vzdálené položky, osiřelé záznamy v databázi a starý obsah z některých dalších pomocných tabulek.";
+$a->strings["Lifespan of remote items"] = "Životnost vzdálených položek";
+$a->strings["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."] = "Pokud je zapnuto čištění databáze, tato funkce definuje počet dnů, po kterých budou smazány vzdálené položky. Vlastní položky a označené či vyplněné položky jsou vždy ponechány. Hodnota 0 tuto funkci vypíná.";
+$a->strings["Lifespan of unclaimed items"] = "Životnost nevyžádaných položek";
+$a->strings["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."] = "Pokud je zapnuto čištění databáze, tato funkce definuje počet dnů, po kterých budou smazány nevyžádané vzdálené položky (většinou obsah z přeposílacího serveru). Výchozí hodnota je 90 dní. Pokud je zadaná hodnota 0, výchozí hodnotou bude obecná hodnota životnosti vzdálených položek.";
+$a->strings["Path to item cache"] = "Cesta k položkám v mezipaměti";
+$a->strings["The item caches buffers generated bbcode and external images."] = "V mezipaměti je uložen vygenerovaný BBCode a externí obrázky.";
 $a->strings["Cache duration in seconds"] = "Doba platnosti vyrovnávací paměti v sekundách";
 $a->strings["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."] = "Jak dlouho by měla vyrovnávací paměť držet data? Výchozí hodnota je 86400 sekund (Jeden den). Pro vypnutí funkce vyrovnávací paměti nastavte hodnotu na -1.";
 $a->strings["Maximum numbers of comments per post"] = "Maximální počet komentářů k příspěvku";
-$a->strings["How much comments should be shown for each post? Default value is 100."] = "Kolik komentářů by mělo být zobrazeno k každému příspěvku? Defaultní hodnota je 100.";
-$a->strings["Path for lock file"] = "Cesta k souboru zámku";
-$a->strings["The lock file is used to avoid multiple pollers at one time. Only define a folder here."] = "";
+$a->strings["How much comments should be shown for each post? Default value is 100."] = "Kolik komentářů by mělo být zobrazeno k každému příspěvku? Výchozí hodnotou je 100.";
 $a->strings["Temp path"] = "Cesta k dočasným souborům";
-$a->strings["If you have a restricted system where the webserver can't access the system temp path, enter another path here."] = "";
+$a->strings["If you have a restricted system where the webserver can't access the system temp path, enter another path here."] = "Pokud máte omezený systém, kde webový server nemá přístup k systémové složce temp, zde zadejte jinou cestu.";
 $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."] = "";
+$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 bandwith."] = "Obrázková proxi zvyšuje výkonnost a soukromí. Neměla by být použita na systémech s pomalým připojením k síti.";
-$a->strings["Enable old style pager"] = "Aktivovat \"old style\" stránkování ";
-$a->strings["The old style pager has page numbers but slows down massively the page speed."] = " \"old style\" stránkování zobrazuje čísla stránek ale značně zpomaluje rychlost stránky.";
-$a->strings["Only search in tags"] = "Hledat pouze ve štítkách";
+$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í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 DFRN contacts of all users."] = "";
+$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ů.";
 $a->strings["RINO Encryption"] = "RINO Šifrování";
-$a->strings["Encryption layer between nodes."] = "Šifrovací vrstva mezi nódy.";
-$a->strings["Embedly API key"] = "";
-$a->strings["<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for web pages. This is an optional parameter."] = "";
-$a->strings["Enable 'worker' background processing"] = "";
-$a->strings["The worker background processing limits the number of parallel background jobs to a maximum number and respects the system load."] = "";
-$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["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 poller calls in your crontab."] = "";
-$a->strings["Enable fastlane"] = "";
-$a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "";
-$a->strings["Enable frontend worker"] = "";
-$a->strings["When enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call yourdomain.tld/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. The worker background process needs to be activated for this."] = "";
+$a->strings["Encryption layer between nodes."] = "Šifrovací vrstva mezi servery.";
+$a->strings["Enabled"] = "Povoleno";
+$a->strings["Maximum number of parallel workers"] = "Maximální počet paralelních pracovníků";
+$a->strings["On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d."] = "Na sdílených hostinzích toto nastavte na hodnotu %d. Na větších systémech se hodí hodnoty kolem %d. Výchozí hodnotou je %d.";
+$a->strings["Don't use 'proc_open' with the worker"] = "Nepoužívat \"proc_open\" s pracovníkem";
+$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."] = "Toto zapněte, pokud Váš systém nedovoluje používání \"proc_open\". To se může stát na sdíleném hostingu. Pokud je toto povoleno, bude zvýšena častost vyvolávání pracovníka v crontabu.";
+$a->strings["Enable fastlane"] = "Povolit fastlane";
+$a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "Pokud je toto povoleno, mechanismus fastlane spustí dodatečného pracovníka, pokud jsou procesy vyšší priority zablokované procesy nižší priority.";
+$a->strings["Enable frontend worker"] = "Povolit frontendového pracovníka";
+$a->strings["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."] = "Pokud je toto povoleno, bude proces pracovníka vyvolán, pokud je proveden backendový přístup \\x28např. když jsou doručovány zprávy\\x29. Na menších stránkách možná budete chtít pravidelně vyvolávat %s/worker přes externí úlohu cron. Tuto možnost byste měl/a zapnout pouze, pokud nemůžete na Vašem serveru používat cron/plánované úlohy.";
+$a->strings["Subscribe to relay"] = "Odebírat ze serveru pro přeposílání";
+$a->strings["Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page."] = "Umožňuje přijímat veřejné příspěvky z přeposílacího serveru. Budou zahrnuty ve vyhledávání, odebíraných štítcích a na globální komunitní stránce.";
+$a->strings["Relay server"] = "Server pro přeposílání (relay)";
+$a->strings["Address of the relay server where public posts should be send to. For example https://relay.diasp.org"] = "Adresa přeposílacího serveru, kam budou posílány veřejné příspěvky. Příklad: https://relay.diasp.org";
+$a->strings["Direct relay transfer"] = "Přímý přenos na server pro přeposílání";
+$a->strings["Enables the direct transfer to other servers without using the relay servers"] = "Umožňuje přímý přenos na ostatní servery bez použití přeposílacích serverů";
+$a->strings["Relay scope"] = "Rozsah příspěvků z přeposílacího serveru";
+$a->strings["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."] = "Může být buď \"vše\" nebo \"štítky\". \"vše\" znamená, že budou přijaty všechny veřejné příspěvky. \"štítky\" znamená, že budou přijaty pouze příspěvky s vybranými štítky.";
+$a->strings["all"] = "vše";
+$a->strings["tags"] = "štítky";
+$a->strings["Server tags"] = "Serverové štítky";
+$a->strings["Comma separated list of tags for the 'tags' subscription."] = "Seznam štítků pro odběr \"tags\", oddělených čárkami.";
+$a->strings["Allow user tags"] = "Povolit uživatelské štítky";
+$a->strings["If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'."] = "Pokud je toto povoleno, budou štítky z uložených hledání vedle odběru \"relay_server_tags\" použity i pro odběr \"tags\".";
+$a->strings["Start Relocation"] = "Začít přemístění";
 $a->strings["Update has been marked successful"] = "Aktualizace byla označena jako úspěšná.";
 $a->strings["Database structure update %s was successfully applied."] = "Aktualizace struktury databáze %s byla úspěšně aplikována.";
 $a->strings["Executing of database structure update %s failed with error: %s"] = "Provádění aktualizace databáze %s skončilo chybou: %s";
 $a->strings["Executing %s failed with error: %s"] = "Vykonávání %s selhalo s chybou: %s";
 $a->strings["Update %s was successfully applied."] = "Aktualizace %s byla úspěšně aplikována.";
-$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Aktualizace %s nevrátila žádný status. Není zřejmé, jestli byla úspěšná.";
+$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Aktualizace %s nevrátila žádný stav. Není zřejmé, jestli byla úspěšná.";
 $a->strings["There was no additional update function %s that needed to be called."] = "Nebyla nalezena žádná další aktualizační funkce %s která by měla být volána.";
 $a->strings["No failed updates."] = "Žádné neúspěšné aktualizace.";
 $a->strings["Check database structure"] = "Ověření struktury databáze";
@@ -1699,106 +1313,231 @@ $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\tDrahý %1\$s,\n\t\t\t\tadministrátor webu %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\tThank you and welcome to %4\$s."] = "\n\t\t\tVaše přihlašovací údaje jsou následující:\n\n\t\t\tAdresa webu: \t%1\$s\n\t\t\tpřihlašovací jméno:\t\t%2\$s\n\t\t\theslo:\t\t%3\$s\n\n\t\t\tHeslo si můžete změnit na stránce \"Nastavení\" vašeho účtu poté, co se přihlásíte.\n\n\t\t\tProsím věnujte pár chvil revizi dalšího nastavení vašeho účtu na dané stránce.\n\n\t\t\tTaké su můžete přidat nějaké základní informace do svého výchozího profilu (na stránce \"Profily\"), takže ostatní lidé vás snáze najdou. \n\n\t\t\tDoporučujeme Vám uvést celé jméno a i foto. Přidáním nějakých \"klíčových slov\" (velmi užitečné pro hledání nových přátel) a možná také zemi, ve které žijete, pokud nechcete být více konkrétní.\n\n\t\t\tPlně resepktujeme vaše právo na soukromí a nic z výše uvedeného není povinné. Pokud jste zde nový a neznáte zde nikoho, uvedením daných informací můžete získat nové přátele.\n\n\t\t\tDíky a vítejte na %4\$s.";
+$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"] = [
 	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";
-$a->strings["User '%s' unblocked"] = "Uživatel '%s' odblokován";
-$a->strings["User '%s' blocked"] = "Uživatel '%s' blokován";
+$a->strings["User '%s' deleted"] = "Uživatel \"%s\" smazán";
+$a->strings["User '%s' unblocked"] = "Uživatel \"%s\" odblokován";
+$a->strings["User '%s' blocked"] = "Uživatel \"%s\" zablokován";
+$a->strings["Private Forum"] = "Soukromé fórum";
+$a->strings["Email"] = "E-mail";
 $a->strings["Register date"] = "Datum registrace";
 $a->strings["Last login"] = "Datum posledního přihlášení";
 $a->strings["Last item"] = "Poslední položka";
-$a->strings["Add User"] = "Přidat Uživatele";
-$a->strings["select all"] = "Vybrat vše";
-$a->strings["User registrations waiting for confirm"] = "Registrace uživatele čeká na potvrzení";
-$a->strings["User waiting for permanent deletion"] = "Uživatel čeká na trvalé smazání";
+$a->strings["Type"] = "Typ";
+$a->strings["Add User"] = "Přidat uživatele";
+$a->strings["User registrations waiting for confirm"] = "Registrace uživatelů čekající na potvrzení";
+$a->strings["User waiting for permanent deletion"] = "Uživatel čekající na trvalé smazání";
 $a->strings["Request date"] = "Datum žádosti";
 $a->strings["No registrations."] = "Žádné registrace.";
-$a->strings["Note from the user"] = "";
+$a->strings["Note from the user"] = "Poznámka od uživatele";
 $a->strings["Deny"] = "Odmítnout";
-$a->strings["Block"] = "Blokovat";
-$a->strings["Unblock"] = "Odblokovat";
-$a->strings["Site admin"] = "Site administrátor";
+$a->strings["User blocked"] = "Uživatel zablokován";
+$a->strings["Site admin"] = "Administrátor webu";
 $a->strings["Account expired"] = "Účtu vypršela platnost";
 $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\\n Opravdu 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 pokračovat?";
-$a->strings["Name of the new user."] = "Jméno nového uživatele";
+$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["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.";
-$a->strings["Plugin %s disabled."] = "Plugin %s zakázán.";
-$a->strings["Plugin %s enabled."] = "Plugin %s povolen.";
+$a->strings["Addon %s disabled."] = "Doplněk %s zakázán.";
+$a->strings["Addon %s enabled."] = "Doplněk %s povolen.";
 $a->strings["Disable"] = "Zakázat";
 $a->strings["Enable"] = "Povolit";
 $a->strings["Toggle"] = "Přepnout";
 $a->strings["Author: "] = "Autor: ";
 $a->strings["Maintainer: "] = "Správce: ";
-$a->strings["Reload active plugins"] = "";
-$a->strings["There are currently no plugins available on your node. You can find the official plugin repository at %1\$s and might find other interesting plugins in the open plugin registry at %2\$s"] = "";
-$a->strings["No themes found."] = "Nenalezeny žádná témata.";
+$a->strings["Reload active addons"] = "Znovu načíst aktivní doplňky";
+$a->strings["There are currently no addons available on your node. You can find the official addon repository at %1\$s and might find other interesting addons in the open addon registry at %2\$s"] = "Aktuálně nejsou na Vašem serveru k dispozici žádné doplňky. Oficiální repozitář doplňků najdete na %1\$s a další zajímavé doplňky můžete najít v otevřeném registru doplňků na %2\$s";
+$a->strings["No themes found."] = "Nenalezeny žádné motivy.";
 $a->strings["Screenshot"] = "Snímek obrazovky";
-$a->strings["Reload active themes"] = "";
-$a->strings["No themes found on the system. They should be paced in %1\$s"] = "";
+$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["PHP log currently enabled."] = "";
-$a->strings["PHP log currently disabled."] = "";
+$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";
 $a->strings["Enable Debugging"] = "Povolit ladění";
-$a->strings["Log file"] = "Soubor s logem";
-$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Musí být editovatelné web serverem. Relativní cesta k vašemu kořenovému adresáři Friendica";
+$a->strings["Log file"] = "Soubor se záznamem";
+$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Musí být zapisovatelný webovým serverem. Relativní cesta k Vašemu kořenovému adresáři Friendica.";
 $a->strings["Log level"] = "Úroveň auditu";
-$a->strings["PHP logging"] = "";
-$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["Lock feature %s"] = "";
-$a->strings["Manage Additional Features"] = "";
+$a->strings["PHP logging"] = "Záznamování PHP";
+$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."] = "Pro dočasné umožnění zaznamenávání PHP chyb a varování, můžete přidat do souboru index.php na vaší instalaci následující: Název souboru nastavený v řádku \"error_log\" je relativní ke kořenovému adresáři Friendica a webový server musí mít povolení na něj zapisovat. Možnost \"1\" pro \"log_errors\" a \"display_errors\" tyto funkce povoluje, nastavením hodnoty na \"0\" je zakážete. ";
+$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."] = "Chyba při otevírání záznamu <strong>%1\$s</strong>.\\r\\n<br/>Zkontrolujte, jestli soubor %1\$s existuje a může se číst.";
+$a->strings["Couldn't open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s is readable."] = "Nelze otevřít záznam <strong>%1\$s</strong>.\\r\\n<br/>Zkontrolujte, jestli se soubor %1\$s může číst.";
+$a->strings["Lock feature %s"] = "Funkce zámku %s";
+$a->strings["Manage Additional Features"] = "Spravovat další funkce";
+$a->strings["OpenID protocol error. No ID returned."] = "Chyba OpenID protokolu. Nebylo navráceno žádné ID.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Nenalezen účet a OpenID registrace na tomto serveru není dovolena.";
+$a->strings["Login failed."] = "Přihlášení se nezdařilo.";
+$a->strings["This introduction has already been accepted."] = "Toto pozvání již bylo přijato.";
+$a->strings["Profile location is not valid or does not contain profile information."] = "Adresa profilu není platná nebo neobsahuje profilové informace";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Varování: umístění profilu nemá žádné identifikovatelné jméno vlastníka";
+$a->strings["Warning: profile location has no profile photo."] = "Varování: umístění profilu nemá žádnou profilovou fotku.";
+$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é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["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 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."] = "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";
+$a->strings["Welcome home %s."] = "Vítejte doma, %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í";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"] = "Příklady: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de";
+$a->strings["Please answer the following:"] = "Odpovězte, prosím, následující:";
+$a->strings["Does %s know you?"] = "Zná Vás %s?";
+$a->strings["Add a personal note:"] = "Přidat osobní poznámku:";
+$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."] = " - prosím nepoužívejte tento formulář.  Místo toho zadejte %s do Vašeho vyhledávacího pole Diaspora.";
+$a->strings["Authorize application connection"] = "Povolit připojení aplikacím";
+$a->strings["Return to your app and insert this Securty Code:"] = "Vraťte se do vaší aplikace a zadejte tento bezpečnostní kód:";
+$a->strings["Please login to continue."] = "Pro pokračování se prosím přihlaste.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Chcete umožnit této aplikaci přístup k vašim příspěvkům a kontaktům a/nebo k vytváření Vašich nových příspěvků?";
+$a->strings["Image uploaded but image cropping failed."] = "Obrázek byl odeslán, ale jeho oříznutí se nesdařilo.";
+$a->strings["Image size reduction [%s] failed."] = "Nepodařilo se snížit velikost obrázku [%s].";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Znovu načtěte stránku (Shift+F5) nebo vymažte cache prohlížeče, pokud se nová fotka nezobrazí okamžitě.";
+$a->strings["Unable to process image"] = "Obrázek nelze zpracovat ";
+$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"] = "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";
+$a->strings["Image uploaded successfully."] = "Obrázek byl úspěšně nahrán.";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Omlouváme se, možná je Váš soubor větší než je povolené maximum dle nastavení PHP";
+$a->strings["Or - did you try to upload an empty file?"] = "Nebo - nenahrával/a jste prázdný soubor?";
+$a->strings["File exceeds size limit of %s"] = "Velikost souboru přesáhla limit %s";
+$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 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 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 \"Exportovat účet\"";
+$a->strings["Invalid profile identifier."] = "Neplatný identifikátor profilu.";
+$a->strings["Profile Visibility Editor"] = "Editor viditelnosti profilu ";
+$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";
+$a->strings["month"] = "měsíc";
+$a->strings["week"] = "týden";
+$a->strings["day"] = "den";
+$a->strings["list"] = "seznam";
+$a->strings["User not found"] = "Uživatel nenalezen.";
+$a->strings["This calendar format is not supported"] = "Tento formát kalendáře není podporován.";
+$a->strings["No exportable data found"] = "Nenalezena žádná data pro export";
+$a->strings["calendar"] = "kalendář";
+$a->strings["Account approved."] = "Účet schválen.";
+$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["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"] = "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";
+$a->strings["%s's posts"] = "Příspěvky uživatele %s";
+$a->strings["%s's comments"] = "Komentáře uživatele %s";
+$a->strings["No friends to display."] = "Žádní přátelé k zobrazení";
 $a->strings["%d contact edited."] = [
-	0 => "",
-	1 => "",
-	2 => "",
+	0 => "%d kontakt upraven",
+	1 => "%d kontakty upraveny",
+	2 => "%d kontaktu upraveno",
+	3 => "%d kontaktů upraveno",
 ];
 $a->strings["Could not access contact record."] = "Nelze získat přístup k záznamu kontaktu.";
 $a->strings["Could not locate selected profile."] = "Nelze nalézt vybraný profil.";
 $a->strings["Contact updated."] = "Kontakt aktualizován.";
-$a->strings["Failed to update contact record."] = "Nepodařilo se aktualizovat kontakt.";
 $a->strings["Contact has been blocked"] = "Kontakt byl zablokován";
 $a->strings["Contact has been unblocked"] = "Kontakt byl odblokován";
 $a->strings["Contact has been ignored"] = "Kontakt bude ignorován";
 $a->strings["Contact has been unignored"] = "Kontakt přestal být ignorován";
 $a->strings["Contact has been archived"] = "Kontakt byl archivován";
-$a->strings["Contact has been unarchived"] = "Kontakt byl vrácen z archívu.";
-$a->strings["Drop contact"] = "";
+$a->strings["Contact has been unarchived"] = "Kontakt byl vrácen z archivu.";
+$a->strings["Drop contact"] = "Zrušit kontakt";
 $a->strings["Do you really want to delete this contact?"] = "Opravdu chcete smazat tento kontakt?";
 $a->strings["Contact has been removed."] = "Kontakt byl odstraněn.";
 $a->strings["You are mutual friends with %s"] = "Jste vzájemní přátelé s uživatelem %s";
 $a->strings["You are sharing with %s"] = "Sdílíte s uživatelem %s";
-$a->strings["%s is sharing with you"] = "uživatel %s sdílí s vámi";
+$a->strings["%s is sharing with you"] = "%s s Vámi sdílí";
 $a->strings["Private communications are not available for this contact."] = "Soukromá komunikace není dostupná pro tento kontakt.";
+$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čítat další informace pro kanál";
-$a->strings["Fetch information"] = "Načítat informace";
-$a->strings["Fetch information and keywords"] = "Načítat informace a klíčová slova";
-$a->strings["Contact"] = "";
+$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"] = "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";
 $a->strings["Profile Visibility"] = "Viditelnost profilu";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Vyberte prosím profil, který chcete zobrazit %s při zabezpečeném prohlížení vašeho profilu.";
 $a->strings["Contact Information / Notes"] = "Kontaktní informace / poznámky";
-$a->strings["Edit contact notes"] = "Editovat poznámky kontaktu";
+$a->strings["Contact Settings"] = "Nastavení kontaktů";
+$a->strings["Contact"] = "Kontakt";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Vyberte prosím profil, který chcete zobrazit %s při zabezpečeném prohlížení vašeho profilu.";
+$a->strings["Their personal note"] = "Jejich osobní poznámka";
+$a->strings["Edit contact notes"] = "Upravit poznámky kontaktu";
 $a->strings["Block/Unblock contact"] = "Blokovat / Odblokovat kontakt";
 $a->strings["Ignore contact"] = "Ignorovat kontakt";
 $a->strings["Repair URL settings"] = "Opravit nastavení adresy URL ";
@@ -1810,14 +1549,15 @@ $a->strings["Unignore"] = "Přestat ignorovat";
 $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["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpovědi/Libí se na Vaše veřejné příspěvky <strong>mohou být</strong> stále viditelné";
+$a->strings["Awaiting connection acknowledge"] = "Čekám na potrvzení spojení";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpovědi/oblíbení na Vaše veřejné příspěvky <strong>mohou</strong> být stále viditelné";
 $a->strings["Notification for new posts"] = "Upozornění na nové příspěvky";
 $a->strings["Send a notification of every new post of this contact"] = "Poslat upozornění při každém novém příspěvku tohoto kontaktu";
 $a->strings["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čítat informace a klíčová slova\"";
-$a->strings["Actions"] = "";
-$a->strings["Contact Settings"] = "";
-$a->strings["Suggestions"] = "Doporučení";
+$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"] = "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";
@@ -1832,240 +1572,676 @@ $a->strings["Hidden"] = "Skrytý";
 $a->strings["Only show hidden contacts"] = "Zobrazit pouze skryté kontakty";
 $a->strings["Search your contacts"] = "Prohledat Vaše kontakty";
 $a->strings["Archive"] = "Archivovat";
-$a->strings["Unarchive"] = "Vrátit z archívu";
-$a->strings["Batch Actions"] = "";
+$a->strings["Unarchive"] = "Vrátit z archivu";
+$a->strings["Batch Actions"] = "Souhrnné akce";
+$a->strings["Conversations started by this contact"] = "Konverzace, které tento kontakt začal";
+$a->strings["Posts and Comments"] = "Příspěvky a komentáře";
+$a->strings["Profile Details"] = "Detaily profilu";
 $a->strings["View all contacts"] = "Zobrazit všechny kontakty";
-$a->strings["View all common friends"] = "";
+$a->strings["View all common friends"] = "Zobrazit všechny společné přátele";
 $a->strings["Advanced Contact Settings"] = "Pokročilé nastavení kontaktu";
 $a->strings["Mutual Friendship"] = "Vzájemné přátelství";
 $a->strings["is a fan of yours"] = "je Váš fanoušek";
 $a->strings["you are a fan of"] = "jste fanouškem";
-$a->strings["Toggle Blocked status"] = "Přepnout stav Blokováno";
-$a->strings["Toggle Ignored status"] = "Přepnout stav Ignorováno";
-$a->strings["Toggle Archive status"] = "Přepnout stav Archivováno";
+$a->strings["This is you"] = "Nastavte Vaši polohu";
+$a->strings["Edit contact"] = "Upravit kontakt";
+$a->strings["Toggle Blocked status"] = "Přepínat stav Blokováno";
+$a->strings["Toggle Ignored status"] = "Přepínat stav Ignorováno";
+$a->strings["Toggle Archive status"] = "Přepínat stav Archivováno";
 $a->strings["Delete contact"] = "Odstranit kontakt";
-$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "To se může občas stát pokud kontakt byl zažádán oběma osobami a již byl schválen.";
-$a->strings["Response from remote site was not understood."] = "Odpověď ze vzdáleného serveru nebyla srozumitelná.";
-$a->strings["Unexpected response from remote site: "] = "Neočekávaná odpověď od vzdáleného serveru:";
-$a->strings["Confirmation completed successfully."] = "Potvrzení úspěšně dokončena.";
-$a->strings["Remote site reported: "] = "Vzdálený server oznámil:";
-$a->strings["Temporary failure. Please wait and try again."] = "Dočasné selhání. Prosím, vyčkejte a zkuste to znovu.";
-$a->strings["Introduction failed or was revoked."] = "Žádost o propojení selhala nebo byla zrušena.";
-$a->strings["Unable to set contact photo."] = "Nelze nastavit fotografii kontaktu.";
-$a->strings["No user record found for '%s' "] = "Pro '%s' nenalezen žádný uživatelský záznam ";
-$a->strings["Our site encryption key is apparently messed up."] = "Náš šifrovací klíč zřejmě přestal správně fungovat.";
-$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Byla poskytnuta prázdná URL adresa nebo se nepodařilo URL adresu dešifrovat.";
-$a->strings["Contact record was not found for you on our site."] = "Kontakt záznam nebyl nalezen pro vás na našich stránkách.";
-$a->strings["Site public key not available in contact record for URL %s."] = "V adresáři není k dispozici veřejný klíč pro URL %s.";
-$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Váš systém poskytl duplicitní ID vůči našemu systému. Pokuste se akci zopakovat.";
-$a->strings["Unable to set your contact credentials on our system."] = "Nelze nastavit Vaše přihlašovací údaje v našem systému.";
-$a->strings["Unable to update your contact profile details on our system"] = "Nelze aktualizovat Váš profil v našem systému";
-$a->strings["%1\$s has joined %2\$s"] = "%1\$s se připojil k %2\$s";
-$a->strings["This introduction has already been accepted."] = "Toto pozvání již bylo přijato.";
-$a->strings["Profile location is not valid or does not contain profile information."] = "Adresa profilu není platná nebo neobsahuje profilové informace";
-$a->strings["Warning: profile location has no identifiable owner name."] = "Varování: umístění profilu nemá žádné identifikovatelné jméno vlastníka";
-$a->strings["Warning: profile location has no profile photo."] = "Varování: umístění profilu nemá žádnou profilovou fotografii.";
-$a->strings["%d required parameter was not found at the given location"] = [
-	0 => "%d požadovaný parametr nebyl nalezen na daném místě",
-	1 => "%d požadované parametry nebyly nalezeny na daném místě",
-	2 => "%d požadované parametry nebyly nalezeny na daném místě",
-];
-$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 příliš mnoho požadavků na připojení.";
-$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["Invalid email address."] = "Neplatná emailová adresa";
-$a->strings["This account has not been configured for email. Request failed."] = "Tento účet nebyl nastaven pro email. Požadavek nesplněn.";
-$a->strings["You have already introduced yourself here."] = "Již jste se zde zavedli.";
-$a->strings["Apparently you are already friends with %s."] = "Zřejmě jste již přátelé se %s.";
-$a->strings["Invalid profile URL."] = "Neplatné URL profilu.";
-$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."] = "";
-$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["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 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/siteinfo\">follow this link to find a public Friendica site and join us today</a>."] = "";
-$a->strings["Friend/Connection Request"] = "Požadavek o přátelství / kontaktování";
-$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "Příklady: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca";
-$a->strings["Please answer the following:"] = "Odpovězte, prosím, následující:";
-$a->strings["Does %s know you?"] = "Zná Vás uživatel %s ?";
-$a->strings["Add a personal note:"] = "Přidat osobní poznámku:";
-$a->strings["StatusNet/Federated Social Web"] = "StatusNet / Federativní Sociální Web";
-$a->strings[" - please do not use this form.  Instead, enter %s into your Diaspora search bar."] = " - prosím nepoužívejte tento formulář.  Místo toho zadejte %s do Vašeho Diaspora vyhledávacího pole.";
-$a->strings["Your Identity Address:"] = "Verze PHP pro příkazový řádek na Vašem systému nemá povolen \"register_argc_argv\".";
-$a->strings["Submit Request"] = "Odeslat žádost";
+$a->strings["Event can not end before it has started."] = "Událost nemůže končit dříve, než začala.";
+$a->strings["Event title and start time are required."] = "Název události a datum začátku jsou vyžadovány.";
+$a->strings["Create New Event"] = "Vytvořit novou událost";
+$a->strings["Event details"] = "Detaily události";
+$a->strings["Starting date and Title are required."] = "Počáteční datum a Název jsou vyžadovány.";
+$a->strings["Event Starts:"] = "Událost začíná:";
+$a->strings["Required"] = "Vyžadováno";
+$a->strings["Finish date/time is not known or not relevant"] = "Datum/čas konce není zadán nebo není relevantní";
+$a->strings["Event Finishes:"] = "Akce končí:";
+$a->strings["Adjust for viewer timezone"] = "Nastavit časové pásmo pro uživatele s právem pro čtení";
+$a->strings["Description:"] = "Popis:";
+$a->strings["Title:"] = "Název:";
+$a->strings["Share this event"] = "Sdílet tuto událost";
+$a->strings["Basic"] = "Základní";
+$a->strings["Permissions"] = "Oprávnění:";
+$a->strings["Failed to remove event"] = "Odstranění události selhalo";
+$a->strings["Event removed"] = "Událost odstraněna";
+$a->strings["The contact could not be added."] = "Kontakt nemohl být přidán.";
 $a->strings["You already added this contact."] = "Již jste si tento kontakt přidali.";
-$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "";
-$a->strings["OStatus support is disabled. Contact can't be added."] = "";
-$a->strings["The network type couldn't be detected. Contact can't be added."] = "";
-$a->strings["Contact added"] = "Kontakt přidán";
-$a->strings["Friendica Communications Server - Setup"] = "Friendica Komunikační server - Nastavení";
-$a->strings["Could not connect to database."] = "Nelze se připojit k databázi.";
-$a->strings["Could not create table."] = "Nelze vytvořit tabulku.";
-$a->strings["Your Friendica site database has been installed."] = "Vaše databáze Friendica  byla nainstalována.";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "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["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["Check again"] = "Otestovat 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["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";
-$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["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["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:"] = "";
-$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "";
+$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Podpora pro Diasporu není zapnuta. Kontakt nemůže být přidán.";
+$a->strings["OStatus support is disabled. Contact can't be added."] = "Podpora pro OStatus je vypnnuta. Kontakt nemůže být přidán.";
+$a->strings["The network type couldn't be detected. Contact can't be added."] = "Typ sítě nemohl být detekován. Kontakt nemůže být přidán.";
+$a->strings["Contact Photos"] = "Fotky kontaktu";
+$a->strings["Files"] = "Soubory";
+$a->strings["Post successful."] = "Příspěvek úspěšně odeslán";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s následuje %3\$s uživatele %2\$s";
+$a->strings["Credits"] = "Poděkování";
+$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 je komunitní projekt, který by nebyl možný bez pomoci mnoha lidí. Zde je seznam těch, kteří přispěli ke kódu nebo k překladu Friendica. Děkujeme všem!";
+$a->strings["Item not available."] = "Položka není k dispozici.";
+$a->strings["Item was not found."] = "Položka nebyla nalezena.";
+$a->strings["No more system notifications."] = "Žádné další systémová upozornění.";
+$a->strings["Community option not available."] = "Možnost komunity není dostupná.";
+$a->strings["Not available."] = "Není k dispozici.";
+$a->strings["Local Community"] = "Místní komunita";
+$a->strings["Posts from local users on this server"] = "Příspěvky od místních uživatelů na tomto serveru";
+$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ý 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ý 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";
+$a->strings["Recipient"] = "Příjemce";
+$a->strings["Choose what you wish to do to recipient"] = "Vyberte, co si přejete příjemci udělat";
+$a->strings["Make this post private"] = "Změnit tento příspěvek na soukromý";
+$a->strings["Total invitation limit exceeded."] = "Celkový limit pozvánek byl překročen";
+$a->strings["%s : Not a valid email address."] = "%s : není platná e-mailová adresa.";
+$a->strings["Please join us on Friendica"] = "Prosím přidejte se k nám na Friendice";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limit pozvánek byl překročen. Prosím kontaktujte administrátora Vaší stránky.";
+$a->strings["%s : Message delivery failed."] = "%s : Doručení zprávy se nezdařilo.";
+$a->strings["%d message sent."] = [
+	0 => "%d zpráva odeslána.",
+	1 => "%d zprávy odeslány.",
+	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";
+$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."] = "Navštivte %s pro seznam veřejných serverů, na kterých se můžete přidat. Členové Friendica na jiných serverech se mohou spojit mezi sebou, jakožto i se členy mnoha dalších sociálních sítí.";
+$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 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:";
+$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Jsi srdečně pozván/a se připojit ke mně a k mým blízkým přátelům na Friendica - a pomoci nám vytvořit lepší sociální web.";
+$a->strings["You will need to supply this invitation code: \$invite_code"] = "Budeš muset zadat tento pozvánkový kód: \$invite_code";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Jakmile se zaregistruješ, prosím spoj se se mnou přes mou profilovu stránku na:";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "Pro více informací o projektu Friendica a proč si myslíme, že je důležitý, prosím navštivte http://friendi.ca";
+$a->strings["Personal Notes"] = "Osobní poznámky";
+$a->strings["Profile deleted."] = "Profil smazán.";
+$a->strings["Profile-"] = "Profil-";
+$a->strings["New profile created."] = "Nový profil vytvořen.";
+$a->strings["Profile unavailable to clone."] = "Profil není možné naklonovat.";
+$a->strings["Profile Name is required."] = "Jméno profilu je povinné.";
+$a->strings["Marital Status"] = "Rodinný stav";
+$a->strings["Romantic Partner"] = "Romatický partner";
+$a->strings["Work/Employment"] = "Práce/Zaměstnání";
+$a->strings["Religion"] = "Náboženství";
+$a->strings["Political Views"] = "Politické přesvědčení";
+$a->strings["Gender"] = "Pohlaví";
+$a->strings["Sexual Preference"] = "Sexuální orientace";
+$a->strings["XMPP"] = "XMPP";
+$a->strings["Homepage"] = "Domovská stránka";
+$a->strings["Interests"] = "Zájmy";
+$a->strings["Location"] = "Poloha";
+$a->strings["Profile updated."] = "Profil aktualizován.";
+$a->strings["Hide contacts and friends:"] = "Skrýt kontakty a přátele:";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Skrýt u tohoto profilu Vaše kontakty / seznam přátel před před dalšími uživateli zobrazující si tento profil?";
+$a->strings["Show more profile fields:"] = "Zobrazit další profilová pole";
+$a->strings["Profile Actions"] = "Akce profilu";
+$a->strings["Edit Profile Details"] = "Upravit podrobnosti profilu ";
+$a->strings["Change Profile Photo"] = "Změnit profilovou fotku";
+$a->strings["View this profile"] = "Zobrazit tento profil";
+$a->strings["View all profiles"] = "Zobrazit všechny profily";
+$a->strings["Edit visibility"] = "Upravit viditelnost";
+$a->strings["Create a new profile using these settings"] = "Vytvořit nový profil pomocí tohoto nastavení";
+$a->strings["Clone this profile"] = "Klonovat tento profil";
+$a->strings["Delete this profile"] = "Smazat tento profil";
+$a->strings["Basic information"] = "Základní informace";
+$a->strings["Profile picture"] = "Profilový obrázek";
+$a->strings["Preferences"] = "Nastavení";
+$a->strings["Status information"] = "Informace o stavu";
+$a->strings["Additional information"] = "Dodatečné informace";
+$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í 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:"] = "Poloha/město:";
+$a->strings["Region/State:"] = "Region / stát:";
+$a->strings["Postal/Zip Code:"] = "PSČ:";
+$a->strings["Country:"] = "Země:";
+$a->strings["Age: "] = "Věk: ";
+$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 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["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:";
+$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Používá se pro doporučování potenciálních přátel, může být viděno ostatními)";
+$a->strings["Private Keywords:"] = "Soukromá klíčová slova:";
+$a->strings["(Used for searching profiles, never shown to others)"] = "(Používá se pro vyhledávání profilů, není nikdy zobrazeno ostatním)";
+$a->strings["Likes:"] = "Líbí se:";
+$a->strings["Dislikes:"] = "Nelibí se:";
+$a->strings["Musical interests"] = "Hudební vkus";
+$a->strings["Books, literature"] = "Knihy, literatura";
+$a->strings["Television"] = "Televize";
+$a->strings["Film/dance/culture/entertainment"] = "Film/tanec/kultura/zábava";
+$a->strings["Hobbies/Interests"] = "Koníčky/zájmy";
+$a->strings["Love/romance"] = "Láska/romantika";
+$a->strings["Work/employment"] = "Práce/zaměstnání";
+$a->strings["School/education"] = "Škola/vzdělání";
+$a->strings["Contact information and Social Networks"] = "Kontaktní informace a sociální sítě";
+$a->strings["Profile Image"] = "Profilový obrázek";
+$a->strings["visible to everybody"] = "viditelné pro všechny";
+$a->strings["Edit/Manage Profiles"] = "Upravit/spravovat profily";
+$a->strings["Change profile photo"] = "Změnit profilovou fotku";
+$a->strings["Create New Profile"] = "Vytvořit nový profil";
+$a->strings["Photo Albums"] = "Fotoalba";
+$a->strings["Recent Photos"] = "Nedávné fotky";
+$a->strings["Upload New Photos"] = "Nahrát nové fotky";
+$a->strings["Contact information unavailable"] = "Kontakt byl zablokován";
+$a->strings["Album not found."] = "Album nenalezeno.";
+$a->strings["Delete Album"] = "Smazat album";
+$a->strings["Do you really want to delete this photo album and all its photos?"] = "Opravdu chcete smazat toto fotoalbum a všechny jeho fotky?";
+$a->strings["Delete Photo"] = "Smazat fotku";
+$a->strings["Do you really want to delete this photo?"] = "Opravdu chcete smazat tuto fotku?";
+$a->strings["a photo"] = "fotce";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s byl označen ve %2\$s uživatelem %3\$s";
+$a->strings["Image upload didn't complete, please try again"] = "Nahrávání obrázku nebylo dokončeno, zkuste to prosím znovu";
+$a->strings["Image file is missing"] = "Chybí soubor obrázku";
+$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "Server v tuto chvíli nemůže akceptovat nové nahrané soubory, prosím kontaktujte Vašeho administrátora";
+$a->strings["Image file is empty."] = "Soubor obrázku je prázdný.";
+$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 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ší:";
+$a->strings["View Photo"] = "Zobrazit fotku";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Oprávnění bylo zamítnuto. Přístup k této položce může být omezen.";
+$a->strings["Photo not available"] = "Fotka není k dispozici";
+$a->strings["View photo"] = "Zobrazit fotku";
+$a->strings["Edit photo"] = "Upravit fotku";
+$a->strings["Use as profile photo"] = "Použít jako profilovou fotku";
+$a->strings["Private Message"] = "Soukromá zpráva";
+$a->strings["View Full Size"] = "Zobrazit v plné velikosti";
+$a->strings["Tags: "] = "Štítky: ";
+$a->strings["[Remove any tag]"] = "[Odstranit všechny štítky]";
+$a->strings["New album name"] = "Nové jméno alba";
+$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)"] = "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";
+$a->strings["Map"] = "Mapa";
+$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>"] = "<span><a href=\"%s\" target=\"_blank\" class=\"shared-wall-item-name\">%s</a> napsal/a následující <a href=\"%s\" target=\"_blank\">příspěvek</a>";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<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>"] = "<span><a href=\"%s\" target=\"_blank\">%s</a> napsal/a následující <a href=\"%s\" target=\"_blank\">příspěvek</a>";
+$a->strings["Update %s failed. See error logs."] = "Aktualizace %s selhala. Zkontrolujte protokol chyb.";
+$a->strings["There are no tables on MyISAM."] = "V MyISAM nejsou žádné tabulky.";
+$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\t\tVývojáři Friendica nedávno vydali aktualizaci %s,\n\t\t\t\tale když jsem ji zkusil instalovat, něco se strašně pokazilo.\n\t\t\t\tToto se musí ihned opravit a nemůžu to udělat sám. Prosím, kontaktujte\n\t\t\t\tvývojáře Friendica, pokud to nedokážete sám. Moje databáze může být neplatná.";
+$a->strings["The error message is\n[pre]%s[/pre]"] = "Chybová zpráva je\n[pre]%s[/pre]";
+$a->strings["\nError %d occurred during database update:\n%s\n"] = "\nPři aktualizaci databáze se vyskytla chyba %d:\n%s\n";
+$a->strings["Errors encountered performing database changes: "] = "Při vykonávání změn v databázy se vyskytly chyby: ";
+$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 server, you will not be able to run background polling via cron. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</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["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 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:";
 $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."] = "Vyberte prosím profil, který chcete zobrazit %s při zabezpečeném prohlížení Vašeho profilu.";
+$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["mysqli PHP module"] = "mysqli PHP modul";
-$a->strings["mb_string PHP module"] = "mb_string PHP modul";
-$a->strings["mcrypt PHP module"] = "";
-$a->strings["XML PHP module"] = "";
-$a->strings["iconv module"] = "";
-$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: mysqli PHP module required but not installed."] = "Chyba: požadovaný mysqli PHP modul není nainstalován.";
+$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"] = "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"] = "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: mcrypt PHP module required but not installed."] = "";
-$a->strings["Error: iconv PHP module required but not installed."] = "";
-$a->strings["If you are using php_cli, please make sure that mcrypt module is enabled in its config file"] = "";
-$a->strings["Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer."] = "";
-$a->strings["mcrypt_create_iv() function"] = "";
-$a->strings["Error, XML PHP module required but not installed."] = "";
-$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."] = "Webový instalátor musí být schopen vytvořit soubor s názvem \".htconfig.php\" v hlavním adresáři vašeho webového serveru ale nyní mu to není umožněno.";
+$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 .htconfig.php in your Friendica top folder."] = "Na konci této procedury obd nás obdržíte text k uložení v souboru pojmenovaném .htconfig.php ve Vašem Friendica kořenovém adresáři.";
+$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[".htconfig.php is writable"] = ".htconfig.php je editovatelné";
-$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"] = "";
-$a->strings["ImageMagick PHP extension is installed"] = "";
-$a->strings["ImageMagick supports GIF"] = "";
-$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."] = "Databázový konfigurační soubor \".htconfig.php\" nemohl být uložen. 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["<h1>What next</h1>"] = "<h1>Co dál<h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "Webový instalátor musí být schopen vytvořit soubor s názvem \".htconfig.php\" v hlavním adresáři Vašeho webového serveru ale nyní mu to není umožněno.";
-$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["System error. Post not saved."] = "Chyba systému. Příspěvek nebyl uložen.";
-$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Tato zpráva vám byla zaslána od %s, člena 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["%s posted an update."] = "%s poslal aktualizaci.";
-$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
-	0 => "",
-	1 => "",
-	2 => "",
+$a->strings["ImageMagick PHP extension is not installed"] = "PHP rozšíření ImageMagick není nainstalováno";
+$a->strings["ImageMagick PHP extension is installed"] = "PHP rozšíření ImageMagick je nainstalováno";
+$a->strings["ImageMagick supports GIF"] = "ImageMagick podporuje GIF";
+$a->strings["Post to Email"] = "Poslat příspěvek na e-mail";
+$a->strings["Hide your profile details from unknown viewers?"] = "Skrýt Vaše profilové detaily před neznámými návštěvníky?";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konektory deaktivovány, neboť je aktivován \"%s\".";
+$a->strings["Visible to everybody"] = "Viditelné pro všechny";
+$a->strings["Close"] = "Zavřít";
+$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "Nelze najít žádný nearchivovaný záznam kontaktu pro tuto URL adresu (%s)";
+$a->strings["The contact entries have been archived"] = "Záznamy kontaktů byly archivovány";
+$a->strings["Execute pending post updates."] = "Provést čekající aktualizace příspěvků.";
+$a->strings["All pending post updates are done."] = "Všechny čekající aktualizace příspěvků jsou hotové.";
+$a->strings["Enter new password: "] = "Zadejte nové heslo";
+$a->strings["Password can't be empty"] = "Heslo nemůže být prázdné";
+$a->strings["System"] = "Systém";
+$a->strings["Home"] = "Domů";
+$a->strings["Introductions"] = "Představení";
+$a->strings["%s commented on %s's post"] = "%s okomentoval/a příspěvek uživatele %s";
+$a->strings["%s created a new post"] = "%s vytvořil nový příspěvek";
+$a->strings["%s liked %s's post"] = "Uživateli %s se líbí příspěvek uživatele %s";
+$a->strings["%s disliked %s's post"] = "Uživateli %s se nelíbí příspěvek uživatele %s";
+$a->strings["%s is attending %s's event"] = "%s se zúčastní události %s";
+$a->strings["%s is not attending %s's event"] = "%s se nezúčastní události %s";
+$a->strings["%s may attend %s's event"] = "%s by se mohl/a zúčastnit události %s";
+$a->strings["%s is now friends with %s"] = "%s se nyní přátelí s uživatelem %s";
+$a->strings["Friend Suggestion"] = "Návrh přátelství";
+$a->strings["Friend/Connect Request"] = "Žádost o přátelství/spojení";
+$a->strings["New Follower"] = "Nový sledovatel";
+$a->strings["Error decoding account file"] = "Chyba dekódování uživatelského účtu";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Chyba! V souboru nejsou data o verzi! Je to opravdu soubor s účtem Friendica?";
+$a->strings["User '%s' already exists on this server!"] = "Uživatel \"%s\" již na tomto serveru existuje!";
+$a->strings["User creation error"] = "Chyba při vytváření uživatele";
+$a->strings["User profile creation error"] = "Chyba vytváření uživatelského profilu";
+$a->strings["%d contact not imported"] = [
+	0 => "%d kontakt nenaimportován",
+	1 => "%d kontakty nenaimportovány",
+	2 => "%d kontaktu nenaimportováno",
+	3 => "%d kontaktů nenaimportováno",
 ];
-$a->strings["Messages in this group won't be send to these receivers."] = "";
-$a->strings["Private messages to this person are at risk of public disclosure."] = "Soukromé zprávy této osobě jsou vystaveny riziku prozrazení.";
-$a->strings["Invalid contact."] = "Neplatný kontakt.";
-$a->strings["Commented Order"] = "Dle komentářů";
-$a->strings["Sort by Comment Date"] = "Řadit podle data komentáře";
-$a->strings["Posted Order"] = "Dle data";
-$a->strings["Sort by Post Date"] = "Řadit podle data příspěvku";
-$a->strings["Posts that mention or involve you"] = "Příspěvky, které Vás zmiňují nebo zahrnují";
-$a->strings["New"] = "Nové";
-$a->strings["Activity Stream - by date"] = "Proud aktivit - dle data";
-$a->strings["Shared Links"] = "Sdílené odkazy";
-$a->strings["Interesting Links"] = "Zajímavé odkazy";
-$a->strings["Starred"] = "S hvězdičkou";
-$a->strings["Favourite Posts"] = "Oblíbené přízpěvky";
-$a->strings["{0} wants to be your friend"] = "{0} chce být Vaším přítelem";
-$a->strings["{0} sent you a message"] = "{0} vám poslal zprávu";
-$a->strings["{0} requested registration"] = "{0} požaduje registraci";
-$a->strings["No contacts."] = "Žádné kontakty.";
+$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";
+$a->strings["(no subject)"] = "(bez předmětu)";
+$a->strings["This entry was edited"] = "Tato položka byla upravena";
+$a->strings["Delete globally"] = "Smazat globálně";
+$a->strings["Remove locally"] = "Odstranit lokálně";
+$a->strings["save to folder"] = "uložit do složky";
+$a->strings["I will attend"] = "zúčastním se";
+$a->strings["I will not attend"] = "nezúčastním se";
+$a->strings["I might attend"] = "mohl bych se zúčastnit";
+$a->strings["ignore thread"] = "ignorovat vlákno";
+$a->strings["unignore thread"] = "přestat ignorovat vlákno";
+$a->strings["toggle ignore status"] = "přepínat stav ignorování";
+$a->strings["add star"] = "přidat hvězdu";
+$a->strings["remove star"] = "odebrat hvězdu";
+$a->strings["toggle star status"] = "přepínat hvězdu";
+$a->strings["starred"] = "označeno hvězdou";
+$a->strings["add tag"] = "přidat štítek";
+$a->strings["like"] = "líbí se mi";
+$a->strings["dislike"] = "nelíbí se mi";
+$a->strings["Share this"] = "Sdílet toto";
+$a->strings["share"] = "sdílet";
+$a->strings["to"] = "na";
 $a->strings["via"] = "přes";
-$a->strings["Repeat the image"] = "";
-$a->strings["Will repeat your image to fill the background."] = "";
-$a->strings["Stretch"] = "";
-$a->strings["Will stretch to width/height of the image."] = "";
-$a->strings["Resize fill and-clip"] = "";
-$a->strings["Resize to fill and retain aspect ratio."] = "";
-$a->strings["Resize best fit"] = "";
-$a->strings["Resize to best fit and retain aspect ratio."] = "";
-$a->strings["Default"] = "";
-$a->strings["Note: "] = "";
-$a->strings["Check image permissions if all users are allowed to visit the image"] = "";
-$a->strings["Select 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 transparency"] = "";
-$a->strings["Set the background image"] = "";
-$a->strings["Guest"] = "";
-$a->strings["Visitor"] = "";
-$a->strings["Alignment"] = "Zarovnání";
-$a->strings["Left"] = "Vlevo";
-$a->strings["Center"] = "Uprostřed";
-$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["Community Profiles"] = "Komunitní profily";
-$a->strings["Last users"] = "Poslední uživatelé";
-$a->strings["Find Friends"] = "Nalézt Přátele";
-$a->strings["Local Directory"] = "Lokální Adresář";
-$a->strings["Quick Start"] = "";
-$a->strings["Connect Services"] = "Propojené služby";
-$a->strings["Comma separated list of helper forums"] = "";
-$a->strings["Set style"] = "Nastavit styl";
-$a->strings["Community Pages"] = "Komunitní stránky";
-$a->strings["Help or @NewHere ?"] = "Pomoc nebo @ProNováčky ?";
-$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["Variations"] = "Variace";
+$a->strings["Wall-to-Wall"] = "Ze zdi na zeď";
+$a->strings["via Wall-To-Wall:"] = "ze zdi na zeď";
+$a->strings["%d comment"] = [
+	0 => "%d komentář",
+	1 => "%d komentáře",
+	2 => "%d komentáře",
+	3 => "%d komentářů",
+];
+$a->strings["Bold"] = "Tučné";
+$a->strings["Italic"] = "Kurzíva";
+$a->strings["Underline"] = "Podtržené";
+$a->strings["Quote"] = "Citace";
+$a->strings["Code"] = "Kód";
+$a->strings["Image"] = "Obrázek";
+$a->strings["Link"] = "Odkaz";
+$a->strings["Video"] = "Video";
 $a->strings["Delete this item?"] = "Odstranit tuto položku?";
 $a->strings["show fewer"] = "zobrazit méně";
-$a->strings["Update %s failed. See error logs."] = "Aktualizace %s selhala. Zkontrolujte protokol chyb.";
+$a->strings["No system theme config value set."] = "Není nastavena konfigurační hodnota systémového motivu.";
+$a->strings["Logged out."] = "Odhlášen.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Zaznamenali jsme problém s Vaším přihlášením prostřednictvím Vámi zadaným OpenID. Prosím ověřte si, že jste ID zadali správně. ";
+$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["Or login using OpenID: "] = "Nebo přihlášení pomocí OpenID: ";
-$a->strings["Forgot your password?"] = "Zapomněli jste své heslo?";
-$a->strings["Website Terms of Service"] = "Podmínky použití serveru";
-$a->strings["terms of service"] = "podmínky použití";
-$a->strings["Website Privacy Policy"] = "Pravidla ochrany soukromí serveru";
-$a->strings["privacy policy"] = "Ochrana soukromí";
-$a->strings["toggle mobile"] = "přepnout mobil";
+$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"] = "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.";
+$a->strings["Privacy Statement"] = "Prohlášení o soukromí";
+$a->strings["%s is now following %s."] = "%s nyní sleduje %s.";
+$a->strings["following"] = "sleduje";
+$a->strings["%s stopped following %s."] = "%s přestal/a sledovat uživatele %s.";
+$a->strings["stopped following"] = "přestal/a sledovat";
+$a->strings["%s's birthday"] = "%s má narozeniny";
+$a->strings["Happy Birthday %s"] = "Veselé narozeniny, %s";
+$a->strings["Sharing notification from Diaspora network"] = "Oznámení o sdílení ze sítě Diaspora";
+$a->strings["Attachments:"] = "Přílohy:";
+$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"] = "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]";
+$a->strings["Drop Contact"] = "Odstranit kontakt";
+$a->strings["Organisation"] = "Organizace";
+$a->strings["News"] = "Zprávy";
+$a->strings["Forum"] = "Fórum";
+$a->strings["Connect URL missing."] = "Chybí URL adresa pro připojení.";
+$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Kontakt nemohl být přidán. Prosím zkontrolujte relevantní přihlašovací údaje sítě na stránce Nastavení -> Sociální sítě.";
+$a->strings["This site is not configured to allow communications with other networks."] = "Tento web není nakonfigurován tak, aby umožňoval komunikaci s ostatními sítěmi.";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "Nenalezen žádný kompatibilní komunikační protokol nebo kanál.";
+$a->strings["The profile address specified does not provide adequate information."] = "Uvedená adresa profilu neposkytuje dostatečné informace.";
+$a->strings["An author or name was not found."] = "Autor nebo jméno nenalezeno";
+$a->strings["No browser URL could be matched to this address."] = "Této adrese neodpovídá žádné URL prohlížeče.";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Není možné namapovat adresu identity ve stylu @ s žádným možným protokolem ani emailovým kontaktem.";
+$a->strings["Use mailto: in front of address to force email check."] = "Použite mailo: před adresou k vynucení emailové kontroly.";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Zadaná adresa profilu patří do sítě, která  byla na tomto serveru zakázána.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Omezený profil. Tato osoba nebude schopna od Vás přijímat přímé/osobní sdělení.";
+$a->strings["Unable to retrieve contact information."] = "Nepodařilo se získat kontaktní informace.";
+$a->strings["Starts:"] = "Začíná:";
+$a->strings["Finishes:"] = "Končí:";
+$a->strings["all-day"] = "celodenní";
+$a->strings["Jun"] = "čvn";
+$a->strings["Sept"] = "září";
+$a->strings["No events to display"] = "Žádné události k zobrazení";
+$a->strings["l, F j"] = "l, j. F";
+$a->strings["Edit event"] = "Upravit událost";
+$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"] = "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."] = "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.";
+$a->strings["Please use a shorter name."] = "Použijte prosím kratší jméno.";
+$a->strings["Name too short."] = "Jméno je příliš krátké.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Nezdá se, že by to bylo vaše celé jméno (křestní jméno a příjmení).";
+$a->strings["Your email domain is not among those allowed on this site."] = "Váš e-mailová doména není na tomto serveru mezi povolenými.";
+$a->strings["Not a valid email address."] = "Neplatná e-mailová adresa.";
+$a->strings["The nickname was blocked from registration by the nodes admin."] = "Administrátor serveru zablokoval registraci této přezdívky.";
+$a->strings["Cannot use that email."] = "Tento e-mail nelze použít.";
+$a->strings["Your nickname can only contain a-z, 0-9 and _."] = "Uživatelské jméno může obsahovat pouze znaky a-z, 0-9 a _.";
+$a->strings["Nickname is already registered. Please choose another."] = "Přezdívka je již registrována. Prosím vyberte jinou.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ZÁVAŽNÁ CHYBA: Generování bezpečnostních klíčů se nezdařilo.";
+$a->strings["An error occurred during registration. Please try again."] = "Došlo k chybě při registraci. Zkuste to prosím znovu.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Došlo k chybě při vytváření Vašeho výchozího profilu. Zkuste to prosím znovu.";
+$a->strings["An error occurred creating your self contact. Please try again."] = "Došlo k chybě při vytváření Vašeho kontaktu na sebe. Zkuste to prosím znovu.";
+$a->strings["Friends"] = "Přátelé";
+$a->strings["An error occurred creating your default contact group. Please try again."] = "Došlo k chybě při vytváření Vaší výchozí skupiny kontaktů. Zkuste to prosím znovu.";
+$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é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";
+$a->strings["edit"] = "upravit";
+$a->strings["Edit group"] = "Upravit skupinu";
+$a->strings["Create a new group"] = "Vytvořit novou skupinu";
+$a->strings["Edit groups"] = "Upravit skupiny";
+$a->strings["Requested account is not available."] = "Požadovaný účet není dostupný.";
+$a->strings["Edit profile"] = "Upravit profil";
+$a->strings["Atom feed"] = "Kanál Atom";
+$a->strings["Manage/edit profiles"] = "Spravovat/upravit profily";
+$a->strings["g A l F d"] = "g A, l d. F";
+$a->strings["F d"] = "d. F";
+$a->strings["[today]"] = "[dnes]";
+$a->strings["Birthday Reminders"] = "Připomínka narozenin";
+$a->strings["Birthdays this week:"] = "Narozeniny tento týden:";
+$a->strings["[No description]"] = "[Žádný popis]";
+$a->strings["Event Reminders"] = "Připomenutí událostí";
+$a->strings["Upcoming events the next 7 days:"] = "Nadcházející události v příštích 7 dnech:";
+$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"] = "%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ě:";
+$a->strings["Musical interests:"] = "Hudební vkus:";
+$a->strings["Books, literature:"] = "Knihy, literatura:";
+$a->strings["Television:"] = "Televize:";
+$a->strings["Film/dance/culture/entertainment:"] = "Film/tanec/kultura/zábava:";
+$a->strings["Love/Romance:"] = "Láska/romantika";
+$a->strings["Work/employment:"] = "Práce/zaměstnání:";
+$a->strings["School/education:"] = "Škola/vzdělávání:";
+$a->strings["Forums:"] = "Fóra";
+$a->strings["Only You Can See This"] = "Toto můžete vidět jen Vy";
+$a->strings["Tips for New Members"] = "Tipy pro nové členy";
+$a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s vítá %2\$s";
+$a->strings["Add New Contact"] = "Přidat nový kontakt";
+$a->strings["Enter address or web location"] = "Zadejte adresu nebo umístění webu";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Příklad: jan@priklad.cz, http://priklad.cz/lucie";
+$a->strings["%d invitation available"] = [
+	0 => "%d pozvánka k dispozici",
+	1 => "%d pozvánky k dispozici",
+	2 => "%d pozvánky k dispozici",
+	3 => "%d pozvánek k dispozici",
+];
+$a->strings["Networks"] = "Sítě";
+$a->strings["All Networks"] = "Všechny sítě";
+$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 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ě";
+$a->strings["Twice daily"] = "Dvakrát denně";
+$a->strings["Daily"] = "Denně";
+$a->strings["Weekly"] = "Týdně";
+$a->strings["Monthly"] = "Měsíčně";
+$a->strings["OStatus"] = "OStatus";
+$a->strings["RSS/Atom"] = "RSS/Atom";
+$a->strings["Zot!"] = "Zot!";
+$a->strings["LinkedIn"] = "LinkedIn";
+$a->strings["XMPP/IM"] = "XMPP/IM";
+$a->strings["MySpace"] = "MySpace";
+$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["pnut"] = "pnut";
+$a->strings["Male"] = "Muž";
+$a->strings["Female"] = "Ž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";
+$a->strings["Intersex"] = "Intersexuál";
+$a->strings["Transsexual"] = "Transsexuál";
+$a->strings["Hermaphrodite"] = "Hermafrodit";
+$a->strings["Neuter"] = "Střední rod";
+$a->strings["Non-specific"] = "Nespecifikováno";
+$a->strings["Other"] = "Jiné";
+$a->strings["Males"] = "Muži";
+$a->strings["Females"] = "Ženy";
+$a->strings["Gay"] = "Gay";
+$a->strings["Lesbian"] = "Lesba";
+$a->strings["No Preference"] = "Bez preferencí";
+$a->strings["Bisexual"] = "Bisexuál";
+$a->strings["Autosexual"] = "Autosexuál";
+$a->strings["Abstinent"] = "Abstinent";
+$a->strings["Virgin"] = "Panic/panna";
+$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"] = "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["Married"] = "Ženatý/vdaná";
+$a->strings["Imaginarily married"] = "Pomyslně ženatý/vdaná";
+$a->strings["Partners"] = "Partneři";
+$a->strings["Cohabiting"] = "Žiji ve společné domácnosti";
+$a->strings["Common law"] = "Zvykové právo";
+$a->strings["Happy"] = "Šťastný/á";
+$a->strings["Not looking"] = "Nehledající";
+$a->strings["Swinger"] = "Swinger";
+$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"] = "Nezájem";
+$a->strings["Ask me"] = "Zeptej se mě";
+$a->strings["General Features"] = "Obecné vlastnosti";
+$a->strings["Multiple Profiles"] = "Vícenásobné profily";
+$a->strings["Ability to create multiple profiles"] = "Schopnost vytvořit vícenásobné profily";
+$a->strings["Photo Location"] = "Poloha fotky";
+$a->strings["Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map."] = "Metadata fotek jsou normálně odebrána. Tato funkce před odebrání metadat extrahuje polohu (pokud je k dispozici) a propojí jej s mapou.";
+$a->strings["Export Public Calendar"] = "Exportovat veřejný kalendář";
+$a->strings["Ability for visitors to download the public calendar"] = "Umožnit návštěvníkům stáhnout si veřejný kalendář";
+$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 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";
+$a->strings["List Forums"] = "Vypsat fóra";
+$a->strings["Enable widget to display the forums your are connected with"] = "Povolením widgetu zobrazíte fóra, se kterými jste spojen/a";
+$a->strings["Group Filter"] = "Skupinový filtr";
+$a->strings["Enable widget to display Network posts only from selected group"] = "Povolením widgetu zobrazíte příspěvky v Síti pouze ze zvolené skupiny";
+$a->strings["Network Filter"] = "Síťový filtr";
+$a->strings["Enable widget to display Network posts only from selected network"] = "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené sítě";
+$a->strings["Save search terms for re-use"] = "Uložit kritéria vyhledávání pro znovupoužití";
+$a->strings["Network Tabs"] = "Síťové záložky";
+$a->strings["Network Personal Tab"] = "Síťová záložka Osobní";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Povolit záložku pro zobrazení pouze síťových příspěvků, na které jste reagoval/a";
+$a->strings["Network New Tab"] = "Síťová záložka Nové";
+$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Povolit záložku pro zobrazení pouze nových příspěvků (za posledních 12 hodin)";
+$a->strings["Network Shared Links Tab"] = "Záložka Síťové sdílené odkazy ";
+$a->strings["Enable tab to display only Network posts with links in them"] = "Povolit záložky pro zobrazování pouze Síťových příspěvků s vazbou na ně";
+$a->strings["Post/Comment Tools"] = "Nástroje příspěvků/komentářů";
+$a->strings["Multiple Deletion"] = "Vícenásobné mazání";
+$a->strings["Select and delete multiple posts/comments at once"] = "Označit a smazat vícero příspěvků/komentářů najednou";
+$a->strings["Edit Sent Posts"] = "Upravovat odeslané příspěvky";
+$a->strings["Edit and correct posts and comments after sending"] = "Editovat a opravit příspěvky a komentáře po odeslání";
+$a->strings["Tagging"] = "Štítkování";
+$a->strings["Ability to tag existing posts"] = "Schopnost přidávat štítky ke stávajícím příspěvkům";
+$a->strings["Post Categories"] = "Kategorie příspěvků";
+$a->strings["Add categories to your posts"] = "Přidat kategorie k Vašim příspěvkům";
+$a->strings["Ability to file posts under folders"] = "Možnost řadit příspěvky do složek";
+$a->strings["Dislike Posts"] = "Označit příspěvky jako neoblíbené";
+$a->strings["Ability to dislike posts/comments"] = "Možnost označovat příspěvky/komentáře jako neoblíbené";
+$a->strings["Star Posts"] = "Označit příspěvky hvězdou";
+$a->strings["Ability to mark special posts with a star indicator"] = "Možnost označovat zvláštní příspěvky indikátorem hvězdy";
+$a->strings["Mute Post Notifications"] = "Ztlumit oznámení o příspěvcích";
+$a->strings["Ability to mute notifications for a thread"] = "Možnost ztlumit oznámení pro vlákno";
+$a->strings["Advanced Profile Settings"] = "Pokročilá nastavení profilu";
+$a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Ukázat návštěvníkům veřejná komunitní fóra na stránce pokročilého profilu";
+$a->strings["Tag Cloud"] = "Štítkový oblak";
+$a->strings["Provide a personal tag cloud on your profile page"] = "Poskytne na Vaší profilové stránce osobní \"štítkový oblak\"";
+$a->strings["Display Membership Date"] = "Zobrazit datum členství";
+$a->strings["Display membership date in profile"] = "Zobrazit v profilu datum připojení";
+$a->strings["Nothing new here"] = "Zde není nic nového";
+$a->strings["Clear notifications"] = "Smazat notifikace";
+$a->strings["Personal notes"] = "Osobní poznámky";
+$a->strings["Your personal notes"] = "Vaše osobní poznámky";
+$a->strings["Sign in"] = "Přihlásit se";
+$a->strings["Home Page"] = "Domovská stránka";
+$a->strings["Create an account"] = "Vytvořit účet";
+$a->strings["Help and documentation"] = "Nápověda a dokumentace";
+$a->strings["Apps"] = "Aplikace";
+$a->strings["Addon applications, utilities, games"] = "Doplňkové aplikace, nástroje, hry";
+$a->strings["Search site content"] = "Hledání na stránkách tohoto webu";
+$a->strings["Community"] = "Komunita";
+$a->strings["Conversations on this and other servers"] = "Konverzace na tomto a jiných serverech";
+$a->strings["Directory"] = "Adresář";
+$a->strings["People directory"] = "Adresář";
+$a->strings["Information about this friendica instance"] = "Informace o této instanci Friendica";
+$a->strings["Terms of Service of this Friendica instance"] = "Podmínky používání této instance Friendica";
+$a->strings["Network Reset"] = "Reset sítě";
+$a->strings["Load Network page with no filters"] = "Načíst stránku Síť bez filtrů";
+$a->strings["Friend Requests"] = "Žádosti přátel";
+$a->strings["See all notifications"] = "Zobrazit všechny upozornění";
+$a->strings["Mark all system notifications seen"] = "Označit všechny upozornění systému jako přečtené";
+$a->strings["Inbox"] = "Doručená pošta";
+$a->strings["Outbox"] = "Odeslaná pošta";
+$a->strings["Manage"] = "Spravovat";
+$a->strings["Manage other pages"] = "Spravovat jiné stránky";
+$a->strings["Manage/Edit Profiles"] = "Spravovat/Editovat Profily";
+$a->strings["Site setup and configuration"] = "Nastavení webu a konfigurace";
+$a->strings["Navigation"] = "Navigace";
+$a->strings["Site map"] = "Mapa webu";
+$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["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ý protokol zdroje";
+$a->strings["Invalid link protocol"] = "Neplatný protokol odkazu";
diff --git a/view/lang/de/messages.po b/view/lang/de/messages.po
index adf1aba2f..1a610dab3 100644
--- a/view/lang/de/messages.po
+++ b/view/lang/de/messages.po
@@ -18,7 +18,8 @@
 # greeneyedred <greeneyedred@googlemail.com>, 2012
 # Hauke <hzuehl@phone-talk.net>, 2012,2018
 # Herbert Thielen <thielen@hs-worms.de>, 2017
-# hoergen oostende <hoergen@hoergen.org>, 2018
+# hoergen <hoergen@hoergen.org>, 2018
+# hoergen <hoergen@hoergen.org>, 2018
 # Hauke <hzuehl@phone-talk.net>, 2011-2012
 # Johannes Schwab <johannes_schwab@gmx.de>, 2015
 # leberwurscht <leberwurscht@hoegners.de>, 2012
@@ -41,8 +42,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-30 05:30+0200\n"
-"PO-Revision-Date: 2018-05-31 04:27+0000\n"
+"POT-Creation-Date: 2018-08-25 15:34+0000\n"
+"PO-Revision-Date: 2018-08-27 08:22+0000\n"
 "Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -51,724 +52,533 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/enotify.php:31
-msgid "Friendica Notification"
-msgstr "Friendica-Benachrichtigung"
-
-#: include/enotify.php:34
-msgid "Thank You,"
-msgstr "Danke,"
-
-#: include/enotify.php:37
-#, php-format
-msgid "%s Administrator"
-msgstr "der Administrator von %s"
-
-#: include/enotify.php:39
-#, php-format
-msgid "%1$s, %2$s Administrator"
-msgstr "%1$s, %2$s Administrator"
-
-#: include/enotify.php:95
-#, php-format
-msgid "[Friendica:Notify] New mail received at %s"
-msgstr "[Friendica-Meldung] Neue Email erhalten um %s"
-
-#: include/enotify.php:97
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr "%1$s hat Dir eine neue private Nachricht um %2$s geschickt."
-
-#: include/enotify.php:98
-msgid "a private message"
-msgstr "eine private Nachricht"
-
-#: include/enotify.php:98
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s schickte Dir %2$s."
-
-#: include/enotify.php:100
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Bitte besuche %s, um Deine privaten Nachrichten anzusehen und/oder zu beantworten."
-
-#: include/enotify.php:138
-#, php-format
-msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
-msgstr "%1$s kommentierte [url=%2$s]a %3$s[/url]"
-
-#: include/enotify.php:146
-#, php-format
-msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
-msgstr "%1$s kommentierte [url=%2$s]%3$ss %4$s[/url]"
-
-#: include/enotify.php:156
-#, php-format
-msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
-msgstr "%1$s kommentierte [url=%2$s]deinen %3$s[/url]"
-
-#: include/enotify.php:168
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Friendica-Meldung] Kommentar zum Beitrag #%1$d von %2$s"
-
-#: include/enotify.php:170
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr "%s hat einen Beitrag kommentiert, dem Du folgst."
-
-#: include/enotify.php:173 include/enotify.php:188 include/enotify.php:203
-#: include/enotify.php:218 include/enotify.php:237 include/enotify.php:252
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
-
-#: include/enotify.php:180
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
-msgstr "[Friendica-Meldung] %s hat auf Deine Pinnwand geschrieben"
-
-#: include/enotify.php:182
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr "%1$s schrieb um %2$s auf Deine Pinnwand"
-
-#: include/enotify.php:183
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
-msgstr "%1$s hat etwas auf [url=%2$s]Deiner Pinnwand[/url] gepostet"
-
-#: include/enotify.php:195
-#, php-format
-msgid "[Friendica:Notify] %s tagged you"
-msgstr "[Friendica-Meldung] %s hat Dich erwähnt"
-
-#: include/enotify.php:197
-#, php-format
-msgid "%1$s tagged you at %2$s"
-msgstr "%1$s erwähnte Dich auf %2$s"
-
-#: include/enotify.php:198
-#, php-format
-msgid "%1$s [url=%2$s]tagged you[/url]."
-msgstr "%1$s [url=%2$s]erwähnte Dich[/url]."
-
-#: include/enotify.php:210
-#, php-format
-msgid "[Friendica:Notify] %s shared a new post"
-msgstr "[Friendica Benachrichtigung] %s hat einen Beitrag geteilt"
-
-#: include/enotify.php:212
-#, php-format
-msgid "%1$s shared a new post at %2$s"
-msgstr "%1$s hat einen neuen Beitrag auf %2$s geteilt"
-
-#: include/enotify.php:213
-#, php-format
-msgid "%1$s [url=%2$s]shared a post[/url]."
-msgstr "%1$s [url=%2$s]hat einen Beitrag geteilt[/url]."
-
-#: include/enotify.php:225
-#, php-format
-msgid "[Friendica:Notify] %1$s poked you"
-msgstr "[Friendica-Meldung] %1$s hat Dich angestupst"
-
-#: include/enotify.php:227
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr "%1$s hat Dich auf %2$s angestupst"
-
-#: include/enotify.php:228
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr "%1$s [url=%2$s]hat Dich angestupst[/url]."
-
-#: include/enotify.php:244
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
-msgstr "[Friendica-Meldung] %s hat Deinen Beitrag getaggt"
-
-#: include/enotify.php:246
-#, php-format
-msgid "%1$s tagged your post at %2$s"
-msgstr "%1$s erwähnte Deinen Beitrag auf %2$s"
-
-#: include/enotify.php:247
-#, php-format
-msgid "%1$s tagged [url=%2$s]your post[/url]"
-msgstr "%1$s erwähnte [url=%2$s]Deinen Beitrag[/url]"
-
-#: include/enotify.php:259
-msgid "[Friendica:Notify] Introduction received"
-msgstr "[Friendica-Meldung] Kontaktanfrage erhalten"
-
-#: include/enotify.php:261
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
-msgstr "Du hast eine Kontaktanfrage von '%1$s' auf %2$s erhalten"
-
-#: include/enotify.php:262
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
-msgstr "Du hast eine [url=%1$s]Kontaktanfrage[/url] von %2$s erhalten."
-
-#: include/enotify.php:267 include/enotify.php:313
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Hier kannst Du das Profil betrachten: %s"
-
-#: include/enotify.php:269
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."
-
-#: include/enotify.php:277
-msgid "[Friendica:Notify] A new person is sharing with you"
-msgstr "[Friendica Benachrichtigung] Eine neue Person teilt mit Dir"
-
-#: include/enotify.php:279 include/enotify.php:280
-#, php-format
-msgid "%1$s is sharing with you at %2$s"
-msgstr "%1$s teilt mit Dir auf %2$s"
-
-#: include/enotify.php:287
-msgid "[Friendica:Notify] You have a new follower"
-msgstr "[Friendica Benachrichtigung] Du hast einen neuen Kontakt auf "
-
-#: include/enotify.php:289 include/enotify.php:290
-#, php-format
-msgid "You have a new follower at %2$s : %1$s"
-msgstr "Du hast einen neuen Kontakt auf %2$s: %1$s"
-
-#: include/enotify.php:302
-msgid "[Friendica:Notify] Friend suggestion received"
-msgstr "[Friendica-Meldung] Kontaktvorschlag erhalten"
-
-#: include/enotify.php:304
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr "Du hast einen Kontakt-Vorschlag von '%1$s' auf %2$s erhalten"
-
-#: include/enotify.php:305
-#, php-format
-msgid ""
-"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
-msgstr "Du hast einen [url=%1$s]Kontakt-Vorschlag[/url] %2$s von %3$s erhalten."
-
-#: include/enotify.php:311
-msgid "Name:"
-msgstr "Name:"
-
-#: include/enotify.php:312
-msgid "Photo:"
-msgstr "Foto:"
-
-#: include/enotify.php:315
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."
-
-#: include/enotify.php:323 include/enotify.php:338
-msgid "[Friendica:Notify] Connection accepted"
-msgstr "[Friendica-Benachrichtigung] Kontaktanfrage bestätigt"
-
-#: include/enotify.php:325 include/enotify.php:340
-#, php-format
-msgid "'%1$s' has accepted your connection request at %2$s"
-msgstr "'%1$s' hat Deine Kontaktanfrage auf  %2$s bestätigt"
-
-#: include/enotify.php:326 include/enotify.php:341
-#, php-format
-msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
-msgstr "%2$s hat Deine [url=%1$s]Kontaktanfrage[/url] akzeptiert."
-
-#: include/enotify.php:331
-msgid ""
-"You are now mutual friends and may exchange status updates, photos, and "
-"email without restriction."
-msgstr "Ihr seid nun beidseitige Kontakte und könnt Statusmitteilungen, Bilder und Emails ohne Einschränkungen austauschen."
-
-#: include/enotify.php:333
-#, php-format
-msgid "Please visit %s if you wish to make any changes to this relationship."
-msgstr "Bitte besuche %s, wenn Du Änderungen an eurer Beziehung vornehmen willst."
-
-#: include/enotify.php:346
-#, php-format
-msgid ""
-"'%1$s' has chosen to accept you a fan, which restricts some forms of "
-"communication - such as private messaging and some profile interactions. If "
-"this is a celebrity or community page, these settings were applied "
-"automatically."
-msgstr "'%1$s' hat sich entschieden Dich als Fan zu akzeptieren, dies schränkt einige Kommunikationswege - wie private Nachrichten und einige Interaktionsmöglichkeiten auf der Profilseite - ein. Wenn dies eine Berühmtheiten- oder Gemeinschaftsseite ist, werden diese Einstellungen automatisch vorgenommen."
-
-#: include/enotify.php:348
-#, php-format
-msgid ""
-"'%1$s' may choose to extend this into a two-way or more permissive "
-"relationship in the future."
-msgstr "'%1$s' kann den Kontaktstatus zu einem späteren Zeitpunkt erweitern und diese Einschränkungen aufheben. "
-
-#: include/enotify.php:350
-#, php-format
-msgid "Please visit %s  if you wish to make any changes to this relationship."
-msgstr "Bitte besuche %s, wenn Du Änderungen an eurer Beziehung vornehmen willst."
-
-#: include/enotify.php:360 mod/removeme.php:45
-msgid "[Friendica System Notify]"
-msgstr "[Friendica System Benachrichtigung]"
-
-#: include/enotify.php:360
-msgid "registration request"
-msgstr "Registrierungsanfrage"
-
-#: include/enotify.php:362
-#, php-format
-msgid "You've received a registration request from '%1$s' at %2$s"
-msgstr "Du hast eine Registrierungsanfrage von %2$s auf '%1$s' erhalten"
-
-#: include/enotify.php:363
-#, php-format
-msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
-msgstr "Du hast eine [url=%1$s]Registrierungsanfrage[/url] von %2$s erhalten."
-
-#: include/enotify.php:368
-#, php-format
-msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
-msgstr "Kompletter Name:\t%1$s\\nURL der Seite:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
-
-#: include/enotify.php:374
-#, php-format
-msgid "Please visit %s to approve or reject the request."
-msgstr "Bitte besuche %s um die Anfrage zu bearbeiten."
-
-#: include/security.php:81
-msgid "Welcome "
-msgstr "Willkommen "
-
-#: include/security.php:82
-msgid "Please upload a profile photo."
-msgstr "Bitte lade ein Profilbild hoch."
-
-#: include/security.php:84
-msgid "Welcome back "
-msgstr "Willkommen zurück "
-
-#: include/security.php:440
-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 "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
-
-#: include/text.php:303
-msgid "newer"
-msgstr "neuer"
-
-#: include/text.php:304
-msgid "older"
-msgstr "älter"
-
-#: include/text.php:309
-msgid "first"
-msgstr "erste"
-
-#: include/text.php:310
-msgid "prev"
-msgstr "vorige"
-
-#: include/text.php:344
-msgid "next"
-msgstr "nächste"
-
-#: include/text.php:345
-msgid "last"
-msgstr "letzte"
-
-#: include/text.php:399
-msgid "Loading more entries..."
-msgstr "lade weitere Einträge..."
-
-#: include/text.php:400
-msgid "The end"
-msgstr "Das Ende"
-
-#: include/text.php:885
-msgid "No contacts"
-msgstr "Keine Kontakte"
-
-#: include/text.php:909
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] "%d Kontakt"
-msgstr[1] "%d Kontakte"
-
-#: include/text.php:922
-msgid "View Contacts"
-msgstr "Kontakte anzeigen"
-
-#: include/text.php:1011 mod/filer.php:35 mod/editpost.php:110
-#: mod/notes.php:67
-msgid "Save"
-msgstr "Speichern"
-
-#: include/text.php:1011
-msgid "Follow"
-msgstr "Folge"
-
-#: include/text.php:1017 mod/search.php:155 src/Content/Nav.php:142
-msgid "Search"
-msgstr "Suche"
-
-#: include/text.php:1020 src/Content/Nav.php:58
-msgid "@name, !forum, #tags, content"
-msgstr "@name, !forum, #tags, content"
-
-#: include/text.php:1026 src/Content/Nav.php:145
-msgid "Full Text"
-msgstr "Volltext"
-
-#: include/text.php:1027 src/Content/Widget/TagCloud.php:54
-#: src/Content/Nav.php:146
-msgid "Tags"
-msgstr "Tags"
-
-#: include/text.php:1028 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 "Kontakte"
-
-#: include/text.php:1031 view/theme/vier/theme.php:253
-#: src/Content/ForumManager.php:125 src/Content/Nav.php:151
+#: index.php:261 mod/apps.php:14
+msgid "You must be logged in to use addons. "
+msgstr "Sie müssen angemeldet sein um Addons benutzen zu können."
+
+#: index.php:308 mod/fetch.php:20 mod/fetch.php:47 mod/fetch.php:54
+#: mod/help.php:62
+msgid "Not Found"
+msgstr "Nicht gefunden"
+
+#: 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 "Seite nicht gefunden."
+
+#: index.php:431 mod/group.php:83 mod/profperm.php:29
+msgid "Permission denied"
+msgstr "Zugriff verweigert"
+
+#: 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 "Zugriff verweigert."
+
+#: index.php:460
+msgid "toggle mobile"
+msgstr "auf/von Mobile Ansicht wechseln"
+
+#: view/theme/duepuntozero/config.php:54 src/Model/User.php:544
+msgid "default"
+msgstr "Standard"
+
+#: 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 "Senden"
+
+#: 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 "Themeneinstellungen"
+
+#: view/theme/duepuntozero/config.php:74
+msgid "Variations"
+msgstr "Variationen"
+
+#: view/theme/quattro/config.php:76
+msgid "Alignment"
+msgstr "Ausrichtung"
+
+#: view/theme/quattro/config.php:76
+msgid "Left"
+msgstr "Links"
+
+#: view/theme/quattro/config.php:76
+msgid "Center"
+msgstr "Mitte"
+
+#: view/theme/quattro/config.php:77
+msgid "Color scheme"
+msgstr "Farbschema"
+
+#: view/theme/quattro/config.php:78
+msgid "Posts font size"
+msgstr "Schriftgröße in Beiträgen"
+
+#: view/theme/quattro/config.php:79
+msgid "Textareas font size"
+msgstr "Schriftgröße in Eingabefeldern"
+
+#: view/theme/vier/config.php:75
+msgid "Comma separated list of helper forums"
+msgstr "Komma-Separierte Liste der Helfer-Foren"
+
+#: view/theme/vier/config.php:115 src/Core/ACL.php:298
+msgid "don't show"
+msgstr "nicht zeigen"
+
+#: view/theme/vier/config.php:115 src/Core/ACL.php:297
+msgid "show"
+msgstr "zeigen"
+
+#: view/theme/vier/config.php:122
+msgid "Set style"
+msgstr "Stil auswählen"
+
+#: view/theme/vier/config.php:123
+msgid "Community Pages"
+msgstr "Foren"
+
+#: view/theme/vier/config.php:124 view/theme/vier/theme.php:149
+msgid "Community Profiles"
+msgstr "Community-Profile"
+
+#: view/theme/vier/config.php:125
+msgid "Help or @NewHere ?"
+msgstr "Hilfe oder @NewHere"
+
+#: view/theme/vier/config.php:126 view/theme/vier/theme.php:386
+msgid "Connect Services"
+msgstr "Verbinde Dienste"
+
+#: view/theme/vier/config.php:127
+msgid "Find Friends"
+msgstr "Kontakte finden"
+
+#: view/theme/vier/config.php:128 view/theme/vier/theme.php:179
+msgid "Last users"
+msgstr "Letzte Nutzer"
+
+#: view/theme/vier/theme.php:197 src/Content/Widget.php:59
+msgid "Find People"
+msgstr "Leute finden"
+
+#: view/theme/vier/theme.php:198 src/Content/Widget.php:60
+msgid "Enter name or interest"
+msgstr "Name oder Interessen eingeben"
+
+#: 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 "Verbinden/Folgen"
+
+#: view/theme/vier/theme.php:200 src/Content/Widget.php:62
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Beispiel: Robert Morgenstein, Angeln"
+
+#: view/theme/vier/theme.php:201 mod/directory.php:214 mod/contacts.php:842
+#: src/Content/Widget.php:63
+msgid "Find"
+msgstr "Finde"
+
+#: view/theme/vier/theme.php:202 mod/suggest.php:117 src/Content/Widget.php:64
+msgid "Friend Suggestions"
+msgstr "Kontaktvorschläge"
+
+#: view/theme/vier/theme.php:203 src/Content/Widget.php:65
+msgid "Similar Interests"
+msgstr "Ähnliche Interessen"
+
+#: view/theme/vier/theme.php:204 src/Content/Widget.php:66
+msgid "Random Profile"
+msgstr "Zufälliges Profil"
+
+#: view/theme/vier/theme.php:205 src/Content/Widget.php:67
+msgid "Invite Friends"
+msgstr "Freunde einladen"
+
+#: view/theme/vier/theme.php:206 mod/directory.php:207
+#: src/Content/Widget.php:68
+msgid "Global Directory"
+msgstr "Weltweites Verzeichnis"
+
+#: view/theme/vier/theme.php:208 src/Content/Widget.php:70
+msgid "Local Directory"
+msgstr "Lokales Verzeichnis"
+
+#: view/theme/vier/theme.php:251 include/text.php:909 src/Content/Nav.php:151
+#: src/Content/ForumManager.php:125
 msgid "Forums"
 msgstr "Foren"
 
-#: include/text.php:1075
-msgid "poke"
-msgstr "anstupsen"
+#: view/theme/vier/theme.php:253 src/Content/ForumManager.php:127
+msgid "External link to forum"
+msgstr "Externer Link zum Forum"
 
-#: include/text.php:1075
-msgid "poked"
-msgstr "stupste"
+#: 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 "mehr anzeigen"
 
-#: include/text.php:1076
-msgid "ping"
-msgstr "anpingen"
+#: view/theme/vier/theme.php:289
+msgid "Quick Start"
+msgstr "Schnell-Start"
 
-#: include/text.php:1076
-msgid "pinged"
-msgstr "pingte"
+#: view/theme/vier/theme.php:295 mod/help.php:56 src/Content/Nav.php:134
+msgid "Help"
+msgstr "Hilfe"
 
-#: include/text.php:1077
-msgid "prod"
-msgstr "knuffen"
+#: view/theme/frio/config.php:102
+msgid "Custom"
+msgstr "Benutzerdefiniert"
 
-#: include/text.php:1077
-msgid "prodded"
-msgstr "knuffte"
+#: view/theme/frio/config.php:114
+msgid "Note"
+msgstr "Hinweis"
 
-#: include/text.php:1078
-msgid "slap"
-msgstr "ohrfeigen"
+#: view/theme/frio/config.php:114
+msgid "Check image permissions if all users are allowed to see the image"
+msgstr "Überprüfe, dass alle Benutzer die Berechtigung haben dieses Bild anzusehen"
 
-#: include/text.php:1078
-msgid "slapped"
-msgstr "ohrfeigte"
+#: view/theme/frio/config.php:121
+msgid "Select color scheme"
+msgstr "Farbschema auswählen"
 
-#: include/text.php:1079
-msgid "finger"
-msgstr "befummeln"
+#: view/theme/frio/config.php:122
+msgid "Navigation bar background color"
+msgstr "Hintergrundfarbe der Navigationsleiste"
 
-#: include/text.php:1079
-msgid "fingered"
-msgstr "befummelte"
+#: view/theme/frio/config.php:123
+msgid "Navigation bar icon color "
+msgstr "Icon Farbe in der Navigationsleiste"
 
-#: include/text.php:1080
-msgid "rebuff"
-msgstr "eine Abfuhr erteilen"
+#: view/theme/frio/config.php:124
+msgid "Link color"
+msgstr "Linkfarbe"
 
-#: include/text.php:1080
-msgid "rebuffed"
-msgstr "abfuhrerteilte"
+#: view/theme/frio/config.php:125
+msgid "Set the background color"
+msgstr "Hintergrundfarbe festlegen"
 
-#: include/text.php:1094 mod/settings.php:935 src/Model/Event.php:379
-msgid "Monday"
-msgstr "Montag"
+#: view/theme/frio/config.php:126
+msgid "Content background opacity"
+msgstr "Opazität des Hintergrunds von Beiträgen"
 
-#: include/text.php:1094 src/Model/Event.php:380
-msgid "Tuesday"
-msgstr "Dienstag"
+#: view/theme/frio/config.php:127
+msgid "Set the background image"
+msgstr "Hintergrundbild festlegen"
 
-#: include/text.php:1094 src/Model/Event.php:381
-msgid "Wednesday"
-msgstr "Mittwoch"
+#: view/theme/frio/config.php:128
+msgid "Background image style"
+msgstr "Stiel des Hintergrundbildes"
 
-#: include/text.php:1094 src/Model/Event.php:382
-msgid "Thursday"
-msgstr "Donnerstag"
+#: view/theme/frio/config.php:133
+msgid "Login page background image"
+msgstr "Hintergrundbild der Login-Seite"
 
-#: include/text.php:1094 src/Model/Event.php:383
-msgid "Friday"
-msgstr "Freitag"
+#: view/theme/frio/config.php:137
+msgid "Login page background color"
+msgstr "Hintergrundfarbe der Login-Seite"
 
-#: include/text.php:1094 src/Model/Event.php:384
-msgid "Saturday"
-msgstr "Samstag"
+#: view/theme/frio/config.php:137
+msgid "Leave background image and color empty for theme defaults"
+msgstr "Wenn die Theme Vorgaben verwendet werden sollen, lass bitte die Felder für die Hintergrundfarbe und das Hintergrundbild leer."
 
-#: include/text.php:1094 mod/settings.php:935 src/Model/Event.php:378
-msgid "Sunday"
-msgstr "Sonntag"
+#: view/theme/frio/theme.php:248
+msgid "Guest"
+msgstr "Gast"
 
-#: include/text.php:1098 src/Model/Event.php:399
-msgid "January"
-msgstr "Januar"
+#: view/theme/frio/theme.php:253
+msgid "Visitor"
+msgstr "Besucher"
 
-#: include/text.php:1098 src/Model/Event.php:400
-msgid "February"
-msgstr "Februar"
+#: view/theme/frio/theme.php:266 src/Module/Login.php:309
+#: src/Content/Nav.php:97
+msgid "Logout"
+msgstr "Abmelden"
 
-#: include/text.php:1098 src/Model/Event.php:401
-msgid "March"
-msgstr "März"
+#: view/theme/frio/theme.php:266 src/Content/Nav.php:97
+msgid "End this session"
+msgstr "Diese Sitzung beenden"
 
-#: include/text.php:1098 src/Model/Event.php:402
-msgid "April"
-msgstr "April"
+#: 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 "Status"
 
-#: include/text.php:1098 include/text.php:1115 src/Model/Event.php:390
-#: src/Model/Event.php:403
-msgid "May"
-msgstr "Mai"
+#: view/theme/frio/theme.php:269 src/Content/Nav.php:100
+#: src/Content/Nav.php:186
+msgid "Your posts and conversations"
+msgstr "Deine Beiträge und Unterhaltungen"
 
-#: include/text.php:1098 src/Model/Event.php:404
-msgid "June"
-msgstr "Juni"
+#: 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 "Profil"
 
-#: include/text.php:1098 src/Model/Event.php:405
-msgid "July"
-msgstr "Juli"
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:101
+msgid "Your profile page"
+msgstr "Deine Profilseite"
 
-#: include/text.php:1098 src/Model/Event.php:406
-msgid "August"
-msgstr "August"
+#: view/theme/frio/theme.php:271 mod/fbrowser.php:35 src/Model/Profile.php:891
+#: src/Content/Nav.php:102
+msgid "Photos"
+msgstr "Bilder"
 
-#: include/text.php:1098 src/Model/Event.php:407
-msgid "September"
-msgstr "September"
+#: view/theme/frio/theme.php:271 src/Content/Nav.php:102
+msgid "Your photos"
+msgstr "Deine Fotos"
 
-#: include/text.php:1098 src/Model/Event.php:408
-msgid "October"
-msgstr "Oktober"
+#: view/theme/frio/theme.php:272 src/Model/Profile.php:899
+#: src/Model/Profile.php:902 src/Content/Nav.php:103
+msgid "Videos"
+msgstr "Videos"
 
-#: include/text.php:1098 src/Model/Event.php:409
-msgid "November"
-msgstr "November"
+#: view/theme/frio/theme.php:272 src/Content/Nav.php:103
+msgid "Your videos"
+msgstr "Deine Videos"
 
-#: include/text.php:1098 src/Model/Event.php:410
-msgid "December"
-msgstr "Dezember"
+#: 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 "Veranstaltungen"
 
-#: include/text.php:1112 src/Model/Event.php:371
-msgid "Mon"
-msgstr "Mo"
+#: view/theme/frio/theme.php:273 src/Content/Nav.php:104
+msgid "Your events"
+msgstr "Deine Ereignisse"
 
-#: include/text.php:1112 src/Model/Event.php:372
-msgid "Tue"
-msgstr "Di"
+#: view/theme/frio/theme.php:276 mod/admin.php:771
+#: src/Core/NotificationsManager.php:179 src/Content/Nav.php:183
+msgid "Network"
+msgstr "Netzwerk"
 
-#: include/text.php:1112 src/Model/Event.php:373
-msgid "Wed"
-msgstr "Mi"
+#: view/theme/frio/theme.php:276 src/Content/Nav.php:183
+msgid "Conversations from your friends"
+msgstr "Unterhaltungen Deiner Kontakte"
 
-#: include/text.php:1112 src/Model/Event.php:374
-msgid "Thu"
-msgstr "Do"
+#: 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 "Ereignisse und Kalender"
 
-#: include/text.php:1112 src/Model/Event.php:375
-msgid "Fri"
-msgstr "Fr"
+#: view/theme/frio/theme.php:278 mod/message.php:127 src/Content/Nav.php:196
+msgid "Messages"
+msgstr "Nachrichten"
 
-#: include/text.php:1112 src/Model/Event.php:376
-msgid "Sat"
-msgstr "Sa"
+#: view/theme/frio/theme.php:278 src/Content/Nav.php:196
+msgid "Private mail"
+msgstr "Private E-Mail"
 
-#: include/text.php:1112 src/Model/Event.php:370
-msgid "Sun"
-msgstr "So"
+#: 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 "Einstellungen"
 
-#: include/text.php:1115 src/Model/Event.php:386
-msgid "Jan"
-msgstr "Jan"
+#: view/theme/frio/theme.php:279 src/Content/Nav.php:207
+msgid "Account settings"
+msgstr "Kontoeinstellungen"
 
-#: include/text.php:1115 src/Model/Event.php:387
-msgid "Feb"
-msgstr "Feb"
+#: 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 "Kontakte"
 
-#: include/text.php:1115 src/Model/Event.php:388
-msgid "Mar"
-msgstr "März"
+#: view/theme/frio/theme.php:280 src/Content/Nav.php:213
+msgid "Manage/edit friends and contacts"
+msgstr " Kontakte verwalten/editieren"
 
-#: include/text.php:1115 src/Model/Event.php:389
-msgid "Apr"
-msgstr "Apr"
+#: view/theme/frio/theme.php:367 include/conversation.php:866
+msgid "Follow Thread"
+msgstr "Folge der Unterhaltung"
 
-#: include/text.php:1115 src/Model/Event.php:392
-msgid "Jul"
-msgstr "Juli"
+#: view/theme/frio/php/Image.php:24
+msgid "Top Banner"
+msgstr "Top Banner"
 
-#: include/text.php:1115 src/Model/Event.php:393
-msgid "Aug"
-msgstr "Aug"
+#: 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 "Skaliere das Hintergrundbild so, dass es die Breite der Seite einnimmt und fülle den Rest der Seite mit der Hintergrundfarbe bei langen Seiten."
 
-#: include/text.php:1115
-msgid "Sep"
-msgstr "Sep"
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
+msgstr "Vollbildmodus"
 
-#: include/text.php:1115 src/Model/Event.php:395
-msgid "Oct"
-msgstr "Okt"
+#: view/theme/frio/php/Image.php:25
+msgid ""
+"Resize image to fill entire screen, clipping either the right or the bottom."
+msgstr "Skaliere das Bild so, dass es den gesamten Bildschirm füllt. Hierfür wird entweder die Breite oder die Höhe des Bildes automatisch abgeschnitten."
 
-#: include/text.php:1115 src/Model/Event.php:396
-msgid "Nov"
-msgstr "Nov"
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
+msgstr "Mosaik in einer Zeile"
 
-#: include/text.php:1115 src/Model/Event.php:397
-msgid "Dec"
-msgstr "Dez"
+#: view/theme/frio/php/Image.php:26
+msgid ""
+"Resize image to repeat it on a single row, either vertical or horizontal."
+msgstr "Skaliere das Bild so, dass es in einer einzelnen Reihe, entweder horizontal oder vertikal, wiederholt wird."
 
-#: include/text.php:1255
+#: view/theme/frio/php/Image.php:27
+msgid "Mosaic"
+msgstr "Mosaik"
+
+#: view/theme/frio/php/Image.php:27
+msgid "Repeat image to fill the screen."
+msgstr "Wiederhole das Bild um den Bildschirm zu füllen."
+
+#: update.php:194
 #, php-format
-msgid "Content warning: %s"
-msgstr "Inhaltswarnung: %s"
+msgid "%s: Updating author-id and owner-id in item and thread table. "
+msgstr "%s: Aktualisiere die author-id und owner-id in der Thread Tabelle"
 
-#: include/text.php:1325 mod/videos.php:380
-msgid "View Video"
-msgstr "Video ansehen"
+#: update.php:240
+#, php-format
+msgid "%s: Updating post-type."
+msgstr "%s: Aktualisiere Beitrags-Typ"
 
-#: include/text.php:1342
-msgid "bytes"
-msgstr "Byte"
+#: 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 "Beitrag nicht gefunden."
 
-#: include/text.php:1375 include/text.php:1386 include/text.php:1419
-msgid "Click to open/close"
-msgstr "Zum öffnen/schließen klicken"
+#: include/items.php:393
+msgid "Do you really want to delete this item?"
+msgstr "Möchtest Du wirklich dieses Item löschen?"
 
-#: include/text.php:1534
-msgid "View on separate page"
-msgstr "Auf separater Seite ansehen"
+#: 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/text.php:1535
-msgid "view on separate page"
-msgstr "auf separater Seite ansehen"
+#: 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 "Abbrechen"
 
-#: include/text.php:1540 include/text.php:1547 src/Model/Event.php:594
-msgid "link to source"
-msgstr "Link zum Originalbeitrag"
+#: include/items.php:483 src/Content/Feature.php:96
+msgid "Archives"
+msgstr "Archiv"
 
-#: include/text.php:1749 include/conversation.php:144
-#: include/conversation.php:282 src/Model/Item.php:2003
+#: include/conversation.php:151 include/conversation.php:287
+#: include/text.php:1611
 msgid "event"
 msgstr "Event"
 
-#: include/text.php:1751 include/conversation.php:152
-#: include/conversation.php:290 mod/subthread.php:97 mod/tagger.php:72
-#: src/Model/Item.php:2001
-msgid "photo"
-msgstr "Foto"
-
-#: include/text.php:1753
-msgid "activity"
-msgstr "Aktivität"
-
-#: include/text.php:1755 src/Object/Post.php:437 src/Object/Post.php:449
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "Kommentar"
-msgstr[1] "Kommentare"
-
-#: include/text.php:1758
-msgid "post"
-msgstr "Beitrag"
-
-#: include/text.php:1915
-msgid "Item filed"
-msgstr "Beitrag abgelegt"
-
-#: 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] "Das tägliche Limit von %d Beitrag wurde erreicht. Die Nachricht wurde verworfen."
-msgstr[1] "Das tägliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde verworfen."
-
-#: 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] "Das wöchentliche Limit von %d Beitrag wurde erreicht. Die Nachricht wurde verworfen."
-msgstr[1] "Das wöchentliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde verworfen."
-
-#: include/api.php:1250
-#, php-format
-msgid "Monthly posting limit of %d post reached. The post was rejected."
-msgstr "Das monatliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde verworfen."
-
-#: include/api.php:4522 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:1672 src/Model/User.php:553
-#: src/Model/User.php:561 src/Model/User.php:569
-msgid "Profile Photos"
-msgstr "Profilbilder"
-
-#: include/conversation.php:147 include/conversation.php:157
-#: include/conversation.php:285 include/conversation.php:294
-#: mod/subthread.php:97 mod/tagger.php:72 src/Model/Item.php:2001
-#: src/Protocol/Diaspora.php:1957
+#: 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:164 src/Model/Item.php:1874
-#: src/Protocol/Diaspora.php:1953
+#: 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 mag %2$ss %3$s"
 
-#: include/conversation.php:167 src/Model/Item.php:1879
+#: include/conversation.php:173
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s mag %2$ss %3$s nicht"
 
-#: include/conversation.php:170
+#: include/conversation.php:175
 #, php-format
 msgid "%1$s attends %2$s's %3$s"
 msgstr "%1$s nimmt an %2$ss %3$s teil."
 
-#: include/conversation.php:173
+#: include/conversation.php:177
 #, php-format
 msgid "%1$s doesn't attend %2$s's %3$s"
 msgstr "%1$s nimmt nicht an %2$ss %3$s teil."
 
-#: include/conversation.php:176
+#: include/conversation.php:179
 #, php-format
 msgid "%1$s attends maybe %2$s's %3$s"
 msgstr "%1$s nimmt eventuell an %2$ss %3$s teil."
 
-#: include/conversation.php:209
+#: include/conversation.php:214
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr "%1$s ist nun mit %2$s befreundet"
 
-#: include/conversation.php:250
+#: include/conversation.php:255
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr "%1$s stupste %2$s"
 
-#: include/conversation.php:304 mod/tagger.php:110
+#: 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 hat %2$ss %3$s mit %4$s getaggt"
@@ -782,561 +592,3304 @@ msgstr "Nachricht/Beitrag"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
 
-#: include/conversation.php:613 mod/profiles.php:355 mod/photos.php:1489
+#: include/conversation.php:545 mod/profiles.php:352 mod/photos.php:1507
 msgid "Likes"
 msgstr "Likes"
 
-#: include/conversation.php:613 mod/profiles.php:359 mod/photos.php:1489
+#: include/conversation.php:545 mod/profiles.php:356 mod/photos.php:1507
 msgid "Dislikes"
 msgstr "Dislikes"
 
-#: include/conversation.php:614 include/conversation.php:1644
-#: mod/photos.php:1490
+#: include/conversation.php:546 include/conversation.php:1492
+#: mod/photos.php:1508
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Teilnehmend"
 msgstr[1] "Teilnehmend"
 
-#: include/conversation.php:614 mod/photos.php:1490
+#: include/conversation.php:546 mod/photos.php:1508
 msgid "Not attending"
 msgstr "Nicht teilnehmend"
 
-#: include/conversation.php:614 mod/photos.php:1490
+#: include/conversation.php:546 mod/photos.php:1508
 msgid "Might attend"
 msgstr "Eventuell teilnehmend"
 
-#: include/conversation.php:726 mod/photos.php:1557 src/Object/Post.php:192
+#: include/conversation.php:626 mod/photos.php:1564 src/Object/Post.php:195
 msgid "Select"
 msgstr "Auswählen"
 
-#: include/conversation.php:727 mod/contacts.php:830 mod/contacts.php:1035
-#: mod/admin.php:1822 mod/photos.php:1558 mod/settings.php:730
-#: src/Object/Post.php:187
+#: 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 "Löschen"
 
-#: include/conversation.php:765 src/Object/Post.php:371
-#: src/Object/Post.php:372
+#: include/conversation.php:661 src/Object/Post.php:362
+#: src/Object/Post.php:363
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Das Profil von %s auf %s betrachten."
 
-#: include/conversation.php:777 src/Object/Post.php:359
+#: include/conversation.php:673 src/Object/Post.php:350
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: include/conversation.php:778 src/Object/Post.php:360
+#: include/conversation.php:674 src/Object/Post.php:351
 msgid "Filed under:"
 msgstr "Abgelegt unter:"
 
-#: include/conversation.php:785 src/Object/Post.php:385
+#: include/conversation.php:681 src/Object/Post.php:376
 #, php-format
 msgid "%s from %s"
 msgstr "%s von %s"
 
-#: include/conversation.php:800
+#: include/conversation.php:696
 msgid "View in context"
 msgstr "Im Zusammenhang betrachten"
 
-#: include/conversation.php:802 include/conversation.php:1317
-#: mod/wallmessage.php:145 mod/editpost.php:125 mod/message.php:245
-#: mod/message.php:414 mod/photos.php:1461 src/Object/Post.php:410
+#: 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 "Bitte warten"
 
-#: include/conversation.php:873
+#: include/conversation.php:762
 msgid "remove"
 msgstr "löschen"
 
-#: include/conversation.php:877
+#: include/conversation.php:766
 msgid "Delete Selected Items"
 msgstr "Lösche die markierten Beiträge"
 
-#: include/conversation.php:1022 view/theme/frio/theme.php:352
-msgid "Follow Thread"
-msgstr "Folge der Unterhaltung"
-
-#: include/conversation.php:1023 src/Model/Contact.php:662
+#: include/conversation.php:867 src/Model/Contact.php:937
 msgid "View Status"
 msgstr "Pinnwand anschauen"
 
-#: include/conversation.php:1024 include/conversation.php:1040
-#: 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
+#: 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 "Profil anschauen"
 
-#: include/conversation.php:1025 src/Model/Contact.php:664
+#: include/conversation.php:869 src/Model/Contact.php:939
 msgid "View Photos"
 msgstr "Bilder anschauen"
 
-#: include/conversation.php:1026 src/Model/Contact.php:665
+#: include/conversation.php:870 src/Model/Contact.php:931
+#: src/Model/Contact.php:940
 msgid "Network Posts"
 msgstr "Netzwerkbeiträge"
 
-#: include/conversation.php:1027 src/Model/Contact.php:666
+#: include/conversation.php:871 src/Model/Contact.php:932
+#: src/Model/Contact.php:941
 msgid "View Contact"
 msgstr "Kontakt anzeigen"
 
-#: include/conversation.php:1028 src/Model/Contact.php:668
+#: include/conversation.php:872 src/Model/Contact.php:943
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
-#: include/conversation.php:1032 src/Model/Contact.php:669
+#: include/conversation.php:876 src/Model/Contact.php:944
 msgid "Poke"
 msgstr "Anstupsen"
 
-#: include/conversation.php:1037 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 "Verbinden/Folgen"
-
-#: include/conversation.php:1156
+#: include/conversation.php:999
 #, php-format
 msgid "%s likes this."
 msgstr "%s mag das."
 
-#: include/conversation.php:1159
+#: include/conversation.php:1002
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s mag das nicht."
 
-#: include/conversation.php:1162
+#: include/conversation.php:1005
 #, php-format
 msgid "%s attends."
 msgstr "%s nimmt teil."
 
-#: include/conversation.php:1165
+#: include/conversation.php:1008
 #, php-format
 msgid "%s doesn't attend."
 msgstr "%s nimmt nicht teil."
 
-#: include/conversation.php:1168
+#: include/conversation.php:1011
 #, php-format
 msgid "%s attends maybe."
 msgstr "%s nimmt eventuell teil."
 
-#: include/conversation.php:1179
+#: include/conversation.php:1022
 msgid "and"
 msgstr "und"
 
-#: include/conversation.php:1185
+#: include/conversation.php:1028
 #, php-format
 msgid "and %d other people"
 msgstr "und %dandere"
 
-#: include/conversation.php:1194
+#: include/conversation.php:1037
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr "<span  %1$s>%2$d Personen</span> mögen das"
 
-#: include/conversation.php:1195
+#: include/conversation.php:1038
 #, php-format
 msgid "%s like this."
 msgstr "%s mögen das."
 
-#: include/conversation.php:1198
+#: include/conversation.php:1041
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr "<span  %1$s>%2$d Personen</span> mögen das nicht"
 
-#: include/conversation.php:1199
+#: include/conversation.php:1042
 #, php-format
 msgid "%s don't like this."
 msgstr "%s mögen dies nicht."
 
-#: include/conversation.php:1202
+#: include/conversation.php:1045
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend"
 msgstr "<span %1$s>%2$d Personen</span> nehmen teil"
 
-#: include/conversation.php:1203
+#: include/conversation.php:1046
 #, php-format
 msgid "%s attend."
 msgstr "%s nehmen teil."
 
-#: include/conversation.php:1206
+#: include/conversation.php:1049
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't attend"
 msgstr "<span %1$s>%2$d Personen</span> nehmen nicht teil"
 
-#: include/conversation.php:1207
+#: include/conversation.php:1050
 #, php-format
 msgid "%s don't attend."
 msgstr "%s nehmen nicht teil."
 
-#: include/conversation.php:1210
+#: include/conversation.php:1053
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend maybe"
 msgstr "<span %1$s>%2$d Personen</span> nehmen eventuell teil"
 
-#: include/conversation.php:1211
+#: include/conversation.php:1054
 #, php-format
 msgid "%s attend maybe."
 msgstr "%s nimmt eventuell teil."
 
-#: include/conversation.php:1241 include/conversation.php:1257
+#: include/conversation.php:1084 include/conversation.php:1100
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Für <strong>jedermann</strong> sichtbar"
 
-#: include/conversation.php:1242 include/conversation.php:1258
-#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:181
-#: mod/message.php:188 mod/message.php:324 mod/message.php:331
+#: 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 "Bitte gib die URL des Links ein:"
 
-#: include/conversation.php:1243 include/conversation.php:1259
+#: include/conversation.php:1086 include/conversation.php:1102
 msgid "Please enter a video link/URL:"
 msgstr "Bitte Link/URL zum Video einfügen:"
 
-#: include/conversation.php:1244 include/conversation.php:1260
+#: include/conversation.php:1087 include/conversation.php:1103
 msgid "Please enter an audio link/URL:"
 msgstr "Bitte Link/URL zum Audio einfügen:"
 
-#: include/conversation.php:1245 include/conversation.php:1261
+#: include/conversation.php:1088 include/conversation.php:1104
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: include/conversation.php:1246 include/conversation.php:1262
+#: include/conversation.php:1089 include/conversation.php:1105
 #: mod/filer.php:34
 msgid "Save to Folder:"
 msgstr "In diesem Ordner speichern:"
 
-#: include/conversation.php:1247 include/conversation.php:1263
+#: include/conversation.php:1090 include/conversation.php:1106
 msgid "Where are you right now?"
 msgstr "Wo hältst Du Dich jetzt gerade auf?"
 
-#: include/conversation.php:1248
+#: include/conversation.php:1091
 msgid "Delete item(s)?"
 msgstr "Einträge löschen?"
 
-#: include/conversation.php:1295
+#: include/conversation.php:1138
 msgid "New Post"
 msgstr "Neuer Beitrag"
 
-#: include/conversation.php:1298
+#: include/conversation.php:1141
 msgid "Share"
 msgstr "Teilen"
 
-#: include/conversation.php:1299 mod/wallmessage.php:143 mod/editpost.php:111
-#: mod/message.php:243 mod/message.php:411
+#: 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 hochladen"
 
-#: include/conversation.php:1300 mod/editpost.php:112
+#: include/conversation.php:1143 mod/editpost.php:102
 msgid "upload photo"
 msgstr "Bild hochladen"
 
-#: include/conversation.php:1301 mod/editpost.php:113
+#: include/conversation.php:1144 mod/editpost.php:103
 msgid "Attach file"
 msgstr "Datei anhängen"
 
-#: include/conversation.php:1302 mod/editpost.php:114
+#: include/conversation.php:1145 mod/editpost.php:104
 msgid "attach file"
 msgstr "Datei anhängen"
 
-#: include/conversation.php:1303 mod/wallmessage.php:144 mod/editpost.php:115
-#: mod/message.php:244 mod/message.php:412
+#: 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 "Einen Link einfügen"
 
-#: include/conversation.php:1304 mod/editpost.php:116
+#: include/conversation.php:1147 mod/editpost.php:106
 msgid "web link"
 msgstr "Weblink"
 
-#: include/conversation.php:1305 mod/editpost.php:117
+#: include/conversation.php:1148 mod/editpost.php:107
 msgid "Insert video link"
 msgstr "Video-Adresse einfügen"
 
-#: include/conversation.php:1306 mod/editpost.php:118
+#: include/conversation.php:1149 mod/editpost.php:108
 msgid "video link"
 msgstr "Video-Link"
 
-#: include/conversation.php:1307 mod/editpost.php:119
+#: include/conversation.php:1150 mod/editpost.php:109
 msgid "Insert audio link"
 msgstr "Audio-Adresse einfügen"
 
-#: include/conversation.php:1308 mod/editpost.php:120
+#: include/conversation.php:1151 mod/editpost.php:110
 msgid "audio link"
 msgstr "Audio-Link"
 
-#: include/conversation.php:1309 mod/editpost.php:121
+#: include/conversation.php:1152 mod/editpost.php:111
 msgid "Set your location"
 msgstr "Deinen Standort festlegen"
 
-#: include/conversation.php:1310 mod/editpost.php:122
+#: include/conversation.php:1153 mod/editpost.php:112
 msgid "set location"
 msgstr "Ort setzen"
 
-#: include/conversation.php:1311 mod/editpost.php:123
+#: include/conversation.php:1154 mod/editpost.php:113
 msgid "Clear browser location"
 msgstr "Browser-Standort leeren"
 
-#: include/conversation.php:1312 mod/editpost.php:124
+#: include/conversation.php:1155 mod/editpost.php:114
 msgid "clear location"
 msgstr "Ort löschen"
 
-#: include/conversation.php:1314 mod/editpost.php:138
+#: include/conversation.php:1157 mod/editpost.php:129
 msgid "Set title"
 msgstr "Titel setzen"
 
-#: include/conversation.php:1316 mod/editpost.php:140
+#: include/conversation.php:1159 mod/editpost.php:131
 msgid "Categories (comma-separated list)"
 msgstr "Kategorien (kommasepariert)"
 
-#: include/conversation.php:1318 mod/editpost.php:126
+#: include/conversation.php:1161 mod/editpost.php:116
 msgid "Permission settings"
 msgstr "Berechtigungseinstellungen"
 
-#: include/conversation.php:1319 mod/editpost.php:155
+#: include/conversation.php:1162 mod/editpost.php:146
 msgid "permissions"
 msgstr "Zugriffsrechte"
 
-#: include/conversation.php:1327 mod/editpost.php:135
+#: include/conversation.php:1171 mod/editpost.php:126
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: include/conversation.php:1331 mod/editpost.php:146 mod/events.php:528
-#: mod/photos.php:1480 mod/photos.php:1519 mod/photos.php:1592
-#: src/Object/Post.php:813
+#: 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 "Vorschau"
 
-#: include/conversation.php:1335 include/items.php:387 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 "Abbrechen"
-
-#: include/conversation.php:1340
+#: include/conversation.php:1184
 msgid "Post to Groups"
 msgstr "Poste an Gruppe"
 
-#: include/conversation.php:1341
+#: include/conversation.php:1185
 msgid "Post to Contacts"
 msgstr "Poste an Kontakte"
 
-#: include/conversation.php:1342
+#: include/conversation.php:1186
 msgid "Private post"
 msgstr "Privater Beitrag"
 
-#: include/conversation.php:1347 mod/editpost.php:153
-#: src/Model/Profile.php:338
+#: include/conversation.php:1191 mod/editpost.php:144
+#: src/Model/Profile.php:344
 msgid "Message"
 msgstr "Nachricht"
 
-#: include/conversation.php:1348 mod/editpost.php:154
+#: include/conversation.php:1192 mod/editpost.php:145
 msgid "Browser"
 msgstr "Browser"
 
-#: include/conversation.php:1615
+#: include/conversation.php:1463
 msgid "View all"
 msgstr "Zeige alle"
 
-#: include/conversation.php:1638
+#: include/conversation.php:1486
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "mag ich"
 msgstr[1] "Mag ich"
 
-#: include/conversation.php:1641
+#: include/conversation.php:1489
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "mag ich nicht"
 msgstr[1] "Mag ich nicht"
 
-#: include/conversation.php:1647
+#: include/conversation.php:1495
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Nicht teilnehmend "
 msgstr[1] "Nicht teilnehmend"
 
-#: include/conversation.php:1650 src/Content/ContactSelector.php:125
+#: include/conversation.php:1498 src/Content/ContactSelector.php:122
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Unentschieden"
 msgstr[1] "Unentschieden"
 
-#: include/items.php:342 mod/notice.php:22 mod/viewsrc.php:21
-#: mod/admin.php:277 mod/admin.php:1878 mod/admin.php:2126 mod/display.php:72
-#: mod/display.php:255 mod/display.php:356
-msgid "Item not found."
-msgstr "Beitrag nicht gefunden."
+#: include/security.php:83
+msgid "Welcome "
+msgstr "Willkommen "
 
-#: include/items.php:382
-msgid "Do you really want to delete this item?"
-msgstr "Möchtest Du wirklich dieses Item löschen?"
+#: include/security.php:84
+msgid "Please upload a profile photo."
+msgstr "Bitte lade ein Profilbild hoch."
 
-#: include/items.php:384 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 "Ja"
+#: include/security.php:86
+msgid "Welcome back "
+msgstr "Willkommen zurück "
 
-#: include/items.php:401 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/group.php:26
-#: mod/dfrn_confirm.php:68 mod/notifications.php:73 mod/profiles.php:182
-#: mod/profiles.php:513 mod/events.php:194 mod/item.php:160 mod/network.php:32
-#: mod/notes.php:30 mod/photos.php:174 mod/photos.php:1039 mod/register.php:54
-#: mod/settings.php:43 mod/settings.php:142 mod/settings.php:659 index.php:436
-msgid "Permission denied."
-msgstr "Zugriff verweigert."
+#: 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 "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."
 
-#: include/items.php:471 src/Content/Feature.php:96
-msgid "Archives"
-msgstr "Archiv"
+#: include/enotify.php:52
+msgid "Friendica Notification"
+msgstr "Friendica-Benachrichtigung"
 
-#: include/items.php:477 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 "mehr anzeigen"
+#: include/enotify.php:55
+msgid "Thank You,"
+msgstr "Danke,"
 
-#: mod/allfriends.php:51
-msgid "No friends to display."
-msgstr "Keine Kontakte zum Anzeigen."
+#: include/enotify.php:58
+#, php-format
+msgid "%1$s, %2$s Administrator"
+msgstr "%1$s, %2$s Administrator"
 
-#: 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/enotify.php:60
+#, php-format
+msgid "%s Administrator"
+msgstr "der Administrator von %s"
+
+#: include/enotify.php:123
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr "[Friendica-Meldung] Neue Email erhalten um %s"
+
+#: include/enotify.php:125
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
+msgstr "%1$s hat Dir eine neue private Nachricht um %2$s geschickt."
+
+#: include/enotify.php:126
+msgid "a private message"
+msgstr "eine private Nachricht"
+
+#: include/enotify.php:126
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s schickte Dir %2$s."
+
+#: include/enotify.php:128
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Bitte besuche %s, um Deine privaten Nachrichten anzusehen und/oder zu beantworten."
+
+#: include/enotify.php:161
+#, php-format
+msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
+msgstr "%1$s kommentierte [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 kommentierte [url=%2$s]%3$ss %4$s[/url]"
+
+#: include/enotify.php:179
+#, php-format
+msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
+msgstr "%1$s kommentierte [url=%2$s]deinen %3$s[/url]"
+
+#: include/enotify.php:191
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Friendica-Meldung] Kommentar zum Beitrag #%1$d von %2$s"
+
+#: include/enotify.php:193
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s hat einen Beitrag kommentiert, dem Du folgst."
+
+#: 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 "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren."
+
+#: include/enotify.php:203
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica-Meldung] %s hat auf Deine Pinnwand geschrieben"
+
+#: include/enotify.php:205
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "%1$s schrieb um %2$s auf Deine Pinnwand"
+
+#: include/enotify.php:206
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr "%1$s hat etwas auf [url=%2$s]Deiner Pinnwand[/url] gepostet"
+
+#: include/enotify.php:218
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr "[Friendica-Meldung] %s hat Dich erwähnt"
+
+#: include/enotify.php:220
+#, php-format
+msgid "%1$s tagged you at %2$s"
+msgstr "%1$s erwähnte Dich auf %2$s"
+
+#: include/enotify.php:221
+#, php-format
+msgid "%1$s [url=%2$s]tagged you[/url]."
+msgstr "%1$s [url=%2$s]erwähnte Dich[/url]."
+
+#: include/enotify.php:233
+#, php-format
+msgid "[Friendica:Notify] %s shared a new post"
+msgstr "[Friendica Benachrichtigung] %s hat einen Beitrag geteilt"
+
+#: include/enotify.php:235
+#, php-format
+msgid "%1$s shared a new post at %2$s"
+msgstr "%1$s hat einen neuen Beitrag auf %2$s geteilt"
+
+#: include/enotify.php:236
+#, php-format
+msgid "%1$s [url=%2$s]shared a post[/url]."
+msgstr "%1$s [url=%2$s]hat einen Beitrag geteilt[/url]."
+
+#: include/enotify.php:248
+#, php-format
+msgid "[Friendica:Notify] %1$s poked you"
+msgstr "[Friendica-Meldung] %1$s hat Dich angestupst"
+
+#: include/enotify.php:250
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr "%1$s hat Dich auf %2$s angestupst"
+
+#: include/enotify.php:251
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
+msgstr "%1$s [url=%2$s]hat Dich angestupst[/url]."
+
+#: include/enotify.php:268
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr "[Friendica-Meldung] %s hat Deinen Beitrag getaggt"
+
+#: include/enotify.php:270
+#, php-format
+msgid "%1$s tagged your post at %2$s"
+msgstr "%1$s erwähnte Deinen Beitrag auf %2$s"
+
+#: include/enotify.php:271
+#, php-format
+msgid "%1$s tagged [url=%2$s]your post[/url]"
+msgstr "%1$s erwähnte [url=%2$s]Deinen Beitrag[/url]"
+
+#: include/enotify.php:283
+msgid "[Friendica:Notify] Introduction received"
+msgstr "[Friendica-Meldung] Kontaktanfrage erhalten"
+
+#: include/enotify.php:285
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr "Du hast eine Kontaktanfrage von '%1$s' auf %2$s erhalten"
+
+#: include/enotify.php:286
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr "Du hast eine [url=%1$s]Kontaktanfrage[/url] von %2$s erhalten."
+
+#: include/enotify.php:291 include/enotify.php:337
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Hier kannst Du das Profil betrachten: %s"
+
+#: include/enotify.php:293
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen."
+
+#: include/enotify.php:300
+msgid "[Friendica:Notify] A new person is sharing with you"
+msgstr "[Friendica Benachrichtigung] Eine neue Person teilt mit Dir"
+
+#: include/enotify.php:302 include/enotify.php:303
+#, php-format
+msgid "%1$s is sharing with you at %2$s"
+msgstr "%1$s teilt mit Dir auf %2$s"
+
+#: include/enotify.php:310
+msgid "[Friendica:Notify] You have a new follower"
+msgstr "[Friendica Benachrichtigung] Du hast einen neuen Kontakt auf "
+
+#: include/enotify.php:312 include/enotify.php:313
+#, php-format
+msgid "You have a new follower at %2$s : %1$s"
+msgstr "Du hast einen neuen Kontakt auf %2$s: %1$s"
+
+#: include/enotify.php:326
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr "[Friendica-Meldung] Kontaktvorschlag erhalten"
+
+#: include/enotify.php:328
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr "Du hast einen Kontakt-Vorschlag von '%1$s' auf %2$s erhalten"
+
+#: include/enotify.php:329
+#, php-format
+msgid ""
+"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+msgstr "Du hast einen [url=%1$s]Kontakt-Vorschlag[/url] %2$s von %3$s erhalten."
+
+#: include/enotify.php:335
+msgid "Name:"
+msgstr "Name:"
+
+#: 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 "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."
+
+#: include/enotify.php:347 include/enotify.php:362
+msgid "[Friendica:Notify] Connection accepted"
+msgstr "[Friendica-Benachrichtigung] Kontaktanfrage bestätigt"
+
+#: include/enotify.php:349 include/enotify.php:364
+#, php-format
+msgid "'%1$s' has accepted your connection request at %2$s"
+msgstr "'%1$s' hat Deine Kontaktanfrage auf  %2$s bestätigt"
+
+#: 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 hat Deine [url=%1$s]Kontaktanfrage[/url] akzeptiert."
+
+#: include/enotify.php:355
+msgid ""
+"You are now mutual friends and may exchange status updates, photos, and "
+"email without restriction."
+msgstr "Ihr seid nun beidseitige Kontakte und könnt Statusmitteilungen, Bilder und Emails ohne Einschränkungen austauschen."
+
+#: include/enotify.php:357
+#, php-format
+msgid "Please visit %s if you wish to make any changes to this relationship."
+msgstr "Bitte besuche %s, wenn Du Änderungen an eurer Beziehung vornehmen willst."
+
+#: 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' hat sich entschieden Dich als Fan zu akzeptieren, dies schränkt einige Kommunikationswege - wie private Nachrichten und einige Interaktionsmöglichkeiten auf der Profilseite - ein. Wenn dies eine Berühmtheiten- oder Gemeinschaftsseite ist, werden diese Einstellungen automatisch vorgenommen."
+
+#: 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' kann den Kontaktstatus zu einem späteren Zeitpunkt erweitern und diese Einschränkungen aufheben. "
+
+#: include/enotify.php:374
+#, php-format
+msgid "Please visit %s  if you wish to make any changes to this relationship."
+msgstr "Bitte besuche %s, wenn Du Änderungen an eurer Beziehung vornehmen willst."
+
+#: include/enotify.php:384 mod/removeme.php:47
+msgid "[Friendica System Notify]"
+msgstr "[Friendica System Benachrichtigung]"
+
+#: include/enotify.php:384
+msgid "registration request"
+msgstr "Registrierungsanfrage"
+
+#: include/enotify.php:386
+#, php-format
+msgid "You've received a registration request from '%1$s' at %2$s"
+msgstr "Du hast eine Registrierungsanfrage von %2$s auf '%1$s' erhalten"
+
+#: include/enotify.php:387
+#, php-format
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
+msgstr "Du hast eine [url=%1$s]Registrierungsanfrage[/url] von %2$s erhalten."
+
+#: include/enotify.php:392
+#, php-format
+msgid ""
+"Full Name:\t%s\n"
+"Site Location:\t%s\n"
+"Login Name:\t%s (%s)"
+msgstr "Kompletter Name: %s\nURL der Seite: %s\nLogin Name: %s(%s)"
+
+#: include/enotify.php:398
+#, php-format
+msgid "Please visit %s to approve or reject the request."
+msgstr "Bitte besuche %s um die Anfrage zu bearbeiten."
+
+#: include/text.php:302
+msgid "newer"
+msgstr "neuer"
+
+#: include/text.php:303
+msgid "older"
+msgstr "älter"
+
+#: include/text.php:308
+msgid "first"
+msgstr "erste"
+
+#: include/text.php:309
+msgid "prev"
+msgstr "vorige"
+
+#: include/text.php:343
+msgid "next"
+msgstr "nächste"
+
+#: include/text.php:344
+msgid "last"
+msgstr "letzte"
+
+#: include/text.php:398
+msgid "Loading more entries..."
+msgstr "lade weitere Einträge..."
+
+#: include/text.php:399
+msgid "The end"
+msgstr "Das Ende"
+
+#: include/text.php:767
+msgid "No contacts"
+msgstr "Keine Kontakte"
+
+#: include/text.php:791
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d Kontakt"
+msgstr[1] "%d Kontakte"
+
+#: include/text.php:804
+msgid "View Contacts"
+msgstr "Kontakte anzeigen"
+
+#: include/text.php:889 mod/filer.php:35 mod/editpost.php:100 mod/notes.php:54
+msgid "Save"
+msgstr "Speichern"
+
+#: include/text.php:889
+msgid "Follow"
+msgstr "Folge"
+
+#: include/text.php:895 mod/search.php:162 src/Content/Nav.php:142
+msgid "Search"
+msgstr "Suche"
+
+#: include/text.php:898 src/Content/Nav.php:58
+msgid "@name, !forum, #tags, content"
+msgstr "@name, !forum, #tags, content"
+
+#: include/text.php:904 src/Content/Nav.php:145
+msgid "Full Text"
+msgstr "Volltext"
+
+#: include/text.php:905 src/Content/Nav.php:146
+#: src/Content/Widget/TagCloud.php:53
+msgid "Tags"
+msgstr "Tags"
+
+#: include/text.php:953
+msgid "poke"
+msgstr "anstupsen"
+
+#: include/text.php:953
+msgid "poked"
+msgstr "stupste"
+
+#: include/text.php:954
+msgid "ping"
+msgstr "anpingen"
+
+#: include/text.php:954
+msgid "pinged"
+msgstr "pingte"
+
+#: include/text.php:955
+msgid "prod"
+msgstr "knuffen"
+
+#: include/text.php:955
+msgid "prodded"
+msgstr "knuffte"
+
+#: include/text.php:956
+msgid "slap"
+msgstr "ohrfeigen"
+
+#: include/text.php:956
+msgid "slapped"
+msgstr "ohrfeigte"
+
+#: include/text.php:957
+msgid "finger"
+msgstr "befummeln"
+
+#: include/text.php:957
+msgid "fingered"
+msgstr "befummelte"
+
+#: include/text.php:958
+msgid "rebuff"
+msgstr "eine Abfuhr erteilen"
+
+#: include/text.php:958
+msgid "rebuffed"
+msgstr "abfuhrerteilte"
+
+#: include/text.php:972 mod/settings.php:941 src/Model/Event.php:388
+msgid "Monday"
+msgstr "Montag"
+
+#: include/text.php:972 src/Model/Event.php:389
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: include/text.php:972 src/Model/Event.php:390
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: include/text.php:972 src/Model/Event.php:391
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: include/text.php:972 src/Model/Event.php:392
+msgid "Friday"
+msgstr "Freitag"
+
+#: include/text.php:972 src/Model/Event.php:393
+msgid "Saturday"
+msgstr "Samstag"
+
+#: include/text.php:972 mod/settings.php:941 src/Model/Event.php:387
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: include/text.php:976 src/Model/Event.php:408
+msgid "January"
+msgstr "Januar"
+
+#: include/text.php:976 src/Model/Event.php:409
+msgid "February"
+msgstr "Februar"
+
+#: include/text.php:976 src/Model/Event.php:410
+msgid "March"
+msgstr "März"
+
+#: 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 "Mai"
+
+#: 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 "August"
+
+#: 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 "Dezember"
+
+#: include/text.php:990 src/Model/Event.php:380
+msgid "Mon"
+msgstr "Mo"
+
+#: include/text.php:990 src/Model/Event.php:381
+msgid "Tue"
+msgstr "Di"
+
+#: include/text.php:990 src/Model/Event.php:382
+msgid "Wed"
+msgstr "Mi"
+
+#: include/text.php:990 src/Model/Event.php:383
+msgid "Thu"
+msgstr "Do"
+
+#: include/text.php:990 src/Model/Event.php:384
+msgid "Fri"
+msgstr "Fr"
+
+#: include/text.php:990 src/Model/Event.php:385
+msgid "Sat"
+msgstr "Sa"
+
+#: include/text.php:990 src/Model/Event.php:379
+msgid "Sun"
+msgstr "So"
+
+#: 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 "März"
+
+#: 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 "Juli"
+
+#: 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 "Dez"
+
+#: include/text.php:1139
+#, php-format
+msgid "Content warning: %s"
+msgstr "Inhaltswarnung: %s"
+
+#: include/text.php:1204 mod/videos.php:375
+msgid "View Video"
+msgstr "Video ansehen"
+
+#: include/text.php:1221
+msgid "bytes"
+msgstr "Byte"
+
+#: include/text.php:1254 include/text.php:1265 include/text.php:1300
+msgid "Click to open/close"
+msgstr "Zum öffnen/schließen klicken"
+
+#: include/text.php:1415
+msgid "View on separate page"
+msgstr "Auf separater Seite ansehen"
+
+#: include/text.php:1416
+msgid "view on separate page"
+msgstr "auf separater Seite ansehen"
+
+#: include/text.php:1421 include/text.php:1428 src/Model/Event.php:609
+msgid "link to source"
+msgstr "Link zum Originalbeitrag"
+
+#: include/text.php:1615
+msgid "activity"
+msgstr "Aktivität"
+
+#: include/text.php:1617 src/Object/Post.php:428 src/Object/Post.php:440
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "Kommentar"
+msgstr[1] "Kommentare"
+
+#: include/text.php:1620
+msgid "post"
+msgstr "Beitrag"
+
+#: include/text.php:1775
+msgid "Item filed"
+msgstr "Beitrag abgelegt"
+
+#: 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] "Das tägliche Limit von %d Beitrag wurde erreicht. Die Nachricht wurde verworfen."
+msgstr[1] "Das tägliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde verworfen."
+
+#: 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] "Das wöchentliche Limit von %d Beitrag wurde erreicht. Die Nachricht wurde verworfen."
+msgstr[1] "Das wöchentliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde verworfen."
+
+#: include/api.php:1166
+#, php-format
+msgid "Monthly posting limit of %d post reached. The post was rejected."
+msgstr "Das monatliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde verworfen."
+
+#: 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 "Profilbilder"
+
+#: mod/crepair.php:89
+msgid "Contact settings applied."
+msgstr "Einstellungen zum Kontakt angewandt."
+
+#: mod/crepair.php:91
+msgid "Contact update failed."
+msgstr "Konnte den Kontakt nicht aktualisieren."
+
+#: 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 "Kontakt nicht gefunden."
+
+#: 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>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."
+
+#: 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 "Bitte nutze den Zurück-Button Deines Browsers <strong>jetzt</strong>, wenn Du Dir unsicher bist, was Du tun willst."
+
+#: mod/crepair.php:131 mod/crepair.php:133
+msgid "No mirroring"
+msgstr "Kein Spiegeln"
+
+#: mod/crepair.php:131
+msgid "Mirror as forwarded posting"
+msgstr "Spiegeln als weitergeleitete Beiträge"
+
+#: mod/crepair.php:131 mod/crepair.php:133
+msgid "Mirror as my own posting"
+msgstr "Spiegeln als meine eigenen Beiträge"
+
+#: mod/crepair.php:146
+msgid "Return to contact editor"
+msgstr "Zurück zum Kontakteditor"
+
+#: mod/crepair.php:148
+msgid "Refetch contact data"
+msgstr "Kontaktdaten neu laden"
+
+#: mod/crepair.php:151
+msgid "Remote Self"
+msgstr "Entfernte Konten"
+
+#: mod/crepair.php:154
+msgid "Mirror postings from this contact"
+msgstr "Spiegle Beiträge dieses Kontakts"
+
+#: mod/crepair.php:156
+msgid ""
+"Mark this contact as remote_self, this will cause friendica to repost new "
+"entries from this contact."
+msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden."
+
+#: 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 "Name"
+
+#: mod/crepair.php:161
+msgid "Account Nickname"
+msgstr "Konto-Spitzname"
+
+#: mod/crepair.php:162
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@Tagname - überschreibt Name/Spitzname"
+
+#: mod/crepair.php:163
+msgid "Account URL"
+msgstr "Konto-URL"
+
+#: mod/crepair.php:164
+msgid "Friend Request URL"
+msgstr "URL für Kontaktschaftsanfragen"
+
+#: mod/crepair.php:165
+msgid "Friend Confirm URL"
+msgstr "URL für Bestätigungen von Kontaktanfragen"
+
+#: mod/crepair.php:166
+msgid "Notification Endpoint URL"
+msgstr "URL-Endpunkt für Benachrichtigungen"
+
+#: mod/crepair.php:167
+msgid "Poll/Feed URL"
+msgstr "Pull/Feed-URL"
+
+#: mod/crepair.php:168
+msgid "New photo from this URL"
+msgstr "Neues Foto von dieser URL"
+
+#: mod/wallmessage.php:49 mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."
+
+#: mod/wallmessage.php:57 mod/message.php:74
+msgid "No recipient selected."
+msgstr "Kein Empfänger gewählt."
+
+#: mod/wallmessage.php:60
+msgid "Unable to check your home location."
+msgstr "Konnte Deinen Heimatort nicht bestimmen."
+
+#: mod/wallmessage.php:63 mod/message.php:81
+msgid "Message could not be sent."
+msgstr "Nachricht konnte nicht gesendet werden."
+
+#: mod/wallmessage.php:66 mod/message.php:84
+msgid "Message collection failure."
+msgstr "Konnte Nachrichten nicht abrufen."
+
+#: mod/wallmessage.php:69 mod/message.php:87
+msgid "Message sent."
+msgstr "Nachricht gesendet."
+
+#: mod/wallmessage.php:86 mod/wallmessage.php:95
+msgid "No recipient."
+msgstr "Kein Empfänger."
+
+#: mod/wallmessage.php:132 mod/message.php:249
+msgid "Send Private Message"
+msgstr "Private Nachricht senden"
+
+#: 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 "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."
+
+#: mod/wallmessage.php:134 mod/message.php:250 mod/message.php:419
+msgid "To:"
+msgstr "An:"
+
+#: mod/wallmessage.php:135 mod/message.php:254 mod/message.php:421
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: mod/wallmessage.php:141 mod/message.php:258 mod/message.php:424
+#: mod/invite.php:150
+msgid "Your message:"
+msgstr "Deine Nachricht:"
+
+#: mod/lockview.php:42 mod/lockview.php:50
+msgid "Remote privacy information not available."
+msgstr "Entfernte Privatsphäreneinstellungen nicht verfügbar."
+
+#: mod/lockview.php:59
+msgid "Visible to:"
+msgstr "Sichtbar für:"
+
+#: mod/install.php:100
+msgid "Friendica Communications Server - Setup"
+msgstr "Friendica-Server für soziale Netzwerke – Setup"
+
+#: mod/install.php:106
+msgid "Could not connect to database."
+msgstr "Verbindung zur Datenbank gescheitert."
+
+#: mod/install.php:110
+msgid "Could not create table."
+msgstr "Tabelle konnte nicht angelegt werden."
+
+#: mod/install.php:116
+msgid "Your Friendica site database has been installed."
+msgstr "Die Datenbank Deiner Friendicaseite wurde installiert."
+
+#: mod/install.php:121
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren."
+
+#: mod/install.php:122 mod/install.php:166 mod/install.php:274
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Lies bitte die \"INSTALL.txt\"."
+
+#: mod/install.php:134
+msgid "Database already in use."
+msgstr "Die Datenbank wird bereits verwendet."
+
+#: mod/install.php:163
+msgid "System check"
+msgstr "Systemtest"
+
+#: mod/install.php:167 mod/cal.php:279 mod/events.php:394
+msgid "Next"
+msgstr "Nächste"
+
+#: mod/install.php:168
+msgid "Check again"
+msgstr "Noch einmal testen"
+
+#: mod/install.php:187
+msgid "Database connection"
+msgstr "Datenbankverbindung"
+
+#: mod/install.php:188
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können."
+
+#: mod/install.php:189
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest."
+
+#: mod/install.php:190
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst."
+
+#: mod/install.php:194
+msgid "Database Server Name"
+msgstr "Datenbank-Server"
+
+#: mod/install.php:195
+msgid "Database Login Name"
+msgstr "Datenbank-Nutzer"
+
+#: mod/install.php:196
+msgid "Database Login Password"
+msgstr "Datenbank-Passwort"
+
+#: mod/install.php:196
+msgid "For security reasons the password must not be empty"
+msgstr "Aus Sicherheitsgründen darf das Passwort nicht leer sein."
+
+#: mod/install.php:197
+msgid "Database Name"
+msgstr "Datenbank-Name"
+
+#: mod/install.php:198 mod/install.php:235
+msgid "Site administrator email address"
+msgstr "E-Mail-Adresse des Administrators"
+
+#: 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 "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst."
+
+#: mod/install.php:200 mod/install.php:238
+msgid "Please select a default timezone for your website"
+msgstr "Bitte wähle die Standardzeitzone Deiner Webseite"
+
+#: mod/install.php:225
+msgid "Site settings"
+msgstr "Server-Einstellungen"
+
+#: mod/install.php:239
+msgid "System Language:"
+msgstr "Systemsprache:"
+
+#: mod/install.php:239
+msgid ""
+"Set the default language for your Friendica installation interface and to "
+"send emails."
+msgstr "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand"
+
+#: 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 "Die Datenbankkonfigurationsdatei \"config/local.ini.php\" konnte nicht erstellt werden. Um eine Konfigurationsdatei in Ihrem Webserver-Verzeichnis zu erstellen, Gehen Sie wie folgt vor."
+
+#: mod/install.php:272
+msgid "<h1>What next</h1>"
+msgstr "<h1>Wie geht es weiter?</h1>"
+
+#: mod/install.php:273
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"worker."
+msgstr "Wichtig: Du musst [manuell] einen Cronjob (o.ä.) für den Worker einrichten."
+
+#: 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 "Du solltest nun die Seite zur <a href=\"%s/register\">Nutzerregistrierung</a> deiner neuen Friendica Instanz besuchen und einen neuen Nutzer einrichten. Bitte denke daran die selbe E-Mail Adresse anzugeben, die du auch als Administrator E-Mail angegeben hast, damit du das Admin-Panel verwenden kannst."
+
+#: 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 "Profil nicht gefunden."
+
+#: mod/dfrn_confirm.php:128
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it"
+" has already been approved."
+msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde."
+
+#: mod/dfrn_confirm.php:238
+msgid "Response from remote site was not understood."
+msgstr "Antwort der Gegenstelle unverständlich."
+
+#: mod/dfrn_confirm.php:245 mod/dfrn_confirm.php:251
+msgid "Unexpected response from remote site: "
+msgstr "Unerwartete Antwort der Gegenstelle: "
+
+#: mod/dfrn_confirm.php:260
+msgid "Confirmation completed successfully."
+msgstr "Bestätigung erfolgreich abgeschlossen."
+
+#: mod/dfrn_confirm.php:272
+msgid "Temporary failure. Please wait and try again."
+msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal."
+
+#: mod/dfrn_confirm.php:275
+msgid "Introduction failed or was revoked."
+msgstr "Kontaktanfrage schlug fehl oder wurde zurückgezogen."
+
+#: mod/dfrn_confirm.php:280
+msgid "Remote site reported: "
+msgstr "Gegenstelle meldet: "
+
+#: mod/dfrn_confirm.php:392
+msgid "Unable to set contact photo."
+msgstr "Konnte das Bild des Kontakts nicht speichern."
+
+#: mod/dfrn_confirm.php:450
+#, php-format
+msgid "No user record found for '%s' "
+msgstr "Für '%s' wurde kein Nutzer gefunden"
+
+#: mod/dfrn_confirm.php:460
+msgid "Our site encryption key is apparently messed up."
+msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung."
+
+#: mod/dfrn_confirm.php:471
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden."
+
+#: mod/dfrn_confirm.php:487
+msgid "Contact record was not found for you on our site."
+msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."
+
+#: mod/dfrn_confirm.php:501
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server."
+
+#: 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 "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."
+
+#: mod/dfrn_confirm.php:528
+msgid "Unable to set your contact credentials on our system."
+msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."
+
+#: mod/dfrn_confirm.php:584
+msgid "Unable to update your contact profile details on our system"
+msgstr "Die Updates für Dein Profil konnten nicht gespeichert werden"
+
+#: mod/dfrn_confirm.php:614 mod/dfrn_request.php:561
+#: src/Model/Contact.php:1891
+msgid "[Name Withheld]"
+msgstr "[Name unterdrückt]"
+
+#: mod/dirfind.php:53
+#, php-format
+msgid "People Search - %s"
+msgstr "Personensuche - %s"
+
+#: mod/dirfind.php:64
+#, php-format
+msgid "Forum Search - %s"
+msgstr "Forensuche - %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 "Verbinden"
 
-#: mod/api.php:85 mod/api.php:107
-msgid "Authorize application connection"
-msgstr "Verbindung der Applikation autorisieren"
+#: mod/dirfind.php:265 mod/match.php:125
+msgid "No matches"
+msgstr "Keine Übereinstimmungen"
 
-#: mod/api.php:86
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:"
+#: mod/manage.php:180
+msgid "Manage Identities and/or Pages"
+msgstr "Verwalte Identitäten und/oder Seiten"
 
-#: mod/api.php:95
-msgid "Please login to continue."
-msgstr "Bitte melde Dich an um fortzufahren."
-
-#: 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 "Möchtest Du dieser Anwendung den Zugriff auf Deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?"
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
+msgstr "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die Deine Kontoinformationen teilen oder zu denen Du „Verwalten“-Befugnisse bekommen hast."
 
-#: 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 "Wähle eine Identität zum Verwalten aus: "
+
+#: mod/videos.php:138
+msgid "Do you really want to delete this video?"
+msgstr "Möchtest Du dieses Video wirklich löschen?"
+
+#: mod/videos.php:143
+msgid "Delete Video"
+msgstr "Video Löschen"
+
+#: 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 "Öffentlicher Zugriff verweigert."
+
+#: mod/videos.php:206
+msgid "No videos selected"
+msgstr "Keine Videos  ausgewählt"
+
+#: mod/videos.php:307 mod/photos.php:1050
+msgid "Access to this item is restricted."
+msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt."
+
+#: mod/videos.php:382 mod/photos.php:1699
+msgid "View Album"
+msgstr "Album betrachten"
+
+#: mod/videos.php:390
+msgid "Recent Videos"
+msgstr "Neueste Videos"
+
+#: mod/videos.php:392
+msgid "Upload New Videos"
+msgstr "Neues Video hochladen"
+
+#: mod/webfinger.php:17 mod/probe.php:14
+msgid "Only logged in users are permitted to perform a probing."
+msgstr "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet."
+
+#: 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 "Ort:"
+
+#: mod/directory.php:156 mod/notifications.php:259 src/Model/Profile.php:420
+#: src/Model/Profile.php:732
+msgid "Gender:"
+msgstr "Geschlecht:"
+
+#: mod/directory.php:157 src/Model/Profile.php:421 src/Model/Profile.php:756
+msgid "Status:"
+msgstr "Status:"
+
+#: mod/directory.php:158 src/Model/Profile.php:422 src/Model/Profile.php:773
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#: 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 "Über:"
+
+#: mod/directory.php:209
+msgid "Find on this site"
+msgstr "Auf diesem Server suchen"
+
+#: mod/directory.php:211
+msgid "Results for:"
+msgstr "Ergebnisse für:"
+
+#: mod/directory.php:213
+msgid "Site Directory"
+msgstr "Verzeichnis"
+
+#: mod/directory.php:218
+msgid "No entries (some entries may be hidden)."
+msgstr "Keine Einträge (einige Einträge könnten versteckt sein)."
+
+#: mod/match.php:48
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu."
+
+#: mod/match.php:104
+msgid "is interested in:"
+msgstr "ist interessiert an:"
+
+#: mod/match.php:120
+msgid "Profile Match"
+msgstr "Profilübereinstimmungen"
+
+#: mod/settings.php:51 mod/photos.php:134
+msgid "everybody"
+msgstr "jeder"
+
+#: mod/settings.php:56
+msgid "Account"
+msgstr "Nutzerkonto"
+
+#: mod/settings.php:64 src/Model/Profile.php:372 src/Content/Nav.php:210
+msgid "Profiles"
+msgstr "Profile"
+
+#: mod/settings.php:72 mod/admin.php:190
+msgid "Additional features"
+msgstr "Zusätzliche Features"
+
+#: mod/settings.php:80
+msgid "Display"
+msgstr "Anzeige"
+
+#: mod/settings.php:87 mod/settings.php:840
+msgid "Social Networks"
+msgstr "Soziale Netzwerke"
+
+#: 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 "Delegationen"
+
+#: mod/settings.php:108
+msgid "Connected apps"
+msgstr "Verbundene Programme"
+
+#: mod/settings.php:115 mod/uexport.php:52
+msgid "Export personal data"
+msgstr "Persönliche Daten exportieren"
+
+#: mod/settings.php:122
+msgid "Remove account"
+msgstr "Konto löschen"
+
+#: mod/settings.php:174
+msgid "Missing some important data!"
+msgstr "Wichtige Daten fehlen!"
+
+#: mod/settings.php:176 mod/settings.php:701 mod/contacts.php:848
+msgid "Update"
+msgstr "Aktualisierungen"
+
+#: mod/settings.php:285
+msgid "Failed to connect with email account using the settings provided."
+msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."
+
+#: mod/settings.php:290
+msgid "Email settings updated."
+msgstr "E-Mail Einstellungen bearbeitet."
+
+#: mod/settings.php:306
+msgid "Features updated"
+msgstr "Features aktualisiert"
+
+#: mod/settings.php:379
+msgid "Relocate message has been send to your contacts"
+msgstr "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet."
+
+#: mod/settings.php:391 src/Model/User.php:377
+msgid "Passwords do not match. Password unchanged."
+msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
+
+#: mod/settings.php:396
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
+
+#: 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 "Das neuer Passwort wurde in einem öffentlichen Daten-Dump veröffentlicht. Bitte verwende ein anderes Passwort."
+
+#: mod/settings.php:407
+msgid "Wrong password."
+msgstr "Falsches Passwort."
+
+#: mod/settings.php:414 src/Core/Console/NewPassword.php:89
+msgid "Password changed."
+msgstr "Passwort geändert."
+
+#: mod/settings.php:416 src/Core/Console/NewPassword.php:86
+msgid "Password update failed. Please try again."
+msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."
+
+#: mod/settings.php:500
+msgid " Please use a shorter name."
+msgstr " Bitte verwende einen kürzeren Namen."
+
+#: mod/settings.php:503
+msgid " Name too short."
+msgstr " Name ist zu kurz."
+
+#: mod/settings.php:511
+msgid "Wrong Password"
+msgstr "Falsches Passwort"
+
+#: mod/settings.php:516
+msgid "Invalid email."
+msgstr "Ungültige E-Mail-Adresse."
+
+#: mod/settings.php:522
+msgid "Cannot change to that email."
+msgstr "Ändern der E-Mail nicht möglich. "
+
+#: mod/settings.php:572
+msgid "Private forum has no privacy permissions. Using default privacy group."
+msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt."
+
+#: mod/settings.php:575
+msgid "Private forum has no privacy permissions and no default privacy group."
+msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte."
+
+#: mod/settings.php:615
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
+
+#: mod/settings.php:674 mod/settings.php:700 mod/settings.php:734
+msgid "Add application"
+msgstr "Programm hinzufügen"
+
+#: 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 "Einstellungen speichern"
+
+#: 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 "Umleiten"
+
+#: mod/settings.php:681 mod/settings.php:707
+msgid "Icon url"
+msgstr "Icon URL"
+
+#: mod/settings.php:692
+msgid "You can't edit this application."
+msgstr "Du kannst dieses Programm nicht bearbeiten."
+
+#: mod/settings.php:733
+msgid "Connected Apps"
+msgstr "Verbundene Programme"
+
+#: mod/settings.php:735 src/Object/Post.php:158 src/Object/Post.php:160
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: mod/settings.php:737
+msgid "Client key starts with"
+msgstr "Anwenderschlüssel beginnt mit"
+
+#: mod/settings.php:738
+msgid "No name"
+msgstr "Kein Name"
+
+#: mod/settings.php:739
+msgid "Remove authorization"
+msgstr "Autorisierung entziehen"
+
+#: mod/settings.php:750
+msgid "No Addon settings configured"
+msgstr "Keine Addon-Einstellungen konfiguriert"
+
+#: mod/settings.php:759
+msgid "Addon Settings"
+msgstr "Addon Einstellungen"
+
+#: mod/settings.php:773 mod/admin.php:2539 mod/admin.php:2540
+msgid "Off"
+msgstr "Aus"
+
+#: mod/settings.php:773 mod/admin.php:2539 mod/admin.php:2540
+msgid "On"
+msgstr "An"
+
+#: mod/settings.php:780
+msgid "Additional Features"
+msgstr "Zusätzliche Features"
+
+#: mod/settings.php:803 src/Content/ContactSelector.php:82
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: mod/settings.php:803 mod/settings.php:804
+msgid "enabled"
+msgstr "eingeschaltet"
+
+#: mod/settings.php:803 mod/settings.php:804
+msgid "disabled"
+msgstr "ausgeschaltet"
+
+#: mod/settings.php:803 mod/settings.php:804
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
+msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s"
+
+#: mod/settings.php:804
+msgid "GNU Social (OStatus)"
+msgstr "GNU Social (OStatus)"
+
+#: mod/settings.php:835
+msgid "Email access is disabled on this site."
+msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
+
+#: mod/settings.php:845
+msgid "General Social Media Settings"
+msgstr "Allgemeine Einstellungen zu Sozialen Medien"
+
+#: mod/settings.php:846
+msgid "Disable Content Warning"
+msgstr "Inhaltswarnungen ausschalten"
+
+#: 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 "Nutzer von anderen Netzwerken, wie z.B. Mastodon oder Pleroma, können Inhaltswarnungen, welche die Beiträge standardmäßig einklappen. Diese Einstellung deaktiviert das automatische Einklappt solcher Beiträge und setzt die Inhaltswarnung als Titel des Beitrags. Wenn du andere Filtereinstellungen vorgenommen hast, werden diese hierdurch nicht beeinflusst."
+
+#: mod/settings.php:847
+msgid "Disable intelligent shortening"
+msgstr "Intelligentes Link kürzen ausschalten"
+
+#: 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 "Normalerweise versucht das System den besten Link zu finden um ihn zu gekürzten Postings hinzu zu fügen. Wird diese Option ausgewählt wird stets ein Link auf die originale Friendica Nachricht beigefügt."
+
+#: mod/settings.php:848
+msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
+msgstr "Automatisch allen GNU Social (OStatus) Followern/Erwähnern folgen"
+
+#: 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 "Wenn du eine Nachricht eines unbekannten OStatus Nutzers bekommst, entscheidet diese Option wie diese behandelt werden soll. Ist die Option aktiviert, wird ein neuer Kontakt für den Verfasser erstellt,."
+
+#: mod/settings.php:849
+msgid "Default group for OStatus contacts"
+msgstr "Voreingestellte Gruppe für OStatus Kontakte"
+
+#: mod/settings.php:850
+msgid "Your legacy GNU Social account"
+msgstr "Dein alter GNU Social Account"
+
+#: 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 "Wenn du deinen alten GNU Socual/Statusnet Accountnamen hier angibst (Format name@domain.tld) werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden."
+
+#: mod/settings.php:853
+msgid "Repair OStatus subscriptions"
+msgstr "OStatus Abonnements reparieren"
+
+#: mod/settings.php:857
+msgid "Email/Mailbox Setup"
+msgstr "E-Mail/Postfach-Einstellungen"
+
+#: 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 "Wenn Du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für Dein Postfach an."
+
+#: mod/settings.php:859
+msgid "Last successful email check:"
+msgstr "Letzter erfolgreicher E-Mail Check"
+
+#: mod/settings.php:861
+msgid "IMAP server name:"
+msgstr "IMAP-Server-Name:"
+
+#: mod/settings.php:862
+msgid "IMAP port:"
+msgstr "IMAP-Port:"
+
+#: mod/settings.php:863
+msgid "Security:"
+msgstr "Sicherheit:"
+
+#: mod/settings.php:863 mod/settings.php:868
+msgid "None"
+msgstr "Keine"
+
+#: mod/settings.php:864
+msgid "Email login name:"
+msgstr "E-Mail-Login-Name:"
+
+#: mod/settings.php:865
+msgid "Email password:"
+msgstr "E-Mail-Passwort:"
+
+#: mod/settings.php:866
+msgid "Reply-to address:"
+msgstr "Reply-to Adresse:"
+
+#: mod/settings.php:867
+msgid "Send public posts to all email contacts:"
+msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"
+
+#: mod/settings.php:868
+msgid "Action after import:"
+msgstr "Aktion nach Import:"
+
+#: mod/settings.php:868 src/Content/Nav.php:193
+msgid "Mark as seen"
+msgstr "Als gelesen markieren"
+
+#: mod/settings.php:868
+msgid "Move to folder"
+msgstr "In einen Ordner verschieben"
+
+#: mod/settings.php:869
+msgid "Move to folder:"
+msgstr "In diesen Ordner verschieben:"
+
+#: mod/settings.php:903 mod/admin.php:1316
+msgid "No special theme for mobile devices"
+msgstr "Kein spezielles Theme für mobile Geräte verwenden."
+
+#: mod/settings.php:912
+#, php-format
+msgid "%s - (Unsupported)"
+msgstr "%s - (Nicht unterstützt)"
+
+#: mod/settings.php:914
+#, php-format
+msgid "%s - (Experimental)"
+msgstr "%s - (Experimentell)"
+
+#: mod/settings.php:957
+msgid "Display Settings"
+msgstr "Anzeige-Einstellungen"
+
+#: mod/settings.php:963 mod/settings.php:987
+msgid "Display Theme:"
+msgstr "Theme:"
+
+#: mod/settings.php:964
+msgid "Mobile Theme:"
+msgstr "Mobiles Theme"
+
+#: mod/settings.php:965
+msgid "Suppress warning of insecure networks"
+msgstr "Warnung wegen unsicheren Netzwerken unterdrücken"
+
+#: 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 "Soll das System Warnungen unterdrücken, die angezeigt werden weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können."
+
+#: mod/settings.php:966
+msgid "Update browser every xx seconds"
+msgstr "Browser alle xx Sekunden aktualisieren"
+
+#: mod/settings.php:966
+msgid "Minimum of 10 seconds. Enter -1 to disable it."
+msgstr "Minimum sind 10 Sekunden. Gib -1 ein um abzuschalten."
+
+#: mod/settings.php:967
+msgid "Number of items to display per page:"
+msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: "
+
+#: mod/settings.php:967 mod/settings.php:968
+msgid "Maximum of 100 items"
+msgstr "Maximal 100 Beiträge"
+
+#: mod/settings.php:968
+msgid "Number of items to display per page when viewed from mobile device:"
+msgstr "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:"
+
+#: mod/settings.php:969
+msgid "Don't show emoticons"
+msgstr "Keine Smilies anzeigen"
+
+#: mod/settings.php:970
+msgid "Calendar"
+msgstr "Kalender"
+
+#: mod/settings.php:971
+msgid "Beginning of week:"
+msgstr "Wochenbeginn:"
+
+#: mod/settings.php:972
+msgid "Don't show notices"
+msgstr "Info-Popups nicht anzeigen"
+
+#: mod/settings.php:973
+msgid "Infinite scroll"
+msgstr "Endloses Scrollen"
+
+#: mod/settings.php:974
+msgid "Automatic updates only at the top of the network page"
+msgstr "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist."
+
+#: mod/settings.php:974
+msgid ""
+"When disabled, the network page is updated all the time, which could be "
+"confusing while reading."
+msgstr "Wenn dies deaktiviert ist, wird die Netzwerk Seite aktualisiert, wann immer neue Beiträge eintreffen, egal an welcher Stelle gerade gelesen wird."
+
+#: mod/settings.php:975
+msgid "Bandwidth Saver Mode"
+msgstr "Bandbreiten-Spar-Modus"
+
+#: mod/settings.php:975
+msgid ""
+"When enabled, embedded content is not displayed on automatic updates, they "
+"only show on page reload."
+msgstr "Wenn aktiviert, wird der eingebettete Inhalt nicht automatisch aktualisiert. In diesem Fall Seite bitte neu laden."
+
+#: mod/settings.php:976
+msgid "Smart Threading"
+msgstr "Intelligentes Threading"
+
+#: 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 "Ist dies aktiviert, werden Einrückungen in Unterhaltungen unterdrückt wo sie nicht benötigt werden. Werden sie benötigt, werden die Threads weiterhin eingerückt."
+
+#: mod/settings.php:978
+msgid "General Theme Settings"
+msgstr "Allgemeine Themeneinstellungen"
+
+#: mod/settings.php:979
+msgid "Custom Theme Settings"
+msgstr "Benutzerdefinierte Theme Einstellungen"
+
+#: mod/settings.php:980
+msgid "Content Settings"
+msgstr "Einstellungen zum Inhalt"
+
+#: mod/settings.php:1000
+msgid "Unable to find your profile. Please contact your admin."
+msgstr "Konnte dein Profil nicht finden. Bitte kontaktiere den Admin."
+
+#: mod/settings.php:1039
+msgid "Account Types"
+msgstr "Kontenarten"
+
+#: mod/settings.php:1040
+msgid "Personal Page Subtypes"
+msgstr "Unterarten der persönlichen Seite"
+
+#: mod/settings.php:1041
+msgid "Community Forum Subtypes"
+msgstr "Unterarten des Gemeinschaftsforums"
+
+#: mod/settings.php:1048 mod/admin.php:1841
+msgid "Personal Page"
+msgstr "Persönliche Seite"
+
+#: mod/settings.php:1049
+msgid "Account for a personal profile."
+msgstr "Konto für ein persönliches Profil."
+
+#: mod/settings.php:1052 mod/admin.php:1842
+msgid "Organisation Page"
+msgstr "Organisationsseite"
+
+#: mod/settings.php:1053
+msgid ""
+"Account for an organisation that automatically approves contact requests as "
+"\"Followers\"."
+msgstr "Konto für eine Organisation, das Kontaktanfragen automatisch als \"Follower\" annimmt."
+
+#: mod/settings.php:1056 mod/admin.php:1843
+msgid "News Page"
+msgstr "Nachrichtenseite"
+
+#: mod/settings.php:1057
+msgid ""
+"Account for a news reflector that automatically approves contact requests as"
+" \"Followers\"."
+msgstr "Konto für einen Feedspiegel, das Kontaktanfragen automatisch als \"Follower\" annimmt."
+
+#: mod/settings.php:1060 mod/admin.php:1844
+msgid "Community Forum"
+msgstr "Gemeinschaftsforum"
+
+#: mod/settings.php:1061
+msgid "Account for community discussions."
+msgstr "Konto für Diskussionsforen. "
+
+#: mod/settings.php:1064 mod/admin.php:1834
+msgid "Normal Account Page"
+msgstr "Normales Konto"
+
+#: mod/settings.php:1065
+msgid ""
+"Account for a regular personal profile that requires manual approval of "
+"\"Friends\" and \"Followers\"."
+msgstr "Konto für ein normales persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden."
+
+#: mod/settings.php:1068 mod/admin.php:1835
+msgid "Soapbox Page"
+msgstr "Marktschreier-Konto"
+
+#: mod/settings.php:1069
+msgid ""
+"Account for a public profile that automatically approves contact requests as"
+" \"Followers\"."
+msgstr "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt."
+
+#: mod/settings.php:1072 mod/admin.php:1836
+msgid "Public Forum"
+msgstr "Öffentliches Forum"
+
+#: mod/settings.php:1073
+msgid "Automatically approves all contact requests."
+msgstr "Bestätigt alle Kontaktanfragen automatisch."
+
+#: mod/settings.php:1076 mod/admin.php:1837
+msgid "Automatic Friend Page"
+msgstr "Automatische Freunde Seite"
+
+#: mod/settings.php:1077
+msgid ""
+"Account for a popular profile that automatically approves contact requests "
+"as \"Friends\"."
+msgstr "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt."
+
+#: mod/settings.php:1080
+msgid "Private Forum [Experimental]"
+msgstr "Privates Forum [Versuchsstadium]"
+
+#: mod/settings.php:1081
+msgid "Requires manual approval of contact requests."
+msgstr "Kontaktanfragen müssen manuell bestätigt werden."
+
+#: mod/settings.php:1092
+msgid "OpenID:"
+msgstr "OpenID:"
+
+#: mod/settings.php:1092
+msgid "(Optional) Allow this OpenID to login to this account."
+msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."
+
+#: mod/settings.php:1100
+msgid "Publish your default profile in your local site directory?"
+msgstr "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"
+
+#: 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 "Dein Profil wird im <a href=\"%s\">lokalen Verzeichnis</a> dieses Knotens veröffentlicht. Je nach Systemeinstellungen kann es öffentlich auffindbar sein."
+
+#: 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 "Nein"
 
-#: mod/apps.php:14 index.php:265
-msgid "You must be logged in to use addons. "
-msgstr "Sie müssen angemeldet sein um Addons benutzen zu können."
+#: mod/settings.php:1106
+msgid "Publish your default profile in the global social directory?"
+msgstr "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?"
 
-#: mod/apps.php:19
-msgid "Applications"
-msgstr "Anwendungen"
+#: 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 "Dein Profil wird in den globalen Friendica Verzeichnissen (z.B. <a href=\"%s\">%s</a>) veröffentlicht. Dein Profil wird öffentlich auffindbar sein."
 
-#: mod/apps.php:22
-msgid "No installed applications."
-msgstr "Keine Applikationen installiert."
+#: mod/settings.php:1113
+msgid "Hide your contact/friend list from viewers of your default profile?"
+msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"
 
-#: mod/attach.php:15
-msgid "Item not available."
-msgstr "Beitrag nicht verfügbar."
+#: 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 "Die Liste deiner Kontakte wird nicht in deinem Standard-Profil angezeigt werden. Du kannst für jedes weitere Profil diese Entscheidung separat einstellen."
 
-#: mod/attach.php:25
-msgid "Item was not found."
-msgstr "Beitrag konnte nicht gefunden werden."
+#: mod/settings.php:1117
+msgid "Hide your profile details from anonymous viewers?"
+msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
 
-#: 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 "Anonyme Besucher deines Profils werden ausschließlich dein Profilbild, deinen Namen sowie deinen Spitznamen sehen. Deine lffentlichen Beiträge und Kommentare werden weiterhin sichtbar sein."
+
+#: mod/settings.php:1121
+msgid "Allow friends to post to your profile page?"
+msgstr "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?"
+
+#: mod/settings.php:1121
+msgid ""
+"Your contacts may write posts on your profile wall. These posts will be "
+"distributed to your contacts"
+msgstr "Deine Kontakte können Beiträge auf deiner Pinnwand hinterlassen. Diese werden an deine Kontakte verteilt."
+
+#: mod/settings.php:1125
+msgid "Allow friends to tag your posts?"
+msgstr "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern versehen?"
+
+#: mod/settings.php:1125
+msgid "Your contacts can add additional tags to your posts."
+msgstr "Deine Kontakte dürfen deine Beiträge mit zusätzlichen Schlagworten versehen."
+
+#: mod/settings.php:1129
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
+
+#: mod/settings.php:1129
+msgid ""
+"If you like, Friendica may suggest new members to add you as a contact."
+msgstr "Wenn du magst, kann Friendica dich neuen Mitgliedern als Kontakt vorschlagen."
+
+#: mod/settings.php:1133
+msgid "Permit unknown people to send you private mail?"
+msgstr "Dürfen Dir Unbekannte private Nachrichten schicken?"
+
+#: mod/settings.php:1133
+msgid ""
+"Friendica network users may send you private messages even if they are not "
+"in your contact list."
+msgstr "Nutzer des Friendica Netzwerks können dir private Nachrichten senden, selbst wenn sie nicht in deine Kontaktliste sind."
+
+#: mod/settings.php:1137
+msgid "Profile is <strong>not published</strong>."
+msgstr "Profil ist <strong>nicht veröffentlicht</strong>."
+
+#: mod/settings.php:1143
+#, php-format
+msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
+msgstr "Die Adresse deines Profils lautet <strong>'%s'</strong> oder '%s'."
+
+#: mod/settings.php:1150
+msgid "Automatically expire posts after this many days:"
+msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:"
+
+#: mod/settings.php:1150
+msgid "If empty, posts will not expire. Expired posts will be deleted"
+msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."
+
+#: mod/settings.php:1151
+msgid "Advanced expiration settings"
+msgstr "Erweiterte Verfallseinstellungen"
+
+#: mod/settings.php:1152
+msgid "Advanced Expiration"
+msgstr "Erweitertes Verfallen"
+
+#: mod/settings.php:1153
+msgid "Expire posts:"
+msgstr "Beiträge verfallen lassen:"
+
+#: mod/settings.php:1154
+msgid "Expire personal notes:"
+msgstr "Persönliche Notizen verfallen lassen:"
+
+#: mod/settings.php:1155
+msgid "Expire starred posts:"
+msgstr "Markierte Beiträge verfallen lassen:"
+
+#: mod/settings.php:1156
+msgid "Expire photos:"
+msgstr "Fotos verfallen lassen:"
+
+#: mod/settings.php:1157
+msgid "Only expire posts by others:"
+msgstr "Nur Beiträge anderer verfallen:"
+
+#: mod/settings.php:1187
+msgid "Account Settings"
+msgstr "Kontoeinstellungen"
+
+#: mod/settings.php:1195
+msgid "Password Settings"
+msgstr "Passwort-Einstellungen"
+
+#: mod/settings.php:1196 mod/register.php:275
+msgid "New Password:"
+msgstr "Neues Passwort:"
+
+#: mod/settings.php:1197 mod/register.php:276
+msgid "Confirm:"
+msgstr "Bestätigen:"
+
+#: mod/settings.php:1197
+msgid "Leave password fields blank unless changing"
+msgstr "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern"
+
+#: mod/settings.php:1198
+msgid "Current Password:"
+msgstr "Aktuelles Passwort:"
+
+#: mod/settings.php:1198 mod/settings.php:1199
+msgid "Your current password to confirm the changes"
+msgstr "Dein aktuelles Passwort um die Änderungen zu bestätigen"
+
+#: mod/settings.php:1199
+msgid "Password:"
+msgstr "Passwort:"
+
+#: mod/settings.php:1203
+msgid "Basic Settings"
+msgstr "Grundeinstellungen"
+
+#: mod/settings.php:1204 src/Model/Profile.php:725
+msgid "Full Name:"
+msgstr "Kompletter Name:"
+
+#: mod/settings.php:1205
+msgid "Email Address:"
+msgstr "E-Mail-Adresse:"
+
+#: mod/settings.php:1206
+msgid "Your Timezone:"
+msgstr "Deine Zeitzone:"
+
+#: mod/settings.php:1207
+msgid "Your Language:"
+msgstr "Deine Sprache:"
+
+#: mod/settings.php:1207
+msgid ""
+"Set the language we use to show you friendica interface and to send you "
+"emails"
+msgstr "Wähle die Sprache, in der wir Dir die Friendica-Oberfläche präsentieren sollen und Dir E-Mail schicken"
+
+#: mod/settings.php:1208
+msgid "Default Post Location:"
+msgstr "Standardstandort:"
+
+#: mod/settings.php:1209
+msgid "Use Browser Location:"
+msgstr "Standort des Browsers verwenden:"
+
+#: mod/settings.php:1212
+msgid "Security and Privacy Settings"
+msgstr "Sicherheits- und Privatsphäre-Einstellungen"
+
+#: mod/settings.php:1214
+msgid "Maximum Friend Requests/Day:"
+msgstr "Maximale Anzahl vonKontaktanfragen/Tag:"
+
+#: mod/settings.php:1214 mod/settings.php:1243
+msgid "(to prevent spam abuse)"
+msgstr "(um SPAM zu vermeiden)"
+
+#: mod/settings.php:1215
+msgid "Default Post Permissions"
+msgstr "Standard-Zugriffsrechte für Beiträge"
+
+#: mod/settings.php:1216
+msgid "(click to open/close)"
+msgstr "(klicke zum öffnen/schließen)"
+
+#: mod/settings.php:1224 mod/photos.php:1126 mod/photos.php:1456
+msgid "Show to Groups"
+msgstr "Zeige den Gruppen"
+
+#: mod/settings.php:1225 mod/photos.php:1127 mod/photos.php:1457
+msgid "Show to Contacts"
+msgstr "Zeige den Kontakten"
+
+#: mod/settings.php:1226
+msgid "Default Private Post"
+msgstr "Privater Standardbeitrag"
+
+#: mod/settings.php:1227
+msgid "Default Public Post"
+msgstr "Öffentlicher Standardbeitrag"
+
+#: mod/settings.php:1231
+msgid "Default Permissions for New Posts"
+msgstr "Standardberechtigungen für neue Beiträge"
+
+#: mod/settings.php:1243
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:"
+
+#: mod/settings.php:1246
+msgid "Notification Settings"
+msgstr "Benachrichtigungseinstellungen"
+
+#: mod/settings.php:1247
+msgid "Send a notification email when:"
+msgstr "Benachrichtigungs-E-Mail senden wenn:"
+
+#: mod/settings.php:1248
+msgid "You receive an introduction"
+msgstr "– Du eine Kontaktanfrage erhältst"
+
+#: mod/settings.php:1249
+msgid "Your introductions are confirmed"
+msgstr "– eine Deiner Kontaktanfragen akzeptiert wurde"
+
+#: mod/settings.php:1250
+msgid "Someone writes on your profile wall"
+msgstr "– jemand etwas auf Deine Pinnwand schreibt"
+
+#: mod/settings.php:1251
+msgid "Someone writes a followup comment"
+msgstr "– jemand auch einen Kommentar verfasst"
+
+#: mod/settings.php:1252
+msgid "You receive a private message"
+msgstr "– Du eine private Nachricht erhältst"
+
+#: mod/settings.php:1253
+msgid "You receive a friend suggestion"
+msgstr "– Du eine Empfehlung erhältst"
+
+#: mod/settings.php:1254
+msgid "You are tagged in a post"
+msgstr "– Du in einem Beitrag erwähnt wirst"
+
+#: mod/settings.php:1255
+msgid "You are poked/prodded/etc. in a post"
+msgstr "– Du von jemandem angestupst oder sonstwie behandelt wirst"
+
+#: mod/settings.php:1257
+msgid "Activate desktop notifications"
+msgstr "Desktop Benachrichtigungen einschalten"
+
+#: mod/settings.php:1257
+msgid "Show desktop popup on new notifications"
+msgstr "Desktop Benachrichtigungen einschalten"
+
+#: mod/settings.php:1259
+msgid "Text-only notification emails"
+msgstr "Benachrichtigungs E-Mail als Rein-Text."
+
+#: mod/settings.php:1261
+msgid "Send text only notification emails, without the html part"
+msgstr "Sende Benachrichtigungs E-Mail als Rein-Text - ohne HTML-Teil"
+
+#: mod/settings.php:1263
+msgid "Show detailled notifications"
+msgstr "Detaillierte Benachrichtigungen anzeigen"
+
+#: mod/settings.php:1265
+msgid ""
+"Per default, notifications are condensed to a single notification per item. "
+"When enabled every notification is displayed."
+msgstr "Normalerweise werde alle Benachrichtigungen zu einem Thema zusammengefasst in einer einzigen Mitteilung. Wenn diese Option aktiviert ist, wird jede Mitteilung angezeigt."
+
+#: mod/settings.php:1267
+msgid "Advanced Account/Page Type Settings"
+msgstr "Erweiterte Konto-/Seitentyp-Einstellungen"
+
+#: mod/settings.php:1268
+msgid "Change the behaviour of this account for special situations"
+msgstr "Verhalten dieses Kontos in bestimmten Situationen:"
+
+#: mod/settings.php:1271
+msgid "Relocate"
+msgstr "Umziehen"
+
+#: 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 "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button."
+
+#: mod/settings.php:1273
+msgid "Resend relocate message to contacts"
+msgstr "Umzugsbenachrichtigung erneut an Kontakte senden"
+
+#: mod/ping.php:289
+msgid "{0} wants to be your friend"
+msgstr "{0} möchte mit Dir in Kontakt treten"
+
+#: mod/ping.php:305
+msgid "{0} sent you a message"
+msgstr "{0} schickte Dir eine Nachricht"
+
+#: mod/ping.php:321
+msgid "{0} requested registration"
+msgstr "{0} möchte sich registrieren"
+
+#: mod/search.php:39 mod/network.php:194
+msgid "Remove term"
+msgstr "Begriff entfernen"
+
+#: mod/search.php:48 mod/network.php:201 src/Content/Feature.php:100
+msgid "Saved Searches"
+msgstr "Gespeicherte Suchen"
+
+#: mod/search.php:112
+msgid "Only logged in users are permitted to perform a search."
+msgstr "Nur eingeloggten Benutzern ist das Suchen gestattet."
+
+#: mod/search.php:136
+msgid "Too Many Requests"
+msgstr "Zu viele Abfragen"
+
+#: mod/search.php:137
+msgid "Only one search per minute is permitted for not logged in users."
+msgstr "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet."
+
+#: mod/search.php:240 mod/community.php:161
+msgid "No results."
+msgstr "Keine Ergebnisse."
+
+#: mod/search.php:246
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Beiträge die mit %s getaggt sind"
+
+#: mod/search.php:248 mod/contacts.php:841
+#, php-format
+msgid "Results for: %s"
+msgstr "Ergebnisse für: %s"
+
+#: mod/common.php:93
 msgid "No contacts in common."
 msgstr "Keine gemeinsamen Kontakte."
 
-#: mod/common.php:140 mod/contacts.php:886
+#: mod/common.php:142 mod/contacts.php:916
 msgid "Common Friends"
 msgstr "Gemeinsame Kontakte"
 
-#: mod/credits.php:18
-msgid "Credits"
-msgstr "Credits"
+#: mod/bookmarklet.php:24 src/Module/Login.php:310 src/Content/Nav.php:114
+msgid "Login"
+msgstr "Anmeldung"
 
-#: mod/credits.php:19
+#: mod/bookmarklet.php:52
+msgid "The post was created"
+msgstr "Der Beitrag wurde angelegt"
+
+#: mod/network.php:202 src/Model/Group.php:401
+msgid "add"
+msgstr "hinzufügen"
+
+#: 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 ist ein Gemeinschaftsprojekt, das nicht ohne die Hilfe vieler Personen möglich wäre. Hier ist eine Aufzählung der Personen, die zum Code oder der Übersetzung beigetragen haben. Dank an alle !"
+"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] "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann."
+msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können."
 
-#: mod/fbrowser.php:34 view/theme/frio/theme.php:261 src/Content/Nav.php:102
-#: src/Model/Profile.php:902
-msgid "Photos"
-msgstr "Bilder"
+#: mod/network.php:551
+msgid "Messages in this group won't be send to these receivers."
+msgstr "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden."
 
-#: 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:1647 mod/photos.php:1661 src/Model/Photo.php:244
-#: src/Model/Photo.php:253
-msgid "Contact Photos"
-msgstr "Kontaktbilder"
+#: mod/network.php:620
+msgid "No such group"
+msgstr "Es gibt keine solche Gruppe"
 
-#: mod/fbrowser.php:105 mod/fbrowser.php:136 mod/profile_photo.php:250
-msgid "Upload"
-msgstr "Hochladen"
+#: mod/network.php:641 mod/group.php:247
+msgid "Group is empty"
+msgstr "Gruppe ist leer"
 
-#: mod/fbrowser.php:131
-msgid "Files"
-msgstr "Dateien"
+#: mod/network.php:645
+#, php-format
+msgid "Group: %s"
+msgstr "Gruppe: %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 "Nicht gefunden"
+#: mod/network.php:671
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."
 
-#: mod/hcard.php:18
+#: mod/network.php:674
+msgid "Invalid contact."
+msgstr "Ungültiger Kontakt."
+
+#: mod/network.php:945
+msgid "Commented Order"
+msgstr "Neueste Kommentare"
+
+#: mod/network.php:948
+msgid "Sort by Comment Date"
+msgstr "Nach Kommentardatum sortieren"
+
+#: mod/network.php:953
+msgid "Posted Order"
+msgstr "Neueste Beiträge"
+
+#: mod/network.php:956
+msgid "Sort by Post Date"
+msgstr "Nach Beitragsdatum sortieren"
+
+#: mod/network.php:964 mod/profiles.php:594
+#: src/Core/NotificationsManager.php:186
+msgid "Personal"
+msgstr "Persönlich"
+
+#: mod/network.php:967
+msgid "Posts that mention or involve you"
+msgstr "Beiträge, in denen es um Dich geht"
+
+#: mod/network.php:975
+msgid "New"
+msgstr "Neue"
+
+#: mod/network.php:978
+msgid "Activity Stream - by date"
+msgstr "Aktivitäten-Stream - nach Datum"
+
+#: mod/network.php:986
+msgid "Shared Links"
+msgstr "Geteilte Links"
+
+#: mod/network.php:989
+msgid "Interesting Links"
+msgstr "Interessante Links"
+
+#: mod/network.php:997
+msgid "Starred"
+msgstr "Markierte"
+
+#: mod/network.php:1000
+msgid "Favourite Posts"
+msgstr "Favorisierte Beiträge"
+
+#: mod/group.php:36
+msgid "Group created."
+msgstr "Gruppe erstellt."
+
+#: mod/group.php:42
+msgid "Could not create group."
+msgstr "Konnte die Gruppe nicht erstellen."
+
+#: mod/group.php:56 mod/group.php:187
+msgid "Group not found."
+msgstr "Gruppe nicht gefunden."
+
+#: mod/group.php:70
+msgid "Group name changed."
+msgstr "Gruppenname geändert."
+
+#: mod/group.php:101
+msgid "Save Group"
+msgstr "Gruppe speichern"
+
+#: mod/group.php:102
+msgid "Filter"
+msgstr "Filter"
+
+#: mod/group.php:107
+msgid "Create a group of contacts/friends."
+msgstr "Eine Kontaktgruppe anlegen."
+
+#: mod/group.php:108 mod/group.php:134 mod/group.php:229
+#: src/Model/Group.php:410
+msgid "Group Name: "
+msgstr "Gruppenname:"
+
+#: mod/group.php:125 src/Model/Group.php:407
+msgid "Contacts not in any group"
+msgstr "Kontakte in keiner Gruppe"
+
+#: mod/group.php:157
+msgid "Group removed."
+msgstr "Gruppe entfernt."
+
+#: mod/group.php:159
+msgid "Unable to remove group."
+msgstr "Konnte die Gruppe nicht entfernen."
+
+#: mod/group.php:222
+msgid "Delete Group"
+msgstr "Gruppe löschen"
+
+#: mod/group.php:233
+msgid "Edit Group Name"
+msgstr "Gruppen Name bearbeiten"
+
+#: mod/group.php:244
+msgid "Members"
+msgstr "Mitglieder"
+
+#: mod/group.php:246 mod/contacts.php:739
+msgid "All Contacts"
+msgstr "Alle Kontakte"
+
+#: mod/group.php:260
+msgid "Remove contact from group"
+msgstr "Entferne den Kontakt aus der Gruppe"
+
+#: mod/group.php:278 mod/profperm.php:118
+msgid "Click on a contact to add or remove."
+msgstr "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen"
+
+#: mod/group.php:292
+msgid "Add contact to group"
+msgstr "Füge den Kontakt zur Gruppe hinzu"
+
+#: mod/delegate.php:39
+msgid "Parent user not found."
+msgstr "Verwalter nicht gefunden."
+
+#: mod/delegate.php:146
+msgid "No parent user"
+msgstr "Kein Verwalter"
+
+#: mod/delegate.php:161
+msgid "Parent Password:"
+msgstr "Passwort des Verwalters"
+
+#: mod/delegate.php:161
+msgid ""
+"Please enter the password of the parent account to legitimize your request."
+msgstr "Bitte gib das Passwort des Verwalters ein, um deine Anfrage zu bestätigen."
+
+#: mod/delegate.php:166
+msgid "Parent User"
+msgstr "Verwalter"
+
+#: 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 "Verwalter haben Zugriff auf alle Funktionen dieses Benutzerkontos und können dessen Einstellungen ändern."
+
+#: mod/delegate.php:171 src/Content/Nav.php:205
+msgid "Delegate Page Management"
+msgstr "Delegiere das Management für die Seite"
+
+#: mod/delegate.php:172
+msgid "Delegates"
+msgstr "Bevollmächtigte"
+
+#: 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 "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!"
+
+#: mod/delegate.php:175
+msgid "Existing Page Delegates"
+msgstr "Vorhandene Bevollmächtigte für die Seite"
+
+#: mod/delegate.php:177
+msgid "Potential Delegates"
+msgstr "Potentielle Bevollmächtigte"
+
+#: mod/delegate.php:179 mod/tagrm.php:90
+msgid "Remove"
+msgstr "Entfernen"
+
+#: mod/delegate.php:180
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: mod/delegate.php:181
+msgid "No entries."
+msgstr "Keine Einträge."
+
+#: mod/uexport.php:44
+msgid "Export account"
+msgstr "Account exportieren"
+
+#: 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 "Exportiere Deine Accountinformationen und Kontakte. Verwende dies um ein Backup Deines Accounts anzulegen und/oder damit auf einen anderen Server umzuziehen."
+
+#: mod/uexport.php:45
+msgid "Export all"
+msgstr "Alles exportieren"
+
+#: 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 "Exportiere Deine Accountinformationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies, um ein komplettes Backup Deines Accounts anzulegen (Fotos werden nicht exportiert)."
+
+#: mod/repair_ostatus.php:21
+msgid "Resubscribing to OStatus contacts"
+msgstr "Erneuern der OStatus Abonements"
+
+#: mod/repair_ostatus.php:37
+msgid "Error"
+msgstr "Fehler"
+
+#: mod/repair_ostatus.php:52 mod/ostatus_subscribe.php:65
+msgid "Done"
+msgstr "Erledigt"
+
+#: mod/repair_ostatus.php:58 mod/ostatus_subscribe.php:89
+msgid "Keep this window open until done."
+msgstr "Lasse dieses Fenster offen, bis der Vorgang abgeschlossen ist."
+
+#: 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 "Zugriff verweigert."
+
+#: mod/viewcontacts.php:90
+msgid "No contacts."
+msgstr "Keine Kontakte."
+
+#: mod/viewcontacts.php:106 mod/contacts.php:639 mod/contacts.php:1052
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Besuche %ss Profil [%s]"
+
+#: mod/unfollow.php:36
+msgid "Contact wasn't found or can't be unfollowed."
+msgstr "Der Kontakt konnte nicht gefunden oder nicht entfolgt werden."
+
+#: mod/unfollow.php:49
+msgid "Contact unfollowed"
+msgstr "Kontakt wird nicht mehr gefolgt"
+
+#: mod/unfollow.php:67 mod/dfrn_request.php:654 mod/follow.php:62
+msgid "Submit Request"
+msgstr "Anfrage abschicken"
+
+#: mod/unfollow.php:76
+msgid "You aren't a friend of this contact."
+msgstr "Du hast keine beidseitige Freundschaft mit diesem Kontakt."
+
+#: mod/unfollow.php:82
+msgid "Unfollowing is currently not supported by your network."
+msgstr "Bei diesem Netzwerk wird das Entfolgen derzeit nicht unterstützt."
+
+#: mod/unfollow.php:103 mod/contacts.php:601
+msgid "Disconnect/Unfollow"
+msgstr "Verbindung lösen/Nicht mehr folgen"
+
+#: mod/unfollow.php:116 mod/dfrn_request.php:652 mod/follow.php:157
+msgid "Your Identity Address:"
+msgstr "Adresse Deines Profils:"
+
+#: 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 "Profil URL"
+
+#: mod/unfollow.php:135 mod/contacts.php:888 mod/follow.php:189
+#: src/Model/Profile.php:878
+msgid "Status Messages and Posts"
+msgstr "Statusnachrichten und Beiträge"
+
+#: 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 "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"
+
+#: mod/register.php:99
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."
+
+#: 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 "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern."
+
+#: mod/register.php:110
+msgid "Registration successful."
+msgstr "Registrierung erfolgreich."
+
+#: mod/register.php:115
+msgid "Your registration can not be processed."
+msgstr "Deine Registrierung konnte nicht verarbeitet werden."
+
+#: mod/register.php:162
+msgid "Your registration is pending approval by the site owner."
+msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
+
+#: 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 "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."
+
+#: mod/register.php:220
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr "Du kannst dieses Formular auch (optional) mit Deiner OpenID ausfüllen, indem Du Deine OpenID angibst und 'Registrieren' klickst."
+
+#: 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 "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."
+
+#: mod/register.php:222
+msgid "Your OpenID (optional): "
+msgstr "Deine OpenID (optional): "
+
+#: mod/register.php:234
+msgid "Include your profile in member directory?"
+msgstr "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?"
+
+#: mod/register.php:261
+msgid "Note for the admin"
+msgstr "Hinweis für den Admin"
+
+#: mod/register.php:261
+msgid "Leave a message for the admin, why you want to join this node"
+msgstr "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest."
+
+#: mod/register.php:262
+msgid "Membership on this site is by invitation only."
+msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
+
+#: mod/register.php:263
+msgid "Your invitation code: "
+msgstr "Dein Ein­la­dungs­code"
+
+#: mod/register.php:266 mod/admin.php:1428
+msgid "Registration"
+msgstr "Registrierung"
+
+#: mod/register.php:272
+msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
+msgstr "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):"
+
+#: mod/register.php:273
+msgid ""
+"Your Email Address: (Initial information will be send there, so this has to "
+"be an existing address.)"
+msgstr "Deine E-Mail Adresse (Informationen zur Registrierung werden an diese Adresse gesendet, darum muss sie existieren.)"
+
+#: mod/register.php:275
+msgid "Leave empty for an auto generated password."
+msgstr "Leer lassen um das Passwort automatisch zu generieren."
+
+#: 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 "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@%s</strong>' sein."
+
+#: mod/register.php:278
+msgid "Choose a nickname: "
+msgstr "Spitznamen wählen: "
+
+#: mod/register.php:281 src/Module/Login.php:281 src/Content/Nav.php:128
+msgid "Register"
+msgstr "Registrieren"
+
+#: mod/register.php:287 mod/uimport.php:70
+msgid "Import"
+msgstr "Import"
+
+#: mod/register.php:288
+msgid "Import your profile to this friendica instance"
+msgstr "Importiere Dein Profil auf diese Friendica Instanz"
+
+#: 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 "Nutzungsbedingungen"
+
+#: mod/register.php:296
+msgid "Note: This node explicitly contains adult content"
+msgstr "Hinweis: Dieser Knoten enthält explizit Inhalte für Erwachsene"
+
+#: mod/notifications.php:35
+msgid "Invalid request identifier."
+msgstr "Invalid request identifier."
+
+#: mod/notifications.php:44 mod/notifications.php:183
+#: mod/notifications.php:235 mod/message.php:114
+msgid "Discard"
+msgstr "Verwerfen"
+
+#: 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 "Ignorieren"
+
+#: mod/notifications.php:93 src/Content/Nav.php:191
+msgid "Notifications"
+msgstr "Benachrichtigungen"
+
+#: mod/notifications.php:101
+msgid "Network Notifications"
+msgstr "Netzwerk Benachrichtigungen"
+
+#: mod/notifications.php:106 mod/notify.php:81
+msgid "System Notifications"
+msgstr "Systembenachrichtigungen"
+
+#: mod/notifications.php:111
+msgid "Personal Notifications"
+msgstr "Persönliche Benachrichtigungen"
+
+#: mod/notifications.php:116
+msgid "Home Notifications"
+msgstr "Pinnwand Benachrichtigungen"
+
+#: mod/notifications.php:148
+msgid "Show Ignored Requests"
+msgstr "Zeige ignorierte Anfragen"
+
+#: mod/notifications.php:148
+msgid "Hide Ignored Requests"
+msgstr "Verberge ignorierte Anfragen"
+
+#: mod/notifications.php:161 mod/notifications.php:243
+msgid "Notification type:"
+msgstr "Art der Benachrichtigung:"
+
+#: mod/notifications.php:164
+msgid "Suggested by:"
+msgstr "Vorgeschlagen von:"
+
+#: mod/notifications.php:176 mod/notifications.php:260 mod/contacts.php:666
+msgid "Hide this contact from others"
+msgstr "Verbirg diesen Kontakt vor Anderen"
+
+#: mod/notifications.php:179 mod/notifications.php:269 mod/admin.php:1904
+msgid "Approve"
+msgstr "Genehmigen"
+
+#: mod/notifications.php:202
+msgid "Claims to be known to you: "
+msgstr "Behauptet Dich zu kennen: "
+
+#: mod/notifications.php:203
+msgid "yes"
+msgstr "ja"
+
+#: mod/notifications.php:203
+msgid "no"
+msgstr "nein"
+
+#: mod/notifications.php:204 mod/notifications.php:209
+msgid "Shall your connection be bidirectional or not?"
+msgstr "Soll die Verbindung beidseitig sein oder nicht?"
+
+#: 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 "Akzeptierst du %s als Kontakt, erlaubst du damit das Lesen deiner Beiträge und abonnierst selbst auch die Beiträge von %s."
+
+#: 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 "Wenn du %s als Abonnent akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten."
+
+#: 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 "Wenn du %s als Teilenden akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten."
+
+#: mod/notifications.php:222
+msgid "Friend"
+msgstr "Kontakt"
+
+#: mod/notifications.php:223
+msgid "Sharer"
+msgstr "Teilenden"
+
+#: mod/notifications.php:223
+msgid "Subscriber"
+msgstr "Abonnent"
+
+#: mod/notifications.php:257 mod/contacts.php:686 mod/follow.php:177
+#: src/Model/Profile.php:781
+msgid "Tags:"
+msgstr "Tags:"
+
+#: mod/notifications.php:266 mod/contacts.php:76 src/Model/Profile.php:520
+msgid "Network:"
+msgstr "Netzwerk:"
+
+#: mod/notifications.php:280
+msgid "No introductions."
+msgstr "Keine Kontaktanfragen."
+
+#: mod/notifications.php:318
+msgid "Show unread"
+msgstr "Ungelesene anzeigen"
+
+#: mod/notifications.php:318
+msgid "Show all"
+msgstr "Alle anzeigen"
+
+#: mod/notifications.php:323
+#, php-format
+msgid "No more %s notifications."
+msgstr "Keine weiteren %s Benachrichtigungen"
+
+#: mod/message.php:31 mod/message.php:120 src/Content/Nav.php:199
+msgid "New Message"
+msgstr "Neue Nachricht"
+
+#: mod/message.php:78
+msgid "Unable to locate contact information."
+msgstr "Konnte die Kontaktinformationen nicht finden."
+
+#: mod/message.php:152
+msgid "Do you really want to delete this message?"
+msgstr "Möchtest Du wirklich diese Nachricht löschen?"
+
+#: mod/message.php:169
+msgid "Message deleted."
+msgstr "Nachricht gelöscht."
+
+#: mod/message.php:184
+msgid "Conversation removed."
+msgstr "Unterhaltung gelöscht."
+
+#: mod/message.php:290
+msgid "No messages."
+msgstr "Keine Nachrichten."
+
+#: mod/message.php:331
+msgid "Message not available."
+msgstr "Nachricht nicht verfügbar."
+
+#: mod/message.php:395
+msgid "Delete message"
+msgstr "Nachricht löschen"
+
+#: mod/message.php:397 mod/message.php:498
+msgid "D, d M Y - g:i A"
+msgstr "D, d. M Y - H:i"
+
+#: mod/message.php:412 mod/message.php:495
+msgid "Delete conversation"
+msgstr "Unterhaltung löschen"
+
+#: mod/message.php:414
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten."
+
+#: mod/message.php:418
+msgid "Send Reply"
+msgstr "Antwort senden"
+
+#: mod/message.php:469
+#, php-format
+msgid "Unknown sender - %s"
+msgstr "'Unbekannter Absender - %s"
+
+#: mod/message.php:471
+#, php-format
+msgid "You and %s"
+msgstr "Du und %s"
+
+#: mod/message.php:473
+#, php-format
+msgid "%s and You"
+msgstr "%s und Du"
+
+#: mod/message.php:501
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d Nachricht"
+msgstr[1] "%d Nachrichten"
+
+#: mod/hcard.php:19
 msgid "No profile"
 msgstr "Kein Profil"
 
+#: mod/ostatus_subscribe.php:22
+msgid "Subscribing to OStatus contacts"
+msgstr "OStatus Kontakten folgen"
+
+#: mod/ostatus_subscribe.php:34
+msgid "No contact provided."
+msgstr "Keine Kontakte gefunden."
+
+#: mod/ostatus_subscribe.php:41
+msgid "Couldn't fetch information for contact."
+msgstr "Konnte die Kontaktinformationen nicht einholen."
+
+#: mod/ostatus_subscribe.php:51
+msgid "Couldn't fetch friends for contact."
+msgstr "Konnte die Kontaktliste des Kontakts nicht abfragen."
+
+#: mod/ostatus_subscribe.php:79
+msgid "success"
+msgstr "Erfolg"
+
+#: mod/ostatus_subscribe.php:81
+msgid "failed"
+msgstr "Fehlgeschlagen"
+
+#: mod/ostatus_subscribe.php:84 src/Object/Post.php:264
+msgid "ignored"
+msgstr "Ignoriert"
+
+#: mod/dfrn_poll.php:126 mod/dfrn_poll.php:549
+#, php-format
+msgid "%1$s welcomes %2$s"
+msgstr "%1$s heißt %2$s herzlich willkommen"
+
+#: mod/removeme.php:47
+msgid "User deleted their account"
+msgstr "Gelöschter Nutzeraccount"
+
+#: 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 "Ein Nutzer deiner Friendica Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass deren Daten aus deinen Backups entfernt werden."
+
+#: mod/removeme.php:49
+#, php-format
+msgid "The user id is %d"
+msgstr "Die ID des Users lautet %d"
+
+#: mod/removeme.php:81 mod/removeme.php:84
+msgid "Remove My Account"
+msgstr "Konto löschen"
+
+#: mod/removeme.php:82
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen."
+
+#: mod/removeme.php:83
+msgid "Please enter your password for verification:"
+msgstr "Bitte gib Dein Passwort zur Verifikation ein:"
+
+#: mod/tagrm.php:43
+msgid "Tag removed"
+msgstr "Tag entfernt"
+
+#: mod/tagrm.php:77
+msgid "Remove Item Tag"
+msgstr "Gegenstands-Tag entfernen"
+
+#: mod/tagrm.php:79
+msgid "Select a tag to remove: "
+msgstr "Wähle ein Tag zum Entfernen aus: "
+
 #: mod/home.php:39
 #, php-format
 msgid "Welcome to %s"
 msgstr "Willkommen zu %s"
 
-#: mod/lockview.php:38 mod/lockview.php:46
-msgid "Remote privacy information not available."
-msgstr "Entfernte Privatsphäreneinstellungen nicht verfügbar."
+#: mod/suggest.php:38
+msgid "Do you really want to delete this suggestion?"
+msgstr "Möchtest Du wirklich diese Empfehlung löschen?"
 
-#: mod/lockview.php:55
-msgid "Visible to:"
-msgstr "Sichtbar für:"
+#: mod/suggest.php:74
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."
 
-#: mod/maintenance.php:24
-msgid "System down for maintenance"
-msgstr "System zur Wartung abgeschaltet"
+#: mod/suggest.php:87 mod/suggest.php:107
+msgid "Ignore/Hide"
+msgstr "Ignorieren/Verbergen"
+
+#: mod/filer.php:34
+msgid "- select -"
+msgstr "- auswählen -"
+
+#: 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 "Diese Friendica Instanz verwendet die Version %s, sie ist unter der folgenden Adresse im Web zu finden %s. Die Datenbank Version ist %s und die Post-Update Version %s."
+
+#: mod/friendica.php:84
+msgid ""
+"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
+"about the Friendica project."
+msgstr "Bitte besuche <a href=\"https://friendi.ca\">Friendi.ca</a> um mehr über das Friendica Projekt zu erfahren."
+
+#: mod/friendica.php:88
+msgid "Bug reports and issues: please visit"
+msgstr "Probleme oder Fehler gefunden? Bitte besuche"
+
+#: mod/friendica.php:88
+msgid "the bugtracker at github"
+msgstr "den Bugtracker auf github"
+
+#: mod/friendica.php:91
+msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
+msgstr "Vorschläge, Lob usw.: E-Mail an \"Info\" at \"Friendi - dot ca\""
+
+#: mod/friendica.php:105
+msgid "Installed addons/apps:"
+msgstr "Installierte Apps und Addons"
+
+#: mod/friendica.php:119
+msgid "No installed addons/apps"
+msgstr "Es sind keine Addons oder Apps installiert"
+
+#: mod/friendica.php:124
+#, php-format
+msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
+msgstr "Erfahre mehr über die <a href=\"%1$s/tos\">Nutzungsbedingungen</a> dieses Knotens."
+
+#: mod/friendica.php:129
+msgid "On this server the following remote servers are blocked."
+msgstr "Auf diesem Server werden die folgenden entfernten Server blockiert."
+
+#: 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 "Blockierte Domain"
+
+#: mod/friendica.php:130 mod/admin.php:364 mod/admin.php:382
+msgid "Reason for the block"
+msgstr "Begründung für die Blockierung"
+
+#: mod/display.php:303 mod/cal.php:144 mod/profile.php:175
+msgid "Access to this profile has been restricted."
+msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt."
+
+#: 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 "Ungültige Anfrage"
+
+#: 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 "Bildgröße überschreitet das Limit von %s"
+
+#: mod/wall_upload.php:209 mod/profile_photo.php:160 mod/photos.php:831
+msgid "Unable to process image."
+msgstr "Konnte das Bild nicht bearbeiten."
+
+#: 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 "Pinnwand-Bilder"
+
+#: mod/wall_upload.php:248 mod/profile_photo.php:305 mod/photos.php:860
+msgid "Image upload failed."
+msgstr "Hochladen des Bildes gescheitert."
 
 #: mod/newmember.php:11
 msgid "Welcome to Friendica"
@@ -1369,11 +3922,6 @@ msgid ""
 " join."
 msgstr "Auf der <em>Quick Start</em> Seite findest Du eine kurze Einleitung in die einzelnen Funktionen Deines Profils und die Netzwerk-Reiter, wo Du interessante Foren findest und neue Kontakte knüpfst."
 
-#: mod/newmember.php:19 mod/admin.php:1930 mod/admin.php:2199
-#: mod/settings.php:124 view/theme/frio/theme.php:269 src/Content/Nav.php:207
-msgid "Settings"
-msgstr "Einstellungen"
-
 #: mod/newmember.php:21
 msgid "Go to Your Settings"
 msgstr "Gehe zu deinen Einstellungen"
@@ -1393,14 +3941,7 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn Du Dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest Du es veröffentlichen - außer all Deine Kontakte und potentiellen Kontakte wissen genau, wie sie Dich finden können."
 
-#: 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 "Profil"
-
-#: 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 "Profilbild hochladen"
 
@@ -1483,7 +4024,7 @@ msgid ""
 "hours."
 msgstr "Im seitlichen Bedienfeld der Kontakteseite gibt es diverse Werkzeuge, um neue Personen zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Leute vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden."
 
-#: mod/newmember.php:43 src/Model/Group.php:414
+#: mod/newmember.php:43 src/Model/Group.php:402
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -1523,1234 +4064,15 @@ msgid ""
 " features and resources."
 msgstr "Unsere <strong>Hilfe</strong> Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten."
 
-#: 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 "Besuche %ss Profil [%s]"
-
-#: mod/nogroup.php:43 mod/contacts.php:960
-msgid "Edit contact"
-msgstr "Kontakt bearbeiten"
-
-#: mod/nogroup.php:63
-msgid "Contacts who are not members of a group"
-msgstr "Kontakte, die keiner Gruppe zugewiesen sind"
-
-#: mod/p.php:14
-msgid "Not Extended"
-msgstr "Nicht erweitert."
-
-#: mod/repair_ostatus.php:18
-msgid "Resubscribing to OStatus contacts"
-msgstr "Erneuern der OStatus Abonements"
-
-#: mod/repair_ostatus.php:34
-msgid "Error"
-msgstr "Fehler"
-
-#: mod/repair_ostatus.php:48 mod/ostatus_subscribe.php:64
-msgid "Done"
-msgstr "Erledigt"
-
-#: mod/repair_ostatus.php:54 mod/ostatus_subscribe.php:88
-msgid "Keep this window open until done."
-msgstr "Lasse dieses Fenster offen, bis der Vorgang abgeschlossen ist."
-
-#: mod/suggest.php:36
-msgid "Do you really want to delete this suggestion?"
-msgstr "Möchtest Du wirklich diese Empfehlung löschen?"
-
-#: mod/suggest.php:73
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal."
-
-#: mod/suggest.php:84 mod/suggest.php:104
-msgid "Ignore/Hide"
-msgstr "Ignorieren/Verbergen"
-
-#: mod/suggest.php:114 view/theme/vier/theme.php:204 src/Content/Widget.php:64
-msgid "Friend Suggestions"
-msgstr "Kontaktvorschläge"
-
-#: mod/update_community.php:27 mod/update_display.php:27
-#: mod/update_notes.php:40 mod/update_profile.php:39 mod/update_network.php:33
-msgid "[Embedded content - reload page to view]"
-msgstr "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]"
-
-#: 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 "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal."
-
-#: mod/uimport.php:70 mod/register.php:288
-msgid "Import"
-msgstr "Import"
-
-#: mod/uimport.php:72
-msgid "Move account"
-msgstr "Account umziehen"
-
-#: mod/uimport.php:73
-msgid "You can import an account from another Friendica server."
-msgstr "Du kannst einen Account von einem anderen Friendica Server importieren."
-
-#: 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 "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist."
-
-#: 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 "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren"
-
-#: mod/uimport.php:76
-msgid "Account file"
-msgstr "Account Datei"
-
-#: mod/uimport.php:76
-msgid ""
-"To export your account, go to \"Settings->Export your personal data\" and "
-"select \"Export account\""
-msgstr "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""
-
-#: mod/match.php:48
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu."
-
-#: mod/match.php:104
-msgid "is interested in:"
-msgstr "ist interessiert an:"
-
-#: mod/match.php:120
-msgid "Profile Match"
-msgstr "Profilübereinstimmungen"
-
-#: mod/match.php:125 mod/dirfind.php:253
-msgid "No matches"
-msgstr "Keine Übereinstimmungen"
-
-#: mod/manage.php:180
-msgid "Manage Identities and/or Pages"
-msgstr "Verwalte Identitäten und/oder Seiten"
-
-#: 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 "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die Deine Kontoinformationen teilen oder zu denen Du „Verwalten“-Befugnisse bekommen hast."
-
-#: mod/manage.php:182
-msgid "Select an identity to manage: "
-msgstr "Wähle eine Identität zum Verwalten aus: "
-
-#: 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/profiles.php:579
-#: mod/events.php:530 mod/photos.php:1068 mod/photos.php:1148
-#: mod/photos.php:1433 mod/photos.php:1479 mod/photos.php:1518
-#: mod/photos.php:1591 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 "Senden"
-
-#: 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 "Ungültige Anfrage"
-
-#: mod/wall_attach.php:101
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt."
-
-#: mod/wall_attach.php:101
-msgid "Or - did you try to upload an empty file?"
-msgstr "Oder - hast Du versucht, eine leere Datei hochzuladen?"
-
-#: mod/wall_attach.php:112
-#, php-format
-msgid "File exceeds size limit of %s"
-msgstr "Die Datei ist größer als das erlaubte Limit von %s"
-
-#: mod/wall_attach.php:136 mod/wall_attach.php:152
-msgid "File upload failed."
-msgstr "Hochladen der Datei fehlgeschlagen."
-
-#: mod/filer.php:34
-msgid "- select -"
-msgstr "- auswählen -"
-
-#: mod/localtime.php:19 src/Model/Event.php:36 src/Model/Event.php:814
-msgid "l F d, Y \\@ g:i A"
-msgstr "l, d. F Y\\, H:i"
-
-#: mod/localtime.php:33
-msgid "Time Conversion"
-msgstr "Zeitumrechnung"
-
-#: mod/localtime.php:35
-msgid ""
-"Friendica provides this service for sharing events with other networks and "
-"friends in unknown timezones."
-msgstr "Friendica bietet diese Funktion an, um das Teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann."
-
-#: mod/localtime.php:39
-#, php-format
-msgid "UTC time: %s"
-msgstr "UTC Zeit: %s"
-
-#: mod/localtime.php:42
-#, php-format
-msgid "Current timezone: %s"
-msgstr "Aktuelle Zeitzone: %s"
-
-#: mod/localtime.php:46
-#, php-format
-msgid "Converted localtime: %s"
-msgstr "Umgerechnete lokale Zeit: %s"
-
-#: mod/localtime.php:52
-msgid "Please select your timezone:"
-msgstr "Bitte wähle Deine Zeitzone:"
-
-#: mod/notify.php:77
-msgid "No more system notifications."
-msgstr "Keine weiteren Systembenachrichtigungen."
-
-#: mod/notify.php:81 mod/notifications.php:113
-msgid "System Notifications"
-msgstr "Systembenachrichtigungen"
-
-#: mod/ping.php:292
-msgid "{0} wants to be your friend"
-msgstr "{0} möchte mit Dir in Kontakt treten"
-
-#: mod/ping.php:307
-msgid "{0} sent you a message"
-msgstr "{0} schickte Dir eine Nachricht"
-
-#: mod/ping.php:322
-msgid "{0} requested registration"
-msgstr "{0} möchte sich registrieren"
-
-#: mod/poke.php:192
-msgid "Poke/Prod"
-msgstr "Anstupsen"
-
-#: mod/poke.php:193
-msgid "poke, prod or do other things to somebody"
-msgstr "Stupse Leute an oder mache anderes mit ihnen"
-
-#: mod/poke.php:194
-msgid "Recipient"
-msgstr "Empfänger"
-
-#: mod/poke.php:195
-msgid "Choose what you wish to do to recipient"
-msgstr "Was willst Du mit dem Empfänger machen:"
-
-#: mod/poke.php:198
-msgid "Make this post private"
-msgstr "Diesen Beitrag privat machen"
-
-#: mod/probe.php:13 mod/viewcontacts.php:45 mod/webfinger.php:16
-#: mod/directory.php:42 mod/dfrn_request.php:602 mod/community.php:27
-#: 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 "Öffentlicher Zugriff verweigert."
-
-#: mod/probe.php:14 mod/webfinger.php:17
-msgid "Only logged in users are permitted to perform a probing."
-msgstr "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet."
-
-#: mod/profperm.php:28 mod/group.php:83 index.php:435
-msgid "Permission denied"
-msgstr "Zugriff verweigert"
-
-#: mod/profperm.php:34 mod/profperm.php:65
-msgid "Invalid profile identifier."
-msgstr "Ungültiger Profil-Bezeichner."
-
-#: mod/profperm.php:111
-msgid "Profile Visibility Editor"
-msgstr "Editor für die Profil-Sichtbarkeit"
-
-#: mod/profperm.php:115 mod/group.php:265
-msgid "Click on a contact to add or remove."
-msgstr "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen"
-
-#: mod/profperm.php:124
-msgid "Visible To"
-msgstr "Sichtbar für"
-
-#: mod/profperm.php:140
-msgid "All Contacts (with secure profile access)"
-msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
-
-#: mod/regmod.php:68
-msgid "Account approved."
-msgstr "Konto freigegeben."
-
-#: mod/regmod.php:93
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registrierung für %s wurde zurückgezogen"
-
-#: mod/regmod.php:102
-msgid "Please login."
-msgstr "Bitte melde Dich an."
-
-#: mod/subthread.php:113
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s folgt %2$s %3$s"
-
-#: mod/tagrm.php:47
-msgid "Tag removed"
-msgstr "Tag entfernt"
-
-#: mod/tagrm.php:85
-msgid "Remove Item Tag"
-msgstr "Gegenstands-Tag entfernen"
-
-#: mod/tagrm.php:87
-msgid "Select a tag to remove: "
-msgstr "Wähle ein Tag zum Entfernen aus: "
-
-#: mod/tagrm.php:98 mod/delegate.php:177
-msgid "Remove"
-msgstr "Entfernen"
-
-#: mod/uexport.php:44
-msgid "Export account"
-msgstr "Account exportieren"
-
-#: 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 "Exportiere Deine Accountinformationen und Kontakte. Verwende dies um ein Backup Deines Accounts anzulegen und/oder damit auf einen anderen Server umzuziehen."
-
-#: mod/uexport.php:45
-msgid "Export all"
-msgstr "Alles exportieren"
-
-#: 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 "Exportiere Deine Accountinformationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies, um ein komplettes Backup Deines Accounts anzulegen (Fotos werden nicht exportiert)."
-
-#: mod/uexport.php:52 mod/settings.php:108
-msgid "Export personal data"
-msgstr "Persönliche Daten exportieren"
-
-#: mod/viewcontacts.php:87
-msgid "No contacts."
-msgstr "Keine Kontakte."
-
-#: mod/viewsrc.php:12 mod/community.php:34
-msgid "Access denied."
-msgstr "Zugriff verweigert."
-
-#: 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 "Bildgröße überschreitet das Limit von %s"
-
-#: mod/wall_upload.php:200 mod/profile_photo.php:162 mod/photos.php:806
-msgid "Unable to process image."
-msgstr "Konnte das Bild nicht bearbeiten."
-
-#: 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 "Pinnwand-Bilder"
-
-#: mod/wall_upload.php:239 mod/profile_photo.php:307 mod/photos.php:835
-msgid "Image upload failed."
-msgstr "Hochladen des Bildes gescheitert."
-
-#: mod/wallmessage.php:49 mod/wallmessage.php:112
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen."
-
-#: mod/wallmessage.php:57 mod/message.php:73
-msgid "No recipient selected."
-msgstr "Kein Empfänger gewählt."
-
-#: mod/wallmessage.php:60
-msgid "Unable to check your home location."
-msgstr "Konnte Deinen Heimatort nicht bestimmen."
-
-#: mod/wallmessage.php:63 mod/message.php:80
-msgid "Message could not be sent."
-msgstr "Nachricht konnte nicht gesendet werden."
-
-#: mod/wallmessage.php:66 mod/message.php:83
-msgid "Message collection failure."
-msgstr "Konnte Nachrichten nicht abrufen."
-
-#: mod/wallmessage.php:69 mod/message.php:86
-msgid "Message sent."
-msgstr "Nachricht gesendet."
-
-#: mod/wallmessage.php:86 mod/wallmessage.php:95
-msgid "No recipient."
-msgstr "Kein Empfänger."
-
-#: mod/wallmessage.php:132 mod/message.php:231
-msgid "Send Private Message"
-msgstr "Private Nachricht senden"
-
-#: 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 "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern."
-
-#: mod/wallmessage.php:134 mod/message.php:232 mod/message.php:402
-msgid "To:"
-msgstr "An:"
-
-#: mod/wallmessage.php:135 mod/message.php:236 mod/message.php:404
-msgid "Subject:"
-msgstr "Betreff:"
-
-#: mod/wallmessage.php:141 mod/invite.php:149 mod/message.php:240
-#: mod/message.php:407
-msgid "Your message:"
-msgstr "Deine Nachricht:"
-
-#: mod/bookmarklet.php:23 src/Content/Nav.php:114 src/Module/Login.php:313
-msgid "Login"
-msgstr "Anmeldung"
-
-#: mod/bookmarklet.php:51
-msgid "The post was created"
-msgstr "Der Beitrag wurde angelegt"
-
-#: mod/editpost.php:25 mod/editpost.php:35
-msgid "Item not found"
-msgstr "Beitrag nicht gefunden"
-
-#: mod/editpost.php:42
-msgid "Edit post"
-msgstr "Beitrag bearbeiten"
-
-#: mod/editpost.php:134 src/Core/ACL.php:315
-msgid "CC: email addresses"
-msgstr "Cc: E-Mail-Addressen"
-
-#: mod/editpost.php:141 src/Core/ACL.php:316
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Z.B.: bob@example.com, mary@example.com"
-
-#: mod/fsuggest.php:30 mod/fsuggest.php:96 mod/crepair.php:110
-#: mod/dfrn_confirm.php:129
-msgid "Contact not found."
-msgstr "Kontakt nicht gefunden."
-
-#: mod/fsuggest.php:72
-msgid "Friend suggestion sent."
-msgstr "Kontaktvorschlag gesendet."
-
-#: mod/fsuggest.php:101
-msgid "Suggest Friends"
-msgstr "Kontakte vorschlagen"
-
-#: mod/fsuggest.php:103
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Schlage %s einen Kontakt vor"
-
-#: mod/cal.php:142 mod/display.php:316 mod/profile.php:174
-msgid "Access to this profile has been restricted."
-msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt."
-
-#: 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 "Veranstaltungen"
-
-#: mod/cal.php:275 mod/events.php:392
-msgid "View"
-msgstr "Ansehen"
-
-#: mod/cal.php:276 mod/events.php:394
-msgid "Previous"
-msgstr "Vorherige"
-
-#: mod/cal.php:277 mod/install.php:156 mod/events.php:395
-msgid "Next"
-msgstr "Nächste"
-
-#: mod/cal.php:280 mod/events.php:400 src/Model/Event.php:412
-msgid "today"
-msgstr "Heute"
-
-#: mod/cal.php:281 mod/events.php:401 src/Util/Temporal.php:304
-#: src/Model/Event.php:413
-msgid "month"
-msgstr "Monat"
-
-#: mod/cal.php:282 mod/events.php:402 src/Util/Temporal.php:305
-#: src/Model/Event.php:414
-msgid "week"
-msgstr "Woche"
-
-#: mod/cal.php:283 mod/events.php:403 src/Util/Temporal.php:306
-#: src/Model/Event.php:415
-msgid "day"
-msgstr "Tag"
-
-#: mod/cal.php:284 mod/events.php:404
-msgid "list"
-msgstr "Liste"
-
-#: mod/cal.php:297 src/Core/Console/NewPassword.php:73 src/Model/User.php:214
-msgid "User not found"
-msgstr "Nutzer nicht gefunden"
-
-#: mod/cal.php:313
-msgid "This calendar format is not supported"
-msgstr "Dieses Kalenderformat wird nicht unterstützt."
-
-#: mod/cal.php:315
-msgid "No exportable data found"
-msgstr "Keine exportierbaren Daten gefunden"
-
-#: mod/cal.php:332
-msgid "calendar"
-msgstr "Kalender"
-
-#: mod/contacts.php:71 mod/notifications.php:259 src/Model/Profile.php:516
-msgid "Network:"
-msgstr "Netzwerk:"
-
-#: mod/contacts.php:157
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] "%d Kontakt bearbeitet."
-msgstr[1] "%d Kontakte bearbeitet."
-
-#: mod/contacts.php:184 mod/contacts.php:400
-msgid "Could not access contact record."
-msgstr "Konnte nicht auf die Kontaktdaten zugreifen."
-
-#: mod/contacts.php:194
-msgid "Could not locate selected profile."
-msgstr "Konnte das ausgewählte Profil nicht finden."
-
-#: mod/contacts.php:228
-msgid "Contact updated."
-msgstr "Kontakt aktualisiert."
-
-#: mod/contacts.php:230 mod/dfrn_request.php:415
-msgid "Failed to update contact record."
-msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen."
-
-#: mod/contacts.php:421
-msgid "Contact has been blocked"
-msgstr "Kontakt wurde blockiert"
-
-#: mod/contacts.php:421
-msgid "Contact has been unblocked"
-msgstr "Kontakt wurde wieder freigegeben"
-
-#: mod/contacts.php:432
-msgid "Contact has been ignored"
-msgstr "Kontakt wurde ignoriert"
-
-#: mod/contacts.php:432
-msgid "Contact has been unignored"
-msgstr "Kontakt wird nicht mehr ignoriert"
-
-#: mod/contacts.php:443
-msgid "Contact has been archived"
-msgstr "Kontakt wurde archiviert"
-
-#: mod/contacts.php:443
-msgid "Contact has been unarchived"
-msgstr "Kontakt wurde aus dem Archiv geholt"
-
-#: mod/contacts.php:467
-msgid "Drop contact"
-msgstr "Kontakt löschen"
-
-#: mod/contacts.php:470 mod/contacts.php:823
-msgid "Do you really want to delete this contact?"
-msgstr "Möchtest Du wirklich diesen Kontakt löschen?"
-
-#: mod/contacts.php:488
-msgid "Contact has been removed."
-msgstr "Kontakt wurde entfernt."
-
-#: mod/contacts.php:519
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr "Du hast mit %s eine beidseitige Freundschaft"
-
-#: mod/contacts.php:523
-#, php-format
-msgid "You are sharing with %s"
-msgstr "Du teilst mit %s"
-
-#: mod/contacts.php:527
-#, php-format
-msgid "%s is sharing with you"
-msgstr "%s teilt mit Dir"
-
-#: mod/contacts.php:547
-msgid "Private communications are not available for this contact."
-msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar."
-
-#: mod/contacts.php:549
-msgid "Never"
-msgstr "Niemals"
-
-#: mod/contacts.php:552
-msgid "(Update was successful)"
-msgstr "(Aktualisierung war erfolgreich)"
-
-#: mod/contacts.php:552
-msgid "(Update was not successful)"
-msgstr "(Aktualisierung war nicht erfolgreich)"
-
-#: mod/contacts.php:554 mod/contacts.php:992
-msgid "Suggest friends"
-msgstr "Kontakte vorschlagen"
-
-#: mod/contacts.php:558
-#, php-format
-msgid "Network type: %s"
-msgstr "Netzwerktyp: %s"
-
-#: mod/contacts.php:563
-msgid "Communications lost with this contact!"
-msgstr "Verbindungen mit diesem Kontakt verloren!"
-
-#: mod/contacts.php:569
-msgid "Fetch further information for feeds"
-msgstr "Weitere Informationen zu Feeds holen"
-
-#: 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 "Zusätzliche Informationen wie Vorschaubilder, Titel und Zusammenfassungen vom Feed-Eintrag laden. Du kannst diese Option aktivieren, wenn der Feed nicht all zu viel Text beinhaltet. Schlagwörter werden auf den Meta-Informationen des Feed-Headers bezogen und als Hash-Tags verwendet."
-
-#: mod/contacts.php:572 mod/admin.php:1283 mod/admin.php:1445
-#: mod/admin.php:1455
-msgid "Disabled"
-msgstr "Deaktiviert"
-
-#: mod/contacts.php:573
-msgid "Fetch information"
-msgstr "Beziehe Information"
-
-#: mod/contacts.php:574
-msgid "Fetch keywords"
-msgstr "Schlüsselwprter abrufen"
-
-#: mod/contacts.php:575
-msgid "Fetch information and keywords"
-msgstr "Beziehe Information und Schlüsselworte"
-
-#: mod/contacts.php:599 mod/unfollow.php:100
-msgid "Disconnect/Unfollow"
-msgstr "Verbindung lösen/Nicht mehr folgen"
-
-#: mod/contacts.php:608
-msgid "Contact"
-msgstr "Kontakt"
-
-#: mod/contacts.php:611
-msgid "Profile Visibility"
-msgstr "Profil-Sichtbarkeit"
-
-#: mod/contacts.php:612
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft."
-
-#: mod/contacts.php:613
-msgid "Contact Information / Notes"
-msgstr "Kontakt Informationen / Notizen"
-
-#: mod/contacts.php:614
-msgid "Their personal note"
-msgstr "Die persönliche Mitteilung"
-
-#: mod/contacts.php:616
-msgid "Edit contact notes"
-msgstr "Notizen zum Kontakt bearbeiten"
-
-#: mod/contacts.php:620
-msgid "Block/Unblock contact"
-msgstr "Kontakt blockieren/freischalten"
-
-#: mod/contacts.php:621
-msgid "Ignore contact"
-msgstr "Ignoriere den Kontakt"
-
-#: mod/contacts.php:622
-msgid "Repair URL settings"
-msgstr "URL Einstellungen reparieren"
-
-#: mod/contacts.php:623
-msgid "View conversations"
-msgstr "Unterhaltungen anzeigen"
-
-#: mod/contacts.php:628
-msgid "Last update:"
-msgstr "Letzte Aktualisierung: "
-
-#: mod/contacts.php:630
-msgid "Update public posts"
-msgstr "Öffentliche Beiträge aktualisieren"
-
-#: mod/contacts.php:632 mod/contacts.php:1002
-msgid "Update now"
-msgstr "Jetzt aktualisieren"
-
-#: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:489 mod/admin.php:1824
-msgid "Unblock"
-msgstr "Entsperren"
-
-#: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:488 mod/admin.php:1823
-msgid "Block"
-msgstr "Sperren"
-
-#: mod/contacts.php:638 mod/contacts.php:828 mod/contacts.php:1019
-msgid "Unignore"
-msgstr "Ignorieren aufheben"
-
-#: 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 "Ignorieren"
-
-#: mod/contacts.php:642
-msgid "Currently blocked"
-msgstr "Derzeit geblockt"
-
-#: mod/contacts.php:643
-msgid "Currently ignored"
-msgstr "Derzeit ignoriert"
-
-#: mod/contacts.php:644
-msgid "Currently archived"
-msgstr "Momentan archiviert"
-
-#: mod/contacts.php:645
-msgid "Awaiting connection acknowledge"
-msgstr "Bedarf der Bestätigung des Kontakts"
-
-#: mod/contacts.php:646 mod/notifications.php:175 mod/notifications.php:253
-msgid "Hide this contact from others"
-msgstr "Verbirg diesen Kontakt vor Anderen"
-
-#: mod/contacts.php:646
-msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
-msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein"
-
-#: mod/contacts.php:647
-msgid "Notification for new posts"
-msgstr "Benachrichtigung bei neuen Beiträgen"
-
-#: mod/contacts.php:647
-msgid "Send a notification of every new post of this contact"
-msgstr "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt."
-
-#: mod/contacts.php:650
-msgid "Blacklisted keywords"
-msgstr "Blacklistete Schlüsselworte "
-
-#: 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 "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde"
-
-#: mod/contacts.php:656 mod/unfollow.php:122 mod/follow.php:166
-#: mod/notifications.php:256 mod/admin.php:494 mod/admin.php:504
-msgid "Profile URL"
-msgstr "Profil URL"
-
-#: mod/contacts.php:660 mod/directory.php:148 mod/notifications.php:246
-#: mod/events.php:518 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 "Ort:"
-
-#: 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 "Über:"
-
-#: mod/contacts.php:666 mod/follow.php:174 mod/notifications.php:250
-#: src/Model/Profile.php:792
-msgid "Tags:"
-msgstr "Tags:"
-
-#: mod/contacts.php:667
-msgid "Actions"
-msgstr "Aktionen"
-
-#: 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 "Status"
-
-#: mod/contacts.php:670
-msgid "Contact Settings"
-msgstr "Kontakteinstellungen"
-
-#: mod/contacts.php:711
-msgid "Suggestions"
-msgstr "Kontaktvorschläge"
-
-#: mod/contacts.php:714
-msgid "Suggest potential friends"
-msgstr "Kontakte vorschlagen"
-
-#: mod/contacts.php:719 mod/group.php:215
-msgid "All Contacts"
-msgstr "Alle Kontakte"
-
-#: mod/contacts.php:722
-msgid "Show all contacts"
-msgstr "Alle Kontakte anzeigen"
-
-#: mod/contacts.php:727
-msgid "Unblocked"
-msgstr "Ungeblockt"
-
-#: mod/contacts.php:730
-msgid "Only show unblocked contacts"
-msgstr "Nur nicht-blockierte Kontakte anzeigen"
-
-#: mod/contacts.php:735
-msgid "Blocked"
-msgstr "Geblockt"
-
-#: mod/contacts.php:738
-msgid "Only show blocked contacts"
-msgstr "Nur blockierte Kontakte anzeigen"
-
-#: mod/contacts.php:743
-msgid "Ignored"
-msgstr "Ignoriert"
-
-#: mod/contacts.php:746
-msgid "Only show ignored contacts"
-msgstr "Nur ignorierte Kontakte anzeigen"
-
-#: mod/contacts.php:751
-msgid "Archived"
-msgstr "Archiviert"
-
-#: mod/contacts.php:754
-msgid "Only show archived contacts"
-msgstr "Nur archivierte Kontakte anzeigen"
-
-#: mod/contacts.php:759
-msgid "Hidden"
-msgstr "Verborgen"
-
-#: mod/contacts.php:762
-msgid "Only show hidden contacts"
-msgstr "Nur verborgene Kontakte anzeigen"
-
-#: mod/contacts.php:818
-msgid "Search your contacts"
-msgstr "Suche in deinen Kontakten"
-
-#: mod/contacts.php:819 mod/search.php:236
-#, php-format
-msgid "Results for: %s"
-msgstr "Ergebnisse für: %s"
-
-#: mod/contacts.php:820 mod/directory.php:209 view/theme/vier/theme.php:203
-#: src/Content/Widget.php:63
-msgid "Find"
-msgstr "Finde"
-
-#: mod/contacts.php:826 mod/settings.php:169 mod/settings.php:695
-msgid "Update"
-msgstr "Aktualisierungen"
-
-#: mod/contacts.php:829 mod/contacts.php:1027
-msgid "Archive"
-msgstr "Archivieren"
-
-#: mod/contacts.php:829 mod/contacts.php:1027
-msgid "Unarchive"
-msgstr "Aus Archiv zurückholen"
-
-#: mod/contacts.php:832
-msgid "Batch Actions"
-msgstr "Stapelverarbeitung"
-
-#: mod/contacts.php:858 mod/unfollow.php:132 mod/follow.php:186
-#: src/Model/Profile.php:889
-msgid "Status Messages and Posts"
-msgstr "Statusnachrichten und Beiträge"
-
-#: mod/contacts.php:866 src/Model/Profile.php:897
-msgid "Profile Details"
-msgstr "Profildetails"
-
-#: mod/contacts.php:878
-msgid "View all contacts"
-msgstr "Alle Kontakte anzeigen"
-
-#: mod/contacts.php:889
-msgid "View all common friends"
-msgstr "Alle Kontakte anzeigen"
-
-#: mod/contacts.php:895 mod/admin.php:1358 mod/events.php:532
-#: src/Model/Profile.php:863
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: mod/contacts.php:898
-msgid "Advanced Contact Settings"
-msgstr "Fortgeschrittene Kontakteinstellungen"
-
-#: mod/contacts.php:930
-msgid "Mutual Friendship"
-msgstr "Beidseitige Freundschaft"
-
-#: mod/contacts.php:934
-msgid "is a fan of yours"
-msgstr "ist ein Fan von dir"
-
-#: mod/contacts.php:938
-msgid "you are a fan of"
-msgstr "Du bist Fan von"
-
-#: mod/contacts.php:953 mod/photos.php:1476 mod/photos.php:1515
-#: mod/photos.php:1588 src/Object/Post.php:801
-msgid "This is you"
-msgstr "Das bist Du"
-
-#: mod/contacts.php:1013
-msgid "Toggle Blocked status"
-msgstr "Geblockt-Status ein-/ausschalten"
-
-#: mod/contacts.php:1021
-msgid "Toggle Ignored status"
-msgstr "Ignoriert-Status ein-/ausschalten"
-
-#: mod/contacts.php:1029
-msgid "Toggle Archive status"
-msgstr "Archiviert-Status ein-/ausschalten"
-
-#: mod/contacts.php:1037
-msgid "Delete contact"
-msgstr "Lösche den Kontakt"
-
-#: mod/delegate.php:37
-msgid "Parent user not found."
-msgstr "Verwalter nicht gefunden."
-
-#: mod/delegate.php:144
-msgid "No parent user"
-msgstr "Kein Verwalter"
-
-#: mod/delegate.php:159
-msgid "Parent Password:"
-msgstr "Passwort des Verwalters"
-
-#: mod/delegate.php:159
-msgid ""
-"Please enter the password of the parent account to legitimize your request."
-msgstr "Bitte gib das Passwort des Verwalters ein, um deine Anfrage zu bestätigen."
-
-#: mod/delegate.php:164
-msgid "Parent User"
-msgstr "Verwalter"
-
-#: 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 "Verwalter haben Zugriff auf alle Funktionen dieses Benutzerkontos und können dessen Einstellungen ändern."
-
-#: mod/delegate.php:168 mod/admin.php:311 mod/admin.php:1353
-#: mod/admin.php:1989 mod/admin.php:2242 mod/admin.php:2316 mod/admin.php:2463
-#: mod/settings.php:669 mod/settings.php:776 mod/settings.php:864
-#: mod/settings.php:953 mod/settings.php:1183
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
-
-#: mod/delegate.php:169 src/Content/Nav.php:205
-msgid "Delegate Page Management"
-msgstr "Delegiere das Management für die Seite"
-
-#: mod/delegate.php:170
-msgid "Delegates"
-msgstr "Bevollmächtigte"
-
-#: 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 "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!"
-
-#: mod/delegate.php:173
-msgid "Existing Page Delegates"
-msgstr "Vorhandene Bevollmächtigte für die Seite"
-
-#: mod/delegate.php:175
-msgid "Potential Delegates"
-msgstr "Potentielle Bevollmächtigte"
-
-#: mod/delegate.php:178
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: mod/delegate.php:179
-msgid "No entries."
-msgstr "Keine Einträge."
-
-#: mod/feedtest.php:20
-msgid "You must be logged in to use this module"
-msgstr "Du musst eingeloggt sein um dieses Modul benutzen zu können."
-
-#: mod/feedtest.php:48
-msgid "Source URL"
-msgstr "URL der Quelle"
-
-#: mod/oexchange.php:30
-msgid "Post successful."
-msgstr "Beitrag erfolgreich veröffentlicht."
-
-#: mod/ostatus_subscribe.php:21
-msgid "Subscribing to OStatus contacts"
-msgstr "OStatus Kontakten folgen"
-
-#: mod/ostatus_subscribe.php:33
-msgid "No contact provided."
-msgstr "Keine Kontakte gefunden."
-
-#: mod/ostatus_subscribe.php:40
-msgid "Couldn't fetch information for contact."
-msgstr "Konnte die Kontaktinformationen nicht einholen."
-
-#: mod/ostatus_subscribe.php:50
-msgid "Couldn't fetch friends for contact."
-msgstr "Konnte die Kontaktliste des Kontakts nicht abfragen."
-
-#: mod/ostatus_subscribe.php:78
-msgid "success"
-msgstr "Erfolg"
-
-#: mod/ostatus_subscribe.php:80
-msgid "failed"
-msgstr "Fehlgeschlagen"
-
-#: mod/ostatus_subscribe.php:83 src/Object/Post.php:287
-msgid "ignored"
-msgstr "Ignoriert"
-
-#: mod/profile_photo.php:55
-msgid "Image uploaded but image cropping failed."
-msgstr "Bild hochgeladen, aber das Zuschneiden schlug fehl."
-
-#: 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 "Verkleinern der Bildgröße von [%s] scheiterte."
-
-#: mod/profile_photo.php:125
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."
-
-#: mod/profile_photo.php:134
-msgid "Unable to process image"
-msgstr "Bild konnte nicht verarbeitet werden"
-
-#: mod/profile_photo.php:247
-msgid "Upload File:"
-msgstr "Datei hochladen:"
-
-#: mod/profile_photo.php:248
-msgid "Select a profile:"
-msgstr "Profil auswählen:"
-
-#: mod/profile_photo.php:253
-msgid "or"
-msgstr "oder"
-
-#: mod/profile_photo.php:253
-msgid "skip this step"
-msgstr "diesen Schritt überspringen"
-
-#: mod/profile_photo.php:253
-msgid "select a photo from your photo albums"
-msgstr "wähle ein Foto aus deinen Fotoalben"
-
-#: mod/profile_photo.php:266
-msgid "Crop Image"
-msgstr "Bild zurechtschneiden"
-
-#: mod/profile_photo.php:267
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."
-
-#: mod/profile_photo.php:269
-msgid "Done Editing"
-msgstr "Bearbeitung abgeschlossen"
-
-#: mod/profile_photo.php:305
-msgid "Image uploaded successfully."
-msgstr "Bild erfolgreich hochgeladen."
-
-#: mod/unfollow.php:34
-msgid "Contact wasn't found or can't be unfollowed."
-msgstr "Der Kontakt konnte nicht gefunden oder nicht entfolgt werden."
-
-#: mod/unfollow.php:47
-msgid "Contact unfollowed"
-msgstr "Kontakt wird nicht mehr gefolgt"
-
-#: mod/unfollow.php:65 mod/follow.php:62 mod/dfrn_request.php:657
-msgid "Submit Request"
-msgstr "Anfrage abschicken"
-
-#: mod/unfollow.php:73
-msgid "You aren't a friend of this contact."
-msgstr "Du hast keine beidseitige Freundschaft mit diesem Kontakt."
-
-#: mod/unfollow.php:79
-msgid "Unfollowing is currently not supported by your network."
-msgstr "Bei diesem Netzwerk wird das Entfolgen derzeit nicht unterstützt."
-
-#: mod/unfollow.php:113 mod/follow.php:157 mod/dfrn_request.php:655
-msgid "Your Identity Address:"
-msgstr "Adresse Deines Profils:"
-
-#: mod/directory.php:151 mod/notifications.php:252 src/Model/Profile.php:416
-#: src/Model/Profile.php:743
-msgid "Gender:"
-msgstr "Geschlecht:"
-
-#: mod/directory.php:152 src/Model/Profile.php:417 src/Model/Profile.php:767
-msgid "Status:"
-msgstr "Status:"
-
-#: mod/directory.php:153 src/Model/Profile.php:418 src/Model/Profile.php:784
-msgid "Homepage:"
-msgstr "Homepage:"
-
-#: mod/directory.php:202 view/theme/vier/theme.php:208
-#: src/Content/Widget.php:68
-msgid "Global Directory"
-msgstr "Weltweites Verzeichnis"
-
-#: mod/directory.php:204
-msgid "Find on this site"
-msgstr "Auf diesem Server suchen"
-
-#: mod/directory.php:206
-msgid "Results for:"
-msgstr "Ergebnisse für:"
-
-#: mod/directory.php:208
-msgid "Site Directory"
-msgstr "Verzeichnis"
-
-#: mod/directory.php:213
-msgid "No entries (some entries may be hidden)."
-msgstr "Keine Einträge (einige Einträge könnten versteckt sein)."
-
-#: mod/dirfind.php:49
-#, php-format
-msgid "People Search - %s"
-msgstr "Personensuche - %s"
-
-#: mod/dirfind.php:60
-#, php-format
-msgid "Forum Search - %s"
-msgstr "Forensuche - %s"
-
-#: mod/follow.php:45
-msgid "The contact could not be added."
-msgstr "Der Kontakt konnte nicht hinzugefügt werden."
-
-#: mod/follow.php:73
-msgid "You already added this contact."
-msgstr "Du hast den Kontakt bereits hinzugefügt."
-
-#: mod/follow.php:83
-msgid "Diaspora support isn't enabled. Contact can't be added."
-msgstr "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."
-
-#: mod/follow.php:90
-msgid "OStatus support is disabled. Contact can't be added."
-msgstr "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."
-
-#: mod/follow.php:97
-msgid "The network type couldn't be detected. Contact can't be added."
-msgstr "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden."
-
-#: mod/follow.php:149 mod/dfrn_request.php:647
-msgid "Please answer the following:"
-msgstr "Bitte beantworte folgendes:"
-
-#: mod/follow.php:150 mod/dfrn_request.php:648
-#, php-format
-msgid "Does %s know you?"
-msgstr "Kennt %s Dich?"
-
-#: mod/follow.php:151 mod/dfrn_request.php:649
-msgid "Add a personal note:"
-msgstr "Eine persönliche Notiz beifügen:"
-
-#: mod/lostpass.php:27
+#: mod/lostpass.php:28
 msgid "No valid account found."
 msgstr "Kein gültiges Konto gefunden."
 
-#: mod/lostpass.php:39
+#: mod/lostpass.php:40
 msgid "Password reset request issued. Check your email."
 msgstr "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe Deine E-Mail."
 
-#: mod/lostpass.php:45
+#: mod/lostpass.php:46
 #, php-format
 msgid ""
 "\n"
@@ -2766,7 +4088,7 @@ msgid ""
 "\t\tissued this request."
 msgstr "\nHallo %1$s,\n\nAuf \"%2$s\" ist eine Anfrage auf das Zurücksetzen Deines Passworts gestellt\nworden. Um diese Anfrage zu verifizieren, folge bitte dem unten stehenden\nLink oder kopiere und füge ihn in die Adressleiste Deines Browsers ein.\n\nSolltest Du die Anfrage NICHT gemacht haben, ignoriere und/oder lösche diese\nE-Mail bitte.\n\nDein Passwort wird nicht geändert, solange wir nicht verifiziert haben, dass\nDu diese Änderung angefragt hast."
 
-#: mod/lostpass.php:56
+#: mod/lostpass.php:57
 #, php-format
 msgid ""
 "\n"
@@ -2783,66 +4105,66 @@ msgid ""
 "\t\tLogin Name:\t%3$s"
 msgstr "\nUm Deine Identität zu verifizieren, folge bitte dem folgenden Link:\n\n%1$s\n\nDu wirst eine weitere E-Mail mit Deinem neuen Passwort erhalten. Sobald Du Dich\nangemeldet hast, kannst Du Dein Passwort in den Einstellungen ändern.\n\nDie Anmeldedetails sind die folgenden:\n\nAdresse der Seite:\t%2$s\nBenutzername:\t%3$s"
 
-#: mod/lostpass.php:73
+#: mod/lostpass.php:76
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
 
-#: mod/lostpass.php:89
+#: mod/lostpass.php:92
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast Du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
-#: mod/lostpass.php:102
+#: mod/lostpass.php:105
 msgid "Request has expired, please make a new one."
 msgstr "Die Anfrage ist abgelaufen. Bitte stelle eine erneute."
 
-#: mod/lostpass.php:117
+#: mod/lostpass.php:120
 msgid "Forgot your Password?"
 msgstr "Hast Du Dein Passwort vergessen?"
 
-#: 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 "Gib Deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden Dir dann weitere Informationen per Mail zugesendet."
 
-#: mod/lostpass.php:119 src/Module/Login.php:315
+#: mod/lostpass.php:122 src/Module/Login.php:312
 msgid "Nickname or Email: "
 msgstr "Spitzname oder E-Mail:"
 
-#: mod/lostpass.php:120
+#: mod/lostpass.php:123
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: mod/lostpass.php:136 src/Module/Login.php:327
+#: mod/lostpass.php:139 src/Module/Login.php:324
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
-#: mod/lostpass.php:137
+#: mod/lostpass.php:140
 msgid "Your password has been reset as requested."
 msgstr "Dein Passwort wurde wie gewünscht zurückgesetzt."
 
-#: mod/lostpass.php:138
+#: mod/lostpass.php:141
 msgid "Your new password is"
 msgstr "Dein neues Passwort lautet"
 
-#: mod/lostpass.php:139
+#: mod/lostpass.php:142
 msgid "Save or copy your new password - and then"
 msgstr "Speichere oder kopiere Dein neues Passwort - und dann"
 
-#: mod/lostpass.php:140
+#: mod/lostpass.php:143
 msgid "click here to login"
 msgstr "hier klicken, um Dich anzumelden"
 
-#: mod/lostpass.php:141
+#: mod/lostpass.php:144
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald Du Dich erfolgreich angemeldet hast."
 
-#: mod/lostpass.php:149
+#: mod/lostpass.php:152
 #, php-format
 msgid ""
 "\n"
@@ -2853,7 +4175,7 @@ msgid ""
 "\t\t"
 msgstr "\nHallo %1$s,\n\nDein Passwort wurde wie gewünscht geändert. Bitte bewahre diese Informationen gut auf (oder ändere Dein Passwort in eines, das Du Dir leicht merken kannst)."
 
-#: mod/lostpass.php:155
+#: mod/lostpass.php:158
 #, php-format
 msgid ""
 "\n"
@@ -2867,7 +4189,7 @@ msgid ""
 "\t\t"
 msgstr "\nDie Anmeldedaten sind die folgenden:\n\nAdresse der Seite: %1$s\nLogin Name: %2$s\nPasswort: %3$s\n\nDas Passwort kann und sollte in den Kontoeinstellungen nach der Anmeldung geändert werden."
 
-#: mod/lostpass.php:169
+#: mod/lostpass.php:174
 #, php-format
 msgid "Your password has been changed at %s"
 msgstr "Auf %s wurde Dein Passwort geändert"
@@ -2948,543 +4270,1818 @@ msgstr "Markdown"
 msgid "HTML"
 msgstr "HTML"
 
-#: mod/friendica.php:77
-msgid "This is Friendica, version"
-msgstr "Dies ist Friendica, Version"
+#: mod/admin.php:109
+msgid "Theme settings updated."
+msgstr "Themeneinstellungen aktualisiert."
 
-#: mod/friendica.php:78
-msgid "running at web location"
-msgstr "die unter folgender Webadresse zu finden ist"
+#: mod/admin.php:182 src/Content/Nav.php:175
+msgid "Information"
+msgstr "Information"
 
-#: mod/friendica.php:82
+#: mod/admin.php:183
+msgid "Overview"
+msgstr "Übersicht"
+
+#: mod/admin.php:184 mod/admin.php:723
+msgid "Federation Statistics"
+msgstr "Föderation Statistik"
+
+#: mod/admin.php:185
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#: mod/admin.php:186 mod/admin.php:1425
+msgid "Site"
+msgstr "Seite"
+
+#: mod/admin.php:187 mod/admin.php:1354 mod/admin.php:1896 mod/admin.php:1913
+msgid "Users"
+msgstr "Nutzer"
+
+#: mod/admin.php:189 mod/admin.php:2283 mod/admin.php:2327
+msgid "Themes"
+msgstr "Themen"
+
+#: mod/admin.php:192
+msgid "Database"
+msgstr "Datenbank"
+
+#: mod/admin.php:193
+msgid "DB updates"
+msgstr "DB Updates"
+
+#: mod/admin.php:194 mod/admin.php:766
+msgid "Inspect Queue"
+msgstr "Warteschlange Inspizieren"
+
+#: mod/admin.php:195
+msgid "Inspect worker Queue"
+msgstr "Worker Warteschlange inspizieren"
+
+#: mod/admin.php:196
+msgid "Tools"
+msgstr "Werkzeuge"
+
+#: mod/admin.php:197
+msgid "Contact Blocklist"
+msgstr "Kontakt Sperrliste"
+
+#: mod/admin.php:198 mod/admin.php:372
+msgid "Server Blocklist"
+msgstr "Server Blockliste"
+
+#: mod/admin.php:199 mod/admin.php:531
+msgid "Delete Item"
+msgstr "Eintrag löschen"
+
+#: mod/admin.php:200 mod/admin.php:201 mod/admin.php:2402
+msgid "Logs"
+msgstr "Protokolle"
+
+#: mod/admin.php:202 mod/admin.php:2469
+msgid "View Logs"
+msgstr "Protokolle anzeigen"
+
+#: mod/admin.php:204
+msgid "Diagnostics"
+msgstr "Diagnostik"
+
+#: mod/admin.php:205
+msgid "PHP Info"
+msgstr "PHP Info"
+
+#: mod/admin.php:206
+msgid "probe address"
+msgstr "Adresse untersuchen"
+
+#: mod/admin.php:207
+msgid "check webfinger"
+msgstr "Webfinger überprüfen"
+
+#: mod/admin.php:226 src/Content/Nav.php:218
+msgid "Admin"
+msgstr "Administration"
+
+#: mod/admin.php:227
+msgid "Addon Features"
+msgstr "Addon Features"
+
+#: mod/admin.php:228
+msgid "User registrations waiting for confirmation"
+msgstr "Nutzeranmeldungen die auf Bestätigung warten"
+
+#: 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 "Administration"
+
+#: mod/admin.php:311
+msgid "Display Terms of Service"
+msgstr "Nutzungsbedingungen anzeigen"
+
+#: mod/admin.php:311
 msgid ""
-"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
-"about the Friendica project."
-msgstr "Bitte besuche <a href=\"https://friendi.ca\">Friendi.ca</a> um mehr über das Friendica Projekt zu erfahren."
+"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 "Aktiviert die Seite für die Nutzungsbedingungen. Ist dies der Fall werden sie auch von der Registrierungsseite und der allgemeinen Informationsseite verlinkt."
 
-#: mod/friendica.php:86
-msgid "Bug reports and issues: please visit"
-msgstr "Probleme oder Fehler gefunden? Bitte besuche"
+#: mod/admin.php:312
+msgid "Display Privacy Statement"
+msgstr "Datenschutzerklärung anzeigen"
 
-#: mod/friendica.php:86
-msgid "the bugtracker at github"
-msgstr "den Bugtracker auf github"
-
-#: mod/friendica.php:89
-msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
-msgstr "Vorschläge, Lob usw.: E-Mail an \"Info\" at \"Friendi - dot ca\""
-
-#: mod/friendica.php:103
-msgid "Installed addons/apps:"
-msgstr "Installierte Apps und Addons"
-
-#: mod/friendica.php:117
-msgid "No installed addons/apps"
-msgstr "Es sind keine Addons oder Apps installiert"
-
-#: mod/friendica.php:122
-#, php-format
-msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
-msgstr "Erfahre mehr über die <a href=\"%1$s/tos\">Nutzungsbedingungen</a> dieses Knotens."
-
-#: mod/friendica.php:127
-msgid "On this server the following remote servers are blocked."
-msgstr "Auf diesem Server werden die folgenden entfernten Server blockiert."
-
-#: mod/friendica.php:128 mod/dfrn_request.php:347 mod/admin.php:357
-#: mod/admin.php:375 src/Model/Contact.php:1281
-msgid "Blocked domain"
-msgstr "Blockierte Domain"
-
-#: mod/friendica.php:128 mod/admin.php:358 mod/admin.php:376
-msgid "Reason for the block"
-msgstr "Begründung für die Blockierung"
-
-#: mod/invite.php:33
-msgid "Total invitation limit exceeded."
-msgstr "Limit für Einladungen erreicht."
-
-#: mod/invite.php:55
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s: Keine gültige Email Adresse."
-
-#: mod/invite.php:87
-msgid "Please join us on Friendica"
-msgstr "Ich lade Dich zu unserem sozialen Netzwerk Friendica ein"
-
-#: mod/invite.php:96
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Limit für Einladungen erreicht. Bitte kontaktiere des Administrator der Seite."
-
-#: mod/invite.php:100
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s: Zustellung der Nachricht fehlgeschlagen."
-
-#: mod/invite.php:104
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d Nachricht gesendet."
-msgstr[1] "%d Nachrichten gesendet."
-
-#: mod/invite.php:122
-msgid "You have no more invitations available"
-msgstr "Du hast keine weiteren Einladungen"
-
-#: mod/invite.php:130
+#: mod/admin.php:312
 #, 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 "Besuche %s für eine Liste der öffentlichen Server, denen Du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke."
+"Show some informations regarding the needed information to operate the node "
+"according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."
+msgstr "Zeige Informationen über die zum Betrieb der Seite notwendigen personenbezogenen Daten an, wie es z.B. die <a href=\"%s\" target=\"_blank\">EU-DSGVO</a> verlangt."
 
-#: mod/invite.php:132
+#: mod/admin.php:313
+msgid "Privacy Statement Preview"
+msgstr "Vorschau: Datenschutzerklärung"
+
+#: mod/admin.php:315
+msgid "The Terms of Service"
+msgstr "Die Nutzungsbedingungen"
+
+#: 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 "Füge hier die Nutzungsbedingungen deines Knotens ein. Du kannst BBCode zur Formatierung verwenden. Überschriften sollten [h2] oder darunter sein."
+
+#: mod/admin.php:363
+msgid "The blocked domain"
+msgstr "Die blockierte Domain"
+
+#: mod/admin.php:364 mod/admin.php:377
+msgid "The reason why you blocked this domain."
+msgstr "Die Begründung warum du diese Domain blockiert hast."
+
+#: mod/admin.php:365
+msgid "Delete domain"
+msgstr "Domain löschen"
+
+#: mod/admin.php:365
+msgid "Check to delete this entry from the blocklist"
+msgstr "Markieren, um diesen Eintrag von der Blocklist zu entfernen"
+
+#: 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 "Auf dieser Seite kannst du die Liste der blockierten Domains aus dem föderalen Netzwerk verwalten, denen es untersagt ist mit deinem Knoten zu interagieren. Für jede der blockierten Domains musst du außerdem einen Grund für die Sperrung angeben."
+
+#: 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 "Die Liste der blockierten Domains wird auf der /friendica Seite öffentlich einsehbar gemacht, damit deine Nutzer und Personen die Kommunikationsprobleme erkunden, die Ursachen einfach finden können."
+
+#: mod/admin.php:375
+msgid "Add new entry to block list"
+msgstr "Neuen Eintrag in die Blockliste"
+
+#: mod/admin.php:376
+msgid "Server Domain"
+msgstr "Domain des Servers"
+
+#: mod/admin.php:376
+msgid ""
+"The domain of the new server to add to the block list. Do not include the "
+"protocol."
+msgstr "Der Domain-Name des Servers der geblockt werden soll. Gib das Protokoll nicht mit an!"
+
+#: mod/admin.php:377
+msgid "Block reason"
+msgstr "Begründung der Blockierung"
+
+#: mod/admin.php:378
+msgid "Add Entry"
+msgstr "Eintrag hinzufügen"
+
+#: mod/admin.php:379
+msgid "Save changes to the blocklist"
+msgstr "Änderungen der Blockliste speichern"
+
+#: mod/admin.php:380
+msgid "Current Entries in the Blocklist"
+msgstr "Aktuelle Einträge der Blockliste"
+
+#: mod/admin.php:383
+msgid "Delete entry from blocklist"
+msgstr "Eintrag von der Blockliste entfernen"
+
+#: mod/admin.php:386
+msgid "Delete entry from blocklist?"
+msgstr "Eintrag von der Blockliste entfernen?"
+
+#: mod/admin.php:412
+msgid "Server added to blocklist."
+msgstr "Server zur Blockliste hinzugefügt."
+
+#: mod/admin.php:428
+msgid "Site blocklist updated."
+msgstr "Blockliste aktualisiert."
+
+#: mod/admin.php:451 src/Core/Console/GlobalCommunityBlock.php:68
+msgid "The contact has been blocked from the node"
+msgstr "Der Kontakt wurde von diesem Knoten geblockt"
+
+#: mod/admin.php:453 src/Core/Console/GlobalCommunityBlock.php:65
+#, php-format
+msgid "Could not find any contact entry for this URL (%s)"
+msgstr "Für die URL (%s) konnte kein Kontakt gefunden werden"
+
+#: mod/admin.php:460
+#, php-format
+msgid "%s contact unblocked"
+msgid_plural "%s contacts unblocked"
+msgstr[0] "%sKontakt wieder freigegeben"
+msgstr[1] "%sKontakte wieder freigegeben"
+
+#: mod/admin.php:489
+msgid "Remote Contact Blocklist"
+msgstr "Sperrliste entfernter Kontakte"
+
+#: mod/admin.php:490
+msgid ""
+"This page allows you to prevent any message from a remote contact to reach "
+"your node."
+msgstr "Auf dieser Seite kannst du Accounts von anderen Knoten blockieren und damit verhindern, dass ihre Beiträge von deinem Knoten angenommen werden."
+
+#: mod/admin.php:491
+msgid "Block Remote Contact"
+msgstr "Blockiere entfernten Kontakt"
+
+#: mod/admin.php:492 mod/admin.php:1898
+msgid "select all"
+msgstr "Alle auswählen"
+
+#: mod/admin.php:493
+msgid "select none"
+msgstr "Auswahl aufheben"
+
+#: mod/admin.php:494 mod/admin.php:1907 mod/contacts.php:657
+#: mod/contacts.php:849 mod/contacts.php:1105
+msgid "Block"
+msgstr "Sperren"
+
+#: mod/admin.php:495 mod/admin.php:1909 mod/contacts.php:657
+#: mod/contacts.php:849 mod/contacts.php:1105
+msgid "Unblock"
+msgstr "Entsperren"
+
+#: mod/admin.php:496
+msgid "No remote contact is blocked from this node."
+msgstr "Derzeit werden keine Kontakte auf diesem Knoten blockiert."
+
+#: mod/admin.php:498
+msgid "Blocked Remote Contacts"
+msgstr "Blockierte Kontakte von anderen Knoten"
+
+#: mod/admin.php:499
+msgid "Block New Remote Contact"
+msgstr "Blockieren von weiteren Kontakten"
+
+#: mod/admin.php:500
+msgid "Photo"
+msgstr "Foto:"
+
+#: mod/admin.php:500 mod/profiles.php:391
+msgid "Address"
+msgstr "Adresse"
+
+#: mod/admin.php:508
+#, php-format
+msgid "%s total blocked contact"
+msgid_plural "%s total blocked contacts"
+msgstr[0] "Insgesamt %s blockierter Kontakt"
+msgstr[1] "Insgesamt %s blockierte Kontakte"
+
+#: mod/admin.php:510
+msgid "URL of the remote contact to block."
+msgstr "Die URL des Kontakts, vom entfernten Server, der blockiert werden soll."
+
+#: mod/admin.php:532
+msgid "Delete this Item"
+msgstr "Diesen Eintrag löschen"
+
+#: 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 "Auf dieser Seite kannst du Einträge von deinem Knoten löschen. Wenn der Eintrag der Anfang einer Diskussion ist, wird der gesamte Diskussionsverlauf gelöscht."
+
+#: 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 "Zur Löschung musst du die GUID des Eintrags kennen. Diese findest du z.B. durch die /display URL des Eintrags. Der letzte Teil der URL ist die GUID. Lautet die URL beispielsweise http://example.com/display/123456 ist die GUID 123456."
+
+#: mod/admin.php:535
+msgid "GUID"
+msgstr "GUID"
+
+#: mod/admin.php:535
+msgid "The GUID of the item you want to delete."
+msgstr "Die GUID des zu löschenden Eintrags"
+
+#: mod/admin.php:569
+msgid "Item marked for deletion."
+msgstr "Eintrag wurden zur Löschung markiert"
+
+#: mod/admin.php:640
+msgid "unknown"
+msgstr "Unbekannt"
+
+#: 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 "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des föderalen sozialen Netzwerks, von dem deine Friendica Installation ein Teil ist. Diese Zahlen sind nicht absolut und reflektieren nur den Teil des Netzwerks, den dein Knoten kennt."
+
+#: mod/admin.php:717
+msgid ""
+"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
+"will improve the data displayed here."
+msgstr "Die Funktion um <em>Automatisch ein Kontaktverzeichnis erstellen</em> ist nicht aktiv. Es wird die hier angezeigten Daten verbessern."
+
+#: mod/admin.php:729
 #, php-format
 msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
-msgstr "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s oder einer anderen öffentlichen Friendica Website."
+"Currently this node is aware of %d nodes with %d registered users from the "
+"following platforms:"
+msgstr "Momentan kennt dieser Knoten %d Knoten mit insgesamt %d registrierten Nutzern, die die folgenden Plattformen verwenden:"
 
-#: mod/invite.php:133
+#: mod/admin.php:768 mod/admin.php:809
+msgid "ID"
+msgstr "ID"
+
+#: mod/admin.php:769
+msgid "Recipient Name"
+msgstr "Empfänger Name"
+
+#: mod/admin.php:770
+msgid "Recipient Profile"
+msgstr "Empfänger Profil"
+
+#: mod/admin.php:772 mod/admin.php:811
+msgid "Created"
+msgstr "Erstellt"
+
+#: mod/admin.php:773
+msgid "Last Tried"
+msgstr "Zuletzt versucht"
+
+#: 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 "Auf dieser Seite werden die in der Warteschlange eingereihten Beiträge aufgelistet. Bei diesen Beiträgen schlug die erste Zustellung fehl. Es wird später wiederholt versucht die Beiträge zuzustellen, bis sie schließlich gelöscht werden."
+
+#: mod/admin.php:807
+msgid "Inspect Worker Queue"
+msgstr "Worker Warteschlange inspizieren"
+
+#: mod/admin.php:810
+msgid "Job Parameters"
+msgstr "Parameter der Aufgabe"
+
+#: mod/admin.php:812
+msgid "Priority"
+msgstr "Priorität"
+
+#: 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 "Auf dieser Seite werden die derzeit in der Warteschlange befindlichen Worker-Jobs aufgelistet. Diese Jobs werden vom Cronjob verarbeitet, den Sie während der Installation eingerichtet haben."
+
+#: mod/admin.php:837
 #, 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 Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen Du beitreten kannst."
+"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 "Deine DB verwendet derzeit noch MyISAM Tabellen. Du solltest die Datenbank Engine auf InnoDB umstellen, da Friendica in Zukunft InnoDB Features verwenden wird. Eine Anleitung zur Umstellung der Datenbank kannst du  <a href=\"%s\">hier</a>  finden. Du kannst außerdem mit dem Befehl <tt>php bin/console.php dbstructure toinnodb</tt> auf der Kommandozeile die Umstellung automatisch vornehmen lassen."
 
-#: mod/invite.php:137
-msgid ""
-"Our apologies. This system is not currently configured to connect with other"
-" public sites or invite members."
-msgstr "Es tut uns leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen."
-
-#: 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 Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden."
-
-#: mod/invite.php:140
-#, php-format
-msgid "To accept this invitation, please visit and register at %s."
-msgstr "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s."
-
-#: mod/invite.php:147
-msgid "Send invitations"
-msgstr "Einladungen senden"
-
-#: mod/invite.php:148
-msgid "Enter email addresses, one per line:"
-msgstr "E-Mail-Adressen eingeben, eine pro Zeile:"
-
-#: 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 "Du bist herzlich dazu eingeladen, Dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen."
-
-#: mod/invite.php:151
-msgid "You will need to supply this invitation code: $invite_code"
-msgstr "Du benötigst den folgenden Einladungscode: $invite_code"
-
-#: mod/invite.php:151
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
-msgstr "Sobald Du registriert bist, kontaktiere mich bitte auf meiner Profilseite:"
-
-#: 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 "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendi.ca."
-
-#: mod/crepair.php:87
-msgid "Contact settings applied."
-msgstr "Einstellungen zum Kontakt angewandt."
-
-#: mod/crepair.php:89
-msgid "Contact update failed."
-msgstr "Konnte den Kontakt nicht aktualisieren."
-
-#: 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>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."
-
-#: 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 "Bitte nutze den Zurück-Button Deines Browsers <strong>jetzt</strong>, wenn Du Dir unsicher bist, was Du tun willst."
-
-#: mod/crepair.php:129 mod/crepair.php:131
-msgid "No mirroring"
-msgstr "Kein Spiegeln"
-
-#: mod/crepair.php:129
-msgid "Mirror as forwarded posting"
-msgstr "Spiegeln als weitergeleitete Beiträge"
-
-#: mod/crepair.php:129 mod/crepair.php:131
-msgid "Mirror as my own posting"
-msgstr "Spiegeln als meine eigenen Beiträge"
-
-#: mod/crepair.php:144
-msgid "Return to contact editor"
-msgstr "Zurück zum Kontakteditor"
-
-#: mod/crepair.php:146
-msgid "Refetch contact data"
-msgstr "Kontaktdaten neu laden"
-
-#: mod/crepair.php:149
-msgid "Remote Self"
-msgstr "Entfernte Konten"
-
-#: mod/crepair.php:152
-msgid "Mirror postings from this contact"
-msgstr "Spiegle Beiträge dieses Kontakts"
-
-#: mod/crepair.php:154
-msgid ""
-"Mark this contact as remote_self, this will cause friendica to repost new "
-"entries from this contact."
-msgstr "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden."
-
-#: mod/crepair.php:158 mod/admin.php:494 mod/admin.php:1806 mod/admin.php:1817
-#: mod/admin.php:1830 mod/admin.php:1846 mod/settings.php:671
-#: mod/settings.php:697
-msgid "Name"
-msgstr "Name"
-
-#: mod/crepair.php:159
-msgid "Account Nickname"
-msgstr "Konto-Spitzname"
-
-#: mod/crepair.php:160
-msgid "@Tagname - overrides Name/Nickname"
-msgstr "@Tagname - überschreibt Name/Spitzname"
-
-#: mod/crepair.php:161
-msgid "Account URL"
-msgstr "Konto-URL"
-
-#: mod/crepair.php:162
-msgid "Friend Request URL"
-msgstr "URL für Kontaktschaftsanfragen"
-
-#: mod/crepair.php:163
-msgid "Friend Confirm URL"
-msgstr "URL für Bestätigungen von Kontaktanfragen"
-
-#: mod/crepair.php:164
-msgid "Notification Endpoint URL"
-msgstr "URL-Endpunkt für Benachrichtigungen"
-
-#: mod/crepair.php:165
-msgid "Poll/Feed URL"
-msgstr "Pull/Feed-URL"
-
-#: mod/crepair.php:166
-msgid "New photo from this URL"
-msgstr "Neues Foto von dieser URL"
-
-#: mod/dfrn_poll.php:123 mod/dfrn_poll.php:539
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr "%1$s heißt %2$s herzlich willkommen"
-
-#: mod/help.php:48
-msgid "Help:"
-msgstr "Hilfe:"
-
-#: mod/help.php:54 view/theme/vier/theme.php:297 src/Content/Nav.php:134
-msgid "Help"
-msgstr "Hilfe"
-
-#: mod/help.php:63 index.php:317
-msgid "Page not found."
-msgstr "Seite nicht gefunden."
-
-#: mod/install.php:87
-msgid "Friendica Communications Server - Setup"
-msgstr "Friendica-Server für soziale Netzwerke – Setup"
-
-#: mod/install.php:93
-msgid "Could not connect to database."
-msgstr "Verbindung zur Datenbank gescheitert."
-
-#: mod/install.php:97
-msgid "Could not create table."
-msgstr "Tabelle konnte nicht angelegt werden."
-
-#: mod/install.php:103
-msgid "Your Friendica site database has been installed."
-msgstr "Die Datenbank Deiner Friendicaseite wurde installiert."
-
-#: mod/install.php:108
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren."
-
-#: mod/install.php:109 mod/install.php:155 mod/install.php:267
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Lies bitte die \"INSTALL.txt\"."
-
-#: mod/install.php:121
-msgid "Database already in use."
-msgstr "Die Datenbank wird bereits verwendet."
-
-#: mod/install.php:152
-msgid "System check"
-msgstr "Systemtest"
-
-#: mod/install.php:157
-msgid "Check again"
-msgstr "Noch einmal testen"
-
-#: mod/install.php:177
-msgid "Database connection"
-msgstr "Datenbankverbindung"
-
-#: mod/install.php:178
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
-msgstr "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können."
-
-#: mod/install.php:179
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest."
-
-#: mod/install.php:180
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst."
-
-#: mod/install.php:184
-msgid "Database Server Name"
-msgstr "Datenbank-Server"
-
-#: mod/install.php:185
-msgid "Database Login Name"
-msgstr "Datenbank-Nutzer"
-
-#: mod/install.php:186
-msgid "Database Login Password"
-msgstr "Datenbank-Passwort"
-
-#: mod/install.php:186
-msgid "For security reasons the password must not be empty"
-msgstr "Aus Sicherheitsgründen darf das Passwort nicht leer sein."
-
-#: mod/install.php:187
-msgid "Database Name"
-msgstr "Datenbank-Name"
-
-#: mod/install.php:188 mod/install.php:228
-msgid "Site administrator email address"
-msgstr "E-Mail-Adresse des Administrators"
-
-#: 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 "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst."
-
-#: mod/install.php:192 mod/install.php:231
-msgid "Please select a default timezone for your website"
-msgstr "Bitte wähle die Standardzeitzone Deiner Webseite"
-
-#: mod/install.php:218
-msgid "Site settings"
-msgstr "Server-Einstellungen"
-
-#: mod/install.php:232
-msgid "System Language:"
-msgstr "Systemsprache:"
-
-#: mod/install.php:232
-msgid ""
-"Set the default language for your Friendica installation interface and to "
-"send emails."
-msgstr "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand"
-
-#: 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 "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis Deiner Friendica-Installation zu erzeugen."
-
-#: mod/install.php:265
-msgid "<h1>What next</h1>"
-msgstr "<h1>Wie geht es weiter?</h1>"
-
-#: mod/install.php:266
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"worker."
-msgstr "Wichtig: Du musst [manuell] einen Cronjob (o.ä.) für den Worker einrichten."
-
-#: mod/install.php:269
+#: mod/admin.php:844
 #, 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 "Du solltest nun die Seite zur <a href=\"%s/register\">Nutzerregistrierung</a> deiner neuen Friendica Instanz besuchen und einen neuen Nutzer einrichten. Bitte denke daran die selbe E-Mail Adresse anzugeben, die du auch als Administrator E-Mail angegeben hast, damit du das Admin-Panel verwenden kannst."
+"There is a new version of Friendica available for download. Your current "
+"version is %1$s, upstream version is %2$s"
+msgstr "Es gibt eine neue Version von Friendica. Du verwendest derzeit die Version %1$s, die aktuelle Version ist %2$s."
 
-#: mod/message.php:30 src/Content/Nav.php:199
-msgid "New Message"
-msgstr "Neue Nachricht"
-
-#: mod/message.php:77
-msgid "Unable to locate contact information."
-msgstr "Konnte die Kontaktinformationen nicht finden."
-
-#: mod/message.php:112 view/theme/frio/theme.php:268 src/Content/Nav.php:196
-msgid "Messages"
-msgstr "Nachrichten"
-
-#: mod/message.php:136
-msgid "Do you really want to delete this message?"
-msgstr "Möchtest Du wirklich diese Nachricht löschen?"
-
-#: mod/message.php:152
-msgid "Message deleted."
-msgstr "Nachricht gelöscht."
-
-#: mod/message.php:166
-msgid "Conversation removed."
-msgstr "Unterhaltung gelöscht."
-
-#: mod/message.php:272
-msgid "No messages."
-msgstr "Keine Nachrichten."
-
-#: mod/message.php:311
-msgid "Message not available."
-msgstr "Nachricht nicht verfügbar."
-
-#: mod/message.php:378
-msgid "Delete message"
-msgstr "Nachricht löschen"
-
-#: mod/message.php:380 mod/message.php:481
-msgid "D, d M Y - g:i A"
-msgstr "D, d. M Y - H:i"
-
-#: mod/message.php:395 mod/message.php:478
-msgid "Delete conversation"
-msgstr "Unterhaltung löschen"
-
-#: mod/message.php:397
+#: mod/admin.php:854
 msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten."
+"The database update failed. Please run \"php bin/console.php dbstructure "
+"update\" from the command line and have a look at the errors that might "
+"appear."
+msgstr "Das Update der Datenbank ist fehlgeschlagen. Bitte führe 'php bin/console.php dbstructure update' in der Kommandozeile aus und achte auf eventuell auftretende Fehlermeldungen."
 
-#: mod/message.php:401
-msgid "Send Reply"
-msgstr "Antwort senden"
+#: mod/admin.php:860
+msgid "The worker was never executed. Please check your database structure!"
+msgstr "Der Hintergrundprozess (worker) wurde noch nie gestartet. Bitte überprüfe deine Datenbankstruktur."
 
-#: mod/message.php:452
+#: mod/admin.php:863
 #, php-format
-msgid "Unknown sender - %s"
-msgstr "'Unbekannter Absender - %s"
+msgid ""
+"The last worker execution was on %s UTC. This is older than one hour. Please"
+" check your crontab settings."
+msgstr "Der Hintergrundprozess (worker) wurde zuletzt um %s UTC ausgeführt. Das war vor mehr als einer Stunde. Bitte überprüfe deine crontab Einstellungen."
 
-#: mod/message.php:454
+#: mod/admin.php:869
 #, php-format
-msgid "You and %s"
-msgstr "Du und %s"
+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 "Die Konfiguration von Friendica befindet sich ab jetzt in der 'config/local.ini.php' Datei. Kopiere bitte die Datei  'config/local-sample.ini.php' nach 'config/local.ini.php' und setze die Konfigurationvariablen so wie in der alten <code>.htconfig.php</code>. Wie die Übertragung der Werte aussehen muss kannst du der <a href=\"%s\">Konfiguration Hilfeseite</a> entnehmen."
 
-#: mod/message.php:456
+#: mod/admin.php:876
 #, php-format
-msgid "%s and You"
-msgstr "%s und Du"
+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> konnte von deinem System nicht aufgerufen werden. Dies deitet auf ein schwerwiegendes Problem deiner Konfiguration hin. Bitte konsultiere <a href=\"%s\">die Installations-Dokumentation</a> zum Beheben des Problems."
 
-#: mod/message.php:484
+#: mod/admin.php:882
+msgid "Normal Account"
+msgstr "Normales Konto"
+
+#: mod/admin.php:883
+msgid "Automatic Follower Account"
+msgstr "Automatisch folgendes Konto (Marktschreier)"
+
+#: mod/admin.php:884
+msgid "Public Forum Account"
+msgstr "Öffentliches Forum Konto"
+
+#: mod/admin.php:885
+msgid "Automatic Friend Account"
+msgstr "Automatische Freunde Seite"
+
+#: mod/admin.php:886
+msgid "Blog Account"
+msgstr "Blog-Konto"
+
+#: mod/admin.php:887
+msgid "Private Forum Account"
+msgstr "Privates Forum Konto"
+
+#: mod/admin.php:909
+msgid "Message queues"
+msgstr "Nachrichten-Warteschlangen"
+
+#: mod/admin.php:915
+msgid "Summary"
+msgstr "Zusammenfassung"
+
+#: mod/admin.php:917
+msgid "Registered users"
+msgstr "Registrierte Personen"
+
+#: mod/admin.php:919
+msgid "Pending registrations"
+msgstr "Anstehende Anmeldungen"
+
+#: mod/admin.php:920
+msgid "Version"
+msgstr "Version"
+
+#: mod/admin.php:925
+msgid "Active addons"
+msgstr "Aktivierte Addons"
+
+#: mod/admin.php:956
+msgid "Can not parse base url. Must have at least <scheme>://<domain>"
+msgstr "Die Basis-URL konnte nicht analysiert werden. Sie muss mindestens aus <protokoll>://<domain> bestehen"
+
+#: mod/admin.php:1289
+msgid "Site settings updated."
+msgstr "Seiteneinstellungen aktualisiert."
+
+#: mod/admin.php:1345
+msgid "No community page for local users"
+msgstr "Keine Gemeinschaftsseite für lokale Nutzer"
+
+#: mod/admin.php:1346
+msgid "No community page"
+msgstr "Keine Gemeinschaftsseite"
+
+#: mod/admin.php:1347
+msgid "Public postings from users of this site"
+msgstr "Öffentliche Beiträge von NutzerInnen dieser Seite"
+
+#: mod/admin.php:1348
+msgid "Public postings from the federated network"
+msgstr "Öffentliche Beiträge aus dem föderalen Netzwerk"
+
+#: mod/admin.php:1349
+msgid "Public postings from local users and the federated network"
+msgstr "Öffentliche Beiträge von lokalen Nutzern und aus dem föderalen Netzwerk"
+
+#: mod/admin.php:1353 mod/admin.php:1520 mod/admin.php:1530
+#: mod/contacts.php:577
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+#: mod/admin.php:1355
+msgid "Users, Global Contacts"
+msgstr "Nutzer, globale Kontakte"
+
+#: mod/admin.php:1356
+msgid "Users, Global Contacts/fallback"
+msgstr "Nutzer, globale Kontakte / Fallback"
+
+#: mod/admin.php:1360
+msgid "One month"
+msgstr "ein Monat"
+
+#: mod/admin.php:1361
+msgid "Three months"
+msgstr "drei Monate"
+
+#: mod/admin.php:1362
+msgid "Half a year"
+msgstr "ein halbes Jahr"
+
+#: mod/admin.php:1363
+msgid "One year"
+msgstr "ein Jahr"
+
+#: mod/admin.php:1368
+msgid "Multi user instance"
+msgstr "Mehrbenutzer Instanz"
+
+#: mod/admin.php:1394
+msgid "Closed"
+msgstr "Geschlossen"
+
+#: mod/admin.php:1395
+msgid "Requires approval"
+msgstr "Bedarf der Zustimmung"
+
+#: mod/admin.php:1396
+msgid "Open"
+msgstr "Offen"
+
+#: mod/admin.php:1400
+msgid "No SSL policy, links will track page SSL state"
+msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"
+
+#: mod/admin.php:1401
+msgid "Force all links to use SSL"
+msgstr "SSL für alle Links erzwingen"
+
+#: mod/admin.php:1402
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"
+
+#: mod/admin.php:1406
+msgid "Don't check"
+msgstr "Nicht überprüfen"
+
+#: mod/admin.php:1407
+msgid "check the stable version"
+msgstr "überprüfe die stabile Version"
+
+#: mod/admin.php:1408
+msgid "check the development version"
+msgstr "überprüfe die Entwicklungsversion"
+
+#: mod/admin.php:1427
+msgid "Republish users to directory"
+msgstr "Nutzer erneut im globalen Verzeichnis veröffentlichen."
+
+#: mod/admin.php:1429
+msgid "File upload"
+msgstr "Datei hochladen"
+
+#: mod/admin.php:1430
+msgid "Policies"
+msgstr "Regeln"
+
+#: mod/admin.php:1431 mod/contacts.php:926 mod/events.php:535
+#: src/Model/Profile.php:852
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: mod/admin.php:1432
+msgid "Auto Discovered Contact Directory"
+msgstr "Automatisch ein Kontaktverzeichnis erstellen"
+
+#: mod/admin.php:1433
+msgid "Performance"
+msgstr "Performance"
+
+#: mod/admin.php:1434
+msgid "Worker"
+msgstr "Worker"
+
+#: mod/admin.php:1435
+msgid "Message Relay"
+msgstr "Nachrichten Relais"
+
+#: mod/admin.php:1436
+msgid ""
+"Relocate - WARNING: advanced function. Could make this server unreachable."
+msgstr "Umsiedeln - WARNUNG: Könnte diesen Server unerreichbar machen."
+
+#: mod/admin.php:1439
+msgid "Site name"
+msgstr "Seitenname"
+
+#: mod/admin.php:1440
+msgid "Host name"
+msgstr "Host Name"
+
+#: mod/admin.php:1441
+msgid "Sender Email"
+msgstr "Absender für Emails"
+
+#: mod/admin.php:1441
+msgid ""
+"The email address your server shall use to send notification emails from."
+msgstr "Die E-Mail Adresse die dein Server zum Versenden von Benachrichtigungen verwenden soll."
+
+#: mod/admin.php:1442
+msgid "Banner/Logo"
+msgstr "Banner/Logo"
+
+#: mod/admin.php:1443
+msgid "Shortcut icon"
+msgstr "Shortcut Icon"
+
+#: mod/admin.php:1443
+msgid "Link to an icon that will be used for browsers."
+msgstr "Link zu einem Icon, das Browser verwenden werden."
+
+#: mod/admin.php:1444
+msgid "Touch icon"
+msgstr "Touch Icon"
+
+#: mod/admin.php:1444
+msgid "Link to an icon that will be used for tablets and mobiles."
+msgstr "Link zu einem Icon das Tablets und Handies verwenden sollen."
+
+#: mod/admin.php:1445
+msgid "Additional Info"
+msgstr "Zusätzliche Informationen"
+
+#: mod/admin.php:1445
 #, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d Nachricht"
-msgstr[1] "%d Nachrichten"
+msgid ""
+"For public servers: you can add additional information here that will be "
+"listed at %s/servers."
+msgstr "Für öffentliche Server kannst Du hier zusätzliche Informationen angeben, die dann auf %s/servers angezeigt werden."
 
-#: mod/group.php:36
-msgid "Group created."
-msgstr "Gruppe erstellt."
+#: mod/admin.php:1446
+msgid "System language"
+msgstr "Systemsprache"
 
-#: mod/group.php:42
-msgid "Could not create group."
-msgstr "Konnte die Gruppe nicht erstellen."
+#: mod/admin.php:1447
+msgid "System theme"
+msgstr "Systemweites Theme"
 
-#: mod/group.php:56 mod/group.php:157
-msgid "Group not found."
-msgstr "Gruppe nicht gefunden."
+#: mod/admin.php:1447
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
+msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
 
-#: mod/group.php:70
-msgid "Group name changed."
-msgstr "Gruppenname geändert."
+#: mod/admin.php:1448
+msgid "Mobile system theme"
+msgstr "Systemweites mobiles Theme"
 
-#: mod/group.php:97
-msgid "Save Group"
-msgstr "Gruppe speichern"
+#: mod/admin.php:1448
+msgid "Theme for mobile devices"
+msgstr "Thema für mobile Geräte"
 
-#: mod/group.php:102
-msgid "Create a group of contacts/friends."
-msgstr "Eine Kontaktgruppe anlegen."
+#: mod/admin.php:1449
+msgid "SSL link policy"
+msgstr "Regeln für SSL Links"
 
-#: mod/group.php:103 mod/group.php:199 src/Model/Group.php:421
-msgid "Group Name: "
-msgstr "Gruppenname:"
+#: mod/admin.php:1449
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr "Bestimmt, ob generierte Links SSL verwenden müssen"
 
-#: mod/group.php:127
-msgid "Group removed."
-msgstr "Gruppe entfernt."
+#: mod/admin.php:1450
+msgid "Force SSL"
+msgstr "Erzwinge SSL"
 
-#: mod/group.php:129
-msgid "Unable to remove group."
-msgstr "Konnte die Gruppe nicht entfernen."
+#: mod/admin.php:1450
+msgid ""
+"Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
+" to endless loops."
+msgstr "Erzinge alle Nicht-SSL Anfragen auf SSL - Achtung: auf manchen Systemen verursacht dies eine Endlosschleife."
 
-#: mod/group.php:192
-msgid "Delete Group"
-msgstr "Gruppe löschen"
+#: mod/admin.php:1451
+msgid "Hide help entry from navigation menu"
+msgstr "Verberge den Menüeintrag für die Hilfe im Navigationsmenü"
 
-#: mod/group.php:198
-msgid "Group Editor"
-msgstr "Gruppeneditor"
+#: 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 "Verbirgt den Menüeintrag für die Hilfe-Seiten im Navigationsmenü. Die Seiten können weiterhin über /help aufgerufen werden."
 
-#: mod/group.php:203
-msgid "Edit Group Name"
-msgstr "Gruppen Name bearbeiten"
+#: mod/admin.php:1452
+msgid "Single user instance"
+msgstr "Ein-Nutzer Instanz"
 
-#: mod/group.php:213
-msgid "Members"
-msgstr "Mitglieder"
+#: mod/admin.php:1452
+msgid "Make this instance multi-user or single-user for the named user"
+msgstr "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt."
 
-#: mod/group.php:216 mod/network.php:639
-msgid "Group is empty"
-msgstr "Gruppe ist leer"
+#: mod/admin.php:1453
+msgid "Maximum image size"
+msgstr "Maximale Bildgröße"
 
-#: mod/group.php:229
-msgid "Remove contact from group"
-msgstr "Entferne den Kontakt aus der Gruppe"
+#: mod/admin.php:1453
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr "Maximale Uploadgröße von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."
 
-#: mod/group.php:253
-msgid "Add contact to group"
-msgstr "Füge den Kontakt zur Gruppe hinzu"
+#: mod/admin.php:1454
+msgid "Maximum image length"
+msgstr "Maximale Bildlänge"
+
+#: mod/admin.php:1454
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
+msgstr "Maximale Länge in Pixeln der längsten Seite eines hoch geladenen Bildes. Grundeinstellung ist -1 was keine Einschränkung bedeutet."
+
+#: mod/admin.php:1455
+msgid "JPEG image quality"
+msgstr "Qualität des JPEG Bildes"
+
+#: mod/admin.php:1455
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
+msgstr "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust."
+
+#: mod/admin.php:1457
+msgid "Register policy"
+msgstr "Registrierungsmethode"
+
+#: mod/admin.php:1458
+msgid "Maximum Daily Registrations"
+msgstr "Maximum täglicher Registrierungen"
+
+#: 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 "Wenn die Registrierung weiter oben erlaubt ist, regelt dies die maximale Anzahl von Neuanmeldungen pro Tag. Wenn die Registrierung geschlossen ist, hat diese Einstellung keinen Effekt."
+
+#: mod/admin.php:1459
+msgid "Register text"
+msgstr "Registrierungstext"
+
+#: mod/admin.php:1459
+msgid ""
+"Will be displayed prominently on the registration page. You can use BBCode "
+"here."
+msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt. BBCode kann verwendet werden."
+
+#: mod/admin.php:1460
+msgid "Forbidden Nicknames"
+msgstr "Verbotene Spitznamen"
+
+#: 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 "Durch Kommas getrennte Liste von Spitznamen, die von der Registrierung ausgeschlossen sind. Die Vorgabe ist eine Liste von Rollennamen nach RFC 2142."
+
+#: mod/admin.php:1461
+msgid "Accounts abandoned after x days"
+msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt"
+
+#: mod/admin.php:1461
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
+msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit."
+
+#: mod/admin.php:1462
+msgid "Allowed friend domains"
+msgstr "Erlaubte Domains für Kontakte"
+
+#: 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 "Liste der Domains, die für Kontakte erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
+
+#: mod/admin.php:1463
+msgid "Allowed email domains"
+msgstr "Erlaubte Domains für E-Mails"
+
+#: 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 "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
+
+#: mod/admin.php:1464
+msgid "No OEmbed rich content"
+msgstr "OEmbed nicht verwenden"
+
+#: mod/admin.php:1464
+msgid ""
+"Don't show the rich content (e.g. embedded PDF), except from the domains "
+"listed below."
+msgstr "Verhindert das Einbetten von reichhaltigen Inhalten (z.B. eingebettete PDF Dateien). Ausgenommen von dieser Regel werden Domänen die unten aufgeführt werden."
+
+#: mod/admin.php:1465
+msgid "Allowed OEmbed domains"
+msgstr "Erlaubte OEmbed Domänen"
+
+#: mod/admin.php:1465
+msgid ""
+"Comma separated list of domains which oembed content is allowed to be "
+"displayed. Wildcards are accepted."
+msgstr "Komma separierte Liste von Domänen für die das einbetten reichhaltiger Inhalte erlaubt sind. Platzhalter können verwendet werden."
+
+#: mod/admin.php:1466
+msgid "Block public"
+msgstr "Öffentlichen Zugriff blockieren"
+
+#: 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 "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
+
+#: mod/admin.php:1467
+msgid "Force publish"
+msgstr "Erzwinge Veröffentlichung"
+
+#: mod/admin.php:1467
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
+
+#: mod/admin.php:1467
+msgid "Enabling this may violate privacy laws like the GDPR"
+msgstr "Wenn du diese Option aktivierst, verstößt das unter Umständen gegen Gesetze wie die EU-DSGVO."
+
+#: mod/admin.php:1468
+msgid "Global directory URL"
+msgstr "URL des weltweiten Verzeichnisses"
+
+#: 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 des weltweiten Verzeichnisses. Wenn diese nicht gesetzt ist, ist das Verzeichnis für die Applikation nicht erreichbar."
+
+#: mod/admin.php:1469
+msgid "Private posts by default for new users"
+msgstr "Private Beiträge als Standard für neue Nutzer"
+
+#: mod/admin.php:1469
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
+msgstr "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen."
+
+#: mod/admin.php:1470
+msgid "Don't include post content in email notifications"
+msgstr "Inhalte von Beiträgen nicht in E-Mail-Benachrichtigungen versenden"
+
+#: 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 "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz nicht in E-Mail-Benachrichtigungen einbinden."
+
+#: mod/admin.php:1471
+msgid "Disallow public access to addons listed in the apps menu."
+msgstr "Öffentlichen Zugriff auf Addons im Apps Menü verbieten."
+
+#: mod/admin.php:1471
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
+msgstr "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt."
+
+#: mod/admin.php:1472
+msgid "Don't embed private images in posts"
+msgstr "Private Bilder nicht in Beiträgen einbetten."
+
+#: 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 "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert."
+
+#: mod/admin.php:1473
+msgid "Explicit Content"
+msgstr "Sensibler Inhalt"
+
+#: 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 "Wählen Sie das um anzuzeigen, dass Ihr Knoten hauptsächlich für explizite Inhalte verwendet wird, die möglicherweise nicht für Minderjährige geeignet sind. Diese Info wird in der Knoteninformation veröffentlicht und kann durch das Globale Verzeichnis genutzt werden, um Ihren Knoten von den Auflistungen auszuschließen. Zusätzlich wird auf der Registrierungsseite ein Hinweis darüber angezeigt."
+
+#: mod/admin.php:1474
+msgid "Allow Users to set remote_self"
+msgstr "Nutzern erlauben das remote_self Flag zu setzen"
+
+#: 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 "Ist dies ausgewählt kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im Kontakt reparieren Dialog markieren. Nach dem setzten dieses Flags werden alle Top-Level Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet."
+
+#: mod/admin.php:1475
+msgid "Block multiple registrations"
+msgstr "Unterbinde Mehrfachregistrierung"
+
+#: mod/admin.php:1475
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr "Benutzern nicht erlauben, weitere Konten für Organisationsseiten o.ä. mit der gleichen E-Mail Adresse anzulegen, um diese als ."
+
+#: mod/admin.php:1476
+msgid "OpenID support"
+msgstr "OpenID Unterstützung"
+
+#: mod/admin.php:1476
+msgid "OpenID support for registration and logins."
+msgstr "OpenID-Unterstützung für Registrierung und Login."
+
+#: mod/admin.php:1477
+msgid "Fullname check"
+msgstr "Namen auf Vollständigkeit überprüfen"
+
+#: mod/admin.php:1477
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden."
+
+#: mod/admin.php:1478
+msgid "Community pages for visitors"
+msgstr "Für Besucher verfügbare Gemeinschaftsseite"
+
+#: mod/admin.php:1478
+msgid ""
+"Which community pages should be available for visitors. Local users always "
+"see both pages."
+msgstr "Welche Gemeinschaftsseiten sollen für Besucher dieses Knotens verfügbar sein? Lokale Nutzer können grundsätzlich beide Gemeinschaftsseiten verwenden."
+
+#: mod/admin.php:1479
+msgid "Posts per user on community page"
+msgstr "Anzahl der Beiträge pro Benutzer auf der Gemeinschaftsseite"
+
+#: mod/admin.php:1479
+msgid ""
+"The maximum number of posts per user on the community page. (Not valid for "
+"'Global Community')"
+msgstr "Die Anzahl der Beiträge die von jedem Nutzer maximal auf der Gemeinschaftsseite angezeigt werden sollen. Dieser Parameter wird nicht für die Globale Gemeinschaftsseite genutzt."
+
+#: mod/admin.php:1480
+msgid "Enable OStatus support"
+msgstr "OStatus Unterstützung aktivieren"
+
+#: 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 "Biete die eingebaute OStatus (iStatusNet, GNU Social, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre Warnungen werden nur bei Bedarf angezeigt."
+
+#: mod/admin.php:1481
+msgid "Only import OStatus threads from our contacts"
+msgstr "Nur OStatus Konversationen unserer Kontakte importieren"
+
+#: 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 "Normalerweise werden alle Inhalte von OStatus Kontakten importiert. Mit dieser Option werden nur solche Konversationen gespeichert, die von Kontakten der Nutzer dieses Knotens gestartet wurden."
+
+#: mod/admin.php:1482
+msgid "OStatus support can only be enabled if threading is enabled."
+msgstr "OStatus Unterstützung kann nur aktiviert werden wenn \"Threading\" aktiviert ist. "
+
+#: mod/admin.php:1484
+msgid ""
+"Diaspora support can't be enabled because Friendica was installed into a sub"
+" directory."
+msgstr "Diaspora Unterstützung kann nicht aktiviert werden da Friendica in ein Unterverzeichnis installiert ist."
+
+#: mod/admin.php:1485
+msgid "Enable Diaspora support"
+msgstr "Diaspora Unterstützung aktivieren"
+
+#: mod/admin.php:1485
+msgid "Provide built-in Diaspora network compatibility."
+msgstr "Verwende die eingebaute Diaspora-Verknüpfung."
+
+#: mod/admin.php:1486
+msgid "Only allow Friendica contacts"
+msgstr "Nur Friendica-Kontakte erlauben"
+
+#: mod/admin.php:1486
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert."
+
+#: mod/admin.php:1487
+msgid "Verify SSL"
+msgstr "SSL Überprüfen"
+
+#: 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 "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann."
+
+#: mod/admin.php:1488
+msgid "Proxy user"
+msgstr "Proxy Nutzer"
+
+#: mod/admin.php:1489
+msgid "Proxy URL"
+msgstr "Proxy URL"
+
+#: mod/admin.php:1490
+msgid "Network timeout"
+msgstr "Netzwerk Wartezeit"
+
+#: mod/admin.php:1490
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
+
+#: mod/admin.php:1491
+msgid "Maximum Load Average"
+msgstr "Maximum Load Average"
+
+#: mod/admin.php:1491
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50"
+
+#: mod/admin.php:1492
+msgid "Maximum Load Average (Frontend)"
+msgstr "Maximum Load Average (Frontend)"
+
+#: mod/admin.php:1492
+msgid "Maximum system load before the frontend quits service - default 50."
+msgstr "Maximale Systemlast bevor Vordergrundprozesse pausiert werden - Standard 50."
+
+#: mod/admin.php:1493
+msgid "Minimal Memory"
+msgstr "Minimaler Speicher"
+
+#: mod/admin.php:1493
+msgid ""
+"Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
+"default 0 (deactivated)."
+msgstr "Minimal freier Speicher in MB für den Worker Prozess. Benötigt Zugriff auf /proc/meminfo - Standardwert ist 0 (deaktiviert)"
+
+#: mod/admin.php:1494
+msgid "Maximum table size for optimization"
+msgstr "Maximale Tabellengröße zur Optimierung"
+
+#: mod/admin.php:1494
+msgid ""
+"Maximum table size (in MB) for the automatic optimization. Enter -1 to "
+"disable it."
+msgstr "Maximale Tabellengröße (in MB) für die automatische Optimierung - Gib -1 für Deaktivierung ein."
+
+#: mod/admin.php:1495
+msgid "Minimum level of fragmentation"
+msgstr "Minimaler Fragmentationsgrad"
+
+#: mod/admin.php:1495
+msgid ""
+"Minimum fragmenation level to start the automatic optimization - default "
+"value is 30%."
+msgstr "Minimales Fragmentationsgrad von Datenbanktabellen um die automatische Optimierung einzuleiten - Standardwert ist 30%"
+
+#: mod/admin.php:1497
+msgid "Periodical check of global contacts"
+msgstr "Regelmäßig globale Kontakte überprüfen"
+
+#: 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 "Wenn diese Option aktiviert ist, werden die globalen Kontakte regelmäßig auf fehlende oder veraltete Daten sowie auf Erreichbarkeit des Kontakts und des Servers überprüft."
+
+#: mod/admin.php:1498
+msgid "Days between requery"
+msgstr "Tage zwischen erneuten Abfragen"
+
+#: mod/admin.php:1498
+msgid "Number of days after which a server is requeried for his contacts."
+msgstr "Legt das Abfrageintervall fest, nachdem ein Server erneut nach Kontakten abgefragt werden soll."
+
+#: mod/admin.php:1499
+msgid "Discover contacts from other servers"
+msgstr "Neue Kontakte auf anderen Servern entdecken"
+
+#: 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 "Regelmäßig andere Server nach potentiellen Kontakten absuchen. Du kannst zwischen 'Nutzern', den tatsächlichen Nutzern des anderen Systems und 'globalen Kontakten', aktiven Kontakten die auf dem System bekannt sind, wählen. Der Fallback-Mechanismus ist für ältere Friendica und Redmatrix Server gedacht, bei denen globale Kontakte noch nicht verfügbar sind. Durch den Fallbackmodus entsteht auf deinem Server eine wesentlich höhere Last, empfohlen wird der Modus 'Nutzer, globale Kontakte'."
+
+#: mod/admin.php:1500
+msgid "Timeframe for fetching global contacts"
+msgstr "Zeitfenster für globale Kontakte"
+
+#: 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 "Wenn die Entdeckung neuer Kontakte aktiv ist, definiert dieses Zeitfenster den Zeitraum in dem globale Kontakte als aktiv gelten und von anderen Servern importiert werden."
+
+#: mod/admin.php:1501
+msgid "Search the local directory"
+msgstr "Lokales Verzeichnis durchsuchen"
+
+#: 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 "Suche im lokalen Verzeichnis anstelle des globalen Verzeichnisses durchführen. Jede Suche wird im Hintergrund auch im globalen Verzeichnis durchgeführt um die Suchresultate zu verbessern, wenn diese Suche wiederholt wird."
+
+#: mod/admin.php:1503
+msgid "Publish server information"
+msgstr "Server Informationen veröffentlichen"
+
+#: 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 "Wenn aktiviert, werden allgemeine Informationen über den Server und Nutzungsdaten veröffentlicht. Die Daten beinhalten den Namen sowie die Version des Servers, die Anzahl der Personen mit öffentlichen Profilen, die Anzahl der Beiträge sowie aktivierte Protokolle und Connectoren. Für Details bitte <a href='http://the-federation.info/'>the-federation.info</a> aufrufen."
+
+#: mod/admin.php:1505
+msgid "Check upstream version"
+msgstr "Suche nach Updates"
+
+#: 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 "Wenn diese Option aktiviert ist wird regelmäßig nach neuen Friendica Versionen auf github überprüft. Wenn es eine neue Version gibt, wird dies auf der Übersichtsseite im Admin-Panel angezeigt."
+
+#: mod/admin.php:1506
+msgid "Suppress Tags"
+msgstr "Tags Unterdrücken"
+
+#: mod/admin.php:1506
+msgid "Suppress showing a list of hashtags at the end of the posting."
+msgstr "Unterdrückt die Anzeige von Tags am Ende eines Beitrags."
+
+#: mod/admin.php:1507
+msgid "Clean database"
+msgstr "Datenbank aufräumen"
+
+#: mod/admin.php:1507
+msgid ""
+"Remove old remote items, orphaned database records and old content from some"
+" other helper tables."
+msgstr "Entferne alte Beiträge von anderen Knoten, verwaiste Einträge und alten Inhalt einiger Hilfstabellen."
+
+#: mod/admin.php:1508
+msgid "Lifespan of remote items"
+msgstr "Lebensdauer von Beiträgen anderer Knoten"
+
+#: 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 "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl in Tagen nach der Beiträge die auf anderen Knoten des Netzwerks verfasst wurden, gelöscht werden sollen. Eigene Beiträge sowie markierte oder abgespeicherte Beiträge werden nicht gelöscht. Ein Wert von 0 deaktiviert das automatische löschen von Beiträgen."
+
+#: mod/admin.php:1509
+msgid "Lifespan of unclaimed items"
+msgstr "Lebensdauer nicht angeforderter Beiträge"
+
+#: 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 "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl von Tagen nach denen nicht angeforderte Beiträge (hauptsächlich sole die über das Relais eintreffen) gelöscht werden. Der Standardwert beträgt 90 Tage. Wird dieser Wert auf 0 gesetzt, wird die Lebenszeit von Beiträgen anderer Knoten verwendet."
+
+#: mod/admin.php:1510
+msgid "Path to item cache"
+msgstr "Pfad zum Eintrag Cache"
+
+#: mod/admin.php:1510
+msgid "The item caches buffers generated bbcode and external images."
+msgstr "Im Item-Cache werden externe Bilder und geparster BBCode zwischen gespeichert."
+
+#: mod/admin.php:1511
+msgid "Cache duration in seconds"
+msgstr "Cache-Dauer in Sekunden"
+
+#: 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 "Wie lange sollen die gecachedten Dateien vorgehalten werden? Grundeinstellung sind 86400 Sekunden (ein Tag). Um den Item Cache zu deaktivieren, setze diesen Wert auf -1."
+
+#: mod/admin.php:1512
+msgid "Maximum numbers of comments per post"
+msgstr "Maximale Anzahl von Kommentaren pro Beitrag"
+
+#: mod/admin.php:1512
+msgid "How much comments should be shown for each post? Default value is 100."
+msgstr "Wie viele Kommentare sollen pro Beitrag angezeigt werden? Standardwert sind 100."
+
+#: mod/admin.php:1513
+msgid "Temp path"
+msgstr "Temp Pfad"
+
+#: 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 "Solltest du ein eingeschränktes System haben, auf dem der Webserver nicht auf das temp Verzeichnis des Systems zugreifen kann, setze hier einen anderen Pfad."
+
+#: mod/admin.php:1514
+msgid "Base path to installation"
+msgstr "Basis-Pfad zur Installation"
+
+#: 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 "Falls das System nicht den korrekten Pfad zu deiner Installation gefunden hat, gib den richtigen Pfad bitte hier ein. Du solltest hier den Pfad nur auf einem eingeschränkten System angeben müssen, bei dem du mit symbolischen Links auf dein Webverzeichnis verweist."
+
+#: mod/admin.php:1515
+msgid "Disable picture proxy"
+msgstr "Bilder Proxy deaktivieren"
+
+#: mod/admin.php:1515
+msgid ""
+"The picture proxy increases performance and privacy. It shouldn't be used on"
+" systems with very low bandwidth."
+msgstr "Der Proxy für Bilder verbessert die Leistung und Privatsphäre der Nutzer. Er sollte nicht auf Systemen verwendet werden, die nur über begrenzte Bandbreite verfügen."
+
+#: mod/admin.php:1516
+msgid "Only search in tags"
+msgstr "Nur in Tags suchen"
+
+#: mod/admin.php:1516
+msgid "On large systems the text search can slow down the system extremely."
+msgstr "Auf großen Knoten kann die Volltext-Suche das System ausbremsen."
+
+#: mod/admin.php:1518
+msgid "New base url"
+msgstr "Neue 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 "Ändert die Basis-URL dieses Servers und sendet eine Umzugsmitteilung an alle Friendica und Diaspora* Kontakte deiner NutzerInnen."
+
+#: mod/admin.php:1520
+msgid "RINO Encryption"
+msgstr "RINO Verschlüsselung"
+
+#: mod/admin.php:1520
+msgid "Encryption layer between nodes."
+msgstr "Verschlüsselung zwischen Friendica Instanzen"
+
+#: mod/admin.php:1520
+msgid "Enabled"
+msgstr "Aktiv"
+
+#: mod/admin.php:1522
+msgid "Maximum number of parallel workers"
+msgstr "Maximale Anzahl parallel laufender Worker"
+
+#: 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 "Wenn dein Knoten bei einem Shared Hoster ist, setzte diesen Wert auf %d. Auf größeren Systemen funktioniert ein Wert von %d recht gut. Standardeinstellung sind %d."
+
+#: mod/admin.php:1523
+msgid "Don't use 'proc_open' with the worker"
+msgstr "'proc_open' nicht mit den Workern verwenden"
+
+#: 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 "Aktiviere diese Option, wenn dein System die Verwendung von 'proc_open' verhindert. Dies könnte auf Shared Hostern der Fall sein. Wenn du diese Option aktivierst, solltest du die Frequenz der poller Aufrufe in deiner crontab erhöhen."
+
+#: mod/admin.php:1524
+msgid "Enable fastlane"
+msgstr "Aktiviere 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 "Wenn aktiviert, wird der Fastlane-Mechanismus einen weiteren Worker-Prozeß starten wenn Prozesse mit höherer Priorität von Prozessen mit niedrigerer Priorität blockiert werden."
+
+#: mod/admin.php:1525
+msgid "Enable frontend worker"
+msgstr "Aktiviere den 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 "Ist diese Option aktiv, wird der Worker Prozess durch Aktionen am Frontend gestartet (z.B. wenn Nachrichten zugestellt werden). Auf kleineren Seiten sollte %s/worker regelmäßig, beispielsweise durch einen externen Cron Anbieter, aufgerufen werden. Du solltest dies Option nur dann aktivieren, wenn du keinen Cron Job auf deinem eigenen Server starten kannst."
+
+#: mod/admin.php:1527
+msgid "Subscribe to relay"
+msgstr "Relais abonnieren"
+
+#: 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 "Aktiviert den Empfang von öffentlichen Beiträgen vom Relais-Server. Diese Beiträge werden in der Suche, den abonnierten Hashtags sowie der globalen Gemeinschaftsseite verfügbar sein."
+
+#: 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 "Adresse des Relais Servers an den die öffentlichen Beiträge gesendet werden sollen. Zum Beispiel https://relay.diasp.org"
+
+#: mod/admin.php:1529
+msgid "Direct relay transfer"
+msgstr "Direkte Relais Übertragung"
+
+#: mod/admin.php:1529
+msgid ""
+"Enables the direct transfer to other servers without using the relay servers"
+msgstr "Aktiviert das direkte Verteilen an andere Server, ohne dass ein Relais Server verwendet wird."
+
+#: mod/admin.php:1530
+msgid "Relay scope"
+msgstr "Geltungsbereich des 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 "Der Wert kann entweder 'Alle' oder 'Schlagwörter' sein. 'Alle' bedeutet, dass alle öffentliche Beiträge empfangen werden sollen. 'Schlagwörter' schränkt dem Empfang auf Beiträge ein, die bestimmte Schlagwörter beinhalten."
+
+#: mod/admin.php:1530
+msgid "all"
+msgstr "Alle"
+
+#: mod/admin.php:1530
+msgid "tags"
+msgstr "Schlagwörter"
+
+#: mod/admin.php:1531
+msgid "Server tags"
+msgstr "Server Schlagworte"
+
+#: mod/admin.php:1531
+msgid "Comma separated list of tags for the 'tags' subscription."
+msgstr "Liste von Schlagworten die abonniert werden sollen, mit Komma getrennt."
+
+#: mod/admin.php:1532
+msgid "Allow user tags"
+msgstr "Verwende Schlagworte der Nutzer"
+
+#: 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 "Ist dies aktiviert, werden die Schlagwörter der gespeicherten Suchen zusätzlich zu den oben  definierten Server Schlagworte abonniert."
+
+#: mod/admin.php:1535
+msgid "Start Relocation"
+msgstr "Umsiedlung starten"
+
+#: mod/admin.php:1561
+msgid "Update has been marked successful"
+msgstr "Update wurde als erfolgreich markiert"
+
+#: mod/admin.php:1568
+#, php-format
+msgid "Database structure update %s was successfully applied."
+msgstr "Das Update %s der Struktur der Datenbank wurde erfolgreich angewandt."
+
+#: mod/admin.php:1571
+#, php-format
+msgid "Executing of database structure update %s failed with error: %s"
+msgstr "Das Update %s der Struktur der Datenbank schlug mit folgender Fehlermeldung fehl: %s"
+
+#: mod/admin.php:1587
+#, php-format
+msgid "Executing %s failed with error: %s"
+msgstr "Die Ausführung von %s schlug fehl. Fehlermeldung: %s"
+
+#: mod/admin.php:1589
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr "Update %s war erfolgreich."
+
+#: mod/admin.php:1592
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr "Update %s hat keinen Status zurückgegeben. Unbekannter Status."
+
+#: mod/admin.php:1595
+#, php-format
+msgid "There was no additional update function %s that needed to be called."
+msgstr "Es gab keine weitere Update-Funktion, die von %s ausgeführt werden musste."
+
+#: mod/admin.php:1618
+msgid "No failed updates."
+msgstr "Keine fehlgeschlagenen Updates."
+
+#: mod/admin.php:1619
+msgid "Check database structure"
+msgstr "Datenbank Struktur überprüfen"
+
+#: mod/admin.php:1624
+msgid "Failed Updates"
+msgstr "Fehlgeschlagene Updates"
+
+#: mod/admin.php:1625
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben."
+
+#: mod/admin.php:1626
+msgid "Mark success (if update was manually applied)"
+msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)"
+
+#: mod/admin.php:1627
+msgid "Attempt to execute this update step automatically"
+msgstr "Versuchen, diesen Schritt automatisch auszuführen"
+
+#: 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 "\nHallo %1$s,\n\nauf %2$s wurde ein Account für Dich angelegt."
+
+#: 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 "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1$s\n\tBenutzername:\t%2$s\n\tPasswort:\t%3$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %1$s/removeme  jederzeit tun.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4$s."
+
+#: mod/admin.php:1706 src/Model/User.php:707
+#, php-format
+msgid "Registration details for %s"
+msgstr "Details der Registration von %s"
+
+#: mod/admin.php:1716
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] "%s Benutzer geblockt/freigegeben"
+msgstr[1] "%s Benutzer geblockt/freigegeben"
+
+#: mod/admin.php:1722
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] "%s Nutzer gelöscht"
+msgstr[1] "%s Nutzer gelöscht"
+
+#: mod/admin.php:1769
+#, php-format
+msgid "User '%s' deleted"
+msgstr "Nutzer '%s' gelöscht"
+
+#: mod/admin.php:1777
+#, php-format
+msgid "User '%s' unblocked"
+msgstr "Nutzer '%s' entsperrt"
+
+#: mod/admin.php:1777
+#, php-format
+msgid "User '%s' blocked"
+msgstr "Nutzer '%s' gesperrt"
+
+#: mod/admin.php:1838
+msgid "Private Forum"
+msgstr "Privates 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 "Anmeldedatum"
+
+#: mod/admin.php:1890 mod/admin.php:1915
+msgid "Last login"
+msgstr "Letzte Anmeldung"
+
+#: mod/admin.php:1890 mod/admin.php:1915
+msgid "Last item"
+msgstr "Letzter Beitrag"
+
+#: mod/admin.php:1890
+msgid "Type"
+msgstr "Typ"
+
+#: mod/admin.php:1897
+msgid "Add User"
+msgstr "Nutzer hinzufügen"
+
+#: mod/admin.php:1899
+msgid "User registrations waiting for confirm"
+msgstr "Neuanmeldungen, die auf Deine Bestätigung warten"
+
+#: mod/admin.php:1900
+msgid "User waiting for permanent deletion"
+msgstr "Nutzer wartet auf permanente Löschung"
+
+#: mod/admin.php:1901
+msgid "Request date"
+msgstr "Anfragedatum"
+
+#: mod/admin.php:1902
+msgid "No registrations."
+msgstr "Keine Neuanmeldungen."
+
+#: mod/admin.php:1903
+msgid "Note from the user"
+msgstr "Hinweis vom Nutzer"
+
+#: mod/admin.php:1905
+msgid "Deny"
+msgstr "Verwehren"
+
+#: mod/admin.php:1908
+msgid "User blocked"
+msgstr "Nutzer blockiert."
+
+#: mod/admin.php:1910
+msgid "Site admin"
+msgstr "Seitenadministrator"
+
+#: mod/admin.php:1911
+msgid "Account expired"
+msgstr "Account ist abgelaufen"
+
+#: mod/admin.php:1914
+msgid "New User"
+msgstr "Neuer Nutzer"
+
+#: mod/admin.php:1915
+msgid "Deleted since"
+msgstr "Gelöscht seit"
+
+#: 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 "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist Du sicher?"
+
+#: 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 "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist Du sicher?"
+
+#: mod/admin.php:1931
+msgid "Name of the new user."
+msgstr "Name des neuen Nutzers"
+
+#: mod/admin.php:1932
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: mod/admin.php:1932
+msgid "Nickname of the new user."
+msgstr "Spitznamen für den neuen Nutzer"
+
+#: mod/admin.php:1933
+msgid "Email address of the new user."
+msgstr "Email Adresse des neuen Nutzers"
+
+#: mod/admin.php:1975
+#, php-format
+msgid "Addon %s disabled."
+msgstr "Addon %s ausgeschaltet."
+
+#: mod/admin.php:1979
+#, php-format
+msgid "Addon %s enabled."
+msgstr "Addon %s eingeschaltet."
+
+#: mod/admin.php:1989 mod/admin.php:2238
+msgid "Disable"
+msgstr "Ausschalten"
+
+#: mod/admin.php:1992 mod/admin.php:2241
+msgid "Enable"
+msgstr "Einschalten"
+
+#: mod/admin.php:2014 mod/admin.php:2284
+msgid "Toggle"
+msgstr "Umschalten"
+
+#: mod/admin.php:2022 mod/admin.php:2293
+msgid "Author: "
+msgstr "Autor:"
+
+#: mod/admin.php:2023 mod/admin.php:2294
+msgid "Maintainer: "
+msgstr "Betreuer:"
+
+#: mod/admin.php:2075
+msgid "Reload active addons"
+msgstr "Aktivierte Addons neu laden"
+
+#: 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 "Es sind derzeit keine Addons auf diesem Knoten verfügbar. Du findest das offizielle Addon-Repository unter %1$s und weitere eventuell interessante Addons im offenen Addon-Verzeichnis auf %2$s."
+
+#: mod/admin.php:2200
+msgid "No themes found."
+msgstr "Keine Themen gefunden."
+
+#: mod/admin.php:2275
+msgid "Screenshot"
+msgstr "Bildschirmfoto"
+
+#: mod/admin.php:2329
+msgid "Reload active themes"
+msgstr "Aktives Theme neu laden"
+
+#: mod/admin.php:2334
+#, php-format
+msgid "No themes found on the system. They should be placed in %1$s"
+msgstr "Es wurden keine Themes auf dem System gefunden. Diese sollten in %1$s platziert werden."
+
+#: mod/admin.php:2335
+msgid "[Experimental]"
+msgstr "[Experimentell]"
+
+#: mod/admin.php:2336
+msgid "[Unsupported]"
+msgstr "[Nicht unterstützt]"
+
+#: mod/admin.php:2360
+msgid "Log settings updated."
+msgstr "Protokolleinstellungen aktualisiert."
+
+#: mod/admin.php:2393
+msgid "PHP log currently enabled."
+msgstr "PHP Protokollierung ist derzeit aktiviert."
+
+#: mod/admin.php:2395
+msgid "PHP log currently disabled."
+msgstr "PHP Protokollierung ist derzeit nicht aktiviert."
+
+#: mod/admin.php:2404
+msgid "Clear"
+msgstr "löschen"
+
+#: mod/admin.php:2408
+msgid "Enable Debugging"
+msgstr "Protokoll führen"
+
+#: mod/admin.php:2409
+msgid "Log file"
+msgstr "Protokolldatei"
+
+#: mod/admin.php:2409
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
+msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis."
+
+#: mod/admin.php:2410
+msgid "Log level"
+msgstr "Protokoll-Level"
+
+#: mod/admin.php:2412
+msgid "PHP logging"
+msgstr "PHP Protokollieren"
+
+#: 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 "Um die Protokollierung von PHP-Fehlern und Warnungen vorübergehend zu aktivieren, können Sie der Datei index.php Ihrer Installation Folgendes voranstellen. Der in der Datei 'error_log' angegebene Dateiname ist relativ zum obersten Verzeichnis von friendica und muss vom Webserver beschreibbar sein. Die Option '1' für 'log_errors' und 'display_errors' aktiviert diese Optionen, ersetze die '1' durch einer '0' um sie zu deaktivieren."
+
+#: 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 "Fehler beim Öffnen der Logdatei <strong>%1$s</strong>.\\r\\n<br/>Bitte überprüfe ob die Datei %1$s existiert und gelesen werden kann."
+
+#: 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 "Konnte die Logdatei <strong>%1$s</strong> nicht öffnen.\\r\\n<br/>Bitte stelle sicher, dass die Datei %1$s lesbar ist."
+
+#: mod/admin.php:2540
+#, php-format
+msgid "Lock feature %s"
+msgstr "Feature festlegen: %s"
+
+#: mod/admin.php:2548
+msgid "Manage Additional Features"
+msgstr "Zusätzliche Features Verwalten"
 
 #: mod/openid.php:29
 msgid "OpenID protocol error. No ID returned."
@@ -3495,452 +6092,1270 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr "Nutzerkonto wurde nicht gefunden und OpenID-Registrierung ist auf diesem Server nicht gestattet."
 
-#: 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 "Anmeldung fehlgeschlagen."
 
-#: 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 "Profil nicht gefunden."
-
-#: mod/dfrn_confirm.php:130
-msgid ""
-"This may occasionally happen if contact was requested by both persons and it"
-" has already been approved."
-msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde."
-
-#: mod/dfrn_confirm.php:240
-msgid "Response from remote site was not understood."
-msgstr "Antwort der Gegenstelle unverständlich."
-
-#: mod/dfrn_confirm.php:247 mod/dfrn_confirm.php:252
-msgid "Unexpected response from remote site: "
-msgstr "Unerwartete Antwort der Gegenstelle: "
-
-#: mod/dfrn_confirm.php:261
-msgid "Confirmation completed successfully."
-msgstr "Bestätigung erfolgreich abgeschlossen."
-
-#: mod/dfrn_confirm.php:273
-msgid "Temporary failure. Please wait and try again."
-msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal."
-
-#: mod/dfrn_confirm.php:276
-msgid "Introduction failed or was revoked."
-msgstr "Kontaktanfrage schlug fehl oder wurde zurückgezogen."
-
-#: mod/dfrn_confirm.php:281
-msgid "Remote site reported: "
-msgstr "Gegenstelle meldet: "
-
-#: mod/dfrn_confirm.php:392
-msgid "Unable to set contact photo."
-msgstr "Konnte das Bild des Kontakts nicht speichern."
-
-#: mod/dfrn_confirm.php:450
-#, php-format
-msgid "No user record found for '%s' "
-msgstr "Für '%s' wurde kein Nutzer gefunden"
-
-#: mod/dfrn_confirm.php:460
-msgid "Our site encryption key is apparently messed up."
-msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung."
-
-#: mod/dfrn_confirm.php:471
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden."
-
-#: mod/dfrn_confirm.php:487
-msgid "Contact record was not found for you on our site."
-msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."
-
-#: mod/dfrn_confirm.php:501
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
-msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server."
-
-#: 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 "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal."
-
-#: mod/dfrn_confirm.php:528
-msgid "Unable to set your contact credentials on our system."
-msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden."
-
-#: mod/dfrn_confirm.php:583
-msgid "Unable to update your contact profile details on our system"
-msgstr "Die Updates für Dein Profil konnten nicht gespeichert werden"
-
-#: mod/dfrn_confirm.php:613 mod/dfrn_request.php:564
-#: src/Model/Contact.php:1578
-msgid "[Name Withheld]"
-msgstr "[Name unterdrückt]"
-
 #: mod/dfrn_request.php:94
 msgid "This introduction has already been accepted."
 msgstr "Diese Kontaktanfrage wurde bereits akzeptiert."
 
-#: mod/dfrn_request.php:112 mod/dfrn_request.php:355
+#: mod/dfrn_request.php:112 mod/dfrn_request.php:353
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung."
 
-#: mod/dfrn_request.php:116 mod/dfrn_request.php:359
+#: mod/dfrn_request.php:116 mod/dfrn_request.php:357
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden."
 
-#: mod/dfrn_request.php:119 mod/dfrn_request.php:362
+#: mod/dfrn_request.php:119 mod/dfrn_request.php:360
 msgid "Warning: profile location has no profile photo."
 msgstr "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse."
 
-#: mod/dfrn_request.php:123 mod/dfrn_request.php:366
+#: 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] "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden"
 msgstr[1] "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden"
 
-#: mod/dfrn_request.php:162
+#: mod/dfrn_request.php:161
 msgid "Introduction complete."
 msgstr "Kontaktanfrage abgeschlossen."
 
-#: mod/dfrn_request.php:199
+#: mod/dfrn_request.php:197
 msgid "Unrecoverable protocol error."
 msgstr "Nicht behebbarer Protokollfehler."
 
-#: mod/dfrn_request.php:226
+#: mod/dfrn_request.php:224
 msgid "Profile unavailable."
 msgstr "Profil nicht verfügbar."
 
-#: mod/dfrn_request.php:248
+#: mod/dfrn_request.php:246
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr "%s hat heute zu viele Kontaktanfragen erhalten."
 
-#: mod/dfrn_request.php:249
+#: mod/dfrn_request.php:247
 msgid "Spam protection measures have been invoked."
 msgstr "Maßnahmen zum Spamschutz wurden ergriffen."
 
-#: mod/dfrn_request.php:250
+#: mod/dfrn_request.php:248
 msgid "Friends are advised to please try again in 24 hours."
 msgstr "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."
 
-#: mod/dfrn_request.php:276
+#: mod/dfrn_request.php:274
 msgid "Invalid locator"
 msgstr "Ungültiger Locator"
 
-#: mod/dfrn_request.php:312
+#: mod/dfrn_request.php:310
 msgid "You have already introduced yourself here."
 msgstr "Du hast Dich hier bereits vorgestellt."
 
-#: mod/dfrn_request.php:315
+#: mod/dfrn_request.php:313
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "Es scheint so, als ob Du bereits mit %s in Kontakt stehst."
 
-#: mod/dfrn_request.php:335
+#: mod/dfrn_request.php:333
 msgid "Invalid profile URL."
 msgstr "Ungültige Profil-URL."
 
-#: mod/dfrn_request.php:341 src/Model/Contact.php:1276
+#: mod/dfrn_request.php:339 src/Model/Contact.php:1577
 msgid "Disallowed profile URL."
 msgstr "Nicht erlaubte Profil-URL."
 
-#: mod/dfrn_request.php:435
+#: mod/dfrn_request.php:412 mod/contacts.php:235
+msgid "Failed to update contact record."
+msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen."
+
+#: mod/dfrn_request.php:432
 msgid "Your introduction has been sent."
 msgstr "Deine Kontaktanfrage wurde gesendet."
 
-#: mod/dfrn_request.php:473
+#: mod/dfrn_request.php:470
 msgid ""
 "Remote subscription can't be done for your network. Please subscribe "
 "directly on your system."
 msgstr "Entferntes abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems.   "
 
-#: mod/dfrn_request.php:489
+#: mod/dfrn_request.php:486
 msgid "Please login to confirm introduction."
 msgstr "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen."
 
-#: mod/dfrn_request.php:497
+#: mod/dfrn_request.php:494
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
 msgstr "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an."
 
-#: mod/dfrn_request.php:511 mod/dfrn_request.php:528
+#: mod/dfrn_request.php:508 mod/dfrn_request.php:525
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: mod/dfrn_request.php:523
+#: mod/dfrn_request.php:520
 msgid "Hide this contact"
 msgstr "Verberge diesen Kontakt"
 
-#: mod/dfrn_request.php:526
+#: mod/dfrn_request.php:523
 #, php-format
 msgid "Welcome home %s."
 msgstr "Willkommen zurück %s."
 
-#: mod/dfrn_request.php:527
+#: mod/dfrn_request.php:524
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "Bitte bestätige Deine Kontaktanfrage bei %s."
 
-#: mod/dfrn_request.php:637
+#: mod/dfrn_request.php:634
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr "Bitte gib die Adresse Deines Profils in einem der unterstützten sozialen Netzwerke an:"
 
-#: mod/dfrn_request.php:640
+#: 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 "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"%s\">folge diesem Link</a> um einen öffentlichen Friendica Server zu finden und beizutreten."
 
-#: mod/dfrn_request.php:645
+#: mod/dfrn_request.php:642
 msgid "Friend/Connection Request"
 msgstr "Kontaktanfrage"
 
-#: mod/dfrn_request.php:646
+#: mod/dfrn_request.php:643
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@gnusocial.de"
 msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"
 
-#: mod/dfrn_request.php:651 src/Content/ContactSelector.php:79
+#: mod/dfrn_request.php:644 mod/follow.php:149
+msgid "Please answer the following:"
+msgstr "Bitte beantworte folgendes:"
+
+#: mod/dfrn_request.php:645 mod/follow.php:150
+#, php-format
+msgid "Does %s know you?"
+msgstr "Kennt %s Dich?"
+
+#: mod/dfrn_request.php:646 mod/follow.php:151
+msgid "Add a personal note:"
+msgstr "Eine persönliche Notiz beifügen:"
+
+#: mod/dfrn_request.php:648 src/Content/ContactSelector.php:78
 msgid "Friendica"
 msgstr "Friendica"
 
-#: mod/dfrn_request.php:652
+#: mod/dfrn_request.php:649
 msgid "GNU Social (Pleroma, Mastodon)"
 msgstr "GNU Social (Pleroma, Mastodon)"
 
-#: mod/dfrn_request.php:653
+#: mod/dfrn_request.php:650
 msgid "Diaspora (Socialhome, Hubzilla)"
 msgstr "Diaspora (Socialhome, Hubzilla)"
 
-#: mod/dfrn_request.php:654
+#: mod/dfrn_request.php:651
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search"
 " bar."
 msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste."
 
-#: mod/notifications.php:37
-msgid "Invalid request identifier."
-msgstr "Invalid request identifier."
+#: mod/api.php:85 mod/api.php:107
+msgid "Authorize application connection"
+msgstr "Verbindung der Applikation autorisieren"
 
-#: mod/notifications.php:46 mod/notifications.php:182
-#: mod/notifications.php:229
-msgid "Discard"
-msgstr "Verwerfen"
+#: mod/api.php:86
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:"
 
-#: mod/notifications.php:98 src/Content/Nav.php:191
-msgid "Notifications"
-msgstr "Benachrichtigungen"
+#: mod/api.php:95
+msgid "Please login to continue."
+msgstr "Bitte melde Dich an um fortzufahren."
 
-#: mod/notifications.php:107
-msgid "Network Notifications"
-msgstr "Netzwerk Benachrichtigungen"
+#: 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 "Möchtest Du dieser Anwendung den Zugriff auf Deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?"
 
-#: mod/notifications.php:119
-msgid "Personal Notifications"
-msgstr "Persönliche Benachrichtigungen"
+#: mod/profile_photo.php:55
+msgid "Image uploaded but image cropping failed."
+msgstr "Bild hochgeladen, aber das Zuschneiden schlug fehl."
 
-#: mod/notifications.php:125
-msgid "Home Notifications"
-msgstr "Pinnwand Benachrichtigungen"
-
-#: mod/notifications.php:155
-msgid "Show Ignored Requests"
-msgstr "Zeige ignorierte Anfragen"
-
-#: mod/notifications.php:155
-msgid "Hide Ignored Requests"
-msgstr "Verberge ignorierte Anfragen"
-
-#: mod/notifications.php:167 mod/notifications.php:236
-msgid "Notification type: "
-msgstr "Benachrichtigungstyp: "
-
-#: mod/notifications.php:170
+#: mod/profile_photo.php:87 mod/profile_photo.php:96 mod/profile_photo.php:105
+#: mod/profile_photo.php:313
 #, php-format
-msgid "suggested by %s"
-msgstr "vorgeschlagen von %s"
+msgid "Image size reduction [%s] failed."
+msgstr "Verkleinern der Bildgröße von [%s] scheiterte."
 
-#: mod/notifications.php:178 mod/notifications.php:262 mod/admin.php:1820
-msgid "Approve"
-msgstr "Genehmigen"
+#: mod/profile_photo.php:124
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird."
 
-#: mod/notifications.php:197
-msgid "Claims to be known to you: "
-msgstr "Behauptet Dich zu kennen: "
+#: mod/profile_photo.php:132
+msgid "Unable to process image"
+msgstr "Bild konnte nicht verarbeitet werden"
 
-#: mod/notifications.php:198
-msgid "yes"
-msgstr "ja"
+#: mod/profile_photo.php:244
+msgid "Upload File:"
+msgstr "Datei hochladen:"
 
-#: mod/notifications.php:198
-msgid "no"
-msgstr "nein"
+#: mod/profile_photo.php:245
+msgid "Select a profile:"
+msgstr "Profil auswählen:"
 
-#: mod/notifications.php:199 mod/notifications.php:204
-msgid "Shall your connection be bidirectional or not?"
-msgstr "Soll die Verbindung beidseitig sein oder nicht?"
+#: mod/profile_photo.php:247 mod/fbrowser.php:106 mod/fbrowser.php:137
+msgid "Upload"
+msgstr "Hochladen"
 
-#: mod/notifications.php:200 mod/notifications.php:205
+#: mod/profile_photo.php:250
+msgid "or"
+msgstr "oder"
+
+#: mod/profile_photo.php:251
+msgid "skip this step"
+msgstr "diesen Schritt überspringen"
+
+#: mod/profile_photo.php:251
+msgid "select a photo from your photo albums"
+msgstr "wähle ein Foto aus deinen Fotoalben"
+
+#: mod/profile_photo.php:264
+msgid "Crop Image"
+msgstr "Bild zurechtschneiden"
+
+#: mod/profile_photo.php:265
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann."
+
+#: mod/profile_photo.php:267
+msgid "Done Editing"
+msgstr "Bearbeitung abgeschlossen"
+
+#: mod/profile_photo.php:303
+msgid "Image uploaded successfully."
+msgstr "Bild erfolgreich hochgeladen."
+
+#: mod/wall_attach.php:107
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt."
+
+#: mod/wall_attach.php:107
+msgid "Or - did you try to upload an empty file?"
+msgstr "Oder - hast Du versucht, eine leere Datei hochzuladen?"
+
+#: mod/wall_attach.php:118
+#, php-format
+msgid "File exceeds size limit of %s"
+msgstr "Die Datei ist größer als das erlaubte Limit von %s"
+
+#: mod/wall_attach.php:142 mod/wall_attach.php:158
+msgid "File upload failed."
+msgstr "Hochladen der Datei fehlgeschlagen."
+
+#: mod/item.php:117
+msgid "Unable to locate original post."
+msgstr "Konnte den Originalbeitrag nicht finden."
+
+#: mod/item.php:285
+msgid "Empty post discarded."
+msgstr "Leerer Beitrag wurde verworfen."
+
+#: mod/item.php:809
 #, 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 "Akzeptierst du %s als Kontakt, erlaubst du damit das Lesen deiner Beiträge und abonnierst selbst auch die Beiträge von %s."
+"This message was sent to you by %s, a member of the Friendica social "
+"network."
+msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."
 
-#: mod/notifications.php:201
+#: mod/item.php:811
 #, 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 "Wenn du %s als Abonnent akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten."
+msgid "You may visit them online at %s"
+msgstr "Du kannst sie online unter %s besuchen"
 
-#: mod/notifications.php:206
+#: mod/item.php:812
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest."
+
+#: mod/item.php:816
 #, 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 "Wenn du %s als Teilenden akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten."
+msgid "%s posted an update."
+msgstr "%s hat ein Update veröffentlicht."
 
-#: mod/notifications.php:217
-msgid "Friend"
+#: mod/help.php:49
+msgid "Help:"
+msgstr "Hilfe:"
+
+#: mod/uimport.php:72
+msgid "Move account"
+msgstr "Account umziehen"
+
+#: mod/uimport.php:73
+msgid "You can import an account from another Friendica server."
+msgstr "Du kannst einen Account von einem anderen Friendica Server importieren."
+
+#: 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 "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist."
+
+#: 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 "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren"
+
+#: mod/uimport.php:76
+msgid "Account file"
+msgstr "Account Datei"
+
+#: mod/uimport.php:76
+msgid ""
+"To export your account, go to \"Settings->Export your personal data\" and "
+"select \"Export account\""
+msgstr "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\""
+
+#: mod/profperm.php:35 mod/profperm.php:68
+msgid "Invalid profile identifier."
+msgstr "Ungültiger Profil-Bezeichner."
+
+#: mod/profperm.php:114
+msgid "Profile Visibility Editor"
+msgstr "Editor für die Profil-Sichtbarkeit"
+
+#: mod/profperm.php:127
+msgid "Visible To"
+msgstr "Sichtbar für"
+
+#: mod/profperm.php:143
+msgid "All Contacts (with secure profile access)"
+msgstr "Alle Kontakte (mit gesichertem Profilzugriff)"
+
+#: mod/cal.php:277 mod/events.php:391
+msgid "View"
+msgstr "Ansehen"
+
+#: mod/cal.php:278 mod/events.php:393
+msgid "Previous"
+msgstr "Vorherige"
+
+#: mod/cal.php:282 mod/events.php:399 src/Model/Event.php:421
+msgid "today"
+msgstr "Heute"
+
+#: mod/cal.php:283 mod/events.php:400 src/Util/Temporal.php:304
+#: src/Model/Event.php:422
+msgid "month"
+msgstr "Monat"
+
+#: mod/cal.php:284 mod/events.php:401 src/Util/Temporal.php:305
+#: src/Model/Event.php:423
+msgid "week"
+msgstr "Woche"
+
+#: mod/cal.php:285 mod/events.php:402 src/Util/Temporal.php:306
+#: src/Model/Event.php:424
+msgid "day"
+msgstr "Tag"
+
+#: mod/cal.php:286 mod/events.php:403
+msgid "list"
+msgstr "Liste"
+
+#: mod/cal.php:299 src/Core/Console/NewPassword.php:68 src/Model/User.php:221
+msgid "User not found"
+msgstr "Nutzer nicht gefunden"
+
+#: mod/cal.php:315
+msgid "This calendar format is not supported"
+msgstr "Dieses Kalenderformat wird nicht unterstützt."
+
+#: mod/cal.php:317
+msgid "No exportable data found"
+msgstr "Keine exportierbaren Daten gefunden"
+
+#: mod/cal.php:334
+msgid "calendar"
+msgstr "Kalender"
+
+#: mod/regmod.php:70
+msgid "Account approved."
+msgstr "Konto freigegeben."
+
+#: mod/regmod.php:95
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registrierung für %s wurde zurückgezogen"
+
+#: mod/regmod.php:102
+msgid "Please login."
+msgstr "Bitte melde Dich an."
+
+#: mod/editpost.php:26 mod/editpost.php:36
+msgid "Item not found"
+msgstr "Beitrag nicht gefunden"
+
+#: mod/editpost.php:43
+msgid "Edit post"
+msgstr "Beitrag bearbeiten"
+
+#: mod/editpost.php:125 src/Core/ACL.php:304
+msgid "CC: email addresses"
+msgstr "Cc: E-Mail-Addressen"
+
+#: mod/editpost.php:132 src/Core/ACL.php:305
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Z.B.: bob@example.com, mary@example.com"
+
+#: mod/apps.php:19
+msgid "Applications"
+msgstr "Anwendungen"
+
+#: mod/apps.php:22
+msgid "No installed applications."
+msgstr "Keine Applikationen installiert."
+
+#: mod/feedtest.php:21
+msgid "You must be logged in to use this module"
+msgstr "Du musst eingeloggt sein um dieses Modul benutzen zu können."
+
+#: mod/feedtest.php:49
+msgid "Source URL"
+msgstr "URL der Quelle"
+
+#: mod/fsuggest.php:72
+msgid "Friend suggestion sent."
+msgstr "Kontaktvorschlag gesendet."
+
+#: mod/fsuggest.php:101
+msgid "Suggest Friends"
+msgstr "Kontakte vorschlagen"
+
+#: mod/fsuggest.php:103
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "Schlage %s einen Kontakt vor"
+
+#: mod/maintenance.php:24
+msgid "System down for maintenance"
+msgstr "System zur Wartung abgeschaltet"
+
+#: mod/profile.php:38 src/Model/Profile.php:115
+msgid "Requested profile is not available."
+msgstr "Das angefragte Profil ist nicht vorhanden."
+
+#: mod/profile.php:79 mod/profile.php:82 src/Protocol/OStatus.php:1275
+#, php-format
+msgid "%s's timeline"
+msgstr "Timeline von %s"
+
+#: mod/profile.php:80 src/Protocol/OStatus.php:1276
+#, php-format
+msgid "%s's posts"
+msgstr "Beiträge von %s"
+
+#: mod/profile.php:81 src/Protocol/OStatus.php:1277
+#, php-format
+msgid "%s's comments"
+msgstr "Kommentare von %s"
+
+#: mod/allfriends.php:53
+msgid "No friends to display."
+msgstr "Keine Kontakte zum Anzeigen."
+
+#: mod/contacts.php:162
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] "%d Kontakt bearbeitet."
+msgstr[1] "%d Kontakte bearbeitet."
+
+#: mod/contacts.php:189 mod/contacts.php:395
+msgid "Could not access contact record."
+msgstr "Konnte nicht auf die Kontaktdaten zugreifen."
+
+#: mod/contacts.php:199
+msgid "Could not locate selected profile."
+msgstr "Konnte das ausgewählte Profil nicht finden."
+
+#: mod/contacts.php:233
+msgid "Contact updated."
+msgstr "Kontakt aktualisiert."
+
+#: mod/contacts.php:416
+msgid "Contact has been blocked"
+msgstr "Kontakt wurde blockiert"
+
+#: mod/contacts.php:416
+msgid "Contact has been unblocked"
+msgstr "Kontakt wurde wieder freigegeben"
+
+#: mod/contacts.php:426
+msgid "Contact has been ignored"
+msgstr "Kontakt wurde ignoriert"
+
+#: mod/contacts.php:426
+msgid "Contact has been unignored"
+msgstr "Kontakt wird nicht mehr ignoriert"
+
+#: mod/contacts.php:436
+msgid "Contact has been archived"
+msgstr "Kontakt wurde archiviert"
+
+#: mod/contacts.php:436
+msgid "Contact has been unarchived"
+msgstr "Kontakt wurde aus dem Archiv geholt"
+
+#: mod/contacts.php:460
+msgid "Drop contact"
+msgstr "Kontakt löschen"
+
+#: mod/contacts.php:463 mod/contacts.php:845
+msgid "Do you really want to delete this contact?"
+msgstr "Möchtest Du wirklich diesen Kontakt löschen?"
+
+#: mod/contacts.php:481
+msgid "Contact has been removed."
+msgstr "Kontakt wurde entfernt."
+
+#: mod/contacts.php:518
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "Du hast mit %s eine beidseitige Freundschaft"
+
+#: mod/contacts.php:523
+#, php-format
+msgid "You are sharing with %s"
+msgstr "Du teilst mit %s"
+
+#: mod/contacts.php:528
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s teilt mit Dir"
+
+#: mod/contacts.php:552
+msgid "Private communications are not available for this contact."
+msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar."
+
+#: mod/contacts.php:554
+msgid "Never"
+msgstr "Niemals"
+
+#: mod/contacts.php:557
+msgid "(Update was successful)"
+msgstr "(Aktualisierung war erfolgreich)"
+
+#: mod/contacts.php:557
+msgid "(Update was not successful)"
+msgstr "(Aktualisierung war nicht erfolgreich)"
+
+#: mod/contacts.php:559 mod/contacts.php:1086
+msgid "Suggest friends"
+msgstr "Kontakte vorschlagen"
+
+#: mod/contacts.php:563
+#, php-format
+msgid "Network type: %s"
+msgstr "Netzwerktyp: %s"
+
+#: mod/contacts.php:568
+msgid "Communications lost with this contact!"
+msgstr "Verbindungen mit diesem Kontakt verloren!"
+
+#: mod/contacts.php:574
+msgid "Fetch further information for feeds"
+msgstr "Weitere Informationen zu Feeds holen"
+
+#: 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 "Zusätzliche Informationen wie Vorschaubilder, Titel und Zusammenfassungen vom Feed-Eintrag laden. Du kannst diese Option aktivieren, wenn der Feed nicht all zu viel Text beinhaltet. Schlagwörter werden auf den Meta-Informationen des Feed-Headers bezogen und als Hash-Tags verwendet."
+
+#: mod/contacts.php:578
+msgid "Fetch information"
+msgstr "Beziehe Information"
+
+#: mod/contacts.php:579
+msgid "Fetch keywords"
+msgstr "Schlüsselwörter abrufen"
+
+#: mod/contacts.php:580
+msgid "Fetch information and keywords"
+msgstr "Beziehe Information und Schlüsselworte"
+
+#: mod/contacts.php:617
+msgid "Profile Visibility"
+msgstr "Profil-Sichtbarkeit"
+
+#: mod/contacts.php:618
+msgid "Contact Information / Notes"
+msgstr "Kontakt Informationen / Notizen"
+
+#: mod/contacts.php:619
+msgid "Contact Settings"
+msgstr "Kontakteinstellungen"
+
+#: mod/contacts.php:628
+msgid "Contact"
 msgstr "Kontakt"
 
-#: mod/notifications.php:218
-msgid "Sharer"
-msgstr "Teilenden"
-
-#: mod/notifications.php:218
-msgid "Subscriber"
-msgstr "Abonnent"
-
-#: mod/notifications.php:273
-msgid "No introductions."
-msgstr "Keine Kontaktanfragen."
-
-#: mod/notifications.php:314
-msgid "Show unread"
-msgstr "Ungelesene anzeigen"
-
-#: mod/notifications.php:314
-msgid "Show all"
-msgstr "Alle anzeigen"
-
-#: mod/notifications.php:320
+#: mod/contacts.php:632
 #, php-format
-msgid "No more %s notifications."
-msgstr "Keine weiteren %s Benachrichtigungen"
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft."
 
-#: mod/profiles.php:58
+#: mod/contacts.php:634
+msgid "Their personal note"
+msgstr "Die persönliche Mitteilung"
+
+#: mod/contacts.php:636
+msgid "Edit contact notes"
+msgstr "Notizen zum Kontakt bearbeiten"
+
+#: mod/contacts.php:640
+msgid "Block/Unblock contact"
+msgstr "Kontakt blockieren/freischalten"
+
+#: mod/contacts.php:641
+msgid "Ignore contact"
+msgstr "Ignoriere den Kontakt"
+
+#: mod/contacts.php:642
+msgid "Repair URL settings"
+msgstr "URL Einstellungen reparieren"
+
+#: mod/contacts.php:643
+msgid "View conversations"
+msgstr "Unterhaltungen anzeigen"
+
+#: mod/contacts.php:648
+msgid "Last update:"
+msgstr "Letzte Aktualisierung: "
+
+#: mod/contacts.php:650
+msgid "Update public posts"
+msgstr "Öffentliche Beiträge aktualisieren"
+
+#: mod/contacts.php:652 mod/contacts.php:1096
+msgid "Update now"
+msgstr "Jetzt aktualisieren"
+
+#: mod/contacts.php:658 mod/contacts.php:850 mod/contacts.php:1113
+msgid "Unignore"
+msgstr "Ignorieren aufheben"
+
+#: mod/contacts.php:662
+msgid "Currently blocked"
+msgstr "Derzeit geblockt"
+
+#: mod/contacts.php:663
+msgid "Currently ignored"
+msgstr "Derzeit ignoriert"
+
+#: mod/contacts.php:664
+msgid "Currently archived"
+msgstr "Momentan archiviert"
+
+#: mod/contacts.php:665
+msgid "Awaiting connection acknowledge"
+msgstr "Bedarf der Bestätigung des Kontakts"
+
+#: mod/contacts.php:666
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein"
+
+#: mod/contacts.php:667
+msgid "Notification for new posts"
+msgstr "Benachrichtigung bei neuen Beiträgen"
+
+#: mod/contacts.php:667
+msgid "Send a notification of every new post of this contact"
+msgstr "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt."
+
+#: mod/contacts.php:670
+msgid "Blacklisted keywords"
+msgstr "Blacklistete Schlüsselworte "
+
+#: 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 "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde"
+
+#: mod/contacts.php:682 src/Model/Profile.php:424
+msgid "XMPP:"
+msgstr "XMPP:"
+
+#: mod/contacts.php:687
+msgid "Actions"
+msgstr "Aktionen"
+
+#: mod/contacts.php:731
+msgid "Suggestions"
+msgstr "Kontaktvorschläge"
+
+#: mod/contacts.php:734
+msgid "Suggest potential friends"
+msgstr "Kontakte vorschlagen"
+
+#: mod/contacts.php:742
+msgid "Show all contacts"
+msgstr "Alle Kontakte anzeigen"
+
+#: mod/contacts.php:747
+msgid "Unblocked"
+msgstr "Ungeblockt"
+
+#: mod/contacts.php:750
+msgid "Only show unblocked contacts"
+msgstr "Nur nicht-blockierte Kontakte anzeigen"
+
+#: mod/contacts.php:755
+msgid "Blocked"
+msgstr "Geblockt"
+
+#: mod/contacts.php:758
+msgid "Only show blocked contacts"
+msgstr "Nur blockierte Kontakte anzeigen"
+
+#: mod/contacts.php:763
+msgid "Ignored"
+msgstr "Ignoriert"
+
+#: mod/contacts.php:766
+msgid "Only show ignored contacts"
+msgstr "Nur ignorierte Kontakte anzeigen"
+
+#: mod/contacts.php:771
+msgid "Archived"
+msgstr "Archiviert"
+
+#: mod/contacts.php:774
+msgid "Only show archived contacts"
+msgstr "Nur archivierte Kontakte anzeigen"
+
+#: mod/contacts.php:779
+msgid "Hidden"
+msgstr "Verborgen"
+
+#: mod/contacts.php:782
+msgid "Only show hidden contacts"
+msgstr "Nur verborgene Kontakte anzeigen"
+
+#: mod/contacts.php:840
+msgid "Search your contacts"
+msgstr "Suche in deinen Kontakten"
+
+#: mod/contacts.php:851 mod/contacts.php:1122
+msgid "Archive"
+msgstr "Archivieren"
+
+#: mod/contacts.php:851 mod/contacts.php:1122
+msgid "Unarchive"
+msgstr "Aus Archiv zurückholen"
+
+#: mod/contacts.php:854
+msgid "Batch Actions"
+msgstr "Stapelverarbeitung"
+
+#: mod/contacts.php:880
+msgid "Conversations started by this contact"
+msgstr "Unterhaltungen, die von diesem Kontakt begonnen wurden"
+
+#: mod/contacts.php:885
+msgid "Posts and Comments"
+msgstr "Statusnachrichten und Kommentare"
+
+#: mod/contacts.php:896 src/Model/Profile.php:886
+msgid "Profile Details"
+msgstr "Profildetails"
+
+#: mod/contacts.php:908
+msgid "View all contacts"
+msgstr "Alle Kontakte anzeigen"
+
+#: mod/contacts.php:919
+msgid "View all common friends"
+msgstr "Alle Kontakte anzeigen"
+
+#: mod/contacts.php:929
+msgid "Advanced Contact Settings"
+msgstr "Fortgeschrittene Kontakteinstellungen"
+
+#: mod/contacts.php:1019
+msgid "Mutual Friendship"
+msgstr "Beidseitige Freundschaft"
+
+#: mod/contacts.php:1024
+msgid "is a fan of yours"
+msgstr "ist ein Fan von dir"
+
+#: mod/contacts.php:1029
+msgid "you are a fan of"
+msgstr "Du bist Fan von"
+
+#: 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 "Das bist Du"
+
+#: mod/contacts.php:1053
+msgid "Edit contact"
+msgstr "Kontakt bearbeiten"
+
+#: mod/contacts.php:1107
+msgid "Toggle Blocked status"
+msgstr "Geblockt-Status ein-/ausschalten"
+
+#: mod/contacts.php:1115
+msgid "Toggle Ignored status"
+msgstr "Ignoriert-Status ein-/ausschalten"
+
+#: mod/contacts.php:1124
+msgid "Toggle Archive status"
+msgstr "Archiviert-Status ein-/ausschalten"
+
+#: mod/contacts.php:1132
+msgid "Delete contact"
+msgstr "Lösche den Kontakt"
+
+#: mod/events.php:103 mod/events.php:105
+msgid "Event can not end before it has started."
+msgstr "Die Veranstaltung kann nicht enden bevor sie beginnt."
+
+#: mod/events.php:112 mod/events.php:114
+msgid "Event title and start time are required."
+msgstr "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden."
+
+#: mod/events.php:392
+msgid "Create New Event"
+msgstr "Neue Veranstaltung erstellen"
+
+#: mod/events.php:509
+msgid "Event details"
+msgstr "Veranstaltungsdetails"
+
+#: mod/events.php:510
+msgid "Starting date and Title are required."
+msgstr "Anfangszeitpunkt und Titel werden benötigt"
+
+#: mod/events.php:511 mod/events.php:512
+msgid "Event Starts:"
+msgstr "Veranstaltungsbeginn:"
+
+#: mod/events.php:511 mod/events.php:523 mod/profiles.php:607
+msgid "Required"
+msgstr "Benötigt"
+
+#: mod/events.php:513 mod/events.php:529
+msgid "Finish date/time is not known or not relevant"
+msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant"
+
+#: mod/events.php:515 mod/events.php:516
+msgid "Event Finishes:"
+msgstr "Veranstaltungsende:"
+
+#: mod/events.php:517 mod/events.php:530
+msgid "Adjust for viewer timezone"
+msgstr "An Zeitzone des Betrachters anpassen"
+
+#: mod/events.php:519
+msgid "Description:"
+msgstr "Beschreibung"
+
+#: 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 "Veranstaltung teilen"
+
+#: mod/events.php:534 src/Model/Profile.php:851
+msgid "Basic"
+msgstr "Allgemein"
+
+#: mod/events.php:536 mod/photos.php:1112 mod/photos.php:1448
+#: src/Core/ACL.php:307
+msgid "Permissions"
+msgstr "Berechtigungen"
+
+#: mod/events.php:555
+msgid "Failed to remove event"
+msgstr "Entfernen der Veranstaltung fehlgeschlagen"
+
+#: mod/events.php:557
+msgid "Event removed"
+msgstr "Veranstaltung enfternt"
+
+#: mod/follow.php:45
+msgid "The contact could not be added."
+msgstr "Der Kontakt konnte nicht hinzugefügt werden."
+
+#: mod/follow.php:73
+msgid "You already added this contact."
+msgstr "Du hast den Kontakt bereits hinzugefügt."
+
+#: mod/follow.php:83
+msgid "Diaspora support isn't enabled. Contact can't be added."
+msgstr "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."
+
+#: mod/follow.php:90
+msgid "OStatus support is disabled. Contact can't be added."
+msgstr "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden."
+
+#: mod/follow.php:97
+msgid "The network type couldn't be detected. Contact can't be added."
+msgstr "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden."
+
+#: 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 "Kontaktbilder"
+
+#: mod/fbrowser.php:132
+msgid "Files"
+msgstr "Dateien"
+
+#: mod/oexchange.php:30
+msgid "Post successful."
+msgstr "Beitrag erfolgreich veröffentlicht."
+
+#: mod/subthread.php:103
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s folgt %2$s %3$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 ist ein Gemeinschaftsprojekt, das nicht ohne die Hilfe vieler Personen möglich wäre. Hier ist eine Aufzählung der Personen, die zum Code oder der Übersetzung beigetragen haben. Dank an alle !"
+
+#: mod/attach.php:16
+msgid "Item not available."
+msgstr "Beitrag nicht verfügbar."
+
+#: mod/attach.php:26
+msgid "Item was not found."
+msgstr "Beitrag konnte nicht gefunden werden."
+
+#: mod/notify.php:77
+msgid "No more system notifications."
+msgstr "Keine weiteren Systembenachrichtigungen."
+
+#: mod/community.php:71
+msgid "Community option not available."
+msgstr "Optionen für die Gemeinschaftsseite nicht verfügbar."
+
+#: mod/community.php:88
+msgid "Not available."
+msgstr "Nicht verfügbar."
+
+#: mod/community.php:101
+msgid "Local Community"
+msgstr "Lokale Gemeinschaft"
+
+#: mod/community.php:104
+msgid "Posts from local users on this server"
+msgstr "Beiträge von Nutzern dieses Servers"
+
+#: mod/community.php:112
+msgid "Global Community"
+msgstr "Globale Gemeinschaft"
+
+#: mod/community.php:115
+msgid "Posts from users of the whole federated network"
+msgstr "Beiträge von Nutzern des gesamten  föderalen Netzwerks"
+
+#: 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 "Diese Gemeinschaftsseite zeigt alle öffentlichen Beiträge, die auf diesem Knoten eingegangen sind. Der Inhalt entspricht nicht zwingend der Meinung der Nutzer dieses Servers."
+
+#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:829
+msgid "l F d, Y \\@ g:i A"
+msgstr "l, d. F Y\\, H:i"
+
+#: mod/localtime.php:33
+msgid "Time Conversion"
+msgstr "Zeitumrechnung"
+
+#: mod/localtime.php:35
+msgid ""
+"Friendica provides this service for sharing events with other networks and "
+"friends in unknown timezones."
+msgstr "Friendica bietet diese Funktion an, um das Teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann."
+
+#: mod/localtime.php:39
+#, php-format
+msgid "UTC time: %s"
+msgstr "UTC Zeit: %s"
+
+#: mod/localtime.php:42
+#, php-format
+msgid "Current timezone: %s"
+msgstr "Aktuelle Zeitzone: %s"
+
+#: mod/localtime.php:46
+#, php-format
+msgid "Converted localtime: %s"
+msgstr "Umgerechnete lokale Zeit: %s"
+
+#: mod/localtime.php:52
+msgid "Please select your timezone:"
+msgstr "Bitte wähle Deine Zeitzone:"
+
+#: mod/poke.php:188
+msgid "Poke/Prod"
+msgstr "Anstupsen"
+
+#: mod/poke.php:189
+msgid "poke, prod or do other things to somebody"
+msgstr "Stupse Leute an oder mache anderes mit ihnen"
+
+#: mod/poke.php:190
+msgid "Recipient"
+msgstr "Empfänger"
+
+#: mod/poke.php:191
+msgid "Choose what you wish to do to recipient"
+msgstr "Was willst Du mit dem Empfänger machen:"
+
+#: mod/poke.php:194
+msgid "Make this post private"
+msgstr "Diesen Beitrag privat machen"
+
+#: mod/invite.php:34
+msgid "Total invitation limit exceeded."
+msgstr "Limit für Einladungen erreicht."
+
+#: mod/invite.php:56
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s: Keine gültige Email Adresse."
+
+#: mod/invite.php:88
+msgid "Please join us on Friendica"
+msgstr "Ich lade Dich zu unserem sozialen Netzwerk Friendica ein"
+
+#: mod/invite.php:97
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Limit für Einladungen erreicht. Bitte kontaktiere des Administrator der Seite."
+
+#: mod/invite.php:101
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s: Zustellung der Nachricht fehlgeschlagen."
+
+#: mod/invite.php:105
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d Nachricht gesendet."
+msgstr[1] "%d Nachrichten gesendet."
+
+#: mod/invite.php:123
+msgid "You have no more invitations available"
+msgstr "Du hast keine weiteren Einladungen"
+
+#: 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 "Besuche %s für eine Liste der öffentlichen Server, denen Du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke."
+
+#: mod/invite.php:133
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s oder einer anderen öffentlichen 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 Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen Du beitreten kannst."
+
+#: mod/invite.php:138
+msgid ""
+"Our apologies. This system is not currently configured to connect with other"
+" public sites or invite members."
+msgstr "Es tut uns leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen."
+
+#: 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 Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden."
+
+#: mod/invite.php:141
+#, php-format
+msgid "To accept this invitation, please visit and register at %s."
+msgstr "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s."
+
+#: mod/invite.php:148
+msgid "Send invitations"
+msgstr "Einladungen senden"
+
+#: mod/invite.php:149
+msgid "Enter email addresses, one per line:"
+msgstr "E-Mail-Adressen eingeben, eine pro Zeile:"
+
+#: 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 "Du bist herzlich dazu eingeladen, Dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen."
+
+#: mod/invite.php:152
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr "Du benötigst den folgenden Einladungscode: $invite_code"
+
+#: mod/invite.php:152
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr "Sobald Du registriert bist, kontaktiere mich bitte auf meiner Profilseite:"
+
+#: 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 "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendi.ca."
+
+#: mod/notes.php:42 src/Model/Profile.php:933
+msgid "Personal Notes"
+msgstr "Persönliche Notizen"
+
+#: mod/profiles.php:57
 msgid "Profile deleted."
 msgstr "Profil gelöscht."
 
-#: mod/profiles.php:74 mod/profiles.php:110
+#: mod/profiles.php:73 mod/profiles.php:109
 msgid "Profile-"
 msgstr "Profil-"
 
-#: mod/profiles.php:93 mod/profiles.php:132
+#: mod/profiles.php:92 mod/profiles.php:131
 msgid "New profile created."
 msgstr "Neues Profil angelegt."
 
-#: mod/profiles.php:116
+#: mod/profiles.php:115
 msgid "Profile unavailable to clone."
 msgstr "Profil nicht zum Duplizieren verfügbar."
 
-#: mod/profiles.php:206
+#: mod/profiles.php:203
 msgid "Profile Name is required."
 msgstr "Profilname ist erforderlich."
 
-#: mod/profiles.php:347
+#: mod/profiles.php:344
 msgid "Marital Status"
 msgstr "Familienstand"
 
-#: mod/profiles.php:351
+#: mod/profiles.php:348
 msgid "Romantic Partner"
 msgstr "Romanze"
 
-#: mod/profiles.php:363
+#: mod/profiles.php:360
 msgid "Work/Employment"
 msgstr "Arbeit / Beschäftigung"
 
-#: mod/profiles.php:366
+#: mod/profiles.php:363
 msgid "Religion"
 msgstr "Religion"
 
-#: mod/profiles.php:370
+#: mod/profiles.php:367
 msgid "Political Views"
 msgstr "Politische Ansichten"
 
-#: mod/profiles.php:374
+#: mod/profiles.php:371
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: mod/profiles.php:378
+#: mod/profiles.php:375
 msgid "Sexual Preference"
 msgstr "Sexuelle Vorlieben"
 
-#: mod/profiles.php:382
+#: mod/profiles.php:379
 msgid "XMPP"
 msgstr "XMPP"
 
-#: mod/profiles.php:386
+#: mod/profiles.php:383
 msgid "Homepage"
 msgstr "Webseite"
 
-#: mod/profiles.php:390 mod/profiles.php:593
+#: mod/profiles.php:387 mod/profiles.php:593
 msgid "Interests"
 msgstr "Interessen"
 
-#: mod/profiles.php:394 mod/admin.php:494
-msgid "Address"
-msgstr "Adresse"
-
-#: mod/profiles.php:401 mod/profiles.php:589
+#: mod/profiles.php:398 mod/profiles.php:589
 msgid "Location"
 msgstr "Wohnort"
 
-#: mod/profiles.php:483
+#: mod/profiles.php:481
 msgid "Profile updated."
 msgstr "Profil aktualisiert."
 
-#: mod/profiles.php:540
+#: mod/profiles.php:538
 msgid "Hide contacts and friends:"
 msgstr "Kontakte und Freunde verbergen"
 
-#: mod/profiles.php:545
+#: mod/profiles.php:543
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?"
 
-#: mod/profiles.php:565
+#: mod/profiles.php:563
 msgid "Show more profile fields:"
 msgstr "Zeige mehr Profil-Felder:"
 
-#: mod/profiles.php:577
+#: mod/profiles.php:575
 msgid "Profile Actions"
 msgstr "Profilaktionen"
 
-#: mod/profiles.php:578
+#: mod/profiles.php:576
 msgid "Edit Profile Details"
 msgstr "Profil bearbeiten"
 
-#: mod/profiles.php:580
+#: mod/profiles.php:578
 msgid "Change Profile Photo"
 msgstr "Profilbild ändern"
 
-#: mod/profiles.php:581
+#: mod/profiles.php:580
 msgid "View this profile"
 msgstr "Dieses Profil anzeigen"
 
-#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:389
+#: mod/profiles.php:581
+msgid "View all profiles"
+msgstr "Alle Profile anzeigen"
+
+#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:393
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
@@ -3976,11 +7391,6 @@ msgstr "Status Informationen"
 msgid "Additional information"
 msgstr "Zusätzliche Informationen"
 
-#: mod/profiles.php:594 mod/network.php:962
-#: src/Core/NotificationsManager.php:185
-msgid "Personal"
-msgstr "Persönlich"
-
 #: mod/profiles.php:595
 msgid "Relation"
 msgstr "Beziehung"
@@ -3997,7 +7407,7 @@ msgstr "Dein Geschlecht:"
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span> Beziehungsstatus:"
 
-#: mod/profiles.php:601 src/Model/Profile.php:780
+#: mod/profiles.php:601 src/Model/Profile.php:769
 msgid "Sexual Preference:"
 msgstr "Sexuelle Vorlieben:"
 
@@ -4009,10 +7419,6 @@ msgstr "Beispiel: Fischen Fotografie Software"
 msgid "Profile Name:"
 msgstr "Profilname:"
 
-#: mod/profiles.php:607 mod/events.php:508 mod/events.php:520
-msgid "Required"
-msgstr "Benötigt"
-
 #: mod/profiles.php:609
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
@@ -4081,11 +7487,11 @@ msgstr "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auc
 msgid "Homepage URL:"
 msgstr "Adresse der Homepage:"
 
-#: mod/profiles.php:628 src/Model/Profile.php:788
+#: mod/profiles.php:628 src/Model/Profile.php:777
 msgid "Hometown:"
 msgstr "Heimatort:"
 
-#: mod/profiles.php:629 src/Model/Profile.php:796
+#: mod/profiles.php:629 src/Model/Profile.php:785
 msgid "Political Views:"
 msgstr "Politische Ansichten:"
 
@@ -4109,11 +7515,11 @@ msgstr "Private Schlüsselwörter:"
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"
 
-#: mod/profiles.php:633 src/Model/Profile.php:812
+#: mod/profiles.php:633 src/Model/Profile.php:801
 msgid "Likes:"
 msgstr "Likes:"
 
-#: mod/profiles.php:634 src/Model/Profile.php:816
+#: mod/profiles.php:634 src/Model/Profile.php:805
 msgid "Dislikes:"
 msgstr "Dislikes:"
 
@@ -4153,11 +7559,11 @@ msgstr "Schule/Ausbildung"
 msgid "Contact information and Social Networks"
 msgstr "Kontaktinformationen und Soziale Netzwerke"
 
-#: mod/profiles.php:674 src/Model/Profile.php:385
+#: mod/profiles.php:674 src/Model/Profile.php:389
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: mod/profiles.php:676 src/Model/Profile.php:388
+#: mod/profiles.php:676 src/Model/Profile.php:392
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
@@ -4165,3644 +7571,267 @@ msgstr "sichtbar für jeden"
 msgid "Edit/Manage Profiles"
 msgstr "Bearbeite/Verwalte Profile"
 
-#: 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 "Profilbild ändern"
 
-#: mod/profiles.php:685 src/Model/Profile.php:376
+#: mod/profiles.php:685 src/Model/Profile.php:380
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
-#: mod/admin.php:107
-msgid "Theme settings updated."
-msgstr "Themeneinstellungen aktualisiert."
-
-#: mod/admin.php:180 src/Content/Nav.php:175
-msgid "Information"
-msgstr "Information"
-
-#: mod/admin.php:181
-msgid "Overview"
-msgstr "Übersicht"
-
-#: mod/admin.php:182 mod/admin.php:717
-msgid "Federation Statistics"
-msgstr "Föderation Statistik"
-
-#: mod/admin.php:183
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#: mod/admin.php:184 mod/admin.php:1352
-msgid "Site"
-msgstr "Seite"
-
-#: mod/admin.php:185 mod/admin.php:1284 mod/admin.php:1812 mod/admin.php:1828
-msgid "Users"
-msgstr "Nutzer"
-
-#: mod/admin.php:186 mod/admin.php:1928 mod/admin.php:1988 mod/settings.php:87
-msgid "Addons"
-msgstr "Addons"
-
-#: mod/admin.php:187 mod/admin.php:2197 mod/admin.php:2241
-msgid "Themes"
-msgstr "Themen"
-
-#: mod/admin.php:188 mod/settings.php:65
-msgid "Additional features"
-msgstr "Zusätzliche Features"
-
-#: 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 "Nutzungsbedingungen"
-
-#: mod/admin.php:190
-msgid "Database"
-msgstr "Datenbank"
-
-#: mod/admin.php:191
-msgid "DB updates"
-msgstr "DB Updates"
-
-#: mod/admin.php:192 mod/admin.php:752
-msgid "Inspect Queue"
-msgstr "Warteschlange Inspizieren"
-
-#: mod/admin.php:193
-msgid "Tools"
-msgstr "Werkzeuge"
-
-#: mod/admin.php:194
-msgid "Contact Blocklist"
-msgstr "Kontakt Sperrliste"
-
-#: mod/admin.php:195 mod/admin.php:366
-msgid "Server Blocklist"
-msgstr "Server Blockliste"
-
-#: mod/admin.php:196 mod/admin.php:525
-msgid "Delete Item"
-msgstr "Eintrag löschen"
-
-#: mod/admin.php:197 mod/admin.php:198 mod/admin.php:2315
-msgid "Logs"
-msgstr "Protokolle"
-
-#: mod/admin.php:199 mod/admin.php:2382
-msgid "View Logs"
-msgstr "Protokolle anzeigen"
-
-#: mod/admin.php:201
-msgid "Diagnostics"
-msgstr "Diagnostik"
-
-#: mod/admin.php:202
-msgid "PHP Info"
-msgstr "PHP Info"
-
-#: mod/admin.php:203
-msgid "probe address"
-msgstr "Adresse untersuchen"
-
-#: mod/admin.php:204
-msgid "check webfinger"
-msgstr "Webfinger überprüfen"
-
-#: mod/admin.php:223 src/Content/Nav.php:218
-msgid "Admin"
-msgstr "Administration"
-
-#: mod/admin.php:224
-msgid "Addon Features"
-msgstr "Addon Features"
-
-#: mod/admin.php:225
-msgid "User registrations waiting for confirmation"
-msgstr "Nutzeranmeldungen die auf Bestätigung warten"
-
-#: 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:1351
-#: mod/admin.php:1811 mod/admin.php:1927 mod/admin.php:1987 mod/admin.php:2196
-#: mod/admin.php:2240 mod/admin.php:2314 mod/admin.php:2381
-msgid "Administration"
-msgstr "Administration"
-
-#: mod/admin.php:305
-msgid "Display Terms of Service"
-msgstr "Nutzungsbedingungen anzeigen"
-
-#: mod/admin.php:305
-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 "Aktiviert die Seite für die Nutzungsbedingungen. Ist dies der Fall werden sie auch von der Registrierungsseite und der allgemeinen Informationsseite verlinkt."
-
-#: mod/admin.php:306
-msgid "Display Privacy Statement"
-msgstr "Datenschutzerklärung anzeigen"
-
-#: mod/admin.php:306
-#, 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 "Zeige Informationen über die zum Betrieb der Seite notwendigen personenbezogenen Daten an, wie es z.B. die <a href=\"%s\" target=\"_blank\">EU-DSGVO</a> verlangt."
-
-#: mod/admin.php:307
-msgid "Privacy Statement Preview"
-msgstr "Vorschau: Datenschutzerklärung"
-
-#: mod/admin.php:309
-msgid "The Terms of Service"
-msgstr "Die Nutzungsbedingungen"
-
-#: mod/admin.php:309
-msgid ""
-"Enter the Terms of Service for your node here. You can use BBCode. Headers "
-"of sections should be [h2] and below."
-msgstr "Füge hier die Nutzungsbedingungen deines Knotens ein. Du kannst BBCode zur Formatierung verwenden. Überschriften sollten [h2] oder darunter sein."
-
-#: mod/admin.php:357
-msgid "The blocked domain"
-msgstr "Die blockierte Domain"
-
-#: mod/admin.php:358 mod/admin.php:371
-msgid "The reason why you blocked this domain."
-msgstr "Die Begründung warum du diese Domain blockiert hast."
-
-#: mod/admin.php:359
-msgid "Delete domain"
-msgstr "Domain löschen"
-
-#: mod/admin.php:359
-msgid "Check to delete this entry from the blocklist"
-msgstr "Markieren, um diesen Eintrag von der Blocklist zu entfernen"
-
-#: mod/admin.php:367
-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 "Auf dieser Seite kannst du die Liste der blockierten Domains aus dem föderalen Netzwerk verwalten, denen es untersagt ist mit deinem Knoten zu interagieren. Für jede der blockierten Domains musst du außerdem einen Grund für die Sperrung angeben."
-
-#: mod/admin.php:368
-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 "Die Liste der blockierten Domains wird auf der /friendica Seite öffentlich einsehbar gemacht, damit deine Nutzer und Personen die Kommunikationsprobleme erkunden, die Ursachen einfach finden können."
-
-#: mod/admin.php:369
-msgid "Add new entry to block list"
-msgstr "Neuen Eintrag in die Blockliste"
-
-#: mod/admin.php:370
-msgid "Server Domain"
-msgstr "Domain des Servers"
-
-#: mod/admin.php:370
-msgid ""
-"The domain of the new server to add to the block list. Do not include the "
-"protocol."
-msgstr "Der Domain-Name des Servers der geblockt werden soll. Gib das Protokoll nicht mit an!"
-
-#: mod/admin.php:371
-msgid "Block reason"
-msgstr "Begründung der Blockierung"
-
-#: mod/admin.php:372
-msgid "Add Entry"
-msgstr "Eintrag hinzufügen"
-
-#: mod/admin.php:373
-msgid "Save changes to the blocklist"
-msgstr "Änderungen der Blockliste speichern"
-
-#: mod/admin.php:374
-msgid "Current Entries in the Blocklist"
-msgstr "Aktuelle Einträge der Blockliste"
-
-#: mod/admin.php:377
-msgid "Delete entry from blocklist"
-msgstr "Eintrag von der Blockliste entfernen"
-
-#: mod/admin.php:380
-msgid "Delete entry from blocklist?"
-msgstr "Eintrag von der Blockliste entfernen?"
-
-#: mod/admin.php:406
-msgid "Server added to blocklist."
-msgstr "Server zur Blockliste hinzugefügt."
-
-#: mod/admin.php:422
-msgid "Site blocklist updated."
-msgstr "Blockliste aktualisiert."
-
-#: mod/admin.php:445 src/Core/Console/GlobalCommunityBlock.php:72
-msgid "The contact has been blocked from the node"
-msgstr "Der Kontakt wurde von diesem Knoten geblockt"
-
-#: mod/admin.php:447 src/Core/Console/GlobalCommunityBlock.php:69
-#, php-format
-msgid "Could not find any contact entry for this URL (%s)"
-msgstr "Für die URL (%s) konnte kein Kontakt gefunden werden"
-
-#: mod/admin.php:454
-#, php-format
-msgid "%s contact unblocked"
-msgid_plural "%s contacts unblocked"
-msgstr[0] "%sKontakt wieder freigegeben"
-msgstr[1] "%sKontakte wieder freigegeben"
-
-#: mod/admin.php:483
-msgid "Remote Contact Blocklist"
-msgstr "Sperrliste entfernter Kontakte"
-
-#: mod/admin.php:484
-msgid ""
-"This page allows you to prevent any message from a remote contact to reach "
-"your node."
-msgstr "Auf dieser Seite kannst du Accounts von anderen Knoten blockieren und damit verhindern, dass ihre Beiträge von deinem Knoten angenommen werden."
-
-#: mod/admin.php:485
-msgid "Block Remote Contact"
-msgstr "Blockiere entfernten Kontakt"
-
-#: mod/admin.php:486 mod/admin.php:1814
-msgid "select all"
-msgstr "Alle auswählen"
-
-#: mod/admin.php:487
-msgid "select none"
-msgstr "Auswahl aufheben"
-
-#: mod/admin.php:490
-msgid "No remote contact is blocked from this node."
-msgstr "Derzeit werden keine Kontakte auf diesem Knoten blockiert."
-
-#: mod/admin.php:492
-msgid "Blocked Remote Contacts"
-msgstr "Blockierte Kontakte von anderen Knoten"
-
-#: mod/admin.php:493
-msgid "Block New Remote Contact"
-msgstr "Blockieren von weiteren Kontakten"
-
-#: mod/admin.php:494
-msgid "Photo"
-msgstr "Foto:"
-
-#: mod/admin.php:502
-#, php-format
-msgid "%s total blocked contact"
-msgid_plural "%s total blocked contacts"
-msgstr[0] "Insgesamt %s blockierter Kontakt"
-msgstr[1] "Insgesamt %s blockierte Kontakte"
-
-#: mod/admin.php:504
-msgid "URL of the remote contact to block."
-msgstr "Die URL des Kontakts, vom entfernten Server, der blockiert werden soll."
-
-#: mod/admin.php:526
-msgid "Delete this Item"
-msgstr "Diesen Eintrag löschen"
-
-#: mod/admin.php:527
-msgid ""
-"On this page you can delete an item from your node. If the item is a top "
-"level posting, the entire thread will be deleted."
-msgstr "Auf dieser Seite kannst du Einträge von deinem Knoten löschen. Wenn der Eintrag der Anfang einer Diskussion ist, wird der gesamte Diskussionsverlauf gelöscht."
-
-#: mod/admin.php:528
-msgid ""
-"You need to know the GUID of the item. You can find it e.g. by looking at "
-"the display URL. The last part of http://example.com/display/123456 is the "
-"GUID, here 123456."
-msgstr "Zur Löschung musst du die GUID des Eintrags kennen. Diese findest du z.B. durch die /display URL des Eintrags. Der letzte Teil der URL ist die GUID. Lautet die URL beispielsweise http://example.com/display/123456 ist die GUID 123456."
-
-#: mod/admin.php:529
-msgid "GUID"
-msgstr "GUID"
-
-#: mod/admin.php:529
-msgid "The GUID of the item you want to delete."
-msgstr "Die GUID des zu löschenden Eintrags"
-
-#: mod/admin.php:563
-msgid "Item marked for deletion."
-msgstr "Eintrag wurden zur Löschung markiert"
-
-#: mod/admin.php:634
-msgid "unknown"
-msgstr "Unbekannt"
-
-#: mod/admin.php:710
-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 "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des föderalen sozialen Netzwerks, von dem deine Friendica Installation ein Teil ist. Diese Zahlen sind nicht absolut und reflektieren nur den Teil des Netzwerks, den dein Knoten kennt."
-
-#: mod/admin.php:711
-msgid ""
-"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
-"will improve the data displayed here."
-msgstr "Die Funktion um <em>Automatisch ein Kontaktverzeichnis erstellen</em> ist nicht aktiv. Es wird die hier angezeigten Daten verbessern."
-
-#: mod/admin.php:723
-#, php-format
-msgid ""
-"Currently this node is aware of %d nodes with %d registered users from the "
-"following platforms:"
-msgstr "Momentan kennt dieser Knoten %d Knoten mit insgesamt %d registrierten Nutzern, die die folgenden Plattformen verwenden:"
-
-#: mod/admin.php:754
-msgid "ID"
-msgstr "ID"
-
-#: mod/admin.php:755
-msgid "Recipient Name"
-msgstr "Empfänger Name"
-
-#: mod/admin.php:756
-msgid "Recipient Profile"
-msgstr "Empfänger Profil"
-
-#: mod/admin.php:757 view/theme/frio/theme.php:266
-#: src/Core/NotificationsManager.php:178 src/Content/Nav.php:183
-msgid "Network"
-msgstr "Netzwerk"
-
-#: mod/admin.php:758
-msgid "Created"
-msgstr "Erstellt"
-
-#: mod/admin.php:759
-msgid "Last Tried"
-msgstr "Zuletzt versucht"
-
-#: mod/admin.php:760
-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 "Auf dieser Seite werden die in der Warteschlange eingereihten Beiträge aufgelistet. Bei diesen Beiträgen schlug die erste Zustellung fehl. Es wird später wiederholt versucht die Beiträge zuzustellen, bis sie schließlich gelöscht werden."
-
-#: mod/admin.php:784
-#, 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 "Deine DB verwendet derzeit noch MyISAM Tabellen. Du solltest die Datenbank Engine auf InnoDB umstellen, da Friendica in Zukunft InnoDB Features verwenden wird. Eine Anleitung zur Umstellung der Datenbank kannst du  <a href=\"%s\">hier</a>  finden. Du kannst außerdem mit dem Befehl <tt>php bin/console.php dbstructure toinnodb</tt> auf der Kommandozeile die Umstellung automatisch vornehmen lassen."
-
-#: mod/admin.php:791
-#, php-format
-msgid ""
-"There is a new version of Friendica available for download. Your current "
-"version is %1$s, upstream version is %2$s"
-msgstr "Es gibt eine neue Version von Friendica. Du verwendest derzeit die Version %1$s, die aktuelle Version ist %2$s."
-
-#: mod/admin.php:801
-msgid ""
-"The database update failed. Please run \"php bin/console.php dbstructure "
-"update\" from the command line and have a look at the errors that might "
-"appear."
-msgstr "Das Update der Datenbank ist fehlgeschlagen. Bitte führe 'php bin/console.php dbstructure update' in der Kommandozeile aus und achte auf eventuell auftretende Fehlermeldungen."
-
-#: mod/admin.php:807
-msgid "The worker was never executed. Please check your database structure!"
-msgstr "Der Hintergrundprozess (worker) wurde noch nie gestartet. Bitte überprüfe deine Datenbankstruktur."
-
-#: mod/admin.php:810
-#, php-format
-msgid ""
-"The last worker execution was on %s UTC. This is older than one hour. Please"
-" check your crontab settings."
-msgstr "Der Hintergrundprozess (worker) wurde zuletzt um %s UTC ausgeführt. Das war vor mehr als einer Stunde. Bitte überprüfe deine crontab Einstellungen."
-
-#: mod/admin.php:815
-msgid "Normal Account"
-msgstr "Normales Konto"
-
-#: mod/admin.php:816
-msgid "Automatic Follower Account"
-msgstr "Automatisch folgendes Konto (Marktschreier)"
-
-#: mod/admin.php:817
-msgid "Public Forum Account"
-msgstr "Öffentliches Forum Konto"
-
-#: mod/admin.php:818
-msgid "Automatic Friend Account"
-msgstr "Automatische Freunde Seite"
-
-#: mod/admin.php:819
-msgid "Blog Account"
-msgstr "Blog-Konto"
-
-#: mod/admin.php:820
-msgid "Private Forum Account"
-msgstr "Privates Forum Konto"
-
-#: mod/admin.php:842
-msgid "Message queues"
-msgstr "Nachrichten-Warteschlangen"
-
-#: mod/admin.php:848
-msgid "Summary"
-msgstr "Zusammenfassung"
-
-#: mod/admin.php:850
-msgid "Registered users"
-msgstr "Registrierte Personen"
-
-#: mod/admin.php:852
-msgid "Pending registrations"
-msgstr "Anstehende Anmeldungen"
-
-#: mod/admin.php:853
-msgid "Version"
-msgstr "Version"
-
-#: mod/admin.php:858
-msgid "Active addons"
-msgstr "Aktivierte Addons"
-
-#: mod/admin.php:889
-msgid "Can not parse base url. Must have at least <scheme>://<domain>"
-msgstr "Die Basis-URL konnte nicht analysiert werden. Sie muss mindestens aus <protokoll>://<domain> bestehen"
-
-#: mod/admin.php:1219
-msgid "Site settings updated."
-msgstr "Seiteneinstellungen aktualisiert."
-
-#: mod/admin.php:1246 mod/settings.php:897
-msgid "No special theme for mobile devices"
-msgstr "Kein spezielles Theme für mobile Geräte verwenden."
-
-#: mod/admin.php:1275
-msgid "No community page for local users"
-msgstr "Keine Gemeinschaftsseite für lokale Nutzer"
-
-#: mod/admin.php:1276
-msgid "No community page"
-msgstr "Keine Gemeinschaftsseite"
-
-#: mod/admin.php:1277
-msgid "Public postings from users of this site"
-msgstr "Öffentliche Beiträge von NutzerInnen dieser Seite"
-
-#: mod/admin.php:1278
-msgid "Public postings from the federated network"
-msgstr "Öffentliche Beiträge aus dem föderalen Netzwerk"
-
-#: mod/admin.php:1279
-msgid "Public postings from local users and the federated network"
-msgstr "Öffentliche Beiträge von lokalen Nutzern und aus dem föderalen Netzwerk"
-
-#: mod/admin.php:1285
-msgid "Users, Global Contacts"
-msgstr "Nutzer, globale Kontakte"
-
-#: mod/admin.php:1286
-msgid "Users, Global Contacts/fallback"
-msgstr "Nutzer, globale Kontakte / Fallback"
-
-#: mod/admin.php:1290
-msgid "One month"
-msgstr "ein Monat"
-
-#: mod/admin.php:1291
-msgid "Three months"
-msgstr "drei Monate"
-
-#: mod/admin.php:1292
-msgid "Half a year"
-msgstr "ein halbes Jahr"
-
-#: mod/admin.php:1293
-msgid "One year"
-msgstr "ein Jahr"
-
-#: mod/admin.php:1298
-msgid "Multi user instance"
-msgstr "Mehrbenutzer Instanz"
-
-#: mod/admin.php:1321
-msgid "Closed"
-msgstr "Geschlossen"
-
-#: mod/admin.php:1322
-msgid "Requires approval"
-msgstr "Bedarf der Zustimmung"
-
-#: mod/admin.php:1323
-msgid "Open"
-msgstr "Offen"
-
-#: mod/admin.php:1327
-msgid "No SSL policy, links will track page SSL state"
-msgstr "Keine SSL Richtlinie, Links werden das verwendete Protokoll beibehalten"
-
-#: mod/admin.php:1328
-msgid "Force all links to use SSL"
-msgstr "SSL für alle Links erzwingen"
-
-#: mod/admin.php:1329
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
-msgstr "Selbst-unterzeichnetes Zertifikat, SSL nur für lokale Links verwenden (nicht empfohlen)"
-
-#: mod/admin.php:1333
-msgid "Don't check"
-msgstr "Nicht überprüfen"
-
-#: mod/admin.php:1334
-msgid "check the stable version"
-msgstr "überprüfe die stabile Version"
-
-#: mod/admin.php:1335
-msgid "check the development version"
-msgstr "überprüfe die Entwicklungsversion"
-
-#: mod/admin.php:1354
-msgid "Republish users to directory"
-msgstr "Nutzer erneut im globalen Verzeichnis veröffentlichen."
-
-#: mod/admin.php:1355 mod/register.php:267
-msgid "Registration"
-msgstr "Registrierung"
-
-#: mod/admin.php:1356
-msgid "File upload"
-msgstr "Datei hochladen"
-
-#: mod/admin.php:1357
-msgid "Policies"
-msgstr "Regeln"
-
-#: mod/admin.php:1359
-msgid "Auto Discovered Contact Directory"
-msgstr "Automatisch ein Kontaktverzeichnis erstellen"
-
-#: mod/admin.php:1360
-msgid "Performance"
-msgstr "Performance"
-
-#: mod/admin.php:1361
-msgid "Worker"
-msgstr "Worker"
-
-#: mod/admin.php:1362
-msgid "Message Relay"
-msgstr "Nachrichten Relais"
-
-#: mod/admin.php:1363
-msgid ""
-"Relocate - WARNING: advanced function. Could make this server unreachable."
-msgstr "Umsiedeln - WARNUNG: Könnte diesen Server unerreichbar machen."
-
-#: mod/admin.php:1366
-msgid "Site name"
-msgstr "Seitenname"
-
-#: mod/admin.php:1367
-msgid "Host name"
-msgstr "Host Name"
-
-#: mod/admin.php:1368
-msgid "Sender Email"
-msgstr "Absender für Emails"
-
-#: mod/admin.php:1368
-msgid ""
-"The email address your server shall use to send notification emails from."
-msgstr "Die E-Mail Adresse die dein Server zum Versenden von Benachrichtigungen verwenden soll."
-
-#: mod/admin.php:1369
-msgid "Banner/Logo"
-msgstr "Banner/Logo"
-
-#: mod/admin.php:1370
-msgid "Shortcut icon"
-msgstr "Shortcut Icon"
-
-#: mod/admin.php:1370
-msgid "Link to an icon that will be used for browsers."
-msgstr "Link zu einem Icon, das Browser verwenden werden."
-
-#: mod/admin.php:1371
-msgid "Touch icon"
-msgstr "Touch Icon"
-
-#: mod/admin.php:1371
-msgid "Link to an icon that will be used for tablets and mobiles."
-msgstr "Link zu einem Icon das Tablets und Handies verwenden sollen."
-
-#: mod/admin.php:1372
-msgid "Additional Info"
-msgstr "Zusätzliche Informationen"
-
-#: mod/admin.php:1372
-#, php-format
-msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at %s/servers."
-msgstr "Für öffentliche Server kannst Du hier zusätzliche Informationen angeben, die dann auf %s/servers angezeigt werden."
-
-#: mod/admin.php:1373
-msgid "System language"
-msgstr "Systemsprache"
-
-#: mod/admin.php:1374
-msgid "System theme"
-msgstr "Systemweites Theme"
-
-#: mod/admin.php:1374
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
-msgstr "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>"
-
-#: mod/admin.php:1375
-msgid "Mobile system theme"
-msgstr "Systemweites mobiles Theme"
-
-#: mod/admin.php:1375
-msgid "Theme for mobile devices"
-msgstr "Thema für mobile Geräte"
-
-#: mod/admin.php:1376
-msgid "SSL link policy"
-msgstr "Regeln für SSL Links"
-
-#: mod/admin.php:1376
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr "Bestimmt, ob generierte Links SSL verwenden müssen"
-
-#: mod/admin.php:1377
-msgid "Force SSL"
-msgstr "Erzwinge SSL"
-
-#: mod/admin.php:1377
-msgid ""
-"Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
-" to endless loops."
-msgstr "Erzinge alle Nicht-SSL Anfragen auf SSL - Achtung: auf manchen Systemen verursacht dies eine Endlosschleife."
-
-#: mod/admin.php:1378
-msgid "Hide help entry from navigation menu"
-msgstr "Verberge den Menüeintrag für die Hilfe im Navigationsmenü"
-
-#: mod/admin.php:1378
-msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
-msgstr "Verbirgt den Menüeintrag für die Hilfe-Seiten im Navigationsmenü. Die Seiten können weiterhin über /help aufgerufen werden."
-
-#: mod/admin.php:1379
-msgid "Single user instance"
-msgstr "Ein-Nutzer Instanz"
-
-#: mod/admin.php:1379
-msgid "Make this instance multi-user or single-user for the named user"
-msgstr "Regelt ob es sich bei dieser Instanz um eine ein Personen Installation oder eine Installation mit mehr als einem Nutzer handelt."
-
-#: mod/admin.php:1380
-msgid "Maximum image size"
-msgstr "Maximale Bildgröße"
-
-#: mod/admin.php:1380
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
-msgstr "Maximale Uploadgröße von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."
-
-#: mod/admin.php:1381
-msgid "Maximum image length"
-msgstr "Maximale Bildlänge"
-
-#: mod/admin.php:1381
-msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
-msgstr "Maximale Länge in Pixeln der längsten Seite eines hoch geladenen Bildes. Grundeinstellung ist -1 was keine Einschränkung bedeutet."
-
-#: mod/admin.php:1382
-msgid "JPEG image quality"
-msgstr "Qualität des JPEG Bildes"
-
-#: mod/admin.php:1382
-msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
-msgstr "Hoch geladene JPEG Bilder werden mit dieser Qualität [0-100] gespeichert. Grundeinstellung ist 100, kein Qualitätsverlust."
-
-#: mod/admin.php:1384
-msgid "Register policy"
-msgstr "Registrierungsmethode"
-
-#: mod/admin.php:1385
-msgid "Maximum Daily Registrations"
-msgstr "Maximum täglicher Registrierungen"
-
-#: mod/admin.php:1385
-msgid ""
-"If registration is permitted above, this sets the maximum number of new user"
-" registrations to accept per day.  If register is set to closed, this "
-"setting has no effect."
-msgstr "Wenn die Registrierung weiter oben erlaubt ist, regelt dies die maximale Anzahl von Neuanmeldungen pro Tag. Wenn die Registrierung geschlossen ist, hat diese Einstellung keinen Effekt."
-
-#: mod/admin.php:1386
-msgid "Register text"
-msgstr "Registrierungstext"
-
-#: mod/admin.php:1386
-msgid ""
-"Will be displayed prominently on the registration page. You can use BBCode "
-"here."
-msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt. BBCode kann verwendet werden."
-
-#: mod/admin.php:1387
-msgid "Accounts abandoned after x days"
-msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt"
-
-#: mod/admin.php:1387
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
-msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit."
-
-#: mod/admin.php:1388
-msgid "Allowed friend domains"
-msgstr "Erlaubte Domains für Kontakte"
-
-#: mod/admin.php:1388
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr "Liste der Domains, die für Kontakte erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
-
-#: mod/admin.php:1389
-msgid "Allowed email domains"
-msgstr "Erlaubte Domains für E-Mails"
-
-#: mod/admin.php:1389
-msgid ""
-"Comma separated list of domains which are allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains"
-msgstr "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."
-
-#: mod/admin.php:1390
-msgid "No OEmbed rich content"
-msgstr "OEmbed nicht verwenden"
-
-#: mod/admin.php:1390
-msgid ""
-"Don't show the rich content (e.g. embedded PDF), except from the domains "
-"listed below."
-msgstr "Verhindert das Einbetten von reichhaltigen Inhalten (z.B. eingebettete PDF Dateien). Ausgenommen von dieser Regel werden Domänen die unten aufgeführt werden."
-
-#: mod/admin.php:1391
-msgid "Allowed OEmbed domains"
-msgstr "Erlaubte OEmbed Domänen"
-
-#: mod/admin.php:1391
-msgid ""
-"Comma separated list of domains which oembed content is allowed to be "
-"displayed. Wildcards are accepted."
-msgstr "Komma separierte Liste von Domänen für die das einbetten reichhaltiger Inhalte erlaubt sind. Platzhalter können verwendet werden."
-
-#: mod/admin.php:1392
-msgid "Block public"
-msgstr "Öffentlichen Zugriff blockieren"
-
-#: mod/admin.php:1392
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
-msgstr "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist."
-
-#: mod/admin.php:1393
-msgid "Force publish"
-msgstr "Erzwinge Veröffentlichung"
-
-#: mod/admin.php:1393
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
-msgstr "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen."
-
-#: mod/admin.php:1393
-msgid "Enabling this may violate privacy laws like the GDPR"
-msgstr "Wenn du diese Option aktivierst, verstößt das unter Umständen gegen Gesetze wie die EU-DSGVO."
-
-#: mod/admin.php:1394
-msgid "Global directory URL"
-msgstr "URL des weltweiten Verzeichnisses"
-
-#: mod/admin.php:1394
-msgid ""
-"URL to the global directory. If this is not set, the global directory is "
-"completely unavailable to the application."
-msgstr "URL des weltweiten Verzeichnisses. Wenn diese nicht gesetzt ist, ist das Verzeichnis für die Applikation nicht erreichbar."
-
-#: mod/admin.php:1395
-msgid "Private posts by default for new users"
-msgstr "Private Beiträge als Standard für neue Nutzer"
-
-#: mod/admin.php:1395
-msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
-msgstr "Die Standard-Zugriffsrechte für neue Nutzer werden so gesetzt, dass als Voreinstellung in die private Gruppe gepostet wird anstelle von öffentlichen Beiträgen."
-
-#: mod/admin.php:1396
-msgid "Don't include post content in email notifications"
-msgstr "Inhalte von Beiträgen nicht in E-Mail-Benachrichtigungen versenden"
-
-#: mod/admin.php:1396
-msgid ""
-"Don't include the content of a post/comment/private message/etc. in the "
-"email notifications that are sent out from this site, as a privacy measure."
-msgstr "Inhalte von Beiträgen/Kommentaren/privaten Nachrichten/usw., zum Datenschutz nicht in E-Mail-Benachrichtigungen einbinden."
-
-#: mod/admin.php:1397
-msgid "Disallow public access to addons listed in the apps menu."
-msgstr "Öffentlichen Zugriff auf Addons im Apps Menü verbieten."
-
-#: mod/admin.php:1397
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
-msgstr "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt."
-
-#: mod/admin.php:1398
-msgid "Don't embed private images in posts"
-msgstr "Private Bilder nicht in Beiträgen einbetten."
-
-#: mod/admin.php:1398
-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 "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert."
-
-#: mod/admin.php:1399
-msgid "Allow Users to set remote_self"
-msgstr "Nutzern erlauben das remote_self Flag zu setzen"
-
-#: mod/admin.php:1399
-msgid ""
-"With checking this, every user is allowed to mark every contact as a "
-"remote_self in the repair contact dialog. Setting this flag on a contact "
-"causes mirroring every posting of that contact in the users stream."
-msgstr "Ist dies ausgewählt kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im Kontakt reparieren Dialog markieren. Nach dem setzten dieses Flags werden alle Top-Level Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet."
-
-#: mod/admin.php:1400
-msgid "Block multiple registrations"
-msgstr "Unterbinde Mehrfachregistrierung"
-
-#: mod/admin.php:1400
-msgid "Disallow users to register additional accounts for use as pages."
-msgstr "Benutzern nicht erlauben, weitere Konten für Organisationsseiten o.ä. mit der gleichen E-Mail Adresse anzulegen, um diese als ."
-
-#: mod/admin.php:1401
-msgid "OpenID support"
-msgstr "OpenID Unterstützung"
-
-#: mod/admin.php:1401
-msgid "OpenID support for registration and logins."
-msgstr "OpenID-Unterstützung für Registrierung und Login."
-
-#: mod/admin.php:1402
-msgid "Fullname check"
-msgstr "Namen auf Vollständigkeit überprüfen"
-
-#: mod/admin.php:1402
-msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
-msgstr "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden."
-
-#: mod/admin.php:1403
-msgid "Community pages for visitors"
-msgstr "Für Besucher verfügbare Gemeinschaftsseite"
-
-#: mod/admin.php:1403
-msgid ""
-"Which community pages should be available for visitors. Local users always "
-"see both pages."
-msgstr "Welche Gemeinschaftsseiten sollen für Besucher dieses Knotens verfügbar sein? Lokale Nutzer können grundsätzlich beide Gemeinschaftsseiten verwenden."
-
-#: mod/admin.php:1404
-msgid "Posts per user on community page"
-msgstr "Anzahl der Beiträge pro Benutzer auf der Gemeinschaftsseite"
-
-#: mod/admin.php:1404
-msgid ""
-"The maximum number of posts per user on the community page. (Not valid for "
-"'Global Community')"
-msgstr "Die Anzahl der Beiträge die von jedem Nutzer maximal auf der Gemeinschaftsseite angezeigt werden sollen. Dieser Parameter wird nicht für die Globale Gemeinschaftsseite genutzt."
-
-#: mod/admin.php:1405
-msgid "Enable OStatus support"
-msgstr "OStatus Unterstützung aktivieren"
-
-#: mod/admin.php:1405
-msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
-msgstr "Biete die eingebaute OStatus (iStatusNet, GNU Social, etc.) Unterstützung an. Jede Kommunikation in OStatus ist öffentlich, Privatsphäre Warnungen werden nur bei Bedarf angezeigt."
-
-#: mod/admin.php:1406
-msgid "Only import OStatus threads from our contacts"
-msgstr "Nur OStatus Konversationen unserer Kontakte importieren"
-
-#: mod/admin.php:1406
-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 "Normalerweise werden alle Inhalte von OStatus Kontakten importiert. Mit dieser Option werden nur solche Konversationen gespeichert, die von Kontakten der Nutzer dieses Knotens gestartet wurden."
-
-#: mod/admin.php:1407
-msgid "OStatus support can only be enabled if threading is enabled."
-msgstr "OStatus Unterstützung kann nur aktiviert werden wenn \"Threading\" aktiviert ist. "
-
-#: mod/admin.php:1409
-msgid ""
-"Diaspora support can't be enabled because Friendica was installed into a sub"
-" directory."
-msgstr "Diaspora Unterstützung kann nicht aktiviert werden da Friendica in ein Unterverzeichnis installiert ist."
-
-#: mod/admin.php:1410
-msgid "Enable Diaspora support"
-msgstr "Diaspora Unterstützung aktivieren"
-
-#: mod/admin.php:1410
-msgid "Provide built-in Diaspora network compatibility."
-msgstr "Verwende die eingebaute Diaspora-Verknüpfung."
-
-#: mod/admin.php:1411
-msgid "Only allow Friendica contacts"
-msgstr "Nur Friendica-Kontakte erlauben"
-
-#: mod/admin.php:1411
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
-msgstr "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert."
-
-#: mod/admin.php:1412
-msgid "Verify SSL"
-msgstr "SSL Überprüfen"
-
-#: mod/admin.php:1412
-msgid ""
-"If you wish, you can turn on strict certificate checking. This will mean you"
-" cannot connect (at all) to self-signed SSL sites."
-msgstr "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann."
-
-#: mod/admin.php:1413
-msgid "Proxy user"
-msgstr "Proxy Nutzer"
-
-#: mod/admin.php:1414
-msgid "Proxy URL"
-msgstr "Proxy URL"
-
-#: mod/admin.php:1415
-msgid "Network timeout"
-msgstr "Netzwerk Wartezeit"
-
-#: mod/admin.php:1415
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
-msgstr "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."
-
-#: mod/admin.php:1416
-msgid "Maximum Load Average"
-msgstr "Maximum Load Average"
-
-#: mod/admin.php:1416
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
-msgstr "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50"
-
-#: mod/admin.php:1417
-msgid "Maximum Load Average (Frontend)"
-msgstr "Maximum Load Average (Frontend)"
-
-#: mod/admin.php:1417
-msgid "Maximum system load before the frontend quits service - default 50."
-msgstr "Maximale Systemlast bevor Vordergrundprozesse pausiert werden - Standard 50."
-
-#: mod/admin.php:1418
-msgid "Minimal Memory"
-msgstr "Minimaler Speicher"
-
-#: mod/admin.php:1418
-msgid ""
-"Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
-"default 0 (deactivated)."
-msgstr "Minimal freier Speicher in MB für den Worker Prozess. Benötigt Zugriff auf /proc/meminfo - Standardwert ist 0 (deaktiviert)"
-
-#: mod/admin.php:1419
-msgid "Maximum table size for optimization"
-msgstr "Maximale Tabellengröße zur Optimierung"
-
-#: mod/admin.php:1419
-msgid ""
-"Maximum table size (in MB) for the automatic optimization. Enter -1 to "
-"disable it."
-msgstr "Maximale Tabellengröße (in MB) für die automatische Optimierung - Gib -1 für Deaktivierung ein."
-
-#: mod/admin.php:1420
-msgid "Minimum level of fragmentation"
-msgstr "Minimaler Fragmentationsgrad"
-
-#: mod/admin.php:1420
-msgid ""
-"Minimum fragmenation level to start the automatic optimization - default "
-"value is 30%."
-msgstr "Minimales Fragmentationsgrad von Datenbanktabellen um die automatische Optimierung einzuleiten - Standardwert ist 30%"
-
-#: mod/admin.php:1422
-msgid "Periodical check of global contacts"
-msgstr "Regelmäßig globale Kontakte überprüfen"
-
-#: mod/admin.php:1422
-msgid ""
-"If enabled, the global contacts are checked periodically for missing or "
-"outdated data and the vitality of the contacts and servers."
-msgstr "Wenn diese Option aktiviert ist, werden die globalen Kontakte regelmäßig auf fehlende oder veraltete Daten sowie auf Erreichbarkeit des Kontakts und des Servers überprüft."
-
-#: mod/admin.php:1423
-msgid "Days between requery"
-msgstr "Tage zwischen erneuten Abfragen"
-
-#: mod/admin.php:1423
-msgid "Number of days after which a server is requeried for his contacts."
-msgstr "Legt das Abfrageintervall fest, nachdem ein Server erneut nach Kontakten abgefragt werden soll."
-
-#: mod/admin.php:1424
-msgid "Discover contacts from other servers"
-msgstr "Neue Kontakte auf anderen Servern entdecken"
-
-#: mod/admin.php:1424
-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 "Regelmäßig andere Server nach potentiellen Kontakten absuchen. Du kannst zwischen 'Nutzern', den tatsächlichen Nutzern des anderen Systems und 'globalen Kontakten', aktiven Kontakten die auf dem System bekannt sind, wählen. Der Fallback-Mechanismus ist für ältere Friendica und Redmatrix Server gedacht, bei denen globale Kontakte noch nicht verfügbar sind. Durch den Fallbackmodus entsteht auf deinem Server eine wesentlich höhere Last, empfohlen wird der Modus 'Nutzer, globale Kontakte'."
-
-#: mod/admin.php:1425
-msgid "Timeframe for fetching global contacts"
-msgstr "Zeitfenster für globale Kontakte"
-
-#: mod/admin.php:1425
-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 "Wenn die Entdeckung neuer Kontakte aktiv ist, definiert dieses Zeitfenster den Zeitraum in dem globale Kontakte als aktiv gelten und von anderen Servern importiert werden."
-
-#: mod/admin.php:1426
-msgid "Search the local directory"
-msgstr "Lokales Verzeichnis durchsuchen"
-
-#: mod/admin.php:1426
-msgid ""
-"Search the local directory instead of the global directory. When searching "
-"locally, every search will be executed on the global directory in the "
-"background. This improves the search results when the search is repeated."
-msgstr "Suche im lokalen Verzeichnis anstelle des globalen Verzeichnisses durchführen. Jede Suche wird im Hintergrund auch im globalen Verzeichnis durchgeführt um die Suchresultate zu verbessern, wenn diese Suche wiederholt wird."
-
-#: mod/admin.php:1428
-msgid "Publish server information"
-msgstr "Server Informationen veröffentlichen"
-
-#: mod/admin.php:1428
-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 "Wenn aktiviert, werden allgemeine Informationen über den Server und Nutzungsdaten veröffentlicht. Die Daten beinhalten den Namen sowie die Version des Servers, die Anzahl der Personen mit öffentlichen Profilen, die Anzahl der Beiträge sowie aktivierte Protokolle und Connectoren. Für Details bitte <a href='http://the-federation.info/'>the-federation.info</a> aufrufen."
-
-#: mod/admin.php:1430
-msgid "Check upstream version"
-msgstr "Suche nach Updates"
-
-#: mod/admin.php:1430
-msgid ""
-"Enables checking for new Friendica versions at github. If there is a new "
-"version, you will be informed in the admin panel overview."
-msgstr "Wenn diese Option aktiviert ist wird regelmäßig nach neuen Friendica Versionen auf github überprüft. Wenn es eine neue Version gibt, wird dies auf der Übersichtsseite im Admin-Panel angezeigt."
-
-#: mod/admin.php:1431
-msgid "Suppress Tags"
-msgstr "Tags Unterdrücken"
-
-#: mod/admin.php:1431
-msgid "Suppress showing a list of hashtags at the end of the posting."
-msgstr "Unterdrückt die Anzeige von Tags am Ende eines Beitrags."
-
-#: mod/admin.php:1432
-msgid "Clean database"
-msgstr "Datenbank aufräumen"
-
-#: mod/admin.php:1432
-msgid ""
-"Remove old remote items, orphaned database records and old content from some"
-" other helper tables."
-msgstr "Entferne alte Beiträge von anderen Knoten, verwaiste Einträge und alten Inhalt einiger Hilfstabellen."
-
-#: mod/admin.php:1433
-msgid "Lifespan of remote items"
-msgstr "Lebensdauer von Beiträgen anderer Knoten"
-
-#: mod/admin.php:1433
-msgid ""
-"When the database cleanup is enabled, this defines the days after which "
-"remote items will be deleted. Own items, and marked or filed items are "
-"always kept. 0 disables this behaviour."
-msgstr "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl in Tagen nach der Beiträge die auf anderen Knoten des Netzwerks verfasst wurden, gelöscht werden sollen. Eigene Beiträge sowie markierte oder abgespeicherte Beiträge werden nicht gelöscht. Ein Wert von 0 deaktiviert das automatische löschen von Beiträgen."
-
-#: mod/admin.php:1434
-msgid "Lifespan of unclaimed items"
-msgstr "Lebensdauer nicht angeforderter Beiträge"
-
-#: mod/admin.php:1434
-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 "Wenn das Aufräumen der Datenbank aktiviert ist, definiert dies die Anzahl von Tagen nach denen nicht angeforderte Beiträge (hauptsächlich sole die über das Relais eintreffen) gelöscht werden. Der Standardwert beträgt 90 Tage. Wird dieser Wert auf 0 gesetzt, wird die Lebenszeit von Beiträgen anderer Knoten verwendet."
-
-#: mod/admin.php:1435
-msgid "Path to item cache"
-msgstr "Pfad zum Eintrag Cache"
-
-#: mod/admin.php:1435
-msgid "The item caches buffers generated bbcode and external images."
-msgstr "Im Item-Cache werden externe Bilder und geparster BBCode zwischen gespeichert."
-
-#: mod/admin.php:1436
-msgid "Cache duration in seconds"
-msgstr "Cache-Dauer in Sekunden"
-
-#: mod/admin.php:1436
-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 "Wie lange sollen die gecachedten Dateien vorgehalten werden? Grundeinstellung sind 86400 Sekunden (ein Tag). Um den Item Cache zu deaktivieren, setze diesen Wert auf -1."
-
-#: mod/admin.php:1437
-msgid "Maximum numbers of comments per post"
-msgstr "Maximale Anzahl von Kommentaren pro Beitrag"
-
-#: mod/admin.php:1437
-msgid "How much comments should be shown for each post? Default value is 100."
-msgstr "Wie viele Kommentare sollen pro Beitrag angezeigt werden? Standardwert sind 100."
-
-#: mod/admin.php:1438
-msgid "Temp path"
-msgstr "Temp Pfad"
-
-#: mod/admin.php:1438
-msgid ""
-"If you have a restricted system where the webserver can't access the system "
-"temp path, enter another path here."
-msgstr "Solltest du ein eingeschränktes System haben, auf dem der Webserver nicht auf das temp Verzeichnis des Systems zugreifen kann, setze hier einen anderen Pfad."
-
-#: mod/admin.php:1439
-msgid "Base path to installation"
-msgstr "Basis-Pfad zur Installation"
-
-#: mod/admin.php:1439
-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 "Falls das System nicht den korrekten Pfad zu deiner Installation gefunden hat, gib den richtigen Pfad bitte hier ein. Du solltest hier den Pfad nur auf einem eingeschränkten System angeben müssen, bei dem du mit symbolischen Links auf dein Webverzeichnis verweist."
-
-#: mod/admin.php:1440
-msgid "Disable picture proxy"
-msgstr "Bilder Proxy deaktivieren"
-
-#: mod/admin.php:1440
-msgid ""
-"The picture proxy increases performance and privacy. It shouldn't be used on"
-" systems with very low bandwith."
-msgstr "Der Proxy für Bilder verbessert die Leistung und Privatsphäre der Nutzer. Er sollte nicht auf Systemen verwendet werden, die nur über begrenzte Bandbreite verfügen."
-
-#: mod/admin.php:1441
-msgid "Only search in tags"
-msgstr "Nur in Tags suchen"
-
-#: mod/admin.php:1441
-msgid "On large systems the text search can slow down the system extremely."
-msgstr "Auf großen Knoten kann die Volltext-Suche das System ausbremsen."
-
-#: mod/admin.php:1443
-msgid "New base url"
-msgstr "Neue Basis-URL"
-
-#: mod/admin.php:1443
-msgid ""
-"Change base url for this server. Sends relocate message to all Friendica and"
-" Diaspora* contacts of all users."
-msgstr "Ändert die Basis-URL dieses Servers und sendet eine Umzugsmitteilung an alle Friendica und Diaspora* Kontakte deiner NutzerInnen."
-
-#: mod/admin.php:1445
-msgid "RINO Encryption"
-msgstr "RINO Verschlüsselung"
-
-#: mod/admin.php:1445
-msgid "Encryption layer between nodes."
-msgstr "Verschlüsselung zwischen Friendica Instanzen"
-
-#: mod/admin.php:1445
-msgid "Enabled"
-msgstr "Aktiv"
-
-#: mod/admin.php:1447
-msgid "Maximum number of parallel workers"
-msgstr "Maximale Anzahl parallel laufender Worker"
-
-#: mod/admin.php:1447
-msgid ""
-"On shared hosters set this to 2. On larger systems, values of 10 are great. "
-"Default value is 4."
-msgstr "Wenn dein Knoten bei einem Shared Hoster ist, setzte diesen Wert auf 2. Auf größeren Systemen funktioniert ein Wert von 10 recht gut. Standardeinstellung sind 4."
-
-#: mod/admin.php:1448
-msgid "Don't use 'proc_open' with the worker"
-msgstr "'proc_open' nicht mit den Workern verwenden"
-
-#: mod/admin.php:1448
-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 "Aktiviere diese Option, wenn dein System die Verwendung von 'proc_open' verhindert. Dies könnte auf Shared Hostern der Fall sein. Wenn du diese Option aktivierst, solltest du die Frequenz der poller Aufrufe in deiner crontab erhöhen."
-
-#: mod/admin.php:1449
-msgid "Enable fastlane"
-msgstr "Aktiviere Fastlane"
-
-#: mod/admin.php:1449
-msgid ""
-"When enabed, the fastlane mechanism starts an additional worker if processes"
-" with higher priority are blocked by processes of lower priority."
-msgstr "Wenn aktiviert, wird der Fastlane-Mechanismus einen weiteren Worker-Prozeß starten wenn Prozesse mit höherer Priorität von Prozessen mit niedrigerer Priorität blockiert werden."
-
-#: mod/admin.php:1450
-msgid "Enable frontend worker"
-msgstr "Aktiviere den Frontend Worker"
-
-#: mod/admin.php:1450
-#, 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 "Ist diese Option aktiv, wird der Worker Prozess durch Aktionen am Frontend gestartet (z.B. wenn Nachrichten zugestellt werden). Auf kleineren Seiten sollte %s/worker regelmäßig, beispielsweise durch einen externen Cron Anbieter, aufgerufen werden. Du solltest dies Option nur dann aktivieren, wenn du keinen Cron Job auf deinem eigenen Server starten kannst."
-
-#: mod/admin.php:1452
-msgid "Subscribe to relay"
-msgstr "Relais abonnieren"
-
-#: mod/admin.php:1452
-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 "Aktiviert den Empfang von öffentlichen Beiträgen vom Relais-Server. Diese Beiträge werden in der Suche, den abonnierten Hashtags sowie der globalen Gemeinschaftsseite verfügbar sein."
-
-#: mod/admin.php:1453
-msgid "Relay server"
-msgstr "Relais Server"
-
-#: mod/admin.php:1453
-msgid ""
-"Address of the relay server where public posts should be send to. For "
-"example https://relay.diasp.org"
-msgstr "Adresse des Relais Servers an den die öffentlichen Beiträge gesendet werden sollen. Zum Beispiel https://relay.diasp.org"
-
-#: mod/admin.php:1454
-msgid "Direct relay transfer"
-msgstr "Direkte Relais Übertragung"
-
-#: mod/admin.php:1454
-msgid ""
-"Enables the direct transfer to other servers without using the relay servers"
-msgstr "Aktiviert das direkte Verteilen an andere Server, ohne dass ein Relais Server verwendet wird."
-
-#: mod/admin.php:1455
-msgid "Relay scope"
-msgstr "Geltungsbereich des Relais"
-
-#: mod/admin.php:1455
-msgid ""
-"Can be 'all' or 'tags'. 'all' means that every public post should be "
-"received. 'tags' means that only posts with selected tags should be "
-"received."
-msgstr "Der Wert kann entweder 'Alle' oder 'Schlagwörter' sein. 'Alle' bedeutet, dass alle öffentliche Beiträge empfangen werden sollen. 'Schlagwörter' schränkt dem Empfang auf Beiträge ein, die bestimmte Schlagwörter beinhalten."
-
-#: mod/admin.php:1455
-msgid "all"
-msgstr "Alle"
-
-#: mod/admin.php:1455
-msgid "tags"
-msgstr "Schlagwörter"
-
-#: mod/admin.php:1456
-msgid "Server tags"
-msgstr "Server Schlagworte"
-
-#: mod/admin.php:1456
-msgid "Comma separated list of tags for the 'tags' subscription."
-msgstr "Liste von Schlagworten die abonniert werden sollen, mit Komma getrennt."
-
-#: mod/admin.php:1457
-msgid "Allow user tags"
-msgstr "Verwende Schlagworte der Nutzer"
-
-#: mod/admin.php:1457
-msgid ""
-"If enabled, the tags from the saved searches will used for the 'tags' "
-"subscription in addition to the 'relay_server_tags'."
-msgstr "Ist dies aktiviert, werden die Schlagwörter der gespeicherten Suchen zusätzlich zu den oben  definierten Server Schlagworte abonniert."
-
-#: mod/admin.php:1485
-msgid "Update has been marked successful"
-msgstr "Update wurde als erfolgreich markiert"
-
-#: mod/admin.php:1492
-#, php-format
-msgid "Database structure update %s was successfully applied."
-msgstr "Das Update %s der Struktur der Datenbank wurde erfolgreich angewandt."
-
-#: mod/admin.php:1495
-#, php-format
-msgid "Executing of database structure update %s failed with error: %s"
-msgstr "Das Update %s der Struktur der Datenbank schlug mit folgender Fehlermeldung fehl: %s"
-
-#: mod/admin.php:1508
-#, php-format
-msgid "Executing %s failed with error: %s"
-msgstr "Die Ausführung von %s schlug fehl. Fehlermeldung: %s"
-
-#: mod/admin.php:1510
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr "Update %s war erfolgreich."
-
-#: mod/admin.php:1513
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
-msgstr "Update %s hat keinen Status zurückgegeben. Unbekannter Status."
-
-#: mod/admin.php:1516
-#, php-format
-msgid "There was no additional update function %s that needed to be called."
-msgstr "Es gab keine weitere Update-Funktion, die von %s ausgeführt werden musste."
-
-#: mod/admin.php:1536
-msgid "No failed updates."
-msgstr "Keine fehlgeschlagenen Updates."
-
-#: mod/admin.php:1537
-msgid "Check database structure"
-msgstr "Datenbank Struktur überprüfen"
-
-#: mod/admin.php:1542
-msgid "Failed Updates"
-msgstr "Fehlgeschlagene Updates"
-
-#: mod/admin.php:1543
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
-msgstr "Ohne Updates vor 1139, da diese keinen Status zurückgegeben haben."
-
-#: mod/admin.php:1544
-msgid "Mark success (if update was manually applied)"
-msgstr "Als erfolgreich markieren (falls das Update manuell installiert wurde)"
-
-#: mod/admin.php:1545
-msgid "Attempt to execute this update step automatically"
-msgstr "Versuchen, diesen Schritt automatisch auszuführen"
-
-#: mod/admin.php:1584
-#, 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 "\nHallo %1$s,\n\nauf %2$s wurde ein Account für Dich angelegt."
-
-#: mod/admin.php:1587
-#, 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 "\nNachfolgend die Anmelde-Details:\n\tAdresse der Seite:\t%1$s\n\tBenutzername:\t%2$s\n\tPasswort:\t%3$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %1$s/removeme  jederzeit tun.\n\nNun viel Spaß, gute Begegnungen und willkommen auf %4$s."
-
-#: mod/admin.php:1621 src/Model/User.php:663
-#, php-format
-msgid "Registration details for %s"
-msgstr "Details der Registration von %s"
-
-#: mod/admin.php:1631
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] "%s Benutzer geblockt/freigegeben"
-msgstr[1] "%s Benutzer geblockt/freigegeben"
-
-#: mod/admin.php:1637
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s Nutzer gelöscht"
-msgstr[1] "%s Nutzer gelöscht"
-
-#: mod/admin.php:1684
-#, php-format
-msgid "User '%s' deleted"
-msgstr "Nutzer '%s' gelöscht"
-
-#: mod/admin.php:1692
-#, php-format
-msgid "User '%s' unblocked"
-msgstr "Nutzer '%s' entsperrt"
-
-#: mod/admin.php:1692
-#, php-format
-msgid "User '%s' blocked"
-msgstr "Nutzer '%s' gesperrt"
-
-#: mod/admin.php:1749 mod/settings.php:1058
-msgid "Normal Account Page"
-msgstr "Normales Konto"
-
-#: mod/admin.php:1750 mod/settings.php:1062
-msgid "Soapbox Page"
-msgstr "Marktschreier-Konto"
-
-#: mod/admin.php:1751 mod/settings.php:1066
-msgid "Public Forum"
-msgstr "Öffentliches Forum"
-
-#: mod/admin.php:1752 mod/settings.php:1070
-msgid "Automatic Friend Page"
-msgstr "Automatische Freunde Seite"
-
-#: mod/admin.php:1753
-msgid "Private Forum"
-msgstr "Privates Forum"
-
-#: mod/admin.php:1756 mod/settings.php:1042
-msgid "Personal Page"
-msgstr "Persönliche Seite"
-
-#: mod/admin.php:1757 mod/settings.php:1046
-msgid "Organisation Page"
-msgstr "Organisationsseite"
-
-#: mod/admin.php:1758 mod/settings.php:1050
-msgid "News Page"
-msgstr "Nachrichtenseite"
-
-#: mod/admin.php:1759 mod/settings.php:1054
-msgid "Community Forum"
-msgstr "Gemeinschaftsforum"
-
-#: mod/admin.php:1806 mod/admin.php:1817 mod/admin.php:1830 mod/admin.php:1848
-#: src/Content/ContactSelector.php:82
-msgid "Email"
-msgstr "E-Mail"
-
-#: mod/admin.php:1806 mod/admin.php:1830
-msgid "Register date"
-msgstr "Anmeldedatum"
-
-#: mod/admin.php:1806 mod/admin.php:1830
-msgid "Last login"
-msgstr "Letzte Anmeldung"
-
-#: mod/admin.php:1806 mod/admin.php:1830
-msgid "Last item"
-msgstr "Letzter Beitrag"
-
-#: mod/admin.php:1806
-msgid "Type"
-msgstr "Typ"
-
-#: mod/admin.php:1813
-msgid "Add User"
-msgstr "Nutzer hinzufügen"
-
-#: mod/admin.php:1815
-msgid "User registrations waiting for confirm"
-msgstr "Neuanmeldungen, die auf Deine Bestätigung warten"
-
-#: mod/admin.php:1816
-msgid "User waiting for permanent deletion"
-msgstr "Nutzer wartet auf permanente Löschung"
-
-#: mod/admin.php:1817
-msgid "Request date"
-msgstr "Anfragedatum"
-
-#: mod/admin.php:1818
-msgid "No registrations."
-msgstr "Keine Neuanmeldungen."
-
-#: mod/admin.php:1819
-msgid "Note from the user"
-msgstr "Hinweis vom Nutzer"
-
-#: mod/admin.php:1821
-msgid "Deny"
-msgstr "Verwehren"
-
-#: mod/admin.php:1825
-msgid "Site admin"
-msgstr "Seitenadministrator"
-
-#: mod/admin.php:1826
-msgid "Account expired"
-msgstr "Account ist abgelaufen"
-
-#: mod/admin.php:1829
-msgid "New User"
-msgstr "Neuer Nutzer"
-
-#: mod/admin.php:1830
-msgid "Deleted since"
-msgstr "Gelöscht seit"
-
-#: mod/admin.php:1835
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Die markierten Nutzer werden gelöscht!\\n\\nAlle Beiträge, die diese Nutzer auf dieser Seite veröffentlicht haben, werden permanent gelöscht!\\n\\nBist Du sicher?"
-
-#: mod/admin.php:1836
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Der Nutzer {0} wird gelöscht!\\n\\nAlles was dieser Nutzer auf dieser Seite veröffentlicht hat, wird permanent gelöscht!\\n\\nBist Du sicher?"
-
-#: mod/admin.php:1846
-msgid "Name of the new user."
-msgstr "Name des neuen Nutzers"
-
-#: mod/admin.php:1847
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: mod/admin.php:1847
-msgid "Nickname of the new user."
-msgstr "Spitznamen für den neuen Nutzer"
-
-#: mod/admin.php:1848
-msgid "Email address of the new user."
-msgstr "Email Adresse des neuen Nutzers"
-
-#: mod/admin.php:1890
-#, php-format
-msgid "Addon %s disabled."
-msgstr "Addon %s ausgeschaltet."
-
-#: mod/admin.php:1894
-#, php-format
-msgid "Addon %s enabled."
-msgstr "Addon %s eingeschaltet."
-
-#: mod/admin.php:1904 mod/admin.php:2153
-msgid "Disable"
-msgstr "Ausschalten"
-
-#: mod/admin.php:1907 mod/admin.php:2156
-msgid "Enable"
-msgstr "Einschalten"
-
-#: mod/admin.php:1929 mod/admin.php:2198
-msgid "Toggle"
-msgstr "Umschalten"
-
-#: mod/admin.php:1937 mod/admin.php:2207
-msgid "Author: "
-msgstr "Autor:"
-
-#: mod/admin.php:1938 mod/admin.php:2208
-msgid "Maintainer: "
-msgstr "Betreuer:"
-
-#: mod/admin.php:1990
-msgid "Reload active addons"
-msgstr "Aktivierte Addons neu laden"
-
-#: mod/admin.php:1995
-#, 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 "Es sind derzeit keine Addons auf diesem Knoten verfügbar. Du findest das offizielle Addon-Repository unter %1$s und weitere eventuell interessante Addons im offenen Addon-Verzeichnis auf %2$s."
-
-#: mod/admin.php:2115
-msgid "No themes found."
-msgstr "Keine Themen gefunden."
-
-#: mod/admin.php:2189
-msgid "Screenshot"
-msgstr "Bildschirmfoto"
-
-#: mod/admin.php:2243
-msgid "Reload active themes"
-msgstr "Aktives Theme neu laden"
-
-#: mod/admin.php:2248
-#, php-format
-msgid "No themes found on the system. They should be placed in %1$s"
-msgstr "Es wurden keine Themes auf dem System gefunden. Diese sollten in %1$s platziert werden."
-
-#: mod/admin.php:2249
-msgid "[Experimental]"
-msgstr "[Experimentell]"
-
-#: mod/admin.php:2250
-msgid "[Unsupported]"
-msgstr "[Nicht unterstützt]"
-
-#: mod/admin.php:2274
-msgid "Log settings updated."
-msgstr "Protokolleinstellungen aktualisiert."
-
-#: mod/admin.php:2306
-msgid "PHP log currently enabled."
-msgstr "PHP Protokollierung ist derzeit aktiviert."
-
-#: mod/admin.php:2308
-msgid "PHP log currently disabled."
-msgstr "PHP Protokollierung ist derzeit nicht aktiviert."
-
-#: mod/admin.php:2317
-msgid "Clear"
-msgstr "löschen"
-
-#: mod/admin.php:2321
-msgid "Enable Debugging"
-msgstr "Protokoll führen"
-
-#: mod/admin.php:2322
-msgid "Log file"
-msgstr "Protokolldatei"
-
-#: mod/admin.php:2322
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
-msgstr "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis."
-
-#: mod/admin.php:2323
-msgid "Log level"
-msgstr "Protokoll-Level"
-
-#: mod/admin.php:2325
-msgid "PHP logging"
-msgstr "PHP Protokollieren"
-
-#: mod/admin.php:2326
-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 "
-"'display_errors' is to enable these options, set to '0' to disable them."
-msgstr "Um PHP Warnungen und Fehler zu protokollieren, kannst du die folgenden Zeilen zur .htconfig.php Datei deiner Installation hinzufügen. Den Dateinamen der Log-Datei legst du in der Zeile mit dem 'error_log' fest,  Er ist relativ zum Friendica-Stammverzeichnis und muss schreibbar durch den Webserver sein. Eine \"1\" als Option für die Punkte 'log_errors' und 'display_errors' aktiviert die Funktionen zum Protokollieren bzw. Anzeigen der Fehler, eine \"0\" deaktiviert sie."
-
-#: mod/admin.php:2357
-#, 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 "Fehler beim Öffnen der Logdatei <strong>%1$s</strong>.\\r\\n<br/>Bitte überprüfe ob die Datei %1$s existiert und gelesen werden kann."
-
-#: mod/admin.php:2361
-#, 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 "Konnte die Logdatei <strong>%1$s</strong> nicht öffnen.\\r\\n<br/>Bitte stelle sicher, dass die Datei %1$s lesbar ist."
-
-#: mod/admin.php:2452 mod/admin.php:2453 mod/settings.php:767
-msgid "Off"
-msgstr "Aus"
-
-#: mod/admin.php:2452 mod/admin.php:2453 mod/settings.php:767
-msgid "On"
-msgstr "An"
-
-#: mod/admin.php:2453
-#, php-format
-msgid "Lock feature %s"
-msgstr "Feature festlegen: %s"
-
-#: mod/admin.php:2461
-msgid "Manage Additional Features"
-msgstr "Zusätzliche Features Verwalten"
-
-#: mod/community.php:51
-msgid "Community option not available."
-msgstr "Optionen für die Gemeinschaftsseite nicht verfügbar."
-
-#: mod/community.php:68
-msgid "Not available."
-msgstr "Nicht verfügbar."
-
-#: mod/community.php:81
-msgid "Local Community"
-msgstr "Lokale Gemeinschaft"
-
-#: mod/community.php:84
-msgid "Posts from local users on this server"
-msgstr "Beiträge von Nutzern dieses Servers"
-
-#: mod/community.php:92
-msgid "Global Community"
-msgstr "Globale Gemeinschaft"
-
-#: mod/community.php:95
-msgid "Posts from users of the whole federated network"
-msgstr "Beiträge von Nutzern des gesamten  föderalen Netzwerks"
-
-#: mod/community.php:141 mod/search.php:228
-msgid "No results."
-msgstr "Keine Ergebnisse."
-
-#: 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 "Diese Gemeinschaftsseite zeigt alle öffentlichen Beiträge, die auf diesem Knoten eingegangen sind. Der Inhalt entspricht nicht zwingend der Meinung der Nutzer dieses Servers."
-
-#: mod/events.php:105 mod/events.php:107
-msgid "Event can not end before it has started."
-msgstr "Die Veranstaltung kann nicht enden bevor sie beginnt."
-
-#: mod/events.php:114 mod/events.php:116
-msgid "Event title and start time are required."
-msgstr "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden."
-
-#: mod/events.php:393
-msgid "Create New Event"
-msgstr "Neue Veranstaltung erstellen"
-
-#: mod/events.php:506
-msgid "Event details"
-msgstr "Veranstaltungsdetails"
-
-#: mod/events.php:507
-msgid "Starting date and Title are required."
-msgstr "Anfangszeitpunkt und Titel werden benötigt"
-
-#: mod/events.php:508 mod/events.php:509
-msgid "Event Starts:"
-msgstr "Veranstaltungsbeginn:"
-
-#: mod/events.php:510 mod/events.php:526
-msgid "Finish date/time is not known or not relevant"
-msgstr "Enddatum/-zeit ist nicht bekannt oder nicht relevant"
-
-#: mod/events.php:512 mod/events.php:513
-msgid "Event Finishes:"
-msgstr "Veranstaltungsende:"
-
-#: mod/events.php:514 mod/events.php:527
-msgid "Adjust for viewer timezone"
-msgstr "An Zeitzone des Betrachters anpassen"
-
-#: mod/events.php:516
-msgid "Description:"
-msgstr "Beschreibung"
-
-#: mod/events.php:520 mod/events.php:522
-msgid "Title:"
-msgstr "Titel:"
-
-#: mod/events.php:523 mod/events.php:524
-msgid "Share this event"
-msgstr "Veranstaltung teilen"
-
-#: mod/events.php:531 src/Model/Profile.php:862
-msgid "Basic"
-msgstr "Allgemein"
-
-#: mod/events.php:533 mod/photos.php:1086 mod/photos.php:1429
-#: src/Core/ACL.php:318
-msgid "Permissions"
-msgstr "Berechtigungen"
-
-#: mod/events.php:552
-msgid "Failed to remove event"
-msgstr "Entfernen der Veranstaltung fehlgeschlagen"
-
-#: mod/events.php:554
-msgid "Event removed"
-msgstr "Veranstaltung enfternt"
-
-#: mod/item.php:114
-msgid "Unable to locate original post."
-msgstr "Konnte den Originalbeitrag nicht finden."
-
-#: mod/item.php:274
-msgid "Empty post discarded."
-msgstr "Leerer Beitrag wurde verworfen."
-
-#: mod/item.php:804
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social "
-"network."
-msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica."
-
-#: mod/item.php:806
-#, php-format
-msgid "You may visit them online at %s"
-msgstr "Du kannst sie online unter %s besuchen"
-
-#: mod/item.php:807
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest."
-
-#: mod/item.php:811
-#, php-format
-msgid "%s posted an update."
-msgstr "%s hat ein Update veröffentlicht."
-
-#: mod/network.php:194 mod/search.php:37
-msgid "Remove term"
-msgstr "Begriff entfernen"
-
-#: mod/network.php:201 mod/search.php:46 src/Content/Feature.php:100
-msgid "Saved Searches"
-msgstr "Gespeicherte Suchen"
-
-#: mod/network.php:202 src/Model/Group.php:413
-msgid "add"
-msgstr "hinzufügen"
-
-#: 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] "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann."
-msgstr[1] "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können."
-
-#: mod/network.php:550
-msgid "Messages in this group won't be send to these receivers."
-msgstr "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden."
-
-#: mod/network.php:618
-msgid "No such group"
-msgstr "Es gibt keine solche Gruppe"
-
-#: mod/network.php:643
-#, php-format
-msgid "Group: %s"
-msgstr "Gruppe: %s"
-
-#: mod/network.php:669
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen."
-
-#: mod/network.php:672
-msgid "Invalid contact."
-msgstr "Ungültiger Kontakt."
-
-#: mod/network.php:943
-msgid "Commented Order"
-msgstr "Neueste Kommentare"
-
-#: mod/network.php:946
-msgid "Sort by Comment Date"
-msgstr "Nach Kommentardatum sortieren"
-
-#: mod/network.php:951
-msgid "Posted Order"
-msgstr "Neueste Beiträge"
-
-#: mod/network.php:954
-msgid "Sort by Post Date"
-msgstr "Nach Beitragsdatum sortieren"
-
-#: mod/network.php:965
-msgid "Posts that mention or involve you"
-msgstr "Beiträge, in denen es um Dich geht"
-
-#: mod/network.php:973
-msgid "New"
-msgstr "Neue"
-
-#: mod/network.php:976
-msgid "Activity Stream - by date"
-msgstr "Aktivitäten-Stream - nach Datum"
-
-#: mod/network.php:984
-msgid "Shared Links"
-msgstr "Geteilte Links"
-
-#: mod/network.php:987
-msgid "Interesting Links"
-msgstr "Interessante Links"
-
-#: mod/network.php:995
-msgid "Starred"
-msgstr "Markierte"
-
-#: mod/network.php:998
-msgid "Favourite Posts"
-msgstr "Favorisierte Beiträge"
-
-#: mod/notes.php:52 src/Model/Profile.php:944
-msgid "Personal Notes"
-msgstr "Persönliche Notizen"
-
-#: mod/photos.php:108 src/Model/Profile.php:905
+#: mod/photos.php:112 src/Model/Profile.php:894
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
-#: mod/photos.php:109 mod/photos.php:1701
+#: mod/photos.php:113 mod/photos.php:1708
 msgid "Recent Photos"
 msgstr "Neueste Fotos"
 
-#: mod/photos.php:112 mod/photos.php:1198 mod/photos.php:1703
+#: mod/photos.php:116 mod/photos.php:1230 mod/photos.php:1710
 msgid "Upload New Photos"
 msgstr "Neue Fotos hochladen"
 
-#: mod/photos.php:126 mod/settings.php:51
-msgid "everybody"
-msgstr "jeder"
-
-#: mod/photos.php:184
+#: mod/photos.php:190
 msgid "Contact information unavailable"
 msgstr "Kontaktinformationen nicht verfügbar"
 
-#: mod/photos.php:204
+#: mod/photos.php:209
 msgid "Album not found."
 msgstr "Album nicht gefunden."
 
-#: mod/photos.php:234 mod/photos.php:245 mod/photos.php:1149
+#: mod/photos.php:239 mod/photos.php:252 mod/photos.php:1181
 msgid "Delete Album"
 msgstr "Album löschen"
 
-#: mod/photos.php:243
+#: mod/photos.php:250
 msgid "Do you really want to delete this photo album and all its photos?"
 msgstr "Möchtest Du wirklich dieses Foto-Album und all seine Foto löschen?"
 
-#: mod/photos.php:303 mod/photos.php:314 mod/photos.php:1434
+#: mod/photos.php:312 mod/photos.php:324 mod/photos.php:1453
 msgid "Delete Photo"
 msgstr "Foto löschen"
 
-#: mod/photos.php:312
+#: mod/photos.php:322
 msgid "Do you really want to delete this photo?"
 msgstr "Möchtest Du wirklich dieses Foto löschen?"
 
-#: mod/photos.php:655
+#: mod/photos.php:679
 msgid "a photo"
 msgstr "einem Foto"
 
-#: mod/photos.php:655
+#: mod/photos.php:679
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr "%1$s wurde von %3$s in %2$s getaggt"
 
-#: mod/photos.php:757
+#: mod/photos.php:782
 msgid "Image upload didn't complete, please try again"
 msgstr "Der Upload des Bildes war nicht vollständig. Bitte versuche es erneut."
 
-#: mod/photos.php:760
+#: mod/photos.php:785
 msgid "Image file is missing"
 msgstr "Bilddatei konnte nicht gefunden werden."
 
-#: mod/photos.php:765
+#: mod/photos.php:790
 msgid ""
 "Server can't accept new file upload at this time, please contact your "
 "administrator"
 msgstr "Der Server kann derzeit keine neuen Datei Uploads akzeptieren. Bitte kontaktiere deinen Administrator."
 
-#: mod/photos.php:791
+#: mod/photos.php:816
 msgid "Image file is empty."
 msgstr "Bilddatei ist leer."
 
-#: mod/photos.php:928
+#: mod/photos.php:953
 msgid "No photos selected"
 msgstr "Keine Bilder ausgewählt"
 
-#: mod/photos.php:1024 mod/videos.php:309
-msgid "Access to this item is restricted."
-msgstr "Zugriff zu diesem Eintrag wurde eingeschränkt."
-
-#: mod/photos.php:1078
+#: mod/photos.php:1104
 msgid "Upload Photos"
 msgstr "Bilder hochladen"
 
-#: mod/photos.php:1082 mod/photos.php:1144
+#: mod/photos.php:1108 mod/photos.php:1176
 msgid "New album name: "
 msgstr "Name des neuen Albums: "
 
-#: mod/photos.php:1083
-msgid "or existing album name: "
-msgstr "oder existierender Albumname: "
+#: mod/photos.php:1109
+msgid "or select existing album:"
+msgstr "oder wähle ein bestehendes Album:"
 
-#: mod/photos.php:1084
+#: mod/photos.php:1110
 msgid "Do not show a status post for this upload"
 msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen"
 
-#: mod/photos.php:1094 mod/photos.php:1437 mod/settings.php:1218
-msgid "Show to Groups"
-msgstr "Zeige den Gruppen"
-
-#: mod/photos.php:1095 mod/photos.php:1438 mod/settings.php:1219
-msgid "Show to Contacts"
-msgstr "Zeige den Kontakten"
-
-#: mod/photos.php:1155
+#: mod/photos.php:1187
 msgid "Edit Album"
 msgstr "Album bearbeiten"
 
-#: mod/photos.php:1160
+#: mod/photos.php:1192
 msgid "Show Newest First"
 msgstr "Zeige neueste zuerst"
 
-#: mod/photos.php:1162
+#: mod/photos.php:1194
 msgid "Show Oldest First"
 msgstr "Zeige älteste zuerst"
 
-#: mod/photos.php:1183 mod/photos.php:1686
+#: mod/photos.php:1215 mod/photos.php:1693
 msgid "View Photo"
 msgstr "Foto betrachten"
 
-#: mod/photos.php:1224
+#: mod/photos.php:1256
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein."
 
-#: mod/photos.php:1226
+#: mod/photos.php:1258
 msgid "Photo not available"
 msgstr "Foto nicht verfügbar"
 
-#: mod/photos.php:1289
+#: mod/photos.php:1333
 msgid "View photo"
 msgstr "Fotos ansehen"
 
-#: mod/photos.php:1289
+#: mod/photos.php:1333
 msgid "Edit photo"
 msgstr "Foto bearbeiten"
 
-#: mod/photos.php:1290
+#: mod/photos.php:1334
 msgid "Use as profile photo"
 msgstr "Als Profilbild verwenden"
 
-#: mod/photos.php:1296 src/Object/Post.php:149
+#: mod/photos.php:1340 src/Object/Post.php:151
 msgid "Private Message"
 msgstr "Private Nachricht"
 
-#: mod/photos.php:1315
+#: mod/photos.php:1360
 msgid "View Full Size"
 msgstr "Betrachte Originalgröße"
 
-#: mod/photos.php:1402
+#: mod/photos.php:1421
 msgid "Tags: "
 msgstr "Tags: "
 
-#: mod/photos.php:1405
+#: mod/photos.php:1424
 msgid "[Remove any tag]"
 msgstr "[Tag entfernen]"
 
-#: mod/photos.php:1420
+#: mod/photos.php:1439
 msgid "New album name"
 msgstr "Name des neuen Albums"
 
-#: mod/photos.php:1421
+#: mod/photos.php:1440
 msgid "Caption"
 msgstr "Bildunterschrift"
 
-#: mod/photos.php:1422
+#: mod/photos.php:1441
 msgid "Add a Tag"
 msgstr "Tag hinzufügen"
 
-#: mod/photos.php:1422
+#: mod/photos.php:1441
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: mod/photos.php:1423
+#: mod/photos.php:1442
 msgid "Do not rotate"
 msgstr "Nicht rotieren"
 
-#: mod/photos.php:1424
+#: mod/photos.php:1443
 msgid "Rotate CW (right)"
 msgstr "Drehen US (rechts)"
 
-#: mod/photos.php:1425
+#: mod/photos.php:1444
 msgid "Rotate CCW (left)"
 msgstr "Drehen EUS (links)"
 
-#: mod/photos.php:1459 src/Object/Post.php:304
+#: mod/photos.php:1478 src/Object/Post.php:293
 msgid "I like this (toggle)"
 msgstr "Ich mag das (toggle)"
 
-#: mod/photos.php:1460 src/Object/Post.php:305
+#: mod/photos.php:1479 src/Object/Post.php:294
 msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (toggle)"
 
-#: mod/photos.php:1478 mod/photos.php:1517 mod/photos.php:1590
-#: src/Object/Post.php:407 src/Object/Post.php:803
+#: 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 "Kommentar"
 
-#: mod/photos.php:1622
+#: mod/photos.php:1627
 msgid "Map"
 msgstr "Karte"
 
-#: mod/photos.php:1692 mod/videos.php:387
-msgid "View Album"
-msgstr "Album betrachten"
-
-#: mod/profile.php:37 src/Model/Profile.php:118
-msgid "Requested profile is not available."
-msgstr "Das angefragte Profil ist nicht vorhanden."
-
-#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1250
-#, php-format
-msgid "%s's timeline"
-msgstr "Timeline von %s"
-
-#: mod/profile.php:79 src/Protocol/OStatus.php:1251
-#, php-format
-msgid "%s's posts"
-msgstr "Beiträge von %s"
-
-#: mod/profile.php:80 src/Protocol/OStatus.php:1252
-#, php-format
-msgid "%s's comments"
-msgstr "Kommentare von %s"
-
-#: mod/profile.php:195
-msgid "Tips for New Members"
-msgstr "Tipps für neue Nutzer"
-
-#: mod/register.php:100
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet."
-
-#: mod/register.php:104
+#: 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 "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern."
+"<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> schrieb den folgenden <a href=\"%s\" target=\"_blank\">Beitrag</a>"
 
-#: mod/register.php:111
-msgid "Registration successful."
-msgstr "Registrierung erfolgreich."
+#: 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"
 
-#: mod/register.php:116
-msgid "Your registration can not be processed."
-msgstr "Deine Registrierung konnte nicht verarbeitet werden."
-
-#: mod/register.php:163
-msgid "Your registration is pending approval by the site owner."
-msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden."
-
-#: mod/register.php:221
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr "Du kannst dieses Formular auch (optional) mit Deiner OpenID ausfüllen, indem Du Deine OpenID angibst und 'Registrieren' klickst."
-
-#: 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 "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus."
-
-#: mod/register.php:223
-msgid "Your OpenID (optional): "
-msgstr "Deine OpenID (optional): "
-
-#: mod/register.php:235
-msgid "Include your profile in member directory?"
-msgstr "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?"
-
-#: mod/register.php:262
-msgid "Note for the admin"
-msgstr "Hinweis für den Admin"
-
-#: mod/register.php:262
-msgid "Leave a message for the admin, why you want to join this node"
-msgstr "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest."
-
-#: mod/register.php:263
-msgid "Membership on this site is by invitation only."
-msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
-
-#: mod/register.php:264
-msgid "Your invitation code: "
-msgstr "Dein Ein­la­dungs­code"
-
-#: mod/register.php:273
-msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
-msgstr "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):"
-
-#: mod/register.php:274
-msgid ""
-"Your Email Address: (Initial information will be send there, so this has to "
-"be an existing address.)"
-msgstr "Deine E-Mail Adresse (Informationen zur Registrierung werden an diese Adresse gesendet, darum muss sie existieren.)"
-
-#: mod/register.php:276 mod/settings.php:1190
-msgid "New Password:"
-msgstr "Neues Passwort:"
-
-#: mod/register.php:276
-msgid "Leave empty for an auto generated password."
-msgstr "Leer lassen um das Passwort automatisch zu generieren."
-
-#: mod/register.php:277 mod/settings.php:1191
-msgid "Confirm:"
-msgstr "Bestätigen:"
-
-#: 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>'."
-msgstr "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@%s</strong>' sein."
+"<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> schrieb den folgenden <a href=\"%s\" target=\"_blank\">Beitrag</a>"
 
-#: mod/register.php:279
-msgid "Choose a nickname: "
-msgstr "Spitznamen wählen: "
-
-#: mod/register.php:282 src/Content/Nav.php:128 src/Module/Login.php:284
-msgid "Register"
-msgstr "Registrieren"
-
-#: mod/register.php:289
-msgid "Import your profile to this friendica instance"
-msgstr "Importiere Dein Profil auf diese Friendica Instanz"
-
-#: mod/removeme.php:45
-msgid "User deleted their account"
-msgstr "Gelöschter Nutzeraccount"
-
-#: 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 "Ein Nutzer deiner Friendica Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass deren Daten aus deinen Backups entfernt werden."
-
-#: mod/removeme.php:47
+#: boot.php:653
 #, php-format
-msgid "The user id is %d"
-msgstr "Die ID des Users lautet %d"
+msgid "Update %s failed. See error logs."
+msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
 
-#: mod/removeme.php:78 mod/removeme.php:81
-msgid "Remove My Account"
-msgstr "Konto löschen"
+#: src/Database/DBStructure.php:33
+msgid "There are no tables on MyISAM."
+msgstr "Es gibt keine MyISAM Tabellen."
 
-#: mod/removeme.php:79
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen."
-
-#: mod/removeme.php:80
-msgid "Please enter your password for verification:"
-msgstr "Bitte gib Dein Passwort zur Verifikation ein:"
-
-#: mod/search.php:105
-msgid "Only logged in users are permitted to perform a search."
-msgstr "Nur eingeloggten Benutzern ist das Suchen gestattet."
-
-#: mod/search.php:129
-msgid "Too Many Requests"
-msgstr "Zu viele Abfragen"
-
-#: mod/search.php:130
-msgid "Only one search per minute is permitted for not logged in users."
-msgstr "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet."
-
-#: mod/search.php:234
-#, php-format
-msgid "Items tagged with: %s"
-msgstr "Beiträge die mit %s getaggt sind"
-
-#: mod/settings.php:56
-msgid "Account"
-msgstr "Nutzerkonto"
-
-#: mod/settings.php:73
-msgid "Display"
-msgstr "Anzeige"
-
-#: mod/settings.php:80 mod/settings.php:834
-msgid "Social Networks"
-msgstr "Soziale Netzwerke"
-
-#: mod/settings.php:94 src/Content/Nav.php:205
-msgid "Delegations"
-msgstr "Delegationen"
-
-#: mod/settings.php:101
-msgid "Connected apps"
-msgstr "Verbundene Programme"
-
-#: mod/settings.php:115
-msgid "Remove account"
-msgstr "Konto löschen"
-
-#: mod/settings.php:167
-msgid "Missing some important data!"
-msgstr "Wichtige Daten fehlen!"
-
-#: mod/settings.php:278
-msgid "Failed to connect with email account using the settings provided."
-msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."
-
-#: mod/settings.php:283
-msgid "Email settings updated."
-msgstr "E-Mail Einstellungen bearbeitet."
-
-#: mod/settings.php:299
-msgid "Features updated"
-msgstr "Features aktualisiert"
-
-#: mod/settings.php:372
-msgid "Relocate message has been send to your contacts"
-msgstr "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet."
-
-#: mod/settings.php:384 src/Model/User.php:339
-msgid "Passwords do not match. Password unchanged."
-msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
-
-#: mod/settings.php:389
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
-
-#: 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 "Das neuer Passwort wurde in einem öffentlichen Daten-Dump veröffentlicht. Bitte verwende ein anderes Passwort."
-
-#: mod/settings.php:400
-msgid "Wrong password."
-msgstr "Falsches Passwort."
-
-#: mod/settings.php:407 src/Core/Console/NewPassword.php:94
-msgid "Password changed."
-msgstr "Passwort geändert."
-
-#: mod/settings.php:409 src/Core/Console/NewPassword.php:91
-msgid "Password update failed. Please try again."
-msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."
-
-#: mod/settings.php:493
-msgid " Please use a shorter name."
-msgstr " Bitte verwende einen kürzeren Namen."
-
-#: mod/settings.php:496
-msgid " Name too short."
-msgstr " Name ist zu kurz."
-
-#: mod/settings.php:504
-msgid "Wrong Password"
-msgstr "Falsches Passwort"
-
-#: mod/settings.php:509
-msgid "Invalid email."
-msgstr "Ungültige E-Mail-Adresse."
-
-#: mod/settings.php:516
-msgid "Cannot change to that email."
-msgstr "Ändern der E-Mail nicht möglich. "
-
-#: mod/settings.php:566
-msgid "Private forum has no privacy permissions. Using default privacy group."
-msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt."
-
-#: mod/settings.php:569
-msgid "Private forum has no privacy permissions and no default privacy group."
-msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte."
-
-#: mod/settings.php:609
-msgid "Settings updated."
-msgstr "Einstellungen aktualisiert."
-
-#: mod/settings.php:668 mod/settings.php:694 mod/settings.php:728
-msgid "Add application"
-msgstr "Programm hinzufügen"
-
-#: 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 "Umleiten"
-
-#: mod/settings.php:675 mod/settings.php:701
-msgid "Icon url"
-msgstr "Icon URL"
-
-#: mod/settings.php:686
-msgid "You can't edit this application."
-msgstr "Du kannst dieses Programm nicht bearbeiten."
-
-#: mod/settings.php:727
-msgid "Connected Apps"
-msgstr "Verbundene Programme"
-
-#: mod/settings.php:729 src/Object/Post.php:155 src/Object/Post.php:157
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: mod/settings.php:731
-msgid "Client key starts with"
-msgstr "Anwenderschlüssel beginnt mit"
-
-#: mod/settings.php:732
-msgid "No name"
-msgstr "Kein Name"
-
-#: mod/settings.php:733
-msgid "Remove authorization"
-msgstr "Autorisierung entziehen"
-
-#: mod/settings.php:744
-msgid "No Addon settings configured"
-msgstr "Keine Addon-Einstellungen konfiguriert"
-
-#: mod/settings.php:753
-msgid "Addon Settings"
-msgstr "Addon Einstellungen"
-
-#: mod/settings.php:774
-msgid "Additional Features"
-msgstr "Zusätzliche Features"
-
-#: mod/settings.php:797 src/Content/ContactSelector.php:83
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: mod/settings.php:797 mod/settings.php:798
-msgid "enabled"
-msgstr "eingeschaltet"
-
-#: mod/settings.php:797 mod/settings.php:798
-msgid "disabled"
-msgstr "ausgeschaltet"
-
-#: mod/settings.php:797 mod/settings.php:798
-#, php-format
-msgid "Built-in support for %s connectivity is %s"
-msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s"
-
-#: mod/settings.php:798
-msgid "GNU Social (OStatus)"
-msgstr "GNU Social (OStatus)"
-
-#: mod/settings.php:829
-msgid "Email access is disabled on this site."
-msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
-
-#: mod/settings.php:839
-msgid "General Social Media Settings"
-msgstr "Allgemeine Einstellungen zu Sozialen Medien"
-
-#: mod/settings.php:840
-msgid "Disable Content Warning"
-msgstr "Inhaltswarnungen ausschalten"
-
-#: 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 "Nutzer von anderen Netzwerken, wie z.B. Mastodon oder Pleroma, können Inhaltswarnungen, welche die Beiträge standardmäßig einklappen. Diese Einstellung deaktiviert das automatische Einklappt solcher Beiträge und setzt die Inhaltswarnung als Titel des Beitrags. Wenn du andere Filtereinstellungen vorgenommen hast, werden diese hierdurch nicht beeinflusst."
-
-#: mod/settings.php:841
-msgid "Disable intelligent shortening"
-msgstr "Intelligentes Link kürzen ausschalten"
-
-#: 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 "Normalerweise versucht das System den besten Link zu finden um ihn zu gekürzten Postings hinzu zu fügen. Wird diese Option ausgewählt wird stets ein Link auf die originale Friendica Nachricht beigefügt."
-
-#: mod/settings.php:842
-msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
-msgstr "Automatisch allen GNU Social (OStatus) Followern/Erwähnern folgen"
-
-#: 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 "Wenn du eine Nachricht eines unbekannten OStatus Nutzers bekommst, entscheidet diese Option wie diese behandelt werden soll. Ist die Option aktiviert, wird ein neuer Kontakt für den Verfasser erstellt,."
-
-#: mod/settings.php:843
-msgid "Default group for OStatus contacts"
-msgstr "Voreingestellte Gruppe für OStatus Kontakte"
-
-#: mod/settings.php:844
-msgid "Your legacy GNU Social account"
-msgstr "Dein alter GNU Social Account"
-
-#: 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 "Wenn du deinen alten GNU Socual/Statusnet Accountnamen hier angibst (Format name@domain.tld) werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden."
-
-#: mod/settings.php:847
-msgid "Repair OStatus subscriptions"
-msgstr "OStatus Abonnements reparieren"
-
-#: mod/settings.php:851
-msgid "Email/Mailbox Setup"
-msgstr "E-Mail/Postfach-Einstellungen"
-
-#: 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 "Wenn Du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für Dein Postfach an."
-
-#: mod/settings.php:853
-msgid "Last successful email check:"
-msgstr "Letzter erfolgreicher E-Mail Check"
-
-#: mod/settings.php:855
-msgid "IMAP server name:"
-msgstr "IMAP-Server-Name:"
-
-#: mod/settings.php:856
-msgid "IMAP port:"
-msgstr "IMAP-Port:"
-
-#: mod/settings.php:857
-msgid "Security:"
-msgstr "Sicherheit:"
-
-#: mod/settings.php:857 mod/settings.php:862
-msgid "None"
-msgstr "Keine"
-
-#: mod/settings.php:858
-msgid "Email login name:"
-msgstr "E-Mail-Login-Name:"
-
-#: mod/settings.php:859
-msgid "Email password:"
-msgstr "E-Mail-Passwort:"
-
-#: mod/settings.php:860
-msgid "Reply-to address:"
-msgstr "Reply-to Adresse:"
-
-#: mod/settings.php:861
-msgid "Send public posts to all email contacts:"
-msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"
-
-#: mod/settings.php:862
-msgid "Action after import:"
-msgstr "Aktion nach Import:"
-
-#: mod/settings.php:862 src/Content/Nav.php:193
-msgid "Mark as seen"
-msgstr "Als gelesen markieren"
-
-#: mod/settings.php:862
-msgid "Move to folder"
-msgstr "In einen Ordner verschieben"
-
-#: mod/settings.php:863
-msgid "Move to folder:"
-msgstr "In diesen Ordner verschieben:"
-
-#: mod/settings.php:906
-#, php-format
-msgid "%s - (Unsupported)"
-msgstr "%s - (Nicht unterstützt)"
-
-#: mod/settings.php:908
-#, php-format
-msgid "%s - (Experimental)"
-msgstr "%s - (Experimentell)"
-
-#: mod/settings.php:951
-msgid "Display Settings"
-msgstr "Anzeige-Einstellungen"
-
-#: mod/settings.php:957 mod/settings.php:981
-msgid "Display Theme:"
-msgstr "Theme:"
-
-#: mod/settings.php:958
-msgid "Mobile Theme:"
-msgstr "Mobiles Theme"
-
-#: mod/settings.php:959
-msgid "Suppress warning of insecure networks"
-msgstr "Warnung wegen unsicheren Netzwerken unterdrücken"
-
-#: 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 "Soll das System Warnungen unterdrücken, die angezeigt werden weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können."
-
-#: mod/settings.php:960
-msgid "Update browser every xx seconds"
-msgstr "Browser alle xx Sekunden aktualisieren"
-
-#: mod/settings.php:960
-msgid "Minimum of 10 seconds. Enter -1 to disable it."
-msgstr "Minimum sind 10 Sekunden. Gib -1 ein um abzuschalten."
-
-#: mod/settings.php:961
-msgid "Number of items to display per page:"
-msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: "
-
-#: mod/settings.php:961 mod/settings.php:962
-msgid "Maximum of 100 items"
-msgstr "Maximal 100 Beiträge"
-
-#: mod/settings.php:962
-msgid "Number of items to display per page when viewed from mobile device:"
-msgstr "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:"
-
-#: mod/settings.php:963
-msgid "Don't show emoticons"
-msgstr "Keine Smilies anzeigen"
-
-#: mod/settings.php:964
-msgid "Calendar"
-msgstr "Kalender"
-
-#: mod/settings.php:965
-msgid "Beginning of week:"
-msgstr "Wochenbeginn:"
-
-#: mod/settings.php:966
-msgid "Don't show notices"
-msgstr "Info-Popups nicht anzeigen"
-
-#: mod/settings.php:967
-msgid "Infinite scroll"
-msgstr "Endloses Scrollen"
-
-#: mod/settings.php:968
-msgid "Automatic updates only at the top of the network page"
-msgstr "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist."
-
-#: mod/settings.php:968
-msgid ""
-"When disabled, the network page is updated all the time, which could be "
-"confusing while reading."
-msgstr "Wenn dies deaktiviert ist, wird die Netzwerk Seite aktualisiert, wann immer neue Beiträge eintreffen, egal an welcher Stelle gerade gelesen wird."
-
-#: mod/settings.php:969
-msgid "Bandwith Saver Mode"
-msgstr "Bandbreiten-Spar-Modus"
-
-#: mod/settings.php:969
-msgid ""
-"When enabled, embedded content is not displayed on automatic updates, they "
-"only show on page reload."
-msgstr "Wenn aktiviert, wird der eingebettete Inhalt nicht automatisch aktualisiert. In diesem Fall Seite bitte neu laden."
-
-#: mod/settings.php:970
-msgid "Smart Threading"
-msgstr "Intelligentes Threading"
-
-#: 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 "Ist dies aktiviert, werden Einrückungen in Unterhaltungen unterdrückt wo sie nicht benötigt werden. Werden sie benötigt, werden die Threads weiterhin eingerückt."
-
-#: mod/settings.php:972
-msgid "General Theme Settings"
-msgstr "Allgemeine Themeneinstellungen"
-
-#: mod/settings.php:973
-msgid "Custom Theme Settings"
-msgstr "Benutzerdefinierte Theme Einstellungen"
-
-#: mod/settings.php:974
-msgid "Content Settings"
-msgstr "Einstellungen zum Inhalt"
-
-#: 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 "Themeneinstellungen"
-
-#: mod/settings.php:994
-msgid "Unable to find your profile. Please contact your admin."
-msgstr "Konnte dein Profil nicht finden. Bitte kontaktiere den Admin."
-
-#: mod/settings.php:1033
-msgid "Account Types"
-msgstr "Kontenarten"
-
-#: mod/settings.php:1034
-msgid "Personal Page Subtypes"
-msgstr "Unterarten der persönlichen Seite"
-
-#: mod/settings.php:1035
-msgid "Community Forum Subtypes"
-msgstr "Unterarten des Gemeinschaftsforums"
-
-#: mod/settings.php:1043
-msgid "Account for a personal profile."
-msgstr "Konto für ein persönliches Profil."
-
-#: mod/settings.php:1047
-msgid ""
-"Account for an organisation that automatically approves contact requests as "
-"\"Followers\"."
-msgstr "Konto für eine Organisation, das Kontaktanfragen automatisch als \"Follower\" annimmt."
-
-#: mod/settings.php:1051
-msgid ""
-"Account for a news reflector that automatically approves contact requests as"
-" \"Followers\"."
-msgstr "Konto für einen Feedspiegel, das Kontaktanfragen automatisch als \"Follower\" annimmt."
-
-#: mod/settings.php:1055
-msgid "Account for community discussions."
-msgstr "Konto für Diskussionsforen. "
-
-#: mod/settings.php:1059
-msgid ""
-"Account for a regular personal profile that requires manual approval of "
-"\"Friends\" and \"Followers\"."
-msgstr "Konto für ein normales persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden."
-
-#: mod/settings.php:1063
-msgid ""
-"Account for a public profile that automatically approves contact requests as"
-" \"Followers\"."
-msgstr "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt."
-
-#: mod/settings.php:1067
-msgid "Automatically approves all contact requests."
-msgstr "Bestätigt alle Kontaktanfragen automatisch."
-
-#: mod/settings.php:1071
-msgid ""
-"Account for a popular profile that automatically approves contact requests "
-"as \"Friends\"."
-msgstr "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt."
-
-#: mod/settings.php:1074
-msgid "Private Forum [Experimental]"
-msgstr "Privates Forum [Versuchsstadium]"
-
-#: mod/settings.php:1075
-msgid "Requires manual approval of contact requests."
-msgstr "Kontaktanfragen müssen manuell bestätigt werden."
-
-#: mod/settings.php:1086
-msgid "OpenID:"
-msgstr "OpenID:"
-
-#: mod/settings.php:1086
-msgid "(Optional) Allow this OpenID to login to this account."
-msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."
-
-#: mod/settings.php:1094
-msgid "Publish your default profile in your local site directory?"
-msgstr "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"
-
-#: 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."
-msgstr "Dein Profil wird im <a href=\"%s\">lokalen Verzeichnis</a> dieses Knotens veröffentlicht. Je nach Systemeinstellungen kann es öffentlich auffindbar sein."
+"\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 "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."
 
-#: mod/settings.php:1100
-msgid "Publish your default profile in the global social directory?"
-msgstr "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?"
-
-#: 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 "Dein Profil wird in den globalen Friendica Verzeichnissen (z.B. <a href=\"%s\">%s</a>) veröffentlicht. Dein Profil wird öffentlich auffindbar sein."
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]"
 
-#: mod/settings.php:1107
-msgid "Hide your contact/friend list from viewers of your default profile?"
-msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"
-
-#: 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 "Die Liste deiner Kontakte wird nicht in deinem Standard-Profil angezeigt werden. Du kannst für jedes weitere Profil diese Entscheidung separat einstellen."
+"\n"
+"Error %d occurred during database update:\n"
+"%s\n"
+msgstr "\nFehler %d beim Update der Datenbank aufgetreten\n%s\n"
 
-#: mod/settings.php:1111
-msgid "Hide your profile details from anonymous viewers?"
-msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
+#: src/Database/DBStructure.php:195
+msgid "Errors encountered performing database changes: "
+msgstr "Fehler beim Ändern der Datenbank aufgetreten"
 
-#: 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 "Anonyme Besucher deines Profils werden ausschließlich dein Profilbild, deinen Namen sowie deinen Spitznamen sehen. Deine lffentlichen Beiträge und Kommentare werden weiterhin sichtbar sein."
-
-#: mod/settings.php:1115
-msgid "Allow friends to post to your profile page?"
-msgstr "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?"
-
-#: mod/settings.php:1115
-msgid ""
-"Your contacts may write posts on your profile wall. These posts will be "
-"distributed to your contacts"
-msgstr "Deine Kontakte können Beiträge auf deiner Pinnwand hinterlassen. Diese werden an deine Kontakte verteilt."
-
-#: mod/settings.php:1119
-msgid "Allow friends to tag your posts?"
-msgstr "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern versehen?"
-
-#: mod/settings.php:1119
-msgid "Your contacts can add additional tags to your posts."
-msgstr "Deine Kontakte dürfen deine Beiträge mit zusätzlichen Schlagworten versehen."
-
-#: mod/settings.php:1123
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
-
-#: mod/settings.php:1123
-msgid ""
-"If you like, Friendica may suggest new members to add you as a contact."
-msgstr "Wenn du magst, kann Friendica dich neuen Mitgliedern als Kontakt vorschlagen."
-
-#: mod/settings.php:1127
-msgid "Permit unknown people to send you private mail?"
-msgstr "Dürfen Dir Unbekannte private Nachrichten schicken?"
-
-#: mod/settings.php:1127
-msgid ""
-"Friendica network users may send you private messages even if they are not "
-"in your contact list."
-msgstr "Nutzer des Friendica Netzwerks können dir private Nachrichten senden, selbst wenn sie nicht in deine Kontaktliste sind."
-
-#: mod/settings.php:1131
-msgid "Profile is <strong>not published</strong>."
-msgstr "Profil ist <strong>nicht veröffentlicht</strong>."
-
-#: mod/settings.php:1137
+#: src/Database/DBStructure.php:211
 #, php-format
-msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
-msgstr "Die Adresse deines Profils lautet <strong>'%s'</strong> oder '%s'."
+msgid "%s: Database update"
+msgstr "%s: Datenbank Aktualisierung"
 
-#: mod/settings.php:1144
-msgid "Automatically expire posts after this many days:"
-msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:"
-
-#: mod/settings.php:1144
-msgid "If empty, posts will not expire. Expired posts will be deleted"
-msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."
-
-#: mod/settings.php:1145
-msgid "Advanced expiration settings"
-msgstr "Erweiterte Verfallseinstellungen"
-
-#: mod/settings.php:1146
-msgid "Advanced Expiration"
-msgstr "Erweitertes Verfallen"
-
-#: mod/settings.php:1147
-msgid "Expire posts:"
-msgstr "Beiträge verfallen lassen:"
-
-#: mod/settings.php:1148
-msgid "Expire personal notes:"
-msgstr "Persönliche Notizen verfallen lassen:"
-
-#: mod/settings.php:1149
-msgid "Expire starred posts:"
-msgstr "Markierte Beiträge verfallen lassen:"
-
-#: mod/settings.php:1150
-msgid "Expire photos:"
-msgstr "Fotos verfallen lassen:"
-
-#: mod/settings.php:1151
-msgid "Only expire posts by others:"
-msgstr "Nur Beiträge anderer verfallen:"
-
-#: mod/settings.php:1181
-msgid "Account Settings"
-msgstr "Kontoeinstellungen"
-
-#: mod/settings.php:1189
-msgid "Password Settings"
-msgstr "Passwort-Einstellungen"
-
-#: mod/settings.php:1191
-msgid "Leave password fields blank unless changing"
-msgstr "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern"
-
-#: mod/settings.php:1192
-msgid "Current Password:"
-msgstr "Aktuelles Passwort:"
-
-#: mod/settings.php:1192 mod/settings.php:1193
-msgid "Your current password to confirm the changes"
-msgstr "Dein aktuelles Passwort um die Änderungen zu bestätigen"
-
-#: mod/settings.php:1193
-msgid "Password:"
-msgstr "Passwort:"
-
-#: mod/settings.php:1197
-msgid "Basic Settings"
-msgstr "Grundeinstellungen"
-
-#: mod/settings.php:1198 src/Model/Profile.php:736
-msgid "Full Name:"
-msgstr "Kompletter Name:"
-
-#: mod/settings.php:1199
-msgid "Email Address:"
-msgstr "E-Mail-Adresse:"
-
-#: mod/settings.php:1200
-msgid "Your Timezone:"
-msgstr "Deine Zeitzone:"
-
-#: mod/settings.php:1201
-msgid "Your Language:"
-msgstr "Deine Sprache:"
-
-#: mod/settings.php:1201
-msgid ""
-"Set the language we use to show you friendica interface and to send you "
-"emails"
-msgstr "Wähle die Sprache, in der wir Dir die Friendica-Oberfläche präsentieren sollen und Dir E-Mail schicken"
-
-#: mod/settings.php:1202
-msgid "Default Post Location:"
-msgstr "Standardstandort:"
-
-#: mod/settings.php:1203
-msgid "Use Browser Location:"
-msgstr "Standort des Browsers verwenden:"
-
-#: mod/settings.php:1206
-msgid "Security and Privacy Settings"
-msgstr "Sicherheits- und Privatsphäre-Einstellungen"
-
-#: mod/settings.php:1208
-msgid "Maximum Friend Requests/Day:"
-msgstr "Maximale Anzahl vonKontaktanfragen/Tag:"
-
-#: mod/settings.php:1208 mod/settings.php:1237
-msgid "(to prevent spam abuse)"
-msgstr "(um SPAM zu vermeiden)"
-
-#: mod/settings.php:1209
-msgid "Default Post Permissions"
-msgstr "Standard-Zugriffsrechte für Beiträge"
-
-#: mod/settings.php:1210
-msgid "(click to open/close)"
-msgstr "(klicke zum öffnen/schließen)"
-
-#: mod/settings.php:1220
-msgid "Default Private Post"
-msgstr "Privater Standardbeitrag"
-
-#: mod/settings.php:1221
-msgid "Default Public Post"
-msgstr "Öffentlicher Standardbeitrag"
-
-#: mod/settings.php:1225
-msgid "Default Permissions for New Posts"
-msgstr "Standardberechtigungen für neue Beiträge"
-
-#: mod/settings.php:1237
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:"
-
-#: mod/settings.php:1240
-msgid "Notification Settings"
-msgstr "Benachrichtigungseinstellungen"
-
-#: mod/settings.php:1241
-msgid "Send a notification email when:"
-msgstr "Benachrichtigungs-E-Mail senden wenn:"
-
-#: mod/settings.php:1242
-msgid "You receive an introduction"
-msgstr "– Du eine Kontaktanfrage erhältst"
-
-#: mod/settings.php:1243
-msgid "Your introductions are confirmed"
-msgstr "– eine Deiner Kontaktanfragen akzeptiert wurde"
-
-#: mod/settings.php:1244
-msgid "Someone writes on your profile wall"
-msgstr "– jemand etwas auf Deine Pinnwand schreibt"
-
-#: mod/settings.php:1245
-msgid "Someone writes a followup comment"
-msgstr "– jemand auch einen Kommentar verfasst"
-
-#: mod/settings.php:1246
-msgid "You receive a private message"
-msgstr "– Du eine private Nachricht erhältst"
-
-#: mod/settings.php:1247
-msgid "You receive a friend suggestion"
-msgstr "– Du eine Empfehlung erhältst"
-
-#: mod/settings.php:1248
-msgid "You are tagged in a post"
-msgstr "– Du in einem Beitrag erwähnt wirst"
-
-#: mod/settings.php:1249
-msgid "You are poked/prodded/etc. in a post"
-msgstr "– Du von jemandem angestupst oder sonstwie behandelt wirst"
-
-#: mod/settings.php:1251
-msgid "Activate desktop notifications"
-msgstr "Desktop Benachrichtigungen einschalten"
-
-#: mod/settings.php:1251
-msgid "Show desktop popup on new notifications"
-msgstr "Desktop Benachrichtigungen einschalten"
-
-#: mod/settings.php:1253
-msgid "Text-only notification emails"
-msgstr "Benachrichtigungs E-Mail als Rein-Text."
-
-#: mod/settings.php:1255
-msgid "Send text only notification emails, without the html part"
-msgstr "Sende Benachrichtigungs E-Mail als Rein-Text - ohne HTML-Teil"
-
-#: mod/settings.php:1257
-msgid "Show detailled notifications"
-msgstr "Detaillierte Benachrichtigungen anzeigen"
-
-#: mod/settings.php:1259
-msgid ""
-"Per default, notifications are condensed to a single notification per item. "
-"When enabled every notification is displayed."
-msgstr "Normalerweise werde alle Benachrichtigungen zu einem Thema zusammengefasst in einer einzigen Mitteilung. Wenn diese Option aktiviert ist, wird jede Mitteilung angezeigt."
-
-#: mod/settings.php:1261
-msgid "Advanced Account/Page Type Settings"
-msgstr "Erweiterte Konto-/Seitentyp-Einstellungen"
-
-#: mod/settings.php:1262
-msgid "Change the behaviour of this account for special situations"
-msgstr "Verhalten dieses Kontos in bestimmten Situationen:"
-
-#: mod/settings.php:1265
-msgid "Relocate"
-msgstr "Umziehen"
-
-#: 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 "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button."
-
-#: mod/settings.php:1267
-msgid "Resend relocate message to contacts"
-msgstr "Umzugsbenachrichtigung erneut an Kontakte senden"
-
-#: mod/videos.php:139
-msgid "Do you really want to delete this video?"
-msgstr "Möchtest Du dieses Video wirklich löschen?"
-
-#: mod/videos.php:144
-msgid "Delete Video"
-msgstr "Video Löschen"
-
-#: mod/videos.php:207
-msgid "No videos selected"
-msgstr "Keine Videos  ausgewählt"
-
-#: mod/videos.php:396
-msgid "Recent Videos"
-msgstr "Neueste Videos"
-
-#: mod/videos.php:398
-msgid "Upload New Videos"
-msgstr "Neues Video hochladen"
-
-#: view/theme/duepuntozero/config.php:54 src/Model/User.php:502
-msgid "default"
-msgstr "Standard"
-
-#: 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 "Variationen"
-
-#: view/theme/frio/php/Image.php:24
-msgid "Top Banner"
-msgstr "Top Banner"
-
-#: 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 "Skaliere das Hintergrundbild so, dass es die Breite der Seite einnimmt und fülle den Rest der Seite mit der Hintergrundfarbe bei langen Seiten."
-
-#: view/theme/frio/php/Image.php:25
-msgid "Full screen"
-msgstr "Vollbildmodus"
-
-#: view/theme/frio/php/Image.php:25
-msgid ""
-"Resize image to fill entire screen, clipping either the right or the bottom."
-msgstr "Skaliere das Bild so, dass es den gesamten Bildschirm füllt. Hierfür wird entweder die Breite oder die Höhe des Bildes automatisch abgeschnitten."
-
-#: view/theme/frio/php/Image.php:26
-msgid "Single row mosaic"
-msgstr "Mosaik in einer Zeile"
-
-#: view/theme/frio/php/Image.php:26
-msgid ""
-"Resize image to repeat it on a single row, either vertical or horizontal."
-msgstr "Skaliere das Bild so, dass es in einer einzelnen Reihe, entweder horizontal oder vertikal, wiederholt wird."
-
-#: view/theme/frio/php/Image.php:27
-msgid "Mosaic"
-msgstr "Mosaik"
-
-#: view/theme/frio/php/Image.php:27
-msgid "Repeat image to fill the screen."
-msgstr "Wiederhole das Bild um den Bildschirm zu füllen."
-
-#: view/theme/frio/config.php:102
-msgid "Custom"
-msgstr "Benutzerdefiniert"
-
-#: view/theme/frio/config.php:114
-msgid "Note"
-msgstr "Hinweis"
-
-#: view/theme/frio/config.php:114
-msgid "Check image permissions if all users are allowed to see the image"
-msgstr "Überprüfe, dass alle Benutzer die Berechtigung haben dieses Bild anzusehen"
-
-#: view/theme/frio/config.php:121
-msgid "Select color scheme"
-msgstr "Farbschema auswählen"
-
-#: view/theme/frio/config.php:122
-msgid "Navigation bar background color"
-msgstr "Hintergrundfarbe der Navigationsleiste"
-
-#: view/theme/frio/config.php:123
-msgid "Navigation bar icon color "
-msgstr "Icon Farbe in der Navigationsleiste"
-
-#: view/theme/frio/config.php:124
-msgid "Link color"
-msgstr "Linkfarbe"
-
-#: view/theme/frio/config.php:125
-msgid "Set the background color"
-msgstr "Hintergrundfarbe festlegen"
-
-#: view/theme/frio/config.php:126
-msgid "Content background opacity"
-msgstr "Opazität des Hintergrunds von Beiträgen"
-
-#: view/theme/frio/config.php:127
-msgid "Set the background image"
-msgstr "Hintergrundbild festlegen"
-
-#: view/theme/frio/config.php:128
-msgid "Background image style"
-msgstr "Stiel des Hintergrundbildes"
-
-#: view/theme/frio/config.php:133
-msgid "Login page background image"
-msgstr "Hintergrundbild der Login-Seite"
-
-#: view/theme/frio/config.php:137
-msgid "Login page background color"
-msgstr "Hintergrundfarbe der Login-Seite"
-
-#: view/theme/frio/config.php:137
-msgid "Leave background image and color empty for theme defaults"
-msgstr "Wenn die Theme Vorgaben verwendet werden sollen, lass bitte die Felder für die Hintergrundfarbe und das Hintergrundbild leer."
-
-#: view/theme/frio/theme.php:238
-msgid "Guest"
-msgstr "Gast"
-
-#: view/theme/frio/theme.php:243
-msgid "Visitor"
-msgstr "Besucher"
-
-#: view/theme/frio/theme.php:256 src/Content/Nav.php:97
-#: src/Module/Login.php:312
-msgid "Logout"
-msgstr "Abmelden"
-
-#: view/theme/frio/theme.php:256 src/Content/Nav.php:97
-msgid "End this session"
-msgstr "Diese Sitzung beenden"
-
-#: view/theme/frio/theme.php:259 src/Content/Nav.php:100
-#: src/Content/Nav.php:186
-msgid "Your posts and conversations"
-msgstr "Deine Beiträge und Unterhaltungen"
-
-#: view/theme/frio/theme.php:260 src/Content/Nav.php:101
-msgid "Your profile page"
-msgstr "Deine Profilseite"
-
-#: view/theme/frio/theme.php:261 src/Content/Nav.php:102
-msgid "Your photos"
-msgstr "Deine Fotos"
-
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:103
-#: src/Model/Profile.php:910 src/Model/Profile.php:913
-msgid "Videos"
-msgstr "Videos"
-
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:103
-msgid "Your videos"
-msgstr "Deine Videos"
-
-#: view/theme/frio/theme.php:263 src/Content/Nav.php:104
-msgid "Your events"
-msgstr "Deine Ereignisse"
-
-#: view/theme/frio/theme.php:266 src/Content/Nav.php:183
-msgid "Conversations from your friends"
-msgstr "Unterhaltungen Deiner Kontakte"
-
-#: 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 "Ereignisse und Kalender"
-
-#: view/theme/frio/theme.php:268 src/Content/Nav.php:196
-msgid "Private mail"
-msgstr "Private E-Mail"
-
-#: view/theme/frio/theme.php:269 src/Content/Nav.php:207
-msgid "Account settings"
-msgstr "Kontoeinstellungen"
-
-#: view/theme/frio/theme.php:270 src/Content/Nav.php:213
-msgid "Manage/edit friends and contacts"
-msgstr " Kontakte verwalten/editieren"
-
-#: view/theme/quattro/config.php:76
-msgid "Alignment"
-msgstr "Ausrichtung"
-
-#: view/theme/quattro/config.php:76
-msgid "Left"
-msgstr "Links"
-
-#: view/theme/quattro/config.php:76
-msgid "Center"
-msgstr "Mitte"
-
-#: view/theme/quattro/config.php:77
-msgid "Color scheme"
-msgstr "Farbschema"
-
-#: view/theme/quattro/config.php:78
-msgid "Posts font size"
-msgstr "Schriftgröße in Beiträgen"
-
-#: view/theme/quattro/config.php:79
-msgid "Textareas font size"
-msgstr "Schriftgröße in Eingabefeldern"
-
-#: view/theme/vier/config.php:75
-msgid "Comma separated list of helper forums"
-msgstr "Komma-Separierte Liste der Helfer-Foren"
-
-#: view/theme/vier/config.php:115 src/Core/ACL.php:309
-msgid "don't show"
-msgstr "nicht zeigen"
-
-#: view/theme/vier/config.php:115 src/Core/ACL.php:308
-msgid "show"
-msgstr "zeigen"
-
-#: view/theme/vier/config.php:122
-msgid "Set style"
-msgstr "Stil auswählen"
-
-#: view/theme/vier/config.php:123
-msgid "Community Pages"
-msgstr "Foren"
-
-#: view/theme/vier/config.php:124 view/theme/vier/theme.php:150
-msgid "Community Profiles"
-msgstr "Community-Profile"
-
-#: view/theme/vier/config.php:125
-msgid "Help or @NewHere ?"
-msgstr "Hilfe oder @NewHere"
-
-#: view/theme/vier/config.php:126 view/theme/vier/theme.php:388
-msgid "Connect Services"
-msgstr "Verbinde Dienste"
-
-#: view/theme/vier/config.php:127
-msgid "Find Friends"
-msgstr "Kontakte finden"
-
-#: view/theme/vier/config.php:128 view/theme/vier/theme.php:181
-msgid "Last users"
-msgstr "Letzte Nutzer"
-
-#: view/theme/vier/theme.php:199 src/Content/Widget.php:59
-msgid "Find People"
-msgstr "Leute finden"
-
-#: view/theme/vier/theme.php:200 src/Content/Widget.php:60
-msgid "Enter name or interest"
-msgstr "Name oder Interessen eingeben"
-
-#: view/theme/vier/theme.php:202 src/Content/Widget.php:62
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Beispiel: Robert Morgenstein, Angeln"
-
-#: view/theme/vier/theme.php:205 src/Content/Widget.php:65
-msgid "Similar Interests"
-msgstr "Ähnliche Interessen"
-
-#: view/theme/vier/theme.php:206 src/Content/Widget.php:66
-msgid "Random Profile"
-msgstr "Zufälliges Profil"
-
-#: view/theme/vier/theme.php:207 src/Content/Widget.php:67
-msgid "Invite Friends"
-msgstr "Freunde einladen"
-
-#: view/theme/vier/theme.php:210 src/Content/Widget.php:70
-msgid "Local Directory"
-msgstr "Lokales Verzeichnis"
-
-#: view/theme/vier/theme.php:255 src/Content/ForumManager.php:127
-msgid "External link to forum"
-msgstr "Externer Link zum Forum"
-
-#: view/theme/vier/theme.php:291
-msgid "Quick Start"
-msgstr "Schnell-Start"
-
-#: src/Core/UserImport.php:104
-msgid "Error decoding account file"
-msgstr "Fehler beim Verarbeiten der Account Datei"
-
-#: src/Core/UserImport.php:110
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"
-
-#: src/Core/UserImport.php:118
+#: src/Database/DBStructure.php:473
 #, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "Nutzer '%s' existiert bereits auf diesem Server!"
+msgid "%s: updating %s table."
+msgstr "%s: aktualisiere Tabelle %s"
 
-#: src/Core/UserImport.php:151
-msgid "User creation error"
-msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten"
-
-#: src/Core/UserImport.php:169
-msgid "User profile creation error"
-msgstr "Fehler beim Anlegen des Nutzerkontos"
-
-#: src/Core/UserImport.php:213
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] "%d Kontakt nicht importiert"
-msgstr[1] "%d Kontakte nicht importiert"
-
-#: src/Core/UserImport.php:278
-msgid "Done. You can now login with your username and password"
-msgstr "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden"
-
-#: src/Core/ACL.php:295
-msgid "Post to Email"
-msgstr "An E-Mail senden"
-
-#: src/Core/ACL.php:301
-msgid "Hide your profile details from unknown viewers?"
-msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
-
-#: src/Core/ACL.php:300
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist."
-
-#: src/Core/ACL.php:307
-msgid "Visible to everybody"
-msgstr "Für jeden sichtbar"
-
-#: src/Core/ACL.php:319
-msgid "Close"
-msgstr "Schließen"
-
-#: src/Core/Console/NewPassword.php:78
-msgid "Enter new password: "
-msgstr "Neues Passwort eingeben:"
-
-#: src/Core/Console/NewPassword.php:83 src/Model/User.php:262
-msgid "Password can't be empty"
-msgstr "Das Passwort kann nicht leer sein"
-
-#: src/Core/Console/ArchiveContact.php:67
-#, php-format
-msgid "Could not find any unarchived contact entry for this URL (%s)"
-msgstr "Für die URL (%s) konnte kein nicht-archivierter Kontakt gefunden werden"
-
-#: src/Core/Console/ArchiveContact.php:72
-msgid "The contact entries have been archived"
-msgstr "Die Kontakteinträge wurden archiviert."
-
-#: src/Core/NotificationsManager.php:171
-msgid "System"
-msgstr "System"
-
-#: src/Core/NotificationsManager.php:192 src/Content/Nav.php:124
-#: src/Content/Nav.php:186
-msgid "Home"
-msgstr "Pinnwand"
-
-#: src/Core/NotificationsManager.php:199 src/Content/Nav.php:190
-msgid "Introductions"
-msgstr "Kontaktanfragen"
-
-#: src/Core/NotificationsManager.php:256 src/Core/NotificationsManager.php:268
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s hat %ss Beitrag kommentiert"
-
-#: src/Core/NotificationsManager.php:267
-#, php-format
-msgid "%s created a new post"
-msgstr "%s hat einen neuen Beitrag erstellt"
-
-#: src/Core/NotificationsManager.php:281
-#, php-format
-msgid "%s liked %s's post"
-msgstr "%s mag %ss Beitrag"
-
-#: src/Core/NotificationsManager.php:294
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "%s mag %ss Beitrag nicht"
-
-#: src/Core/NotificationsManager.php:307
-#, php-format
-msgid "%s is attending %s's event"
-msgstr "%s nimmt an %s's Event teil"
-
-#: src/Core/NotificationsManager.php:320
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr "%s nimmt nicht an %s's Event teil"
-
-#: src/Core/NotificationsManager.php:333
-#, php-format
-msgid "%s may attend %s's event"
-msgstr "%s nimmt eventuell an %s's Event teil"
-
-#: src/Core/NotificationsManager.php:350
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s ist jetzt mit %s befreundet"
-
-#: src/Core/NotificationsManager.php:825
-msgid "Friend Suggestion"
-msgstr "Kontaktvorschlag"
-
-#: src/Core/NotificationsManager.php:851
-msgid "Friend/Connect Request"
-msgstr "Kontakt-/Freundschaftsanfrage"
-
-#: src/Core/NotificationsManager.php:851
-msgid "New Follower"
-msgstr "Neuer Bewunderer"
-
-#: 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 "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden."
 
-#: 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 "
@@ -7810,223 +7839,634 @@ msgid ""
 "up-the-worker'>'Setup the worker'</a>"
 msgstr "Wenn auf deinem Server keine Kommandozeilenversion von PHP installiert ist, kannst du den Hintergrundprozess nicht einrichten. Hier findest du alternative Möglichkeiten<a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'für das Worker Setup'</a>"
 
-#: src/Core/Install.php:162
+#: src/Core/Install.php:143
 msgid "PHP executable path"
 msgstr "Pfad zu 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 "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren."
 
-#: src/Core/Install.php:167
+#: src/Core/Install.php:148
 msgid "Command line PHP"
 msgstr "Kommandozeilen-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 "Die ausführbare Datei von PHP stimmt nicht mit der PHP cli Version überein (es könnte sich um die cgi-fgci Version handeln)"
 
-#: src/Core/Install.php:177
+#: src/Core/Install.php:158
 msgid "Found PHP version: "
 msgstr "Gefundene PHP Version:"
 
-#: src/Core/Install.php:179
+#: src/Core/Install.php:160
 msgid "PHP cli binary"
 msgstr "PHP CLI Binary"
 
-#: 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 "Die Kommandozeilenversion von PHP auf Deinem System hat \"register_argc_argv\" nicht aktiviert."
 
-#: src/Core/Install.php:190
+#: src/Core/Install.php:171
 msgid "This is required for message delivery to work."
 msgstr "Dies wird für die Auslieferung von Nachrichten benötigt."
 
-#: 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 "Fehler: Die Funktion \"openssl_pkey_new\" auf diesem System ist nicht in der Lage, Verschlüsselungsschlüssel zu erzeugen"
 
-#: 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 "Wenn der Server unter Windows läuft, schau Dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an."
 
-#: src/Core/Install.php:223
+#: src/Core/Install.php:204
 msgid "Generate encryption keys"
 msgstr "Schlüssel erzeugen"
 
-#: src/Core/Install.php:244
+#: src/Core/Install.php:225
 msgid "libCurl PHP module"
 msgstr "PHP: libCurl-Modul"
 
-#: src/Core/Install.php:245
+#: src/Core/Install.php:226
 msgid "GD graphics PHP module"
 msgstr "PHP: GD-Grafikmodul"
 
-#: src/Core/Install.php:246
+#: src/Core/Install.php:227
 msgid "OpenSSL PHP module"
 msgstr "PHP: OpenSSL-Modul"
 
-#: src/Core/Install.php:247
+#: src/Core/Install.php:228
 msgid "PDO or MySQLi PHP module"
 msgstr "PDO oder MySQLi PHP Modul"
 
-#: src/Core/Install.php:248
+#: src/Core/Install.php:229
 msgid "mb_string PHP module"
 msgstr "PHP: mb_string-Modul"
 
-#: src/Core/Install.php:249
+#: src/Core/Install.php:230
 msgid "XML PHP module"
 msgstr "XML PHP Modul"
 
-#: src/Core/Install.php:250
+#: src/Core/Install.php:231
 msgid "iconv PHP module"
 msgstr "PHP iconv Modul"
 
-#: src/Core/Install.php:251
+#: src/Core/Install.php:232
 msgid "POSIX PHP module"
 msgstr "PHP POSIX Modul"
 
-#: 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 module"
 
-#: src/Core/Install.php:255
+#: src/Core/Install.php:236
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert."
 
-#: src/Core/Install.php:263
+#: src/Core/Install.php:244
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert."
 
-#: src/Core/Install.php:267
+#: src/Core/Install.php:248
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert."
 
-#: src/Core/Install.php:271
+#: src/Core/Install.php:252
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Fehler: Das openssl-Modul von PHP ist nicht installiert."
 
-#: src/Core/Install.php:275
+#: src/Core/Install.php:256
 msgid "Error: PDO or MySQLi PHP module required but not installed."
 msgstr "Fehler: PDO oder MySQLi PHP Modul erforderlich, aber nicht installiert."
 
-#: src/Core/Install.php:279
+#: src/Core/Install.php:260
 msgid "Error: The MySQL driver for PDO is not installed."
 msgstr "Fehler: der MySQL Treiber für PDO ist nicht installiert"
 
-#: src/Core/Install.php:283
+#: src/Core/Install.php:264
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert."
 
-#: src/Core/Install.php:287
+#: src/Core/Install.php:268
 msgid "Error: iconv PHP module required but not installed."
 msgstr "Fehler: Das iconv-Modul von PHP ist nicht installiert."
 
-#: src/Core/Install.php:291
+#: src/Core/Install.php:272
 msgid "Error: POSIX PHP module required but not installed."
 msgstr "Fehler POSIX PHP Modul erforderlich aber nicht installiert."
 
-#: src/Core/Install.php:301
+#: src/Core/Install.php:282
 msgid "Error, XML PHP module required but not installed."
 msgstr "Fehler: XML PHP Modul erforderlich aber nicht installiert."
 
-#: 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 "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis Deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun."
+"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 "Das Installationsprogramm muss in der Lage sein, eine Datei namens \"local.ini.php\" im Ordner \"config\" Ihres Webservers zu erstellen, ist aber nicht in der Lager dazu."
 
-#: 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 "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast."
 
-#: 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 "Nachdem Du alles ausgefüllt hast, erhältst Du einen Text, den Du in eine Datei namens .htconfig.php in Deinem Friendica-Wurzelverzeichnis kopieren musst."
+"named local.ini.php in your Friendica \"config\" folder."
+msgstr "Am Ende dieser Prozedur bekommst du einen Text der in der local.ini.php im Friendica \"config\" Ordner gespeichert werden muss."
 
-#: 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 "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt."
 
-#: src/Core/Install.php:326
-msgid ".htconfig.php is writable"
-msgstr "Schreibrechte auf .htconfig.php"
+#: src/Core/Install.php:307
+msgid "config/local.ini.php is writable"
+msgstr "config/local.ini.php ist beschreibbar"
 
-#: 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 nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen."
 
-#: 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 "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von 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 "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat."
 
-#: 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 "Hinweis: aus Sicherheitsgründen solltest Du dem Webserver nur Schreibrechte für view/smarty3/ geben -- Nicht den Templatedateien (.tpl) die sie enthalten."
 
-#: src/Core/Install.php:350
+#: src/Core/Install.php:331
 msgid "view/smarty3 is writable"
 msgstr "view/smarty3 ist schreibbar"
 
-#: src/Core/Install.php:375
+#: src/Core/Install.php:356
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr "Umschreiben der URLs in der .htaccess funktioniert nicht. Überprüfe die Konfiguration des Servers."
 
-#: src/Core/Install.php:377
+#: src/Core/Install.php:358
 msgid "Error message from Curl when fetching"
 msgstr "Fehlermeldung von Curl während des Ladens"
 
-#: src/Core/Install.php:381
+#: src/Core/Install.php:362
 msgid "Url rewrite is working"
 msgstr "URL rewrite funktioniert"
 
-#: src/Core/Install.php:408
+#: src/Core/Install.php:389
 msgid "ImageMagick PHP extension is not installed"
 msgstr "ImageMagicx PHP Erweiterung ist nicht installiert."
 
-#: src/Core/Install.php:410
+#: src/Core/Install.php:391
 msgid "ImageMagick PHP extension is installed"
 msgstr "ImageMagick PHP Erweiterung ist installiert"
 
-#: src/Core/Install.php:412
+#: src/Core/Install.php:393
 msgid "ImageMagick supports GIF"
 msgstr "ImageMagick unterstützt GIF"
 
-#: src/Util/Temporal.php:147 src/Model/Profile.php:756
+#: src/Core/ACL.php:284
+msgid "Post to Email"
+msgstr "An E-Mail senden"
+
+#: src/Core/ACL.php:290
+msgid "Hide your profile details from unknown viewers?"
+msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
+
+#: src/Core/ACL.php:289
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist."
+
+#: src/Core/ACL.php:296
+msgid "Visible to everybody"
+msgstr "Für jeden sichtbar"
+
+#: src/Core/ACL.php:308
+msgid "Close"
+msgstr "Schließen"
+
+#: src/Core/Console/ArchiveContact.php:65
+#, php-format
+msgid "Could not find any unarchived contact entry for this URL (%s)"
+msgstr "Für die URL (%s) konnte kein nicht-archivierter Kontakt gefunden werden"
+
+#: src/Core/Console/ArchiveContact.php:70
+msgid "The contact entries have been archived"
+msgstr "Die Kontakteinträge wurden archiviert."
+
+#: src/Core/Console/PostUpdate.php:32
+msgid "Execute pending post updates."
+msgstr "Ausstehende Post-Updates ausführen"
+
+#: src/Core/Console/PostUpdate.php:38
+msgid "All pending post updates are done."
+msgstr "Alle ausstehenden Post-Updates wurden ausgeführt."
+
+#: src/Core/Console/NewPassword.php:73
+msgid "Enter new password: "
+msgstr "Neues Passwort eingeben:"
+
+#: src/Core/Console/NewPassword.php:78 src/Model/User.php:269
+msgid "Password can't be empty"
+msgstr "Das Passwort kann nicht leer sein"
+
+#: src/Core/NotificationsManager.php:172
+msgid "System"
+msgstr "System"
+
+#: src/Core/NotificationsManager.php:193 src/Content/Nav.php:124
+#: src/Content/Nav.php:186
+msgid "Home"
+msgstr "Pinnwand"
+
+#: src/Core/NotificationsManager.php:200 src/Content/Nav.php:190
+msgid "Introductions"
+msgstr "Kontaktanfragen"
+
+#: src/Core/NotificationsManager.php:262 src/Core/NotificationsManager.php:274
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s hat %ss Beitrag kommentiert"
+
+#: src/Core/NotificationsManager.php:273
+#, php-format
+msgid "%s created a new post"
+msgstr "%s hat einen neuen Beitrag erstellt"
+
+#: src/Core/NotificationsManager.php:287
+#, php-format
+msgid "%s liked %s's post"
+msgstr "%s mag %ss Beitrag"
+
+#: src/Core/NotificationsManager.php:300
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "%s mag %ss Beitrag nicht"
+
+#: src/Core/NotificationsManager.php:313
+#, php-format
+msgid "%s is attending %s's event"
+msgstr "%s nimmt an %s's Event teil"
+
+#: src/Core/NotificationsManager.php:326
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr "%s nimmt nicht an %s's Event teil"
+
+#: src/Core/NotificationsManager.php:339
+#, php-format
+msgid "%s may attend %s's event"
+msgstr "%s nimmt eventuell an %s's Event teil"
+
+#: src/Core/NotificationsManager.php:360
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s ist jetzt mit %s befreundet"
+
+#: src/Core/NotificationsManager.php:626
+msgid "Friend Suggestion"
+msgstr "Kontaktvorschlag"
+
+#: src/Core/NotificationsManager.php:656
+msgid "Friend/Connect Request"
+msgstr "Kontakt-/Freundschaftsanfrage"
+
+#: src/Core/NotificationsManager.php:656
+msgid "New Follower"
+msgstr "Neuer Bewunderer"
+
+#: src/Core/UserImport.php:100
+msgid "Error decoding account file"
+msgstr "Fehler beim Verarbeiten der Account Datei"
+
+#: src/Core/UserImport.php:106
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?"
+
+#: src/Core/UserImport.php:114
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "Nutzer '%s' existiert bereits auf diesem Server!"
+
+#: src/Core/UserImport.php:147
+msgid "User creation error"
+msgstr "Fehler beim Anlegen des Nutzeraccounts aufgetreten"
+
+#: src/Core/UserImport.php:165
+msgid "User profile creation error"
+msgstr "Fehler beim Anlegen des Nutzerkontos"
+
+#: src/Core/UserImport.php:209
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d Kontakt nicht importiert"
+msgstr[1] "%d Kontakte nicht importiert"
+
+#: src/Core/UserImport.php:274
+msgid "Done. You can now login with your username and password"
+msgstr "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden"
+
+#: src/Worker/Delivery.php:423
+msgid "(no subject)"
+msgstr "(kein Betreff)"
+
+#: src/Object/Post.php:130
+msgid "This entry was edited"
+msgstr "Dieser Beitrag wurde bearbeitet."
+
+#: src/Object/Post.php:190
+msgid "Delete globally"
+msgstr "Global löschen"
+
+#: src/Object/Post.php:190
+msgid "Remove locally"
+msgstr "Lokal entfernen"
+
+#: src/Object/Post.php:203
+msgid "save to folder"
+msgstr "In Ordner speichern"
+
+#: src/Object/Post.php:232
+msgid "I will attend"
+msgstr "Ich werde teilnehmen"
+
+#: src/Object/Post.php:232
+msgid "I will not attend"
+msgstr "Ich werde nicht teilnehmen"
+
+#: src/Object/Post.php:232
+msgid "I might attend"
+msgstr "Ich werde eventuell teilnehmen"
+
+#: src/Object/Post.php:259
+msgid "ignore thread"
+msgstr "Thread ignorieren"
+
+#: src/Object/Post.php:260
+msgid "unignore thread"
+msgstr "Thread nicht mehr ignorieren"
+
+#: src/Object/Post.php:261
+msgid "toggle ignore status"
+msgstr "Ignoriert-Status ein-/ausschalten"
+
+#: src/Object/Post.php:272
+msgid "add star"
+msgstr "markieren"
+
+#: src/Object/Post.php:273
+msgid "remove star"
+msgstr "Markierung entfernen"
+
+#: src/Object/Post.php:274
+msgid "toggle star status"
+msgstr "Markierung umschalten"
+
+#: src/Object/Post.php:277
+msgid "starred"
+msgstr "markiert"
+
+#: src/Object/Post.php:282
+msgid "add tag"
+msgstr "Tag hinzufügen"
+
+#: src/Object/Post.php:293
+msgid "like"
+msgstr "mag ich"
+
+#: src/Object/Post.php:294
+msgid "dislike"
+msgstr "mag ich nicht"
+
+#: src/Object/Post.php:297
+msgid "Share this"
+msgstr "Weitersagen"
+
+#: src/Object/Post.php:297
+msgid "share"
+msgstr "Teilen"
+
+#: src/Object/Post.php:364
+msgid "to"
+msgstr "zu"
+
+#: 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 Kommentar"
+msgstr[1] "%d Kommentare"
+
+#: src/Object/Post.php:796
+msgid "Bold"
+msgstr "Fett"
+
+#: src/Object/Post.php:797
+msgid "Italic"
+msgstr "Kursiv"
+
+#: src/Object/Post.php:798
+msgid "Underline"
+msgstr "Unterstrichen"
+
+#: src/Object/Post.php:799
+msgid "Quote"
+msgstr "Zitat"
+
+#: src/Object/Post.php:800
+msgid "Code"
+msgstr "Code"
+
+#: src/Object/Post.php:801
+msgid "Image"
+msgstr "Bild"
+
+#: 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 "Diesen Beitrag löschen?"
+
+#: src/App.php:787
+msgid "show fewer"
+msgstr "weniger anzeigen"
+
+#: src/App.php:1385
+msgid "No system theme config value set."
+msgstr "Es wurde kein Konfigurationswert für das Systemweite Theme gesetzt."
+
+#: src/Module/Logout.php:28
+msgid "Logged out."
+msgstr "Abgemeldet."
+
+#: 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 "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast."
+
+#: src/Module/Login.php:100 src/Model/User.php:408
+msgid "The error message was:"
+msgstr "Die Fehlermeldung lautete:"
+
+#: src/Module/Login.php:280
+msgid "Create a New Account"
+msgstr "Neues Konto erstellen"
+
+#: src/Module/Login.php:313
+msgid "Password: "
+msgstr "Passwort: "
+
+#: src/Module/Login.php:314
+msgid "Remember me"
+msgstr "Anmeldedaten merken"
+
+#: src/Module/Login.php:317
+msgid "Or login using OpenID: "
+msgstr "Oder melde Dich mit Deiner OpenID an: "
+
+#: src/Module/Login.php:323
+msgid "Forgot your password?"
+msgstr "Passwort vergessen?"
+
+#: src/Module/Login.php:326
+msgid "Website Terms of Service"
+msgstr "Website Nutzungsbedingungen"
+
+#: src/Module/Login.php:327
+msgid "terms of service"
+msgstr "Nutzungsbedingungen"
+
+#: src/Module/Login.php:329
+msgid "Website Privacy Policy"
+msgstr "Website Datenschutzerklärung"
+
+#: src/Module/Login.php:330
+msgid "privacy policy"
+msgstr "Datenschutzerklärung"
+
+#: 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 "Zum Zwecke der Registrierung und um die Kommunikation zwischen dem Nutzer und seinen Kontakten zu gewährleisten, muß der Nutzer einen Namen (auch Pseudonym) und einen Nutzernamen (Spitzname) sowie eine funktionierende E-Mail-Adresse angeben. Der Name ist auf der Profilseite für alle Nutzer sichtbar, auch wenn die Profildetails nicht angezeigt werden.\nDie E-Mail-Adresse wird nur zur Benachrichtigung des Nutzers verwendet, sie wird nirgends angezeigt. Die Anzeige des Nutzerkontos im Server-Verzeichnis bzw. dem weltweiten Verzeichnis erfolgt gemäß den Einstellungen des Nutzers, sie ist zur Kommunikation nicht zwingend notwendig."
+
+#: 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 "Diese Daten sind für die Kommunikation notwendig und werden an die Knoten der Kommunikationspartner übermittelt. und werden dort gespeichert Nutzer können weitere private Angaben machen, die ebenfalls an die verwendeten Server der Kommunikationspartner übermittelt werden können."
+
+#: 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 "Angemeldete Nutzer können ihre Nutzerdaten jederzeit von den <a href=\"%1$s/settings/uexport\">Kontoeinstellungen</a> aus exportieren. Wenn ein Nutzer wünscht das Nutzerkonto zu löschen, so ist dies jederzeit unter <a href=\"%1$s/removeme\">%1$s/removeme</a> möglich. Die Löschung des Nutzerkontos ist permanent. Die Löschung der Daten wird auch von den Knoten der Kommunikationspartner angefordert."
+
+#: src/Module/Tos.php:39 src/Module/Tos.php:73
+msgid "Privacy Statement"
+msgstr "Datenschutzerklärung"
+
+#: src/Protocol/OStatus.php:1813
+#, php-format
+msgid "%s is now following %s."
+msgstr "%s folgt nun %s"
+
+#: src/Protocol/OStatus.php:1814
+msgid "following"
+msgstr "folgen"
+
+#: src/Protocol/OStatus.php:1817
+#, php-format
+msgid "%s stopped following %s."
+msgstr "%s hat aufgehört %s zu folgen"
+
+#: src/Protocol/OStatus.php:1818
+msgid "stopped following"
+msgstr "wird nicht mehr gefolgt"
+
+#: src/Protocol/DFRN.php:1525 src/Model/Contact.php:1956
+#, php-format
+msgid "%s's birthday"
+msgstr "%ss Geburtstag"
+
+#: src/Protocol/DFRN.php:1526 src/Model/Contact.php:1957
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "Herzlichen Glückwunsch %s"
+
+#: src/Protocol/Diaspora.php:2417
+msgid "Sharing notification from Diaspora network"
+msgstr "Freigabe-Benachrichtigung von Diaspora"
+
+#: src/Protocol/Diaspora.php:3514
+msgid "Attachments:"
+msgstr "Anhänge:"
+
+#: src/Util/Temporal.php:147 src/Model/Profile.php:745
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
@@ -8091,363 +8531,438 @@ msgstr "Sekunden"
 msgid "%1$d %2$s ago"
 msgstr "vor %1$d %2$s"
 
-#: src/Content/Text/BBCode.php:426
-msgid "view full size"
-msgstr "Volle Größe anzeigen"
-
-#: src/Content/Text/BBCode.php:852 src/Content/Text/BBCode.php:1621
-#: src/Content/Text/BBCode.php:1622
-msgid "Image/photo"
-msgstr "Bild/Foto"
-
-#: src/Content/Text/BBCode.php:990
-#, 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"
+#: src/Model/Mail.php:39 src/Model/Mail.php:171
+msgid "[no subject]"
+msgstr "[kein Betreff]"
+
+#: src/Model/Contact.php:942
+msgid "Drop Contact"
+msgstr "Kontakt löschen"
+
+#: src/Model/Contact.php:1399
+msgid "Organisation"
+msgstr "Organisation"
+
+#: src/Model/Contact.php:1403
+msgid "News"
+msgstr "Nachrichten"
+
+#: src/Model/Contact.php:1407
+msgid "Forum"
+msgstr "Forum"
+
+#: src/Model/Contact.php:1587
+msgid "Connect URL missing."
+msgstr "Connect-URL fehlt"
+
+#: 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 "Der Kontakt konnte nicht hinzugefügt werden. Bitte überprüfe die Einstellungen unter Einstellungen -> Soziale Netzwerke"
+
+#: src/Model/Contact.php:1635
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."
+
+#: src/Model/Contact.php:1636 src/Model/Contact.php:1650
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."
+
+#: src/Model/Contact.php:1648
+msgid "The profile address specified does not provide adequate information."
+msgstr "Die angegebene Profiladresse liefert unzureichende Informationen."
+
+#: src/Model/Contact.php:1653
+msgid "An author or name was not found."
+msgstr "Es wurde kein Autor oder Name gefunden."
+
+#: src/Model/Contact.php:1656
+msgid "No browser URL could be matched to this address."
+msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."
+
+#: src/Model/Contact.php:1659
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."
+
+#: src/Model/Contact.php:1660
+msgid "Use mailto: in front of address to force email check."
+msgstr "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."
+
+#: src/Model/Contact.php:1666
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."
+
+#: src/Model/Contact.php:1671
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können."
+
+#: src/Model/Contact.php:1722
+msgid "Unable to retrieve contact information."
+msgstr "Konnte die Kontaktinformationen nicht empfangen."
+
+#: src/Model/Event.php:59 src/Model/Event.php:76 src/Model/Event.php:428
+#: src/Model/Event.php:897
+msgid "Starts:"
+msgstr "Beginnt:"
+
+#: src/Model/Event.php:62 src/Model/Event.php:82 src/Model/Event.php:429
+#: src/Model/Event.php:901
+msgid "Finishes:"
+msgstr "Endet:"
+
+#: src/Model/Event.php:377
+msgid "all-day"
+msgstr "ganztägig"
+
+#: 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 "Keine Veranstaltung zum Anzeigen"
+
+#: src/Model/Event.php:550
+msgid "l, F j"
+msgstr "l, F j"
+
+#: src/Model/Event.php:581
+msgid "Edit event"
+msgstr "Veranstaltung bearbeiten"
+
+#: src/Model/Event.php:582
+msgid "Duplicate event"
+msgstr "Veranstaltung kopieren"
+
+#: src/Model/Event.php:583
+msgid "Delete event"
+msgstr "Veranstaltung löschen"
+
+#: src/Model/Event.php:830
+msgid "D g:i A"
+msgstr "D H:i"
+
+#: src/Model/Event.php:831
+msgid "g:i A"
+msgstr "H:i"
+
+#: src/Model/Event.php:916 src/Model/Event.php:918
+msgid "Show map"
+msgstr "Karte anzeigen"
+
+#: src/Model/Event.php:917
+msgid "Hide map"
+msgstr "Karte verbergen"
+
+#: src/Model/User.php:168
+msgid "Login failed"
+msgstr "Anmeldung fehlgeschlagen"
+
+#: src/Model/User.php:199
+msgid "Not enough information to authenticate"
+msgstr "Nicht genügend Informationen für die Authentifizierung"
+
+#: src/Model/User.php:384
+msgid "An invitation is required."
+msgstr "Du benötigst eine Einladung."
+
+#: src/Model/User.php:388
+msgid "Invitation could not be verified."
+msgstr "Die Einladung konnte nicht überprüft werden."
+
+#: src/Model/User.php:395
+msgid "Invalid OpenID url"
+msgstr "Ungültige OpenID URL"
+
+#: src/Model/User.php:414
+msgid "Please enter the required information."
+msgstr "Bitte trage die erforderlichen Informationen ein."
+
+#: src/Model/User.php:427
+msgid "Please use a shorter name."
+msgstr "Bitte verwende einen kürzeren Namen."
+
+#: src/Model/User.php:430
+msgid "Name too short."
+msgstr "Der Name ist zu kurz."
 
-#: src/Content/Text/BBCode.php:1548 src/Content/Text/BBCode.php:1570
-msgid "$1 wrote:"
-msgstr "$1 hat geschrieben:"
+#: src/Model/User.php:438
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein."
 
-#: src/Content/Text/BBCode.php:1630 src/Content/Text/BBCode.php:1631
-msgid "Encrypted content"
-msgstr "Verschlüsselter Inhalt"
+#: src/Model/User.php:443
+msgid "Your email domain is not among those allowed on this site."
+msgstr "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."
 
-#: src/Content/Text/BBCode.php:1750
-msgid "Invalid source protocol"
-msgstr "Ungültiges Quell-Protokoll"
+#: src/Model/User.php:447
+msgid "Not a valid email address."
+msgstr "Keine gültige E-Mail-Adresse."
 
-#: src/Content/Text/BBCode.php:1761
-msgid "Invalid link protocol"
-msgstr "Ungültiges Link-Protokoll"
+#: src/Model/User.php:450
+msgid "The nickname was blocked from registration by the nodes admin."
+msgstr "Der Admin des Knotens hat den Spitznamen für die Registrierung gesperrt."
 
-#: src/Content/OEmbed.php:253
-msgid "Embedding disabled"
-msgstr "Einbettungen deaktiviert"
+#: src/Model/User.php:454 src/Model/User.php:462
+msgid "Cannot use that email."
+msgstr "Konnte diese E-Mail-Adresse nicht verwenden."
 
-#: src/Content/OEmbed.php:373
-msgid "Embedded content"
-msgstr "Eingebetteter Inhalt"
+#: src/Model/User.php:469
+msgid "Your nickname can only contain a-z, 0-9 and _."
+msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen."
 
-#: src/Content/Widget/CalendarExport.php:61
-msgid "Export"
-msgstr "Exportieren"
+#: src/Model/User.php:476 src/Model/User.php:533
+msgid "Nickname is already registered. Please choose another."
+msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
 
-#: src/Content/Widget/CalendarExport.php:62
-msgid "Export calendar as ical"
-msgstr "Kalender als ical exportieren"
+#: src/Model/User.php:486
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."
 
-#: src/Content/Widget/CalendarExport.php:63
-msgid "Export calendar as csv"
-msgstr "Kalender als csv exportieren"
+#: src/Model/User.php:520 src/Model/User.php:524
+msgid "An error occurred during registration. Please try again."
+msgstr "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
 
-#: src/Content/ContactSelector.php:55
-msgid "Frequently"
-msgstr "immer wieder"
+#: src/Model/User.php:549
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
 
-#: src/Content/ContactSelector.php:56
-msgid "Hourly"
-msgstr "Stündlich"
+#: src/Model/User.php:556
+msgid "An error occurred creating your self contact. Please try again."
+msgstr "Bei der Erstellung deines self Kontakts ist ein Fehler aufgetreten. Bitte versuche es erneut."
 
-#: src/Content/ContactSelector.php:57
-msgid "Twice daily"
-msgstr "Zweimal täglich"
-
-#: src/Content/ContactSelector.php:58
-msgid "Daily"
-msgstr "Täglich"
-
-#: src/Content/ContactSelector.php:59
-msgid "Weekly"
-msgstr "Wöchentlich"
-
-#: src/Content/ContactSelector.php:60
-msgid "Monthly"
-msgstr "Monatlich"
-
-#: 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 "Zott"
-
-#: src/Content/ContactSelector.php:86
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: src/Content/ContactSelector.php:87
-msgid "XMPP/IM"
-msgstr "XMPP/Chat"
-
-#: 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 "Twitter"
-
-#: src/Content/ContactSelector.php:92
-msgid "Diaspora Connector"
-msgstr "Diaspora Connector"
-
-#: src/Content/ContactSelector.php:93
-msgid "GNU Social Connector"
-msgstr "GNU social Connector"
-
-#: src/Content/ContactSelector.php:94
-msgid "pnut"
-msgstr "pnut"
-
-#: src/Content/ContactSelector.php:95
-msgid "App.net"
-msgstr "App.net"
-
-#: src/Content/ContactSelector.php:125
-msgid "Male"
-msgstr "Männlich"
-
-#: src/Content/ContactSelector.php:125
-msgid "Female"
-msgstr "Weiblich"
-
-#: src/Content/ContactSelector.php:125
-msgid "Currently Male"
-msgstr "Momentan männlich"
-
-#: src/Content/ContactSelector.php:125
-msgid "Currently Female"
-msgstr "Momentan weiblich"
-
-#: src/Content/ContactSelector.php:125
-msgid "Mostly Male"
-msgstr "Hauptsächlich männlich"
-
-#: src/Content/ContactSelector.php:125
-msgid "Mostly Female"
-msgstr "Hauptsächlich weiblich"
-
-#: src/Content/ContactSelector.php:125
-msgid "Transgender"
-msgstr "Transgender"
-
-#: src/Content/ContactSelector.php:125
-msgid "Intersex"
-msgstr "Intersex"
-
-#: src/Content/ContactSelector.php:125
-msgid "Transsexual"
-msgstr "Transsexuell"
-
-#: src/Content/ContactSelector.php:125
-msgid "Hermaphrodite"
-msgstr "Hermaphrodit"
-
-#: src/Content/ContactSelector.php:125
-msgid "Neuter"
-msgstr "Neuter"
-
-#: src/Content/ContactSelector.php:125
-msgid "Non-specific"
-msgstr "Nicht spezifiziert"
-
-#: src/Content/ContactSelector.php:125
-msgid "Other"
-msgstr "Andere"
-
-#: src/Content/ContactSelector.php:147
-msgid "Males"
-msgstr "Männer"
-
-#: src/Content/ContactSelector.php:147
-msgid "Females"
-msgstr "Frauen"
-
-#: src/Content/ContactSelector.php:147
-msgid "Gay"
-msgstr "Schwul"
-
-#: src/Content/ContactSelector.php:147
-msgid "Lesbian"
-msgstr "Lesbisch"
-
-#: src/Content/ContactSelector.php:147
-msgid "No Preference"
-msgstr "Keine Vorlieben"
-
-#: src/Content/ContactSelector.php:147
-msgid "Bisexual"
-msgstr "Bisexuell"
-
-#: src/Content/ContactSelector.php:147
-msgid "Autosexual"
-msgstr "Autosexual"
-
-#: src/Content/ContactSelector.php:147
-msgid "Abstinent"
-msgstr "Abstinent"
-
-#: src/Content/ContactSelector.php:147
-msgid "Virgin"
-msgstr "Jungfrauen"
-
-#: src/Content/ContactSelector.php:147
-msgid "Deviant"
-msgstr "Deviant"
-
-#: src/Content/ContactSelector.php:147
-msgid "Fetish"
-msgstr "Fetish"
-
-#: src/Content/ContactSelector.php:147
-msgid "Oodles"
-msgstr "Oodles"
-
-#: src/Content/ContactSelector.php:147
-msgid "Nonsexual"
-msgstr "Nonsexual"
-
-#: src/Content/ContactSelector.php:169
-msgid "Single"
-msgstr "Single"
-
-#: src/Content/ContactSelector.php:169
-msgid "Lonely"
-msgstr "Einsam"
-
-#: src/Content/ContactSelector.php:169
-msgid "Available"
-msgstr "Verfügbar"
-
-#: src/Content/ContactSelector.php:169
-msgid "Unavailable"
-msgstr "Nicht verfügbar"
-
-#: src/Content/ContactSelector.php:169
-msgid "Has crush"
-msgstr "verknallt"
-
-#: src/Content/ContactSelector.php:169
-msgid "Infatuated"
-msgstr "verliebt"
-
-#: src/Content/ContactSelector.php:169
-msgid "Dating"
-msgstr "Dating"
-
-#: src/Content/ContactSelector.php:169
-msgid "Unfaithful"
-msgstr "Untreu"
-
-#: src/Content/ContactSelector.php:169
-msgid "Sex Addict"
-msgstr "Sexbesessen"
-
-#: src/Content/ContactSelector.php:169 src/Model/User.php:519
+#: src/Model/User.php:561 src/Content/ContactSelector.php:166
 msgid "Friends"
 msgstr "Kontakte"
 
-#: src/Content/ContactSelector.php:169
-msgid "Friends/Benefits"
-msgstr "Freunde/Zuwendungen"
+#: src/Model/User.php:565
+msgid ""
+"An error occurred creating your default contact group. Please try again."
+msgstr "Bei der Erstellung deiner Standardgruppe für Kontakte ist ein Fehler aufgetreten. Bitte versuche es erneut."
 
-#: src/Content/ContactSelector.php:169
-msgid "Casual"
-msgstr "Casual"
+#: 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 "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account muss noch vom Admin des Knotens geprüft werden."
 
-#: src/Content/ContactSelector.php:169
-msgid "Engaged"
-msgstr "Verlobt"
+#: src/Model/User.php:649
+#, php-format
+msgid "Registration at %s"
+msgstr "Registrierung als %s"
 
-#: src/Content/ContactSelector.php:169
-msgid "Married"
-msgstr "Verheiratet"
+#: 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 "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde eingerichtet."
 
-#: src/Content/ContactSelector.php:169
-msgid "Imaginarily married"
-msgstr "imaginär verheiratet"
+#: 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 "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3$s/removeme jederzeit tun.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2$s."
 
-#: src/Content/ContactSelector.php:169
-msgid "Partners"
-msgstr "Partner"
+#: 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 "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls Du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen."
 
-#: src/Content/ContactSelector.php:169
-msgid "Cohabiting"
-msgstr "zusammenlebend"
+#: src/Model/Group.php:329
+msgid "Default privacy group for new contacts"
+msgstr "Voreingestellte Gruppe für neue Kontakte"
 
-#: src/Content/ContactSelector.php:169
-msgid "Common law"
-msgstr "wilde Ehe"
+#: src/Model/Group.php:362
+msgid "Everybody"
+msgstr "Alle Kontakte"
 
-#: src/Content/ContactSelector.php:169
-msgid "Happy"
-msgstr "Glücklich"
+#: src/Model/Group.php:382
+msgid "edit"
+msgstr "bearbeiten"
 
-#: src/Content/ContactSelector.php:169
-msgid "Not looking"
-msgstr "Nicht auf der Suche"
+#: src/Model/Group.php:406
+msgid "Edit group"
+msgstr "Gruppe bearbeiten"
 
-#: src/Content/ContactSelector.php:169
-msgid "Swinger"
-msgstr "Swinger"
+#: src/Model/Group.php:409
+msgid "Create a new group"
+msgstr "Neue Gruppe erstellen"
 
-#: src/Content/ContactSelector.php:169
-msgid "Betrayed"
-msgstr "Betrogen"
+#: src/Model/Group.php:411
+msgid "Edit groups"
+msgstr "Gruppen bearbeiten"
 
-#: src/Content/ContactSelector.php:169
-msgid "Separated"
-msgstr "Getrennt"
+#: src/Model/Profile.php:97
+msgid "Requested account is not available."
+msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: src/Content/ContactSelector.php:169
-msgid "Unstable"
-msgstr "Unstabil"
+#: src/Model/Profile.php:163 src/Model/Profile.php:399
+#: src/Model/Profile.php:846
+msgid "Edit profile"
+msgstr "Profil bearbeiten"
 
-#: src/Content/ContactSelector.php:169
-msgid "Divorced"
-msgstr "Geschieden"
+#: src/Model/Profile.php:333
+msgid "Atom feed"
+msgstr "Atom-Feed"
 
-#: src/Content/ContactSelector.php:169
-msgid "Imaginarily divorced"
-msgstr "imaginär geschieden"
+#: src/Model/Profile.php:372
+msgid "Manage/edit profiles"
+msgstr "Profile verwalten/editieren"
 
-#: src/Content/ContactSelector.php:169
-msgid "Widowed"
-msgstr "Verwitwet"
+#: src/Model/Profile.php:550 src/Model/Profile.php:639
+msgid "g A l F d"
+msgstr "l, d. F G \\U\\h\\r"
 
-#: src/Content/ContactSelector.php:169
-msgid "Uncertain"
-msgstr "Unsicher"
+#: src/Model/Profile.php:551
+msgid "F d"
+msgstr "d. F"
 
-#: src/Content/ContactSelector.php:169
-msgid "It's complicated"
-msgstr "Ist kompliziert"
+#: src/Model/Profile.php:604 src/Model/Profile.php:690
+msgid "[today]"
+msgstr "[heute]"
 
-#: src/Content/ContactSelector.php:169
-msgid "Don't care"
-msgstr "Ist mir nicht wichtig"
+#: src/Model/Profile.php:615
+msgid "Birthday Reminders"
+msgstr "Geburtstagserinnerungen"
 
-#: src/Content/ContactSelector.php:169
-msgid "Ask me"
-msgstr "Frag mich"
+#: src/Model/Profile.php:616
+msgid "Birthdays this week:"
+msgstr "Geburtstage diese Woche:"
+
+#: src/Model/Profile.php:677
+msgid "[No description]"
+msgstr "[keine Beschreibung]"
+
+#: src/Model/Profile.php:704
+msgid "Event Reminders"
+msgstr "Veranstaltungserinnerungen"
+
+#: src/Model/Profile.php:705
+msgid "Upcoming events the next 7 days:"
+msgstr "Veranstaltungen der nächsten 7 Tage:"
+
+#: src/Model/Profile.php:728
+msgid "Member since:"
+msgstr "Mitglied seit:"
+
+#: 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 "Alter:"
+
+#: src/Model/Profile.php:765
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "für %1$d %2$s"
+
+#: src/Model/Profile.php:789
+msgid "Religion:"
+msgstr "Religion:"
+
+#: src/Model/Profile.php:797
+msgid "Hobbies/Interests:"
+msgstr "Hobbies/Interessen:"
+
+#: src/Model/Profile.php:809
+msgid "Contact information and Social Networks:"
+msgstr "Kontaktinformationen und Soziale Netzwerke:"
+
+#: src/Model/Profile.php:813
+msgid "Musical interests:"
+msgstr "Musikalische Interessen:"
+
+#: src/Model/Profile.php:817
+msgid "Books, literature:"
+msgstr "Literatur/Bücher:"
+
+#: src/Model/Profile.php:821
+msgid "Television:"
+msgstr "Fernsehen:"
+
+#: src/Model/Profile.php:825
+msgid "Film/dance/culture/entertainment:"
+msgstr "Filme/Tänze/Kultur/Unterhaltung:"
+
+#: src/Model/Profile.php:829
+msgid "Love/Romance:"
+msgstr "Liebesleben:"
+
+#: src/Model/Profile.php:833
+msgid "Work/employment:"
+msgstr "Arbeit/Beschäftigung:"
+
+#: src/Model/Profile.php:837
+msgid "School/education:"
+msgstr "Schule/Ausbildung:"
+
+#: src/Model/Profile.php:842
+msgid "Forums:"
+msgstr "Foren:"
+
+#: src/Model/Profile.php:936
+msgid "Only You Can See This"
+msgstr "Nur Du kannst das sehen"
+
+#: src/Model/Profile.php:944 src/Model/Profile.php:947
+msgid "Tips for New Members"
+msgstr "Tipps für neue Nutzer"
+
+#: src/Model/Profile.php:1106
+#, php-format
+msgid "OpenWebAuth: %1$s welcomes %2$s"
+msgstr "OpenWebAuth: %1$s heißt %2$sherzlich willkommen"
 
 #: src/Content/Widget.php:33
 msgid "Add New Contact"
@@ -8468,33 +8983,329 @@ msgid_plural "%d invitations available"
 msgstr[0] "%d Einladung verfügbar"
 msgstr[1] "%d Einladungen verfügbar"
 
-#: src/Content/Widget.php:164
+#: src/Content/Widget.php:157
 msgid "Networks"
 msgstr "Netzwerke"
 
-#: src/Content/Widget.php:167
+#: src/Content/Widget.php:160
 msgid "All Networks"
 msgstr "Alle Netzwerke"
 
-#: src/Content/Widget.php:205 src/Content/Feature.php:118
+#: src/Content/Widget.php:198 src/Content/Feature.php:118
 msgid "Saved Folders"
 msgstr "Gespeicherte Ordner"
 
-#: src/Content/Widget.php:208 src/Content/Widget.php:248
+#: src/Content/Widget.php:201 src/Content/Widget.php:241
 msgid "Everything"
 msgstr "Alles"
 
-#: src/Content/Widget.php:245
+#: src/Content/Widget.php:238
 msgid "Categories"
 msgstr "Kategorien"
 
-#: 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 gemeinsamer Kontakt"
 msgstr[1] "%d gemeinsame Kontakte"
 
+#: src/Content/ContactSelector.php:54
+msgid "Frequently"
+msgstr "immer wieder"
+
+#: src/Content/ContactSelector.php:55
+msgid "Hourly"
+msgstr "Stündlich"
+
+#: src/Content/ContactSelector.php:56
+msgid "Twice daily"
+msgstr "Zweimal täglich"
+
+#: src/Content/ContactSelector.php:57
+msgid "Daily"
+msgstr "Täglich"
+
+#: src/Content/ContactSelector.php:58
+msgid "Weekly"
+msgstr "Wöchentlich"
+
+#: src/Content/ContactSelector.php:59
+msgid "Monthly"
+msgstr "Monatlich"
+
+#: 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 "Zott"
+
+#: 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 "Männlich"
+
+#: src/Content/ContactSelector.php:122
+msgid "Female"
+msgstr "Weiblich"
+
+#: src/Content/ContactSelector.php:122
+msgid "Currently Male"
+msgstr "Momentan männlich"
+
+#: src/Content/ContactSelector.php:122
+msgid "Currently Female"
+msgstr "Momentan weiblich"
+
+#: src/Content/ContactSelector.php:122
+msgid "Mostly Male"
+msgstr "Hauptsächlich männlich"
+
+#: src/Content/ContactSelector.php:122
+msgid "Mostly Female"
+msgstr "Hauptsächlich weiblich"
+
+#: 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 "Transsexuell"
+
+#: src/Content/ContactSelector.php:122
+msgid "Hermaphrodite"
+msgstr "Hermaphrodit"
+
+#: src/Content/ContactSelector.php:122
+msgid "Neuter"
+msgstr "Neuter"
+
+#: src/Content/ContactSelector.php:122
+msgid "Non-specific"
+msgstr "Nicht spezifiziert"
+
+#: src/Content/ContactSelector.php:122
+msgid "Other"
+msgstr "Andere"
+
+#: src/Content/ContactSelector.php:144
+msgid "Males"
+msgstr "Männer"
+
+#: src/Content/ContactSelector.php:144
+msgid "Females"
+msgstr "Frauen"
+
+#: src/Content/ContactSelector.php:144
+msgid "Gay"
+msgstr "Schwul"
+
+#: src/Content/ContactSelector.php:144
+msgid "Lesbian"
+msgstr "Lesbisch"
+
+#: src/Content/ContactSelector.php:144
+msgid "No Preference"
+msgstr "Keine Vorlieben"
+
+#: src/Content/ContactSelector.php:144
+msgid "Bisexual"
+msgstr "Bisexuell"
+
+#: src/Content/ContactSelector.php:144
+msgid "Autosexual"
+msgstr "Autosexual"
+
+#: src/Content/ContactSelector.php:144
+msgid "Abstinent"
+msgstr "Abstinent"
+
+#: src/Content/ContactSelector.php:144
+msgid "Virgin"
+msgstr "Jungfrauen"
+
+#: src/Content/ContactSelector.php:144
+msgid "Deviant"
+msgstr "Deviant"
+
+#: src/Content/ContactSelector.php:144
+msgid "Fetish"
+msgstr "Fetish"
+
+#: src/Content/ContactSelector.php:144
+msgid "Oodles"
+msgstr "Oodles"
+
+#: src/Content/ContactSelector.php:144
+msgid "Nonsexual"
+msgstr "Nonsexual"
+
+#: src/Content/ContactSelector.php:166
+msgid "Single"
+msgstr "Single"
+
+#: src/Content/ContactSelector.php:166
+msgid "Lonely"
+msgstr "Einsam"
+
+#: src/Content/ContactSelector.php:166
+msgid "Available"
+msgstr "Verfügbar"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unavailable"
+msgstr "Nicht verfügbar"
+
+#: src/Content/ContactSelector.php:166
+msgid "Has crush"
+msgstr "verknallt"
+
+#: src/Content/ContactSelector.php:166
+msgid "Infatuated"
+msgstr "verliebt"
+
+#: src/Content/ContactSelector.php:166
+msgid "Dating"
+msgstr "Dating"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unfaithful"
+msgstr "Untreu"
+
+#: src/Content/ContactSelector.php:166
+msgid "Sex Addict"
+msgstr "Sexbesessen"
+
+#: src/Content/ContactSelector.php:166
+msgid "Friends/Benefits"
+msgstr "Freunde/Zuwendungen"
+
+#: src/Content/ContactSelector.php:166
+msgid "Casual"
+msgstr "Casual"
+
+#: src/Content/ContactSelector.php:166
+msgid "Engaged"
+msgstr "Verlobt"
+
+#: src/Content/ContactSelector.php:166
+msgid "Married"
+msgstr "Verheiratet"
+
+#: src/Content/ContactSelector.php:166
+msgid "Imaginarily married"
+msgstr "imaginär verheiratet"
+
+#: src/Content/ContactSelector.php:166
+msgid "Partners"
+msgstr "Partner"
+
+#: src/Content/ContactSelector.php:166
+msgid "Cohabiting"
+msgstr "zusammenlebend"
+
+#: src/Content/ContactSelector.php:166
+msgid "Common law"
+msgstr "wilde Ehe"
+
+#: src/Content/ContactSelector.php:166
+msgid "Happy"
+msgstr "Glücklich"
+
+#: src/Content/ContactSelector.php:166
+msgid "Not looking"
+msgstr "Nicht auf der Suche"
+
+#: src/Content/ContactSelector.php:166
+msgid "Swinger"
+msgstr "Swinger"
+
+#: src/Content/ContactSelector.php:166
+msgid "Betrayed"
+msgstr "Betrogen"
+
+#: src/Content/ContactSelector.php:166
+msgid "Separated"
+msgstr "Getrennt"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unstable"
+msgstr "Unstabil"
+
+#: src/Content/ContactSelector.php:166
+msgid "Divorced"
+msgstr "Geschieden"
+
+#: src/Content/ContactSelector.php:166
+msgid "Imaginarily divorced"
+msgstr "imaginär geschieden"
+
+#: src/Content/ContactSelector.php:166
+msgid "Widowed"
+msgstr "Verwitwet"
+
+#: src/Content/ContactSelector.php:166
+msgid "Uncertain"
+msgstr "Unsicher"
+
+#: src/Content/ContactSelector.php:166
+msgid "It's complicated"
+msgstr "Ist kompliziert"
+
+#: src/Content/ContactSelector.php:166
+msgid "Don't care"
+msgstr "Ist mir nicht wichtig"
+
+#: src/Content/ContactSelector.php:166
+msgid "Ask me"
+msgstr "Frag mich"
+
 #: src/Content/Feature.php:79
 msgid "General Features"
 msgstr "Allgemeine Features"
@@ -8802,10 +9613,6 @@ msgstr "Verwalten"
 msgid "Manage other pages"
 msgstr "Andere Seiten verwalten"
 
-#: src/Content/Nav.php:210 src/Model/Profile.php:368
-msgid "Profiles"
-msgstr "Profile"
-
 #: src/Content/Nav.php:210
 msgid "Manage/Edit Profiles"
 msgstr "Profile Verwalten/Editieren"
@@ -8822,758 +9629,47 @@ msgstr "Navigation"
 msgid "Site map"
 msgstr "Sitemap"
 
-#: src/Database/DBStructure.php:32
-msgid "There are no tables on MyISAM."
-msgstr "Es gibt keine MyISAM Tabellen."
-
-#: 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 "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein."
-
-#: src/Database/DBStructure.php:80
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "Die Fehlermeldung lautet\n[pre]%s[/pre]"
-
-#: src/Database/DBStructure.php:191
-#, php-format
-msgid ""
-"\n"
-"Error %d occurred during database update:\n"
-"%s\n"
-msgstr "\nFehler %d beim Update der Datenbank aufgetreten\n%s\n"
-
-#: src/Database/DBStructure.php:194
-msgid "Errors encountered performing database changes: "
-msgstr "Fehler beim Ändern der Datenbank aufgetreten"
-
-#: src/Database/DBStructure.php:210
-#, php-format
-msgid "%s: Database update"
-msgstr "%s: Datenbank Aktualisierung"
-
-#: src/Database/DBStructure.php:460
-#, php-format
-msgid "%s: updating %s table."
-msgstr "%s: aktualisiere Tabelle %s"
-
-#: src/Model/Mail.php:40 src/Model/Mail.php:174
-msgid "[no subject]"
-msgstr "[kein Betreff]"
-
-#: src/Model/Event.php:53 src/Model/Event.php:70 src/Model/Event.php:419
-#: src/Model/Event.php:882
-msgid "Starts:"
-msgstr "Beginnt:"
-
-#: src/Model/Event.php:56 src/Model/Event.php:76 src/Model/Event.php:420
-#: src/Model/Event.php:886
-msgid "Finishes:"
-msgstr "Endet:"
-
-#: src/Model/Event.php:368
-msgid "all-day"
-msgstr "ganztägig"
-
-#: src/Model/Event.php:391
-msgid "Jun"
-msgstr "Jun"
-
-#: src/Model/Event.php:394
-msgid "Sept"
-msgstr "Sep"
-
-#: src/Model/Event.php:417
-msgid "No events to display"
-msgstr "Keine Veranstaltung zum Anzeigen"
-
-#: src/Model/Event.php:543
-msgid "l, F j"
-msgstr "l, F j"
-
-#: src/Model/Event.php:566
-msgid "Edit event"
-msgstr "Veranstaltung bearbeiten"
-
-#: src/Model/Event.php:567
-msgid "Duplicate event"
-msgstr "Veranstaltung kopieren"
-
-#: src/Model/Event.php:568
-msgid "Delete event"
-msgstr "Veranstaltung löschen"
-
-#: src/Model/Event.php:815
-msgid "D g:i A"
-msgstr "D H:i"
-
-#: src/Model/Event.php:816
-msgid "g:i A"
-msgstr "H:i"
-
-#: src/Model/Event.php:901 src/Model/Event.php:903
-msgid "Show map"
-msgstr "Karte anzeigen"
-
-#: src/Model/Event.php:902
-msgid "Hide map"
-msgstr "Karte verbergen"
-
-#: 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 "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls Du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen."
-
-#: src/Model/Group.php:341
-msgid "Default privacy group for new contacts"
-msgstr "Voreingestellte Gruppe für neue Kontakte"
-
-#: src/Model/Group.php:374
-msgid "Everybody"
-msgstr "Alle Kontakte"
-
-#: src/Model/Group.php:394
-msgid "edit"
-msgstr "bearbeiten"
-
-#: src/Model/Group.php:418
-msgid "Edit group"
-msgstr "Gruppe bearbeiten"
-
-#: src/Model/Group.php:419
-msgid "Contacts not in any group"
-msgstr "Kontakte in keiner Gruppe"
-
-#: src/Model/Group.php:420
-msgid "Create a new group"
-msgstr "Neue Gruppe erstellen"
-
-#: src/Model/Group.php:422
-msgid "Edit groups"
-msgstr "Gruppen bearbeiten"
-
-#: src/Model/User.php:154
-msgid "Login failed"
-msgstr "Anmeldung fehlgeschlagen"
-
-#: src/Model/User.php:185
-msgid "Not enough information to authenticate"
-msgstr "Nicht genügend Informationen für die Authentifizierung"
-
-#: src/Model/User.php:346
-msgid "An invitation is required."
-msgstr "Du benötigst eine Einladung."
-
-#: src/Model/User.php:350
-msgid "Invitation could not be verified."
-msgstr "Die Einladung konnte nicht überprüft werden."
-
-#: src/Model/User.php:357
-msgid "Invalid OpenID url"
-msgstr "Ungültige OpenID URL"
-
-#: src/Model/User.php:370 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 "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast."
-
-#: src/Model/User.php:370 src/Module/Login.php:101
-msgid "The error message was:"
-msgstr "Die Fehlermeldung lautete:"
-
-#: src/Model/User.php:376
-msgid "Please enter the required information."
-msgstr "Bitte trage die erforderlichen Informationen ein."
-
-#: src/Model/User.php:389
-msgid "Please use a shorter name."
-msgstr "Bitte verwende einen kürzeren Namen."
-
-#: src/Model/User.php:392
-msgid "Name too short."
-msgstr "Der Name ist zu kurz."
-
-#: src/Model/User.php:400
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein."
-
-#: src/Model/User.php:405
-msgid "Your email domain is not among those allowed on this site."
-msgstr "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt."
-
-#: src/Model/User.php:409
-msgid "Not a valid email address."
-msgstr "Keine gültige E-Mail-Adresse."
-
-#: src/Model/User.php:413 src/Model/User.php:421
-msgid "Cannot use that email."
-msgstr "Konnte diese E-Mail-Adresse nicht verwenden."
-
-#: src/Model/User.php:428
-msgid "Your nickname can only contain a-z, 0-9 and _."
-msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen."
-
-#: src/Model/User.php:435 src/Model/User.php:491
-msgid "Nickname is already registered. Please choose another."
-msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
-
-#: src/Model/User.php:445
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."
-
-#: src/Model/User.php:478 src/Model/User.php:482
-msgid "An error occurred during registration. Please try again."
-msgstr "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
-
-#: src/Model/User.php:507
-msgid "An error occurred creating your default profile. Please try again."
-msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."
-
-#: src/Model/User.php:514
-msgid "An error occurred creating your self contact. Please try again."
-msgstr "Bei der Erstellung deines self Kontakts ist ein Fehler aufgetreten. Bitte versuche es erneut."
-
-#: src/Model/User.php:523
-msgid ""
-"An error occurred creating your default contact group. Please try again."
-msgstr "Bei der Erstellung deiner Standardgruppe für Kontakte ist ein Fehler aufgetreten. Bitte versuche es erneut."
-
-#: src/Model/User.php:597
-#, 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 "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account muss noch vom Admin des Knotens geprüft werden."
-
-#: src/Model/User.php:607
-#, php-format
-msgid "Registration at %s"
-msgstr "Registrierung als %s"
-
-#: src/Model/User.php:625
-#, 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 "\nHallo %1$s,\n\ndanke für Deine Registrierung auf %2$s. Dein Account wurde eingerichtet."
-
-#: src/Model/User.php:629
-#, 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 "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3$s\n\tBenutzernamename:\t%1$s\n\tPasswort:\t%5$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3$s/removeme jederzeit tun.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2$s."
-
-#: src/Model/Contact.php:667
-msgid "Drop Contact"
-msgstr "Kontakt löschen"
-
-#: src/Model/Contact.php:1101
-msgid "Organisation"
-msgstr "Organisation"
-
-#: src/Model/Contact.php:1104
-msgid "News"
-msgstr "Nachrichten"
-
-#: src/Model/Contact.php:1107
-msgid "Forum"
-msgstr "Forum"
-
-#: src/Model/Contact.php:1286
-msgid "Connect URL missing."
-msgstr "Connect-URL fehlt"
-
-#: 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 "Der Kontakt konnte nicht hinzugefügt werden. Bitte überprüfe die Einstellungen unter Einstellungen -> Soziale Netzwerke"
-
-#: src/Model/Contact.php:1342
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."
-
-#: src/Model/Contact.php:1343 src/Model/Contact.php:1357
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."
-
-#: src/Model/Contact.php:1355
-msgid "The profile address specified does not provide adequate information."
-msgstr "Die angegebene Profiladresse liefert unzureichende Informationen."
-
-#: src/Model/Contact.php:1360
-msgid "An author or name was not found."
-msgstr "Es wurde kein Autor oder Name gefunden."
-
-#: src/Model/Contact.php:1363
-msgid "No browser URL could be matched to this address."
-msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."
-
-#: src/Model/Contact.php:1366
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."
-
-#: src/Model/Contact.php:1367
-msgid "Use mailto: in front of address to force email check."
-msgstr "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen."
-
-#: src/Model/Contact.php:1373
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."
-
-#: src/Model/Contact.php:1378
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können."
-
-#: src/Model/Contact.php:1429
-msgid "Unable to retrieve contact information."
-msgstr "Konnte die Kontaktinformationen nicht empfangen."
-
-#: src/Model/Contact.php:1646 src/Protocol/DFRN.php:1513
-#, php-format
-msgid "%s's birthday"
-msgstr "%ss Geburtstag"
-
-#: src/Model/Contact.php:1647 src/Protocol/DFRN.php:1514
-#, php-format
-msgid "Happy Birthday %s"
-msgstr "Herzlichen Glückwunsch %s"
-
-#: src/Model/Item.php:1884
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$s nimmt an %2$ss %3$s teil."
-
-#: src/Model/Item.php:1889
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$s nimmt nicht an %2$ss %3$s teil."
-
-#: src/Model/Item.php:1894
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s nimmt eventuell an %2$ss %3$s teil."
-
-#: src/Model/Profile.php:97
-msgid "Requested account is not available."
-msgstr "Das angefragte Profil ist nicht vorhanden."
-
-#: src/Model/Profile.php:164 src/Model/Profile.php:395
-#: src/Model/Profile.php:857
-msgid "Edit profile"
-msgstr "Profil bearbeiten"
-
-#: src/Model/Profile.php:332
-msgid "Atom feed"
-msgstr "Atom-Feed"
-
-#: src/Model/Profile.php:368
-msgid "Manage/edit profiles"
-msgstr "Profile verwalten/editieren"
-
-#: src/Model/Profile.php:546 src/Model/Profile.php:639
-msgid "g A l F d"
-msgstr "l, d. F G \\U\\h\\r"
-
-#: src/Model/Profile.php:547
-msgid "F d"
-msgstr "d. F"
-
-#: src/Model/Profile.php:604 src/Model/Profile.php:701
-msgid "[today]"
-msgstr "[heute]"
-
-#: src/Model/Profile.php:615
-msgid "Birthday Reminders"
-msgstr "Geburtstagserinnerungen"
-
-#: src/Model/Profile.php:616
-msgid "Birthdays this week:"
-msgstr "Geburtstage diese Woche:"
-
-#: src/Model/Profile.php:688
-msgid "[No description]"
-msgstr "[keine Beschreibung]"
-
-#: src/Model/Profile.php:715
-msgid "Event Reminders"
-msgstr "Veranstaltungserinnerungen"
-
-#: src/Model/Profile.php:716
-msgid "Events this week:"
-msgstr "Veranstaltungen diese Woche"
-
-#: src/Model/Profile.php:739
-msgid "Member since:"
-msgstr "Mitglied seit:"
-
-#: 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 "Alter:"
-
-#: src/Model/Profile.php:776
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "für %1$d %2$s"
-
-#: src/Model/Profile.php:800
-msgid "Religion:"
-msgstr "Religion:"
-
-#: src/Model/Profile.php:808
-msgid "Hobbies/Interests:"
-msgstr "Hobbies/Interessen:"
-
-#: src/Model/Profile.php:820
-msgid "Contact information and Social Networks:"
-msgstr "Kontaktinformationen und Soziale Netzwerke:"
-
-#: src/Model/Profile.php:824
-msgid "Musical interests:"
-msgstr "Musikalische Interessen:"
-
-#: src/Model/Profile.php:828
-msgid "Books, literature:"
-msgstr "Literatur/Bücher:"
-
-#: src/Model/Profile.php:832
-msgid "Television:"
-msgstr "Fernsehen:"
-
-#: src/Model/Profile.php:836
-msgid "Film/dance/culture/entertainment:"
-msgstr "Filme/Tänze/Kultur/Unterhaltung:"
-
-#: src/Model/Profile.php:840
-msgid "Love/Romance:"
-msgstr "Liebesleben:"
-
-#: src/Model/Profile.php:844
-msgid "Work/employment:"
-msgstr "Arbeit/Beschäftigung:"
-
-#: src/Model/Profile.php:848
-msgid "School/education:"
-msgstr "Schule/Ausbildung:"
-
-#: src/Model/Profile.php:853
-msgid "Forums:"
-msgstr "Foren:"
-
-#: src/Model/Profile.php:947
-msgid "Only You Can See This"
-msgstr "Nur Du kannst das sehen"
-
-#: src/Protocol/Diaspora.php:2521
-msgid "Sharing notification from Diaspora network"
-msgstr "Freigabe-Benachrichtigung von Diaspora"
-
-#: src/Protocol/Diaspora.php:3609
-msgid "Attachments:"
-msgstr "Anhänge:"
-
-#: src/Protocol/OStatus.php:1798
-#, php-format
-msgid "%s is now following %s."
-msgstr "%s folgt nun %s"
-
-#: src/Protocol/OStatus.php:1799
-msgid "following"
-msgstr "folgen"
-
-#: src/Protocol/OStatus.php:1802
-#, php-format
-msgid "%s stopped following %s."
-msgstr "%s hat aufgehört %s zu folgen"
-
-#: src/Protocol/OStatus.php:1803
-msgid "stopped following"
-msgstr "wird nicht mehr gefolgt"
-
-#: src/Worker/Delivery.php:415
-msgid "(no subject)"
-msgstr "(kein Betreff)"
-
-#: src/Module/Logout.php:28
-msgid "Logged out."
-msgstr "Abgemeldet."
-
-#: src/Module/Login.php:283
-msgid "Create a New Account"
-msgstr "Neues Konto erstellen"
-
-#: src/Module/Login.php:316
-msgid "Password: "
-msgstr "Passwort: "
-
-#: src/Module/Login.php:317
-msgid "Remember me"
-msgstr "Anmeldedaten merken"
-
-#: src/Module/Login.php:320
-msgid "Or login using OpenID: "
-msgstr "Oder melde Dich mit Deiner OpenID an: "
-
-#: src/Module/Login.php:326
-msgid "Forgot your password?"
-msgstr "Passwort vergessen?"
-
-#: src/Module/Login.php:329
-msgid "Website Terms of Service"
-msgstr "Website Nutzungsbedingungen"
-
-#: src/Module/Login.php:330
-msgid "terms of service"
-msgstr "Nutzungsbedingungen"
-
-#: src/Module/Login.php:332
-msgid "Website Privacy Policy"
-msgstr "Website Datenschutzerklärung"
-
-#: src/Module/Login.php:333
-msgid "privacy policy"
-msgstr "Datenschutzerklärung"
-
-#: 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 "Zum Zwecke der Registrierung und um die Kommunikation zwischen dem Nutzer und seinen Kontakten zu gewährleisten, muß der Nutzer einen Namen (auch Pseudonym) und einen Nutzernamen (Spitzname) sowie eine funktionierende E-Mail-Adresse angeben. Der Name ist auf der Profilseite für alle Nutzer sichtbar, auch wenn die Profildetails nicht angezeigt werden.\nDie E-Mail-Adresse wird nur zur Benachrichtigung des Nutzers verwendet, sie wird nirgends angezeigt. Die Anzeige des Nutzerkontos im Server-Verzeichnis bzw. dem weltweiten Verzeichnis erfolgt gemäß den Einstellungen des Nutzers, sie ist zur Kommunikation nicht zwingend notwendig."
-
-#: 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 "Diese Daten sind für die Kommunikation notwendig und werden an die Knoten der Kommunikationspartner übermittelt. und werden dort gespeichert Nutzer können weitere private Angaben machen, die ebenfalls an die verwendeten Server der Kommunikationspartner übermittelt werden können."
-
-#: 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 "Angemeldete Nutzer können ihre Nutzerdaten jederzeit von den <a href=\"%1$s/settings/uexport\">Kontoeinstellungen</a> aus exportieren. Wenn ein Nutzer wünscht das Nutzerkonto zu löschen, so ist dies jederzeit unter <a href=\"%1$s/removeme\">%1$s/removeme</a> möglich. Die Löschung des Nutzerkontos ist permanent. Die Löschung der Daten wird auch von den Knoten der Kommunikationspartner angefordert."
-
-#: src/Module/Tos.php:39 src/Module/Tos.php:73
-msgid "Privacy Statement"
-msgstr "Datenschutzerklärung"
-
-#: src/Object/Post.php:128
-msgid "This entry was edited"
-msgstr "Dieser Beitrag wurde bearbeitet."
-
-#: src/Object/Post.php:187
-msgid "Remove from your stream"
-msgstr "Aus deinem Netzwerkstrom entfernen"
-
-#: src/Object/Post.php:200
-msgid "save to folder"
-msgstr "In Ordner speichern"
-
-#: src/Object/Post.php:243
-msgid "I will attend"
-msgstr "Ich werde teilnehmen"
-
-#: src/Object/Post.php:243
-msgid "I will not attend"
-msgstr "Ich werde nicht teilnehmen"
-
-#: src/Object/Post.php:243
-msgid "I might attend"
-msgstr "Ich werde eventuell teilnehmen"
-
-#: src/Object/Post.php:271
-msgid "add star"
-msgstr "markieren"
-
-#: src/Object/Post.php:272
-msgid "remove star"
-msgstr "Markierung entfernen"
-
-#: src/Object/Post.php:273
-msgid "toggle star status"
-msgstr "Markierung umschalten"
-
-#: src/Object/Post.php:276
-msgid "starred"
-msgstr "markiert"
-
-#: src/Object/Post.php:282
-msgid "ignore thread"
-msgstr "Thread ignorieren"
-
-#: src/Object/Post.php:283
-msgid "unignore thread"
-msgstr "Thread nicht mehr ignorieren"
-
-#: src/Object/Post.php:284
-msgid "toggle ignore status"
-msgstr "Ignoriert-Status ein-/ausschalten"
-
-#: src/Object/Post.php:293
-msgid "add tag"
-msgstr "Tag hinzufügen"
-
-#: src/Object/Post.php:304
-msgid "like"
-msgstr "mag ich"
-
-#: src/Object/Post.php:305
-msgid "dislike"
-msgstr "mag ich nicht"
-
-#: src/Object/Post.php:308
-msgid "Share this"
-msgstr "Weitersagen"
-
-#: src/Object/Post.php:308
-msgid "share"
-msgstr "Teilen"
-
-#: src/Object/Post.php:373
-msgid "to"
-msgstr "zu"
-
-#: src/Object/Post.php:374
-msgid "via"
-msgstr "via"
-
-#: src/Object/Post.php:375
-msgid "Wall-to-Wall"
-msgstr "Wall-to-Wall"
-
-#: src/Object/Post.php:376
-msgid "via Wall-To-Wall:"
-msgstr "via Wall-To-Wall:"
-
-#: src/Object/Post.php:435
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d Kommentar"
-msgstr[1] "%d Kommentare"
-
-#: src/Object/Post.php:805
-msgid "Bold"
-msgstr "Fett"
-
-#: src/Object/Post.php:806
-msgid "Italic"
-msgstr "Kursiv"
-
-#: src/Object/Post.php:807
-msgid "Underline"
-msgstr "Unterstrichen"
-
-#: src/Object/Post.php:808
-msgid "Quote"
-msgstr "Zitat"
-
-#: src/Object/Post.php:809
-msgid "Code"
-msgstr "Code"
-
-#: src/Object/Post.php:810
-msgid "Image"
-msgstr "Bild"
-
-#: src/Object/Post.php:811
-msgid "Link"
-msgstr "Link"
-
-#: src/Object/Post.php:812
-msgid "Video"
-msgstr "Video"
-
-#: src/App.php:526
-msgid "Delete this item?"
-msgstr "Diesen Beitrag löschen?"
-
-#: src/App.php:528
-msgid "show fewer"
-msgstr "weniger anzeigen"
-
-#: src/App.php:1117
-msgid "No system theme config value set."
-msgstr "Es wurde kein Konfigurationswert für das Systemweite Theme gesetzt."
-
-#: index.php:464
-msgid "toggle mobile"
-msgstr "auf/von Mobile Ansicht wechseln"
-
-#: update.php:193
-#, php-format
-msgid "%s: Updating author-id and owner-id in item and thread table. "
-msgstr "%s: Aktualisiere die author-id und owner-id in der Thread Tabelle"
-
-#: boot.php:796
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
+#: src/Content/Widget/CalendarExport.php:65
+msgid "Export"
+msgstr "Exportieren"
+
+#: src/Content/Widget/CalendarExport.php:66
+msgid "Export calendar as ical"
+msgstr "Kalender als ical exportieren"
+
+#: src/Content/Widget/CalendarExport.php:67
+msgid "Export calendar as csv"
+msgstr "Kalender als csv exportieren"
+
+#: src/Content/OEmbed.php:256
+msgid "Embedding disabled"
+msgstr "Einbettungen deaktiviert"
+
+#: src/Content/OEmbed.php:376
+msgid "Embedded content"
+msgstr "Eingebetteter Inhalt"
+
+#: src/Content/Text/BBCode.php:423
+msgid "view full size"
+msgstr "Volle Größe anzeigen"
+
+#: src/Content/Text/BBCode.php:853 src/Content/Text/BBCode.php:1626
+#: src/Content/Text/BBCode.php:1627
+msgid "Image/photo"
+msgstr "Bild/Foto"
+
+#: src/Content/Text/BBCode.php:1553 src/Content/Text/BBCode.php:1575
+msgid "$1 wrote:"
+msgstr "$1 hat geschrieben:"
+
+#: src/Content/Text/BBCode.php:1635 src/Content/Text/BBCode.php:1636
+msgid "Encrypted content"
+msgstr "Verschlüsselter Inhalt"
+
+#: src/Content/Text/BBCode.php:1755
+msgid "Invalid source protocol"
+msgstr "Ungültiges Quell-Protokoll"
+
+#: src/Content/Text/BBCode.php:1766
+msgid "Invalid link protocol"
+msgstr "Ungültiges Link-Protokoll"
diff --git a/view/lang/de/strings.php b/view/lang/de/strings.php
index 52b2a5bd4..675f995a2 100644
--- a/view/lang/de/strings.php
+++ b/view/lang/de/strings.php
@@ -6,10 +6,222 @@ function string_plural_select_de($n){
 	return ($n != 1);;
 }}
 ;
+$a->strings["You must be logged in to use addons. "] = "Sie müssen angemeldet sein um Addons benutzen zu können.";
+$a->strings["Not Found"] = "Nicht gefunden";
+$a->strings["Page not found."] = "Seite nicht gefunden.";
+$a->strings["Permission denied"] = "Zugriff verweigert";
+$a->strings["Permission denied."] = "Zugriff verweigert.";
+$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln";
+$a->strings["default"] = "Standard";
+$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"] = "Senden";
+$a->strings["Theme settings"] = "Themeneinstellungen";
+$a->strings["Variations"] = "Variationen";
+$a->strings["Alignment"] = "Ausrichtung";
+$a->strings["Left"] = "Links";
+$a->strings["Center"] = "Mitte";
+$a->strings["Color scheme"] = "Farbschema";
+$a->strings["Posts font size"] = "Schriftgröße in Beiträgen";
+$a->strings["Textareas font size"] = "Schriftgröße in Eingabefeldern";
+$a->strings["Comma separated list of helper forums"] = "Komma-Separierte Liste der Helfer-Foren";
+$a->strings["don't show"] = "nicht zeigen";
+$a->strings["show"] = "zeigen";
+$a->strings["Set style"] = "Stil auswählen";
+$a->strings["Community Pages"] = "Foren";
+$a->strings["Community Profiles"] = "Community-Profile";
+$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
+$a->strings["Connect Services"] = "Verbinde Dienste";
+$a->strings["Find Friends"] = "Kontakte finden";
+$a->strings["Last users"] = "Letzte Nutzer";
+$a->strings["Find People"] = "Leute finden";
+$a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
+$a->strings["Connect/Follow"] = "Verbinden/Folgen";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiel: Robert Morgenstein, Angeln";
+$a->strings["Find"] = "Finde";
+$a->strings["Friend Suggestions"] = "Kontaktvorschläge";
+$a->strings["Similar Interests"] = "Ähnliche Interessen";
+$a->strings["Random Profile"] = "Zufälliges Profil";
+$a->strings["Invite Friends"] = "Freunde einladen";
+$a->strings["Global Directory"] = "Weltweites Verzeichnis";
+$a->strings["Local Directory"] = "Lokales Verzeichnis";
+$a->strings["Forums"] = "Foren";
+$a->strings["External link to forum"] = "Externer Link zum Forum";
+$a->strings["show more"] = "mehr anzeigen";
+$a->strings["Quick Start"] = "Schnell-Start";
+$a->strings["Help"] = "Hilfe";
+$a->strings["Custom"] = "Benutzerdefiniert";
+$a->strings["Note"] = "Hinweis";
+$a->strings["Check image permissions if all users are allowed to see the image"] = "Überprüfe, dass alle Benutzer die Berechtigung haben dieses Bild anzusehen";
+$a->strings["Select color scheme"] = "Farbschema auswählen";
+$a->strings["Navigation bar background color"] = "Hintergrundfarbe der Navigationsleiste";
+$a->strings["Navigation bar icon color "] = "Icon Farbe in der Navigationsleiste";
+$a->strings["Link color"] = "Linkfarbe";
+$a->strings["Set the background color"] = "Hintergrundfarbe festlegen";
+$a->strings["Content background opacity"] = "Opazität des Hintergrunds von Beiträgen";
+$a->strings["Set the background image"] = "Hintergrundbild festlegen";
+$a->strings["Background image style"] = "Stiel des Hintergrundbildes";
+$a->strings["Login page background image"] = "Hintergrundbild der Login-Seite";
+$a->strings["Login page background color"] = "Hintergrundfarbe der Login-Seite";
+$a->strings["Leave background image and color empty for theme defaults"] = "Wenn die Theme Vorgaben verwendet werden sollen, lass bitte die Felder für die Hintergrundfarbe und das Hintergrundbild leer.";
+$a->strings["Guest"] = "Gast";
+$a->strings["Visitor"] = "Besucher";
+$a->strings["Logout"] = "Abmelden";
+$a->strings["End this session"] = "Diese Sitzung beenden";
+$a->strings["Status"] = "Status";
+$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
+$a->strings["Profile"] = "Profil";
+$a->strings["Your profile page"] = "Deine Profilseite";
+$a->strings["Photos"] = "Bilder";
+$a->strings["Your photos"] = "Deine Fotos";
+$a->strings["Videos"] = "Videos";
+$a->strings["Your videos"] = "Deine Videos";
+$a->strings["Events"] = "Veranstaltungen";
+$a->strings["Your events"] = "Deine Ereignisse";
+$a->strings["Network"] = "Netzwerk";
+$a->strings["Conversations from your friends"] = "Unterhaltungen Deiner Kontakte";
+$a->strings["Events and Calendar"] = "Ereignisse und Kalender";
+$a->strings["Messages"] = "Nachrichten";
+$a->strings["Private mail"] = "Private E-Mail";
+$a->strings["Settings"] = "Einstellungen";
+$a->strings["Account settings"] = "Kontoeinstellungen";
+$a->strings["Contacts"] = "Kontakte";
+$a->strings["Manage/edit friends and contacts"] = " Kontakte verwalten/editieren";
+$a->strings["Follow Thread"] = "Folge der Unterhaltung";
+$a->strings["Top Banner"] = "Top Banner";
+$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Skaliere das Hintergrundbild so, dass es die Breite der Seite einnimmt und fülle den Rest der Seite mit der Hintergrundfarbe bei langen Seiten.";
+$a->strings["Full screen"] = "Vollbildmodus";
+$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Skaliere das Bild so, dass es den gesamten Bildschirm füllt. Hierfür wird entweder die Breite oder die Höhe des Bildes automatisch abgeschnitten.";
+$a->strings["Single row mosaic"] = "Mosaik in einer Zeile";
+$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Skaliere das Bild so, dass es in einer einzelnen Reihe, entweder horizontal oder vertikal, wiederholt wird.";
+$a->strings["Mosaic"] = "Mosaik";
+$a->strings["Repeat image to fill the screen."] = "Wiederhole das Bild um den Bildschirm zu füllen.";
+$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Aktualisiere die author-id und owner-id in der Thread Tabelle";
+$a->strings["%s: Updating post-type."] = "%s: Aktualisiere Beitrags-Typ";
+$a->strings["Item not found."] = "Beitrag nicht gefunden.";
+$a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?";
+$a->strings["Yes"] = "Ja";
+$a->strings["Cancel"] = "Abbrechen";
+$a->strings["Archives"] = "Archiv";
+$a->strings["event"] = "Event";
+$a->strings["status"] = "Status";
+$a->strings["photo"] = "Foto";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht";
+$a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil.";
+$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil.";
+$a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil.";
+$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s ist nun mit %2\$s befreundet";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s getaggt";
+$a->strings["post/item"] = "Nachricht/Beitrag";
+$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s hat %2\$s\\s %3\$s als Favorit markiert";
+$a->strings["Likes"] = "Likes";
+$a->strings["Dislikes"] = "Dislikes";
+$a->strings["Attending"] = [
+	0 => "Teilnehmend",
+	1 => "Teilnehmend",
+];
+$a->strings["Not attending"] = "Nicht teilnehmend";
+$a->strings["Might attend"] = "Eventuell teilnehmend";
+$a->strings["Select"] = "Auswählen";
+$a->strings["Delete"] = "Löschen";
+$a->strings["View %s's profile @ %s"] = "Das Profil von %s auf %s betrachten.";
+$a->strings["Categories:"] = "Kategorien:";
+$a->strings["Filed under:"] = "Abgelegt unter:";
+$a->strings["%s from %s"] = "%s von %s";
+$a->strings["View in context"] = "Im Zusammenhang betrachten";
+$a->strings["Please wait"] = "Bitte warten";
+$a->strings["remove"] = "löschen";
+$a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";
+$a->strings["View Status"] = "Pinnwand anschauen";
+$a->strings["View Profile"] = "Profil anschauen";
+$a->strings["View Photos"] = "Bilder anschauen";
+$a->strings["Network Posts"] = "Netzwerkbeiträge";
+$a->strings["View Contact"] = "Kontakt anzeigen";
+$a->strings["Send PM"] = "Private Nachricht senden";
+$a->strings["Poke"] = "Anstupsen";
+$a->strings["%s likes this."] = "%s mag das.";
+$a->strings["%s doesn't like this."] = "%s mag das nicht.";
+$a->strings["%s attends."] = "%s nimmt teil.";
+$a->strings["%s doesn't attend."] = "%s nimmt nicht teil.";
+$a->strings["%s attends maybe."] = "%s nimmt eventuell teil.";
+$a->strings["and"] = "und";
+$a->strings["and %d other people"] = "und %dandere";
+$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d Personen</span> mögen das";
+$a->strings["%s like this."] = "%s mögen das.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d Personen</span> mögen das nicht";
+$a->strings["%s don't like this."] = "%s mögen dies nicht.";
+$a->strings["<span  %1\$s>%2\$d people</span> attend"] = "<span %1\$s>%2\$d Personen</span> nehmen teil";
+$a->strings["%s attend."] = "%s nehmen teil.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span %1\$s>%2\$d Personen</span> nehmen nicht teil";
+$a->strings["%s don't attend."] = "%s nehmen nicht teil.";
+$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span %1\$s>%2\$d Personen</span> nehmen eventuell teil";
+$a->strings["%s attend maybe."] = "%s nimmt eventuell teil.";
+$a->strings["Visible to <strong>everybody</strong>"] = "Für <strong>jedermann</strong> sichtbar";
+$a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:";
+$a->strings["Please enter a video link/URL:"] = "Bitte Link/URL zum Video einfügen:";
+$a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:";
+$a->strings["Tag term:"] = "Tag:";
+$a->strings["Save to Folder:"] = "In diesem Ordner speichern:";
+$a->strings["Where are you right now?"] = "Wo hältst Du Dich jetzt gerade auf?";
+$a->strings["Delete item(s)?"] = "Einträge löschen?";
+$a->strings["New Post"] = "Neuer Beitrag";
+$a->strings["Share"] = "Teilen";
+$a->strings["Upload photo"] = "Foto hochladen";
+$a->strings["upload photo"] = "Bild hochladen";
+$a->strings["Attach file"] = "Datei anhängen";
+$a->strings["attach file"] = "Datei anhängen";
+$a->strings["Insert web link"] = "Einen Link einfügen";
+$a->strings["web link"] = "Weblink";
+$a->strings["Insert video link"] = "Video-Adresse einfügen";
+$a->strings["video link"] = "Video-Link";
+$a->strings["Insert audio link"] = "Audio-Adresse einfügen";
+$a->strings["audio link"] = "Audio-Link";
+$a->strings["Set your location"] = "Deinen Standort festlegen";
+$a->strings["set location"] = "Ort setzen";
+$a->strings["Clear browser location"] = "Browser-Standort leeren";
+$a->strings["clear location"] = "Ort löschen";
+$a->strings["Set title"] = "Titel setzen";
+$a->strings["Categories (comma-separated list)"] = "Kategorien (kommasepariert)";
+$a->strings["Permission settings"] = "Berechtigungseinstellungen";
+$a->strings["permissions"] = "Zugriffsrechte";
+$a->strings["Public post"] = "Öffentlicher Beitrag";
+$a->strings["Preview"] = "Vorschau";
+$a->strings["Post to Groups"] = "Poste an Gruppe";
+$a->strings["Post to Contacts"] = "Poste an Kontakte";
+$a->strings["Private post"] = "Privater Beitrag";
+$a->strings["Message"] = "Nachricht";
+$a->strings["Browser"] = "Browser";
+$a->strings["View all"] = "Zeige alle";
+$a->strings["Like"] = [
+	0 => "mag ich",
+	1 => "Mag ich",
+];
+$a->strings["Dislike"] = [
+	0 => "mag ich nicht",
+	1 => "Mag ich nicht",
+];
+$a->strings["Not Attending"] = [
+	0 => "Nicht teilnehmend ",
+	1 => "Nicht teilnehmend",
+];
+$a->strings["Undecided"] = [
+	0 => "Unentschieden",
+	1 => "Unentschieden",
+];
+$a->strings["Welcome "] = "Willkommen ";
+$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
+$a->strings["Welcome back "] = "Willkommen zurück ";
+$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."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
 $a->strings["Friendica Notification"] = "Friendica-Benachrichtigung";
 $a->strings["Thank You,"] = "Danke,";
-$a->strings["%s Administrator"] = "der Administrator von %s";
 $a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Administrator";
+$a->strings["%s Administrator"] = "der Administrator von %s";
 $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica-Meldung] Neue Email erhalten um %s";
 $a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat Dir eine neue private Nachricht um %2\$s geschickt.";
 $a->strings["a private message"] = "eine private Nachricht";
@@ -63,12 +275,8 @@ $a->strings["[Friendica System Notify]"] = "[Friendica System Benachrichtigung]"
 $a->strings["registration request"] = "Registrierungsanfrage";
 $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Du hast eine Registrierungsanfrage von %2\$s auf '%1\$s' erhalten";
 $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Du hast eine [url=%1\$s]Registrierungsanfrage[/url] von %2\$s erhalten.";
-$a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"] = "Kompletter Name:\t%1\$s\\nURL der Seite:\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)"] = "Kompletter Name: %s\nURL der Seite: %s\nLogin Name: %s(%s)";
 $a->strings["Please visit %s to approve or reject the request."] = "Bitte besuche %s um die Anfrage zu bearbeiten.";
-$a->strings["Welcome "] = "Willkommen ";
-$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
-$a->strings["Welcome back "] = "Willkommen zurück ";
-$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."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
 $a->strings["newer"] = "neuer";
 $a->strings["older"] = "älter";
 $a->strings["first"] = "erste";
@@ -89,8 +297,6 @@ $a->strings["Search"] = "Suche";
 $a->strings["@name, !forum, #tags, content"] = "@name, !forum, #tags, content";
 $a->strings["Full Text"] = "Volltext";
 $a->strings["Tags"] = "Tags";
-$a->strings["Contacts"] = "Kontakte";
-$a->strings["Forums"] = "Foren";
 $a->strings["poke"] = "anstupsen";
 $a->strings["poked"] = "stupste";
 $a->strings["ping"] = "anpingen";
@@ -146,8 +352,6 @@ $a->strings["Click to open/close"] = "Zum öffnen/schließen klicken";
 $a->strings["View on separate page"] = "Auf separater Seite ansehen";
 $a->strings["view on separate page"] = "auf separater Seite ansehen";
 $a->strings["link to source"] = "Link zum Originalbeitrag";
-$a->strings["event"] = "Event";
-$a->strings["photo"] = "Foto";
 $a->strings["activity"] = "Aktivität";
 $a->strings["comment"] = [
 	0 => "Kommentar",
@@ -165,157 +369,538 @@ $a->strings["Weekly posting limit of %d post reached. The post was rejected."] =
 ];
 $a->strings["Monthly posting limit of %d post reached. The post was rejected."] = "Das monatliche Limit von %d Beiträgen wurde erreicht. Der Beitrag wurde verworfen.";
 $a->strings["Profile Photos"] = "Profilbilder";
-$a->strings["status"] = "Status";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht";
-$a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil.";
-$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil.";
-$a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil.";
-$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s ist nun mit %2\$s befreundet";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s stupste %2\$s";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s getaggt";
-$a->strings["post/item"] = "Nachricht/Beitrag";
-$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s hat %2\$s\\s %3\$s als Favorit markiert";
-$a->strings["Likes"] = "Likes";
-$a->strings["Dislikes"] = "Dislikes";
-$a->strings["Attending"] = [
-	0 => "Teilnehmend",
-	1 => "Teilnehmend",
-];
-$a->strings["Not attending"] = "Nicht teilnehmend";
-$a->strings["Might attend"] = "Eventuell teilnehmend";
-$a->strings["Select"] = "Auswählen";
-$a->strings["Delete"] = "Löschen";
-$a->strings["View %s's profile @ %s"] = "Das Profil von %s auf %s betrachten.";
-$a->strings["Categories:"] = "Kategorien:";
-$a->strings["Filed under:"] = "Abgelegt unter:";
-$a->strings["%s from %s"] = "%s von %s";
-$a->strings["View in context"] = "Im Zusammenhang betrachten";
-$a->strings["Please wait"] = "Bitte warten";
-$a->strings["remove"] = "löschen";
-$a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";
-$a->strings["Follow Thread"] = "Folge der Unterhaltung";
-$a->strings["View Status"] = "Pinnwand anschauen";
-$a->strings["View Profile"] = "Profil anschauen";
-$a->strings["View Photos"] = "Bilder anschauen";
-$a->strings["Network Posts"] = "Netzwerkbeiträge";
-$a->strings["View Contact"] = "Kontakt anzeigen";
-$a->strings["Send PM"] = "Private Nachricht senden";
-$a->strings["Poke"] = "Anstupsen";
-$a->strings["Connect/Follow"] = "Verbinden/Folgen";
-$a->strings["%s likes this."] = "%s mag das.";
-$a->strings["%s doesn't like this."] = "%s mag das nicht.";
-$a->strings["%s attends."] = "%s nimmt teil.";
-$a->strings["%s doesn't attend."] = "%s nimmt nicht teil.";
-$a->strings["%s attends maybe."] = "%s nimmt eventuell teil.";
-$a->strings["and"] = "und";
-$a->strings["and %d other people"] = "und %dandere";
-$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d Personen</span> mögen das";
-$a->strings["%s like this."] = "%s mögen das.";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d Personen</span> mögen das nicht";
-$a->strings["%s don't like this."] = "%s mögen dies nicht.";
-$a->strings["<span  %1\$s>%2\$d people</span> attend"] = "<span %1\$s>%2\$d Personen</span> nehmen teil";
-$a->strings["%s attend."] = "%s nehmen teil.";
-$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span %1\$s>%2\$d Personen</span> nehmen nicht teil";
-$a->strings["%s don't attend."] = "%s nehmen nicht teil.";
-$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span %1\$s>%2\$d Personen</span> nehmen eventuell teil";
-$a->strings["%s attend maybe."] = "%s nimmt eventuell teil.";
-$a->strings["Visible to <strong>everybody</strong>"] = "Für <strong>jedermann</strong> sichtbar";
-$a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:";
-$a->strings["Please enter a video link/URL:"] = "Bitte Link/URL zum Video einfügen:";
-$a->strings["Please enter an audio link/URL:"] = "Bitte Link/URL zum Audio einfügen:";
-$a->strings["Tag term:"] = "Tag:";
-$a->strings["Save to Folder:"] = "In diesem Ordner speichern:";
-$a->strings["Where are you right now?"] = "Wo hältst Du Dich jetzt gerade auf?";
-$a->strings["Delete item(s)?"] = "Einträge löschen?";
-$a->strings["New Post"] = "Neuer Beitrag";
-$a->strings["Share"] = "Teilen";
-$a->strings["Upload photo"] = "Foto hochladen";
-$a->strings["upload photo"] = "Bild hochladen";
-$a->strings["Attach file"] = "Datei anhängen";
-$a->strings["attach file"] = "Datei anhängen";
-$a->strings["Insert web link"] = "Einen Link einfügen";
-$a->strings["web link"] = "Weblink";
-$a->strings["Insert video link"] = "Video-Adresse einfügen";
-$a->strings["video link"] = "Video-Link";
-$a->strings["Insert audio link"] = "Audio-Adresse einfügen";
-$a->strings["audio link"] = "Audio-Link";
-$a->strings["Set your location"] = "Deinen Standort festlegen";
-$a->strings["set location"] = "Ort setzen";
-$a->strings["Clear browser location"] = "Browser-Standort leeren";
-$a->strings["clear location"] = "Ort löschen";
-$a->strings["Set title"] = "Titel setzen";
-$a->strings["Categories (comma-separated list)"] = "Kategorien (kommasepariert)";
-$a->strings["Permission settings"] = "Berechtigungseinstellungen";
-$a->strings["permissions"] = "Zugriffsrechte";
-$a->strings["Public post"] = "Öffentlicher Beitrag";
-$a->strings["Preview"] = "Vorschau";
-$a->strings["Cancel"] = "Abbrechen";
-$a->strings["Post to Groups"] = "Poste an Gruppe";
-$a->strings["Post to Contacts"] = "Poste an Kontakte";
-$a->strings["Private post"] = "Privater Beitrag";
-$a->strings["Message"] = "Nachricht";
-$a->strings["Browser"] = "Browser";
-$a->strings["View all"] = "Zeige alle";
-$a->strings["Like"] = [
-	0 => "mag ich",
-	1 => "Mag ich",
-];
-$a->strings["Dislike"] = [
-	0 => "mag ich nicht",
-	1 => "Mag ich nicht",
-];
-$a->strings["Not Attending"] = [
-	0 => "Nicht teilnehmend ",
-	1 => "Nicht teilnehmend",
-];
-$a->strings["Undecided"] = [
-	0 => "Unentschieden",
-	1 => "Unentschieden",
-];
-$a->strings["Item not found."] = "Beitrag nicht gefunden.";
-$a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?";
-$a->strings["Yes"] = "Ja";
-$a->strings["Permission denied."] = "Zugriff verweigert.";
-$a->strings["Archives"] = "Archiv";
-$a->strings["show more"] = "mehr anzeigen";
-$a->strings["No friends to display."] = "Keine Kontakte zum Anzeigen.";
-$a->strings["Connect"] = "Verbinden";
-$a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren";
-$a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:";
-$a->strings["Please login to continue."] = "Bitte melde Dich an um fortzufahren.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung den Zugriff auf Deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?";
-$a->strings["No"] = "Nein";
-$a->strings["You must be logged in to use addons. "] = "Sie müssen angemeldet sein um Addons benutzen zu können.";
-$a->strings["Applications"] = "Anwendungen";
-$a->strings["No installed applications."] = "Keine Applikationen installiert.";
-$a->strings["Item not available."] = "Beitrag nicht verfügbar.";
-$a->strings["Item was not found."] = "Beitrag konnte nicht gefunden werden.";
-$a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte.";
-$a->strings["Common Friends"] = "Gemeinsame Kontakte";
-$a->strings["Credits"] = "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 ist ein Gemeinschaftsprojekt, das nicht ohne die Hilfe vieler Personen möglich wäre. Hier ist eine Aufzählung der Personen, die zum Code oder der Übersetzung beigetragen haben. Dank an alle !";
-$a->strings["Photos"] = "Bilder";
-$a->strings["Contact Photos"] = "Kontaktbilder";
-$a->strings["Upload"] = "Hochladen";
-$a->strings["Files"] = "Dateien";
-$a->strings["Not Found"] = "Nicht gefunden";
-$a->strings["No profile"] = "Kein Profil";
-$a->strings["Welcome to %s"] = "Willkommen zu %s";
+$a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt.";
+$a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren.";
+$a->strings["Contact not found."] = "Kontakt nicht gefunden.";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button Deines Browsers <strong>jetzt</strong>, wenn Du Dir unsicher bist, was Du tun willst.";
+$a->strings["No mirroring"] = "Kein Spiegeln";
+$a->strings["Mirror as forwarded posting"] = "Spiegeln als weitergeleitete Beiträge";
+$a->strings["Mirror as my own posting"] = "Spiegeln als meine eigenen Beiträge";
+$a->strings["Return to contact editor"] = "Zurück zum Kontakteditor";
+$a->strings["Refetch contact data"] = "Kontaktdaten neu laden";
+$a->strings["Remote Self"] = "Entfernte Konten";
+$a->strings["Mirror postings from this contact"] = "Spiegle Beiträge dieses Kontakts";
+$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden.";
+$a->strings["Name"] = "Name";
+$a->strings["Account Nickname"] = "Konto-Spitzname";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname";
+$a->strings["Account URL"] = "Konto-URL";
+$a->strings["Friend Request URL"] = "URL für Kontaktschaftsanfragen";
+$a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Kontaktanfragen";
+$a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen";
+$a->strings["Poll/Feed URL"] = "Pull/Feed-URL";
+$a->strings["New photo from this URL"] = "Neues Foto von dieser URL";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen.";
+$a->strings["No recipient selected."] = "Kein Empfänger gewählt.";
+$a->strings["Unable to check your home location."] = "Konnte Deinen Heimatort nicht bestimmen.";
+$a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden.";
+$a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen.";
+$a->strings["Message sent."] = "Nachricht gesendet.";
+$a->strings["No recipient."] = "Kein Empfänger.";
+$a->strings["Send Private Message"] = "Private Nachricht senden";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern.";
+$a->strings["To:"] = "An:";
+$a->strings["Subject:"] = "Betreff:";
+$a->strings["Your message:"] = "Deine Nachricht:";
 $a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar.";
 $a->strings["Visible to:"] = "Sichtbar für:";
-$a->strings["System down for maintenance"] = "System zur Wartung abgeschaltet";
+$a->strings["Friendica Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
+$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert.";
+$a->strings["Could not create table."] = "Tabelle konnte nicht angelegt werden.";
+$a->strings["Your Friendica site database has been installed."] = "Die Datenbank Deiner Friendicaseite wurde installiert.";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
+$a->strings["Database already in use."] = "Die Datenbank wird bereits verwendet.";
+$a->strings["System check"] = "Systemtest";
+$a->strings["Next"] = "Nächste";
+$a->strings["Check again"] = "Noch einmal testen";
+$a->strings["Database connection"] = "Datenbankverbindung";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst.";
+$a->strings["Database Server Name"] = "Datenbank-Server";
+$a->strings["Database Login Name"] = "Datenbank-Nutzer";
+$a->strings["Database Login Password"] = "Datenbank-Passwort";
+$a->strings["For security reasons the password must not be empty"] = "Aus Sicherheitsgründen darf das Passwort nicht leer sein.";
+$a->strings["Database Name"] = "Datenbank-Name";
+$a->strings["Site administrator email address"] = "E-Mail-Adresse des Administrators";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst.";
+$a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone Deiner Webseite";
+$a->strings["Site settings"] = "Server-Einstellungen";
+$a->strings["System Language:"] = "Systemsprache:";
+$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand";
+$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."] = "Die Datenbankkonfigurationsdatei \"config/local.ini.php\" konnte nicht erstellt werden. Um eine Konfigurationsdatei in Ihrem Webserver-Verzeichnis zu erstellen, Gehen Sie wie folgt vor.";
+$a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "Wichtig: Du musst [manuell] einen Cronjob (o.ä.) für den Worker einrichten.";
+$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."] = "Du solltest nun die Seite zur <a href=\"%s/register\">Nutzerregistrierung</a> deiner neuen Friendica Instanz besuchen und einen neuen Nutzer einrichten. Bitte denke daran die selbe E-Mail Adresse anzugeben, die du auch als Administrator E-Mail angegeben hast, damit du das Admin-Panel verwenden kannst.";
+$a->strings["Profile not found."] = "Profil nicht gefunden.";
+$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde.";
+$a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich.";
+$a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: ";
+$a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen.";
+$a->strings["Temporary failure. Please wait and try again."] = "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal.";
+$a->strings["Introduction failed or was revoked."] = "Kontaktanfrage schlug fehl oder wurde zurückgezogen.";
+$a->strings["Remote site reported: "] = "Gegenstelle meldet: ";
+$a->strings["Unable to set contact photo."] = "Konnte das Bild des Kontakts nicht speichern.";
+$a->strings["No user record found for '%s' "] = "Für '%s' wurde kein Nutzer gefunden";
+$a->strings["Our site encryption key is apparently messed up."] = "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung.";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden.";
+$a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden.";
+$a->strings["Site public key not available in contact record for URL %s."] = "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server.";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal.";
+$a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden.";
+$a->strings["Unable to update your contact profile details on our system"] = "Die Updates für Dein Profil konnten nicht gespeichert werden";
+$a->strings["[Name Withheld]"] = "[Name unterdrückt]";
+$a->strings["People Search - %s"] = "Personensuche - %s";
+$a->strings["Forum Search - %s"] = "Forensuche - %s";
+$a->strings["Connect"] = "Verbinden";
+$a->strings["No matches"] = "Keine Übereinstimmungen";
+$a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die Deine Kontoinformationen teilen oder zu denen Du „Verwalten“-Befugnisse bekommen hast.";
+$a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten aus: ";
+$a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?";
+$a->strings["Delete Video"] = "Video Löschen";
+$a->strings["Public access denied."] = "Öffentlicher Zugriff verweigert.";
+$a->strings["No videos selected"] = "Keine Videos  ausgewählt";
+$a->strings["Access to this item is restricted."] = "Zugriff zu diesem Eintrag wurde eingeschränkt.";
+$a->strings["View Album"] = "Album betrachten";
+$a->strings["Recent Videos"] = "Neueste Videos";
+$a->strings["Upload New Videos"] = "Neues Video hochladen";
+$a->strings["Only logged in users are permitted to perform a probing."] = "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet.";
+$a->strings["Location:"] = "Ort:";
+$a->strings["Gender:"] = "Geschlecht:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Homepage:";
+$a->strings["About:"] = "Über:";
+$a->strings["Find on this site"] = "Auf diesem Server suchen";
+$a->strings["Results for:"] = "Ergebnisse für:";
+$a->strings["Site Directory"] = "Verzeichnis";
+$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu.";
+$a->strings["is interested in:"] = "ist interessiert an:";
+$a->strings["Profile Match"] = "Profilübereinstimmungen";
+$a->strings["everybody"] = "jeder";
+$a->strings["Account"] = "Nutzerkonto";
+$a->strings["Profiles"] = "Profile";
+$a->strings["Additional features"] = "Zusätzliche Features";
+$a->strings["Display"] = "Anzeige";
+$a->strings["Social Networks"] = "Soziale Netzwerke";
+$a->strings["Addons"] = "Addons";
+$a->strings["Delegations"] = "Delegationen";
+$a->strings["Connected apps"] = "Verbundene Programme";
+$a->strings["Export personal data"] = "Persönliche Daten exportieren";
+$a->strings["Remove account"] = "Konto löschen";
+$a->strings["Missing some important data!"] = "Wichtige Daten fehlen!";
+$a->strings["Update"] = "Aktualisierungen";
+$a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich.";
+$a->strings["Email settings updated."] = "E-Mail Einstellungen bearbeitet.";
+$a->strings["Features updated"] = "Features aktualisiert";
+$a->strings["Relocate message has been send to your contacts"] = "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet.";
+$a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert.";
+$a->strings["The new password has been exposed in a public data dump, please choose another."] = "Das neuer Passwort wurde in einem öffentlichen Daten-Dump veröffentlicht. Bitte verwende ein anderes Passwort.";
+$a->strings["Wrong password."] = "Falsches Passwort.";
+$a->strings["Password changed."] = "Passwort geändert.";
+$a->strings["Password update failed. Please try again."] = "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal.";
+$a->strings[" Please use a shorter name."] = " Bitte verwende einen kürzeren Namen.";
+$a->strings[" Name too short."] = " Name ist zu kurz.";
+$a->strings["Wrong Password"] = "Falsches Passwort";
+$a->strings["Invalid email."] = "Ungültige E-Mail-Adresse.";
+$a->strings["Cannot change to that email."] = "Ändern der E-Mail nicht möglich. ";
+$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt.";
+$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["Add application"] = "Programm hinzufügen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Consumer Key"] = "Consumer Key";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Redirect"] = "Umleiten";
+$a->strings["Icon url"] = "Icon URL";
+$a->strings["You can't edit this application."] = "Du kannst dieses Programm nicht bearbeiten.";
+$a->strings["Connected Apps"] = "Verbundene Programme";
+$a->strings["Edit"] = "Bearbeiten";
+$a->strings["Client key starts with"] = "Anwenderschlüssel beginnt mit";
+$a->strings["No name"] = "Kein Name";
+$a->strings["Remove authorization"] = "Autorisierung entziehen";
+$a->strings["No Addon settings configured"] = "Keine Addon-Einstellungen konfiguriert";
+$a->strings["Addon Settings"] = "Addon Einstellungen";
+$a->strings["Off"] = "Aus";
+$a->strings["On"] = "An";
+$a->strings["Additional Features"] = "Zusätzliche Features";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["enabled"] = "eingeschaltet";
+$a->strings["disabled"] = "ausgeschaltet";
+$a->strings["Built-in support for %s connectivity is %s"] = "Eingebaute Unterstützung für Verbindungen zu %s ist %s";
+$a->strings["GNU Social (OStatus)"] = "GNU Social (OStatus)";
+$a->strings["Email access is disabled on this site."] = "Zugriff auf E-Mails für diese Seite deaktiviert.";
+$a->strings["General Social Media Settings"] = "Allgemeine Einstellungen zu Sozialen Medien";
+$a->strings["Disable Content Warning"] = "Inhaltswarnungen ausschalten";
+$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."] = "Nutzer von anderen Netzwerken, wie z.B. Mastodon oder Pleroma, können Inhaltswarnungen, welche die Beiträge standardmäßig einklappen. Diese Einstellung deaktiviert das automatische Einklappt solcher Beiträge und setzt die Inhaltswarnung als Titel des Beitrags. Wenn du andere Filtereinstellungen vorgenommen hast, werden diese hierdurch nicht beeinflusst.";
+$a->strings["Disable intelligent shortening"] = "Intelligentes Link kürzen ausschalten";
+$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."] = "Normalerweise versucht das System den besten Link zu finden um ihn zu gekürzten Postings hinzu zu fügen. Wird diese Option ausgewählt wird stets ein Link auf die originale Friendica Nachricht beigefügt.";
+$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "Automatisch allen GNU Social (OStatus) Followern/Erwähnern folgen";
+$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."] = "Wenn du eine Nachricht eines unbekannten OStatus Nutzers bekommst, entscheidet diese Option wie diese behandelt werden soll. Ist die Option aktiviert, wird ein neuer Kontakt für den Verfasser erstellt,.";
+$a->strings["Default group for OStatus contacts"] = "Voreingestellte Gruppe für OStatus Kontakte";
+$a->strings["Your legacy GNU Social account"] = "Dein alter GNU Social Account";
+$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."] = "Wenn du deinen alten GNU Socual/Statusnet Accountnamen hier angibst (Format name@domain.tld) werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden.";
+$a->strings["Repair OStatus subscriptions"] = "OStatus Abonnements reparieren";
+$a->strings["Email/Mailbox Setup"] = "E-Mail/Postfach-Einstellungen";
+$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Wenn Du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für Dein Postfach an.";
+$a->strings["Last successful email check:"] = "Letzter erfolgreicher E-Mail Check";
+$a->strings["IMAP server name:"] = "IMAP-Server-Name:";
+$a->strings["IMAP port:"] = "IMAP-Port:";
+$a->strings["Security:"] = "Sicherheit:";
+$a->strings["None"] = "Keine";
+$a->strings["Email login name:"] = "E-Mail-Login-Name:";
+$a->strings["Email password:"] = "E-Mail-Passwort:";
+$a->strings["Reply-to address:"] = "Reply-to Adresse:";
+$a->strings["Send public posts to all email contacts:"] = "Sende öffentliche Beiträge an alle E-Mail-Kontakte:";
+$a->strings["Action after import:"] = "Aktion nach Import:";
+$a->strings["Mark as seen"] = "Als gelesen markieren";
+$a->strings["Move to folder"] = "In einen Ordner verschieben";
+$a->strings["Move to folder:"] = "In diesen Ordner verschieben:";
+$a->strings["No special theme for mobile devices"] = "Kein spezielles Theme für mobile Geräte verwenden.";
+$a->strings["%s - (Unsupported)"] = "%s - (Nicht unterstützt)";
+$a->strings["%s - (Experimental)"] = "%s - (Experimentell)";
+$a->strings["Display Settings"] = "Anzeige-Einstellungen";
+$a->strings["Display Theme:"] = "Theme:";
+$a->strings["Mobile Theme:"] = "Mobiles Theme";
+$a->strings["Suppress warning of insecure networks"] = "Warnung wegen unsicheren Netzwerken unterdrücken";
+$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Soll das System Warnungen unterdrücken, die angezeigt werden weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können.";
+$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
+$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum sind 10 Sekunden. Gib -1 ein um abzuschalten.";
+$a->strings["Number of items to display per page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: ";
+$a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge";
+$a->strings["Number of items to display per page when viewed from mobile device:"] = "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:";
+$a->strings["Don't show emoticons"] = "Keine Smilies anzeigen";
+$a->strings["Calendar"] = "Kalender";
+$a->strings["Beginning of week:"] = "Wochenbeginn:";
+$a->strings["Don't show notices"] = "Info-Popups nicht anzeigen";
+$a->strings["Infinite scroll"] = "Endloses Scrollen";
+$a->strings["Automatic updates only at the top of the network page"] = "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist.";
+$a->strings["When disabled, the network page is updated all the time, which could be confusing while reading."] = "Wenn dies deaktiviert ist, wird die Netzwerk Seite aktualisiert, wann immer neue Beiträge eintreffen, egal an welcher Stelle gerade gelesen wird.";
+$a->strings["Bandwidth Saver Mode"] = "Bandbreiten-Spar-Modus";
+$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Wenn aktiviert, wird der eingebettete Inhalt nicht automatisch aktualisiert. In diesem Fall Seite bitte neu laden.";
+$a->strings["Smart Threading"] = "Intelligentes Threading";
+$a->strings["When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled."] = "Ist dies aktiviert, werden Einrückungen in Unterhaltungen unterdrückt wo sie nicht benötigt werden. Werden sie benötigt, werden die Threads weiterhin eingerückt.";
+$a->strings["General Theme Settings"] = "Allgemeine Themeneinstellungen";
+$a->strings["Custom Theme Settings"] = "Benutzerdefinierte Theme Einstellungen";
+$a->strings["Content Settings"] = "Einstellungen zum Inhalt";
+$a->strings["Unable to find your profile. Please contact your admin."] = "Konnte dein Profil nicht finden. Bitte kontaktiere den Admin.";
+$a->strings["Account Types"] = "Kontenarten";
+$a->strings["Personal Page Subtypes"] = "Unterarten der persönlichen Seite";
+$a->strings["Community Forum Subtypes"] = "Unterarten des Gemeinschaftsforums";
+$a->strings["Personal Page"] = "Persönliche Seite";
+$a->strings["Account for a personal profile."] = "Konto für ein persönliches Profil.";
+$a->strings["Organisation Page"] = "Organisationsseite";
+$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "Konto für eine Organisation, das Kontaktanfragen automatisch als \"Follower\" annimmt.";
+$a->strings["News Page"] = "Nachrichtenseite";
+$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "Konto für einen Feedspiegel, das Kontaktanfragen automatisch als \"Follower\" annimmt.";
+$a->strings["Community Forum"] = "Gemeinschaftsforum";
+$a->strings["Account for community discussions."] = "Konto für Diskussionsforen. ";
+$a->strings["Normal Account Page"] = "Normales Konto";
+$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "Konto für ein normales persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden.";
+$a->strings["Soapbox Page"] = "Marktschreier-Konto";
+$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt.";
+$a->strings["Public Forum"] = "Öffentliches Forum";
+$a->strings["Automatically approves all contact requests."] = "Bestätigt alle Kontaktanfragen automatisch.";
+$a->strings["Automatic Friend Page"] = "Automatische Freunde Seite";
+$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt.";
+$a->strings["Private Forum [Experimental]"] = "Privates Forum [Versuchsstadium]";
+$a->strings["Requires manual approval of contact requests."] = "Kontaktanfragen müssen manuell bestätigt werden.";
+$a->strings["OpenID:"] = "OpenID:";
+$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID.";
+$a->strings["Publish your default profile in your local site directory?"] = "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?";
+$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."] = "Dein Profil wird im <a href=\"%s\">lokalen Verzeichnis</a> dieses Knotens veröffentlicht. Je nach Systemeinstellungen kann es öffentlich auffindbar sein.";
+$a->strings["No"] = "Nein";
+$a->strings["Publish your default profile in the global social directory?"] = "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?";
+$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."] = "Dein Profil wird in den globalen Friendica Verzeichnissen (z.B. <a href=\"%s\">%s</a>) veröffentlicht. Dein Profil wird öffentlich auffindbar sein.";
+$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?";
+$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"] = "Die Liste deiner Kontakte wird nicht in deinem Standard-Profil angezeigt werden. Du kannst für jedes weitere Profil diese Entscheidung separat einstellen.";
+$a->strings["Hide your profile details from anonymous viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?";
+$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."] = "Anonyme Besucher deines Profils werden ausschließlich dein Profilbild, deinen Namen sowie deinen Spitznamen sehen. Deine lffentlichen Beiträge und Kommentare werden weiterhin sichtbar sein.";
+$a->strings["Allow friends to post to your profile page?"] = "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?";
+$a->strings["Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"] = "Deine Kontakte können Beiträge auf deiner Pinnwand hinterlassen. Diese werden an deine Kontakte verteilt.";
+$a->strings["Allow friends to tag your posts?"] = "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern versehen?";
+$a->strings["Your contacts can add additional tags to your posts."] = "Deine Kontakte dürfen deine Beiträge mit zusätzlichen Schlagworten versehen.";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
+$a->strings["If you like, Friendica may suggest new members to add you as a contact."] = "Wenn du magst, kann Friendica dich neuen Mitgliedern als Kontakt vorschlagen.";
+$a->strings["Permit unknown people to send you private mail?"] = "Dürfen Dir Unbekannte private Nachrichten schicken?";
+$a->strings["Friendica network users may send you private messages even if they are not in your contact list."] = "Nutzer des Friendica Netzwerks können dir private Nachrichten senden, selbst wenn sie nicht in deine Kontaktliste sind.";
+$a->strings["Profile is <strong>not published</strong>."] = "Profil ist <strong>nicht veröffentlicht</strong>.";
+$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "Die Adresse deines Profils lautet <strong>'%s'</strong> oder '%s'.";
+$a->strings["Automatically expire posts after this many days:"] = "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:";
+$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht.";
+$a->strings["Advanced expiration settings"] = "Erweiterte Verfallseinstellungen";
+$a->strings["Advanced Expiration"] = "Erweitertes Verfallen";
+$a->strings["Expire posts:"] = "Beiträge verfallen lassen:";
+$a->strings["Expire personal notes:"] = "Persönliche Notizen verfallen lassen:";
+$a->strings["Expire starred posts:"] = "Markierte Beiträge verfallen lassen:";
+$a->strings["Expire photos:"] = "Fotos verfallen lassen:";
+$a->strings["Only expire posts by others:"] = "Nur Beiträge anderer verfallen:";
+$a->strings["Account Settings"] = "Kontoeinstellungen";
+$a->strings["Password Settings"] = "Passwort-Einstellungen";
+$a->strings["New Password:"] = "Neues Passwort:";
+$a->strings["Confirm:"] = "Bestätigen:";
+$a->strings["Leave password fields blank unless changing"] = "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern";
+$a->strings["Current Password:"] = "Aktuelles Passwort:";
+$a->strings["Your current password to confirm the changes"] = "Dein aktuelles Passwort um die Änderungen zu bestätigen";
+$a->strings["Password:"] = "Passwort:";
+$a->strings["Basic Settings"] = "Grundeinstellungen";
+$a->strings["Full Name:"] = "Kompletter Name:";
+$a->strings["Email Address:"] = "E-Mail-Adresse:";
+$a->strings["Your Timezone:"] = "Deine Zeitzone:";
+$a->strings["Your Language:"] = "Deine Sprache:";
+$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "Wähle die Sprache, in der wir Dir die Friendica-Oberfläche präsentieren sollen und Dir E-Mail schicken";
+$a->strings["Default Post Location:"] = "Standardstandort:";
+$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
+$a->strings["Security and Privacy Settings"] = "Sicherheits- und Privatsphäre-Einstellungen";
+$a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl vonKontaktanfragen/Tag:";
+$a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)";
+$a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträge";
+$a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)";
+$a->strings["Show to Groups"] = "Zeige den Gruppen";
+$a->strings["Show to Contacts"] = "Zeige den Kontakten";
+$a->strings["Default Private Post"] = "Privater Standardbeitrag";
+$a->strings["Default Public Post"] = "Öffentlicher Standardbeitrag";
+$a->strings["Default Permissions for New Posts"] = "Standardberechtigungen für neue Beiträge";
+$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:";
+$a->strings["Notification Settings"] = "Benachrichtigungseinstellungen";
+$a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:";
+$a->strings["You receive an introduction"] = "– Du eine Kontaktanfrage erhältst";
+$a->strings["Your introductions are confirmed"] = "– eine Deiner Kontaktanfragen akzeptiert wurde";
+$a->strings["Someone writes on your profile wall"] = "– jemand etwas auf Deine Pinnwand schreibt";
+$a->strings["Someone writes a followup comment"] = "– jemand auch einen Kommentar verfasst";
+$a->strings["You receive a private message"] = "– Du eine private Nachricht erhältst";
+$a->strings["You receive a friend suggestion"] = "– Du eine Empfehlung erhältst";
+$a->strings["You are tagged in a post"] = "– Du in einem Beitrag erwähnt wirst";
+$a->strings["You are poked/prodded/etc. in a post"] = "– Du von jemandem angestupst oder sonstwie behandelt wirst";
+$a->strings["Activate desktop notifications"] = "Desktop Benachrichtigungen einschalten";
+$a->strings["Show desktop popup on new notifications"] = "Desktop Benachrichtigungen einschalten";
+$a->strings["Text-only notification emails"] = "Benachrichtigungs E-Mail als Rein-Text.";
+$a->strings["Send text only notification emails, without the html part"] = "Sende Benachrichtigungs E-Mail als Rein-Text - ohne HTML-Teil";
+$a->strings["Show detailled notifications"] = "Detaillierte Benachrichtigungen anzeigen";
+$a->strings["Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed."] = "Normalerweise werde alle Benachrichtigungen zu einem Thema zusammengefasst in einer einzigen Mitteilung. Wenn diese Option aktiviert ist, wird jede Mitteilung angezeigt.";
+$a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Konto-/Seitentyp-Einstellungen";
+$a->strings["Change the behaviour of this account for special situations"] = "Verhalten dieses Kontos in bestimmten Situationen:";
+$a->strings["Relocate"] = "Umziehen";
+$a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button.";
+$a->strings["Resend relocate message to contacts"] = "Umzugsbenachrichtigung erneut an Kontakte senden";
+$a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt treten";
+$a->strings["{0} sent you a message"] = "{0} schickte Dir eine Nachricht";
+$a->strings["{0} requested registration"] = "{0} möchte sich registrieren";
+$a->strings["Remove term"] = "Begriff entfernen";
+$a->strings["Saved Searches"] = "Gespeicherte Suchen";
+$a->strings["Only logged in users are permitted to perform a search."] = "Nur eingeloggten Benutzern ist das Suchen gestattet.";
+$a->strings["Too Many Requests"] = "Zu viele Abfragen";
+$a->strings["Only one search per minute is permitted for not logged in users."] = "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet.";
+$a->strings["No results."] = "Keine Ergebnisse.";
+$a->strings["Items tagged with: %s"] = "Beiträge die mit %s getaggt sind";
+$a->strings["Results for: %s"] = "Ergebnisse für: %s";
+$a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte.";
+$a->strings["Common Friends"] = "Gemeinsame Kontakte";
+$a->strings["Login"] = "Anmeldung";
+$a->strings["The post was created"] = "Der Beitrag wurde angelegt";
+$a->strings["add"] = "hinzufügen";
+$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
+	0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann.",
+	1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können.",
+];
+$a->strings["Messages in this group won't be send to these receivers."] = "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden.";
+$a->strings["No such group"] = "Es gibt keine solche Gruppe";
+$a->strings["Group is empty"] = "Gruppe ist leer";
+$a->strings["Group: %s"] = "Gruppe: %s";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen.";
+$a->strings["Invalid contact."] = "Ungültiger Kontakt.";
+$a->strings["Commented Order"] = "Neueste Kommentare";
+$a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortieren";
+$a->strings["Posted Order"] = "Neueste Beiträge";
+$a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortieren";
+$a->strings["Personal"] = "Persönlich";
+$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um Dich geht";
+$a->strings["New"] = "Neue";
+$a->strings["Activity Stream - by date"] = "Aktivitäten-Stream - nach Datum";
+$a->strings["Shared Links"] = "Geteilte Links";
+$a->strings["Interesting Links"] = "Interessante Links";
+$a->strings["Starred"] = "Markierte";
+$a->strings["Favourite Posts"] = "Favorisierte Beiträge";
+$a->strings["Group created."] = "Gruppe erstellt.";
+$a->strings["Could not create group."] = "Konnte die Gruppe nicht erstellen.";
+$a->strings["Group not found."] = "Gruppe nicht gefunden.";
+$a->strings["Group name changed."] = "Gruppenname geändert.";
+$a->strings["Save Group"] = "Gruppe speichern";
+$a->strings["Filter"] = "Filter";
+$a->strings["Create a group of contacts/friends."] = "Eine Kontaktgruppe anlegen.";
+$a->strings["Group Name: "] = "Gruppenname:";
+$a->strings["Contacts not in any group"] = "Kontakte in keiner Gruppe";
+$a->strings["Group removed."] = "Gruppe entfernt.";
+$a->strings["Unable to remove group."] = "Konnte die Gruppe nicht entfernen.";
+$a->strings["Delete Group"] = "Gruppe löschen";
+$a->strings["Edit Group Name"] = "Gruppen Name bearbeiten";
+$a->strings["Members"] = "Mitglieder";
+$a->strings["All Contacts"] = "Alle Kontakte";
+$a->strings["Remove contact from group"] = "Entferne den Kontakt aus der Gruppe";
+$a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen";
+$a->strings["Add contact to group"] = "Füge den Kontakt zur Gruppe hinzu";
+$a->strings["Parent user not found."] = "Verwalter nicht gefunden.";
+$a->strings["No parent user"] = "Kein Verwalter";
+$a->strings["Parent Password:"] = "Passwort des Verwalters";
+$a->strings["Please enter the password of the parent account to legitimize your request."] = "Bitte gib das Passwort des Verwalters ein, um deine Anfrage zu bestätigen.";
+$a->strings["Parent User"] = "Verwalter";
+$a->strings["Parent users have total control about this account, including the account settings. Please double check whom you give this access."] = "Verwalter haben Zugriff auf alle Funktionen dieses Benutzerkontos und können dessen Einstellungen ändern.";
+$a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite";
+$a->strings["Delegates"] = "Bevollmächtigte";
+$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."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!";
+$a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite";
+$a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
+$a->strings["Remove"] = "Entfernen";
+$a->strings["Add"] = "Hinzufügen";
+$a->strings["No entries."] = "Keine Einträge.";
+$a->strings["Export account"] = "Account exportieren";
+$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."] = "Exportiere Deine Accountinformationen und Kontakte. Verwende dies um ein Backup Deines Accounts anzulegen und/oder damit auf einen anderen Server umzuziehen.";
+$a->strings["Export all"] = "Alles exportieren";
+$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)"] = "Exportiere Deine Accountinformationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies, um ein komplettes Backup Deines Accounts anzulegen (Fotos werden nicht exportiert).";
+$a->strings["Resubscribing to OStatus contacts"] = "Erneuern der OStatus Abonements";
+$a->strings["Error"] = "Fehler";
+$a->strings["Done"] = "Erledigt";
+$a->strings["Keep this window open until done."] = "Lasse dieses Fenster offen, bis der Vorgang abgeschlossen ist.";
+$a->strings["Access denied."] = "Zugriff verweigert.";
+$a->strings["No contacts."] = "Keine Kontakte.";
+$a->strings["Visit %s's profile [%s]"] = "Besuche %ss Profil [%s]";
+$a->strings["Contact wasn't found or can't be unfollowed."] = "Der Kontakt konnte nicht gefunden oder nicht entfolgt werden.";
+$a->strings["Contact unfollowed"] = "Kontakt wird nicht mehr gefolgt";
+$a->strings["Submit Request"] = "Anfrage abschicken";
+$a->strings["You aren't a friend of this contact."] = "Du hast keine beidseitige Freundschaft mit diesem Kontakt.";
+$a->strings["Unfollowing is currently not supported by your network."] = "Bei diesem Netzwerk wird das Entfolgen derzeit nicht unterstützt.";
+$a->strings["Disconnect/Unfollow"] = "Verbindung lösen/Nicht mehr folgen";
+$a->strings["Your Identity Address:"] = "Adresse Deines Profils:";
+$a->strings["Profile URL"] = "Profil URL";
+$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
+$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
+$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."] = "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern.";
+$a->strings["Registration successful."] = "Registrierung erfolgreich.";
+$a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden.";
+$a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Du kannst dieses Formular auch (optional) mit Deiner OpenID ausfüllen, indem Du Deine OpenID angibst und 'Registrieren' klickst.";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus.";
+$a->strings["Your OpenID (optional): "] = "Deine OpenID (optional): ";
+$a->strings["Include your profile in member directory?"] = "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?";
+$a->strings["Note for the admin"] = "Hinweis für den Admin";
+$a->strings["Leave a message for the admin, why you want to join this node"] = "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest.";
+$a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
+$a->strings["Your invitation code: "] = "Dein Ein­la­dungs­code";
+$a->strings["Registration"] = "Registrierung";
+$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):";
+$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Deine E-Mail Adresse (Informationen zur Registrierung werden an diese Adresse gesendet, darum muss sie existieren.)";
+$a->strings["Leave empty for an auto generated password."] = "Leer lassen um das Passwort automatisch zu generieren.";
+$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@%s</strong>'."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@%s</strong>' sein.";
+$a->strings["Choose a nickname: "] = "Spitznamen wählen: ";
+$a->strings["Register"] = "Registrieren";
+$a->strings["Import"] = "Import";
+$a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica Instanz";
+$a->strings["Terms of Service"] = "Nutzungsbedingungen";
+$a->strings["Note: This node explicitly contains adult content"] = "Hinweis: Dieser Knoten enthält explizit Inhalte für Erwachsene";
+$a->strings["Invalid request identifier."] = "Invalid request identifier.";
+$a->strings["Discard"] = "Verwerfen";
+$a->strings["Ignore"] = "Ignorieren";
+$a->strings["Notifications"] = "Benachrichtigungen";
+$a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen";
+$a->strings["System Notifications"] = "Systembenachrichtigungen";
+$a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen";
+$a->strings["Home Notifications"] = "Pinnwand Benachrichtigungen";
+$a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen";
+$a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen";
+$a->strings["Notification type:"] = "Art der Benachrichtigung:";
+$a->strings["Suggested by:"] = "Vorgeschlagen von:";
+$a->strings["Hide this contact from others"] = "Verbirg diesen Kontakt vor Anderen";
+$a->strings["Approve"] = "Genehmigen";
+$a->strings["Claims to be known to you: "] = "Behauptet Dich zu kennen: ";
+$a->strings["yes"] = "ja";
+$a->strings["no"] = "nein";
+$a->strings["Shall your connection be bidirectional or not?"] = "Soll die Verbindung beidseitig sein oder nicht?";
+$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."] = "Akzeptierst du %s als Kontakt, erlaubst du damit das Lesen deiner Beiträge und abonnierst selbst auch die Beiträge von %s.";
+$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."] = "Wenn du %s als Abonnent akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten.";
+$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."] = "Wenn du %s als Teilenden akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten.";
+$a->strings["Friend"] = "Kontakt";
+$a->strings["Sharer"] = "Teilenden";
+$a->strings["Subscriber"] = "Abonnent";
+$a->strings["Tags:"] = "Tags:";
+$a->strings["Network:"] = "Netzwerk:";
+$a->strings["No introductions."] = "Keine Kontaktanfragen.";
+$a->strings["Show unread"] = "Ungelesene anzeigen";
+$a->strings["Show all"] = "Alle anzeigen";
+$a->strings["No more %s notifications."] = "Keine weiteren %s Benachrichtigungen";
+$a->strings["New Message"] = "Neue Nachricht";
+$a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden.";
+$a->strings["Do you really want to delete this message?"] = "Möchtest Du wirklich diese Nachricht löschen?";
+$a->strings["Message deleted."] = "Nachricht gelöscht.";
+$a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
+$a->strings["No messages."] = "Keine Nachrichten.";
+$a->strings["Message not available."] = "Nachricht nicht verfügbar.";
+$a->strings["Delete message"] = "Nachricht löschen";
+$a->strings["D, d M Y - g:i A"] = "D, d. M Y - H:i";
+$a->strings["Delete conversation"] = "Unterhaltung löschen";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten.";
+$a->strings["Send Reply"] = "Antwort senden";
+$a->strings["Unknown sender - %s"] = "'Unbekannter Absender - %s";
+$a->strings["You and %s"] = "Du und %s";
+$a->strings["%s and You"] = "%s und Du";
+$a->strings["%d message"] = [
+	0 => "%d Nachricht",
+	1 => "%d Nachrichten",
+];
+$a->strings["No profile"] = "Kein Profil";
+$a->strings["Subscribing to OStatus contacts"] = "OStatus Kontakten folgen";
+$a->strings["No contact provided."] = "Keine Kontakte gefunden.";
+$a->strings["Couldn't fetch information for contact."] = "Konnte die Kontaktinformationen nicht einholen.";
+$a->strings["Couldn't fetch friends for contact."] = "Konnte die Kontaktliste des Kontakts nicht abfragen.";
+$a->strings["success"] = "Erfolg";
+$a->strings["failed"] = "Fehlgeschlagen";
+$a->strings["ignored"] = "Ignoriert";
+$a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen";
+$a->strings["User deleted their account"] = "Gelöschter Nutzeraccount";
+$a->strings["On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups."] = "Ein Nutzer deiner Friendica Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass deren Daten aus deinen Backups entfernt werden.";
+$a->strings["The user id is %d"] = "Die ID des Users lautet %d";
+$a->strings["Remove My Account"] = "Konto löschen";
+$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen.";
+$a->strings["Please enter your password for verification:"] = "Bitte gib Dein Passwort zur Verifikation ein:";
+$a->strings["Tag removed"] = "Tag entfernt";
+$a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen";
+$a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: ";
+$a->strings["Welcome to %s"] = "Willkommen zu %s";
+$a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
+$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
+$a->strings["- select -"] = "- auswählen -";
+$a->strings["This is Friendica, version %s that is running at the web location %s. The database version is %s, the post update version is %s."] = "Diese Friendica Instanz verwendet die Version %s, sie ist unter der folgenden Adresse im Web zu finden %s. Die Datenbank Version ist %s und die Post-Update Version %s.";
+$a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "Bitte besuche <a href=\"https://friendi.ca\">Friendi.ca</a> um mehr über das Friendica Projekt zu erfahren.";
+$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
+$a->strings["the bugtracker at github"] = "den Bugtracker auf github";
+$a->strings["Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"] = "Vorschläge, Lob usw.: E-Mail an \"Info\" at \"Friendi - dot ca\"";
+$a->strings["Installed addons/apps:"] = "Installierte Apps und Addons";
+$a->strings["No installed addons/apps"] = "Es sind keine Addons oder Apps installiert";
+$a->strings["Read about the <a href=\"%1\$s/tos\">Terms of Service</a> of this node."] = "Erfahre mehr über die <a href=\"%1\$s/tos\">Nutzungsbedingungen</a> dieses Knotens.";
+$a->strings["On this server the following remote servers are blocked."] = "Auf diesem Server werden die folgenden entfernten Server blockiert.";
+$a->strings["Blocked domain"] = "Blockierte Domain";
+$a->strings["Reason for the block"] = "Begründung für die Blockierung";
+$a->strings["Access to this profile has been restricted."] = "Der Zugriff zu diesem Profil wurde eingeschränkt.";
+$a->strings["Invalid request."] = "Ungültige Anfrage";
+$a->strings["Image exceeds size limit of %s"] = "Bildgröße überschreitet das Limit von %s";
+$a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten.";
+$a->strings["Wall Photos"] = "Pinnwand-Bilder";
+$a->strings["Image upload failed."] = "Hochladen des Bildes gescheitert.";
 $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica";
 $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder";
 $a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden.";
 $a->strings["Getting Started"] = "Einstieg";
 $a->strings["Friendica Walk-Through"] = "Friendica Rundgang";
 $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."] = "Auf der <em>Quick Start</em> Seite findest Du eine kurze Einleitung in die einzelnen Funktionen Deines Profils und die Netzwerk-Reiter, wo Du interessante Foren findest und neue Kontakte knüpfst.";
-$a->strings["Settings"] = "Einstellungen";
 $a->strings["Go to Your Settings"] = "Gehe zu deinen Einstellungen";
 $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."] = "Ändere bitte unter <em>Einstellungen</em> dein Passwort. Außerdem merke dir deine Identifikationsadresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Kontakte mit anderen im Friendica Netzwerk zu knüpfen..";
 $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."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn Du Dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest Du es veröffentlichen - außer all Deine Kontakte und potentiellen Kontakte wissen genau, wie sie Dich finden können.";
-$a->strings["Profile"] = "Profil";
 $a->strings["Upload Profile Photo"] = "Profilbild hochladen";
 $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."] = "Lade ein Profilbild hoch, falls Du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Kontakte zu finden, wenn Du ein Bild von Dir selbst verwendest, als wenn Du dies nicht tust.";
 $a->strings["Edit Your Profile"] = "Editiere dein Profil";
@@ -339,287 +924,6 @@ $a->strings["Friendica respects your privacy. By default, your posts will only s
 $a->strings["Getting Help"] = "Hilfe bekommen";
 $a->strings["Go to the Help Section"] = "Zum Hilfe Abschnitt gehen";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Unsere <strong>Hilfe</strong> Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten.";
-$a->strings["Visit %s's profile [%s]"] = "Besuche %ss Profil [%s]";
-$a->strings["Edit contact"] = "Kontakt bearbeiten";
-$a->strings["Contacts who are not members of a group"] = "Kontakte, die keiner Gruppe zugewiesen sind";
-$a->strings["Not Extended"] = "Nicht erweitert.";
-$a->strings["Resubscribing to OStatus contacts"] = "Erneuern der OStatus Abonements";
-$a->strings["Error"] = "Fehler";
-$a->strings["Done"] = "Erledigt";
-$a->strings["Keep this window open until done."] = "Lasse dieses Fenster offen, bis der Vorgang abgeschlossen ist.";
-$a->strings["Do you really want to delete this suggestion?"] = "Möchtest Du wirklich diese Empfehlung löschen?";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge verfügbar. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
-$a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
-$a->strings["Friend Suggestions"] = "Kontaktvorschläge";
-$a->strings["[Embedded content - reload page to view]"] = "[Eingebetteter Inhalt - Seite neu laden zum Betrachten]";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal.";
-$a->strings["Import"] = "Import";
-$a->strings["Move account"] = "Account umziehen";
-$a->strings["You can import an account from another Friendica server."] = "Du kannst einen Account von einem anderen Friendica Server importieren.";
-$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist.";
-$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren";
-$a->strings["Account file"] = "Account Datei";
-$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu Deinem Standardprofil hinzu.";
-$a->strings["is interested in:"] = "ist interessiert an:";
-$a->strings["Profile Match"] = "Profilübereinstimmungen";
-$a->strings["No matches"] = "Keine Übereinstimmungen";
-$a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
-$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppenseiten wechseln, die Deine Kontoinformationen teilen oder zu denen Du „Verwalten“-Befugnisse bekommen hast.";
-$a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten aus: ";
-$a->strings["Submit"] = "Senden";
-$a->strings["Invalid request."] = "Ungültige Anfrage";
-$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt.";
-$a->strings["Or - did you try to upload an empty file?"] = "Oder - hast Du versucht, eine leere Datei hochzuladen?";
-$a->strings["File exceeds size limit of %s"] = "Die Datei ist größer als das erlaubte Limit von %s";
-$a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen.";
-$a->strings["- select -"] = "- auswählen -";
-$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\, H:i";
-$a->strings["Time Conversion"] = "Zeitumrechnung";
-$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann.";
-$a->strings["UTC time: %s"] = "UTC Zeit: %s";
-$a->strings["Current timezone: %s"] = "Aktuelle Zeitzone: %s";
-$a->strings["Converted localtime: %s"] = "Umgerechnete lokale Zeit: %s";
-$a->strings["Please select your timezone:"] = "Bitte wähle Deine Zeitzone:";
-$a->strings["No more system notifications."] = "Keine weiteren Systembenachrichtigungen.";
-$a->strings["System Notifications"] = "Systembenachrichtigungen";
-$a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt treten";
-$a->strings["{0} sent you a message"] = "{0} schickte Dir eine Nachricht";
-$a->strings["{0} requested registration"] = "{0} möchte sich registrieren";
-$a->strings["Poke/Prod"] = "Anstupsen";
-$a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen";
-$a->strings["Recipient"] = "Empfänger";
-$a->strings["Choose what you wish to do to recipient"] = "Was willst Du mit dem Empfänger machen:";
-$a->strings["Make this post private"] = "Diesen Beitrag privat machen";
-$a->strings["Public access denied."] = "Öffentlicher Zugriff verweigert.";
-$a->strings["Only logged in users are permitted to perform a probing."] = "Nur eingeloggten Benutzern ist das Untersuchen von Adressen gestattet.";
-$a->strings["Permission denied"] = "Zugriff verweigert";
-$a->strings["Invalid profile identifier."] = "Ungültiger Profil-Bezeichner.";
-$a->strings["Profile Visibility Editor"] = "Editor für die Profil-Sichtbarkeit";
-$a->strings["Click on a contact to add or remove."] = "Klicke einen Kontakt an, um ihn hinzuzufügen oder zu entfernen";
-$a->strings["Visible To"] = "Sichtbar für";
-$a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit gesichertem Profilzugriff)";
-$a->strings["Account approved."] = "Konto freigegeben.";
-$a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen";
-$a->strings["Please login."] = "Bitte melde Dich an.";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt %2\$s %3\$s";
-$a->strings["Tag removed"] = "Tag entfernt";
-$a->strings["Remove Item Tag"] = "Gegenstands-Tag entfernen";
-$a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: ";
-$a->strings["Remove"] = "Entfernen";
-$a->strings["Export account"] = "Account exportieren";
-$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."] = "Exportiere Deine Accountinformationen und Kontakte. Verwende dies um ein Backup Deines Accounts anzulegen und/oder damit auf einen anderen Server umzuziehen.";
-$a->strings["Export all"] = "Alles exportieren";
-$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)"] = "Exportiere Deine Accountinformationen, Kontakte und alle Einträge als JSON Datei. Dies könnte eine sehr große Datei werden und dementsprechend viel Zeit benötigen. Verwende dies, um ein komplettes Backup Deines Accounts anzulegen (Fotos werden nicht exportiert).";
-$a->strings["Export personal data"] = "Persönliche Daten exportieren";
-$a->strings["No contacts."] = "Keine Kontakte.";
-$a->strings["Access denied."] = "Zugriff verweigert.";
-$a->strings["Image exceeds size limit of %s"] = "Bildgröße überschreitet das Limit von %s";
-$a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten.";
-$a->strings["Wall Photos"] = "Pinnwand-Bilder";
-$a->strings["Image upload failed."] = "Hochladen des Bildes gescheitert.";
-$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximale Anzahl der täglichen Pinnwand Nachrichten für %s ist überschritten. Zustellung fehlgeschlagen.";
-$a->strings["No recipient selected."] = "Kein Empfänger gewählt.";
-$a->strings["Unable to check your home location."] = "Konnte Deinen Heimatort nicht bestimmen.";
-$a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden.";
-$a->strings["Message collection failure."] = "Konnte Nachrichten nicht abrufen.";
-$a->strings["Message sent."] = "Nachricht gesendet.";
-$a->strings["No recipient."] = "Kein Empfänger.";
-$a->strings["Send Private Message"] = "Private Nachricht senden";
-$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Wenn Du möchtest, dass %s Dir antworten kann, überprüfe Deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern.";
-$a->strings["To:"] = "An:";
-$a->strings["Subject:"] = "Betreff:";
-$a->strings["Your message:"] = "Deine Nachricht:";
-$a->strings["Login"] = "Anmeldung";
-$a->strings["The post was created"] = "Der Beitrag wurde angelegt";
-$a->strings["Item not found"] = "Beitrag nicht gefunden";
-$a->strings["Edit post"] = "Beitrag bearbeiten";
-$a->strings["CC: email addresses"] = "Cc: E-Mail-Addressen";
-$a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com";
-$a->strings["Contact not found."] = "Kontakt nicht gefunden.";
-$a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet.";
-$a->strings["Suggest Friends"] = "Kontakte vorschlagen";
-$a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor";
-$a->strings["Access to this profile has been restricted."] = "Der Zugriff zu diesem Profil wurde eingeschränkt.";
-$a->strings["Events"] = "Veranstaltungen";
-$a->strings["View"] = "Ansehen";
-$a->strings["Previous"] = "Vorherige";
-$a->strings["Next"] = "Nächste";
-$a->strings["today"] = "Heute";
-$a->strings["month"] = "Monat";
-$a->strings["week"] = "Woche";
-$a->strings["day"] = "Tag";
-$a->strings["list"] = "Liste";
-$a->strings["User not found"] = "Nutzer nicht gefunden";
-$a->strings["This calendar format is not supported"] = "Dieses Kalenderformat wird nicht unterstützt.";
-$a->strings["No exportable data found"] = "Keine exportierbaren Daten gefunden";
-$a->strings["calendar"] = "Kalender";
-$a->strings["Network:"] = "Netzwerk:";
-$a->strings["%d contact edited."] = [
-	0 => "%d Kontakt bearbeitet.",
-	1 => "%d Kontakte bearbeitet.",
-];
-$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen.";
-$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden.";
-$a->strings["Contact updated."] = "Kontakt aktualisiert.";
-$a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen.";
-$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert";
-$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben";
-$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert";
-$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert";
-$a->strings["Contact has been archived"] = "Kontakt wurde archiviert";
-$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt";
-$a->strings["Drop contact"] = "Kontakt löschen";
-$a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirklich diesen Kontakt löschen?";
-$a->strings["Contact has been removed."] = "Kontakt wurde entfernt.";
-$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft";
-$a->strings["You are sharing with %s"] = "Du teilst mit %s";
-$a->strings["%s is sharing with you"] = "%s teilt mit Dir";
-$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar.";
-$a->strings["Never"] = "Niemals";
-$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)";
-$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)";
-$a->strings["Suggest friends"] = "Kontakte vorschlagen";
-$a->strings["Network type: %s"] = "Netzwerktyp: %s";
-$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!";
-$a->strings["Fetch further information for feeds"] = "Weitere Informationen zu Feeds holen";
-$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."] = "Zusätzliche Informationen wie Vorschaubilder, Titel und Zusammenfassungen vom Feed-Eintrag laden. Du kannst diese Option aktivieren, wenn der Feed nicht all zu viel Text beinhaltet. Schlagwörter werden auf den Meta-Informationen des Feed-Headers bezogen und als Hash-Tags verwendet.";
-$a->strings["Disabled"] = "Deaktiviert";
-$a->strings["Fetch information"] = "Beziehe Information";
-$a->strings["Fetch keywords"] = "Schlüsselwprter abrufen";
-$a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte";
-$a->strings["Disconnect/Unfollow"] = "Verbindung lösen/Nicht mehr folgen";
-$a->strings["Contact"] = "Kontakt";
-$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft.";
-$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen";
-$a->strings["Their personal note"] = "Die persönliche Mitteilung";
-$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten";
-$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten";
-$a->strings["Ignore contact"] = "Ignoriere den Kontakt";
-$a->strings["Repair URL settings"] = "URL Einstellungen reparieren";
-$a->strings["View conversations"] = "Unterhaltungen anzeigen";
-$a->strings["Last update:"] = "Letzte Aktualisierung: ";
-$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
-$a->strings["Update now"] = "Jetzt aktualisieren";
-$a->strings["Unblock"] = "Entsperren";
-$a->strings["Block"] = "Sperren";
-$a->strings["Unignore"] = "Ignorieren aufheben";
-$a->strings["Ignore"] = "Ignorieren";
-$a->strings["Currently blocked"] = "Derzeit geblockt";
-$a->strings["Currently ignored"] = "Derzeit ignoriert";
-$a->strings["Currently archived"] = "Momentan archiviert";
-$a->strings["Awaiting connection acknowledge"] = "Bedarf der Bestätigung des Kontakts";
-$a->strings["Hide this contact from others"] = "Verbirg diesen Kontakt vor Anderen";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein";
-$a->strings["Notification for new posts"] = "Benachrichtigung bei neuen Beiträgen";
-$a->strings["Send a notification of every new post of this contact"] = "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt.";
-$a->strings["Blacklisted keywords"] = "Blacklistete Schlüsselworte ";
-$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde";
-$a->strings["Profile URL"] = "Profil URL";
-$a->strings["Location:"] = "Ort:";
-$a->strings["XMPP:"] = "XMPP:";
-$a->strings["About:"] = "Über:";
-$a->strings["Tags:"] = "Tags:";
-$a->strings["Actions"] = "Aktionen";
-$a->strings["Status"] = "Status";
-$a->strings["Contact Settings"] = "Kontakteinstellungen";
-$a->strings["Suggestions"] = "Kontaktvorschläge";
-$a->strings["Suggest potential friends"] = "Kontakte vorschlagen";
-$a->strings["All Contacts"] = "Alle Kontakte";
-$a->strings["Show all contacts"] = "Alle Kontakte anzeigen";
-$a->strings["Unblocked"] = "Ungeblockt";
-$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen";
-$a->strings["Blocked"] = "Geblockt";
-$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen";
-$a->strings["Ignored"] = "Ignoriert";
-$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen";
-$a->strings["Archived"] = "Archiviert";
-$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen";
-$a->strings["Hidden"] = "Verborgen";
-$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen";
-$a->strings["Search your contacts"] = "Suche in deinen Kontakten";
-$a->strings["Results for: %s"] = "Ergebnisse für: %s";
-$a->strings["Find"] = "Finde";
-$a->strings["Update"] = "Aktualisierungen";
-$a->strings["Archive"] = "Archivieren";
-$a->strings["Unarchive"] = "Aus Archiv zurückholen";
-$a->strings["Batch Actions"] = "Stapelverarbeitung";
-$a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
-$a->strings["Profile Details"] = "Profildetails";
-$a->strings["View all contacts"] = "Alle Kontakte anzeigen";
-$a->strings["View all common friends"] = "Alle Kontakte anzeigen";
-$a->strings["Advanced"] = "Erweitert";
-$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen";
-$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft";
-$a->strings["is a fan of yours"] = "ist ein Fan von dir";
-$a->strings["you are a fan of"] = "Du bist Fan von";
-$a->strings["This is you"] = "Das bist Du";
-$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten";
-$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten";
-$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten";
-$a->strings["Delete contact"] = "Lösche den Kontakt";
-$a->strings["Parent user not found."] = "Verwalter nicht gefunden.";
-$a->strings["No parent user"] = "Kein Verwalter";
-$a->strings["Parent Password:"] = "Passwort des Verwalters";
-$a->strings["Please enter the password of the parent account to legitimize your request."] = "Bitte gib das Passwort des Verwalters ein, um deine Anfrage zu bestätigen.";
-$a->strings["Parent User"] = "Verwalter";
-$a->strings["Parent users have total control about this account, including the account settings. Please double check whom you give this access."] = "Verwalter haben Zugriff auf alle Funktionen dieses Benutzerkontos und können dessen Einstellungen ändern.";
-$a->strings["Save Settings"] = "Einstellungen speichern";
-$a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite";
-$a->strings["Delegates"] = "Bevollmächtigte";
-$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."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für Deinen privaten Account, dem Du nicht absolut vertraust!";
-$a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite";
-$a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
-$a->strings["Add"] = "Hinzufügen";
-$a->strings["No entries."] = "Keine Einträge.";
-$a->strings["You must be logged in to use this module"] = "Du musst eingeloggt sein um dieses Modul benutzen zu können.";
-$a->strings["Source URL"] = "URL der Quelle";
-$a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht.";
-$a->strings["Subscribing to OStatus contacts"] = "OStatus Kontakten folgen";
-$a->strings["No contact provided."] = "Keine Kontakte gefunden.";
-$a->strings["Couldn't fetch information for contact."] = "Konnte die Kontaktinformationen nicht einholen.";
-$a->strings["Couldn't fetch friends for contact."] = "Konnte die Kontaktliste des Kontakts nicht abfragen.";
-$a->strings["success"] = "Erfolg";
-$a->strings["failed"] = "Fehlgeschlagen";
-$a->strings["ignored"] = "Ignoriert";
-$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zuschneiden schlug fehl.";
-$a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird.";
-$a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden";
-$a->strings["Upload File:"] = "Datei hochladen:";
-$a->strings["Select a profile:"] = "Profil auswählen:";
-$a->strings["or"] = "oder";
-$a->strings["skip this step"] = "diesen Schritt überspringen";
-$a->strings["select a photo from your photo albums"] = "wähle ein Foto aus deinen Fotoalben";
-$a->strings["Crop Image"] = "Bild zurechtschneiden";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann.";
-$a->strings["Done Editing"] = "Bearbeitung abgeschlossen";
-$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen.";
-$a->strings["Contact wasn't found or can't be unfollowed."] = "Der Kontakt konnte nicht gefunden oder nicht entfolgt werden.";
-$a->strings["Contact unfollowed"] = "Kontakt wird nicht mehr gefolgt";
-$a->strings["Submit Request"] = "Anfrage abschicken";
-$a->strings["You aren't a friend of this contact."] = "Du hast keine beidseitige Freundschaft mit diesem Kontakt.";
-$a->strings["Unfollowing is currently not supported by your network."] = "Bei diesem Netzwerk wird das Entfolgen derzeit nicht unterstützt.";
-$a->strings["Your Identity Address:"] = "Adresse Deines Profils:";
-$a->strings["Gender:"] = "Geschlecht:";
-$a->strings["Status:"] = "Status:";
-$a->strings["Homepage:"] = "Homepage:";
-$a->strings["Global Directory"] = "Weltweites Verzeichnis";
-$a->strings["Find on this site"] = "Auf diesem Server suchen";
-$a->strings["Results for:"] = "Ergebnisse für:";
-$a->strings["Site Directory"] = "Verzeichnis";
-$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
-$a->strings["People Search - %s"] = "Personensuche - %s";
-$a->strings["Forum Search - %s"] = "Forensuche - %s";
-$a->strings["The contact could not be added."] = "Der Kontakt konnte nicht hinzugefügt werden.";
-$a->strings["You already added this contact."] = "Du hast den Kontakt bereits hinzugefügt.";
-$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden.";
-$a->strings["OStatus support is disabled. Contact can't be added."] = "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden.";
-$a->strings["The network type couldn't be detected. Contact can't be added."] = "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden.";
-$a->strings["Please answer the following:"] = "Bitte beantworte folgendes:";
-$a->strings["Does %s know you?"] = "Kennt %s Dich?";
-$a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:";
 $a->strings["No valid account found."] = "Kein gültiges Konto gefunden.";
 $a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe Deine E-Mail.";
 $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."] = "\nHallo %1\$s,\n\nAuf \"%2\$s\" ist eine Anfrage auf das Zurücksetzen Deines Passworts gestellt\nworden. Um diese Anfrage zu verifizieren, folge bitte dem unten stehenden\nLink oder kopiere und füge ihn in die Adressleiste Deines Browsers ein.\n\nSolltest Du die Anfrage NICHT gemacht haben, ignoriere und/oder lösche diese\nE-Mail bitte.\n\nDein Passwort wird nicht geändert, solange wir nicht verifiziert haben, dass\nDu diese Änderung angefragt hast.";
@@ -659,292 +963,6 @@ $a->strings["Source text"] = "Quelltext";
 $a->strings["BBCode"] = "BBCode";
 $a->strings["Markdown"] = "Markdown";
 $a->strings["HTML"] = "HTML";
-$a->strings["This is Friendica, version"] = "Dies ist Friendica, Version";
-$a->strings["running at web location"] = "die unter folgender Webadresse zu finden ist";
-$a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "Bitte besuche <a href=\"https://friendi.ca\">Friendi.ca</a> um mehr über das Friendica Projekt zu erfahren.";
-$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
-$a->strings["the bugtracker at github"] = "den Bugtracker auf github";
-$a->strings["Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"] = "Vorschläge, Lob usw.: E-Mail an \"Info\" at \"Friendi - dot ca\"";
-$a->strings["Installed addons/apps:"] = "Installierte Apps und Addons";
-$a->strings["No installed addons/apps"] = "Es sind keine Addons oder Apps installiert";
-$a->strings["Read about the <a href=\"%1\$s/tos\">Terms of Service</a> of this node."] = "Erfahre mehr über die <a href=\"%1\$s/tos\">Nutzungsbedingungen</a> dieses Knotens.";
-$a->strings["On this server the following remote servers are blocked."] = "Auf diesem Server werden die folgenden entfernten Server blockiert.";
-$a->strings["Blocked domain"] = "Blockierte Domain";
-$a->strings["Reason for the block"] = "Begründung für die Blockierung";
-$a->strings["Total invitation limit exceeded."] = "Limit für Einladungen erreicht.";
-$a->strings["%s : Not a valid email address."] = "%s: Keine gültige Email Adresse.";
-$a->strings["Please join us on Friendica"] = "Ich lade Dich zu unserem sozialen Netzwerk Friendica ein";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limit für Einladungen erreicht. Bitte kontaktiere des Administrator der Seite.";
-$a->strings["%s : Message delivery failed."] = "%s: Zustellung der Nachricht fehlgeschlagen.";
-$a->strings["%d message sent."] = [
-	0 => "%d Nachricht gesendet.",
-	1 => "%d Nachrichten gesendet.",
-];
-$a->strings["You have no more invitations available"] = "Du hast keine weiteren Einladungen";
-$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."] = "Besuche %s für eine Liste der öffentlichen Server, denen Du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke.";
-$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s oder einer anderen öffentlichen Friendica Website.";
-$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 Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen Du beitreten kannst.";
-$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Es tut uns leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen.";
-$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 Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden.";
-$a->strings["To accept this invitation, please visit and register at %s."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s.";
-$a->strings["Send invitations"] = "Einladungen senden";
-$a->strings["Enter email addresses, one per line:"] = "E-Mail-Adressen eingeben, eine pro Zeile:";
-$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Du bist herzlich dazu eingeladen, Dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen.";
-$a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungscode: \$invite_code";
-$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald Du registriert bist, kontaktiere mich bitte auf meiner Profilseite:";
-$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendi.ca.";
-$a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt.";
-$a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren.";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
-$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button Deines Browsers <strong>jetzt</strong>, wenn Du Dir unsicher bist, was Du tun willst.";
-$a->strings["No mirroring"] = "Kein Spiegeln";
-$a->strings["Mirror as forwarded posting"] = "Spiegeln als weitergeleitete Beiträge";
-$a->strings["Mirror as my own posting"] = "Spiegeln als meine eigenen Beiträge";
-$a->strings["Return to contact editor"] = "Zurück zum Kontakteditor";
-$a->strings["Refetch contact data"] = "Kontaktdaten neu laden";
-$a->strings["Remote Self"] = "Entfernte Konten";
-$a->strings["Mirror postings from this contact"] = "Spiegle Beiträge dieses Kontakts";
-$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Markiere diesen Kontakt als remote_self (entferntes Konto), dies veranlasst Friendica alle Top-Level Beiträge dieses Kontakts an all Deine Kontakte zu senden.";
-$a->strings["Name"] = "Name";
-$a->strings["Account Nickname"] = "Konto-Spitzname";
-$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname";
-$a->strings["Account URL"] = "Konto-URL";
-$a->strings["Friend Request URL"] = "URL für Kontaktschaftsanfragen";
-$a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Kontaktanfragen";
-$a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen";
-$a->strings["Poll/Feed URL"] = "Pull/Feed-URL";
-$a->strings["New photo from this URL"] = "Neues Foto von dieser URL";
-$a->strings["%1\$s welcomes %2\$s"] = "%1\$s heißt %2\$s herzlich willkommen";
-$a->strings["Help:"] = "Hilfe:";
-$a->strings["Help"] = "Hilfe";
-$a->strings["Page not found."] = "Seite nicht gefunden.";
-$a->strings["Friendica Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
-$a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert.";
-$a->strings["Could not create table."] = "Tabelle konnte nicht angelegt werden.";
-$a->strings["Your Friendica site database has been installed."] = "Die Datenbank Deiner Friendicaseite wurde installiert.";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst Du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
-$a->strings["Database already in use."] = "Die Datenbank wird bereits verwendet.";
-$a->strings["System check"] = "Systemtest";
-$a->strings["Check again"] = "Noch einmal testen";
-$a->strings["Database connection"] = "Datenbankverbindung";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Um Friendica installieren zu können, müssen wir wissen, wie wir mit Deiner Datenbank Kontakt aufnehmen können.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite, falls Du Fragen zu diesen Einstellungen haben solltest.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Die Datenbank, die Du unten angibst, sollte bereits existieren. Ist dies noch nicht der Fall, erzeuge sie bitte bevor Du mit der Installation fortfährst.";
-$a->strings["Database Server Name"] = "Datenbank-Server";
-$a->strings["Database Login Name"] = "Datenbank-Nutzer";
-$a->strings["Database Login Password"] = "Datenbank-Passwort";
-$a->strings["For security reasons the password must not be empty"] = "Aus Sicherheitsgründen darf das Passwort nicht leer sein.";
-$a->strings["Database Name"] = "Datenbank-Name";
-$a->strings["Site administrator email address"] = "E-Mail-Adresse des Administrators";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Die E-Mail-Adresse, die in Deinem Friendica-Account eingetragen ist, muss mit dieser Adresse übereinstimmen, damit Du das Admin-Panel benutzen kannst.";
-$a->strings["Please select a default timezone for your website"] = "Bitte wähle die Standardzeitzone Deiner Webseite";
-$a->strings["Site settings"] = "Server-Einstellungen";
-$a->strings["System Language:"] = "Systemsprache:";
-$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Wähle die Standardsprache für deine Friendica-Installations-Oberfläche und den E-Mail-Versand";
-$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."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis Deiner Friendica-Installation zu erzeugen.";
-$a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "Wichtig: Du musst [manuell] einen Cronjob (o.ä.) für den Worker einrichten.";
-$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."] = "Du solltest nun die Seite zur <a href=\"%s/register\">Nutzerregistrierung</a> deiner neuen Friendica Instanz besuchen und einen neuen Nutzer einrichten. Bitte denke daran die selbe E-Mail Adresse anzugeben, die du auch als Administrator E-Mail angegeben hast, damit du das Admin-Panel verwenden kannst.";
-$a->strings["New Message"] = "Neue Nachricht";
-$a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden.";
-$a->strings["Messages"] = "Nachrichten";
-$a->strings["Do you really want to delete this message?"] = "Möchtest Du wirklich diese Nachricht löschen?";
-$a->strings["Message deleted."] = "Nachricht gelöscht.";
-$a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
-$a->strings["No messages."] = "Keine Nachrichten.";
-$a->strings["Message not available."] = "Nachricht nicht verfügbar.";
-$a->strings["Delete message"] = "Nachricht löschen";
-$a->strings["D, d M Y - g:i A"] = "D, d. M Y - H:i";
-$a->strings["Delete conversation"] = "Unterhaltung löschen";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Sichere Kommunikation ist nicht verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten.";
-$a->strings["Send Reply"] = "Antwort senden";
-$a->strings["Unknown sender - %s"] = "'Unbekannter Absender - %s";
-$a->strings["You and %s"] = "Du und %s";
-$a->strings["%s and You"] = "%s und Du";
-$a->strings["%d message"] = [
-	0 => "%d Nachricht",
-	1 => "%d Nachrichten",
-];
-$a->strings["Group created."] = "Gruppe erstellt.";
-$a->strings["Could not create group."] = "Konnte die Gruppe nicht erstellen.";
-$a->strings["Group not found."] = "Gruppe nicht gefunden.";
-$a->strings["Group name changed."] = "Gruppenname geändert.";
-$a->strings["Save Group"] = "Gruppe speichern";
-$a->strings["Create a group of contacts/friends."] = "Eine Kontaktgruppe anlegen.";
-$a->strings["Group Name: "] = "Gruppenname:";
-$a->strings["Group removed."] = "Gruppe entfernt.";
-$a->strings["Unable to remove group."] = "Konnte die Gruppe nicht entfernen.";
-$a->strings["Delete Group"] = "Gruppe löschen";
-$a->strings["Group Editor"] = "Gruppeneditor";
-$a->strings["Edit Group Name"] = "Gruppen Name bearbeiten";
-$a->strings["Members"] = "Mitglieder";
-$a->strings["Group is empty"] = "Gruppe ist leer";
-$a->strings["Remove contact from group"] = "Entferne den Kontakt aus der Gruppe";
-$a->strings["Add contact to group"] = "Füge den Kontakt zur Gruppe hinzu";
-$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
-$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Nutzerkonto wurde nicht gefunden und OpenID-Registrierung ist auf diesem Server nicht gestattet.";
-$a->strings["Login failed."] = "Anmeldung fehlgeschlagen.";
-$a->strings["Profile not found."] = "Profil nicht gefunden.";
-$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde.";
-$a->strings["Response from remote site was not understood."] = "Antwort der Gegenstelle unverständlich.";
-$a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: ";
-$a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen.";
-$a->strings["Temporary failure. Please wait and try again."] = "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal.";
-$a->strings["Introduction failed or was revoked."] = "Kontaktanfrage schlug fehl oder wurde zurückgezogen.";
-$a->strings["Remote site reported: "] = "Gegenstelle meldet: ";
-$a->strings["Unable to set contact photo."] = "Konnte das Bild des Kontakts nicht speichern.";
-$a->strings["No user record found for '%s' "] = "Für '%s' wurde kein Nutzer gefunden";
-$a->strings["Our site encryption key is apparently messed up."] = "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung.";
-$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden.";
-$a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden.";
-$a->strings["Site public key not available in contact record for URL %s."] = "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server.";
-$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID, die uns Dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal.";
-$a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden.";
-$a->strings["Unable to update your contact profile details on our system"] = "Die Updates für Dein Profil konnten nicht gespeichert werden";
-$a->strings["[Name Withheld]"] = "[Name unterdrückt]";
-$a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert.";
-$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung.";
-$a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden.";
-$a->strings["Warning: profile location has no profile photo."] = "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse.";
-$a->strings["%d required parameter was not found at the given location"] = [
-	0 => "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden",
-	1 => "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden",
-];
-$a->strings["Introduction complete."] = "Kontaktanfrage abgeschlossen.";
-$a->strings["Unrecoverable protocol error."] = "Nicht behebbarer Protokollfehler.";
-$a->strings["Profile unavailable."] = "Profil nicht verfügbar.";
-$a->strings["%s has received too many connection requests today."] = "%s hat heute zu viele Kontaktanfragen erhalten.";
-$a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen.";
-$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen.";
-$a->strings["Invalid locator"] = "Ungültiger Locator";
-$a->strings["You have already introduced yourself here."] = "Du hast Dich hier bereits vorgestellt.";
-$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob Du bereits mit %s in Kontakt stehst.";
-$a->strings["Invalid profile URL."] = "Ungültige Profil-URL.";
-$a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL.";
-$a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet.";
-$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Entferntes abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems.   ";
-$a->strings["Please login to confirm introduction."] = "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen.";
-$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an.";
-$a->strings["Confirm"] = "Bestätigen";
-$a->strings["Hide this contact"] = "Verberge diesen Kontakt";
-$a->strings["Welcome home %s."] = "Willkommen zurück %s.";
-$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige Deine Kontaktanfrage bei %s.";
-$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse Deines Profils in einem der unterstützten sozialen Netzwerke an:";
-$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>."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"%s\">folge diesem Link</a> um einen öffentlichen Friendica Server zu finden und beizutreten.";
-$a->strings["Friend/Connection Request"] = "Kontaktanfrage";
-$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de";
-$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."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste.";
-$a->strings["Invalid request identifier."] = "Invalid request identifier.";
-$a->strings["Discard"] = "Verwerfen";
-$a->strings["Notifications"] = "Benachrichtigungen";
-$a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen";
-$a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen";
-$a->strings["Home Notifications"] = "Pinnwand Benachrichtigungen";
-$a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen";
-$a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen";
-$a->strings["Notification type: "] = "Benachrichtigungstyp: ";
-$a->strings["suggested by %s"] = "vorgeschlagen von %s";
-$a->strings["Approve"] = "Genehmigen";
-$a->strings["Claims to be known to you: "] = "Behauptet Dich zu kennen: ";
-$a->strings["yes"] = "ja";
-$a->strings["no"] = "nein";
-$a->strings["Shall your connection be bidirectional or not?"] = "Soll die Verbindung beidseitig sein oder nicht?";
-$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."] = "Akzeptierst du %s als Kontakt, erlaubst du damit das Lesen deiner Beiträge und abonnierst selbst auch die Beiträge von %s.";
-$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."] = "Wenn du %s als Abonnent akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten.";
-$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."] = "Wenn du %s als Teilenden akzeptierst, erlaubst du damit das Lesen deiner Beiträge, wirst aber selbst die Beiträge der anderen Seite nicht erhalten.";
-$a->strings["Friend"] = "Kontakt";
-$a->strings["Sharer"] = "Teilenden";
-$a->strings["Subscriber"] = "Abonnent";
-$a->strings["No introductions."] = "Keine Kontaktanfragen.";
-$a->strings["Show unread"] = "Ungelesene anzeigen";
-$a->strings["Show all"] = "Alle anzeigen";
-$a->strings["No more %s notifications."] = "Keine weiteren %s Benachrichtigungen";
-$a->strings["Profile deleted."] = "Profil gelöscht.";
-$a->strings["Profile-"] = "Profil-";
-$a->strings["New profile created."] = "Neues Profil angelegt.";
-$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar.";
-$a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
-$a->strings["Marital Status"] = "Familienstand";
-$a->strings["Romantic Partner"] = "Romanze";
-$a->strings["Work/Employment"] = "Arbeit / Beschäftigung";
-$a->strings["Religion"] = "Religion";
-$a->strings["Political Views"] = "Politische Ansichten";
-$a->strings["Gender"] = "Geschlecht";
-$a->strings["Sexual Preference"] = "Sexuelle Vorlieben";
-$a->strings["XMPP"] = "XMPP";
-$a->strings["Homepage"] = "Webseite";
-$a->strings["Interests"] = "Interessen";
-$a->strings["Address"] = "Adresse";
-$a->strings["Location"] = "Wohnort";
-$a->strings["Profile updated."] = "Profil aktualisiert.";
-$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?";
-$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:";
-$a->strings["Profile Actions"] = "Profilaktionen";
-$a->strings["Edit Profile Details"] = "Profil bearbeiten";
-$a->strings["Change Profile Photo"] = "Profilbild ändern";
-$a->strings["View this profile"] = "Dieses Profil anzeigen";
-$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
-$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden";
-$a->strings["Clone this profile"] = "Dieses Profil duplizieren";
-$a->strings["Delete this profile"] = "Dieses Profil löschen";
-$a->strings["Basic information"] = "Grundinformationen";
-$a->strings["Profile picture"] = "Profilbild";
-$a->strings["Preferences"] = "Vorlieben";
-$a->strings["Status information"] = "Status Informationen";
-$a->strings["Additional information"] = "Zusätzliche Informationen";
-$a->strings["Personal"] = "Persönlich";
-$a->strings["Relation"] = "Beziehung";
-$a->strings["Miscellaneous"] = "Verschiedenes";
-$a->strings["Your Gender:"] = "Dein Geschlecht:";
-$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Beziehungsstatus:";
-$a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:";
-$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software";
-$a->strings["Profile Name:"] = "Profilname:";
-$a->strings["Required"] = "Benötigt";
-$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein.";
-$a->strings["Your Full Name:"] = "Dein kompletter Name:";
-$a->strings["Title/Description:"] = "Titel/Beschreibung:";
-$a->strings["Street Address:"] = "Adresse:";
-$a->strings["Locality/City:"] = "Wohnort:";
-$a->strings["Region/State:"] = "Region/Bundesstaat:";
-$a->strings["Postal/Zip Code:"] = "Postleitzahl:";
-$a->strings["Country:"] = "Land:";
-$a->strings["Age: "] = "Alter: ";
-$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
-$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
-$a->strings["Since [date]:"] = "Seit [Datum]:";
-$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von Dir …";
-$a->strings["XMPP (Jabber) address:"] = "XMPP (Jabber) Adresse";
-$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können.";
-$a->strings["Homepage URL:"] = "Adresse der Homepage:";
-$a->strings["Hometown:"] = "Heimatort:";
-$a->strings["Political Views:"] = "Politische Ansichten:";
-$a->strings["Religious Views:"] = "Religiöse Ansichten:";
-$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:";
-$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)";
-$a->strings["Private Keywords:"] = "Private Schlüsselwörter:";
-$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)";
-$a->strings["Likes:"] = "Likes:";
-$a->strings["Dislikes:"] = "Dislikes:";
-$a->strings["Musical interests"] = "Musikalische Interessen";
-$a->strings["Books, literature"] = "Bücher, Literatur";
-$a->strings["Television"] = "Fernsehen";
-$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung";
-$a->strings["Hobbies/Interests"] = "Hobbies/Interessen";
-$a->strings["Love/romance"] = "Liebe/Romantik";
-$a->strings["Work/employment"] = "Arbeit/Anstellung";
-$a->strings["School/education"] = "Schule/Ausbildung";
-$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke";
-$a->strings["Profile Image"] = "Profilbild";
-$a->strings["visible to everybody"] = "sichtbar für jeden";
-$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile";
-$a->strings["Change profile photo"] = "Profilbild ändern";
-$a->strings["Create New Profile"] = "Neues Profil anlegen";
 $a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert.";
 $a->strings["Information"] = "Information";
 $a->strings["Overview"] = "Übersicht";
@@ -952,13 +970,11 @@ $a->strings["Federation Statistics"] = "Föderation Statistik";
 $a->strings["Configuration"] = "Konfiguration";
 $a->strings["Site"] = "Seite";
 $a->strings["Users"] = "Nutzer";
-$a->strings["Addons"] = "Addons";
 $a->strings["Themes"] = "Themen";
-$a->strings["Additional features"] = "Zusätzliche Features";
-$a->strings["Terms of Service"] = "Nutzungsbedingungen";
 $a->strings["Database"] = "Datenbank";
 $a->strings["DB updates"] = "DB Updates";
 $a->strings["Inspect Queue"] = "Warteschlange Inspizieren";
+$a->strings["Inspect worker Queue"] = "Worker Warteschlange inspizieren";
 $a->strings["Tools"] = "Werkzeuge";
 $a->strings["Contact Blocklist"] = "Kontakt Sperrliste";
 $a->strings["Server Blocklist"] = "Server Blockliste";
@@ -1008,10 +1024,13 @@ $a->strings["This page allows you to prevent any message from a remote contact t
 $a->strings["Block Remote Contact"] = "Blockiere entfernten Kontakt";
 $a->strings["select all"] = "Alle auswählen";
 $a->strings["select none"] = "Auswahl aufheben";
+$a->strings["Block"] = "Sperren";
+$a->strings["Unblock"] = "Entsperren";
 $a->strings["No remote contact is blocked from this node."] = "Derzeit werden keine Kontakte auf diesem Knoten blockiert.";
 $a->strings["Blocked Remote Contacts"] = "Blockierte Kontakte von anderen Knoten";
 $a->strings["Block New Remote Contact"] = "Blockieren von weiteren Kontakten";
 $a->strings["Photo"] = "Foto:";
+$a->strings["Address"] = "Adresse";
 $a->strings["%s total blocked contact"] = [
 	0 => "Insgesamt %s blockierter Kontakt",
 	1 => "Insgesamt %s blockierte Kontakte",
@@ -1030,15 +1049,20 @@ $a->strings["Currently this node is aware of %d nodes with %d registered users f
 $a->strings["ID"] = "ID";
 $a->strings["Recipient Name"] = "Empfänger Name";
 $a->strings["Recipient Profile"] = "Empfänger Profil";
-$a->strings["Network"] = "Netzwerk";
 $a->strings["Created"] = "Erstellt";
 $a->strings["Last Tried"] = "Zuletzt versucht";
 $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."] = "Auf dieser Seite werden die in der Warteschlange eingereihten Beiträge aufgelistet. Bei diesen Beiträgen schlug die erste Zustellung fehl. Es wird später wiederholt versucht die Beiträge zuzustellen, bis sie schließlich gelöscht werden.";
+$a->strings["Inspect Worker Queue"] = "Worker Warteschlange inspizieren";
+$a->strings["Job Parameters"] = "Parameter der Aufgabe";
+$a->strings["Priority"] = "Priorität";
+$a->strings["This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you've set up during install."] = "Auf dieser Seite werden die derzeit in der Warteschlange befindlichen Worker-Jobs aufgelistet. Diese Jobs werden vom Cronjob verarbeitet, den Sie während der Installation eingerichtet haben.";
 $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 />"] = "Deine DB verwendet derzeit noch MyISAM Tabellen. Du solltest die Datenbank Engine auf InnoDB umstellen, da Friendica in Zukunft InnoDB Features verwenden wird. Eine Anleitung zur Umstellung der Datenbank kannst du  <a href=\"%s\">hier</a>  finden. Du kannst außerdem mit dem Befehl <tt>php bin/console.php dbstructure toinnodb</tt> auf der Kommandozeile die Umstellung automatisch vornehmen lassen.";
 $a->strings["There is a new version of Friendica available for download. Your current version is %1\$s, upstream version is %2\$s"] = "Es gibt eine neue Version von Friendica. Du verwendest derzeit die Version %1\$s, die aktuelle Version ist %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."] = "Das Update der Datenbank ist fehlgeschlagen. Bitte führe 'php bin/console.php dbstructure update' in der Kommandozeile aus und achte auf eventuell auftretende Fehlermeldungen.";
 $a->strings["The worker was never executed. Please check your database structure!"] = "Der Hintergrundprozess (worker) wurde noch nie gestartet. Bitte überprüfe deine Datenbankstruktur.";
 $a->strings["The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings."] = "Der Hintergrundprozess (worker) wurde zuletzt um %s UTC ausgeführt. Das war vor mehr als einer Stunde. Bitte überprüfe deine crontab Einstellungen.";
+$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."] = "Die Konfiguration von Friendica befindet sich ab jetzt in der 'config/local.ini.php' Datei. Kopiere bitte die Datei  'config/local-sample.ini.php' nach 'config/local.ini.php' und setze die Konfigurationvariablen so wie in der alten <code>.htconfig.php</code>. Wie die Übertragung der Werte aussehen muss kannst du der <a href=\"%s\">Konfiguration Hilfeseite</a> entnehmen.";
+$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> konnte von deinem System nicht aufgerufen werden. Dies deitet auf ein schwerwiegendes Problem deiner Konfiguration hin. Bitte konsultiere <a href=\"%s\">die Installations-Dokumentation</a> zum Beheben des Problems.";
 $a->strings["Normal Account"] = "Normales Konto";
 $a->strings["Automatic Follower Account"] = "Automatisch folgendes Konto (Marktschreier)";
 $a->strings["Public Forum Account"] = "Öffentliches Forum Konto";
@@ -1053,12 +1077,12 @@ $a->strings["Version"] = "Version";
 $a->strings["Active addons"] = "Aktivierte Addons";
 $a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] = "Die Basis-URL konnte nicht analysiert werden. Sie muss mindestens aus <protokoll>://<domain> bestehen";
 $a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert.";
-$a->strings["No special theme for mobile devices"] = "Kein spezielles Theme für mobile Geräte verwenden.";
 $a->strings["No community page for local users"] = "Keine Gemeinschaftsseite für lokale Nutzer";
 $a->strings["No community page"] = "Keine Gemeinschaftsseite";
 $a->strings["Public postings from users of this site"] = "Öffentliche Beiträge von NutzerInnen dieser Seite";
 $a->strings["Public postings from the federated network"] = "Öffentliche Beiträge aus dem föderalen Netzwerk";
 $a->strings["Public postings from local users and the federated network"] = "Öffentliche Beiträge von lokalen Nutzern und aus dem föderalen Netzwerk";
+$a->strings["Disabled"] = "Deaktiviert";
 $a->strings["Users, Global Contacts"] = "Nutzer, globale Kontakte";
 $a->strings["Users, Global Contacts/fallback"] = "Nutzer, globale Kontakte / Fallback";
 $a->strings["One month"] = "ein Monat";
@@ -1076,9 +1100,9 @@ $a->strings["Don't check"] = "Nicht überprüfen";
 $a->strings["check the stable version"] = "überprüfe die stabile Version";
 $a->strings["check the development version"] = "überprüfe die Entwicklungsversion";
 $a->strings["Republish users to directory"] = "Nutzer erneut im globalen Verzeichnis veröffentlichen.";
-$a->strings["Registration"] = "Registrierung";
 $a->strings["File upload"] = "Datei hochladen";
 $a->strings["Policies"] = "Regeln";
+$a->strings["Advanced"] = "Erweitert";
 $a->strings["Auto Discovered Contact Directory"] = "Automatisch ein Kontaktverzeichnis erstellen";
 $a->strings["Performance"] = "Performance";
 $a->strings["Worker"] = "Worker";
@@ -1119,6 +1143,8 @@ $a->strings["Maximum Daily Registrations"] = "Maximum täglicher Registrierungen
 $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."] = "Wenn die Registrierung weiter oben erlaubt ist, regelt dies die maximale Anzahl von Neuanmeldungen pro Tag. Wenn die Registrierung geschlossen ist, hat diese Einstellung keinen Effekt.";
 $a->strings["Register text"] = "Registrierungstext";
 $a->strings["Will be displayed prominently on the registration page. You can use BBCode here."] = "Wird gut sichtbar auf der Registrierungsseite angezeigt. BBCode kann verwendet werden.";
+$a->strings["Forbidden Nicknames"] = "Verbotene Spitznamen";
+$a->strings["Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142."] = "Durch Kommas getrennte Liste von Spitznamen, die von der Registrierung ausgeschlossen sind. Die Vorgabe ist eine Liste von Rollennamen nach RFC 2142.";
 $a->strings["Accounts abandoned after x days"] = "Nutzerkonten gelten nach x Tagen als unbenutzt";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit.";
 $a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
@@ -1144,6 +1170,8 @@ $a->strings["Disallow public access to addons listed in the apps menu."] = "Öff
 $a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Wenn ausgewählt werden die im Apps Menü aufgeführten Addons nur angemeldeten Nutzern der Seite zur Verfügung gestellt.";
 $a->strings["Don't embed private images in posts"] = "Private Bilder nicht in Beiträgen einbetten.";
 $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."] = "Ersetze lokal gehostete private Fotos in Beiträgen nicht mit einer eingebetteten Kopie des Bildes. Dies bedeutet, dass Kontakte, die Beiträge mit privaten Fotos erhalten sich zunächst auf den jeweiligen Servern authentifizieren müssen bevor die Bilder geladen und angezeigt werden, was eine gewisse Zeit dauert.";
+$a->strings["Explicit Content"] = "Sensibler Inhalt";
+$a->strings["Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page."] = "Wählen Sie das um anzuzeigen, dass Ihr Knoten hauptsächlich für explizite Inhalte verwendet wird, die möglicherweise nicht für Minderjährige geeignet sind. Diese Info wird in der Knoteninformation veröffentlicht und kann durch das Globale Verzeichnis genutzt werden, um Ihren Knoten von den Auflistungen auszuschließen. Zusätzlich wird auf der Registrierungsseite ein Hinweis darüber angezeigt.";
 $a->strings["Allow Users to set remote_self"] = "Nutzern erlauben das remote_self Flag zu setzen";
 $a->strings["With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream."] = "Ist dies ausgewählt kann jeder Nutzer jeden seiner Kontakte als remote_self (entferntes Konto) im Kontakt reparieren Dialog markieren. Nach dem setzten dieses Flags werden alle Top-Level Beiträge dieser Kontakte automatisch in den Stream dieses Nutzers gepostet.";
 $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
@@ -1215,7 +1243,7 @@ $a->strings["If you have a restricted system where the webserver can't access th
 $a->strings["Base path to installation"] = "Basis-Pfad zur Installation";
 $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."] = "Falls das System nicht den korrekten Pfad zu deiner Installation gefunden hat, gib den richtigen Pfad bitte hier ein. Du solltest hier den Pfad nur auf einem eingeschränkten System angeben müssen, bei dem du mit symbolischen Links auf dein Webverzeichnis verweist.";
 $a->strings["Disable picture proxy"] = "Bilder Proxy deaktivieren";
-$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "Der Proxy für Bilder verbessert die Leistung und Privatsphäre der Nutzer. Er sollte nicht auf Systemen verwendet werden, die nur über begrenzte Bandbreite verfügen.";
+$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth."] = "Der Proxy für Bilder verbessert die Leistung und Privatsphäre der Nutzer. Er sollte nicht auf Systemen verwendet werden, die nur über begrenzte Bandbreite verfügen.";
 $a->strings["Only search in tags"] = "Nur in Tags suchen";
 $a->strings["On large systems the text search can slow down the system extremely."] = "Auf großen Knoten kann die Volltext-Suche das System ausbremsen.";
 $a->strings["New base url"] = "Neue Basis-URL";
@@ -1224,7 +1252,7 @@ $a->strings["RINO Encryption"] = "RINO Verschlüsselung";
 $a->strings["Encryption layer between nodes."] = "Verschlüsselung zwischen Friendica Instanzen";
 $a->strings["Enabled"] = "Aktiv";
 $a->strings["Maximum number of parallel workers"] = "Maximale Anzahl parallel laufender Worker";
-$a->strings["On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4."] = "Wenn dein Knoten bei einem Shared Hoster ist, setzte diesen Wert auf 2. Auf größeren Systemen funktioniert ein Wert von 10 recht gut. Standardeinstellung sind 4.";
+$a->strings["On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d."] = "Wenn dein Knoten bei einem Shared Hoster ist, setzte diesen Wert auf %d. Auf größeren Systemen funktioniert ein Wert von %d recht gut. Standardeinstellung sind %d.";
 $a->strings["Don't use 'proc_open' with the worker"] = "'proc_open' nicht mit den Workern verwenden";
 $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."] = "Aktiviere diese Option, wenn dein System die Verwendung von 'proc_open' verhindert. Dies könnte auf Shared Hostern der Fall sein. Wenn du diese Option aktivierst, solltest du die Frequenz der poller Aufrufe in deiner crontab erhöhen.";
 $a->strings["Enable fastlane"] = "Aktiviere Fastlane";
@@ -1245,6 +1273,7 @@ $a->strings["Server tags"] = "Server Schlagworte";
 $a->strings["Comma separated list of tags for the 'tags' subscription."] = "Liste von Schlagworten die abonniert werden sollen, mit Komma getrennt.";
 $a->strings["Allow user tags"] = "Verwende Schlagworte der Nutzer";
 $a->strings["If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'."] = "Ist dies aktiviert, werden die Schlagwörter der gespeicherten Suchen zusätzlich zu den oben  definierten Server Schlagworte abonniert.";
+$a->strings["Start Relocation"] = "Umsiedlung starten";
 $a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert";
 $a->strings["Database structure update %s was successfully applied."] = "Das Update %s der Struktur der Datenbank wurde erfolgreich angewandt.";
 $a->strings["Executing of database structure update %s failed with error: %s"] = "Das Update %s der Struktur der Datenbank schlug mit folgender Fehlermeldung fehl: %s";
@@ -1272,15 +1301,7 @@ $a->strings["%s user deleted"] = [
 $a->strings["User '%s' deleted"] = "Nutzer '%s' gelöscht";
 $a->strings["User '%s' unblocked"] = "Nutzer '%s' entsperrt";
 $a->strings["User '%s' blocked"] = "Nutzer '%s' gesperrt";
-$a->strings["Normal Account Page"] = "Normales Konto";
-$a->strings["Soapbox Page"] = "Marktschreier-Konto";
-$a->strings["Public Forum"] = "Öffentliches Forum";
-$a->strings["Automatic Friend Page"] = "Automatische Freunde Seite";
 $a->strings["Private Forum"] = "Privates Forum";
-$a->strings["Personal Page"] = "Persönliche Seite";
-$a->strings["Organisation Page"] = "Organisationsseite";
-$a->strings["News Page"] = "Nachrichtenseite";
-$a->strings["Community Forum"] = "Gemeinschaftsforum";
 $a->strings["Email"] = "E-Mail";
 $a->strings["Register date"] = "Anmeldedatum";
 $a->strings["Last login"] = "Letzte Anmeldung";
@@ -1293,6 +1314,7 @@ $a->strings["Request date"] = "Anfragedatum";
 $a->strings["No registrations."] = "Keine Neuanmeldungen.";
 $a->strings["Note from the user"] = "Hinweis vom Nutzer";
 $a->strings["Deny"] = "Verwehren";
+$a->strings["User blocked"] = "Nutzer blockiert.";
 $a->strings["Site admin"] = "Seitenadministrator";
 $a->strings["Account expired"] = "Account ist abgelaufen";
 $a->strings["New User"] = "Neuer Nutzer";
@@ -1327,27 +1349,219 @@ $a->strings["Log file"] = "Protokolldatei";
 $a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis.";
 $a->strings["Log level"] = "Protokoll-Level";
 $a->strings["PHP logging"] = "PHP Protokollieren";
-$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."] = "Um PHP Warnungen und Fehler zu protokollieren, kannst du die folgenden Zeilen zur .htconfig.php Datei deiner Installation hinzufügen. Den Dateinamen der Log-Datei legst du in der Zeile mit dem 'error_log' fest,  Er ist relativ zum Friendica-Stammverzeichnis und muss schreibbar durch den Webserver sein. Eine \"1\" als Option für die Punkte 'log_errors' und 'display_errors' aktiviert die Funktionen zum Protokollieren bzw. Anzeigen der Fehler, eine \"0\" deaktiviert sie.";
+$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."] = "Um die Protokollierung von PHP-Fehlern und Warnungen vorübergehend zu aktivieren, können Sie der Datei index.php Ihrer Installation Folgendes voranstellen. Der in der Datei 'error_log' angegebene Dateiname ist relativ zum obersten Verzeichnis von friendica und muss vom Webserver beschreibbar sein. Die Option '1' für 'log_errors' und 'display_errors' aktiviert diese Optionen, ersetze die '1' durch einer '0' um sie zu deaktivieren.";
 $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."] = "Fehler beim Öffnen der Logdatei <strong>%1\$s</strong>.\\r\\n<br/>Bitte überprüfe ob die Datei %1\$s existiert und gelesen werden kann.";
 $a->strings["Couldn't open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s is readable."] = "Konnte die Logdatei <strong>%1\$s</strong> nicht öffnen.\\r\\n<br/>Bitte stelle sicher, dass die Datei %1\$s lesbar ist.";
-$a->strings["Off"] = "Aus";
-$a->strings["On"] = "An";
 $a->strings["Lock feature %s"] = "Feature festlegen: %s";
 $a->strings["Manage Additional Features"] = "Zusätzliche Features Verwalten";
-$a->strings["Community option not available."] = "Optionen für die Gemeinschaftsseite nicht verfügbar.";
-$a->strings["Not available."] = "Nicht verfügbar.";
-$a->strings["Local Community"] = "Lokale Gemeinschaft";
-$a->strings["Posts from local users on this server"] = "Beiträge von Nutzern dieses Servers";
-$a->strings["Global Community"] = "Globale Gemeinschaft";
-$a->strings["Posts from users of the whole federated network"] = "Beiträge von Nutzern des gesamten  föderalen Netzwerks";
-$a->strings["No results."] = "Keine Ergebnisse.";
-$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "Diese Gemeinschaftsseite zeigt alle öffentlichen Beiträge, die auf diesem Knoten eingegangen sind. Der Inhalt entspricht nicht zwingend der Meinung der Nutzer dieses Servers.";
+$a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Nutzerkonto wurde nicht gefunden und OpenID-Registrierung ist auf diesem Server nicht gestattet.";
+$a->strings["Login failed."] = "Anmeldung fehlgeschlagen.";
+$a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert.";
+$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt keine Profildaten zur Verfügung.";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden.";
+$a->strings["Warning: profile location has no profile photo."] = "Warnung: Es gibt kein Profilbild bei der angegebenen Profiladresse.";
+$a->strings["%d required parameter was not found at the given location"] = [
+	0 => "%d benötigter Parameter wurde an der angegebenen Stelle nicht gefunden",
+	1 => "%d benötigte Parameter wurden an der angegebenen Stelle nicht gefunden",
+];
+$a->strings["Introduction complete."] = "Kontaktanfrage abgeschlossen.";
+$a->strings["Unrecoverable protocol error."] = "Nicht behebbarer Protokollfehler.";
+$a->strings["Profile unavailable."] = "Profil nicht verfügbar.";
+$a->strings["%s has received too many connection requests today."] = "%s hat heute zu viele Kontaktanfragen erhalten.";
+$a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen.";
+$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen.";
+$a->strings["Invalid locator"] = "Ungültiger Locator";
+$a->strings["You have already introduced yourself here."] = "Du hast Dich hier bereits vorgestellt.";
+$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob Du bereits mit %s in Kontakt stehst.";
+$a->strings["Invalid profile URL."] = "Ungültige Profil-URL.";
+$a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL.";
+$a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen.";
+$a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet.";
+$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Entferntes abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems.   ";
+$a->strings["Please login to confirm introduction."] = "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen.";
+$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an.";
+$a->strings["Confirm"] = "Bestätigen";
+$a->strings["Hide this contact"] = "Verberge diesen Kontakt";
+$a->strings["Welcome home %s."] = "Willkommen zurück %s.";
+$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige Deine Kontaktanfrage bei %s.";
+$a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Bitte gib die Adresse Deines Profils in einem der unterstützten sozialen Netzwerke an:";
+$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>."] = "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, <a href=\"%s\">folge diesem Link</a> um einen öffentlichen Friendica Server zu finden und beizutreten.";
+$a->strings["Friend/Connection Request"] = "Kontaktanfrage";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"] = "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de";
+$a->strings["Please answer the following:"] = "Bitte beantworte folgendes:";
+$a->strings["Does %s know you?"] = "Kennt %s Dich?";
+$a->strings["Add a personal note:"] = "Eine persönliche Notiz beifügen:";
+$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."] = " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in Deiner Diaspora Suchleiste.";
+$a->strings["Authorize application connection"] = "Verbindung der Applikation autorisieren";
+$a->strings["Return to your app and insert this Securty Code:"] = "Gehe zu Deiner Anwendung zurück und trage dort folgenden Sicherheitscode ein:";
+$a->strings["Please login to continue."] = "Bitte melde Dich an um fortzufahren.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung den Zugriff auf Deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in Deinem Namen gestatten?";
+$a->strings["Image uploaded but image cropping failed."] = "Bild hochgeladen, aber das Zuschneiden schlug fehl.";
+$a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] scheiterte.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Drücke Umschalt+Neu Laden oder leere den Browser-Cache, falls das neue Foto nicht gleich angezeigt wird.";
+$a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden";
+$a->strings["Upload File:"] = "Datei hochladen:";
+$a->strings["Select a profile:"] = "Profil auswählen:";
+$a->strings["Upload"] = "Hochladen";
+$a->strings["or"] = "oder";
+$a->strings["skip this step"] = "diesen Schritt überspringen";
+$a->strings["select a photo from your photo albums"] = "wähle ein Foto aus deinen Fotoalben";
+$a->strings["Crop Image"] = "Bild zurechtschneiden";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an, damit das Bild optimal dargestellt werden kann.";
+$a->strings["Done Editing"] = "Bearbeitung abgeschlossen";
+$a->strings["Image uploaded successfully."] = "Bild erfolgreich hochgeladen.";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Entschuldige, die Datei scheint größer zu sein als es die PHP Konfiguration erlaubt.";
+$a->strings["Or - did you try to upload an empty file?"] = "Oder - hast Du versucht, eine leere Datei hochzuladen?";
+$a->strings["File exceeds size limit of %s"] = "Die Datei ist größer als das erlaubte Limit von %s";
+$a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen.";
+$a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden.";
+$a->strings["Empty post discarded."] = "Leerer Beitrag wurde verworfen.";
+$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica.";
+$a->strings["You may visit them online at %s"] = "Du kannst sie online unter %s besuchen";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest.";
+$a->strings["%s posted an update."] = "%s hat ein Update veröffentlicht.";
+$a->strings["Help:"] = "Hilfe:";
+$a->strings["Move account"] = "Account umziehen";
+$a->strings["You can import an account from another Friendica server."] = "Du kannst einen Account von einem anderen Friendica Server importieren.";
+$a->strings["You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."] = "Du musst Deinen Account vom alten Server exportieren und hier hochladen. Wir stellen Deinen alten Account mit all Deinen Kontakten wieder her. Wir werden auch versuchen all Deine Kontakte darüber zu informieren, dass Du hierher umgezogen bist.";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Dieses Feature ist experimentell. Wir können keine Kontakte vom OStatus Netzwerk (GNU Social/Statusnet) oder von Diaspora importieren";
+$a->strings["Account file"] = "Account Datei";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Um Deinen Account zu exportieren, rufe \"Einstellungen -> Persönliche Daten exportieren\" auf und wähle \"Account exportieren\"";
+$a->strings["Invalid profile identifier."] = "Ungültiger Profil-Bezeichner.";
+$a->strings["Profile Visibility Editor"] = "Editor für die Profil-Sichtbarkeit";
+$a->strings["Visible To"] = "Sichtbar für";
+$a->strings["All Contacts (with secure profile access)"] = "Alle Kontakte (mit gesichertem Profilzugriff)";
+$a->strings["View"] = "Ansehen";
+$a->strings["Previous"] = "Vorherige";
+$a->strings["today"] = "Heute";
+$a->strings["month"] = "Monat";
+$a->strings["week"] = "Woche";
+$a->strings["day"] = "Tag";
+$a->strings["list"] = "Liste";
+$a->strings["User not found"] = "Nutzer nicht gefunden";
+$a->strings["This calendar format is not supported"] = "Dieses Kalenderformat wird nicht unterstützt.";
+$a->strings["No exportable data found"] = "Keine exportierbaren Daten gefunden";
+$a->strings["calendar"] = "Kalender";
+$a->strings["Account approved."] = "Konto freigegeben.";
+$a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen";
+$a->strings["Please login."] = "Bitte melde Dich an.";
+$a->strings["Item not found"] = "Beitrag nicht gefunden";
+$a->strings["Edit post"] = "Beitrag bearbeiten";
+$a->strings["CC: email addresses"] = "Cc: E-Mail-Addressen";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com";
+$a->strings["Applications"] = "Anwendungen";
+$a->strings["No installed applications."] = "Keine Applikationen installiert.";
+$a->strings["You must be logged in to use this module"] = "Du musst eingeloggt sein um dieses Modul benutzen zu können.";
+$a->strings["Source URL"] = "URL der Quelle";
+$a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet.";
+$a->strings["Suggest Friends"] = "Kontakte vorschlagen";
+$a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor";
+$a->strings["System down for maintenance"] = "System zur Wartung abgeschaltet";
+$a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden.";
+$a->strings["%s's timeline"] = "Timeline von %s";
+$a->strings["%s's posts"] = "Beiträge von %s";
+$a->strings["%s's comments"] = "Kommentare von %s";
+$a->strings["No friends to display."] = "Keine Kontakte zum Anzeigen.";
+$a->strings["%d contact edited."] = [
+	0 => "%d Kontakt bearbeitet.",
+	1 => "%d Kontakte bearbeitet.",
+];
+$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen.";
+$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profil nicht finden.";
+$a->strings["Contact updated."] = "Kontakt aktualisiert.";
+$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert";
+$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben";
+$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert";
+$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert";
+$a->strings["Contact has been archived"] = "Kontakt wurde archiviert";
+$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt";
+$a->strings["Drop contact"] = "Kontakt löschen";
+$a->strings["Do you really want to delete this contact?"] = "Möchtest Du wirklich diesen Kontakt löschen?";
+$a->strings["Contact has been removed."] = "Kontakt wurde entfernt.";
+$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft";
+$a->strings["You are sharing with %s"] = "Du teilst mit %s";
+$a->strings["%s is sharing with you"] = "%s teilt mit Dir";
+$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar.";
+$a->strings["Never"] = "Niemals";
+$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)";
+$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)";
+$a->strings["Suggest friends"] = "Kontakte vorschlagen";
+$a->strings["Network type: %s"] = "Netzwerktyp: %s";
+$a->strings["Communications lost with this contact!"] = "Verbindungen mit diesem Kontakt verloren!";
+$a->strings["Fetch further information for feeds"] = "Weitere Informationen zu Feeds holen";
+$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."] = "Zusätzliche Informationen wie Vorschaubilder, Titel und Zusammenfassungen vom Feed-Eintrag laden. Du kannst diese Option aktivieren, wenn der Feed nicht all zu viel Text beinhaltet. Schlagwörter werden auf den Meta-Informationen des Feed-Headers bezogen und als Hash-Tags verwendet.";
+$a->strings["Fetch information"] = "Beziehe Information";
+$a->strings["Fetch keywords"] = "Schlüsselwörter abrufen";
+$a->strings["Fetch information and keywords"] = "Beziehe Information und Schlüsselworte";
+$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit";
+$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen";
+$a->strings["Contact Settings"] = "Kontakteinstellungen";
+$a->strings["Contact"] = "Kontakt";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines Deiner Profile das angezeigt werden soll, wenn %s Dein Profil aufruft.";
+$a->strings["Their personal note"] = "Die persönliche Mitteilung";
+$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten";
+$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten";
+$a->strings["Ignore contact"] = "Ignoriere den Kontakt";
+$a->strings["Repair URL settings"] = "URL Einstellungen reparieren";
+$a->strings["View conversations"] = "Unterhaltungen anzeigen";
+$a->strings["Last update:"] = "Letzte Aktualisierung: ";
+$a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
+$a->strings["Update now"] = "Jetzt aktualisieren";
+$a->strings["Unignore"] = "Ignorieren aufheben";
+$a->strings["Currently blocked"] = "Derzeit geblockt";
+$a->strings["Currently ignored"] = "Derzeit ignoriert";
+$a->strings["Currently archived"] = "Momentan archiviert";
+$a->strings["Awaiting connection acknowledge"] = "Bedarf der Bestätigung des Kontakts";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein";
+$a->strings["Notification for new posts"] = "Benachrichtigung bei neuen Beiträgen";
+$a->strings["Send a notification of every new post of this contact"] = "Sende eine Benachrichtigung, wann immer dieser Kontakt einen neuen Beitrag schreibt.";
+$a->strings["Blacklisted keywords"] = "Blacklistete Schlüsselworte ";
+$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Komma-Separierte Liste mit Schlüsselworten, die nicht in Hashtags konvertiert werden, wenn \"Beziehe Information und Schlüsselworte\" aktiviert wurde";
+$a->strings["XMPP:"] = "XMPP:";
+$a->strings["Actions"] = "Aktionen";
+$a->strings["Suggestions"] = "Kontaktvorschläge";
+$a->strings["Suggest potential friends"] = "Kontakte vorschlagen";
+$a->strings["Show all contacts"] = "Alle Kontakte anzeigen";
+$a->strings["Unblocked"] = "Ungeblockt";
+$a->strings["Only show unblocked contacts"] = "Nur nicht-blockierte Kontakte anzeigen";
+$a->strings["Blocked"] = "Geblockt";
+$a->strings["Only show blocked contacts"] = "Nur blockierte Kontakte anzeigen";
+$a->strings["Ignored"] = "Ignoriert";
+$a->strings["Only show ignored contacts"] = "Nur ignorierte Kontakte anzeigen";
+$a->strings["Archived"] = "Archiviert";
+$a->strings["Only show archived contacts"] = "Nur archivierte Kontakte anzeigen";
+$a->strings["Hidden"] = "Verborgen";
+$a->strings["Only show hidden contacts"] = "Nur verborgene Kontakte anzeigen";
+$a->strings["Search your contacts"] = "Suche in deinen Kontakten";
+$a->strings["Archive"] = "Archivieren";
+$a->strings["Unarchive"] = "Aus Archiv zurückholen";
+$a->strings["Batch Actions"] = "Stapelverarbeitung";
+$a->strings["Conversations started by this contact"] = "Unterhaltungen, die von diesem Kontakt begonnen wurden";
+$a->strings["Posts and Comments"] = "Statusnachrichten und Kommentare";
+$a->strings["Profile Details"] = "Profildetails";
+$a->strings["View all contacts"] = "Alle Kontakte anzeigen";
+$a->strings["View all common friends"] = "Alle Kontakte anzeigen";
+$a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen";
+$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft";
+$a->strings["is a fan of yours"] = "ist ein Fan von dir";
+$a->strings["you are a fan of"] = "Du bist Fan von";
+$a->strings["This is you"] = "Das bist Du";
+$a->strings["Edit contact"] = "Kontakt bearbeiten";
+$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten";
+$a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten";
+$a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten";
+$a->strings["Delete contact"] = "Lösche den Kontakt";
 $a->strings["Event can not end before it has started."] = "Die Veranstaltung kann nicht enden bevor sie beginnt.";
 $a->strings["Event title and start time are required."] = "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden.";
 $a->strings["Create New Event"] = "Neue Veranstaltung erstellen";
 $a->strings["Event details"] = "Veranstaltungsdetails";
 $a->strings["Starting date and Title are required."] = "Anfangszeitpunkt und Titel werden benötigt";
 $a->strings["Event Starts:"] = "Veranstaltungsbeginn:";
+$a->strings["Required"] = "Benötigt";
 $a->strings["Finish date/time is not known or not relevant"] = "Enddatum/-zeit ist nicht bekannt oder nicht relevant";
 $a->strings["Event Finishes:"] = "Veranstaltungsende:";
 $a->strings["Adjust for viewer timezone"] = "An Zeitzone des Betrachters anpassen";
@@ -1358,40 +1572,145 @@ $a->strings["Basic"] = "Allgemein";
 $a->strings["Permissions"] = "Berechtigungen";
 $a->strings["Failed to remove event"] = "Entfernen der Veranstaltung fehlgeschlagen";
 $a->strings["Event removed"] = "Veranstaltung enfternt";
-$a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden.";
-$a->strings["Empty post discarded."] = "Leerer Beitrag wurde verworfen.";
-$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica.";
-$a->strings["You may visit them online at %s"] = "Du kannst sie online unter %s besuchen";
-$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Falls Du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem Du auf diese Nachricht antwortest.";
-$a->strings["%s posted an update."] = "%s hat ein Update veröffentlicht.";
-$a->strings["Remove term"] = "Begriff entfernen";
-$a->strings["Saved Searches"] = "Gespeicherte Suchen";
-$a->strings["add"] = "hinzufügen";
-$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
-	0 => "Warnung: Diese Gruppe beinhaltet %s Person aus einem Netzwerk das keine nicht öffentlichen Beiträge empfangen kann.",
-	1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus Netzwerken die keine nicht-öffentlichen Beiträge empfangen können.",
+$a->strings["The contact could not be added."] = "Der Kontakt konnte nicht hinzugefügt werden.";
+$a->strings["You already added this contact."] = "Du hast den Kontakt bereits hinzugefügt.";
+$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Diaspora Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden.";
+$a->strings["OStatus support is disabled. Contact can't be added."] = "OStatus Unterstützung ist nicht aktiviert. Der Kontakt kann nicht zugefügt werden.";
+$a->strings["The network type couldn't be detected. Contact can't be added."] = "Der Netzwerktype wurde nicht erkannt. Der Kontakt kann nicht hinzugefügt werden.";
+$a->strings["Contact Photos"] = "Kontaktbilder";
+$a->strings["Files"] = "Dateien";
+$a->strings["Post successful."] = "Beitrag erfolgreich veröffentlicht.";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s folgt %2\$s %3\$s";
+$a->strings["Credits"] = "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 ist ein Gemeinschaftsprojekt, das nicht ohne die Hilfe vieler Personen möglich wäre. Hier ist eine Aufzählung der Personen, die zum Code oder der Übersetzung beigetragen haben. Dank an alle !";
+$a->strings["Item not available."] = "Beitrag nicht verfügbar.";
+$a->strings["Item was not found."] = "Beitrag konnte nicht gefunden werden.";
+$a->strings["No more system notifications."] = "Keine weiteren Systembenachrichtigungen.";
+$a->strings["Community option not available."] = "Optionen für die Gemeinschaftsseite nicht verfügbar.";
+$a->strings["Not available."] = "Nicht verfügbar.";
+$a->strings["Local Community"] = "Lokale Gemeinschaft";
+$a->strings["Posts from local users on this server"] = "Beiträge von Nutzern dieses Servers";
+$a->strings["Global Community"] = "Globale Gemeinschaft";
+$a->strings["Posts from users of the whole federated network"] = "Beiträge von Nutzern des gesamten  föderalen Netzwerks";
+$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "Diese Gemeinschaftsseite zeigt alle öffentlichen Beiträge, die auf diesem Knoten eingegangen sind. Der Inhalt entspricht nicht zwingend der Meinung der Nutzer dieses Servers.";
+$a->strings["l F d, Y \\@ g:i A"] = "l, d. F Y\\, H:i";
+$a->strings["Time Conversion"] = "Zeitumrechnung";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann.";
+$a->strings["UTC time: %s"] = "UTC Zeit: %s";
+$a->strings["Current timezone: %s"] = "Aktuelle Zeitzone: %s";
+$a->strings["Converted localtime: %s"] = "Umgerechnete lokale Zeit: %s";
+$a->strings["Please select your timezone:"] = "Bitte wähle Deine Zeitzone:";
+$a->strings["Poke/Prod"] = "Anstupsen";
+$a->strings["poke, prod or do other things to somebody"] = "Stupse Leute an oder mache anderes mit ihnen";
+$a->strings["Recipient"] = "Empfänger";
+$a->strings["Choose what you wish to do to recipient"] = "Was willst Du mit dem Empfänger machen:";
+$a->strings["Make this post private"] = "Diesen Beitrag privat machen";
+$a->strings["Total invitation limit exceeded."] = "Limit für Einladungen erreicht.";
+$a->strings["%s : Not a valid email address."] = "%s: Keine gültige Email Adresse.";
+$a->strings["Please join us on Friendica"] = "Ich lade Dich zu unserem sozialen Netzwerk Friendica ein";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limit für Einladungen erreicht. Bitte kontaktiere des Administrator der Seite.";
+$a->strings["%s : Message delivery failed."] = "%s: Zustellung der Nachricht fehlgeschlagen.";
+$a->strings["%d message sent."] = [
+	0 => "%d Nachricht gesendet.",
+	1 => "%d Nachrichten gesendet.",
 ];
-$a->strings["Messages in this group won't be send to these receivers."] = "Beiträge in dieser Gruppe werden deshalb nicht an diese Personen zugestellt werden.";
-$a->strings["No such group"] = "Es gibt keine solche Gruppe";
-$a->strings["Group: %s"] = "Gruppe: %s";
-$a->strings["Private messages to this person are at risk of public disclosure."] = "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen.";
-$a->strings["Invalid contact."] = "Ungültiger Kontakt.";
-$a->strings["Commented Order"] = "Neueste Kommentare";
-$a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortieren";
-$a->strings["Posted Order"] = "Neueste Beiträge";
-$a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortieren";
-$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um Dich geht";
-$a->strings["New"] = "Neue";
-$a->strings["Activity Stream - by date"] = "Aktivitäten-Stream - nach Datum";
-$a->strings["Shared Links"] = "Geteilte Links";
-$a->strings["Interesting Links"] = "Interessante Links";
-$a->strings["Starred"] = "Markierte";
-$a->strings["Favourite Posts"] = "Favorisierte Beiträge";
+$a->strings["You have no more invitations available"] = "Du hast keine weiteren Einladungen";
+$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."] = "Besuche %s für eine Liste der öffentlichen Server, denen Du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke.";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s oder einer anderen öffentlichen Friendica Website.";
+$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 Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen Du beitreten kannst.";
+$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Es tut uns leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen.";
+$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 Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden.";
+$a->strings["To accept this invitation, please visit and register at %s."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere Dich bitte bei %s.";
+$a->strings["Send invitations"] = "Einladungen senden";
+$a->strings["Enter email addresses, one per line:"] = "E-Mail-Adressen eingeben, eine pro Zeile:";
+$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Du bist herzlich dazu eingeladen, Dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen.";
+$a->strings["You will need to supply this invitation code: \$invite_code"] = "Du benötigst den folgenden Einladungscode: \$invite_code";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald Du registriert bist, kontaktiere mich bitte auf meiner Profilseite:";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "Für weitere Informationen über das Friendica Projekt und warum wir es für ein wichtiges Projekt halten, besuche bitte http://friendi.ca.";
 $a->strings["Personal Notes"] = "Persönliche Notizen";
+$a->strings["Profile deleted."] = "Profil gelöscht.";
+$a->strings["Profile-"] = "Profil-";
+$a->strings["New profile created."] = "Neues Profil angelegt.";
+$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar.";
+$a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
+$a->strings["Marital Status"] = "Familienstand";
+$a->strings["Romantic Partner"] = "Romanze";
+$a->strings["Work/Employment"] = "Arbeit / Beschäftigung";
+$a->strings["Religion"] = "Religion";
+$a->strings["Political Views"] = "Politische Ansichten";
+$a->strings["Gender"] = "Geschlecht";
+$a->strings["Sexual Preference"] = "Sexuelle Vorlieben";
+$a->strings["XMPP"] = "XMPP";
+$a->strings["Homepage"] = "Webseite";
+$a->strings["Interests"] = "Interessen";
+$a->strings["Location"] = "Wohnort";
+$a->strings["Profile updated."] = "Profil aktualisiert.";
+$a->strings["Hide contacts and friends:"] = "Kontakte und Freunde verbergen";
+$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Liste der Kontakte vor Betrachtern dieses Profils verbergen?";
+$a->strings["Show more profile fields:"] = "Zeige mehr Profil-Felder:";
+$a->strings["Profile Actions"] = "Profilaktionen";
+$a->strings["Edit Profile Details"] = "Profil bearbeiten";
+$a->strings["Change Profile Photo"] = "Profilbild ändern";
+$a->strings["View this profile"] = "Dieses Profil anzeigen";
+$a->strings["View all profiles"] = "Alle Profile anzeigen";
+$a->strings["Edit visibility"] = "Sichtbarkeit bearbeiten";
+$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden";
+$a->strings["Clone this profile"] = "Dieses Profil duplizieren";
+$a->strings["Delete this profile"] = "Dieses Profil löschen";
+$a->strings["Basic information"] = "Grundinformationen";
+$a->strings["Profile picture"] = "Profilbild";
+$a->strings["Preferences"] = "Vorlieben";
+$a->strings["Status information"] = "Status Informationen";
+$a->strings["Additional information"] = "Zusätzliche Informationen";
+$a->strings["Relation"] = "Beziehung";
+$a->strings["Miscellaneous"] = "Verschiedenes";
+$a->strings["Your Gender:"] = "Dein Geschlecht:";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Beziehungsstatus:";
+$a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:";
+$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software";
+$a->strings["Profile Name:"] = "Profilname:";
+$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist Dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein.";
+$a->strings["Your Full Name:"] = "Dein kompletter Name:";
+$a->strings["Title/Description:"] = "Titel/Beschreibung:";
+$a->strings["Street Address:"] = "Adresse:";
+$a->strings["Locality/City:"] = "Wohnort:";
+$a->strings["Region/State:"] = "Region/Bundesstaat:";
+$a->strings["Postal/Zip Code:"] = "Postleitzahl:";
+$a->strings["Country:"] = "Land:";
+$a->strings["Age: "] = "Alter: ";
+$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
+$a->strings["Since [date]:"] = "Seit [Datum]:";
+$a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von Dir …";
+$a->strings["XMPP (Jabber) address:"] = "XMPP (Jabber) Adresse";
+$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "Die XMPP Adresse wird an deine Kontakte verteilt werden, so dass sie auch über XMPP mit dir in Kontakt treten können.";
+$a->strings["Homepage URL:"] = "Adresse der Homepage:";
+$a->strings["Hometown:"] = "Heimatort:";
+$a->strings["Political Views:"] = "Politische Ansichten:";
+$a->strings["Religious Views:"] = "Religiöse Ansichten:";
+$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:";
+$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Kontakte zu finden, kann von Kontakten eingesehen werden)";
+$a->strings["Private Keywords:"] = "Private Schlüsselwörter:";
+$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)";
+$a->strings["Likes:"] = "Likes:";
+$a->strings["Dislikes:"] = "Dislikes:";
+$a->strings["Musical interests"] = "Musikalische Interessen";
+$a->strings["Books, literature"] = "Bücher, Literatur";
+$a->strings["Television"] = "Fernsehen";
+$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung";
+$a->strings["Hobbies/Interests"] = "Hobbies/Interessen";
+$a->strings["Love/romance"] = "Liebe/Romantik";
+$a->strings["Work/employment"] = "Arbeit/Anstellung";
+$a->strings["School/education"] = "Schule/Ausbildung";
+$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke";
+$a->strings["Profile Image"] = "Profilbild";
+$a->strings["visible to everybody"] = "sichtbar für jeden";
+$a->strings["Edit/Manage Profiles"] = "Bearbeite/Verwalte Profile";
+$a->strings["Change profile photo"] = "Profilbild ändern";
+$a->strings["Create New Profile"] = "Neues Profil anlegen";
 $a->strings["Photo Albums"] = "Fotoalben";
 $a->strings["Recent Photos"] = "Neueste Fotos";
 $a->strings["Upload New Photos"] = "Neue Fotos hochladen";
-$a->strings["everybody"] = "jeder";
 $a->strings["Contact information unavailable"] = "Kontaktinformationen nicht verfügbar";
 $a->strings["Album not found."] = "Album nicht gefunden.";
 $a->strings["Delete Album"] = "Album löschen";
@@ -1405,13 +1724,10 @@ $a->strings["Image file is missing"] = "Bilddatei konnte nicht gefunden werden."
 $a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "Der Server kann derzeit keine neuen Datei Uploads akzeptieren. Bitte kontaktiere deinen Administrator.";
 $a->strings["Image file is empty."] = "Bilddatei ist leer.";
 $a->strings["No photos selected"] = "Keine Bilder ausgewählt";
-$a->strings["Access to this item is restricted."] = "Zugriff zu diesem Eintrag wurde eingeschränkt.";
 $a->strings["Upload Photos"] = "Bilder hochladen";
 $a->strings["New album name: "] = "Name des neuen Albums: ";
-$a->strings["or existing album name: "] = "oder existierender Albumname: ";
+$a->strings["or select existing album:"] = "oder wähle ein bestehendes Album:";
 $a->strings["Do not show a status post for this upload"] = "Keine Status-Mitteilung für diesen Beitrag anzeigen";
-$a->strings["Show to Groups"] = "Zeige den Gruppen";
-$a->strings["Show to Contacts"] = "Zeige den Kontakten";
 $a->strings["Edit Album"] = "Album bearbeiten";
 $a->strings["Show Newest First"] = "Zeige neueste zuerst";
 $a->strings["Show Oldest First"] = "Zeige älteste zuerst";
@@ -1436,337 +1752,17 @@ $a->strings["I like this (toggle)"] = "Ich mag das (toggle)";
 $a->strings["I don't like this (toggle)"] = "Ich mag das nicht (toggle)";
 $a->strings["Comment"] = "Kommentar";
 $a->strings["Map"] = "Karte";
-$a->strings["View Album"] = "Album betrachten";
-$a->strings["Requested profile is not available."] = "Das angefragte Profil ist nicht vorhanden.";
-$a->strings["%s's timeline"] = "Timeline von %s";
-$a->strings["%s's posts"] = "Beiträge von %s";
-$a->strings["%s's comments"] = "Kommentare von %s";
-$a->strings["Tips for New Members"] = "Tipps für neue Nutzer";
-$a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an Dich gesendet.";
-$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."] = "Versenden der E-Mail fehlgeschlagen. Hier sind Deine Account Details:\n\nLogin: %s\nPasswort: %s\n\nDu kannst das Passwort nach dem Anmelden ändern.";
-$a->strings["Registration successful."] = "Registrierung erfolgreich.";
-$a->strings["Your registration can not be processed."] = "Deine Registrierung konnte nicht verarbeitet werden.";
-$a->strings["Your registration is pending approval by the site owner."] = "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden.";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Du kannst dieses Formular auch (optional) mit Deiner OpenID ausfüllen, indem Du Deine OpenID angibst und 'Registrieren' klickst.";
-$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Wenn Du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus.";
-$a->strings["Your OpenID (optional): "] = "Deine OpenID (optional): ";
-$a->strings["Include your profile in member directory?"] = "Soll Dein Profil im Nutzerverzeichnis angezeigt werden?";
-$a->strings["Note for the admin"] = "Hinweis für den Admin";
-$a->strings["Leave a message for the admin, why you want to join this node"] = "Hinterlasse eine Nachricht an den Admin, warum du einen Account auf dieser Instanz haben möchtest.";
-$a->strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
-$a->strings["Your invitation code: "] = "Dein Ein­la­dungs­code";
-$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Dein vollständiger Name (z.B. Hans Mustermann, echt oder echt erscheinend):";
-$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Deine E-Mail Adresse (Informationen zur Registrierung werden an diese Adresse gesendet, darum muss sie existieren.)";
-$a->strings["New Password:"] = "Neues Passwort:";
-$a->strings["Leave empty for an auto generated password."] = "Leer lassen um das Passwort automatisch zu generieren.";
-$a->strings["Confirm:"] = "Bestätigen:";
-$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@%s</strong>'."] = "Wähle einen Spitznamen für Dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse Deines Profils auf dieser Seite wird '<strong>spitzname@%s</strong>' sein.";
-$a->strings["Choose a nickname: "] = "Spitznamen wählen: ";
-$a->strings["Register"] = "Registrieren";
-$a->strings["Import your profile to this friendica instance"] = "Importiere Dein Profil auf diese Friendica Instanz";
-$a->strings["User deleted their account"] = "Gelöschter Nutzeraccount";
-$a->strings["On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups."] = "Ein Nutzer deiner Friendica Instanz hat seinen Account gelöscht. Bitte stelle sicher, dass deren Daten aus deinen Backups entfernt werden.";
-$a->strings["The user id is %d"] = "Die ID des Users lautet %d";
-$a->strings["Remove My Account"] = "Konto löschen";
-$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen.";
-$a->strings["Please enter your password for verification:"] = "Bitte gib Dein Passwort zur Verifikation ein:";
-$a->strings["Only logged in users are permitted to perform a search."] = "Nur eingeloggten Benutzern ist das Suchen gestattet.";
-$a->strings["Too Many Requests"] = "Zu viele Abfragen";
-$a->strings["Only one search per minute is permitted for not logged in users."] = "Es ist nur eine Suchanfrage pro Minute für nicht eingeloggte Benutzer gestattet.";
-$a->strings["Items tagged with: %s"] = "Beiträge die mit %s getaggt sind";
-$a->strings["Account"] = "Nutzerkonto";
-$a->strings["Display"] = "Anzeige";
-$a->strings["Social Networks"] = "Soziale Netzwerke";
-$a->strings["Delegations"] = "Delegationen";
-$a->strings["Connected apps"] = "Verbundene Programme";
-$a->strings["Remove account"] = "Konto löschen";
-$a->strings["Missing some important data!"] = "Wichtige Daten fehlen!";
-$a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich.";
-$a->strings["Email settings updated."] = "E-Mail Einstellungen bearbeitet.";
-$a->strings["Features updated"] = "Features aktualisiert";
-$a->strings["Relocate message has been send to your contacts"] = "Die Umzugsbenachrichtigung wurde an Deine Kontakte versendet.";
-$a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert.";
-$a->strings["The new password has been exposed in a public data dump, please choose another."] = "Das neuer Passwort wurde in einem öffentlichen Daten-Dump veröffentlicht. Bitte verwende ein anderes Passwort.";
-$a->strings["Wrong password."] = "Falsches Passwort.";
-$a->strings["Password changed."] = "Passwort geändert.";
-$a->strings["Password update failed. Please try again."] = "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal.";
-$a->strings[" Please use a shorter name."] = " Bitte verwende einen kürzeren Namen.";
-$a->strings[" Name too short."] = " Name ist zu kurz.";
-$a->strings["Wrong Password"] = "Falsches Passwort";
-$a->strings["Invalid email."] = "Ungültige E-Mail-Adresse.";
-$a->strings["Cannot change to that email."] = "Ändern der E-Mail nicht möglich. ";
-$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt.";
-$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte.";
-$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
-$a->strings["Add application"] = "Programm hinzufügen";
-$a->strings["Consumer Key"] = "Consumer Key";
-$a->strings["Consumer Secret"] = "Consumer Secret";
-$a->strings["Redirect"] = "Umleiten";
-$a->strings["Icon url"] = "Icon URL";
-$a->strings["You can't edit this application."] = "Du kannst dieses Programm nicht bearbeiten.";
-$a->strings["Connected Apps"] = "Verbundene Programme";
-$a->strings["Edit"] = "Bearbeiten";
-$a->strings["Client key starts with"] = "Anwenderschlüssel beginnt mit";
-$a->strings["No name"] = "Kein Name";
-$a->strings["Remove authorization"] = "Autorisierung entziehen";
-$a->strings["No Addon settings configured"] = "Keine Addon-Einstellungen konfiguriert";
-$a->strings["Addon Settings"] = "Addon Einstellungen";
-$a->strings["Additional Features"] = "Zusätzliche Features";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["enabled"] = "eingeschaltet";
-$a->strings["disabled"] = "ausgeschaltet";
-$a->strings["Built-in support for %s connectivity is %s"] = "Eingebaute Unterstützung für Verbindungen zu %s ist %s";
-$a->strings["GNU Social (OStatus)"] = "GNU Social (OStatus)";
-$a->strings["Email access is disabled on this site."] = "Zugriff auf E-Mails für diese Seite deaktiviert.";
-$a->strings["General Social Media Settings"] = "Allgemeine Einstellungen zu Sozialen Medien";
-$a->strings["Disable Content Warning"] = "Inhaltswarnungen ausschalten";
-$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."] = "Nutzer von anderen Netzwerken, wie z.B. Mastodon oder Pleroma, können Inhaltswarnungen, welche die Beiträge standardmäßig einklappen. Diese Einstellung deaktiviert das automatische Einklappt solcher Beiträge und setzt die Inhaltswarnung als Titel des Beitrags. Wenn du andere Filtereinstellungen vorgenommen hast, werden diese hierdurch nicht beeinflusst.";
-$a->strings["Disable intelligent shortening"] = "Intelligentes Link kürzen ausschalten";
-$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."] = "Normalerweise versucht das System den besten Link zu finden um ihn zu gekürzten Postings hinzu zu fügen. Wird diese Option ausgewählt wird stets ein Link auf die originale Friendica Nachricht beigefügt.";
-$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "Automatisch allen GNU Social (OStatus) Followern/Erwähnern folgen";
-$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."] = "Wenn du eine Nachricht eines unbekannten OStatus Nutzers bekommst, entscheidet diese Option wie diese behandelt werden soll. Ist die Option aktiviert, wird ein neuer Kontakt für den Verfasser erstellt,.";
-$a->strings["Default group for OStatus contacts"] = "Voreingestellte Gruppe für OStatus Kontakte";
-$a->strings["Your legacy GNU Social account"] = "Dein alter GNU Social Account";
-$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."] = "Wenn du deinen alten GNU Socual/Statusnet Accountnamen hier angibst (Format name@domain.tld) werden deine Kontakte automatisch hinzugefügt. Dieses Feld wird geleert, wenn die Kontakte hinzugefügt wurden.";
-$a->strings["Repair OStatus subscriptions"] = "OStatus Abonnements reparieren";
-$a->strings["Email/Mailbox Setup"] = "E-Mail/Postfach-Einstellungen";
-$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Wenn Du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für Dein Postfach an.";
-$a->strings["Last successful email check:"] = "Letzter erfolgreicher E-Mail Check";
-$a->strings["IMAP server name:"] = "IMAP-Server-Name:";
-$a->strings["IMAP port:"] = "IMAP-Port:";
-$a->strings["Security:"] = "Sicherheit:";
-$a->strings["None"] = "Keine";
-$a->strings["Email login name:"] = "E-Mail-Login-Name:";
-$a->strings["Email password:"] = "E-Mail-Passwort:";
-$a->strings["Reply-to address:"] = "Reply-to Adresse:";
-$a->strings["Send public posts to all email contacts:"] = "Sende öffentliche Beiträge an alle E-Mail-Kontakte:";
-$a->strings["Action after import:"] = "Aktion nach Import:";
-$a->strings["Mark as seen"] = "Als gelesen markieren";
-$a->strings["Move to folder"] = "In einen Ordner verschieben";
-$a->strings["Move to folder:"] = "In diesen Ordner verschieben:";
-$a->strings["%s - (Unsupported)"] = "%s - (Nicht unterstützt)";
-$a->strings["%s - (Experimental)"] = "%s - (Experimentell)";
-$a->strings["Display Settings"] = "Anzeige-Einstellungen";
-$a->strings["Display Theme:"] = "Theme:";
-$a->strings["Mobile Theme:"] = "Mobiles Theme";
-$a->strings["Suppress warning of insecure networks"] = "Warnung wegen unsicheren Netzwerken unterdrücken";
-$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Soll das System Warnungen unterdrücken, die angezeigt werden weil von dir eingerichtete Kontakt-Gruppen Accounts aus Netzwerken beinhalten, die keine nicht öffentlichen Beiträge empfangen können.";
-$a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren";
-$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum sind 10 Sekunden. Gib -1 ein um abzuschalten.";
-$a->strings["Number of items to display per page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: ";
-$a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge";
-$a->strings["Number of items to display per page when viewed from mobile device:"] = "Zahl der Beiträge, die pro Netzwerkseite auf mobilen Geräten angezeigt werden sollen:";
-$a->strings["Don't show emoticons"] = "Keine Smilies anzeigen";
-$a->strings["Calendar"] = "Kalender";
-$a->strings["Beginning of week:"] = "Wochenbeginn:";
-$a->strings["Don't show notices"] = "Info-Popups nicht anzeigen";
-$a->strings["Infinite scroll"] = "Endloses Scrollen";
-$a->strings["Automatic updates only at the top of the network page"] = "Automatische Updates nur, wenn Du oben auf der Netzwerkseite bist.";
-$a->strings["When disabled, the network page is updated all the time, which could be confusing while reading."] = "Wenn dies deaktiviert ist, wird die Netzwerk Seite aktualisiert, wann immer neue Beiträge eintreffen, egal an welcher Stelle gerade gelesen wird.";
-$a->strings["Bandwith Saver Mode"] = "Bandbreiten-Spar-Modus";
-$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Wenn aktiviert, wird der eingebettete Inhalt nicht automatisch aktualisiert. In diesem Fall Seite bitte neu laden.";
-$a->strings["Smart Threading"] = "Intelligentes Threading";
-$a->strings["When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled."] = "Ist dies aktiviert, werden Einrückungen in Unterhaltungen unterdrückt wo sie nicht benötigt werden. Werden sie benötigt, werden die Threads weiterhin eingerückt.";
-$a->strings["General Theme Settings"] = "Allgemeine Themeneinstellungen";
-$a->strings["Custom Theme Settings"] = "Benutzerdefinierte Theme Einstellungen";
-$a->strings["Content Settings"] = "Einstellungen zum Inhalt";
-$a->strings["Theme settings"] = "Themeneinstellungen";
-$a->strings["Unable to find your profile. Please contact your admin."] = "Konnte dein Profil nicht finden. Bitte kontaktiere den Admin.";
-$a->strings["Account Types"] = "Kontenarten";
-$a->strings["Personal Page Subtypes"] = "Unterarten der persönlichen Seite";
-$a->strings["Community Forum Subtypes"] = "Unterarten des Gemeinschaftsforums";
-$a->strings["Account for a personal profile."] = "Konto für ein persönliches Profil.";
-$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "Konto für eine Organisation, das Kontaktanfragen automatisch als \"Follower\" annimmt.";
-$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "Konto für einen Feedspiegel, das Kontaktanfragen automatisch als \"Follower\" annimmt.";
-$a->strings["Account for community discussions."] = "Konto für Diskussionsforen. ";
-$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "Konto für ein normales persönliches Profil. Kontaktanfragen müssen manuell als \"Friend\" oder \"Follower\" bestätigt werden.";
-$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Konto für ein öffentliches Profil, das Kontaktanfragen automatisch als \"Follower\" annimmt.";
-$a->strings["Automatically approves all contact requests."] = "Bestätigt alle Kontaktanfragen automatisch.";
-$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "Konto für ein gefragtes Profil, das Kontaktanfragen automatisch als \"Friend\" annimmt.";
-$a->strings["Private Forum [Experimental]"] = "Privates Forum [Versuchsstadium]";
-$a->strings["Requires manual approval of contact requests."] = "Kontaktanfragen müssen manuell bestätigt werden.";
-$a->strings["OpenID:"] = "OpenID:";
-$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID.";
-$a->strings["Publish your default profile in your local site directory?"] = "Darf Dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?";
-$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."] = "Dein Profil wird im <a href=\"%s\">lokalen Verzeichnis</a> dieses Knotens veröffentlicht. Je nach Systemeinstellungen kann es öffentlich auffindbar sein.";
-$a->strings["Publish your default profile in the global social directory?"] = "Darf Dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?";
-$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."] = "Dein Profil wird in den globalen Friendica Verzeichnissen (z.B. <a href=\"%s\">%s</a>) veröffentlicht. Dein Profil wird öffentlich auffindbar sein.";
-$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?";
-$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"] = "Die Liste deiner Kontakte wird nicht in deinem Standard-Profil angezeigt werden. Du kannst für jedes weitere Profil diese Entscheidung separat einstellen.";
-$a->strings["Hide your profile details from anonymous viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?";
-$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."] = "Anonyme Besucher deines Profils werden ausschließlich dein Profilbild, deinen Namen sowie deinen Spitznamen sehen. Deine lffentlichen Beiträge und Kommentare werden weiterhin sichtbar sein.";
-$a->strings["Allow friends to post to your profile page?"] = "Dürfen Deine Kontakte auf Deine Pinnwand schreiben?";
-$a->strings["Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"] = "Deine Kontakte können Beiträge auf deiner Pinnwand hinterlassen. Diese werden an deine Kontakte verteilt.";
-$a->strings["Allow friends to tag your posts?"] = "Dürfen Deine Kontakte Deine Beiträge mit Schlagwörtern versehen?";
-$a->strings["Your contacts can add additional tags to your posts."] = "Deine Kontakte dürfen deine Beiträge mit zusätzlichen Schlagworten versehen.";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir Dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?";
-$a->strings["If you like, Friendica may suggest new members to add you as a contact."] = "Wenn du magst, kann Friendica dich neuen Mitgliedern als Kontakt vorschlagen.";
-$a->strings["Permit unknown people to send you private mail?"] = "Dürfen Dir Unbekannte private Nachrichten schicken?";
-$a->strings["Friendica network users may send you private messages even if they are not in your contact list."] = "Nutzer des Friendica Netzwerks können dir private Nachrichten senden, selbst wenn sie nicht in deine Kontaktliste sind.";
-$a->strings["Profile is <strong>not published</strong>."] = "Profil ist <strong>nicht veröffentlicht</strong>.";
-$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "Die Adresse deines Profils lautet <strong>'%s'</strong> oder '%s'.";
-$a->strings["Automatically expire posts after this many days:"] = "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:";
-$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht.";
-$a->strings["Advanced expiration settings"] = "Erweiterte Verfallseinstellungen";
-$a->strings["Advanced Expiration"] = "Erweitertes Verfallen";
-$a->strings["Expire posts:"] = "Beiträge verfallen lassen:";
-$a->strings["Expire personal notes:"] = "Persönliche Notizen verfallen lassen:";
-$a->strings["Expire starred posts:"] = "Markierte Beiträge verfallen lassen:";
-$a->strings["Expire photos:"] = "Fotos verfallen lassen:";
-$a->strings["Only expire posts by others:"] = "Nur Beiträge anderer verfallen:";
-$a->strings["Account Settings"] = "Kontoeinstellungen";
-$a->strings["Password Settings"] = "Passwort-Einstellungen";
-$a->strings["Leave password fields blank unless changing"] = "Lass die Passwort-Felder leer, außer Du willst das Passwort ändern";
-$a->strings["Current Password:"] = "Aktuelles Passwort:";
-$a->strings["Your current password to confirm the changes"] = "Dein aktuelles Passwort um die Änderungen zu bestätigen";
-$a->strings["Password:"] = "Passwort:";
-$a->strings["Basic Settings"] = "Grundeinstellungen";
-$a->strings["Full Name:"] = "Kompletter Name:";
-$a->strings["Email Address:"] = "E-Mail-Adresse:";
-$a->strings["Your Timezone:"] = "Deine Zeitzone:";
-$a->strings["Your Language:"] = "Deine Sprache:";
-$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "Wähle die Sprache, in der wir Dir die Friendica-Oberfläche präsentieren sollen und Dir E-Mail schicken";
-$a->strings["Default Post Location:"] = "Standardstandort:";
-$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:";
-$a->strings["Security and Privacy Settings"] = "Sicherheits- und Privatsphäre-Einstellungen";
-$a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl vonKontaktanfragen/Tag:";
-$a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)";
-$a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträge";
-$a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)";
-$a->strings["Default Private Post"] = "Privater Standardbeitrag";
-$a->strings["Default Public Post"] = "Öffentlicher Standardbeitrag";
-$a->strings["Default Permissions for New Posts"] = "Standardberechtigungen für neue Beiträge";
-$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:";
-$a->strings["Notification Settings"] = "Benachrichtigungseinstellungen";
-$a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:";
-$a->strings["You receive an introduction"] = "– Du eine Kontaktanfrage erhältst";
-$a->strings["Your introductions are confirmed"] = "– eine Deiner Kontaktanfragen akzeptiert wurde";
-$a->strings["Someone writes on your profile wall"] = "– jemand etwas auf Deine Pinnwand schreibt";
-$a->strings["Someone writes a followup comment"] = "– jemand auch einen Kommentar verfasst";
-$a->strings["You receive a private message"] = "– Du eine private Nachricht erhältst";
-$a->strings["You receive a friend suggestion"] = "– Du eine Empfehlung erhältst";
-$a->strings["You are tagged in a post"] = "– Du in einem Beitrag erwähnt wirst";
-$a->strings["You are poked/prodded/etc. in a post"] = "– Du von jemandem angestupst oder sonstwie behandelt wirst";
-$a->strings["Activate desktop notifications"] = "Desktop Benachrichtigungen einschalten";
-$a->strings["Show desktop popup on new notifications"] = "Desktop Benachrichtigungen einschalten";
-$a->strings["Text-only notification emails"] = "Benachrichtigungs E-Mail als Rein-Text.";
-$a->strings["Send text only notification emails, without the html part"] = "Sende Benachrichtigungs E-Mail als Rein-Text - ohne HTML-Teil";
-$a->strings["Show detailled notifications"] = "Detaillierte Benachrichtigungen anzeigen";
-$a->strings["Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed."] = "Normalerweise werde alle Benachrichtigungen zu einem Thema zusammengefasst in einer einzigen Mitteilung. Wenn diese Option aktiviert ist, wird jede Mitteilung angezeigt.";
-$a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Konto-/Seitentyp-Einstellungen";
-$a->strings["Change the behaviour of this account for special situations"] = "Verhalten dieses Kontos in bestimmten Situationen:";
-$a->strings["Relocate"] = "Umziehen";
-$a->strings["If you have moved this profile from another server, and some of your contacts don't receive your updates, try pushing this button."] = "Wenn Du Dein Profil von einem anderen Server umgezogen hast und einige Deiner Kontakte Deine Beiträge nicht erhalten, verwende diesen Button.";
-$a->strings["Resend relocate message to contacts"] = "Umzugsbenachrichtigung erneut an Kontakte senden";
-$a->strings["Do you really want to delete this video?"] = "Möchtest Du dieses Video wirklich löschen?";
-$a->strings["Delete Video"] = "Video Löschen";
-$a->strings["No videos selected"] = "Keine Videos  ausgewählt";
-$a->strings["Recent Videos"] = "Neueste Videos";
-$a->strings["Upload New Videos"] = "Neues Video hochladen";
-$a->strings["default"] = "Standard";
-$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"] = "Variationen";
-$a->strings["Top Banner"] = "Top Banner";
-$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Skaliere das Hintergrundbild so, dass es die Breite der Seite einnimmt und fülle den Rest der Seite mit der Hintergrundfarbe bei langen Seiten.";
-$a->strings["Full screen"] = "Vollbildmodus";
-$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Skaliere das Bild so, dass es den gesamten Bildschirm füllt. Hierfür wird entweder die Breite oder die Höhe des Bildes automatisch abgeschnitten.";
-$a->strings["Single row mosaic"] = "Mosaik in einer Zeile";
-$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Skaliere das Bild so, dass es in einer einzelnen Reihe, entweder horizontal oder vertikal, wiederholt wird.";
-$a->strings["Mosaic"] = "Mosaik";
-$a->strings["Repeat image to fill the screen."] = "Wiederhole das Bild um den Bildschirm zu füllen.";
-$a->strings["Custom"] = "Benutzerdefiniert";
-$a->strings["Note"] = "Hinweis";
-$a->strings["Check image permissions if all users are allowed to see the image"] = "Überprüfe, dass alle Benutzer die Berechtigung haben dieses Bild anzusehen";
-$a->strings["Select color scheme"] = "Farbschema auswählen";
-$a->strings["Navigation bar background color"] = "Hintergrundfarbe der Navigationsleiste";
-$a->strings["Navigation bar icon color "] = "Icon Farbe in der Navigationsleiste";
-$a->strings["Link color"] = "Linkfarbe";
-$a->strings["Set the background color"] = "Hintergrundfarbe festlegen";
-$a->strings["Content background opacity"] = "Opazität des Hintergrunds von Beiträgen";
-$a->strings["Set the background image"] = "Hintergrundbild festlegen";
-$a->strings["Background image style"] = "Stiel des Hintergrundbildes";
-$a->strings["Login page background image"] = "Hintergrundbild der Login-Seite";
-$a->strings["Login page background color"] = "Hintergrundfarbe der Login-Seite";
-$a->strings["Leave background image and color empty for theme defaults"] = "Wenn die Theme Vorgaben verwendet werden sollen, lass bitte die Felder für die Hintergrundfarbe und das Hintergrundbild leer.";
-$a->strings["Guest"] = "Gast";
-$a->strings["Visitor"] = "Besucher";
-$a->strings["Logout"] = "Abmelden";
-$a->strings["End this session"] = "Diese Sitzung beenden";
-$a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
-$a->strings["Your profile page"] = "Deine Profilseite";
-$a->strings["Your photos"] = "Deine Fotos";
-$a->strings["Videos"] = "Videos";
-$a->strings["Your videos"] = "Deine Videos";
-$a->strings["Your events"] = "Deine Ereignisse";
-$a->strings["Conversations from your friends"] = "Unterhaltungen Deiner Kontakte";
-$a->strings["Events and Calendar"] = "Ereignisse und Kalender";
-$a->strings["Private mail"] = "Private E-Mail";
-$a->strings["Account settings"] = "Kontoeinstellungen";
-$a->strings["Manage/edit friends and contacts"] = " Kontakte verwalten/editieren";
-$a->strings["Alignment"] = "Ausrichtung";
-$a->strings["Left"] = "Links";
-$a->strings["Center"] = "Mitte";
-$a->strings["Color scheme"] = "Farbschema";
-$a->strings["Posts font size"] = "Schriftgröße in Beiträgen";
-$a->strings["Textareas font size"] = "Schriftgröße in Eingabefeldern";
-$a->strings["Comma separated list of helper forums"] = "Komma-Separierte Liste der Helfer-Foren";
-$a->strings["don't show"] = "nicht zeigen";
-$a->strings["show"] = "zeigen";
-$a->strings["Set style"] = "Stil auswählen";
-$a->strings["Community Pages"] = "Foren";
-$a->strings["Community Profiles"] = "Community-Profile";
-$a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
-$a->strings["Connect Services"] = "Verbinde Dienste";
-$a->strings["Find Friends"] = "Kontakte finden";
-$a->strings["Last users"] = "Letzte Nutzer";
-$a->strings["Find People"] = "Leute finden";
-$a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiel: Robert Morgenstein, Angeln";
-$a->strings["Similar Interests"] = "Ähnliche Interessen";
-$a->strings["Random Profile"] = "Zufälliges Profil";
-$a->strings["Invite Friends"] = "Freunde einladen";
-$a->strings["Local Directory"] = "Lokales Verzeichnis";
-$a->strings["External link to forum"] = "Externer Link zum Forum";
-$a->strings["Quick Start"] = "Schnell-Start";
-$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?";
-$a->strings["User '%s' already exists on this server!"] = "Nutzer '%s' existiert bereits auf diesem Server!";
-$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzeraccounts aufgetreten";
-$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzerkontos";
-$a->strings["%d contact not imported"] = [
-	0 => "%d Kontakt nicht importiert",
-	1 => "%d Kontakte nicht importiert",
-];
-$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden";
-$a->strings["Post to Email"] = "An E-Mail senden";
-$a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?";
-$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist.";
-$a->strings["Visible to everybody"] = "Für jeden sichtbar";
-$a->strings["Close"] = "Schließen";
-$a->strings["Enter new password: "] = "Neues Passwort eingeben:";
-$a->strings["Password can't be empty"] = "Das Passwort kann nicht leer sein";
-$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "Für die URL (%s) konnte kein nicht-archivierter Kontakt gefunden werden";
-$a->strings["The contact entries have been archived"] = "Die Kontakteinträge wurden archiviert.";
-$a->strings["System"] = "System";
-$a->strings["Home"] = "Pinnwand";
-$a->strings["Introductions"] = "Kontaktanfragen";
-$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert";
-$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt";
-$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag";
-$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht";
-$a->strings["%s is attending %s's event"] = "%s nimmt an %s's Event teil";
-$a->strings["%s is not attending %s's event"] = "%s nimmt nicht an %s's Event teil";
-$a->strings["%s may attend %s's event"] = "%s nimmt eventuell an %s's Event teil";
-$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet";
-$a->strings["Friend Suggestion"] = "Kontaktvorschlag";
-$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage";
-$a->strings["New Follower"] = "Neuer Bewunderer";
+$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>"] = "<span><a href=\"%s\" target=\"_blank\" class=\"shared-wall-item-name\">%s</a> schrieb den folgenden <a href=\"%s\" target=\"_blank\">Beitrag</a>";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<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>"] = "<span><a href=\"%s\" target=\"_blank\">%s</a> schrieb den folgenden <a href=\"%s\" target=\"_blank\">Beitrag</a>";
+$a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen.";
+$a->strings["There are no tables on MyISAM."] = "Es gibt keine MyISAM Tabellen.";
+$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."] = "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein.";
+$a->strings["The error message is\n[pre]%s[/pre]"] = "Die Fehlermeldung lautet\n[pre]%s[/pre]";
+$a->strings["\nError %d occurred during database update:\n%s\n"] = "\nFehler %d beim Update der Datenbank aufgetreten\n%s\n";
+$a->strings["Errors encountered performing database changes: "] = "Fehler beim Ändern der Datenbank aufgetreten";
+$a->strings["%s: Database update"] = "%s: Datenbank Aktualisierung";
+$a->strings["%s: updating %s table."] = "%s: aktualisiere Tabelle %s";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
 $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>"] = "Wenn auf deinem Server keine Kommandozeilenversion von PHP installiert ist, kannst du den Hintergrundprozess nicht einrichten. Hier findest du alternative Möglichkeiten<a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'für das Worker Setup'</a>";
 $a->strings["PHP executable path"] = "Pfad zu PHP";
@@ -1800,11 +1796,11 @@ $a->strings["Error: mb_string PHP module required but not installed."] = "Fehler
 $a->strings["Error: iconv PHP module required but not installed."] = "Fehler: Das iconv-Modul von PHP ist nicht installiert.";
 $a->strings["Error: POSIX PHP module required but not installed."] = "Fehler POSIX PHP Modul erforderlich aber nicht installiert.";
 $a->strings["Error, XML PHP module required but not installed."] = "Fehler: XML PHP Modul erforderlich aber nicht installiert.";
-$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."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis Deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun.";
+$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."] = "Das Installationsprogramm muss in der Lage sein, eine Datei namens \"local.ini.php\" im Ordner \"config\" Ihres Webservers zu erstellen, ist aber nicht in der Lager dazu.";
 $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."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn Du sie hast.";
-$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."] = "Nachdem Du alles ausgefüllt hast, erhältst Du einen Text, den Du in eine Datei namens .htconfig.php in Deinem Friendica-Wurzelverzeichnis kopieren musst.";
+$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."] = "Am Ende dieser Prozedur bekommst du einen Text der in der local.ini.php im Friendica \"config\" Ordner gespeichert werden muss.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst Du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest Du in der Datei INSTALL.txt.";
-$a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php";
+$a->strings["config/local.ini.php is writable"] = "config/local.ini.php ist beschreibbar";
 $a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica nutzt die Smarty3 Template Engine um die Webansichten zu rendern. Smarty3 kompiliert Templates zu PHP um das Rendern zu beschleunigen.";
 $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."] = "Um diese kompilierten Templates zu speichern benötigt der Webserver Schreibrechte zum Verzeichnis view/smarty3/ im obersten Ordner von Friendica.";
 $a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer unter dem der Webserver läuft (z.B. www-data) Schreibrechte zu diesem Verzeichnis hat.";
@@ -1816,6 +1812,104 @@ $a->strings["Url rewrite is working"] = "URL rewrite funktioniert";
 $a->strings["ImageMagick PHP extension is not installed"] = "ImageMagicx PHP Erweiterung ist nicht installiert.";
 $a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP Erweiterung ist installiert";
 $a->strings["ImageMagick supports GIF"] = "ImageMagick unterstützt GIF";
+$a->strings["Post to Email"] = "An E-Mail senden";
+$a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist.";
+$a->strings["Visible to everybody"] = "Für jeden sichtbar";
+$a->strings["Close"] = "Schließen";
+$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "Für die URL (%s) konnte kein nicht-archivierter Kontakt gefunden werden";
+$a->strings["The contact entries have been archived"] = "Die Kontakteinträge wurden archiviert.";
+$a->strings["Execute pending post updates."] = "Ausstehende Post-Updates ausführen";
+$a->strings["All pending post updates are done."] = "Alle ausstehenden Post-Updates wurden ausgeführt.";
+$a->strings["Enter new password: "] = "Neues Passwort eingeben:";
+$a->strings["Password can't be empty"] = "Das Passwort kann nicht leer sein";
+$a->strings["System"] = "System";
+$a->strings["Home"] = "Pinnwand";
+$a->strings["Introductions"] = "Kontaktanfragen";
+$a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert";
+$a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt";
+$a->strings["%s liked %s's post"] = "%s mag %ss Beitrag";
+$a->strings["%s disliked %s's post"] = "%s mag %ss Beitrag nicht";
+$a->strings["%s is attending %s's event"] = "%s nimmt an %s's Event teil";
+$a->strings["%s is not attending %s's event"] = "%s nimmt nicht an %s's Event teil";
+$a->strings["%s may attend %s's event"] = "%s nimmt eventuell an %s's Event teil";
+$a->strings["%s is now friends with %s"] = "%s ist jetzt mit %s befreundet";
+$a->strings["Friend Suggestion"] = "Kontaktvorschlag";
+$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage";
+$a->strings["New Follower"] = "Neuer Bewunderer";
+$a->strings["Error decoding account file"] = "Fehler beim Verarbeiten der Account Datei";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fehler! Keine Versionsdaten in der Datei! Ist das wirklich eine Friendica Account Datei?";
+$a->strings["User '%s' already exists on this server!"] = "Nutzer '%s' existiert bereits auf diesem Server!";
+$a->strings["User creation error"] = "Fehler beim Anlegen des Nutzeraccounts aufgetreten";
+$a->strings["User profile creation error"] = "Fehler beim Anlegen des Nutzerkontos";
+$a->strings["%d contact not imported"] = [
+	0 => "%d Kontakt nicht importiert",
+	1 => "%d Kontakte nicht importiert",
+];
+$a->strings["Done. You can now login with your username and password"] = "Erledigt. Du kannst Dich jetzt mit Deinem Nutzernamen und Passwort anmelden";
+$a->strings["(no subject)"] = "(kein Betreff)";
+$a->strings["This entry was edited"] = "Dieser Beitrag wurde bearbeitet.";
+$a->strings["Delete globally"] = "Global löschen";
+$a->strings["Remove locally"] = "Lokal entfernen";
+$a->strings["save to folder"] = "In Ordner speichern";
+$a->strings["I will attend"] = "Ich werde teilnehmen";
+$a->strings["I will not attend"] = "Ich werde nicht teilnehmen";
+$a->strings["I might attend"] = "Ich werde eventuell teilnehmen";
+$a->strings["ignore thread"] = "Thread ignorieren";
+$a->strings["unignore thread"] = "Thread nicht mehr ignorieren";
+$a->strings["toggle ignore status"] = "Ignoriert-Status ein-/ausschalten";
+$a->strings["add star"] = "markieren";
+$a->strings["remove star"] = "Markierung entfernen";
+$a->strings["toggle star status"] = "Markierung umschalten";
+$a->strings["starred"] = "markiert";
+$a->strings["add tag"] = "Tag hinzufügen";
+$a->strings["like"] = "mag ich";
+$a->strings["dislike"] = "mag ich nicht";
+$a->strings["Share this"] = "Weitersagen";
+$a->strings["share"] = "Teilen";
+$a->strings["to"] = "zu";
+$a->strings["via"] = "via";
+$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
+$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
+$a->strings["%d comment"] = [
+	0 => "%d Kommentar",
+	1 => "%d Kommentare",
+];
+$a->strings["Bold"] = "Fett";
+$a->strings["Italic"] = "Kursiv";
+$a->strings["Underline"] = "Unterstrichen";
+$a->strings["Quote"] = "Zitat";
+$a->strings["Code"] = "Code";
+$a->strings["Image"] = "Bild";
+$a->strings["Link"] = "Link";
+$a->strings["Video"] = "Video";
+$a->strings["Delete this item?"] = "Diesen Beitrag löschen?";
+$a->strings["show fewer"] = "weniger anzeigen";
+$a->strings["No system theme config value set."] = "Es wurde kein Konfigurationswert für das Systemweite Theme gesetzt.";
+$a->strings["Logged out."] = "Abgemeldet.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast.";
+$a->strings["The error message was:"] = "Die Fehlermeldung lautete:";
+$a->strings["Create a New Account"] = "Neues Konto erstellen";
+$a->strings["Password: "] = "Passwort: ";
+$a->strings["Remember me"] = "Anmeldedaten merken";
+$a->strings["Or login using OpenID: "] = "Oder melde Dich mit Deiner OpenID an: ";
+$a->strings["Forgot your password?"] = "Passwort vergessen?";
+$a->strings["Website Terms of Service"] = "Website Nutzungsbedingungen";
+$a->strings["terms of service"] = "Nutzungsbedingungen";
+$a->strings["Website Privacy Policy"] = "Website Datenschutzerklärung";
+$a->strings["privacy policy"] = "Datenschutzerklärung";
+$a->strings["At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication."] = "Zum Zwecke der Registrierung und um die Kommunikation zwischen dem Nutzer und seinen Kontakten zu gewährleisten, muß der Nutzer einen Namen (auch Pseudonym) und einen Nutzernamen (Spitzname) sowie eine funktionierende E-Mail-Adresse angeben. Der Name ist auf der Profilseite für alle Nutzer sichtbar, auch wenn die Profildetails nicht angezeigt werden.\nDie E-Mail-Adresse wird nur zur Benachrichtigung des Nutzers verwendet, sie wird nirgends angezeigt. Die Anzeige des Nutzerkontos im Server-Verzeichnis bzw. dem weltweiten Verzeichnis erfolgt gemäß den Einstellungen des Nutzers, sie ist zur Kommunikation nicht zwingend notwendig.";
+$a->strings["This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts."] = "Diese Daten sind für die Kommunikation notwendig und werden an die Knoten der Kommunikationspartner übermittelt. und werden dort gespeichert Nutzer können weitere private Angaben machen, die ebenfalls an die verwendeten Server der Kommunikationspartner übermittelt werden können.";
+$a->strings["At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/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."] = "Angemeldete Nutzer können ihre Nutzerdaten jederzeit von den <a href=\"%1\$s/settings/uexport\">Kontoeinstellungen</a> aus exportieren. Wenn ein Nutzer wünscht das Nutzerkonto zu löschen, so ist dies jederzeit unter <a href=\"%1\$s/removeme\">%1\$s/removeme</a> möglich. Die Löschung des Nutzerkontos ist permanent. Die Löschung der Daten wird auch von den Knoten der Kommunikationspartner angefordert.";
+$a->strings["Privacy Statement"] = "Datenschutzerklärung";
+$a->strings["%s is now following %s."] = "%s folgt nun %s";
+$a->strings["following"] = "folgen";
+$a->strings["%s stopped following %s."] = "%s hat aufgehört %s zu folgen";
+$a->strings["stopped following"] = "wird nicht mehr gefolgt";
+$a->strings["%s's birthday"] = "%ss Geburtstag";
+$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s";
+$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
+$a->strings["Attachments:"] = "Anhänge:";
 $a->strings["Birthday:"] = "Geburtstag:";
 $a->strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD oder MM-DD";
 $a->strings["never"] = "nie";
@@ -1832,18 +1926,116 @@ $a->strings["minutes"] = "Minuten";
 $a->strings["second"] = "Sekunde";
 $a->strings["seconds"] = "Sekunden";
 $a->strings["%1\$d %2\$s ago"] = "vor %1\$d %2\$s";
-$a->strings["view full size"] = "Volle Größe anzeigen";
-$a->strings["Image/photo"] = "Bild/Foto";
-$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
-$a->strings["$1 wrote:"] = "$1 hat geschrieben:";
-$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
-$a->strings["Invalid source protocol"] = "Ungültiges Quell-Protokoll";
-$a->strings["Invalid link protocol"] = "Ungültiges Link-Protokoll";
-$a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
-$a->strings["Embedded content"] = "Eingebetteter Inhalt";
-$a->strings["Export"] = "Exportieren";
-$a->strings["Export calendar as ical"] = "Kalender als ical exportieren";
-$a->strings["Export calendar as csv"] = "Kalender als csv exportieren";
+$a->strings["[no subject]"] = "[kein Betreff]";
+$a->strings["Drop Contact"] = "Kontakt löschen";
+$a->strings["Organisation"] = "Organisation";
+$a->strings["News"] = "Nachrichten";
+$a->strings["Forum"] = "Forum";
+$a->strings["Connect URL missing."] = "Connect-URL fehlt";
+$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Der Kontakt konnte nicht hinzugefügt werden. Bitte überprüfe die Einstellungen unter Einstellungen -> Soziale Netzwerke";
+$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann.";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden.";
+$a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen.";
+$a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden.";
+$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden.";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen.";
+$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen.";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können.";
+$a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen.";
+$a->strings["Starts:"] = "Beginnt:";
+$a->strings["Finishes:"] = "Endet:";
+$a->strings["all-day"] = "ganztägig";
+$a->strings["Jun"] = "Jun";
+$a->strings["Sept"] = "Sep";
+$a->strings["No events to display"] = "Keine Veranstaltung zum Anzeigen";
+$a->strings["l, F j"] = "l, F j";
+$a->strings["Edit event"] = "Veranstaltung bearbeiten";
+$a->strings["Duplicate event"] = "Veranstaltung kopieren";
+$a->strings["Delete event"] = "Veranstaltung löschen";
+$a->strings["D g:i A"] = "D H:i";
+$a->strings["g:i A"] = "H:i";
+$a->strings["Show map"] = "Karte anzeigen";
+$a->strings["Hide map"] = "Karte verbergen";
+$a->strings["Login failed"] = "Anmeldung fehlgeschlagen";
+$a->strings["Not enough information to authenticate"] = "Nicht genügend Informationen für die Authentifizierung";
+$a->strings["An invitation is required."] = "Du benötigst eine Einladung.";
+$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden.";
+$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL";
+$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein.";
+$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen.";
+$a->strings["Name too short."] = "Der Name ist zu kurz.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein.";
+$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt.";
+$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse.";
+$a->strings["The nickname was blocked from registration by the nodes admin."] = "Der Admin des Knotens hat den Spitznamen für die Registrierung gesperrt.";
+$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden.";
+$a->strings["Your nickname can only contain a-z, 0-9 and _."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen.";
+$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
+$a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
+$a->strings["An error occurred creating your self contact. Please try again."] = "Bei der Erstellung deines self Kontakts ist ein Fehler aufgetreten. Bitte versuche es erneut.";
+$a->strings["Friends"] = "Kontakte";
+$a->strings["An error occurred creating your default contact group. Please try again."] = "Bei der Erstellung deiner Standardgruppe für Kontakte ist ein Fehler aufgetreten. Bitte versuche es erneut.";
+$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"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account muss noch vom Admin des Knotens geprüft werden.";
+$a->strings["Registration at %s"] = "Registrierung als %s";
+$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet.";
+$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3\$s/removeme jederzeit tun.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s.";
+$a->strings["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."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls Du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
+$a->strings["Default privacy group for new contacts"] = "Voreingestellte Gruppe für neue Kontakte";
+$a->strings["Everybody"] = "Alle Kontakte";
+$a->strings["edit"] = "bearbeiten";
+$a->strings["Edit group"] = "Gruppe bearbeiten";
+$a->strings["Create a new group"] = "Neue Gruppe erstellen";
+$a->strings["Edit groups"] = "Gruppen bearbeiten";
+$a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden.";
+$a->strings["Edit profile"] = "Profil bearbeiten";
+$a->strings["Atom feed"] = "Atom-Feed";
+$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren";
+$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r";
+$a->strings["F d"] = "d. F";
+$a->strings["[today]"] = "[heute]";
+$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen";
+$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:";
+$a->strings["[No description]"] = "[keine Beschreibung]";
+$a->strings["Event Reminders"] = "Veranstaltungserinnerungen";
+$a->strings["Upcoming events the next 7 days:"] = "Veranstaltungen der nächsten 7 Tage:";
+$a->strings["Member since:"] = "Mitglied seit:";
+$a->strings["j F, Y"] = "j F, Y";
+$a->strings["j F"] = "j F";
+$a->strings["Age:"] = "Alter:";
+$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s";
+$a->strings["Religion:"] = "Religion:";
+$a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:";
+$a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:";
+$a->strings["Musical interests:"] = "Musikalische Interessen:";
+$a->strings["Books, literature:"] = "Literatur/Bücher:";
+$a->strings["Television:"] = "Fernsehen:";
+$a->strings["Film/dance/culture/entertainment:"] = "Filme/Tänze/Kultur/Unterhaltung:";
+$a->strings["Love/Romance:"] = "Liebesleben:";
+$a->strings["Work/employment:"] = "Arbeit/Beschäftigung:";
+$a->strings["School/education:"] = "Schule/Ausbildung:";
+$a->strings["Forums:"] = "Foren:";
+$a->strings["Only You Can See This"] = "Nur Du kannst das sehen";
+$a->strings["Tips for New Members"] = "Tipps für neue Nutzer";
+$a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s heißt %2\$sherzlich willkommen";
+$a->strings["Add New Contact"] = "Neuen Kontakt hinzufügen";
+$a->strings["Enter address or web location"] = "Adresse oder Web-Link eingeben";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@example.com, http://example.com/barbara";
+$a->strings["%d invitation available"] = [
+	0 => "%d Einladung verfügbar",
+	1 => "%d Einladungen verfügbar",
+];
+$a->strings["Networks"] = "Netzwerke";
+$a->strings["All Networks"] = "Alle Netzwerke";
+$a->strings["Saved Folders"] = "Gespeicherte Ordner";
+$a->strings["Everything"] = "Alles";
+$a->strings["Categories"] = "Kategorien";
+$a->strings["%d contact in common"] = [
+	0 => "%d gemeinsamer Kontakt",
+	1 => "%d gemeinsame Kontakte",
+];
 $a->strings["Frequently"] = "immer wieder";
 $a->strings["Hourly"] = "Stündlich";
 $a->strings["Twice daily"] = "Zweimal täglich";
@@ -1852,7 +2044,6 @@ $a->strings["Weekly"] = "Wöchentlich";
 $a->strings["Monthly"] = "Monatlich";
 $a->strings["OStatus"] = "OStatus";
 $a->strings["RSS/Atom"] = "RSS/Atom";
-$a->strings["Facebook"] = "Facebook";
 $a->strings["Zot!"] = "Zott";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/Chat";
@@ -1863,7 +2054,6 @@ $a->strings["Twitter"] = "Twitter";
 $a->strings["Diaspora Connector"] = "Diaspora Connector";
 $a->strings["GNU Social Connector"] = "GNU social Connector";
 $a->strings["pnut"] = "pnut";
-$a->strings["App.net"] = "App.net";
 $a->strings["Male"] = "Männlich";
 $a->strings["Female"] = "Weiblich";
 $a->strings["Currently Male"] = "Momentan männlich";
@@ -1899,7 +2089,6 @@ $a->strings["Infatuated"] = "verliebt";
 $a->strings["Dating"] = "Dating";
 $a->strings["Unfaithful"] = "Untreu";
 $a->strings["Sex Addict"] = "Sexbesessen";
-$a->strings["Friends"] = "Kontakte";
 $a->strings["Friends/Benefits"] = "Freunde/Zuwendungen";
 $a->strings["Casual"] = "Casual";
 $a->strings["Engaged"] = "Verlobt";
@@ -1921,22 +2110,6 @@ $a->strings["Uncertain"] = "Unsicher";
 $a->strings["It's complicated"] = "Ist kompliziert";
 $a->strings["Don't care"] = "Ist mir nicht wichtig";
 $a->strings["Ask me"] = "Frag mich";
-$a->strings["Add New Contact"] = "Neuen Kontakt hinzufügen";
-$a->strings["Enter address or web location"] = "Adresse oder Web-Link eingeben";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@example.com, http://example.com/barbara";
-$a->strings["%d invitation available"] = [
-	0 => "%d Einladung verfügbar",
-	1 => "%d Einladungen verfügbar",
-];
-$a->strings["Networks"] = "Netzwerke";
-$a->strings["All Networks"] = "Alle Netzwerke";
-$a->strings["Saved Folders"] = "Gespeicherte Ordner";
-$a->strings["Everything"] = "Alles";
-$a->strings["Categories"] = "Kategorien";
-$a->strings["%d contact in common"] = [
-	0 => "%d gemeinsamer Kontakt",
-	1 => "%d gemeinsame Kontakte",
-];
 $a->strings["General Features"] = "Allgemeine Features";
 $a->strings["Multiple Profiles"] = "Mehrere Profile";
 $a->strings["Ability to create multiple profiles"] = "Möglichkeit mehrere Profile zu erstellen";
@@ -2013,174 +2186,18 @@ $a->strings["Inbox"] = "Eingang";
 $a->strings["Outbox"] = "Ausgang";
 $a->strings["Manage"] = "Verwalten";
 $a->strings["Manage other pages"] = "Andere Seiten verwalten";
-$a->strings["Profiles"] = "Profile";
 $a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren";
 $a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration";
 $a->strings["Navigation"] = "Navigation";
 $a->strings["Site map"] = "Sitemap";
-$a->strings["There are no tables on MyISAM."] = "Es gibt keine MyISAM Tabellen.";
-$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."] = "\nDie Friendica-Entwickler haben vor kurzem das Update %s veröffentlicht, aber bei der Installation ging etwas schrecklich schief.\n\nDas Problem sollte so schnell wie möglich gelöst werden, aber ich schaffe es nicht alleine. Bitte kontaktiere einen Friendica-Entwickler falls Du mir nicht alleine helfen kannst. Meine Datenbank könnte ungültig sein.";
-$a->strings["The error message is\n[pre]%s[/pre]"] = "Die Fehlermeldung lautet\n[pre]%s[/pre]";
-$a->strings["\nError %d occurred during database update:\n%s\n"] = "\nFehler %d beim Update der Datenbank aufgetreten\n%s\n";
-$a->strings["Errors encountered performing database changes: "] = "Fehler beim Ändern der Datenbank aufgetreten";
-$a->strings["%s: Database update"] = "%s: Datenbank Aktualisierung";
-$a->strings["%s: updating %s table."] = "%s: aktualisiere Tabelle %s";
-$a->strings["[no subject]"] = "[kein Betreff]";
-$a->strings["Starts:"] = "Beginnt:";
-$a->strings["Finishes:"] = "Endet:";
-$a->strings["all-day"] = "ganztägig";
-$a->strings["Jun"] = "Jun";
-$a->strings["Sept"] = "Sep";
-$a->strings["No events to display"] = "Keine Veranstaltung zum Anzeigen";
-$a->strings["l, F j"] = "l, F j";
-$a->strings["Edit event"] = "Veranstaltung bearbeiten";
-$a->strings["Duplicate event"] = "Veranstaltung kopieren";
-$a->strings["Delete event"] = "Veranstaltung löschen";
-$a->strings["D g:i A"] = "D H:i";
-$a->strings["g:i A"] = "H:i";
-$a->strings["Show map"] = "Karte anzeigen";
-$a->strings["Hide map"] = "Karte verbergen";
-$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."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen <strong>könnten</strong> auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls Du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen.";
-$a->strings["Default privacy group for new contacts"] = "Voreingestellte Gruppe für neue Kontakte";
-$a->strings["Everybody"] = "Alle Kontakte";
-$a->strings["edit"] = "bearbeiten";
-$a->strings["Edit group"] = "Gruppe bearbeiten";
-$a->strings["Contacts not in any group"] = "Kontakte in keiner Gruppe";
-$a->strings["Create a new group"] = "Neue Gruppe erstellen";
-$a->strings["Edit groups"] = "Gruppen bearbeiten";
-$a->strings["Login failed"] = "Anmeldung fehlgeschlagen";
-$a->strings["Not enough information to authenticate"] = "Nicht genügend Informationen für die Authentifizierung";
-$a->strings["An invitation is required."] = "Du benötigst eine Einladung.";
-$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden.";
-$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch Dich mit der von Dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass Du die OpenID richtig geschrieben hast.";
-$a->strings["The error message was:"] = "Die Fehlermeldung lautete:";
-$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein.";
-$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen.";
-$a->strings["Name too short."] = "Der Name ist zu kurz.";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht Dein kompletter Name (Vor- und Nachname) zu sein.";
-$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain Deiner E-Mail Adresse ist auf dieser Seite nicht erlaubt.";
-$a->strings["Not a valid email address."] = "Keine gültige E-Mail-Adresse.";
-$a->strings["Cannot use that email."] = "Konnte diese E-Mail-Adresse nicht verwenden.";
-$a->strings["Your nickname can only contain a-z, 0-9 and _."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\" und \"_\") bestehen.";
-$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
-$a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
-$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
-$a->strings["An error occurred creating your self contact. Please try again."] = "Bei der Erstellung deines self Kontakts ist ein Fehler aufgetreten. Bitte versuche es erneut.";
-$a->strings["An error occurred creating your default contact group. Please try again."] = "Bei der Erstellung deiner Standardgruppe für Kontakte ist ein Fehler aufgetreten. Bitte versuche es erneut.";
-$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"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account muss noch vom Admin des Knotens geprüft werden.";
-$a->strings["Registration at %s"] = "Registrierung als %s";
-$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\nHallo %1\$s,\n\ndanke für Deine Registrierung auf %2\$s. Dein Account wurde eingerichtet.";
-$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nSolltest du dein Nutzerkonto löschen wollen, kannst du dies unter %3\$s/removeme jederzeit tun.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s.";
-$a->strings["Drop Contact"] = "Kontakt löschen";
-$a->strings["Organisation"] = "Organisation";
-$a->strings["News"] = "Nachrichten";
-$a->strings["Forum"] = "Forum";
-$a->strings["Connect URL missing."] = "Connect-URL fehlt";
-$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Der Kontakt konnte nicht hinzugefügt werden. Bitte überprüfe die Einstellungen unter Einstellungen -> Soziale Netzwerke";
-$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann.";
-$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden.";
-$a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen.";
-$a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden.";
-$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden.";
-$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen.";
-$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen.";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde.";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von Dir erhalten können.";
-$a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen.";
-$a->strings["%s's birthday"] = "%ss Geburtstag";
-$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s";
-$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil.";
-$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil.";
-$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil.";
-$a->strings["Requested account is not available."] = "Das angefragte Profil ist nicht vorhanden.";
-$a->strings["Edit profile"] = "Profil bearbeiten";
-$a->strings["Atom feed"] = "Atom-Feed";
-$a->strings["Manage/edit profiles"] = "Profile verwalten/editieren";
-$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r";
-$a->strings["F d"] = "d. F";
-$a->strings["[today]"] = "[heute]";
-$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen";
-$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:";
-$a->strings["[No description]"] = "[keine Beschreibung]";
-$a->strings["Event Reminders"] = "Veranstaltungserinnerungen";
-$a->strings["Events this week:"] = "Veranstaltungen diese Woche";
-$a->strings["Member since:"] = "Mitglied seit:";
-$a->strings["j F, Y"] = "j F, Y";
-$a->strings["j F"] = "j F";
-$a->strings["Age:"] = "Alter:";
-$a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s";
-$a->strings["Religion:"] = "Religion:";
-$a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:";
-$a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:";
-$a->strings["Musical interests:"] = "Musikalische Interessen:";
-$a->strings["Books, literature:"] = "Literatur/Bücher:";
-$a->strings["Television:"] = "Fernsehen:";
-$a->strings["Film/dance/culture/entertainment:"] = "Filme/Tänze/Kultur/Unterhaltung:";
-$a->strings["Love/Romance:"] = "Liebesleben:";
-$a->strings["Work/employment:"] = "Arbeit/Beschäftigung:";
-$a->strings["School/education:"] = "Schule/Ausbildung:";
-$a->strings["Forums:"] = "Foren:";
-$a->strings["Only You Can See This"] = "Nur Du kannst das sehen";
-$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
-$a->strings["Attachments:"] = "Anhänge:";
-$a->strings["%s is now following %s."] = "%s folgt nun %s";
-$a->strings["following"] = "folgen";
-$a->strings["%s stopped following %s."] = "%s hat aufgehört %s zu folgen";
-$a->strings["stopped following"] = "wird nicht mehr gefolgt";
-$a->strings["(no subject)"] = "(kein Betreff)";
-$a->strings["Logged out."] = "Abgemeldet.";
-$a->strings["Create a New Account"] = "Neues Konto erstellen";
-$a->strings["Password: "] = "Passwort: ";
-$a->strings["Remember me"] = "Anmeldedaten merken";
-$a->strings["Or login using OpenID: "] = "Oder melde Dich mit Deiner OpenID an: ";
-$a->strings["Forgot your password?"] = "Passwort vergessen?";
-$a->strings["Website Terms of Service"] = "Website Nutzungsbedingungen";
-$a->strings["terms of service"] = "Nutzungsbedingungen";
-$a->strings["Website Privacy Policy"] = "Website Datenschutzerklärung";
-$a->strings["privacy policy"] = "Datenschutzerklärung";
-$a->strings["At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node's user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication."] = "Zum Zwecke der Registrierung und um die Kommunikation zwischen dem Nutzer und seinen Kontakten zu gewährleisten, muß der Nutzer einen Namen (auch Pseudonym) und einen Nutzernamen (Spitzname) sowie eine funktionierende E-Mail-Adresse angeben. Der Name ist auf der Profilseite für alle Nutzer sichtbar, auch wenn die Profildetails nicht angezeigt werden.\nDie E-Mail-Adresse wird nur zur Benachrichtigung des Nutzers verwendet, sie wird nirgends angezeigt. Die Anzeige des Nutzerkontos im Server-Verzeichnis bzw. dem weltweiten Verzeichnis erfolgt gemäß den Einstellungen des Nutzers, sie ist zur Kommunikation nicht zwingend notwendig.";
-$a->strings["This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts."] = "Diese Daten sind für die Kommunikation notwendig und werden an die Knoten der Kommunikationspartner übermittelt. und werden dort gespeichert Nutzer können weitere private Angaben machen, die ebenfalls an die verwendeten Server der Kommunikationspartner übermittelt werden können.";
-$a->strings["At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/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."] = "Angemeldete Nutzer können ihre Nutzerdaten jederzeit von den <a href=\"%1\$s/settings/uexport\">Kontoeinstellungen</a> aus exportieren. Wenn ein Nutzer wünscht das Nutzerkonto zu löschen, so ist dies jederzeit unter <a href=\"%1\$s/removeme\">%1\$s/removeme</a> möglich. Die Löschung des Nutzerkontos ist permanent. Die Löschung der Daten wird auch von den Knoten der Kommunikationspartner angefordert.";
-$a->strings["Privacy Statement"] = "Datenschutzerklärung";
-$a->strings["This entry was edited"] = "Dieser Beitrag wurde bearbeitet.";
-$a->strings["Remove from your stream"] = "Aus deinem Netzwerkstrom entfernen";
-$a->strings["save to folder"] = "In Ordner speichern";
-$a->strings["I will attend"] = "Ich werde teilnehmen";
-$a->strings["I will not attend"] = "Ich werde nicht teilnehmen";
-$a->strings["I might attend"] = "Ich werde eventuell teilnehmen";
-$a->strings["add star"] = "markieren";
-$a->strings["remove star"] = "Markierung entfernen";
-$a->strings["toggle star status"] = "Markierung umschalten";
-$a->strings["starred"] = "markiert";
-$a->strings["ignore thread"] = "Thread ignorieren";
-$a->strings["unignore thread"] = "Thread nicht mehr ignorieren";
-$a->strings["toggle ignore status"] = "Ignoriert-Status ein-/ausschalten";
-$a->strings["add tag"] = "Tag hinzufügen";
-$a->strings["like"] = "mag ich";
-$a->strings["dislike"] = "mag ich nicht";
-$a->strings["Share this"] = "Weitersagen";
-$a->strings["share"] = "Teilen";
-$a->strings["to"] = "zu";
-$a->strings["via"] = "via";
-$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
-$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
-$a->strings["%d comment"] = [
-	0 => "%d Kommentar",
-	1 => "%d Kommentare",
-];
-$a->strings["Bold"] = "Fett";
-$a->strings["Italic"] = "Kursiv";
-$a->strings["Underline"] = "Unterstrichen";
-$a->strings["Quote"] = "Zitat";
-$a->strings["Code"] = "Code";
-$a->strings["Image"] = "Bild";
-$a->strings["Link"] = "Link";
-$a->strings["Video"] = "Video";
-$a->strings["Delete this item?"] = "Diesen Beitrag löschen?";
-$a->strings["show fewer"] = "weniger anzeigen";
-$a->strings["No system theme config value set."] = "Es wurde kein Konfigurationswert für das Systemweite Theme gesetzt.";
-$a->strings["toggle mobile"] = "auf/von Mobile Ansicht wechseln";
-$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Aktualisiere die author-id und owner-id in der Thread Tabelle";
-$a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen.";
+$a->strings["Export"] = "Exportieren";
+$a->strings["Export calendar as ical"] = "Kalender als ical exportieren";
+$a->strings["Export calendar as csv"] = "Kalender als csv exportieren";
+$a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
+$a->strings["Embedded content"] = "Eingebetteter Inhalt";
+$a->strings["view full size"] = "Volle Größe anzeigen";
+$a->strings["Image/photo"] = "Bild/Foto";
+$a->strings["$1 wrote:"] = "$1 hat geschrieben:";
+$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
+$a->strings["Invalid source protocol"] = "Ungültiges Quell-Protokoll";
+$a->strings["Invalid link protocol"] = "Ungültiges Link-Protokoll";
diff --git a/view/lang/en-us/messages.po b/view/lang/en-us/messages.po
index 9b0aa7171..4004363e8 100644
--- a/view/lang/en-us/messages.po
+++ b/view/lang/en-us/messages.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Andy H3 <andy@hubup.pro>, 2017-2018
+# R C <miqrogroove@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-20 14:22+0200\n"
-"PO-Revision-Date: 2018-05-21 12:05+0000\n"
-"Last-Translator: Andy H3 <andy@hubup.pro>\n"
+"POT-Creation-Date: 2018-06-02 08:49+0200\n"
+"PO-Revision-Date: 2018-06-13 04:09+0000\n"
+"Last-Translator: R C <miqrogroove@gmail.com>\n"
 "Language-Team: English (United States) (http://www.transifex.com/Friendica/friendica/language/en_US/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -268,7 +269,7 @@ msgid ""
 "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' has chosen to accept you as 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' has chosen to accept you as 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."
 
 #: include/enotify.php:348
 #, php-format
@@ -282,7 +283,7 @@ msgstr "'%1$s' may choose to extend this into a two-way or more permissive relat
 msgid "Please visit %s  if you wish to make any changes to this relationship."
 msgstr "Please visit %s  if you wish to make any changes to this relationship."
 
-#: include/enotify.php:360 mod/removeme.php:44
+#: include/enotify.php:360 mod/removeme.php:45
 msgid "[Friendica System Notify]"
 msgstr "[Friendica System Notify]"
 
@@ -310,6 +311,537 @@ msgstr "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
 msgid "Please visit %s to approve or reject the request."
 msgstr "Please visit %s to approve or reject the request."
 
+#: 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] "Daily posting limit of %d post reached. The post was rejected."
+msgstr[1] "Daily posting limit of %d posts reached. This post was rejected."
+
+#: 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] "Weekly posting limit of %d post reached. The post was rejected."
+msgstr[1] "Weekly posting limit of %d posts reached. This post was rejected."
+
+#: include/api.php:1250
+#, php-format
+msgid "Monthly posting limit of %d post reached. The post was rejected."
+msgstr "Monthly posting limit of %d posts reached. This post was rejected."
+
+#: 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 "Profile photos"
+
+#: include/conversation.php:144 include/conversation.php:279
+#: include/text.php:1749 src/Model/Item.php:2002
+msgid "event"
+msgstr "event"
+
+#: 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 "status"
+
+#: 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 "photo"
+
+#: 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 likes %2$s'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 doesn't like %2$s's %3$s"
+
+#: include/conversation.php:168
+#, php-format
+msgid "%1$s attends %2$s's %3$s"
+msgstr "%1$s goes to %2$s's %3$s"
+
+#: include/conversation.php:170
+#, php-format
+msgid "%1$s doesn't attend %2$s's %3$s"
+msgstr "%1$s won’t attend %2$s's %3$s"
+
+#: include/conversation.php:172
+#, php-format
+msgid "%1$s attends maybe %2$s's %3$s"
+msgstr "%1$s might go to %2$s's %3$s"
+
+#: include/conversation.php:206
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr "%1$s is now friends with %2$s"
+
+#: include/conversation.php:247
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s poked %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 tagged %2$s's %3$s with %4$s"
+
+#: include/conversation.php:328
+msgid "post/item"
+msgstr "Post/Item"
+
+#: include/conversation.php:329
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr "%1$s marked %2$s's %3$s as favorite"
+
+#: include/conversation.php:609 mod/photos.php:1495 mod/profiles.php:355
+msgid "Likes"
+msgstr "Likes"
+
+#: include/conversation.php:609 mod/photos.php:1495 mod/profiles.php:359
+msgid "Dislikes"
+msgstr "Dislikes"
+
+#: include/conversation.php:610 include/conversation.php:1638
+#: mod/photos.php:1496
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "Attending"
+msgstr[1] "Attending"
+
+#: include/conversation.php:610 mod/photos.php:1496
+msgid "Not attending"
+msgstr "Not attending"
+
+#: include/conversation.php:610 mod/photos.php:1496
+msgid "Might attend"
+msgstr "Might attend"
+
+#: include/conversation.php:722 mod/photos.php:1563 src/Object/Post.php:192
+msgid "Select"
+msgstr "Select"
+
+#: 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 "Delete"
+
+#: include/conversation.php:761 src/Object/Post.php:371
+#: src/Object/Post.php:372
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "View %s's profile @ %s"
+
+#: include/conversation.php:773 src/Object/Post.php:359
+msgid "Categories:"
+msgstr "Categories:"
+
+#: include/conversation.php:774 src/Object/Post.php:360
+msgid "Filed under:"
+msgstr "Filed under:"
+
+#: include/conversation.php:781 src/Object/Post.php:385
+#, php-format
+msgid "%s from %s"
+msgstr "%s from %s"
+
+#: include/conversation.php:796
+msgid "View in context"
+msgstr "View in context"
+
+#: 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 "Please wait"
+
+#: include/conversation.php:869
+msgid "remove"
+msgstr "Remove"
+
+#: include/conversation.php:873
+msgid "Delete Selected Items"
+msgstr "Delete selected items"
+
+#: include/conversation.php:1018 view/theme/frio/theme.php:352
+msgid "Follow Thread"
+msgstr "Follow thread"
+
+#: include/conversation.php:1019 src/Model/Contact.php:662
+msgid "View Status"
+msgstr "View status"
+
+#: 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 "View profile"
+
+#: include/conversation.php:1021 src/Model/Contact.php:664
+msgid "View Photos"
+msgstr "View photos"
+
+#: include/conversation.php:1022 src/Model/Contact.php:665
+msgid "Network Posts"
+msgstr "Network posts"
+
+#: include/conversation.php:1023 src/Model/Contact.php:666
+msgid "View Contact"
+msgstr "View contact"
+
+#: include/conversation.php:1024 src/Model/Contact.php:668
+msgid "Send PM"
+msgstr "Send PM"
+
+#: include/conversation.php:1028 src/Model/Contact.php:669
+msgid "Poke"
+msgstr "Poke"
+
+#: 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 "Connect/Follow"
+
+#: include/conversation.php:1152
+#, php-format
+msgid "%s likes this."
+msgstr "%s likes this."
+
+#: include/conversation.php:1155
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s doesn't like this."
+
+#: include/conversation.php:1158
+#, php-format
+msgid "%s attends."
+msgstr "%s attends."
+
+#: include/conversation.php:1161
+#, php-format
+msgid "%s doesn't attend."
+msgstr "%s won't attend."
+
+#: include/conversation.php:1164
+#, php-format
+msgid "%s attends maybe."
+msgstr "%s might attend."
+
+#: include/conversation.php:1175
+msgid "and"
+msgstr "and"
+
+#: include/conversation.php:1181
+#, php-format
+msgid "and %d other people"
+msgstr "and %d other people"
+
+#: include/conversation.php:1190
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
+msgstr "<span  %1$s>%2$d people</span> like this"
+
+#: include/conversation.php:1191
+#, php-format
+msgid "%s like this."
+msgstr "%s like this."
+
+#: include/conversation.php:1194
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
+msgstr "<span  %1$s>%2$d people</span> don't like this"
+
+#: include/conversation.php:1195
+#, php-format
+msgid "%s don't like this."
+msgstr "%s don't like this."
+
+#: include/conversation.php:1198
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend"
+msgstr "<span  %1$s>%2$d people</span> attend"
+
+#: include/conversation.php:1199
+#, php-format
+msgid "%s attend."
+msgstr "%s attend."
+
+#: include/conversation.php:1202
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't attend"
+msgstr "<span  %1$s>%2$d people</span> won't attend"
+
+#: include/conversation.php:1203
+#, php-format
+msgid "%s don't attend."
+msgstr "%s won't attend."
+
+#: include/conversation.php:1206
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend maybe"
+msgstr "<span  %1$s>%2$d people</span> might attend"
+
+#: include/conversation.php:1207
+#, php-format
+msgid "%s attend maybe."
+msgstr "%s may be attending."
+
+#: include/conversation.php:1237 include/conversation.php:1253
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Visible to <strong>everybody</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 "Please enter a link URL:"
+
+#: include/conversation.php:1239 include/conversation.php:1255
+msgid "Please enter a video link/URL:"
+msgstr "Please enter a video link/URL:"
+
+#: include/conversation.php:1240 include/conversation.php:1256
+msgid "Please enter an audio link/URL:"
+msgstr "Please enter an audio link/URL:"
+
+#: include/conversation.php:1241 include/conversation.php:1257
+msgid "Tag term:"
+msgstr "Tag term:"
+
+#: include/conversation.php:1242 include/conversation.php:1258
+#: mod/filer.php:34
+msgid "Save to Folder:"
+msgstr "Save to folder:"
+
+#: include/conversation.php:1243 include/conversation.php:1259
+msgid "Where are you right now?"
+msgstr "Where are you right now?"
+
+#: include/conversation.php:1244
+msgid "Delete item(s)?"
+msgstr "Delete item(s)?"
+
+#: include/conversation.php:1291
+msgid "New Post"
+msgstr "New post"
+
+#: include/conversation.php:1294
+msgid "Share"
+msgstr "Share"
+
+#: include/conversation.php:1295 mod/wallmessage.php:143 mod/editpost.php:111
+#: mod/message.php:243 mod/message.php:411
+msgid "Upload photo"
+msgstr "Upload photo"
+
+#: include/conversation.php:1296 mod/editpost.php:112
+msgid "upload photo"
+msgstr "upload photo"
+
+#: include/conversation.php:1297 mod/editpost.php:113
+msgid "Attach file"
+msgstr "Attach file"
+
+#: include/conversation.php:1298 mod/editpost.php:114
+msgid "attach file"
+msgstr "attach file"
+
+#: 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 "Insert web link"
+
+#: include/conversation.php:1300 mod/editpost.php:116
+msgid "web link"
+msgstr "web link"
+
+#: include/conversation.php:1301 mod/editpost.php:117
+msgid "Insert video link"
+msgstr "Insert video link"
+
+#: include/conversation.php:1302 mod/editpost.php:118
+msgid "video link"
+msgstr "video link"
+
+#: include/conversation.php:1303 mod/editpost.php:119
+msgid "Insert audio link"
+msgstr "Insert audio link"
+
+#: include/conversation.php:1304 mod/editpost.php:120
+msgid "audio link"
+msgstr "audio link"
+
+#: include/conversation.php:1305 mod/editpost.php:121
+msgid "Set your location"
+msgstr "Set your location"
+
+#: include/conversation.php:1306 mod/editpost.php:122
+msgid "set location"
+msgstr "set location"
+
+#: include/conversation.php:1307 mod/editpost.php:123
+msgid "Clear browser location"
+msgstr "Clear browser location"
+
+#: include/conversation.php:1308 mod/editpost.php:124
+msgid "clear location"
+msgstr "clear location"
+
+#: include/conversation.php:1310 mod/editpost.php:138
+msgid "Set title"
+msgstr "Set title"
+
+#: include/conversation.php:1312 mod/editpost.php:140
+msgid "Categories (comma-separated list)"
+msgstr "Categories (comma-separated list)"
+
+#: include/conversation.php:1314 mod/editpost.php:126
+msgid "Permission settings"
+msgstr "Permission settings"
+
+#: include/conversation.php:1315 mod/editpost.php:155
+msgid "permissions"
+msgstr "permissions"
+
+#: include/conversation.php:1323 mod/editpost.php:135
+msgid "Public post"
+msgstr "Public post"
+
+#: 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 "Preview"
+
+#: 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 "Cancel"
+
+#: include/conversation.php:1336
+msgid "Post to Groups"
+msgstr "Post to groups"
+
+#: include/conversation.php:1337
+msgid "Post to Contacts"
+msgstr "Post to contacts"
+
+#: include/conversation.php:1338
+msgid "Private post"
+msgstr "Private post"
+
+#: include/conversation.php:1343 mod/editpost.php:153
+#: src/Model/Profile.php:338
+msgid "Message"
+msgstr "Message"
+
+#: include/conversation.php:1344 mod/editpost.php:154
+msgid "Browser"
+msgstr "Browser"
+
+#: include/conversation.php:1609
+msgid "View all"
+msgstr "View all"
+
+#: include/conversation.php:1632
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Like"
+msgstr[1] "Likes"
+
+#: include/conversation.php:1635
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "Dislike"
+msgstr[1] "Dislikes"
+
+#: include/conversation.php:1641
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "Not attending"
+msgstr[1] "Not attending"
+
+#: include/conversation.php:1644 src/Content/ContactSelector.php:125
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] "Undecided"
+msgstr[1] "Undecided"
+
+#: 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 "Item not found."
+
+#: include/items.php:383
+msgid "Do you really want to delete this item?"
+msgstr "Do you really want to delete this item?"
+
+#: 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 "Yes"
+
+#: 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 "Permission denied."
+
+#: include/items.php:472 src/Content/Feature.php:96
+msgid "Archives"
+msgstr "Archives"
+
+#: 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 "Show more..."
+
 #: include/security.php:81
 msgid "Welcome "
 msgstr "Welcome "
@@ -322,851 +854,315 @@ msgstr "Please upload a profile photo."
 msgid "Welcome back "
 msgstr "Welcome back "
 
-#: include/security.php:440
+#: 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 "The form security token was incorrect. This probably happened because the form has not been submitted within 3 hours."
 
-#: include/dba.php:59
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "Cannot locate DNS info for database server '%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] "Daily posting limit of %d post are reached. The post was rejected."
-msgstr[1] "Daily posting limit of %d posts are reached. This post was rejected."
-
-#: 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] "Weekly posting limit of %d post are reached. The post was rejected."
-msgstr[1] "Weekly posting limit of %d posts are reached. This post was rejected."
-
-#: include/api.php:1250
-#, php-format
-msgid "Monthly posting limit of %d post reached. The post was rejected."
-msgstr "Monthly posting limit of %d posts are reached. This post was rejected."
-
-#: include/api.php:4522 mod/photos.php:88 mod/photos.php:194
-#: mod/photos.php:722 mod/photos.php:1149 mod/photos.php:1166
-#: mod/photos.php:1684 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 src/Model/User.php:553
-#: src/Model/User.php:561 src/Model/User.php:569
-msgid "Profile Photos"
-msgstr "Profile photos"
-
-#: include/conversation.php:144 include/conversation.php:282
-#: include/text.php:1749 src/Model/Item.php:1970
-msgid "event"
-msgstr "event"
-
-#: include/conversation.php:147 include/conversation.php:157
-#: include/conversation.php:285 include/conversation.php:294
-#: mod/subthread.php:97 mod/tagger.php:72 src/Model/Item.php:1968
-#: src/Protocol/Diaspora.php:1957
-msgid "status"
-msgstr "status"
-
-#: include/conversation.php:152 include/conversation.php:290
-#: include/text.php:1751 mod/subthread.php:97 mod/tagger.php:72
-#: src/Model/Item.php:1968
-msgid "photo"
-msgstr "photo"
-
-#: include/conversation.php:164 src/Model/Item.php:1841
-#: src/Protocol/Diaspora.php:1953
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s likes %2$s's %3$s"
-
-#: include/conversation.php:167 src/Model/Item.php:1846
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "%1$s doesn't like %2$s's %3$s"
-
-#: include/conversation.php:170
-#, php-format
-msgid "%1$s attends %2$s's %3$s"
-msgstr "%1$s goes to %2$s's %3$s"
-
-#: include/conversation.php:173
-#, php-format
-msgid "%1$s doesn't attend %2$s's %3$s"
-msgstr "%1$s doesn't go %2$s's %3$s"
-
-#: include/conversation.php:176
-#, php-format
-msgid "%1$s attends maybe %2$s's %3$s"
-msgstr "%1$s might go to %2$s's %3$s"
-
-#: include/conversation.php:209
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr "%1$s is now friends with %2$s"
-
-#: include/conversation.php:250
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s poked %2$s"
-
-#: include/conversation.php:304 mod/tagger.php:110
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s tagged %2$s's %3$s with %4$s"
-
-#: include/conversation.php:331
-msgid "post/item"
-msgstr "Post/Item"
-
-#: include/conversation.php:332
-#, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
-msgstr "%1$s marked %2$s's %3$s as favorite"
-
-#: include/conversation.php:608 mod/photos.php:1501 mod/profiles.php:355
-msgid "Likes"
-msgstr "Likes"
-
-#: include/conversation.php:608 mod/photos.php:1501 mod/profiles.php:359
-msgid "Dislikes"
-msgstr "Dislikes"
-
-#: include/conversation.php:609 include/conversation.php:1639
-#: mod/photos.php:1502
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "Attending"
-msgstr[1] "Attending"
-
-#: include/conversation.php:609 mod/photos.php:1502
-msgid "Not attending"
-msgstr "Not attending"
-
-#: include/conversation.php:609 mod/photos.php:1502
-msgid "Might attend"
-msgstr "Might attend"
-
-#: include/conversation.php:721 mod/photos.php:1569 src/Object/Post.php:192
-msgid "Select"
-msgstr "Select"
-
-#: include/conversation.php:722 mod/photos.php:1570 mod/contacts.php:830
-#: mod/contacts.php:1035 mod/admin.php:1827 mod/settings.php:730
-#: src/Object/Post.php:187
-msgid "Delete"
-msgstr "Delete"
-
-#: include/conversation.php:760 src/Object/Post.php:371
-#: src/Object/Post.php:372
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "View %s's profile @ %s"
-
-#: include/conversation.php:772 src/Object/Post.php:359
-msgid "Categories:"
-msgstr "Categories:"
-
-#: include/conversation.php:773 src/Object/Post.php:360
-msgid "Filed under:"
-msgstr "Filed under:"
-
-#: include/conversation.php:780 src/Object/Post.php:385
-#, php-format
-msgid "%s from %s"
-msgstr "%s from %s"
-
-#: include/conversation.php:795
-msgid "View in context"
-msgstr "View in context"
-
-#: include/conversation.php:797 include/conversation.php:1312
-#: mod/wallmessage.php:145 mod/editpost.php:125 mod/photos.php:1473
-#: mod/message.php:245 mod/message.php:414 src/Object/Post.php:410
-msgid "Please wait"
-msgstr "Please wait"
-
-#: include/conversation.php:868
-msgid "remove"
-msgstr "Remove"
-
-#: include/conversation.php:872
-msgid "Delete Selected Items"
-msgstr "Delete selected items"
-
-#: include/conversation.php:1017 view/theme/frio/theme.php:352
-msgid "Follow Thread"
-msgstr "Follow thread"
-
-#: include/conversation.php:1018 src/Model/Contact.php:662
-msgid "View Status"
-msgstr "View status"
-
-#: include/conversation.php:1019 include/conversation.php:1035
-#: 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 "View profile"
-
-#: include/conversation.php:1020 src/Model/Contact.php:664
-msgid "View Photos"
-msgstr "View photos"
-
-#: include/conversation.php:1021 src/Model/Contact.php:665
-msgid "Network Posts"
-msgstr "Network posts"
-
-#: include/conversation.php:1022 src/Model/Contact.php:666
-msgid "View Contact"
-msgstr "View contact"
-
-#: include/conversation.php:1023 src/Model/Contact.php:668
-msgid "Send PM"
-msgstr "Send PM"
-
-#: include/conversation.php:1027 src/Model/Contact.php:669
-msgid "Poke"
-msgstr "Poke"
-
-#: include/conversation.php:1032 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 "Connect/Follow"
-
-#: include/conversation.php:1151
-#, php-format
-msgid "%s likes this."
-msgstr "%s likes this."
-
-#: include/conversation.php:1154
-#, php-format
-msgid "%s doesn't like this."
-msgstr "%s doesn't like this."
-
-#: include/conversation.php:1157
-#, php-format
-msgid "%s attends."
-msgstr "%s attends."
-
-#: include/conversation.php:1160
-#, php-format
-msgid "%s doesn't attend."
-msgstr "%s doesn't attend."
-
-#: include/conversation.php:1163
-#, php-format
-msgid "%s attends maybe."
-msgstr "%s may attend."
-
-#: include/conversation.php:1174
-msgid "and"
-msgstr "and"
-
-#: include/conversation.php:1180
-#, php-format
-msgid "and %d other people"
-msgstr "and %d other people"
-
-#: include/conversation.php:1189
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this"
-msgstr "<span  %1$s>%2$d people</span> like this"
-
-#: include/conversation.php:1190
-#, php-format
-msgid "%s like this."
-msgstr "%s like this."
-
-#: include/conversation.php:1193
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this"
-msgstr "<span  %1$s>%2$d people</span> don't like this"
-
-#: include/conversation.php:1194
-#, php-format
-msgid "%s don't like this."
-msgstr "%s don't like this."
-
-#: include/conversation.php:1197
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend"
-msgstr "<span  %1$s>%2$d people</span> attend"
-
-#: include/conversation.php:1198
-#, php-format
-msgid "%s attend."
-msgstr "%s attend."
-
-#: include/conversation.php:1201
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't attend"
-msgstr "<span  %1$s>%2$d people</span> don't attend"
-
-#: include/conversation.php:1202
-#, php-format
-msgid "%s don't attend."
-msgstr "%s don't attend."
-
-#: include/conversation.php:1205
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend maybe"
-msgstr "<span  %1$s>%2$d people</span> attend maybe"
-
-#: include/conversation.php:1206
-#, php-format
-msgid "%s attend maybe."
-msgstr "%s may be attending."
-
-#: include/conversation.php:1236 include/conversation.php:1252
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Visible to <strong>everybody</strong>"
-
-#: include/conversation.php:1237 include/conversation.php:1253
-#: 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 "Please enter a link URL:"
-
-#: include/conversation.php:1238 include/conversation.php:1254
-msgid "Please enter a video link/URL:"
-msgstr "Please enter a video link/URL:"
-
-#: include/conversation.php:1239 include/conversation.php:1255
-msgid "Please enter an audio link/URL:"
-msgstr "Please enter an audio link/URL:"
-
-#: include/conversation.php:1240 include/conversation.php:1256
-msgid "Tag term:"
-msgstr "Tag term:"
-
-#: include/conversation.php:1241 include/conversation.php:1257
-#: mod/filer.php:34
-msgid "Save to Folder:"
-msgstr "Save to folder:"
-
-#: include/conversation.php:1242 include/conversation.php:1258
-msgid "Where are you right now?"
-msgstr "Where are you right now?"
-
-#: include/conversation.php:1243
-msgid "Delete item(s)?"
-msgstr "Delete item(s)?"
-
-#: include/conversation.php:1290
-msgid "New Post"
-msgstr "New post"
-
-#: include/conversation.php:1293
-msgid "Share"
-msgstr "Share"
-
-#: include/conversation.php:1294 mod/wallmessage.php:143 mod/editpost.php:111
-#: mod/message.php:243 mod/message.php:411
-msgid "Upload photo"
-msgstr "Upload photo"
-
-#: include/conversation.php:1295 mod/editpost.php:112
-msgid "upload photo"
-msgstr "upload photo"
-
-#: include/conversation.php:1296 mod/editpost.php:113
-msgid "Attach file"
-msgstr "Attach file"
-
-#: include/conversation.php:1297 mod/editpost.php:114
-msgid "attach file"
-msgstr "attach file"
-
-#: include/conversation.php:1298 mod/wallmessage.php:144 mod/editpost.php:115
-#: mod/message.php:244 mod/message.php:412
-msgid "Insert web link"
-msgstr "Insert web link"
-
-#: include/conversation.php:1299 mod/editpost.php:116
-msgid "web link"
-msgstr "web link"
-
-#: include/conversation.php:1300 mod/editpost.php:117
-msgid "Insert video link"
-msgstr "Insert video link"
-
-#: include/conversation.php:1301 mod/editpost.php:118
-msgid "video link"
-msgstr "video link"
-
-#: include/conversation.php:1302 mod/editpost.php:119
-msgid "Insert audio link"
-msgstr "Insert audio link"
-
-#: include/conversation.php:1303 mod/editpost.php:120
-msgid "audio link"
-msgstr "audio link"
-
-#: include/conversation.php:1304 mod/editpost.php:121
-msgid "Set your location"
-msgstr "Set your location"
-
-#: include/conversation.php:1305 mod/editpost.php:122
-msgid "set location"
-msgstr "set location"
-
-#: include/conversation.php:1306 mod/editpost.php:123
-msgid "Clear browser location"
-msgstr "Clear browser location"
-
-#: include/conversation.php:1307 mod/editpost.php:124
-msgid "clear location"
-msgstr "clear location"
-
-#: include/conversation.php:1309 mod/editpost.php:138
-msgid "Set title"
-msgstr "Set title"
-
-#: include/conversation.php:1311 mod/editpost.php:140
-msgid "Categories (comma-separated list)"
-msgstr "Categories (comma-separated list)"
-
-#: include/conversation.php:1313 mod/editpost.php:126
-msgid "Permission settings"
-msgstr "Permission settings"
-
-#: include/conversation.php:1314 mod/editpost.php:155
-msgid "permissions"
-msgstr "permissions"
-
-#: include/conversation.php:1322 mod/editpost.php:135
-msgid "Public post"
-msgstr "Public post"
-
-#: include/conversation.php:1326 mod/editpost.php:146 mod/photos.php:1492
-#: mod/photos.php:1531 mod/photos.php:1604 mod/events.php:528
-#: src/Object/Post.php:813
-msgid "Preview"
-msgstr "Preview"
-
-#: include/conversation.php:1330 include/items.php:387 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/photos.php:248 mod/photos.php:324
-#: mod/videos.php:147 mod/contacts.php:475 mod/unfollow.php:117
-#: mod/follow.php:161 mod/message.php:141 mod/dfrn_request.php:658
-#: mod/settings.php:670 mod/settings.php:696
-msgid "Cancel"
-msgstr "Cancel"
-
-#: include/conversation.php:1335
-msgid "Post to Groups"
-msgstr "Post to groups"
-
-#: include/conversation.php:1336
-msgid "Post to Contacts"
-msgstr "Post to contacts"
-
-#: include/conversation.php:1337
-msgid "Private post"
-msgstr "Private post"
-
-#: include/conversation.php:1342 mod/editpost.php:153
-#: src/Model/Profile.php:338
-msgid "Message"
-msgstr "Message"
-
-#: include/conversation.php:1343 mod/editpost.php:154
-msgid "Browser"
-msgstr "Browser"
-
-#: include/conversation.php:1610
-msgid "View all"
-msgstr "View all"
-
-#: include/conversation.php:1633
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Like"
-msgstr[1] "Likes"
-
-#: include/conversation.php:1636
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "Dislike"
-msgstr[1] "Dislikes"
-
-#: include/conversation.php:1642
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "Not attending"
-msgstr[1] "Not attending"
-
-#: include/conversation.php:1645 src/Content/ContactSelector.php:125
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] "Undecided"
-msgstr[1] "Undecided"
-
-#: include/items.php:342 mod/notice.php:22 mod/viewsrc.php:21
-#: mod/admin.php:277 mod/admin.php:1883 mod/admin.php:2131 mod/display.php:72
-#: mod/display.php:255 mod/display.php:356
-msgid "Item not found."
-msgstr "Item not found."
-
-#: include/items.php:382
-msgid "Do you really want to delete this item?"
-msgstr "Do you really want to delete this item?"
-
-#: include/items.php:384 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 "Yes"
-
-#: include/items.php:401 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/notes.php:30 mod/photos.php:174
-#: mod/photos.php:1051 mod/cal.php:304 mod/contacts.php:386
-#: mod/delegate.php:25 mod/delegate.php:43 mod/delegate.php:54
-#: mod/events.php:194 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/network.php:32
-#: mod/crepair.php:98 mod/message.php:59 mod/message.php:104 mod/group.php:26
-#: mod/dfrn_confirm.php:68 mod/item.php:160 mod/notifications.php:73
-#: 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 "Permission denied."
-
-#: include/items.php:471 src/Content/Feature.php:96
-msgid "Archives"
-msgstr "Archives"
-
-#: include/items.php:477 view/theme/vier/theme.php:258
-#: src/Content/ForumManager.php:130 src/Content/Widget.php:317
-#: src/Object/Post.php:438 src/App.php:525
-msgid "show more"
-msgstr "Show more..."
-
-#: include/text.php:303
+#: include/text.php:302
 msgid "newer"
 msgstr "Later posts"
 
-#: include/text.php:304
+#: include/text.php:303
 msgid "older"
 msgstr "Earlier posts"
 
-#: include/text.php:309
+#: include/text.php:308
 msgid "first"
 msgstr "first"
 
-#: include/text.php:310
+#: include/text.php:309
 msgid "prev"
 msgstr "prev"
 
-#: include/text.php:344
+#: include/text.php:343
 msgid "next"
 msgstr "next"
 
-#: include/text.php:345
+#: include/text.php:344
 msgid "last"
 msgstr "last"
 
-#: include/text.php:399
+#: include/text.php:398
 msgid "Loading more entries..."
 msgstr "Loading more entries..."
 
-#: include/text.php:400
+#: include/text.php:399
 msgid "The end"
 msgstr "The end"
 
-#: include/text.php:885
+#: include/text.php:884
 msgid "No contacts"
 msgstr "No contacts"
 
-#: include/text.php:909
+#: include/text.php:908
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d contact"
 msgstr[1] "%d contacts"
 
-#: include/text.php:922
+#: include/text.php:921
 msgid "View Contacts"
 msgstr "View contacts"
 
-#: include/text.php:1011 mod/filer.php:35 mod/editpost.php:110
+#: include/text.php:1010 mod/filer.php:35 mod/editpost.php:110
 #: mod/notes.php:67
 msgid "Save"
 msgstr "Save"
 
-#: include/text.php:1011
+#: include/text.php:1010
 msgid "Follow"
 msgstr "Follow"
 
-#: include/text.php:1017 mod/search.php:155 src/Content/Nav.php:142
+#: include/text.php:1016 mod/search.php:155 src/Content/Nav.php:142
 msgid "Search"
 msgstr "Search"
 
-#: include/text.php:1020 src/Content/Nav.php:58
+#: include/text.php:1019 src/Content/Nav.php:58
 msgid "@name, !forum, #tags, content"
 msgstr "@name, !forum, #tags, content"
 
-#: include/text.php:1026 src/Content/Nav.php:145
+#: include/text.php:1025 src/Content/Nav.php:145
 msgid "Full Text"
 msgstr "Full text"
 
-#: include/text.php:1027 src/Content/Widget/TagCloud.php:54
+#: include/text.php:1026 src/Content/Widget/TagCloud.php:54
 #: src/Content/Nav.php:146
 msgid "Tags"
 msgstr "Tags"
 
-#: include/text.php:1028 mod/viewcontacts.php:131 mod/contacts.php:814
+#: 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 "Contacts"
 
-#: include/text.php:1031 view/theme/vier/theme.php:253
+#: include/text.php:1030 view/theme/vier/theme.php:253
 #: src/Content/ForumManager.php:125 src/Content/Nav.php:151
 msgid "Forums"
 msgstr "Forums"
 
-#: include/text.php:1075
+#: include/text.php:1074
 msgid "poke"
 msgstr "poke"
 
-#: include/text.php:1075
+#: include/text.php:1074
 msgid "poked"
 msgstr "poked"
 
-#: include/text.php:1076
+#: include/text.php:1075
 msgid "ping"
 msgstr "ping"
 
-#: include/text.php:1076
+#: include/text.php:1075
 msgid "pinged"
 msgstr "pinged"
 
-#: include/text.php:1077
+#: include/text.php:1076
 msgid "prod"
 msgstr "prod"
 
-#: include/text.php:1077
+#: include/text.php:1076
 msgid "prodded"
 msgstr "prodded"
 
-#: include/text.php:1078
+#: include/text.php:1077
 msgid "slap"
 msgstr "slap"
 
-#: include/text.php:1078
+#: include/text.php:1077
 msgid "slapped"
 msgstr "slapped"
 
-#: include/text.php:1079
+#: include/text.php:1078
 msgid "finger"
 msgstr "finger"
 
-#: include/text.php:1079
+#: include/text.php:1078
 msgid "fingered"
 msgstr "fingered"
 
-#: include/text.php:1080
+#: include/text.php:1079
 msgid "rebuff"
 msgstr "rebuff"
 
-#: include/text.php:1080
+#: include/text.php:1079
 msgid "rebuffed"
 msgstr "rebuffed"
 
-#: include/text.php:1094 mod/settings.php:935 src/Model/Event.php:379
+#: include/text.php:1093 mod/settings.php:935 src/Model/Event.php:379
 msgid "Monday"
 msgstr "Monday"
 
-#: include/text.php:1094 src/Model/Event.php:380
+#: include/text.php:1093 src/Model/Event.php:380
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: include/text.php:1094 src/Model/Event.php:381
+#: include/text.php:1093 src/Model/Event.php:381
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: include/text.php:1094 src/Model/Event.php:382
+#: include/text.php:1093 src/Model/Event.php:382
 msgid "Thursday"
 msgstr "Thursday"
 
-#: include/text.php:1094 src/Model/Event.php:383
+#: include/text.php:1093 src/Model/Event.php:383
 msgid "Friday"
 msgstr "Friday"
 
-#: include/text.php:1094 src/Model/Event.php:384
+#: include/text.php:1093 src/Model/Event.php:384
 msgid "Saturday"
 msgstr "Saturday"
 
-#: include/text.php:1094 mod/settings.php:935 src/Model/Event.php:378
+#: include/text.php:1093 mod/settings.php:935 src/Model/Event.php:378
 msgid "Sunday"
 msgstr "Sunday"
 
-#: include/text.php:1098 src/Model/Event.php:399
+#: include/text.php:1097 src/Model/Event.php:399
 msgid "January"
 msgstr "January"
 
-#: include/text.php:1098 src/Model/Event.php:400
+#: include/text.php:1097 src/Model/Event.php:400
 msgid "February"
 msgstr "February"
 
-#: include/text.php:1098 src/Model/Event.php:401
+#: include/text.php:1097 src/Model/Event.php:401
 msgid "March"
 msgstr "March"
 
-#: include/text.php:1098 src/Model/Event.php:402
+#: include/text.php:1097 src/Model/Event.php:402
 msgid "April"
 msgstr "April"
 
-#: include/text.php:1098 include/text.php:1115 src/Model/Event.php:390
+#: include/text.php:1097 include/text.php:1114 src/Model/Event.php:390
 #: src/Model/Event.php:403
 msgid "May"
 msgstr "May"
 
-#: include/text.php:1098 src/Model/Event.php:404
+#: include/text.php:1097 src/Model/Event.php:404
 msgid "June"
 msgstr "June"
 
-#: include/text.php:1098 src/Model/Event.php:405
+#: include/text.php:1097 src/Model/Event.php:405
 msgid "July"
 msgstr "July"
 
-#: include/text.php:1098 src/Model/Event.php:406
+#: include/text.php:1097 src/Model/Event.php:406
 msgid "August"
 msgstr "August"
 
-#: include/text.php:1098 src/Model/Event.php:407
+#: include/text.php:1097 src/Model/Event.php:407
 msgid "September"
 msgstr "September"
 
-#: include/text.php:1098 src/Model/Event.php:408
+#: include/text.php:1097 src/Model/Event.php:408
 msgid "October"
 msgstr "October"
 
-#: include/text.php:1098 src/Model/Event.php:409
+#: include/text.php:1097 src/Model/Event.php:409
 msgid "November"
 msgstr "November"
 
-#: include/text.php:1098 src/Model/Event.php:410
+#: include/text.php:1097 src/Model/Event.php:410
 msgid "December"
 msgstr "December"
 
-#: include/text.php:1112 src/Model/Event.php:371
+#: include/text.php:1111 src/Model/Event.php:371
 msgid "Mon"
 msgstr "Mon"
 
-#: include/text.php:1112 src/Model/Event.php:372
+#: include/text.php:1111 src/Model/Event.php:372
 msgid "Tue"
 msgstr "Tue"
 
-#: include/text.php:1112 src/Model/Event.php:373
+#: include/text.php:1111 src/Model/Event.php:373
 msgid "Wed"
 msgstr "Wed"
 
-#: include/text.php:1112 src/Model/Event.php:374
+#: include/text.php:1111 src/Model/Event.php:374
 msgid "Thu"
 msgstr "Thu"
 
-#: include/text.php:1112 src/Model/Event.php:375
+#: include/text.php:1111 src/Model/Event.php:375
 msgid "Fri"
 msgstr "Fri"
 
-#: include/text.php:1112 src/Model/Event.php:376
+#: include/text.php:1111 src/Model/Event.php:376
 msgid "Sat"
 msgstr "Sat"
 
-#: include/text.php:1112 src/Model/Event.php:370
+#: include/text.php:1111 src/Model/Event.php:370
 msgid "Sun"
 msgstr "Sun"
 
-#: include/text.php:1115 src/Model/Event.php:386
+#: include/text.php:1114 src/Model/Event.php:386
 msgid "Jan"
 msgstr "Jan"
 
-#: include/text.php:1115 src/Model/Event.php:387
+#: include/text.php:1114 src/Model/Event.php:387
 msgid "Feb"
 msgstr "Feb"
 
-#: include/text.php:1115 src/Model/Event.php:388
+#: include/text.php:1114 src/Model/Event.php:388
 msgid "Mar"
 msgstr "Mar"
 
-#: include/text.php:1115 src/Model/Event.php:389
+#: include/text.php:1114 src/Model/Event.php:389
 msgid "Apr"
 msgstr "Apr"
 
-#: include/text.php:1115 src/Model/Event.php:392
+#: include/text.php:1114 src/Model/Event.php:392
 msgid "Jul"
 msgstr "Jul"
 
-#: include/text.php:1115 src/Model/Event.php:393
+#: include/text.php:1114 src/Model/Event.php:393
 msgid "Aug"
 msgstr "Aug"
 
-#: include/text.php:1115
+#: include/text.php:1114
 msgid "Sep"
 msgstr "Sep"
 
-#: include/text.php:1115 src/Model/Event.php:395
+#: include/text.php:1114 src/Model/Event.php:395
 msgid "Oct"
 msgstr "Oct"
 
-#: include/text.php:1115 src/Model/Event.php:396
+#: include/text.php:1114 src/Model/Event.php:396
 msgid "Nov"
 msgstr "Nov"
 
-#: include/text.php:1115 src/Model/Event.php:397
+#: include/text.php:1114 src/Model/Event.php:397
 msgid "Dec"
 msgstr "Dec"
 
-#: include/text.php:1255
+#: include/text.php:1254
 #, php-format
 msgid "Content warning: %s"
 msgstr "Content warning: %s"
 
-#: include/text.php:1325 mod/videos.php:380
+#: include/text.php:1324 mod/videos.php:380
 msgid "View Video"
 msgstr "View video"
 
-#: include/text.php:1342
+#: include/text.php:1341
 msgid "bytes"
 msgstr "bytes"
 
-#: include/text.php:1375 include/text.php:1386 include/text.php:1419
+#: include/text.php:1374 include/text.php:1385 include/text.php:1418
 msgid "Click to open/close"
 msgstr "Reveal/hide"
 
-#: include/text.php:1534
+#: include/text.php:1533
 msgid "View on separate page"
 msgstr "View on separate page"
 
-#: include/text.php:1535
+#: include/text.php:1534
 msgid "view on separate page"
 msgstr "view on separate page"
 
-#: include/text.php:1540 include/text.php:1547 src/Model/Event.php:594
+#: include/text.php:1539 include/text.php:1546 src/Model/Event.php:594
 msgid "link to source"
 msgstr "Link to source"
 
@@ -1184,7 +1180,7 @@ msgstr[1] "comments"
 msgid "post"
 msgstr "post"
 
-#: include/text.php:1915
+#: include/text.php:1916
 msgid "Item filed"
 msgstr "Item filed"
 
@@ -1270,8 +1266,8 @@ msgid "Photos"
 msgstr "Photos"
 
 #: mod/fbrowser.php:43 mod/fbrowser.php:68 mod/photos.php:194
-#: mod/photos.php:1062 mod/photos.php:1149 mod/photos.php:1166
-#: mod/photos.php:1659 mod/photos.php:1673 src/Model/Photo.php:244
+#: 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 "Contact photos"
@@ -1341,7 +1337,7 @@ msgid ""
 " join."
 msgstr "On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."
 
-#: mod/newmember.php:19 mod/admin.php:1935 mod/admin.php:2204
+#: 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 "Settings"
@@ -1547,11 +1543,6 @@ msgstr "Ignore/Hide"
 msgid "Friend Suggestions"
 msgstr "Friend suggestions"
 
-#: mod/update_community.php:27 mod/update_display.php:27
-#: mod/update_notes.php:40 mod/update_profile.php:39 mod/update_network.php:33
-msgid "[Embedded content - reload page to view]"
-msgstr "[Embedded content - reload page to view]"
-
 #: mod/uimport.php:55 mod/register.php:192
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
@@ -1624,11 +1615,11 @@ msgid "Select an identity to manage: "
 msgstr "Select identity:"
 
 #: mod/manage.php:184 mod/localtime.php:56 mod/poke.php:199
-#: mod/fsuggest.php:114 mod/photos.php:1080 mod/photos.php:1160
-#: mod/photos.php:1445 mod/photos.php:1491 mod/photos.php:1530
-#: mod/photos.php:1603 mod/contacts.php:610 mod/events.php:530
-#: 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/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
@@ -1735,16 +1726,16 @@ msgstr "Choose what you wish to do:"
 msgid "Make this post private"
 msgstr "Make this post private"
 
-#: mod/probe.php:13 mod/search.php:98 mod/search.php:104
-#: mod/viewcontacts.php:45 mod/webfinger.php:16 mod/photos.php:932
-#: mod/videos.php:199 mod/directory.php:42 mod/community.php:27
-#: mod/dfrn_request.php:602 mod/display.php:203
+#: 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 "Public access denied."
 
 #: mod/probe.php:14 mod/webfinger.php:17
 msgid "Only logged in users are permitted to perform a probing."
-msgstr "Only logged in users are permitted to perform a probing."
+msgstr "Only logged in users are permitted to use the Probe feature."
 
 #: mod/profperm.php:28 mod/group.php:83 index.php:435
 msgid "Permission denied"
@@ -1783,45 +1774,6 @@ msgstr "Registration revoked for %s"
 msgid "Please login."
 msgstr "Please login."
 
-#: mod/search.php:37 mod/network.php:194
-msgid "Remove term"
-msgstr "Remove term"
-
-#: mod/search.php:46 mod/network.php:201 src/Content/Feature.php:100
-msgid "Saved Searches"
-msgstr "Saved searches"
-
-#: mod/search.php:105
-msgid "Only logged in users are permitted to perform a search."
-msgstr "Only logged in users are permitted to perform a search."
-
-#: mod/search.php:129
-msgid "Too Many Requests"
-msgstr "Too many requests"
-
-#: mod/search.php:130
-msgid "Only one search per minute is permitted for not logged in users."
-msgstr "Only one search per minute is permitted for not logged in users."
-
-#: mod/search.php:228 mod/community.php:141
-msgid "No results."
-msgstr "No results."
-
-#: mod/search.php:234
-#, php-format
-msgid "Items tagged with: %s"
-msgstr "Items tagged with: %s"
-
-#: mod/search.php:236 mod/contacts.php:819
-#, php-format
-msgid "Results for: %s"
-msgstr "Results for: %s"
-
-#: mod/subthread.php:113
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s is following %2$s's %3$s"
-
 #: mod/tagrm.php:47
 msgid "Tag removed"
 msgstr "Tag removed"
@@ -1857,7 +1809,7 @@ 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 "Export your account info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)"
+msgstr "Export your account info, contacts and all your items as JSON. This could be a very big file, and could take a lot of time. Use this to make a full backup of your account. Photos are not exported."
 
 #: mod/uexport.php:52 mod/settings.php:108
 msgid "Export personal data"
@@ -1871,13 +1823,13 @@ msgstr "No contacts."
 msgid "Access denied."
 msgstr "Access denied."
 
-#: mod/wall_upload.php:186 mod/photos.php:763 mod/photos.php:766
-#: mod/photos.php:795 mod/profile_photo.php:153
+#: 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 "Image exceeds size limit of %s"
 
-#: mod/wall_upload.php:200 mod/photos.php:818 mod/profile_photo.php:162
+#: mod/wall_upload.php:200 mod/profile_photo.php:162 mod/photos.php:806
 msgid "Unable to process image."
 msgstr "Unable to process image."
 
@@ -1886,7 +1838,7 @@ msgstr "Unable to process image."
 msgid "Wall Photos"
 msgstr "Wall photos"
 
-#: mod/wall_upload.php:239 mod/photos.php:847 mod/profile_photo.php:307
+#: mod/wall_upload.php:239 mod/profile_photo.php:307 mod/photos.php:835
 msgid "Image upload failed."
 msgstr "Image upload failed."
 
@@ -1985,241 +1937,6 @@ msgstr "Suggest friends"
 msgid "Suggest a friend for %s"
 msgstr "Suggest a friend for %s"
 
-#: mod/notes.php:52 src/Model/Profile.php:944
-msgid "Personal Notes"
-msgstr "Personal notes"
-
-#: mod/photos.php:108 src/Model/Profile.php:905
-msgid "Photo Albums"
-msgstr "Photo Albums"
-
-#: mod/photos.php:109 mod/photos.php:1713
-msgid "Recent Photos"
-msgstr "Recent photos"
-
-#: mod/photos.php:112 mod/photos.php:1210 mod/photos.php:1715
-msgid "Upload New Photos"
-msgstr "Upload new photos"
-
-#: mod/photos.php:126 mod/settings.php:51
-msgid "everybody"
-msgstr "everybody"
-
-#: mod/photos.php:184
-msgid "Contact information unavailable"
-msgstr "Contact information unavailable"
-
-#: mod/photos.php:204
-msgid "Album not found."
-msgstr "Album not found."
-
-#: mod/photos.php:234 mod/photos.php:245 mod/photos.php:1161
-msgid "Delete Album"
-msgstr "Delete album"
-
-#: mod/photos.php:243
-msgid "Do you really want to delete this photo album and all its photos?"
-msgstr "Do you really want to delete this photo album and all its photos?"
-
-#: mod/photos.php:310 mod/photos.php:321 mod/photos.php:1446
-msgid "Delete Photo"
-msgstr "Delete photo"
-
-#: mod/photos.php:319
-msgid "Do you really want to delete this photo?"
-msgstr "Do you really want to delete this photo?"
-
-#: mod/photos.php:667
-msgid "a photo"
-msgstr "a photo"
-
-#: mod/photos.php:667
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
-msgstr "%1$s was tagged in %2$s by %3$s"
-
-#: mod/photos.php:769
-msgid "Image upload didn't complete, please try again"
-msgstr "Image upload didn't complete, please try again"
-
-#: mod/photos.php:772
-msgid "Image file is missing"
-msgstr "Image file is missing"
-
-#: mod/photos.php:777
-msgid ""
-"Server can't accept new file upload at this time, please contact your "
-"administrator"
-msgstr "Server can't accept new file upload at this time, please contact your administrator"
-
-#: mod/photos.php:803
-msgid "Image file is empty."
-msgstr "Image file is empty."
-
-#: mod/photos.php:940
-msgid "No photos selected"
-msgstr "No photos selected"
-
-#: mod/photos.php:1036 mod/videos.php:309
-msgid "Access to this item is restricted."
-msgstr "Access to this item is restricted."
-
-#: mod/photos.php:1090
-msgid "Upload Photos"
-msgstr "Upload photos"
-
-#: mod/photos.php:1094 mod/photos.php:1156
-msgid "New album name: "
-msgstr "New album name: "
-
-#: mod/photos.php:1095
-msgid "or existing album name: "
-msgstr "or existing album name: "
-
-#: mod/photos.php:1096
-msgid "Do not show a status post for this upload"
-msgstr "Do not show a status post for this upload"
-
-#: mod/photos.php:1098 mod/photos.php:1441 mod/events.php:533
-#: src/Core/ACL.php:318
-msgid "Permissions"
-msgstr "Permissions"
-
-#: mod/photos.php:1106 mod/photos.php:1449 mod/settings.php:1218
-msgid "Show to Groups"
-msgstr "Show to groups"
-
-#: mod/photos.php:1107 mod/photos.php:1450 mod/settings.php:1219
-msgid "Show to Contacts"
-msgstr "Show to contacts"
-
-#: mod/photos.php:1167
-msgid "Edit Album"
-msgstr "Edit album"
-
-#: mod/photos.php:1172
-msgid "Show Newest First"
-msgstr "Show newest first"
-
-#: mod/photos.php:1174
-msgid "Show Oldest First"
-msgstr "Show oldest first"
-
-#: mod/photos.php:1195 mod/photos.php:1698
-msgid "View Photo"
-msgstr "View photo"
-
-#: mod/photos.php:1236
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Permission denied. Access to this item may be restricted."
-
-#: mod/photos.php:1238
-msgid "Photo not available"
-msgstr "Photo not available"
-
-#: mod/photos.php:1301
-msgid "View photo"
-msgstr "View photo"
-
-#: mod/photos.php:1301
-msgid "Edit photo"
-msgstr "Edit photo"
-
-#: mod/photos.php:1302
-msgid "Use as profile photo"
-msgstr "Use as profile photo"
-
-#: mod/photos.php:1308 src/Object/Post.php:149
-msgid "Private Message"
-msgstr "Private message"
-
-#: mod/photos.php:1327
-msgid "View Full Size"
-msgstr "View full size"
-
-#: mod/photos.php:1414
-msgid "Tags: "
-msgstr "Tags: "
-
-#: mod/photos.php:1417
-msgid "[Remove any tag]"
-msgstr "[Remove any tag]"
-
-#: mod/photos.php:1432
-msgid "New album name"
-msgstr "New album name"
-
-#: mod/photos.php:1433
-msgid "Caption"
-msgstr "Caption"
-
-#: mod/photos.php:1434
-msgid "Add a Tag"
-msgstr "Add Tag"
-
-#: mod/photos.php:1434
-msgid ""
-"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr "Example: @bob, @jojo@example.com, #California, #camping"
-
-#: mod/photos.php:1435
-msgid "Do not rotate"
-msgstr "Do not rotate"
-
-#: mod/photos.php:1436
-msgid "Rotate CW (right)"
-msgstr "Rotate right (CW)"
-
-#: mod/photos.php:1437
-msgid "Rotate CCW (left)"
-msgstr "Rotate left (CCW)"
-
-#: mod/photos.php:1471 src/Object/Post.php:304
-msgid "I like this (toggle)"
-msgstr "I like this (toggle)"
-
-#: mod/photos.php:1472 src/Object/Post.php:305
-msgid "I don't like this (toggle)"
-msgstr "I don't like this (toggle)"
-
-#: mod/photos.php:1488 mod/photos.php:1527 mod/photos.php:1600
-#: mod/contacts.php:953 src/Object/Post.php:801
-msgid "This is you"
-msgstr "This is me"
-
-#: mod/photos.php:1490 mod/photos.php:1529 mod/photos.php:1602
-#: src/Object/Post.php:407 src/Object/Post.php:803
-msgid "Comment"
-msgstr "Comment"
-
-#: mod/photos.php:1634
-msgid "Map"
-msgstr "Map"
-
-#: mod/photos.php:1704 mod/videos.php:387
-msgid "View Album"
-msgstr "View album"
-
-#: mod/videos.php:139
-msgid "Do you really want to delete this video?"
-msgstr "Do you really want to delete this video?"
-
-#: mod/videos.php:144
-msgid "Delete Video"
-msgstr "Delete video"
-
-#: mod/videos.php:207
-msgid "No videos selected"
-msgstr "No videos selected"
-
-#: mod/videos.php:396
-msgid "Recent Videos"
-msgstr "Recent videos"
-
-#: mod/videos.php:398
-msgid "Upload New Videos"
-msgstr "Upload new videos"
-
 #: mod/cal.php:142 mod/display.php:316 mod/profile.php:174
 msgid "Access to this profile has been restricted."
 msgstr "Access to this profile has been restricted."
@@ -2238,7 +1955,7 @@ msgstr "View"
 msgid "Previous"
 msgstr "Previous"
 
-#: mod/cal.php:277 mod/events.php:395 mod/install.php:156
+#: mod/cal.php:277 mod/install.php:156 mod/events.php:395
 msgid "Next"
 msgstr "Next"
 
@@ -2397,10 +2114,10 @@ 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 "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 "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."
 
-#: mod/contacts.php:572 mod/admin.php:1288 mod/admin.php:1450
-#: mod/admin.php:1460
+#: mod/contacts.php:572 mod/admin.php:1284 mod/admin.php:1449
+#: mod/admin.php:1459
 msgid "Disabled"
 msgstr "Disabled"
 
@@ -2476,12 +2193,12 @@ msgid "Update now"
 msgstr "Update now"
 
 #: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:489 mod/admin.php:1829
+#: mod/admin.php:489 mod/admin.php:1834
 msgid "Unblock"
 msgstr "Unblock"
 
 #: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:488 mod/admin.php:1828
+#: mod/admin.php:488 mod/admin.php:1833
 msgid "Block"
 msgstr "Block"
 
@@ -2536,14 +2253,14 @@ msgstr "Blacklisted keywords"
 msgid ""
 "Comma separated list of keywords that should not be converted to hashtags, "
 "when \"Fetch information and keywords\" is selected"
-msgstr "Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"
+msgstr "Comma-separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"
 
 #: 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 "Profile URL:"
 
-#: mod/contacts.php:660 mod/events.php:518 mod/directory.php:148
+#: 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:"
@@ -2636,6 +2353,11 @@ msgstr "Only show hidden contacts"
 msgid "Search your contacts"
 msgstr "Search your contacts"
 
+#: mod/contacts.php:819 mod/search.php:236
+#, php-format
+msgid "Results for: %s"
+msgstr "Results for: %s"
+
 #: mod/contacts.php:820 mod/directory.php:209 view/theme/vier/theme.php:203
 #: src/Content/Widget.php:63
 msgid "Find"
@@ -2674,7 +2396,7 @@ msgstr "View all contacts"
 msgid "View all common friends"
 msgstr "View all common friends"
 
-#: mod/contacts.php:895 mod/events.php:532 mod/admin.php:1363
+#: mod/contacts.php:895 mod/admin.php:1362 mod/events.php:533
 #: src/Model/Profile.php:863
 msgid "Advanced"
 msgstr "Advanced"
@@ -2695,6 +2417,11 @@ msgstr "is a fan of yours"
 msgid "you are a fan of"
 msgstr "I follow them"
 
+#: 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 "This is me"
+
 #: mod/contacts.php:1013
 msgid "Toggle Blocked status"
 msgstr "Toggle blocked status"
@@ -2738,8 +2465,8 @@ msgid ""
 "settings. Please double check whom you give this access."
 msgstr "Parent users have total control of this account, including core settings. Please double-check whom you grant such access."
 
-#: mod/delegate.php:168 mod/admin.php:311 mod/admin.php:1358
-#: mod/admin.php:1994 mod/admin.php:2247 mod/admin.php:2321 mod/admin.php:2468
+#: 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"
@@ -2776,70 +2503,6 @@ msgstr "Add"
 msgid "No entries."
 msgstr "No entries."
 
-#: mod/events.php:105 mod/events.php:107
-msgid "Event can not end before it has started."
-msgstr "Event cannot end before it has started."
-
-#: mod/events.php:114 mod/events.php:116
-msgid "Event title and start time are required."
-msgstr "Event title and starting time are required."
-
-#: mod/events.php:393
-msgid "Create New Event"
-msgstr "Create new event"
-
-#: mod/events.php:506
-msgid "Event details"
-msgstr "Event details"
-
-#: mod/events.php:507
-msgid "Starting date and Title are required."
-msgstr "Starting date and title are required."
-
-#: mod/events.php:508 mod/events.php:509
-msgid "Event Starts:"
-msgstr "Event starts:"
-
-#: mod/events.php:508 mod/events.php:520 mod/profiles.php:607
-msgid "Required"
-msgstr "Required"
-
-#: mod/events.php:510 mod/events.php:526
-msgid "Finish date/time is not known or not relevant"
-msgstr "Finish date/time is not known or not relevant"
-
-#: mod/events.php:512 mod/events.php:513
-msgid "Event Finishes:"
-msgstr "Event finishes:"
-
-#: mod/events.php:514 mod/events.php:527
-msgid "Adjust for viewer timezone"
-msgstr "Adjust for viewer's time zone"
-
-#: mod/events.php:516
-msgid "Description:"
-msgstr "Description:"
-
-#: mod/events.php:520 mod/events.php:522
-msgid "Title:"
-msgstr "Title:"
-
-#: mod/events.php:523 mod/events.php:524
-msgid "Share this event"
-msgstr "Share this event"
-
-#: mod/events.php:531 src/Model/Profile.php:862
-msgid "Basic"
-msgstr "Basic"
-
-#: mod/events.php:552
-msgid "Failed to remove event"
-msgstr "Failed to remove event"
-
-#: mod/events.php:554
-msgid "Event removed"
-msgstr "Event removed"
-
 #: mod/feedtest.php:20
 msgid "You must be logged in to use this module"
 msgstr "You must be logged in to use this module"
@@ -3243,36 +2906,6 @@ msgstr "Markdown"
 msgid "HTML"
 msgstr "HTML"
 
-#: mod/community.php:51
-msgid "Community option not available."
-msgstr "Community option not available."
-
-#: mod/community.php:68
-msgid "Not available."
-msgstr "Not available."
-
-#: mod/community.php:81
-msgid "Local Community"
-msgstr "Local community"
-
-#: mod/community.php:84
-msgid "Posts from local users on this server"
-msgstr "Posts from local users on this server"
-
-#: mod/community.php:92
-msgid "Global Community"
-msgstr "Global community"
-
-#: mod/community.php:95
-msgid "Posts from users of the whole federated network"
-msgstr "Posts from users of the whole federated network"
-
-#: 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 "This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."
-
 #: mod/friendica.php:77
 msgid "This is Friendica, version"
 msgstr "This is Friendica, version"
@@ -3380,7 +3013,7 @@ msgid ""
 "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 sites are all inter-connect to create a large 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 sites are all inter-connected to create a large 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."
 
 #: mod/invite.php:137
 msgid ""
@@ -3393,7 +3026,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 "Friendica sites are all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. Each site can also connect with many traditional social networks."
+msgstr "Friendica sites are all inter-connected to create a huge privacy-enhanced social web that is owned and controlled by its members. Each site can also connect with many traditional social networks."
 
 #: mod/invite.php:140
 #, php-format
@@ -3429,95 +3062,6 @@ msgid ""
 "important, please visit http://friendi.ca"
 msgstr "For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"
 
-#: mod/network.php:202 src/Model/Group.php:413
-msgid "add"
-msgstr "add"
-
-#: 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] "Warning: This group contains %s member from a network that doesn't allow non public messages."
-msgstr[1] "Warning: This group contains %s members from a network that doesn't allow non public messages."
-
-#: mod/network.php:550
-msgid "Messages in this group won't be send to these receivers."
-msgstr "Messages in this group won't be send to these receivers."
-
-#: mod/network.php:618
-msgid "No such group"
-msgstr "No such group"
-
-#: mod/network.php:639 mod/group.php:216
-msgid "Group is empty"
-msgstr "Group is empty"
-
-#: mod/network.php:643
-#, php-format
-msgid "Group: %s"
-msgstr "Group: %s"
-
-#: mod/network.php:669
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr "Private messages to this person are at risk of public disclosure."
-
-#: mod/network.php:672
-msgid "Invalid contact."
-msgstr "Invalid contact."
-
-#: mod/network.php:937
-msgid "Commented Order"
-msgstr "Commented last"
-
-#: mod/network.php:940
-msgid "Sort by Comment Date"
-msgstr "Sort by comment date"
-
-#: mod/network.php:945
-msgid "Posted Order"
-msgstr "Posted last"
-
-#: mod/network.php:948
-msgid "Sort by Post Date"
-msgstr "Sort by post date"
-
-#: mod/network.php:956 mod/profiles.php:594
-#: src/Core/NotificationsManager.php:185
-msgid "Personal"
-msgstr "Personal"
-
-#: mod/network.php:959
-msgid "Posts that mention or involve you"
-msgstr "Posts mentioning or involving me"
-
-#: mod/network.php:967
-msgid "New"
-msgstr "New"
-
-#: mod/network.php:970
-msgid "Activity Stream - by date"
-msgstr "Activity Stream - by date"
-
-#: mod/network.php:978
-msgid "Shared Links"
-msgstr "Shared links"
-
-#: mod/network.php:981
-msgid "Interesting Links"
-msgstr "Interesting links"
-
-#: mod/network.php:989
-msgid "Starred"
-msgstr "Starred"
-
-#: mod/network.php:992
-msgid "Favourite Posts"
-msgstr "My favorite posts"
-
 #: mod/crepair.php:87
 msgid "Contact settings applied."
 msgstr "Contact settings applied."
@@ -3530,7 +3074,7 @@ msgstr "Contact update failed."
 msgid ""
 "<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
 " information your communications with this contact may stop working."
-msgstr "<strong>Warning: These are highly advanced settings.</strong> If you enter incorrect information your communications with this contact may not working."
+msgstr "<strong>Warning: These are highly advanced settings.</strong> If you enter incorrect information, your communications with this contact might be disrupted."
 
 #: mod/crepair.php:115
 msgid ""
@@ -3572,8 +3116,8 @@ msgid ""
 "entries from this contact."
 msgstr "This will cause Friendica to repost new entries from this contact."
 
-#: mod/crepair.php:158 mod/admin.php:494 mod/admin.php:1811 mod/admin.php:1822
-#: mod/admin.php:1835 mod/admin.php:1851 mod/settings.php:671
+#: 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 "Name:"
@@ -3836,79 +3380,6 @@ msgid_plural "%d messages"
 msgstr[0] "%d message"
 msgstr[1] "%d messages"
 
-#: mod/group.php:36
-msgid "Group created."
-msgstr "Group created."
-
-#: mod/group.php:42
-msgid "Could not create group."
-msgstr "Could not create group."
-
-#: mod/group.php:56 mod/group.php:157
-msgid "Group not found."
-msgstr "Group not found."
-
-#: mod/group.php:70
-msgid "Group name changed."
-msgstr "Group name changed."
-
-#: mod/group.php:97
-msgid "Save Group"
-msgstr "Save group"
-
-#: mod/group.php:102
-msgid "Create a group of contacts/friends."
-msgstr "Create a group of contacts/friends."
-
-#: mod/group.php:103 mod/group.php:199 src/Model/Group.php:421
-msgid "Group Name: "
-msgstr "Group name: "
-
-#: mod/group.php:127
-msgid "Group removed."
-msgstr "Group removed."
-
-#: mod/group.php:129
-msgid "Unable to remove group."
-msgstr "Unable to remove group."
-
-#: mod/group.php:192
-msgid "Delete Group"
-msgstr "Delete group"
-
-#: mod/group.php:198
-msgid "Group Editor"
-msgstr "Group Editor"
-
-#: mod/group.php:203
-msgid "Edit Group Name"
-msgstr "Edit group name"
-
-#: mod/group.php:213
-msgid "Members"
-msgstr "Members"
-
-#: mod/group.php:229
-msgid "Remove contact from group"
-msgstr "Remove contact from group"
-
-#: mod/group.php:253
-msgid "Add contact to group"
-msgstr "Add contact to group"
-
-#: mod/openid.php:29
-msgid "OpenID protocol error. No ID returned."
-msgstr "OpenID protocol error. No ID returned."
-
-#: mod/openid.php:66
-msgid ""
-"Account not found and OpenID registration is not permitted on this site."
-msgstr "Account not found and OpenID registration is not permitted on this site."
-
-#: mod/openid.php:116 src/Module/Login.php:86 src/Module/Login.php:135
-msgid "Login failed."
-msgstr "Login failed."
-
 #: mod/admin.php:107
 msgid "Theme settings updated."
 msgstr "Theme settings updated."
@@ -3921,7 +3392,7 @@ msgstr "Information"
 msgid "Overview"
 msgstr "Overview"
 
-#: mod/admin.php:182 mod/admin.php:722
+#: mod/admin.php:182 mod/admin.php:717
 msgid "Federation Statistics"
 msgstr "Federation statistics"
 
@@ -3929,19 +3400,19 @@ msgstr "Federation statistics"
 msgid "Configuration"
 msgstr "Configuration"
 
-#: mod/admin.php:184 mod/admin.php:1357
+#: mod/admin.php:184 mod/admin.php:1356
 msgid "Site"
 msgstr "Site"
 
-#: mod/admin.php:185 mod/admin.php:1289 mod/admin.php:1817 mod/admin.php:1833
+#: mod/admin.php:185 mod/admin.php:1285 mod/admin.php:1822 mod/admin.php:1838
 msgid "Users"
 msgstr "Users"
 
-#: mod/admin.php:186 mod/admin.php:1933 mod/admin.php:1993 mod/settings.php:87
+#: mod/admin.php:186 mod/admin.php:1938 mod/admin.php:1998 mod/settings.php:87
 msgid "Addons"
 msgstr "Addons"
 
-#: mod/admin.php:187 mod/admin.php:2202 mod/admin.php:2246
+#: mod/admin.php:187 mod/admin.php:2208 mod/admin.php:2252
 msgid "Themes"
 msgstr "Theme selection"
 
@@ -3962,7 +3433,7 @@ msgstr "Database"
 msgid "DB updates"
 msgstr "DB updates"
 
-#: mod/admin.php:192 mod/admin.php:757
+#: mod/admin.php:192 mod/admin.php:752
 msgid "Inspect Queue"
 msgstr "Inspect queue"
 
@@ -3982,11 +3453,11 @@ msgstr "Server blocklist"
 msgid "Delete Item"
 msgstr "Delete item"
 
-#: mod/admin.php:197 mod/admin.php:198 mod/admin.php:2320
+#: mod/admin.php:197 mod/admin.php:198 mod/admin.php:2326
 msgid "Logs"
 msgstr "Logs"
 
-#: mod/admin.php:199 mod/admin.php:2387
+#: mod/admin.php:199 mod/admin.php:2393
 msgid "View Logs"
 msgstr "View logs"
 
@@ -4019,9 +3490,9 @@ msgid "User registrations waiting for confirmation"
 msgstr "User registrations awaiting confirmation"
 
 #: mod/admin.php:303 mod/admin.php:365 mod/admin.php:482 mod/admin.php:524
-#: mod/admin.php:721 mod/admin.php:756 mod/admin.php:852 mod/admin.php:1356
-#: mod/admin.php:1816 mod/admin.php:1932 mod/admin.php:1992 mod/admin.php:2201
-#: mod/admin.php:2245 mod/admin.php:2319 mod/admin.php:2386
+#: 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
 msgid "Administration"
 msgstr "Administration"
 
@@ -4033,7 +3504,7 @@ msgstr "Display Terms of Service"
 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 "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 "Enable the Terms of Service page. If this is enabled, a link to the terms will be added to the registration form and to the general information page."
 
 #: mod/admin.php:306
 msgid "Display Privacy Statement"
@@ -4044,7 +3515,7 @@ msgstr "Display Privacy Statement"
 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 "Show some informations regarding the needed information to operate the node according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."
+msgstr "Show some information needed, for example, to comply with <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."
 
 #: mod/admin.php:307
 msgid "Privacy Statement Preview"
@@ -4082,14 +3553,14 @@ msgid ""
 "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 "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 "This page can be used to define a blacklist 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."
 
 #: mod/admin.php:368
 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 "The list of blocked servers will publicly available on the Friendica page so that your users and people investigating communication problems can readily find the reason."
+msgstr "The list of blocked servers will be available publicly on the Friendica page so that your users and people investigating communication problems can find the reason."
 
 #: mod/admin.php:369
 msgid "Add new entry to block list"
@@ -4167,7 +3638,7 @@ msgstr "This page allows you to prevent any message from a remote contact to rea
 msgid "Block Remote Contact"
 msgstr "Block remote contact"
 
-#: mod/admin.php:486 mod/admin.php:1819
+#: mod/admin.php:486 mod/admin.php:1824
 msgid "select all"
 msgstr "select all"
 
@@ -4231,67 +3702,67 @@ msgstr "GUID"
 msgid "The GUID of the item you want to delete."
 msgstr "GUID of item to be deleted."
 
-#: mod/admin.php:568
+#: mod/admin.php:563
 msgid "Item marked for deletion."
 msgstr "Item marked for deletion."
 
-#: mod/admin.php:639
+#: mod/admin.php:634
 msgid "unknown"
 msgstr "unknown"
 
-#: mod/admin.php:715
+#: mod/admin.php:710
 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 "This page offers you the amount of known part of the federated social network your Friendica node is part of. These numbers are not complete and only reflect the part of the network your node is aware of."
+msgstr "This page offers statistics about the federated social network, of which your Friendica node is one part. These numbers do not represent the entire network, but merely the parts that are connected to your node.\""
 
-#: mod/admin.php:716
+#: mod/admin.php:711
 msgid ""
 "The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
 "will improve the data displayed here."
 msgstr "The <em>Auto Discovered Contact Directory</em> feature is not enabled; enabling it will improve the data displayed here."
 
-#: mod/admin.php:728
+#: mod/admin.php:723
 #, php-format
 msgid ""
 "Currently this node is aware of %d nodes with %d registered users from the "
 "following platforms:"
-msgstr "Currently this node is aware of %d nodes with %d registered users from the following platforms:"
+msgstr "Currently, this node is aware of %d nodes with %d registered users from the following platforms:"
 
-#: mod/admin.php:759
+#: mod/admin.php:754
 msgid "ID"
 msgstr "ID"
 
-#: mod/admin.php:760
+#: mod/admin.php:755
 msgid "Recipient Name"
 msgstr "Recipient name"
 
-#: mod/admin.php:761
+#: mod/admin.php:756
 msgid "Recipient Profile"
 msgstr "Recipient profile"
 
-#: mod/admin.php:762 view/theme/frio/theme.php:266
+#: mod/admin.php:757 view/theme/frio/theme.php:266
 #: src/Core/NotificationsManager.php:178 src/Content/Nav.php:183
 msgid "Network"
 msgstr "Network"
 
-#: mod/admin.php:763
+#: mod/admin.php:758
 msgid "Created"
 msgstr "Created"
 
-#: mod/admin.php:764
+#: mod/admin.php:759
 msgid "Last Tried"
 msgstr "Last Tried"
 
-#: mod/admin.php:765
+#: mod/admin.php:760
 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 "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 "This page lists the content of the queue for outgoing postings. These are postings for which the initial delivery failed. They will be resent later, and eventually deleted if the delivery fails permanently."
 
-#: mod/admin.php:789
+#: mod/admin.php:784
 #, php-format
 msgid ""
 "Your DB still runs with MyISAM tables. You should change the engine type to "
@@ -4300,490 +3771,494 @@ 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 "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 "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 />"
 
-#: mod/admin.php:796
+#: mod/admin.php:791
 #, 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 "A new Friendica version is available now. Your current version is %1$s, upstream version is %2$s"
 
-#: mod/admin.php:806
+#: mod/admin.php:801
 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 "The database update failed. Please run \"php bin/console.php dbstructure update\" from the command line and check for errors that may appear."
 
-#: mod/admin.php:812
+#: mod/admin.php:807
 msgid "The worker was never executed. Please check your database structure!"
 msgstr "The worker process has never been executed. Please check your database structure!"
 
-#: mod/admin.php:815
+#: mod/admin.php:810
 #, php-format
 msgid ""
 "The last worker execution was on %s UTC. This is older than one hour. Please"
 " check your crontab settings."
 msgstr "The last worker process started at %s UTC. This is more than one hour ago. Please adjust your crontab settings."
 
-#: mod/admin.php:820
+#: mod/admin.php:815
 msgid "Normal Account"
 msgstr "Standard account"
 
-#: mod/admin.php:821
+#: mod/admin.php:816
 msgid "Automatic Follower Account"
 msgstr "Automatic follower account"
 
-#: mod/admin.php:822
+#: mod/admin.php:817
 msgid "Public Forum Account"
 msgstr "Public forum account"
 
-#: mod/admin.php:823
+#: mod/admin.php:818
 msgid "Automatic Friend Account"
 msgstr "Automatic friend account"
 
-#: mod/admin.php:824
+#: mod/admin.php:819
 msgid "Blog Account"
 msgstr "Blog account"
 
-#: mod/admin.php:825
+#: mod/admin.php:820
 msgid "Private Forum Account"
 msgstr "Private forum account"
 
-#: mod/admin.php:847
+#: mod/admin.php:842
 msgid "Message queues"
 msgstr "Message queues"
 
-#: mod/admin.php:853
+#: mod/admin.php:848
 msgid "Summary"
 msgstr "Summary"
 
-#: mod/admin.php:855
+#: mod/admin.php:850
 msgid "Registered users"
 msgstr "Signed up users"
 
-#: mod/admin.php:857
+#: mod/admin.php:852
 msgid "Pending registrations"
 msgstr "Pending registrations"
 
-#: mod/admin.php:858
+#: mod/admin.php:853
 msgid "Version"
 msgstr "Version"
 
-#: mod/admin.php:863
+#: mod/admin.php:858
 msgid "Active addons"
 msgstr "Active addons"
 
-#: mod/admin.php:894
+#: mod/admin.php:889
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr "Can not parse base URL. Must have at least <scheme>://<domain>"
 
-#: mod/admin.php:1224
+#: mod/admin.php:1220
 msgid "Site settings updated."
 msgstr "Site settings updated."
 
-#: mod/admin.php:1251 mod/settings.php:897
+#: mod/admin.php:1247 mod/settings.php:897
 msgid "No special theme for mobile devices"
 msgstr "No special theme for mobile devices"
 
-#: mod/admin.php:1280
+#: mod/admin.php:1276
 msgid "No community page for local users"
 msgstr "No community page for local users"
 
-#: mod/admin.php:1281
+#: mod/admin.php:1277
 msgid "No community page"
 msgstr "No community page"
 
-#: mod/admin.php:1282
+#: mod/admin.php:1278
 msgid "Public postings from users of this site"
 msgstr "Public postings from users of this site"
 
-#: mod/admin.php:1283
+#: mod/admin.php:1279
 msgid "Public postings from the federated network"
 msgstr "Public postings from the federated network"
 
-#: mod/admin.php:1284
+#: mod/admin.php:1280
 msgid "Public postings from local users and the federated network"
 msgstr "Public postings from local users and the federated network"
 
-#: mod/admin.php:1290
+#: mod/admin.php:1286
 msgid "Users, Global Contacts"
 msgstr "Users, Global Contacts"
 
-#: mod/admin.php:1291
+#: mod/admin.php:1287
 msgid "Users, Global Contacts/fallback"
 msgstr "Users, Global Contacts/fallback"
 
-#: mod/admin.php:1295
+#: mod/admin.php:1291
 msgid "One month"
 msgstr "One month"
 
-#: mod/admin.php:1296
+#: mod/admin.php:1292
 msgid "Three months"
 msgstr "Three months"
 
-#: mod/admin.php:1297
+#: mod/admin.php:1293
 msgid "Half a year"
 msgstr "Half a year"
 
-#: mod/admin.php:1298
+#: mod/admin.php:1294
 msgid "One year"
 msgstr "One a year"
 
-#: mod/admin.php:1303
+#: mod/admin.php:1299
 msgid "Multi user instance"
 msgstr "Multi user instance"
 
-#: mod/admin.php:1326
+#: mod/admin.php:1325
 msgid "Closed"
 msgstr "Closed"
 
-#: mod/admin.php:1327
+#: mod/admin.php:1326
 msgid "Requires approval"
 msgstr "Requires approval"
 
-#: mod/admin.php:1328
+#: mod/admin.php:1327
 msgid "Open"
 msgstr "Open"
 
-#: mod/admin.php:1332
+#: mod/admin.php:1331
 msgid "No SSL policy, links will track page SSL state"
 msgstr "No SSL policy, links will track page SSL state"
 
-#: mod/admin.php:1333
+#: mod/admin.php:1332
 msgid "Force all links to use SSL"
 msgstr "Force all links to use SSL"
 
-#: mod/admin.php:1334
+#: mod/admin.php:1333
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Self-signed certificate, use SSL for local links only (discouraged)"
 
-#: mod/admin.php:1338
+#: mod/admin.php:1337
 msgid "Don't check"
 msgstr "Don't check"
 
-#: mod/admin.php:1339
+#: mod/admin.php:1338
 msgid "check the stable version"
 msgstr "check for stable version updates"
 
-#: mod/admin.php:1340
+#: mod/admin.php:1339
 msgid "check the development version"
 msgstr "check for development version updates"
 
-#: mod/admin.php:1359
+#: mod/admin.php:1358
 msgid "Republish users to directory"
 msgstr "Republish users to directory"
 
-#: mod/admin.php:1360 mod/register.php:267
+#: mod/admin.php:1359 mod/register.php:267
 msgid "Registration"
 msgstr "Join this Friendica Node Today"
 
-#: mod/admin.php:1361
+#: mod/admin.php:1360
 msgid "File upload"
 msgstr "File upload"
 
-#: mod/admin.php:1362
+#: mod/admin.php:1361
 msgid "Policies"
 msgstr "Policies"
 
-#: mod/admin.php:1364
+#: mod/admin.php:1363
 msgid "Auto Discovered Contact Directory"
 msgstr "Auto-discovered contact directory"
 
-#: mod/admin.php:1365
+#: mod/admin.php:1364
 msgid "Performance"
 msgstr "Performance"
 
-#: mod/admin.php:1366
+#: mod/admin.php:1365
 msgid "Worker"
 msgstr "Worker"
 
-#: mod/admin.php:1367
+#: mod/admin.php:1366
 msgid "Message Relay"
 msgstr "Message relay"
 
-#: mod/admin.php:1368
+#: mod/admin.php:1367
 msgid ""
 "Relocate - WARNING: advanced function. Could make this server unreachable."
 msgstr "Relocate - Warning, advanced function: This could make this server unreachable."
 
-#: mod/admin.php:1371
+#: mod/admin.php:1370
 msgid "Site name"
 msgstr "Site name"
 
-#: mod/admin.php:1372
+#: mod/admin.php:1371
 msgid "Host name"
 msgstr "Host name"
 
-#: mod/admin.php:1373
+#: mod/admin.php:1372
 msgid "Sender Email"
 msgstr "Sender email"
 
-#: mod/admin.php:1373
+#: mod/admin.php:1372
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr "The email address your server shall use to send notification emails from."
 
-#: mod/admin.php:1374
+#: mod/admin.php:1373
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: mod/admin.php:1375
+#: mod/admin.php:1374
 msgid "Shortcut icon"
 msgstr "Shortcut icon"
 
-#: mod/admin.php:1375
+#: mod/admin.php:1374
 msgid "Link to an icon that will be used for browsers."
 msgstr "Link to an icon that will be used for browsers."
 
-#: mod/admin.php:1376
+#: mod/admin.php:1375
 msgid "Touch icon"
 msgstr "Touch icon"
 
-#: mod/admin.php:1376
+#: mod/admin.php:1375
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr "Link to an icon that will be used for tablets and mobiles."
 
-#: mod/admin.php:1377
+#: mod/admin.php:1376
 msgid "Additional Info"
 msgstr "Additional Info"
 
-#: mod/admin.php:1377
+#: mod/admin.php:1376
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
 msgstr "For public servers: You can add additional information here that will be listed at %s/servers."
 
-#: mod/admin.php:1378
+#: mod/admin.php:1377
 msgid "System language"
 msgstr "System language"
 
-#: mod/admin.php:1379
+#: mod/admin.php:1378
 msgid "System theme"
 msgstr "System theme"
 
-#: mod/admin.php:1379
+#: mod/admin.php:1378
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Default system theme - may be overridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"
 
-#: mod/admin.php:1380
+#: mod/admin.php:1379
 msgid "Mobile system theme"
 msgstr "Mobile system theme"
 
-#: mod/admin.php:1380
+#: mod/admin.php:1379
 msgid "Theme for mobile devices"
 msgstr "Theme for mobile devices"
 
-#: mod/admin.php:1381
+#: mod/admin.php:1380
 msgid "SSL link policy"
 msgstr "SSL link policy"
 
-#: mod/admin.php:1381
+#: mod/admin.php:1380
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Determines whether generated links should be forced to use SSL"
 
-#: mod/admin.php:1382
+#: mod/admin.php:1381
 msgid "Force SSL"
 msgstr "Force SSL"
 
-#: mod/admin.php:1382
+#: mod/admin.php:1381
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
 msgstr "Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops."
 
-#: mod/admin.php:1383
+#: mod/admin.php:1382
 msgid "Hide help entry from navigation menu"
 msgstr "Hide help entry from navigation menu"
 
-#: mod/admin.php:1383
+#: mod/admin.php:1382
 msgid ""
 "Hides the menu entry for the Help pages from the navigation menu. You can "
 "still access it calling /help directly."
 msgstr "Hides the menu entry for the Help pages from the navigation menu. Help pages can still be accessed by calling ../help directly via its URL."
 
-#: mod/admin.php:1384
+#: mod/admin.php:1383
 msgid "Single user instance"
 msgstr "Single user instance"
 
-#: mod/admin.php:1384
+#: mod/admin.php:1383
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "Make this instance multi-user or single-user for the named user"
 
-#: mod/admin.php:1385
+#: mod/admin.php:1384
 msgid "Maximum image size"
 msgstr "Maximum image size"
 
-#: mod/admin.php:1385
+#: mod/admin.php:1384
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximum size in bytes of uploaded images. Default is 0, which means no limits."
 
-#: mod/admin.php:1386
+#: mod/admin.php:1385
 msgid "Maximum image length"
 msgstr "Maximum image length"
 
-#: mod/admin.php:1386
+#: mod/admin.php:1385
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."
 
-#: mod/admin.php:1387
+#: mod/admin.php:1386
 msgid "JPEG image quality"
 msgstr "JPEG image quality"
 
-#: mod/admin.php:1387
+#: mod/admin.php:1386
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
-msgstr "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is the original quality level."
+msgstr "Uploaded JPEGs will be saved at this quality setting [0-100]. Default is 100, which is the original quality level."
 
-#: mod/admin.php:1389
+#: mod/admin.php:1388
 msgid "Register policy"
 msgstr "Registration policy"
 
-#: mod/admin.php:1390
+#: mod/admin.php:1389
 msgid "Maximum Daily Registrations"
 msgstr "Maximum daily registrations"
 
-#: mod/admin.php:1390
+#: mod/admin.php:1389
 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 "If open registration is permitted, this sets the maximum number of new registrations per day.  This setting has no effect for registrations by approval."
 
-#: mod/admin.php:1391
+#: mod/admin.php:1390
 msgid "Register text"
 msgstr "Registration text"
 
-#: mod/admin.php:1391
+#: mod/admin.php:1390
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
 msgstr "Will be displayed prominently on the registration page. You may use BBCode here."
 
-#: mod/admin.php:1392
+#: mod/admin.php:1391
 msgid "Accounts abandoned after x days"
 msgstr "Accounts abandoned after so many days"
 
-#: mod/admin.php:1392
+#: mod/admin.php:1391
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."
 
-#: mod/admin.php:1393
+#: mod/admin.php:1392
 msgid "Allowed friend domains"
 msgstr "Allowed friend domains"
 
-#: mod/admin.php:1393
+#: mod/admin.php:1392
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
-msgstr "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Leave empty to allow any domains"
+msgstr "Comma-separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Leave empty to allow any domains"
 
-#: mod/admin.php:1394
+#: mod/admin.php:1393
 msgid "Allowed email domains"
 msgstr "Allowed email domains"
 
-#: mod/admin.php:1394
+#: mod/admin.php:1393
 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 "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Leave empty to allow any domains"
+msgstr "Comma-separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Leave empty to allow any domains"
 
-#: mod/admin.php:1395
+#: mod/admin.php:1394
 msgid "No OEmbed rich content"
 msgstr "No OEmbed rich content"
 
-#: mod/admin.php:1395
+#: mod/admin.php:1394
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
 msgstr "Don't show rich content (e.g. embedded PDF), except from the domains listed below."
 
-#: mod/admin.php:1396
+#: mod/admin.php:1395
 msgid "Allowed OEmbed domains"
 msgstr "Allowed OEmbed domains"
 
-#: mod/admin.php:1396
+#: mod/admin.php:1395
 msgid ""
 "Comma separated list of domains which oembed content is allowed to be "
 "displayed. Wildcards are accepted."
-msgstr "Comma separated list of domains from where OEmbed content is allowed. Wildcards are possible."
+msgstr "Comma-separated list of domains from where OEmbed content is allowed. Wildcards are possible."
 
-#: mod/admin.php:1397
+#: mod/admin.php:1396
 msgid "Block public"
 msgstr "Block public"
 
-#: mod/admin.php:1397
+#: mod/admin.php:1396
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Block public access to all otherwise public personal pages on this site, except for local users when logged in."
 
-#: mod/admin.php:1398
+#: mod/admin.php:1397
 msgid "Force publish"
 msgstr "Mandatory directory listing"
 
-#: mod/admin.php:1398
+#: mod/admin.php:1397
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Force all profiles on this site to be listed in the site directory."
 
-#: mod/admin.php:1399
+#: mod/admin.php:1397
+msgid "Enabling this may violate privacy laws like the GDPR"
+msgstr ""
+
+#: mod/admin.php:1398
 msgid "Global directory URL"
 msgstr "Global directory URL"
 
-#: mod/admin.php:1399
+#: mod/admin.php:1398
 msgid ""
 "URL to the global directory. If this is not set, the global directory is "
 "completely unavailable to the application."
 msgstr "URL to the global directory: If this is not set, the global directory is completely unavailable to the application."
 
-#: mod/admin.php:1400
+#: mod/admin.php:1399
 msgid "Private posts by default for new users"
 msgstr "Private posts by default for new users"
 
-#: mod/admin.php:1400
+#: mod/admin.php:1399
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr "Set default post permissions for all new members to the default privacy group rather than public."
 
-#: mod/admin.php:1401
+#: mod/admin.php:1400
 msgid "Don't include post content in email notifications"
 msgstr "Don't include post content in email notifications"
 
-#: mod/admin.php:1401
+#: mod/admin.php:1400
 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 "Don't include the content of a post/comment/private message in the email notifications sent from this site, as a privacy measure."
 
-#: mod/admin.php:1402
+#: mod/admin.php:1401
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr "Disallow public access to addons listed in the apps menu."
 
-#: mod/admin.php:1402
+#: mod/admin.php:1401
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr "Checking this box will restrict addons listed in the apps menu to members only."
 
-#: mod/admin.php:1403
+#: mod/admin.php:1402
 msgid "Don't embed private images in posts"
 msgstr "Don't embed private images in posts"
 
-#: mod/admin.php:1403
+#: mod/admin.php:1402
 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 "
@@ -4791,210 +4266,210 @@ msgid ""
 "while."
 msgstr "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."
 
-#: mod/admin.php:1404
+#: mod/admin.php:1403
 msgid "Allow Users to set remote_self"
 msgstr "Allow users to set \"Remote self\""
 
-#: mod/admin.php:1404
+#: mod/admin.php:1403
 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 "This allows every user to mark contacts as a \"Remote self\" in the repair contact dialogue. Setting this flag on a contact will mirror every posting of that contact in the users stream."
 
-#: mod/admin.php:1405
+#: mod/admin.php:1404
 msgid "Block multiple registrations"
 msgstr "Block multiple registrations"
 
-#: mod/admin.php:1405
+#: mod/admin.php:1404
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Disallow users to sign up for additional accounts."
 
-#: mod/admin.php:1406
+#: mod/admin.php:1405
 msgid "OpenID support"
 msgstr "OpenID support"
 
-#: mod/admin.php:1406
+#: mod/admin.php:1405
 msgid "OpenID support for registration and logins."
 msgstr "OpenID support for registration and logins."
 
-#: mod/admin.php:1407
+#: mod/admin.php:1406
 msgid "Fullname check"
 msgstr "Full name check"
 
-#: mod/admin.php:1407
+#: mod/admin.php:1406
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr "Force users to sign up with a space between first name and last name in the full name field; it may reduce spam and abuse registrations."
 
-#: mod/admin.php:1408
+#: mod/admin.php:1407
 msgid "Community pages for visitors"
 msgstr "Community pages for visitors"
 
-#: mod/admin.php:1408
+#: mod/admin.php:1407
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
 msgstr "Which community pages should be available for visitors. Local users always see both pages."
 
-#: mod/admin.php:1409
+#: mod/admin.php:1408
 msgid "Posts per user on community page"
 msgstr "Posts per user on community page"
 
-#: mod/admin.php:1409
+#: mod/admin.php:1408
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
 msgstr "Maximum number of posts per user on the community page (not valid for 'Global Community')."
 
-#: mod/admin.php:1410
+#: mod/admin.php:1409
 msgid "Enable OStatus support"
 msgstr "Enable OStatus support"
 
-#: mod/admin.php:1410
+#: mod/admin.php:1409
 msgid ""
 "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr "Provide built-in OStatus (StatusNet, GNU Social, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."
 
-#: mod/admin.php:1411
+#: mod/admin.php:1410
 msgid "Only import OStatus threads from our contacts"
 msgstr "Only import OStatus threads from known contacts"
 
-#: mod/admin.php:1411
+#: mod/admin.php:1410
 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 "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 "Normally we import all content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system."
 
-#: mod/admin.php:1412
+#: mod/admin.php:1411
 msgid "OStatus support can only be enabled if threading is enabled."
 msgstr "OStatus support can only be enabled if threading is enabled."
 
-#: mod/admin.php:1414
+#: mod/admin.php:1413
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub"
 " directory."
 msgstr "Diaspora support can't be enabled because Friendica was installed into a sub directory."
 
-#: mod/admin.php:1415
+#: mod/admin.php:1414
 msgid "Enable Diaspora support"
 msgstr "Enable Diaspora support"
 
-#: mod/admin.php:1415
+#: mod/admin.php:1414
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Provide built-in Diaspora network compatibility."
 
-#: mod/admin.php:1416
+#: mod/admin.php:1415
 msgid "Only allow Friendica contacts"
 msgstr "Only allow Friendica contacts"
 
-#: mod/admin.php:1416
+#: mod/admin.php:1415
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "All contacts must use Friendica protocols. All other built-in communication protocols will be disabled."
 
-#: mod/admin.php:1417
+#: mod/admin.php:1416
 msgid "Verify SSL"
 msgstr "Verify SSL"
 
-#: mod/admin.php:1417
+#: mod/admin.php:1416
 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 "If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."
 
-#: mod/admin.php:1418
+#: mod/admin.php:1417
 msgid "Proxy user"
 msgstr "Proxy user"
 
-#: mod/admin.php:1419
+#: mod/admin.php:1418
 msgid "Proxy URL"
 msgstr "Proxy URL"
 
-#: mod/admin.php:1420
+#: mod/admin.php:1419
 msgid "Network timeout"
 msgstr "Network timeout"
 
-#: mod/admin.php:1420
+#: mod/admin.php:1419
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Value is in seconds. Set to 0 for unlimited (not recommended)."
 
-#: mod/admin.php:1421
+#: mod/admin.php:1420
 msgid "Maximum Load Average"
 msgstr "Maximum load average"
 
-#: mod/admin.php:1421
+#: mod/admin.php:1420
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximum system load before delivery and poll processes are deferred (default 50)."
 
-#: mod/admin.php:1422
+#: mod/admin.php:1421
 msgid "Maximum Load Average (Frontend)"
 msgstr "Maximum load average (frontend)"
 
-#: mod/admin.php:1422
+#: mod/admin.php:1421
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr "Maximum system load before the frontend quits service (default 50)."
 
-#: mod/admin.php:1423
+#: mod/admin.php:1422
 msgid "Minimal Memory"
 msgstr "Minimal memory"
 
-#: mod/admin.php:1423
+#: mod/admin.php:1422
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
 msgstr "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated)."
 
-#: mod/admin.php:1424
+#: mod/admin.php:1423
 msgid "Maximum table size for optimization"
 msgstr "Maximum table size for optimization"
 
-#: mod/admin.php:1424
+#: mod/admin.php:1423
 msgid ""
 "Maximum table size (in MB) for the automatic optimization. Enter -1 to "
 "disable it."
 msgstr "Maximum table size (in MB) for automatic optimization. Enter -1 to disable it."
 
-#: mod/admin.php:1425
+#: mod/admin.php:1424
 msgid "Minimum level of fragmentation"
 msgstr "Minimum level of fragmentation"
 
-#: mod/admin.php:1425
+#: mod/admin.php:1424
 msgid ""
 "Minimum fragmenation level to start the automatic optimization - default "
 "value is 30%."
 msgstr "Minimum fragmentation level to start the automatic optimization (default 30%)."
 
-#: mod/admin.php:1427
+#: mod/admin.php:1426
 msgid "Periodical check of global contacts"
 msgstr "Periodical check of global contacts"
 
-#: mod/admin.php:1427
+#: mod/admin.php:1426
 msgid ""
 "If enabled, the global contacts are checked periodically for missing or "
 "outdated data and the vitality of the contacts and servers."
 msgstr "This checks global contacts periodically for missing or outdated data and the vitality of the contacts and servers."
 
-#: mod/admin.php:1428
+#: mod/admin.php:1427
 msgid "Days between requery"
 msgstr "Days between enquiry"
 
-#: mod/admin.php:1428
+#: mod/admin.php:1427
 msgid "Number of days after which a server is requeried for his contacts."
-msgstr "Number of days after which a server is required check contacts."
+msgstr "Number of days after which a server is rechecked for contacts."
 
-#: mod/admin.php:1429
+#: mod/admin.php:1428
 msgid "Discover contacts from other servers"
 msgstr "Discover contacts from other servers"
 
-#: mod/admin.php:1429
+#: mod/admin.php:1428
 msgid ""
 "Periodically query other servers for contacts. You can choose between "
 "'users': the users on the remote system, 'Global Contacts': active contacts "
@@ -5004,32 +4479,32 @@ msgid ""
 "Global Contacts'."
 msgstr "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 recommend setting is 'Users, Global Contacts'."
 
-#: mod/admin.php:1430
+#: mod/admin.php:1429
 msgid "Timeframe for fetching global contacts"
 msgstr "Time-frame for fetching global contacts"
 
-#: mod/admin.php:1430
+#: mod/admin.php:1429
 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 "If discovery is activated, this value defines the time-frame for the activity of the global contacts that are fetched from other servers."
 
-#: mod/admin.php:1431
+#: mod/admin.php:1430
 msgid "Search the local directory"
 msgstr "Search the local directory"
 
-#: mod/admin.php:1431
+#: mod/admin.php:1430
 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 "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."
 
-#: mod/admin.php:1433
+#: mod/admin.php:1432
 msgid "Publish server information"
 msgstr "Publish server information"
 
-#: mod/admin.php:1433
+#: mod/admin.php:1432
 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 "
@@ -5037,50 +4512,50 @@ msgid ""
 " href='http://the-federation.info/'>the-federation.info</a> for details."
 msgstr "This publishes generic data about the server and its usage. 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."
 
-#: mod/admin.php:1435
+#: mod/admin.php:1434
 msgid "Check upstream version"
 msgstr "Check upstream version"
 
-#: mod/admin.php:1435
+#: mod/admin.php:1434
 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 "Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."
 
-#: mod/admin.php:1436
+#: mod/admin.php:1435
 msgid "Suppress Tags"
 msgstr "Suppress tags"
 
-#: mod/admin.php:1436
+#: mod/admin.php:1435
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr "Suppress listed hashtags at the end of posts."
 
-#: mod/admin.php:1437
+#: mod/admin.php:1436
 msgid "Clean database"
 msgstr "Clean database"
 
-#: mod/admin.php:1437
+#: mod/admin.php:1436
 msgid ""
 "Remove old remote items, orphaned database records and old content from some"
 " other helper tables."
-msgstr "Remove old remote items, orphaned database records and old content from some other helper tables."
+msgstr "Remove old remote items, orphaned database records, and old content from some other helper tables."
 
-#: mod/admin.php:1438
+#: mod/admin.php:1437
 msgid "Lifespan of remote items"
 msgstr "Lifespan of remote items"
 
-#: mod/admin.php:1438
+#: mod/admin.php:1437
 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 "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 "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 behavior."
 
-#: mod/admin.php:1439
+#: mod/admin.php:1438
 msgid "Lifespan of unclaimed items"
 msgstr "Lifespan of unclaimed items"
 
-#: mod/admin.php:1439
+#: mod/admin.php:1438
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "unclaimed remote items (mostly content from the relay) will be deleted. "
@@ -5088,129 +4563,129 @@ msgid ""
 "items if set to 0."
 msgstr "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."
 
-#: mod/admin.php:1440
+#: mod/admin.php:1439
 msgid "Path to item cache"
 msgstr "Path to item cache"
 
-#: mod/admin.php:1440
+#: mod/admin.php:1439
 msgid "The item caches buffers generated bbcode and external images."
-msgstr "The item caches buffers generated bbcode and external images."
+msgstr "The item cache retains expanded bbcode and external images."
 
-#: mod/admin.php:1441
+#: mod/admin.php:1440
 msgid "Cache duration in seconds"
 msgstr "Cache duration in seconds"
 
-#: mod/admin.php:1441
+#: mod/admin.php:1440
 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 "How long should cache files be held? (Default 86400 seconds - one day;  -1 disables item cache)"
 
-#: mod/admin.php:1442
+#: mod/admin.php:1441
 msgid "Maximum numbers of comments per post"
-msgstr "Maximum numbers of comments per post"
+msgstr "Maximum number of comments per post"
 
-#: mod/admin.php:1442
+#: mod/admin.php:1441
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr "How many comments should be shown for each post? (Default 100)"
 
-#: mod/admin.php:1443
+#: mod/admin.php:1442
 msgid "Temp path"
 msgstr "Temp path"
 
-#: mod/admin.php:1443
+#: mod/admin.php:1442
 msgid ""
 "If you have a restricted system where the webserver can't access the system "
 "temp path, enter another path here."
-msgstr "Enter a different tmp path, if your system restricts the webserver's access to the system temp path."
+msgstr "Enter a different temp path if your system restricts the webserver's access to the system temp path."
 
-#: mod/admin.php:1444
+#: mod/admin.php:1443
 msgid "Base path to installation"
 msgstr "Base path to installation"
 
-#: mod/admin.php:1444
+#: mod/admin.php:1443
 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 "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."
 
-#: mod/admin.php:1445
+#: mod/admin.php:1444
 msgid "Disable picture proxy"
 msgstr "Disable picture proxy"
 
-#: mod/admin.php:1445
+#: mod/admin.php:1444
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
-" systems with very low bandwith."
-msgstr "The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."
+" systems with very low bandwidth."
+msgstr ""
 
-#: mod/admin.php:1446
+#: mod/admin.php:1445
 msgid "Only search in tags"
 msgstr "Only search in tags"
 
-#: mod/admin.php:1446
+#: mod/admin.php:1445
 msgid "On large systems the text search can slow down the system extremely."
-msgstr "On large systems the text search can slow down the system significantly."
+msgstr "On large systems, the text search can slow down the system significantly."
 
-#: mod/admin.php:1448
+#: mod/admin.php:1447
 msgid "New base url"
 msgstr "New base URL"
 
-#: mod/admin.php:1448
+#: mod/admin.php:1447
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and"
 " Diaspora* contacts of all users."
-msgstr "Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users."
+msgstr "Change base URL for this server. Sends a relocate message to all Friendica and Diaspora* contacts, for all users."
 
-#: mod/admin.php:1450
+#: mod/admin.php:1449
 msgid "RINO Encryption"
 msgstr "RINO Encryption"
 
-#: mod/admin.php:1450
+#: mod/admin.php:1449
 msgid "Encryption layer between nodes."
 msgstr "Encryption layer between nodes."
 
-#: mod/admin.php:1450
+#: mod/admin.php:1449
 msgid "Enabled"
 msgstr "Enabled"
 
-#: mod/admin.php:1452
+#: mod/admin.php:1451
 msgid "Maximum number of parallel workers"
 msgstr "Maximum number of parallel workers"
 
-#: mod/admin.php:1452
+#: mod/admin.php:1451
 msgid ""
 "On shared hosters set this to 2. On larger systems, values of 10 are great. "
 "Default value is 4."
-msgstr "On shared hosts set this to 2. On larger systems, values of 10 are great. Default value is 4."
+msgstr "On shared hosts, set this to 2. On larger systems, values of 10 are great. Default value is 4."
 
-#: mod/admin.php:1453
+#: mod/admin.php:1452
 msgid "Don't use 'proc_open' with the worker"
 msgstr "Don't use 'proc_open' with the worker"
 
-#: mod/admin.php:1453
+#: mod/admin.php:1452
 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 "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 "Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosts. If this is enabled, you should increase the frequency of worker calls in your crontab."
 
-#: mod/admin.php:1454
+#: mod/admin.php:1453
 msgid "Enable fastlane"
 msgstr "Enable fast-lane"
 
-#: mod/admin.php:1454
+#: mod/admin.php:1453
 msgid ""
 "When enabed, the fastlane mechanism starts an additional worker if processes"
 " with higher priority are blocked by processes of lower priority."
 msgstr "The fast-lane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."
 
-#: mod/admin.php:1455
+#: mod/admin.php:1454
 msgid "Enable frontend worker"
 msgstr "Enable frontend worker"
 
-#: mod/admin.php:1455
+#: mod/admin.php:1454
 #, php-format
 msgid ""
 "When enabled the Worker process is triggered when backend access is "
@@ -5218,134 +4693,134 @@ msgid ""
 "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 "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 "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."
 
-#: mod/admin.php:1457
+#: mod/admin.php:1456
 msgid "Subscribe to relay"
 msgstr "Subscribe to relay"
 
-#: mod/admin.php:1457
+#: mod/admin.php:1456
 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 "Receive public posts from the specified relay. Post will be included in searches, subscribed tags and on the global community page."
+msgstr "Receive public posts from the specified relay. Post will be included in searches, subscribed tags, and on the global community page."
 
-#: mod/admin.php:1458
+#: mod/admin.php:1457
 msgid "Relay server"
 msgstr "Relay server"
 
-#: mod/admin.php:1458
+#: mod/admin.php:1457
 msgid ""
 "Address of the relay server where public posts should be send to. For "
 "example https://relay.diasp.org"
-msgstr "Address of the relay server where public posts should be send to. For example https://relay.diasp.org"
+msgstr "Address of the relay server where public posts should be sent. For example https://relay.diasp.org"
 
-#: mod/admin.php:1459
+#: mod/admin.php:1458
 msgid "Direct relay transfer"
 msgstr "Direct relay transfer"
 
-#: mod/admin.php:1459
+#: mod/admin.php:1458
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr "Enables direct transfer to other servers without using a relay server."
 
-#: mod/admin.php:1460
+#: mod/admin.php:1459
 msgid "Relay scope"
 msgstr "Relay scope"
 
-#: mod/admin.php:1460
+#: mod/admin.php:1459
 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 "Set to 'all' or 'tags'. 'all' means receive every public post; 'tags' receive public posts only with specified tags."
 
-#: mod/admin.php:1460
+#: mod/admin.php:1459
 msgid "all"
 msgstr "all"
 
-#: mod/admin.php:1460
+#: mod/admin.php:1459
 msgid "tags"
 msgstr "tags"
 
-#: mod/admin.php:1461
+#: mod/admin.php:1460
 msgid "Server tags"
 msgstr "Server tags"
 
-#: mod/admin.php:1461
+#: mod/admin.php:1460
 msgid "Comma separated list of tags for the 'tags' subscription."
-msgstr "Comma separated tags for subscription."
+msgstr "Comma-separated tags for subscription."
 
-#: mod/admin.php:1462
+#: mod/admin.php:1461
 msgid "Allow user tags"
 msgstr "Allow user tags"
 
-#: mod/admin.php:1462
+#: mod/admin.php:1461
 msgid ""
 "If enabled, the tags from the saved searches will used for the 'tags' "
 "subscription in addition to the 'relay_server_tags'."
 msgstr "Use user-generated tags from saved searches for 'tags' subscription in addition to 'relay_server_tags'."
 
-#: mod/admin.php:1490
+#: mod/admin.php:1489
 msgid "Update has been marked successful"
 msgstr "Update has been marked successful"
 
-#: mod/admin.php:1497
+#: mod/admin.php:1496
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr "Database structure update %s was successfully applied."
 
-#: mod/admin.php:1500
+#: mod/admin.php:1499
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
-msgstr "Executing of database structure update %s failed with error: %s"
-
-#: mod/admin.php:1513
-#, php-format
-msgid "Executing %s failed with error: %s"
-msgstr "Executing %s failed with error: %s"
+msgstr "Execution of database structure update %s failed with error: %s"
 
 #: mod/admin.php:1515
 #, php-format
+msgid "Executing %s failed with error: %s"
+msgstr "Execution of %s failed with error: %s"
+
+#: mod/admin.php:1517
+#, php-format
 msgid "Update %s was successfully applied."
 msgstr "Update %s was successfully applied."
 
-#: mod/admin.php:1518
+#: mod/admin.php:1520
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Update %s did not return a status. Unknown if it succeeded."
 
-#: mod/admin.php:1521
+#: mod/admin.php:1523
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr "There was no additional update function %s that needed to be called."
 
-#: mod/admin.php:1541
+#: mod/admin.php:1546
 msgid "No failed updates."
 msgstr "No failed updates."
 
-#: mod/admin.php:1542
+#: mod/admin.php:1547
 msgid "Check database structure"
 msgstr "Check database structure"
 
-#: mod/admin.php:1547
+#: mod/admin.php:1552
 msgid "Failed Updates"
 msgstr "Failed updates"
 
-#: mod/admin.php:1548
+#: mod/admin.php:1553
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "This does not include updates prior to 1139, which did not return a status."
 
-#: mod/admin.php:1549
+#: mod/admin.php:1554
 msgid "Mark success (if update was manually applied)"
 msgstr "Mark success (if update was manually applied)"
 
-#: mod/admin.php:1550
+#: mod/admin.php:1555
 msgid "Attempt to execute this update step automatically"
 msgstr "Attempt to execute this update step automatically"
 
-#: mod/admin.php:1589
+#: mod/admin.php:1594
 #, php-format
 msgid ""
 "\n"
@@ -5353,7 +4828,7 @@ msgid ""
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr "\n\t\t\tDear %1$s,\n\t\t\t\tThe administrator of %2$s has set up an account for you."
 
-#: mod/admin.php:1592
+#: mod/admin.php:1597
 #, php-format
 msgid ""
 "\n"
@@ -5385,208 +4860,208 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr "\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."
 
-#: mod/admin.php:1626 src/Model/User.php:663
+#: mod/admin.php:1631 src/Model/User.php:665
 #, php-format
 msgid "Registration details for %s"
 msgstr "Registration details for %s"
 
-#: mod/admin.php:1636
+#: mod/admin.php:1641
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s user blocked/unblocked"
 msgstr[1] "%s users blocked/unblocked"
 
-#: mod/admin.php:1642
+#: mod/admin.php:1647
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s user deleted"
 msgstr[1] "%s users deleted"
 
-#: mod/admin.php:1689
+#: mod/admin.php:1694
 #, php-format
 msgid "User '%s' deleted"
 msgstr "User '%s' deleted"
 
-#: mod/admin.php:1697
+#: mod/admin.php:1702
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "User '%s' unblocked"
 
-#: mod/admin.php:1697
+#: mod/admin.php:1702
 #, php-format
 msgid "User '%s' blocked"
 msgstr "User '%s' blocked"
 
-#: mod/admin.php:1754 mod/settings.php:1058
+#: mod/admin.php:1759 mod/settings.php:1058
 msgid "Normal Account Page"
 msgstr "Standard"
 
-#: mod/admin.php:1755 mod/settings.php:1062
+#: mod/admin.php:1760 mod/settings.php:1062
 msgid "Soapbox Page"
 msgstr "Soapbox"
 
-#: mod/admin.php:1756 mod/settings.php:1066
+#: mod/admin.php:1761 mod/settings.php:1066
 msgid "Public Forum"
 msgstr "Public forum"
 
-#: mod/admin.php:1757 mod/settings.php:1070
+#: mod/admin.php:1762 mod/settings.php:1070
 msgid "Automatic Friend Page"
 msgstr "Love-all"
 
-#: mod/admin.php:1758
+#: mod/admin.php:1763
 msgid "Private Forum"
 msgstr "Private Forum"
 
-#: mod/admin.php:1761 mod/settings.php:1042
+#: mod/admin.php:1766 mod/settings.php:1042
 msgid "Personal Page"
 msgstr "Personal Page"
 
-#: mod/admin.php:1762 mod/settings.php:1046
+#: mod/admin.php:1767 mod/settings.php:1046
 msgid "Organisation Page"
 msgstr "Organization Page"
 
-#: mod/admin.php:1763 mod/settings.php:1050
+#: mod/admin.php:1768 mod/settings.php:1050
 msgid "News Page"
 msgstr "News Page"
 
-#: mod/admin.php:1764 mod/settings.php:1054
+#: mod/admin.php:1769 mod/settings.php:1054
 msgid "Community Forum"
 msgstr "Community Forum"
 
-#: mod/admin.php:1811 mod/admin.php:1822 mod/admin.php:1835 mod/admin.php:1853
+#: mod/admin.php:1816 mod/admin.php:1827 mod/admin.php:1840 mod/admin.php:1858
 #: src/Content/ContactSelector.php:82
 msgid "Email"
 msgstr "Email"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1816 mod/admin.php:1840
 msgid "Register date"
 msgstr "Registration date"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1816 mod/admin.php:1840
 msgid "Last login"
 msgstr "Last login"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1816 mod/admin.php:1840
 msgid "Last item"
 msgstr "Last item"
 
-#: mod/admin.php:1811
+#: mod/admin.php:1816
 msgid "Type"
 msgstr "Type"
 
-#: mod/admin.php:1818
+#: mod/admin.php:1823
 msgid "Add User"
 msgstr "Add user"
 
-#: mod/admin.php:1820
+#: mod/admin.php:1825
 msgid "User registrations waiting for confirm"
 msgstr "User registrations awaiting confirmation"
 
-#: mod/admin.php:1821
+#: mod/admin.php:1826
 msgid "User waiting for permanent deletion"
 msgstr "User awaiting permanent deletion"
 
-#: mod/admin.php:1822
+#: mod/admin.php:1827
 msgid "Request date"
 msgstr "Request date"
 
-#: mod/admin.php:1823
+#: mod/admin.php:1828
 msgid "No registrations."
 msgstr "No registrations."
 
-#: mod/admin.php:1824
+#: mod/admin.php:1829
 msgid "Note from the user"
 msgstr "Note from the user"
 
-#: mod/admin.php:1825 mod/notifications.php:178 mod/notifications.php:262
+#: mod/admin.php:1830 mod/notifications.php:178 mod/notifications.php:262
 msgid "Approve"
 msgstr "Approve"
 
-#: mod/admin.php:1826
+#: mod/admin.php:1831
 msgid "Deny"
 msgstr "Deny"
 
-#: mod/admin.php:1830
+#: mod/admin.php:1835
 msgid "Site admin"
 msgstr "Site admin"
 
-#: mod/admin.php:1831
+#: mod/admin.php:1836
 msgid "Account expired"
 msgstr "Account expired"
 
-#: mod/admin.php:1834
+#: mod/admin.php:1839
 msgid "New User"
 msgstr "New user"
 
-#: mod/admin.php:1835
+#: mod/admin.php:1840
 msgid "Deleted since"
 msgstr "Deleted since"
 
-#: mod/admin.php:1840
+#: mod/admin.php:1845
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
-msgstr "Selected users will be deleted!\\n\\nEverything these users has posted on this site will be permanently deleted!\\n\\nAre you sure?"
+msgstr "Selected users will be deleted!\\n\\nEverything these users have posted on this site will be permanently deleted!\\n\\nAre you sure?"
 
-#: mod/admin.php:1841
+#: mod/admin.php:1846
 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 "The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"
 
-#: mod/admin.php:1851
+#: mod/admin.php:1856
 msgid "Name of the new user."
 msgstr "Name of the new user."
 
-#: mod/admin.php:1852
+#: mod/admin.php:1857
 msgid "Nickname"
 msgstr "Nickname"
 
-#: mod/admin.php:1852
+#: mod/admin.php:1857
 msgid "Nickname of the new user."
 msgstr "Nickname of the new user."
 
-#: mod/admin.php:1853
+#: mod/admin.php:1858
 msgid "Email address of the new user."
 msgstr "Email address of the new user."
 
-#: mod/admin.php:1895
+#: mod/admin.php:1900
 #, php-format
 msgid "Addon %s disabled."
 msgstr "Addon %s disabled."
 
-#: mod/admin.php:1899
+#: mod/admin.php:1904
 #, php-format
 msgid "Addon %s enabled."
 msgstr "Addon %s enabled."
 
-#: mod/admin.php:1909 mod/admin.php:2158
+#: mod/admin.php:1914 mod/admin.php:2163
 msgid "Disable"
 msgstr "Disable"
 
-#: mod/admin.php:1912 mod/admin.php:2161
+#: mod/admin.php:1917 mod/admin.php:2166
 msgid "Enable"
 msgstr "Enable"
 
-#: mod/admin.php:1934 mod/admin.php:2203
+#: mod/admin.php:1939 mod/admin.php:2209
 msgid "Toggle"
 msgstr "Toggle"
 
-#: mod/admin.php:1942 mod/admin.php:2212
+#: mod/admin.php:1947 mod/admin.php:2218
 msgid "Author: "
 msgstr "Author: "
 
-#: mod/admin.php:1943 mod/admin.php:2213
+#: mod/admin.php:1948 mod/admin.php:2219
 msgid "Maintainer: "
 msgstr "Maintainer: "
 
-#: mod/admin.php:1995
+#: mod/admin.php:2000
 msgid "Reload active addons"
 msgstr "Reload active addons"
 
-#: mod/admin.php:2000
+#: mod/admin.php:2005
 #, php-format
 msgid ""
 "There are currently no addons available on your node. You can find the "
@@ -5594,70 +5069,70 @@ msgid ""
 " the open addon registry at %2$s"
 msgstr "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"
 
-#: mod/admin.php:2120
+#: mod/admin.php:2125
 msgid "No themes found."
 msgstr "No themes found."
 
-#: mod/admin.php:2194
+#: mod/admin.php:2200
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: mod/admin.php:2248
+#: mod/admin.php:2254
 msgid "Reload active themes"
 msgstr "Reload active themes"
 
-#: mod/admin.php:2253
+#: mod/admin.php:2259
 #, php-format
 msgid "No themes found on the system. They should be placed in %1$s"
 msgstr "No themes found on the system. They should be placed in %1$s"
 
-#: mod/admin.php:2254
+#: mod/admin.php:2260
 msgid "[Experimental]"
 msgstr "[Experimental]"
 
-#: mod/admin.php:2255
+#: mod/admin.php:2261
 msgid "[Unsupported]"
 msgstr "[Unsupported]"
 
-#: mod/admin.php:2279
+#: mod/admin.php:2285
 msgid "Log settings updated."
 msgstr "Log settings updated."
 
-#: mod/admin.php:2311
+#: mod/admin.php:2317
 msgid "PHP log currently enabled."
 msgstr "PHP log currently enabled."
 
-#: mod/admin.php:2313
+#: mod/admin.php:2319
 msgid "PHP log currently disabled."
 msgstr "PHP log currently disabled."
 
-#: mod/admin.php:2322
+#: mod/admin.php:2328
 msgid "Clear"
 msgstr "Clear"
 
-#: mod/admin.php:2326
+#: mod/admin.php:2332
 msgid "Enable Debugging"
 msgstr "Enable debugging"
 
-#: mod/admin.php:2327
+#: mod/admin.php:2333
 msgid "Log file"
 msgstr "Log file"
 
-#: mod/admin.php:2327
+#: mod/admin.php:2333
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Must be writable by web server and relative to your Friendica top-level directory."
 
-#: mod/admin.php:2328
+#: mod/admin.php:2334
 msgid "Log level"
 msgstr "Log level"
 
-#: mod/admin.php:2330
+#: mod/admin.php:2336
 msgid "PHP logging"
 msgstr "PHP logging"
 
-#: mod/admin.php:2331
+#: mod/admin.php:2337
 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 "
@@ -5666,37 +5141,71 @@ msgid ""
 "'display_errors' is to enable these options, set to '0' to disable them."
 msgstr "To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The file name 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."
 
-#: mod/admin.php:2362
+#: mod/admin.php:2368
 #, 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 "Error trying to open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see if file %1$s exist and is readable."
 
-#: mod/admin.php:2366
+#: mod/admin.php:2372
 #, 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 "Couldn't open <strong>%1$s</strong> log file.\\r\\n<br/>Check if file %1$s is readable."
 
-#: mod/admin.php:2457 mod/admin.php:2458 mod/settings.php:767
+#: mod/admin.php:2463 mod/admin.php:2464 mod/settings.php:767
 msgid "Off"
 msgstr "Off"
 
-#: mod/admin.php:2457 mod/admin.php:2458 mod/settings.php:767
+#: mod/admin.php:2463 mod/admin.php:2464 mod/settings.php:767
 msgid "On"
 msgstr "On"
 
-#: mod/admin.php:2458
+#: mod/admin.php:2464
 #, php-format
 msgid "Lock feature %s"
 msgstr "Lock feature %s"
 
-#: mod/admin.php:2466
+#: mod/admin.php:2472
 msgid "Manage Additional Features"
 msgstr "Manage additional features"
 
+#: mod/community.php:51
+msgid "Community option not available."
+msgstr "Community option not available."
+
+#: mod/community.php:68
+msgid "Not available."
+msgstr "Not available."
+
+#: mod/community.php:81
+msgid "Local Community"
+msgstr "Local community"
+
+#: mod/community.php:84
+msgid "Posts from local users on this server"
+msgstr "Posts from local users on this server"
+
+#: mod/community.php:92
+msgid "Global Community"
+msgstr "Global community"
+
+#: mod/community.php:95
+msgid "Posts from users of the whole federated network"
+msgstr "Posts from users of the whole federated network"
+
+#: mod/community.php:141 mod/search.php:228
+msgid "No results."
+msgstr "No results."
+
+#: 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 "This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."
+
 #: 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."
@@ -5747,7 +5256,7 @@ msgstr "Our site encryption key is apparently messed up."
 
 #: mod/dfrn_confirm.php:471
 msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr "An empty URL was provided or the URL could not be decrypted by us."
+msgstr "An empty URL was provided, or the URL could not be decrypted by us."
 
 #: mod/dfrn_confirm.php:487
 msgid "Contact record was not found for you on our site."
@@ -5926,6 +5435,139 @@ msgid ""
 " bar."
 msgstr " - please do not use this form.  Instead, enter %s into your Diaspora search bar."
 
+#: mod/events.php:105 mod/events.php:107
+msgid "Event can not end before it has started."
+msgstr "Event cannot end before it has started."
+
+#: mod/events.php:114 mod/events.php:116
+msgid "Event title and start time are required."
+msgstr "Event title and starting time are required."
+
+#: mod/events.php:393
+msgid "Create New Event"
+msgstr "Create new event"
+
+#: mod/events.php:507
+msgid "Event details"
+msgstr "Event details"
+
+#: mod/events.php:508
+msgid "Starting date and Title are required."
+msgstr "Starting date and title are required."
+
+#: mod/events.php:509 mod/events.php:510
+msgid "Event Starts:"
+msgstr "Event starts:"
+
+#: mod/events.php:509 mod/events.php:521 mod/profiles.php:607
+msgid "Required"
+msgstr "Required"
+
+#: mod/events.php:511 mod/events.php:527
+msgid "Finish date/time is not known or not relevant"
+msgstr "Finish date/time is not known or not relevant"
+
+#: mod/events.php:513 mod/events.php:514
+msgid "Event Finishes:"
+msgstr "Event finishes:"
+
+#: mod/events.php:515 mod/events.php:528
+msgid "Adjust for viewer timezone"
+msgstr "Adjust for viewer's time zone"
+
+#: mod/events.php:517
+msgid "Description:"
+msgstr "Description:"
+
+#: mod/events.php:521 mod/events.php:523
+msgid "Title:"
+msgstr "Title:"
+
+#: mod/events.php:524 mod/events.php:525
+msgid "Share this event"
+msgstr "Share this event"
+
+#: mod/events.php:532 src/Model/Profile.php:862
+msgid "Basic"
+msgstr "Basic"
+
+#: mod/events.php:534 mod/photos.php:1086 mod/photos.php:1435
+#: src/Core/ACL.php:318
+msgid "Permissions"
+msgstr "Permissions"
+
+#: mod/events.php:553
+msgid "Failed to remove event"
+msgstr "Failed to remove event"
+
+#: mod/events.php:555
+msgid "Event removed"
+msgstr "Event removed"
+
+#: mod/group.php:36
+msgid "Group created."
+msgstr "Group created."
+
+#: mod/group.php:42
+msgid "Could not create group."
+msgstr "Could not create group."
+
+#: mod/group.php:56 mod/group.php:157
+msgid "Group not found."
+msgstr "Group not found."
+
+#: mod/group.php:70
+msgid "Group name changed."
+msgstr "Group name changed."
+
+#: mod/group.php:97
+msgid "Save Group"
+msgstr "Save group"
+
+#: mod/group.php:102
+msgid "Create a group of contacts/friends."
+msgstr "Create a group of contacts/friends."
+
+#: mod/group.php:103 mod/group.php:199 src/Model/Group.php:421
+msgid "Group Name: "
+msgstr "Group name: "
+
+#: mod/group.php:127
+msgid "Group removed."
+msgstr "Group removed."
+
+#: mod/group.php:129
+msgid "Unable to remove group."
+msgstr "Unable to remove group."
+
+#: mod/group.php:192
+msgid "Delete Group"
+msgstr "Delete group"
+
+#: mod/group.php:198
+msgid "Group Editor"
+msgstr "Group Editor"
+
+#: mod/group.php:203
+msgid "Edit Group Name"
+msgstr "Edit group name"
+
+#: mod/group.php:213
+msgid "Members"
+msgstr "Members"
+
+#: mod/group.php:216 mod/network.php:639
+msgid "Group is empty"
+msgstr "Group is empty"
+
+#: mod/group.php:229
+msgid "Remove contact from group"
+msgstr "Remove contact from group"
+
+#: mod/group.php:253
+msgid "Add contact to group"
+msgstr "Add contact to group"
+
 #: mod/item.php:114
 msgid "Unable to locate original post."
 msgstr "Unable to locate original post."
@@ -5957,6 +5599,103 @@ msgstr "Please contact the sender by replying to this post if you do not wish to
 msgid "%s posted an update."
 msgstr "%s posted an update."
 
+#: mod/network.php:194 mod/search.php:37
+msgid "Remove term"
+msgstr "Remove term"
+
+#: mod/network.php:201 mod/search.php:46 src/Content/Feature.php:100
+msgid "Saved Searches"
+msgstr "Saved searches"
+
+#: mod/network.php:202 src/Model/Group.php:413
+msgid "add"
+msgstr "add"
+
+#: 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] "Warning: This group contains %s member from a network that doesn't allow non public messages."
+msgstr[1] "Warning: This group contains %s members from a network that doesn't allow non-public messages."
+
+#: mod/network.php:550
+msgid "Messages in this group won't be send to these receivers."
+msgstr "Messages in this group won't be sent to these receivers."
+
+#: mod/network.php:618
+msgid "No such group"
+msgstr "No such group"
+
+#: mod/network.php:643
+#, php-format
+msgid "Group: %s"
+msgstr "Group: %s"
+
+#: mod/network.php:669
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "Private messages to this person are at risk of public disclosure."
+
+#: mod/network.php:672
+msgid "Invalid contact."
+msgstr "Invalid contact."
+
+#: mod/network.php:943
+msgid "Commented Order"
+msgstr "Commented last"
+
+#: mod/network.php:946
+msgid "Sort by Comment Date"
+msgstr "Sort by comment date"
+
+#: mod/network.php:951
+msgid "Posted Order"
+msgstr "Posted last"
+
+#: mod/network.php:954
+msgid "Sort by Post Date"
+msgstr "Sort by post date"
+
+#: mod/network.php:962 mod/profiles.php:594
+#: src/Core/NotificationsManager.php:185
+msgid "Personal"
+msgstr "Personal"
+
+#: mod/network.php:965
+msgid "Posts that mention or involve you"
+msgstr "Posts mentioning or involving me"
+
+#: mod/network.php:973
+msgid "New"
+msgstr "New"
+
+#: mod/network.php:976
+msgid "Activity Stream - by date"
+msgstr "Activity Stream - by date"
+
+#: mod/network.php:984
+msgid "Shared Links"
+msgstr "Shared links"
+
+#: mod/network.php:987
+msgid "Interesting Links"
+msgstr "Interesting links"
+
+#: mod/network.php:995
+msgid "Starred"
+msgstr "Starred"
+
+#: mod/network.php:998
+msgid "Favourite Posts"
+msgstr "My favorite posts"
+
+#: mod/notes.php:52 src/Model/Profile.php:944
+msgid "Personal Notes"
+msgstr "Personal notes"
+
 #: mod/notifications.php:37
 msgid "Invalid request identifier."
 msgstr "Invalid request identifier."
@@ -6020,7 +5759,7 @@ msgstr "Shall your connection be in both directions or not?"
 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 "Accepting %s as a friend allows %s to subscribe to your posts; you will also receive updates from them in your news feed."
+msgstr "Accepting %s as a friend allows %s to subscribe to your posts. You will also receive updates from them in your news feed."
 
 #: mod/notifications.php:201
 #, php-format
@@ -6065,21 +5804,235 @@ msgstr "Show all"
 msgid "No more %s notifications."
 msgstr "No more %s notifications."
 
+#: mod/openid.php:29
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID protocol error. No ID returned."
+
+#: mod/openid.php:66
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr "Account not found and OpenID registration is not permitted on this site."
+
+#: mod/openid.php:116 src/Module/Login.php:86 src/Module/Login.php:135
+msgid "Login failed."
+msgstr "Login failed."
+
+#: mod/photos.php:108 src/Model/Profile.php:905
+msgid "Photo Albums"
+msgstr "Photo Albums"
+
+#: mod/photos.php:109 mod/photos.php:1708
+msgid "Recent Photos"
+msgstr "Recent photos"
+
+#: mod/photos.php:112 mod/photos.php:1198 mod/photos.php:1710
+msgid "Upload New Photos"
+msgstr "Upload new photos"
+
+#: mod/photos.php:126 mod/settings.php:51
+msgid "everybody"
+msgstr "everybody"
+
+#: mod/photos.php:184
+msgid "Contact information unavailable"
+msgstr "Contact information unavailable"
+
+#: mod/photos.php:204
+msgid "Album not found."
+msgstr "Album not found."
+
+#: mod/photos.php:234 mod/photos.php:245 mod/photos.php:1149
+msgid "Delete Album"
+msgstr "Delete album"
+
+#: mod/photos.php:243
+msgid "Do you really want to delete this photo album and all its photos?"
+msgstr "Do you really want to delete this photo album and all its photos?"
+
+#: mod/photos.php:303 mod/photos.php:314 mod/photos.php:1440
+msgid "Delete Photo"
+msgstr "Delete photo"
+
+#: mod/photos.php:312
+msgid "Do you really want to delete this photo?"
+msgstr "Do you really want to delete this photo?"
+
+#: mod/photos.php:655
+msgid "a photo"
+msgstr "a photo"
+
+#: mod/photos.php:655
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
+msgstr "%1$s was tagged in %2$s by %3$s"
+
+#: mod/photos.php:757
+msgid "Image upload didn't complete, please try again"
+msgstr "Image upload didn't complete. Please try again."
+
+#: mod/photos.php:760
+msgid "Image file is missing"
+msgstr "Image file is missing"
+
+#: mod/photos.php:765
+msgid ""
+"Server can't accept new file upload at this time, please contact your "
+"administrator"
+msgstr "Server can't accept new file uploads at this time. Please contact your administrator."
+
+#: mod/photos.php:791
+msgid "Image file is empty."
+msgstr "Image file is empty."
+
+#: mod/photos.php:928
+msgid "No photos selected"
+msgstr "No photos selected"
+
+#: mod/photos.php:1024 mod/videos.php:309
+msgid "Access to this item is restricted."
+msgstr "Access to this item is restricted."
+
+#: mod/photos.php:1078
+msgid "Upload Photos"
+msgstr "Upload photos"
+
+#: mod/photos.php:1082 mod/photos.php:1144
+msgid "New album name: "
+msgstr "New album name: "
+
+#: mod/photos.php:1083
+msgid "or existing album name: "
+msgstr "or existing album name: "
+
+#: mod/photos.php:1084
+msgid "Do not show a status post for this upload"
+msgstr "Do not show a status post for this upload"
+
+#: mod/photos.php:1094 mod/photos.php:1443 mod/settings.php:1218
+msgid "Show to Groups"
+msgstr "Show to groups"
+
+#: mod/photos.php:1095 mod/photos.php:1444 mod/settings.php:1219
+msgid "Show to Contacts"
+msgstr "Show to contacts"
+
+#: mod/photos.php:1155
+msgid "Edit Album"
+msgstr "Edit album"
+
+#: mod/photos.php:1160
+msgid "Show Newest First"
+msgstr "Show newest first"
+
+#: mod/photos.php:1162
+msgid "Show Oldest First"
+msgstr "Show oldest first"
+
+#: mod/photos.php:1183 mod/photos.php:1693
+msgid "View Photo"
+msgstr "View photo"
+
+#: mod/photos.php:1224
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permission denied. Access to this item may be restricted."
+
+#: mod/photos.php:1226
+msgid "Photo not available"
+msgstr "Photo not available"
+
+#: mod/photos.php:1294
+msgid "View photo"
+msgstr "View photo"
+
+#: mod/photos.php:1294
+msgid "Edit photo"
+msgstr "Edit photo"
+
+#: mod/photos.php:1295
+msgid "Use as profile photo"
+msgstr "Use as profile photo"
+
+#: mod/photos.php:1301 src/Object/Post.php:149
+msgid "Private Message"
+msgstr "Private message"
+
+#: mod/photos.php:1321
+msgid "View Full Size"
+msgstr "View full size"
+
+#: mod/photos.php:1408
+msgid "Tags: "
+msgstr "Tags: "
+
+#: mod/photos.php:1411
+msgid "[Remove any tag]"
+msgstr "[Remove any tag]"
+
+#: mod/photos.php:1426
+msgid "New album name"
+msgstr "New album name"
+
+#: mod/photos.php:1427
+msgid "Caption"
+msgstr "Caption"
+
+#: mod/photos.php:1428
+msgid "Add a Tag"
+msgstr "Add Tag"
+
+#: mod/photos.php:1428
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Example: @bob, @jojo@example.com, #California, #camping"
+
+#: mod/photos.php:1429
+msgid "Do not rotate"
+msgstr "Do not rotate"
+
+#: mod/photos.php:1430
+msgid "Rotate CW (right)"
+msgstr "Rotate right (CW)"
+
+#: mod/photos.php:1431
+msgid "Rotate CCW (left)"
+msgstr "Rotate left (CCW)"
+
+#: mod/photos.php:1465 src/Object/Post.php:304
+msgid "I like this (toggle)"
+msgstr "I like this (toggle)"
+
+#: mod/photos.php:1466 src/Object/Post.php:305
+msgid "I don't like this (toggle)"
+msgstr "I don't like this (toggle)"
+
+#: 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 "Comment"
+
+#: mod/photos.php:1628
+msgid "Map"
+msgstr "Map"
+
+#: mod/photos.php:1699 mod/videos.php:387
+msgid "View Album"
+msgstr "View album"
+
 #: mod/profile.php:37 src/Model/Profile.php:118
 msgid "Requested profile is not available."
 msgstr "Requested profile is unavailable."
 
-#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1251
+#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1250
 #, php-format
 msgid "%s's timeline"
 msgstr "%s's timeline"
 
-#: mod/profile.php:79 src/Protocol/OStatus.php:1252
+#: mod/profile.php:79 src/Protocol/OStatus.php:1251
 #, php-format
 msgid "%s's posts"
 msgstr "%s's posts"
 
-#: mod/profile.php:80 src/Protocol/OStatus.php:1253
+#: mod/profile.php:80 src/Protocol/OStatus.php:1252
 #, php-format
 msgid "%s's comments"
 msgstr "%s's comments"
@@ -6418,7 +6371,7 @@ msgstr "Registration successful. Please check your email for further instruction
 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 "Failed to send email message. Here your account details:<br> login: %s<br> password: %s<br><br>You can change your password after login."
+msgstr "Failed to send email message. Here are your account details:<br> login: %s<br> password: %s<br><br>You can change your password after login."
 
 #: mod/register.php:111
 msgid "Registration successful."
@@ -6458,7 +6411,7 @@ msgstr "Note for the admin"
 
 #: mod/register.php:262
 msgid "Leave a message for the admin, why you want to join this node"
-msgstr "Leave a message for the admin, why you want to join this node."
+msgstr "Leave a message for the admin. Why do you want to join this node?"
 
 #: mod/register.php:263
 msgid "Membership on this site is by invitation only."
@@ -6476,7 +6429,7 @@ msgstr "Your full name: "
 msgid ""
 "Your Email Address: (Initial information will be send there, so this has to "
 "be an existing address.)"
-msgstr "Your Email Address: (Initial information will be send there; so this must be an existing address.)"
+msgstr "Your Email Address: (Initial information will be sent there, so this must be an existing address.)"
 
 #: mod/register.php:276 mod/settings.php:1190
 msgid "New Password:"
@@ -6509,35 +6462,52 @@ msgstr "Sign up now >>"
 msgid "Import your profile to this friendica instance"
 msgstr "Import an existing Friendica profile to this node."
 
-#: mod/removeme.php:44
+#: mod/removeme.php:45
 msgid "User deleted their account"
 msgstr "User deleted their account"
 
-#: mod/removeme.php:45
+#: 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 "On your Friendica node a user deleted their account. Please ensure that their data is removed from the backups."
+msgstr "A user deleted his or her account on your Friendica node. Please ensure these data are removed from the backups."
 
-#: mod/removeme.php:46
+#: mod/removeme.php:47
 #, php-format
 msgid "The user id is %d"
 msgstr "The user id is %d"
 
-#: mod/removeme.php:77 mod/removeme.php:80
+#: mod/removeme.php:78 mod/removeme.php:81
 msgid "Remove My Account"
 msgstr "Remove My Account"
 
-#: mod/removeme.php:78
+#: mod/removeme.php:79
 msgid ""
 "This will completely remove your account. Once this has been done it is not "
 "recoverable."
 msgstr "This will completely remove your account. Once this has been done it is not recoverable."
 
-#: mod/removeme.php:79
+#: mod/removeme.php:80
 msgid "Please enter your password for verification:"
 msgstr "Please enter your password for verification:"
 
+#: mod/search.php:105
+msgid "Only logged in users are permitted to perform a search."
+msgstr "Only logged in users are permitted to perform a search."
+
+#: mod/search.php:129
+msgid "Too Many Requests"
+msgstr "Too many requests"
+
+#: mod/search.php:130
+msgid "Only one search per minute is permitted for not logged in users."
+msgstr "Only one search per minute is permitted for not-logged-in users."
+
+#: mod/search.php:234
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Items tagged with: %s"
+
 #: mod/settings.php:56
 msgid "Account"
 msgstr "Account"
@@ -6580,9 +6550,9 @@ msgstr "Features updated"
 
 #: mod/settings.php:372
 msgid "Relocate message has been send to your contacts"
-msgstr "Relocate message has been send to your contacts"
+msgstr "Relocate message has been sent to your contacts"
 
-#: mod/settings.php:384 src/Model/User.php:339
+#: mod/settings.php:384 src/Model/User.php:340
 msgid "Passwords do not match. Password unchanged."
 msgstr "Passwords do not match. Password unchanged."
 
@@ -6870,7 +6840,7 @@ msgstr "Suppress warning of insecure networks"
 msgid ""
 "Should the system suppress the warning that the current group contains "
 "members of networks that can't receive non public postings."
-msgstr "Suppresses warnings if groups contains members whose networks cannot receive non-public postings."
+msgstr "Suppresses warnings if groups contain members whose networks cannot receive non-public postings."
 
 #: mod/settings.php:960
 msgid "Update browser every xx seconds"
@@ -6923,8 +6893,8 @@ msgid ""
 msgstr "When disabled, the network page is updated all the time, which could be confusing while reading."
 
 #: mod/settings.php:969
-msgid "Bandwith Saver Mode"
-msgstr "Bandwith saving mode"
+msgid "Bandwidth Saver Mode"
+msgstr ""
 
 #: mod/settings.php:969
 msgid ""
@@ -7041,9 +7011,10 @@ msgstr "Publish default profile in local site directory?"
 #: mod/settings.php:1094
 #, 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 "Your profile will be published in the global Friendica directories (e.g. <a href=\"%s\">%s</a>). Your profile will be publicly visible."
+"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 "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."
 
 #: mod/settings.php:1100
 msgid "Publish your default profile in the global social directory?"
@@ -7052,10 +7023,9 @@ msgstr "Publish default profile in global directory?"
 #: 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 "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."
+"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 "Your profile will be published in the global Friendica directories (e.g. <a href=\"%s\">%s</a>). Your profile will be publicly visible."
 
 #: mod/settings.php:1107
 msgid "Hide your contact/friend list from viewers of your default profile?"
@@ -7075,9 +7045,9 @@ msgstr "Hide your profile details from anonymous viewers?"
 #: 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. Disables posting public "
-"messages to Diaspora and other networks."
-msgstr "Anonymous visitors will only see your profile picture, display name, and nickname. Disables posting public messages to Diaspora and other networks."
+" 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?"
@@ -7229,7 +7199,7 @@ msgstr "Maximum friend requests per day:"
 
 #: mod/settings.php:1208 mod/settings.php:1237
 msgid "(to prevent spam abuse)"
-msgstr "May prevent spam or abuse registrations"
+msgstr "May prevent spam and abusive registrations"
 
 #: mod/settings.php:1209
 msgid "Default Post Permissions"
@@ -7327,7 +7297,7 @@ msgstr "Advanced account types"
 
 #: mod/settings.php:1262
 msgid "Change the behaviour of this account for special situations"
-msgstr "Change behaviour of this account for special situations"
+msgstr "Change behavior of this account for special situations"
 
 #: mod/settings.php:1265
 msgid "Relocate"
@@ -7343,7 +7313,37 @@ msgstr "If you have moved this profile from another server and some of your cont
 msgid "Resend relocate message to contacts"
 msgstr "Resend relocation message to contacts"
 
-#: view/theme/duepuntozero/config.php:54 src/Model/User.php:502
+#: mod/subthread.php:117
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s is following %2$s's %3$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 "[Embedded content - reload page to view]"
+
+#: mod/videos.php:139
+msgid "Do you really want to delete this video?"
+msgstr "Do you really want to delete this video?"
+
+#: mod/videos.php:144
+msgid "Delete Video"
+msgstr "Delete video"
+
+#: mod/videos.php:207
+msgid "No videos selected"
+msgstr "No videos selected"
+
+#: mod/videos.php:396
+msgid "Recent Videos"
+msgstr "Recent videos"
+
+#: mod/videos.php:398
+msgid "Upload New Videos"
+msgstr "Upload new videos"
+
+#: view/theme/duepuntozero/config.php:54 src/Model/User.php:504
 msgid "default"
 msgstr "default"
 
@@ -7421,7 +7421,7 @@ msgstr "Note"
 
 #: view/theme/frio/config.php:114
 msgid "Check image permissions if all users are allowed to see the image"
-msgstr "Check image permissions that all everyone is allowed to see the image"
+msgstr "Check image permissions that everyone is allowed to see the image"
 
 #: view/theme/frio/config.php:121
 msgid "Select color scheme"
@@ -7557,7 +7557,7 @@ msgstr "Text areas font size"
 
 #: view/theme/vier/config.php:75
 msgid "Comma separated list of helper forums"
-msgstr "Comma separated list of helper forums"
+msgstr "Comma-separated list of helper forums"
 
 #: view/theme/vier/config.php:115 src/Core/ACL.php:309
 msgid "don't show"
@@ -7928,7 +7928,7 @@ msgstr "This is most often a permission setting issue, as the web server may not
 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 "At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top-level directory."
+msgstr "At the end of this procedure, we will give you the text to save in a file named .htconfig.php in your Friendica top-level directory."
 
 #: src/Core/Install.php:323
 msgid ""
@@ -7957,7 +7957,7 @@ msgstr "In order to store these compiled templates, the web server needs to have
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
-msgstr "Please ensure the user (e.g. www-data) that your web server runs as has write access to this directory."
+msgstr "Please ensure the user that your web server runs as (e.g. www-data) has write access to this directory."
 
 #: src/Core/Install.php:347
 msgid ""
@@ -8059,33 +8059,33 @@ msgstr "seconds"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s ago"
 
-#: src/Content/Text/BBCode.php:416
+#: src/Content/Text/BBCode.php:426
 msgid "view full size"
 msgstr "view full size"
 
-#: src/Content/Text/BBCode.php:842 src/Content/Text/BBCode.php:1611
-#: src/Content/Text/BBCode.php:1612
+#: src/Content/Text/BBCode.php:852 src/Content/Text/BBCode.php:1621
+#: src/Content/Text/BBCode.php:1622
 msgid "Image/photo"
 msgstr "Image/Photo"
 
-#: src/Content/Text/BBCode.php:980
+#: src/Content/Text/BBCode.php:990
 #, 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"
 
-#: src/Content/Text/BBCode.php:1538 src/Content/Text/BBCode.php:1560
+#: src/Content/Text/BBCode.php:1548 src/Content/Text/BBCode.php:1570
 msgid "$1 wrote:"
 msgstr "$1 wrote:"
 
-#: src/Content/Text/BBCode.php:1620 src/Content/Text/BBCode.php:1621
+#: src/Content/Text/BBCode.php:1630 src/Content/Text/BBCode.php:1631
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
-#: src/Content/Text/BBCode.php:1740
+#: src/Content/Text/BBCode.php:1750
 msgid "Invalid source protocol"
 msgstr "Invalid source protocol"
 
-#: src/Content/Text/BBCode.php:1751
+#: src/Content/Text/BBCode.php:1761
 msgid "Invalid link protocol"
 msgstr "Invalid link protocol"
 
@@ -8329,7 +8329,7 @@ msgstr "Unfaithful"
 msgid "Sex Addict"
 msgstr "Sex addict"
 
-#: src/Content/ContactSelector.php:169 src/Model/User.php:519
+#: src/Content/ContactSelector.php:169 src/Model/User.php:521
 msgid "Friends"
 msgstr "Friends"
 
@@ -8483,7 +8483,7 @@ msgstr "Photo location"
 msgid ""
 "Photo metadata is normally stripped. This extracts the location (if present)"
 " prior to stripping metadata and links it to a map."
-msgstr "Photo metadata is normally removed. This extracts the location (if present) prior to removing metadata and links it to a map."
+msgstr "Photo metadata is normally removed. This saves the geo tag (if present) and links it to a map prior to removing other metadata."
 
 #: src/Content/Feature.php:83
 msgid "Export Public Calendar"
@@ -8528,7 +8528,7 @@ msgstr "List forums"
 
 #: src/Content/Feature.php:97
 msgid "Enable widget to display the forums your are connected with"
-msgstr "Enable widget to display the forums your are connected with"
+msgstr "Enable widget to display the forums you are connected with"
 
 #: src/Content/Feature.php:98
 msgid "Group Filter"
@@ -8596,7 +8596,7 @@ msgstr "Edit sent posts"
 
 #: src/Content/Feature.php:115
 msgid "Edit and correct posts and comments after sending"
-msgstr "Ability to editing posts and comments after sending"
+msgstr "Ability to edit posts and comments after sending"
 
 #: src/Content/Feature.php:116
 msgid "Tagging"
@@ -8752,7 +8752,7 @@ msgstr "See all notifications"
 
 #: src/Content/Nav.php:193
 msgid "Mark all system notifications seen"
-msgstr "Mark all system notifications seen"
+msgstr "Mark notifications as seen"
 
 #: src/Content/Nav.php:197
 msgid "Inbox"
@@ -8837,6 +8837,124 @@ msgstr "%s: updating %s table."
 msgid "[no subject]"
 msgstr "[no subject]"
 
+#: 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 "A deleted group with this name has been 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."
+
+#: src/Model/Group.php:341
+msgid "Default privacy group for new contacts"
+msgstr "Default privacy group for new contacts"
+
+#: src/Model/Group.php:374
+msgid "Everybody"
+msgstr "Everybody"
+
+#: src/Model/Group.php:394
+msgid "edit"
+msgstr "edit"
+
+#: src/Model/Group.php:418
+msgid "Edit group"
+msgstr "Edit group"
+
+#: src/Model/Group.php:419
+msgid "Contacts not in any group"
+msgstr "Contacts not in any group"
+
+#: src/Model/Group.php:420
+msgid "Create a new group"
+msgstr "Create new group"
+
+#: src/Model/Group.php:422
+msgid "Edit groups"
+msgstr "Edit groups"
+
+#: src/Model/Contact.php:667
+msgid "Drop Contact"
+msgstr "Drop contact"
+
+#: src/Model/Contact.php:1101
+msgid "Organisation"
+msgstr "Organization"
+
+#: src/Model/Contact.php:1104
+msgid "News"
+msgstr "News"
+
+#: src/Model/Contact.php:1107
+msgid "Forum"
+msgstr "Forum"
+
+#: src/Model/Contact.php:1286
+msgid "Connect URL missing."
+msgstr "Connect URL missing."
+
+#: 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 "The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."
+
+#: src/Model/Contact.php:1342
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "This site is not configured to allow communications with other networks."
+
+#: src/Model/Contact.php:1343 src/Model/Contact.php:1357
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "No compatible communication protocols or feeds were discovered."
+
+#: src/Model/Contact.php:1355
+msgid "The profile address specified does not provide adequate information."
+msgstr "The profile address specified does not provide adequate information."
+
+#: src/Model/Contact.php:1360
+msgid "An author or name was not found."
+msgstr "An author or name was not found."
+
+#: src/Model/Contact.php:1363
+msgid "No browser URL could be matched to this address."
+msgstr "No browser URL could be matched to this address."
+
+#: src/Model/Contact.php:1366
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr "Unable to match @-style identity address with a known protocol or email contact."
+
+#: src/Model/Contact.php:1367
+msgid "Use mailto: in front of address to force email check."
+msgstr "Use mailto: in front of address to force email check."
+
+#: src/Model/Contact.php:1373
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "The profile address specified belongs to a network which has been disabled on this site."
+
+#: src/Model/Contact.php:1378
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Limited profile: This person will be unable to receive direct/private messages from you."
+
+#: src/Model/Contact.php:1429
+msgid "Unable to retrieve contact information."
+msgstr "Unable to retrieve contact information."
+
+#: src/Model/Contact.php:1646 src/Protocol/DFRN.php:1515
+#, php-format
+msgid "%s's birthday"
+msgstr "%s's birthday"
+
+#: src/Model/Contact.php:1647 src/Protocol/DFRN.php:1516
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "Happy Birthday, %s!"
+
 #: src/Model/Event.php:53 src/Model/Event.php:70 src/Model/Event.php:419
 #: src/Model/Event.php:882
 msgid "Starts:"
@@ -8895,40 +9013,20 @@ msgstr "Show map"
 msgid "Hide map"
 msgstr "Hide map"
 
-#: 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 "A deleted group with this name has been 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."
+#: src/Model/Item.php:1883
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
+msgstr "%1$s is going to %2$s's %3$s"
 
-#: src/Model/Group.php:341
-msgid "Default privacy group for new contacts"
-msgstr "Default privacy group for new contacts"
+#: src/Model/Item.php:1888
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
+msgstr "%1$s is not going to %2$s's %3$s"
 
-#: src/Model/Group.php:374
-msgid "Everybody"
-msgstr "Everybody"
-
-#: src/Model/Group.php:394
-msgid "edit"
-msgstr "edit"
-
-#: src/Model/Group.php:418
-msgid "Edit group"
-msgstr "Edit group"
-
-#: src/Model/Group.php:419
-msgid "Contacts not in any group"
-msgstr "Contacts not in any group"
-
-#: src/Model/Group.php:420
-msgid "Create a new group"
-msgstr "Create new group"
-
-#: src/Model/Group.php:422
-msgid "Edit groups"
-msgstr "Edit groups"
+#: src/Model/Item.php:1893
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
+msgstr "%1$s may go to %2$s's %3$s"
 
 #: src/Model/Profile.php:97
 msgid "Requested account is not available."
@@ -9056,86 +9154,86 @@ msgstr "Login failed"
 msgid "Not enough information to authenticate"
 msgstr "Not enough information to authenticate"
 
-#: src/Model/User.php:346
+#: src/Model/User.php:347
 msgid "An invitation is required."
 msgstr "An invitation is required."
 
-#: src/Model/User.php:350
+#: src/Model/User.php:351
 msgid "Invitation could not be verified."
 msgstr "Invitation could not be verified."
 
-#: src/Model/User.php:357
+#: src/Model/User.php:358
 msgid "Invalid OpenID url"
 msgstr "Invalid OpenID URL"
 
-#: src/Model/User.php:370 src/Module/Login.php:101
+#: 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 "We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."
 
-#: src/Model/User.php:370 src/Module/Login.php:101
+#: src/Model/User.php:371 src/Module/Login.php:101
 msgid "The error message was:"
 msgstr "The error message was:"
 
-#: src/Model/User.php:376
+#: src/Model/User.php:377
 msgid "Please enter the required information."
 msgstr "Please enter the required information."
 
-#: src/Model/User.php:389
+#: src/Model/User.php:390
 msgid "Please use a shorter name."
 msgstr "Please use a shorter name."
 
-#: src/Model/User.php:392
+#: src/Model/User.php:393
 msgid "Name too short."
 msgstr "Name too short."
 
-#: src/Model/User.php:400
+#: src/Model/User.php:401
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr "That doesn't appear to be your full (i.e first and last) name."
 
-#: src/Model/User.php:405
+#: src/Model/User.php:406
 msgid "Your email domain is not among those allowed on this site."
 msgstr "Your email domain is not allowed on this site."
 
-#: src/Model/User.php:409
+#: src/Model/User.php:410
 msgid "Not a valid email address."
 msgstr "Not a valid email address."
 
-#: src/Model/User.php:413 src/Model/User.php:421
+#: src/Model/User.php:414 src/Model/User.php:422
 msgid "Cannot use that email."
 msgstr "Cannot use that email."
 
-#: src/Model/User.php:428
+#: src/Model/User.php:429
 msgid "Your nickname can only contain a-z, 0-9 and _."
 msgstr "Your nickname can only contain a-z, 0-9 and _."
 
-#: src/Model/User.php:435 src/Model/User.php:491
+#: src/Model/User.php:436 src/Model/User.php:493
 msgid "Nickname is already registered. Please choose another."
 msgstr "Nickname is already registered. Please choose another."
 
-#: src/Model/User.php:445
+#: src/Model/User.php:446
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr "SERIOUS ERROR: Generation of security keys failed."
 
-#: src/Model/User.php:478 src/Model/User.php:482
+#: src/Model/User.php:480 src/Model/User.php:484
 msgid "An error occurred during registration. Please try again."
 msgstr "An error occurred during registration. Please try again."
 
-#: src/Model/User.php:507
+#: src/Model/User.php:509
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "An error occurred creating your default profile. Please try again."
 
-#: src/Model/User.php:514
+#: src/Model/User.php:516
 msgid "An error occurred creating your self contact. Please try again."
 msgstr "An error occurred creating your self contact. Please try again."
 
-#: src/Model/User.php:523
+#: src/Model/User.php:525
 msgid ""
 "An error occurred creating your default contact group. Please try again."
 msgstr "An error occurred while creating your default contact group. Please try again."
 
-#: src/Model/User.php:597
+#: src/Model/User.php:599
 #, php-format
 msgid ""
 "\n"
@@ -9144,12 +9242,12 @@ msgid ""
 "\t\t"
 msgstr "\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"
 
-#: src/Model/User.php:607
+#: src/Model/User.php:609
 #, php-format
 msgid "Registration at %s"
 msgstr "Registration at %s"
 
-#: src/Model/User.php:625
+#: src/Model/User.php:627
 #, php-format
 msgid ""
 "\n"
@@ -9158,7 +9256,7 @@ msgid ""
 "\t\t"
 msgstr "\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"
 
-#: src/Model/User.php:629
+#: src/Model/User.php:631
 #, php-format
 msgid ""
 "\n"
@@ -9190,122 +9288,6 @@ msgid ""
 "\t\t\tThank you and welcome to %2$s."
 msgstr "\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."
 
-#: src/Model/Contact.php:667
-msgid "Drop Contact"
-msgstr "Drop contact"
-
-#: src/Model/Contact.php:1101
-msgid "Organisation"
-msgstr "Organization"
-
-#: src/Model/Contact.php:1104
-msgid "News"
-msgstr "News"
-
-#: src/Model/Contact.php:1107
-msgid "Forum"
-msgstr "Forum"
-
-#: src/Model/Contact.php:1286
-msgid "Connect URL missing."
-msgstr "Connect URL missing."
-
-#: 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 "The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."
-
-#: src/Model/Contact.php:1342
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "This site is not configured to allow communications with other networks."
-
-#: src/Model/Contact.php:1343 src/Model/Contact.php:1357
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "No compatible communication protocols or feeds were discovered."
-
-#: src/Model/Contact.php:1355
-msgid "The profile address specified does not provide adequate information."
-msgstr "The profile address specified does not provide adequate information."
-
-#: src/Model/Contact.php:1360
-msgid "An author or name was not found."
-msgstr "An author or name was not found."
-
-#: src/Model/Contact.php:1363
-msgid "No browser URL could be matched to this address."
-msgstr "No browser URL could be matched to this address."
-
-#: src/Model/Contact.php:1366
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr "Unable to match @-style identity address with a known protocol or email contact."
-
-#: src/Model/Contact.php:1367
-msgid "Use mailto: in front of address to force email check."
-msgstr "Use mailto: in front of address to force email check."
-
-#: src/Model/Contact.php:1373
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr "The profile address specified belongs to a network which has been disabled on this site."
-
-#: src/Model/Contact.php:1378
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr "Limited profile: This person will be unable to receive direct/private messages from you."
-
-#: src/Model/Contact.php:1429
-msgid "Unable to retrieve contact information."
-msgstr "Unable to retrieve contact information."
-
-#: src/Model/Contact.php:1646 src/Protocol/DFRN.php:1513
-#, php-format
-msgid "%s's birthday"
-msgstr "%s's birthday"
-
-#: src/Model/Contact.php:1647 src/Protocol/DFRN.php:1514
-#, php-format
-msgid "Happy Birthday %s"
-msgstr "Happy Birthday, %s!"
-
-#: src/Model/Item.php:1851
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$s is going to %2$s's %3$s"
-
-#: src/Model/Item.php:1856
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$s is not going to %2$s's %3$s"
-
-#: src/Model/Item.php:1861
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s may go to %2$s's %3$s"
-
-#: src/Protocol/OStatus.php:1799
-#, php-format
-msgid "%s is now following %s."
-msgstr "%s is now following %s."
-
-#: src/Protocol/OStatus.php:1800
-msgid "following"
-msgstr "following"
-
-#: src/Protocol/OStatus.php:1803
-#, php-format
-msgid "%s stopped following %s."
-msgstr "%s stopped following %s."
-
-#: src/Protocol/OStatus.php:1804
-msgid "stopped following"
-msgstr "stopped following"
-
 #: src/Protocol/Diaspora.php:2521
 msgid "Sharing notification from Diaspora network"
 msgstr "Sharing notification from Diaspora network"
@@ -9314,6 +9296,24 @@ msgstr "Sharing notification from Diaspora network"
 msgid "Attachments:"
 msgstr "Attachments:"
 
+#: src/Protocol/OStatus.php:1798
+#, php-format
+msgid "%s is now following %s."
+msgstr "%s is now following %s."
+
+#: src/Protocol/OStatus.php:1799
+msgid "following"
+msgstr "following"
+
+#: src/Protocol/OStatus.php:1802
+#, php-format
+msgid "%s stopped following %s."
+msgstr "%s stopped following %s."
+
+#: src/Protocol/OStatus.php:1803
+msgid "stopped following"
+msgstr "stopped following"
+
 #: src/Worker/Delivery.php:415
 msgid "(no subject)"
 msgstr "(no subject)"
@@ -9369,7 +9369,7 @@ msgid ""
 "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 "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 "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), a 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 won’t 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."
 
 #: src/Module/Tos.php:35 src/Module/Tos.php:75
 msgid ""
@@ -9398,8 +9398,12 @@ msgid "This entry was edited"
 msgstr "This entry was edited"
 
 #: src/Object/Post.php:187
-msgid "Remove from your stream"
-msgstr "Remove from your stream"
+msgid "Delete globally"
+msgstr ""
+
+#: src/Object/Post.php:187
+msgid "Remove locally"
+msgstr ""
 
 #: src/Object/Post.php:200
 msgid "save to folder"
@@ -9520,15 +9524,15 @@ msgstr "Link"
 msgid "Video"
 msgstr "Video"
 
-#: src/App.php:524
+#: src/App.php:526
 msgid "Delete this item?"
 msgstr "Delete this item?"
 
-#: src/App.php:526
+#: src/App.php:528
 msgid "show fewer"
 msgstr "Show fewer."
 
-#: src/App.php:1114
+#: src/App.php:1117
 msgid "No system theme config value set."
 msgstr "No system theme configuration value set."
 
@@ -9536,12 +9540,12 @@ msgstr "No system theme configuration value set."
 msgid "toggle mobile"
 msgstr "Toggle mobile"
 
-#: update.php:193
-#, php-format
-msgid "%s: Updating author-id and owner-id in item and thread table. "
-msgstr "%s: Updating author-id and owner-id in item and thread table. "
-
 #: boot.php:796
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s failed. See error logs."
+
+#: update.php:193
+#, php-format
+msgid "%s: Updating author-id and owner-id in item and thread table. "
+msgstr "%s: Updating author-id and owner-id in item and thread table. "
diff --git a/view/lang/en-us/strings.php b/view/lang/en-us/strings.php
index d53e6018c..dd325a417 100644
--- a/view/lang/en-us/strings.php
+++ b/view/lang/en-us/strings.php
@@ -56,7 +56,7 @@ $a->strings["'%1\$s' has accepted your connection request at %2\$s"] = "'%1\$s'
 $a->strings["%2\$s has accepted your [url=%1\$s]connection request[/url]."] = "%2\$s has accepted your [url=%1\$s]connection request[/url].";
 $a->strings["You are now mutual friends and may exchange status updates, photos, and email without restriction."] = "You are now mutual friends and may exchange status updates, photos, and email without restriction.";
 $a->strings["Please visit %s if you wish to make any changes to this relationship."] = "Please visit %s if you wish to make any changes to this relationship.";
-$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' has chosen to accept you as 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.";
+$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' has chosen to accept you as 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.";
 $a->strings["'%1\$s' may choose to extend this into a two-way or more permissive relationship in the future."] = "'%1\$s' may choose to extend this into a two-way or more permissive relationship in the future.";
 $a->strings["Please visit %s  if you wish to make any changes to this relationship."] = "Please visit %s  if you wish to make any changes to this relationship.";
 $a->strings["[Friendica System Notify]"] = "[Friendica System Notify]";
@@ -65,20 +65,15 @@ $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Y
 $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "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)"] = "Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)";
 $a->strings["Please visit %s to approve or reject the request."] = "Please visit %s to approve or reject the request.";
-$a->strings["Welcome "] = "Welcome ";
-$a->strings["Please upload a profile photo."] = "Please upload a profile photo.";
-$a->strings["Welcome back "] = "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."] = "The form security token was incorrect. This probably happened because the form has not been submitted within 3 hours.";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "Cannot locate DNS info for database server '%s'";
 $a->strings["Daily posting limit of %d post reached. The post was rejected."] = [
-	0 => "Daily posting limit of %d post are reached. The post was rejected.",
-	1 => "Daily posting limit of %d posts are reached. This post was rejected.",
+	0 => "Daily posting limit of %d post reached. The post was rejected.",
+	1 => "Daily posting limit of %d posts reached. This post was rejected.",
 ];
 $a->strings["Weekly posting limit of %d post reached. The post was rejected."] = [
-	0 => "Weekly posting limit of %d post are reached. The post was rejected.",
-	1 => "Weekly posting limit of %d posts are reached. This post was rejected.",
+	0 => "Weekly posting limit of %d post reached. The post was rejected.",
+	1 => "Weekly posting limit of %d posts reached. This post was rejected.",
 ];
-$a->strings["Monthly posting limit of %d post reached. The post was rejected."] = "Monthly posting limit of %d posts are reached. This post was rejected.";
+$a->strings["Monthly posting limit of %d post reached. The post was rejected."] = "Monthly posting limit of %d posts reached. This post was rejected.";
 $a->strings["Profile Photos"] = "Profile photos";
 $a->strings["event"] = "event";
 $a->strings["status"] = "status";
@@ -86,7 +81,7 @@ $a->strings["photo"] = "photo";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s likes %2\$s's %3\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s doesn't like %2\$s's %3\$s";
 $a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s goes to %2\$s's %3\$s";
-$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s doesn't go %2\$s's %3\$s";
+$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s won’t attend %2\$s's %3\$s";
 $a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s might go to %2\$s's %3\$s";
 $a->strings["%1\$s is now friends with %2\$s"] = "%1\$s is now friends with %2\$s";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s poked %2\$s";
@@ -123,8 +118,8 @@ $a->strings["Connect/Follow"] = "Connect/Follow";
 $a->strings["%s likes this."] = "%s likes this.";
 $a->strings["%s doesn't like this."] = "%s doesn't like this.";
 $a->strings["%s attends."] = "%s attends.";
-$a->strings["%s doesn't attend."] = "%s doesn't attend.";
-$a->strings["%s attends maybe."] = "%s may attend.";
+$a->strings["%s doesn't attend."] = "%s won't attend.";
+$a->strings["%s attends maybe."] = "%s might attend.";
 $a->strings["and"] = "and";
 $a->strings["and %d other people"] = "and %d other people";
 $a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d people</span> like this";
@@ -133,9 +128,9 @@ $a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>
 $a->strings["%s don't like this."] = "%s don't like this.";
 $a->strings["<span  %1\$s>%2\$d people</span> attend"] = "<span  %1\$s>%2\$d people</span> attend";
 $a->strings["%s attend."] = "%s attend.";
-$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span  %1\$s>%2\$d people</span> don't attend";
-$a->strings["%s don't attend."] = "%s don't attend.";
-$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span  %1\$s>%2\$d people</span> attend maybe";
+$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span  %1\$s>%2\$d people</span> won't attend";
+$a->strings["%s don't attend."] = "%s won't attend.";
+$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span  %1\$s>%2\$d people</span> might attend";
 $a->strings["%s attend maybe."] = "%s may be attending.";
 $a->strings["Visible to <strong>everybody</strong>"] = "Visible to <strong>everybody</strong>";
 $a->strings["Please enter a link URL:"] = "Please enter a link URL:";
@@ -196,6 +191,10 @@ $a->strings["Yes"] = "Yes";
 $a->strings["Permission denied."] = "Permission denied.";
 $a->strings["Archives"] = "Archives";
 $a->strings["show more"] = "Show more...";
+$a->strings["Welcome "] = "Welcome ";
+$a->strings["Please upload a profile photo."] = "Please upload a profile photo.";
+$a->strings["Welcome back "] = "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."] = "The form security token was incorrect. This probably happened because the form has not been submitted within 3 hours.";
 $a->strings["newer"] = "Later posts";
 $a->strings["older"] = "Earlier posts";
 $a->strings["first"] = "first";
@@ -352,7 +351,6 @@ $a->strings["Do you really want to delete this suggestion?"] = "Do you really wa
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "No suggestions available. If this is a new site, please try again in 24 hours.";
 $a->strings["Ignore/Hide"] = "Ignore/Hide";
 $a->strings["Friend Suggestions"] = "Friend suggestions";
-$a->strings["[Embedded content - reload page to view]"] = "[Embedded content - reload page to view]";
 $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.";
 $a->strings["Import"] = "Import profile";
 $a->strings["Move account"] = "Move Existing Friendica Account";
@@ -393,7 +391,7 @@ $a->strings["Recipient"] = "Recipient:";
 $a->strings["Choose what you wish to do to recipient"] = "Choose what you wish to do:";
 $a->strings["Make this post private"] = "Make this post private";
 $a->strings["Public access denied."] = "Public access denied.";
-$a->strings["Only logged in users are permitted to perform a probing."] = "Only logged in users are permitted to perform a probing.";
+$a->strings["Only logged in users are permitted to perform a probing."] = "Only logged in users are permitted to use the Probe feature.";
 $a->strings["Permission denied"] = "Permission denied";
 $a->strings["Invalid profile identifier."] = "Invalid profile identifier.";
 $a->strings["Profile Visibility Editor"] = "Profile Visibility Editor";
@@ -403,15 +401,6 @@ $a->strings["All Contacts (with secure profile access)"] = "All contacts with se
 $a->strings["Account approved."] = "Account approved.";
 $a->strings["Registration revoked for %s"] = "Registration revoked for %s";
 $a->strings["Please login."] = "Please login.";
-$a->strings["Remove term"] = "Remove term";
-$a->strings["Saved Searches"] = "Saved searches";
-$a->strings["Only logged in users are permitted to perform a search."] = "Only logged in users are permitted to perform a search.";
-$a->strings["Too Many Requests"] = "Too many requests";
-$a->strings["Only one search per minute is permitted for not logged in users."] = "Only one search per minute is permitted for not logged in users.";
-$a->strings["No results."] = "No results.";
-$a->strings["Items tagged with: %s"] = "Items tagged with: %s";
-$a->strings["Results for: %s"] = "Results for: %s";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s is following %2\$s's %3\$s";
 $a->strings["Tag removed"] = "Tag removed";
 $a->strings["Remove Item Tag"] = "Remove Item tag";
 $a->strings["Select a tag to remove: "] = "Select a tag to remove: ";
@@ -419,7 +408,7 @@ $a->strings["Remove"] = "Remove";
 $a->strings["Export account"] = "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."] = "Export your account info and contacts. Use this to backup your account or to move it to another server.";
 $a->strings["Export all"] = "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)"] = "Export your account info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account (photos are not exported)";
+$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)"] = "Export your account info, contacts and all your items as JSON. This 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.";
 $a->strings["Export personal data"] = "Export personal data";
 $a->strings["No contacts."] = "No contacts.";
 $a->strings["Access denied."] = "Access denied.";
@@ -449,63 +438,6 @@ $a->strings["Contact not found."] = "Contact not found.";
 $a->strings["Friend suggestion sent."] = "Friend suggestion sent";
 $a->strings["Suggest Friends"] = "Suggest friends";
 $a->strings["Suggest a friend for %s"] = "Suggest a friend for %s";
-$a->strings["Personal Notes"] = "Personal notes";
-$a->strings["Photo Albums"] = "Photo Albums";
-$a->strings["Recent Photos"] = "Recent photos";
-$a->strings["Upload New Photos"] = "Upload new photos";
-$a->strings["everybody"] = "everybody";
-$a->strings["Contact information unavailable"] = "Contact information unavailable";
-$a->strings["Album not found."] = "Album not found.";
-$a->strings["Delete Album"] = "Delete album";
-$a->strings["Do you really want to delete this photo album and all its photos?"] = "Do you really want to delete this photo album and all its photos?";
-$a->strings["Delete Photo"] = "Delete photo";
-$a->strings["Do you really want to delete this photo?"] = "Do you really want to delete this photo?";
-$a->strings["a photo"] = "a photo";
-$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s was tagged in %2\$s by %3\$s";
-$a->strings["Image upload didn't complete, please try again"] = "Image upload didn't complete, please try again";
-$a->strings["Image file is missing"] = "Image file is missing";
-$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "Server can't accept new file upload at this time, please contact your administrator";
-$a->strings["Image file is empty."] = "Image file is empty.";
-$a->strings["No photos selected"] = "No photos selected";
-$a->strings["Access to this item is restricted."] = "Access to this item is restricted.";
-$a->strings["Upload Photos"] = "Upload photos";
-$a->strings["New album name: "] = "New album name: ";
-$a->strings["or existing album name: "] = "or existing album name: ";
-$a->strings["Do not show a status post for this upload"] = "Do not show a status post for this upload";
-$a->strings["Permissions"] = "Permissions";
-$a->strings["Show to Groups"] = "Show to groups";
-$a->strings["Show to Contacts"] = "Show to contacts";
-$a->strings["Edit Album"] = "Edit album";
-$a->strings["Show Newest First"] = "Show newest first";
-$a->strings["Show Oldest First"] = "Show oldest first";
-$a->strings["View Photo"] = "View photo";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Permission denied. Access to this item may be restricted.";
-$a->strings["Photo not available"] = "Photo not available";
-$a->strings["View photo"] = "View photo";
-$a->strings["Edit photo"] = "Edit photo";
-$a->strings["Use as profile photo"] = "Use as profile photo";
-$a->strings["Private Message"] = "Private message";
-$a->strings["View Full Size"] = "View full size";
-$a->strings["Tags: "] = "Tags: ";
-$a->strings["[Remove any tag]"] = "[Remove any tag]";
-$a->strings["New album name"] = "New album name";
-$a->strings["Caption"] = "Caption";
-$a->strings["Add a Tag"] = "Add Tag";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Example: @bob, @jojo@example.com, #California, #camping";
-$a->strings["Do not rotate"] = "Do not rotate";
-$a->strings["Rotate CW (right)"] = "Rotate right (CW)";
-$a->strings["Rotate CCW (left)"] = "Rotate left (CCW)";
-$a->strings["I like this (toggle)"] = "I like this (toggle)";
-$a->strings["I don't like this (toggle)"] = "I don't like this (toggle)";
-$a->strings["This is you"] = "This is me";
-$a->strings["Comment"] = "Comment";
-$a->strings["Map"] = "Map";
-$a->strings["View Album"] = "View album";
-$a->strings["Do you really want to delete this video?"] = "Do you really want to delete this video?";
-$a->strings["Delete Video"] = "Delete video";
-$a->strings["No videos selected"] = "No videos selected";
-$a->strings["Recent Videos"] = "Recent videos";
-$a->strings["Upload New Videos"] = "Upload new videos";
 $a->strings["Access to this profile has been restricted."] = "Access to this profile has been restricted.";
 $a->strings["Events"] = "Events";
 $a->strings["View"] = "View";
@@ -549,7 +481,7 @@ $a->strings["Suggest friends"] = "Suggest friends";
 $a->strings["Network type: %s"] = "Network type: %s";
 $a->strings["Communications lost with this contact!"] = "Communications lost with this contact!";
 $a->strings["Fetch further information for feeds"] = "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."] = "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 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."] = "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"] = "Disabled";
 $a->strings["Fetch information"] = "Fetch information";
 $a->strings["Fetch keywords"] = "Fetch keywords";
@@ -581,7 +513,7 @@ $a->strings["Replies/likes to your public posts <strong>may</strong> still be vi
 $a->strings["Notification for new posts"] = "Notification for new posts";
 $a->strings["Send a notification of every new post of this contact"] = "Send notification for every new post from this contact";
 $a->strings["Blacklisted keywords"] = "Blacklisted keywords";
-$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected";
+$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Comma-separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected";
 $a->strings["Profile URL"] = "Profile URL:";
 $a->strings["Location:"] = "Location:";
 $a->strings["XMPP:"] = "XMPP:";
@@ -605,6 +537,7 @@ $a->strings["Only show archived contacts"] = "Only show archived contacts";
 $a->strings["Hidden"] = "Hidden";
 $a->strings["Only show hidden contacts"] = "Only show hidden contacts";
 $a->strings["Search your contacts"] = "Search your contacts";
+$a->strings["Results for: %s"] = "Results for: %s";
 $a->strings["Find"] = "Find";
 $a->strings["Update"] = "Update";
 $a->strings["Archive"] = "Archive";
@@ -619,6 +552,7 @@ $a->strings["Advanced Contact Settings"] = "Advanced contact settings";
 $a->strings["Mutual Friendship"] = "Mutual friendship";
 $a->strings["is a fan of yours"] = "is a fan of yours";
 $a->strings["you are a fan of"] = "I follow them";
+$a->strings["This is you"] = "This is me";
 $a->strings["Toggle Blocked status"] = "Toggle blocked status";
 $a->strings["Toggle Ignored status"] = "Toggle ignored status";
 $a->strings["Toggle Archive status"] = "Toggle archive status";
@@ -637,22 +571,6 @@ $a->strings["Existing Page Delegates"] = "Existing page delegates";
 $a->strings["Potential Delegates"] = "Potential delegates";
 $a->strings["Add"] = "Add";
 $a->strings["No entries."] = "No entries.";
-$a->strings["Event can not end before it has started."] = "Event cannot end before it has started.";
-$a->strings["Event title and start time are required."] = "Event title and starting time are required.";
-$a->strings["Create New Event"] = "Create new event";
-$a->strings["Event details"] = "Event details";
-$a->strings["Starting date and Title are required."] = "Starting date and title are required.";
-$a->strings["Event Starts:"] = "Event starts:";
-$a->strings["Required"] = "Required";
-$a->strings["Finish date/time is not known or not relevant"] = "Finish date/time is not known or not relevant";
-$a->strings["Event Finishes:"] = "Event finishes:";
-$a->strings["Adjust for viewer timezone"] = "Adjust for viewer's time zone";
-$a->strings["Description:"] = "Description:";
-$a->strings["Title:"] = "Title:";
-$a->strings["Share this event"] = "Share this event";
-$a->strings["Basic"] = "Basic";
-$a->strings["Failed to remove event"] = "Failed to remove event";
-$a->strings["Event removed"] = "Event removed";
 $a->strings["You must be logged in to use this module"] = "You must be logged in to use this module";
 $a->strings["Source URL"] = "Source URL";
 $a->strings["Post successful."] = "Post successful.";
@@ -739,13 +657,6 @@ $a->strings["Source text"] = "Source text";
 $a->strings["BBCode"] = "BBCode";
 $a->strings["Markdown"] = "Markdown";
 $a->strings["HTML"] = "HTML";
-$a->strings["Community option not available."] = "Community option not available.";
-$a->strings["Not available."] = "Not available.";
-$a->strings["Local Community"] = "Local community";
-$a->strings["Posts from local users on this server"] = "Posts from local users on this server";
-$a->strings["Global Community"] = "Global community";
-$a->strings["Posts from users of the whole federated network"] = "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."] = "This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users.";
 $a->strings["This is Friendica, version"] = "This is Friendica, version";
 $a->strings["running at web location"] = "running at web location";
 $a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project.";
@@ -770,9 +681,9 @@ $a->strings["%d message sent."] = [
 $a->strings["You have no more invitations available"] = "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."] = "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.";
 $a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "To accept this invitation, please sign up at %s or any other public Friendica website.";
-$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 sites are all inter-connect to create a large 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.";
+$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 sites are all inter-connected to create a large 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.";
 $a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "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 sites are all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. Each site can also connect with many traditional social networks.";
+$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 sites are all inter-connected to create a huge privacy-enhanced social web that is owned and controlled by its members. Each site can also connect with many traditional social networks.";
 $a->strings["To accept this invitation, please visit and register at %s."] = "To accept this invitation, please visit and register at %s.";
 $a->strings["Send invitations"] = "Send invitations";
 $a->strings["Enter email addresses, one per line:"] = "Enter email addresses, one per line:";
@@ -780,32 +691,9 @@ $a->strings["You are cordially invited to join me and other close friends on Fri
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "You will need to supply this invitation code: \$invite_code";
 $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Once you have signed up, 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"] = "For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca";
-$a->strings["add"] = "add";
-$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
-	0 => "Warning: This group contains %s member from a network that doesn't allow non public messages.",
-	1 => "Warning: This group contains %s members from a network that doesn't allow non public messages.",
-];
-$a->strings["Messages in this group won't be send to these receivers."] = "Messages in this group won't be send to these receivers.";
-$a->strings["No such group"] = "No such group";
-$a->strings["Group is empty"] = "Group is empty";
-$a->strings["Group: %s"] = "Group: %s";
-$a->strings["Private messages to this person are at risk of public disclosure."] = "Private messages to this person are at risk of public disclosure.";
-$a->strings["Invalid contact."] = "Invalid contact.";
-$a->strings["Commented Order"] = "Commented last";
-$a->strings["Sort by Comment Date"] = "Sort by comment date";
-$a->strings["Posted Order"] = "Posted last";
-$a->strings["Sort by Post Date"] = "Sort by post date";
-$a->strings["Personal"] = "Personal";
-$a->strings["Posts that mention or involve you"] = "Posts mentioning or involving me";
-$a->strings["New"] = "New";
-$a->strings["Activity Stream - by date"] = "Activity Stream - by date";
-$a->strings["Shared Links"] = "Shared links";
-$a->strings["Interesting Links"] = "Interesting links";
-$a->strings["Starred"] = "Starred";
-$a->strings["Favourite Posts"] = "My favorite posts";
 $a->strings["Contact settings applied."] = "Contact settings applied.";
 $a->strings["Contact update failed."] = "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>Warning: These are highly advanced settings.</strong> If you enter incorrect information your communications with this contact may not working.";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>Warning: These are highly advanced settings.</strong> If you enter incorrect information, your communications with this contact might be disrupted.";
 $a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page.";
 $a->strings["No mirroring"] = "No mirroring";
 $a->strings["Mirror as forwarded posting"] = "Mirror as forwarded posting";
@@ -876,24 +764,6 @@ $a->strings["%d message"] = [
 	0 => "%d message",
 	1 => "%d messages",
 ];
-$a->strings["Group created."] = "Group created.";
-$a->strings["Could not create group."] = "Could not create group.";
-$a->strings["Group not found."] = "Group not found.";
-$a->strings["Group name changed."] = "Group name changed.";
-$a->strings["Save Group"] = "Save group";
-$a->strings["Create a group of contacts/friends."] = "Create a group of contacts/friends.";
-$a->strings["Group Name: "] = "Group name: ";
-$a->strings["Group removed."] = "Group removed.";
-$a->strings["Unable to remove group."] = "Unable to remove group.";
-$a->strings["Delete Group"] = "Delete group";
-$a->strings["Group Editor"] = "Group Editor";
-$a->strings["Edit Group Name"] = "Edit group name";
-$a->strings["Members"] = "Members";
-$a->strings["Remove contact from group"] = "Remove contact from group";
-$a->strings["Add contact to group"] = "Add contact to group";
-$a->strings["OpenID protocol error. No ID returned."] = "OpenID protocol error. No ID returned.";
-$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account not found and OpenID registration is not permitted on this site.";
-$a->strings["Login failed."] = "Login failed.";
 $a->strings["Theme settings updated."] = "Theme settings updated.";
 $a->strings["Information"] = "Information";
 $a->strings["Overview"] = "Overview";
@@ -923,9 +793,9 @@ $a->strings["Addon Features"] = "Addon features";
 $a->strings["User registrations waiting for confirmation"] = "User registrations awaiting confirmation";
 $a->strings["Administration"] = "Administration";
 $a->strings["Display Terms of Service"] = "Display Terms of Service";
-$a->strings["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."] = "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.";
+$a->strings["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."] = "Enable the Terms of Service page. If this is enabled, a link to the terms will be added to the registration form and to the general information page.";
 $a->strings["Display Privacy Statement"] = "Display Privacy Statement";
-$a->strings["Show some informations regarding the needed information to operate the node according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."] = "Show some informations regarding the needed information to operate the node according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>.";
+$a->strings["Show some informations regarding the needed information to operate the node according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."] = "Show some information needed, for example, to comply with <a href=\"%s\" target=\"_blank\">EU-GDPR</a>.";
 $a->strings["Privacy Statement Preview"] = "Privacy Statement Preview";
 $a->strings["The Terms of Service"] = "Terms of Service";
 $a->strings["Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below."] = "Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] or less.";
@@ -933,8 +803,8 @@ $a->strings["The blocked domain"] = "Blocked domain";
 $a->strings["The reason why you blocked this domain."] = "Reason why you blocked this domain.";
 $a->strings["Delete domain"] = "Delete domain";
 $a->strings["Check to delete this entry from the blocklist"] = "Check to delete this entry from the blocklist";
-$a->strings["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."] = "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.";
-$a->strings["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."] = "The list of blocked servers will publicly available on the Friendica page so that your users and people investigating communication problems can readily find the reason.";
+$a->strings["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."] = "This page can be used to define a blacklist 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.";
+$a->strings["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."] = "The list of blocked servers will be available publicly on the Friendica page so that your users and people investigating communication problems can find the reason.";
 $a->strings["Add new entry to block list"] = "Add new entry to block list";
 $a->strings["Server Domain"] = "Server domain";
 $a->strings["The domain of the new server to add to the block list. Do not include the protocol."] = "The domain of the new server to add to the block list. Do not include the protocol.";
@@ -974,17 +844,17 @@ $a->strings["GUID"] = "GUID";
 $a->strings["The GUID of the item you want to delete."] = "GUID of item to be deleted.";
 $a->strings["Item marked for deletion."] = "Item marked for deletion.";
 $a->strings["unknown"] = "unknown";
-$a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "This page offers you the amount of known part of the federated social network your Friendica node is part of. These numbers are not complete and only reflect the part of the network your node is aware of.";
+$a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "This page offers statistics about the federated social network, of which your Friendica node is one part. These numbers do not represent the entire network, but merely the parts that are connected to your node.\"";
 $a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "The <em>Auto Discovered Contact Directory</em> feature is not enabled; enabling it will improve the data displayed here.";
-$a->strings["Currently this node is aware of %d nodes with %d registered users from the following platforms:"] = "Currently this node is aware of %d nodes with %d registered users from the following platforms:";
+$a->strings["Currently this node is aware of %d nodes with %d registered users from the following platforms:"] = "Currently, this node is aware of %d nodes with %d registered users from the following platforms:";
 $a->strings["ID"] = "ID";
 $a->strings["Recipient Name"] = "Recipient name";
 $a->strings["Recipient Profile"] = "Recipient profile";
 $a->strings["Network"] = "Network";
 $a->strings["Created"] = "Created";
 $a->strings["Last Tried"] = "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."] = "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["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 />"] = "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["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."] = "This page lists the content of the queue for outgoing postings. These are postings for which the initial delivery failed. They will be resent later, and eventually deleted if the delivery fails permanently.";
+$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 />"] = "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"] = "A new Friendica version is available now. Your current version is %1\$s, upstream version is %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."] = "The database update failed. Please run \"php bin/console.php dbstructure update\" from the command line and check for errors that may appear.";
 $a->strings["The worker was never executed. Please check your database structure!"] = "The worker process has never been executed. Please check your database structure!";
@@ -1063,7 +933,7 @@ $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means
 $a->strings["Maximum image length"] = "Maximum image length";
 $a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.";
 $a->strings["JPEG image quality"] = "JPEG image quality";
-$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is the original quality level.";
+$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Uploaded JPEGs will be saved at this quality setting [0-100]. Default is 100, which is the original quality level.";
 $a->strings["Register policy"] = "Registration policy";
 $a->strings["Maximum Daily Registrations"] = "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."] = "If open registration is permitted, this sets the maximum number of new registrations per day.  This setting has no effect for registrations by approval.";
@@ -1072,17 +942,18 @@ $a->strings["Will be displayed prominently on the registration page. You can use
 $a->strings["Accounts abandoned after x days"] = "Accounts abandoned after so many days";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit.";
 $a->strings["Allowed friend domains"] = "Allowed friend domains";
-$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Leave empty to allow any domains";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Comma-separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Leave empty to allow any domains";
 $a->strings["Allowed email domains"] = "Allowed email domains";
-$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"] = "Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Leave empty to allow any domains";
+$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"] = "Comma-separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Leave empty to allow any domains";
 $a->strings["No OEmbed rich content"] = "No OEmbed rich content";
 $a->strings["Don't show the rich content (e.g. embedded PDF), except from the domains listed below."] = "Don't show rich content (e.g. embedded PDF), except from the domains listed below.";
 $a->strings["Allowed OEmbed domains"] = "Allowed OEmbed domains";
-$a->strings["Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted."] = "Comma separated list of domains from where OEmbed content is allowed. Wildcards are possible.";
+$a->strings["Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted."] = "Comma-separated list of domains from where OEmbed content is allowed. Wildcards are possible.";
 $a->strings["Block public"] = "Block public";
 $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Block public access to all otherwise public personal pages on this site, except for local users when logged in.";
 $a->strings["Force publish"] = "Mandatory directory listing";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Force all profiles on this site to be listed in the site directory.";
+$a->strings["Enabling this may violate privacy laws like the GDPR"] = "";
 $a->strings["Global directory URL"] = "Global directory URL";
 $a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL to the global directory: If this is not set, the global directory is completely unavailable to the application.";
 $a->strings["Private posts by default for new users"] = "Private posts by default for new users";
@@ -1108,7 +979,7 @@ $a->strings["The maximum number of posts per user on the community page. (Not va
 $a->strings["Enable OStatus support"] = "Enable OStatus support";
 $a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Provide built-in OStatus (StatusNet, GNU Social, etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.";
 $a->strings["Only import OStatus threads from our contacts"] = "Only import OStatus threads from known contacts";
-$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."] = "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.";
+$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."] = "Normally we import all content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system.";
 $a->strings["OStatus support can only be enabled if threading is enabled."] = "OStatus support can only be enabled if threading is enabled.";
 $a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "Diaspora support can't be enabled because Friendica was installed into a sub directory.";
 $a->strings["Enable Diaspora support"] = "Enable Diaspora support";
@@ -1134,7 +1005,7 @@ $a->strings["Minimum fragmenation level to start the automatic optimization - de
 $a->strings["Periodical check of global contacts"] = "Periodical check of global contacts";
 $a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "This checks global contacts periodically for missing or outdated data and the vitality of the contacts and servers.";
 $a->strings["Days between requery"] = "Days between enquiry";
-$a->strings["Number of days after which a server is requeried for his contacts."] = "Number of days after which a server is required check contacts.";
+$a->strings["Number of days after which a server is requeried for his contacts."] = "Number of days after which a server is rechecked for contacts.";
 $a->strings["Discover contacts from other servers"] = "Discover contacts from other servers";
 $a->strings["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'."] = "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 recommend setting is 'Users, Global Contacts'.";
 $a->strings["Timeframe for fetching global contacts"] = "Time-frame for fetching global contacts";
@@ -1148,42 +1019,42 @@ $a->strings["Enables checking for new Friendica versions at github. If there is
 $a->strings["Suppress Tags"] = "Suppress tags";
 $a->strings["Suppress showing a list of hashtags at the end of the posting."] = "Suppress listed hashtags at the end of posts.";
 $a->strings["Clean database"] = "Clean database";
-$a->strings["Remove old remote items, orphaned database records and old content from some other helper tables."] = "Remove old remote items, orphaned database records and old content from some other helper tables.";
+$a->strings["Remove old remote items, orphaned database records and old content from some other helper tables."] = "Remove old remote items, orphaned database records, and old content from some other helper tables.";
 $a->strings["Lifespan of remote items"] = "Lifespan of remote items";
-$a->strings["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."] = "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.";
+$a->strings["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."] = "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 behavior.";
 $a->strings["Lifespan of unclaimed items"] = "Lifespan of unclaimed items";
 $a->strings["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."] = "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.";
 $a->strings["Path to item cache"] = "Path to item cache";
-$a->strings["The item caches buffers generated bbcode and external images."] = "The item caches buffers generated bbcode and external images.";
+$a->strings["The item caches buffers generated bbcode and external images."] = "The item cache retains expanded bbcode and external images.";
 $a->strings["Cache duration in seconds"] = "Cache duration in seconds";
 $a->strings["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."] = "How long should cache files be held? (Default 86400 seconds - one day;  -1 disables item cache)";
-$a->strings["Maximum numbers of comments per post"] = "Maximum numbers of comments per post";
+$a->strings["Maximum numbers of comments per post"] = "Maximum number of comments per post";
 $a->strings["How much comments should be shown for each post? Default value is 100."] = "How many comments should be shown for each post? (Default 100)";
 $a->strings["Temp path"] = "Temp path";
-$a->strings["If you have a restricted system where the webserver can't access the system temp path, enter another path here."] = "Enter a different tmp path, if your system restricts the webserver's access to the system temp path.";
+$a->strings["If you have a restricted system where the webserver can't access the system temp path, enter another path here."] = "Enter a different temp path if your system restricts the webserver's access to the system temp path.";
 $a->strings["Base path to installation"] = "Base path to installation";
 $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."] = "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.";
 $a->strings["Disable picture proxy"] = "Disable picture proxy";
-$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.";
+$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth."] = "";
 $a->strings["Only search in tags"] = "Only search in tags";
-$a->strings["On large systems the text search can slow down the system extremely."] = "On large systems the text search can slow down the system significantly.";
+$a->strings["On large systems the text search can slow down the system extremely."] = "On large systems, the text search can slow down the system significantly.";
 $a->strings["New base url"] = "New base URL";
-$a->strings["Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users."] = "Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.";
+$a->strings["Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users."] = "Change base URL for this server. Sends a relocate message to all Friendica and Diaspora* contacts, for all users.";
 $a->strings["RINO Encryption"] = "RINO Encryption";
 $a->strings["Encryption layer between nodes."] = "Encryption layer between nodes.";
 $a->strings["Enabled"] = "Enabled";
 $a->strings["Maximum number of parallel workers"] = "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."] = "On shared hosts set this to 2. On larger systems, values of 10 are great. Default value is 4.";
+$a->strings["On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4."] = "On shared hosts, set this to 2. On larger systems, values of 10 are great. Default value is 4.";
 $a->strings["Don't use 'proc_open' with the worker"] = "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."] = "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 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."] = "Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosts. If this is enabled, you should increase the frequency of worker calls in your crontab.";
 $a->strings["Enable fastlane"] = "Enable fast-lane";
 $a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "The fast-lane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.";
 $a->strings["Enable frontend worker"] = "Enable frontend worker";
-$a->strings["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."] = "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.";
+$a->strings["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."] = "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.";
 $a->strings["Subscribe to relay"] = "Subscribe to relay";
-$a->strings["Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page."] = "Receive public posts from the specified relay. Post will be included in searches, subscribed tags and on the global community page.";
+$a->strings["Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page."] = "Receive public posts from the specified relay. Post will be included in searches, subscribed tags, and on the global community page.";
 $a->strings["Relay server"] = "Relay server";
-$a->strings["Address of the relay server where public posts should be send to. For example https://relay.diasp.org"] = "Address of the relay server where public posts should be send to. For example https://relay.diasp.org";
+$a->strings["Address of the relay server where public posts should be send to. For example https://relay.diasp.org"] = "Address of the relay server where public posts should be sent. For example https://relay.diasp.org";
 $a->strings["Direct relay transfer"] = "Direct relay transfer";
 $a->strings["Enables the direct transfer to other servers without using the relay servers"] = "Enables direct transfer to other servers without using a relay server.";
 $a->strings["Relay scope"] = "Relay scope";
@@ -1191,13 +1062,13 @@ $a->strings["Can be 'all' or 'tags'. 'all' means that every public post should b
 $a->strings["all"] = "all";
 $a->strings["tags"] = "tags";
 $a->strings["Server tags"] = "Server tags";
-$a->strings["Comma separated list of tags for the 'tags' subscription."] = "Comma separated tags for subscription.";
+$a->strings["Comma separated list of tags for the 'tags' subscription."] = "Comma-separated tags for subscription.";
 $a->strings["Allow user tags"] = "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'."] = "Use user-generated tags from saved searches for 'tags' subscription in addition to 'relay_server_tags'.";
 $a->strings["Update has been marked successful"] = "Update has been marked successful";
 $a->strings["Database structure update %s was successfully applied."] = "Database structure update %s was successfully applied.";
-$a->strings["Executing of database structure update %s failed with error: %s"] = "Executing of database structure update %s failed with error: %s";
-$a->strings["Executing %s failed with error: %s"] = "Executing %s failed with error: %s";
+$a->strings["Executing of database structure update %s failed with error: %s"] = "Execution of database structure update %s failed with error: %s";
+$a->strings["Executing %s failed with error: %s"] = "Execution of %s failed with error: %s";
 $a->strings["Update %s was successfully applied."] = "Update %s was successfully applied.";
 $a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Update %s did not return a status. Unknown if it succeeded.";
 $a->strings["There was no additional update function %s that needed to be called."] = "There was no additional update function %s that needed to be called.";
@@ -1247,7 +1118,7 @@ $a->strings["Site admin"] = "Site admin";
 $a->strings["Account expired"] = "Account expired";
 $a->strings["New User"] = "New user";
 $a->strings["Deleted since"] = "Deleted since";
-$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Selected users will be deleted!\\n\\nEverything these users has posted on this site will be permanently deleted!\\n\\nAre you sure?";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Selected users will be deleted!\\n\\nEverything these users have posted on this site will be permanently deleted!\\n\\nAre you sure?";
 $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?"] = "The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?";
 $a->strings["Name of the new user."] = "Name of the new user.";
 $a->strings["Nickname"] = "Nickname";
@@ -1284,6 +1155,14 @@ $a->strings["Off"] = "Off";
 $a->strings["On"] = "On";
 $a->strings["Lock feature %s"] = "Lock feature %s";
 $a->strings["Manage Additional Features"] = "Manage additional features";
+$a->strings["Community option not available."] = "Community option not available.";
+$a->strings["Not available."] = "Not available.";
+$a->strings["Local Community"] = "Local community";
+$a->strings["Posts from local users on this server"] = "Posts from local users on this server";
+$a->strings["Global Community"] = "Global community";
+$a->strings["Posts from users of the whole federated network"] = "Posts from users of the whole federated network";
+$a->strings["No results."] = "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."] = "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."] = "Profile not found.";
 $a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "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."] = "Response from remote site was not understood.";
@@ -1295,7 +1174,7 @@ $a->strings["Remote site reported: "] = "Remote site reported: ";
 $a->strings["Unable to set contact photo."] = "Unable to set contact photo.";
 $a->strings["No user record found for '%s' "] = "No user record found for '%s' ";
 $a->strings["Our site encryption key is apparently messed up."] = "Our site encryption key is apparently messed up.";
-$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "An empty URL was provided or the URL could not be decrypted by us.";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "An empty URL was provided, or the URL could not be decrypted by us.";
 $a->strings["Contact record was not found for you on our site."] = "Contact record was not found for you on our site.";
 $a->strings["Site public key not available in contact record for URL %s."] = "Site public key not available in contact record for URL %s.";
 $a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "The ID provided by your system is a duplicate on our system. It should work if you try again.";
@@ -1337,12 +1216,70 @@ $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."] = " - please do not use this form.  Instead, enter %s into your Diaspora search bar.";
+$a->strings["Event can not end before it has started."] = "Event cannot end before it has started.";
+$a->strings["Event title and start time are required."] = "Event title and starting time are required.";
+$a->strings["Create New Event"] = "Create new event";
+$a->strings["Event details"] = "Event details";
+$a->strings["Starting date and Title are required."] = "Starting date and title are required.";
+$a->strings["Event Starts:"] = "Event starts:";
+$a->strings["Required"] = "Required";
+$a->strings["Finish date/time is not known or not relevant"] = "Finish date/time is not known or not relevant";
+$a->strings["Event Finishes:"] = "Event finishes:";
+$a->strings["Adjust for viewer timezone"] = "Adjust for viewer's time zone";
+$a->strings["Description:"] = "Description:";
+$a->strings["Title:"] = "Title:";
+$a->strings["Share this event"] = "Share this event";
+$a->strings["Basic"] = "Basic";
+$a->strings["Permissions"] = "Permissions";
+$a->strings["Failed to remove event"] = "Failed to remove event";
+$a->strings["Event removed"] = "Event removed";
+$a->strings["Group created."] = "Group created.";
+$a->strings["Could not create group."] = "Could not create group.";
+$a->strings["Group not found."] = "Group not found.";
+$a->strings["Group name changed."] = "Group name changed.";
+$a->strings["Save Group"] = "Save group";
+$a->strings["Create a group of contacts/friends."] = "Create a group of contacts/friends.";
+$a->strings["Group Name: "] = "Group name: ";
+$a->strings["Group removed."] = "Group removed.";
+$a->strings["Unable to remove group."] = "Unable to remove group.";
+$a->strings["Delete Group"] = "Delete group";
+$a->strings["Group Editor"] = "Group Editor";
+$a->strings["Edit Group Name"] = "Edit group name";
+$a->strings["Members"] = "Members";
+$a->strings["Group is empty"] = "Group is empty";
+$a->strings["Remove contact from group"] = "Remove contact from group";
+$a->strings["Add contact to group"] = "Add contact to group";
 $a->strings["Unable to locate original post."] = "Unable to locate original post.";
 $a->strings["Empty post discarded."] = "Empty post discarded.";
 $a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "This message was sent to you by %s, a member of the Friendica social network.";
 $a->strings["You may visit them online at %s"] = "You may visit them online at %s";
 $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "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 posted an update.";
+$a->strings["Remove term"] = "Remove term";
+$a->strings["Saved Searches"] = "Saved searches";
+$a->strings["add"] = "add";
+$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
+	0 => "Warning: This group contains %s member from a network that doesn't allow non public messages.",
+	1 => "Warning: This group contains %s members from a network that doesn't allow non-public messages.",
+];
+$a->strings["Messages in this group won't be send to these receivers."] = "Messages in this group won't be sent to these receivers.";
+$a->strings["No such group"] = "No such group";
+$a->strings["Group: %s"] = "Group: %s";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "Private messages to this person are at risk of public disclosure.";
+$a->strings["Invalid contact."] = "Invalid contact.";
+$a->strings["Commented Order"] = "Commented last";
+$a->strings["Sort by Comment Date"] = "Sort by comment date";
+$a->strings["Posted Order"] = "Posted last";
+$a->strings["Sort by Post Date"] = "Sort by post date";
+$a->strings["Personal"] = "Personal";
+$a->strings["Posts that mention or involve you"] = "Posts mentioning or involving me";
+$a->strings["New"] = "New";
+$a->strings["Activity Stream - by date"] = "Activity Stream - by date";
+$a->strings["Shared Links"] = "Shared links";
+$a->strings["Interesting Links"] = "Interesting links";
+$a->strings["Starred"] = "Starred";
+$a->strings["Favourite Posts"] = "My favorite posts";
+$a->strings["Personal Notes"] = "Personal notes";
 $a->strings["Invalid request identifier."] = "Invalid request identifier.";
 $a->strings["Discard"] = "Discard";
 $a->strings["Notifications"] = "Notifications";
@@ -1357,7 +1294,7 @@ $a->strings["Claims to be known to you: "] = "Says they know me:";
 $a->strings["yes"] = "yes";
 $a->strings["no"] = "no";
 $a->strings["Shall your connection be bidirectional or not?"] = "Shall your connection be in both directions 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."] = "Accepting %s as a friend allows %s to subscribe to your posts; you will also receive updates from them in your news feed.";
+$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."] = "Accepting %s as a friend allows %s to subscribe to your posts. 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."] = "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."] = "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"] = "Friend";
@@ -1367,6 +1304,58 @@ $a->strings["No introductions."] = "No introductions.";
 $a->strings["Show unread"] = "Show unread";
 $a->strings["Show all"] = "Show all";
 $a->strings["No more %s notifications."] = "No more %s notifications.";
+$a->strings["OpenID protocol error. No ID returned."] = "OpenID protocol error. No ID returned.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account not found and OpenID registration is not permitted on this site.";
+$a->strings["Login failed."] = "Login failed.";
+$a->strings["Photo Albums"] = "Photo Albums";
+$a->strings["Recent Photos"] = "Recent photos";
+$a->strings["Upload New Photos"] = "Upload new photos";
+$a->strings["everybody"] = "everybody";
+$a->strings["Contact information unavailable"] = "Contact information unavailable";
+$a->strings["Album not found."] = "Album not found.";
+$a->strings["Delete Album"] = "Delete album";
+$a->strings["Do you really want to delete this photo album and all its photos?"] = "Do you really want to delete this photo album and all its photos?";
+$a->strings["Delete Photo"] = "Delete photo";
+$a->strings["Do you really want to delete this photo?"] = "Do you really want to delete this photo?";
+$a->strings["a photo"] = "a photo";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s was tagged in %2\$s by %3\$s";
+$a->strings["Image upload didn't complete, please try again"] = "Image upload didn't complete. Please try again.";
+$a->strings["Image file is missing"] = "Image file is missing";
+$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "Server can't accept new file uploads at this time. Please contact your administrator.";
+$a->strings["Image file is empty."] = "Image file is empty.";
+$a->strings["No photos selected"] = "No photos selected";
+$a->strings["Access to this item is restricted."] = "Access to this item is restricted.";
+$a->strings["Upload Photos"] = "Upload photos";
+$a->strings["New album name: "] = "New album name: ";
+$a->strings["or existing album name: "] = "or existing album name: ";
+$a->strings["Do not show a status post for this upload"] = "Do not show a status post for this upload";
+$a->strings["Show to Groups"] = "Show to groups";
+$a->strings["Show to Contacts"] = "Show to contacts";
+$a->strings["Edit Album"] = "Edit album";
+$a->strings["Show Newest First"] = "Show newest first";
+$a->strings["Show Oldest First"] = "Show oldest first";
+$a->strings["View Photo"] = "View photo";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permission denied. Access to this item may be restricted.";
+$a->strings["Photo not available"] = "Photo not available";
+$a->strings["View photo"] = "View photo";
+$a->strings["Edit photo"] = "Edit photo";
+$a->strings["Use as profile photo"] = "Use as profile photo";
+$a->strings["Private Message"] = "Private message";
+$a->strings["View Full Size"] = "View full size";
+$a->strings["Tags: "] = "Tags: ";
+$a->strings["[Remove any tag]"] = "[Remove any tag]";
+$a->strings["New album name"] = "New album name";
+$a->strings["Caption"] = "Caption";
+$a->strings["Add a Tag"] = "Add Tag";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Example: @bob, @jojo@example.com, #California, #camping";
+$a->strings["Do not rotate"] = "Do not rotate";
+$a->strings["Rotate CW (right)"] = "Rotate right (CW)";
+$a->strings["Rotate CCW (left)"] = "Rotate left (CCW)";
+$a->strings["I like this (toggle)"] = "I like this (toggle)";
+$a->strings["I don't like this (toggle)"] = "I don't like this (toggle)";
+$a->strings["Comment"] = "Comment";
+$a->strings["Map"] = "Map";
+$a->strings["View Album"] = "View album";
 $a->strings["Requested profile is not available."] = "Requested profile is unavailable.";
 $a->strings["%s's timeline"] = "%s's timeline";
 $a->strings["%s's posts"] = "%s's posts";
@@ -1452,7 +1441,7 @@ $a->strings["Edit/Manage Profiles"] = "Edit/Manage Profiles";
 $a->strings["Change profile photo"] = "Change profile photo";
 $a->strings["Create New Profile"] = "Create new profile";
 $a->strings["Registration successful. Please check your email for further instructions."] = "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."] = "Failed to send email message. Here your account details:<br> login: %s<br> password: %s<br><br>You can change your password after login.";
+$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."] = "Failed to send email message. Here are your account details:<br> login: %s<br> password: %s<br><br>You can change your password after login.";
 $a->strings["Registration successful."] = "Registration successful.";
 $a->strings["Your registration can not be processed."] = "Your registration cannot be processed.";
 $a->strings["Your registration is pending approval by the site owner."] = "Your registration is pending approval by the site administrator.";
@@ -1461,11 +1450,11 @@ $a->strings["If you are not familiar with OpenID, please leave that field blank
 $a->strings["Your OpenID (optional): "] = "Your OpenID (optional): ";
 $a->strings["Include your profile in member directory?"] = "Include your profile in member directory?";
 $a->strings["Note for the admin"] = "Note for the admin";
-$a->strings["Leave a message for the admin, why you want to join this node"] = "Leave a message for the admin, why you want to join this node.";
+$a->strings["Leave a message for the admin, why you want to join this node"] = "Leave a message for the admin. Why do you want to join this node?";
 $a->strings["Membership on this site is by invitation only."] = "Membership on this site is by invitation only.";
 $a->strings["Your invitation code: "] = "Your invitation code: ";
 $a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Your full name: ";
-$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Your Email Address: (Initial information will be send there; so this must be an existing address.)";
+$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Your Email Address: (Initial information will be sent there, so this must be an existing address.)";
 $a->strings["New Password:"] = "New password:";
 $a->strings["Leave empty for an auto generated password."] = "Leave empty for an auto generated password.";
 $a->strings["Confirm:"] = "Confirm new password:";
@@ -1474,11 +1463,15 @@ $a->strings["Choose a nickname: "] = "Choose a nickname: ";
 $a->strings["Register"] = "Sign up now >>";
 $a->strings["Import your profile to this friendica instance"] = "Import an existing Friendica profile to this node.";
 $a->strings["User deleted their account"] = "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."] = "On your Friendica node a user deleted their account. Please ensure that their data is removed from the backups.";
+$a->strings["On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups."] = "A user deleted his or her account on your Friendica node. Please ensure these data are removed from the backups.";
 $a->strings["The user id is %d"] = "The user id is %d";
 $a->strings["Remove My Account"] = "Remove My Account";
 $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "This will completely remove your account. Once this has been done it is not recoverable.";
 $a->strings["Please enter your password for verification:"] = "Please enter your password for verification:";
+$a->strings["Only logged in users are permitted to perform a search."] = "Only logged in users are permitted to perform a search.";
+$a->strings["Too Many Requests"] = "Too many requests";
+$a->strings["Only one search per minute is permitted for not logged in users."] = "Only one search per minute is permitted for not-logged-in users.";
+$a->strings["Items tagged with: %s"] = "Items tagged with: %s";
 $a->strings["Account"] = "Account";
 $a->strings["Display"] = "Display";
 $a->strings["Social Networks"] = "Social networks";
@@ -1489,7 +1482,7 @@ $a->strings["Missing some important data!"] = "Missing some important data!";
 $a->strings["Failed to connect with email account using the settings provided."] = "Failed to connect with email account using the settings provided.";
 $a->strings["Email settings updated."] = "Email settings updated.";
 $a->strings["Features updated"] = "Features updated";
-$a->strings["Relocate message has been send to your contacts"] = "Relocate message has been send to your contacts";
+$a->strings["Relocate message has been send to your contacts"] = "Relocate message has been sent to your contacts";
 $a->strings["Passwords do not match. Password unchanged."] = "Passwords do not match. Password unchanged.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "Empty passwords are not allowed. Password unchanged.";
 $a->strings["The new password has been exposed in a public data dump, please choose another."] = "The new password has been exposed in a public data dump; please choose another.";
@@ -1556,7 +1549,7 @@ $a->strings["Display Settings"] = "Display Settings";
 $a->strings["Display Theme:"] = "Display theme:";
 $a->strings["Mobile Theme:"] = "Mobile theme:";
 $a->strings["Suppress warning of insecure networks"] = "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."] = "Suppresses warnings if groups contains members whose networks cannot receive non-public postings.";
+$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Suppresses warnings if groups contain members whose networks cannot receive non-public postings.";
 $a->strings["Update browser every xx seconds"] = "Update browser every so many seconds:";
 $a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum 10 seconds; to disable -1.";
 $a->strings["Number of items to display per page:"] = "Number of items displayed per page:";
@@ -1569,7 +1562,7 @@ $a->strings["Don't show notices"] = "Don't show notices";
 $a->strings["Infinite scroll"] = "Infinite scroll";
 $a->strings["Automatic updates only at the top of the network page"] = "Automatically updates only top of the network page";
 $a->strings["When disabled, the network page is updated all the time, which could be confusing while reading."] = "When disabled, the network page is updated all the time, which could be confusing while reading.";
-$a->strings["Bandwith Saver Mode"] = "Bandwith saving mode";
+$a->strings["Bandwidth Saver Mode"] = "";
 $a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "If enabled, embedded content is not displayed on automatic updates; it is only shown on page reload.";
 $a->strings["Smart Threading"] = "Smart Threading";
 $a->strings["When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled."] = "Suppresses extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled.";
@@ -1594,13 +1587,13 @@ $a->strings["Requires manual approval of contact requests."] = "Requires manual
 $a->strings["OpenID:"] = "OpenID:";
 $a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Allow this OpenID to login to this account.";
 $a->strings["Publish your default profile in your local site directory?"] = "Publish default profile in local site 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."] = "Your profile will be published in the global Friendica directories (e.g. <a href=\"%s\">%s</a>). Your profile will be publicly visible.";
-$a->strings["Publish your default profile in the global social directory?"] = "Publish default profile in global 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."] = "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?"] = "Publish default profile in global 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."] = "Your profile will be published in the global Friendica directories (e.g. <a href=\"%s\">%s</a>). Your profile will be publicly visible.";
 $a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Hide my contact list from others?";
 $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"] = "Your contact list won't be shown in your default profile page. You can decide to display your contact list separately for each additional profile you create";
 $a->strings["Hide your profile details from anonymous viewers?"] = "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. Disables posting public messages to Diaspora and other networks."] = "Anonymous visitors will only see your profile picture, display name, and nickname. Disables posting public messages to Diaspora and other networks.";
+$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?"] = "Allow friends to post to my wall?";
 $a->strings["Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"] = "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?"] = "Allow friends to tag my post?";
@@ -1636,7 +1629,7 @@ $a->strings["Default Post Location:"] = "Posting location:";
 $a->strings["Use Browser Location:"] = "Use browser location:";
 $a->strings["Security and Privacy Settings"] = "Security and privacy";
 $a->strings["Maximum Friend Requests/Day:"] = "Maximum friend requests per day:";
-$a->strings["(to prevent spam abuse)"] = "May prevent spam or abuse registrations";
+$a->strings["(to prevent spam abuse)"] = "May prevent spam and abusive registrations";
 $a->strings["Default Post Permissions"] = "Default post permissions";
 $a->strings["(click to open/close)"] = "(reveal/hide)";
 $a->strings["Default Private Post"] = "Default private post";
@@ -1660,10 +1653,17 @@ $a->strings["Send text only notification emails, without the html part"] = "Rece
 $a->strings["Show detailled notifications"] = "Show detailled notifications";
 $a->strings["Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed."] = "By default, notifications are condensed into a single notification for each item. When enabled, every notification is displayed.";
 $a->strings["Advanced Account/Page Type Settings"] = "Advanced account types";
-$a->strings["Change the behaviour of this account for special situations"] = "Change behaviour of this account for special situations";
+$a->strings["Change the behaviour of this account for special situations"] = "Change behavior of this account for special situations";
 $a->strings["Relocate"] = "Recent relocation";
 $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."] = "If you have moved this profile from another server and some of your contacts don't receive your updates:";
 $a->strings["Resend relocate message to contacts"] = "Resend relocation message to contacts";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s is following %2\$s's %3\$s";
+$a->strings["[Embedded content - reload page to view]"] = "[Embedded content - reload page to view]";
+$a->strings["Do you really want to delete this video?"] = "Do you really want to delete this video?";
+$a->strings["Delete Video"] = "Delete video";
+$a->strings["No videos selected"] = "No videos selected";
+$a->strings["Recent Videos"] = "Recent videos";
+$a->strings["Upload New Videos"] = "Upload new videos";
 $a->strings["default"] = "default";
 $a->strings["greenzero"] = "greenzero";
 $a->strings["purplezero"] = "purplezero";
@@ -1682,7 +1682,7 @@ $a->strings["Mosaic"] = "Mosaic";
 $a->strings["Repeat image to fill the screen."] = "Repeat image to fill the screen.";
 $a->strings["Custom"] = "Custom";
 $a->strings["Note"] = "Note";
-$a->strings["Check image permissions if all users are allowed to see the image"] = "Check image permissions that all everyone is allowed to see the image";
+$a->strings["Check image permissions if all users are allowed to see the image"] = "Check image permissions that everyone is allowed to see the image";
 $a->strings["Select color scheme"] = "Select color scheme";
 $a->strings["Navigation bar background color"] = "Navigation bar background color:";
 $a->strings["Navigation bar icon color "] = "Navigation bar icon color:";
@@ -1715,7 +1715,7 @@ $a->strings["Center"] = "Center";
 $a->strings["Color scheme"] = "Color scheme";
 $a->strings["Posts font size"] = "Posts font size";
 $a->strings["Textareas font size"] = "Text areas font size";
-$a->strings["Comma separated list of helper forums"] = "Comma separated list of helper forums";
+$a->strings["Comma separated list of helper forums"] = "Comma-separated list of helper forums";
 $a->strings["don't show"] = "don't show";
 $a->strings["show"] = "show";
 $a->strings["Set style"] = "Set style";
@@ -1802,12 +1802,12 @@ $a->strings["Error: POSIX PHP module required but not installed."] = "Error: POS
 $a->strings["Error, XML PHP module required but not installed."] = "Error, XML PHP module required but not installed.";
 $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."] = "The web installer needs to be able to create a file called \".htconfig.php\" in the top-level directory of your web server, but 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."] = "This is most often a permission setting issue, as the web server may not be able to write files in your directory - 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."] = "At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top-level directory.";
+$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."] = "At the end of this procedure, we will give you the text to save in a file named .htconfig.php in your Friendica top-level directory.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternatively, you may skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions.";
 $a->strings[".htconfig.php is writable"] = ".htconfig.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 uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.";
 $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."] = "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 directory.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Please ensure the user (e.g. www-data) that your web server runs as has write access to this directory.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Please ensure the user that your web server runs as (e.g. www-data) has write access to this directory.";
 $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."] = "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.";
 $a->strings["view/smarty3 is writable"] = "view/smarty3 is writable";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "URL rewrite in .htaccess is not working. Check your server configuration.";
@@ -1941,7 +1941,7 @@ $a->strings["General Features"] = "General";
 $a->strings["Multiple Profiles"] = "Multiple profiles";
 $a->strings["Ability to create multiple profiles"] = "Ability to create multiple profiles";
 $a->strings["Photo Location"] = "Photo location";
-$a->strings["Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map."] = "Photo metadata is normally removed. This extracts the location (if present) prior to removing metadata and links it to a map.";
+$a->strings["Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map."] = "Photo metadata is normally removed. This saves the geo tag (if present) and links it to a map prior to removing other metadata.";
 $a->strings["Export Public Calendar"] = "Export public calendar";
 $a->strings["Ability for visitors to download the public calendar"] = "Ability for visitors to download the public calendar";
 $a->strings["Post Composition Features"] = "Post composition";
@@ -1952,7 +1952,7 @@ $a->strings["Add/remove mention when a forum page is selected/deselected in ACL
 $a->strings["Network Sidebar"] = "Network sidebar";
 $a->strings["Ability to select posts by date ranges"] = "Ability to select posts by date ranges";
 $a->strings["List Forums"] = "List forums";
-$a->strings["Enable widget to display the forums your are connected with"] = "Enable widget to display the forums your are connected with";
+$a->strings["Enable widget to display the forums your are connected with"] = "Enable widget to display the forums you are connected with";
 $a->strings["Group Filter"] = "Group filter";
 $a->strings["Enable widget to display Network posts only from selected group"] = "Enable widget to display network posts only from selected group";
 $a->strings["Network Filter"] = "Network filter";
@@ -1969,7 +1969,7 @@ $a->strings["Post/Comment Tools"] = "Post/Comment tools";
 $a->strings["Multiple Deletion"] = "Multiple deletion";
 $a->strings["Select and delete multiple posts/comments at once"] = "Select and delete multiple posts/comments at once";
 $a->strings["Edit Sent Posts"] = "Edit sent posts";
-$a->strings["Edit and correct posts and comments after sending"] = "Ability to editing posts and comments after sending";
+$a->strings["Edit and correct posts and comments after sending"] = "Ability to edit posts and comments after sending";
 $a->strings["Tagging"] = "Tagging";
 $a->strings["Ability to tag existing posts"] = "Ability to tag existing posts";
 $a->strings["Post Categories"] = "Post categories";
@@ -2008,7 +2008,7 @@ $a->strings["Network Reset"] = "Network reset";
 $a->strings["Load Network page with no filters"] = "Load network page without filters";
 $a->strings["Friend Requests"] = "Friend requests";
 $a->strings["See all notifications"] = "See all notifications";
-$a->strings["Mark all system notifications seen"] = "Mark all system notifications seen";
+$a->strings["Mark all system notifications seen"] = "Mark notifications as seen";
 $a->strings["Inbox"] = "Inbox";
 $a->strings["Outbox"] = "Outbox";
 $a->strings["Manage"] = "Manage";
@@ -2026,6 +2026,32 @@ $a->strings["Errors encountered performing database changes: "] = "Errors encoun
 $a->strings["%s: Database update"] = "%s: Database update";
 $a->strings["%s: updating %s table."] = "%s: updating %s table.";
 $a->strings["[no subject]"] = "[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."] = "A deleted group with this name has been 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.";
+$a->strings["Default privacy group for new contacts"] = "Default privacy group for new contacts";
+$a->strings["Everybody"] = "Everybody";
+$a->strings["edit"] = "edit";
+$a->strings["Edit group"] = "Edit group";
+$a->strings["Contacts not in any group"] = "Contacts not in any group";
+$a->strings["Create a new group"] = "Create new group";
+$a->strings["Edit groups"] = "Edit groups";
+$a->strings["Drop Contact"] = "Drop contact";
+$a->strings["Organisation"] = "Organization";
+$a->strings["News"] = "News";
+$a->strings["Forum"] = "Forum";
+$a->strings["Connect URL missing."] = "Connect URL missing.";
+$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "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."] = "This site is not configured to allow communications with other networks.";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "No compatible communication protocols or feeds were discovered.";
+$a->strings["The profile address specified does not provide adequate information."] = "The profile address specified does not provide adequate information.";
+$a->strings["An author or name was not found."] = "An author or name was not found.";
+$a->strings["No browser URL could be matched to this address."] = "No browser URL could be matched to this address.";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "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."] = "Use mailto: in front of address to force email check.";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "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."] = "Limited profile: This person will be unable to receive direct/private messages from you.";
+$a->strings["Unable to retrieve contact information."] = "Unable to retrieve contact information.";
+$a->strings["%s's birthday"] = "%s's birthday";
+$a->strings["Happy Birthday %s"] = "Happy Birthday, %s!";
 $a->strings["Starts:"] = "Starts:";
 $a->strings["Finishes:"] = "Finishes:";
 $a->strings["all-day"] = "All-day";
@@ -2040,14 +2066,9 @@ $a->strings["D g:i A"] = "D g:i A";
 $a->strings["g:i A"] = "g:i A";
 $a->strings["Show map"] = "Show map";
 $a->strings["Hide map"] = "Hide map";
-$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."] = "A deleted group with this name has been 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.";
-$a->strings["Default privacy group for new contacts"] = "Default privacy group for new contacts";
-$a->strings["Everybody"] = "Everybody";
-$a->strings["edit"] = "edit";
-$a->strings["Edit group"] = "Edit group";
-$a->strings["Contacts not in any group"] = "Contacts not in any group";
-$a->strings["Create a new group"] = "Create new group";
-$a->strings["Edit groups"] = "Edit groups";
+$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s is going to %2\$s's %3\$s";
+$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s is not going to %2\$s's %3\$s";
+$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s may go to %2\$s's %3\$s";
 $a->strings["Requested account is not available."] = "Requested account is unavailable.";
 $a->strings["Edit profile"] = "Edit profile";
 $a->strings["Atom feed"] = "Atom feed";
@@ -2102,33 +2123,12 @@ $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Yo
 $a->strings["Registration at %s"] = "Registration at %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\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\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\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["Drop Contact"] = "Drop contact";
-$a->strings["Organisation"] = "Organization";
-$a->strings["News"] = "News";
-$a->strings["Forum"] = "Forum";
-$a->strings["Connect URL missing."] = "Connect URL missing.";
-$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "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."] = "This site is not configured to allow communications with other networks.";
-$a->strings["No compatible communication protocols or feeds were discovered."] = "No compatible communication protocols or feeds were discovered.";
-$a->strings["The profile address specified does not provide adequate information."] = "The profile address specified does not provide adequate information.";
-$a->strings["An author or name was not found."] = "An author or name was not found.";
-$a->strings["No browser URL could be matched to this address."] = "No browser URL could be matched to this address.";
-$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "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."] = "Use mailto: in front of address to force email check.";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "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."] = "Limited profile: This person will be unable to receive direct/private messages from you.";
-$a->strings["Unable to retrieve contact information."] = "Unable to retrieve contact information.";
-$a->strings["%s's birthday"] = "%s's birthday";
-$a->strings["Happy Birthday %s"] = "Happy Birthday, %s!";
-$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s is going to %2\$s's %3\$s";
-$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s is not going to %2\$s's %3\$s";
-$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s may go to %2\$s's %3\$s";
+$a->strings["Sharing notification from Diaspora network"] = "Sharing notification from Diaspora network";
+$a->strings["Attachments:"] = "Attachments:";
 $a->strings["%s is now following %s."] = "%s is now following %s.";
 $a->strings["following"] = "following";
 $a->strings["%s stopped following %s."] = "%s stopped following %s.";
 $a->strings["stopped following"] = "stopped following";
-$a->strings["Sharing notification from Diaspora network"] = "Sharing notification from Diaspora network";
-$a->strings["Attachments:"] = "Attachments:";
 $a->strings["(no subject)"] = "(no subject)";
 $a->strings["Logged out."] = "Logged out.";
 $a->strings["Create a New Account"] = "Create a new account";
@@ -2140,12 +2140,13 @@ $a->strings["Website Terms of Service"] = "Website Terms of Service";
 $a->strings["terms of service"] = "Terms of service";
 $a->strings["Website Privacy Policy"] = "Website Privacy Policy";
 $a->strings["privacy policy"] = "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."] = "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["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."] = "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), a 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 won’t 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."] = "This information is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional personal information that may be transmitted to the communication partner's 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."] = "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"] = "Privacy Statement";
 $a->strings["This entry was edited"] = "This entry was edited";
-$a->strings["Remove from your stream"] = "Remove from your stream";
+$a->strings["Delete globally"] = "";
+$a->strings["Remove locally"] = "";
 $a->strings["save to folder"] = "Save to folder";
 $a->strings["I will attend"] = "I will attend";
 $a->strings["I will not attend"] = "I will not attend";
@@ -2182,5 +2183,5 @@ $a->strings["Delete this item?"] = "Delete this item?";
 $a->strings["show fewer"] = "Show fewer.";
 $a->strings["No system theme config value set."] = "No system theme configuration value set.";
 $a->strings["toggle mobile"] = "Toggle mobile";
-$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Updating author-id and owner-id in item and thread table. ";
 $a->strings["Update %s failed. See error logs."] = "Update %s failed. See error logs.";
+$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Updating author-id and owner-id in item and thread table. ";
diff --git a/view/lang/fi-fi/messages.po b/view/lang/fi-fi/messages.po
index 7fafd3053..442608f68 100644
--- a/view/lang/fi-fi/messages.po
+++ b/view/lang/fi-fi/messages.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-20 14:22+0200\n"
-"PO-Revision-Date: 2018-05-20 13:51+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"POT-Creation-Date: 2018-06-02 08:49+0200\n"
+"PO-Revision-Date: 2018-06-06 15:02+0000\n"
+"Last-Translator: Kris\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -289,7 +289,7 @@ msgstr "'%1$s' voi halutessaan laajentaa suhteenne kahdenväliseksi."
 msgid "Please visit %s  if you wish to make any changes to this relationship."
 msgstr "Käy osoitteessa %s muokkaamaan tätä kaverisuhdetta."
 
-#: include/enotify.php:360 mod/removeme.php:44
+#: include/enotify.php:360 mod/removeme.php:45
 msgid "[Friendica System Notify]"
 msgstr "[Friendica Järjestelmäilmoitus]"
 
@@ -317,29 +317,6 @@ msgstr "Koko nimi:\t%1$s\\nSivusto:\t%2$s\\nKäyttäjätunnus:\t%3$s (%4$s)"
 msgid "Please visit %s to approve or reject the request."
 msgstr "Hyväksy tai hylkää pyyntö %s-sivustossa."
 
-#: include/security.php:81
-msgid "Welcome "
-msgstr "Tervetuloa"
-
-#: include/security.php:82
-msgid "Please upload a profile photo."
-msgstr "Lataa profiilikuva."
-
-#: include/security.php:84
-msgid "Welcome back "
-msgstr "Tervetuloa takaisin"
-
-#: include/security.php:440
-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 "Lomakkeen turvallisuusavain oli väärin. Tämä voi johtua siitä, että lomake on ollut avoinna liian kauan (>3 tuntia) ennen sen lähettämistä."
-
-#: include/dba.php:59
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "'%s' tietokantapalvelimen DNS-tieto ei löydy"
-
 #: include/api.php:1202
 #, php-format
 msgid "Daily posting limit of %d post reached. The post was rejected."
@@ -360,475 +337,474 @@ msgstr[1] "Viikottainen julkaisuraja (%d) on tullut täyteen. Julkaisu hylätty.
 msgid "Monthly posting limit of %d post reached. The post was rejected."
 msgstr "Kuukausittainen julkaisuraja (%d) on tullut täyteen. Julkaisu hylätty."
 
-#: include/api.php:4522 mod/photos.php:88 mod/photos.php:194
-#: mod/photos.php:722 mod/photos.php:1149 mod/photos.php:1166
-#: mod/photos.php:1684 mod/profile_photo.php:85 mod/profile_photo.php:93
+#: 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 src/Model/User.php:553
-#: src/Model/User.php:561 src/Model/User.php:569
+#: 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 "Profiilin valokuvat"
 
-#: include/conversation.php:144 include/conversation.php:282
-#: include/text.php:1749 src/Model/Item.php:1970
+#: include/conversation.php:144 include/conversation.php:279
+#: include/text.php:1749 src/Model/Item.php:2002
 msgid "event"
 msgstr "tapahtuma"
 
 #: include/conversation.php:147 include/conversation.php:157
-#: include/conversation.php:285 include/conversation.php:294
-#: mod/subthread.php:97 mod/tagger.php:72 src/Model/Item.php:1968
+#: 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 "tila"
 
-#: include/conversation.php:152 include/conversation.php:290
-#: include/text.php:1751 mod/subthread.php:97 mod/tagger.php:72
-#: src/Model/Item.php:1968
+#: 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 "kuva"
 
-#: include/conversation.php:164 src/Model/Item.php:1841
+#: 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 tykkää käyttäjän %2$s %3$s"
 
-#: include/conversation.php:167 src/Model/Item.php:1846
+#: include/conversation.php:166 src/Model/Item.php:1878
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: include/conversation.php:170
+#: include/conversation.php:168
 #, php-format
 msgid "%1$s attends %2$s's %3$s"
 msgstr "%1$s osallistuu tapahtumaan %3$s, jonka järjestää %2$s"
 
-#: include/conversation.php:173
+#: include/conversation.php:170
 #, php-format
 msgid "%1$s doesn't attend %2$s's %3$s"
 msgstr "%1$s ei osallistu tapahtumaan %3$s, jonka järjestää %2$s"
 
-#: include/conversation.php:176
+#: include/conversation.php:172
 #, php-format
 msgid "%1$s attends maybe %2$s's %3$s"
 msgstr "%1$s ehkä osallistuu tapahtumaan %3$s, jonka järjestää %2$s"
 
-#: include/conversation.php:209
+#: include/conversation.php:206
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr "%1$s ja %2$s ovat kavereita"
 
-#: include/conversation.php:250
+#: include/conversation.php:247
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr "%1$s tökkäsi %2$s"
 
-#: include/conversation.php:304 mod/tagger.php:110
+#: include/conversation.php:301 mod/tagger.php:110
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: include/conversation.php:331
+#: include/conversation.php:328
 msgid "post/item"
 msgstr "julkaisu/kohde"
 
-#: include/conversation.php:332
+#: include/conversation.php:329
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: include/conversation.php:608 mod/photos.php:1501 mod/profiles.php:355
+#: include/conversation.php:609 mod/photos.php:1495 mod/profiles.php:355
 msgid "Likes"
 msgstr "Tykkäyksiä"
 
-#: include/conversation.php:608 mod/photos.php:1501 mod/profiles.php:359
+#: include/conversation.php:609 mod/photos.php:1495 mod/profiles.php:359
 msgid "Dislikes"
 msgstr "Inhokit"
 
-#: include/conversation.php:609 include/conversation.php:1639
-#: mod/photos.php:1502
+#: include/conversation.php:610 include/conversation.php:1638
+#: mod/photos.php:1496
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Osallistuu"
 msgstr[1] "Osallistuu"
 
-#: include/conversation.php:609 mod/photos.php:1502
+#: include/conversation.php:610 mod/photos.php:1496
 msgid "Not attending"
 msgstr "Ei osallistu"
 
-#: include/conversation.php:609 mod/photos.php:1502
+#: include/conversation.php:610 mod/photos.php:1496
 msgid "Might attend"
 msgstr "Ehkä"
 
-#: include/conversation.php:721 mod/photos.php:1569 src/Object/Post.php:192
+#: include/conversation.php:722 mod/photos.php:1563 src/Object/Post.php:192
 msgid "Select"
 msgstr "Valitse"
 
-#: include/conversation.php:722 mod/photos.php:1570 mod/contacts.php:830
-#: mod/contacts.php:1035 mod/admin.php:1827 mod/settings.php:730
-#: src/Object/Post.php:187
+#: 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 "Poista"
 
-#: include/conversation.php:760 src/Object/Post.php:371
+#: include/conversation.php:761 src/Object/Post.php:371
 #: src/Object/Post.php:372
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Katso %s-henkilön profiilia @ %s"
 
-#: include/conversation.php:772 src/Object/Post.php:359
+#: include/conversation.php:773 src/Object/Post.php:359
 msgid "Categories:"
 msgstr "Luokat:"
 
-#: include/conversation.php:773 src/Object/Post.php:360
+#: include/conversation.php:774 src/Object/Post.php:360
 msgid "Filed under:"
 msgstr "Arkistoitu kansioon:"
 
-#: include/conversation.php:780 src/Object/Post.php:385
+#: include/conversation.php:781 src/Object/Post.php:385
 #, php-format
 msgid "%s from %s"
 msgstr "%s sovelluksesta %s"
 
-#: include/conversation.php:795
+#: include/conversation.php:796
 msgid "View in context"
 msgstr "Näytä kontekstissa"
 
-#: include/conversation.php:797 include/conversation.php:1312
-#: mod/wallmessage.php:145 mod/editpost.php:125 mod/photos.php:1473
-#: mod/message.php:245 mod/message.php:414 src/Object/Post.php:410
+#: 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 "Odota"
 
-#: include/conversation.php:868
+#: include/conversation.php:869
 msgid "remove"
 msgstr "poista"
 
-#: include/conversation.php:872
+#: include/conversation.php:873
 msgid "Delete Selected Items"
 msgstr "Poista valitut kohteet"
 
-#: include/conversation.php:1017 view/theme/frio/theme.php:352
+#: include/conversation.php:1018 view/theme/frio/theme.php:352
 msgid "Follow Thread"
 msgstr "Seuraa ketjua"
 
-#: include/conversation.php:1018 src/Model/Contact.php:662
+#: include/conversation.php:1019 src/Model/Contact.php:662
 msgid "View Status"
 msgstr "Näytä tila"
 
-#: include/conversation.php:1019 include/conversation.php:1035
+#: 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 "Näytä profiilia"
 
-#: include/conversation.php:1020 src/Model/Contact.php:664
+#: include/conversation.php:1021 src/Model/Contact.php:664
 msgid "View Photos"
 msgstr "Näytä kuvia"
 
-#: include/conversation.php:1021 src/Model/Contact.php:665
+#: include/conversation.php:1022 src/Model/Contact.php:665
 msgid "Network Posts"
 msgstr "Uutisvirtajulkaisut"
 
-#: include/conversation.php:1022 src/Model/Contact.php:666
+#: include/conversation.php:1023 src/Model/Contact.php:666
 msgid "View Contact"
 msgstr "Näytä kontaktia"
 
-#: include/conversation.php:1023 src/Model/Contact.php:668
+#: include/conversation.php:1024 src/Model/Contact.php:668
 msgid "Send PM"
 msgstr "Lähetä yksityisviesti"
 
-#: include/conversation.php:1027 src/Model/Contact.php:669
+#: include/conversation.php:1028 src/Model/Contact.php:669
 msgid "Poke"
 msgstr "Tökkää"
 
-#: include/conversation.php:1032 mod/allfriends.php:74 mod/suggest.php:83
+#: 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 "Yhdistä/Seuraa"
 
-#: include/conversation.php:1151
+#: include/conversation.php:1152
 #, php-format
 msgid "%s likes this."
 msgstr "%s tykkää tästä."
 
-#: include/conversation.php:1154
+#: include/conversation.php:1155
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s ei tykkää tästä."
 
-#: include/conversation.php:1157
+#: include/conversation.php:1158
 #, php-format
 msgid "%s attends."
 msgstr "%s osallistuu."
 
-#: include/conversation.php:1160
+#: include/conversation.php:1161
 #, php-format
 msgid "%s doesn't attend."
 msgstr "%s ei osallistu."
 
-#: include/conversation.php:1163
+#: include/conversation.php:1164
 #, php-format
 msgid "%s attends maybe."
 msgstr "%s ehkä osallistuu."
 
-#: include/conversation.php:1174
+#: include/conversation.php:1175
 msgid "and"
 msgstr "ja"
 
-#: include/conversation.php:1180
+#: include/conversation.php:1181
 #, php-format
 msgid "and %d other people"
 msgstr "ja %d muuta ihmistä"
 
-#: include/conversation.php:1189
+#: include/conversation.php:1190
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr "<span  %1$s>%2$d ihmistä</span> tykkää tästä"
 
-#: include/conversation.php:1190
+#: include/conversation.php:1191
 #, php-format
 msgid "%s like this."
 msgstr "%s tykkää tästä."
 
-#: include/conversation.php:1193
+#: include/conversation.php:1194
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr "<span  %1$s>%2$d ihmistä</span> ei tykkää tästä."
 
-#: include/conversation.php:1194
+#: include/conversation.php:1195
 #, php-format
 msgid "%s don't like this."
 msgstr "%s ei tykkää tästä."
 
-#: include/conversation.php:1197
+#: include/conversation.php:1198
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend"
 msgstr "<span  %1$s>%2$d ihmistä</span> osallistuu"
 
-#: include/conversation.php:1198
+#: include/conversation.php:1199
 #, php-format
 msgid "%s attend."
 msgstr "%s osallistuu."
 
-#: include/conversation.php:1201
+#: include/conversation.php:1202
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't attend"
 msgstr "<span  %1$s>%2$d ihmistä</span> ei osallistu"
 
-#: include/conversation.php:1202
+#: include/conversation.php:1203
 #, php-format
 msgid "%s don't attend."
 msgstr "%s ei osallistu."
 
-#: include/conversation.php:1205
+#: include/conversation.php:1206
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend maybe"
 msgstr "<span  %1$s>%2$d ihmistä</span> ehkä osallistuu"
 
-#: include/conversation.php:1206
+#: include/conversation.php:1207
 #, php-format
 msgid "%s attend maybe."
 msgstr "%s ehkä osallistuu."
 
-#: include/conversation.php:1236 include/conversation.php:1252
+#: include/conversation.php:1237 include/conversation.php:1253
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Näkyy <strong>kaikille</strong>"
 
-#: include/conversation.php:1237 include/conversation.php:1253
+#: 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 "Lisää URL-linkki:"
 
-#: include/conversation.php:1238 include/conversation.php:1254
+#: include/conversation.php:1239 include/conversation.php:1255
 msgid "Please enter a video link/URL:"
 msgstr "Lisää video URL-linkki:"
 
-#: include/conversation.php:1239 include/conversation.php:1255
+#: include/conversation.php:1240 include/conversation.php:1256
 msgid "Please enter an audio link/URL:"
 msgstr "Lisää ääni URL-linkki:"
 
-#: include/conversation.php:1240 include/conversation.php:1256
+#: include/conversation.php:1241 include/conversation.php:1257
 msgid "Tag term:"
 msgstr "Tunniste:"
 
-#: include/conversation.php:1241 include/conversation.php:1257
+#: include/conversation.php:1242 include/conversation.php:1258
 #: mod/filer.php:34
 msgid "Save to Folder:"
 msgstr "Tallenna kansioon:"
 
-#: include/conversation.php:1242 include/conversation.php:1258
+#: include/conversation.php:1243 include/conversation.php:1259
 msgid "Where are you right now?"
 msgstr "Mikä on sijaintisi?"
 
-#: include/conversation.php:1243
+#: include/conversation.php:1244
 msgid "Delete item(s)?"
 msgstr "Poista kohde/kohteet?"
 
-#: include/conversation.php:1290
+#: include/conversation.php:1291
 msgid "New Post"
 msgstr "Uusi julkaisu"
 
-#: include/conversation.php:1293
+#: include/conversation.php:1294
 msgid "Share"
 msgstr "Jaa"
 
-#: include/conversation.php:1294 mod/wallmessage.php:143 mod/editpost.php:111
+#: include/conversation.php:1295 mod/wallmessage.php:143 mod/editpost.php:111
 #: mod/message.php:243 mod/message.php:411
 msgid "Upload photo"
 msgstr "Lähetä kuva"
 
-#: include/conversation.php:1295 mod/editpost.php:112
+#: include/conversation.php:1296 mod/editpost.php:112
 msgid "upload photo"
 msgstr "lähetä kuva"
 
-#: include/conversation.php:1296 mod/editpost.php:113
+#: include/conversation.php:1297 mod/editpost.php:113
 msgid "Attach file"
 msgstr "Liitä tiedosto"
 
-#: include/conversation.php:1297 mod/editpost.php:114
+#: include/conversation.php:1298 mod/editpost.php:114
 msgid "attach file"
 msgstr "liitä tiedosto"
 
-#: include/conversation.php:1298 mod/wallmessage.php:144 mod/editpost.php:115
+#: 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 "Lisää linkki"
 
-#: include/conversation.php:1299 mod/editpost.php:116
+#: include/conversation.php:1300 mod/editpost.php:116
 msgid "web link"
 msgstr "WWW-linkki"
 
-#: include/conversation.php:1300 mod/editpost.php:117
+#: include/conversation.php:1301 mod/editpost.php:117
 msgid "Insert video link"
 msgstr "Lisää videolinkki"
 
-#: include/conversation.php:1301 mod/editpost.php:118
+#: include/conversation.php:1302 mod/editpost.php:118
 msgid "video link"
 msgstr "videolinkki"
 
-#: include/conversation.php:1302 mod/editpost.php:119
+#: include/conversation.php:1303 mod/editpost.php:119
 msgid "Insert audio link"
 msgstr "Lisää äänilinkki"
 
-#: include/conversation.php:1303 mod/editpost.php:120
+#: include/conversation.php:1304 mod/editpost.php:120
 msgid "audio link"
 msgstr "äänilinkki"
 
-#: include/conversation.php:1304 mod/editpost.php:121
+#: include/conversation.php:1305 mod/editpost.php:121
 msgid "Set your location"
 msgstr "Aseta sijaintisi"
 
-#: include/conversation.php:1305 mod/editpost.php:122
+#: include/conversation.php:1306 mod/editpost.php:122
 msgid "set location"
 msgstr "aseta sijainti"
 
-#: include/conversation.php:1306 mod/editpost.php:123
+#: include/conversation.php:1307 mod/editpost.php:123
 msgid "Clear browser location"
 msgstr "Tyhjennä selaimen sijainti"
 
-#: include/conversation.php:1307 mod/editpost.php:124
+#: include/conversation.php:1308 mod/editpost.php:124
 msgid "clear location"
 msgstr "tyhjennä sijainti"
 
-#: include/conversation.php:1309 mod/editpost.php:138
+#: include/conversation.php:1310 mod/editpost.php:138
 msgid "Set title"
 msgstr "Aseta otsikko"
 
-#: include/conversation.php:1311 mod/editpost.php:140
+#: include/conversation.php:1312 mod/editpost.php:140
 msgid "Categories (comma-separated list)"
 msgstr "Luokat (pilkuilla eroteltu luettelo)"
 
-#: include/conversation.php:1313 mod/editpost.php:126
+#: include/conversation.php:1314 mod/editpost.php:126
 msgid "Permission settings"
 msgstr "Käyttöoikeusasetukset"
 
-#: include/conversation.php:1314 mod/editpost.php:155
+#: include/conversation.php:1315 mod/editpost.php:155
 msgid "permissions"
 msgstr "käyttöoikeudet"
 
-#: include/conversation.php:1322 mod/editpost.php:135
+#: include/conversation.php:1323 mod/editpost.php:135
 msgid "Public post"
 msgstr "Julkinen viesti"
 
-#: include/conversation.php:1326 mod/editpost.php:146 mod/photos.php:1492
-#: mod/photos.php:1531 mod/photos.php:1604 mod/events.php:528
+#: 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 "Esikatselu"
 
-#: include/conversation.php:1330 include/items.php:387 mod/fbrowser.php:103
+#: 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/photos.php:248 mod/photos.php:324
-#: mod/videos.php:147 mod/contacts.php:475 mod/unfollow.php:117
+#: 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/settings.php:670 mod/settings.php:696
+#: mod/photos.php:248 mod/photos.php:317 mod/settings.php:670
+#: mod/settings.php:696 mod/videos.php:147
 msgid "Cancel"
 msgstr "Peru"
 
-#: include/conversation.php:1335
+#: include/conversation.php:1336
 msgid "Post to Groups"
 msgstr "Lähetä ryhmiin"
 
-#: include/conversation.php:1336
+#: include/conversation.php:1337
 msgid "Post to Contacts"
 msgstr "Lähetä kontakteille"
 
-#: include/conversation.php:1337
+#: include/conversation.php:1338
 msgid "Private post"
 msgstr "Yksityinen julkaisu"
 
-#: include/conversation.php:1342 mod/editpost.php:153
+#: include/conversation.php:1343 mod/editpost.php:153
 #: src/Model/Profile.php:338
 msgid "Message"
 msgstr "Viesti"
 
-#: include/conversation.php:1343 mod/editpost.php:154
+#: include/conversation.php:1344 mod/editpost.php:154
 msgid "Browser"
 msgstr "Selain"
 
-#: include/conversation.php:1610
+#: include/conversation.php:1609
 msgid "View all"
 msgstr "Näytä kaikki"
 
-#: include/conversation.php:1633
+#: include/conversation.php:1632
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Tykkäys"
 msgstr[1] "Tykkäyksiä"
 
-#: include/conversation.php:1636
+#: include/conversation.php:1635
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "Inhokki"
 msgstr[1] "Inhokit"
 
-#: include/conversation.php:1642
+#: include/conversation.php:1641
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Ei osallistu"
 msgstr[1] "Ei osallistu"
 
-#: include/conversation.php:1645 src/Content/ContactSelector.php:125
+#: include/conversation.php:1644 src/Content/ContactSelector.php:125
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "En ole varma"
 msgstr[1] "En ole varma"
 
-#: include/items.php:342 mod/notice.php:22 mod/viewsrc.php:21
-#: mod/admin.php:277 mod/admin.php:1883 mod/admin.php:2131 mod/display.php:72
+#: 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 "Kohdetta ei löytynyt."
 
-#: include/items.php:382
+#: include/items.php:383
 msgid "Do you really want to delete this item?"
 msgstr "Haluatko varmasti poistaa tämän kohteen?"
 
-#: include/items.php:384 mod/api.php:110 mod/suggest.php:38
+#: 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
@@ -839,341 +815,360 @@ msgstr "Haluatko varmasti poistaa tämän kohteen?"
 msgid "Yes"
 msgstr "Kyllä"
 
-#: include/items.php:401 mod/allfriends.php:21 mod/api.php:35 mod/api.php:40
+#: 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/notes.php:30 mod/photos.php:174
-#: mod/photos.php:1051 mod/cal.php:304 mod/contacts.php:386
-#: mod/delegate.php:25 mod/delegate.php:43 mod/delegate.php:54
-#: mod/events.php:194 mod/ostatus_subscribe.php:16 mod/profile_photo.php:30
+#: 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/network.php:32
-#: mod/crepair.php:98 mod/message.php:59 mod/message.php:104 mod/group.php:26
-#: mod/dfrn_confirm.php:68 mod/item.php:160 mod/notifications.php:73
-#: 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
+#: 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 "Käyttöoikeus evätty."
 
-#: include/items.php:471 src/Content/Feature.php:96
+#: include/items.php:472 src/Content/Feature.php:96
 msgid "Archives"
 msgstr "Arkisto"
 
-#: include/items.php:477 view/theme/vier/theme.php:258
+#: 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:525
+#: src/Object/Post.php:438 src/App.php:527
 msgid "show more"
 msgstr "näytä lisää"
 
-#: include/text.php:303
+#: include/security.php:81
+msgid "Welcome "
+msgstr "Tervetuloa"
+
+#: include/security.php:82
+msgid "Please upload a profile photo."
+msgstr "Lataa profiilikuva."
+
+#: include/security.php:84
+msgid "Welcome back "
+msgstr "Tervetuloa takaisin"
+
+#: 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 "Lomakkeen turvallisuusavain oli väärin. Tämä voi johtua siitä, että lomake on ollut avoinna liian kauan (>3 tuntia) ennen sen lähettämistä."
+
+#: include/text.php:302
 msgid "newer"
 msgstr "uudempi"
 
-#: include/text.php:304
+#: include/text.php:303
 msgid "older"
 msgstr "vanhempi"
 
-#: include/text.php:309
+#: include/text.php:308
 msgid "first"
 msgstr "ensimmäinen"
 
-#: include/text.php:310
+#: include/text.php:309
 msgid "prev"
 msgstr "edellinen"
 
-#: include/text.php:344
+#: include/text.php:343
 msgid "next"
 msgstr "seuraava"
 
-#: include/text.php:345
+#: include/text.php:344
 msgid "last"
 msgstr "viimeinen"
 
-#: include/text.php:399
+#: include/text.php:398
 msgid "Loading more entries..."
 msgstr "Merkinnät ladataan..."
 
-#: include/text.php:400
+#: include/text.php:399
 msgid "The end"
 msgstr "Loppu"
 
-#: include/text.php:885
+#: include/text.php:884
 msgid "No contacts"
 msgstr "Ei kontakteja"
 
-#: include/text.php:909
+#: include/text.php:908
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d kontakti"
 msgstr[1] "%d kontakteja"
 
-#: include/text.php:922
+#: include/text.php:921
 msgid "View Contacts"
 msgstr "Näytä kontaktit"
 
-#: include/text.php:1011 mod/filer.php:35 mod/editpost.php:110
+#: include/text.php:1010 mod/filer.php:35 mod/editpost.php:110
 #: mod/notes.php:67
 msgid "Save"
 msgstr "Tallenna"
 
-#: include/text.php:1011
+#: include/text.php:1010
 msgid "Follow"
 msgstr "Seuraa"
 
-#: include/text.php:1017 mod/search.php:155 src/Content/Nav.php:142
+#: include/text.php:1016 mod/search.php:155 src/Content/Nav.php:142
 msgid "Search"
 msgstr "Haku"
 
-#: include/text.php:1020 src/Content/Nav.php:58
+#: include/text.php:1019 src/Content/Nav.php:58
 msgid "@name, !forum, #tags, content"
 msgstr "@nimi, !foorumi, #tunnisteet, sisältö"
 
-#: include/text.php:1026 src/Content/Nav.php:145
+#: include/text.php:1025 src/Content/Nav.php:145
 msgid "Full Text"
 msgstr "Koko teksti"
 
-#: include/text.php:1027 src/Content/Widget/TagCloud.php:54
+#: include/text.php:1026 src/Content/Widget/TagCloud.php:54
 #: src/Content/Nav.php:146
 msgid "Tags"
 msgstr "Tunnisteet"
 
-#: include/text.php:1028 mod/viewcontacts.php:131 mod/contacts.php:814
+#: 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 "Yhteystiedot"
 
-#: include/text.php:1031 view/theme/vier/theme.php:253
+#: include/text.php:1030 view/theme/vier/theme.php:253
 #: src/Content/ForumManager.php:125 src/Content/Nav.php:151
 msgid "Forums"
 msgstr "Foorumit"
 
-#: include/text.php:1075
+#: include/text.php:1074
 msgid "poke"
 msgstr "töki"
 
-#: include/text.php:1075
+#: include/text.php:1074
 msgid "poked"
 msgstr "tökkäsi"
 
-#: include/text.php:1076
+#: include/text.php:1075
 msgid "ping"
 msgstr "pingaa"
 
-#: include/text.php:1076
+#: include/text.php:1075
 msgid "pinged"
 msgstr "pingasi"
 
-#: include/text.php:1077
+#: include/text.php:1076
 msgid "prod"
 msgstr "töki"
 
-#: include/text.php:1077
+#: include/text.php:1076
 msgid "prodded"
 msgstr "tökkäsi"
 
-#: include/text.php:1078
+#: include/text.php:1077
 msgid "slap"
 msgstr "läimäytä"
 
-#: include/text.php:1078
+#: include/text.php:1077
 msgid "slapped"
 msgstr "läimäsi"
 
-#: include/text.php:1079
+#: include/text.php:1078
 msgid "finger"
 msgstr "näytä keskisormea"
 
-#: include/text.php:1079
+#: include/text.php:1078
 msgid "fingered"
 msgstr "näytti keskisormea"
 
-#: include/text.php:1080
+#: include/text.php:1079
 msgid "rebuff"
 msgstr "torju"
 
-#: include/text.php:1080
+#: include/text.php:1079
 msgid "rebuffed"
 msgstr "torjui"
 
-#: include/text.php:1094 mod/settings.php:935 src/Model/Event.php:379
+#: include/text.php:1093 mod/settings.php:935 src/Model/Event.php:379
 msgid "Monday"
 msgstr "Maanantai"
 
-#: include/text.php:1094 src/Model/Event.php:380
+#: include/text.php:1093 src/Model/Event.php:380
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: include/text.php:1094 src/Model/Event.php:381
+#: include/text.php:1093 src/Model/Event.php:381
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: include/text.php:1094 src/Model/Event.php:382
+#: include/text.php:1093 src/Model/Event.php:382
 msgid "Thursday"
 msgstr "Torstai"
 
-#: include/text.php:1094 src/Model/Event.php:383
+#: include/text.php:1093 src/Model/Event.php:383
 msgid "Friday"
 msgstr "Perjantai"
 
-#: include/text.php:1094 src/Model/Event.php:384
+#: include/text.php:1093 src/Model/Event.php:384
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: include/text.php:1094 mod/settings.php:935 src/Model/Event.php:378
+#: include/text.php:1093 mod/settings.php:935 src/Model/Event.php:378
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: include/text.php:1098 src/Model/Event.php:399
+#: include/text.php:1097 src/Model/Event.php:399
 msgid "January"
 msgstr "Tammikuu"
 
-#: include/text.php:1098 src/Model/Event.php:400
+#: include/text.php:1097 src/Model/Event.php:400
 msgid "February"
 msgstr "Helmikuu"
 
-#: include/text.php:1098 src/Model/Event.php:401
+#: include/text.php:1097 src/Model/Event.php:401
 msgid "March"
 msgstr "Maaliskuu"
 
-#: include/text.php:1098 src/Model/Event.php:402
+#: include/text.php:1097 src/Model/Event.php:402
 msgid "April"
 msgstr "Huhtikuu"
 
-#: include/text.php:1098 include/text.php:1115 src/Model/Event.php:390
+#: include/text.php:1097 include/text.php:1114 src/Model/Event.php:390
 #: src/Model/Event.php:403
 msgid "May"
 msgstr "Toukokuu"
 
-#: include/text.php:1098 src/Model/Event.php:404
+#: include/text.php:1097 src/Model/Event.php:404
 msgid "June"
 msgstr "Kesäkuu"
 
-#: include/text.php:1098 src/Model/Event.php:405
+#: include/text.php:1097 src/Model/Event.php:405
 msgid "July"
 msgstr "Heinäkuu"
 
-#: include/text.php:1098 src/Model/Event.php:406
+#: include/text.php:1097 src/Model/Event.php:406
 msgid "August"
 msgstr "Elokuu"
 
-#: include/text.php:1098 src/Model/Event.php:407
+#: include/text.php:1097 src/Model/Event.php:407
 msgid "September"
 msgstr "Syyskuu"
 
-#: include/text.php:1098 src/Model/Event.php:408
+#: include/text.php:1097 src/Model/Event.php:408
 msgid "October"
 msgstr "Lokakuu"
 
-#: include/text.php:1098 src/Model/Event.php:409
+#: include/text.php:1097 src/Model/Event.php:409
 msgid "November"
 msgstr "Marraskuu"
 
-#: include/text.php:1098 src/Model/Event.php:410
+#: include/text.php:1097 src/Model/Event.php:410
 msgid "December"
 msgstr "Joulukuu"
 
-#: include/text.php:1112 src/Model/Event.php:371
+#: include/text.php:1111 src/Model/Event.php:371
 msgid "Mon"
 msgstr "Ma"
 
-#: include/text.php:1112 src/Model/Event.php:372
+#: include/text.php:1111 src/Model/Event.php:372
 msgid "Tue"
 msgstr "Ti"
 
-#: include/text.php:1112 src/Model/Event.php:373
+#: include/text.php:1111 src/Model/Event.php:373
 msgid "Wed"
 msgstr "Ke"
 
-#: include/text.php:1112 src/Model/Event.php:374
+#: include/text.php:1111 src/Model/Event.php:374
 msgid "Thu"
 msgstr "To"
 
-#: include/text.php:1112 src/Model/Event.php:375
+#: include/text.php:1111 src/Model/Event.php:375
 msgid "Fri"
 msgstr "Pe"
 
-#: include/text.php:1112 src/Model/Event.php:376
+#: include/text.php:1111 src/Model/Event.php:376
 msgid "Sat"
 msgstr "La"
 
-#: include/text.php:1112 src/Model/Event.php:370
+#: include/text.php:1111 src/Model/Event.php:370
 msgid "Sun"
 msgstr "Su"
 
-#: include/text.php:1115 src/Model/Event.php:386
+#: include/text.php:1114 src/Model/Event.php:386
 msgid "Jan"
 msgstr "Tam."
 
-#: include/text.php:1115 src/Model/Event.php:387
+#: include/text.php:1114 src/Model/Event.php:387
 msgid "Feb"
 msgstr "Hel."
 
-#: include/text.php:1115 src/Model/Event.php:388
+#: include/text.php:1114 src/Model/Event.php:388
 msgid "Mar"
 msgstr "Maa."
 
-#: include/text.php:1115 src/Model/Event.php:389
+#: include/text.php:1114 src/Model/Event.php:389
 msgid "Apr"
 msgstr "Huh."
 
-#: include/text.php:1115 src/Model/Event.php:392
+#: include/text.php:1114 src/Model/Event.php:392
 msgid "Jul"
 msgstr "Tou."
 
-#: include/text.php:1115 src/Model/Event.php:393
+#: include/text.php:1114 src/Model/Event.php:393
 msgid "Aug"
 msgstr "Elo."
 
-#: include/text.php:1115
+#: include/text.php:1114
 msgid "Sep"
 msgstr "Syy."
 
-#: include/text.php:1115 src/Model/Event.php:395
+#: include/text.php:1114 src/Model/Event.php:395
 msgid "Oct"
 msgstr "Lok."
 
-#: include/text.php:1115 src/Model/Event.php:396
+#: include/text.php:1114 src/Model/Event.php:396
 msgid "Nov"
 msgstr "Mar."
 
-#: include/text.php:1115 src/Model/Event.php:397
+#: include/text.php:1114 src/Model/Event.php:397
 msgid "Dec"
 msgstr "Jou."
 
-#: include/text.php:1255
+#: include/text.php:1254
 #, php-format
 msgid "Content warning: %s"
 msgstr "Sisältövaroitus: %s"
 
-#: include/text.php:1325 mod/videos.php:380
+#: include/text.php:1324 mod/videos.php:380
 msgid "View Video"
 msgstr "Katso video"
 
-#: include/text.php:1342
+#: include/text.php:1341
 msgid "bytes"
 msgstr "tavua"
 
-#: include/text.php:1375 include/text.php:1386 include/text.php:1419
+#: include/text.php:1374 include/text.php:1385 include/text.php:1418
 msgid "Click to open/close"
 msgstr "Klikkaa auki/kiinni"
 
-#: include/text.php:1534
+#: include/text.php:1533
 msgid "View on separate page"
 msgstr "Katso erillisellä sivulla"
 
-#: include/text.php:1535
+#: include/text.php:1534
 msgid "view on separate page"
 msgstr "katso erillisellä sivulla"
 
-#: include/text.php:1540 include/text.php:1547 src/Model/Event.php:594
+#: include/text.php:1539 include/text.php:1546 src/Model/Event.php:594
 msgid "link to source"
 msgstr "linkki lähteeseen"
 
@@ -1191,7 +1186,7 @@ msgstr[1] "kommentoi"
 msgid "post"
 msgstr "julkaisu"
 
-#: include/text.php:1915
+#: include/text.php:1916
 msgid "Item filed"
 msgstr "Kohde arkistoitu"
 
@@ -1277,8 +1272,8 @@ msgid "Photos"
 msgstr "Kuvat"
 
 #: mod/fbrowser.php:43 mod/fbrowser.php:68 mod/photos.php:194
-#: mod/photos.php:1062 mod/photos.php:1149 mod/photos.php:1166
-#: mod/photos.php:1659 mod/photos.php:1673 src/Model/Photo.php:244
+#: 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 "Kontaktin valokuvat"
@@ -1348,7 +1343,7 @@ msgid ""
 " join."
 msgstr ""
 
-#: mod/newmember.php:19 mod/admin.php:1935 mod/admin.php:2204
+#: 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 "Asetukset"
@@ -1522,7 +1517,7 @@ msgstr "Ei laajennettu"
 
 #: mod/repair_ostatus.php:18
 msgid "Resubscribing to OStatus contacts"
-msgstr ""
+msgstr "OStatus -kontaktien uudelleentilaus"
 
 #: mod/repair_ostatus.php:34
 msgid "Error"
@@ -1554,11 +1549,6 @@ msgstr "Jätä huomiotta/piilota"
 msgid "Friend Suggestions"
 msgstr "Ystäväehdotukset"
 
-#: mod/update_community.php:27 mod/update_display.php:27
-#: mod/update_notes.php:40 mod/update_profile.php:39 mod/update_network.php:33
-msgid "[Embedded content - reload page to view]"
-msgstr "[Upotettu sisältö - näet sen päivittämällä sivun]"
-
 #: mod/uimport.php:55 mod/register.php:192
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
@@ -1631,11 +1621,11 @@ msgid "Select an identity to manage: "
 msgstr "Valitse identiteetti hallitavaksi:"
 
 #: mod/manage.php:184 mod/localtime.php:56 mod/poke.php:199
-#: mod/fsuggest.php:114 mod/photos.php:1080 mod/photos.php:1160
-#: mod/photos.php:1445 mod/photos.php:1491 mod/photos.php:1530
-#: mod/photos.php:1603 mod/contacts.php:610 mod/events.php:530
-#: 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/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
@@ -1671,7 +1661,7 @@ msgstr "- valitse -"
 
 #: mod/localtime.php:19 src/Model/Event.php:36 src/Model/Event.php:814
 msgid "l F d, Y \\@ g:i A"
-msgstr ""
+msgstr "l j.n.Y \\@ H:i"
 
 #: mod/localtime.php:33
 msgid "Time Conversion"
@@ -1742,10 +1732,10 @@ msgstr "Valitse mitä haluat tehdä vastaanottajalle"
 msgid "Make this post private"
 msgstr "Muuta julkaisu yksityiseksi"
 
-#: mod/probe.php:13 mod/search.php:98 mod/search.php:104
-#: mod/viewcontacts.php:45 mod/webfinger.php:16 mod/photos.php:932
-#: mod/videos.php:199 mod/directory.php:42 mod/community.php:27
-#: mod/dfrn_request.php:602 mod/display.php:203
+#: 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 "Julkinen käyttö estetty."
 
@@ -1790,45 +1780,6 @@ msgstr ""
 msgid "Please login."
 msgstr "Ole hyvä ja kirjaudu."
 
-#: mod/search.php:37 mod/network.php:194
-msgid "Remove term"
-msgstr "Poista kohde"
-
-#: mod/search.php:46 mod/network.php:201 src/Content/Feature.php:100
-msgid "Saved Searches"
-msgstr "Tallennetut haut"
-
-#: 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 "Liian monta pyyntöä"
-
-#: mod/search.php:130
-msgid "Only one search per minute is permitted for not logged in users."
-msgstr ""
-
-#: mod/search.php:228 mod/community.php:141
-msgid "No results."
-msgstr "Ei tuloksia."
-
-#: mod/search.php:234
-#, php-format
-msgid "Items tagged with: %s"
-msgstr "Kohteet joilla tunnisteet: %s"
-
-#: mod/search.php:236 mod/contacts.php:819
-#, php-format
-msgid "Results for: %s"
-msgstr "Tulokset haulla: %s"
-
-#: mod/subthread.php:113
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr ""
-
 #: mod/tagrm.php:47
 msgid "Tag removed"
 msgstr "Tägi poistettiin"
@@ -1878,13 +1829,13 @@ msgstr "Ei kontakteja."
 msgid "Access denied."
 msgstr "Käyttö estetty."
 
-#: mod/wall_upload.php:186 mod/photos.php:763 mod/photos.php:766
-#: mod/photos.php:795 mod/profile_photo.php:153
+#: 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 "Kuva ylittää kokorajoituksen %s"
 
-#: mod/wall_upload.php:200 mod/photos.php:818 mod/profile_photo.php:162
+#: mod/wall_upload.php:200 mod/profile_photo.php:162 mod/photos.php:806
 msgid "Unable to process image."
 msgstr "Kuvan käsitteleminen epäonnistui."
 
@@ -1893,7 +1844,7 @@ msgstr "Kuvan käsitteleminen epäonnistui."
 msgid "Wall Photos"
 msgstr "Seinäkuvat"
 
-#: mod/wall_upload.php:239 mod/photos.php:847 mod/profile_photo.php:307
+#: mod/wall_upload.php:239 mod/profile_photo.php:307 mod/photos.php:835
 msgid "Image upload failed."
 msgstr "Kuvan lähettäminen epäonnistui."
 
@@ -1992,241 +1943,6 @@ msgstr "Ehdota ystäviä"
 msgid "Suggest a friend for %s"
 msgstr "Ehdota ystävää ystävälle %s"
 
-#: mod/notes.php:52 src/Model/Profile.php:944
-msgid "Personal Notes"
-msgstr "Henkilökohtaiset tiedot"
-
-#: mod/photos.php:108 src/Model/Profile.php:905
-msgid "Photo Albums"
-msgstr "Valokuva-albumit"
-
-#: mod/photos.php:109 mod/photos.php:1713
-msgid "Recent Photos"
-msgstr "Viimeaikaisia kuvia"
-
-#: mod/photos.php:112 mod/photos.php:1210 mod/photos.php:1715
-msgid "Upload New Photos"
-msgstr "Lähetä uusia kuvia"
-
-#: mod/photos.php:126 mod/settings.php:51
-msgid "everybody"
-msgstr "kaikki"
-
-#: mod/photos.php:184
-msgid "Contact information unavailable"
-msgstr "Kontaktin tietoja ei saatavilla"
-
-#: mod/photos.php:204
-msgid "Album not found."
-msgstr "Albumia ei ole."
-
-#: mod/photos.php:234 mod/photos.php:245 mod/photos.php:1161
-msgid "Delete Album"
-msgstr "Poista albumi"
-
-#: mod/photos.php:243
-msgid "Do you really want to delete this photo album and all its photos?"
-msgstr "Haluatko varmasti poistaa tämän albumin ja kaikki sen kuvat?"
-
-#: mod/photos.php:310 mod/photos.php:321 mod/photos.php:1446
-msgid "Delete Photo"
-msgstr "Poista valokuva"
-
-#: mod/photos.php:319
-msgid "Do you really want to delete this photo?"
-msgstr "Haluatko varmasti poistaa kuvan?"
-
-#: mod/photos.php:667
-msgid "a photo"
-msgstr "valokuva"
-
-#: mod/photos.php:667
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
-msgstr "%1$s merkattiin kuvaan %2$s ystävän %3$s toimesta"
-
-#: mod/photos.php:769
-msgid "Image upload didn't complete, please try again"
-msgstr "Kuvan lataus ei onnistunut, yritä uudelleen"
-
-#: mod/photos.php:772
-msgid "Image file is missing"
-msgstr "Kuvatiedosto puuttuu"
-
-#: mod/photos.php:777
-msgid ""
-"Server can't accept new file upload at this time, please contact your "
-"administrator"
-msgstr ""
-
-#: mod/photos.php:803
-msgid "Image file is empty."
-msgstr "Kuvatiedosto on tyhjä."
-
-#: mod/photos.php:940
-msgid "No photos selected"
-msgstr "Ei valittuja kuvia"
-
-#: mod/photos.php:1036 mod/videos.php:309
-msgid "Access to this item is restricted."
-msgstr "Pääsy kohteeseen on rajoitettu."
-
-#: mod/photos.php:1090
-msgid "Upload Photos"
-msgstr "Lähetä kuvia"
-
-#: mod/photos.php:1094 mod/photos.php:1156
-msgid "New album name: "
-msgstr "Albumin uusi nimi: "
-
-#: mod/photos.php:1095
-msgid "or existing album name: "
-msgstr "tai olemassaolevan albumin nimi: "
-
-#: mod/photos.php:1096
-msgid "Do not show a status post for this upload"
-msgstr "Älä näytä tilaviestiä tälle lähetykselle"
-
-#: mod/photos.php:1098 mod/photos.php:1441 mod/events.php:533
-#: src/Core/ACL.php:318
-msgid "Permissions"
-msgstr "Käyttöoikeudet"
-
-#: mod/photos.php:1106 mod/photos.php:1449 mod/settings.php:1218
-msgid "Show to Groups"
-msgstr "Näytä ryhmille"
-
-#: mod/photos.php:1107 mod/photos.php:1450 mod/settings.php:1219
-msgid "Show to Contacts"
-msgstr "Näytä kontakteille"
-
-#: mod/photos.php:1167
-msgid "Edit Album"
-msgstr "Muokkaa albumia"
-
-#: mod/photos.php:1172
-msgid "Show Newest First"
-msgstr "Näytä uusin ensin"
-
-#: mod/photos.php:1174
-msgid "Show Oldest First"
-msgstr "Näytä vanhin ensin"
-
-#: mod/photos.php:1195 mod/photos.php:1698
-msgid "View Photo"
-msgstr "Näytä kuva"
-
-#: mod/photos.php:1236
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Estetty. Tämän kohteen käyttöä on saatettu rajoittaa."
-
-#: mod/photos.php:1238
-msgid "Photo not available"
-msgstr "Kuva ei ole saatavilla"
-
-#: mod/photos.php:1301
-msgid "View photo"
-msgstr "Näytä kuva"
-
-#: mod/photos.php:1301
-msgid "Edit photo"
-msgstr "Muokkaa kuvaa"
-
-#: mod/photos.php:1302
-msgid "Use as profile photo"
-msgstr "Käytä profiilikuvana"
-
-#: mod/photos.php:1308 src/Object/Post.php:149
-msgid "Private Message"
-msgstr "Yksityisviesti"
-
-#: mod/photos.php:1327
-msgid "View Full Size"
-msgstr "Näytä täysikokoisena"
-
-#: mod/photos.php:1414
-msgid "Tags: "
-msgstr "Merkinnät:"
-
-#: mod/photos.php:1417
-msgid "[Remove any tag]"
-msgstr "[Poista mikä tahansa merkintä]"
-
-#: mod/photos.php:1432
-msgid "New album name"
-msgstr "Uusi nimi albumille"
-
-#: mod/photos.php:1433
-msgid "Caption"
-msgstr "Kuvateksti"
-
-#: mod/photos.php:1434
-msgid "Add a Tag"
-msgstr "Lisää merkintä"
-
-#: mod/photos.php:1434
-msgid ""
-"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr "Esimerkki: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-
-#: mod/photos.php:1435
-msgid "Do not rotate"
-msgstr "Älä kierrä"
-
-#: mod/photos.php:1436
-msgid "Rotate CW (right)"
-msgstr "Käännä oikealle"
-
-#: mod/photos.php:1437
-msgid "Rotate CCW (left)"
-msgstr "Käännä vasemmalle"
-
-#: mod/photos.php:1471 src/Object/Post.php:304
-msgid "I like this (toggle)"
-msgstr "Tykkään tästä (vaihda)"
-
-#: mod/photos.php:1472 src/Object/Post.php:305
-msgid "I don't like this (toggle)"
-msgstr "En tykkää tästä (vaihda)"
-
-#: mod/photos.php:1488 mod/photos.php:1527 mod/photos.php:1600
-#: mod/contacts.php:953 src/Object/Post.php:801
-msgid "This is you"
-msgstr "Tämä olet sinä"
-
-#: mod/photos.php:1490 mod/photos.php:1529 mod/photos.php:1602
-#: src/Object/Post.php:407 src/Object/Post.php:803
-msgid "Comment"
-msgstr "Kommentti"
-
-#: mod/photos.php:1634
-msgid "Map"
-msgstr "Kartta"
-
-#: mod/photos.php:1704 mod/videos.php:387
-msgid "View Album"
-msgstr "Näytä albumi"
-
-#: mod/videos.php:139
-msgid "Do you really want to delete this video?"
-msgstr "Haluatko varmasti poistaa tämän videon?"
-
-#: mod/videos.php:144
-msgid "Delete Video"
-msgstr "Poista video"
-
-#: mod/videos.php:207
-msgid "No videos selected"
-msgstr "Ei videoita valittuna"
-
-#: mod/videos.php:396
-msgid "Recent Videos"
-msgstr "Viimeisimmät videot"
-
-#: mod/videos.php:398
-msgid "Upload New Videos"
-msgstr "Lataa uusia videoita"
-
 #: mod/cal.php:142 mod/display.php:316 mod/profile.php:174
 msgid "Access to this profile has been restricted."
 msgstr "Pääsy tähän profiiliin on rajoitettu"
@@ -2245,7 +1961,7 @@ msgstr "Katso"
 msgid "Previous"
 msgstr "Edellinen"
 
-#: mod/cal.php:277 mod/events.php:395 mod/install.php:156
+#: mod/cal.php:277 mod/install.php:156 mod/events.php:395
 msgid "Next"
 msgstr "Seuraava"
 
@@ -2406,8 +2122,8 @@ msgid ""
 "are taken from the meta header in the feed item and are posted as hash tags."
 msgstr ""
 
-#: mod/contacts.php:572 mod/admin.php:1288 mod/admin.php:1450
-#: mod/admin.php:1460
+#: mod/contacts.php:572 mod/admin.php:1284 mod/admin.php:1449
+#: mod/admin.php:1459
 msgid "Disabled"
 msgstr "Pois käytöstä"
 
@@ -2483,12 +2199,12 @@ msgid "Update now"
 msgstr "Päivitä nyt"
 
 #: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:489 mod/admin.php:1829
+#: mod/admin.php:489 mod/admin.php:1834
 msgid "Unblock"
 msgstr "Salli"
 
 #: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:488 mod/admin.php:1828
+#: mod/admin.php:488 mod/admin.php:1833
 msgid "Block"
 msgstr "Estä"
 
@@ -2550,7 +2266,7 @@ msgstr ""
 msgid "Profile URL"
 msgstr "Profiilin URL"
 
-#: mod/contacts.php:660 mod/events.php:518 mod/directory.php:148
+#: 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:"
@@ -2643,6 +2359,11 @@ msgstr "Näytä vain piilotetut henkilöt"
 msgid "Search your contacts"
 msgstr "Etsi henkilöitä"
 
+#: mod/contacts.php:819 mod/search.php:236
+#, php-format
+msgid "Results for: %s"
+msgstr "Tulokset haulla: %s"
+
 #: mod/contacts.php:820 mod/directory.php:209 view/theme/vier/theme.php:203
 #: src/Content/Widget.php:63
 msgid "Find"
@@ -2681,7 +2402,7 @@ msgstr "Näytä kaikki kontaktit"
 msgid "View all common friends"
 msgstr "Näytä kaikki yhteiset kaverit"
 
-#: mod/contacts.php:895 mod/events.php:532 mod/admin.php:1363
+#: mod/contacts.php:895 mod/admin.php:1362 mod/events.php:533
 #: src/Model/Profile.php:863
 msgid "Advanced"
 msgstr ""
@@ -2702,6 +2423,11 @@ msgstr "on fanisi"
 msgid "you are a fan of"
 msgstr "fanitat"
 
+#: 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 "Tämä olet sinä"
+
 #: mod/contacts.php:1013
 msgid "Toggle Blocked status"
 msgstr "Estetty tila päälle/pois"
@@ -2745,8 +2471,8 @@ msgid ""
 "settings. Please double check whom you give this access."
 msgstr ""
 
-#: mod/delegate.php:168 mod/admin.php:311 mod/admin.php:1358
-#: mod/admin.php:1994 mod/admin.php:2247 mod/admin.php:2321 mod/admin.php:2468
+#: 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"
@@ -2783,70 +2509,6 @@ msgstr "Lisää"
 msgid "No entries."
 msgstr "Ei kohteita."
 
-#: mod/events.php:105 mod/events.php:107
-msgid "Event can not end before it has started."
-msgstr "Tapahtuma ei voi päättyä ennen kuin on alkanut."
-
-#: mod/events.php:114 mod/events.php:116
-msgid "Event title and start time are required."
-msgstr "Tapahtuman nimi ja alkamisaika vaaditaan."
-
-#: mod/events.php:393
-msgid "Create New Event"
-msgstr "Luo uusi tapahtuma"
-
-#: mod/events.php:506
-msgid "Event details"
-msgstr "Tapahtuman tiedot"
-
-#: mod/events.php:507
-msgid "Starting date and Title are required."
-msgstr "Aloituspvm ja otsikko vaaditaan."
-
-#: mod/events.php:508 mod/events.php:509
-msgid "Event Starts:"
-msgstr "Tapahtuma alkaa:"
-
-#: mod/events.php:508 mod/events.php:520 mod/profiles.php:607
-msgid "Required"
-msgstr "Vaaditaan"
-
-#: mod/events.php:510 mod/events.php:526
-msgid "Finish date/time is not known or not relevant"
-msgstr "Päättymispvm ja kellonaika ei ole tiedossa tai niillä ei ole merkitystä"
-
-#: mod/events.php:512 mod/events.php:513
-msgid "Event Finishes:"
-msgstr "Tapahtuma päättyy:"
-
-#: mod/events.php:514 mod/events.php:527
-msgid "Adjust for viewer timezone"
-msgstr "Ota huomioon katsojan aikavyöhyke"
-
-#: mod/events.php:516
-msgid "Description:"
-msgstr "Kuvaus:"
-
-#: mod/events.php:520 mod/events.php:522
-msgid "Title:"
-msgstr "Otsikko:"
-
-#: mod/events.php:523 mod/events.php:524
-msgid "Share this event"
-msgstr "Jaa tämä tapahtuma"
-
-#: mod/events.php:531 src/Model/Profile.php:862
-msgid "Basic"
-msgstr ""
-
-#: mod/events.php:552
-msgid "Failed to remove event"
-msgstr "Tapahtuman poisto epäonnistui"
-
-#: mod/events.php:554
-msgid "Event removed"
-msgstr "Tapahtuma poistettu"
-
 #: mod/feedtest.php:20
 msgid "You must be logged in to use this module"
 msgstr "Sinun pitää kirjautua sisään, jotta voit käyttää tätä moduulia"
@@ -3250,36 +2912,6 @@ msgstr "Markdown"
 msgid "HTML"
 msgstr "HTML"
 
-#: mod/community.php:51
-msgid "Community option not available."
-msgstr "Yhteisö vaihtoehto ei saatavilla."
-
-#: mod/community.php:68
-msgid "Not available."
-msgstr "Ei saatavilla."
-
-#: mod/community.php:81
-msgid "Local Community"
-msgstr "Paikallinen yhteisö"
-
-#: mod/community.php:84
-msgid "Posts from local users on this server"
-msgstr "Tämän palvelimen julkaisut"
-
-#: mod/community.php:92
-msgid "Global Community"
-msgstr "Maailmanlaajuinen yhteisö"
-
-#: mod/community.php:95
-msgid "Posts from users of the whole federated network"
-msgstr "Maailmanlaajuisen verkon julkaisut"
-
-#: 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/friendica.php:77
 msgid "This is Friendica, version"
 msgstr "Tämä on Friendica, versio"
@@ -3436,95 +3068,6 @@ msgid ""
 "important, please visit http://friendi.ca"
 msgstr ""
 
-#: mod/network.php:202 src/Model/Group.php:413
-msgid "add"
-msgstr "lisää"
-
-#: 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] ""
-msgstr[1] ""
-
-#: 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 "Ryhmä ei ole olemassa"
-
-#: mod/network.php:639 mod/group.php:216
-msgid "Group is empty"
-msgstr "Ryhmä on tyhjä"
-
-#: mod/network.php:643
-#, php-format
-msgid "Group: %s"
-msgstr "Ryhmä: %s"
-
-#: mod/network.php:669
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr "Yksityisviestit lähetetty tälle henkilölle saattaa näkyä muillekin."
-
-#: mod/network.php:672
-msgid "Invalid contact."
-msgstr "Virheellinen kontakti."
-
-#: mod/network.php:937
-msgid "Commented Order"
-msgstr "Järjestä viimeisimpien kommenttien mukaan"
-
-#: mod/network.php:940
-msgid "Sort by Comment Date"
-msgstr "Kommentit päivämäärän mukaan"
-
-#: mod/network.php:945
-msgid "Posted Order"
-msgstr "Järjestä julkaisupäivämäärän mukaan"
-
-#: mod/network.php:948
-msgid "Sort by Post Date"
-msgstr "Julkaisut päivämäärän mukaan"
-
-#: mod/network.php:956 mod/profiles.php:594
-#: src/Core/NotificationsManager.php:185
-msgid "Personal"
-msgstr "Henkilökohtainen"
-
-#: mod/network.php:959
-msgid "Posts that mention or involve you"
-msgstr "Julkaisut jotka liittyvät sinuun"
-
-#: mod/network.php:967
-msgid "New"
-msgstr "Uusi"
-
-#: mod/network.php:970
-msgid "Activity Stream - by date"
-msgstr ""
-
-#: mod/network.php:978
-msgid "Shared Links"
-msgstr "Jaetut linkit"
-
-#: mod/network.php:981
-msgid "Interesting Links"
-msgstr "Kiinnostavat linkit"
-
-#: mod/network.php:989
-msgid "Starred"
-msgstr "Tähtimerkitty"
-
-#: mod/network.php:992
-msgid "Favourite Posts"
-msgstr "Lempijulkaisut"
-
 #: mod/crepair.php:87
 msgid "Contact settings applied."
 msgstr "Kontaktiasetukset tallennettu."
@@ -3579,8 +3122,8 @@ msgid ""
 "entries from this contact."
 msgstr ""
 
-#: mod/crepair.php:158 mod/admin.php:494 mod/admin.php:1811 mod/admin.php:1822
-#: mod/admin.php:1835 mod/admin.php:1851 mod/settings.php:671
+#: 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 "Nimi"
@@ -3805,7 +3348,7 @@ msgstr "Poista viesti"
 
 #: mod/message.php:380 mod/message.php:481
 msgid "D, d M Y - g:i A"
-msgstr ""
+msgstr "D, j.n.Y - H:i"
 
 #: mod/message.php:395 mod/message.php:478
 msgid "Delete conversation"
@@ -3843,79 +3386,6 @@ msgid_plural "%d messages"
 msgstr[0] "%d viesti"
 msgstr[1] "%d viestiä"
 
-#: mod/group.php:36
-msgid "Group created."
-msgstr "Ryhmä luotu."
-
-#: mod/group.php:42
-msgid "Could not create group."
-msgstr "Ryhmää ei voitu luoda."
-
-#: mod/group.php:56 mod/group.php:157
-msgid "Group not found."
-msgstr "Ryhmää ei löytynyt."
-
-#: mod/group.php:70
-msgid "Group name changed."
-msgstr "Ryhmän nimi muutettu."
-
-#: mod/group.php:97
-msgid "Save Group"
-msgstr "Tallenna ryhmä"
-
-#: mod/group.php:102
-msgid "Create a group of contacts/friends."
-msgstr "Luo kontakti/kaveriryhmä"
-
-#: mod/group.php:103 mod/group.php:199 src/Model/Group.php:421
-msgid "Group Name: "
-msgstr "Ryhmän nimi:"
-
-#: mod/group.php:127
-msgid "Group removed."
-msgstr "Ryhmä poistettu."
-
-#: mod/group.php:129
-msgid "Unable to remove group."
-msgstr "Ryhmää ei voida poistaa."
-
-#: mod/group.php:192
-msgid "Delete Group"
-msgstr "Poista ryhmä"
-
-#: mod/group.php:198
-msgid "Group Editor"
-msgstr "Ryhmien muokkausta"
-
-#: mod/group.php:203
-msgid "Edit Group Name"
-msgstr "Muokkaa ryhmän nimeä"
-
-#: mod/group.php:213
-msgid "Members"
-msgstr "Jäsenet"
-
-#: mod/group.php:229
-msgid "Remove contact from group"
-msgstr "Poista kontakti ryhmästä"
-
-#: mod/group.php:253
-msgid "Add contact to group"
-msgstr "Lisää kontakti ryhmään"
-
-#: mod/openid.php:29
-msgid "OpenID protocol error. No ID returned."
-msgstr "OpenID -protokollavirhe. Tunnusta ei vastaanotettu."
-
-#: mod/openid.php:66
-msgid ""
-"Account not found and OpenID registration is not permitted on this site."
-msgstr "Käyttäjätiliä ei löytynyt. Rekisteröityminen OpenID:n kautta ei ole sallittua tällä sivustolla."
-
-#: mod/openid.php:116 src/Module/Login.php:86 src/Module/Login.php:135
-msgid "Login failed."
-msgstr "Kirjautuminen epäonnistui"
-
 #: mod/admin.php:107
 msgid "Theme settings updated."
 msgstr "Teeman asetukset päivitetty."
@@ -3928,7 +3398,7 @@ msgstr "Tietoja"
 msgid "Overview"
 msgstr "Yleiskatsaus"
 
-#: mod/admin.php:182 mod/admin.php:722
+#: mod/admin.php:182 mod/admin.php:717
 msgid "Federation Statistics"
 msgstr "Liiton tilastotiedot"
 
@@ -3936,19 +3406,19 @@ msgstr "Liiton tilastotiedot"
 msgid "Configuration"
 msgstr "Kokoonpano"
 
-#: mod/admin.php:184 mod/admin.php:1357
+#: mod/admin.php:184 mod/admin.php:1356
 msgid "Site"
 msgstr "Sivusto"
 
-#: mod/admin.php:185 mod/admin.php:1289 mod/admin.php:1817 mod/admin.php:1833
+#: mod/admin.php:185 mod/admin.php:1285 mod/admin.php:1822 mod/admin.php:1838
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: mod/admin.php:186 mod/admin.php:1933 mod/admin.php:1993 mod/settings.php:87
+#: mod/admin.php:186 mod/admin.php:1938 mod/admin.php:1998 mod/settings.php:87
 msgid "Addons"
 msgstr "Lisäosat"
 
-#: mod/admin.php:187 mod/admin.php:2202 mod/admin.php:2246
+#: mod/admin.php:187 mod/admin.php:2208 mod/admin.php:2252
 msgid "Themes"
 msgstr "Teemat"
 
@@ -3969,7 +3439,7 @@ msgstr "Tietokanta"
 msgid "DB updates"
 msgstr "Tietokannan päivitykset"
 
-#: mod/admin.php:192 mod/admin.php:757
+#: mod/admin.php:192 mod/admin.php:752
 msgid "Inspect Queue"
 msgstr "Tarkista jono"
 
@@ -3989,11 +3459,11 @@ msgstr "Palvelimien estolista"
 msgid "Delete Item"
 msgstr "Poista kohde"
 
-#: mod/admin.php:197 mod/admin.php:198 mod/admin.php:2320
+#: mod/admin.php:197 mod/admin.php:198 mod/admin.php:2326
 msgid "Logs"
 msgstr "Lokit"
 
-#: mod/admin.php:199 mod/admin.php:2387
+#: mod/admin.php:199 mod/admin.php:2393
 msgid "View Logs"
 msgstr "Katso lokit"
 
@@ -4026,9 +3496,9 @@ msgid "User registrations waiting for confirmation"
 msgstr "Käyttäjärekisteröinnit odottavat hyväksyntää"
 
 #: mod/admin.php:303 mod/admin.php:365 mod/admin.php:482 mod/admin.php:524
-#: mod/admin.php:721 mod/admin.php:756 mod/admin.php:852 mod/admin.php:1356
-#: mod/admin.php:1816 mod/admin.php:1932 mod/admin.php:1992 mod/admin.php:2201
-#: mod/admin.php:2245 mod/admin.php:2319 mod/admin.php:2386
+#: 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
 msgid "Administration"
 msgstr "Ylläpito"
 
@@ -4174,7 +3644,7 @@ msgstr ""
 msgid "Block Remote Contact"
 msgstr "Estä etäkontakti"
 
-#: mod/admin.php:486 mod/admin.php:1819
+#: mod/admin.php:486 mod/admin.php:1824
 msgid "select all"
 msgstr "valitse kaikki"
 
@@ -4238,67 +3708,67 @@ msgstr "GUID"
 msgid "The GUID of the item you want to delete."
 msgstr "Poistettavan kohteen GUID."
 
-#: mod/admin.php:568
+#: mod/admin.php:563
 msgid "Item marked for deletion."
 msgstr "Kohde merkitty poistettavaksi."
 
-#: mod/admin.php:639
+#: mod/admin.php:634
 msgid "unknown"
 msgstr "tuntematon"
 
-#: mod/admin.php:715
+#: mod/admin.php:710
 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:716
+#: mod/admin.php:711
 msgid ""
 "The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
 "will improve the data displayed here."
 msgstr ""
 
-#: mod/admin.php:728
+#: mod/admin.php:723
 #, php-format
 msgid ""
 "Currently this node is aware of %d nodes with %d registered users from the "
 "following platforms:"
 msgstr "Tällä hetkellä tämä solmu havaitsee %d muita solmuja joissa %d rekisteröityneitä käyttäjiä. Tarkemmat tiedot:"
 
-#: mod/admin.php:759
+#: mod/admin.php:754
 msgid "ID"
 msgstr ""
 
-#: mod/admin.php:760
+#: mod/admin.php:755
 msgid "Recipient Name"
 msgstr "Vastaanottajan nimi"
 
-#: mod/admin.php:761
+#: mod/admin.php:756
 msgid "Recipient Profile"
 msgstr "Vastaanottajan profiili"
 
-#: mod/admin.php:762 view/theme/frio/theme.php:266
+#: mod/admin.php:757 view/theme/frio/theme.php:266
 #: src/Core/NotificationsManager.php:178 src/Content/Nav.php:183
 msgid "Network"
 msgstr "Uutisvirta"
 
-#: mod/admin.php:763
+#: mod/admin.php:758
 msgid "Created"
 msgstr "Luotu"
 
-#: mod/admin.php:764
+#: mod/admin.php:759
 msgid "Last Tried"
 msgstr "Viimeksi yritetty"
 
-#: mod/admin.php:765
+#: mod/admin.php:760
 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:789
+#: mod/admin.php:784
 #, php-format
 msgid ""
 "Your DB still runs with MyISAM tables. You should change the engine type to "
@@ -4309,488 +3779,492 @@ msgid ""
 " an automatic conversion.<br />"
 msgstr ""
 
-#: mod/admin.php:796
+#: mod/admin.php:791
 #, php-format
 msgid ""
 "There is a new version of Friendica available for download. Your current "
 "version is %1$s, upstream version is %2$s"
 msgstr ""
 
-#: mod/admin.php:806
+#: mod/admin.php:801
 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 "Tietokannan päivitys epäonnistui. Suorita komento \"php bin/console.php dbstructure update\" komentoriviltä ja lue mahdolliset virheviestit."
 
-#: mod/admin.php:812
+#: mod/admin.php:807
 msgid "The worker was never executed. Please check your database structure!"
 msgstr "Workeriä ei ole otettu käyttöön. Tarkista tietokantasi rakenne!"
 
-#: mod/admin.php:815
+#: mod/admin.php:810
 #, php-format
 msgid ""
 "The last worker execution was on %s UTC. This is older than one hour. Please"
 " check your crontab settings."
 msgstr "Viimeisin worker -käynnistys tapahtui klo %s UTC, eli yli tunti sitten. Tarkista crontab -asetukset."
 
-#: mod/admin.php:820
+#: mod/admin.php:815
 msgid "Normal Account"
 msgstr "Perustili"
 
-#: mod/admin.php:821
+#: mod/admin.php:816
 msgid "Automatic Follower Account"
 msgstr "Automaattinen seuraajatili"
 
-#: mod/admin.php:822
+#: mod/admin.php:817
 msgid "Public Forum Account"
 msgstr "Julkinen foorumitili"
 
-#: mod/admin.php:823
+#: mod/admin.php:818
 msgid "Automatic Friend Account"
 msgstr "Automaattinen kaveritili"
 
-#: mod/admin.php:824
+#: mod/admin.php:819
 msgid "Blog Account"
 msgstr "Blogitili"
 
-#: mod/admin.php:825
+#: mod/admin.php:820
 msgid "Private Forum Account"
 msgstr "Yksityinen foorumitili"
 
-#: mod/admin.php:847
+#: mod/admin.php:842
 msgid "Message queues"
 msgstr "Viestijonot"
 
-#: mod/admin.php:853
+#: mod/admin.php:848
 msgid "Summary"
 msgstr "Yhteenveto"
 
-#: mod/admin.php:855
+#: mod/admin.php:850
 msgid "Registered users"
 msgstr "Rekisteröityneet käyttäjät"
 
-#: mod/admin.php:857
+#: mod/admin.php:852
 msgid "Pending registrations"
 msgstr "Vireillä olevat rekisteröinnit"
 
-#: mod/admin.php:858
+#: mod/admin.php:853
 msgid "Version"
 msgstr "Versio"
 
-#: mod/admin.php:863
+#: mod/admin.php:858
 msgid "Active addons"
 msgstr "Käytössäolevat lisäosat"
 
-#: mod/admin.php:894
+#: mod/admin.php:889
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr "Ei voitu jäsentää perusosoitetta. Täytyy sisältää ainakin <scheme>://<domain>"
 
-#: mod/admin.php:1224
+#: mod/admin.php:1220
 msgid "Site settings updated."
 msgstr "Sivuston asetukset päivitettiin."
 
-#: mod/admin.php:1251 mod/settings.php:897
+#: mod/admin.php:1247 mod/settings.php:897
 msgid "No special theme for mobile devices"
 msgstr "Ei mobiiliteemaa"
 
-#: mod/admin.php:1280
+#: mod/admin.php:1276
 msgid "No community page for local users"
 msgstr ""
 
-#: mod/admin.php:1281
+#: mod/admin.php:1277
 msgid "No community page"
 msgstr "Ei yhteisösivua"
 
-#: mod/admin.php:1282
+#: mod/admin.php:1278
 msgid "Public postings from users of this site"
 msgstr "Julkiset julkaisut tämän sivuston käyttäjiltä"
 
-#: mod/admin.php:1283
+#: mod/admin.php:1279
 msgid "Public postings from the federated network"
 msgstr "Julkiset julkaisut liittoutuneelta verkolta"
 
-#: mod/admin.php:1284
+#: mod/admin.php:1280
 msgid "Public postings from local users and the federated network"
 msgstr "Julkiset julkaisut tältä sivustolta ja liittoutuneelta verkolta"
 
-#: mod/admin.php:1290
+#: mod/admin.php:1286
 msgid "Users, Global Contacts"
 msgstr "Käyttäjät, maailmanlaajuiset kontaktit"
 
-#: mod/admin.php:1291
+#: mod/admin.php:1287
 msgid "Users, Global Contacts/fallback"
 msgstr ""
 
-#: mod/admin.php:1295
+#: mod/admin.php:1291
 msgid "One month"
 msgstr "Yksi kuukausi"
 
-#: mod/admin.php:1296
+#: mod/admin.php:1292
 msgid "Three months"
 msgstr "Kolme kuukautta"
 
-#: mod/admin.php:1297
+#: mod/admin.php:1293
 msgid "Half a year"
 msgstr "Puoli vuotta"
 
-#: mod/admin.php:1298
+#: mod/admin.php:1294
 msgid "One year"
 msgstr "Yksi vuosi"
 
-#: mod/admin.php:1303
+#: mod/admin.php:1299
 msgid "Multi user instance"
 msgstr "Monen käyttäjän instanssi"
 
-#: mod/admin.php:1326
+#: mod/admin.php:1325
 msgid "Closed"
 msgstr "Suljettu"
 
-#: mod/admin.php:1327
+#: mod/admin.php:1326
 msgid "Requires approval"
 msgstr "Edellyttää hyväksyntää"
 
-#: mod/admin.php:1328
+#: mod/admin.php:1327
 msgid "Open"
 msgstr "Avoin"
 
-#: mod/admin.php:1332
+#: mod/admin.php:1331
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: mod/admin.php:1333
+#: mod/admin.php:1332
 msgid "Force all links to use SSL"
 msgstr "Pakota kaikki linkit käyttämään SSL-yhteyttä"
 
-#: mod/admin.php:1334
+#: mod/admin.php:1333
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: mod/admin.php:1338
+#: mod/admin.php:1337
 msgid "Don't check"
 msgstr "Älä tarkista"
 
-#: mod/admin.php:1339
+#: mod/admin.php:1338
 msgid "check the stable version"
 msgstr ""
 
-#: mod/admin.php:1340
+#: mod/admin.php:1339
 msgid "check the development version"
 msgstr ""
 
-#: mod/admin.php:1359
+#: mod/admin.php:1358
 msgid "Republish users to directory"
 msgstr ""
 
-#: mod/admin.php:1360 mod/register.php:267
+#: mod/admin.php:1359 mod/register.php:267
 msgid "Registration"
 msgstr "Rekisteröityminen"
 
-#: mod/admin.php:1361
+#: mod/admin.php:1360
 msgid "File upload"
 msgstr "Tiedoston lataus"
 
-#: mod/admin.php:1362
+#: mod/admin.php:1361
 msgid "Policies"
 msgstr "Käytännöt"
 
-#: mod/admin.php:1364
+#: mod/admin.php:1363
 msgid "Auto Discovered Contact Directory"
 msgstr ""
 
-#: mod/admin.php:1365
+#: mod/admin.php:1364
 msgid "Performance"
 msgstr "Suoritus"
 
-#: mod/admin.php:1366
+#: mod/admin.php:1365
 msgid "Worker"
 msgstr "Worker"
 
-#: mod/admin.php:1367
+#: mod/admin.php:1366
 msgid "Message Relay"
 msgstr "Viestirele"
 
-#: mod/admin.php:1368
+#: mod/admin.php:1367
 msgid ""
 "Relocate - WARNING: advanced function. Could make this server unreachable."
 msgstr ""
 
-#: mod/admin.php:1371
+#: mod/admin.php:1370
 msgid "Site name"
 msgstr "Sivuston nimi"
 
-#: mod/admin.php:1372
+#: mod/admin.php:1371
 msgid "Host name"
 msgstr "Palvelimen nimi"
 
-#: mod/admin.php:1373
+#: mod/admin.php:1372
 msgid "Sender Email"
 msgstr "Lähettäjän sähköposti"
 
-#: mod/admin.php:1373
+#: mod/admin.php:1372
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr "Lähettäjän sähköpostiosoite palvelimen ilmoitussähköposteissa."
 
-#: mod/admin.php:1374
+#: mod/admin.php:1373
 msgid "Banner/Logo"
 msgstr "Banneri/logo"
 
-#: mod/admin.php:1375
+#: mod/admin.php:1374
 msgid "Shortcut icon"
 msgstr "Pikakuvake"
 
-#: mod/admin.php:1375
+#: mod/admin.php:1374
 msgid "Link to an icon that will be used for browsers."
 msgstr "Linkki kuvakkeeseen jota selaimet saa käyttää."
 
-#: mod/admin.php:1376
+#: mod/admin.php:1375
 msgid "Touch icon"
 msgstr "Kosketusnäyttökuvake"
 
-#: mod/admin.php:1376
+#: mod/admin.php:1375
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr "Linkki kuvakkeeseen jota tabletit ja matkapuhelimet saa käyttää."
 
-#: mod/admin.php:1377
+#: mod/admin.php:1376
 msgid "Additional Info"
 msgstr "Lisätietoja"
 
-#: mod/admin.php:1377
+#: mod/admin.php:1376
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
 msgstr ""
 
-#: mod/admin.php:1378
+#: mod/admin.php:1377
 msgid "System language"
 msgstr "Järjestelmän kieli"
 
-#: mod/admin.php:1379
+#: mod/admin.php:1378
 msgid "System theme"
 msgstr "Järjestelmäteema"
 
-#: mod/admin.php:1379
+#: mod/admin.php:1378
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: mod/admin.php:1380
+#: mod/admin.php:1379
 msgid "Mobile system theme"
 msgstr "Mobiili järjestelmäteema"
 
-#: mod/admin.php:1380
+#: mod/admin.php:1379
 msgid "Theme for mobile devices"
 msgstr "Mobiiliteema"
 
-#: mod/admin.php:1381
+#: mod/admin.php:1380
 msgid "SSL link policy"
 msgstr "SSL-linkkikäytäntö"
 
-#: mod/admin.php:1381
+#: mod/admin.php:1380
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Määrittää pakotetaanko tuotetut linkit käyttämään SSL-yhteyttä."
 
-#: mod/admin.php:1382
+#: mod/admin.php:1381
 msgid "Force SSL"
 msgstr "Pakoita SSL-yhteyden käyttöä"
 
-#: mod/admin.php:1382
+#: mod/admin.php:1381
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
 msgstr ""
 
-#: mod/admin.php:1383
+#: mod/admin.php:1382
 msgid "Hide help entry from navigation menu"
 msgstr ""
 
-#: mod/admin.php:1383
+#: mod/admin.php:1382
 msgid ""
 "Hides the menu entry for the Help pages from the navigation menu. You can "
 "still access it calling /help directly."
 msgstr ""
 
-#: mod/admin.php:1384
+#: mod/admin.php:1383
 msgid "Single user instance"
 msgstr "Yksittäisen käyttäjän instanssi"
 
-#: mod/admin.php:1384
+#: mod/admin.php:1383
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr ""
 
-#: mod/admin.php:1385
+#: mod/admin.php:1384
 msgid "Maximum image size"
 msgstr "Suurin kuvakoko"
 
-#: mod/admin.php:1385
+#: mod/admin.php:1384
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Ladattavan kuvatiedoston enimmäiskoko tavuina. Oletusarvo on 0, eli ei enimmäiskokoa."
 
-#: mod/admin.php:1386
+#: mod/admin.php:1385
 msgid "Maximum image length"
 msgstr "Suurin kuvapituus"
 
-#: mod/admin.php:1386
+#: mod/admin.php:1385
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "Ladattavan kuvatiedoston enimmäispituus pikseleinä. Oletusarvo on -1, eli ei enimmäispituutta."
 
-#: mod/admin.php:1387
+#: mod/admin.php:1386
 msgid "JPEG image quality"
 msgstr "JPEG-kuvanlaatu"
 
-#: mod/admin.php:1387
+#: mod/admin.php:1386
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr "Ladatut JPEG-kuvat tallennetaan tällä laatuasetuksella [0-100]. Oletus on 100, eli korkein laatu."
 
-#: mod/admin.php:1389
+#: mod/admin.php:1388
 msgid "Register policy"
 msgstr "Rekisteröintipolitiikka"
 
-#: mod/admin.php:1390
+#: mod/admin.php:1389
 msgid "Maximum Daily Registrations"
 msgstr "Päivittäinen rekisteröitymisraja"
 
-#: mod/admin.php:1390
+#: mod/admin.php:1389
 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 "Mikäli rekisteröityminen on sallittu, tämä asettaa enimmäismäärä uusia rekisteröitymisiä päivässä. Jos reksiteröityminen ei ole sallittu, tällä asetuksella ei ole vaikutusta."
 
-#: mod/admin.php:1391
+#: mod/admin.php:1390
 msgid "Register text"
 msgstr "Rekisteröitymisteksti"
 
-#: mod/admin.php:1391
+#: mod/admin.php:1390
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
 msgstr "Näkyvästi esillä rekisteröitymissivulla. Voit käyttää BBCodeia."
 
-#: mod/admin.php:1392
+#: mod/admin.php:1391
 msgid "Accounts abandoned after x days"
 msgstr "Käyttäjätilit hylätään X päivän jälkeen"
 
-#: mod/admin.php:1392
+#: mod/admin.php:1391
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: mod/admin.php:1393
+#: mod/admin.php:1392
 msgid "Allowed friend domains"
 msgstr "Sallittuja kaveri-verkkotunnuksia"
 
-#: mod/admin.php:1393
+#: mod/admin.php:1392
 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:1394
+#: mod/admin.php:1393
 msgid "Allowed email domains"
 msgstr "Sallittuja sähköposti-verkkotunnuksia"
 
-#: mod/admin.php:1394
+#: mod/admin.php:1393
 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:1395
+#: mod/admin.php:1394
 msgid "No OEmbed rich content"
 msgstr ""
 
-#: mod/admin.php:1395
+#: mod/admin.php:1394
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
 msgstr ""
 
-#: mod/admin.php:1396
+#: mod/admin.php:1395
 msgid "Allowed OEmbed domains"
 msgstr "Sallittuja OEmbed -verkkotunnuksia"
 
-#: mod/admin.php:1396
+#: mod/admin.php:1395
 msgid ""
 "Comma separated list of domains which oembed content is allowed to be "
 "displayed. Wildcards are accepted."
 msgstr ""
 
-#: mod/admin.php:1397
+#: mod/admin.php:1396
 msgid "Block public"
 msgstr "Estä vierailijat"
 
-#: mod/admin.php:1397
+#: mod/admin.php:1396
 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:1398
+#: mod/admin.php:1397
 msgid "Force publish"
 msgstr ""
 
-#: mod/admin.php:1398
+#: mod/admin.php:1397
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: mod/admin.php:1399
+#: mod/admin.php:1397
+msgid "Enabling this may violate privacy laws like the GDPR"
+msgstr ""
+
+#: mod/admin.php:1398
 msgid "Global directory URL"
 msgstr "Maailmanlaajuisen hakemiston URL-osoite"
 
-#: mod/admin.php:1399
+#: mod/admin.php:1398
 msgid ""
 "URL to the global directory. If this is not set, the global directory is "
 "completely unavailable to the application."
 msgstr ""
 
-#: mod/admin.php:1400
+#: mod/admin.php:1399
 msgid "Private posts by default for new users"
 msgstr ""
 
-#: mod/admin.php:1400
+#: mod/admin.php:1399
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr ""
 
-#: mod/admin.php:1401
+#: mod/admin.php:1400
 msgid "Don't include post content in email notifications"
 msgstr "Älä lisää julkaisun sisältö sähköposti-ilmoitukseen"
 
-#: mod/admin.php:1401
+#: mod/admin.php:1400
 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:1402
+#: mod/admin.php:1401
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr ""
 
-#: mod/admin.php:1402
+#: mod/admin.php:1401
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr ""
 
-#: mod/admin.php:1403
+#: mod/admin.php:1402
 msgid "Don't embed private images in posts"
 msgstr "Älä upota yksityisiä kuvia julkaisuissa"
 
-#: mod/admin.php:1403
+#: mod/admin.php:1402
 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 "
@@ -4798,210 +4272,210 @@ msgid ""
 "while."
 msgstr ""
 
-#: mod/admin.php:1404
+#: mod/admin.php:1403
 msgid "Allow Users to set remote_self"
 msgstr ""
 
-#: mod/admin.php:1404
+#: mod/admin.php:1403
 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:1405
+#: mod/admin.php:1404
 msgid "Block multiple registrations"
 msgstr ""
 
-#: mod/admin.php:1405
+#: mod/admin.php:1404
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: mod/admin.php:1406
+#: mod/admin.php:1405
 msgid "OpenID support"
 msgstr "OpenID-tuki"
 
-#: mod/admin.php:1406
+#: mod/admin.php:1405
 msgid "OpenID support for registration and logins."
 msgstr "OpenID-tuki rekisteröitymiseen ja kirjautumiseen"
 
-#: mod/admin.php:1407
+#: mod/admin.php:1406
 msgid "Fullname check"
 msgstr "Koko nimi tarkistus"
 
-#: mod/admin.php:1407
+#: mod/admin.php:1406
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: mod/admin.php:1408
+#: mod/admin.php:1407
 msgid "Community pages for visitors"
 msgstr "Yhteisösivu vieraille"
 
-#: mod/admin.php:1408
+#: mod/admin.php:1407
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
 msgstr ""
 
-#: mod/admin.php:1409
+#: mod/admin.php:1408
 msgid "Posts per user on community page"
 msgstr ""
 
-#: mod/admin.php:1409
+#: mod/admin.php:1408
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
 msgstr "Enimmäismäärä julkaisuja käyttäjää kohden yhteisösivulla. (Ei koske maailmanlaajuista yhteisösivua.)"
 
-#: mod/admin.php:1410
+#: mod/admin.php:1409
 msgid "Enable OStatus support"
 msgstr "Salli OStatus-tuki"
 
-#: mod/admin.php:1410
+#: mod/admin.php:1409
 msgid ""
 "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 
-#: mod/admin.php:1411
+#: mod/admin.php:1410
 msgid "Only import OStatus threads from our contacts"
 msgstr "Ainoastaan tuo OStatus -ketjuja kontakteiltamme"
 
-#: mod/admin.php:1411
+#: mod/admin.php:1410
 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:1412
+#: mod/admin.php:1411
 msgid "OStatus support can only be enabled if threading is enabled."
 msgstr "OStatus-tuki voidaan ottaa käyttöön ainoastaan jos ketjuttaminen on jo otettu käyttöön."
 
-#: mod/admin.php:1414
+#: mod/admin.php:1413
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub"
 " directory."
 msgstr "Diaspora -tukea ei voitu ottaa käyttöön koska Friendica on asennettu alihakemistoon."
 
-#: mod/admin.php:1415
+#: mod/admin.php:1414
 msgid "Enable Diaspora support"
 msgstr "Salli Diaspora-tuki"
 
-#: mod/admin.php:1415
+#: mod/admin.php:1414
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Ota käyttöön Diaspora-yhteensopivuus"
 
-#: mod/admin.php:1416
+#: mod/admin.php:1415
 msgid "Only allow Friendica contacts"
 msgstr "Salli ainoastaan Friendica -kontakteja"
 
-#: mod/admin.php:1416
+#: mod/admin.php:1415
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "Kaikkien kontaktien on käytettävä Friendica-protokollaa. Kaikki muut protokollat poistetaan käytöstä."
 
-#: mod/admin.php:1417
+#: mod/admin.php:1416
 msgid "Verify SSL"
 msgstr "Vahvista SSL"
 
-#: mod/admin.php:1417
+#: mod/admin.php:1416
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
 msgstr ""
 
-#: mod/admin.php:1418
+#: mod/admin.php:1417
 msgid "Proxy user"
 msgstr "Välityspalvelimen käyttäjä"
 
-#: mod/admin.php:1419
+#: mod/admin.php:1418
 msgid "Proxy URL"
 msgstr "Välityspalvelimen osoite"
 
-#: mod/admin.php:1420
+#: mod/admin.php:1419
 msgid "Network timeout"
 msgstr "Verkon aikakatkaisu"
 
-#: mod/admin.php:1420
+#: mod/admin.php:1419
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: mod/admin.php:1421
+#: mod/admin.php:1420
 msgid "Maximum Load Average"
 msgstr "Kuorman enimmäiskeksiarvo"
 
-#: mod/admin.php:1421
+#: mod/admin.php:1420
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Järjestelmäkuormitus jolloin lähetys- ja kyselyprosessit lykätään (oletusarvo 50)."
 
-#: mod/admin.php:1422
+#: mod/admin.php:1421
 msgid "Maximum Load Average (Frontend)"
 msgstr "Kuorman enimmäiskeskiarvo (Frontend)"
 
-#: mod/admin.php:1422
+#: mod/admin.php:1421
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr "Järjestelmäkuormitus jolloin Frontend poistetaan käytöstä (oletusarvo 50)."
 
-#: mod/admin.php:1423
+#: mod/admin.php:1422
 msgid "Minimal Memory"
 msgstr ""
 
-#: mod/admin.php:1423
+#: mod/admin.php:1422
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
 msgstr ""
 
-#: mod/admin.php:1424
+#: mod/admin.php:1423
 msgid "Maximum table size for optimization"
 msgstr "Taulukon enimmäiskoko optimointia varten"
 
-#: mod/admin.php:1424
+#: mod/admin.php:1423
 msgid ""
 "Maximum table size (in MB) for the automatic optimization. Enter -1 to "
 "disable it."
 msgstr ""
 
-#: mod/admin.php:1425
+#: mod/admin.php:1424
 msgid "Minimum level of fragmentation"
 msgstr ""
 
-#: mod/admin.php:1425
+#: mod/admin.php:1424
 msgid ""
 "Minimum fragmenation level to start the automatic optimization - default "
 "value is 30%."
 msgstr ""
 
-#: mod/admin.php:1427
+#: mod/admin.php:1426
 msgid "Periodical check of global contacts"
 msgstr ""
 
-#: mod/admin.php:1427
+#: mod/admin.php:1426
 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:1428
+#: mod/admin.php:1427
 msgid "Days between requery"
 msgstr ""
 
-#: mod/admin.php:1428
+#: mod/admin.php:1427
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr ""
 
-#: mod/admin.php:1429
+#: mod/admin.php:1428
 msgid "Discover contacts from other servers"
 msgstr "Etsi kontakteja muilta palvelimilta"
 
-#: mod/admin.php:1429
+#: mod/admin.php:1428
 msgid ""
 "Periodically query other servers for contacts. You can choose between "
 "'users': the users on the remote system, 'Global Contacts': active contacts "
@@ -5011,32 +4485,32 @@ msgid ""
 "Global Contacts'."
 msgstr ""
 
-#: mod/admin.php:1430
+#: mod/admin.php:1429
 msgid "Timeframe for fetching global contacts"
 msgstr ""
 
-#: mod/admin.php:1430
+#: mod/admin.php:1429
 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:1431
+#: mod/admin.php:1430
 msgid "Search the local directory"
 msgstr "Paikallisluettelohaku"
 
-#: mod/admin.php:1431
+#: mod/admin.php:1430
 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:1433
+#: mod/admin.php:1432
 msgid "Publish server information"
 msgstr "Julkaise palvelintiedot"
 
-#: mod/admin.php:1433
+#: mod/admin.php:1432
 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 "
@@ -5044,50 +4518,50 @@ msgid ""
 " href='http://the-federation.info/'>the-federation.info</a> for details."
 msgstr ""
 
-#: mod/admin.php:1435
+#: mod/admin.php:1434
 msgid "Check upstream version"
 msgstr ""
 
-#: mod/admin.php:1435
+#: mod/admin.php:1434
 msgid ""
 "Enables checking for new Friendica versions at github. If there is a new "
 "version, you will be informed in the admin panel overview."
 msgstr ""
 
-#: mod/admin.php:1436
+#: mod/admin.php:1435
 msgid "Suppress Tags"
 msgstr "Piilota tunnisteet"
 
-#: mod/admin.php:1436
+#: mod/admin.php:1435
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr "Piilota tunnistelista julkaisun lopussa."
 
-#: mod/admin.php:1437
+#: mod/admin.php:1436
 msgid "Clean database"
 msgstr "Siivoa tietokanta"
 
-#: mod/admin.php:1437
+#: mod/admin.php:1436
 msgid ""
 "Remove old remote items, orphaned database records and old content from some"
 " other helper tables."
 msgstr ""
 
-#: mod/admin.php:1438
+#: mod/admin.php:1437
 msgid "Lifespan of remote items"
 msgstr ""
 
-#: mod/admin.php:1438
+#: mod/admin.php:1437
 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:1439
+#: mod/admin.php:1438
 msgid "Lifespan of unclaimed items"
 msgstr ""
 
-#: mod/admin.php:1439
+#: mod/admin.php:1438
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "unclaimed remote items (mostly content from the relay) will be deleted. "
@@ -5095,129 +4569,129 @@ msgid ""
 "items if set to 0."
 msgstr ""
 
-#: mod/admin.php:1440
+#: mod/admin.php:1439
 msgid "Path to item cache"
 msgstr ""
 
-#: mod/admin.php:1440
+#: mod/admin.php:1439
 msgid "The item caches buffers generated bbcode and external images."
 msgstr ""
 
-#: mod/admin.php:1441
+#: mod/admin.php:1440
 msgid "Cache duration in seconds"
 msgstr "Välimuistin kesto sekunteina"
 
-#: mod/admin.php:1441
+#: mod/admin.php:1440
 msgid ""
 "How long should the cache files be hold? Default value is 86400 seconds (One"
 " day). To disable the item cache, set the value to -1."
 msgstr ""
 
-#: mod/admin.php:1442
+#: mod/admin.php:1441
 msgid "Maximum numbers of comments per post"
 msgstr "Julkaisun kommentiraja"
 
-#: mod/admin.php:1442
+#: mod/admin.php:1441
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr ""
 
-#: mod/admin.php:1443
+#: mod/admin.php:1442
 msgid "Temp path"
 msgstr "Väliaikaistiedostojen polku"
 
-#: mod/admin.php:1443
+#: mod/admin.php:1442
 msgid ""
 "If you have a restricted system where the webserver can't access the system "
 "temp path, enter another path here."
 msgstr "Mikäli verkkopalvelimesi ei voi käyttää järjestelmän väliaikaistiedostojen polkua, syötä toinen polku tähän."
 
-#: mod/admin.php:1444
+#: mod/admin.php:1443
 msgid "Base path to installation"
 msgstr "Asennuksen peruspolku"
 
-#: mod/admin.php:1444
+#: mod/admin.php:1443
 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:1445
+#: mod/admin.php:1444
 msgid "Disable picture proxy"
 msgstr ""
 
-#: mod/admin.php:1445
+#: mod/admin.php:1444
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
-" systems with very low bandwith."
+" systems with very low bandwidth."
 msgstr ""
 
-#: mod/admin.php:1446
+#: mod/admin.php:1445
 msgid "Only search in tags"
 msgstr "Tunnistehaku"
 
-#: mod/admin.php:1446
+#: mod/admin.php:1445
 msgid "On large systems the text search can slow down the system extremely."
 msgstr ""
 
-#: mod/admin.php:1448
+#: mod/admin.php:1447
 msgid "New base url"
 msgstr "Uusi perusosoite"
 
-#: mod/admin.php:1448
+#: mod/admin.php:1447
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and"
 " Diaspora* contacts of all users."
 msgstr "Vaihtaa tämän palvelimen perus-URL-osoitteen. Lähettää uudelleensijoitusviestit käyttäjien kaikille kontakteille Friendicassa ja Diasporassa*."
 
-#: mod/admin.php:1450
+#: mod/admin.php:1449
 msgid "RINO Encryption"
 msgstr "RINO-salaus"
 
-#: mod/admin.php:1450
+#: mod/admin.php:1449
 msgid "Encryption layer between nodes."
 msgstr "Salauskerros solmujen välillä."
 
-#: mod/admin.php:1450
+#: mod/admin.php:1449
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: mod/admin.php:1452
+#: mod/admin.php:1451
 msgid "Maximum number of parallel workers"
 msgstr "Enimmäismäärä rinnakkaisia workereitä"
 
-#: mod/admin.php:1452
+#: mod/admin.php:1451
 msgid ""
 "On shared hosters set this to 2. On larger systems, values of 10 are great. "
 "Default value is 4."
 msgstr ""
 
-#: mod/admin.php:1453
+#: mod/admin.php:1452
 msgid "Don't use 'proc_open' with the worker"
 msgstr ""
 
-#: mod/admin.php:1453
+#: mod/admin.php:1452
 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:1454
+#: mod/admin.php:1453
 msgid "Enable fastlane"
 msgstr "Käytä fastlane"
 
-#: mod/admin.php:1454
+#: mod/admin.php:1453
 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:1455
+#: mod/admin.php:1454
 msgid "Enable frontend worker"
 msgstr "Ota Frontend Worker käyttöön"
 
-#: mod/admin.php:1455
+#: mod/admin.php:1454
 #, php-format
 msgid ""
 "When enabled the Worker process is triggered when backend access is "
@@ -5227,132 +4701,132 @@ msgid ""
 " on your server."
 msgstr ""
 
-#: mod/admin.php:1457
+#: mod/admin.php:1456
 msgid "Subscribe to relay"
 msgstr "Relen tilaus"
 
-#: mod/admin.php:1457
+#: mod/admin.php:1456
 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:1458
+#: mod/admin.php:1457
 msgid "Relay server"
 msgstr "Relepalvelin"
 
-#: mod/admin.php:1458
+#: mod/admin.php:1457
 msgid ""
 "Address of the relay server where public posts should be send to. For "
 "example https://relay.diasp.org"
 msgstr ""
 
-#: mod/admin.php:1459
+#: mod/admin.php:1458
 msgid "Direct relay transfer"
 msgstr "Suora releen siirto"
 
-#: mod/admin.php:1459
+#: mod/admin.php:1458
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr ""
 
-#: mod/admin.php:1460
+#: mod/admin.php:1459
 msgid "Relay scope"
 msgstr "Relen soveltamisala"
 
-#: mod/admin.php:1460
+#: mod/admin.php:1459
 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:1460
+#: mod/admin.php:1459
 msgid "all"
 msgstr "kaikki"
 
-#: mod/admin.php:1460
+#: mod/admin.php:1459
 msgid "tags"
 msgstr "tunnisteet"
 
-#: mod/admin.php:1461
+#: mod/admin.php:1460
 msgid "Server tags"
 msgstr "palvelintunnisteet"
 
-#: mod/admin.php:1461
+#: mod/admin.php:1460
 msgid "Comma separated list of tags for the 'tags' subscription."
 msgstr "Pilkulla erotettu tunnistelista tunnistetilausta varten."
 
-#: mod/admin.php:1462
+#: mod/admin.php:1461
 msgid "Allow user tags"
 msgstr "Salli käyttäjien tunnisteet"
 
-#: mod/admin.php:1462
+#: mod/admin.php:1461
 msgid ""
 "If enabled, the tags from the saved searches will used for the 'tags' "
 "subscription in addition to the 'relay_server_tags'."
 msgstr "Jos otettu käyttöön, tunnisteet tallennetuista hauista käytetään tunnistetilaukseen 'relay_server_tags'in lisäksi."
 
-#: mod/admin.php:1490
+#: mod/admin.php:1489
 msgid "Update has been marked successful"
 msgstr ""
 
-#: mod/admin.php:1497
+#: mod/admin.php:1496
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr "Tietokannan rakenteen %s-päivitys onnistui."
 
-#: mod/admin.php:1500
+#: mod/admin.php:1499
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr "Tietokannan rakennepäivitys %s epäonnistui virheviestillä %s"
 
-#: mod/admin.php:1513
+#: mod/admin.php:1515
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr ""
 
-#: mod/admin.php:1515
+#: mod/admin.php:1517
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "%s-päivitys onnistui."
 
-#: mod/admin.php:1518
+#: mod/admin.php:1520
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: mod/admin.php:1521
+#: mod/admin.php:1523
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr ""
 
-#: mod/admin.php:1541
+#: mod/admin.php:1546
 msgid "No failed updates."
 msgstr "Ei epäonnistuineita päivityksiä."
 
-#: mod/admin.php:1542
+#: mod/admin.php:1547
 msgid "Check database structure"
 msgstr "Tarkista tietokannan rakenne"
 
-#: mod/admin.php:1547
+#: mod/admin.php:1552
 msgid "Failed Updates"
 msgstr "Epäonnistuineita päivityksiä"
 
-#: mod/admin.php:1548
+#: mod/admin.php:1553
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: mod/admin.php:1549
+#: mod/admin.php:1554
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: mod/admin.php:1550
+#: mod/admin.php:1555
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: mod/admin.php:1589
+#: mod/admin.php:1594
 #, php-format
 msgid ""
 "\n"
@@ -5360,7 +4834,7 @@ msgid ""
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr ""
 
-#: mod/admin.php:1592
+#: mod/admin.php:1597
 #, php-format
 msgid ""
 "\n"
@@ -5392,208 +4866,208 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr ""
 
-#: mod/admin.php:1626 src/Model/User.php:663
+#: mod/admin.php:1631 src/Model/User.php:665
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: mod/admin.php:1636
+#: mod/admin.php:1641
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s käyttäjä estetty / poistettu estolistalta"
 msgstr[1] "%s käyttäjää estetty / poistettu estolistalta"
 
-#: mod/admin.php:1642
+#: mod/admin.php:1647
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s käyttäjä poistettu"
 msgstr[1] "%s käyttäjää poistettu"
 
-#: mod/admin.php:1689
+#: mod/admin.php:1694
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Käyttäjä '%s' poistettu"
 
-#: mod/admin.php:1697
+#: mod/admin.php:1702
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Käyttäjä '%s' poistettu estolistalta"
 
-#: mod/admin.php:1697
+#: mod/admin.php:1702
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Käyttäjä '%s' estetty"
 
-#: mod/admin.php:1754 mod/settings.php:1058
+#: mod/admin.php:1759 mod/settings.php:1058
 msgid "Normal Account Page"
 msgstr "Tavallinen käyttäjätili"
 
-#: mod/admin.php:1755 mod/settings.php:1062
+#: mod/admin.php:1760 mod/settings.php:1062
 msgid "Soapbox Page"
 msgstr "Saarnatuoli sivu"
 
-#: mod/admin.php:1756 mod/settings.php:1066
+#: mod/admin.php:1761 mod/settings.php:1066
 msgid "Public Forum"
 msgstr "Julkinen foorumi"
 
-#: mod/admin.php:1757 mod/settings.php:1070
+#: mod/admin.php:1762 mod/settings.php:1070
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: mod/admin.php:1758
+#: mod/admin.php:1763
 msgid "Private Forum"
 msgstr "Yksityisfoorumi"
 
-#: mod/admin.php:1761 mod/settings.php:1042
+#: mod/admin.php:1766 mod/settings.php:1042
 msgid "Personal Page"
 msgstr "Henkilökohtainen sivu"
 
-#: mod/admin.php:1762 mod/settings.php:1046
+#: mod/admin.php:1767 mod/settings.php:1046
 msgid "Organisation Page"
 msgstr "Järjestön sivu"
 
-#: mod/admin.php:1763 mod/settings.php:1050
+#: mod/admin.php:1768 mod/settings.php:1050
 msgid "News Page"
 msgstr "Uutissivu"
 
-#: mod/admin.php:1764 mod/settings.php:1054
+#: mod/admin.php:1769 mod/settings.php:1054
 msgid "Community Forum"
 msgstr "Yhteisöfoorumi"
 
-#: mod/admin.php:1811 mod/admin.php:1822 mod/admin.php:1835 mod/admin.php:1853
+#: mod/admin.php:1816 mod/admin.php:1827 mod/admin.php:1840 mod/admin.php:1858
 #: src/Content/ContactSelector.php:82
 msgid "Email"
 msgstr "Sähköposti"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1816 mod/admin.php:1840
 msgid "Register date"
 msgstr "Rekisteripäivämäärä"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1816 mod/admin.php:1840
 msgid "Last login"
 msgstr "Viimeisin kirjautuminen"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1816 mod/admin.php:1840
 msgid "Last item"
 msgstr "Viimeisin kohde"
 
-#: mod/admin.php:1811
+#: mod/admin.php:1816
 msgid "Type"
 msgstr "Tyyppi"
 
-#: mod/admin.php:1818
+#: mod/admin.php:1823
 msgid "Add User"
 msgstr "Lisää käyttäjä"
 
-#: mod/admin.php:1820
+#: mod/admin.php:1825
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: mod/admin.php:1821
+#: mod/admin.php:1826
 msgid "User waiting for permanent deletion"
 msgstr ""
 
-#: mod/admin.php:1822
+#: mod/admin.php:1827
 msgid "Request date"
 msgstr "Pyynnön päivämäärä"
 
-#: mod/admin.php:1823
+#: mod/admin.php:1828
 msgid "No registrations."
 msgstr "Ei rekisteröintejä."
 
-#: mod/admin.php:1824
+#: mod/admin.php:1829
 msgid "Note from the user"
 msgstr ""
 
-#: mod/admin.php:1825 mod/notifications.php:178 mod/notifications.php:262
+#: mod/admin.php:1830 mod/notifications.php:178 mod/notifications.php:262
 msgid "Approve"
 msgstr "Hyväksy"
 
-#: mod/admin.php:1826
+#: mod/admin.php:1831
 msgid "Deny"
 msgstr "Kieltäydy"
 
-#: mod/admin.php:1830
+#: mod/admin.php:1835
 msgid "Site admin"
 msgstr "Sivuston ylläpito"
 
-#: mod/admin.php:1831
+#: mod/admin.php:1836
 msgid "Account expired"
 msgstr "Tili vanhentunut"
 
-#: mod/admin.php:1834
+#: mod/admin.php:1839
 msgid "New User"
 msgstr "Uusi käyttäjä"
 
-#: mod/admin.php:1835
+#: mod/admin.php:1840
 msgid "Deleted since"
 msgstr "Poistettu"
 
-#: mod/admin.php:1840
+#: mod/admin.php:1845
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: mod/admin.php:1841
+#: mod/admin.php:1846
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: mod/admin.php:1851
+#: mod/admin.php:1856
 msgid "Name of the new user."
 msgstr "Uuden käyttäjän nimi."
 
-#: mod/admin.php:1852
+#: mod/admin.php:1857
 msgid "Nickname"
 msgstr "Lempinimi"
 
-#: mod/admin.php:1852
+#: mod/admin.php:1857
 msgid "Nickname of the new user."
 msgstr "Uuden käyttäjän lempinimi"
 
-#: mod/admin.php:1853
+#: mod/admin.php:1858
 msgid "Email address of the new user."
 msgstr "Uuden käyttäjän sähköpostiosoite."
 
-#: mod/admin.php:1895
+#: mod/admin.php:1900
 #, php-format
 msgid "Addon %s disabled."
 msgstr "Lisäosa %s poistettu käytöstä."
 
-#: mod/admin.php:1899
+#: mod/admin.php:1904
 #, php-format
 msgid "Addon %s enabled."
 msgstr "Lisäosa %s käytössä."
 
-#: mod/admin.php:1909 mod/admin.php:2158
+#: mod/admin.php:1914 mod/admin.php:2163
 msgid "Disable"
 msgstr "Poista käytöstä"
 
-#: mod/admin.php:1912 mod/admin.php:2161
+#: mod/admin.php:1917 mod/admin.php:2166
 msgid "Enable"
 msgstr "Ota käyttöön"
 
-#: mod/admin.php:1934 mod/admin.php:2203
+#: mod/admin.php:1939 mod/admin.php:2209
 msgid "Toggle"
 msgstr "Vaihda"
 
-#: mod/admin.php:1942 mod/admin.php:2212
+#: mod/admin.php:1947 mod/admin.php:2218
 msgid "Author: "
 msgstr "Tekijä"
 
-#: mod/admin.php:1943 mod/admin.php:2213
+#: mod/admin.php:1948 mod/admin.php:2219
 msgid "Maintainer: "
 msgstr "Ylläpitäjä:"
 
-#: mod/admin.php:1995
+#: mod/admin.php:2000
 msgid "Reload active addons"
 msgstr ""
 
-#: mod/admin.php:2000
+#: mod/admin.php:2005
 #, php-format
 msgid ""
 "There are currently no addons available on your node. You can find the "
@@ -5601,70 +5075,70 @@ msgid ""
 " the open addon registry at %2$s"
 msgstr ""
 
-#: mod/admin.php:2120
+#: mod/admin.php:2125
 msgid "No themes found."
 msgstr "Teemoja ei löytynyt."
 
-#: mod/admin.php:2194
+#: mod/admin.php:2200
 msgid "Screenshot"
 msgstr "Kuvakaappaus"
 
-#: mod/admin.php:2248
+#: mod/admin.php:2254
 msgid "Reload active themes"
 msgstr "Lataa aktiiviset teemat uudelleen"
 
-#: mod/admin.php:2253
+#: mod/admin.php:2259
 #, php-format
 msgid "No themes found on the system. They should be placed in %1$s"
 msgstr "Teemoja ei löytynyt järjestelmästä. Teemat tulisi laittaa kansioon %1$s"
 
-#: mod/admin.php:2254
+#: mod/admin.php:2260
 msgid "[Experimental]"
 msgstr "[Kokeellinen]"
 
-#: mod/admin.php:2255
+#: mod/admin.php:2261
 msgid "[Unsupported]"
 msgstr "[Ei tueta]"
 
-#: mod/admin.php:2279
+#: mod/admin.php:2285
 msgid "Log settings updated."
 msgstr "Lokiasetukset päivitetty."
 
-#: mod/admin.php:2311
+#: mod/admin.php:2317
 msgid "PHP log currently enabled."
 msgstr "PHP-loki käytössä"
 
-#: mod/admin.php:2313
+#: mod/admin.php:2319
 msgid "PHP log currently disabled."
 msgstr "PHP-loki pois käytöstä"
 
-#: mod/admin.php:2322
+#: mod/admin.php:2328
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: mod/admin.php:2326
+#: mod/admin.php:2332
 msgid "Enable Debugging"
 msgstr "Ota virheenkorjaustila käyttöön"
 
-#: mod/admin.php:2327
+#: mod/admin.php:2333
 msgid "Log file"
 msgstr "Lokitiedosto"
 
-#: mod/admin.php:2327
+#: mod/admin.php:2333
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: mod/admin.php:2328
+#: mod/admin.php:2334
 msgid "Log level"
 msgstr "Lokitaso"
 
-#: mod/admin.php:2330
+#: mod/admin.php:2336
 msgid "PHP logging"
 msgstr "PHP-loki"
 
-#: mod/admin.php:2331
+#: mod/admin.php:2337
 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 "
@@ -5673,37 +5147,71 @@ msgid ""
 "'display_errors' is to enable these options, set to '0' to disable them."
 msgstr ""
 
-#: mod/admin.php:2362
+#: mod/admin.php:2368
 #, php-format
 msgid ""
 "Error trying to open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see "
 "if file %1$s exist and is readable."
 msgstr ""
 
-#: mod/admin.php:2366
+#: mod/admin.php:2372
 #, php-format
 msgid ""
 "Couldn't open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see if file"
 " %1$s is readable."
 msgstr ""
 
-#: mod/admin.php:2457 mod/admin.php:2458 mod/settings.php:767
+#: mod/admin.php:2463 mod/admin.php:2464 mod/settings.php:767
 msgid "Off"
 msgstr "Pois päältä"
 
-#: mod/admin.php:2457 mod/admin.php:2458 mod/settings.php:767
+#: mod/admin.php:2463 mod/admin.php:2464 mod/settings.php:767
 msgid "On"
 msgstr "Päällä"
 
-#: mod/admin.php:2458
+#: mod/admin.php:2464
 #, php-format
 msgid "Lock feature %s"
 msgstr "Lukitse ominaisuus %s"
 
-#: mod/admin.php:2466
+#: mod/admin.php:2472
 msgid "Manage Additional Features"
 msgstr "Hallitse lisäominaisuudet"
 
+#: mod/community.php:51
+msgid "Community option not available."
+msgstr "Yhteisö vaihtoehto ei saatavilla."
+
+#: mod/community.php:68
+msgid "Not available."
+msgstr "Ei saatavilla."
+
+#: mod/community.php:81
+msgid "Local Community"
+msgstr "Paikallinen yhteisö"
+
+#: mod/community.php:84
+msgid "Posts from local users on this server"
+msgstr "Tämän palvelimen julkaisut"
+
+#: mod/community.php:92
+msgid "Global Community"
+msgstr "Maailmanlaajuinen yhteisö"
+
+#: mod/community.php:95
+msgid "Posts from users of the whole federated network"
+msgstr "Maailmanlaajuisen verkon julkaisut"
+
+#: mod/community.php:141 mod/search.php:228
+msgid "No results."
+msgstr "Ei tuloksia."
+
+#: 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."
@@ -5933,6 +5441,139 @@ msgid ""
 " bar."
 msgstr " - älä käytä tätä lomaketta. Kirjoita sen sijaan %s Diaspora-hakupalkkiisi."
 
+#: mod/events.php:105 mod/events.php:107
+msgid "Event can not end before it has started."
+msgstr "Tapahtuma ei voi päättyä ennen kuin on alkanut."
+
+#: mod/events.php:114 mod/events.php:116
+msgid "Event title and start time are required."
+msgstr "Tapahtuman nimi ja alkamisaika vaaditaan."
+
+#: mod/events.php:393
+msgid "Create New Event"
+msgstr "Luo uusi tapahtuma"
+
+#: mod/events.php:507
+msgid "Event details"
+msgstr "Tapahtuman tiedot"
+
+#: mod/events.php:508
+msgid "Starting date and Title are required."
+msgstr "Aloituspvm ja otsikko vaaditaan."
+
+#: mod/events.php:509 mod/events.php:510
+msgid "Event Starts:"
+msgstr "Tapahtuma alkaa:"
+
+#: mod/events.php:509 mod/events.php:521 mod/profiles.php:607
+msgid "Required"
+msgstr "Vaaditaan"
+
+#: mod/events.php:511 mod/events.php:527
+msgid "Finish date/time is not known or not relevant"
+msgstr "Päättymispvm ja kellonaika ei ole tiedossa tai niillä ei ole merkitystä"
+
+#: mod/events.php:513 mod/events.php:514
+msgid "Event Finishes:"
+msgstr "Tapahtuma päättyy:"
+
+#: mod/events.php:515 mod/events.php:528
+msgid "Adjust for viewer timezone"
+msgstr "Ota huomioon katsojan aikavyöhyke"
+
+#: mod/events.php:517
+msgid "Description:"
+msgstr "Kuvaus:"
+
+#: mod/events.php:521 mod/events.php:523
+msgid "Title:"
+msgstr "Otsikko:"
+
+#: mod/events.php:524 mod/events.php:525
+msgid "Share this event"
+msgstr "Jaa tämä tapahtuma"
+
+#: 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 "Käyttöoikeudet"
+
+#: mod/events.php:553
+msgid "Failed to remove event"
+msgstr "Tapahtuman poisto epäonnistui"
+
+#: mod/events.php:555
+msgid "Event removed"
+msgstr "Tapahtuma poistettu"
+
+#: mod/group.php:36
+msgid "Group created."
+msgstr "Ryhmä luotu."
+
+#: mod/group.php:42
+msgid "Could not create group."
+msgstr "Ryhmää ei voitu luoda."
+
+#: mod/group.php:56 mod/group.php:157
+msgid "Group not found."
+msgstr "Ryhmää ei löytynyt."
+
+#: mod/group.php:70
+msgid "Group name changed."
+msgstr "Ryhmän nimi muutettu."
+
+#: mod/group.php:97
+msgid "Save Group"
+msgstr "Tallenna ryhmä"
+
+#: mod/group.php:102
+msgid "Create a group of contacts/friends."
+msgstr "Luo kontakti/kaveriryhmä"
+
+#: mod/group.php:103 mod/group.php:199 src/Model/Group.php:421
+msgid "Group Name: "
+msgstr "Ryhmän nimi:"
+
+#: mod/group.php:127
+msgid "Group removed."
+msgstr "Ryhmä poistettu."
+
+#: mod/group.php:129
+msgid "Unable to remove group."
+msgstr "Ryhmää ei voida poistaa."
+
+#: mod/group.php:192
+msgid "Delete Group"
+msgstr "Poista ryhmä"
+
+#: mod/group.php:198
+msgid "Group Editor"
+msgstr "Ryhmien muokkausta"
+
+#: mod/group.php:203
+msgid "Edit Group Name"
+msgstr "Muokkaa ryhmän nimeä"
+
+#: mod/group.php:213
+msgid "Members"
+msgstr "Jäsenet"
+
+#: mod/group.php:216 mod/network.php:639
+msgid "Group is empty"
+msgstr "Ryhmä on tyhjä"
+
+#: mod/group.php:229
+msgid "Remove contact from group"
+msgstr "Poista kontakti ryhmästä"
+
+#: mod/group.php:253
+msgid "Add contact to group"
+msgstr "Lisää kontakti ryhmään"
+
 #: mod/item.php:114
 msgid "Unable to locate original post."
 msgstr "Alkuperäinen julkaisu ei löydy."
@@ -5964,6 +5605,103 @@ msgstr ""
 msgid "%s posted an update."
 msgstr "%s julkaisi päivityksen."
 
+#: mod/network.php:194 mod/search.php:37
+msgid "Remove term"
+msgstr "Poista kohde"
+
+#: mod/network.php:201 mod/search.php:46 src/Content/Feature.php:100
+msgid "Saved Searches"
+msgstr "Tallennetut haut"
+
+#: mod/network.php:202 src/Model/Group.php:413
+msgid "add"
+msgstr "lisää"
+
+#: 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] ""
+msgstr[1] ""
+
+#: 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 "Ryhmä ei ole olemassa"
+
+#: mod/network.php:643
+#, php-format
+msgid "Group: %s"
+msgstr "Ryhmä: %s"
+
+#: mod/network.php:669
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "Yksityisviestit lähetetty tälle henkilölle saattaa näkyä muillekin."
+
+#: mod/network.php:672
+msgid "Invalid contact."
+msgstr "Virheellinen kontakti."
+
+#: mod/network.php:943
+msgid "Commented Order"
+msgstr "Järjestä viimeisimpien kommenttien mukaan"
+
+#: mod/network.php:946
+msgid "Sort by Comment Date"
+msgstr "Kommentit päivämäärän mukaan"
+
+#: mod/network.php:951
+msgid "Posted Order"
+msgstr "Järjestä julkaisupäivämäärän mukaan"
+
+#: mod/network.php:954
+msgid "Sort by Post Date"
+msgstr "Julkaisut päivämäärän mukaan"
+
+#: mod/network.php:962 mod/profiles.php:594
+#: src/Core/NotificationsManager.php:185
+msgid "Personal"
+msgstr "Henkilökohtainen"
+
+#: mod/network.php:965
+msgid "Posts that mention or involve you"
+msgstr "Julkaisut jotka liittyvät sinuun"
+
+#: mod/network.php:973
+msgid "New"
+msgstr "Uusi"
+
+#: mod/network.php:976
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: mod/network.php:984
+msgid "Shared Links"
+msgstr "Jaetut linkit"
+
+#: mod/network.php:987
+msgid "Interesting Links"
+msgstr "Kiinnostavat linkit"
+
+#: mod/network.php:995
+msgid "Starred"
+msgstr "Tähtimerkitty"
+
+#: mod/network.php:998
+msgid "Favourite Posts"
+msgstr "Lempijulkaisut"
+
+#: mod/notes.php:52 src/Model/Profile.php:944
+msgid "Personal Notes"
+msgstr "Henkilökohtaiset tiedot"
+
 #: mod/notifications.php:37
 msgid "Invalid request identifier."
 msgstr "Virheellinen pyyntötunniste."
@@ -6072,21 +5810,235 @@ msgstr "Näytä kaikki"
 msgid "No more %s notifications."
 msgstr "Ei muita %s ilmoituksia."
 
+#: mod/openid.php:29
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID -protokollavirhe. Tunnusta ei vastaanotettu."
+
+#: mod/openid.php:66
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr "Käyttäjätiliä ei löytynyt. Rekisteröityminen OpenID:n kautta ei ole sallittua tällä sivustolla."
+
+#: mod/openid.php:116 src/Module/Login.php:86 src/Module/Login.php:135
+msgid "Login failed."
+msgstr "Kirjautuminen epäonnistui"
+
+#: mod/photos.php:108 src/Model/Profile.php:905
+msgid "Photo Albums"
+msgstr "Valokuva-albumit"
+
+#: mod/photos.php:109 mod/photos.php:1708
+msgid "Recent Photos"
+msgstr "Viimeaikaisia kuvia"
+
+#: mod/photos.php:112 mod/photos.php:1198 mod/photos.php:1710
+msgid "Upload New Photos"
+msgstr "Lähetä uusia kuvia"
+
+#: mod/photos.php:126 mod/settings.php:51
+msgid "everybody"
+msgstr "kaikki"
+
+#: mod/photos.php:184
+msgid "Contact information unavailable"
+msgstr "Kontaktin tietoja ei saatavilla"
+
+#: mod/photos.php:204
+msgid "Album not found."
+msgstr "Albumia ei ole."
+
+#: mod/photos.php:234 mod/photos.php:245 mod/photos.php:1149
+msgid "Delete Album"
+msgstr "Poista albumi"
+
+#: mod/photos.php:243
+msgid "Do you really want to delete this photo album and all its photos?"
+msgstr "Haluatko varmasti poistaa tämän albumin ja kaikki sen kuvat?"
+
+#: mod/photos.php:303 mod/photos.php:314 mod/photos.php:1440
+msgid "Delete Photo"
+msgstr "Poista valokuva"
+
+#: mod/photos.php:312
+msgid "Do you really want to delete this photo?"
+msgstr "Haluatko varmasti poistaa kuvan?"
+
+#: mod/photos.php:655
+msgid "a photo"
+msgstr "valokuva"
+
+#: mod/photos.php:655
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
+msgstr "%1$s merkattiin kuvaan %2$s ystävän %3$s toimesta"
+
+#: mod/photos.php:757
+msgid "Image upload didn't complete, please try again"
+msgstr "Kuvan lataus ei onnistunut, yritä uudelleen"
+
+#: mod/photos.php:760
+msgid "Image file is missing"
+msgstr "Kuvatiedosto puuttuu"
+
+#: mod/photos.php:765
+msgid ""
+"Server can't accept new file upload at this time, please contact your "
+"administrator"
+msgstr ""
+
+#: mod/photos.php:791
+msgid "Image file is empty."
+msgstr "Kuvatiedosto on tyhjä."
+
+#: mod/photos.php:928
+msgid "No photos selected"
+msgstr "Ei valittuja kuvia"
+
+#: mod/photos.php:1024 mod/videos.php:309
+msgid "Access to this item is restricted."
+msgstr "Pääsy kohteeseen on rajoitettu."
+
+#: mod/photos.php:1078
+msgid "Upload Photos"
+msgstr "Lähetä kuvia"
+
+#: mod/photos.php:1082 mod/photos.php:1144
+msgid "New album name: "
+msgstr "Albumin uusi nimi: "
+
+#: mod/photos.php:1083
+msgid "or existing album name: "
+msgstr "tai olemassaolevan albumin nimi: "
+
+#: mod/photos.php:1084
+msgid "Do not show a status post for this upload"
+msgstr "Älä näytä tilaviestiä tälle lähetykselle"
+
+#: mod/photos.php:1094 mod/photos.php:1443 mod/settings.php:1218
+msgid "Show to Groups"
+msgstr "Näytä ryhmille"
+
+#: mod/photos.php:1095 mod/photos.php:1444 mod/settings.php:1219
+msgid "Show to Contacts"
+msgstr "Näytä kontakteille"
+
+#: mod/photos.php:1155
+msgid "Edit Album"
+msgstr "Muokkaa albumia"
+
+#: mod/photos.php:1160
+msgid "Show Newest First"
+msgstr "Näytä uusin ensin"
+
+#: mod/photos.php:1162
+msgid "Show Oldest First"
+msgstr "Näytä vanhin ensin"
+
+#: mod/photos.php:1183 mod/photos.php:1693
+msgid "View Photo"
+msgstr "Näytä kuva"
+
+#: mod/photos.php:1224
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Estetty. Tämän kohteen käyttöä on saatettu rajoittaa."
+
+#: mod/photos.php:1226
+msgid "Photo not available"
+msgstr "Kuva ei ole saatavilla"
+
+#: mod/photos.php:1294
+msgid "View photo"
+msgstr "Näytä kuva"
+
+#: mod/photos.php:1294
+msgid "Edit photo"
+msgstr "Muokkaa kuvaa"
+
+#: mod/photos.php:1295
+msgid "Use as profile photo"
+msgstr "Käytä profiilikuvana"
+
+#: mod/photos.php:1301 src/Object/Post.php:149
+msgid "Private Message"
+msgstr "Yksityisviesti"
+
+#: mod/photos.php:1321
+msgid "View Full Size"
+msgstr "Näytä täysikokoisena"
+
+#: mod/photos.php:1408
+msgid "Tags: "
+msgstr "Merkinnät:"
+
+#: mod/photos.php:1411
+msgid "[Remove any tag]"
+msgstr "[Poista mikä tahansa merkintä]"
+
+#: mod/photos.php:1426
+msgid "New album name"
+msgstr "Uusi nimi albumille"
+
+#: mod/photos.php:1427
+msgid "Caption"
+msgstr "Kuvateksti"
+
+#: mod/photos.php:1428
+msgid "Add a Tag"
+msgstr "Lisää merkintä"
+
+#: mod/photos.php:1428
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Esimerkki: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+
+#: mod/photos.php:1429
+msgid "Do not rotate"
+msgstr "Älä kierrä"
+
+#: mod/photos.php:1430
+msgid "Rotate CW (right)"
+msgstr "Käännä oikealle"
+
+#: mod/photos.php:1431
+msgid "Rotate CCW (left)"
+msgstr "Käännä vasemmalle"
+
+#: mod/photos.php:1465 src/Object/Post.php:304
+msgid "I like this (toggle)"
+msgstr "Tykkään tästä (vaihda)"
+
+#: mod/photos.php:1466 src/Object/Post.php:305
+msgid "I don't like this (toggle)"
+msgstr "En tykkää tästä (vaihda)"
+
+#: 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 "Kommentti"
+
+#: mod/photos.php:1628
+msgid "Map"
+msgstr "Kartta"
+
+#: mod/photos.php:1699 mod/videos.php:387
+msgid "View Album"
+msgstr "Näytä albumi"
+
 #: mod/profile.php:37 src/Model/Profile.php:118
 msgid "Requested profile is not available."
 msgstr "Pyydettyä profiilia ei saatavilla."
 
-#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1251
+#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1250
 #, php-format
 msgid "%s's timeline"
 msgstr "%s: aikajana"
 
-#: mod/profile.php:79 src/Protocol/OStatus.php:1252
+#: mod/profile.php:79 src/Protocol/OStatus.php:1251
 #, php-format
 msgid "%s's posts"
 msgstr "%s: julkaisut"
 
-#: mod/profile.php:80 src/Protocol/OStatus.php:1253
+#: mod/profile.php:80 src/Protocol/OStatus.php:1252
 #, php-format
 msgid "%s's comments"
 msgstr "%s: kommentit"
@@ -6516,35 +6468,52 @@ msgstr "Rekisteröidy"
 msgid "Import your profile to this friendica instance"
 msgstr "Tuo profiilisi tähän Friendica -instanssiin."
 
-#: mod/removeme.php:44
+#: mod/removeme.php:45
 msgid "User deleted their account"
 msgstr "Käyttäjä poisti tilinsä"
 
-#: mod/removeme.php:45
+#: 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 "Friendica -solmullasi käyttäjä poisti tilinsä. Varmista että hänen tiedot poistetaan myös varmuuskopioista."
 
-#: mod/removeme.php:46
+#: mod/removeme.php:47
 #, php-format
 msgid "The user id is %d"
 msgstr "Käyttäjätunnus on %d"
 
-#: mod/removeme.php:77 mod/removeme.php:80
+#: mod/removeme.php:78 mod/removeme.php:81
 msgid "Remove My Account"
 msgstr "Poista tilini"
 
-#: mod/removeme.php:78
+#: mod/removeme.php:79
 msgid ""
 "This will completely remove your account. Once this has been done it is not "
 "recoverable."
 msgstr "Tämä poistaa käyttäjätilisi pysyvästi. Poistoa ei voi perua myöhemmin."
 
-#: mod/removeme.php:79
+#: mod/removeme.php:80
 msgid "Please enter your password for verification:"
 msgstr "Syötä salasanasi varmistusta varten:"
 
+#: 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 "Liian monta pyyntöä"
+
+#: 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 "Kohteet joilla tunnisteet: %s"
+
 #: mod/settings.php:56
 msgid "Account"
 msgstr "Tili"
@@ -6589,7 +6558,7 @@ msgstr "Ominaisuudet päivitetty"
 msgid "Relocate message has been send to your contacts"
 msgstr ""
 
-#: mod/settings.php:384 src/Model/User.php:339
+#: mod/settings.php:384 src/Model/User.php:340
 msgid "Passwords do not match. Password unchanged."
 msgstr "Salasanat eivät täsmää. Salasana ennallaan."
 
@@ -6930,8 +6899,8 @@ msgid ""
 msgstr ""
 
 #: mod/settings.php:969
-msgid "Bandwith Saver Mode"
-msgstr "Kaistanleveyssäästömoodi"
+msgid "Bandwidth Saver Mode"
+msgstr ""
 
 #: mod/settings.php:969
 msgid ""
@@ -7048,8 +7017,9 @@ msgstr "Julkaise oletusprofiilisi tämän sivuston paikallisluettelossa?"
 #: mod/settings.php:1094
 #, 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."
+"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
@@ -7059,9 +7029,8 @@ msgstr "Julkaise oletusprofiilisi maailmanlaajuisessa sosiaaliluettelossa?"
 #: 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."
+"Your profile will be published in the global friendica directories (e.g. <a "
+"href=\"%s\">%s</a>). Your profile will be visible in public."
 msgstr ""
 
 #: mod/settings.php:1107
@@ -7082,8 +7051,8 @@ 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. Disables posting public "
-"messages to Diaspora and other networks."
+" 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
@@ -7350,7 +7319,37 @@ msgstr ""
 msgid "Resend relocate message to contacts"
 msgstr ""
 
-#: view/theme/duepuntozero/config.php:54 src/Model/User.php:502
+#: mod/subthread.php:117
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr ""
+
+#: 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 "[Upotettu sisältö - näet sen päivittämällä sivun]"
+
+#: mod/videos.php:139
+msgid "Do you really want to delete this video?"
+msgstr "Haluatko varmasti poistaa tämän videon?"
+
+#: mod/videos.php:144
+msgid "Delete Video"
+msgstr "Poista video"
+
+#: mod/videos.php:207
+msgid "No videos selected"
+msgstr "Ei videoita valittuna"
+
+#: mod/videos.php:396
+msgid "Recent Videos"
+msgstr "Viimeisimmät videot"
+
+#: mod/videos.php:398
+msgid "Upload New Videos"
+msgstr "Lataa uusia videoita"
+
+#: view/theme/duepuntozero/config.php:54 src/Model/User.php:504
 msgid "default"
 msgstr "oletus"
 
@@ -8066,33 +8065,33 @@ msgstr "sekuntia"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s sitten"
 
-#: src/Content/Text/BBCode.php:416
+#: src/Content/Text/BBCode.php:426
 msgid "view full size"
 msgstr "näytä täysikokoisena"
 
-#: src/Content/Text/BBCode.php:842 src/Content/Text/BBCode.php:1611
-#: src/Content/Text/BBCode.php:1612
+#: src/Content/Text/BBCode.php:852 src/Content/Text/BBCode.php:1621
+#: src/Content/Text/BBCode.php:1622
 msgid "Image/photo"
 msgstr "Kuva/valokuva"
 
-#: src/Content/Text/BBCode.php:980
+#: src/Content/Text/BBCode.php:990
 #, 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"
 
-#: src/Content/Text/BBCode.php:1538 src/Content/Text/BBCode.php:1560
+#: src/Content/Text/BBCode.php:1548 src/Content/Text/BBCode.php:1570
 msgid "$1 wrote:"
 msgstr "$1 kirjoitti:"
 
-#: src/Content/Text/BBCode.php:1620 src/Content/Text/BBCode.php:1621
+#: src/Content/Text/BBCode.php:1630 src/Content/Text/BBCode.php:1631
 msgid "Encrypted content"
 msgstr "Salattu sisältö"
 
-#: src/Content/Text/BBCode.php:1740
+#: src/Content/Text/BBCode.php:1750
 msgid "Invalid source protocol"
 msgstr "Virheellinen lähdeprotokolla"
 
-#: src/Content/Text/BBCode.php:1751
+#: src/Content/Text/BBCode.php:1761
 msgid "Invalid link protocol"
 msgstr "Virheellinen linkkiprotokolla"
 
@@ -8336,7 +8335,7 @@ msgstr "Uskoton"
 msgid "Sex Addict"
 msgstr "Sekririippuvainen"
 
-#: src/Content/ContactSelector.php:169 src/Model/User.php:519
+#: src/Content/ContactSelector.php:169 src/Model/User.php:521
 msgid "Friends"
 msgstr "Kaverit"
 
@@ -8844,6 +8843,124 @@ msgstr "%s: päivitetään %s-taulukkoa."
 msgid "[no subject]"
 msgstr "[ei aihetta]"
 
+#: 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 ""
+
+#: src/Model/Group.php:341
+msgid "Default privacy group for new contacts"
+msgstr "Oletusryhmä uusille kontakteille"
+
+#: src/Model/Group.php:374
+msgid "Everybody"
+msgstr "Kaikki"
+
+#: src/Model/Group.php:394
+msgid "edit"
+msgstr "muokkaa"
+
+#: src/Model/Group.php:418
+msgid "Edit group"
+msgstr "Muokkaa ryhmää"
+
+#: src/Model/Group.php:419
+msgid "Contacts not in any group"
+msgstr "Kontaktit ilman ryhmää"
+
+#: src/Model/Group.php:420
+msgid "Create a new group"
+msgstr "Luo uusi ryhmä"
+
+#: src/Model/Group.php:422
+msgid "Edit groups"
+msgstr "Muokkaa ryhmiä"
+
+#: src/Model/Contact.php:667
+msgid "Drop Contact"
+msgstr "Poista kontakti"
+
+#: src/Model/Contact.php:1101
+msgid "Organisation"
+msgstr "Järjestö"
+
+#: src/Model/Contact.php:1104
+msgid "News"
+msgstr "Uutiset"
+
+#: src/Model/Contact.php:1107
+msgid "Forum"
+msgstr "Keskustelupalsta"
+
+#: src/Model/Contact.php:1286
+msgid "Connect URL missing."
+msgstr "Yhteys URL-linkki puuttuu."
+
+#: 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 "Kontaktia ei pystytty lisäämään. Tarkista verkkoasetukset omista asetuksistasi (Settings -> Social Networks)."
+
+#: src/Model/Contact.php:1342
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Tämä sivusto ei salli yhteyksiä muiden verkkojen kanssa.."
+
+#: src/Model/Contact.php:1343 src/Model/Contact.php:1357
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "Yhteensopivia viestintäprotokolleja tai syötteitä ei löytynyt."
+
+#: src/Model/Contact.php:1355
+msgid "The profile address specified does not provide adequate information."
+msgstr "Annettu profiiliosoite ei sisällä riittävästi tietoa."
+
+#: src/Model/Contact.php:1360
+msgid "An author or name was not found."
+msgstr "Julkaisija tai nimi puuttuu."
+
+#: src/Model/Contact.php:1363
+msgid "No browser URL could be matched to this address."
+msgstr ""
+
+#: 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 "Käytä \"mailto:\" osoitteen edessä pakottaaksesi sähköpostin tarkastuksen."
+
+#: src/Model/Contact.php:1373
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "Profiilin osoite kuuluu verkkoon, joka on poistettu tältä sivustolta."
+
+#: src/Model/Contact.php:1378
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Rajoitettu profiili. Tämä henkilö ei pysty/tule saamaan suoria/henkilökohtaisia ilmoituksia sinulta."
+
+#: src/Model/Contact.php:1429
+msgid "Unable to retrieve contact information."
+msgstr "Kontaktin tietoja ei voitu hakea."
+
+#: src/Model/Contact.php:1646 src/Protocol/DFRN.php:1515
+#, php-format
+msgid "%s's birthday"
+msgstr "%s: syntymäpäivä"
+
+#: src/Model/Contact.php:1647 src/Protocol/DFRN.php:1516
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "Hyvää syntymäpäivää %s"
+
 #: src/Model/Event.php:53 src/Model/Event.php:70 src/Model/Event.php:419
 #: src/Model/Event.php:882
 msgid "Starts:"
@@ -8888,11 +9005,11 @@ msgstr "Poista tapahtuma"
 
 #: src/Model/Event.php:815
 msgid "D g:i A"
-msgstr "D g:i A"
+msgstr "D H:i"
 
 #: src/Model/Event.php:816
 msgid "g:i A"
-msgstr "g:i A"
+msgstr "H:i"
 
 #: src/Model/Event.php:901 src/Model/Event.php:903
 msgid "Show map"
@@ -8902,40 +9019,20 @@ msgstr "Näytä kartta"
 msgid "Hide map"
 msgstr "Piilota kartta"
 
-#: 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 ""
+#: src/Model/Item.php:1883
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
+msgstr "%1$s osallistuu tapahtumaan %3$s, jonka järjestää %2$s"
 
-#: src/Model/Group.php:341
-msgid "Default privacy group for new contacts"
-msgstr "Oletusryhmä uusille kontakteille"
+#: src/Model/Item.php:1888
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
+msgstr "%1$s ei osallistu tapahtumaan %3$s, jonka järjestää %2$s"
 
-#: src/Model/Group.php:374
-msgid "Everybody"
-msgstr "Kaikki"
-
-#: src/Model/Group.php:394
-msgid "edit"
-msgstr "muokkaa"
-
-#: src/Model/Group.php:418
-msgid "Edit group"
-msgstr "Muokkaa ryhmää"
-
-#: src/Model/Group.php:419
-msgid "Contacts not in any group"
-msgstr "Kontaktit ilman ryhmää"
-
-#: src/Model/Group.php:420
-msgid "Create a new group"
-msgstr "Luo uusi ryhmä"
-
-#: src/Model/Group.php:422
-msgid "Edit groups"
-msgstr "Muokkaa ryhmiä"
+#: src/Model/Item.php:1893
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
+msgstr "%1$s ehkä osallistuu tapahtumaan %3$s, jonka järjestää %2$s"
 
 #: src/Model/Profile.php:97
 msgid "Requested account is not available."
@@ -9063,86 +9160,86 @@ msgstr "Kirjautuminen epäonnistui"
 msgid "Not enough information to authenticate"
 msgstr "Ei tarpeeksi tietoja kirjautumiseen"
 
-#: src/Model/User.php:346
+#: src/Model/User.php:347
 msgid "An invitation is required."
 msgstr "Vaaditaa kutsu."
 
-#: src/Model/User.php:350
+#: src/Model/User.php:351
 msgid "Invitation could not be verified."
 msgstr "Kutsua ei voitu vahvistaa."
 
-#: src/Model/User.php:357
+#: src/Model/User.php:358
 msgid "Invalid OpenID url"
 msgstr "Virheellinen OpenID url-osoite"
 
-#: src/Model/User.php:370 src/Module/Login.php:101
+#: 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 "Kohtasimme ongelman antamasi OpenID:n kanssa. Ole hyvä ja tarkista ID:n oikea kirjoitusasu."
 
-#: src/Model/User.php:370 src/Module/Login.php:101
+#: src/Model/User.php:371 src/Module/Login.php:101
 msgid "The error message was:"
 msgstr "Virheviesti oli:"
 
-#: src/Model/User.php:376
+#: src/Model/User.php:377
 msgid "Please enter the required information."
 msgstr "Syötä tarvittavat tiedot."
 
-#: src/Model/User.php:389
+#: src/Model/User.php:390
 msgid "Please use a shorter name."
 msgstr "Käytä lyhyempää nimeä."
 
-#: src/Model/User.php:392
+#: src/Model/User.php:393
 msgid "Name too short."
 msgstr "Nimi on liian lyhyt."
 
-#: src/Model/User.php:400
+#: src/Model/User.php:401
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr "Tuo ei vakuta täydeltä nimeltäsi (Etunimi Sukunimi)."
 
-#: src/Model/User.php:405
+#: src/Model/User.php:406
 msgid "Your email domain is not among those allowed on this site."
 msgstr "Sähköpostiosoitteesi verkkotunnus on tämän sivuston estolistalla."
 
-#: src/Model/User.php:409
+#: src/Model/User.php:410
 msgid "Not a valid email address."
 msgstr "Virheellinen sähköpostiosoite."
 
-#: src/Model/User.php:413 src/Model/User.php:421
+#: src/Model/User.php:414 src/Model/User.php:422
 msgid "Cannot use that email."
 msgstr "Sähköpostiosoitetta ei voitu käyttää."
 
-#: src/Model/User.php:428
+#: src/Model/User.php:429
 msgid "Your nickname can only contain a-z, 0-9 and _."
 msgstr "Nimimerkki voi sisältää a-z, 0-9 ja _."
 
-#: src/Model/User.php:435 src/Model/User.php:491
+#: src/Model/User.php:436 src/Model/User.php:493
 msgid "Nickname is already registered. Please choose another."
 msgstr "Valitsemasi nimimerkki on jo käytössä. Valitse toinen nimimerkki."
 
-#: src/Model/User.php:445
+#: src/Model/User.php:446
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr "VAKAVA VIRHE: Salausavainten luominen epäonnistui."
 
-#: src/Model/User.php:478 src/Model/User.php:482
+#: src/Model/User.php:480 src/Model/User.php:484
 msgid "An error occurred during registration. Please try again."
 msgstr "Rekisteröityminen epäonnistui. Yritä uudelleen."
 
-#: src/Model/User.php:507
+#: src/Model/User.php:509
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "Oletusprofiilin luominen epäonnistui. Yritä uudelleen."
 
-#: src/Model/User.php:514
+#: src/Model/User.php:516
 msgid "An error occurred creating your self contact. Please try again."
 msgstr "Yhteystietojesi luonti epäonnistui. Yritä uudelleen."
 
-#: src/Model/User.php:523
+#: src/Model/User.php:525
 msgid ""
 "An error occurred creating your default contact group. Please try again."
 msgstr "Oletusryhmäsi luonti epäonnistui. Yritä uudelleen."
 
-#: src/Model/User.php:597
+#: src/Model/User.php:599
 #, php-format
 msgid ""
 "\n"
@@ -9151,12 +9248,12 @@ msgid ""
 "\t\t"
 msgstr "\n\t\t\tHei %1$s,\n\t\t\t\tKiitoksia rekisteröitymisestä sivustolle %2$s. Tilisi on odottamassa ylläpidon hyväksyntää.\n\t\t"
 
-#: src/Model/User.php:607
+#: src/Model/User.php:609
 #, php-format
 msgid "Registration at %s"
 msgstr "Rekisteröityminen kohteessa %s"
 
-#: src/Model/User.php:625
+#: src/Model/User.php:627
 #, php-format
 msgid ""
 "\n"
@@ -9165,7 +9262,7 @@ msgid ""
 "\t\t"
 msgstr "\n\t\t\tHei %1$s,\n\t\t\t\tKiitoksia rekisteröinnistä sivustolle %2$s. Tilisi on luotu.\n\t\t"
 
-#: src/Model/User.php:629
+#: src/Model/User.php:631
 #, php-format
 msgid ""
 "\n"
@@ -9197,122 +9294,6 @@ msgid ""
 "\t\t\tThank you and welcome to %2$s."
 msgstr ""
 
-#: src/Model/Contact.php:667
-msgid "Drop Contact"
-msgstr "Poista kontakti"
-
-#: src/Model/Contact.php:1101
-msgid "Organisation"
-msgstr "Järjestö"
-
-#: src/Model/Contact.php:1104
-msgid "News"
-msgstr "Uutiset"
-
-#: src/Model/Contact.php:1107
-msgid "Forum"
-msgstr "Keskustelupalsta"
-
-#: src/Model/Contact.php:1286
-msgid "Connect URL missing."
-msgstr "Yhteys URL-linkki puuttuu."
-
-#: 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 "Kontaktia ei pystytty lisäämään. Tarkista verkkoasetukset omista asetuksistasi (Settings -> Social Networks)."
-
-#: src/Model/Contact.php:1342
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "Tämä sivusto ei salli yhteyksiä muiden verkkojen kanssa.."
-
-#: src/Model/Contact.php:1343 src/Model/Contact.php:1357
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "Yhteensopivia viestintäprotokolleja tai syötteitä ei löytynyt."
-
-#: src/Model/Contact.php:1355
-msgid "The profile address specified does not provide adequate information."
-msgstr "Annettu profiiliosoite ei sisällä riittävästi tietoa."
-
-#: src/Model/Contact.php:1360
-msgid "An author or name was not found."
-msgstr "Julkaisija tai nimi puuttuu."
-
-#: src/Model/Contact.php:1363
-msgid "No browser URL could be matched to this address."
-msgstr ""
-
-#: 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 "Käytä \"mailto:\" osoitteen edessä pakottaaksesi sähköpostin tarkastuksen."
-
-#: src/Model/Contact.php:1373
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr "Profiilin osoite kuuluu verkkoon, joka on poistettu tältä sivustolta."
-
-#: src/Model/Contact.php:1378
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr "Rajoitettu profiili. Tämä henkilö ei pysty/tule saamaan suoria/henkilökohtaisia ilmoituksia sinulta."
-
-#: src/Model/Contact.php:1429
-msgid "Unable to retrieve contact information."
-msgstr "Kontaktin tietoja ei voitu hakea."
-
-#: src/Model/Contact.php:1646 src/Protocol/DFRN.php:1513
-#, php-format
-msgid "%s's birthday"
-msgstr "%s: syntymäpäivä"
-
-#: src/Model/Contact.php:1647 src/Protocol/DFRN.php:1514
-#, php-format
-msgid "Happy Birthday %s"
-msgstr "Hyvää syntymäpäivää %s"
-
-#: src/Model/Item.php:1851
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$s osallistuu tapahtumaan %3$s, jonka järjestää %2$s"
-
-#: src/Model/Item.php:1856
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$s ei osallistu tapahtumaan %3$s, jonka järjestää %2$s"
-
-#: src/Model/Item.php:1861
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s ehkä osallistuu tapahtumaan %3$s, jonka järjestää %2$s"
-
-#: src/Protocol/OStatus.php:1799
-#, php-format
-msgid "%s is now following %s."
-msgstr "%s seuraa %s."
-
-#: src/Protocol/OStatus.php:1800
-msgid "following"
-msgstr "seuraa"
-
-#: src/Protocol/OStatus.php:1803
-#, php-format
-msgid "%s stopped following %s."
-msgstr "%s ei enää seuraa %s."
-
-#: src/Protocol/OStatus.php:1804
-msgid "stopped following"
-msgstr "ei enää seuraa"
-
 #: src/Protocol/Diaspora.php:2521
 msgid "Sharing notification from Diaspora network"
 msgstr "Ilmoitus Diaspora -verkosta tapahtuneesta jakamisesta."
@@ -9321,6 +9302,24 @@ msgstr "Ilmoitus Diaspora -verkosta tapahtuneesta jakamisesta."
 msgid "Attachments:"
 msgstr "Liitteitä:"
 
+#: src/Protocol/OStatus.php:1798
+#, php-format
+msgid "%s is now following %s."
+msgstr "%s seuraa %s."
+
+#: src/Protocol/OStatus.php:1799
+msgid "following"
+msgstr "seuraa"
+
+#: src/Protocol/OStatus.php:1802
+#, php-format
+msgid "%s stopped following %s."
+msgstr "%s ei enää seuraa %s."
+
+#: src/Protocol/OStatus.php:1803
+msgid "stopped following"
+msgstr "ei enää seuraa"
+
 #: src/Worker/Delivery.php:415
 msgid "(no subject)"
 msgstr "(ei aihetta)"
@@ -9405,8 +9404,12 @@ msgid "This entry was edited"
 msgstr "Tämä kohde oli muokattu"
 
 #: src/Object/Post.php:187
-msgid "Remove from your stream"
-msgstr "Poista virrastasi"
+msgid "Delete globally"
+msgstr ""
+
+#: src/Object/Post.php:187
+msgid "Remove locally"
+msgstr ""
 
 #: src/Object/Post.php:200
 msgid "save to folder"
@@ -9527,15 +9530,15 @@ msgstr "Linkki"
 msgid "Video"
 msgstr "Video"
 
-#: src/App.php:524
+#: src/App.php:526
 msgid "Delete this item?"
 msgstr "Poista tämä kohde?"
 
-#: src/App.php:526
+#: src/App.php:528
 msgid "show fewer"
 msgstr "näytä vähemmän"
 
-#: src/App.php:1114
+#: src/App.php:1117
 msgid "No system theme config value set."
 msgstr ""
 
@@ -9543,12 +9546,12 @@ msgstr ""
 msgid "toggle mobile"
 msgstr "Mobiilisivusto päälle/pois"
 
-#: update.php:193
-#, php-format
-msgid "%s: Updating author-id and owner-id in item and thread table. "
-msgstr ""
-
 #: boot.php:796
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "%s päivitys epäonnistui, katso virhelokit."
+
+#: update.php:193
+#, php-format
+msgid "%s: Updating author-id and owner-id in item and thread table. "
+msgstr ""
diff --git a/view/lang/fi-fi/strings.php b/view/lang/fi-fi/strings.php
index a6f4bbe1e..a530cd8cf 100644
--- a/view/lang/fi-fi/strings.php
+++ b/view/lang/fi-fi/strings.php
@@ -65,11 +65,6 @@ $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "O
 $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Olet vastaanottanut [url=%1\$s]rekisteröintipyynnön[/url] henkilöltä %2\$s.";
 $a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"] = "Koko nimi:\t%1\$s\\nSivusto:\t%2\$s\\nKäyttäjätunnus:\t%3\$s (%4\$s)";
 $a->strings["Please visit %s to approve or reject the request."] = "Hyväksy tai hylkää pyyntö %s-sivustossa.";
-$a->strings["Welcome "] = "Tervetuloa";
-$a->strings["Please upload a profile photo."] = "Lataa profiilikuva.";
-$a->strings["Welcome back "] = "Tervetuloa takaisin";
-$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."] = "Lomakkeen turvallisuusavain oli väärin. Tämä voi johtua siitä, että lomake on ollut avoinna liian kauan (>3 tuntia) ennen sen lähettämistä.";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "'%s' tietokantapalvelimen DNS-tieto ei löydy";
 $a->strings["Daily posting limit of %d post reached. The post was rejected."] = [
 	0 => "Päivittäinen julkaisuraja (%d) on tullut täyteen. Julkaisu hylätty.",
 	1 => "Päivittäinen julkaisuraja (%d) on tullut täyteen. Julkaisu hylätty.",
@@ -196,6 +191,10 @@ $a->strings["Yes"] = "Kyllä";
 $a->strings["Permission denied."] = "Käyttöoikeus evätty.";
 $a->strings["Archives"] = "Arkisto";
 $a->strings["show more"] = "näytä lisää";
+$a->strings["Welcome "] = "Tervetuloa";
+$a->strings["Please upload a profile photo."] = "Lataa profiilikuva.";
+$a->strings["Welcome back "] = "Tervetuloa takaisin";
+$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."] = "Lomakkeen turvallisuusavain oli väärin. Tämä voi johtua siitä, että lomake on ollut avoinna liian kauan (>3 tuntia) ennen sen lähettämistä.";
 $a->strings["newer"] = "uudempi";
 $a->strings["older"] = "vanhempi";
 $a->strings["first"] = "ensimmäinen";
@@ -344,7 +343,7 @@ $a->strings["Visit %s's profile [%s]"] = "Näytä %s-käyttäjän profiili [%s]"
 $a->strings["Edit contact"] = "Muokkaa kontaktia";
 $a->strings["Contacts who are not members of a group"] = "Kontaktit jotka eivät kuulu ryhmään";
 $a->strings["Not Extended"] = "Ei laajennettu";
-$a->strings["Resubscribing to OStatus contacts"] = "";
+$a->strings["Resubscribing to OStatus contacts"] = "OStatus -kontaktien uudelleentilaus";
 $a->strings["Error"] = "Virhe";
 $a->strings["Done"] = "Valmis";
 $a->strings["Keep this window open until done."] = "Pidä tämä ikkuna auki kunnes kaikki tehtävät on suoritettu.";
@@ -352,7 +351,6 @@ $a->strings["Do you really want to delete this suggestion?"] = "Haluatko varmast
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Ehdotuksia ei löydy. Jos tämä on uusi sivusto, kokeile uudelleen vuorokauden kuluttua.";
 $a->strings["Ignore/Hide"] = "Jätä huomiotta/piilota";
 $a->strings["Friend Suggestions"] = "Ystäväehdotukset";
-$a->strings["[Embedded content - reload page to view]"] = "[Upotettu sisältö - näet sen päivittämällä sivun]";
 $a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Sivuston päivittäinen rekisteröintiraja ylitetty. Yritä uudelleen huomenna.";
 $a->strings["Import"] = "Tuo";
 $a->strings["Move account"] = "Siirrä tili";
@@ -375,7 +373,7 @@ $a->strings["Or - did you try to upload an empty file?"] = "Yrititkö ladata tyh
 $a->strings["File exceeds size limit of %s"] = "Tiedosto ylittää kokorajoituksen %s";
 $a->strings["File upload failed."] = "Tiedoston lähettäminen epäonnistui.";
 $a->strings["- select -"] = "- valitse -";
-$a->strings["l F d, Y \\@ g:i A"] = "";
+$a->strings["l F d, Y \\@ g:i A"] = "l j.n.Y \\@ H:i";
 $a->strings["Time Conversion"] = "Aikamuunnos";
 $a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "";
 $a->strings["UTC time: %s"] = "UTC-aika: %s";
@@ -403,15 +401,6 @@ $a->strings["All Contacts (with secure profile access)"] = "";
 $a->strings["Account approved."] = "Tili hyväksytty.";
 $a->strings["Registration revoked for %s"] = "";
 $a->strings["Please login."] = "Ole hyvä ja kirjaudu.";
-$a->strings["Remove term"] = "Poista kohde";
-$a->strings["Saved Searches"] = "Tallennetut haut";
-$a->strings["Only logged in users are permitted to perform a search."] = "";
-$a->strings["Too Many Requests"] = "Liian monta pyyntöä";
-$a->strings["Only one search per minute is permitted for not logged in users."] = "";
-$a->strings["No results."] = "Ei tuloksia.";
-$a->strings["Items tagged with: %s"] = "Kohteet joilla tunnisteet: %s";
-$a->strings["Results for: %s"] = "Tulokset haulla: %s";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "";
 $a->strings["Tag removed"] = "Tägi poistettiin";
 $a->strings["Remove Item Tag"] = "Poista tägi";
 $a->strings["Select a tag to remove: "] = "Valitse tägi poistamista varten:";
@@ -449,63 +438,6 @@ $a->strings["Contact not found."] = "Kontaktia ei ole.";
 $a->strings["Friend suggestion sent."] = "Ystäväehdotus lähetettiin.";
 $a->strings["Suggest Friends"] = "Ehdota ystäviä";
 $a->strings["Suggest a friend for %s"] = "Ehdota ystävää ystävälle %s";
-$a->strings["Personal Notes"] = "Henkilökohtaiset tiedot";
-$a->strings["Photo Albums"] = "Valokuva-albumit";
-$a->strings["Recent Photos"] = "Viimeaikaisia kuvia";
-$a->strings["Upload New Photos"] = "Lähetä uusia kuvia";
-$a->strings["everybody"] = "kaikki";
-$a->strings["Contact information unavailable"] = "Kontaktin tietoja ei saatavilla";
-$a->strings["Album not found."] = "Albumia ei ole.";
-$a->strings["Delete Album"] = "Poista albumi";
-$a->strings["Do you really want to delete this photo album and all its photos?"] = "Haluatko varmasti poistaa tämän albumin ja kaikki sen kuvat?";
-$a->strings["Delete Photo"] = "Poista valokuva";
-$a->strings["Do you really want to delete this photo?"] = "Haluatko varmasti poistaa kuvan?";
-$a->strings["a photo"] = "valokuva";
-$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s merkattiin kuvaan %2\$s ystävän %3\$s toimesta";
-$a->strings["Image upload didn't complete, please try again"] = "Kuvan lataus ei onnistunut, yritä uudelleen";
-$a->strings["Image file is missing"] = "Kuvatiedosto puuttuu";
-$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "";
-$a->strings["Image file is empty."] = "Kuvatiedosto on tyhjä.";
-$a->strings["No photos selected"] = "Ei valittuja kuvia";
-$a->strings["Access to this item is restricted."] = "Pääsy kohteeseen on rajoitettu.";
-$a->strings["Upload Photos"] = "Lähetä kuvia";
-$a->strings["New album name: "] = "Albumin uusi nimi: ";
-$a->strings["or existing album name: "] = "tai olemassaolevan albumin nimi: ";
-$a->strings["Do not show a status post for this upload"] = "Älä näytä tilaviestiä tälle lähetykselle";
-$a->strings["Permissions"] = "Käyttöoikeudet";
-$a->strings["Show to Groups"] = "Näytä ryhmille";
-$a->strings["Show to Contacts"] = "Näytä kontakteille";
-$a->strings["Edit Album"] = "Muokkaa albumia";
-$a->strings["Show Newest First"] = "Näytä uusin ensin";
-$a->strings["Show Oldest First"] = "Näytä vanhin ensin";
-$a->strings["View Photo"] = "Näytä kuva";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Estetty. Tämän kohteen käyttöä on saatettu rajoittaa.";
-$a->strings["Photo not available"] = "Kuva ei ole saatavilla";
-$a->strings["View photo"] = "Näytä kuva";
-$a->strings["Edit photo"] = "Muokkaa kuvaa";
-$a->strings["Use as profile photo"] = "Käytä profiilikuvana";
-$a->strings["Private Message"] = "Yksityisviesti";
-$a->strings["View Full Size"] = "Näytä täysikokoisena";
-$a->strings["Tags: "] = "Merkinnät:";
-$a->strings["[Remove any tag]"] = "[Poista mikä tahansa merkintä]";
-$a->strings["New album name"] = "Uusi nimi albumille";
-$a->strings["Caption"] = "Kuvateksti";
-$a->strings["Add a Tag"] = "Lisää merkintä";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Esimerkki: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
-$a->strings["Do not rotate"] = "Älä kierrä";
-$a->strings["Rotate CW (right)"] = "Käännä oikealle";
-$a->strings["Rotate CCW (left)"] = "Käännä vasemmalle";
-$a->strings["I like this (toggle)"] = "Tykkään tästä (vaihda)";
-$a->strings["I don't like this (toggle)"] = "En tykkää tästä (vaihda)";
-$a->strings["This is you"] = "Tämä olet sinä";
-$a->strings["Comment"] = "Kommentti";
-$a->strings["Map"] = "Kartta";
-$a->strings["View Album"] = "Näytä albumi";
-$a->strings["Do you really want to delete this video?"] = "Haluatko varmasti poistaa tämän videon?";
-$a->strings["Delete Video"] = "Poista video";
-$a->strings["No videos selected"] = "Ei videoita valittuna";
-$a->strings["Recent Videos"] = "Viimeisimmät videot";
-$a->strings["Upload New Videos"] = "Lataa uusia videoita";
 $a->strings["Access to this profile has been restricted."] = "Pääsy tähän profiiliin on rajoitettu";
 $a->strings["Events"] = "Tapahtumat";
 $a->strings["View"] = "Katso";
@@ -605,6 +537,7 @@ $a->strings["Only show archived contacts"] = "Näytä vain arkistoidut henkilöt
 $a->strings["Hidden"] = "Piilotettu";
 $a->strings["Only show hidden contacts"] = "Näytä vain piilotetut henkilöt";
 $a->strings["Search your contacts"] = "Etsi henkilöitä";
+$a->strings["Results for: %s"] = "Tulokset haulla: %s";
 $a->strings["Find"] = "Etsi";
 $a->strings["Update"] = "Päivitä";
 $a->strings["Archive"] = "Arkistoi";
@@ -619,6 +552,7 @@ $a->strings["Advanced Contact Settings"] = "Kontakti-lisäasetukset";
 $a->strings["Mutual Friendship"] = "Yhteinen kaveruus";
 $a->strings["is a fan of yours"] = "on fanisi";
 $a->strings["you are a fan of"] = "fanitat";
+$a->strings["This is you"] = "Tämä olet sinä";
 $a->strings["Toggle Blocked status"] = "Estetty tila päälle/pois";
 $a->strings["Toggle Ignored status"] = "Sivuuta/seuraa";
 $a->strings["Toggle Archive status"] = "Arkistotila päälle/pois";
@@ -637,22 +571,6 @@ $a->strings["Existing Page Delegates"] = "Sivun valtuutetut";
 $a->strings["Potential Delegates"] = "Mahdolliset valtuutetut";
 $a->strings["Add"] = "Lisää";
 $a->strings["No entries."] = "Ei kohteita.";
-$a->strings["Event can not end before it has started."] = "Tapahtuma ei voi päättyä ennen kuin on alkanut.";
-$a->strings["Event title and start time are required."] = "Tapahtuman nimi ja alkamisaika vaaditaan.";
-$a->strings["Create New Event"] = "Luo uusi tapahtuma";
-$a->strings["Event details"] = "Tapahtuman tiedot";
-$a->strings["Starting date and Title are required."] = "Aloituspvm ja otsikko vaaditaan.";
-$a->strings["Event Starts:"] = "Tapahtuma alkaa:";
-$a->strings["Required"] = "Vaaditaan";
-$a->strings["Finish date/time is not known or not relevant"] = "Päättymispvm ja kellonaika ei ole tiedossa tai niillä ei ole merkitystä";
-$a->strings["Event Finishes:"] = "Tapahtuma päättyy:";
-$a->strings["Adjust for viewer timezone"] = "Ota huomioon katsojan aikavyöhyke";
-$a->strings["Description:"] = "Kuvaus:";
-$a->strings["Title:"] = "Otsikko:";
-$a->strings["Share this event"] = "Jaa tämä tapahtuma";
-$a->strings["Basic"] = "";
-$a->strings["Failed to remove event"] = "Tapahtuman poisto epäonnistui";
-$a->strings["Event removed"] = "Tapahtuma poistettu";
 $a->strings["You must be logged in to use this module"] = "Sinun pitää kirjautua sisään, jotta voit käyttää tätä moduulia";
 $a->strings["Source URL"] = "Lähde URL";
 $a->strings["Post successful."] = "Viestin lähetys onnistui.";
@@ -739,13 +657,6 @@ $a->strings["Source text"] = "Lähdeteksti";
 $a->strings["BBCode"] = "BBCode";
 $a->strings["Markdown"] = "Markdown";
 $a->strings["HTML"] = "HTML";
-$a->strings["Community option not available."] = "Yhteisö vaihtoehto ei saatavilla.";
-$a->strings["Not available."] = "Ei saatavilla.";
-$a->strings["Local Community"] = "Paikallinen yhteisö";
-$a->strings["Posts from local users on this server"] = "Tämän palvelimen julkaisut";
-$a->strings["Global Community"] = "Maailmanlaajuinen yhteisö";
-$a->strings["Posts from users of the whole federated network"] = "Maailmanlaajuisen verkon julkaisut";
-$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["This is Friendica, version"] = "Tämä on Friendica, versio";
 $a->strings["running at web location"] = "käynnissä osoitteessa";
 $a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "Vieraile osoitteessa <a href=\"https://friendi.ca\">Friendi.ca</a> saadaksesi lisätietoja Friendica- projektista.";
@@ -780,29 +691,6 @@ $a->strings["You are cordially invited to join me and other close friends on Fri
 $a->strings["You will need to supply this invitation code: \$invite_code"] = "";
 $a->strings["Once you have registered, please connect with me via my profile page at:"] = "Kun olet rekisteröitynyt, lähetä minulle kaverikutsun profiilisivuni kautta:";
 $a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "";
-$a->strings["add"] = "lisää";
-$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
-	0 => "",
-	1 => "",
-];
-$a->strings["Messages in this group won't be send to these receivers."] = "";
-$a->strings["No such group"] = "Ryhmä ei ole olemassa";
-$a->strings["Group is empty"] = "Ryhmä on tyhjä";
-$a->strings["Group: %s"] = "Ryhmä: %s";
-$a->strings["Private messages to this person are at risk of public disclosure."] = "Yksityisviestit lähetetty tälle henkilölle saattaa näkyä muillekin.";
-$a->strings["Invalid contact."] = "Virheellinen kontakti.";
-$a->strings["Commented Order"] = "Järjestä viimeisimpien kommenttien mukaan";
-$a->strings["Sort by Comment Date"] = "Kommentit päivämäärän mukaan";
-$a->strings["Posted Order"] = "Järjestä julkaisupäivämäärän mukaan";
-$a->strings["Sort by Post Date"] = "Julkaisut päivämäärän mukaan";
-$a->strings["Personal"] = "Henkilökohtainen";
-$a->strings["Posts that mention or involve you"] = "Julkaisut jotka liittyvät sinuun";
-$a->strings["New"] = "Uusi";
-$a->strings["Activity Stream - by date"] = "";
-$a->strings["Shared Links"] = "Jaetut linkit";
-$a->strings["Interesting Links"] = "Kiinnostavat linkit";
-$a->strings["Starred"] = "Tähtimerkitty";
-$a->strings["Favourite Posts"] = "Lempijulkaisut";
 $a->strings["Contact settings applied."] = "Kontaktiasetukset tallennettu.";
 $a->strings["Contact update failed."] = "Kontaktipäivitys epäonnistui.";
 $a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>VAROITUS: Tämä on erittäin vaativaa</strong> ja jos kirjoitat virheellisiä tietoja, viestintäsi tämän henkilön kanssa voi lakata toimimasta.";
@@ -865,7 +753,7 @@ $a->strings["Conversation removed."] = "Keskustelu poistettu.";
 $a->strings["No messages."] = "Ei viestejä.";
 $a->strings["Message not available."] = "Viesti ei saatavilla.";
 $a->strings["Delete message"] = "Poista viesti";
-$a->strings["D, d M Y - g:i A"] = "";
+$a->strings["D, d M Y - g:i A"] = "D, j.n.Y - H:i";
 $a->strings["Delete conversation"] = "Poista keskustelu";
 $a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "";
 $a->strings["Send Reply"] = "Lähetä vastaus";
@@ -876,24 +764,6 @@ $a->strings["%d message"] = [
 	0 => "%d viesti",
 	1 => "%d viestiä",
 ];
-$a->strings["Group created."] = "Ryhmä luotu.";
-$a->strings["Could not create group."] = "Ryhmää ei voitu luoda.";
-$a->strings["Group not found."] = "Ryhmää ei löytynyt.";
-$a->strings["Group name changed."] = "Ryhmän nimi muutettu.";
-$a->strings["Save Group"] = "Tallenna ryhmä";
-$a->strings["Create a group of contacts/friends."] = "Luo kontakti/kaveriryhmä";
-$a->strings["Group Name: "] = "Ryhmän nimi:";
-$a->strings["Group removed."] = "Ryhmä poistettu.";
-$a->strings["Unable to remove group."] = "Ryhmää ei voida poistaa.";
-$a->strings["Delete Group"] = "Poista ryhmä";
-$a->strings["Group Editor"] = "Ryhmien muokkausta";
-$a->strings["Edit Group Name"] = "Muokkaa ryhmän nimeä";
-$a->strings["Members"] = "Jäsenet";
-$a->strings["Remove contact from group"] = "Poista kontakti ryhmästä";
-$a->strings["Add contact to group"] = "Lisää kontakti ryhmään";
-$a->strings["OpenID protocol error. No ID returned."] = "OpenID -protokollavirhe. Tunnusta ei vastaanotettu.";
-$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Käyttäjätiliä ei löytynyt. Rekisteröityminen OpenID:n kautta ei ole sallittua tällä sivustolla.";
-$a->strings["Login failed."] = "Kirjautuminen epäonnistui";
 $a->strings["Theme settings updated."] = "Teeman asetukset päivitetty.";
 $a->strings["Information"] = "Tietoja";
 $a->strings["Overview"] = "Yleiskatsaus";
@@ -1083,6 +953,7 @@ $a->strings["Block public"] = "Estä vierailijat";
 $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "";
 $a->strings["Force publish"] = "";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "";
+$a->strings["Enabling this may violate privacy laws like the GDPR"] = "";
 $a->strings["Global directory URL"] = "Maailmanlaajuisen hakemiston URL-osoite";
 $a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "";
 $a->strings["Private posts by default for new users"] = "";
@@ -1164,7 +1035,7 @@ $a->strings["If you have a restricted system where the webserver can't access th
 $a->strings["Base path to installation"] = "Asennuksen peruspolku";
 $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."] = "";
 $a->strings["Disable picture proxy"] = "";
-$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "";
+$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth."] = "";
 $a->strings["Only search in tags"] = "Tunnistehaku";
 $a->strings["On large systems the text search can slow down the system extremely."] = "";
 $a->strings["New base url"] = "Uusi perusosoite";
@@ -1284,6 +1155,14 @@ $a->strings["Off"] = "Pois päältä";
 $a->strings["On"] = "Päällä";
 $a->strings["Lock feature %s"] = "Lukitse ominaisuus %s";
 $a->strings["Manage Additional Features"] = "Hallitse lisäominaisuudet";
+$a->strings["Community option not available."] = "Yhteisö vaihtoehto ei saatavilla.";
+$a->strings["Not available."] = "Ei saatavilla.";
+$a->strings["Local Community"] = "Paikallinen yhteisö";
+$a->strings["Posts from local users on this server"] = "Tämän palvelimen julkaisut";
+$a->strings["Global Community"] = "Maailmanlaajuinen yhteisö";
+$a->strings["Posts from users of the whole federated network"] = "Maailmanlaajuisen verkon julkaisut";
+$a->strings["No results."] = "Ei tuloksia.";
+$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."] = "Profiilia ei löytynyt.";
 $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."] = "Etäsivuston vastaus oli epäselvä.";
@@ -1337,12 +1216,70 @@ $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."] = " - älä käytä tätä lomaketta. Kirjoita sen sijaan %s Diaspora-hakupalkkiisi.";
+$a->strings["Event can not end before it has started."] = "Tapahtuma ei voi päättyä ennen kuin on alkanut.";
+$a->strings["Event title and start time are required."] = "Tapahtuman nimi ja alkamisaika vaaditaan.";
+$a->strings["Create New Event"] = "Luo uusi tapahtuma";
+$a->strings["Event details"] = "Tapahtuman tiedot";
+$a->strings["Starting date and Title are required."] = "Aloituspvm ja otsikko vaaditaan.";
+$a->strings["Event Starts:"] = "Tapahtuma alkaa:";
+$a->strings["Required"] = "Vaaditaan";
+$a->strings["Finish date/time is not known or not relevant"] = "Päättymispvm ja kellonaika ei ole tiedossa tai niillä ei ole merkitystä";
+$a->strings["Event Finishes:"] = "Tapahtuma päättyy:";
+$a->strings["Adjust for viewer timezone"] = "Ota huomioon katsojan aikavyöhyke";
+$a->strings["Description:"] = "Kuvaus:";
+$a->strings["Title:"] = "Otsikko:";
+$a->strings["Share this event"] = "Jaa tämä tapahtuma";
+$a->strings["Basic"] = "";
+$a->strings["Permissions"] = "Käyttöoikeudet";
+$a->strings["Failed to remove event"] = "Tapahtuman poisto epäonnistui";
+$a->strings["Event removed"] = "Tapahtuma poistettu";
+$a->strings["Group created."] = "Ryhmä luotu.";
+$a->strings["Could not create group."] = "Ryhmää ei voitu luoda.";
+$a->strings["Group not found."] = "Ryhmää ei löytynyt.";
+$a->strings["Group name changed."] = "Ryhmän nimi muutettu.";
+$a->strings["Save Group"] = "Tallenna ryhmä";
+$a->strings["Create a group of contacts/friends."] = "Luo kontakti/kaveriryhmä";
+$a->strings["Group Name: "] = "Ryhmän nimi:";
+$a->strings["Group removed."] = "Ryhmä poistettu.";
+$a->strings["Unable to remove group."] = "Ryhmää ei voida poistaa.";
+$a->strings["Delete Group"] = "Poista ryhmä";
+$a->strings["Group Editor"] = "Ryhmien muokkausta";
+$a->strings["Edit Group Name"] = "Muokkaa ryhmän nimeä";
+$a->strings["Members"] = "Jäsenet";
+$a->strings["Group is empty"] = "Ryhmä on tyhjä";
+$a->strings["Remove contact from group"] = "Poista kontakti ryhmästä";
+$a->strings["Add contact to group"] = "Lisää kontakti ryhmään";
 $a->strings["Unable to locate original post."] = "Alkuperäinen julkaisu ei löydy.";
 $a->strings["Empty post discarded."] = "Tyhjä julkaisu hylätty.";
 $a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Viestin lähetti %s Friendica sosiaaliverkoston kautta.";
 $a->strings["You may visit them online at %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 julkaisi päivityksen.";
+$a->strings["Remove term"] = "Poista kohde";
+$a->strings["Saved Searches"] = "Tallennetut haut";
+$a->strings["add"] = "lisää";
+$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
+	0 => "",
+	1 => "",
+];
+$a->strings["Messages in this group won't be send to these receivers."] = "";
+$a->strings["No such group"] = "Ryhmä ei ole olemassa";
+$a->strings["Group: %s"] = "Ryhmä: %s";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "Yksityisviestit lähetetty tälle henkilölle saattaa näkyä muillekin.";
+$a->strings["Invalid contact."] = "Virheellinen kontakti.";
+$a->strings["Commented Order"] = "Järjestä viimeisimpien kommenttien mukaan";
+$a->strings["Sort by Comment Date"] = "Kommentit päivämäärän mukaan";
+$a->strings["Posted Order"] = "Järjestä julkaisupäivämäärän mukaan";
+$a->strings["Sort by Post Date"] = "Julkaisut päivämäärän mukaan";
+$a->strings["Personal"] = "Henkilökohtainen";
+$a->strings["Posts that mention or involve you"] = "Julkaisut jotka liittyvät sinuun";
+$a->strings["New"] = "Uusi";
+$a->strings["Activity Stream - by date"] = "";
+$a->strings["Shared Links"] = "Jaetut linkit";
+$a->strings["Interesting Links"] = "Kiinnostavat linkit";
+$a->strings["Starred"] = "Tähtimerkitty";
+$a->strings["Favourite Posts"] = "Lempijulkaisut";
+$a->strings["Personal Notes"] = "Henkilökohtaiset tiedot";
 $a->strings["Invalid request identifier."] = "Virheellinen pyyntötunniste.";
 $a->strings["Discard"] = "Hylkää";
 $a->strings["Notifications"] = "Huomautukset";
@@ -1367,6 +1304,58 @@ $a->strings["No introductions."] = "Ei esittelyjä.";
 $a->strings["Show unread"] = "Näytä lukemattomat";
 $a->strings["Show all"] = "Näytä kaikki";
 $a->strings["No more %s notifications."] = "Ei muita %s ilmoituksia.";
+$a->strings["OpenID protocol error. No ID returned."] = "OpenID -protokollavirhe. Tunnusta ei vastaanotettu.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Käyttäjätiliä ei löytynyt. Rekisteröityminen OpenID:n kautta ei ole sallittua tällä sivustolla.";
+$a->strings["Login failed."] = "Kirjautuminen epäonnistui";
+$a->strings["Photo Albums"] = "Valokuva-albumit";
+$a->strings["Recent Photos"] = "Viimeaikaisia kuvia";
+$a->strings["Upload New Photos"] = "Lähetä uusia kuvia";
+$a->strings["everybody"] = "kaikki";
+$a->strings["Contact information unavailable"] = "Kontaktin tietoja ei saatavilla";
+$a->strings["Album not found."] = "Albumia ei ole.";
+$a->strings["Delete Album"] = "Poista albumi";
+$a->strings["Do you really want to delete this photo album and all its photos?"] = "Haluatko varmasti poistaa tämän albumin ja kaikki sen kuvat?";
+$a->strings["Delete Photo"] = "Poista valokuva";
+$a->strings["Do you really want to delete this photo?"] = "Haluatko varmasti poistaa kuvan?";
+$a->strings["a photo"] = "valokuva";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s merkattiin kuvaan %2\$s ystävän %3\$s toimesta";
+$a->strings["Image upload didn't complete, please try again"] = "Kuvan lataus ei onnistunut, yritä uudelleen";
+$a->strings["Image file is missing"] = "Kuvatiedosto puuttuu";
+$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "";
+$a->strings["Image file is empty."] = "Kuvatiedosto on tyhjä.";
+$a->strings["No photos selected"] = "Ei valittuja kuvia";
+$a->strings["Access to this item is restricted."] = "Pääsy kohteeseen on rajoitettu.";
+$a->strings["Upload Photos"] = "Lähetä kuvia";
+$a->strings["New album name: "] = "Albumin uusi nimi: ";
+$a->strings["or existing album name: "] = "tai olemassaolevan albumin nimi: ";
+$a->strings["Do not show a status post for this upload"] = "Älä näytä tilaviestiä tälle lähetykselle";
+$a->strings["Show to Groups"] = "Näytä ryhmille";
+$a->strings["Show to Contacts"] = "Näytä kontakteille";
+$a->strings["Edit Album"] = "Muokkaa albumia";
+$a->strings["Show Newest First"] = "Näytä uusin ensin";
+$a->strings["Show Oldest First"] = "Näytä vanhin ensin";
+$a->strings["View Photo"] = "Näytä kuva";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Estetty. Tämän kohteen käyttöä on saatettu rajoittaa.";
+$a->strings["Photo not available"] = "Kuva ei ole saatavilla";
+$a->strings["View photo"] = "Näytä kuva";
+$a->strings["Edit photo"] = "Muokkaa kuvaa";
+$a->strings["Use as profile photo"] = "Käytä profiilikuvana";
+$a->strings["Private Message"] = "Yksityisviesti";
+$a->strings["View Full Size"] = "Näytä täysikokoisena";
+$a->strings["Tags: "] = "Merkinnät:";
+$a->strings["[Remove any tag]"] = "[Poista mikä tahansa merkintä]";
+$a->strings["New album name"] = "Uusi nimi albumille";
+$a->strings["Caption"] = "Kuvateksti";
+$a->strings["Add a Tag"] = "Lisää merkintä";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Esimerkki: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
+$a->strings["Do not rotate"] = "Älä kierrä";
+$a->strings["Rotate CW (right)"] = "Käännä oikealle";
+$a->strings["Rotate CCW (left)"] = "Käännä vasemmalle";
+$a->strings["I like this (toggle)"] = "Tykkään tästä (vaihda)";
+$a->strings["I don't like this (toggle)"] = "En tykkää tästä (vaihda)";
+$a->strings["Comment"] = "Kommentti";
+$a->strings["Map"] = "Kartta";
+$a->strings["View Album"] = "Näytä albumi";
 $a->strings["Requested profile is not available."] = "Pyydettyä profiilia ei saatavilla.";
 $a->strings["%s's timeline"] = "%s: aikajana";
 $a->strings["%s's posts"] = "%s: julkaisut";
@@ -1479,6 +1468,10 @@ $a->strings["The user id is %d"] = "Käyttäjätunnus on %d";
 $a->strings["Remove My Account"] = "Poista tilini";
 $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Tämä poistaa käyttäjätilisi pysyvästi. Poistoa ei voi perua myöhemmin.";
 $a->strings["Please enter your password for verification:"] = "Syötä salasanasi varmistusta varten:";
+$a->strings["Only logged in users are permitted to perform a search."] = "";
+$a->strings["Too Many Requests"] = "Liian monta pyyntöä";
+$a->strings["Only one search per minute is permitted for not logged in users."] = "";
+$a->strings["Items tagged with: %s"] = "Kohteet joilla tunnisteet: %s";
 $a->strings["Account"] = "Tili";
 $a->strings["Display"] = "Ulkonäkö";
 $a->strings["Social Networks"] = "Sosiaalinen media";
@@ -1569,7 +1562,7 @@ $a->strings["Don't show notices"] = "";
 $a->strings["Infinite scroll"] = "Loputon selaaminen";
 $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["Bandwith Saver Mode"] = "Kaistanleveyssäästömoodi";
+$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."] = "";
@@ -1594,13 +1587,13 @@ $a->strings["Requires manual approval of contact requests."] = "";
 $a->strings["OpenID:"] = "OpenID:";
 $a->strings["(Optional) Allow this OpenID to login to this account."] = "";
 $a->strings["Publish your default profile in your local site directory?"] = "Julkaise oletusprofiilisi tämän sivuston paikallisluettelossa?";
-$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["Publish your default profile in the global social directory?"] = "Julkaise oletusprofiilisi maailmanlaajuisessa sosiaaliluettelossa?";
 $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?"] = "Julkaise oletusprofiilisi maailmanlaajuisessa sosiaaliluettelossa?";
+$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. Disables posting public messages to Diaspora and other networks."] = "";
+$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?"] = "Anna kavereiden julkaista profiilisivullasi?";
 $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?"] = "Anna kavereiden lisätä tunnisteita julkaisuusi?";
@@ -1664,6 +1657,13 @@ $a->strings["Change the behaviour of this account for special situations"] = "";
 $a->strings["Relocate"] = "Uudelleensijoitus";
 $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"] = "";
+$a->strings["[Embedded content - reload page to view]"] = "[Upotettu sisältö - näet sen päivittämällä sivun]";
+$a->strings["Do you really want to delete this video?"] = "Haluatko varmasti poistaa tämän videon?";
+$a->strings["Delete Video"] = "Poista video";
+$a->strings["No videos selected"] = "Ei videoita valittuna";
+$a->strings["Recent Videos"] = "Viimeisimmät videot";
+$a->strings["Upload New Videos"] = "Lataa uusia videoita";
 $a->strings["default"] = "oletus";
 $a->strings["greenzero"] = "greenzero";
 $a->strings["purplezero"] = "purplezero";
@@ -2026,6 +2026,32 @@ $a->strings["Errors encountered performing database changes: "] = "Tietokannan m
 $a->strings["%s: Database update"] = "%s: Tietokantapäivitys";
 $a->strings["%s: updating %s table."] = "%s: päivitetään %s-taulukkoa.";
 $a->strings["[no subject]"] = "[ei aihetta]";
+$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."] = "";
+$a->strings["Default privacy group for new contacts"] = "Oletusryhmä uusille kontakteille";
+$a->strings["Everybody"] = "Kaikki";
+$a->strings["edit"] = "muokkaa";
+$a->strings["Edit group"] = "Muokkaa ryhmää";
+$a->strings["Contacts not in any group"] = "Kontaktit ilman ryhmää";
+$a->strings["Create a new group"] = "Luo uusi ryhmä";
+$a->strings["Edit groups"] = "Muokkaa ryhmiä";
+$a->strings["Drop Contact"] = "Poista kontakti";
+$a->strings["Organisation"] = "Järjestö";
+$a->strings["News"] = "Uutiset";
+$a->strings["Forum"] = "Keskustelupalsta";
+$a->strings["Connect URL missing."] = "Yhteys URL-linkki puuttuu.";
+$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Kontaktia ei pystytty lisäämään. Tarkista verkkoasetukset omista asetuksistasi (Settings -> Social Networks).";
+$a->strings["This site is not configured to allow communications with other networks."] = "Tämä sivusto ei salli yhteyksiä muiden verkkojen kanssa..";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "Yhteensopivia viestintäprotokolleja tai syötteitä ei löytynyt.";
+$a->strings["The profile address specified does not provide adequate information."] = "Annettu profiiliosoite ei sisällä riittävästi tietoa.";
+$a->strings["An author or name was not found."] = "Julkaisija tai nimi puuttuu.";
+$a->strings["No browser URL could be matched to this address."] = "";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "";
+$a->strings["Use mailto: in front of address to force email check."] = "Käytä \"mailto:\" osoitteen edessä pakottaaksesi sähköpostin tarkastuksen.";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Profiilin osoite kuuluu verkkoon, joka on poistettu tältä sivustolta.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Rajoitettu profiili. Tämä henkilö ei pysty/tule saamaan suoria/henkilökohtaisia ilmoituksia sinulta.";
+$a->strings["Unable to retrieve contact information."] = "Kontaktin tietoja ei voitu hakea.";
+$a->strings["%s's birthday"] = "%s: syntymäpäivä";
+$a->strings["Happy Birthday %s"] = "Hyvää syntymäpäivää %s";
 $a->strings["Starts:"] = "Alkaa:";
 $a->strings["Finishes:"] = "Päättyy:";
 $a->strings["all-day"] = "koko päivä";
@@ -2036,18 +2062,13 @@ $a->strings["l, F j"] = "l, F j";
 $a->strings["Edit event"] = "Muokkaa tapahtumaa";
 $a->strings["Duplicate event"] = "Monista tapahtuma";
 $a->strings["Delete event"] = "Poista tapahtuma";
-$a->strings["D g:i A"] = "D g:i A";
-$a->strings["g:i A"] = "g:i A";
+$a->strings["D g:i A"] = "D H:i";
+$a->strings["g:i A"] = "H:i";
 $a->strings["Show map"] = "Näytä kartta";
 $a->strings["Hide map"] = "Piilota kartta";
-$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."] = "";
-$a->strings["Default privacy group for new contacts"] = "Oletusryhmä uusille kontakteille";
-$a->strings["Everybody"] = "Kaikki";
-$a->strings["edit"] = "muokkaa";
-$a->strings["Edit group"] = "Muokkaa ryhmää";
-$a->strings["Contacts not in any group"] = "Kontaktit ilman ryhmää";
-$a->strings["Create a new group"] = "Luo uusi ryhmä";
-$a->strings["Edit groups"] = "Muokkaa ryhmiä";
+$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s osallistuu tapahtumaan %3\$s, jonka järjestää %2\$s";
+$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s ei osallistu tapahtumaan %3\$s, jonka järjestää %2\$s";
+$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s ehkä osallistuu tapahtumaan %3\$s, jonka järjestää %2\$s";
 $a->strings["Requested account is not available."] = "Pyydetty käyttäjätili ei ole saatavilla.";
 $a->strings["Edit profile"] = "Muokkaa profiilia";
 $a->strings["Atom feed"] = "Atom -syöte";
@@ -2102,33 +2123,12 @@ $a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Yo
 $a->strings["Registration at %s"] = "Rekisteröityminen kohteessa %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\tHei %1\$s,\n\t\t\t\tKiitoksia rekisteröinnistä sivustolle %2\$s. Tilisi on luotu.\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["Drop Contact"] = "Poista kontakti";
-$a->strings["Organisation"] = "Järjestö";
-$a->strings["News"] = "Uutiset";
-$a->strings["Forum"] = "Keskustelupalsta";
-$a->strings["Connect URL missing."] = "Yhteys URL-linkki puuttuu.";
-$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Kontaktia ei pystytty lisäämään. Tarkista verkkoasetukset omista asetuksistasi (Settings -> Social Networks).";
-$a->strings["This site is not configured to allow communications with other networks."] = "Tämä sivusto ei salli yhteyksiä muiden verkkojen kanssa..";
-$a->strings["No compatible communication protocols or feeds were discovered."] = "Yhteensopivia viestintäprotokolleja tai syötteitä ei löytynyt.";
-$a->strings["The profile address specified does not provide adequate information."] = "Annettu profiiliosoite ei sisällä riittävästi tietoa.";
-$a->strings["An author or name was not found."] = "Julkaisija tai nimi puuttuu.";
-$a->strings["No browser URL could be matched to this address."] = "";
-$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "";
-$a->strings["Use mailto: in front of address to force email check."] = "Käytä \"mailto:\" osoitteen edessä pakottaaksesi sähköpostin tarkastuksen.";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Profiilin osoite kuuluu verkkoon, joka on poistettu tältä sivustolta.";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Rajoitettu profiili. Tämä henkilö ei pysty/tule saamaan suoria/henkilökohtaisia ilmoituksia sinulta.";
-$a->strings["Unable to retrieve contact information."] = "Kontaktin tietoja ei voitu hakea.";
-$a->strings["%s's birthday"] = "%s: syntymäpäivä";
-$a->strings["Happy Birthday %s"] = "Hyvää syntymäpäivää %s";
-$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s osallistuu tapahtumaan %3\$s, jonka järjestää %2\$s";
-$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s ei osallistu tapahtumaan %3\$s, jonka järjestää %2\$s";
-$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s ehkä osallistuu tapahtumaan %3\$s, jonka järjestää %2\$s";
+$a->strings["Sharing notification from Diaspora network"] = "Ilmoitus Diaspora -verkosta tapahtuneesta jakamisesta.";
+$a->strings["Attachments:"] = "Liitteitä:";
 $a->strings["%s is now following %s."] = "%s seuraa %s.";
 $a->strings["following"] = "seuraa";
 $a->strings["%s stopped following %s."] = "%s ei enää seuraa %s.";
 $a->strings["stopped following"] = "ei enää seuraa";
-$a->strings["Sharing notification from Diaspora network"] = "Ilmoitus Diaspora -verkosta tapahtuneesta jakamisesta.";
-$a->strings["Attachments:"] = "Liitteitä:";
 $a->strings["(no subject)"] = "(ei aihetta)";
 $a->strings["Logged out."] = "Kirjautunut ulos.";
 $a->strings["Create a New Account"] = "Luo uusi käyttäjätili";
@@ -2145,7 +2145,8 @@ $a->strings["This data is required for communication and is passed on to the nod
 $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"] = "Tietosuojalausunto";
 $a->strings["This entry was edited"] = "Tämä kohde oli muokattu";
-$a->strings["Remove from your stream"] = "Poista virrastasi";
+$a->strings["Delete globally"] = "";
+$a->strings["Remove locally"] = "";
 $a->strings["save to folder"] = "tallenna kansioon";
 $a->strings["I will attend"] = "Osallistun";
 $a->strings["I will not attend"] = "En aio osallistua";
@@ -2182,5 +2183,5 @@ $a->strings["Delete this item?"] = "Poista tämä kohde?";
 $a->strings["show fewer"] = "näytä vähemmän";
 $a->strings["No system theme config value set."] = "";
 $a->strings["toggle mobile"] = "Mobiilisivusto päälle/pois";
-$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "";
 $a->strings["Update %s failed. See error logs."] = "%s päivitys epäonnistui, katso virhelokit.";
+$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "";
diff --git a/view/lang/fr/messages.po b/view/lang/fr/messages.po
index ae80151fb..9035bb0b2 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
diff --git a/view/lang/it/messages.po b/view/lang/it/messages.po
index dbf98b685..2650ef156 100644
--- a/view/lang/it/messages.po
+++ b/view/lang/it/messages.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-20 14:22+0200\n"
-"PO-Revision-Date: 2018-05-28 08:58+0000\n"
+"POT-Creation-Date: 2018-08-07 09:58+0200\n"
+"PO-Revision-Date: 2018-08-13 09:27+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -26,250 +26,724 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/enotify.php:31
+#: 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] "Limite giornaliero di %d messaggio raggiunto. Il messaggio è stato rifiutato"
+msgstr[1] "Limite giornaliero di %d messaggi raggiunto. Il messaggio è stato rifiutato."
+
+#: 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] "Limite settimanale di %d messaggio raggiunto. Il messaggio è stato rifiutato"
+msgstr[1] "Limite settimanale di %d messaggi raggiunto. Il messaggio è stato rifiutato."
+
+#: include/api.php:1166
+#, php-format
+msgid "Monthly posting limit of %d post reached. The post was rejected."
+msgstr "Limite mensile di %d messaggi raggiunto. Il messaggio è stato rifiutato."
+
+#: 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
+#: 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
+msgid "Profile Photos"
+msgstr "Foto del profilo"
+
+#: include/conversation.php:150 include/conversation.php:286
+#: include/text.php:1630
+msgid "event"
+msgstr "l'evento"
+
+#: 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 "stato"
+
+#: 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 "A %1$s piace %3$s di %2$s"
+
+#: include/conversation.php:172
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "A %1$s non piace %3$s di %2$s"
+
+#: include/conversation.php:174
+#, php-format
+msgid "%1$s attends %2$s's %3$s"
+msgstr "%1$s partecipa a %3$s di %2$s"
+
+#: include/conversation.php:176
+#, php-format
+msgid "%1$s doesn't attend %2$s's %3$s"
+msgstr "%1$s non partecipa a %3$s di %2$s"
+
+#: include/conversation.php:178
+#, php-format
+msgid "%1$s attends maybe %2$s's %3$s"
+msgstr "%1$s forse partecipa a %3$s di %2$s"
+
+#: include/conversation.php:213
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr "%1$s e %2$s adesso sono amici"
+
+#: include/conversation.php:254
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr "%1$s ha stuzzicato %2$s"
+
+#: 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 ha taggato %3$s di %2$s con %4$s"
+
+#: include/conversation.php:330
+msgid "post/item"
+msgstr "post/elemento"
+
+#: include/conversation.php:331
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr "%1$s ha segnato il/la %3$s di %2$s come preferito"
+
+#: include/conversation.php:521 mod/photos.php:1477 mod/profiles.php:352
+msgid "Likes"
+msgstr "Mi piace"
+
+#: include/conversation.php:521 mod/photos.php:1477 mod/profiles.php:356
+msgid "Dislikes"
+msgstr "Non mi piace"
+
+#: include/conversation.php:522 include/conversation.php:1481
+#: mod/photos.php:1478
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] "Partecipa"
+msgstr[1] "Partecipano"
+
+#: include/conversation.php:522 mod/photos.php:1478
+msgid "Not attending"
+msgstr "Non partecipa"
+
+#: include/conversation.php:522 mod/photos.php:1478
+msgid "Might attend"
+msgstr "Forse partecipa"
+
+#: include/conversation.php:612 mod/photos.php:1534 src/Object/Post.php:194
+msgid "Select"
+msgstr "Seleziona"
+
+#: 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 "Rimuovi"
+
+#: include/conversation.php:647 src/Object/Post.php:361
+#: src/Object/Post.php:362
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr "Vedi il profilo di %s @ %s"
+
+#: include/conversation.php:659 src/Object/Post.php:349
+msgid "Categories:"
+msgstr "Categorie:"
+
+#: include/conversation.php:660 src/Object/Post.php:350
+msgid "Filed under:"
+msgstr "Archiviato in:"
+
+#: include/conversation.php:667 src/Object/Post.php:375
+#, php-format
+msgid "%s from %s"
+msgstr "%s da %s"
+
+#: include/conversation.php:682
+msgid "View in context"
+msgstr "Vedi nel contesto"
+
+#: 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 "Attendi"
+
+#: include/conversation.php:757
+msgid "remove"
+msgstr "rimuovi"
+
+#: include/conversation.php:761
+msgid "Delete Selected Items"
+msgstr "Cancella elementi selezionati"
+
+#: include/conversation.php:861 view/theme/frio/theme.php:357
+msgid "Follow Thread"
+msgstr "Segui la discussione"
+
+#: include/conversation.php:862 src/Model/Contact.php:728
+msgid "View Status"
+msgstr "Visualizza stato"
+
+#: 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 "Visualizza profilo"
+
+#: include/conversation.php:864 src/Model/Contact.php:730
+msgid "View Photos"
+msgstr "Visualizza foto"
+
+#: include/conversation.php:865 src/Model/Contact.php:731
+msgid "Network Posts"
+msgstr "Post della Rete"
+
+#: include/conversation.php:866 src/Model/Contact.php:732
+msgid "View Contact"
+msgstr "Mostra contatto"
+
+#: include/conversation.php:867 src/Model/Contact.php:734
+msgid "Send PM"
+msgstr "Invia messaggio privato"
+
+#: include/conversation.php:871 src/Model/Contact.php:735
+msgid "Poke"
+msgstr "Stuzzica"
+
+#: 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 "Connetti/segui"
+
+#: include/conversation.php:994
+#, php-format
+msgid "%s likes this."
+msgstr "Piace a %s."
+
+#: include/conversation.php:997
+#, php-format
+msgid "%s doesn't like this."
+msgstr "Non piace a %s."
+
+#: include/conversation.php:1000
+#, php-format
+msgid "%s attends."
+msgstr "%s partecipa."
+
+#: include/conversation.php:1003
+#, php-format
+msgid "%s doesn't attend."
+msgstr "%s non partecipa."
+
+#: include/conversation.php:1006
+#, php-format
+msgid "%s attends maybe."
+msgstr "%s forse partecipa."
+
+#: include/conversation.php:1017
+msgid "and"
+msgstr "e"
+
+#: include/conversation.php:1023
+#, php-format
+msgid "and %d other people"
+msgstr "e altre %d persone"
+
+#: include/conversation.php:1032
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
+msgstr "Piace a <span %1$s>%2$d persone</span>."
+
+#: include/conversation.php:1033
+#, php-format
+msgid "%s like this."
+msgstr "a %s piace."
+
+#: include/conversation.php:1036
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
+msgstr "Non piace a <span %1$s>%2$d persone</span>."
+
+#: include/conversation.php:1037
+#, php-format
+msgid "%s don't like this."
+msgstr "a %s non piace."
+
+#: include/conversation.php:1040
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend"
+msgstr "<span  %1$s>%2$d persone</span> partecipano"
+
+#: include/conversation.php:1041
+#, php-format
+msgid "%s attend."
+msgstr "%s partecipa."
+
+#: include/conversation.php:1044
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't attend"
+msgstr "<span  %1$s>%2$d persone</span> non partecipano"
+
+#: include/conversation.php:1045
+#, php-format
+msgid "%s don't attend."
+msgstr "%s non partecipa."
+
+#: include/conversation.php:1048
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend maybe"
+msgstr "<span %1$s>%2$d persone</span> forse partecipano"
+
+#: include/conversation.php:1049
+#, php-format
+msgid "%s attend maybe."
+msgstr "%s forse partecipano."
+
+#: include/conversation.php:1079 include/conversation.php:1095
+msgid "Visible to <strong>everybody</strong>"
+msgstr "Visibile a <strong>tutti</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 "Inserisci l'indirizzo del link:"
+
+#: include/conversation.php:1081 include/conversation.php:1097
+msgid "Please enter a video link/URL:"
+msgstr "Inserisci un collegamento video / URL:"
+
+#: include/conversation.php:1082 include/conversation.php:1098
+msgid "Please enter an audio link/URL:"
+msgstr "Inserisci un collegamento audio / URL:"
+
+#: include/conversation.php:1083 include/conversation.php:1099
+msgid "Tag term:"
+msgstr "Tag:"
+
+#: include/conversation.php:1084 include/conversation.php:1100
+#: mod/filer.php:34
+msgid "Save to Folder:"
+msgstr "Salva nella Cartella:"
+
+#: include/conversation.php:1085 include/conversation.php:1101
+msgid "Where are you right now?"
+msgstr "Dove sei ora?"
+
+#: include/conversation.php:1086
+msgid "Delete item(s)?"
+msgstr "Cancellare questo elemento/i?"
+
+#: include/conversation.php:1133
+msgid "New Post"
+msgstr "Nuovo Messaggio"
+
+#: include/conversation.php:1136
+msgid "Share"
+msgstr "Condividi"
+
+#: include/conversation.php:1137 mod/editpost.php:101 mod/message.php:261
+#: mod/message.php:428 mod/wallmessage.php:143
+msgid "Upload photo"
+msgstr "Carica foto"
+
+#: include/conversation.php:1138 mod/editpost.php:102
+msgid "upload photo"
+msgstr "carica foto"
+
+#: include/conversation.php:1139 mod/editpost.php:103
+msgid "Attach file"
+msgstr "Allega file"
+
+#: include/conversation.php:1140 mod/editpost.php:104
+msgid "attach file"
+msgstr "allega file"
+
+#: 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 "Inserisci link"
+
+#: include/conversation.php:1142 mod/editpost.php:106
+msgid "web link"
+msgstr "link web"
+
+#: include/conversation.php:1143 mod/editpost.php:107
+msgid "Insert video link"
+msgstr "Inserire collegamento video"
+
+#: include/conversation.php:1144 mod/editpost.php:108
+msgid "video link"
+msgstr "link video"
+
+#: include/conversation.php:1145 mod/editpost.php:109
+msgid "Insert audio link"
+msgstr "Inserisci collegamento audio"
+
+#: include/conversation.php:1146 mod/editpost.php:110
+msgid "audio link"
+msgstr "link audio"
+
+#: include/conversation.php:1147 mod/editpost.php:111
+msgid "Set your location"
+msgstr "La tua posizione"
+
+#: include/conversation.php:1148 mod/editpost.php:112
+msgid "set location"
+msgstr "posizione"
+
+#: include/conversation.php:1149 mod/editpost.php:113
+msgid "Clear browser location"
+msgstr "Rimuovi la localizzazione data dal browser"
+
+#: include/conversation.php:1150 mod/editpost.php:114
+msgid "clear location"
+msgstr "canc. pos."
+
+#: include/conversation.php:1152 mod/editpost.php:129
+msgid "Set title"
+msgstr "Scegli un titolo"
+
+#: include/conversation.php:1154 mod/editpost.php:131
+msgid "Categories (comma-separated list)"
+msgstr "Categorie (lista separata da virgola)"
+
+#: include/conversation.php:1156 mod/editpost.php:116
+msgid "Permission settings"
+msgstr "Impostazioni permessi"
+
+#: include/conversation.php:1157 mod/editpost.php:146
+msgid "permissions"
+msgstr "permessi"
+
+#: include/conversation.php:1166 mod/editpost.php:126
+msgid "Public post"
+msgstr "Messaggio pubblico"
+
+#: 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 "Anteprima"
+
+#: 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 "Annulla"
+
+#: include/conversation.php:1179
+msgid "Post to Groups"
+msgstr "Invia ai Gruppi"
+
+#: include/conversation.php:1180
+msgid "Post to Contacts"
+msgstr "Invia ai Contatti"
+
+#: include/conversation.php:1181
+msgid "Private post"
+msgstr "Post privato"
+
+#: include/conversation.php:1186 mod/editpost.php:144
+#: src/Model/Profile.php:340
+msgid "Message"
+msgstr "Messaggio"
+
+#: include/conversation.php:1187 mod/editpost.php:145
+msgid "Browser"
+msgstr "Browser"
+
+#: include/conversation.php:1452
+msgid "View all"
+msgstr "Mostra tutto"
+
+#: include/conversation.php:1475
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Mi piace"
+msgstr[1] "Mi piace"
+
+#: include/conversation.php:1478
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "Non mi piace"
+msgstr[1] "Non mi piace"
+
+#: include/conversation.php:1484
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] "Non partecipa"
+msgstr[1] "Non partecipano"
+
+#: include/conversation.php:1487 src/Content/ContactSelector.php:123
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] "Indeciso"
+msgstr[1] "Indecisi"
+
+#: include/enotify.php:38
 msgid "Friendica Notification"
 msgstr "Notifica Friendica"
 
-#: include/enotify.php:34
+#: include/enotify.php:41
 msgid "Thank You,"
 msgstr "Grazie,"
 
-#: include/enotify.php:37
-#, php-format
-msgid "%s Administrator"
-msgstr "Amministratore %s"
-
-#: include/enotify.php:39
+#: include/enotify.php:44
 #, php-format
 msgid "%1$s, %2$s Administrator"
 msgstr "%1$s,  amministratore di %2$s"
 
-#: include/enotify.php:95
+#: include/enotify.php:46
+#, php-format
+msgid "%s Administrator"
+msgstr "Amministratore %s"
+
+#: include/enotify.php:109
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
 msgstr "[Friendica:Notifica] Nuovo messaggio privato ricevuto su %s"
 
-#: include/enotify.php:97
+#: include/enotify.php:111
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr "%1$s ti ha inviato un nuovo messaggio privato su %2$s."
 
-#: include/enotify.php:98
+#: include/enotify.php:112
 msgid "a private message"
 msgstr "un messaggio privato"
 
-#: include/enotify.php:98
+#: include/enotify.php:112
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s ti ha inviato %2$s"
 
-#: include/enotify.php:100
+#: include/enotify.php:114
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Visita %s per vedere e/o rispondere ai tuoi messaggi privati."
 
-#: include/enotify.php:138
+#: include/enotify.php:152
 #, php-format
 msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
 msgstr "%1$s ha commentato [url=%2$s]%3$s[/url]"
 
-#: include/enotify.php:146
+#: include/enotify.php:160
 #, php-format
 msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 msgstr "%1$s ha commentato [url=%2$s]%4$s di %3$s[/url]"
 
-#: include/enotify.php:156
+#: include/enotify.php:170
 #, php-format
 msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
 msgstr "%1$s ha commentato un [url=%2$s]tuo %3$s[/url]"
 
-#: include/enotify.php:168
+#: include/enotify.php:182
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[Friendica:Notifica] Commento di %2$s alla conversazione #%1$d"
 
-#: include/enotify.php:170
+#: include/enotify.php:184
 #, php-format
 msgid "%s commented on an item/conversation you have been following."
 msgstr "%s ha commentato un elemento che stavi seguendo."
 
-#: 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: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 "Visita %s per vedere e/o commentare la conversazione"
 
-#: include/enotify.php:180
+#: include/enotify.php:194
 #, php-format
 msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr "[Friendica:Notifica] %s ha scritto sulla tua bacheca"
 
-#: include/enotify.php:182
+#: include/enotify.php:196
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr "%1$s ha scritto sulla tua bacheca su %2$s"
 
-#: include/enotify.php:183
+#: include/enotify.php:197
 #, php-format
 msgid "%1$s posted to [url=%2$s]your wall[/url]"
 msgstr "%1$s ha inviato un messaggio sulla [url=%2$s]tua bacheca[/url]"
 
-#: include/enotify.php:195
+#: include/enotify.php:209
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
 msgstr "[Friendica:Notifica] %s ti ha taggato"
 
-#: include/enotify.php:197
+#: include/enotify.php:211
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$s ti ha taggato su %2$s"
 
-#: include/enotify.php:198
+#: include/enotify.php:212
 #, php-format
 msgid "%1$s [url=%2$s]tagged you[/url]."
 msgstr "%1$s [url=%2$s]ti ha taggato[/url]."
 
-#: include/enotify.php:210
+#: include/enotify.php:224
 #, php-format
 msgid "[Friendica:Notify] %s shared a new post"
 msgstr "[Friendica:Notifica] %s ha condiviso un nuovo messaggio"
 
-#: include/enotify.php:212
+#: include/enotify.php:226
 #, php-format
 msgid "%1$s shared a new post at %2$s"
 msgstr "%1$s ha condiviso un nuovo messaggio su %2$s"
 
-#: include/enotify.php:213
+#: include/enotify.php:227
 #, php-format
 msgid "%1$s [url=%2$s]shared a post[/url]."
 msgstr "%1$s [url=%2$s]ha condiviso un messaggio[/url]."
 
-#: include/enotify.php:225
+#: include/enotify.php:239
 #, php-format
 msgid "[Friendica:Notify] %1$s poked you"
 msgstr "[Friendica:Notifica] %1$s ti ha stuzzicato"
 
-#: include/enotify.php:227
+#: include/enotify.php:241
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr "%1$s ti ha stuzzicato su %2$s"
 
-#: include/enotify.php:228
+#: include/enotify.php:242
 #, php-format
 msgid "%1$s [url=%2$s]poked you[/url]."
 msgstr "%1$s [url=%2$s]ti ha stuzzicato[/url]."
 
-#: include/enotify.php:244
+#: include/enotify.php:259
 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
 msgstr "[Friendica:Notifica] %s ha taggato un tuo messaggio"
 
-#: include/enotify.php:246
+#: include/enotify.php:261
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$s ha taggato il tuo post su %2$s"
 
-#: include/enotify.php:247
+#: include/enotify.php:262
 #, php-format
 msgid "%1$s tagged [url=%2$s]your post[/url]"
 msgstr "%1$s ha taggato [url=%2$s]il tuo post[/url]"
 
-#: include/enotify.php:259
+#: include/enotify.php:274
 msgid "[Friendica:Notify] Introduction received"
 msgstr "[Friendica:Notifica] Hai ricevuto una presentazione"
 
-#: include/enotify.php:261
+#: include/enotify.php:276
 #, php-format
 msgid "You've received an introduction from '%1$s' at %2$s"
 msgstr "Hai ricevuto un'introduzione da '%1$s' su %2$s"
 
-#: include/enotify.php:262
+#: include/enotify.php:277
 #, php-format
 msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
 msgstr "Hai ricevuto [url=%1$s]un'introduzione[/url] da %2$s."
 
-#: include/enotify.php:267 include/enotify.php:313
+#: include/enotify.php:282 include/enotify.php:328
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Puoi visitare il suo profilo presso %s"
 
-#: include/enotify.php:269
+#: include/enotify.php:284
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr "Visita %s per approvare o rifiutare la presentazione."
 
-#: include/enotify.php:277
+#: include/enotify.php:291
 msgid "[Friendica:Notify] A new person is sharing with you"
 msgstr "[Friendica:Notifica] Una nuova persona sta condividendo con te"
 
-#: include/enotify.php:279 include/enotify.php:280
+#: include/enotify.php:293 include/enotify.php:294
 #, php-format
 msgid "%1$s is sharing with you at %2$s"
 msgstr "%1$s sta condividendo con te su %2$s"
 
-#: include/enotify.php:287
+#: include/enotify.php:301
 msgid "[Friendica:Notify] You have a new follower"
 msgstr "[Friendica:Notifica] Una nuova persona ti segue"
 
-#: include/enotify.php:289 include/enotify.php:290
+#: include/enotify.php:303 include/enotify.php:304
 #, php-format
 msgid "You have a new follower at %2$s : %1$s"
 msgstr "Un nuovo utente ha iniziato a seguirti su %2$s : %1$s"
 
-#: include/enotify.php:302
+#: include/enotify.php:317
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr "[Friendica:Notifica] Hai ricevuto un suggerimento di amicizia"
 
-#: include/enotify.php:304
+#: include/enotify.php:319
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "Hai ricevuto un suggerimento di amicizia da '%1$s' su %2$s"
 
-#: include/enotify.php:305
+#: include/enotify.php:320
 #, php-format
 msgid ""
 "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 msgstr "Hai ricevuto [url=%1$s]un suggerimento di amicizia[/url] per %2$s su %3$s"
 
-#: include/enotify.php:311
+#: include/enotify.php:326
 msgid "Name:"
 msgstr "Nome:"
 
-#: include/enotify.php:312
+#: include/enotify.php:327
 msgid "Photo:"
 msgstr "Foto:"
 
-#: include/enotify.php:315
+#: include/enotify.php:330
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Visita %s per approvare o rifiutare il suggerimento."
 
-#: include/enotify.php:323 include/enotify.php:338
+#: include/enotify.php:338 include/enotify.php:353
 msgid "[Friendica:Notify] Connection accepted"
 msgstr "[Friendica:Notifica] Connessione accettata"
 
-#: include/enotify.php:325 include/enotify.php:340
+#: include/enotify.php:340 include/enotify.php:355
 #, php-format
 msgid "'%1$s' has accepted your connection request at %2$s"
 msgstr "'%1$s' ha accettato la tua richiesta di connessione su %2$s"
 
-#: include/enotify.php:326 include/enotify.php:341
+#: include/enotify.php:341 include/enotify.php:356
 #, php-format
 msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
 msgstr "%2$s ha accettato la tua [url=%1$s]richiesta di connessione[/url]"
 
-#: include/enotify.php:331
+#: include/enotify.php:346
 msgid ""
 "You are now mutual friends and may exchange status updates, photos, and "
 "email without restriction."
 msgstr "Ora siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto e messaggi privati senza restrizioni."
 
-#: include/enotify.php:333
+#: include/enotify.php:348
 #, php-format
 msgid "Please visit %s if you wish to make any changes to this relationship."
 msgstr "Visita %s se vuoi modificare questa relazione."
 
-#: include/enotify.php:346
+#: include/enotify.php:361
 #, php-format
 msgid ""
 "'%1$s' has chosen to accept you a fan, which restricts some forms of "
@@ -278,962 +752,445 @@ msgid ""
 "automatically."
 msgstr "'%1$s' ha scelto di accettarti come \"fan\", il che limita alcune forme di comunicazione, come i messaggi privati, e alcune possibilità di interazione col profilo. Se è una pagina di una comunità o di una celebrità, queste impostazioni sono state applicate automaticamente."
 
-#: include/enotify.php:348
+#: 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' può scegliere di estendere questa relazione in una relazione più permissiva in futuro."
 
-#: include/enotify.php:350
+#: include/enotify.php:365
 #, php-format
 msgid "Please visit %s  if you wish to make any changes to this relationship."
 msgstr "Visita %s se desideri modificare questo collegamento."
 
-#: include/enotify.php:360 mod/removeme.php:44
+#: include/enotify.php:375 mod/removeme.php:47
 msgid "[Friendica System Notify]"
 msgstr "[Notifica di Sistema di Friendica]"
 
-#: include/enotify.php:360
+#: include/enotify.php:375
 msgid "registration request"
 msgstr "richiesta di registrazione"
 
-#: include/enotify.php:362
+#: include/enotify.php:377
 #, php-format
 msgid "You've received a registration request from '%1$s' at %2$s"
 msgstr "Hai ricevuto una richiesta di registrazione da '%1$s' su %2$s"
 
-#: include/enotify.php:363
+#: include/enotify.php:378
 #, php-format
 msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
 msgstr "Hai ricevuto una [url=%1$s]richiesta di registrazione[/url] da %2$s."
 
-#: include/enotify.php:368
+#: include/enotify.php:383
 #, php-format
-msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
-msgstr "Nome completo: %1$s\nIndirizzo del sito: %2$s\nNome utente: %3$s (%4$s)"
+msgid ""
+"Full Name:\t%s\n"
+"Site Location:\t%s\n"
+"Login Name:\t%s (%s)"
+msgstr "Nome Completo:\t%s\nIndirizzo del sito:\t%s\nNome utente:\t%s (%s)"
 
-#: include/enotify.php:374
+#: include/enotify.php:389
 #, php-format
 msgid "Please visit %s to approve or reject the request."
 msgstr "Visita %s per approvare o rifiutare la richiesta."
 
-#: include/security.php:81
+#: 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 "Elemento non trovato."
+
+#: include/items.php:396
+msgid "Do you really want to delete this item?"
+msgstr "Vuoi veramente cancellare questo elemento?"
+
+#: 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 "Si"
+
+#: 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 "Permesso negato."
+
+#: include/items.php:486 src/Content/Feature.php:96
+msgid "Archives"
+msgstr "Archivi"
+
+#: 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 "mostra di più"
+
+#: include/security.php:83
 msgid "Welcome "
 msgstr "Ciao"
 
-#: include/security.php:82
+#: include/security.php:84
 msgid "Please upload a profile photo."
 msgstr "Carica una foto per il profilo."
 
-#: include/security.php:84
+#: include/security.php:86
 msgid "Welcome back "
 msgstr "Ciao "
 
-#: include/security.php:440
+#: 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 "Il token di sicurezza della form non era corretto. Probabilmente la form è rimasta aperta troppo a lungo (più di tre ore) prima di inviarla."
 
-#: include/dba.php:59
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "Non trovo le informazioni DNS per il database server '%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] "Limite giornaliero di %d messaggio raggiunto. Il messaggio è stato rifiutato"
-msgstr[1] "Limite giornaliero di %d messaggi raggiunto. Il messaggio è stato rifiutato."
-
-#: 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] "Limite settimanale di %d messaggio raggiunto. Il messaggio è stato rifiutato"
-msgstr[1] "Limite settimanale di %d messaggi raggiunto. Il messaggio è stato rifiutato."
-
-#: include/api.php:1250
-#, php-format
-msgid "Monthly posting limit of %d post reached. The post was rejected."
-msgstr "Limite mensile di %d messaggi raggiunto. Il messaggio è stato rifiutato."
-
-#: include/api.php:4522 mod/photos.php:88 mod/photos.php:194
-#: mod/photos.php:722 mod/photos.php:1149 mod/photos.php:1166
-#: mod/photos.php:1684 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 src/Model/User.php:553
-#: src/Model/User.php:561 src/Model/User.php:569
-msgid "Profile Photos"
-msgstr "Foto del profilo"
-
-#: include/conversation.php:144 include/conversation.php:282
-#: include/text.php:1749 src/Model/Item.php:1970
-msgid "event"
-msgstr "l'evento"
-
-#: include/conversation.php:147 include/conversation.php:157
-#: include/conversation.php:285 include/conversation.php:294
-#: mod/subthread.php:97 mod/tagger.php:72 src/Model/Item.php:1968
-#: src/Protocol/Diaspora.php:1957
-msgid "status"
-msgstr "stato"
-
-#: include/conversation.php:152 include/conversation.php:290
-#: include/text.php:1751 mod/subthread.php:97 mod/tagger.php:72
-#: src/Model/Item.php:1968
-msgid "photo"
-msgstr "foto"
-
-#: include/conversation.php:164 src/Model/Item.php:1841
-#: src/Protocol/Diaspora.php:1953
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "A %1$s piace %3$s di %2$s"
-
-#: include/conversation.php:167 src/Model/Item.php:1846
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr "A %1$s non piace %3$s di %2$s"
-
-#: include/conversation.php:170
-#, php-format
-msgid "%1$s attends %2$s's %3$s"
-msgstr "%1$s partecipa a %3$s di %2$s"
-
-#: include/conversation.php:173
-#, php-format
-msgid "%1$s doesn't attend %2$s's %3$s"
-msgstr "%1$s non partecipa a %3$s di %2$s"
-
-#: include/conversation.php:176
-#, php-format
-msgid "%1$s attends maybe %2$s's %3$s"
-msgstr "%1$s forse partecipa a %3$s di %2$s"
-
-#: include/conversation.php:209
-#, php-format
-msgid "%1$s is now friends with %2$s"
-msgstr "%1$s e %2$s adesso sono amici"
-
-#: include/conversation.php:250
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr "%1$s ha stuzzicato %2$s"
-
-#: include/conversation.php:304 mod/tagger.php:110
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s ha taggato %3$s di %2$s con %4$s"
-
-#: include/conversation.php:331
-msgid "post/item"
-msgstr "post/elemento"
-
-#: include/conversation.php:332
-#, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
-msgstr "%1$s ha segnato il/la %3$s di %2$s come preferito"
-
-#: include/conversation.php:608 mod/photos.php:1501 mod/profiles.php:355
-msgid "Likes"
-msgstr "Mi piace"
-
-#: include/conversation.php:608 mod/photos.php:1501 mod/profiles.php:359
-msgid "Dislikes"
-msgstr "Non mi piace"
-
-#: include/conversation.php:609 include/conversation.php:1639
-#: mod/photos.php:1502
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] "Partecipa"
-msgstr[1] "Partecipano"
-
-#: include/conversation.php:609 mod/photos.php:1502
-msgid "Not attending"
-msgstr "Non partecipa"
-
-#: include/conversation.php:609 mod/photos.php:1502
-msgid "Might attend"
-msgstr "Forse partecipa"
-
-#: include/conversation.php:721 mod/photos.php:1569 src/Object/Post.php:192
-msgid "Select"
-msgstr "Seleziona"
-
-#: include/conversation.php:722 mod/photos.php:1570 mod/contacts.php:830
-#: mod/contacts.php:1035 mod/admin.php:1827 mod/settings.php:730
-#: src/Object/Post.php:187
-msgid "Delete"
-msgstr "Rimuovi"
-
-#: include/conversation.php:760 src/Object/Post.php:371
-#: src/Object/Post.php:372
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr "Vedi il profilo di %s @ %s"
-
-#: include/conversation.php:772 src/Object/Post.php:359
-msgid "Categories:"
-msgstr "Categorie:"
-
-#: include/conversation.php:773 src/Object/Post.php:360
-msgid "Filed under:"
-msgstr "Archiviato in:"
-
-#: include/conversation.php:780 src/Object/Post.php:385
-#, php-format
-msgid "%s from %s"
-msgstr "%s da %s"
-
-#: include/conversation.php:795
-msgid "View in context"
-msgstr "Vedi nel contesto"
-
-#: include/conversation.php:797 include/conversation.php:1312
-#: mod/wallmessage.php:145 mod/editpost.php:125 mod/photos.php:1473
-#: mod/message.php:245 mod/message.php:414 src/Object/Post.php:410
-msgid "Please wait"
-msgstr "Attendi"
-
-#: include/conversation.php:868
-msgid "remove"
-msgstr "rimuovi"
-
-#: include/conversation.php:872
-msgid "Delete Selected Items"
-msgstr "Cancella elementi selezionati"
-
-#: include/conversation.php:1017 view/theme/frio/theme.php:352
-msgid "Follow Thread"
-msgstr "Segui la discussione"
-
-#: include/conversation.php:1018 src/Model/Contact.php:662
-msgid "View Status"
-msgstr "Visualizza stato"
-
-#: include/conversation.php:1019 include/conversation.php:1035
-#: 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 "Visualizza profilo"
-
-#: include/conversation.php:1020 src/Model/Contact.php:664
-msgid "View Photos"
-msgstr "Visualizza foto"
-
-#: include/conversation.php:1021 src/Model/Contact.php:665
-msgid "Network Posts"
-msgstr "Post della Rete"
-
-#: include/conversation.php:1022 src/Model/Contact.php:666
-msgid "View Contact"
-msgstr "Mostra contatto"
-
-#: include/conversation.php:1023 src/Model/Contact.php:668
-msgid "Send PM"
-msgstr "Invia messaggio privato"
-
-#: include/conversation.php:1027 src/Model/Contact.php:669
-msgid "Poke"
-msgstr "Stuzzica"
-
-#: include/conversation.php:1032 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 "Connetti/segui"
-
-#: include/conversation.php:1151
-#, php-format
-msgid "%s likes this."
-msgstr "Piace a %s."
-
-#: include/conversation.php:1154
-#, php-format
-msgid "%s doesn't like this."
-msgstr "Non piace a %s."
-
-#: include/conversation.php:1157
-#, php-format
-msgid "%s attends."
-msgstr "%s partecipa."
-
-#: include/conversation.php:1160
-#, php-format
-msgid "%s doesn't attend."
-msgstr "%s non partecipa."
-
-#: include/conversation.php:1163
-#, php-format
-msgid "%s attends maybe."
-msgstr "%s forse partecipa."
-
-#: include/conversation.php:1174
-msgid "and"
-msgstr "e"
-
-#: include/conversation.php:1180
-#, php-format
-msgid "and %d other people"
-msgstr "e altre %d persone"
-
-#: include/conversation.php:1189
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this"
-msgstr "Piace a <span %1$s>%2$d persone</span>."
-
-#: include/conversation.php:1190
-#, php-format
-msgid "%s like this."
-msgstr "a %s piace."
-
-#: include/conversation.php:1193
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this"
-msgstr "Non piace a <span %1$s>%2$d persone</span>."
-
-#: include/conversation.php:1194
-#, php-format
-msgid "%s don't like this."
-msgstr "a %s non piace."
-
-#: include/conversation.php:1197
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend"
-msgstr "<span  %1$s>%2$d persone</span> partecipano"
-
-#: include/conversation.php:1198
-#, php-format
-msgid "%s attend."
-msgstr "%s partecipa."
-
-#: include/conversation.php:1201
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't attend"
-msgstr "<span  %1$s>%2$d persone</span> non partecipano"
-
-#: include/conversation.php:1202
-#, php-format
-msgid "%s don't attend."
-msgstr "%s non partecipa."
-
-#: include/conversation.php:1205
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend maybe"
-msgstr "<span %1$s>%2$d persone</span> forse partecipano"
-
-#: include/conversation.php:1206
-#, php-format
-msgid "%s attend maybe."
-msgstr "%s forse partecipano."
-
-#: include/conversation.php:1236 include/conversation.php:1252
-msgid "Visible to <strong>everybody</strong>"
-msgstr "Visibile a <strong>tutti</strong>"
-
-#: include/conversation.php:1237 include/conversation.php:1253
-#: 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 "Inserisci l'indirizzo del link:"
-
-#: include/conversation.php:1238 include/conversation.php:1254
-msgid "Please enter a video link/URL:"
-msgstr "Inserisci un collegamento video / URL:"
-
-#: include/conversation.php:1239 include/conversation.php:1255
-msgid "Please enter an audio link/URL:"
-msgstr "Inserisci un collegamento audio / URL:"
-
-#: include/conversation.php:1240 include/conversation.php:1256
-msgid "Tag term:"
-msgstr "Tag:"
-
-#: include/conversation.php:1241 include/conversation.php:1257
-#: mod/filer.php:34
-msgid "Save to Folder:"
-msgstr "Salva nella Cartella:"
-
-#: include/conversation.php:1242 include/conversation.php:1258
-msgid "Where are you right now?"
-msgstr "Dove sei ora?"
-
-#: include/conversation.php:1243
-msgid "Delete item(s)?"
-msgstr "Cancellare questo elemento/i?"
-
-#: include/conversation.php:1290
-msgid "New Post"
-msgstr "Nuovo Messaggio"
-
-#: include/conversation.php:1293
-msgid "Share"
-msgstr "Condividi"
-
-#: include/conversation.php:1294 mod/wallmessage.php:143 mod/editpost.php:111
-#: mod/message.php:243 mod/message.php:411
-msgid "Upload photo"
-msgstr "Carica foto"
-
-#: include/conversation.php:1295 mod/editpost.php:112
-msgid "upload photo"
-msgstr "carica foto"
-
-#: include/conversation.php:1296 mod/editpost.php:113
-msgid "Attach file"
-msgstr "Allega file"
-
-#: include/conversation.php:1297 mod/editpost.php:114
-msgid "attach file"
-msgstr "allega file"
-
-#: include/conversation.php:1298 mod/wallmessage.php:144 mod/editpost.php:115
-#: mod/message.php:244 mod/message.php:412
-msgid "Insert web link"
-msgstr "Inserisci link"
-
-#: include/conversation.php:1299 mod/editpost.php:116
-msgid "web link"
-msgstr "link web"
-
-#: include/conversation.php:1300 mod/editpost.php:117
-msgid "Insert video link"
-msgstr "Inserire collegamento video"
-
-#: include/conversation.php:1301 mod/editpost.php:118
-msgid "video link"
-msgstr "link video"
-
-#: include/conversation.php:1302 mod/editpost.php:119
-msgid "Insert audio link"
-msgstr "Inserisci collegamento audio"
-
-#: include/conversation.php:1303 mod/editpost.php:120
-msgid "audio link"
-msgstr "link audio"
-
-#: include/conversation.php:1304 mod/editpost.php:121
-msgid "Set your location"
-msgstr "La tua posizione"
-
-#: include/conversation.php:1305 mod/editpost.php:122
-msgid "set location"
-msgstr "posizione"
-
-#: include/conversation.php:1306 mod/editpost.php:123
-msgid "Clear browser location"
-msgstr "Rimuovi la localizzazione data dal browser"
-
-#: include/conversation.php:1307 mod/editpost.php:124
-msgid "clear location"
-msgstr "canc. pos."
-
-#: include/conversation.php:1309 mod/editpost.php:138
-msgid "Set title"
-msgstr "Scegli un titolo"
-
-#: include/conversation.php:1311 mod/editpost.php:140
-msgid "Categories (comma-separated list)"
-msgstr "Categorie (lista separata da virgola)"
-
-#: include/conversation.php:1313 mod/editpost.php:126
-msgid "Permission settings"
-msgstr "Impostazioni permessi"
-
-#: include/conversation.php:1314 mod/editpost.php:155
-msgid "permissions"
-msgstr "permessi"
-
-#: include/conversation.php:1322 mod/editpost.php:135
-msgid "Public post"
-msgstr "Messaggio pubblico"
-
-#: include/conversation.php:1326 mod/editpost.php:146 mod/photos.php:1492
-#: mod/photos.php:1531 mod/photos.php:1604 mod/events.php:528
-#: src/Object/Post.php:813
-msgid "Preview"
-msgstr "Anteprima"
-
-#: include/conversation.php:1330 include/items.php:387 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/photos.php:248 mod/photos.php:324
-#: mod/videos.php:147 mod/contacts.php:475 mod/unfollow.php:117
-#: mod/follow.php:161 mod/message.php:141 mod/dfrn_request.php:658
-#: mod/settings.php:670 mod/settings.php:696
-msgid "Cancel"
-msgstr "Annulla"
-
-#: include/conversation.php:1335
-msgid "Post to Groups"
-msgstr "Invia ai Gruppi"
-
-#: include/conversation.php:1336
-msgid "Post to Contacts"
-msgstr "Invia ai Contatti"
-
-#: include/conversation.php:1337
-msgid "Private post"
-msgstr "Post privato"
-
-#: include/conversation.php:1342 mod/editpost.php:153
-#: src/Model/Profile.php:338
-msgid "Message"
-msgstr "Messaggio"
-
-#: include/conversation.php:1343 mod/editpost.php:154
-msgid "Browser"
-msgstr "Browser"
-
-#: include/conversation.php:1610
-msgid "View all"
-msgstr "Mostra tutto"
-
-#: include/conversation.php:1633
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Mi piace"
-msgstr[1] "Mi piace"
-
-#: include/conversation.php:1636
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "Non mi piace"
-msgstr[1] "Non mi piace"
-
-#: include/conversation.php:1642
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] "Non partecipa"
-msgstr[1] "Non partecipano"
-
-#: include/conversation.php:1645 src/Content/ContactSelector.php:125
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] "Indeciso"
-msgstr[1] "Indecisi"
-
-#: include/items.php:342 mod/notice.php:22 mod/viewsrc.php:21
-#: mod/admin.php:277 mod/admin.php:1883 mod/admin.php:2131 mod/display.php:72
-#: mod/display.php:255 mod/display.php:356
-msgid "Item not found."
-msgstr "Elemento non trovato."
-
-#: include/items.php:382
-msgid "Do you really want to delete this item?"
-msgstr "Vuoi veramente cancellare questo elemento?"
-
-#: include/items.php:384 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 "Si"
-
-#: include/items.php:401 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/notes.php:30 mod/photos.php:174
-#: mod/photos.php:1051 mod/cal.php:304 mod/contacts.php:386
-#: mod/delegate.php:25 mod/delegate.php:43 mod/delegate.php:54
-#: mod/events.php:194 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/network.php:32
-#: mod/crepair.php:98 mod/message.php:59 mod/message.php:104 mod/group.php:26
-#: mod/dfrn_confirm.php:68 mod/item.php:160 mod/notifications.php:73
-#: 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 "Permesso negato."
-
-#: include/items.php:471 src/Content/Feature.php:96
-msgid "Archives"
-msgstr "Archivi"
-
-#: include/items.php:477 view/theme/vier/theme.php:258
-#: src/Content/ForumManager.php:130 src/Content/Widget.php:317
-#: src/Object/Post.php:438 src/App.php:525
-msgid "show more"
-msgstr "mostra di più"
-
-#: include/text.php:303
+#: include/text.php:301
 msgid "newer"
 msgstr "nuovi"
 
-#: include/text.php:304
+#: include/text.php:302
 msgid "older"
 msgstr "vecchi"
 
-#: include/text.php:309
+#: include/text.php:307
 msgid "first"
 msgstr "primo"
 
-#: include/text.php:310
+#: include/text.php:308
 msgid "prev"
 msgstr "prec"
 
-#: include/text.php:344
+#: include/text.php:342
 msgid "next"
 msgstr "succ"
 
-#: include/text.php:345
+#: include/text.php:343
 msgid "last"
 msgstr "ultimo"
 
-#: include/text.php:399
+#: include/text.php:397
 msgid "Loading more entries..."
 msgstr "Carico più elementi..."
 
-#: include/text.php:400
+#: include/text.php:398
 msgid "The end"
 msgstr "Fine"
 
-#: include/text.php:885
+#: include/text.php:766
 msgid "No contacts"
 msgstr "Nessun contatto"
 
-#: include/text.php:909
+#: include/text.php:790
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d contatto"
 msgstr[1] "%d contatti"
 
-#: include/text.php:922
+#: include/text.php:803
 msgid "View Contacts"
 msgstr "Visualizza i contatti"
 
-#: include/text.php:1011 mod/filer.php:35 mod/editpost.php:110
-#: mod/notes.php:67
+#: include/text.php:888 mod/filer.php:35 mod/editpost.php:100 mod/notes.php:54
 msgid "Save"
 msgstr "Salva"
 
-#: include/text.php:1011
+#: include/text.php:888
 msgid "Follow"
 msgstr "Segui"
 
-#: include/text.php:1017 mod/search.php:155 src/Content/Nav.php:142
+#: include/text.php:894 mod/search.php:162 src/Content/Nav.php:142
 msgid "Search"
 msgstr "Cerca"
 
-#: include/text.php:1020 src/Content/Nav.php:58
+#: include/text.php:897 src/Content/Nav.php:58
 msgid "@name, !forum, #tags, content"
 msgstr "@nome, !forum, #tag, contenuto"
 
-#: include/text.php:1026 src/Content/Nav.php:145
+#: include/text.php:903 src/Content/Nav.php:145
 msgid "Full Text"
 msgstr "Testo Completo"
 
-#: include/text.php:1027 src/Content/Widget/TagCloud.php:54
+#: include/text.php:904 src/Content/Widget/TagCloud.php:53
 #: src/Content/Nav.php:146
 msgid "Tags"
 msgstr "Tags:"
 
-#: include/text.php:1028 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
+#: 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 "Contatti"
 
-#: include/text.php:1031 view/theme/vier/theme.php:253
+#: include/text.php:908 view/theme/vier/theme.php:251
 #: src/Content/ForumManager.php:125 src/Content/Nav.php:151
 msgid "Forums"
 msgstr "Forum"
 
-#: include/text.php:1075
+#: include/text.php:952
 msgid "poke"
 msgstr "stuzzica"
 
-#: include/text.php:1075
+#: include/text.php:952
 msgid "poked"
 msgstr "ha stuzzicato"
 
-#: include/text.php:1076
+#: include/text.php:953
 msgid "ping"
 msgstr "invia un ping"
 
-#: include/text.php:1076
+#: include/text.php:953
 msgid "pinged"
 msgstr "ha inviato un ping"
 
-#: include/text.php:1077
+#: include/text.php:954
 msgid "prod"
 msgstr "pungola"
 
-#: include/text.php:1077
+#: include/text.php:954
 msgid "prodded"
 msgstr "ha pungolato"
 
-#: include/text.php:1078
+#: include/text.php:955
 msgid "slap"
 msgstr "schiaffeggia"
 
-#: include/text.php:1078
+#: include/text.php:955
 msgid "slapped"
 msgstr "ha schiaffeggiato"
 
-#: include/text.php:1079
+#: include/text.php:956
 msgid "finger"
 msgstr "tocca"
 
-#: include/text.php:1079
+#: include/text.php:956
 msgid "fingered"
 msgstr "ha toccato"
 
-#: include/text.php:1080
+#: include/text.php:957
 msgid "rebuff"
 msgstr "respingi"
 
-#: include/text.php:1080
+#: include/text.php:957
 msgid "rebuffed"
 msgstr "ha respinto"
 
-#: include/text.php:1094 mod/settings.php:935 src/Model/Event.php:379
+#: include/text.php:971 mod/settings.php:941 src/Model/Event.php:388
 msgid "Monday"
 msgstr "Lunedì"
 
-#: include/text.php:1094 src/Model/Event.php:380
+#: include/text.php:971 src/Model/Event.php:389
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: include/text.php:1094 src/Model/Event.php:381
+#: include/text.php:971 src/Model/Event.php:390
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: include/text.php:1094 src/Model/Event.php:382
+#: include/text.php:971 src/Model/Event.php:391
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: include/text.php:1094 src/Model/Event.php:383
+#: include/text.php:971 src/Model/Event.php:392
 msgid "Friday"
 msgstr "Venerdì"
 
-#: include/text.php:1094 src/Model/Event.php:384
+#: include/text.php:971 src/Model/Event.php:393
 msgid "Saturday"
 msgstr "Sabato"
 
-#: include/text.php:1094 mod/settings.php:935 src/Model/Event.php:378
+#: include/text.php:971 mod/settings.php:941 src/Model/Event.php:387
 msgid "Sunday"
 msgstr "Domenica"
 
-#: include/text.php:1098 src/Model/Event.php:399
+#: include/text.php:975 src/Model/Event.php:408
 msgid "January"
 msgstr "Gennaio"
 
-#: include/text.php:1098 src/Model/Event.php:400
+#: include/text.php:975 src/Model/Event.php:409
 msgid "February"
 msgstr "Febbraio"
 
-#: include/text.php:1098 src/Model/Event.php:401
+#: include/text.php:975 src/Model/Event.php:410
 msgid "March"
 msgstr "Marzo"
 
-#: include/text.php:1098 src/Model/Event.php:402
+#: include/text.php:975 src/Model/Event.php:411
 msgid "April"
 msgstr "Aprile"
 
-#: include/text.php:1098 include/text.php:1115 src/Model/Event.php:390
-#: src/Model/Event.php:403
+#: include/text.php:975 include/text.php:992 src/Model/Event.php:399
+#: src/Model/Event.php:412
 msgid "May"
 msgstr "Maggio"
 
-#: include/text.php:1098 src/Model/Event.php:404
+#: include/text.php:975 src/Model/Event.php:413
 msgid "June"
 msgstr "Giugno"
 
-#: include/text.php:1098 src/Model/Event.php:405
+#: include/text.php:975 src/Model/Event.php:414
 msgid "July"
 msgstr "Luglio"
 
-#: include/text.php:1098 src/Model/Event.php:406
+#: include/text.php:975 src/Model/Event.php:415
 msgid "August"
 msgstr "Agosto"
 
-#: include/text.php:1098 src/Model/Event.php:407
+#: include/text.php:975 src/Model/Event.php:416
 msgid "September"
 msgstr "Settembre"
 
-#: include/text.php:1098 src/Model/Event.php:408
+#: include/text.php:975 src/Model/Event.php:417
 msgid "October"
 msgstr "Ottobre"
 
-#: include/text.php:1098 src/Model/Event.php:409
+#: include/text.php:975 src/Model/Event.php:418
 msgid "November"
 msgstr "Novembre"
 
-#: include/text.php:1098 src/Model/Event.php:410
+#: include/text.php:975 src/Model/Event.php:419
 msgid "December"
 msgstr "Dicembre"
 
-#: include/text.php:1112 src/Model/Event.php:371
+#: include/text.php:989 src/Model/Event.php:380
 msgid "Mon"
 msgstr "Lun"
 
-#: include/text.php:1112 src/Model/Event.php:372
+#: include/text.php:989 src/Model/Event.php:381
 msgid "Tue"
 msgstr "Mar"
 
-#: include/text.php:1112 src/Model/Event.php:373
+#: include/text.php:989 src/Model/Event.php:382
 msgid "Wed"
 msgstr "Mer"
 
-#: include/text.php:1112 src/Model/Event.php:374
+#: include/text.php:989 src/Model/Event.php:383
 msgid "Thu"
 msgstr "Gio"
 
-#: include/text.php:1112 src/Model/Event.php:375
+#: include/text.php:989 src/Model/Event.php:384
 msgid "Fri"
 msgstr "Ven"
 
-#: include/text.php:1112 src/Model/Event.php:376
+#: include/text.php:989 src/Model/Event.php:385
 msgid "Sat"
 msgstr "Sab"
 
-#: include/text.php:1112 src/Model/Event.php:370
+#: include/text.php:989 src/Model/Event.php:379
 msgid "Sun"
 msgstr "Dom"
 
-#: include/text.php:1115 src/Model/Event.php:386
+#: include/text.php:992 src/Model/Event.php:395
 msgid "Jan"
 msgstr "Gen"
 
-#: include/text.php:1115 src/Model/Event.php:387
+#: include/text.php:992 src/Model/Event.php:396
 msgid "Feb"
 msgstr "Feb"
 
-#: include/text.php:1115 src/Model/Event.php:388
+#: include/text.php:992 src/Model/Event.php:397
 msgid "Mar"
 msgstr "Mar"
 
-#: include/text.php:1115 src/Model/Event.php:389
+#: include/text.php:992 src/Model/Event.php:398
 msgid "Apr"
 msgstr "Apr"
 
-#: include/text.php:1115 src/Model/Event.php:392
+#: include/text.php:992 src/Model/Event.php:401
 msgid "Jul"
 msgstr "Lug"
 
-#: include/text.php:1115 src/Model/Event.php:393
+#: include/text.php:992 src/Model/Event.php:402
 msgid "Aug"
 msgstr "Ago"
 
-#: include/text.php:1115
+#: include/text.php:992
 msgid "Sep"
 msgstr "Set"
 
-#: include/text.php:1115 src/Model/Event.php:395
+#: include/text.php:992 src/Model/Event.php:404
 msgid "Oct"
 msgstr "Ott"
 
-#: include/text.php:1115 src/Model/Event.php:396
+#: include/text.php:992 src/Model/Event.php:405
 msgid "Nov"
 msgstr "Nov"
 
-#: include/text.php:1115 src/Model/Event.php:397
+#: include/text.php:992 src/Model/Event.php:406
 msgid "Dec"
 msgstr "Dic"
 
-#: include/text.php:1255
+#: include/text.php:1138
 #, php-format
 msgid "Content warning: %s"
 msgstr "Avviso contenuto: %s"
 
-#: include/text.php:1325 mod/videos.php:380
+#: include/text.php:1203 mod/videos.php:373
 msgid "View Video"
 msgstr "Guarda Video"
 
-#: include/text.php:1342
+#: include/text.php:1220
 msgid "bytes"
 msgstr "bytes"
 
-#: include/text.php:1375 include/text.php:1386 include/text.php:1419
+#: include/text.php:1253 include/text.php:1264 include/text.php:1299
 msgid "Click to open/close"
 msgstr "Clicca per aprire/chiudere"
 
-#: include/text.php:1534
+#: include/text.php:1414
 msgid "View on separate page"
 msgstr "Vedi in una pagina separata"
 
-#: include/text.php:1535
+#: include/text.php:1415
 msgid "view on separate page"
 msgstr "vedi in una pagina separata"
 
-#: include/text.php:1540 include/text.php:1547 src/Model/Event.php:594
+#: include/text.php:1420 include/text.php:1427 src/Model/Event.php:606
 msgid "link to source"
 msgstr "Collegamento all'originale"
 
-#: include/text.php:1753
+#: include/text.php:1634
 msgid "activity"
 msgstr "attività"
 
-#: include/text.php:1755 src/Object/Post.php:437 src/Object/Post.php:449
+#: include/text.php:1636 src/Object/Post.php:427 src/Object/Post.php:439
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "commento "
 msgstr[1] "commenti"
 
-#: include/text.php:1758
+#: include/text.php:1639
 msgid "post"
 msgstr "messaggio"
 
-#: include/text.php:1915
+#: include/text.php:1794
 msgid "Item filed"
 msgstr "Messaggio salvato"
 
-#: mod/allfriends.php:51
-msgid "No friends to display."
-msgstr "Nessun amico da visualizzare."
-
-#: 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
-msgid "Connect"
-msgstr "Connetti"
-
-#: mod/api.php:85 mod/api.php:107
-msgid "Authorize application connection"
-msgstr "Autorizza la connessione dell'applicazione"
-
-#: mod/api.php:86
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Torna alla tua applicazione e inserisci questo codice di sicurezza:"
-
-#: mod/api.php:95
-msgid "Please login to continue."
-msgstr "Effettua il login per continuare."
-
-#: 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 "Vuoi autorizzare questa applicazione per accedere ai messaggi e ai contatti, e / o creare nuovi messaggi per te?"
-
-#: 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
-msgid "No"
-msgstr "No"
-
-#: mod/apps.php:14 index.php:265
+#: mod/apps.php:14 index.php:261
 msgid "You must be logged in to use addons. "
 msgstr "Devi aver effettuato il login per usare i componenti aggiuntivi."
 
@@ -1245,22 +1202,6 @@ msgstr "Applicazioni"
 msgid "No installed applications."
 msgstr "Nessuna applicazione installata."
 
-#: mod/attach.php:15
-msgid "Item not available."
-msgstr "Oggetto non disponibile."
-
-#: mod/attach.php:25
-msgid "Item was not found."
-msgstr "Oggetto non trovato."
-
-#: mod/common.php:91
-msgid "No contacts in common."
-msgstr "Nessun contatto in comune."
-
-#: mod/common.php:140 mod/contacts.php:886
-msgid "Common Friends"
-msgstr "Amici in comune"
-
 #: mod/credits.php:18
 msgid "Credits"
 msgstr "Crediti"
@@ -1272,48 +1213,6 @@ msgid ""
 "code or the translation of Friendica. Thank you all!"
 msgstr "Friendica è un progetto comunitario, che non sarebbe stato possibile realizzare senza l'aiuto di molte persone.\nQuesta è una lista di chi ha contribuito al codice o alle traduzioni di Friendica. Grazie a tutti!"
 
-#: mod/fbrowser.php:34 view/theme/frio/theme.php:261 src/Content/Nav.php:102
-#: src/Model/Profile.php:902
-msgid "Photos"
-msgstr "Foto"
-
-#: mod/fbrowser.php:43 mod/fbrowser.php:68 mod/photos.php:194
-#: mod/photos.php:1062 mod/photos.php:1149 mod/photos.php:1166
-#: mod/photos.php:1659 mod/photos.php:1673 src/Model/Photo.php:244
-#: src/Model/Photo.php:253
-msgid "Contact Photos"
-msgstr "Foto dei contatti"
-
-#: mod/fbrowser.php:105 mod/fbrowser.php:136 mod/profile_photo.php:250
-msgid "Upload"
-msgstr "Carica"
-
-#: mod/fbrowser.php:131
-msgid "Files"
-msgstr "File"
-
-#: 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 "Non trovato"
-
-#: mod/hcard.php:18
-msgid "No profile"
-msgstr "Nessun profilo"
-
-#: mod/home.php:39
-#, php-format
-msgid "Welcome to %s"
-msgstr "Benvenuto su %s"
-
-#: mod/lockview.php:38 mod/lockview.php:46
-msgid "Remote privacy information not available."
-msgstr "Informazioni remote sulla privacy non disponibili."
-
-#: mod/lockview.php:55
-msgid "Visible to:"
-msgstr "Visibile a:"
-
 #: mod/maintenance.php:24
 msgid "System down for maintenance"
 msgstr "Sistema in manutenzione"
@@ -1349,8 +1248,8 @@ msgid ""
 " join."
 msgstr "Sulla tua pagina <em>Quick Start</em> - veloce introduzione alla tua pagina profilo e alla pagina Rete, fai qualche nuova amicizia, e trova qualche gruppo a cui unirti."
 
-#: mod/newmember.php:19 mod/admin.php:1935 mod/admin.php:2204
-#: mod/settings.php:124 view/theme/frio/theme.php:269 src/Content/Nav.php:207
+#: 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 "Impostazioni"
 
@@ -1373,14 +1272,14 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr "Guarda le altre impostazioni, in particolare le impostazioni della privacy. Un profilo non pubblicato è come un numero di telefono non in elenco. In genere, dovresti pubblicare il tuo profilo - a meno che tutti i tuoi amici e potenziali tali sappiano esattamente come trovarti."
 
-#: 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
+#: 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 "Profilo"
 
-#: 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 "Carica la foto del profilo"
 
@@ -1463,7 +1362,7 @@ msgid ""
 "hours."
 msgstr "Nel pannello laterale nella pagina \"Contatti\", ci sono diversi strumenti per trovare nuovi amici. Possiamo confrontare le persone per interessi, cercare le persone per nome e fornire suggerimenti basati sui tuoi contatti esistenti. Su un sito nuovo, i suggerimenti sono di solito presenti dopo 24 ore."
 
-#: mod/newmember.php:43 src/Model/Group.php:414
+#: mod/newmember.php:43 src/Model/Group.php:413
 msgid "Groups"
 msgstr "Gruppi"
 
@@ -1503,174 +1402,7 @@ msgid ""
 " features and resources."
 msgstr "Le nostre pagine della <strong>guida</strong> possono essere consultate per avere dettagli su altre caratteristiche del programma e altre risorse."
 
-#: 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 "Visita il profilo di %s [%s]"
-
-#: mod/nogroup.php:43 mod/contacts.php:960
-msgid "Edit contact"
-msgstr "Modifica contatto"
-
-#: mod/nogroup.php:63
-msgid "Contacts who are not members of a group"
-msgstr "Contatti che non sono membri di un gruppo"
-
-#: mod/p.php:14
-msgid "Not Extended"
-msgstr "Not Extended"
-
-#: mod/repair_ostatus.php:18
-msgid "Resubscribing to OStatus contacts"
-msgstr "Risottoscrivi i contatti OStatus"
-
-#: mod/repair_ostatus.php:34
-msgid "Error"
-msgstr "Errore"
-
-#: mod/repair_ostatus.php:48 mod/ostatus_subscribe.php:64
-msgid "Done"
-msgstr "Fatto"
-
-#: mod/repair_ostatus.php:54 mod/ostatus_subscribe.php:88
-msgid "Keep this window open until done."
-msgstr "Tieni questa finestra aperta fino a che ha finito."
-
-#: mod/suggest.php:36
-msgid "Do you really want to delete this suggestion?"
-msgstr "Vuoi veramente cancellare questo suggerimento?"
-
-#: mod/suggest.php:73
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "Nessun suggerimento disponibile. Se questo è un sito nuovo, riprova tra 24 ore."
-
-#: mod/suggest.php:84 mod/suggest.php:104
-msgid "Ignore/Hide"
-msgstr "Ignora / Nascondi"
-
-#: mod/suggest.php:114 view/theme/vier/theme.php:204 src/Content/Widget.php:64
-msgid "Friend Suggestions"
-msgstr "Contatti suggeriti"
-
-#: mod/update_community.php:27 mod/update_display.php:27
-#: mod/update_notes.php:40 mod/update_profile.php:39 mod/update_network.php:33
-msgid "[Embedded content - reload page to view]"
-msgstr "[Contenuto incorporato - ricarica la pagina per visualizzarlo correttamente]"
-
-#: 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 "Questo sito ha superato il numero di registrazioni giornaliere consentite. Prova di nuovo domani."
-
-#: mod/uimport.php:70 mod/register.php:288
-msgid "Import"
-msgstr "Importa"
-
-#: mod/uimport.php:72
-msgid "Move account"
-msgstr "Muovi account"
-
-#: mod/uimport.php:73
-msgid "You can import an account from another Friendica server."
-msgstr "Puoi importare un account da un altro server 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 "Devi esportare il tuo account dal vecchio server e caricarlo qui. Noi ricreeremo il tuo vecchio account qui, con tutti i tuoi contatti. Proveremo anche a informare i tuoi amici che ti sei spostato qui."
-
-#: 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 "Questa funzione è sperimentale. Non possiamo importare i contatti dalla rete OStatus (GNU Social/Statusnet) o da Diaspora"
-
-#: mod/uimport.php:76
-msgid "Account file"
-msgstr "File account"
-
-#: mod/uimport.php:76
-msgid ""
-"To export your account, go to \"Settings->Export your personal data\" and "
-"select \"Export account\""
-msgstr "Per esportare il tuo account, vai su \"Impostazioni -> Esporta i tuoi dati personali\" e seleziona \"Esporta account\""
-
-#: mod/match.php:48
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Nessuna parola chiave per l'abbinamento. Aggiungi parole chiave al tuo profilo predefinito."
-
-#: mod/match.php:104
-msgid "is interested in:"
-msgstr "è interessato a:"
-
-#: mod/match.php:120
-msgid "Profile Match"
-msgstr "Profili corrispondenti"
-
-#: mod/match.php:125 mod/dirfind.php:253
-msgid "No matches"
-msgstr "Nessun risultato"
-
-#: mod/manage.php:180
-msgid "Manage Identities and/or Pages"
-msgstr "Gestisci identità e/o pagine"
-
-#: 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 "Cambia tra differenti identità o pagine comunità/gruppi che condividono il tuo account o per cui hai i permessi di gestione"
-
-#: mod/manage.php:182
-msgid "Select an identity to manage: "
-msgstr "Seleziona un'identità da gestire:"
-
-#: mod/manage.php:184 mod/localtime.php:56 mod/poke.php:199
-#: mod/fsuggest.php:114 mod/photos.php:1080 mod/photos.php:1160
-#: mod/photos.php:1445 mod/photos.php:1491 mod/photos.php:1530
-#: mod/photos.php:1603 mod/contacts.php:610 mod/events.php:530
-#: 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/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 "Invia"
-
-#: 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 "Richiesta non valida."
-
-#: mod/wall_attach.php:101
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr "Mi spiace, forse il file che stai caricando è più grosso di quanto la configurazione di PHP permetta"
-
-#: mod/wall_attach.php:101
-msgid "Or - did you try to upload an empty file?"
-msgstr "O.. non avrai provato a caricare un file vuoto?"
-
-#: mod/wall_attach.php:112
-#, php-format
-msgid "File exceeds size limit of %s"
-msgstr "Il file supera la dimensione massima di %s"
-
-#: mod/wall_attach.php:136 mod/wall_attach.php:152
-msgid "File upload failed."
-msgstr "Caricamento del file non riuscito."
-
-#: mod/filer.php:34
-msgid "- select -"
-msgstr "- seleziona -"
-
-#: mod/localtime.php:19 src/Model/Event.php:36 src/Model/Event.php:814
+#: mod/localtime.php:19 src/Model/Event.php:34 src/Model/Event.php:826
 msgid "l F d, Y \\@ g:i A"
 msgstr "l d F Y \\@ G:i"
 
@@ -1703,1163 +1435,29 @@ msgstr "Ora locale convertita: %s"
 msgid "Please select your timezone:"
 msgstr "Selezionare il tuo fuso orario:"
 
-#: mod/notify.php:77
-msgid "No more system notifications."
-msgstr "Nessuna nuova notifica di sistema."
+#: 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 "Invia"
 
-#: mod/notify.php:81 mod/notifications.php:113
-msgid "System Notifications"
-msgstr "Notifiche di sistema"
-
-#: mod/ping.php:292
-msgid "{0} wants to be your friend"
-msgstr "{0} vuole essere tuo amico"
-
-#: mod/ping.php:307
-msgid "{0} sent you a message"
-msgstr "{0} ti ha inviato un messaggio"
-
-#: mod/ping.php:322
-msgid "{0} requested registration"
-msgstr "{0} chiede la registrazione"
-
-#: mod/poke.php:192
-msgid "Poke/Prod"
-msgstr "Tocca/Pungola"
-
-#: mod/poke.php:193
-msgid "poke, prod or do other things to somebody"
-msgstr "tocca, pungola o fai altre cose a qualcuno"
-
-#: mod/poke.php:194
-msgid "Recipient"
-msgstr "Destinatario"
-
-#: mod/poke.php:195
-msgid "Choose what you wish to do to recipient"
-msgstr "Scegli cosa vuoi fare al destinatario"
-
-#: mod/poke.php:198
-msgid "Make this post private"
-msgstr "Rendi questo post privato"
-
-#: mod/probe.php:13 mod/search.php:98 mod/search.php:104
-#: mod/viewcontacts.php:45 mod/webfinger.php:16 mod/photos.php:932
-#: mod/videos.php:199 mod/directory.php:42 mod/community.php:27
-#: mod/dfrn_request.php:602 mod/display.php:203
+#: 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 "Accesso negato."
 
-#: mod/probe.php:14 mod/webfinger.php:17
+#: mod/webfinger.php:17 mod/probe.php:14
 msgid "Only logged in users are permitted to perform a probing."
 msgstr "Solo agli utenti loggati è permesso effettuare un probe."
 
-#: mod/profperm.php:28 mod/group.php:83 index.php:435
-msgid "Permission denied"
-msgstr "Permesso negato"
-
-#: mod/profperm.php:34 mod/profperm.php:65
-msgid "Invalid profile identifier."
-msgstr "Identificativo del profilo non valido."
-
-#: mod/profperm.php:111
-msgid "Profile Visibility Editor"
-msgstr "Modifica visibilità del profilo"
-
-#: mod/profperm.php:115 mod/group.php:265
-msgid "Click on a contact to add or remove."
-msgstr "Clicca su un contatto per aggiungerlo o rimuoverlo."
-
-#: mod/profperm.php:124
-msgid "Visible To"
-msgstr "Visibile a"
-
-#: mod/profperm.php:140
-msgid "All Contacts (with secure profile access)"
-msgstr "Tutti i contatti (con profilo ad accesso sicuro)"
-
-#: mod/regmod.php:68
-msgid "Account approved."
-msgstr "Account approvato."
-
-#: mod/regmod.php:93
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registrazione revocata per %s"
-
-#: mod/regmod.php:102
-msgid "Please login."
-msgstr "Accedi."
-
-#: mod/search.php:37 mod/network.php:194
-msgid "Remove term"
-msgstr "Rimuovi termine"
-
-#: mod/search.php:46 mod/network.php:201 src/Content/Feature.php:100
-msgid "Saved Searches"
-msgstr "Ricerche salvate"
-
-#: mod/search.php:105
-msgid "Only logged in users are permitted to perform a search."
-msgstr "Solo agli utenti autenticati è permesso eseguire ricerche."
-
-#: mod/search.php:129
-msgid "Too Many Requests"
-msgstr "Troppe richieste"
-
-#: mod/search.php:130
-msgid "Only one search per minute is permitted for not logged in users."
-msgstr "Solo una ricerca al minuto è permessa agli utenti non autenticati."
-
-#: mod/search.php:228 mod/community.php:141
-msgid "No results."
-msgstr "Nessun risultato."
-
-#: mod/search.php:234
-#, php-format
-msgid "Items tagged with: %s"
-msgstr "Elementi taggati con: %s"
-
-#: mod/search.php:236 mod/contacts.php:819
-#, php-format
-msgid "Results for: %s"
-msgstr "Risultati per: %s"
-
-#: mod/subthread.php:113
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s sta seguendo %3$s di %2$s"
-
-#: mod/tagrm.php:47
-msgid "Tag removed"
-msgstr "Tag rimosso"
-
-#: mod/tagrm.php:85
-msgid "Remove Item Tag"
-msgstr "Rimuovi il tag"
-
-#: mod/tagrm.php:87
-msgid "Select a tag to remove: "
-msgstr "Seleziona un tag da rimuovere: "
-
-#: mod/tagrm.php:98 mod/delegate.php:177
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: mod/uexport.php:44
-msgid "Export account"
-msgstr "Esporta account"
-
-#: 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 "Esporta le informazioni del tuo account e dei contatti. Usa questa funzione per fare un backup del tuo account o per spostarlo in un altro server."
-
-#: mod/uexport.php:45
-msgid "Export all"
-msgstr "Esporta tutto"
-
-#: 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 "Esporta le informazioni del tuo account, i tuoi contatti e tutti i tuoi elementi in json. Può diventare un file veramente molto grosso e metterci un sacco di tempo. Usa questa funzione per fare un backup completo del tuo account (le foto non sono esportate)"
-
-#: mod/uexport.php:52 mod/settings.php:108
-msgid "Export personal data"
-msgstr "Esporta dati personali"
-
-#: mod/viewcontacts.php:87
-msgid "No contacts."
-msgstr "Nessun contatto."
-
-#: mod/viewsrc.php:12 mod/community.php:34
-msgid "Access denied."
-msgstr "Accesso negato."
-
-#: mod/wall_upload.php:186 mod/photos.php:763 mod/photos.php:766
-#: mod/photos.php:795 mod/profile_photo.php:153
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "La dimensione dell'immagine supera il limite di %s"
-
-#: mod/wall_upload.php:200 mod/photos.php:818 mod/profile_photo.php:162
-msgid "Unable to process image."
-msgstr "Impossibile caricare l'immagine."
-
-#: 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 "Foto della bacheca"
-
-#: mod/wall_upload.php:239 mod/photos.php:847 mod/profile_photo.php:307
-msgid "Image upload failed."
-msgstr "Caricamento immagine fallito."
-
-#: mod/wallmessage.php:49 mod/wallmessage.php:112
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr "Numero giornaliero di messaggi per %s superato. Invio fallito."
-
-#: mod/wallmessage.php:57 mod/message.php:73
-msgid "No recipient selected."
-msgstr "Nessun destinatario selezionato."
-
-#: mod/wallmessage.php:60
-msgid "Unable to check your home location."
-msgstr "Impossibile controllare la tua posizione di origine."
-
-#: mod/wallmessage.php:63 mod/message.php:80
-msgid "Message could not be sent."
-msgstr "Il messaggio non può essere inviato."
-
-#: mod/wallmessage.php:66 mod/message.php:83
-msgid "Message collection failure."
-msgstr "Errore recuperando il messaggio."
-
-#: mod/wallmessage.php:69 mod/message.php:86
-msgid "Message sent."
-msgstr "Messaggio inviato."
-
-#: mod/wallmessage.php:86 mod/wallmessage.php:95
-msgid "No recipient."
-msgstr "Nessun destinatario."
-
-#: mod/wallmessage.php:132 mod/message.php:231
-msgid "Send Private Message"
-msgstr "Invia un messaggio privato"
-
-#: 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 "Se vuoi che %s ti risponda, controlla che le tue impostazioni di privacy permettano la ricezione di messaggi privati da mittenti sconosciuti."
-
-#: mod/wallmessage.php:134 mod/message.php:232 mod/message.php:402
-msgid "To:"
-msgstr "A:"
-
-#: mod/wallmessage.php:135 mod/message.php:236 mod/message.php:404
-msgid "Subject:"
-msgstr "Oggetto:"
-
-#: mod/wallmessage.php:141 mod/invite.php:149 mod/message.php:240
-#: mod/message.php:407
-msgid "Your message:"
-msgstr "Il tuo messaggio:"
-
-#: mod/bookmarklet.php:23 src/Content/Nav.php:114 src/Module/Login.php:313
-msgid "Login"
-msgstr "Accedi"
-
-#: mod/bookmarklet.php:51
-msgid "The post was created"
-msgstr "Il messaggio è stato creato"
-
-#: mod/editpost.php:25 mod/editpost.php:35
-msgid "Item not found"
-msgstr "Oggetto non trovato"
-
-#: mod/editpost.php:42
-msgid "Edit post"
-msgstr "Modifica messaggio"
-
-#: mod/editpost.php:134 src/Core/ACL.php:315
-msgid "CC: email addresses"
-msgstr "CC: indirizzi email"
-
-#: mod/editpost.php:141 src/Core/ACL.php:316
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Esempio: bob@example.com, mary@example.com"
-
-#: mod/fsuggest.php:30 mod/fsuggest.php:96 mod/crepair.php:110
-#: mod/dfrn_confirm.php:129
-msgid "Contact not found."
-msgstr "Contatto non trovato."
-
-#: mod/fsuggest.php:72
-msgid "Friend suggestion sent."
-msgstr "Suggerimento di amicizia inviato."
-
-#: mod/fsuggest.php:101
-msgid "Suggest Friends"
-msgstr "Suggerisci amici"
-
-#: mod/fsuggest.php:103
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Suggerisci un amico a %s"
-
-#: mod/notes.php:52 src/Model/Profile.php:944
-msgid "Personal Notes"
-msgstr "Note personali"
-
-#: mod/photos.php:108 src/Model/Profile.php:905
-msgid "Photo Albums"
-msgstr "Album foto"
-
-#: mod/photos.php:109 mod/photos.php:1713
-msgid "Recent Photos"
-msgstr "Foto recenti"
-
-#: mod/photos.php:112 mod/photos.php:1210 mod/photos.php:1715
-msgid "Upload New Photos"
-msgstr "Carica nuove foto"
-
-#: mod/photos.php:126 mod/settings.php:51
-msgid "everybody"
-msgstr "tutti"
-
-#: mod/photos.php:184
-msgid "Contact information unavailable"
-msgstr "I dati di questo contatto non sono disponibili"
-
-#: mod/photos.php:204
-msgid "Album not found."
-msgstr "Album non trovato."
-
-#: mod/photos.php:234 mod/photos.php:245 mod/photos.php:1161
-msgid "Delete Album"
-msgstr "Rimuovi album"
-
-#: mod/photos.php:243
-msgid "Do you really want to delete this photo album and all its photos?"
-msgstr "Vuoi davvero cancellare questo album e tutte le sue foto?"
-
-#: mod/photos.php:310 mod/photos.php:321 mod/photos.php:1446
-msgid "Delete Photo"
-msgstr "Rimuovi foto"
-
-#: mod/photos.php:319
-msgid "Do you really want to delete this photo?"
-msgstr "Vuoi veramente cancellare questa foto?"
-
-#: mod/photos.php:667
-msgid "a photo"
-msgstr "una foto"
-
-#: mod/photos.php:667
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
-msgstr "%1$s è stato taggato in %2$s da %3$s"
-
-#: mod/photos.php:769
-msgid "Image upload didn't complete, please try again"
-msgstr "Caricamento dell'immagine non completato. Prova di nuovo."
-
-#: mod/photos.php:772
-msgid "Image file is missing"
-msgstr "Il file dell'immagine è mancante"
-
-#: mod/photos.php:777
-msgid ""
-"Server can't accept new file upload at this time, please contact your "
-"administrator"
-msgstr "Il server non può accettare il caricamento di un nuovo file in questo momento, contattare l'amministratore"
-
-#: mod/photos.php:803
-msgid "Image file is empty."
-msgstr "Il file dell'immagine è vuoto."
-
-#: mod/photos.php:940
-msgid "No photos selected"
-msgstr "Nessuna foto selezionata"
-
-#: mod/photos.php:1036 mod/videos.php:309
-msgid "Access to this item is restricted."
-msgstr "Questo oggetto non è visibile a tutti."
-
-#: mod/photos.php:1090
-msgid "Upload Photos"
-msgstr "Carica foto"
-
-#: mod/photos.php:1094 mod/photos.php:1156
-msgid "New album name: "
-msgstr "Nome nuovo album: "
-
-#: mod/photos.php:1095
-msgid "or existing album name: "
-msgstr "o nome di un album esistente: "
-
-#: mod/photos.php:1096
-msgid "Do not show a status post for this upload"
-msgstr "Non creare un post per questo upload"
-
-#: mod/photos.php:1098 mod/photos.php:1441 mod/events.php:533
-#: src/Core/ACL.php:318
-msgid "Permissions"
-msgstr "Permessi"
-
-#: mod/photos.php:1106 mod/photos.php:1449 mod/settings.php:1218
-msgid "Show to Groups"
-msgstr "Mostra ai gruppi"
-
-#: mod/photos.php:1107 mod/photos.php:1450 mod/settings.php:1219
-msgid "Show to Contacts"
-msgstr "Mostra ai contatti"
-
-#: mod/photos.php:1167
-msgid "Edit Album"
-msgstr "Modifica album"
-
-#: mod/photos.php:1172
-msgid "Show Newest First"
-msgstr "Mostra nuove foto per prime"
-
-#: mod/photos.php:1174
-msgid "Show Oldest First"
-msgstr "Mostra vecchie foto per prime"
-
-#: mod/photos.php:1195 mod/photos.php:1698
-msgid "View Photo"
-msgstr "Vedi foto"
-
-#: mod/photos.php:1236
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Permesso negato. L'accesso a questo elemento può essere limitato."
-
-#: mod/photos.php:1238
-msgid "Photo not available"
-msgstr "Foto non disponibile"
-
-#: mod/photos.php:1301
-msgid "View photo"
-msgstr "Vedi foto"
-
-#: mod/photos.php:1301
-msgid "Edit photo"
-msgstr "Modifica foto"
-
-#: mod/photos.php:1302
-msgid "Use as profile photo"
-msgstr "Usa come foto del profilo"
-
-#: mod/photos.php:1308 src/Object/Post.php:149
-msgid "Private Message"
-msgstr "Messaggio privato"
-
-#: mod/photos.php:1327
-msgid "View Full Size"
-msgstr "Vedi dimensione intera"
-
-#: mod/photos.php:1414
-msgid "Tags: "
-msgstr "Tag: "
-
-#: mod/photos.php:1417
-msgid "[Remove any tag]"
-msgstr "[Rimuovi tutti i tag]"
-
-#: mod/photos.php:1432
-msgid "New album name"
-msgstr "Nuovo nome dell'album"
-
-#: mod/photos.php:1433
-msgid "Caption"
-msgstr "Titolo"
-
-#: mod/photos.php:1434
-msgid "Add a Tag"
-msgstr "Aggiungi tag"
-
-#: mod/photos.php:1434
-msgid ""
-"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr "Esempio: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-
-#: mod/photos.php:1435
-msgid "Do not rotate"
-msgstr "Non ruotare"
-
-#: mod/photos.php:1436
-msgid "Rotate CW (right)"
-msgstr "Ruota a destra"
-
-#: mod/photos.php:1437
-msgid "Rotate CCW (left)"
-msgstr "Ruota a sinistra"
-
-#: mod/photos.php:1471 src/Object/Post.php:304
-msgid "I like this (toggle)"
-msgstr "Mi piace (clic per cambiare)"
-
-#: mod/photos.php:1472 src/Object/Post.php:305
-msgid "I don't like this (toggle)"
-msgstr "Non mi piace (clic per cambiare)"
-
-#: mod/photos.php:1488 mod/photos.php:1527 mod/photos.php:1600
-#: mod/contacts.php:953 src/Object/Post.php:801
-msgid "This is you"
-msgstr "Questo sei tu"
-
-#: mod/photos.php:1490 mod/photos.php:1529 mod/photos.php:1602
-#: src/Object/Post.php:407 src/Object/Post.php:803
-msgid "Comment"
-msgstr "Commento"
-
-#: mod/photos.php:1634
-msgid "Map"
-msgstr "Mappa"
-
-#: mod/photos.php:1704 mod/videos.php:387
-msgid "View Album"
-msgstr "Sfoglia l'album"
-
-#: mod/videos.php:139
-msgid "Do you really want to delete this video?"
-msgstr "Vuoi veramente cancellare questo video?"
-
-#: mod/videos.php:144
-msgid "Delete Video"
-msgstr "Rimuovi video"
-
-#: mod/videos.php:207
-msgid "No videos selected"
-msgstr "Nessun video selezionato"
-
-#: mod/videos.php:396
-msgid "Recent Videos"
-msgstr "Video Recenti"
-
-#: mod/videos.php:398
-msgid "Upload New Videos"
-msgstr "Carica Nuovo Video"
-
-#: mod/cal.php:142 mod/display.php:316 mod/profile.php:174
-msgid "Access to this profile has been restricted."
-msgstr "L'accesso a questo profilo è stato limitato."
-
-#: 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 "Eventi"
-
-#: mod/cal.php:275 mod/events.php:392
-msgid "View"
-msgstr "Mostra"
-
-#: mod/cal.php:276 mod/events.php:394
-msgid "Previous"
-msgstr "Precedente"
-
-#: mod/cal.php:277 mod/events.php:395 mod/install.php:156
-msgid "Next"
-msgstr "Successivo"
-
-#: mod/cal.php:280 mod/events.php:400 src/Model/Event.php:412
-msgid "today"
-msgstr "oggi"
-
-#: mod/cal.php:281 mod/events.php:401 src/Util/Temporal.php:304
-#: src/Model/Event.php:413
-msgid "month"
-msgstr "mese"
-
-#: mod/cal.php:282 mod/events.php:402 src/Util/Temporal.php:305
-#: src/Model/Event.php:414
-msgid "week"
-msgstr "settimana"
-
-#: mod/cal.php:283 mod/events.php:403 src/Util/Temporal.php:306
-#: src/Model/Event.php:415
-msgid "day"
-msgstr "giorno"
-
-#: mod/cal.php:284 mod/events.php:404
-msgid "list"
-msgstr "lista"
-
-#: mod/cal.php:297 src/Core/Console/NewPassword.php:73 src/Model/User.php:214
-msgid "User not found"
-msgstr "Utente non trovato"
-
-#: mod/cal.php:313
-msgid "This calendar format is not supported"
-msgstr "Questo formato di calendario non è supportato"
-
-#: mod/cal.php:315
-msgid "No exportable data found"
-msgstr "Nessun dato esportabile trovato"
-
-#: mod/cal.php:332
-msgid "calendar"
-msgstr "calendario"
-
-#: mod/contacts.php:71 mod/notifications.php:259 src/Model/Profile.php:516
-msgid "Network:"
-msgstr "Rete:"
-
-#: mod/contacts.php:157
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] "%d contatto modificato."
-msgstr[1] "%d contatti modificati"
-
-#: mod/contacts.php:184 mod/contacts.php:400
-msgid "Could not access contact record."
-msgstr "Non è possibile accedere al contatto."
-
-#: mod/contacts.php:194
-msgid "Could not locate selected profile."
-msgstr "Non riesco a trovare il profilo selezionato."
-
-#: mod/contacts.php:228
-msgid "Contact updated."
-msgstr "Contatto aggiornato."
-
-#: mod/contacts.php:230 mod/dfrn_request.php:415
-msgid "Failed to update contact record."
-msgstr "Errore nell'aggiornamento del contatto."
-
-#: mod/contacts.php:421
-msgid "Contact has been blocked"
-msgstr "Il contatto è stato bloccato"
-
-#: mod/contacts.php:421
-msgid "Contact has been unblocked"
-msgstr "Il contatto è stato sbloccato"
-
-#: mod/contacts.php:432
-msgid "Contact has been ignored"
-msgstr "Il contatto è ignorato"
-
-#: mod/contacts.php:432
-msgid "Contact has been unignored"
-msgstr "Il contatto non è più ignorato"
-
-#: mod/contacts.php:443
-msgid "Contact has been archived"
-msgstr "Il contatto è stato archiviato"
-
-#: mod/contacts.php:443
-msgid "Contact has been unarchived"
-msgstr "Il contatto è stato dearchiviato"
-
-#: mod/contacts.php:467
-msgid "Drop contact"
-msgstr "Cancella contatto"
-
-#: mod/contacts.php:470 mod/contacts.php:823
-msgid "Do you really want to delete this contact?"
-msgstr "Vuoi veramente cancellare questo contatto?"
-
-#: mod/contacts.php:488
-msgid "Contact has been removed."
-msgstr "Il contatto è stato rimosso."
-
-#: mod/contacts.php:519
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr "Sei amico reciproco con %s"
-
-#: mod/contacts.php:523
-#, php-format
-msgid "You are sharing with %s"
-msgstr "Stai condividendo con %s"
-
-#: mod/contacts.php:527
-#, php-format
-msgid "%s is sharing with you"
-msgstr "%s sta condividendo con te"
-
-#: mod/contacts.php:547
-msgid "Private communications are not available for this contact."
-msgstr "Le comunicazioni private non sono disponibili per questo contatto."
-
-#: mod/contacts.php:549
-msgid "Never"
-msgstr "Mai"
-
-#: mod/contacts.php:552
-msgid "(Update was successful)"
-msgstr "(L'aggiornamento è stato completato)"
-
-#: mod/contacts.php:552
-msgid "(Update was not successful)"
-msgstr "(L'aggiornamento non è stato completato)"
-
-#: mod/contacts.php:554 mod/contacts.php:992
-msgid "Suggest friends"
-msgstr "Suggerisci amici"
-
-#: mod/contacts.php:558
-#, php-format
-msgid "Network type: %s"
-msgstr "Tipo di rete: %s"
-
-#: mod/contacts.php:563
-msgid "Communications lost with this contact!"
-msgstr "Comunicazione con questo contatto persa!"
-
-#: mod/contacts.php:569
-msgid "Fetch further information for feeds"
-msgstr "Recupera maggiori informazioni per i feed"
-
-#: 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 "Recupera informazioni come immagini di anteprima, titolo e teaser dall'elemento del feed. Puoi attivare questa funzione se il feed non contiene molto testo. Le parole chiave sono recuperate dal tag meta nella pagina dell'elemento e inseriti come hashtag."
-
-#: mod/contacts.php:572 mod/admin.php:1288 mod/admin.php:1450
-#: mod/admin.php:1460
-msgid "Disabled"
-msgstr "Disabilitato"
-
-#: mod/contacts.php:573
-msgid "Fetch information"
-msgstr "Recupera informazioni"
-
-#: mod/contacts.php:574
-msgid "Fetch keywords"
-msgstr "Recupera parole chiave"
-
-#: mod/contacts.php:575
-msgid "Fetch information and keywords"
-msgstr "Recupera informazioni e parole chiave"
-
-#: mod/contacts.php:599 mod/unfollow.php:100
-msgid "Disconnect/Unfollow"
-msgstr "Disconnetti/Non Seguire"
-
-#: mod/contacts.php:608
-msgid "Contact"
-msgstr "Contatto"
-
-#: mod/contacts.php:611
-msgid "Profile Visibility"
-msgstr "Visibilità del profilo"
-
-#: mod/contacts.php:612
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro."
-
-#: mod/contacts.php:613
-msgid "Contact Information / Notes"
-msgstr "Informazioni / Note sul contatto"
-
-#: mod/contacts.php:614
-msgid "Their personal note"
-msgstr "La loro nota personale"
-
-#: mod/contacts.php:616
-msgid "Edit contact notes"
-msgstr "Modifica note contatto"
-
-#: mod/contacts.php:620
-msgid "Block/Unblock contact"
-msgstr "Blocca/Sblocca contatto"
-
-#: mod/contacts.php:621
-msgid "Ignore contact"
-msgstr "Ignora il contatto"
-
-#: mod/contacts.php:622
-msgid "Repair URL settings"
-msgstr "Impostazioni riparazione URL"
-
-#: mod/contacts.php:623
-msgid "View conversations"
-msgstr "Vedi conversazioni"
-
-#: mod/contacts.php:628
-msgid "Last update:"
-msgstr "Ultimo aggiornamento:"
-
-#: mod/contacts.php:630
-msgid "Update public posts"
-msgstr "Aggiorna messaggi pubblici"
-
-#: mod/contacts.php:632 mod/contacts.php:1002
-msgid "Update now"
-msgstr "Aggiorna adesso"
-
-#: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:489 mod/admin.php:1829
-msgid "Unblock"
-msgstr "Sblocca"
-
-#: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:488 mod/admin.php:1828
-msgid "Block"
-msgstr "Blocca"
-
-#: mod/contacts.php:638 mod/contacts.php:828 mod/contacts.php:1019
-msgid "Unignore"
-msgstr "Non ignorare"
-
-#: 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 "Ignora"
-
-#: mod/contacts.php:642
-msgid "Currently blocked"
-msgstr "Bloccato"
-
-#: mod/contacts.php:643
-msgid "Currently ignored"
-msgstr "Ignorato"
-
-#: mod/contacts.php:644
-msgid "Currently archived"
-msgstr "Al momento archiviato"
-
-#: mod/contacts.php:645
-msgid "Awaiting connection acknowledge"
-msgstr "In attesa di conferma della connessione"
-
-#: mod/contacts.php:646 mod/notifications.php:175 mod/notifications.php:253
-msgid "Hide this contact from others"
-msgstr "Nascondi questo contatto agli altri"
-
-#: mod/contacts.php:646
-msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
-msgstr "Risposte ai tuoi post pubblici <strong>possono</strong> essere comunque visibili"
-
-#: mod/contacts.php:647
-msgid "Notification for new posts"
-msgstr "Notifica per i nuovi messaggi"
-
-#: mod/contacts.php:647
-msgid "Send a notification of every new post of this contact"
-msgstr "Invia una notifica per ogni nuovo messaggio di questo contatto"
-
-#: mod/contacts.php:650
-msgid "Blacklisted keywords"
-msgstr "Parole chiave in blacklist"
-
-#: 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 "Lista separata da virgola di parole chiave che non dovranno essere convertite in hashtag, quando \"Recupera informazioni e parole chiave\" è selezionato"
-
-#: 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 Profilo"
-
-#: mod/contacts.php:660 mod/events.php:518 mod/directory.php:148
-#: 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 "Posizione:"
-
-#: 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 "Informazioni:"
-
-#: mod/contacts.php:666 mod/follow.php:174 mod/notifications.php:250
-#: src/Model/Profile.php:792
-msgid "Tags:"
-msgstr "Tag:"
-
-#: mod/contacts.php:667
-msgid "Actions"
-msgstr "Azioni"
-
-#: 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 "Stato"
-
-#: mod/contacts.php:670
-msgid "Contact Settings"
-msgstr "Impostazioni Contatto"
-
-#: mod/contacts.php:711
-msgid "Suggestions"
-msgstr "Suggerimenti"
-
-#: mod/contacts.php:714
-msgid "Suggest potential friends"
-msgstr "Suggerisci potenziali amici"
-
-#: mod/contacts.php:719 mod/group.php:215
-msgid "All Contacts"
-msgstr "Tutti i contatti"
-
-#: mod/contacts.php:722
-msgid "Show all contacts"
-msgstr "Mostra tutti i contatti"
-
-#: mod/contacts.php:727
-msgid "Unblocked"
-msgstr "Sbloccato"
-
-#: mod/contacts.php:730
-msgid "Only show unblocked contacts"
-msgstr "Mostra solo contatti non bloccati"
-
-#: mod/contacts.php:735
-msgid "Blocked"
-msgstr "Bloccato"
-
-#: mod/contacts.php:738
-msgid "Only show blocked contacts"
-msgstr "Mostra solo contatti bloccati"
-
-#: mod/contacts.php:743
-msgid "Ignored"
-msgstr "Ignorato"
-
-#: mod/contacts.php:746
-msgid "Only show ignored contacts"
-msgstr "Mostra solo contatti ignorati"
-
-#: mod/contacts.php:751
-msgid "Archived"
-msgstr "Archiviato"
-
-#: mod/contacts.php:754
-msgid "Only show archived contacts"
-msgstr "Mostra solo contatti archiviati"
-
-#: mod/contacts.php:759
-msgid "Hidden"
-msgstr "Nascosto"
-
-#: mod/contacts.php:762
-msgid "Only show hidden contacts"
-msgstr "Mostra solo contatti nascosti"
-
-#: mod/contacts.php:818
-msgid "Search your contacts"
-msgstr "Cerca nei tuoi contatti"
-
-#: mod/contacts.php:820 mod/directory.php:209 view/theme/vier/theme.php:203
-#: src/Content/Widget.php:63
-msgid "Find"
-msgstr "Trova"
-
-#: mod/contacts.php:826 mod/settings.php:169 mod/settings.php:695
-msgid "Update"
-msgstr "Aggiorna"
-
-#: mod/contacts.php:829 mod/contacts.php:1027
-msgid "Archive"
-msgstr "Archivia"
-
-#: mod/contacts.php:829 mod/contacts.php:1027
-msgid "Unarchive"
-msgstr "Dearchivia"
-
-#: mod/contacts.php:832
-msgid "Batch Actions"
-msgstr "Azioni Batch"
-
-#: mod/contacts.php:858 mod/unfollow.php:132 mod/follow.php:186
-#: src/Model/Profile.php:889
-msgid "Status Messages and Posts"
-msgstr "Messaggi di stato e post"
-
-#: mod/contacts.php:866 src/Model/Profile.php:897
-msgid "Profile Details"
-msgstr "Dettagli del profilo"
-
-#: mod/contacts.php:878
-msgid "View all contacts"
-msgstr "Vedi tutti i contatti"
-
-#: mod/contacts.php:889
-msgid "View all common friends"
-msgstr "Vedi tutti gli amici in comune"
-
-#: mod/contacts.php:895 mod/events.php:532 mod/admin.php:1363
-#: src/Model/Profile.php:863
-msgid "Advanced"
-msgstr "Avanzate"
-
-#: mod/contacts.php:898
-msgid "Advanced Contact Settings"
-msgstr "Impostazioni avanzate Contatto"
-
-#: mod/contacts.php:930
-msgid "Mutual Friendship"
-msgstr "Amicizia reciproca"
-
-#: mod/contacts.php:934
-msgid "is a fan of yours"
-msgstr "è un tuo fan"
-
-#: mod/contacts.php:938
-msgid "you are a fan of"
-msgstr "sei un fan di"
-
-#: mod/contacts.php:1013
-msgid "Toggle Blocked status"
-msgstr "Inverti stato \"Blocca\""
-
-#: mod/contacts.php:1021
-msgid "Toggle Ignored status"
-msgstr "Inverti stato \"Ignora\""
-
-#: mod/contacts.php:1029
-msgid "Toggle Archive status"
-msgstr "Inverti stato \"Archiviato\""
-
-#: mod/contacts.php:1037
-msgid "Delete contact"
-msgstr "Rimuovi contatto"
-
-#: mod/delegate.php:37
-msgid "Parent user not found."
-msgstr "Utente principale non trovato."
-
-#: mod/delegate.php:144
-msgid "No parent user"
-msgstr "Nessun utente principale"
-
-#: mod/delegate.php:159
-msgid "Parent Password:"
-msgstr "Password Principale:"
-
-#: mod/delegate.php:159
-msgid ""
-"Please enter the password of the parent account to legitimize your request."
-msgstr "Inserisci la password dell'account principale per autorizzare la tua richiesta."
-
-#: mod/delegate.php:164
-msgid "Parent User"
-msgstr "Utente Principale"
-
-#: 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 "Gli utenti principali hanno il controllo totale su questo account, comprese le impostazioni. Assicurati di controllare due volte a chi stai fornendo questo accesso."
-
-#: mod/delegate.php:168 mod/admin.php:311 mod/admin.php:1358
-#: mod/admin.php:1994 mod/admin.php:2247 mod/admin.php:2321 mod/admin.php:2468
-#: mod/settings.php:669 mod/settings.php:776 mod/settings.php:864
-#: mod/settings.php:953 mod/settings.php:1183
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
-
-#: mod/delegate.php:169 src/Content/Nav.php:205
-msgid "Delegate Page Management"
-msgstr "Gestione delegati per la pagina"
-
-#: mod/delegate.php:170
-msgid "Delegates"
-msgstr "Delegati"
-
-#: 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 "I Delegati sono in grado di gestire tutti gli aspetti di questa pagina, tranne per le impostazioni di base dell'account. Non delegare il tuo account personale a nessuno di cui non ti fidi ciecamente."
-
-#: mod/delegate.php:173
-msgid "Existing Page Delegates"
-msgstr "Delegati Pagina Esistenti"
-
-#: mod/delegate.php:175
-msgid "Potential Delegates"
-msgstr "Delegati Potenziali"
-
-#: mod/delegate.php:178
-msgid "Add"
-msgstr "Aggiungi"
-
-#: mod/delegate.php:179
-msgid "No entries."
-msgstr "Nessuna voce."
-
-#: mod/events.php:105 mod/events.php:107
-msgid "Event can not end before it has started."
-msgstr "Un evento non può finire prima di iniziare."
-
-#: mod/events.php:114 mod/events.php:116
-msgid "Event title and start time are required."
-msgstr "Titolo e ora di inizio dell'evento sono richiesti."
-
-#: mod/events.php:393
-msgid "Create New Event"
-msgstr "Crea un nuovo evento"
-
-#: mod/events.php:506
-msgid "Event details"
-msgstr "Dettagli dell'evento"
-
-#: mod/events.php:507
-msgid "Starting date and Title are required."
-msgstr "La data di inizio e il titolo sono richiesti."
-
-#: mod/events.php:508 mod/events.php:509
-msgid "Event Starts:"
-msgstr "L'evento inizia:"
-
-#: mod/events.php:508 mod/events.php:520 mod/profiles.php:607
-msgid "Required"
-msgstr "Richiesto"
-
-#: mod/events.php:510 mod/events.php:526
-msgid "Finish date/time is not known or not relevant"
-msgstr "La data/ora di fine non è definita"
-
-#: mod/events.php:512 mod/events.php:513
-msgid "Event Finishes:"
-msgstr "L'evento finisce:"
-
-#: mod/events.php:514 mod/events.php:527
-msgid "Adjust for viewer timezone"
-msgstr "Visualizza con il fuso orario di chi legge"
-
-#: mod/events.php:516
-msgid "Description:"
-msgstr "Descrizione:"
-
-#: mod/events.php:520 mod/events.php:522
-msgid "Title:"
-msgstr "Titolo:"
-
-#: mod/events.php:523 mod/events.php:524
-msgid "Share this event"
-msgstr "Condividi questo evento"
-
-#: mod/events.php:531 src/Model/Profile.php:862
-msgid "Basic"
-msgstr "Base"
-
-#: mod/events.php:552
-msgid "Failed to remove event"
-msgstr "Rimozione evento fallita."
-
-#: mod/events.php:554
-msgid "Event removed"
-msgstr "Evento rimosso"
-
-#: mod/feedtest.php:20
-msgid "You must be logged in to use this module"
-msgstr "Devi aver essere autenticato per usare questo modulo"
-
-#: mod/feedtest.php:48
-msgid "Source URL"
-msgstr "URL Sorgente"
-
-#: mod/oexchange.php:30
-msgid "Post successful."
-msgstr "Inviato!"
-
 #: mod/ostatus_subscribe.php:21
 msgid "Subscribing to OStatus contacts"
 msgstr "Iscrizione a contatti OStatus"
@@ -2876,6 +1474,10 @@ msgstr "Non è stato possibile recuperare le informazioni del contatto."
 msgid "Couldn't fetch friends for contact."
 msgstr "Non è stato possibile recuperare gli amici del contatto."
 
+#: mod/ostatus_subscribe.php:64 mod/repair_ostatus.php:50
+msgid "Done"
+msgstr "Fatto"
+
 #: mod/ostatus_subscribe.php:78
 msgid "success"
 msgstr "successo"
@@ -2884,296 +1486,13 @@ msgstr "successo"
 msgid "failed"
 msgstr "fallito"
 
-#: mod/ostatus_subscribe.php:83 src/Object/Post.php:287
+#: mod/ostatus_subscribe.php:83 src/Object/Post.php:275
 msgid "ignored"
 msgstr "ignorato"
 
-#: mod/profile_photo.php:55
-msgid "Image uploaded but image cropping failed."
-msgstr "L'immagine è stata caricata, ma il non è stato possibile ritagliarla."
-
-#: 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 "Il ridimensionamento dell'immagine [%s] è fallito."
-
-#: mod/profile_photo.php:125
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Ricarica la pagina con shift+F5 o cancella la cache del browser se la nuova foto non viene mostrata immediatamente."
-
-#: mod/profile_photo.php:134
-msgid "Unable to process image"
-msgstr "Impossibile elaborare l'immagine"
-
-#: mod/profile_photo.php:247
-msgid "Upload File:"
-msgstr "Carica un file:"
-
-#: mod/profile_photo.php:248
-msgid "Select a profile:"
-msgstr "Seleziona un profilo:"
-
-#: mod/profile_photo.php:253
-msgid "or"
-msgstr "o"
-
-#: mod/profile_photo.php:253
-msgid "skip this step"
-msgstr "salta questo passaggio"
-
-#: mod/profile_photo.php:253
-msgid "select a photo from your photo albums"
-msgstr "seleziona una foto dai tuoi album"
-
-#: mod/profile_photo.php:266
-msgid "Crop Image"
-msgstr "Ritaglia immagine"
-
-#: mod/profile_photo.php:267
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Ritaglia l'immagine per una visualizzazione migliore."
-
-#: mod/profile_photo.php:269
-msgid "Done Editing"
-msgstr "Finito"
-
-#: mod/profile_photo.php:305
-msgid "Image uploaded successfully."
-msgstr "Immagine caricata con successo."
-
-#: mod/unfollow.php:34
-msgid "Contact wasn't found or can't be unfollowed."
-msgstr "Il contatto non è stato trovato o non si può smettere di seguirlo."
-
-#: mod/unfollow.php:47
-msgid "Contact unfollowed"
-msgstr "Smesso di seguire il contatto"
-
-#: mod/unfollow.php:65 mod/follow.php:62 mod/dfrn_request.php:657
-msgid "Submit Request"
-msgstr "Invia richiesta"
-
-#: mod/unfollow.php:73
-msgid "You aren't a friend of this contact."
-msgstr "Non sei un amico di questo contatto"
-
-#: mod/unfollow.php:79
-msgid "Unfollowing is currently not supported by your network."
-msgstr "Smettere di seguire non è al momento supportato dalla tua rete."
-
-#: mod/unfollow.php:113 mod/follow.php:157 mod/dfrn_request.php:655
-msgid "Your Identity Address:"
-msgstr "L'indirizzo della tua identità:"
-
-#: mod/directory.php:151 mod/notifications.php:252 src/Model/Profile.php:416
-#: src/Model/Profile.php:743
-msgid "Gender:"
-msgstr "Genere:"
-
-#: mod/directory.php:152 src/Model/Profile.php:417 src/Model/Profile.php:767
-msgid "Status:"
-msgstr "Stato:"
-
-#: mod/directory.php:153 src/Model/Profile.php:418 src/Model/Profile.php:784
-msgid "Homepage:"
-msgstr "Homepage:"
-
-#: mod/directory.php:202 view/theme/vier/theme.php:208
-#: src/Content/Widget.php:68
-msgid "Global Directory"
-msgstr "Elenco globale"
-
-#: mod/directory.php:204
-msgid "Find on this site"
-msgstr "Cerca nel sito"
-
-#: mod/directory.php:206
-msgid "Results for:"
-msgstr "Risultati per:"
-
-#: mod/directory.php:208
-msgid "Site Directory"
-msgstr "Elenco del sito"
-
-#: mod/directory.php:213
-msgid "No entries (some entries may be hidden)."
-msgstr "Nessuna voce (qualche voce potrebbe essere nascosta)."
-
-#: mod/dirfind.php:49
-#, php-format
-msgid "People Search - %s"
-msgstr "Cerca persone - %s"
-
-#: mod/dirfind.php:60
-#, php-format
-msgid "Forum Search - %s"
-msgstr "Ricerca Forum  - %s"
-
-#: mod/follow.php:45
-msgid "The contact could not be added."
-msgstr "Il contatto non può essere aggiunto."
-
-#: mod/follow.php:73
-msgid "You already added this contact."
-msgstr "Hai già aggiunto questo contatto."
-
-#: mod/follow.php:83
-msgid "Diaspora support isn't enabled. Contact can't be added."
-msgstr "Il supporto Diaspora non è abilitato. Il contatto non può essere aggiunto."
-
-#: mod/follow.php:90
-msgid "OStatus support is disabled. Contact can't be added."
-msgstr "Il supporto OStatus non è abilitato. Il contatto non può essere aggiunto."
-
-#: mod/follow.php:97
-msgid "The network type couldn't be detected. Contact can't be added."
-msgstr "Non è possibile rilevare il tipo di rete. Il contatto non può essere aggiunto."
-
-#: mod/follow.php:149 mod/dfrn_request.php:647
-msgid "Please answer the following:"
-msgstr "Rispondi:"
-
-#: mod/follow.php:150 mod/dfrn_request.php:648
-#, php-format
-msgid "Does %s know you?"
-msgstr "%s ti conosce?"
-
-#: mod/follow.php:151 mod/dfrn_request.php:649
-msgid "Add a personal note:"
-msgstr "Aggiungi una nota personale:"
-
-#: mod/lostpass.php:27
-msgid "No valid account found."
-msgstr "Nessun account valido trovato."
-
-#: mod/lostpass.php:39
-msgid "Password reset request issued. Check your email."
-msgstr "La richiesta per reimpostare la password è stata inviata. Controlla la tua email."
-
-#: mod/lostpass.php:45
-#, 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 "\nGentile %1$s,\n\tabbiamo ricevuto su \"%2$s\" una richiesta di resettare la password del tuo account. Per confermare questa richiesta, selezionate il link di conferma qui sotto o incollatelo nella barra indirizzo del vostro browser.\n\nSe NON hai richiesto questa modifica, NON selezionare il link e ignora o cancella questa email.\n\nLa tua password non verrà modificata a meno che non possiamo verificare che tu abbia effettivamente richiesto la modifica."
-
-#: mod/lostpass.php:56
-#, 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 "\nSegui questo link per verificare la tua identità:\n\n%1$s\n\nRiceverai in un successivo messaggio la nuova password.\nPotrai cambiarla dalla pagina \"Impostazioni\" del tuo account dopo esserti autenticato.\n\nI dettagli del tuo account sono:\n\tIndirizzo del sito: %2$s\n\tNome utente: %3$s"
-
-#: mod/lostpass.php:73
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Richiesta reimpostazione password su %s"
-
-#: mod/lostpass.php:89
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "La richiesta non può essere verificata. (Puoi averla già richiesta precedentemente). Reimpostazione password fallita."
-
-#: mod/lostpass.php:102
-msgid "Request has expired, please make a new one."
-msgstr "La richiesta è scaduta, si prega di crearne una nuova."
-
-#: mod/lostpass.php:117
-msgid "Forgot your Password?"
-msgstr "Hai dimenticato la password?"
-
-#: mod/lostpass.php:118
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Inserisci il tuo indirizzo email per reimpostare la password."
-
-#: mod/lostpass.php:119 src/Module/Login.php:315
-msgid "Nickname or Email: "
-msgstr "Nome utente o email: "
-
-#: mod/lostpass.php:120
-msgid "Reset"
-msgstr "Reimposta"
-
-#: mod/lostpass.php:136 src/Module/Login.php:327
-msgid "Password Reset"
-msgstr "Reimpostazione password"
-
-#: mod/lostpass.php:137
-msgid "Your password has been reset as requested."
-msgstr "La tua password è stata reimpostata come richiesto."
-
-#: mod/lostpass.php:138
-msgid "Your new password is"
-msgstr "La tua nuova password è"
-
-#: mod/lostpass.php:139
-msgid "Save or copy your new password - and then"
-msgstr "Salva o copia la tua nuova password, quindi"
-
-#: mod/lostpass.php:140
-msgid "click here to login"
-msgstr "clicca qui per entrare"
-
-#: mod/lostpass.php:141
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Puoi cambiare la tua password dalla pagina <em>Impostazioni</em> dopo aver effettuato l'accesso."
-
-#: mod/lostpass.php:149
-#, 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 "\nGentile %1$s,\n\tLa tua password è stata modificata come richiesto.\nSalva questa password, o sostituiscila immediatamente con qualcosa che puoi ricordare."
-
-#: mod/lostpass.php:155
-#, 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 "\nI dettagli del tuo account sono:\n\n\tIndirizzo del sito: %1$s\n\tNome utente: %2$s\n\tPassword: %3$s\n\nPuoi cambiare questa password dalla pagina \"Impostazioni\" del tuo account dopo esserti autenticato."
-
-#: mod/lostpass.php:169
-#, php-format
-msgid "Your password has been changed at %s"
-msgstr "La tua password presso %s è stata cambiata"
+#: mod/ostatus_subscribe.php:88 mod/repair_ostatus.php:56
+msgid "Keep this window open until done."
+msgstr "Tieni questa finestra aperta fino a che ha finito."
 
 #: mod/babel.php:22
 msgid "Source input"
@@ -3251,840 +1570,274 @@ msgstr "Markdown"
 msgid "HTML"
 msgstr "HTML"
 
-#: mod/community.php:51
-msgid "Community option not available."
-msgstr "Opzione Comunità non disponibile"
+#: 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 "[Contenuto incorporato - ricarica la pagina per visualizzarlo correttamente]"
 
-#: mod/community.php:68
-msgid "Not available."
-msgstr "Non disponibile."
+#: mod/bookmarklet.php:24 src/Content/Nav.php:114 src/Module/Login.php:312
+msgid "Login"
+msgstr "Accedi"
 
-#: mod/community.php:81
-msgid "Local Community"
-msgstr "Comunità Locale"
+#: mod/bookmarklet.php:52
+msgid "The post was created"
+msgstr "Il messaggio è stato creato"
 
-#: mod/community.php:84
-msgid "Posts from local users on this server"
-msgstr "Messaggi dagli utenti locali su questo sito"
+#: mod/filer.php:34
+msgid "- select -"
+msgstr "- seleziona -"
 
-#: mod/community.php:92
-msgid "Global Community"
-msgstr "Comunità Globale"
-
-#: mod/community.php:95
-msgid "Posts from users of the whole federated network"
-msgstr "Messaggi dagli utenti della rete federata"
-
-#: 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 "Questa pagina comunità mostra tutti i post pubblici ricevuti da questo nodo. Potrebbero non riflettere le opinioni degli utenti di questo nodo."
-
-#: mod/friendica.php:77
-msgid "This is Friendica, version"
-msgstr "Questo è Friendica, versione"
-
-#: mod/friendica.php:78
-msgid "running at web location"
-msgstr "in esecuzione all'indirizzo web"
-
-#: mod/friendica.php:82
-msgid ""
-"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
-"about the Friendica project."
-msgstr "Visita <a href=\"https://friendi.ca\">Friendi.ca</a> per saperne di più sul progetto Friendica."
-
-#: mod/friendica.php:86
-msgid "Bug reports and issues: please visit"
-msgstr "Segnalazioni di bug e problemi: visita"
-
-#: mod/friendica.php:86
-msgid "the bugtracker at github"
-msgstr "il bugtracker su github"
-
-#: mod/friendica.php:89
-msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
-msgstr "Per suggerimenti, lodi, ecc., invia una mail a info chiocciola friendi punto ca"
-
-#: mod/friendica.php:103
-msgid "Installed addons/apps:"
-msgstr "Addon/applicazioni installate"
-
-#: mod/friendica.php:117
-msgid "No installed addons/apps"
-msgstr "Nessun addons/applicazione installata"
-
-#: mod/friendica.php:122
-#, php-format
-msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
-msgstr "Leggi i <a href=\"%1$s/tos\">Termini di Servizio</a> di questo nodo."
-
-#: mod/friendica.php:127
-msgid "On this server the following remote servers are blocked."
-msgstr "In questo server i seguenti server remoti sono bloccati."
-
-#: 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 "Dominio bloccato"
-
-#: mod/friendica.php:128 mod/admin.php:358 mod/admin.php:376
-msgid "Reason for the block"
-msgstr "Motivazione del blocco"
-
-#: mod/invite.php:33
-msgid "Total invitation limit exceeded."
-msgstr "Limite totale degli inviti superato."
-
-#: mod/invite.php:55
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s: non è un indirizzo email valido."
-
-#: mod/invite.php:87
-msgid "Please join us on Friendica"
-msgstr "Unisciti a noi su Friendica"
-
-#: mod/invite.php:96
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Limite degli inviti superato. Contatta l'amministratore del tuo sito."
-
-#: mod/invite.php:100
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s: la consegna del messaggio fallita."
-
-#: mod/invite.php:104
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d messaggio inviato."
-msgstr[1] "%d messaggi inviati."
-
-#: mod/invite.php:122
-msgid "You have no more invitations available"
-msgstr "Non hai altri inviti disponibili"
-
-#: 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 "Visita %s per una lista di siti pubblici a cui puoi iscriverti. I membri Friendica su altri siti possono collegarsi uno con l'altro, come con membri di molti altri social network."
-
-#: mod/invite.php:132
-#, php-format
-msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
-msgstr "Per accettare questo invito, visita e registrati su %s o su un'altro sito web Friendica aperto al pubblico."
-
-#: 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 "I siti Friendica son tutti collegati tra loro per creare una grossa rete sociale rispettosa della privacy, posseduta e controllata dai suoi membri. I siti Friendica possono anche collegarsi a molti altri social network tradizionali. Vai su %s per una lista di siti Friendica alternativi a cui puoi iscriverti."
-
-#: mod/invite.php:137
-msgid ""
-"Our apologies. This system is not currently configured to connect with other"
-" public sites or invite members."
-msgstr "Ci scusiamo, questo sistema non è configurato per collegarsi con altri siti pubblici o per invitare membri."
-
-#: 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 "I siti Friendica son tutti collegati tra loro per creare una grossa rete sociale rispettosa della privacy, posseduta e controllata dai suoi membri. I siti Friendica possono anche collegarsi a molti altri social network tradizionali."
-
-#: mod/invite.php:140
-#, php-format
-msgid "To accept this invitation, please visit and register at %s."
-msgstr "Per accettare questo invito, visita e registrati su %s"
-
-#: mod/invite.php:147
-msgid "Send invitations"
-msgstr "Invia inviti"
-
-#: mod/invite.php:148
-msgid "Enter email addresses, one per line:"
-msgstr "Inserisci gli indirizzi email, uno per riga:"
-
-#: 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 "Sei cordialmente invitato/a ad unirti a me e ad altri amici su Friendica, e ad aiutarci a creare una rete sociale migliore."
-
-#: mod/invite.php:151
-msgid "You will need to supply this invitation code: $invite_code"
-msgstr "Sarà necessario fornire questo codice invito: $invite_code"
-
-#: mod/invite.php:151
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
-msgstr "Una volta registrato, connettiti con me dal mio profilo:"
-
-#: 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 "Per maggiori informazioni sul progetto Friendica e perchè pensiamo sia importante, visita http://friendi.ca "
-
-#: mod/network.php:202 src/Model/Group.php:413
-msgid "add"
-msgstr "aggiungi"
-
-#: 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] "Attenzione: Questo gruppo contiene %s membro da una rete che non permette la ricezione di messaggi non pubblici."
-msgstr[1] "Attenzione: Questo gruppo contiene %s membri da reti che non permettono la ricezione di messaggi non pubblici."
-
-#: mod/network.php:550
-msgid "Messages in this group won't be send to these receivers."
-msgstr "I messaggi in questo gruppo non saranno inviati ai quei contatti."
-
-#: mod/network.php:618
-msgid "No such group"
-msgstr "Nessun gruppo"
-
-#: mod/network.php:639 mod/group.php:216
-msgid "Group is empty"
-msgstr "Il gruppo è vuoto"
-
-#: mod/network.php:643
-#, php-format
-msgid "Group: %s"
-msgstr "Gruppo: %s"
-
-#: mod/network.php:669
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr "I messaggi privati a questa persona potrebbero risultare visibili anche pubblicamente."
-
-#: mod/network.php:672
-msgid "Invalid contact."
-msgstr "Contatto non valido."
-
-#: mod/network.php:937
-msgid "Commented Order"
-msgstr "Ordina per commento"
-
-#: mod/network.php:940
-msgid "Sort by Comment Date"
-msgstr "Ordina per data commento"
-
-#: mod/network.php:945
-msgid "Posted Order"
-msgstr "Ordina per invio"
-
-#: mod/network.php:948
-msgid "Sort by Post Date"
-msgstr "Ordina per data messaggio"
-
-#: mod/network.php:956 mod/profiles.php:594
-#: src/Core/NotificationsManager.php:185
-msgid "Personal"
-msgstr "Personale"
-
-#: mod/network.php:959
-msgid "Posts that mention or involve you"
-msgstr "Messaggi che ti citano o coinvolgono"
-
-#: mod/network.php:967
-msgid "New"
-msgstr "Nuovo"
-
-#: mod/network.php:970
-msgid "Activity Stream - by date"
-msgstr "Activity Stream - per data"
-
-#: mod/network.php:978
-msgid "Shared Links"
-msgstr "Links condivisi"
-
-#: mod/network.php:981
-msgid "Interesting Links"
-msgstr "Link Interessanti"
-
-#: mod/network.php:989
-msgid "Starred"
-msgstr "Preferiti"
-
-#: mod/network.php:992
-msgid "Favourite Posts"
-msgstr "Messaggi preferiti"
-
-#: mod/crepair.php:87
-msgid "Contact settings applied."
-msgstr "Contatto modificato."
-
-#: mod/crepair.php:89
-msgid "Contact update failed."
-msgstr "Le modifiche al contatto non sono state salvate."
-
-#: 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>ATTENZIONE: Queste sono impostazioni avanzate</strong> e se inserisci informazioni errate le tue comunicazioni con questo contatto potrebbero non funzionare più"
-
-#: 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 "Usa <strong>ora</strong> il tasto 'Indietro' del tuo browser se non sei sicuro di cosa fare in questa pagina."
-
-#: mod/crepair.php:129 mod/crepair.php:131
-msgid "No mirroring"
-msgstr "Non duplicare"
-
-#: mod/crepair.php:129
-msgid "Mirror as forwarded posting"
-msgstr "Duplica come messaggi ricondivisi"
-
-#: mod/crepair.php:129 mod/crepair.php:131
-msgid "Mirror as my own posting"
-msgstr "Duplica come miei messaggi"
-
-#: mod/crepair.php:144
-msgid "Return to contact editor"
-msgstr "Ritorna alla modifica contatto"
-
-#: mod/crepair.php:146
-msgid "Refetch contact data"
-msgstr "Ricarica dati contatto"
-
-#: mod/crepair.php:149
-msgid "Remote Self"
-msgstr "Io remoto"
-
-#: mod/crepair.php:152
-msgid "Mirror postings from this contact"
-msgstr "Ripeti i messaggi di questo contatto"
-
-#: mod/crepair.php:154
-msgid ""
-"Mark this contact as remote_self, this will cause friendica to repost new "
-"entries from this contact."
-msgstr "Imposta questo contatto come 'io remoto', questo farà si che friendica re invii i nuovi messaggi da questo contatto."
-
-#: mod/crepair.php:158 mod/admin.php:494 mod/admin.php:1811 mod/admin.php:1822
-#: mod/admin.php:1835 mod/admin.php:1851 mod/settings.php:671
-#: mod/settings.php:697
-msgid "Name"
-msgstr "Nome"
-
-#: mod/crepair.php:159
-msgid "Account Nickname"
-msgstr "Nome utente"
-
-#: mod/crepair.php:160
-msgid "@Tagname - overrides Name/Nickname"
-msgstr "@TagName - al posto del nome utente"
-
-#: mod/crepair.php:161
-msgid "Account URL"
-msgstr "URL dell'utente"
-
-#: mod/crepair.php:162
-msgid "Friend Request URL"
-msgstr "URL Richiesta Amicizia"
-
-#: mod/crepair.php:163
-msgid "Friend Confirm URL"
-msgstr "URL Conferma Amicizia"
-
-#: mod/crepair.php:164
-msgid "Notification Endpoint URL"
-msgstr "URL Notifiche"
-
-#: mod/crepair.php:165
-msgid "Poll/Feed URL"
-msgstr "URL Feed"
-
-#: mod/crepair.php:166
-msgid "New photo from this URL"
-msgstr "Nuova foto da questo URL"
-
-#: mod/dfrn_poll.php:123 mod/dfrn_poll.php:539
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr "%s dà il benvenuto a %s"
-
-#: mod/help.php:48
+#: mod/help.php:49
 msgid "Help:"
 msgstr "Guida:"
 
-#: mod/help.php:54 view/theme/vier/theme.php:297 src/Content/Nav.php:134
+#: mod/help.php:56 view/theme/vier/theme.php:295 src/Content/Nav.php:134
 msgid "Help"
 msgstr "Guida"
 
-#: mod/help.php:63 index.php:317
+#: mod/help.php:62 mod/fetch.php:19 mod/fetch.php:46 mod/fetch.php:53
+#: index.php:308
+msgid "Not Found"
+msgstr "Non trovato"
+
+#: mod/help.php:65 index.php:313
 msgid "Page not found."
 msgstr "Pagina non trovata."
 
-#: mod/install.php:87
-msgid "Friendica Communications Server - Setup"
-msgstr "Friendica Comunicazione Server - Impostazioni"
-
-#: mod/install.php:93
-msgid "Could not connect to database."
-msgstr " Impossibile collegarsi con il database."
-
-#: mod/install.php:97
-msgid "Could not create table."
-msgstr "Impossibile creare le tabelle."
-
-#: mod/install.php:103
-msgid "Your Friendica site database has been installed."
-msgstr "Il tuo Friendica è stato installato."
-
-#: mod/install.php:108
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr "Potresti dover importare il file \"database.sql\" manualmente con phpmyadmin o mysql"
-
-#: mod/install.php:109 mod/install.php:155 mod/install.php:267
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Leggi il file \"INSTALL.txt\"."
-
-#: mod/install.php:121
-msgid "Database already in use."
-msgstr "Database già in uso."
-
-#: mod/install.php:152
-msgid "System check"
-msgstr "Controllo sistema"
-
-#: mod/install.php:157
-msgid "Check again"
-msgstr "Controlla ancora"
-
-#: mod/install.php:177
-msgid "Database connection"
-msgstr "Connessione al database"
-
-#: mod/install.php:178
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
-msgstr "Per installare Friendica dobbiamo sapere come collegarci al tuo database."
-
-#: mod/install.php:179
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Contatta il tuo fornitore di hosting o l'amministratore del sito se hai domande su queste impostazioni."
-
-#: mod/install.php:180
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "Il database dovrà già esistere. Se non esiste, crealo prima di continuare."
-
-#: mod/install.php:184
-msgid "Database Server Name"
-msgstr "Nome del database server"
-
-#: mod/install.php:185
-msgid "Database Login Name"
-msgstr "Nome utente database"
-
-#: mod/install.php:186
-msgid "Database Login Password"
-msgstr "Password utente database"
-
-#: mod/install.php:186
-msgid "For security reasons the password must not be empty"
-msgstr "Per motivi di sicurezza la password non puo' essere vuota."
-
-#: mod/install.php:187
-msgid "Database Name"
-msgstr "Nome database"
-
-#: mod/install.php:188 mod/install.php:228
-msgid "Site administrator email address"
-msgstr "Indirizzo email dell'amministratore del sito"
-
-#: 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 "Il tuo indirizzo email deve corrispondere a questo per poter usare il pannello di amministrazione web."
-
-#: mod/install.php:192 mod/install.php:231
-msgid "Please select a default timezone for your website"
-msgstr "Seleziona il fuso orario predefinito per il tuo sito web"
-
-#: mod/install.php:218
-msgid "Site settings"
-msgstr "Impostazioni sito"
-
-#: mod/install.php:232
-msgid "System Language:"
-msgstr "Lingua di Sistema:"
-
-#: mod/install.php:232
-msgid ""
-"Set the default language for your Friendica installation interface and to "
-"send emails."
-msgstr "Imposta la lingua di default per l'interfaccia e l'invio delle email."
-
-#: 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 "Il file di configurazione del database \".htconfig.php\" non può essere scritto. Usa il testo qui di seguito per creare un file di configurazione nella cartella principale del tuo sito."
-
-#: mod/install.php:265
-msgid "<h1>What next</h1>"
-msgstr "<h1>Cosa fare ora</h1>"
-
-#: mod/install.php:266
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"worker."
-msgstr "IMPORTANTE: Devi impostare [manualmente] la pianificazione del worker."
-
-#: mod/install.php:269
+#: mod/home.php:39
 #, php-format
+msgid "Welcome to %s"
+msgstr "Benvenuto su %s"
+
+#: mod/uimport.php:55 mod/register.php:191
 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 "Vai nella <a href=\"%s/register\">pagina di registrazione</a> del tuo nuovo nodo Friendica e registra un nuovo utente. Ricorda di usare la stessa email che hai inserito come email dell'utente amministratore. Questo ti permetterà di entrare nel pannello di amministrazione del sito."
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Questo sito ha superato il numero di registrazioni giornaliere consentite. Prova di nuovo domani."
 
-#: mod/message.php:30 src/Content/Nav.php:199
-msgid "New Message"
-msgstr "Nuovo messaggio"
+#: mod/uimport.php:70 mod/register.php:287
+msgid "Import"
+msgstr "Importa"
 
-#: mod/message.php:77
-msgid "Unable to locate contact information."
-msgstr "Impossibile trovare le informazioni del contatto."
+#: mod/uimport.php:72
+msgid "Move account"
+msgstr "Muovi account"
 
-#: mod/message.php:112 view/theme/frio/theme.php:268 src/Content/Nav.php:196
-msgid "Messages"
-msgstr "Messaggi"
+#: mod/uimport.php:73
+msgid "You can import an account from another Friendica server."
+msgstr "Puoi importare un account da un altro server Friendica."
 
-#: mod/message.php:136
-msgid "Do you really want to delete this message?"
-msgstr "Vuoi veramente cancellare questo messaggio?"
-
-#: mod/message.php:152
-msgid "Message deleted."
-msgstr "Messaggio eliminato."
-
-#: mod/message.php:166
-msgid "Conversation removed."
-msgstr "Conversazione rimossa."
-
-#: mod/message.php:272
-msgid "No messages."
-msgstr "Nessun messaggio."
-
-#: mod/message.php:311
-msgid "Message not available."
-msgstr "Messaggio non disponibile."
-
-#: mod/message.php:378
-msgid "Delete message"
-msgstr "Elimina il messaggio"
-
-#: mod/message.php:380 mod/message.php:481
-msgid "D, d M Y - g:i A"
-msgstr "D d M Y - G:i"
-
-#: mod/message.php:395 mod/message.php:478
-msgid "Delete conversation"
-msgstr "Elimina la conversazione"
-
-#: mod/message.php:397
+#: mod/uimport.php:74
 msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Nessuna comunicazione sicura disponibile, <strong>Potresti</strong> essere in grado di rispondere dalla pagina del profilo del mittente."
+"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 "Devi esportare il tuo account dal vecchio server e caricarlo qui. Noi ricreeremo il tuo vecchio account qui, con tutti i tuoi contatti. Proveremo anche a informare i tuoi amici che ti sei spostato qui."
 
-#: mod/message.php:401
-msgid "Send Reply"
-msgstr "Invia la risposta"
-
-#: mod/message.php:452
-#, php-format
-msgid "Unknown sender - %s"
-msgstr "Mittente sconosciuto - %s"
-
-#: mod/message.php:454
-#, php-format
-msgid "You and %s"
-msgstr "Tu e %s"
-
-#: mod/message.php:456
-#, php-format
-msgid "%s and You"
-msgstr "%s e Tu"
-
-#: mod/message.php:484
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d messaggio"
-msgstr[1] "%d messaggi"
-
-#: mod/group.php:36
-msgid "Group created."
-msgstr "Gruppo creato."
-
-#: mod/group.php:42
-msgid "Could not create group."
-msgstr "Impossibile creare il gruppo."
-
-#: mod/group.php:56 mod/group.php:157
-msgid "Group not found."
-msgstr "Gruppo non trovato."
-
-#: mod/group.php:70
-msgid "Group name changed."
-msgstr "Il nome del gruppo è cambiato."
-
-#: mod/group.php:97
-msgid "Save Group"
-msgstr "Salva gruppo"
-
-#: mod/group.php:102
-msgid "Create a group of contacts/friends."
-msgstr "Crea un gruppo di amici/contatti."
-
-#: mod/group.php:103 mod/group.php:199 src/Model/Group.php:421
-msgid "Group Name: "
-msgstr "Nome del gruppo:"
-
-#: mod/group.php:127
-msgid "Group removed."
-msgstr "Gruppo rimosso."
-
-#: mod/group.php:129
-msgid "Unable to remove group."
-msgstr "Impossibile rimuovere il gruppo."
-
-#: mod/group.php:192
-msgid "Delete Group"
-msgstr "Elimina Gruppo"
-
-#: mod/group.php:198
-msgid "Group Editor"
-msgstr "Modifica gruppo"
-
-#: mod/group.php:203
-msgid "Edit Group Name"
-msgstr "Modifica Nome Gruppo"
-
-#: mod/group.php:213
-msgid "Members"
-msgstr "Membri"
-
-#: mod/group.php:229
-msgid "Remove contact from group"
-msgstr "Rimuovi il contatto dal gruppo"
-
-#: mod/group.php:253
-msgid "Add contact to group"
-msgstr "Aggiungi il contatto al gruppo"
-
-#: mod/openid.php:29
-msgid "OpenID protocol error. No ID returned."
-msgstr "Errore protocollo OpenID. Nessun ID ricevuto."
-
-#: mod/openid.php:66
+#: mod/uimport.php:75
 msgid ""
-"Account not found and OpenID registration is not permitted on this site."
-msgstr "L'account non è stato trovato, e la registrazione via OpenID non è permessa su questo sito."
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (GNU Social/Statusnet) or from Diaspora"
+msgstr "Questa funzione è sperimentale. Non possiamo importare i contatti dalla rete OStatus (GNU Social/Statusnet) o da Diaspora"
 
-#: mod/openid.php:116 src/Module/Login.php:86 src/Module/Login.php:135
-msgid "Login failed."
-msgstr "Accesso fallito."
+#: mod/uimport.php:76
+msgid "Account file"
+msgstr "File account"
 
-#: mod/admin.php:107
+#: mod/uimport.php:76
+msgid ""
+"To export your account, go to \"Settings->Export your personal data\" and "
+"select \"Export account\""
+msgstr "Per esportare il tuo account, vai su \"Impostazioni -> Esporta i tuoi dati personali\" e seleziona \"Esporta account\""
+
+#: mod/admin.php:108
 msgid "Theme settings updated."
 msgstr "Impostazioni del tema aggiornate."
 
-#: mod/admin.php:180 src/Content/Nav.php:175
+#: mod/admin.php:181 src/Content/Nav.php:175
 msgid "Information"
 msgstr "Informazioni"
 
-#: mod/admin.php:181
+#: mod/admin.php:182
 msgid "Overview"
 msgstr "Panoramica"
 
-#: mod/admin.php:182 mod/admin.php:722
+#: mod/admin.php:183 mod/admin.php:722
 msgid "Federation Statistics"
 msgstr "Statistiche sulla Federazione"
 
-#: mod/admin.php:183
+#: mod/admin.php:184
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: mod/admin.php:184 mod/admin.php:1357
+#: mod/admin.php:185 mod/admin.php:1405
 msgid "Site"
 msgstr "Sito"
 
-#: mod/admin.php:185 mod/admin.php:1289 mod/admin.php:1817 mod/admin.php:1833
+#: mod/admin.php:186 mod/admin.php:1334 mod/admin.php:1873 mod/admin.php:1890
 msgid "Users"
 msgstr "Utenti"
 
-#: mod/admin.php:186 mod/admin.php:1933 mod/admin.php:1993 mod/settings.php:87
+#: mod/admin.php:187 mod/admin.php:1990 mod/admin.php:2050 mod/settings.php:94
 msgid "Addons"
 msgstr "Addons"
 
-#: mod/admin.php:187 mod/admin.php:2202 mod/admin.php:2246
+#: mod/admin.php:188 mod/admin.php:2260 mod/admin.php:2304
 msgid "Themes"
 msgstr "Temi"
 
-#: mod/admin.php:188 mod/settings.php:65
+#: mod/admin.php:189 mod/settings.php:72
 msgid "Additional features"
 msgstr "Funzionalità aggiuntive"
 
-#: mod/admin.php:189 mod/admin.php:304 mod/register.php:291
+#: 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 "Codizioni del Servizio"
 
-#: mod/admin.php:190
+#: mod/admin.php:191
 msgid "Database"
 msgstr "Database"
 
-#: mod/admin.php:191
+#: mod/admin.php:192
 msgid "DB updates"
 msgstr "Aggiornamenti Database"
 
-#: mod/admin.php:192 mod/admin.php:757
+#: mod/admin.php:193 mod/admin.php:757
 msgid "Inspect Queue"
 msgstr "Ispeziona Coda di invio"
 
-#: mod/admin.php:193
+#: mod/admin.php:194
+msgid "Inspect worker Queue"
+msgstr "Analizza coda lavori"
+
+#: mod/admin.php:195
 msgid "Tools"
 msgstr "Strumenti"
 
-#: mod/admin.php:194
+#: mod/admin.php:196
 msgid "Contact Blocklist"
 msgstr "Blocklist Contatti"
 
-#: mod/admin.php:195 mod/admin.php:366
+#: mod/admin.php:197 mod/admin.php:371
 msgid "Server Blocklist"
 msgstr "Server Blocklist"
 
-#: mod/admin.php:196 mod/admin.php:525
+#: mod/admin.php:198 mod/admin.php:530
 msgid "Delete Item"
 msgstr "Rimuovi elemento"
 
-#: mod/admin.php:197 mod/admin.php:198 mod/admin.php:2320
+#: mod/admin.php:199 mod/admin.php:200 mod/admin.php:2379
 msgid "Logs"
 msgstr "Log"
 
-#: mod/admin.php:199 mod/admin.php:2387
+#: mod/admin.php:201 mod/admin.php:2446
 msgid "View Logs"
 msgstr "Vedi i log"
 
-#: mod/admin.php:201
+#: mod/admin.php:203
 msgid "Diagnostics"
 msgstr "Diagnostiche"
 
-#: mod/admin.php:202
+#: mod/admin.php:204
 msgid "PHP Info"
 msgstr "Info PHP"
 
-#: mod/admin.php:203
+#: mod/admin.php:205
 msgid "probe address"
 msgstr "controlla indirizzo"
 
-#: mod/admin.php:204
+#: mod/admin.php:206
 msgid "check webfinger"
 msgstr "verifica webfinger"
 
-#: mod/admin.php:223 src/Content/Nav.php:218
+#: mod/admin.php:225 src/Content/Nav.php:218
 msgid "Admin"
 msgstr "Amministrazione"
 
-#: mod/admin.php:224
+#: mod/admin.php:226
 msgid "Addon Features"
 msgstr "Funzioni Addon"
 
-#: mod/admin.php:225
+#: mod/admin.php:227
 msgid "User registrations waiting for confirmation"
 msgstr "Utenti registrati in attesa di conferma"
 
-#: mod/admin.php:303 mod/admin.php:365 mod/admin.php:482 mod/admin.php:524
-#: mod/admin.php:721 mod/admin.php:756 mod/admin.php:852 mod/admin.php:1356
-#: mod/admin.php:1816 mod/admin.php:1932 mod/admin.php:1992 mod/admin.php:2201
-#: mod/admin.php:2245 mod/admin.php:2319 mod/admin.php:2386
+#: 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 "Amministrazione"
 
-#: mod/admin.php:305
+#: mod/admin.php:310
 msgid "Display Terms of Service"
 msgstr "Mostra i Termini di Servizio"
 
-#: mod/admin.php:305
+#: 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 "Abilita la pagina dei Termini di Servizio. Se abilitato, un link ai termini sarà aggiunto alla pagina di registrazione e nella pagina delle informazioni generali."
 
-#: mod/admin.php:306
+#: mod/admin.php:311
 msgid "Display Privacy Statement"
 msgstr "Visualizza l'Informativa sulla Privacy"
 
-#: mod/admin.php:306
+#: 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 "Mostra dettagli sulle informazioni richieste per gestire il nodo in accordo, per esempio, al <a href=\"%s\" target=\"_blank\">GDPR</a>."
 
-#: mod/admin.php:307
+#: mod/admin.php:312
 msgid "Privacy Statement Preview"
 msgstr "Anteprima Informativa sulla Privacy"
 
-#: mod/admin.php:309
+#: mod/admin.php:314
 msgid "The Terms of Service"
 msgstr "Le Codizioni del Servizio"
 
-#: mod/admin.php:309
+#: 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 "Inserisci i Termini di Servizio del tuo nodo qui. Puoi usare BBCode. Le intestazioni delle sezioni dovrebbero partire da [h2]."
 
-#: mod/admin.php:357
+#: 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 "Salva Impostazioni"
+
+#: 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 "Dominio bloccato"
+
+#: mod/admin.php:362
 msgid "The blocked domain"
 msgstr "Il dominio bloccato"
 
-#: mod/admin.php:358 mod/admin.php:371
+#: mod/admin.php:363 mod/admin.php:381 mod/friendica.php:130
+msgid "Reason for the block"
+msgstr "Motivazione del blocco"
+
+#: mod/admin.php:363 mod/admin.php:376
 msgid "The reason why you blocked this domain."
 msgstr "Le ragioni per cui blocchi questo dominio."
 
-#: mod/admin.php:359
+#: mod/admin.php:364
 msgid "Delete domain"
 msgstr "Elimina dominio"
 
-#: mod/admin.php:359
+#: mod/admin.php:364
 msgid "Check to delete this entry from the blocklist"
 msgstr "Seleziona per eliminare questa voce dalla blocklist"
 
-#: mod/admin.php:367
+#: 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 "
@@ -4092,150 +1845,171 @@ msgid ""
 "server."
 msgstr "Questa pagina puo' essere usata per definire una black list di server dal network federato a cui nono è permesso interagire col tuo nodo. Per ogni dominio inserito, dovresti anche riportare una ragione per cui hai bloccato il server remoto."
 
-#: mod/admin.php:368
+#: 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 "La lista di server bloccati sarà resa disponibile pubblicamente sulla pagina /friendica, così che i tuoi utenti e le persone che indagano su problemi di comunicazione possano trovarne la ragione facilmente."
 
-#: mod/admin.php:369
+#: mod/admin.php:374
 msgid "Add new entry to block list"
 msgstr "Aggiungi una nuova voce alla blocklist"
 
-#: mod/admin.php:370
+#: mod/admin.php:375
 msgid "Server Domain"
 msgstr "Dominio del Server"
 
-#: mod/admin.php:370
+#: mod/admin.php:375
 msgid ""
 "The domain of the new server to add to the block list. Do not include the "
 "protocol."
 msgstr "Il dominio del server da aggiungere alla blocklist. Non includere il protocollo."
 
-#: mod/admin.php:371
+#: mod/admin.php:376
 msgid "Block reason"
 msgstr "Ragione blocco"
 
-#: mod/admin.php:372
+#: mod/admin.php:377
 msgid "Add Entry"
 msgstr "Aggiungi Voce"
 
-#: mod/admin.php:373
+#: mod/admin.php:378
 msgid "Save changes to the blocklist"
 msgstr "Salva modifiche alla blocklist"
 
-#: mod/admin.php:374
+#: mod/admin.php:379
 msgid "Current Entries in the Blocklist"
 msgstr "Voci correnti nella blocklist"
 
-#: mod/admin.php:377
+#: mod/admin.php:382
 msgid "Delete entry from blocklist"
 msgstr "Elimina voce dalla blocklist"
 
-#: mod/admin.php:380
+#: mod/admin.php:385
 msgid "Delete entry from blocklist?"
 msgstr "Eliminare la voce dalla blocklist?"
 
-#: mod/admin.php:406
+#: mod/admin.php:411
 msgid "Server added to blocklist."
 msgstr "Server aggiunto alla blocklist."
 
-#: mod/admin.php:422
+#: mod/admin.php:427
 msgid "Site blocklist updated."
 msgstr "Blocklist del sito aggiornata."
 
-#: mod/admin.php:445 src/Core/Console/GlobalCommunityBlock.php:72
+#: mod/admin.php:450 src/Core/Console/GlobalCommunityBlock.php:68
 msgid "The contact has been blocked from the node"
 msgstr "Il contatto è stato bloccato dal nodo"
 
-#: mod/admin.php:447 src/Core/Console/GlobalCommunityBlock.php:69
+#: mod/admin.php:452 src/Core/Console/GlobalCommunityBlock.php:65
 #, php-format
 msgid "Could not find any contact entry for this URL (%s)"
 msgstr "Impossibile trovare contatti a questo URL (%s)"
 
-#: mod/admin.php:454
+#: mod/admin.php:459
 #, php-format
 msgid "%s contact unblocked"
 msgid_plural "%s contacts unblocked"
 msgstr[0] "%s contatto sbloccato"
 msgstr[1] "%s contatti sbloccati"
 
-#: mod/admin.php:483
+#: mod/admin.php:488
 msgid "Remote Contact Blocklist"
 msgstr "Blocklist Contatti Remoti"
 
-#: mod/admin.php:484
+#: mod/admin.php:489
 msgid ""
 "This page allows you to prevent any message from a remote contact to reach "
 "your node."
 msgstr "Questa pagina ti permette di impedire che qualsiasi messaggio da un contatto remoto raggiunga il tuo nodo."
 
-#: mod/admin.php:485
+#: mod/admin.php:490
 msgid "Block Remote Contact"
 msgstr "Blocca Contatto Remoto"
 
-#: mod/admin.php:486 mod/admin.php:1819
+#: mod/admin.php:491 mod/admin.php:1875
 msgid "select all"
 msgstr "seleziona tutti"
 
-#: mod/admin.php:487
+#: mod/admin.php:492
 msgid "select none"
 msgstr "seleziona niente"
 
-#: mod/admin.php:490
+#: mod/admin.php:493 mod/admin.php:1884 mod/contacts.php:638
+#: mod/contacts.php:828 mod/contacts.php:1019
+msgid "Block"
+msgstr "Blocca"
+
+#: mod/admin.php:494 mod/admin.php:1886 mod/contacts.php:638
+#: mod/contacts.php:828 mod/contacts.php:1019
+msgid "Unblock"
+msgstr "Sblocca"
+
+#: mod/admin.php:495
 msgid "No remote contact is blocked from this node."
 msgstr "Nessun contatto remoto è bloccato da questo nodo."
 
-#: mod/admin.php:492
+#: mod/admin.php:497
 msgid "Blocked Remote Contacts"
 msgstr "Contatti Remoti Bloccati"
 
-#: mod/admin.php:493
+#: mod/admin.php:498
 msgid "Block New Remote Contact"
 msgstr "Blocca Nuovo Contatto Remoto"
 
-#: mod/admin.php:494
+#: mod/admin.php:499
 msgid "Photo"
 msgstr "Foto"
 
-#: mod/admin.php:494 mod/profiles.php:394
+#: 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 "Nome"
+
+#: mod/admin.php:499 mod/profiles.php:391
 msgid "Address"
 msgstr "Indirizzo"
 
-#: mod/admin.php:502
+#: 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 "URL Profilo"
+
+#: mod/admin.php:507
 #, php-format
 msgid "%s total blocked contact"
 msgid_plural "%s total blocked contacts"
 msgstr[0] "%scontatto bloccato totale"
 msgstr[1] "%scontatti bloccati totali"
 
-#: mod/admin.php:504
+#: mod/admin.php:509
 msgid "URL of the remote contact to block."
 msgstr "URL del contatto remoto da bloccare."
 
-#: mod/admin.php:526
+#: mod/admin.php:531
 msgid "Delete this Item"
 msgstr "Rimuovi questo elemento"
 
-#: mod/admin.php:527
+#: 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 "Su questa pagina puoi cancellare un qualsiasi elemento dal tuo nodo. Se l'elemento è un post \"top\", l'intera discussione sarà cancellato."
 
-#: mod/admin.php:528
+#: 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 "Serve il GUID dell'elemento. Lo puoi trovare, per esempio, guardando l'URL display: l'ultima parte di http://example.com/display/123456 è il GUID, qui 123456."
 
-#: mod/admin.php:529
+#: mod/admin.php:534
 msgid "GUID"
 msgstr "GUID"
 
-#: mod/admin.php:529
+#: mod/admin.php:534
 msgid "The GUID of the item you want to delete."
 msgstr "Il GUID dell'elemento che vuoi cancellare."
 
@@ -4267,7 +2041,7 @@ msgid ""
 "following platforms:"
 msgstr "Attualmente questo nodo conosce %d nodi con %d utenti registrati dalle seguenti piattaforme:"
 
-#: mod/admin.php:759
+#: mod/admin.php:759 mod/admin.php:797
 msgid "ID"
 msgstr "ID"
 
@@ -4280,11 +2054,11 @@ msgid "Recipient Profile"
 msgstr "Profilo Destinatario"
 
 #: mod/admin.php:762 view/theme/frio/theme.php:266
-#: src/Core/NotificationsManager.php:178 src/Content/Nav.php:183
+#: src/Core/NotificationsManager.php:176 src/Content/Nav.php:183
 msgid "Network"
 msgstr "Rete"
 
-#: mod/admin.php:763
+#: mod/admin.php:763 mod/admin.php:799
 msgid "Created"
 msgstr "Creato"
 
@@ -4299,7 +2073,25 @@ msgid ""
 "eventually deleted if the delivery fails permanently."
 msgstr "Questa pagina elenca il contenuto della coda di invio dei post. Questi sono post la cui consegna è fallita. Verranno inviati nuovamente più tardi ed eventualmente cancellati se la consegna continua a fallire."
 
-#: mod/admin.php:789
+#: mod/admin.php:795
+msgid "Inspect Worker Queue"
+msgstr "Analizza coda lavori"
+
+#: mod/admin.php:798
+msgid "Job Parameters"
+msgstr "Parametri lavoro"
+
+#: mod/admin.php:800
+msgid "Priority"
+msgstr "Priorità"
+
+#: 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 "Questa pagina elenca i lavori in coda. Questi lavori sono gestiti dal cron che hai impostato durante l'installazione."
+
+#: mod/admin.php:825
 #, php-format
 msgid ""
 "Your DB still runs with MyISAM tables. You should change the engine type to "
@@ -4310,488 +2102,521 @@ msgid ""
 " an automatic conversion.<br />"
 msgstr "Stai ancora usando tabelle MyISAM. Dovresti cambiare il tipo motore a InnoDB. Siccome Friendica userà funzionalità specifiche di InnoDB nel futuro, dovresti modificarlo. Vedi <a href=\"%s\">qui</a>nel per una guida che puo' esserti utile nel convertire il motore delle tabelle. Puoi anche usare il comando <tt>php bin/console.php dbstructure toinnodb</tt> della tua installazione di Friendica per eseguire una conversione automatica. <br />"
 
-#: mod/admin.php:796
+#: 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 "È disponibile per il download una nuova versione di Friendica. La tua versione è %1$s, la versione upstream è %2$s"
 
-#: mod/admin.php:806
+#: 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 "L'aggiornamento del database è fallito. Esegui \"php bin/console.php dbstructure update\" dalla riga di comando per poter vedere gli eventuali errori che potrebbero apparire."
 
-#: mod/admin.php:812
+#: mod/admin.php:848
 msgid "The worker was never executed. Please check your database structure!"
 msgstr "Il worker non è mai stato eseguito. Controlla la struttura del tuo database!"
 
-#: mod/admin.php:815
+#: 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 "L'ultima esecuzione del worker è stata alle %sUTC, ovvero più di un'ora fa. Controlla le impostazioni del tuo crontab."
 
-#: mod/admin.php:820
+#: 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 "La configurazione di Friendica è adesso salvata in config/local.ini.php: copia config/local-sample.ini.php e sposta la tua configurazione da <code>.htconfig.php</code>. Vedi <a href=\"%s\">la pagina della guida sulla Configurazione</a> per avere aiuto con la transizione."
+
+#: mod/admin.php:862
 msgid "Normal Account"
 msgstr "Account normale"
 
-#: mod/admin.php:821
+#: mod/admin.php:863
 msgid "Automatic Follower Account"
 msgstr "Account Follower Automatico"
 
-#: mod/admin.php:822
+#: mod/admin.php:864
 msgid "Public Forum Account"
 msgstr "Account Forum Publico"
 
-#: mod/admin.php:823
+#: mod/admin.php:865
 msgid "Automatic Friend Account"
 msgstr "Account per amicizia automatizzato"
 
-#: mod/admin.php:824
+#: mod/admin.php:866
 msgid "Blog Account"
 msgstr "Account Blog"
 
-#: mod/admin.php:825
+#: mod/admin.php:867
 msgid "Private Forum Account"
 msgstr "Account Forum Privato"
 
-#: mod/admin.php:847
+#: mod/admin.php:889
 msgid "Message queues"
 msgstr "Code messaggi"
 
-#: mod/admin.php:853
+#: mod/admin.php:895
 msgid "Summary"
 msgstr "Sommario"
 
-#: mod/admin.php:855
+#: mod/admin.php:897
 msgid "Registered users"
 msgstr "Utenti registrati"
 
-#: mod/admin.php:857
+#: mod/admin.php:899
 msgid "Pending registrations"
 msgstr "Registrazioni in attesa"
 
-#: mod/admin.php:858
+#: mod/admin.php:900
 msgid "Version"
 msgstr "Versione"
 
-#: mod/admin.php:863
+#: mod/admin.php:905
 msgid "Active addons"
 msgstr "Addon attivi"
 
-#: mod/admin.php:894
+#: mod/admin.php:936
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr "Impossibile analizzare l'url base. Deve avere almeno [schema]://[dominio]"
 
-#: mod/admin.php:1224
+#: mod/admin.php:1269
 msgid "Site settings updated."
 msgstr "Impostazioni del sito aggiornate."
 
-#: mod/admin.php:1251 mod/settings.php:897
+#: mod/admin.php:1296 mod/settings.php:903
 msgid "No special theme for mobile devices"
 msgstr "Nessun tema speciale per i dispositivi mobili"
 
-#: mod/admin.php:1280
+#: mod/admin.php:1325
 msgid "No community page for local users"
 msgstr "Nessuna pagina di comunità per gli utenti locali"
 
-#: mod/admin.php:1281
+#: mod/admin.php:1326
 msgid "No community page"
 msgstr "Nessuna pagina Comunità"
 
-#: mod/admin.php:1282
+#: mod/admin.php:1327
 msgid "Public postings from users of this site"
 msgstr "Messaggi pubblici dagli utenti di questo sito"
 
-#: mod/admin.php:1283
+#: mod/admin.php:1328
 msgid "Public postings from the federated network"
 msgstr "Messaggi pubblici dalla rete federata"
 
-#: mod/admin.php:1284
+#: mod/admin.php:1329
 msgid "Public postings from local users and the federated network"
 msgstr "Messaggi pubblici dagli utenti di questo sito e dalla rete federata"
 
-#: mod/admin.php:1290
+#: mod/admin.php:1333 mod/admin.php:1500 mod/admin.php:1510
+#: mod/contacts.php:573
+msgid "Disabled"
+msgstr "Disabilitato"
+
+#: mod/admin.php:1335
 msgid "Users, Global Contacts"
 msgstr "Utenti, Contatti Globali"
 
-#: mod/admin.php:1291
+#: mod/admin.php:1336
 msgid "Users, Global Contacts/fallback"
 msgstr "Utenti, Contatti Globali/fallback"
 
-#: mod/admin.php:1295
+#: mod/admin.php:1340
 msgid "One month"
 msgstr "Un mese"
 
-#: mod/admin.php:1296
+#: mod/admin.php:1341
 msgid "Three months"
 msgstr "Tre mesi"
 
-#: mod/admin.php:1297
+#: mod/admin.php:1342
 msgid "Half a year"
 msgstr "Sei mesi"
 
-#: mod/admin.php:1298
+#: mod/admin.php:1343
 msgid "One year"
 msgstr "Un anno"
 
-#: mod/admin.php:1303
+#: mod/admin.php:1348
 msgid "Multi user instance"
 msgstr "Istanza multi utente"
 
-#: mod/admin.php:1326
+#: mod/admin.php:1374
 msgid "Closed"
 msgstr "Chiusa"
 
-#: mod/admin.php:1327
+#: mod/admin.php:1375
 msgid "Requires approval"
 msgstr "Richiede l'approvazione"
 
-#: mod/admin.php:1328
+#: mod/admin.php:1376
 msgid "Open"
 msgstr "Aperta"
 
-#: mod/admin.php:1332
+#: mod/admin.php:1380
 msgid "No SSL policy, links will track page SSL state"
 msgstr "Nessuna gestione SSL, i link seguiranno lo stato SSL della pagina"
 
-#: mod/admin.php:1333
+#: mod/admin.php:1381
 msgid "Force all links to use SSL"
 msgstr "Forza tutti i link ad usare SSL"
 
-#: mod/admin.php:1334
+#: mod/admin.php:1382
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Certificato auto-firmato, usa SSL solo per i link locali (sconsigliato)"
 
-#: mod/admin.php:1338
+#: mod/admin.php:1386
 msgid "Don't check"
 msgstr "Non controllare"
 
-#: mod/admin.php:1339
+#: mod/admin.php:1387
 msgid "check the stable version"
 msgstr "controlla la versione stabile"
 
-#: mod/admin.php:1340
+#: mod/admin.php:1388
 msgid "check the development version"
 msgstr "controlla la versione di sviluppo"
 
-#: mod/admin.php:1359
+#: mod/admin.php:1407
 msgid "Republish users to directory"
 msgstr "Ripubblica gli utenti sulla directory"
 
-#: mod/admin.php:1360 mod/register.php:267
+#: mod/admin.php:1408 mod/register.php:266
 msgid "Registration"
 msgstr "Registrazione"
 
-#: mod/admin.php:1361
+#: mod/admin.php:1409
 msgid "File upload"
 msgstr "Caricamento file"
 
-#: mod/admin.php:1362
+#: mod/admin.php:1410
 msgid "Policies"
 msgstr "Politiche"
 
-#: mod/admin.php:1364
+#: mod/admin.php:1411 mod/contacts.php:896 mod/events.php:534
+#: src/Model/Profile.php:861
+msgid "Advanced"
+msgstr "Avanzate"
+
+#: mod/admin.php:1412
 msgid "Auto Discovered Contact Directory"
 msgstr "Elenco Contatti Scoperto Automaticamente"
 
-#: mod/admin.php:1365
+#: mod/admin.php:1413
 msgid "Performance"
 msgstr "Performance"
 
-#: mod/admin.php:1366
+#: mod/admin.php:1414
 msgid "Worker"
 msgstr "Worker"
 
-#: mod/admin.php:1367
+#: mod/admin.php:1415
 msgid "Message Relay"
 msgstr "Relay Messaggio"
 
-#: mod/admin.php:1368
+#: mod/admin.php:1416
 msgid ""
 "Relocate - WARNING: advanced function. Could make this server unreachable."
 msgstr "Trasloca - ATTENZIONE: funzione avanzata! Può rendere questo server irraggiungibile."
 
-#: mod/admin.php:1371
+#: mod/admin.php:1419
 msgid "Site name"
 msgstr "Nome del sito"
 
-#: mod/admin.php:1372
+#: mod/admin.php:1420
 msgid "Host name"
 msgstr "Nome host"
 
-#: mod/admin.php:1373
+#: mod/admin.php:1421
 msgid "Sender Email"
 msgstr "Mittente email"
 
-#: mod/admin.php:1373
+#: mod/admin.php:1421
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr "L'indirizzo email che il tuo server dovrà usare per inviare notifiche via email."
 
-#: mod/admin.php:1374
+#: mod/admin.php:1422
 msgid "Banner/Logo"
 msgstr "Banner/Logo"
 
-#: mod/admin.php:1375
+#: mod/admin.php:1423
 msgid "Shortcut icon"
 msgstr "Icona shortcut"
 
-#: mod/admin.php:1375
+#: mod/admin.php:1423
 msgid "Link to an icon that will be used for browsers."
 msgstr "Link verso un'icona che verrà usata dai browser."
 
-#: mod/admin.php:1376
+#: mod/admin.php:1424
 msgid "Touch icon"
 msgstr "Icona touch"
 
-#: mod/admin.php:1376
+#: mod/admin.php:1424
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr "Link verso un'icona che verrà usata dai tablet e i telefonini."
 
-#: mod/admin.php:1377
+#: mod/admin.php:1425
 msgid "Additional Info"
 msgstr "Informazioni aggiuntive"
 
-#: mod/admin.php:1377
+#: mod/admin.php:1425
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
 msgstr "Per server pubblici: puoi aggiungere informazioni extra che verranno mostrate su %s/servers."
 
-#: mod/admin.php:1378
+#: mod/admin.php:1426
 msgid "System language"
 msgstr "Lingua di sistema"
 
-#: mod/admin.php:1379
+#: mod/admin.php:1427
 msgid "System theme"
 msgstr "Tema di sistema"
 
-#: mod/admin.php:1379
+#: mod/admin.php:1427
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Tema di sistema - può essere sovrascritto dalle impostazioni utente - <a href='#' id='cnftheme'>cambia le impostazioni del tema</a>"
 
-#: mod/admin.php:1380
+#: mod/admin.php:1428
 msgid "Mobile system theme"
 msgstr "Tema mobile di sistema"
 
-#: mod/admin.php:1380
+#: mod/admin.php:1428
 msgid "Theme for mobile devices"
 msgstr "Tema per dispositivi mobili"
 
-#: mod/admin.php:1381
+#: mod/admin.php:1429
 msgid "SSL link policy"
 msgstr "Gestione link SSL"
 
-#: mod/admin.php:1381
+#: mod/admin.php:1429
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Determina se i link generati devono essere forzati a usare SSL"
 
-#: mod/admin.php:1382
+#: mod/admin.php:1430
 msgid "Force SSL"
 msgstr "Forza SSL"
 
-#: mod/admin.php:1382
+#: mod/admin.php:1430
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
 msgstr "Forza tutte le richieste non SSL su SSL - Attenzione: su alcuni sistemi può portare a loop senza fine"
 
-#: mod/admin.php:1383
+#: mod/admin.php:1431
 msgid "Hide help entry from navigation menu"
 msgstr "Nascondi la voce 'Guida' dal menu di navigazione"
 
-#: mod/admin.php:1383
+#: 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 "Nasconde la voce per le pagine della guida dal menu di navigazione. E' comunque possibile accedervi richiamando /help direttamente."
 
-#: mod/admin.php:1384
+#: mod/admin.php:1432
 msgid "Single user instance"
 msgstr "Istanza a singolo utente"
 
-#: mod/admin.php:1384
+#: mod/admin.php:1432
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "Rendi questa istanza multi utente o a singolo utente per l'utente selezionato"
 
-#: mod/admin.php:1385
+#: mod/admin.php:1433
 msgid "Maximum image size"
 msgstr "Massima dimensione immagini"
 
-#: mod/admin.php:1385
+#: mod/admin.php:1433
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Massima dimensione in byte delle immagini caricate. Il default è 0, cioè nessun limite."
 
-#: mod/admin.php:1386
+#: mod/admin.php:1434
 msgid "Maximum image length"
 msgstr "Massima lunghezza immagine"
 
-#: mod/admin.php:1386
+#: mod/admin.php:1434
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "Massima lunghezza in pixel del lato più lungo delle immagini caricate. Predefinito a -1, ovvero nessun limite."
 
-#: mod/admin.php:1387
+#: mod/admin.php:1435
 msgid "JPEG image quality"
 msgstr "Qualità immagini JPEG"
 
-#: mod/admin.php:1387
+#: mod/admin.php:1435
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr "Le immagini JPEG caricate verranno salvate con questa qualità [0-100]. Predefinito è 100, ovvero qualità piena."
 
-#: mod/admin.php:1389
+#: mod/admin.php:1437
 msgid "Register policy"
 msgstr "Politica di registrazione"
 
-#: mod/admin.php:1390
+#: mod/admin.php:1438
 msgid "Maximum Daily Registrations"
 msgstr "Massime registrazioni giornaliere"
 
-#: mod/admin.php:1390
+#: 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 "Se la registrazione è permessa, qui si definisce il massimo numero di nuovi utenti registrati da accettare giornalmente. Se la registrazione è chiusa, questa impostazione non ha effetto."
 
-#: mod/admin.php:1391
+#: mod/admin.php:1439
 msgid "Register text"
 msgstr "Testo registrazione"
 
-#: mod/admin.php:1391
+#: mod/admin.php:1439
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
 msgstr "Sarà mostrato ben visibile nella pagina di registrazione. Puoi usare BBCode."
 
-#: mod/admin.php:1392
+#: mod/admin.php:1440
+msgid "Forbidden Nicknames"
+msgstr "Nomi utente Vietati"
+
+#: 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 "Lista separata da virgola di nomi utente che sono vietati nella registrazione. Il valore preimpostato è una lista di nomi di ruoli secondo RFC 2142."
+
+#: mod/admin.php:1441
 msgid "Accounts abandoned after x days"
 msgstr "Account abbandonati dopo x giorni"
 
-#: mod/admin.php:1392
+#: mod/admin.php:1441
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Non spreca risorse di sistema controllando siti esterni per gli account abbandonati. Immettere 0 per nessun limite di tempo."
 
-#: mod/admin.php:1393
+#: mod/admin.php:1442
 msgid "Allowed friend domains"
 msgstr "Domini amici consentiti"
 
-#: mod/admin.php:1393
+#: 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 "Elenco separato da virgola dei domini che possono stabilire amicizie con questo sito. Sono accettati caratteri jolly. Vuoto per accettare qualsiasi dominio."
 
-#: mod/admin.php:1394
+#: mod/admin.php:1443
 msgid "Allowed email domains"
 msgstr "Domini email consentiti"
 
-#: mod/admin.php:1394
+#: 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 "Elenco separato da virgola dei domini permessi come indirizzi email in fase di registrazione a questo sito. Sono accettati caratteri jolly. Lascalo vuoto per accettare qualsiasi dominio."
 
-#: mod/admin.php:1395
+#: mod/admin.php:1444
 msgid "No OEmbed rich content"
 msgstr "Nessun contenuto ricco da OEmbed"
 
-#: mod/admin.php:1395
+#: mod/admin.php:1444
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
 msgstr "Non mostrare il contenuto ricco (p.e. PDF), tranne che dai domini elencati di seguito."
 
-#: mod/admin.php:1396
+#: mod/admin.php:1445
 msgid "Allowed OEmbed domains"
 msgstr "Domini OEmbed consentiti"
 
-#: mod/admin.php:1396
+#: mod/admin.php:1445
 msgid ""
 "Comma separated list of domains which oembed content is allowed to be "
 "displayed. Wildcards are accepted."
 msgstr "Elenco separato da virgola di domini il cui contenuto OEmbed verrà visualizzato. Sono permesse wildcard."
 
-#: mod/admin.php:1397
+#: mod/admin.php:1446
 msgid "Block public"
 msgstr "Blocca pagine pubbliche"
 
-#: mod/admin.php:1397
+#: 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 "Seleziona per bloccare l'accesso pubblico a tutte le pagine personali di questo sito, a meno di essere loggato."
 
-#: mod/admin.php:1398
+#: mod/admin.php:1447
 msgid "Force publish"
 msgstr "Forza pubblicazione"
 
-#: mod/admin.php:1398
+#: mod/admin.php:1447
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Seleziona per forzare tutti i profili di questo sito ad essere compresi  nell'elenco di questo sito."
 
-#: mod/admin.php:1399
+#: mod/admin.php:1447
+msgid "Enabling this may violate privacy laws like the GDPR"
+msgstr "Abilitare questo potrebbe violare leggi sulla privacy come il GDPR"
+
+#: mod/admin.php:1448
 msgid "Global directory URL"
 msgstr "URL della directory globale"
 
-#: mod/admin.php:1399
+#: 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 dell'elenco globale. Se vuoto, l'elenco globale sarà completamente disabilitato."
 
-#: mod/admin.php:1400
+#: mod/admin.php:1449
 msgid "Private posts by default for new users"
 msgstr "Post privati di default per i nuovi utenti"
 
-#: mod/admin.php:1400
+#: mod/admin.php:1449
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr "Imposta i permessi predefiniti dei post per tutti i nuovi utenti come privati per il gruppo predefinito, invece che pubblici."
 
-#: mod/admin.php:1401
+#: mod/admin.php:1450
 msgid "Don't include post content in email notifications"
 msgstr "Non includere il contenuto dei post nelle notifiche via email"
 
-#: mod/admin.php:1401
+#: 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 "Non include il contenuti del post/commento/messaggio privato/etc. nelle notifiche email che sono inviate da questo sito, per privacy"
 
-#: mod/admin.php:1402
+#: mod/admin.php:1451
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr "Disabilita l'accesso pubblico ai plugin raccolti nel menu apps."
 
-#: mod/admin.php:1402
+#: mod/admin.php:1451
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr "Selezionando questo box si limiterà ai soli membri l'accesso ai componenti aggiuntivi nel menu applicazioni"
 
-#: mod/admin.php:1403
+#: mod/admin.php:1452
 msgid "Don't embed private images in posts"
 msgstr "Non inglobare immagini private nei post"
 
-#: mod/admin.php:1403
+#: 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 "
@@ -4799,210 +2624,223 @@ msgid ""
 "while."
 msgstr "Non sostituire le foto locali nei post con una copia incorporata dell'immagine. Questo significa che i contatti che riceveranno i post contenenti foto private dovranno autenticarsi e caricare ogni immagine, cosa che può richiedere un po' di tempo."
 
-#: mod/admin.php:1404
+#: mod/admin.php:1453
+msgid "Explicit Content"
+msgstr "Contenuto Esplicito"
+
+#: 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 "Imposta questo per avvisare che il tuo noto è usato principalmente per contenuto esplicito che potrebbe non essere adatto a minori. Questa informazione sarà pubblicata nella pagina di informazioni sul noto e potrà essere usata, per esempio nella directory globale, per filtrare il tuo nodo dalla lista di nodi su cui registrarsi. In più, una nota sarà mostrata nella pagina di registrazione."
+
+#: mod/admin.php:1454
 msgid "Allow Users to set remote_self"
 msgstr "Permetti agli utenti di impostare 'io remoto'"
 
-#: mod/admin.php:1404
+#: 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 "Selezionando questo, a tutti gli utenti sarà permesso di impostare qualsiasi contatto come 'io remoto' nella pagina di modifica del contatto. Impostare questa opzione fa si che tutti i messaggi di quel contatto vengano ripetuti nello stream dell'utente."
 
-#: mod/admin.php:1405
+#: mod/admin.php:1455
 msgid "Block multiple registrations"
 msgstr "Blocca registrazioni multiple"
 
-#: mod/admin.php:1405
+#: mod/admin.php:1455
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Non permette all'utente di registrare account extra da usare come pagine."
 
-#: mod/admin.php:1406
+#: mod/admin.php:1456
 msgid "OpenID support"
 msgstr "Supporto OpenID"
 
-#: mod/admin.php:1406
+#: mod/admin.php:1456
 msgid "OpenID support for registration and logins."
 msgstr "Supporta OpenID per la registrazione e il login"
 
-#: mod/admin.php:1407
+#: mod/admin.php:1457
 msgid "Fullname check"
 msgstr "Controllo nome completo"
 
-#: mod/admin.php:1407
+#: mod/admin.php:1457
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr "Forza gli utenti a registrarsi con uno spazio tra il nome e il cognome in \"Nome completo\", come misura anti spam"
 
-#: mod/admin.php:1408
+#: mod/admin.php:1458
 msgid "Community pages for visitors"
 msgstr "Pagina comunità per i visitatori"
 
-#: mod/admin.php:1408
+#: mod/admin.php:1458
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
 msgstr "Quale pagina comunità verrà mostrata ai visitatori. Gli utenti locali vedranno sempre entrambe le pagine."
 
-#: mod/admin.php:1409
+#: mod/admin.php:1459
 msgid "Posts per user on community page"
 msgstr "Messaggi per utente nella pagina Comunità"
 
-#: mod/admin.php:1409
+#: mod/admin.php:1459
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
 msgstr "Il numero massimo di messaggi per utente mostrato nella pagina Comunità (non valido per 'Comunità globale')"
 
-#: mod/admin.php:1410
+#: mod/admin.php:1460
 msgid "Enable OStatus support"
 msgstr "Abilita supporto OStatus"
 
-#: mod/admin.php:1410
+#: 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 "Fornisce la compatibilità integrata a OStatus (StatusNet, Gnu Social, etc.). Tutte le comunicazioni su OStatus sono pubbliche, quindi un avviso di privacy verrà mostrato occasionalmente."
 
-#: mod/admin.php:1411
+#: mod/admin.php:1461
 msgid "Only import OStatus threads from our contacts"
 msgstr "Importa conversazioni OStatus solo dai nostri contatti."
 
-#: mod/admin.php:1411
+#: 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 "Normalmente importiamo tutto il contenuto dai contatti OStatus. Con questa opzione salviamo solo le conversazioni iniziate da un contatto è conosciuto a questo nodo."
 
-#: mod/admin.php:1412
+#: mod/admin.php:1462
 msgid "OStatus support can only be enabled if threading is enabled."
 msgstr "Il supporto OStatus può essere abilitato solo se è abilitato il threading."
 
-#: mod/admin.php:1414
+#: mod/admin.php:1464
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub"
 " directory."
 msgstr "Il supporto a Diaspora non può essere abilitato perché Friendica è stato installato in una sotto directory."
 
-#: mod/admin.php:1415
+#: mod/admin.php:1465
 msgid "Enable Diaspora support"
 msgstr "Abilita il supporto a Diaspora"
 
-#: mod/admin.php:1415
+#: mod/admin.php:1465
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Fornisce compatibilità con il network Diaspora."
 
-#: mod/admin.php:1416
+#: mod/admin.php:1466
 msgid "Only allow Friendica contacts"
 msgstr "Permetti solo contatti Friendica"
 
-#: mod/admin.php:1416
+#: mod/admin.php:1466
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "Tutti i contatti devono usare il protocollo di Friendica. Tutti gli altri protocolli sono disabilitati."
 
-#: mod/admin.php:1417
+#: mod/admin.php:1467
 msgid "Verify SSL"
 msgstr "Verifica SSL"
 
-#: mod/admin.php:1417
+#: 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 "Se vuoi, puoi abilitare il controllo rigoroso dei certificati.Questo significa che non potrai collegarti (del tutto) con siti con certificati SSL auto-firmati."
 
-#: mod/admin.php:1418
+#: mod/admin.php:1468
 msgid "Proxy user"
 msgstr "Utente Proxy"
 
-#: mod/admin.php:1419
+#: mod/admin.php:1469
 msgid "Proxy URL"
 msgstr "URL Proxy"
 
-#: mod/admin.php:1420
+#: mod/admin.php:1470
 msgid "Network timeout"
 msgstr "Timeout rete"
 
-#: mod/admin.php:1420
+#: mod/admin.php:1470
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Valore in secondi. Imposta a 0 per illimitato (non raccomandato)."
 
-#: mod/admin.php:1421
+#: mod/admin.php:1471
 msgid "Maximum Load Average"
 msgstr "Massimo carico medio"
 
-#: mod/admin.php:1421
+#: mod/admin.php:1471
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Massimo carico di sistema prima che i processi di invio e di poll siano ritardati. Predefinito a 50."
 
-#: mod/admin.php:1422
+#: mod/admin.php:1472
 msgid "Maximum Load Average (Frontend)"
 msgstr "Media Massimo Carico (Frontend)"
 
-#: mod/admin.php:1422
+#: mod/admin.php:1472
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr "Massimo carico di sistema prima che il frontend fermi il servizio - default 50."
 
-#: mod/admin.php:1423
+#: mod/admin.php:1473
 msgid "Minimal Memory"
 msgstr "Memoria Minima"
 
-#: mod/admin.php:1423
+#: mod/admin.php:1473
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
 msgstr "Minima memoria libera in MB per il worker. Necessita di avere accesso a /proc/meminfo - default 0 (disabilitato)."
 
-#: mod/admin.php:1424
+#: mod/admin.php:1474
 msgid "Maximum table size for optimization"
 msgstr "Dimensione massima della tabella per l'ottimizzazione"
 
-#: mod/admin.php:1424
+#: mod/admin.php:1474
 msgid ""
 "Maximum table size (in MB) for the automatic optimization. Enter -1 to "
 "disable it."
 msgstr "La dimensione massima (in MB) per l'ottimizzazione automatica. Inserisci -1 per disabilitarlo."
 
-#: mod/admin.php:1425
+#: mod/admin.php:1475
 msgid "Minimum level of fragmentation"
 msgstr "Livello minimo di frammentazione"
 
-#: mod/admin.php:1425
+#: mod/admin.php:1475
 msgid ""
 "Minimum fragmenation level to start the automatic optimization - default "
 "value is 30%."
 msgstr "Livello minimo di frammentazione per iniziare la procedura di ottimizzazione automatica - il valore di default è 30%."
 
-#: mod/admin.php:1427
+#: mod/admin.php:1477
 msgid "Periodical check of global contacts"
 msgstr "Check periodico dei contatti globali"
 
-#: mod/admin.php:1427
+#: 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 "Se abilitato, i contatti globali sono controllati periodicamente per verificare dati mancanti o sorpassati e la vitalità dei contatti e dei server."
 
-#: mod/admin.php:1428
+#: mod/admin.php:1478
 msgid "Days between requery"
 msgstr "Giorni tra le richieste"
 
-#: mod/admin.php:1428
+#: mod/admin.php:1478
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr "Numero di giorni dopo i quali al server vengono richiesti i suoi contatti."
 
-#: mod/admin.php:1429
+#: mod/admin.php:1479
 msgid "Discover contacts from other servers"
 msgstr "Trova contatti dagli altri server"
 
-#: mod/admin.php:1429
+#: 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 "
@@ -5012,32 +2850,32 @@ msgid ""
 "Global Contacts'."
 msgstr "Richiede periodicamente contatti agli altri server. Puoi scegliere tra 'utenti', gli utenti sul sistema remoto, o 'contatti globali', i contatti attivi che sono conosciuti dal sistema. Il fallback è pensato per i server Redmatrix e i vecchi server Friendica, dove i contatti globali non sono disponibili. Il fallback incrementa il carico di sistema, per cui l'impostazione consigliata è \"Utenti, Contatti Globali\"."
 
-#: mod/admin.php:1430
+#: mod/admin.php:1480
 msgid "Timeframe for fetching global contacts"
 msgstr "Termine per il recupero contatti globali"
 
-#: mod/admin.php:1430
+#: 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 "Quando si attiva la scoperta, questo valore definisce il periodo di tempo per l'attività dei contatti globali che vengono prelevati da altri server."
 
-#: mod/admin.php:1431
+#: mod/admin.php:1481
 msgid "Search the local directory"
 msgstr "Cerca la directory locale"
 
-#: mod/admin.php:1431
+#: 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 "Cerca nella directory locale invece che nella directory globale. Durante la ricerca a livello locale, ogni ricerca verrà eseguita sulla directory globale in background. Ciò migliora i risultati della ricerca quando la ricerca viene ripetuta."
 
-#: mod/admin.php:1433
+#: mod/admin.php:1483
 msgid "Publish server information"
 msgstr "Pubblica informazioni server"
 
-#: mod/admin.php:1433
+#: 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 "
@@ -5045,50 +2883,50 @@ msgid ""
 " href='http://the-federation.info/'>the-federation.info</a> for details."
 msgstr "Se abilitata, saranno pubblicati i dati generali del server e i dati di utilizzo. I dati contengono il nome e la versione del server, il numero di utenti con profili pubblici, numero dei posti e dei protocolli e connettori attivati. Per informazioni, vedere <a href='http://the-federation.info/'> the-federation.info </a>."
 
-#: mod/admin.php:1435
+#: mod/admin.php:1485
 msgid "Check upstream version"
 msgstr "Controlla versione upstream"
 
-#: mod/admin.php:1435
+#: 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 "Abilita il controllo di nuove versioni di Friendica su Github. Se sono disponibili nuove versioni, ne sarai informato nel pannello Panoramica dell'amministrazione."
 
-#: mod/admin.php:1436
+#: mod/admin.php:1486
 msgid "Suppress Tags"
 msgstr "Sopprimi Tags"
 
-#: mod/admin.php:1436
+#: mod/admin.php:1486
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr "Non mostra la lista di hashtag in coda al messaggio"
 
-#: mod/admin.php:1437
+#: mod/admin.php:1487
 msgid "Clean database"
 msgstr "Pulisci database"
 
-#: mod/admin.php:1437
+#: mod/admin.php:1487
 msgid ""
 "Remove old remote items, orphaned database records and old content from some"
 " other helper tables."
 msgstr "Rimuove i i vecchi elementi remoti, i record del database orfani e il vecchio contenuto da alcune tabelle di supporto."
 
-#: mod/admin.php:1438
+#: mod/admin.php:1488
 msgid "Lifespan of remote items"
 msgstr "Durata della vita di oggetti remoti"
 
-#: mod/admin.php:1438
+#: 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 "Quando la pulizia del database è abilitata, questa impostazione definisce quali elementi remoti saranno cancellati. I propri elementi e quelli marcati preferiti o salvati in cartelle saranno sempre mantenuti. Il valore 0 disabilita questa funzionalità."
 
-#: mod/admin.php:1439
+#: mod/admin.php:1489
 msgid "Lifespan of unclaimed items"
 msgstr "Durata della vita di oggetti non reclamati"
 
-#: mod/admin.php:1439
+#: 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. "
@@ -5096,129 +2934,130 @@ msgid ""
 "items if set to 0."
 msgstr "Quando la pulizia del database è abilitata, questa impostazione definisce dopo quanti giorni gli elementi remoti non reclamanti (principalmente il contenuto dai relay) sarà cancellato. Il valore di default è 90 giorni. Se impostato a 0, verrà utilizzato il valore della durata della vita degli elementi remoti."
 
-#: mod/admin.php:1440
+#: mod/admin.php:1490
 msgid "Path to item cache"
 msgstr "Percorso cache elementi"
 
-#: mod/admin.php:1440
+#: mod/admin.php:1490
 msgid "The item caches buffers generated bbcode and external images."
 msgstr "La cache degli elementi memorizza il bbcode generato e le immagini esterne."
 
-#: mod/admin.php:1441
+#: mod/admin.php:1491
 msgid "Cache duration in seconds"
 msgstr "Durata della cache in secondi"
 
-#: mod/admin.php:1441
+#: 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 "Quanto a lungo devono essere mantenuti i file di cache? Il valore predefinito è 86400 secondi (un giorno). Per disabilitare la cache, imposta il valore a -1."
 
-#: mod/admin.php:1442
+#: mod/admin.php:1492
 msgid "Maximum numbers of comments per post"
 msgstr "Numero massimo di commenti per post"
 
-#: mod/admin.php:1442
+#: mod/admin.php:1492
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr "Quanti commenti devono essere mostrati per ogni post? Default : 100."
 
-#: mod/admin.php:1443
+#: mod/admin.php:1493
 msgid "Temp path"
 msgstr "Percorso file temporanei"
 
-#: mod/admin.php:1443
+#: 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 "Se si dispone di un sistema ristretto in cui il server web non può accedere al percorso temporaneo di sistema, inserire un altro percorso qui."
 
-#: mod/admin.php:1444
+#: mod/admin.php:1494
 msgid "Base path to installation"
 msgstr "Percorso base all'installazione"
 
-#: mod/admin.php:1444
+#: 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 "Se il sistema non è in grado di rilevare il percorso corretto per l'installazione, immettere il percorso corretto qui. Questa impostazione deve essere inserita solo se si utilizza un sistema limitato e/o collegamenti simbolici al tuo webroot."
 
-#: mod/admin.php:1445
+#: mod/admin.php:1495
 msgid "Disable picture proxy"
 msgstr "Disabilita il proxy immagini"
 
-#: mod/admin.php:1445
+#: mod/admin.php:1495
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
-" systems with very low bandwith."
+" systems with very low bandwidth."
 msgstr "Il proxy immagini aumenta le performance e la privacy. Non dovrebbe essere usato su server con poca banda disponibile."
 
-#: mod/admin.php:1446
+#: mod/admin.php:1496
 msgid "Only search in tags"
 msgstr "Cerca solo nei tag"
 
-#: mod/admin.php:1446
+#: mod/admin.php:1496
 msgid "On large systems the text search can slow down the system extremely."
 msgstr "Su server con molti dati, la ricerca nel testo può estremamente rallentare il sistema."
 
-#: mod/admin.php:1448
+#: mod/admin.php:1498
 msgid "New base url"
 msgstr "Nuovo url base"
 
-#: mod/admin.php:1448
+#: mod/admin.php:1498
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and"
 " Diaspora* contacts of all users."
 msgstr "Cambia l'URL base di questo server. Invia il messaggio di trasloco a tutti i contatti Friendica e Diaspora* di tutti gli utenti."
 
-#: mod/admin.php:1450
+#: mod/admin.php:1500
 msgid "RINO Encryption"
 msgstr "Crittografia RINO"
 
-#: mod/admin.php:1450
+#: mod/admin.php:1500
 msgid "Encryption layer between nodes."
 msgstr "Crittografia delle comunicazioni tra nodi."
 
-#: mod/admin.php:1450
+#: mod/admin.php:1500
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: mod/admin.php:1452
+#: mod/admin.php:1502
 msgid "Maximum number of parallel workers"
 msgstr "Massimo numero di lavori in parallelo"
 
-#: mod/admin.php:1452
+#: mod/admin.php:1502
+#, php-format
 msgid ""
-"On shared hosters set this to 2. On larger systems, values of 10 are great. "
-"Default value is 4."
-msgstr "Su host condivisi imposta a 2. Su sistemi più grandi, valori fino a 10 vanno bene. Il valore di default è 4."
+"On shared hosters set this to %d. On larger systems, values of %d are great."
+" Default value is %d."
+msgstr "Con hosting condiviso, imposta a %d. Su sistemi più grandi, vanno bene valori come %d. Il valore di default è %d."
 
-#: mod/admin.php:1453
+#: mod/admin.php:1503
 msgid "Don't use 'proc_open' with the worker"
 msgstr "Non usare 'proc_open' con il worker"
 
-#: mod/admin.php:1453
+#: 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 "Abilita se il tuo sistema non consente l'utilizzo di 'proc_open'. Può succedere con gli hosting condivisi. Se abiliti questa opzione, dovresti aumentare la frequenza delle chiamate al worker nel tuo crontab."
 
-#: mod/admin.php:1454
+#: mod/admin.php:1504
 msgid "Enable fastlane"
 msgstr "Abilita fastlane"
 
-#: mod/admin.php:1454
+#: 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 "Quando abilitato, il meccanismo di fastlane avvia processi aggiuntivi se processi con priorità più alta sono bloccati da processi con priorità più bassa."
 
-#: mod/admin.php:1455
+#: mod/admin.php:1505
 msgid "Enable frontend worker"
 msgstr "Abilita worker da frontend"
 
-#: mod/admin.php:1455
+#: mod/admin.php:1505
 #, php-format
 msgid ""
 "When enabled the Worker process is triggered when backend access is "
@@ -5228,132 +3067,136 @@ msgid ""
 " on your server."
 msgstr "Quando abilitato, il processo è avviato quando viene eseguito un accesso al backend (per esempio, quando un messaggio viene consegnato). Su siti più piccoli potresti voler chiamare %s/worker regolarmente attraverso un cron esterno. Dovresti abilitare questa opzione solo se non puoi impostare esecuzioni pianificate sul tuo server. "
 
-#: mod/admin.php:1457
+#: mod/admin.php:1507
 msgid "Subscribe to relay"
 msgstr "Inscrivi a un relay"
 
-#: mod/admin.php:1457
+#: 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 "Abilita la ricezione dei post pubblici dal relay. Saranno inclusi nelle ricerche, nei tag sottoscritti e nella pagina comunità globale."
 
-#: mod/admin.php:1458
+#: mod/admin.php:1508
 msgid "Relay server"
 msgstr "Server relay"
 
-#: mod/admin.php:1458
+#: mod/admin.php:1508
 msgid ""
 "Address of the relay server where public posts should be send to. For "
 "example https://relay.diasp.org"
 msgstr "Indirizzo del server relay dove i post pubblici verranno inviati. Per esempio https://relay.diasp.org"
 
-#: mod/admin.php:1459
+#: mod/admin.php:1509
 msgid "Direct relay transfer"
 msgstr "Trasferimento relay diretto"
 
-#: mod/admin.php:1459
+#: mod/admin.php:1509
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr "Abilita il trasferimento diretto agli altri server senza utilizzare i server relay."
 
-#: mod/admin.php:1460
+#: mod/admin.php:1510
 msgid "Relay scope"
 msgstr "Ambito del relay"
 
-#: mod/admin.php:1460
+#: 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 "Può essere 'tutti' o 'tags'. 'tutti' significa che ogni post pubblico viene ricevuto. 'tags' significa che vengono ricevuti solo i post con i tag selezionati."
 
-#: mod/admin.php:1460
+#: mod/admin.php:1510
 msgid "all"
 msgstr "tutti"
 
-#: mod/admin.php:1460
+#: mod/admin.php:1510
 msgid "tags"
 msgstr "tags"
 
-#: mod/admin.php:1461
+#: mod/admin.php:1511
 msgid "Server tags"
 msgstr "Tags server"
 
-#: mod/admin.php:1461
+#: mod/admin.php:1511
 msgid "Comma separated list of tags for the 'tags' subscription."
 msgstr "Lista separata da virgola per la sottoscrizione 'tags'."
 
-#: mod/admin.php:1462
+#: mod/admin.php:1512
 msgid "Allow user tags"
 msgstr "Permetti tag utente"
 
-#: mod/admin.php:1462
+#: 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 "Se abilitato, i tag delle ricerche salvate saranno usate per la sottoscrizione 'tags' in aggiunta ai tag server."
 
-#: mod/admin.php:1490
+#: mod/admin.php:1515
+msgid "Start Relocation"
+msgstr "Inizia il Trasloco"
+
+#: mod/admin.php:1541
 msgid "Update has been marked successful"
 msgstr "L'aggiornamento è stato segnato come  di successo"
 
-#: mod/admin.php:1497
+#: mod/admin.php:1548
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr "Aggiornamento struttura database %s applicata con successo."
 
-#: mod/admin.php:1500
+#: mod/admin.php:1551
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr "Aggiornamento struttura database %s fallita con errore: %s"
 
-#: mod/admin.php:1513
+#: mod/admin.php:1567
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr "Esecuzione di %s fallita con errore: %s"
 
-#: mod/admin.php:1515
+#: mod/admin.php:1569
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "L'aggiornamento %s è stato applicato con successo"
 
-#: mod/admin.php:1518
+#: mod/admin.php:1572
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "L'aggiornamento %s non ha riportato uno stato. Non so se è andato a buon fine."
 
-#: mod/admin.php:1521
+#: mod/admin.php:1575
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr "Non ci sono altre funzioni di aggiornamento %s da richiamare."
 
-#: mod/admin.php:1541
+#: mod/admin.php:1598
 msgid "No failed updates."
 msgstr "Nessun aggiornamento fallito."
 
-#: mod/admin.php:1542
+#: mod/admin.php:1599
 msgid "Check database structure"
 msgstr "Controlla struttura database"
 
-#: mod/admin.php:1547
+#: mod/admin.php:1604
 msgid "Failed Updates"
 msgstr "Aggiornamenti falliti"
 
-#: mod/admin.php:1548
+#: mod/admin.php:1605
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "Questo non include gli aggiornamenti prima del 1139, che non ritornano lo stato."
 
-#: mod/admin.php:1549
+#: mod/admin.php:1606
 msgid "Mark success (if update was manually applied)"
 msgstr "Segna completato (se l'update è stato applicato manualmente)"
 
-#: mod/admin.php:1550
+#: mod/admin.php:1607
 msgid "Attempt to execute this update step automatically"
 msgstr "Cerco di eseguire questo aggiornamento in automatico"
 
-#: mod/admin.php:1589
+#: mod/admin.php:1646
 #, php-format
 msgid ""
 "\n"
@@ -5361,7 +3204,7 @@ msgid ""
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr "\nGentile %1$s,\n    l'amministratore di %2$s ha impostato un account per te."
 
-#: mod/admin.php:1592
+#: mod/admin.php:1649
 #, php-format
 msgid ""
 "\n"
@@ -5393,208 +3236,212 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr "\nI dettagli del tuo utente sono:\n    Indirizzo del sito: %1$s\n    Nome utente: %2$s\n    Password: %3$s\n\nPuoi cambiare la tua password dalla pagina delle impostazioni del tuo account dopo esserti autenticato.\n\nPer favore, prenditi qualche momento per esaminare tutte le impostazioni presenti.\n\nPotresti voler aggiungere qualche informazione di base al tuo profilo predefinito (nella pagina \"Profili\"), così che le altre persone possano trovarti più facilmente.\n\nTi raccomandiamo di inserire il tuo nome completo, aggiungere una foto, aggiungere qualche parola chiave del profilo (molto utili per trovare nuovi contatti), e magari in quale nazione vivi, se non vuoi essere più specifico di così.\n\nNoi rispettiamo appieno la tua privacy, e nessuna di queste informazioni è necessaria o obbligatoria.\nSe sei nuovo e non conosci nessuno qui, possono aiutarti a trovare qualche nuovo e interessante contatto.\n\n\t\t\tSe mai vorrai cancellare il tuo account, lo potrai fare su%1$s/removeme\n\nGrazie e benvenuto su %4$s"
 
-#: mod/admin.php:1626 src/Model/User.php:663
+#: mod/admin.php:1683 src/Model/User.php:702
 #, php-format
 msgid "Registration details for %s"
 msgstr "Dettagli della registrazione di %s"
 
-#: mod/admin.php:1636
+#: mod/admin.php:1693
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] "%s utente bloccato/sbloccato"
 msgstr[1] "%s utenti bloccati/sbloccati"
 
-#: mod/admin.php:1642
+#: mod/admin.php:1699
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s utente cancellato"
 msgstr[1] "%s utenti cancellati"
 
-#: mod/admin.php:1689
+#: mod/admin.php:1746
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Utente '%s' cancellato"
 
-#: mod/admin.php:1697
+#: mod/admin.php:1754
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Utente '%s' sbloccato"
 
-#: mod/admin.php:1697
+#: mod/admin.php:1754
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Utente '%s' bloccato"
 
-#: mod/admin.php:1754 mod/settings.php:1058
+#: mod/admin.php:1811 mod/settings.php:1064
 msgid "Normal Account Page"
 msgstr "Pagina Account Normale"
 
-#: mod/admin.php:1755 mod/settings.php:1062
+#: mod/admin.php:1812 mod/settings.php:1068
 msgid "Soapbox Page"
 msgstr "Pagina Sandbox"
 
-#: mod/admin.php:1756 mod/settings.php:1066
+#: mod/admin.php:1813 mod/settings.php:1072
 msgid "Public Forum"
 msgstr "Forum Pubblico"
 
-#: mod/admin.php:1757 mod/settings.php:1070
+#: mod/admin.php:1814 mod/settings.php:1076
 msgid "Automatic Friend Page"
 msgstr "Pagina con amicizia automatica"
 
-#: mod/admin.php:1758
+#: mod/admin.php:1815
 msgid "Private Forum"
 msgstr "Forum Privato"
 
-#: mod/admin.php:1761 mod/settings.php:1042
+#: mod/admin.php:1818 mod/settings.php:1048
 msgid "Personal Page"
 msgstr "Pagina Personale"
 
-#: mod/admin.php:1762 mod/settings.php:1046
+#: mod/admin.php:1819 mod/settings.php:1052
 msgid "Organisation Page"
 msgstr "Pagina Organizzazione"
 
-#: mod/admin.php:1763 mod/settings.php:1050
+#: mod/admin.php:1820 mod/settings.php:1056
 msgid "News Page"
 msgstr "Pagina Notizie"
 
-#: mod/admin.php:1764 mod/settings.php:1054
+#: mod/admin.php:1821 mod/settings.php:1060
 msgid "Community Forum"
 msgstr "Community Forum"
 
-#: mod/admin.php:1811 mod/admin.php:1822 mod/admin.php:1835 mod/admin.php:1853
-#: src/Content/ContactSelector.php:82
+#: mod/admin.php:1867 mod/admin.php:1878 mod/admin.php:1892 mod/admin.php:1910
+#: src/Content/ContactSelector.php:80
 msgid "Email"
 msgstr "Email"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1867 mod/admin.php:1892
 msgid "Register date"
 msgstr "Data registrazione"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1867 mod/admin.php:1892
 msgid "Last login"
 msgstr "Ultimo accesso"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1867 mod/admin.php:1892
 msgid "Last item"
 msgstr "Ultimo elemento"
 
-#: mod/admin.php:1811
+#: mod/admin.php:1867
 msgid "Type"
 msgstr "Tipo"
 
-#: mod/admin.php:1818
+#: mod/admin.php:1874
 msgid "Add User"
 msgstr "Aggiungi utente"
 
-#: mod/admin.php:1820
+#: mod/admin.php:1876
 msgid "User registrations waiting for confirm"
 msgstr "Richieste di registrazione in attesa di conferma"
 
-#: mod/admin.php:1821
+#: mod/admin.php:1877
 msgid "User waiting for permanent deletion"
 msgstr "Utente in attesa di cancellazione definitiva"
 
-#: mod/admin.php:1822
+#: mod/admin.php:1878
 msgid "Request date"
 msgstr "Data richiesta"
 
-#: mod/admin.php:1823
+#: mod/admin.php:1879
 msgid "No registrations."
 msgstr "Nessuna registrazione."
 
-#: mod/admin.php:1824
+#: mod/admin.php:1880
 msgid "Note from the user"
 msgstr "Nota dall'utente"
 
-#: mod/admin.php:1825 mod/notifications.php:178 mod/notifications.php:262
+#: mod/admin.php:1881 mod/notifications.php:174 mod/notifications.php:264
 msgid "Approve"
 msgstr "Approva"
 
-#: mod/admin.php:1826
+#: mod/admin.php:1882
 msgid "Deny"
 msgstr "Nega"
 
-#: mod/admin.php:1830
+#: mod/admin.php:1885
+msgid "User blocked"
+msgstr "Utente bloccato"
+
+#: mod/admin.php:1887
 msgid "Site admin"
 msgstr "Amministrazione sito"
 
-#: mod/admin.php:1831
+#: mod/admin.php:1888
 msgid "Account expired"
 msgstr "Account scaduto"
 
-#: mod/admin.php:1834
+#: mod/admin.php:1891
 msgid "New User"
 msgstr "Nuovo Utente"
 
-#: mod/admin.php:1835
+#: mod/admin.php:1892
 msgid "Deleted since"
 msgstr "Rimosso da"
 
-#: mod/admin.php:1840
+#: 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 "Gli utenti selezionati saranno cancellati!\\n\\nTutto quello che gli utenti hanno inviato su questo sito sarà permanentemente canellato!\\n\\nSei sicuro?"
 
-#: mod/admin.php:1841
+#: 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 "L'utente {0} sarà cancellato!\\n\\nTutto quello che ha inviato su questo sito sarà permanentemente cancellato!\\n\\nSei sicuro?"
 
-#: mod/admin.php:1851
+#: mod/admin.php:1908
 msgid "Name of the new user."
 msgstr "Nome del nuovo utente."
 
-#: mod/admin.php:1852
+#: mod/admin.php:1909
 msgid "Nickname"
 msgstr "Nome utente"
 
-#: mod/admin.php:1852
+#: mod/admin.php:1909
 msgid "Nickname of the new user."
 msgstr "Nome utente del nuovo utente."
 
-#: mod/admin.php:1853
+#: mod/admin.php:1910
 msgid "Email address of the new user."
 msgstr "Indirizzo Email del nuovo utente."
 
-#: mod/admin.php:1895
+#: mod/admin.php:1952
 #, php-format
 msgid "Addon %s disabled."
 msgstr "Addon %s disabilitato."
 
-#: mod/admin.php:1899
+#: mod/admin.php:1956
 #, php-format
 msgid "Addon %s enabled."
 msgstr "Addon %s abilitato."
 
-#: mod/admin.php:1909 mod/admin.php:2158
+#: mod/admin.php:1966 mod/admin.php:2215
 msgid "Disable"
 msgstr "Disabilita"
 
-#: mod/admin.php:1912 mod/admin.php:2161
+#: mod/admin.php:1969 mod/admin.php:2218
 msgid "Enable"
 msgstr "Abilita"
 
-#: mod/admin.php:1934 mod/admin.php:2203
+#: mod/admin.php:1991 mod/admin.php:2261
 msgid "Toggle"
 msgstr "Inverti"
 
-#: mod/admin.php:1942 mod/admin.php:2212
+#: mod/admin.php:1999 mod/admin.php:2270
 msgid "Author: "
 msgstr "Autore: "
 
-#: mod/admin.php:1943 mod/admin.php:2213
+#: mod/admin.php:2000 mod/admin.php:2271
 msgid "Maintainer: "
 msgstr "Manutentore: "
 
-#: mod/admin.php:1995
+#: mod/admin.php:2052
 msgid "Reload active addons"
 msgstr "Ricarica addon attivi."
 
-#: mod/admin.php:2000
+#: mod/admin.php:2057
 #, php-format
 msgid ""
 "There are currently no addons available on your node. You can find the "
@@ -5602,410 +3449,2056 @@ msgid ""
 " the open addon registry at %2$s"
 msgstr "Non sono disponibili componenti aggiuntivi sul tuo nodo. Puoi trovare il repository ufficiale degli addon su %1$s e potresti trovare altri addon interessanti nell'open addon repository su %2$s"
 
-#: mod/admin.php:2120
+#: mod/admin.php:2177
 msgid "No themes found."
 msgstr "Nessun tema trovato."
 
-#: mod/admin.php:2194
+#: mod/admin.php:2252
 msgid "Screenshot"
 msgstr "Anteprima"
 
-#: mod/admin.php:2248
+#: mod/admin.php:2306
 msgid "Reload active themes"
 msgstr "Ricarica i temi attivi"
 
-#: mod/admin.php:2253
+#: mod/admin.php:2311
 #, php-format
 msgid "No themes found on the system. They should be placed in %1$s"
 msgstr "Non sono stati trovati temi sul tuo sistema. Dovrebbero essere in %1$s"
 
-#: mod/admin.php:2254
+#: mod/admin.php:2312
 msgid "[Experimental]"
 msgstr "[Sperimentale]"
 
-#: mod/admin.php:2255
+#: mod/admin.php:2313
 msgid "[Unsupported]"
 msgstr "[Non supportato]"
 
-#: mod/admin.php:2279
+#: mod/admin.php:2337
 msgid "Log settings updated."
 msgstr "Impostazioni Log aggiornate."
 
-#: mod/admin.php:2311
+#: mod/admin.php:2370
 msgid "PHP log currently enabled."
 msgstr "Log PHP abilitato."
 
-#: mod/admin.php:2313
+#: mod/admin.php:2372
 msgid "PHP log currently disabled."
 msgstr "Log PHP disabilitato"
 
-#: mod/admin.php:2322
+#: mod/admin.php:2381
 msgid "Clear"
 msgstr "Pulisci"
 
-#: mod/admin.php:2326
+#: mod/admin.php:2385
 msgid "Enable Debugging"
 msgstr "Abilita Debugging"
 
-#: mod/admin.php:2327
+#: mod/admin.php:2386
 msgid "Log file"
 msgstr "File di Log"
 
-#: mod/admin.php:2327
+#: mod/admin.php:2386
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Il server web deve avere i permessi di scrittura. Relativo alla tua directory Friendica."
 
-#: mod/admin.php:2328
+#: mod/admin.php:2387
 msgid "Log level"
 msgstr "Livello di Log"
 
-#: mod/admin.php:2330
+#: mod/admin.php:2389
 msgid "PHP logging"
 msgstr "Log PHP"
 
-#: mod/admin.php:2331
+#: mod/admin.php:2390
 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 "Per abilitare il log degli errori e degli avvisi di PHP puoi aggiungere le seguenti righe al file .htconfig.php nella tua installazione. La posizione del file impostato in 'error_log' è relativa alla directory principale della tua installazione Friendica e il server web deve avere i permessi di scrittura sul file. Il valore '1' per 'log_errors' e 'display_errors' abilita le opzioni, imposta '0' per disabilitarle."
+msgstr "Per abilitare temporaneamente il logging di errori e avvisi di PHP, puoi aggiungere le seguenti linee al file index.php della tua installazione. Il nome del file impostato in 'error_log' è relativo alla directory principale della tua installazione di Freidnica e deve essere scrivibile dal server web. L'opzione '1' di 'log_errors' e 'display_errors' server ad abilitare queste impostazioni. Metti '0' per disabilitarle."
 
-#: mod/admin.php:2362
+#: 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 "Errore aprendo il file di log <strong>%1$s</strong>. Controlla che il file %1$s esista e sia leggibile."
 
-#: mod/admin.php:2366
+#: 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 "Non posso aprire il file di log <strong>%1$s</strong> . Controlla che il file %1$s esista e sia leggibile."
 
-#: mod/admin.php:2457 mod/admin.php:2458 mod/settings.php:767
+#: mod/admin.php:2516 mod/admin.php:2517 mod/settings.php:773
 msgid "Off"
 msgstr "Spento"
 
-#: mod/admin.php:2457 mod/admin.php:2458 mod/settings.php:767
+#: mod/admin.php:2516 mod/admin.php:2517 mod/settings.php:773
 msgid "On"
 msgstr "Acceso"
 
-#: mod/admin.php:2458
+#: mod/admin.php:2517
 #, php-format
 msgid "Lock feature %s"
 msgstr "Blocca funzionalità %s"
 
-#: mod/admin.php:2466
+#: mod/admin.php:2525
 msgid "Manage Additional Features"
 msgstr "Gestisci Funzionalità Aggiuntive"
 
-#: mod/dfrn_confirm.php:74 mod/profiles.php:39 mod/profiles.php:149
-#: mod/profiles.php:196 mod/profiles.php:525
+#: mod/allfriends.php:53
+msgid "No friends to display."
+msgstr "Nessun amico da visualizzare."
+
+#: 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 "Connetti"
+
+#: mod/api.php:85 mod/api.php:107
+msgid "Authorize application connection"
+msgstr "Autorizza la connessione dell'applicazione"
+
+#: mod/api.php:86
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Torna alla tua applicazione e inserisci questo codice di sicurezza:"
+
+#: mod/api.php:95
+msgid "Please login to continue."
+msgstr "Effettua il login per continuare."
+
+#: 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 "Vuoi autorizzare questa applicazione per accedere ai messaggi e ai contatti, e / o creare nuovi messaggi per te?"
+
+#: 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 "No"
+
+#: mod/attach.php:16
+msgid "Item not available."
+msgstr "Oggetto non disponibile."
+
+#: mod/attach.php:26
+msgid "Item was not found."
+msgstr "Oggetto non trovato."
+
+#: mod/cal.php:36 mod/community.php:34 mod/viewcontacts.php:23
+#: mod/viewsrc.php:13
+msgid "Access denied."
+msgstr "Accesso negato."
+
+#: mod/cal.php:144 mod/display.php:303 mod/profile.php:175
+msgid "Access to this profile has been restricted."
+msgstr "L'accesso a questo profilo è stato limitato."
+
+#: 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 "Eventi"
+
+#: mod/cal.php:277 mod/events.php:393
+msgid "View"
+msgstr "Mostra"
+
+#: mod/cal.php:278 mod/events.php:395
+msgid "Previous"
+msgstr "Precedente"
+
+#: mod/cal.php:279 mod/events.php:396 mod/install.php:154
+msgid "Next"
+msgstr "Successivo"
+
+#: mod/cal.php:282 mod/events.php:401 src/Model/Event.php:421
+msgid "today"
+msgstr "oggi"
+
+#: mod/cal.php:283 mod/events.php:402 src/Util/Temporal.php:304
+#: src/Model/Event.php:422
+msgid "month"
+msgstr "mese"
+
+#: mod/cal.php:284 mod/events.php:403 src/Util/Temporal.php:305
+#: src/Model/Event.php:423
+msgid "week"
+msgstr "settimana"
+
+#: mod/cal.php:285 mod/events.php:404 src/Util/Temporal.php:306
+#: src/Model/Event.php:424
+msgid "day"
+msgstr "giorno"
+
+#: mod/cal.php:286 mod/events.php:405
+msgid "list"
+msgstr "lista"
+
+#: mod/cal.php:299 src/Core/Console/NewPassword.php:68 src/Model/User.php:218
+msgid "User not found"
+msgstr "Utente non trovato"
+
+#: mod/cal.php:315
+msgid "This calendar format is not supported"
+msgstr "Questo formato di calendario non è supportato"
+
+#: mod/cal.php:317
+msgid "No exportable data found"
+msgstr "Nessun dato esportabile trovato"
+
+#: mod/cal.php:334
+msgid "calendar"
+msgstr "calendario"
+
+#: mod/common.php:93
+msgid "No contacts in common."
+msgstr "Nessun contatto in comune."
+
+#: mod/common.php:142 mod/contacts.php:887
+msgid "Common Friends"
+msgstr "Amici in comune"
+
+#: mod/community.php:51
+msgid "Community option not available."
+msgstr "Opzione Comunità non disponibile"
+
+#: mod/community.php:68
+msgid "Not available."
+msgstr "Non disponibile."
+
+#: mod/community.php:81
+msgid "Local Community"
+msgstr "Comunità Locale"
+
+#: mod/community.php:84
+msgid "Posts from local users on this server"
+msgstr "Messaggi dagli utenti locali su questo sito"
+
+#: mod/community.php:92
+msgid "Global Community"
+msgstr "Comunità Globale"
+
+#: mod/community.php:95
+msgid "Posts from users of the whole federated network"
+msgstr "Messaggi dagli utenti della rete federata"
+
+#: mod/community.php:141 mod/search.php:240
+msgid "No results."
+msgstr "Nessun risultato."
+
+#: 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 "Questa pagina comunità mostra tutti i post pubblici ricevuti da questo nodo. Potrebbero non riflettere le opinioni degli utenti di questo nodo."
+
+#: mod/contacts.php:70 mod/notifications.php:261 src/Model/Profile.php:518
+msgid "Network:"
+msgstr "Rete:"
+
+#: mod/contacts.php:156
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] "%d contatto modificato."
+msgstr[1] "%d contatti modificati"
+
+#: mod/contacts.php:183 mod/contacts.php:399
+msgid "Could not access contact record."
+msgstr "Non è possibile accedere al contatto."
+
+#: mod/contacts.php:193
+msgid "Could not locate selected profile."
+msgstr "Non riesco a trovare il profilo selezionato."
+
+#: mod/contacts.php:227
+msgid "Contact updated."
+msgstr "Contatto aggiornato."
+
+#: mod/contacts.php:229 mod/dfrn_request.php:411
+msgid "Failed to update contact record."
+msgstr "Errore nell'aggiornamento del contatto."
+
+#: mod/contacts.php:420
+msgid "Contact has been blocked"
+msgstr "Il contatto è stato bloccato"
+
+#: mod/contacts.php:420
+msgid "Contact has been unblocked"
+msgstr "Il contatto è stato sbloccato"
+
+#: mod/contacts.php:431
+msgid "Contact has been ignored"
+msgstr "Il contatto è ignorato"
+
+#: mod/contacts.php:431
+msgid "Contact has been unignored"
+msgstr "Il contatto non è più ignorato"
+
+#: mod/contacts.php:442
+msgid "Contact has been archived"
+msgstr "Il contatto è stato archiviato"
+
+#: mod/contacts.php:442
+msgid "Contact has been unarchived"
+msgstr "Il contatto è stato dearchiviato"
+
+#: mod/contacts.php:466
+msgid "Drop contact"
+msgstr "Cancella contatto"
+
+#: mod/contacts.php:469 mod/contacts.php:824
+msgid "Do you really want to delete this contact?"
+msgstr "Vuoi veramente cancellare questo contatto?"
+
+#: mod/contacts.php:487
+msgid "Contact has been removed."
+msgstr "Il contatto è stato rimosso."
+
+#: mod/contacts.php:518
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "Sei amico reciproco con %s"
+
+#: mod/contacts.php:523
+#, php-format
+msgid "You are sharing with %s"
+msgstr "Stai condividendo con %s"
+
+#: mod/contacts.php:528
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s sta condividendo con te"
+
+#: mod/contacts.php:548
+msgid "Private communications are not available for this contact."
+msgstr "Le comunicazioni private non sono disponibili per questo contatto."
+
+#: mod/contacts.php:550
+msgid "Never"
+msgstr "Mai"
+
+#: mod/contacts.php:553
+msgid "(Update was successful)"
+msgstr "(L'aggiornamento è stato completato)"
+
+#: mod/contacts.php:553
+msgid "(Update was not successful)"
+msgstr "(L'aggiornamento non è stato completato)"
+
+#: mod/contacts.php:555 mod/contacts.php:1000
+msgid "Suggest friends"
+msgstr "Suggerisci amici"
+
+#: mod/contacts.php:559
+#, php-format
+msgid "Network type: %s"
+msgstr "Tipo di rete: %s"
+
+#: mod/contacts.php:564
+msgid "Communications lost with this contact!"
+msgstr "Comunicazione con questo contatto persa!"
+
+#: mod/contacts.php:570
+msgid "Fetch further information for feeds"
+msgstr "Recupera maggiori informazioni per i feed"
+
+#: 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 "Recupera informazioni come immagini di anteprima, titolo e teaser dall'elemento del feed. Puoi attivare questa funzione se il feed non contiene molto testo. Le parole chiave sono recuperate dal tag meta nella pagina dell'elemento e inseriti come hashtag."
+
+#: mod/contacts.php:574
+msgid "Fetch information"
+msgstr "Recupera informazioni"
+
+#: mod/contacts.php:575
+msgid "Fetch keywords"
+msgstr "Recupera parole chiave"
+
+#: mod/contacts.php:576
+msgid "Fetch information and keywords"
+msgstr "Recupera informazioni e parole chiave"
+
+#: mod/contacts.php:600 mod/unfollow.php:101
+msgid "Disconnect/Unfollow"
+msgstr "Disconnetti/Non Seguire"
+
+#: mod/contacts.php:609
+msgid "Contact"
+msgstr "Contatto"
+
+#: mod/contacts.php:612
+msgid "Profile Visibility"
+msgstr "Visibilità del profilo"
+
+#: mod/contacts.php:613
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro."
+
+#: mod/contacts.php:614
+msgid "Contact Information / Notes"
+msgstr "Informazioni / Note sul contatto"
+
+#: mod/contacts.php:615
+msgid "Their personal note"
+msgstr "La loro nota personale"
+
+#: mod/contacts.php:617
+msgid "Edit contact notes"
+msgstr "Modifica note contatto"
+
+#: mod/contacts.php:620 mod/contacts.php:966 mod/viewcontacts.php:105
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Visita il profilo di %s [%s]"
+
+#: mod/contacts.php:621
+msgid "Block/Unblock contact"
+msgstr "Blocca/Sblocca contatto"
+
+#: mod/contacts.php:622
+msgid "Ignore contact"
+msgstr "Ignora il contatto"
+
+#: mod/contacts.php:623
+msgid "Repair URL settings"
+msgstr "Impostazioni riparazione URL"
+
+#: mod/contacts.php:624
+msgid "View conversations"
+msgstr "Vedi conversazioni"
+
+#: mod/contacts.php:629
+msgid "Last update:"
+msgstr "Ultimo aggiornamento:"
+
+#: mod/contacts.php:631
+msgid "Update public posts"
+msgstr "Aggiorna messaggi pubblici"
+
+#: mod/contacts.php:633 mod/contacts.php:1010
+msgid "Update now"
+msgstr "Aggiorna adesso"
+
+#: mod/contacts.php:639 mod/contacts.php:829 mod/contacts.php:1027
+msgid "Unignore"
+msgstr "Non ignorare"
+
+#: 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 "Ignora"
+
+#: mod/contacts.php:643
+msgid "Currently blocked"
+msgstr "Bloccato"
+
+#: mod/contacts.php:644
+msgid "Currently ignored"
+msgstr "Ignorato"
+
+#: mod/contacts.php:645
+msgid "Currently archived"
+msgstr "Al momento archiviato"
+
+#: mod/contacts.php:646
+msgid "Awaiting connection acknowledge"
+msgstr "In attesa di conferma della connessione"
+
+#: mod/contacts.php:647 mod/notifications.php:171 mod/notifications.php:255
+msgid "Hide this contact from others"
+msgstr "Nascondi questo contatto agli altri"
+
+#: mod/contacts.php:647
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "Risposte ai tuoi post pubblici <strong>possono</strong> essere comunque visibili"
+
+#: mod/contacts.php:648
+msgid "Notification for new posts"
+msgstr "Notifica per i nuovi messaggi"
+
+#: mod/contacts.php:648
+msgid "Send a notification of every new post of this contact"
+msgstr "Invia una notifica per ogni nuovo messaggio di questo contatto"
+
+#: mod/contacts.php:651
+msgid "Blacklisted keywords"
+msgstr "Parole chiave in blacklist"
+
+#: 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 "Lista separata da virgola di parole chiave che non dovranno essere convertite in hashtag, quando \"Recupera informazioni e parole chiave\" è selezionato"
+
+#: 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 "Posizione:"
+
+#: 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 "Informazioni:"
+
+#: mod/contacts.php:667 mod/follow.php:178 mod/notifications.php:252
+#: src/Model/Profile.php:790
+msgid "Tags:"
+msgstr "Tag:"
+
+#: mod/contacts.php:668
+msgid "Actions"
+msgstr "Azioni"
+
+#: 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 "Stato"
+
+#: mod/contacts.php:671
+msgid "Contact Settings"
+msgstr "Impostazioni Contatto"
+
+#: mod/contacts.php:712
+msgid "Suggestions"
+msgstr "Suggerimenti"
+
+#: mod/contacts.php:715
+msgid "Suggest potential friends"
+msgstr "Suggerisci potenziali amici"
+
+#: mod/contacts.php:720 mod/group.php:246
+msgid "All Contacts"
+msgstr "Tutti i contatti"
+
+#: mod/contacts.php:723
+msgid "Show all contacts"
+msgstr "Mostra tutti i contatti"
+
+#: mod/contacts.php:728
+msgid "Unblocked"
+msgstr "Sbloccato"
+
+#: mod/contacts.php:731
+msgid "Only show unblocked contacts"
+msgstr "Mostra solo contatti non bloccati"
+
+#: mod/contacts.php:736
+msgid "Blocked"
+msgstr "Bloccato"
+
+#: mod/contacts.php:739
+msgid "Only show blocked contacts"
+msgstr "Mostra solo contatti bloccati"
+
+#: mod/contacts.php:744
+msgid "Ignored"
+msgstr "Ignorato"
+
+#: mod/contacts.php:747
+msgid "Only show ignored contacts"
+msgstr "Mostra solo contatti ignorati"
+
+#: mod/contacts.php:752
+msgid "Archived"
+msgstr "Archiviato"
+
+#: mod/contacts.php:755
+msgid "Only show archived contacts"
+msgstr "Mostra solo contatti archiviati"
+
+#: mod/contacts.php:760
+msgid "Hidden"
+msgstr "Nascosto"
+
+#: mod/contacts.php:763
+msgid "Only show hidden contacts"
+msgstr "Mostra solo contatti nascosti"
+
+#: mod/contacts.php:819
+msgid "Search your contacts"
+msgstr "Cerca nei tuoi contatti"
+
+#: mod/contacts.php:820 mod/search.php:248
+#, php-format
+msgid "Results for: %s"
+msgstr "Risultati per: %s"
+
+#: mod/contacts.php:821 mod/directory.php:214 view/theme/vier/theme.php:201
+#: src/Content/Widget.php:62
+msgid "Find"
+msgstr "Trova"
+
+#: mod/contacts.php:827 mod/settings.php:176 mod/settings.php:701
+msgid "Update"
+msgstr "Aggiorna"
+
+#: mod/contacts.php:830 mod/contacts.php:1035
+msgid "Archive"
+msgstr "Archivia"
+
+#: mod/contacts.php:830 mod/contacts.php:1035
+msgid "Unarchive"
+msgstr "Dearchivia"
+
+#: mod/contacts.php:833
+msgid "Batch Actions"
+msgstr "Azioni Batch"
+
+#: mod/contacts.php:859 mod/follow.php:190 mod/unfollow.php:133
+#: src/Model/Profile.php:887
+msgid "Status Messages and Posts"
+msgstr "Messaggi di stato e post"
+
+#: mod/contacts.php:867 src/Model/Profile.php:895
+msgid "Profile Details"
+msgstr "Dettagli del profilo"
+
+#: mod/contacts.php:879
+msgid "View all contacts"
+msgstr "Vedi tutti i contatti"
+
+#: mod/contacts.php:890
+msgid "View all common friends"
+msgstr "Vedi tutti gli amici in comune"
+
+#: mod/contacts.php:899
+msgid "Advanced Contact Settings"
+msgstr "Impostazioni avanzate Contatto"
+
+#: mod/contacts.php:933
+msgid "Mutual Friendship"
+msgstr "Amicizia reciproca"
+
+#: mod/contacts.php:938
+msgid "is a fan of yours"
+msgstr "è un tuo fan"
+
+#: mod/contacts.php:943
+msgid "you are a fan of"
+msgstr "sei un fan di"
+
+#: 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 "Questo sei tu"
+
+#: mod/contacts.php:967
+msgid "Edit contact"
+msgstr "Modifica contatto"
+
+#: mod/contacts.php:1021
+msgid "Toggle Blocked status"
+msgstr "Inverti stato \"Blocca\""
+
+#: mod/contacts.php:1029
+msgid "Toggle Ignored status"
+msgstr "Inverti stato \"Ignora\""
+
+#: mod/contacts.php:1037
+msgid "Toggle Archive status"
+msgstr "Inverti stato \"Archiviato\""
+
+#: mod/contacts.php:1045
+msgid "Delete contact"
+msgstr "Rimuovi contatto"
+
+#: mod/crepair.php:88
+msgid "Contact settings applied."
+msgstr "Contatto modificato."
+
+#: mod/crepair.php:90
+msgid "Contact update failed."
+msgstr "Le modifiche al contatto non sono state salvate."
+
+#: 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
+msgid "Contact not found."
+msgstr "Contatto non trovato."
+
+#: mod/crepair.php:115
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect"
+" information your communications with this contact may stop working."
+msgstr "<strong>ATTENZIONE: Queste sono impostazioni avanzate</strong> e se inserisci informazioni errate le tue comunicazioni con questo contatto potrebbero non funzionare più"
+
+#: mod/crepair.php:116
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
+msgstr "Usa <strong>ora</strong> il tasto 'Indietro' del tuo browser se non sei sicuro di cosa fare in questa pagina."
+
+#: mod/crepair.php:130 mod/crepair.php:132
+msgid "No mirroring"
+msgstr "Non duplicare"
+
+#: mod/crepair.php:130
+msgid "Mirror as forwarded posting"
+msgstr "Duplica come messaggi ricondivisi"
+
+#: mod/crepair.php:130 mod/crepair.php:132
+msgid "Mirror as my own posting"
+msgstr "Duplica come miei messaggi"
+
+#: mod/crepair.php:145
+msgid "Return to contact editor"
+msgstr "Ritorna alla modifica contatto"
+
+#: mod/crepair.php:147
+msgid "Refetch contact data"
+msgstr "Ricarica dati contatto"
+
+#: mod/crepair.php:150
+msgid "Remote Self"
+msgstr "Io remoto"
+
+#: mod/crepair.php:153
+msgid "Mirror postings from this contact"
+msgstr "Ripeti i messaggi di questo contatto"
+
+#: mod/crepair.php:155
+msgid ""
+"Mark this contact as remote_self, this will cause friendica to repost new "
+"entries from this contact."
+msgstr "Imposta questo contatto come 'io remoto', questo farà si che friendica re invii i nuovi messaggi da questo contatto."
+
+#: mod/crepair.php:160
+msgid "Account Nickname"
+msgstr "Nome utente"
+
+#: mod/crepair.php:161
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@TagName - al posto del nome utente"
+
+#: mod/crepair.php:162
+msgid "Account URL"
+msgstr "URL dell'utente"
+
+#: mod/crepair.php:163
+msgid "Friend Request URL"
+msgstr "URL Richiesta Amicizia"
+
+#: mod/crepair.php:164
+msgid "Friend Confirm URL"
+msgstr "URL Conferma Amicizia"
+
+#: mod/crepair.php:165
+msgid "Notification Endpoint URL"
+msgstr "URL Notifiche"
+
+#: mod/crepair.php:166
+msgid "Poll/Feed URL"
+msgstr "URL Feed"
+
+#: mod/crepair.php:167
+msgid "New photo from this URL"
+msgstr "Nuova foto da questo URL"
+
+#: mod/delegate.php:38
+msgid "Parent user not found."
+msgstr "Utente principale non trovato."
+
+#: mod/delegate.php:145
+msgid "No parent user"
+msgstr "Nessun utente principale"
+
+#: mod/delegate.php:160
+msgid "Parent Password:"
+msgstr "Password Principale:"
+
+#: mod/delegate.php:160
+msgid ""
+"Please enter the password of the parent account to legitimize your request."
+msgstr "Inserisci la password dell'account principale per autorizzare la tua richiesta."
+
+#: mod/delegate.php:165
+msgid "Parent User"
+msgstr "Utente Principale"
+
+#: mod/delegate.php:168
+msgid ""
+"Parent users have total control about this account, including the account "
+"settings. Please double check whom you give this access."
+msgstr "Gli utenti principali hanno il controllo totale su questo account, comprese le impostazioni. Assicurati di controllare due volte a chi stai fornendo questo accesso."
+
+#: mod/delegate.php:170 src/Content/Nav.php:205
+msgid "Delegate Page Management"
+msgstr "Gestione delegati per la pagina"
+
+#: mod/delegate.php:171
+msgid "Delegates"
+msgstr "Delegati"
+
+#: mod/delegate.php:173
+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 "I Delegati sono in grado di gestire tutti gli aspetti di questa pagina, tranne per le impostazioni di base dell'account. Non delegare il tuo account personale a nessuno di cui non ti fidi ciecamente."
+
+#: mod/delegate.php:174
+msgid "Existing Page Delegates"
+msgstr "Delegati Pagina Esistenti"
+
+#: mod/delegate.php:176
+msgid "Potential Delegates"
+msgstr "Delegati Potenziali"
+
+#: mod/delegate.php:178 mod/tagrm.php:90
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: mod/delegate.php:179
+msgid "Add"
+msgstr "Aggiungi"
+
+#: mod/delegate.php:180
+msgid "No entries."
+msgstr "Nessuna voce."
+
+#: mod/dfrn_confirm.php:71 mod/profiles.php:38 mod/profiles.php:148
+#: mod/profiles.php:193 mod/profiles.php:523
 msgid "Profile not found."
 msgstr "Profilo non trovato."
 
-#: mod/dfrn_confirm.php:130
+#: mod/dfrn_confirm.php:127
 msgid ""
 "This may occasionally happen if contact was requested by both persons and it"
 " has already been approved."
 msgstr "Questo può accadere occasionalmente se la richiesta di contatto era stata inviata da entrambe le persone e  già approvata."
 
-#: mod/dfrn_confirm.php:240
+#: mod/dfrn_confirm.php:237
 msgid "Response from remote site was not understood."
 msgstr "Errore di comunicazione con l'altro sito."
 
-#: mod/dfrn_confirm.php:247 mod/dfrn_confirm.php:252
+#: mod/dfrn_confirm.php:244 mod/dfrn_confirm.php:249
 msgid "Unexpected response from remote site: "
 msgstr "La risposta dell'altro sito non può essere gestita: "
 
-#: mod/dfrn_confirm.php:261
+#: mod/dfrn_confirm.php:258
 msgid "Confirmation completed successfully."
 msgstr "Conferma completata con successo."
 
-#: mod/dfrn_confirm.php:273
+#: mod/dfrn_confirm.php:270
 msgid "Temporary failure. Please wait and try again."
 msgstr "Problema temporaneo. Attendi e riprova."
 
-#: mod/dfrn_confirm.php:276
+#: mod/dfrn_confirm.php:273
 msgid "Introduction failed or was revoked."
 msgstr "La presentazione ha generato un errore o è stata revocata."
 
-#: mod/dfrn_confirm.php:281
+#: mod/dfrn_confirm.php:278
 msgid "Remote site reported: "
 msgstr "Il sito remoto riporta: "
 
-#: mod/dfrn_confirm.php:392
+#: mod/dfrn_confirm.php:389
 msgid "Unable to set contact photo."
 msgstr "Impossibile impostare la foto del contatto."
 
-#: mod/dfrn_confirm.php:450
+#: mod/dfrn_confirm.php:447
 #, php-format
 msgid "No user record found for '%s' "
 msgstr "Nessun utente trovato '%s'"
 
-#: mod/dfrn_confirm.php:460
+#: mod/dfrn_confirm.php:457
 msgid "Our site encryption key is apparently messed up."
 msgstr "La nostra chiave di criptazione del sito sembra essere corrotta."
 
-#: mod/dfrn_confirm.php:471
+#: mod/dfrn_confirm.php:468
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr "E' stato fornito un indirizzo vuoto o non possiamo decrittare l'indirizzo."
 
-#: mod/dfrn_confirm.php:487
+#: mod/dfrn_confirm.php:484
 msgid "Contact record was not found for you on our site."
 msgstr "Il contatto non è stato trovato sul nostro sito."
 
-#: mod/dfrn_confirm.php:501
+#: mod/dfrn_confirm.php:498
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr "La chiave pubblica del sito non è disponibile per l'URL %s"
 
-#: mod/dfrn_confirm.php:517
+#: mod/dfrn_confirm.php:514
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr "L'ID fornito dal tuo sistema è duplicato sul nostro sistema. Se riprovi dovrebbe funzionare."
 
-#: mod/dfrn_confirm.php:528
+#: mod/dfrn_confirm.php:525
 msgid "Unable to set your contact credentials on our system."
 msgstr "Impossibile impostare le credenziali del tuo contatto sul nostro sistema."
 
-#: mod/dfrn_confirm.php:583
+#: mod/dfrn_confirm.php:580
 msgid "Unable to update your contact profile details on our system"
 msgstr "Impossibile aggiornare i dettagli del tuo contatto sul nostro sistema"
 
-#: mod/dfrn_confirm.php:613 mod/dfrn_request.php:564
-#: src/Model/Contact.php:1578
+#: mod/dfrn_confirm.php:610 mod/dfrn_request.php:560
+#: src/Model/Contact.php:1648
 msgid "[Name Withheld]"
 msgstr "[Nome Nascosto]"
 
-#: mod/dfrn_request.php:94
+#: mod/dfrn_poll.php:126 mod/dfrn_poll.php:543
+#, php-format
+msgid "%1$s welcomes %2$s"
+msgstr "%s dà il benvenuto a %s"
+
+#: mod/dfrn_request.php:93
 msgid "This introduction has already been accepted."
 msgstr "Questa presentazione è già stata accettata."
 
-#: mod/dfrn_request.php:112 mod/dfrn_request.php:355
+#: mod/dfrn_request.php:111 mod/dfrn_request.php:352
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "L'indirizzo del profilo non è valido o non contiene un profilo."
 
-#: mod/dfrn_request.php:116 mod/dfrn_request.php:359
+#: mod/dfrn_request.php:115 mod/dfrn_request.php:356
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "Attenzione: l'indirizzo del profilo non riporta il nome del proprietario."
 
-#: mod/dfrn_request.php:119 mod/dfrn_request.php:362
+#: mod/dfrn_request.php:118 mod/dfrn_request.php:359
 msgid "Warning: profile location has no profile photo."
 msgstr "Attenzione: l'indirizzo del profilo non ha una foto."
 
-#: mod/dfrn_request.php:123 mod/dfrn_request.php:366
+#: mod/dfrn_request.php:122 mod/dfrn_request.php:363
 #, 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 parametro richiesto non è stato trovato all'indirizzo dato"
 msgstr[1] "%d parametri richiesti non sono stati trovati all'indirizzo dato"
 
-#: mod/dfrn_request.php:162
+#: mod/dfrn_request.php:160
 msgid "Introduction complete."
 msgstr "Presentazione completa."
 
-#: mod/dfrn_request.php:199
+#: mod/dfrn_request.php:196
 msgid "Unrecoverable protocol error."
 msgstr "Errore di comunicazione."
 
-#: mod/dfrn_request.php:226
+#: mod/dfrn_request.php:223
 msgid "Profile unavailable."
 msgstr "Profilo non disponibile."
 
-#: mod/dfrn_request.php:248
+#: mod/dfrn_request.php:245
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr "%s ha ricevuto troppe richieste di connessione per oggi."
 
-#: mod/dfrn_request.php:249
+#: mod/dfrn_request.php:246
 msgid "Spam protection measures have been invoked."
 msgstr "Sono state attivate le misure di protezione contro lo spam."
 
-#: mod/dfrn_request.php:250
+#: mod/dfrn_request.php:247
 msgid "Friends are advised to please try again in 24 hours."
 msgstr "Gli amici sono pregati di riprovare tra 24 ore."
 
-#: mod/dfrn_request.php:276
+#: mod/dfrn_request.php:273
 msgid "Invalid locator"
 msgstr "Indirizzo non valido"
 
-#: mod/dfrn_request.php:312
+#: mod/dfrn_request.php:309
 msgid "You have already introduced yourself here."
 msgstr "Ti sei già presentato qui."
 
-#: mod/dfrn_request.php:315
+#: mod/dfrn_request.php:312
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "Pare che tu e %s siate già amici."
 
-#: mod/dfrn_request.php:335
+#: mod/dfrn_request.php:332
 msgid "Invalid profile URL."
 msgstr "Indirizzo profilo non valido."
 
-#: mod/dfrn_request.php:341 src/Model/Contact.php:1276
+#: mod/dfrn_request.php:338 src/Model/Contact.php:1333
 msgid "Disallowed profile URL."
 msgstr "Indirizzo profilo non permesso."
 
-#: mod/dfrn_request.php:435
+#: mod/dfrn_request.php:431
 msgid "Your introduction has been sent."
 msgstr "La tua presentazione è stata inviata."
 
-#: mod/dfrn_request.php:473
+#: mod/dfrn_request.php:469
 msgid ""
 "Remote subscription can't be done for your network. Please subscribe "
 "directly on your system."
 msgstr "La richiesta di connessione remota non può essere effettuata per la tua rete. Invia la richiesta direttamente sul nostro sistema."
 
-#: mod/dfrn_request.php:489
+#: mod/dfrn_request.php:485
 msgid "Please login to confirm introduction."
 msgstr "Accedi per confermare la presentazione."
 
-#: mod/dfrn_request.php:497
+#: mod/dfrn_request.php:493
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
 msgstr "Non hai fatto accesso con l'identità corretta. Accedi a <strong>questo</strong> profilo."
 
-#: mod/dfrn_request.php:511 mod/dfrn_request.php:528
+#: mod/dfrn_request.php:507 mod/dfrn_request.php:524
 msgid "Confirm"
 msgstr "Conferma"
 
-#: mod/dfrn_request.php:523
+#: mod/dfrn_request.php:519
 msgid "Hide this contact"
 msgstr "Nascondi questo contatto"
 
-#: mod/dfrn_request.php:526
+#: mod/dfrn_request.php:522
 #, php-format
 msgid "Welcome home %s."
 msgstr "Bentornato a casa %s."
 
-#: mod/dfrn_request.php:527
+#: mod/dfrn_request.php:523
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "Conferma la tua richiesta di connessione con %s."
 
-#: mod/dfrn_request.php:637
+#: mod/dfrn_request.php:633
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr "Inserisci il tuo 'Indirizzo Identità' da uno dei seguenti network supportati:"
 
-#: mod/dfrn_request.php:640
+#: 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 "Se non sei un membro del web sociale libero,  <a href=\"%s\">segui questo link per trovare un sito Friendica pubblico e unisciti a noi oggi</a>."
 
-#: mod/dfrn_request.php:645
+#: mod/dfrn_request.php:641
 msgid "Friend/Connection Request"
 msgstr "Richieste di amicizia/connessione"
 
-#: mod/dfrn_request.php:646
+#: mod/dfrn_request.php:642
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@gnusocial.de"
 msgstr "Esempi: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"
 
-#: mod/dfrn_request.php:651 src/Content/ContactSelector.php:79
+#: mod/dfrn_request.php:643 mod/follow.php:150
+msgid "Please answer the following:"
+msgstr "Rispondi:"
+
+#: mod/dfrn_request.php:644 mod/follow.php:151
+#, php-format
+msgid "Does %s know you?"
+msgstr "%s ti conosce?"
+
+#: mod/dfrn_request.php:645 mod/follow.php:152
+msgid "Add a personal note:"
+msgstr "Aggiungi una nota personale:"
+
+#: mod/dfrn_request.php:647 src/Content/ContactSelector.php:77
 msgid "Friendica"
 msgstr "Friendica"
 
-#: mod/dfrn_request.php:652
+#: mod/dfrn_request.php:648
 msgid "GNU Social (Pleroma, Mastodon)"
 msgstr "GNU Social (Pleroma, Mastodon)"
 
-#: mod/dfrn_request.php:653
+#: mod/dfrn_request.php:649
 msgid "Diaspora (Socialhome, Hubzilla)"
 msgstr "Diaspora (Socialhome, Hubzilla)"
 
-#: mod/dfrn_request.php:654
+#: mod/dfrn_request.php:650
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search"
 " bar."
 msgstr " - per favore non usare questa form. Invece, inserisci %s nella tua barra di ricerca su Diaspora."
 
-#: mod/item.php:114
+#: mod/dfrn_request.php:651 mod/follow.php:158 mod/unfollow.php:114
+msgid "Your Identity Address:"
+msgstr "L'indirizzo della tua identità:"
+
+#: mod/dfrn_request.php:653 mod/follow.php:63 mod/unfollow.php:66
+msgid "Submit Request"
+msgstr "Invia richiesta"
+
+#: mod/directory.php:156 mod/notifications.php:254 src/Model/Profile.php:418
+#: src/Model/Profile.php:741
+msgid "Gender:"
+msgstr "Genere:"
+
+#: mod/directory.php:157 src/Model/Profile.php:419 src/Model/Profile.php:765
+msgid "Status:"
+msgstr "Stato:"
+
+#: mod/directory.php:158 src/Model/Profile.php:420 src/Model/Profile.php:782
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#: mod/directory.php:207 view/theme/vier/theme.php:206
+#: src/Content/Widget.php:67
+msgid "Global Directory"
+msgstr "Elenco globale"
+
+#: mod/directory.php:209
+msgid "Find on this site"
+msgstr "Cerca nel sito"
+
+#: mod/directory.php:211
+msgid "Results for:"
+msgstr "Risultati per:"
+
+#: mod/directory.php:213
+msgid "Site Directory"
+msgstr "Elenco del sito"
+
+#: mod/directory.php:218
+msgid "No entries (some entries may be hidden)."
+msgstr "Nessuna voce (qualche voce potrebbe essere nascosta)."
+
+#: mod/dirfind.php:52
+#, php-format
+msgid "People Search - %s"
+msgstr "Cerca persone - %s"
+
+#: mod/dirfind.php:63
+#, php-format
+msgid "Forum Search - %s"
+msgstr "Ricerca Forum  - %s"
+
+#: mod/dirfind.php:256 mod/match.php:125
+msgid "No matches"
+msgstr "Nessun risultato"
+
+#: mod/editpost.php:26 mod/editpost.php:36
+msgid "Item not found"
+msgstr "Oggetto non trovato"
+
+#: mod/editpost.php:43
+msgid "Edit post"
+msgstr "Modifica messaggio"
+
+#: mod/editpost.php:125 src/Core/ACL.php:305
+msgid "CC: email addresses"
+msgstr "CC: indirizzi email"
+
+#: mod/editpost.php:132 src/Core/ACL.php:306
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Esempio: bob@example.com, mary@example.com"
+
+#: mod/events.php:105 mod/events.php:107
+msgid "Event can not end before it has started."
+msgstr "Un evento non può finire prima di iniziare."
+
+#: mod/events.php:114 mod/events.php:116
+msgid "Event title and start time are required."
+msgstr "Titolo e ora di inizio dell'evento sono richiesti."
+
+#: mod/events.php:394
+msgid "Create New Event"
+msgstr "Crea un nuovo evento"
+
+#: mod/events.php:508
+msgid "Event details"
+msgstr "Dettagli dell'evento"
+
+#: mod/events.php:509
+msgid "Starting date and Title are required."
+msgstr "La data di inizio e il titolo sono richiesti."
+
+#: mod/events.php:510 mod/events.php:511
+msgid "Event Starts:"
+msgstr "L'evento inizia:"
+
+#: mod/events.php:510 mod/events.php:522 mod/profiles.php:607
+msgid "Required"
+msgstr "Richiesto"
+
+#: mod/events.php:512 mod/events.php:528
+msgid "Finish date/time is not known or not relevant"
+msgstr "La data/ora di fine non è definita"
+
+#: mod/events.php:514 mod/events.php:515
+msgid "Event Finishes:"
+msgstr "L'evento finisce:"
+
+#: mod/events.php:516 mod/events.php:529
+msgid "Adjust for viewer timezone"
+msgstr "Visualizza con il fuso orario di chi legge"
+
+#: mod/events.php:518
+msgid "Description:"
+msgstr "Descrizione:"
+
+#: mod/events.php:522 mod/events.php:524
+msgid "Title:"
+msgstr "Titolo:"
+
+#: mod/events.php:525 mod/events.php:526
+msgid "Share this event"
+msgstr "Condividi questo evento"
+
+#: mod/events.php:533 src/Model/Profile.php:860
+msgid "Basic"
+msgstr "Base"
+
+#: mod/events.php:535 mod/photos.php:1094 mod/photos.php:1418
+#: src/Core/ACL.php:308
+msgid "Permissions"
+msgstr "Permessi"
+
+#: mod/events.php:554
+msgid "Failed to remove event"
+msgstr "Rimozione evento fallita."
+
+#: mod/events.php:556
+msgid "Event removed"
+msgstr "Evento rimosso"
+
+#: mod/fbrowser.php:35 view/theme/frio/theme.php:261 src/Content/Nav.php:102
+#: src/Model/Profile.php:900
+msgid "Photos"
+msgstr "Foto"
+
+#: 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 "Foto dei contatti"
+
+#: mod/fbrowser.php:106 mod/fbrowser.php:137 mod/profile_photo.php:247
+msgid "Upload"
+msgstr "Carica"
+
+#: mod/fbrowser.php:132
+msgid "Files"
+msgstr "File"
+
+#: mod/feedtest.php:21
+msgid "You must be logged in to use this module"
+msgstr "Devi aver essere autenticato per usare questo modulo"
+
+#: mod/feedtest.php:49
+msgid "Source URL"
+msgstr "URL Sorgente"
+
+#: mod/follow.php:46
+msgid "The contact could not be added."
+msgstr "Il contatto non può essere aggiunto."
+
+#: mod/follow.php:74
+msgid "You already added this contact."
+msgstr "Hai già aggiunto questo contatto."
+
+#: mod/follow.php:84
+msgid "Diaspora support isn't enabled. Contact can't be added."
+msgstr "Il supporto Diaspora non è abilitato. Il contatto non può essere aggiunto."
+
+#: mod/follow.php:91
+msgid "OStatus support is disabled. Contact can't be added."
+msgstr "Il supporto OStatus non è abilitato. Il contatto non può essere aggiunto."
+
+#: mod/follow.php:98
+msgid "The network type couldn't be detected. Contact can't be added."
+msgstr "Non è possibile rilevare il tipo di rete. Il contatto non può essere aggiunto."
+
+#: mod/fsuggest.php:72
+msgid "Friend suggestion sent."
+msgstr "Suggerimento di amicizia inviato."
+
+#: mod/fsuggest.php:101
+msgid "Suggest Friends"
+msgstr "Suggerisci amici"
+
+#: mod/fsuggest.php:103
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "Suggerisci un amico a %s"
+
+#: mod/group.php:36
+msgid "Group created."
+msgstr "Gruppo creato."
+
+#: mod/group.php:42
+msgid "Could not create group."
+msgstr "Impossibile creare il gruppo."
+
+#: mod/group.php:56 mod/group.php:187
+msgid "Group not found."
+msgstr "Gruppo non trovato."
+
+#: mod/group.php:70
+msgid "Group name changed."
+msgstr "Il nome del gruppo è cambiato."
+
+#: mod/group.php:83 mod/profperm.php:28 index.php:431
+msgid "Permission denied"
+msgstr "Permesso negato"
+
+#: mod/group.php:101
+msgid "Save Group"
+msgstr "Salva gruppo"
+
+#: mod/group.php:102
+msgid "Filter"
+msgstr "Filtro"
+
+#: mod/group.php:107
+msgid "Create a group of contacts/friends."
+msgstr "Crea un gruppo di amici/contatti."
+
+#: mod/group.php:108 mod/group.php:134 mod/group.php:229
+#: src/Model/Group.php:421
+msgid "Group Name: "
+msgstr "Nome del gruppo:"
+
+#: mod/group.php:125 src/Model/Group.php:418
+msgid "Contacts not in any group"
+msgstr "Contatti in nessun gruppo."
+
+#: mod/group.php:157
+msgid "Group removed."
+msgstr "Gruppo rimosso."
+
+#: mod/group.php:159
+msgid "Unable to remove group."
+msgstr "Impossibile rimuovere il gruppo."
+
+#: mod/group.php:222
+msgid "Delete Group"
+msgstr "Elimina Gruppo"
+
+#: mod/group.php:233
+msgid "Edit Group Name"
+msgstr "Modifica Nome Gruppo"
+
+#: mod/group.php:244
+msgid "Members"
+msgstr "Membri"
+
+#: mod/group.php:247 mod/network.php:638
+msgid "Group is empty"
+msgstr "Il gruppo è vuoto"
+
+#: mod/group.php:260
+msgid "Remove contact from group"
+msgstr "Rimuovi il contatto dal gruppo"
+
+#: mod/group.php:278 mod/profperm.php:115
+msgid "Click on a contact to add or remove."
+msgstr "Clicca su un contatto per aggiungerlo o rimuoverlo."
+
+#: mod/group.php:292
+msgid "Add contact to group"
+msgstr "Aggiungi il contatto al gruppo"
+
+#: mod/hcard.php:19
+msgid "No profile"
+msgstr "Nessun profilo"
+
+#: mod/install.php:87
+msgid "Friendica Communications Server - Setup"
+msgstr "Friendica Comunicazione Server - Impostazioni"
+
+#: mod/install.php:93
+msgid "Could not connect to database."
+msgstr " Impossibile collegarsi con il database."
+
+#: mod/install.php:97
+msgid "Could not create table."
+msgstr "Impossibile creare le tabelle."
+
+#: mod/install.php:103
+msgid "Your Friendica site database has been installed."
+msgstr "Il tuo Friendica è stato installato."
+
+#: mod/install.php:108
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Potresti dover importare il file \"database.sql\" manualmente con phpmyadmin o mysql"
+
+#: mod/install.php:109 mod/install.php:153 mod/install.php:261
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Leggi il file \"INSTALL.txt\"."
+
+#: mod/install.php:121
+msgid "Database already in use."
+msgstr "Database già in uso."
+
+#: mod/install.php:150
+msgid "System check"
+msgstr "Controllo sistema"
+
+#: mod/install.php:155
+msgid "Check again"
+msgstr "Controlla ancora"
+
+#: mod/install.php:174
+msgid "Database connection"
+msgstr "Connessione al database"
+
+#: mod/install.php:175
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "Per installare Friendica dobbiamo sapere come collegarci al tuo database."
+
+#: mod/install.php:176
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Contatta il tuo fornitore di hosting o l'amministratore del sito se hai domande su queste impostazioni."
+
+#: mod/install.php:177
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "Il database dovrà già esistere. Se non esiste, crealo prima di continuare."
+
+#: mod/install.php:181
+msgid "Database Server Name"
+msgstr "Nome del database server"
+
+#: mod/install.php:182
+msgid "Database Login Name"
+msgstr "Nome utente database"
+
+#: mod/install.php:183
+msgid "Database Login Password"
+msgstr "Password utente database"
+
+#: mod/install.php:183
+msgid "For security reasons the password must not be empty"
+msgstr "Per motivi di sicurezza la password non puo' essere vuota."
+
+#: mod/install.php:184
+msgid "Database Name"
+msgstr "Nome database"
+
+#: mod/install.php:185 mod/install.php:222
+msgid "Site administrator email address"
+msgstr "Indirizzo email dell'amministratore del sito"
+
+#: 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 "Il tuo indirizzo email deve corrispondere a questo per poter usare il pannello di amministrazione web."
+
+#: mod/install.php:187 mod/install.php:225
+msgid "Please select a default timezone for your website"
+msgstr "Seleziona il fuso orario predefinito per il tuo sito web"
+
+#: mod/install.php:212
+msgid "Site settings"
+msgstr "Impostazioni sito"
+
+#: mod/install.php:226
+msgid "System Language:"
+msgstr "Lingua di Sistema:"
+
+#: mod/install.php:226
+msgid ""
+"Set the default language for your Friendica installation interface and to "
+"send emails."
+msgstr "Imposta la lingua di default per l'interfaccia e l'invio delle email."
+
+#: 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 "Il file di configurazione del database \"config/local.ini.php\" non puo' essere scritto. Usa il testo allegato per creare un file di configurazione nell tuo server web."
+
+#: mod/install.php:259
+msgid "<h1>What next</h1>"
+msgstr "<h1>Cosa fare ora</h1>"
+
+#: mod/install.php:260
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"worker."
+msgstr "IMPORTANTE: Devi impostare [manualmente] la pianificazione del 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 "Vai nella <a href=\"%s/register\">pagina di registrazione</a> del tuo nuovo nodo Friendica e registra un nuovo utente. Ricorda di usare la stessa email che hai inserito come email dell'utente amministratore. Questo ti permetterà di entrare nel pannello di amministrazione del sito."
+
+#: mod/invite.php:34
+msgid "Total invitation limit exceeded."
+msgstr "Limite totale degli inviti superato."
+
+#: mod/invite.php:56
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s: non è un indirizzo email valido."
+
+#: mod/invite.php:88
+msgid "Please join us on Friendica"
+msgstr "Unisciti a noi su Friendica"
+
+#: mod/invite.php:97
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Limite degli inviti superato. Contatta l'amministratore del tuo sito."
+
+#: mod/invite.php:101
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s: la consegna del messaggio fallita."
+
+#: mod/invite.php:105
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d messaggio inviato."
+msgstr[1] "%d messaggi inviati."
+
+#: mod/invite.php:123
+msgid "You have no more invitations available"
+msgstr "Non hai altri inviti disponibili"
+
+#: 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 "Visita %s per una lista di siti pubblici a cui puoi iscriverti. I membri Friendica su altri siti possono collegarsi uno con l'altro, come con membri di molti altri social network."
+
+#: mod/invite.php:133
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr "Per accettare questo invito, visita e registrati su %s o su un'altro sito web Friendica aperto al pubblico."
+
+#: 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 "I siti Friendica son tutti collegati tra loro per creare una grossa rete sociale rispettosa della privacy, posseduta e controllata dai suoi membri. I siti Friendica possono anche collegarsi a molti altri social network tradizionali. Vai su %s per una lista di siti Friendica alternativi a cui puoi iscriverti."
+
+#: mod/invite.php:138
+msgid ""
+"Our apologies. This system is not currently configured to connect with other"
+" public sites or invite members."
+msgstr "Ci scusiamo, questo sistema non è configurato per collegarsi con altri siti pubblici o per invitare membri."
+
+#: 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 "I siti Friendica son tutti collegati tra loro per creare una grossa rete sociale rispettosa della privacy, posseduta e controllata dai suoi membri. I siti Friendica possono anche collegarsi a molti altri social network tradizionali."
+
+#: mod/invite.php:141
+#, php-format
+msgid "To accept this invitation, please visit and register at %s."
+msgstr "Per accettare questo invito, visita e registrati su %s"
+
+#: mod/invite.php:148
+msgid "Send invitations"
+msgstr "Invia inviti"
+
+#: mod/invite.php:149
+msgid "Enter email addresses, one per line:"
+msgstr "Inserisci gli indirizzi email, uno per riga:"
+
+#: mod/invite.php:150 mod/message.php:258 mod/message.php:424
+#: mod/wallmessage.php:141
+msgid "Your message:"
+msgstr "Il tuo messaggio:"
+
+#: 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 "Sei cordialmente invitato/a ad unirti a me e ad altri amici su Friendica, e ad aiutarci a creare una rete sociale migliore."
+
+#: mod/invite.php:152
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr "Sarà necessario fornire questo codice invito: $invite_code"
+
+#: mod/invite.php:152
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr "Una volta registrato, connettiti con me dal mio profilo:"
+
+#: 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 "Per maggiori informazioni sul progetto Friendica e perchè pensiamo sia importante, visita http://friendi.ca "
+
+#: mod/item.php:116
 msgid "Unable to locate original post."
 msgstr "Impossibile trovare il messaggio originale."
 
-#: mod/item.php:274
+#: mod/item.php:284
 msgid "Empty post discarded."
 msgstr "Messaggio vuoto scartato."
 
-#: mod/item.php:804
+#: 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 "Foto della bacheca"
+
+#: mod/item.php:808
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "Questo messaggio ti è stato inviato da %s, un membro del social network Friendica."
 
-#: mod/item.php:806
+#: mod/item.php:810
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "Puoi visitarli online su %s"
 
-#: mod/item.php:807
+#: mod/item.php:811
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "Contatta il mittente rispondendo a questo post se non vuoi ricevere questi messaggi."
 
-#: mod/item.php:811
+#: mod/item.php:815
 #, php-format
 msgid "%s posted an update."
 msgstr "%s ha inviato un aggiornamento."
 
-#: mod/notifications.php:37
-msgid "Invalid request identifier."
-msgstr "L'identificativo della richiesta non è valido."
+#: mod/lockview.php:42 mod/lockview.php:50
+msgid "Remote privacy information not available."
+msgstr "Informazioni remote sulla privacy non disponibili."
 
-#: mod/notifications.php:46 mod/notifications.php:182
-#: mod/notifications.php:229
+#: mod/lockview.php:59
+msgid "Visible to:"
+msgstr "Visibile a:"
+
+#: mod/lostpass.php:28
+msgid "No valid account found."
+msgstr "Nessun account valido trovato."
+
+#: mod/lostpass.php:40
+msgid "Password reset request issued. Check your email."
+msgstr "La richiesta per reimpostare la password è stata inviata. Controlla la tua email."
+
+#: 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 "\nGentile %1$s,\n\tabbiamo ricevuto su \"%2$s\" una richiesta di resettare la password del tuo account. Per confermare questa richiesta, selezionate il link di conferma qui sotto o incollatelo nella barra indirizzo del vostro browser.\n\nSe NON hai richiesto questa modifica, NON selezionare il link e ignora o cancella questa email.\n\nLa tua password non verrà modificata a meno che non possiamo verificare che tu abbia effettivamente richiesto la modifica."
+
+#: 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 "\nSegui questo link per verificare la tua identità:\n\n%1$s\n\nRiceverai in un successivo messaggio la nuova password.\nPotrai cambiarla dalla pagina \"Impostazioni\" del tuo account dopo esserti autenticato.\n\nI dettagli del tuo account sono:\n\tIndirizzo del sito: %2$s\n\tNome utente: %3$s"
+
+#: mod/lostpass.php:74
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Richiesta reimpostazione password su %s"
+
+#: mod/lostpass.php:90
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "La richiesta non può essere verificata. (Puoi averla già richiesta precedentemente). Reimpostazione password fallita."
+
+#: mod/lostpass.php:103
+msgid "Request has expired, please make a new one."
+msgstr "La richiesta è scaduta, si prega di crearne una nuova."
+
+#: mod/lostpass.php:118
+msgid "Forgot your Password?"
+msgstr "Hai dimenticato la password?"
+
+#: mod/lostpass.php:119
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Inserisci il tuo indirizzo email per reimpostare la password."
+
+#: mod/lostpass.php:120 src/Module/Login.php:314
+msgid "Nickname or Email: "
+msgstr "Nome utente o email: "
+
+#: mod/lostpass.php:121
+msgid "Reset"
+msgstr "Reimposta"
+
+#: mod/lostpass.php:137 src/Module/Login.php:326
+msgid "Password Reset"
+msgstr "Reimpostazione password"
+
+#: mod/lostpass.php:138
+msgid "Your password has been reset as requested."
+msgstr "La tua password è stata reimpostata come richiesto."
+
+#: mod/lostpass.php:139
+msgid "Your new password is"
+msgstr "La tua nuova password è"
+
+#: mod/lostpass.php:140
+msgid "Save or copy your new password - and then"
+msgstr "Salva o copia la tua nuova password, quindi"
+
+#: mod/lostpass.php:141
+msgid "click here to login"
+msgstr "clicca qui per entrare"
+
+#: mod/lostpass.php:142
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Puoi cambiare la tua password dalla pagina <em>Impostazioni</em> dopo aver effettuato l'accesso."
+
+#: 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 "\nGentile %1$s,\n\tLa tua password è stata modificata come richiesto.\nSalva questa password, o sostituiscila immediatamente con qualcosa che puoi ricordare."
+
+#: 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 "\nI dettagli del tuo account sono:\n\n\tIndirizzo del sito: %1$s\n\tNome utente: %2$s\n\tPassword: %3$s\n\nPuoi cambiare questa password dalla pagina \"Impostazioni\" del tuo account dopo esserti autenticato."
+
+#: mod/lostpass.php:170
+#, php-format
+msgid "Your password has been changed at %s"
+msgstr "La tua password presso %s è stata cambiata"
+
+#: mod/manage.php:180
+msgid "Manage Identities and/or Pages"
+msgstr "Gestisci identità e/o pagine"
+
+#: 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 "Cambia tra differenti identità o pagine comunità/gruppi che condividono il tuo account o per cui hai i permessi di gestione"
+
+#: mod/manage.php:182
+msgid "Select an identity to manage: "
+msgstr "Seleziona un'identità da gestire:"
+
+#: mod/match.php:48
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Nessuna parola chiave per l'abbinamento. Aggiungi parole chiave al tuo profilo predefinito."
+
+#: mod/match.php:104
+msgid "is interested in:"
+msgstr "è interessato a:"
+
+#: mod/match.php:120
+msgid "Profile Match"
+msgstr "Profili corrispondenti"
+
+#: mod/message.php:31 mod/message.php:120 src/Content/Nav.php:199
+msgid "New Message"
+msgstr "Nuovo messaggio"
+
+#: mod/message.php:74 mod/wallmessage.php:57
+msgid "No recipient selected."
+msgstr "Nessun destinatario selezionato."
+
+#: mod/message.php:78
+msgid "Unable to locate contact information."
+msgstr "Impossibile trovare le informazioni del contatto."
+
+#: mod/message.php:81 mod/wallmessage.php:63
+msgid "Message could not be sent."
+msgstr "Il messaggio non può essere inviato."
+
+#: mod/message.php:84 mod/wallmessage.php:66
+msgid "Message collection failure."
+msgstr "Errore recuperando il messaggio."
+
+#: mod/message.php:87 mod/wallmessage.php:69
+msgid "Message sent."
+msgstr "Messaggio inviato."
+
+#: mod/message.php:114 mod/notifications.php:43 mod/notifications.php:178
+#: mod/notifications.php:230
 msgid "Discard"
 msgstr "Scarta"
 
-#: mod/notifications.php:98 src/Content/Nav.php:191
+#: mod/message.php:127 view/theme/frio/theme.php:268 src/Content/Nav.php:196
+msgid "Messages"
+msgstr "Messaggi"
+
+#: mod/message.php:152
+msgid "Do you really want to delete this message?"
+msgstr "Vuoi veramente cancellare questo messaggio?"
+
+#: mod/message.php:169
+msgid "Message deleted."
+msgstr "Messaggio eliminato."
+
+#: mod/message.php:184
+msgid "Conversation removed."
+msgstr "Conversazione rimossa."
+
+#: mod/message.php:249 mod/wallmessage.php:132
+msgid "Send Private Message"
+msgstr "Invia un messaggio privato"
+
+#: mod/message.php:250 mod/message.php:419 mod/wallmessage.php:134
+msgid "To:"
+msgstr "A:"
+
+#: mod/message.php:254 mod/message.php:421 mod/wallmessage.php:135
+msgid "Subject:"
+msgstr "Oggetto:"
+
+#: mod/message.php:290
+msgid "No messages."
+msgstr "Nessun messaggio."
+
+#: mod/message.php:331
+msgid "Message not available."
+msgstr "Messaggio non disponibile."
+
+#: mod/message.php:395
+msgid "Delete message"
+msgstr "Elimina il messaggio"
+
+#: mod/message.php:397 mod/message.php:498
+msgid "D, d M Y - g:i A"
+msgstr "D d M Y - G:i"
+
+#: mod/message.php:412 mod/message.php:495
+msgid "Delete conversation"
+msgstr "Elimina la conversazione"
+
+#: mod/message.php:414
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Nessuna comunicazione sicura disponibile, <strong>Potresti</strong> essere in grado di rispondere dalla pagina del profilo del mittente."
+
+#: mod/message.php:418
+msgid "Send Reply"
+msgstr "Invia la risposta"
+
+#: mod/message.php:469
+#, php-format
+msgid "Unknown sender - %s"
+msgstr "Mittente sconosciuto - %s"
+
+#: mod/message.php:471
+#, php-format
+msgid "You and %s"
+msgstr "Tu e %s"
+
+#: mod/message.php:473
+#, php-format
+msgid "%s and You"
+msgstr "%s e Tu"
+
+#: mod/message.php:501
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] "%d messaggio"
+msgstr[1] "%d messaggi"
+
+#: mod/network.php:193 mod/search.php:39
+msgid "Remove term"
+msgstr "Rimuovi termine"
+
+#: mod/network.php:200 mod/search.php:48 src/Content/Feature.php:100
+msgid "Saved Searches"
+msgstr "Ricerche salvate"
+
+#: mod/network.php:201 src/Model/Group.php:412
+msgid "add"
+msgstr "aggiungi"
+
+#: 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] "Attenzione: Questo gruppo contiene %s membro da una rete che non permette la ricezione di messaggi non pubblici."
+msgstr[1] "Attenzione: Questo gruppo contiene %s membri da reti che non permettono la ricezione di messaggi non pubblici."
+
+#: mod/network.php:548
+msgid "Messages in this group won't be send to these receivers."
+msgstr "I messaggi in questo gruppo non saranno inviati ai quei contatti."
+
+#: mod/network.php:617
+msgid "No such group"
+msgstr "Nessun gruppo"
+
+#: mod/network.php:642
+#, php-format
+msgid "Group: %s"
+msgstr "Gruppo: %s"
+
+#: mod/network.php:668
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "I messaggi privati a questa persona potrebbero risultare visibili anche pubblicamente."
+
+#: mod/network.php:671
+msgid "Invalid contact."
+msgstr "Contatto non valido."
+
+#: mod/network.php:940
+msgid "Commented Order"
+msgstr "Ordina per commento"
+
+#: mod/network.php:943
+msgid "Sort by Comment Date"
+msgstr "Ordina per data commento"
+
+#: mod/network.php:948
+msgid "Posted Order"
+msgstr "Ordina per invio"
+
+#: mod/network.php:951
+msgid "Sort by Post Date"
+msgstr "Ordina per data messaggio"
+
+#: mod/network.php:959 mod/profiles.php:594
+#: src/Core/NotificationsManager.php:183
+msgid "Personal"
+msgstr "Personale"
+
+#: mod/network.php:962
+msgid "Posts that mention or involve you"
+msgstr "Messaggi che ti citano o coinvolgono"
+
+#: mod/network.php:970
+msgid "New"
+msgstr "Nuovo"
+
+#: mod/network.php:973
+msgid "Activity Stream - by date"
+msgstr "Activity Stream - per data"
+
+#: mod/network.php:981
+msgid "Shared Links"
+msgstr "Links condivisi"
+
+#: mod/network.php:984
+msgid "Interesting Links"
+msgstr "Link Interessanti"
+
+#: mod/network.php:992
+msgid "Starred"
+msgstr "Preferiti"
+
+#: mod/network.php:995
+msgid "Favourite Posts"
+msgstr "Messaggi preferiti"
+
+#: mod/notes.php:42 src/Model/Profile.php:942
+msgid "Personal Notes"
+msgstr "Note personali"
+
+#: mod/notifications.php:34
+msgid "Invalid request identifier."
+msgstr "L'identificativo della richiesta non è valido."
+
+#: mod/notifications.php:92 src/Content/Nav.php:191
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: mod/notifications.php:107
+#: mod/notifications.php:100
 msgid "Network Notifications"
 msgstr "Notifiche dalla rete"
 
-#: mod/notifications.php:119
+#: mod/notifications.php:105 mod/notify.php:81
+msgid "System Notifications"
+msgstr "Notifiche di sistema"
+
+#: mod/notifications.php:110
 msgid "Personal Notifications"
 msgstr "Notifiche personali"
 
-#: mod/notifications.php:125
+#: mod/notifications.php:115
 msgid "Home Notifications"
 msgstr "Notifiche bacheca"
 
-#: mod/notifications.php:155
+#: mod/notifications.php:143
 msgid "Show Ignored Requests"
 msgstr "Mostra richieste ignorate"
 
-#: mod/notifications.php:155
+#: mod/notifications.php:143
 msgid "Hide Ignored Requests"
 msgstr "Nascondi richieste ignorate"
 
-#: mod/notifications.php:167 mod/notifications.php:236
-msgid "Notification type: "
-msgstr "Tipo di notifica: "
+#: mod/notifications.php:156 mod/notifications.php:238
+msgid "Notification type:"
+msgstr "Tipo di notifica:"
 
-#: mod/notifications.php:170
-#, php-format
-msgid "suggested by %s"
-msgstr "suggerito da %s"
+#: mod/notifications.php:159
+msgid "Suggested by:"
+msgstr "Suggerito da:"
 
 #: mod/notifications.php:197
 msgid "Claims to be known to you: "
@@ -6056,143 +5549,467 @@ msgstr "Condivisore"
 msgid "Subscriber"
 msgstr "Abbonato"
 
-#: mod/notifications.php:273
+#: mod/notifications.php:275
 msgid "No introductions."
 msgstr "Nessuna presentazione."
 
-#: mod/notifications.php:314
+#: mod/notifications.php:313
 msgid "Show unread"
 msgstr "Mostra non letti"
 
-#: mod/notifications.php:314
+#: mod/notifications.php:313
 msgid "Show all"
 msgstr "Mostra tutti"
 
-#: mod/notifications.php:320
+#: mod/notifications.php:318
 #, php-format
 msgid "No more %s notifications."
 msgstr "Nessun'altra notifica %s."
 
-#: mod/profile.php:37 src/Model/Profile.php:118
+#: mod/notify.php:77
+msgid "No more system notifications."
+msgstr "Nessuna nuova notifica di sistema."
+
+#: mod/oexchange.php:30
+msgid "Post successful."
+msgstr "Inviato!"
+
+#: mod/openid.php:29
+msgid "OpenID protocol error. No ID returned."
+msgstr "Errore protocollo OpenID. Nessun ID ricevuto."
+
+#: mod/openid.php:66
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr "L'account non è stato trovato, e la registrazione via OpenID non è permessa su questo sito."
+
+#: mod/openid.php:116 src/Module/Login.php:85 src/Module/Login.php:134
+msgid "Login failed."
+msgstr "Accesso fallito."
+
+#: mod/photos.php:111 src/Model/Profile.php:903
+msgid "Photo Albums"
+msgstr "Album foto"
+
+#: mod/photos.php:112 mod/photos.php:1678
+msgid "Recent Photos"
+msgstr "Foto recenti"
+
+#: mod/photos.php:115 mod/photos.php:1206 mod/photos.php:1680
+msgid "Upload New Photos"
+msgstr "Carica nuove foto"
+
+#: mod/photos.php:134 mod/settings.php:51
+msgid "everybody"
+msgstr "tutti"
+
+#: mod/photos.php:190
+msgid "Contact information unavailable"
+msgstr "I dati di questo contatto non sono disponibili"
+
+#: mod/photos.php:208
+msgid "Album not found."
+msgstr "Album non trovato."
+
+#: mod/photos.php:238 mod/photos.php:251 mod/photos.php:1157
+msgid "Delete Album"
+msgstr "Rimuovi album"
+
+#: mod/photos.php:249
+msgid "Do you really want to delete this photo album and all its photos?"
+msgstr "Vuoi davvero cancellare questo album e tutte le sue foto?"
+
+#: mod/photos.php:309 mod/photos.php:320 mod/photos.php:1423
+msgid "Delete Photo"
+msgstr "Rimuovi foto"
+
+#: mod/photos.php:318
+msgid "Do you really want to delete this photo?"
+msgstr "Vuoi veramente cancellare questa foto?"
+
+#: mod/photos.php:661
+msgid "a photo"
+msgstr "una foto"
+
+#: mod/photos.php:661
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
+msgstr "%1$s è stato taggato in %2$s da %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 "La dimensione dell'immagine supera il limite di %s"
+
+#: mod/photos.php:764
+msgid "Image upload didn't complete, please try again"
+msgstr "Caricamento dell'immagine non completato. Prova di nuovo."
+
+#: mod/photos.php:767
+msgid "Image file is missing"
+msgstr "Il file dell'immagine è mancante"
+
+#: mod/photos.php:772
+msgid ""
+"Server can't accept new file upload at this time, please contact your "
+"administrator"
+msgstr "Il server non può accettare il caricamento di un nuovo file in questo momento, contattare l'amministratore"
+
+#: mod/photos.php:798
+msgid "Image file is empty."
+msgstr "Il file dell'immagine è vuoto."
+
+#: mod/photos.php:813 mod/profile_photo.php:160 mod/wall_upload.php:209
+msgid "Unable to process image."
+msgstr "Impossibile caricare l'immagine."
+
+#: mod/photos.php:842 mod/profile_photo.php:305 mod/wall_upload.php:248
+msgid "Image upload failed."
+msgstr "Caricamento immagine fallito."
+
+#: mod/photos.php:935
+msgid "No photos selected"
+msgstr "Nessuna foto selezionata"
+
+#: mod/photos.php:1032 mod/videos.php:306
+msgid "Access to this item is restricted."
+msgstr "Questo oggetto non è visibile a tutti."
+
+#: mod/photos.php:1086
+msgid "Upload Photos"
+msgstr "Carica foto"
+
+#: mod/photos.php:1090 mod/photos.php:1152
+msgid "New album name: "
+msgstr "Nome nuovo album: "
+
+#: mod/photos.php:1091
+msgid "or select existing album:"
+msgstr "o seleziona un album esistente:"
+
+#: mod/photos.php:1092
+msgid "Do not show a status post for this upload"
+msgstr "Non creare un post per questo upload"
+
+#: mod/photos.php:1102 mod/photos.php:1426 mod/settings.php:1224
+msgid "Show to Groups"
+msgstr "Mostra ai gruppi"
+
+#: mod/photos.php:1103 mod/photos.php:1427 mod/settings.php:1225
+msgid "Show to Contacts"
+msgstr "Mostra ai contatti"
+
+#: mod/photos.php:1163
+msgid "Edit Album"
+msgstr "Modifica album"
+
+#: mod/photos.php:1168
+msgid "Show Newest First"
+msgstr "Mostra nuove foto per prime"
+
+#: mod/photos.php:1170
+msgid "Show Oldest First"
+msgstr "Mostra vecchie foto per prime"
+
+#: mod/photos.php:1191 mod/photos.php:1663
+msgid "View Photo"
+msgstr "Vedi foto"
+
+#: mod/photos.php:1232
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permesso negato. L'accesso a questo elemento può essere limitato."
+
+#: mod/photos.php:1234
+msgid "Photo not available"
+msgstr "Foto non disponibile"
+
+#: mod/photos.php:1303
+msgid "View photo"
+msgstr "Vedi foto"
+
+#: mod/photos.php:1303
+msgid "Edit photo"
+msgstr "Modifica foto"
+
+#: mod/photos.php:1304
+msgid "Use as profile photo"
+msgstr "Usa come foto del profilo"
+
+#: mod/photos.php:1310 src/Object/Post.php:150
+msgid "Private Message"
+msgstr "Messaggio privato"
+
+#: mod/photos.php:1330
+msgid "View Full Size"
+msgstr "Vedi dimensione intera"
+
+#: mod/photos.php:1391
+msgid "Tags: "
+msgstr "Tag: "
+
+#: mod/photos.php:1394
+msgid "[Remove any tag]"
+msgstr "[Rimuovi tutti i tag]"
+
+#: mod/photos.php:1409
+msgid "New album name"
+msgstr "Nuovo nome dell'album"
+
+#: mod/photos.php:1410
+msgid "Caption"
+msgstr "Titolo"
+
+#: mod/photos.php:1411
+msgid "Add a Tag"
+msgstr "Aggiungi tag"
+
+#: mod/photos.php:1411
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Esempio: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+
+#: mod/photos.php:1412
+msgid "Do not rotate"
+msgstr "Non ruotare"
+
+#: mod/photos.php:1413
+msgid "Rotate CW (right)"
+msgstr "Ruota a destra"
+
+#: mod/photos.php:1414
+msgid "Rotate CCW (left)"
+msgstr "Ruota a sinistra"
+
+#: mod/photos.php:1448 src/Object/Post.php:292
+msgid "I like this (toggle)"
+msgstr "Mi piace (clic per cambiare)"
+
+#: mod/photos.php:1449 src/Object/Post.php:293
+msgid "I don't like this (toggle)"
+msgstr "Non mi piace (clic per cambiare)"
+
+#: 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 "Commento"
+
+#: mod/photos.php:1597
+msgid "Map"
+msgstr "Mappa"
+
+#: mod/photos.php:1669 mod/videos.php:380
+msgid "View Album"
+msgstr "Sfoglia l'album"
+
+#: mod/ping.php:289
+msgid "{0} wants to be your friend"
+msgstr "{0} vuole essere tuo amico"
+
+#: mod/ping.php:305
+msgid "{0} sent you a message"
+msgstr "{0} ti ha inviato un messaggio"
+
+#: mod/ping.php:321
+msgid "{0} requested registration"
+msgstr "{0} chiede la registrazione"
+
+#: mod/poke.php:188
+msgid "Poke/Prod"
+msgstr "Tocca/Pungola"
+
+#: mod/poke.php:189
+msgid "poke, prod or do other things to somebody"
+msgstr "tocca, pungola o fai altre cose a qualcuno"
+
+#: mod/poke.php:190
+msgid "Recipient"
+msgstr "Destinatario"
+
+#: mod/poke.php:191
+msgid "Choose what you wish to do to recipient"
+msgstr "Scegli cosa vuoi fare al destinatario"
+
+#: mod/poke.php:194
+msgid "Make this post private"
+msgstr "Rendi questo post privato"
+
+#: mod/profile.php:38 src/Model/Profile.php:114
 msgid "Requested profile is not available."
 msgstr "Profilo richiesto non disponibile."
 
-#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1251
+#: mod/profile.php:79 mod/profile.php:82 src/Protocol/OStatus.php:1274
 #, php-format
 msgid "%s's timeline"
 msgstr "la timeline di %s"
 
-#: mod/profile.php:79 src/Protocol/OStatus.php:1252
+#: mod/profile.php:80 src/Protocol/OStatus.php:1275
 #, php-format
 msgid "%s's posts"
 msgstr "il messaggio di %s"
 
-#: mod/profile.php:80 src/Protocol/OStatus.php:1253
+#: mod/profile.php:81 src/Protocol/OStatus.php:1276
 #, php-format
 msgid "%s's comments"
 msgstr "il commento di %s"
 
-#: mod/profile.php:195
-msgid "Tips for New Members"
-msgstr "Consigli per i Nuovi Utenti"
+#: mod/profile_photo.php:55
+msgid "Image uploaded but image cropping failed."
+msgstr "L'immagine è stata caricata, ma il non è stato possibile ritagliarla."
 
-#: mod/profiles.php:58
+#: 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 "Il ridimensionamento dell'immagine [%s] è fallito."
+
+#: mod/profile_photo.php:124
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Ricarica la pagina con shift+F5 o cancella la cache del browser se la nuova foto non viene mostrata immediatamente."
+
+#: mod/profile_photo.php:132
+msgid "Unable to process image"
+msgstr "Impossibile elaborare l'immagine"
+
+#: mod/profile_photo.php:244
+msgid "Upload File:"
+msgstr "Carica un file:"
+
+#: mod/profile_photo.php:245
+msgid "Select a profile:"
+msgstr "Seleziona un profilo:"
+
+#: mod/profile_photo.php:250
+msgid "or"
+msgstr "o"
+
+#: mod/profile_photo.php:251
+msgid "skip this step"
+msgstr "salta questo passaggio"
+
+#: mod/profile_photo.php:251
+msgid "select a photo from your photo albums"
+msgstr "seleziona una foto dai tuoi album"
+
+#: mod/profile_photo.php:264
+msgid "Crop Image"
+msgstr "Ritaglia immagine"
+
+#: mod/profile_photo.php:265
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Ritaglia l'immagine per una visualizzazione migliore."
+
+#: mod/profile_photo.php:267
+msgid "Done Editing"
+msgstr "Finito"
+
+#: mod/profile_photo.php:303
+msgid "Image uploaded successfully."
+msgstr "Immagine caricata con successo."
+
+#: mod/profiles.php:57
 msgid "Profile deleted."
 msgstr "Profilo eliminato."
 
-#: mod/profiles.php:74 mod/profiles.php:110
+#: mod/profiles.php:73 mod/profiles.php:109
 msgid "Profile-"
 msgstr "Profilo-"
 
-#: mod/profiles.php:93 mod/profiles.php:132
+#: mod/profiles.php:92 mod/profiles.php:131
 msgid "New profile created."
 msgstr "Il nuovo profilo è stato creato."
 
-#: mod/profiles.php:116
+#: mod/profiles.php:115
 msgid "Profile unavailable to clone."
 msgstr "Impossibile duplicare il profilo."
 
-#: mod/profiles.php:206
+#: mod/profiles.php:203
 msgid "Profile Name is required."
 msgstr "Il nome profilo è obbligatorio ."
 
-#: mod/profiles.php:347
+#: mod/profiles.php:344
 msgid "Marital Status"
 msgstr "Stato civile"
 
-#: mod/profiles.php:351
+#: mod/profiles.php:348
 msgid "Romantic Partner"
 msgstr "Partner romantico"
 
-#: mod/profiles.php:363
+#: mod/profiles.php:360
 msgid "Work/Employment"
 msgstr "Lavoro/Impiego"
 
-#: mod/profiles.php:366
+#: mod/profiles.php:363
 msgid "Religion"
 msgstr "Religione"
 
-#: mod/profiles.php:370
+#: mod/profiles.php:367
 msgid "Political Views"
 msgstr "Orientamento Politico"
 
-#: mod/profiles.php:374
+#: mod/profiles.php:371
 msgid "Gender"
 msgstr "Sesso"
 
-#: mod/profiles.php:378
+#: mod/profiles.php:375
 msgid "Sexual Preference"
 msgstr "Preferenza sessuale"
 
-#: mod/profiles.php:382
+#: mod/profiles.php:379
 msgid "XMPP"
 msgstr "XMPP"
 
-#: mod/profiles.php:386
+#: mod/profiles.php:383
 msgid "Homepage"
 msgstr "Homepage"
 
-#: mod/profiles.php:390 mod/profiles.php:593
+#: mod/profiles.php:387 mod/profiles.php:593
 msgid "Interests"
 msgstr "Interessi"
 
-#: mod/profiles.php:401 mod/profiles.php:589
+#: mod/profiles.php:398 mod/profiles.php:589
 msgid "Location"
 msgstr "Posizione"
 
-#: mod/profiles.php:483
+#: mod/profiles.php:481
 msgid "Profile updated."
 msgstr "Profilo aggiornato."
 
-#: mod/profiles.php:540
+#: mod/profiles.php:538
 msgid "Hide contacts and friends:"
 msgstr "Nascondi contatti:"
 
-#: mod/profiles.php:545
+#: mod/profiles.php:543
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?"
 
-#: mod/profiles.php:565
+#: mod/profiles.php:563
 msgid "Show more profile fields:"
 msgstr "Mostra più informazioni di profilo:"
 
-#: mod/profiles.php:577
+#: mod/profiles.php:575
 msgid "Profile Actions"
 msgstr "Azioni Profilo"
 
-#: mod/profiles.php:578
+#: mod/profiles.php:576
 msgid "Edit Profile Details"
 msgstr "Modifica i dettagli del profilo"
 
-#: mod/profiles.php:580
+#: mod/profiles.php:578
 msgid "Change Profile Photo"
 msgstr "Cambia la foto del profilo"
 
-#: mod/profiles.php:581
+#: mod/profiles.php:580
 msgid "View this profile"
 msgstr "Visualizza questo profilo"
 
-#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:389
+#: mod/profiles.php:581
+msgid "View all profiles"
+msgstr "Vedi tutti i profili"
+
+#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:391
 msgid "Edit visibility"
 msgstr "Modifica visibilità"
 
@@ -6244,7 +6061,7 @@ msgstr "Il tuo sesso:"
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span> Stato sentimentale:"
 
-#: mod/profiles.php:601 src/Model/Profile.php:780
+#: mod/profiles.php:601 src/Model/Profile.php:778
 msgid "Sexual Preference:"
 msgstr "Preferenze sessuali:"
 
@@ -6324,11 +6141,11 @@ msgstr "L'indirizzo XMPP verrà propagato ai tuoi contatti così che possano seg
 msgid "Homepage URL:"
 msgstr "Homepage:"
 
-#: mod/profiles.php:628 src/Model/Profile.php:788
+#: mod/profiles.php:628 src/Model/Profile.php:786
 msgid "Hometown:"
 msgstr "Paese natale:"
 
-#: mod/profiles.php:629 src/Model/Profile.php:796
+#: mod/profiles.php:629 src/Model/Profile.php:794
 msgid "Political Views:"
 msgstr "Orientamento politico:"
 
@@ -6352,11 +6169,11 @@ msgstr "Parole chiave private:"
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(Usato per cercare tra i profili, non è mai visibile agli altri)"
 
-#: mod/profiles.php:633 src/Model/Profile.php:812
+#: mod/profiles.php:633 src/Model/Profile.php:810
 msgid "Likes:"
 msgstr "Mi piace:"
 
-#: mod/profiles.php:634 src/Model/Profile.php:816
+#: mod/profiles.php:634 src/Model/Profile.php:814
 msgid "Dislikes:"
 msgstr "Non mi piace:"
 
@@ -6396,11 +6213,11 @@ msgstr "Scuola/educazione"
 msgid "Contact information and Social Networks"
 msgstr "Informazioni su contatti e social network"
 
-#: mod/profiles.php:674 src/Model/Profile.php:385
+#: mod/profiles.php:674 src/Model/Profile.php:387
 msgid "Profile Image"
 msgstr "Immagine del Profilo"
 
-#: mod/profiles.php:676 src/Model/Profile.php:388
+#: mod/profiles.php:676 src/Model/Profile.php:390
 msgid "visible to everybody"
 msgstr "visibile a tutti"
 
@@ -6408,336 +6225,402 @@ msgstr "visibile a tutti"
 msgid "Edit/Manage Profiles"
 msgstr "Modifica / Gestisci profili"
 
-#: mod/profiles.php:684 src/Model/Profile.php:375 src/Model/Profile.php:397
+#: mod/profiles.php:684 src/Model/Profile.php:377 src/Model/Profile.php:399
 msgid "Change profile photo"
 msgstr "Cambia la foto del profilo"
 
-#: mod/profiles.php:685 src/Model/Profile.php:376
+#: mod/profiles.php:685 src/Model/Profile.php:378
 msgid "Create New Profile"
 msgstr "Crea un nuovo profilo"
 
-#: mod/register.php:100
+#: mod/profperm.php:34 mod/profperm.php:65
+msgid "Invalid profile identifier."
+msgstr "Identificativo del profilo non valido."
+
+#: mod/profperm.php:111
+msgid "Profile Visibility Editor"
+msgstr "Modifica visibilità del profilo"
+
+#: mod/profperm.php:124
+msgid "Visible To"
+msgstr "Visibile a"
+
+#: mod/profperm.php:140
+msgid "All Contacts (with secure profile access)"
+msgstr "Tutti i contatti (con profilo ad accesso sicuro)"
+
+#: mod/register.php:99
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr "Registrazione completata. Controlla la tua mail per ulteriori informazioni."
 
-#: mod/register.php:104
+#: 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 "Si è verificato un errore inviando l'email. I dettagli del tuo account:<br> login: %s<br> password: %s<br><br>Puoi cambiare la password dopo il login."
 
-#: mod/register.php:111
+#: mod/register.php:110
 msgid "Registration successful."
 msgstr "Registrazione completata."
 
-#: mod/register.php:116
+#: mod/register.php:115
 msgid "Your registration can not be processed."
 msgstr "La tua registrazione non puo' essere elaborata."
 
-#: mod/register.php:163
+#: mod/register.php:162
 msgid "Your registration is pending approval by the site owner."
 msgstr "La tua richiesta è in attesa di approvazione da parte del proprietario del sito."
 
-#: mod/register.php:221
+#: mod/register.php:220
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr "Se vuoi, puoi riempire questo modulo tramite OpenID, inserendo il tuo OpenID e cliccando 'Registra'."
 
-#: mod/register.php:222
+#: 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 "Se non hai familiarità con OpenID, lascia il campo vuoto e riempi il resto della maschera."
 
-#: mod/register.php:223
+#: mod/register.php:222
 msgid "Your OpenID (optional): "
 msgstr "Il tuo OpenID (opzionale): "
 
-#: mod/register.php:235
+#: mod/register.php:234
 msgid "Include your profile in member directory?"
 msgstr "Includi il tuo profilo nell'elenco pubblico?"
 
-#: mod/register.php:262
+#: mod/register.php:261
 msgid "Note for the admin"
 msgstr "Nota per l'amministratore"
 
-#: mod/register.php:262
+#: mod/register.php:261
 msgid "Leave a message for the admin, why you want to join this node"
 msgstr "Lascia un messaggio per l'amministratore, per esempio perché vuoi registrarti su questo nodo"
 
-#: mod/register.php:263
+#: mod/register.php:262
 msgid "Membership on this site is by invitation only."
 msgstr "La registrazione su questo sito è solo su invito."
 
-#: mod/register.php:264
+#: mod/register.php:263
 msgid "Your invitation code: "
 msgstr "Il tuo codice di invito:"
 
-#: mod/register.php:273
+#: mod/register.php:272
 msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
 msgstr "Il tuo nome completo (es. Mario Rossi, vero o che sembri vero): "
 
-#: mod/register.php:274
+#: mod/register.php:273
 msgid ""
 "Your Email Address: (Initial information will be send there, so this has to "
 "be an existing address.)"
 msgstr "Il tuo indirizzo email: (Le informazioni iniziali verranno inviate lì, quindi questo deve essere un indirizzo esistente.)"
 
-#: mod/register.php:276 mod/settings.php:1190
+#: mod/register.php:275 mod/settings.php:1196
 msgid "New Password:"
 msgstr "Nuova password:"
 
-#: mod/register.php:276
+#: mod/register.php:275
 msgid "Leave empty for an auto generated password."
 msgstr "Lascia vuoto per generare automaticamente una password."
 
-#: mod/register.php:277 mod/settings.php:1191
+#: mod/register.php:276 mod/settings.php:1197
 msgid "Confirm:"
 msgstr "Conferma:"
 
-#: mod/register.php:278
+#: 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 "Scegli un nome utente. Deve cominciare con una lettera. L'indirizzo del tuo profilo sarà '<strong>soprannome@%s</strong>'."
 
-#: mod/register.php:279
+#: mod/register.php:278
 msgid "Choose a nickname: "
 msgstr "Scegli un nome utente: "
 
-#: mod/register.php:282 src/Content/Nav.php:128 src/Module/Login.php:284
+#: mod/register.php:281 src/Content/Nav.php:128 src/Module/Login.php:283
 msgid "Register"
 msgstr "Registrati"
 
-#: mod/register.php:289
+#: mod/register.php:288
 msgid "Import your profile to this friendica instance"
 msgstr "Importa il tuo profilo in questo server friendica"
 
-#: mod/removeme.php:44
+#: mod/register.php:296
+msgid "Note: This node explicitly contains adult content"
+msgstr "Nota: Questo nodo contiene esplicitamente contenuti per adulti"
+
+#: mod/regmod.php:69
+msgid "Account approved."
+msgstr "Account approvato."
+
+#: mod/regmod.php:94
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registrazione revocata per %s"
+
+#: mod/regmod.php:101
+msgid "Please login."
+msgstr "Accedi."
+
+#: mod/removeme.php:47
 msgid "User deleted their account"
 msgstr "L'utente ha cancellato il suo account"
 
-#: mod/removeme.php:45
+#: 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 "Sul tuo nodo Friendica un utente ha cancellato il suo account. Assicurati che i suoi dati siano rimossi dai backup."
 
-#: mod/removeme.php:46
+#: mod/removeme.php:49
 #, php-format
 msgid "The user id is %d"
 msgstr "L'id utente è %d"
 
-#: mod/removeme.php:77 mod/removeme.php:80
+#: mod/removeme.php:80 mod/removeme.php:83
 msgid "Remove My Account"
 msgstr "Rimuovi il mio account"
 
-#: mod/removeme.php:78
+#: mod/removeme.php:81
 msgid ""
 "This will completely remove your account. Once this has been done it is not "
 "recoverable."
 msgstr "Questo comando rimuoverà completamente il tuo account. Una volta rimosso non potrai più recuperarlo."
 
-#: mod/removeme.php:79
+#: mod/removeme.php:82
 msgid "Please enter your password for verification:"
 msgstr "Inserisci la tua password per verifica:"
 
+#: mod/repair_ostatus.php:20
+msgid "Resubscribing to OStatus contacts"
+msgstr "Risottoscrivi i contatti OStatus"
+
+#: mod/repair_ostatus.php:36
+msgid "Error"
+msgstr "Errore"
+
+#: mod/search.php:112
+msgid "Only logged in users are permitted to perform a search."
+msgstr "Solo agli utenti autenticati è permesso eseguire ricerche."
+
+#: mod/search.php:136
+msgid "Too Many Requests"
+msgstr "Troppe richieste"
+
+#: mod/search.php:137
+msgid "Only one search per minute is permitted for not logged in users."
+msgstr "Solo una ricerca al minuto è permessa agli utenti non autenticati."
+
+#: mod/search.php:246
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Elementi taggati con: %s"
+
 #: mod/settings.php:56
 msgid "Account"
 msgstr "Account"
 
-#: mod/settings.php:73
+#: mod/settings.php:64 src/Content/Nav.php:210 src/Model/Profile.php:370
+msgid "Profiles"
+msgstr "Profili"
+
+#: mod/settings.php:80
 msgid "Display"
 msgstr "Visualizzazione"
 
-#: mod/settings.php:80 mod/settings.php:834
+#: mod/settings.php:87 mod/settings.php:840
 msgid "Social Networks"
 msgstr "Social Networks"
 
-#: mod/settings.php:94 src/Content/Nav.php:205
+#: mod/settings.php:101 src/Content/Nav.php:205
 msgid "Delegations"
 msgstr "Delegazioni"
 
-#: mod/settings.php:101
+#: mod/settings.php:108
 msgid "Connected apps"
 msgstr "Applicazioni collegate"
 
-#: mod/settings.php:115
+#: mod/settings.php:115 mod/uexport.php:52
+msgid "Export personal data"
+msgstr "Esporta dati personali"
+
+#: mod/settings.php:122
 msgid "Remove account"
 msgstr "Rimuovi account"
 
-#: mod/settings.php:167
+#: mod/settings.php:174
 msgid "Missing some important data!"
 msgstr "Mancano alcuni dati importanti!"
 
-#: mod/settings.php:278
+#: mod/settings.php:285
 msgid "Failed to connect with email account using the settings provided."
 msgstr "Impossibile collegarsi all'account email con i parametri forniti."
 
-#: mod/settings.php:283
+#: mod/settings.php:290
 msgid "Email settings updated."
 msgstr "Impostazioni e-mail aggiornate."
 
-#: mod/settings.php:299
+#: mod/settings.php:306
 msgid "Features updated"
 msgstr "Funzionalità aggiornate"
 
-#: mod/settings.php:372
+#: mod/settings.php:379
 msgid "Relocate message has been send to your contacts"
 msgstr "Il messaggio di trasloco è stato inviato ai tuoi contatti"
 
-#: mod/settings.php:384 src/Model/User.php:339
+#: mod/settings.php:391 src/Model/User.php:374
 msgid "Passwords do not match. Password unchanged."
 msgstr "Le password non corrispondono. Password non cambiata."
 
-#: mod/settings.php:389
+#: mod/settings.php:396
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Le password non possono essere vuote. Password non cambiata."
 
-#: mod/settings.php:394 src/Core/Console/NewPassword.php:87
+#: 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 "La nuova password è stata esposta in un dump di dati pubblici, per favore scegline un'altra."
 
-#: mod/settings.php:400
+#: mod/settings.php:407
 msgid "Wrong password."
 msgstr "Password sbagliata."
 
-#: mod/settings.php:407 src/Core/Console/NewPassword.php:94
+#: mod/settings.php:414 src/Core/Console/NewPassword.php:89
 msgid "Password changed."
 msgstr "Password cambiata."
 
-#: mod/settings.php:409 src/Core/Console/NewPassword.php:91
+#: mod/settings.php:416 src/Core/Console/NewPassword.php:86
 msgid "Password update failed. Please try again."
 msgstr "Aggiornamento password fallito. Prova ancora."
 
-#: mod/settings.php:493
+#: mod/settings.php:500
 msgid " Please use a shorter name."
 msgstr " Usa un nome più corto."
 
-#: mod/settings.php:496
+#: mod/settings.php:503
 msgid " Name too short."
 msgstr " Nome troppo corto."
 
-#: mod/settings.php:504
+#: mod/settings.php:511
 msgid "Wrong Password"
 msgstr "Password Sbagliata"
 
-#: mod/settings.php:509
+#: mod/settings.php:516
 msgid "Invalid email."
 msgstr "Email non valida."
 
-#: mod/settings.php:516
+#: mod/settings.php:522
 msgid "Cannot change to that email."
 msgstr "Non puoi usare quella email."
 
-#: mod/settings.php:566
+#: mod/settings.php:572
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr "Il forum privato non ha permessi di privacy. Uso il gruppo di privacy predefinito."
 
-#: mod/settings.php:569
+#: mod/settings.php:575
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr "Il gruppo privato non ha permessi di privacy e nessun gruppo di privacy predefinito."
 
-#: mod/settings.php:609
+#: mod/settings.php:615
 msgid "Settings updated."
 msgstr "Impostazioni aggiornate."
 
-#: mod/settings.php:668 mod/settings.php:694 mod/settings.php:728
+#: mod/settings.php:674 mod/settings.php:700 mod/settings.php:734
 msgid "Add application"
 msgstr "Aggiungi applicazione"
 
-#: mod/settings.php:672 mod/settings.php:698
+#: mod/settings.php:678 mod/settings.php:704
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: mod/settings.php:673 mod/settings.php:699
+#: mod/settings.php:679 mod/settings.php:705
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: mod/settings.php:674 mod/settings.php:700
+#: mod/settings.php:680 mod/settings.php:706
 msgid "Redirect"
 msgstr "Redirect"
 
-#: mod/settings.php:675 mod/settings.php:701
+#: mod/settings.php:681 mod/settings.php:707
 msgid "Icon url"
 msgstr "Url icona"
 
-#: mod/settings.php:686
+#: mod/settings.php:692
 msgid "You can't edit this application."
 msgstr "Non puoi modificare questa applicazione."
 
-#: mod/settings.php:727
+#: mod/settings.php:733
 msgid "Connected Apps"
 msgstr "Applicazioni Collegate"
 
-#: mod/settings.php:729 src/Object/Post.php:155 src/Object/Post.php:157
+#: mod/settings.php:735 src/Object/Post.php:157 src/Object/Post.php:159
 msgid "Edit"
 msgstr "Modifica"
 
-#: mod/settings.php:731
+#: mod/settings.php:737
 msgid "Client key starts with"
 msgstr "Chiave del client inizia con"
 
-#: mod/settings.php:732
+#: mod/settings.php:738
 msgid "No name"
 msgstr "Nessun nome"
 
-#: mod/settings.php:733
+#: mod/settings.php:739
 msgid "Remove authorization"
 msgstr "Rimuovi l'autorizzazione"
 
-#: mod/settings.php:744
+#: mod/settings.php:750
 msgid "No Addon settings configured"
 msgstr "Nessun addon ha impostazioni modificabili"
 
-#: mod/settings.php:753
+#: mod/settings.php:759
 msgid "Addon Settings"
 msgstr "Impostazioni Addon"
 
-#: mod/settings.php:774
+#: mod/settings.php:780
 msgid "Additional Features"
 msgstr "Funzionalità aggiuntive"
 
-#: mod/settings.php:797 src/Content/ContactSelector.php:83
+#: mod/settings.php:803 src/Content/ContactSelector.php:81
 msgid "Diaspora"
 msgstr "Diaspora"
 
-#: mod/settings.php:797 mod/settings.php:798
+#: mod/settings.php:803 mod/settings.php:804
 msgid "enabled"
 msgstr "abilitato"
 
-#: mod/settings.php:797 mod/settings.php:798
+#: mod/settings.php:803 mod/settings.php:804
 msgid "disabled"
 msgstr "disabilitato"
 
-#: mod/settings.php:797 mod/settings.php:798
+#: mod/settings.php:803 mod/settings.php:804
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "Il supporto integrato per la connettività con %s è %s"
 
-#: mod/settings.php:798
+#: mod/settings.php:804
 msgid "GNU Social (OStatus)"
 msgstr "GNU Social (OStatus)"
 
-#: mod/settings.php:829
+#: mod/settings.php:835
 msgid "Email access is disabled on this site."
 msgstr "L'accesso email è disabilitato su questo sito."
 
-#: mod/settings.php:839
+#: mod/settings.php:845
 msgid "General Social Media Settings"
 msgstr "Impostazioni Media Sociali"
 
-#: mod/settings.php:840
+#: mod/settings.php:846
 msgid "Disable Content Warning"
 msgstr "Disabilita Avviso Contenuto"
 
-#: mod/settings.php:840
+#: 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 "
@@ -6745,318 +6628,307 @@ msgid ""
 "any other content filtering you eventually set up."
 msgstr "Gli utenti su reti come Mastodon o Pleroma sono in grado di impostare un campo di avviso che collassa i loro post. Questa impostazione disabilita il collasso automatico e imposta l'avviso di contenuto come titolo del post. Non ha effetto su altri filtri di contenuto che hai eventualmente impostato."
 
-#: mod/settings.php:841
+#: mod/settings.php:847
 msgid "Disable intelligent shortening"
 msgstr "Disabilita accorciamento intelligente"
 
-#: mod/settings.php:841
+#: 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 "Normalmente il sistema tenta di trovare il migliore link da aggiungere a un post accorciato. Se questa opzione è abilitata, ogni post accorciato conterrà sempre un link al post originale su Friendica."
 
-#: mod/settings.php:842
+#: mod/settings.php:848
 msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
 msgstr "Segui automaticamente chiunque da GNU Social (OStatus)  ti segua o ti menzioni"
 
-#: mod/settings.php:842
+#: 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 "Se ricevi un messaggio da un utente OStatus sconosciuto, questa opzione decide cosa fare. Se selezionato, un nuovo contatto verrà creato per ogni utente sconosciuto."
 
-#: mod/settings.php:843
+#: mod/settings.php:849
 msgid "Default group for OStatus contacts"
 msgstr "Gruppo di default per i contatti OStatus"
 
-#: mod/settings.php:844
+#: mod/settings.php:850
 msgid "Your legacy GNU Social account"
 msgstr "Il tuo vecchio account GNU Social"
 
-#: mod/settings.php:844
+#: 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 "Se inserisci il nome del tuo vecchio account GNU Social/Statusnet qui (nel formato utente@dominio.tld), i tuoi contatti verranno automaticamente aggiunti. Il campo verrà svuotato una volta terminato."
 
-#: mod/settings.php:847
+#: mod/settings.php:853
 msgid "Repair OStatus subscriptions"
 msgstr "Ripara le iscrizioni OStatus"
 
-#: mod/settings.php:851
+#: mod/settings.php:857
 msgid "Email/Mailbox Setup"
 msgstr "Impostazioni email"
 
-#: mod/settings.php:852
+#: 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 "Se vuoi comunicare con i contatti email usando questo servizio, specifica come collegarti alla tua casella di posta. (opzionale)"
 
-#: mod/settings.php:853
+#: mod/settings.php:859
 msgid "Last successful email check:"
 msgstr "Ultimo controllo email eseguito con successo:"
 
-#: mod/settings.php:855
+#: mod/settings.php:861
 msgid "IMAP server name:"
 msgstr "Nome server IMAP:"
 
-#: mod/settings.php:856
+#: mod/settings.php:862
 msgid "IMAP port:"
 msgstr "Porta IMAP:"
 
-#: mod/settings.php:857
+#: mod/settings.php:863
 msgid "Security:"
 msgstr "Sicurezza:"
 
-#: mod/settings.php:857 mod/settings.php:862
+#: mod/settings.php:863 mod/settings.php:868
 msgid "None"
 msgstr "Nessuna"
 
-#: mod/settings.php:858
+#: mod/settings.php:864
 msgid "Email login name:"
 msgstr "Nome utente email:"
 
-#: mod/settings.php:859
+#: mod/settings.php:865
 msgid "Email password:"
 msgstr "Password email:"
 
-#: mod/settings.php:860
+#: mod/settings.php:866
 msgid "Reply-to address:"
 msgstr "Indirizzo di risposta:"
 
-#: mod/settings.php:861
+#: mod/settings.php:867
 msgid "Send public posts to all email contacts:"
 msgstr "Invia i messaggi pubblici ai contatti email:"
 
-#: mod/settings.php:862
+#: mod/settings.php:868
 msgid "Action after import:"
 msgstr "Azione post importazione:"
 
-#: mod/settings.php:862 src/Content/Nav.php:193
+#: mod/settings.php:868 src/Content/Nav.php:193
 msgid "Mark as seen"
 msgstr "Segna come letto"
 
-#: mod/settings.php:862
+#: mod/settings.php:868
 msgid "Move to folder"
 msgstr "Sposta nella cartella"
 
-#: mod/settings.php:863
+#: mod/settings.php:869
 msgid "Move to folder:"
 msgstr "Sposta nella cartella:"
 
-#: mod/settings.php:906
+#: mod/settings.php:912
 #, php-format
 msgid "%s - (Unsupported)"
 msgstr "%s - (Non supportato)"
 
-#: mod/settings.php:908
+#: mod/settings.php:914
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Sperimentale)"
 
-#: mod/settings.php:951
+#: mod/settings.php:957
 msgid "Display Settings"
 msgstr "Impostazioni Grafiche"
 
-#: mod/settings.php:957 mod/settings.php:981
+#: mod/settings.php:963 mod/settings.php:987
 msgid "Display Theme:"
 msgstr "Tema:"
 
-#: mod/settings.php:958
+#: mod/settings.php:964
 msgid "Mobile Theme:"
 msgstr "Tema mobile:"
 
-#: mod/settings.php:959
+#: mod/settings.php:965
 msgid "Suppress warning of insecure networks"
 msgstr "Sopprimi avvisi reti insicure"
 
-#: mod/settings.php:959
+#: 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 "Il sistema sopprimerà l'avviso che il gruppo selezionato contiene membri di reti che non possono ricevere post non pubblici."
 
-#: mod/settings.php:960
+#: mod/settings.php:966
 msgid "Update browser every xx seconds"
 msgstr "Aggiorna il browser ogni x secondi"
 
-#: mod/settings.php:960
+#: mod/settings.php:966
 msgid "Minimum of 10 seconds. Enter -1 to disable it."
 msgstr "Minimo 10 secondi. Inserisci -1 per disabilitarlo"
 
-#: mod/settings.php:961
+#: mod/settings.php:967
 msgid "Number of items to display per page:"
 msgstr "Numero di elementi da mostrare per pagina:"
 
-#: mod/settings.php:961 mod/settings.php:962
+#: mod/settings.php:967 mod/settings.php:968
 msgid "Maximum of 100 items"
 msgstr "Massimo 100 voci"
 
-#: mod/settings.php:962
+#: mod/settings.php:968
 msgid "Number of items to display per page when viewed from mobile device:"
 msgstr "Numero di voci da visualizzare per pagina quando si utilizza un dispositivo mobile:"
 
-#: mod/settings.php:963
+#: mod/settings.php:969
 msgid "Don't show emoticons"
 msgstr "Non mostrare le emoticons"
 
-#: mod/settings.php:964
+#: mod/settings.php:970
 msgid "Calendar"
 msgstr "Calendario"
 
-#: mod/settings.php:965
+#: mod/settings.php:971
 msgid "Beginning of week:"
 msgstr "Inizio della settimana:"
 
-#: mod/settings.php:966
+#: mod/settings.php:972
 msgid "Don't show notices"
 msgstr "Non mostrare gli avvisi"
 
-#: mod/settings.php:967
+#: mod/settings.php:973
 msgid "Infinite scroll"
 msgstr "Scroll infinito"
 
-#: mod/settings.php:968
+#: mod/settings.php:974
 msgid "Automatic updates only at the top of the network page"
 msgstr "Aggiornamenti automatici solo in cima alla pagina \"rete\""
 
-#: mod/settings.php:968
+#: mod/settings.php:974
 msgid ""
 "When disabled, the network page is updated all the time, which could be "
 "confusing while reading."
 msgstr "Quando disabilitato, la pagina \"rete\" è aggiornata continuamente, cosa che può confondere durante la lettura."
 
-#: mod/settings.php:969
-msgid "Bandwith Saver Mode"
+#: mod/settings.php:975
+msgid "Bandwidth Saver Mode"
 msgstr "Modalità Salva Banda"
 
-#: mod/settings.php:969
+#: mod/settings.php:975
 msgid ""
 "When enabled, embedded content is not displayed on automatic updates, they "
 "only show on page reload."
 msgstr "Quando abilitato, il contenuto embeddato non è mostrato quando la pagina si aggiorna automaticamente, ma solo quando la pagina viene ricaricata."
 
-#: mod/settings.php:970
+#: mod/settings.php:976
 msgid "Smart Threading"
 msgstr "Smart Threading"
 
-#: mod/settings.php:970
+#: 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 "Quando è abilitato, rimuove i rientri eccessivi nella visualizzazione delle discussioni, mantenendoli dove sono importanti. Funziona solo se le conversazioni a thread sono disponibili e abilitate."
 
-#: mod/settings.php:972
+#: mod/settings.php:978
 msgid "General Theme Settings"
 msgstr "Opzioni Generali Tema"
 
-#: mod/settings.php:973
+#: mod/settings.php:979
 msgid "Custom Theme Settings"
 msgstr "Opzioni Personalizzate Tema"
 
-#: mod/settings.php:974
+#: mod/settings.php:980
 msgid "Content Settings"
 msgstr "Opzioni Contenuto"
 
-#: mod/settings.php:975 view/theme/duepuntozero/config.php:73
+#: 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 "Impostazioni tema"
 
-#: mod/settings.php:994
+#: mod/settings.php:1000
 msgid "Unable to find your profile. Please contact your admin."
 msgstr "Impossibile trovare il tuo profilo. Contatta il tuo amministratore."
 
-#: mod/settings.php:1033
+#: mod/settings.php:1039
 msgid "Account Types"
 msgstr "Tipi di Account"
 
-#: mod/settings.php:1034
+#: mod/settings.php:1040
 msgid "Personal Page Subtypes"
 msgstr "Sottotipi di Pagine Personali"
 
-#: mod/settings.php:1035
+#: mod/settings.php:1041
 msgid "Community Forum Subtypes"
 msgstr "Sottotipi di Community Forum"
 
-#: mod/settings.php:1043
+#: mod/settings.php:1049
 msgid "Account for a personal profile."
 msgstr "Account per profilo personale."
 
-#: mod/settings.php:1047
+#: mod/settings.php:1053
 msgid ""
 "Account for an organisation that automatically approves contact requests as "
 "\"Followers\"."
 msgstr "Account per un'organizzazione, che automaticamente approva le richieste di contatto come \"Follower\"."
 
-#: mod/settings.php:1051
+#: mod/settings.php:1057
 msgid ""
 "Account for a news reflector that automatically approves contact requests as"
 " \"Followers\"."
 msgstr "Account per notizie, che automaticamente approva le richieste di contatto come \"Follower\""
 
-#: mod/settings.php:1055
+#: mod/settings.php:1061
 msgid "Account for community discussions."
 msgstr "Account per discussioni comunitarie."
 
-#: mod/settings.php:1059
+#: mod/settings.php:1065
 msgid ""
 "Account for a regular personal profile that requires manual approval of "
 "\"Friends\" and \"Followers\"."
 msgstr "Account per un profilo personale, che richiede l'approvazione delle richieste di contatto come \"Amico\" o \"Follower\"."
 
-#: mod/settings.php:1063
+#: mod/settings.php:1069
 msgid ""
 "Account for a public profile that automatically approves contact requests as"
 " \"Followers\"."
 msgstr "Account per un profilo publico, che automaticamente approva le richieste di contatto come \"Follower\"."
 
-#: mod/settings.php:1067
+#: mod/settings.php:1073
 msgid "Automatically approves all contact requests."
 msgstr "Approva automaticamente tutte le richieste di contatto."
 
-#: mod/settings.php:1071
+#: mod/settings.php:1077
 msgid ""
 "Account for a popular profile that automatically approves contact requests "
 "as \"Friends\"."
 msgstr "Account per un profilo popolare, che automaticamente approva le richieste di contatto come \"Amici\"."
 
-#: mod/settings.php:1074
+#: mod/settings.php:1080
 msgid "Private Forum [Experimental]"
 msgstr "Forum privato [sperimentale]"
 
-#: mod/settings.php:1075
+#: mod/settings.php:1081
 msgid "Requires manual approval of contact requests."
 msgstr "Richiede l'approvazione manuale delle richieste di contatto."
 
-#: mod/settings.php:1086
+#: mod/settings.php:1092
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: mod/settings.php:1086
+#: mod/settings.php:1092
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Opzionale) Consente di loggarti in questo account con questo OpenID"
 
-#: mod/settings.php:1094
+#: mod/settings.php:1100
 msgid "Publish your default profile in your local site directory?"
 msgstr "Pubblica il tuo profilo predefinito nell'elenco locale del sito"
 
-#: mod/settings.php:1094
-#, 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 "Il tuo profilo sarà pubblicato nella directory globale di friendica (p.e. <a href=\"%s\">%s</a>). Il tuo profilo sarà visibile pubblicamente."
-
-#: mod/settings.php:1100
-msgid "Publish your default profile in the global social directory?"
-msgstr "Pubblica il tuo profilo predefinito nell'elenco sociale globale"
-
 #: mod/settings.php:1100
 #, php-format
 msgid ""
@@ -7065,293 +6937,485 @@ msgid ""
 " system settings."
 msgstr "Il tuo profilo verrà pubblicato nella <a href=\"%s\">directory locale</a> di questo nodo. I dettagli del tuo profilo potrebbero essere visibili pubblicamente a seconda delle impostazioni di sistema."
 
-#: mod/settings.php:1107
+#: mod/settings.php:1106
+msgid "Publish your default profile in the global social directory?"
+msgstr "Pubblica il tuo profilo predefinito nell'elenco sociale globale"
+
+#: 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 "Il tuo profilo sarà pubblicato nella directory globale di friendica (p.e. <a href=\"%s\">%s</a>). Il tuo profilo sarà visibile pubblicamente."
+
+#: mod/settings.php:1113
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Nascondi la lista dei tuoi contatti/amici dai visitatori del tuo profilo predefinito"
 
-#: mod/settings.php:1107
+#: 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 "La tua lista di contatti non sarà mostrata nella tua pagina profilo di default. Puoi decidere di mostrare la tua lista contatti separatamente per ogni profilo in più che crei."
 
-#: mod/settings.php:1111
+#: mod/settings.php:1117
 msgid "Hide your profile details from anonymous viewers?"
 msgstr "Nascondi i dettagli del tuo profilo ai visitatori anonimi?"
 
-#: mod/settings.php:1111
+#: 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. Disables posting public "
-"messages to Diaspora and other networks."
-msgstr "I visitatori anonimi vedranno nella tua pagina profilo solo la tua foto del profilo, il tuo nome e il nome utente che stai usando. Disabilita l'invio di messaggi pubblici verso Diaspora e altre reti."
+" the nickname you are using on your profile page. Your public posts and "
+"replies will still be accessible by other means."
+msgstr "I visitatori anonimi vedranno nella tua pagina profilo solo la tua foto del profilo, il tuo nome e il nome utente che stai usando. I tuoi post pubblici e le risposte saranno comunque accessibili in altre maniere."
 
-#: mod/settings.php:1115
+#: mod/settings.php:1121
 msgid "Allow friends to post to your profile page?"
 msgstr "Permetti agli amici di scrivere sulla tua pagina profilo?"
 
-#: mod/settings.php:1115
+#: mod/settings.php:1121
 msgid ""
 "Your contacts may write posts on your profile wall. These posts will be "
 "distributed to your contacts"
 msgstr "I tuoi contatti possono scrivere messaggi sulla tua pagina di profilo. Questi messaggi saranno distribuiti a tutti i tuoi contatti."
 
-#: mod/settings.php:1119
+#: mod/settings.php:1125
 msgid "Allow friends to tag your posts?"
 msgstr "Permetti agli amici di aggiungere tag  ai tuoi messaggi?"
 
-#: mod/settings.php:1119
+#: mod/settings.php:1125
 msgid "Your contacts can add additional tags to your posts."
 msgstr "I tuoi contatti possono aggiungere tag aggiuntivi ai tuoi messaggi."
 
-#: mod/settings.php:1123
+#: mod/settings.php:1129
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Ci permetti di suggerirti come potenziale amico ai nuovi membri?"
 
-#: mod/settings.php:1123
+#: mod/settings.php:1129
 msgid ""
 "If you like, Friendica may suggest new members to add you as a contact."
 msgstr "Se vuoi, Friendica può suggerire ai nuovi utenti di aggiungerti come contatto."
 
-#: mod/settings.php:1127
+#: mod/settings.php:1133
 msgid "Permit unknown people to send you private mail?"
 msgstr "Permetti a utenti sconosciuti di inviarti messaggi privati?"
 
-#: mod/settings.php:1127
+#: mod/settings.php:1133
 msgid ""
 "Friendica network users may send you private messages even if they are not "
 "in your contact list."
 msgstr "Gli utenti sulla rete Friendica possono inviarti messaggi privati anche se non sono nella tua lista di contatti."
 
-#: mod/settings.php:1131
+#: mod/settings.php:1137
 msgid "Profile is <strong>not published</strong>."
 msgstr "Il profilo <strong>non è pubblicato</strong>."
 
-#: mod/settings.php:1137
+#: mod/settings.php:1143
 #, php-format
 msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
 msgstr "L'indirizzo della tua identità è <strong>'%s'</strong> or '%s'."
 
-#: mod/settings.php:1144
+#: mod/settings.php:1150
 msgid "Automatically expire posts after this many days:"
 msgstr "Fai scadere i post automaticamente dopo x giorni:"
 
-#: mod/settings.php:1144
+#: mod/settings.php:1150
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Se lasciato vuoto, i messaggi non verranno cancellati."
 
-#: mod/settings.php:1145
+#: mod/settings.php:1151
 msgid "Advanced expiration settings"
 msgstr "Impostazioni avanzate di scadenza"
 
-#: mod/settings.php:1146
+#: mod/settings.php:1152
 msgid "Advanced Expiration"
 msgstr "Scadenza avanzata"
 
-#: mod/settings.php:1147
+#: mod/settings.php:1153
 msgid "Expire posts:"
 msgstr "Fai scadere i post:"
 
-#: mod/settings.php:1148
+#: mod/settings.php:1154
 msgid "Expire personal notes:"
 msgstr "Fai scadere le Note personali:"
 
-#: mod/settings.php:1149
+#: mod/settings.php:1155
 msgid "Expire starred posts:"
 msgstr "Fai scadere i post Speciali:"
 
-#: mod/settings.php:1150
+#: mod/settings.php:1156
 msgid "Expire photos:"
 msgstr "Fai scadere le foto:"
 
-#: mod/settings.php:1151
+#: mod/settings.php:1157
 msgid "Only expire posts by others:"
 msgstr "Fai scadere solo i post degli altri:"
 
-#: mod/settings.php:1181
+#: mod/settings.php:1187
 msgid "Account Settings"
 msgstr "Impostazioni account"
 
-#: mod/settings.php:1189
+#: mod/settings.php:1195
 msgid "Password Settings"
 msgstr "Impostazioni password"
 
-#: mod/settings.php:1191
+#: mod/settings.php:1197
 msgid "Leave password fields blank unless changing"
 msgstr "Lascia questi campi in bianco per non effettuare variazioni alla password"
 
-#: mod/settings.php:1192
+#: mod/settings.php:1198
 msgid "Current Password:"
 msgstr "Password Attuale:"
 
-#: mod/settings.php:1192 mod/settings.php:1193
+#: mod/settings.php:1198 mod/settings.php:1199
 msgid "Your current password to confirm the changes"
 msgstr "La tua password attuale per confermare le modifiche"
 
-#: mod/settings.php:1193
+#: mod/settings.php:1199
 msgid "Password:"
 msgstr "Password:"
 
-#: mod/settings.php:1197
+#: mod/settings.php:1203
 msgid "Basic Settings"
 msgstr "Impostazioni base"
 
-#: mod/settings.php:1198 src/Model/Profile.php:736
+#: mod/settings.php:1204 src/Model/Profile.php:734
 msgid "Full Name:"
 msgstr "Nome completo:"
 
-#: mod/settings.php:1199
+#: mod/settings.php:1205
 msgid "Email Address:"
 msgstr "Indirizzo Email:"
 
-#: mod/settings.php:1200
+#: mod/settings.php:1206
 msgid "Your Timezone:"
 msgstr "Il tuo fuso orario:"
 
-#: mod/settings.php:1201
+#: mod/settings.php:1207
 msgid "Your Language:"
 msgstr "La tua lingua:"
 
-#: mod/settings.php:1201
+#: mod/settings.php:1207
 msgid ""
 "Set the language we use to show you friendica interface and to send you "
 "emails"
 msgstr "Imposta la lingua che sarà usata per mostrarti l'interfaccia di Friendica e per inviarti le email"
 
-#: mod/settings.php:1202
+#: mod/settings.php:1208
 msgid "Default Post Location:"
 msgstr "Località predefinita:"
 
-#: mod/settings.php:1203
+#: mod/settings.php:1209
 msgid "Use Browser Location:"
 msgstr "Usa la località rilevata dal browser:"
 
-#: mod/settings.php:1206
+#: mod/settings.php:1212
 msgid "Security and Privacy Settings"
 msgstr "Impostazioni di sicurezza e privacy"
 
-#: mod/settings.php:1208
+#: mod/settings.php:1214
 msgid "Maximum Friend Requests/Day:"
 msgstr "Numero massimo di richieste di amicizia al giorno:"
 
-#: mod/settings.php:1208 mod/settings.php:1237
+#: mod/settings.php:1214 mod/settings.php:1243
 msgid "(to prevent spam abuse)"
 msgstr "(per prevenire lo spam)"
 
-#: mod/settings.php:1209
+#: mod/settings.php:1215
 msgid "Default Post Permissions"
 msgstr "Permessi predefiniti per i messaggi"
 
-#: mod/settings.php:1210
+#: mod/settings.php:1216
 msgid "(click to open/close)"
 msgstr "(clicca per aprire/chiudere)"
 
-#: mod/settings.php:1220
+#: mod/settings.php:1226
 msgid "Default Private Post"
 msgstr "Default Post Privato"
 
-#: mod/settings.php:1221
+#: mod/settings.php:1227
 msgid "Default Public Post"
 msgstr "Default Post Pubblico"
 
-#: mod/settings.php:1225
+#: mod/settings.php:1231
 msgid "Default Permissions for New Posts"
 msgstr "Permessi predefiniti per i nuovi post"
 
-#: mod/settings.php:1237
+#: mod/settings.php:1243
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Numero massimo di messaggi privati da utenti sconosciuti per giorno:"
 
-#: mod/settings.php:1240
+#: mod/settings.php:1246
 msgid "Notification Settings"
 msgstr "Impostazioni notifiche"
 
-#: mod/settings.php:1241
+#: mod/settings.php:1247
 msgid "Send a notification email when:"
 msgstr "Invia una mail di notifica quando:"
 
-#: mod/settings.php:1242
+#: mod/settings.php:1248
 msgid "You receive an introduction"
 msgstr "Ricevi una presentazione"
 
-#: mod/settings.php:1243
+#: mod/settings.php:1249
 msgid "Your introductions are confirmed"
 msgstr "Le tue presentazioni sono confermate"
 
-#: mod/settings.php:1244
+#: mod/settings.php:1250
 msgid "Someone writes on your profile wall"
 msgstr "Qualcuno scrive sulla bacheca del tuo profilo"
 
-#: mod/settings.php:1245
+#: mod/settings.php:1251
 msgid "Someone writes a followup comment"
 msgstr "Qualcuno scrive un commento a un tuo messaggio"
 
-#: mod/settings.php:1246
+#: mod/settings.php:1252
 msgid "You receive a private message"
 msgstr "Ricevi un messaggio privato"
 
-#: mod/settings.php:1247
+#: mod/settings.php:1253
 msgid "You receive a friend suggestion"
 msgstr "Hai ricevuto un suggerimento di amicizia"
 
-#: mod/settings.php:1248
+#: mod/settings.php:1254
 msgid "You are tagged in a post"
 msgstr "Sei stato taggato in un post"
 
-#: mod/settings.php:1249
+#: mod/settings.php:1255
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Sei 'toccato'/'spronato'/ecc. in un post"
 
-#: mod/settings.php:1251
+#: mod/settings.php:1257
 msgid "Activate desktop notifications"
 msgstr "Attiva notifiche desktop"
 
-#: mod/settings.php:1251
+#: mod/settings.php:1257
 msgid "Show desktop popup on new notifications"
 msgstr "Mostra un popup di notifica sul desktop all'arrivo di nuove notifiche"
 
-#: mod/settings.php:1253
+#: mod/settings.php:1259
 msgid "Text-only notification emails"
 msgstr "Email di notifica in solo testo"
 
-#: mod/settings.php:1255
+#: mod/settings.php:1261
 msgid "Send text only notification emails, without the html part"
 msgstr "Invia le email di notifica in solo testo, senza la parte in html"
 
-#: mod/settings.php:1257
+#: mod/settings.php:1263
 msgid "Show detailled notifications"
 msgstr "Mostra notifiche dettagliate"
 
-#: mod/settings.php:1259
+#: mod/settings.php:1265
 msgid ""
 "Per default, notifications are condensed to a single notification per item. "
 "When enabled every notification is displayed."
 msgstr "Per impostazione predefinita, le notifiche sono raggruppate in una singola notifica per articolo. Se abilitato, viene visualizzate tutte le notifiche."
 
-#: mod/settings.php:1261
+#: mod/settings.php:1267
 msgid "Advanced Account/Page Type Settings"
 msgstr "Impostazioni avanzate Account/Tipo di pagina"
 
-#: mod/settings.php:1262
+#: mod/settings.php:1268
 msgid "Change the behaviour of this account for special situations"
 msgstr "Modifica il comportamento di questo account in situazioni speciali"
 
-#: mod/settings.php:1265
+#: mod/settings.php:1271
 msgid "Relocate"
 msgstr "Trasloca"
 
-#: mod/settings.php:1266
+#: 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 "Se hai spostato questo profilo da un'altro server, e alcuni dei tuoi contatti non ricevono i tuoi aggiornamenti, prova a premere questo bottone."
 
-#: mod/settings.php:1267
+#: mod/settings.php:1273
 msgid "Resend relocate message to contacts"
 msgstr "Invia nuovamente il messaggio di trasloco ai contatti"
 
-#: view/theme/duepuntozero/config.php:54 src/Model/User.php:502
+#: mod/subthread.php:113
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s sta seguendo %3$s di %2$s"
+
+#: mod/suggest.php:37
+msgid "Do you really want to delete this suggestion?"
+msgstr "Vuoi veramente cancellare questo suggerimento?"
+
+#: mod/suggest.php:73
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Nessun suggerimento disponibile. Se questo è un sito nuovo, riprova tra 24 ore."
+
+#: mod/suggest.php:86 mod/suggest.php:106
+msgid "Ignore/Hide"
+msgstr "Ignora / Nascondi"
+
+#: mod/suggest.php:116 view/theme/vier/theme.php:202 src/Content/Widget.php:63
+msgid "Friend Suggestions"
+msgstr "Contatti suggeriti"
+
+#: mod/tagrm.php:43
+msgid "Tag removed"
+msgstr "Tag rimosso"
+
+#: mod/tagrm.php:77
+msgid "Remove Item Tag"
+msgstr "Rimuovi il tag"
+
+#: mod/tagrm.php:79
+msgid "Select a tag to remove: "
+msgstr "Seleziona un tag da rimuovere: "
+
+#: mod/uexport.php:44
+msgid "Export account"
+msgstr "Esporta account"
+
+#: 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 "Esporta le informazioni del tuo account e dei contatti. Usa questa funzione per fare un backup del tuo account o per spostarlo in un altro server."
+
+#: mod/uexport.php:45
+msgid "Export all"
+msgstr "Esporta tutto"
+
+#: 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 "Esporta le informazioni del tuo account, i tuoi contatti e tutti i tuoi elementi in json. Può diventare un file veramente molto grosso e metterci un sacco di tempo. Usa questa funzione per fare un backup completo del tuo account (le foto non sono esportate)"
+
+#: mod/unfollow.php:35
+msgid "Contact wasn't found or can't be unfollowed."
+msgstr "Il contatto non è stato trovato o non si può smettere di seguirlo."
+
+#: mod/unfollow.php:48
+msgid "Contact unfollowed"
+msgstr "Smesso di seguire il contatto"
+
+#: mod/unfollow.php:74
+msgid "You aren't a friend of this contact."
+msgstr "Non sei un amico di questo contatto"
+
+#: mod/unfollow.php:80
+msgid "Unfollowing is currently not supported by your network."
+msgstr "Smettere di seguire non è al momento supportato dalla tua rete."
+
+#: mod/videos.php:138
+msgid "Do you really want to delete this video?"
+msgstr "Vuoi veramente cancellare questo video?"
+
+#: mod/videos.php:143
+msgid "Delete Video"
+msgstr "Rimuovi video"
+
+#: mod/videos.php:206
+msgid "No videos selected"
+msgstr "Nessun video selezionato"
+
+#: mod/videos.php:388
+msgid "Recent Videos"
+msgstr "Video Recenti"
+
+#: mod/videos.php:390
+msgid "Upload New Videos"
+msgstr "Carica Nuovo Video"
+
+#: mod/viewcontacts.php:89
+msgid "No contacts."
+msgstr "Nessun contatto."
+
+#: 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 "Richiesta non valida."
+
+#: mod/wall_attach.php:103
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr "Mi spiace, forse il file che stai caricando è più grosso di quanto la configurazione di PHP permetta"
+
+#: mod/wall_attach.php:103
+msgid "Or - did you try to upload an empty file?"
+msgstr "O.. non avrai provato a caricare un file vuoto?"
+
+#: mod/wall_attach.php:114
+#, php-format
+msgid "File exceeds size limit of %s"
+msgstr "Il file supera la dimensione massima di %s"
+
+#: mod/wall_attach.php:138 mod/wall_attach.php:154
+msgid "File upload failed."
+msgstr "Caricamento del file non riuscito."
+
+#: mod/wallmessage.php:49 mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "Numero giornaliero di messaggi per %s superato. Invio fallito."
+
+#: mod/wallmessage.php:60
+msgid "Unable to check your home location."
+msgstr "Impossibile controllare la tua posizione di origine."
+
+#: mod/wallmessage.php:86 mod/wallmessage.php:95
+msgid "No recipient."
+msgstr "Nessun destinatario."
+
+#: 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 "Se vuoi che %s ti risponda, controlla che le tue impostazioni di privacy permettano la ricezione di messaggi privati da mittenti sconosciuti."
+
+#: 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 "Questo è Friendica, versione %s in esecuzione all'indirizzo web %s. La versione del database è %s, la versione post-aggiornamento è %s."
+
+#: mod/friendica.php:84
+msgid ""
+"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
+"about the Friendica project."
+msgstr "Visita <a href=\"https://friendi.ca\">Friendi.ca</a> per saperne di più sul progetto Friendica."
+
+#: mod/friendica.php:88
+msgid "Bug reports and issues: please visit"
+msgstr "Segnalazioni di bug e problemi: visita"
+
+#: mod/friendica.php:88
+msgid "the bugtracker at github"
+msgstr "il bugtracker su github"
+
+#: mod/friendica.php:91
+msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
+msgstr "Per suggerimenti, lodi, ecc., invia una mail a info chiocciola friendi punto ca"
+
+#: mod/friendica.php:105
+msgid "Installed addons/apps:"
+msgstr "Addon/applicazioni installate"
+
+#: mod/friendica.php:119
+msgid "No installed addons/apps"
+msgstr "Nessun addons/applicazione installata"
+
+#: mod/friendica.php:124
+#, php-format
+msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
+msgstr "Leggi i <a href=\"%1$s/tos\">Termini di Servizio</a> di questo nodo."
+
+#: mod/friendica.php:129
+msgid "On this server the following remote servers are blocked."
+msgstr "In questo server i seguenti server remoti sono bloccati."
+
+#: view/theme/duepuntozero/config.php:54 src/Model/User.php:541
 msgid "default"
 msgstr "default"
 
@@ -7484,7 +7548,7 @@ msgid "Visitor"
 msgstr "Visitatore"
 
 #: view/theme/frio/theme.php:256 src/Content/Nav.php:97
-#: src/Module/Login.php:312
+#: src/Module/Login.php:311
 msgid "Logout"
 msgstr "Esci"
 
@@ -7506,7 +7570,7 @@ msgid "Your photos"
 msgstr "Le tue foto"
 
 #: view/theme/frio/theme.php:262 src/Content/Nav.php:103
-#: src/Model/Profile.php:910 src/Model/Profile.php:913
+#: src/Model/Profile.php:908 src/Model/Profile.php:911
 msgid "Videos"
 msgstr "Video"
 
@@ -7523,7 +7587,7 @@ msgid "Conversations from your friends"
 msgstr "Conversazioni dai tuoi amici"
 
 #: view/theme/frio/theme.php:267 src/Content/Nav.php:170
-#: src/Model/Profile.php:925 src/Model/Profile.php:936
+#: src/Model/Profile.php:923 src/Model/Profile.php:934
 msgid "Events and Calendar"
 msgstr "Eventi e calendario"
 
@@ -7567,11 +7631,11 @@ msgstr "Dimensione caratteri nelle aree di testo"
 msgid "Comma separated list of helper forums"
 msgstr "Lista separata da virgola di forum di aiuto"
 
-#: view/theme/vier/config.php:115 src/Core/ACL.php:309
+#: view/theme/vier/config.php:115 src/Core/ACL.php:299
 msgid "don't show"
 msgstr "non mostrare"
 
-#: view/theme/vier/config.php:115 src/Core/ACL.php:308
+#: view/theme/vier/config.php:115 src/Core/ACL.php:298
 msgid "show"
 msgstr "mostra"
 
@@ -7583,7 +7647,7 @@ msgstr "Imposta stile"
 msgid "Community Pages"
 msgstr "Pagine Comunitarie"
 
-#: view/theme/vier/config.php:124 view/theme/vier/theme.php:150
+#: view/theme/vier/config.php:124 view/theme/vier/theme.php:149
 msgid "Community Profiles"
 msgstr "Profili Comunità"
 
@@ -7591,7 +7655,7 @@ msgstr "Profili Comunità"
 msgid "Help or @NewHere ?"
 msgstr "Serve aiuto? Sei nuovo?"
 
-#: view/theme/vier/config.php:126 view/theme/vier/theme.php:388
+#: view/theme/vier/config.php:126 view/theme/vier/theme.php:386
 msgid "Connect Services"
 msgstr "Servizi connessi"
 
@@ -7599,186 +7663,68 @@ msgstr "Servizi connessi"
 msgid "Find Friends"
 msgstr "Trova Amici"
 
-#: view/theme/vier/config.php:128 view/theme/vier/theme.php:181
+#: view/theme/vier/config.php:128 view/theme/vier/theme.php:179
 msgid "Last users"
 msgstr "Ultimi utenti"
 
-#: view/theme/vier/theme.php:199 src/Content/Widget.php:59
+#: view/theme/vier/theme.php:197 src/Content/Widget.php:58
 msgid "Find People"
 msgstr "Trova persone"
 
-#: view/theme/vier/theme.php:200 src/Content/Widget.php:60
+#: view/theme/vier/theme.php:198 src/Content/Widget.php:59
 msgid "Enter name or interest"
 msgstr "Inserisci un nome o un interesse"
 
-#: view/theme/vier/theme.php:202 src/Content/Widget.php:62
+#: view/theme/vier/theme.php:200 src/Content/Widget.php:61
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Esempi: Mario Rossi, Pesca"
 
-#: view/theme/vier/theme.php:205 src/Content/Widget.php:65
+#: view/theme/vier/theme.php:203 src/Content/Widget.php:64
 msgid "Similar Interests"
 msgstr "Interessi simili"
 
-#: view/theme/vier/theme.php:206 src/Content/Widget.php:66
+#: view/theme/vier/theme.php:204 src/Content/Widget.php:65
 msgid "Random Profile"
 msgstr "Profilo causale"
 
-#: view/theme/vier/theme.php:207 src/Content/Widget.php:67
+#: view/theme/vier/theme.php:205 src/Content/Widget.php:66
 msgid "Invite Friends"
 msgstr "Invita amici"
 
-#: view/theme/vier/theme.php:210 src/Content/Widget.php:70
+#: view/theme/vier/theme.php:208 src/Content/Widget.php:69
 msgid "Local Directory"
 msgstr "Elenco Locale"
 
-#: view/theme/vier/theme.php:255 src/Content/ForumManager.php:127
+#: view/theme/vier/theme.php:253 src/Content/ForumManager.php:127
 msgid "External link to forum"
 msgstr "Link esterno al forum"
 
-#: view/theme/vier/theme.php:291
+#: view/theme/vier/theme.php:289
 msgid "Quick Start"
 msgstr "Quick Start"
 
-#: src/Core/UserImport.php:104
-msgid "Error decoding account file"
-msgstr "Errore decodificando il file account"
-
-#: src/Core/UserImport.php:110
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "Errore! Nessuna informazione di versione nel file! Potrebbe non essere un file account di Friendica?"
-
-#: src/Core/UserImport.php:118
-#, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "L'utente '%s' esiste già su questo server!"
-
-#: src/Core/UserImport.php:151
-msgid "User creation error"
-msgstr "Errore creando l'utente"
-
-#: src/Core/UserImport.php:169
-msgid "User profile creation error"
-msgstr "Errore creando il profilo dell'utente"
-
-#: src/Core/UserImport.php:213
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] "%d contatto non importato"
-msgstr[1] "%d contatti non importati"
-
-#: src/Core/UserImport.php:278
-msgid "Done. You can now login with your username and password"
-msgstr "Fatto. Ora puoi entrare con il tuo nome utente e la tua password"
-
-#: src/Core/ACL.php:295
-msgid "Post to Email"
-msgstr "Invia a email"
-
-#: src/Core/ACL.php:301
-msgid "Hide your profile details from unknown viewers?"
-msgstr "Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?"
-
-#: src/Core/ACL.php:300
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr "Connettore disabilitato, dato che \"%s\" è abilitato."
-
-#: src/Core/ACL.php:307
-msgid "Visible to everybody"
-msgstr "Visibile a tutti"
-
-#: src/Core/ACL.php:319
-msgid "Close"
-msgstr "Chiudi"
-
-#: src/Core/Console/NewPassword.php:78
-msgid "Enter new password: "
-msgstr "Inserisci la nuova password:"
-
-#: src/Core/Console/NewPassword.php:83 src/Model/User.php:262
-msgid "Password can't be empty"
-msgstr "La password non puo' essere vuota"
-
-#: src/Core/Console/ArchiveContact.php:67
+#: src/Core/Console/ArchiveContact.php:65
 #, php-format
 msgid "Could not find any unarchived contact entry for this URL (%s)"
 msgstr "Impossibile trovare contatti non archiviati a questo URL (%s)"
 
-#: src/Core/Console/ArchiveContact.php:72
+#: src/Core/Console/ArchiveContact.php:70
 msgid "The contact entries have been archived"
 msgstr "Il contatto è stato archiviato"
 
-#: src/Core/NotificationsManager.php:171
-msgid "System"
-msgstr "Sistema"
+#: src/Core/Console/NewPassword.php:73
+msgid "Enter new password: "
+msgstr "Inserisci la nuova password:"
 
-#: src/Core/NotificationsManager.php:192 src/Content/Nav.php:124
-#: src/Content/Nav.php:186
-msgid "Home"
-msgstr "Home"
+#: src/Core/Console/NewPassword.php:78 src/Model/User.php:266
+msgid "Password can't be empty"
+msgstr "La password non puo' essere vuota"
 
-#: src/Core/NotificationsManager.php:199 src/Content/Nav.php:190
-msgid "Introductions"
-msgstr "Presentazioni"
-
-#: src/Core/NotificationsManager.php:256 src/Core/NotificationsManager.php:268
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s ha commentato il messaggio di %s"
-
-#: src/Core/NotificationsManager.php:267
-#, php-format
-msgid "%s created a new post"
-msgstr "%s a creato un nuovo messaggio"
-
-#: src/Core/NotificationsManager.php:281
-#, php-format
-msgid "%s liked %s's post"
-msgstr "a %s è piaciuto il messaggio di %s"
-
-#: src/Core/NotificationsManager.php:294
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "a %s non è piaciuto il messaggio di %s"
-
-#: src/Core/NotificationsManager.php:307
-#, php-format
-msgid "%s is attending %s's event"
-msgstr "%s partecipa all'evento di %s"
-
-#: src/Core/NotificationsManager.php:320
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr "%s non partecipa all'evento di %s"
-
-#: src/Core/NotificationsManager.php:333
-#, php-format
-msgid "%s may attend %s's event"
-msgstr "%s potrebbe partecipare all'evento di %s"
-
-#: src/Core/NotificationsManager.php:350
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s è ora amico di %s"
-
-#: src/Core/NotificationsManager.php:825
-msgid "Friend Suggestion"
-msgstr "Amico suggerito"
-
-#: src/Core/NotificationsManager.php:851
-msgid "Friend/Connect Request"
-msgstr "Richiesta amicizia/connessione"
-
-#: src/Core/NotificationsManager.php:851
-msgid "New Follower"
-msgstr "Qualcuno inizia a seguirti"
-
-#: src/Core/Install.php:157
+#: src/Core/Install.php:156
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr "Non riesco a trovare la versione di PHP da riga di comando nel PATH del server web"
 
-#: src/Core/Install.php:158
+#: 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 "
@@ -7786,223 +7732,341 @@ msgid ""
 "up-the-worker'>'Setup the worker'</a>"
 msgstr "Se non hai la versione a riga di comando di PHP installata sul tuo server, non sarai in grado di eseguire i processi in background. Vedi <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the poller'</a>"
 
-#: src/Core/Install.php:162
+#: src/Core/Install.php:161
 msgid "PHP executable path"
 msgstr "Percorso eseguibile PHP"
 
-#: src/Core/Install.php:162
+#: src/Core/Install.php:161
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr "Inserisci il percorso completo all'eseguibile di php. Puoi lasciare bianco questo campo per continuare l'installazione."
 
-#: src/Core/Install.php:167
+#: src/Core/Install.php:166
 msgid "Command line PHP"
 msgstr "PHP da riga di comando"
 
-#: src/Core/Install.php:176
+#: src/Core/Install.php:175
 msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
 msgstr "L'eseguibile PHP non è il binario php cli (potrebbe essere la versione cgi-fcgi)"
 
-#: src/Core/Install.php:177
+#: src/Core/Install.php:176
 msgid "Found PHP version: "
 msgstr "Versione PHP:"
 
-#: src/Core/Install.php:179
+#: src/Core/Install.php:178
 msgid "PHP cli binary"
 msgstr "Binario PHP cli"
 
-#: src/Core/Install.php:189
+#: src/Core/Install.php:188
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr "La versione da riga di comando di PHP nel sistema non ha abilitato \"register_argc_argv\"."
 
-#: src/Core/Install.php:190
+#: src/Core/Install.php:189
 msgid "This is required for message delivery to work."
 msgstr "E' obbligatorio per far funzionare la consegna dei messaggi."
 
-#: src/Core/Install.php:192
+#: src/Core/Install.php:191
 msgid "PHP register_argc_argv"
 msgstr "PHP register_argc_argv"
 
-#: src/Core/Install.php:220
+#: src/Core/Install.php:219
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr "Errore: la funzione \"openssl_pkey_new\" in questo sistema non è in grado di generare le chiavi di criptazione"
 
-#: src/Core/Install.php:221
+#: src/Core/Install.php:220
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 msgstr "Se stai eseguendo friendika su windows, guarda \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: src/Core/Install.php:223
+#: src/Core/Install.php:222
 msgid "Generate encryption keys"
 msgstr "Genera chiavi di criptazione"
 
-#: src/Core/Install.php:244
+#: src/Core/Install.php:243
 msgid "libCurl PHP module"
 msgstr "modulo PHP libCurl"
 
-#: src/Core/Install.php:245
+#: src/Core/Install.php:244
 msgid "GD graphics PHP module"
 msgstr "modulo PHP GD graphics"
 
-#: src/Core/Install.php:246
+#: src/Core/Install.php:245
 msgid "OpenSSL PHP module"
 msgstr "modulo PHP OpenSSL"
 
-#: src/Core/Install.php:247
+#: src/Core/Install.php:246
 msgid "PDO or MySQLi PHP module"
 msgstr "modulo PHP PDO o MySQLi"
 
-#: src/Core/Install.php:248
+#: src/Core/Install.php:247
 msgid "mb_string PHP module"
 msgstr "modulo PHP mb_string"
 
-#: src/Core/Install.php:249
+#: src/Core/Install.php:248
 msgid "XML PHP module"
 msgstr "Modulo PHP XML"
 
-#: src/Core/Install.php:250
+#: src/Core/Install.php:249
 msgid "iconv PHP module"
 msgstr "modulo PHP iconv"
 
-#: src/Core/Install.php:251
+#: src/Core/Install.php:250
 msgid "POSIX PHP module"
 msgstr "mooduo PHP POSIX"
 
-#: src/Core/Install.php:255 src/Core/Install.php:257
+#: src/Core/Install.php:254 src/Core/Install.php:256
 msgid "Apache mod_rewrite module"
 msgstr "Modulo mod_rewrite di Apache"
 
-#: src/Core/Install.php:255
+#: src/Core/Install.php:254
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Errore: E' il modulo mod-rewrite di Apache è richiesto, ma non risulta installato"
 
-#: src/Core/Install.php:263
+#: src/Core/Install.php:262
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Errore: il modulo libCURL di PHP è richiesto, ma non risulta installato."
 
-#: src/Core/Install.php:267
+#: src/Core/Install.php:266
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Errore: Il modulo GD graphics di PHP con supporto a JPEG è richiesto, ma non risulta installato."
 
-#: src/Core/Install.php:271
+#: src/Core/Install.php:270
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Errore: il modulo openssl di PHP è richiesto, ma non risulta installato."
 
-#: src/Core/Install.php:275
+#: src/Core/Install.php:274
 msgid "Error: PDO or MySQLi PHP module required but not installed."
 msgstr "Errore: uno dei due moduli PHP PDO o MySQLi è richiesto ma non installato."
 
-#: src/Core/Install.php:279
+#: src/Core/Install.php:278
 msgid "Error: The MySQL driver for PDO is not installed."
 msgstr "Errore: il driver MySQL per PDO non è installato."
 
-#: src/Core/Install.php:283
+#: src/Core/Install.php:282
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Errore: il modulo PHP mb_string è richiesto, ma non risulta installato."
 
-#: src/Core/Install.php:287
+#: src/Core/Install.php:286
 msgid "Error: iconv PHP module required but not installed."
 msgstr "Errore: il modulo PHP iconv è richiesto ma non installato."
 
-#: src/Core/Install.php:291
+#: src/Core/Install.php:290
 msgid "Error: POSIX PHP module required but not installed."
 msgstr "Errore, il modulo PHP POSIX è richiesto ma non installato."
 
-#: src/Core/Install.php:301
+#: src/Core/Install.php:300
 msgid "Error, XML PHP module required but not installed."
 msgstr "Errore, il modulo PHP XML è richiesto ma non installato."
 
-#: src/Core/Install.php:320
+#: src/Core/Install.php:319
 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 "L'installazione web deve poter creare un file chiamato \".htconfig.php\" nella cartella principale del tuo web server ma non è in grado di farlo."
+"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 "L'installer web deve essere in grado di creare un file chiamato \"local.ini.php\"  nella cartella \"config\" del tuo server web, ma non è in grado di farlo."
 
-#: src/Core/Install.php:321
+#: 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 "Ciò è dovuto spesso a impostazioni di permessi, dato che il web server può non essere in grado di scrivere il file nella tua cartella, anche se tu puoi."
 
-#: src/Core/Install.php:322
+#: src/Core/Install.php:321
 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 "Alla fine di questa procedura, di daremo un testo da salvare in un file chiamato .htconfig.php nella tua cartella principale di Friendica"
+"named local.ini.php in your Friendica \"config\" folder."
+msgstr "Alla fine di questa procedura, ti daremo un testo da salvare in un file chiamato \"local.ini.php\" nella cartella \"config\" della tua installazione di Friendica."
 
-#: src/Core/Install.php:323
+#: 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 "Puoi in alternativa saltare questa procedura ed eseguire l'installazione manualmente. Vedi il file \"INSTALL.txt\" per le istruzioni."
 
-#: src/Core/Install.php:326
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php è scrivibile"
+#: src/Core/Install.php:325
+msgid "config/local.ini.php is writable"
+msgstr "config/local.ini.php è scrivibile"
 
-#: src/Core/Install.php:344
+#: 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 usa il motore di template Smarty3 per renderizzare le sue pagine web. Smarty3 compila i template in PHP per velocizzare il rendering."
 
-#: src/Core/Install.php:345
+#: 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 "Per salvare questi template compilati, il server werb ha bisogno dell'accesso in scrittura alla cartella view/smarty3/ nella cartella principale dei Friendica."
 
-#: src/Core/Install.php:346
+#: 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 "Per favore, controlla che l'utente con cui il tuo server web gira (es www-data) ha accesso in scrittura a questa cartella."
 
-#: src/Core/Install.php:347
+#: 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 "Nota: come misura di sicurezza, dovresti dare accesso in scrittura solo alla cartella view/smarty3, non ai template (.tpl) che contiene."
 
-#: src/Core/Install.php:350
+#: src/Core/Install.php:349
 msgid "view/smarty3 is writable"
 msgstr "view/smarty3 è scrivibile"
 
-#: src/Core/Install.php:375
+#: src/Core/Install.php:374
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr "La riscrittura degli url in .htaccess non funziona. Controlla la configurazione del tuo server."
 
-#: src/Core/Install.php:377
+#: src/Core/Install.php:376
 msgid "Error message from Curl when fetching"
 msgstr "Messaggio di errore da Curl durante la richiesta"
 
-#: src/Core/Install.php:381
+#: src/Core/Install.php:380
 msgid "Url rewrite is working"
 msgstr "La riscrittura degli url funziona"
 
-#: src/Core/Install.php:408
+#: src/Core/Install.php:407
 msgid "ImageMagick PHP extension is not installed"
 msgstr "L'estensione PHP ImageMagick non è installata"
 
-#: src/Core/Install.php:410
+#: src/Core/Install.php:409
 msgid "ImageMagick PHP extension is installed"
 msgstr "L'estensione PHP ImageMagick è installata"
 
-#: src/Core/Install.php:412
+#: src/Core/Install.php:411
 msgid "ImageMagick supports GIF"
 msgstr "ImageMagick supporta i GIF"
 
-#: src/Util/Temporal.php:147 src/Model/Profile.php:756
+#: src/Core/ACL.php:285
+msgid "Post to Email"
+msgstr "Invia a email"
+
+#: src/Core/ACL.php:291
+msgid "Hide your profile details from unknown viewers?"
+msgstr "Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?"
+
+#: src/Core/ACL.php:290
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr "Connettore disabilitato, dato che \"%s\" è abilitato."
+
+#: src/Core/ACL.php:297
+msgid "Visible to everybody"
+msgstr "Visibile a tutti"
+
+#: src/Core/ACL.php:309
+msgid "Close"
+msgstr "Chiudi"
+
+#: src/Core/NotificationsManager.php:169
+msgid "System"
+msgstr "Sistema"
+
+#: src/Core/NotificationsManager.php:190 src/Content/Nav.php:124
+#: src/Content/Nav.php:186
+msgid "Home"
+msgstr "Home"
+
+#: src/Core/NotificationsManager.php:197 src/Content/Nav.php:190
+msgid "Introductions"
+msgstr "Presentazioni"
+
+#: src/Core/NotificationsManager.php:259 src/Core/NotificationsManager.php:271
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s ha commentato il messaggio di %s"
+
+#: src/Core/NotificationsManager.php:270
+#, php-format
+msgid "%s created a new post"
+msgstr "%s a creato un nuovo messaggio"
+
+#: src/Core/NotificationsManager.php:284
+#, php-format
+msgid "%s liked %s's post"
+msgstr "a %s è piaciuto il messaggio di %s"
+
+#: src/Core/NotificationsManager.php:297
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "a %s non è piaciuto il messaggio di %s"
+
+#: src/Core/NotificationsManager.php:310
+#, php-format
+msgid "%s is attending %s's event"
+msgstr "%s partecipa all'evento di %s"
+
+#: src/Core/NotificationsManager.php:323
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr "%s non partecipa all'evento di %s"
+
+#: src/Core/NotificationsManager.php:336
+#, php-format
+msgid "%s may attend %s's event"
+msgstr "%s potrebbe partecipare all'evento di %s"
+
+#: src/Core/NotificationsManager.php:353
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s è ora amico di %s"
+
+#: src/Core/NotificationsManager.php:619
+msgid "Friend Suggestion"
+msgstr "Amico suggerito"
+
+#: src/Core/NotificationsManager.php:649
+msgid "Friend/Connect Request"
+msgstr "Richiesta amicizia/connessione"
+
+#: src/Core/NotificationsManager.php:649
+msgid "New Follower"
+msgstr "Qualcuno inizia a seguirti"
+
+#: src/Core/UserImport.php:99
+msgid "Error decoding account file"
+msgstr "Errore decodificando il file account"
+
+#: src/Core/UserImport.php:105
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Errore! Nessuna informazione di versione nel file! Potrebbe non essere un file account di Friendica?"
+
+#: src/Core/UserImport.php:113
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "L'utente '%s' esiste già su questo server!"
+
+#: src/Core/UserImport.php:146
+msgid "User creation error"
+msgstr "Errore creando l'utente"
+
+#: src/Core/UserImport.php:164
+msgid "User profile creation error"
+msgstr "Errore creando il profilo dell'utente"
+
+#: src/Core/UserImport.php:208
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "%d contatto non importato"
+msgstr[1] "%d contatti non importati"
+
+#: src/Core/UserImport.php:273
+msgid "Done. You can now login with your username and password"
+msgstr "Fatto. Ora puoi entrare con il tuo nome utente e la tua password"
+
+#: src/Util/Temporal.php:147 src/Model/Profile.php:754
 msgid "Birthday:"
 msgstr "Compleanno:"
 
@@ -8067,44 +8131,36 @@ msgstr "secondi"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s fa"
 
-#: src/Content/Text/BBCode.php:416
+#: src/Content/Text/BBCode.php:423
 msgid "view full size"
 msgstr "vedi a schermo intero"
 
-#: src/Content/Text/BBCode.php:842 src/Content/Text/BBCode.php:1611
-#: src/Content/Text/BBCode.php:1612
+#: src/Content/Text/BBCode.php:853 src/Content/Text/BBCode.php:1629
+#: src/Content/Text/BBCode.php:1630
 msgid "Image/photo"
 msgstr "Immagine/foto"
 
-#: src/Content/Text/BBCode.php:980
+#: 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"
 
-#: src/Content/Text/BBCode.php:1538 src/Content/Text/BBCode.php:1560
+#: src/Content/Text/BBCode.php:1556 src/Content/Text/BBCode.php:1578
 msgid "$1 wrote:"
 msgstr "$1 ha scritto:"
 
-#: src/Content/Text/BBCode.php:1620 src/Content/Text/BBCode.php:1621
+#: src/Content/Text/BBCode.php:1638 src/Content/Text/BBCode.php:1639
 msgid "Encrypted content"
 msgstr "Contenuto criptato"
 
-#: src/Content/Text/BBCode.php:1740
+#: src/Content/Text/BBCode.php:1758
 msgid "Invalid source protocol"
 msgstr "Protocollo sorgente non valido"
 
-#: src/Content/Text/BBCode.php:1751
+#: src/Content/Text/BBCode.php:1769
 msgid "Invalid link protocol"
 msgstr "Protocollo link non valido"
 
-#: src/Content/OEmbed.php:253
-msgid "Embedding disabled"
-msgstr "Embed disabilitato"
-
-#: src/Content/OEmbed.php:373
-msgid "Embedded content"
-msgstr "Contenuto incorporato"
-
 #: src/Content/Widget/CalendarExport.php:61
 msgid "Export"
 msgstr "Esporta"
@@ -8117,360 +8173,6 @@ msgstr "Esporta il calendario in formato ical"
 msgid "Export calendar as csv"
 msgstr "Esporta il calendario in formato csv"
 
-#: src/Content/ContactSelector.php:55
-msgid "Frequently"
-msgstr "Frequentemente"
-
-#: src/Content/ContactSelector.php:56
-msgid "Hourly"
-msgstr "Ogni ora"
-
-#: src/Content/ContactSelector.php:57
-msgid "Twice daily"
-msgstr "Due volte al dì"
-
-#: src/Content/ContactSelector.php:58
-msgid "Daily"
-msgstr "Giornalmente"
-
-#: src/Content/ContactSelector.php:59
-msgid "Weekly"
-msgstr "Settimanalmente"
-
-#: src/Content/ContactSelector.php:60
-msgid "Monthly"
-msgstr "Mensilmente"
-
-#: 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 "Twitter"
-
-#: src/Content/ContactSelector.php:92
-msgid "Diaspora Connector"
-msgstr "Connettore Diaspora"
-
-#: src/Content/ContactSelector.php:93
-msgid "GNU Social Connector"
-msgstr "Connettore GNU Social"
-
-#: src/Content/ContactSelector.php:94
-msgid "pnut"
-msgstr "pnut"
-
-#: src/Content/ContactSelector.php:95
-msgid "App.net"
-msgstr "App.net"
-
-#: src/Content/ContactSelector.php:125
-msgid "Male"
-msgstr "Maschio"
-
-#: src/Content/ContactSelector.php:125
-msgid "Female"
-msgstr "Femmina"
-
-#: src/Content/ContactSelector.php:125
-msgid "Currently Male"
-msgstr "Al momento maschio"
-
-#: src/Content/ContactSelector.php:125
-msgid "Currently Female"
-msgstr "Al momento femmina"
-
-#: src/Content/ContactSelector.php:125
-msgid "Mostly Male"
-msgstr "Prevalentemente maschio"
-
-#: src/Content/ContactSelector.php:125
-msgid "Mostly Female"
-msgstr "Prevalentemente femmina"
-
-#: src/Content/ContactSelector.php:125
-msgid "Transgender"
-msgstr "Transgender"
-
-#: src/Content/ContactSelector.php:125
-msgid "Intersex"
-msgstr "Intersex"
-
-#: src/Content/ContactSelector.php:125
-msgid "Transsexual"
-msgstr "Transessuale"
-
-#: src/Content/ContactSelector.php:125
-msgid "Hermaphrodite"
-msgstr "Ermafrodito"
-
-#: src/Content/ContactSelector.php:125
-msgid "Neuter"
-msgstr "Neutro"
-
-#: src/Content/ContactSelector.php:125
-msgid "Non-specific"
-msgstr "Non specificato"
-
-#: src/Content/ContactSelector.php:125
-msgid "Other"
-msgstr "Altro"
-
-#: src/Content/ContactSelector.php:147
-msgid "Males"
-msgstr "Maschi"
-
-#: src/Content/ContactSelector.php:147
-msgid "Females"
-msgstr "Femmine"
-
-#: src/Content/ContactSelector.php:147
-msgid "Gay"
-msgstr "Gay"
-
-#: src/Content/ContactSelector.php:147
-msgid "Lesbian"
-msgstr "Lesbica"
-
-#: src/Content/ContactSelector.php:147
-msgid "No Preference"
-msgstr "Nessuna preferenza"
-
-#: src/Content/ContactSelector.php:147
-msgid "Bisexual"
-msgstr "Bisessuale"
-
-#: src/Content/ContactSelector.php:147
-msgid "Autosexual"
-msgstr "Autosessuale"
-
-#: src/Content/ContactSelector.php:147
-msgid "Abstinent"
-msgstr "Astinente"
-
-#: src/Content/ContactSelector.php:147
-msgid "Virgin"
-msgstr "Vergine"
-
-#: src/Content/ContactSelector.php:147
-msgid "Deviant"
-msgstr "Deviato"
-
-#: src/Content/ContactSelector.php:147
-msgid "Fetish"
-msgstr "Fetish"
-
-#: src/Content/ContactSelector.php:147
-msgid "Oodles"
-msgstr "Un sacco"
-
-#: src/Content/ContactSelector.php:147
-msgid "Nonsexual"
-msgstr "Asessuato"
-
-#: src/Content/ContactSelector.php:169
-msgid "Single"
-msgstr "Single"
-
-#: src/Content/ContactSelector.php:169
-msgid "Lonely"
-msgstr "Solitario"
-
-#: src/Content/ContactSelector.php:169
-msgid "Available"
-msgstr "Disponibile"
-
-#: src/Content/ContactSelector.php:169
-msgid "Unavailable"
-msgstr "Non disponibile"
-
-#: src/Content/ContactSelector.php:169
-msgid "Has crush"
-msgstr "è cotto/a"
-
-#: src/Content/ContactSelector.php:169
-msgid "Infatuated"
-msgstr "infatuato/a"
-
-#: src/Content/ContactSelector.php:169
-msgid "Dating"
-msgstr "Disponibile a un incontro"
-
-#: src/Content/ContactSelector.php:169
-msgid "Unfaithful"
-msgstr "Infedele"
-
-#: src/Content/ContactSelector.php:169
-msgid "Sex Addict"
-msgstr "Sesso-dipendente"
-
-#: src/Content/ContactSelector.php:169 src/Model/User.php:519
-msgid "Friends"
-msgstr "Amici"
-
-#: src/Content/ContactSelector.php:169
-msgid "Friends/Benefits"
-msgstr "Amici con benefici"
-
-#: src/Content/ContactSelector.php:169
-msgid "Casual"
-msgstr "Casual"
-
-#: src/Content/ContactSelector.php:169
-msgid "Engaged"
-msgstr "Impegnato"
-
-#: src/Content/ContactSelector.php:169
-msgid "Married"
-msgstr "Sposato"
-
-#: src/Content/ContactSelector.php:169
-msgid "Imaginarily married"
-msgstr "immaginariamente sposato/a"
-
-#: src/Content/ContactSelector.php:169
-msgid "Partners"
-msgstr "Partners"
-
-#: src/Content/ContactSelector.php:169
-msgid "Cohabiting"
-msgstr "Coinquilino"
-
-#: src/Content/ContactSelector.php:169
-msgid "Common law"
-msgstr "diritto comune"
-
-#: src/Content/ContactSelector.php:169
-msgid "Happy"
-msgstr "Felice"
-
-#: src/Content/ContactSelector.php:169
-msgid "Not looking"
-msgstr "Non guarda"
-
-#: src/Content/ContactSelector.php:169
-msgid "Swinger"
-msgstr "Scambista"
-
-#: src/Content/ContactSelector.php:169
-msgid "Betrayed"
-msgstr "Tradito"
-
-#: src/Content/ContactSelector.php:169
-msgid "Separated"
-msgstr "Separato"
-
-#: src/Content/ContactSelector.php:169
-msgid "Unstable"
-msgstr "Instabile"
-
-#: src/Content/ContactSelector.php:169
-msgid "Divorced"
-msgstr "Divorziato"
-
-#: src/Content/ContactSelector.php:169
-msgid "Imaginarily divorced"
-msgstr "immaginariamente divorziato/a"
-
-#: src/Content/ContactSelector.php:169
-msgid "Widowed"
-msgstr "Vedovo"
-
-#: src/Content/ContactSelector.php:169
-msgid "Uncertain"
-msgstr "Incerto"
-
-#: src/Content/ContactSelector.php:169
-msgid "It's complicated"
-msgstr "E' complicato"
-
-#: src/Content/ContactSelector.php:169
-msgid "Don't care"
-msgstr "Non interessa"
-
-#: src/Content/ContactSelector.php:169
-msgid "Ask me"
-msgstr "Chiedimelo"
-
-#: src/Content/Widget.php:33
-msgid "Add New Contact"
-msgstr "Aggiungi nuovo contatto"
-
-#: src/Content/Widget.php:34
-msgid "Enter address or web location"
-msgstr "Inserisci posizione o indirizzo web"
-
-#: src/Content/Widget.php:35
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr "Esempio: bob@example.com, http://example.com/barbara"
-
-#: src/Content/Widget.php:53
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d invito disponibile"
-msgstr[1] "%d inviti disponibili"
-
-#: src/Content/Widget.php:164
-msgid "Networks"
-msgstr "Reti"
-
-#: src/Content/Widget.php:167
-msgid "All Networks"
-msgstr "Tutte le Reti"
-
-#: src/Content/Widget.php:205 src/Content/Feature.php:118
-msgid "Saved Folders"
-msgstr "Cartelle Salvate"
-
-#: src/Content/Widget.php:208 src/Content/Widget.php:248
-msgid "Everything"
-msgstr "Tutto"
-
-#: src/Content/Widget.php:245
-msgid "Categories"
-msgstr "Categorie"
-
-#: src/Content/Widget.php:312
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] "%d contatto in comune"
-msgstr[1] "%d contatti in comune"
-
 #: src/Content/Feature.php:79
 msgid "General Features"
 msgstr "Funzionalità generali"
@@ -8622,6 +8324,10 @@ msgstr "Categorie post"
 msgid "Add categories to your posts"
 msgstr "Aggiungi categorie ai tuoi post"
 
+#: src/Content/Feature.php:118 src/Content/Widget.php:204
+msgid "Saved Folders"
+msgstr "Cartelle Salvate"
+
 #: src/Content/Feature.php:118
 msgid "Ability to file posts under folders"
 msgstr "Permette di archiviare i post in cartelle"
@@ -8674,6 +8380,314 @@ msgstr "Mostra la Data di Registrazione"
 msgid "Display membership date in profile"
 msgstr "Mostra la data in cui ti sei registrato nel profilo"
 
+#: src/Content/ContactSelector.php:53
+msgid "Frequently"
+msgstr "Frequentemente"
+
+#: src/Content/ContactSelector.php:54
+msgid "Hourly"
+msgstr "Ogni ora"
+
+#: src/Content/ContactSelector.php:55
+msgid "Twice daily"
+msgstr "Due volte al dì"
+
+#: src/Content/ContactSelector.php:56
+msgid "Daily"
+msgstr "Giornalmente"
+
+#: src/Content/ContactSelector.php:57
+msgid "Weekly"
+msgstr "Settimanalmente"
+
+#: src/Content/ContactSelector.php:58
+msgid "Monthly"
+msgstr "Mensilmente"
+
+#: 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/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 "Twitter"
+
+#: src/Content/ContactSelector.php:90
+msgid "Diaspora Connector"
+msgstr "Connettore Diaspora"
+
+#: src/Content/ContactSelector.php:91
+msgid "GNU Social Connector"
+msgstr "Connettore GNU Social"
+
+#: 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 "Maschio"
+
+#: src/Content/ContactSelector.php:123
+msgid "Female"
+msgstr "Femmina"
+
+#: src/Content/ContactSelector.php:123
+msgid "Currently Male"
+msgstr "Al momento maschio"
+
+#: src/Content/ContactSelector.php:123
+msgid "Currently Female"
+msgstr "Al momento femmina"
+
+#: src/Content/ContactSelector.php:123
+msgid "Mostly Male"
+msgstr "Prevalentemente maschio"
+
+#: src/Content/ContactSelector.php:123
+msgid "Mostly Female"
+msgstr "Prevalentemente femmina"
+
+#: 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 "Transessuale"
+
+#: src/Content/ContactSelector.php:123
+msgid "Hermaphrodite"
+msgstr "Ermafrodito"
+
+#: src/Content/ContactSelector.php:123
+msgid "Neuter"
+msgstr "Neutro"
+
+#: src/Content/ContactSelector.php:123
+msgid "Non-specific"
+msgstr "Non specificato"
+
+#: src/Content/ContactSelector.php:123
+msgid "Other"
+msgstr "Altro"
+
+#: src/Content/ContactSelector.php:145
+msgid "Males"
+msgstr "Maschi"
+
+#: src/Content/ContactSelector.php:145
+msgid "Females"
+msgstr "Femmine"
+
+#: src/Content/ContactSelector.php:145
+msgid "Gay"
+msgstr "Gay"
+
+#: src/Content/ContactSelector.php:145
+msgid "Lesbian"
+msgstr "Lesbica"
+
+#: src/Content/ContactSelector.php:145
+msgid "No Preference"
+msgstr "Nessuna preferenza"
+
+#: src/Content/ContactSelector.php:145
+msgid "Bisexual"
+msgstr "Bisessuale"
+
+#: src/Content/ContactSelector.php:145
+msgid "Autosexual"
+msgstr "Autosessuale"
+
+#: src/Content/ContactSelector.php:145
+msgid "Abstinent"
+msgstr "Astinente"
+
+#: src/Content/ContactSelector.php:145
+msgid "Virgin"
+msgstr "Vergine"
+
+#: src/Content/ContactSelector.php:145
+msgid "Deviant"
+msgstr "Deviato"
+
+#: src/Content/ContactSelector.php:145
+msgid "Fetish"
+msgstr "Fetish"
+
+#: src/Content/ContactSelector.php:145
+msgid "Oodles"
+msgstr "Un sacco"
+
+#: src/Content/ContactSelector.php:145
+msgid "Nonsexual"
+msgstr "Asessuato"
+
+#: src/Content/ContactSelector.php:167
+msgid "Single"
+msgstr "Single"
+
+#: src/Content/ContactSelector.php:167
+msgid "Lonely"
+msgstr "Solitario"
+
+#: src/Content/ContactSelector.php:167
+msgid "Available"
+msgstr "Disponibile"
+
+#: src/Content/ContactSelector.php:167
+msgid "Unavailable"
+msgstr "Non disponibile"
+
+#: src/Content/ContactSelector.php:167
+msgid "Has crush"
+msgstr "è cotto/a"
+
+#: src/Content/ContactSelector.php:167
+msgid "Infatuated"
+msgstr "infatuato/a"
+
+#: src/Content/ContactSelector.php:167
+msgid "Dating"
+msgstr "Disponibile a un incontro"
+
+#: src/Content/ContactSelector.php:167
+msgid "Unfaithful"
+msgstr "Infedele"
+
+#: src/Content/ContactSelector.php:167
+msgid "Sex Addict"
+msgstr "Sesso-dipendente"
+
+#: src/Content/ContactSelector.php:167 src/Model/User.php:558
+msgid "Friends"
+msgstr "Amici"
+
+#: src/Content/ContactSelector.php:167
+msgid "Friends/Benefits"
+msgstr "Amici con benefici"
+
+#: src/Content/ContactSelector.php:167
+msgid "Casual"
+msgstr "Casual"
+
+#: src/Content/ContactSelector.php:167
+msgid "Engaged"
+msgstr "Impegnato"
+
+#: src/Content/ContactSelector.php:167
+msgid "Married"
+msgstr "Sposato"
+
+#: src/Content/ContactSelector.php:167
+msgid "Imaginarily married"
+msgstr "immaginariamente sposato/a"
+
+#: src/Content/ContactSelector.php:167
+msgid "Partners"
+msgstr "Partners"
+
+#: src/Content/ContactSelector.php:167
+msgid "Cohabiting"
+msgstr "Coinquilino"
+
+#: src/Content/ContactSelector.php:167
+msgid "Common law"
+msgstr "diritto comune"
+
+#: src/Content/ContactSelector.php:167
+msgid "Happy"
+msgstr "Felice"
+
+#: src/Content/ContactSelector.php:167
+msgid "Not looking"
+msgstr "Non guarda"
+
+#: src/Content/ContactSelector.php:167
+msgid "Swinger"
+msgstr "Scambista"
+
+#: src/Content/ContactSelector.php:167
+msgid "Betrayed"
+msgstr "Tradito"
+
+#: src/Content/ContactSelector.php:167
+msgid "Separated"
+msgstr "Separato"
+
+#: src/Content/ContactSelector.php:167
+msgid "Unstable"
+msgstr "Instabile"
+
+#: src/Content/ContactSelector.php:167
+msgid "Divorced"
+msgstr "Divorziato"
+
+#: src/Content/ContactSelector.php:167
+msgid "Imaginarily divorced"
+msgstr "immaginariamente divorziato/a"
+
+#: src/Content/ContactSelector.php:167
+msgid "Widowed"
+msgstr "Vedovo"
+
+#: src/Content/ContactSelector.php:167
+msgid "Uncertain"
+msgstr "Incerto"
+
+#: src/Content/ContactSelector.php:167
+msgid "It's complicated"
+msgstr "E' complicato"
+
+#: src/Content/ContactSelector.php:167
+msgid "Don't care"
+msgstr "Non interessa"
+
+#: src/Content/ContactSelector.php:167
+msgid "Ask me"
+msgstr "Chiedimelo"
+
 #: src/Content/Nav.php:53
 msgid "Nothing new here"
 msgstr "Niente di nuovo qui"
@@ -8778,10 +8792,6 @@ msgstr "Gestisci"
 msgid "Manage other pages"
 msgstr "Gestisci altre pagine"
 
-#: src/Content/Nav.php:210 src/Model/Profile.php:368
-msgid "Profiles"
-msgstr "Profili"
-
 #: src/Content/Nav.php:210
 msgid "Manage/Edit Profiles"
 msgstr "Gestisci/Modifica i profili"
@@ -8798,11 +8808,61 @@ msgstr "Navigazione"
 msgid "Site map"
 msgstr "Mappa del sito"
 
-#: src/Database/DBStructure.php:32
+#: src/Content/OEmbed.php:256
+msgid "Embedding disabled"
+msgstr "Embed disabilitato"
+
+#: src/Content/OEmbed.php:376
+msgid "Embedded content"
+msgstr "Contenuto incorporato"
+
+#: src/Content/Widget.php:32
+msgid "Add New Contact"
+msgstr "Aggiungi nuovo contatto"
+
+#: src/Content/Widget.php:33
+msgid "Enter address or web location"
+msgstr "Inserisci posizione o indirizzo web"
+
+#: src/Content/Widget.php:34
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Esempio: bob@example.com, http://example.com/barbara"
+
+#: src/Content/Widget.php:52
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invito disponibile"
+msgstr[1] "%d inviti disponibili"
+
+#: src/Content/Widget.php:163
+msgid "Networks"
+msgstr "Reti"
+
+#: src/Content/Widget.php:166
+msgid "All Networks"
+msgstr "Tutte le Reti"
+
+#: src/Content/Widget.php:207 src/Content/Widget.php:247
+msgid "Everything"
+msgstr "Tutto"
+
+#: src/Content/Widget.php:244
+msgid "Categories"
+msgstr "Categorie"
+
+#: src/Content/Widget.php:311
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] "%d contatto in comune"
+msgstr[1] "%d contatti in comune"
+
+#: src/Database/DBStructure.php:33
 msgid "There are no tables on MyISAM."
 msgstr "Non ci sono tabelle MyISAM"
 
-#: src/Database/DBStructure.php:75
+#: src/Database/DBStructure.php:76
 #, php-format
 msgid ""
 "\n"
@@ -8812,14 +8872,14 @@ msgid ""
 "\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."
 msgstr "\nGli sviluppatori di Friendica hanno rilasciato l'aggiornamento %s\nrecentemente, ma quando ho provato a installarlo, qualcosa è \nandato terribilmente storto.\nBisogna sistemare le cose e non posso farlo da solo.\nContatta uno sviluppatore se non sei in grado di aiutarmi. Il mio database potrebbe essere invalido."
 
-#: src/Database/DBStructure.php:80
+#: src/Database/DBStructure.php:81
 #, php-format
 msgid ""
 "The error message is\n"
 "[pre]%s[/pre]"
 msgstr "Il messaggio di errore è\n[pre]%s[/pre]"
 
-#: src/Database/DBStructure.php:191
+#: src/Database/DBStructure.php:192
 #, php-format
 msgid ""
 "\n"
@@ -8827,109 +8887,184 @@ msgid ""
 "%s\n"
 msgstr "\nErrore %d durante l'aggiornamento del database:\n%s\n"
 
-#: src/Database/DBStructure.php:194
+#: src/Database/DBStructure.php:195
 msgid "Errors encountered performing database changes: "
 msgstr "Errori riscontrati eseguendo le modifiche al database:"
 
-#: src/Database/DBStructure.php:210
+#: src/Database/DBStructure.php:211
 #, php-format
 msgid "%s: Database update"
 msgstr "%s: Aggiornamento database"
 
-#: src/Database/DBStructure.php:460
+#: src/Database/DBStructure.php:473
 #, php-format
 msgid "%s: updating %s table."
 msgstr "%s: aggiornando la tabella %s."
 
-#: src/Model/Mail.php:40 src/Model/Mail.php:174
-msgid "[no subject]"
-msgstr "[nessun oggetto]"
+#: src/Model/Contact.php:733
+msgid "Drop Contact"
+msgstr "Rimuovi contatto"
 
-#: src/Model/Event.php:53 src/Model/Event.php:70 src/Model/Event.php:419
-#: src/Model/Event.php:882
+#: src/Model/Contact.php:1155
+msgid "Organisation"
+msgstr "Organizzazione"
+
+#: src/Model/Contact.php:1159
+msgid "News"
+msgstr "Notizie"
+
+#: src/Model/Contact.php:1163
+msgid "Forum"
+msgstr "Forum"
+
+#: src/Model/Contact.php:1343
+msgid "Connect URL missing."
+msgstr "URL di connessione mancante."
+
+#: 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 "Il contatto non puo' essere aggiunto. Controlla le credenziali della rete nella tua pagina Impostazioni -> Reti Sociali"
+
+#: src/Model/Contact.php:1399
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Questo sito non è configurato per permettere la comunicazione con altri network."
+
+#: src/Model/Contact.php:1400 src/Model/Contact.php:1414
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "Non sono stati trovati protocolli di comunicazione o feed compatibili."
+
+#: src/Model/Contact.php:1412
+msgid "The profile address specified does not provide adequate information."
+msgstr "L'indirizzo del profilo specificato non fornisce adeguate informazioni."
+
+#: src/Model/Contact.php:1417
+msgid "An author or name was not found."
+msgstr "Non è stato trovato un nome o un autore"
+
+#: src/Model/Contact.php:1420
+msgid "No browser URL could be matched to this address."
+msgstr "Nessun URL può essere associato a questo indirizzo."
+
+#: src/Model/Contact.php:1423
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr "Impossibile l'indirizzo identità con un protocollo conosciuto o con un contatto email."
+
+#: src/Model/Contact.php:1424
+msgid "Use mailto: in front of address to force email check."
+msgstr "Usa \"mailto:\" davanti all'indirizzo per forzare un controllo nelle email."
+
+#: src/Model/Contact.php:1430
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "L'indirizzo del profilo specificato appartiene a un network che è stato disabilitato su questo sito."
+
+#: src/Model/Contact.php:1435
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Profilo limitato. Questa persona non sarà in grado di ricevere notifiche personali da te."
+
+#: src/Model/Contact.php:1486
+msgid "Unable to retrieve contact information."
+msgstr "Impossibile recuperare informazioni sul contatto."
+
+#: src/Model/Contact.php:1716 src/Protocol/DFRN.php:1496
+#, php-format
+msgid "%s's birthday"
+msgstr "Compleanno di %s"
+
+#: src/Model/Contact.php:1717 src/Protocol/DFRN.php:1497
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "Buon compleanno %s"
+
+#: src/Model/Event.php:59 src/Model/Event.php:76 src/Model/Event.php:428
+#: src/Model/Event.php:894
 msgid "Starts:"
 msgstr "Inizia:"
 
-#: src/Model/Event.php:56 src/Model/Event.php:76 src/Model/Event.php:420
-#: src/Model/Event.php:886
+#: src/Model/Event.php:62 src/Model/Event.php:82 src/Model/Event.php:429
+#: src/Model/Event.php:898
 msgid "Finishes:"
 msgstr "Finisce:"
 
-#: src/Model/Event.php:368
+#: src/Model/Event.php:377
 msgid "all-day"
 msgstr "tutto il giorno"
 
-#: src/Model/Event.php:391
+#: src/Model/Event.php:400
 msgid "Jun"
 msgstr "Giu"
 
-#: src/Model/Event.php:394
+#: src/Model/Event.php:403
 msgid "Sept"
 msgstr "Set"
 
-#: src/Model/Event.php:417
+#: src/Model/Event.php:426
 msgid "No events to display"
 msgstr "Nessun evento da mostrare"
 
-#: src/Model/Event.php:543
+#: src/Model/Event.php:550
 msgid "l, F j"
 msgstr "l j F"
 
-#: src/Model/Event.php:566
+#: src/Model/Event.php:578
 msgid "Edit event"
 msgstr "Modifica l'evento"
 
-#: src/Model/Event.php:567
+#: src/Model/Event.php:579
 msgid "Duplicate event"
 msgstr "Duplica evento"
 
-#: src/Model/Event.php:568
+#: src/Model/Event.php:580
 msgid "Delete event"
 msgstr "Elimina evento"
 
-#: src/Model/Event.php:815
+#: src/Model/Event.php:827
 msgid "D g:i A"
 msgstr "D G:i"
 
-#: src/Model/Event.php:816
+#: src/Model/Event.php:828
 msgid "g:i A"
 msgstr "G:i"
 
-#: src/Model/Event.php:901 src/Model/Event.php:903
+#: src/Model/Event.php:913 src/Model/Event.php:915
 msgid "Show map"
 msgstr "Mostra mappa"
 
-#: src/Model/Event.php:902
+#: src/Model/Event.php:914
 msgid "Hide map"
 msgstr "Nascondi mappa"
 
-#: src/Model/Group.php:44
+#: 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 "Un gruppo eliminato con questo nome è stato ricreato. I permessi  esistenti su un elemento <strong>possono</strong> essere applicati a questo gruppo e tutti i membri futuri. Se questo non è ciò che si intende, si prega di creare un altro gruppo con un nome diverso."
 
-#: src/Model/Group.php:341
+#: src/Model/Group.php:340
 msgid "Default privacy group for new contacts"
 msgstr "Gruppo predefinito per i nuovi contatti"
 
-#: src/Model/Group.php:374
+#: src/Model/Group.php:373
 msgid "Everybody"
 msgstr "Tutti"
 
-#: src/Model/Group.php:394
+#: src/Model/Group.php:393
 msgid "edit"
 msgstr "modifica"
 
-#: src/Model/Group.php:418
+#: src/Model/Group.php:417
 msgid "Edit group"
 msgstr "Modifica gruppo"
 
-#: src/Model/Group.php:419
-msgid "Contacts not in any group"
-msgstr "Contatti in nessun gruppo."
-
 #: src/Model/Group.php:420
 msgid "Create a new group"
 msgstr "Crea un nuovo gruppo"
@@ -8938,212 +9073,102 @@ msgstr "Crea un nuovo gruppo"
 msgid "Edit groups"
 msgstr "Modifica gruppi"
 
-#: src/Model/Profile.php:97
-msgid "Requested account is not available."
-msgstr "L'account richiesto non è disponibile."
+#: src/Model/Mail.php:39 src/Model/Mail.php:173
+msgid "[no subject]"
+msgstr "[nessun oggetto]"
 
-#: src/Model/Profile.php:164 src/Model/Profile.php:395
-#: src/Model/Profile.php:857
-msgid "Edit profile"
-msgstr "Modifica il profilo"
-
-#: src/Model/Profile.php:332
-msgid "Atom feed"
-msgstr "Feed Atom"
-
-#: src/Model/Profile.php:368
-msgid "Manage/edit profiles"
-msgstr "Gestisci/modifica i profili"
-
-#: 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 "d F"
-
-#: src/Model/Profile.php:604 src/Model/Profile.php:701
-msgid "[today]"
-msgstr "[oggi]"
-
-#: src/Model/Profile.php:615
-msgid "Birthday Reminders"
-msgstr "Promemoria compleanni"
-
-#: src/Model/Profile.php:616
-msgid "Birthdays this week:"
-msgstr "Compleanni questa settimana:"
-
-#: src/Model/Profile.php:688
-msgid "[No description]"
-msgstr "[Nessuna descrizione]"
-
-#: src/Model/Profile.php:715
-msgid "Event Reminders"
-msgstr "Promemoria"
-
-#: src/Model/Profile.php:716
-msgid "Events this week:"
-msgstr "Eventi di questa settimana:"
-
-#: src/Model/Profile.php:739
-msgid "Member since:"
-msgstr "Membro dal:"
-
-#: 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 "Età:"
-
-#: src/Model/Profile.php:776
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "per %1$d %2$s"
-
-#: src/Model/Profile.php:800
-msgid "Religion:"
-msgstr "Religione:"
-
-#: src/Model/Profile.php:808
-msgid "Hobbies/Interests:"
-msgstr "Hobby/Interessi:"
-
-#: src/Model/Profile.php:820
-msgid "Contact information and Social Networks:"
-msgstr "Informazioni su contatti e social network:"
-
-#: src/Model/Profile.php:824
-msgid "Musical interests:"
-msgstr "Interessi musicali:"
-
-#: src/Model/Profile.php:828
-msgid "Books, literature:"
-msgstr "Libri, letteratura:"
-
-#: src/Model/Profile.php:832
-msgid "Television:"
-msgstr "Televisione:"
-
-#: src/Model/Profile.php:836
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/danza/cultura/intrattenimento:"
-
-#: src/Model/Profile.php:840
-msgid "Love/Romance:"
-msgstr "Amore:"
-
-#: src/Model/Profile.php:844
-msgid "Work/employment:"
-msgstr "Lavoro:"
-
-#: src/Model/Profile.php:848
-msgid "School/education:"
-msgstr "Scuola:"
-
-#: src/Model/Profile.php:853
-msgid "Forums:"
-msgstr "Forum:"
-
-#: src/Model/Profile.php:947
-msgid "Only You Can See This"
-msgstr "Solo tu puoi vedere questo"
-
-#: src/Model/User.php:154
+#: src/Model/User.php:165
 msgid "Login failed"
 msgstr "Accesso fallito."
 
-#: src/Model/User.php:185
+#: src/Model/User.php:196
 msgid "Not enough information to authenticate"
 msgstr "Informazioni insufficienti per l'autenticazione"
 
-#: src/Model/User.php:346
+#: src/Model/User.php:381
 msgid "An invitation is required."
 msgstr "E' richiesto un invito."
 
-#: src/Model/User.php:350
+#: src/Model/User.php:385
 msgid "Invitation could not be verified."
 msgstr "L'invito non puo' essere verificato."
 
-#: src/Model/User.php:357
+#: src/Model/User.php:392
 msgid "Invalid OpenID url"
 msgstr "Url OpenID non valido"
 
-#: src/Model/User.php:370 src/Module/Login.php:101
+#: 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 "Abbiamo incontrato un problema mentre contattavamo il server OpenID che ci hai fornito. Controlla di averlo scritto giusto."
 
-#: src/Model/User.php:370 src/Module/Login.php:101
+#: src/Model/User.php:405 src/Module/Login.php:100
 msgid "The error message was:"
 msgstr "Il messaggio riportato era:"
 
-#: src/Model/User.php:376
+#: src/Model/User.php:411
 msgid "Please enter the required information."
 msgstr "Inserisci le informazioni richieste."
 
-#: src/Model/User.php:389
+#: src/Model/User.php:424
 msgid "Please use a shorter name."
 msgstr "Usa un nome più corto."
 
-#: src/Model/User.php:392
+#: src/Model/User.php:427
 msgid "Name too short."
 msgstr "Il nome è troppo corto."
 
-#: src/Model/User.php:400
+#: src/Model/User.php:435
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr "Questo non sembra essere il tuo nome completo (Nome Cognome)."
 
-#: src/Model/User.php:405
+#: src/Model/User.php:440
 msgid "Your email domain is not among those allowed on this site."
 msgstr "Il dominio della tua email non è tra quelli autorizzati su questo sito."
 
-#: src/Model/User.php:409
+#: src/Model/User.php:444
 msgid "Not a valid email address."
 msgstr "L'indirizzo email non è valido."
 
-#: src/Model/User.php:413 src/Model/User.php:421
+#: src/Model/User.php:447
+msgid "The nickname was blocked from registration by the nodes admin."
+msgstr "Il nome utente non è utilizzabile in registrazione, per impostazione dell'amministratore del nodo."
+
+#: src/Model/User.php:451 src/Model/User.php:459
 msgid "Cannot use that email."
 msgstr "Non puoi usare quell'email."
 
-#: src/Model/User.php:428
+#: src/Model/User.php:466
 msgid "Your nickname can only contain a-z, 0-9 and _."
 msgstr "Il tuo nome utente può contenere solo a-z, 0-9 e _."
 
-#: src/Model/User.php:435 src/Model/User.php:491
+#: src/Model/User.php:473 src/Model/User.php:530
 msgid "Nickname is already registered. Please choose another."
 msgstr "Nome utente già registrato. Scegline un altro."
 
-#: src/Model/User.php:445
+#: src/Model/User.php:483
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr "ERRORE GRAVE: La generazione delle chiavi di sicurezza è fallita."
 
-#: src/Model/User.php:478 src/Model/User.php:482
+#: src/Model/User.php:517 src/Model/User.php:521
 msgid "An error occurred during registration. Please try again."
 msgstr "C'è stato un errore durante la registrazione. Prova ancora."
 
-#: src/Model/User.php:507
+#: src/Model/User.php:546
 msgid "An error occurred creating your default profile. Please try again."
 msgstr "C'è stato un errore nella creazione del tuo profilo. Prova ancora."
 
-#: src/Model/User.php:514
+#: src/Model/User.php:553
 msgid "An error occurred creating your self contact. Please try again."
 msgstr "C'è stato un errore nella creazione del tuo contatto. Prova ancora."
 
-#: src/Model/User.php:523
+#: src/Model/User.php:562
 msgid ""
 "An error occurred creating your default contact group. Please try again."
 msgstr "C'è stato un errore nella creazione del tuo gruppo contatti di default. Prova ancora."
 
-#: src/Model/User.php:597
+#: src/Model/User.php:636
 #, php-format
 msgid ""
 "\n"
@@ -9152,12 +9177,12 @@ msgid ""
 "\t\t"
 msgstr "\nGentile %1$s,\n\tGrazie per la tua registrazione su %2$s. Il tuo account è in attesa di approvazione da parte di un amministratore.\n\t"
 
-#: src/Model/User.php:607
+#: src/Model/User.php:646
 #, php-format
 msgid "Registration at %s"
 msgstr "Registrazione su %s"
 
-#: src/Model/User.php:625
+#: src/Model/User.php:664
 #, php-format
 msgid ""
 "\n"
@@ -9166,7 +9191,7 @@ msgid ""
 "\t\t"
 msgstr "\nGentile %1$s,\n\tGrazie per esserti registrato su %2$s. Il tuo account è stato creato.\n\t"
 
-#: src/Model/User.php:629
+#: src/Model/User.php:668
 #, php-format
 msgid ""
 "\n"
@@ -9198,131 +9223,160 @@ msgid ""
 "\t\t\tThank you and welcome to %2$s."
 msgstr "\nI dettagli del tuo utente sono:\n    Indirizzo del sito: %3$s\n    Nome utente:%1$s \n    Password:%5$s \n\nPuoi cambiare la tua password dalla pagina delle impostazioni del tuo account dopo esserti autenticato.\n\nPer favore, prenditi qualche momento per esaminare tutte le impostazioni presenti.\n\nPotresti voler aggiungere qualche informazione di base al tuo profilo predefinito (nella pagina \"Profili\"), così che le altre persone possano trovarti più facilmente.\n\nTi raccomandiamo di inserire il tuo nome completo, aggiungere una foto, aggiungere qualche parola chiave del profilo (molto utili per trovare nuovi contatti), e magari in quale nazione vivi, se non vuoi essere più specifico di così.\n\nNoi rispettiamo appieno la tua privacy, e nessuna di queste informazioni è necessaria o obbligatoria.\nSe sei nuovo e non conosci nessuno qui, possono aiutarti a trovare qualche nuovo e interessante contatto.\n\n\t\t\tSe mai vorrai cancellare il tuo account, lo potrai fare su %3$s/removeme\n\nGrazie e benvenuto su %2$s"
 
-#: src/Model/Contact.php:667
-msgid "Drop Contact"
-msgstr "Rimuovi contatto"
+#: src/Model/Profile.php:96
+msgid "Requested account is not available."
+msgstr "L'account richiesto non è disponibile."
 
-#: src/Model/Contact.php:1101
-msgid "Organisation"
-msgstr "Organizzazione"
+#: src/Model/Profile.php:164 src/Model/Profile.php:397
+#: src/Model/Profile.php:855
+msgid "Edit profile"
+msgstr "Modifica il profilo"
 
-#: src/Model/Contact.php:1104
-msgid "News"
-msgstr "Notizie"
+#: src/Model/Profile.php:334
+msgid "Atom feed"
+msgstr "Feed Atom"
 
-#: src/Model/Contact.php:1107
-msgid "Forum"
-msgstr "Forum"
+#: src/Model/Profile.php:370
+msgid "Manage/edit profiles"
+msgstr "Gestisci/modifica i profili"
 
-#: src/Model/Contact.php:1286
-msgid "Connect URL missing."
-msgstr "URL di connessione mancante."
+#: src/Model/Profile.php:548 src/Model/Profile.php:637
+msgid "g A l F d"
+msgstr "g A l d F"
 
-#: 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 "Il contatto non puo' essere aggiunto. Controlla le credenziali della rete nella tua pagina Impostazioni -> Reti Sociali"
+#: src/Model/Profile.php:549
+msgid "F d"
+msgstr "d F"
 
-#: src/Model/Contact.php:1342
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "Questo sito non è configurato per permettere la comunicazione con altri network."
+#: src/Model/Profile.php:602 src/Model/Profile.php:699
+msgid "[today]"
+msgstr "[oggi]"
 
-#: src/Model/Contact.php:1343 src/Model/Contact.php:1357
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "Non sono stati trovati protocolli di comunicazione o feed compatibili."
+#: src/Model/Profile.php:613
+msgid "Birthday Reminders"
+msgstr "Promemoria compleanni"
 
-#: src/Model/Contact.php:1355
-msgid "The profile address specified does not provide adequate information."
-msgstr "L'indirizzo del profilo specificato non fornisce adeguate informazioni."
+#: src/Model/Profile.php:614
+msgid "Birthdays this week:"
+msgstr "Compleanni questa settimana:"
 
-#: src/Model/Contact.php:1360
-msgid "An author or name was not found."
-msgstr "Non è stato trovato un nome o un autore"
+#: src/Model/Profile.php:686
+msgid "[No description]"
+msgstr "[Nessuna descrizione]"
 
-#: src/Model/Contact.php:1363
-msgid "No browser URL could be matched to this address."
-msgstr "Nessun URL può essere associato a questo indirizzo."
+#: src/Model/Profile.php:713
+msgid "Event Reminders"
+msgstr "Promemoria"
 
-#: src/Model/Contact.php:1366
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr "Impossibile l'indirizzo identità con un protocollo conosciuto o con un contatto email."
+#: src/Model/Profile.php:714
+msgid "Upcoming events the next 7 days:"
+msgstr "Eventi dei prossimi 7 giorni:"
 
-#: src/Model/Contact.php:1367
-msgid "Use mailto: in front of address to force email check."
-msgstr "Usa \"mailto:\" davanti all'indirizzo per forzare un controllo nelle email."
+#: src/Model/Profile.php:737
+msgid "Member since:"
+msgstr "Membro dal:"
 
-#: src/Model/Contact.php:1373
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr "L'indirizzo del profilo specificato appartiene a un network che è stato disabilitato su questo sito."
+#: src/Model/Profile.php:745
+msgid "j F, Y"
+msgstr "j F Y"
 
-#: src/Model/Contact.php:1378
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr "Profilo limitato. Questa persona non sarà in grado di ricevere notifiche personali da te."
+#: src/Model/Profile.php:746
+msgid "j F"
+msgstr "j F"
 
-#: src/Model/Contact.php:1429
-msgid "Unable to retrieve contact information."
-msgstr "Impossibile recuperare informazioni sul contatto."
+#: src/Model/Profile.php:761
+msgid "Age:"
+msgstr "Età:"
 
-#: src/Model/Contact.php:1646 src/Protocol/DFRN.php:1513
+#: src/Model/Profile.php:774
 #, php-format
-msgid "%s's birthday"
-msgstr "Compleanno di %s"
+msgid "for %1$d %2$s"
+msgstr "per %1$d %2$s"
 
-#: src/Model/Contact.php:1647 src/Protocol/DFRN.php:1514
+#: src/Model/Profile.php:798
+msgid "Religion:"
+msgstr "Religione:"
+
+#: src/Model/Profile.php:806
+msgid "Hobbies/Interests:"
+msgstr "Hobby/Interessi:"
+
+#: src/Model/Profile.php:818
+msgid "Contact information and Social Networks:"
+msgstr "Informazioni su contatti e social network:"
+
+#: src/Model/Profile.php:822
+msgid "Musical interests:"
+msgstr "Interessi musicali:"
+
+#: src/Model/Profile.php:826
+msgid "Books, literature:"
+msgstr "Libri, letteratura:"
+
+#: src/Model/Profile.php:830
+msgid "Television:"
+msgstr "Televisione:"
+
+#: src/Model/Profile.php:834
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/danza/cultura/intrattenimento:"
+
+#: src/Model/Profile.php:838
+msgid "Love/Romance:"
+msgstr "Amore:"
+
+#: src/Model/Profile.php:842
+msgid "Work/employment:"
+msgstr "Lavoro:"
+
+#: src/Model/Profile.php:846
+msgid "School/education:"
+msgstr "Scuola:"
+
+#: src/Model/Profile.php:851
+msgid "Forums:"
+msgstr "Forum:"
+
+#: src/Model/Profile.php:945
+msgid "Only You Can See This"
+msgstr "Solo tu puoi vedere questo"
+
+#: src/Model/Profile.php:953 src/Model/Profile.php:956
+msgid "Tips for New Members"
+msgstr "Consigli per i Nuovi Utenti"
+
+#: src/Model/Profile.php:1115
 #, php-format
-msgid "Happy Birthday %s"
-msgstr "Buon compleanno %s"
+msgid "OpenWebAuth: %1$s welcomes %2$s"
+msgstr "OpenWebAuth: %1$s da il benvenuto a %2$s"
 
-#: src/Model/Item.php:1851
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$s parteciperà a %3$s di %2$s"
+#: src/Protocol/Diaspora.php:2449
+msgid "Sharing notification from Diaspora network"
+msgstr "Notifica di condivisione dal network Diaspora*"
 
-#: src/Model/Item.php:1856
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$s non parteciperà a %3$s di %2$s"
+#: src/Protocol/Diaspora.php:3545
+msgid "Attachments:"
+msgstr "Allegati:"
 
-#: src/Model/Item.php:1861
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s forse parteciperà a %3$s di %2$s"
-
-#: src/Protocol/OStatus.php:1799
+#: src/Protocol/OStatus.php:1816
 #, php-format
 msgid "%s is now following %s."
 msgstr "%s sta seguendo %s"
 
-#: src/Protocol/OStatus.php:1800
+#: src/Protocol/OStatus.php:1817
 msgid "following"
 msgstr "segue"
 
-#: src/Protocol/OStatus.php:1803
+#: src/Protocol/OStatus.php:1820
 #, php-format
 msgid "%s stopped following %s."
 msgstr "%s ha smesso di seguire %s"
 
-#: src/Protocol/OStatus.php:1804
+#: src/Protocol/OStatus.php:1821
 msgid "stopped following"
 msgstr "tolto dai seguiti"
 
-#: src/Protocol/Diaspora.php:2521
-msgid "Sharing notification from Diaspora network"
-msgstr "Notifica di condivisione dal network Diaspora*"
-
-#: src/Protocol/Diaspora.php:3609
-msgid "Attachments:"
-msgstr "Allegati:"
-
-#: src/Worker/Delivery.php:415
+#: src/Worker/Delivery.php:439
 msgid "(no subject)"
 msgstr "(nessun oggetto)"
 
@@ -9330,42 +9384,6 @@ msgstr "(nessun oggetto)"
 msgid "Logged out."
 msgstr "Uscita effettuata."
 
-#: src/Module/Login.php:283
-msgid "Create a New Account"
-msgstr "Crea un nuovo account"
-
-#: src/Module/Login.php:316
-msgid "Password: "
-msgstr "Password: "
-
-#: src/Module/Login.php:317
-msgid "Remember me"
-msgstr "Ricordati di me"
-
-#: src/Module/Login.php:320
-msgid "Or login using OpenID: "
-msgstr "O entra con OpenID:"
-
-#: src/Module/Login.php:326
-msgid "Forgot your password?"
-msgstr "Hai dimenticato la password?"
-
-#: src/Module/Login.php:329
-msgid "Website Terms of Service"
-msgstr "Condizioni di servizio del sito web "
-
-#: src/Module/Login.php:330
-msgid "terms of service"
-msgstr "condizioni del servizio"
-
-#: src/Module/Login.php:332
-msgid "Website Privacy Policy"
-msgstr "Politiche di privacy del sito"
-
-#: src/Module/Login.php:333
-msgid "privacy policy"
-msgstr "politiche di privacy"
-
 #: src/Module/Tos.php:34 src/Module/Tos.php:74
 msgid ""
 "At the time of registration, and for providing communications between the "
@@ -9401,155 +9419,200 @@ msgstr "In qualsiasi momento un utente autenticato può esportare i dati del suo
 msgid "Privacy Statement"
 msgstr "Note sulla Privacy"
 
-#: src/Object/Post.php:128
+#: src/Module/Login.php:282
+msgid "Create a New Account"
+msgstr "Crea un nuovo account"
+
+#: src/Module/Login.php:315
+msgid "Password: "
+msgstr "Password: "
+
+#: src/Module/Login.php:316
+msgid "Remember me"
+msgstr "Ricordati di me"
+
+#: src/Module/Login.php:319
+msgid "Or login using OpenID: "
+msgstr "O entra con OpenID:"
+
+#: src/Module/Login.php:325
+msgid "Forgot your password?"
+msgstr "Hai dimenticato la password?"
+
+#: src/Module/Login.php:328
+msgid "Website Terms of Service"
+msgstr "Condizioni di servizio del sito web "
+
+#: src/Module/Login.php:329
+msgid "terms of service"
+msgstr "condizioni del servizio"
+
+#: src/Module/Login.php:331
+msgid "Website Privacy Policy"
+msgstr "Politiche di privacy del sito"
+
+#: src/Module/Login.php:332
+msgid "privacy policy"
+msgstr "politiche di privacy"
+
+#: src/Object/Post.php:129
 msgid "This entry was edited"
 msgstr "Questa voce è stata modificata"
 
-#: src/Object/Post.php:187
-msgid "Remove from your stream"
-msgstr "Rimuovi dal tuo stream"
+#: src/Object/Post.php:189
+msgid "Delete globally"
+msgstr "Rimuovi globalmente"
 
-#: src/Object/Post.php:200
+#: src/Object/Post.php:189
+msgid "Remove locally"
+msgstr "Rimuovi localmente"
+
+#: src/Object/Post.php:202
 msgid "save to folder"
 msgstr "salva nella cartella"
 
-#: src/Object/Post.php:243
+#: src/Object/Post.php:231
 msgid "I will attend"
 msgstr "Parteciperò"
 
-#: src/Object/Post.php:243
+#: src/Object/Post.php:231
 msgid "I will not attend"
 msgstr "Non parteciperò"
 
-#: src/Object/Post.php:243
+#: src/Object/Post.php:231
 msgid "I might attend"
 msgstr "Forse parteciperò"
 
-#: src/Object/Post.php:271
+#: src/Object/Post.php:259
 msgid "add star"
 msgstr "aggiungi a speciali"
 
-#: src/Object/Post.php:272
+#: src/Object/Post.php:260
 msgid "remove star"
 msgstr "rimuovi da speciali"
 
-#: src/Object/Post.php:273
+#: src/Object/Post.php:261
 msgid "toggle star status"
 msgstr "Inverti stato preferito"
 
-#: src/Object/Post.php:276
+#: src/Object/Post.php:264
 msgid "starred"
 msgstr "preferito"
 
-#: src/Object/Post.php:282
+#: src/Object/Post.php:270
 msgid "ignore thread"
 msgstr "ignora la discussione"
 
-#: src/Object/Post.php:283
+#: src/Object/Post.php:271
 msgid "unignore thread"
 msgstr "non ignorare la discussione"
 
-#: src/Object/Post.php:284
+#: src/Object/Post.php:272
 msgid "toggle ignore status"
 msgstr "inverti stato \"Ignora\""
 
-#: src/Object/Post.php:293
+#: src/Object/Post.php:281
 msgid "add tag"
 msgstr "aggiungi tag"
 
-#: src/Object/Post.php:304
+#: src/Object/Post.php:292
 msgid "like"
 msgstr "mi piace"
 
-#: src/Object/Post.php:305
+#: src/Object/Post.php:293
 msgid "dislike"
 msgstr "non mi piace"
 
-#: src/Object/Post.php:308
+#: src/Object/Post.php:296
 msgid "Share this"
 msgstr "Condividi questo"
 
-#: src/Object/Post.php:308
+#: src/Object/Post.php:296
 msgid "share"
 msgstr "condividi"
 
-#: src/Object/Post.php:373
+#: src/Object/Post.php:363
 msgid "to"
 msgstr "a"
 
-#: src/Object/Post.php:374
+#: src/Object/Post.php:364
 msgid "via"
 msgstr "via"
 
-#: src/Object/Post.php:375
+#: src/Object/Post.php:365
 msgid "Wall-to-Wall"
 msgstr "Da bacheca a bacheca"
 
-#: src/Object/Post.php:376
+#: src/Object/Post.php:366
 msgid "via Wall-To-Wall:"
 msgstr "da bacheca a bacheca"
 
-#: src/Object/Post.php:435
+#: src/Object/Post.php:425
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d commento"
 msgstr[1] "%d commenti"
 
-#: src/Object/Post.php:805
+#: src/Object/Post.php:795
 msgid "Bold"
 msgstr "Grassetto"
 
-#: src/Object/Post.php:806
+#: src/Object/Post.php:796
 msgid "Italic"
 msgstr "Corsivo"
 
-#: src/Object/Post.php:807
+#: src/Object/Post.php:797
 msgid "Underline"
 msgstr "Sottolineato"
 
-#: src/Object/Post.php:808
+#: src/Object/Post.php:798
 msgid "Quote"
 msgstr "Citazione"
 
-#: src/Object/Post.php:809
+#: src/Object/Post.php:799
 msgid "Code"
 msgstr "Codice"
 
-#: src/Object/Post.php:810
+#: src/Object/Post.php:800
 msgid "Image"
 msgstr "Immagine"
 
-#: src/Object/Post.php:811
+#: src/Object/Post.php:801
 msgid "Link"
 msgstr "Link"
 
-#: src/Object/Post.php:812
+#: src/Object/Post.php:802
 msgid "Video"
 msgstr "Video"
 
-#: src/App.php:524
+#: src/App.php:783
 msgid "Delete this item?"
 msgstr "Cancellare questo elemento?"
 
-#: src/App.php:526
+#: src/App.php:785
 msgid "show fewer"
 msgstr "mostra di meno"
 
-#: src/App.php:1114
+#: src/App.php:1383
 msgid "No system theme config value set."
 msgstr "Nessun tema di sistema impostato."
 
-#: index.php:464
-msgid "toggle mobile"
-msgstr "commuta tema mobile"
+#: boot.php:686
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr "aggiornamento %s fallito. Guarda i log di errore."
 
-#: update.php:193
+#: update.php:194
 #, php-format
 msgid "%s: Updating author-id and owner-id in item and thread table. "
 msgstr "%s: Aggiornamento author-id e owner-id nelle tabelle item e thread"
 
-#: boot.php:796
+#: update.php:240
 #, php-format
-msgid "Update %s failed. See error logs."
-msgstr "aggiornamento %s fallito. Guarda i log di errore."
+msgid "%s: Updating post-type."
+msgstr "%s: Aggiorno tipo messaggio."
+
+#: index.php:460
+msgid "toggle mobile"
+msgstr "commuta tema mobile"
diff --git a/view/lang/it/strings.php b/view/lang/it/strings.php
index 1bac05348..0f5bbfbc6 100644
--- a/view/lang/it/strings.php
+++ b/view/lang/it/strings.php
@@ -6,70 +6,6 @@ function string_plural_select_it($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Friendica Notification"] = "Notifica Friendica";
-$a->strings["Thank You,"] = "Grazie,";
-$a->strings["%s Administrator"] = "Amministratore %s";
-$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s,  amministratore di %2\$s";
-$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Notifica] Nuovo messaggio privato ricevuto su %s";
-$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s ti ha inviato un nuovo messaggio privato su %2\$s.";
-$a->strings["a private message"] = "un messaggio privato";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s ti ha inviato %2\$s";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "Visita %s per vedere e/o rispondere ai tuoi messaggi privati.";
-$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s ha commentato [url=%2\$s]%3\$s[/url]";
-$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s ha commentato [url=%2\$s]%4\$s di %3\$s[/url]";
-$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s ha commentato un [url=%2\$s]tuo %3\$s[/url]";
-$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Notifica] Commento di %2\$s alla conversazione #%1\$d";
-$a->strings["%s commented on an item/conversation you have been following."] = "%s ha commentato un elemento che stavi seguendo.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Visita %s per vedere e/o commentare la conversazione";
-$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notifica] %s ha scritto sulla tua bacheca";
-$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s ha scritto sulla tua bacheca su %2\$s";
-$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s ha inviato un messaggio sulla [url=%2\$s]tua bacheca[/url]";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notifica] %s ti ha taggato";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s ti ha taggato su %2\$s";
-$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]ti ha taggato[/url].";
-$a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Notifica] %s ha condiviso un nuovo messaggio";
-$a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s ha condiviso un nuovo messaggio su %2\$s";
-$a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]ha condiviso un messaggio[/url].";
-$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notifica] %1\$s ti ha stuzzicato";
-$a->strings["%1\$s poked you at %2\$s"] = "%1\$s ti ha stuzzicato su %2\$s";
-$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]ti ha stuzzicato[/url].";
-$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notifica] %s ha taggato un tuo messaggio";
-$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s ha taggato il tuo post su %2\$s";
-$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s ha taggato [url=%2\$s]il tuo post[/url]";
-$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Notifica] Hai ricevuto una presentazione";
-$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Hai ricevuto un'introduzione da '%1\$s' su %2\$s";
-$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Hai ricevuto [url=%1\$s]un'introduzione[/url] da %2\$s.";
-$a->strings["You may visit their profile at %s"] = "Puoi visitare il suo profilo presso %s";
-$a->strings["Please visit %s to approve or reject the introduction."] = "Visita %s per approvare o rifiutare la presentazione.";
-$a->strings["[Friendica:Notify] A new person is sharing with you"] = "[Friendica:Notifica] Una nuova persona sta condividendo con te";
-$a->strings["%1\$s is sharing with you at %2\$s"] = "%1\$s sta condividendo con te su %2\$s";
-$a->strings["[Friendica:Notify] You have a new follower"] = "[Friendica:Notifica] Una nuova persona ti segue";
-$a->strings["You have a new follower at %2\$s : %1\$s"] = "Un nuovo utente ha iniziato a seguirti su %2\$s : %1\$s";
-$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Notifica] Hai ricevuto un suggerimento di amicizia";
-$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Hai ricevuto un suggerimento di amicizia da '%1\$s' su %2\$s";
-$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Hai ricevuto [url=%1\$s]un suggerimento di amicizia[/url] per %2\$s su %3\$s";
-$a->strings["Name:"] = "Nome:";
-$a->strings["Photo:"] = "Foto:";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "Visita %s per approvare o rifiutare il suggerimento.";
-$a->strings["[Friendica:Notify] Connection accepted"] = "[Friendica:Notifica] Connessione accettata";
-$a->strings["'%1\$s' has accepted your connection request at %2\$s"] = "'%1\$s' ha accettato la tua richiesta di connessione su %2\$s";
-$a->strings["%2\$s has accepted your [url=%1\$s]connection request[/url]."] = "%2\$s ha accettato la tua [url=%1\$s]richiesta di connessione[/url]";
-$a->strings["You are now mutual friends and may exchange status updates, photos, and email without restriction."] = "Ora siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto e messaggi privati senza restrizioni.";
-$a->strings["Please visit %s if you wish to make any changes to this relationship."] = "Visita %s se vuoi modificare questa relazione.";
-$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' ha scelto di accettarti come \"fan\", il che limita alcune forme di comunicazione, come i messaggi privati, e alcune possibilità di interazione col profilo. Se è una pagina di una comunità o di una celebrità, queste impostazioni sono state applicate automaticamente.";
-$a->strings["'%1\$s' may choose to extend this into a two-way or more permissive relationship in the future."] = "'%1\$s' può scegliere di estendere questa relazione in una relazione più permissiva in futuro.";
-$a->strings["Please visit %s  if you wish to make any changes to this relationship."] = "Visita %s se desideri modificare questo collegamento.";
-$a->strings["[Friendica System Notify]"] = "[Notifica di Sistema di Friendica]";
-$a->strings["registration request"] = "richiesta di registrazione";
-$a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Hai ricevuto una richiesta di registrazione da '%1\$s' su %2\$s";
-$a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Hai ricevuto una [url=%1\$s]richiesta di registrazione[/url] da %2\$s.";
-$a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"] = "Nome completo: %1\$s\nIndirizzo del sito: %2\$s\nNome utente: %3\$s (%4\$s)";
-$a->strings["Please visit %s to approve or reject the request."] = "Visita %s per approvare o rifiutare la richiesta.";
-$a->strings["Welcome "] = "Ciao";
-$a->strings["Please upload a profile photo."] = "Carica una foto per il profilo.";
-$a->strings["Welcome back "] = "Ciao ";
-$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."] = "Il token di sicurezza della form non era corretto. Probabilmente la form è rimasta aperta troppo a lungo (più di tre ore) prima di inviarla.";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'";
 $a->strings["Daily posting limit of %d post reached. The post was rejected."] = [
 	0 => "Limite giornaliero di %d messaggio raggiunto. Il messaggio è stato rifiutato",
 	1 => "Limite giornaliero di %d messaggi raggiunto. Il messaggio è stato rifiutato.",
@@ -190,12 +126,75 @@ $a->strings["Undecided"] = [
 	0 => "Indeciso",
 	1 => "Indecisi",
 ];
+$a->strings["Friendica Notification"] = "Notifica Friendica";
+$a->strings["Thank You,"] = "Grazie,";
+$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s,  amministratore di %2\$s";
+$a->strings["%s Administrator"] = "Amministratore %s";
+$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Notifica] Nuovo messaggio privato ricevuto su %s";
+$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s ti ha inviato un nuovo messaggio privato su %2\$s.";
+$a->strings["a private message"] = "un messaggio privato";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s ti ha inviato %2\$s";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Visita %s per vedere e/o rispondere ai tuoi messaggi privati.";
+$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s ha commentato [url=%2\$s]%3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s ha commentato [url=%2\$s]%4\$s di %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s ha commentato un [url=%2\$s]tuo %3\$s[/url]";
+$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Notifica] Commento di %2\$s alla conversazione #%1\$d";
+$a->strings["%s commented on an item/conversation you have been following."] = "%s ha commentato un elemento che stavi seguendo.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Visita %s per vedere e/o commentare la conversazione";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Notifica] %s ha scritto sulla tua bacheca";
+$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s ha scritto sulla tua bacheca su %2\$s";
+$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s ha inviato un messaggio sulla [url=%2\$s]tua bacheca[/url]";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notifica] %s ti ha taggato";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s ti ha taggato su %2\$s";
+$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]ti ha taggato[/url].";
+$a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Notifica] %s ha condiviso un nuovo messaggio";
+$a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s ha condiviso un nuovo messaggio su %2\$s";
+$a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]ha condiviso un messaggio[/url].";
+$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notifica] %1\$s ti ha stuzzicato";
+$a->strings["%1\$s poked you at %2\$s"] = "%1\$s ti ha stuzzicato su %2\$s";
+$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]ti ha stuzzicato[/url].";
+$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notifica] %s ha taggato un tuo messaggio";
+$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s ha taggato il tuo post su %2\$s";
+$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s ha taggato [url=%2\$s]il tuo post[/url]";
+$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Notifica] Hai ricevuto una presentazione";
+$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Hai ricevuto un'introduzione da '%1\$s' su %2\$s";
+$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Hai ricevuto [url=%1\$s]un'introduzione[/url] da %2\$s.";
+$a->strings["You may visit their profile at %s"] = "Puoi visitare il suo profilo presso %s";
+$a->strings["Please visit %s to approve or reject the introduction."] = "Visita %s per approvare o rifiutare la presentazione.";
+$a->strings["[Friendica:Notify] A new person is sharing with you"] = "[Friendica:Notifica] Una nuova persona sta condividendo con te";
+$a->strings["%1\$s is sharing with you at %2\$s"] = "%1\$s sta condividendo con te su %2\$s";
+$a->strings["[Friendica:Notify] You have a new follower"] = "[Friendica:Notifica] Una nuova persona ti segue";
+$a->strings["You have a new follower at %2\$s : %1\$s"] = "Un nuovo utente ha iniziato a seguirti su %2\$s : %1\$s";
+$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Notifica] Hai ricevuto un suggerimento di amicizia";
+$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Hai ricevuto un suggerimento di amicizia da '%1\$s' su %2\$s";
+$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Hai ricevuto [url=%1\$s]un suggerimento di amicizia[/url] per %2\$s su %3\$s";
+$a->strings["Name:"] = "Nome:";
+$a->strings["Photo:"] = "Foto:";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Visita %s per approvare o rifiutare il suggerimento.";
+$a->strings["[Friendica:Notify] Connection accepted"] = "[Friendica:Notifica] Connessione accettata";
+$a->strings["'%1\$s' has accepted your connection request at %2\$s"] = "'%1\$s' ha accettato la tua richiesta di connessione su %2\$s";
+$a->strings["%2\$s has accepted your [url=%1\$s]connection request[/url]."] = "%2\$s ha accettato la tua [url=%1\$s]richiesta di connessione[/url]";
+$a->strings["You are now mutual friends and may exchange status updates, photos, and email without restriction."] = "Ora siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto e messaggi privati senza restrizioni.";
+$a->strings["Please visit %s if you wish to make any changes to this relationship."] = "Visita %s se vuoi modificare questa relazione.";
+$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' ha scelto di accettarti come \"fan\", il che limita alcune forme di comunicazione, come i messaggi privati, e alcune possibilità di interazione col profilo. Se è una pagina di una comunità o di una celebrità, queste impostazioni sono state applicate automaticamente.";
+$a->strings["'%1\$s' may choose to extend this into a two-way or more permissive relationship in the future."] = "'%1\$s' può scegliere di estendere questa relazione in una relazione più permissiva in futuro.";
+$a->strings["Please visit %s  if you wish to make any changes to this relationship."] = "Visita %s se desideri modificare questo collegamento.";
+$a->strings["[Friendica System Notify]"] = "[Notifica di Sistema di Friendica]";
+$a->strings["registration request"] = "richiesta di registrazione";
+$a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Hai ricevuto una richiesta di registrazione da '%1\$s' su %2\$s";
+$a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Hai ricevuto una [url=%1\$s]richiesta di registrazione[/url] da %2\$s.";
+$a->strings["Full Name:\t%s\nSite Location:\t%s\nLogin Name:\t%s (%s)"] = "Nome Completo:\t%s\nIndirizzo del sito:\t%s\nNome utente:\t%s (%s)";
+$a->strings["Please visit %s to approve or reject the request."] = "Visita %s per approvare o rifiutare la richiesta.";
 $a->strings["Item not found."] = "Elemento non trovato.";
 $a->strings["Do you really want to delete this item?"] = "Vuoi veramente cancellare questo elemento?";
 $a->strings["Yes"] = "Si";
 $a->strings["Permission denied."] = "Permesso negato.";
 $a->strings["Archives"] = "Archivi";
 $a->strings["show more"] = "mostra di più";
+$a->strings["Welcome "] = "Ciao";
+$a->strings["Please upload a profile photo."] = "Carica una foto per il profilo.";
+$a->strings["Welcome back "] = "Ciao ";
+$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."] = "Il token di sicurezza della form non era corretto. Probabilmente la form è rimasta aperta troppo a lungo (più di tre ore) prima di inviarla.";
 $a->strings["newer"] = "nuovi";
 $a->strings["older"] = "vecchi";
 $a->strings["first"] = "primo";
@@ -280,31 +279,11 @@ $a->strings["comment"] = [
 ];
 $a->strings["post"] = "messaggio";
 $a->strings["Item filed"] = "Messaggio salvato";
-$a->strings["No friends to display."] = "Nessun amico da visualizzare.";
-$a->strings["Connect"] = "Connetti";
-$a->strings["Authorize application connection"] = "Autorizza la connessione dell'applicazione";
-$a->strings["Return to your app and insert this Securty Code:"] = "Torna alla tua applicazione e inserisci questo codice di sicurezza:";
-$a->strings["Please login to continue."] = "Effettua il login per continuare.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vuoi autorizzare questa applicazione per accedere ai messaggi e ai contatti, e / o creare nuovi messaggi per te?";
-$a->strings["No"] = "No";
 $a->strings["You must be logged in to use addons. "] = "Devi aver effettuato il login per usare i componenti aggiuntivi.";
 $a->strings["Applications"] = "Applicazioni";
 $a->strings["No installed applications."] = "Nessuna applicazione installata.";
-$a->strings["Item not available."] = "Oggetto non disponibile.";
-$a->strings["Item was not found."] = "Oggetto non trovato.";
-$a->strings["No contacts in common."] = "Nessun contatto in comune.";
-$a->strings["Common Friends"] = "Amici in comune";
 $a->strings["Credits"] = "Crediti";
 $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 è un progetto comunitario, che non sarebbe stato possibile realizzare senza l'aiuto di molte persone.\nQuesta è una lista di chi ha contribuito al codice o alle traduzioni di Friendica. Grazie a tutti!";
-$a->strings["Photos"] = "Foto";
-$a->strings["Contact Photos"] = "Foto dei contatti";
-$a->strings["Upload"] = "Carica";
-$a->strings["Files"] = "File";
-$a->strings["Not Found"] = "Non trovato";
-$a->strings["No profile"] = "Nessun profilo";
-$a->strings["Welcome to %s"] = "Benvenuto su %s";
-$a->strings["Remote privacy information not available."] = "Informazioni remote sulla privacy non disponibili.";
-$a->strings["Visible to:"] = "Visibile a:";
 $a->strings["System down for maintenance"] = "Sistema in manutenzione";
 $a->strings["Welcome to Friendica"] = "Benvenuto su Friendica";
 $a->strings["New Member Checklist"] = "Cose da fare per i Nuovi Utenti";
@@ -340,41 +319,6 @@ $a->strings["Friendica respects your privacy. By default, your posts will only s
 $a->strings["Getting Help"] = "Ottenere Aiuto";
 $a->strings["Go to the Help Section"] = "Vai alla sezione Guida";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Le nostre pagine della <strong>guida</strong> possono essere consultate per avere dettagli su altre caratteristiche del programma e altre risorse.";
-$a->strings["Visit %s's profile [%s]"] = "Visita il profilo di %s [%s]";
-$a->strings["Edit contact"] = "Modifica contatto";
-$a->strings["Contacts who are not members of a group"] = "Contatti che non sono membri di un gruppo";
-$a->strings["Not Extended"] = "Not Extended";
-$a->strings["Resubscribing to OStatus contacts"] = "Risottoscrivi i contatti OStatus";
-$a->strings["Error"] = "Errore";
-$a->strings["Done"] = "Fatto";
-$a->strings["Keep this window open until done."] = "Tieni questa finestra aperta fino a che ha finito.";
-$a->strings["Do you really want to delete this suggestion?"] = "Vuoi veramente cancellare questo suggerimento?";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Nessun suggerimento disponibile. Se questo è un sito nuovo, riprova tra 24 ore.";
-$a->strings["Ignore/Hide"] = "Ignora / Nascondi";
-$a->strings["Friend Suggestions"] = "Contatti suggeriti";
-$a->strings["[Embedded content - reload page to view]"] = "[Contenuto incorporato - ricarica la pagina per visualizzarlo correttamente]";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Questo sito ha superato il numero di registrazioni giornaliere consentite. Prova di nuovo domani.";
-$a->strings["Import"] = "Importa";
-$a->strings["Move account"] = "Muovi account";
-$a->strings["You can import an account from another Friendica server."] = "Puoi importare un account da un altro 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."] = "Devi esportare il tuo account dal vecchio server e caricarlo qui. Noi ricreeremo il tuo vecchio account qui, con tutti i tuoi contatti. Proveremo anche a informare i tuoi amici che ti sei spostato qui.";
-$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Questa funzione è sperimentale. Non possiamo importare i contatti dalla rete OStatus (GNU Social/Statusnet) o da Diaspora";
-$a->strings["Account file"] = "File account";
-$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Per esportare il tuo account, vai su \"Impostazioni -> Esporta i tuoi dati personali\" e seleziona \"Esporta account\"";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "Nessuna parola chiave per l'abbinamento. Aggiungi parole chiave al tuo profilo predefinito.";
-$a->strings["is interested in:"] = "è interessato a:";
-$a->strings["Profile Match"] = "Profili corrispondenti";
-$a->strings["No matches"] = "Nessun risultato";
-$a->strings["Manage Identities and/or Pages"] = "Gestisci identità e/o pagine";
-$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Cambia tra differenti identità o pagine comunità/gruppi che condividono il tuo account o per cui hai i permessi di gestione";
-$a->strings["Select an identity to manage: "] = "Seleziona un'identità da gestire:";
-$a->strings["Submit"] = "Invia";
-$a->strings["Invalid request."] = "Richiesta non valida.";
-$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Mi spiace, forse il file che stai caricando è più grosso di quanto la configurazione di PHP permetta";
-$a->strings["Or - did you try to upload an empty file?"] = "O.. non avrai provato a caricare un file vuoto?";
-$a->strings["File exceeds size limit of %s"] = "Il file supera la dimensione massima di %s";
-$a->strings["File upload failed."] = "Caricamento del file non riuscito.";
-$a->strings["- select -"] = "- seleziona -";
 $a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
 $a->strings["Time Conversion"] = "Conversione Ora";
 $a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fornisce questo servizio per la condivisione di eventi con altre reti e amici in fusi orari sconosciuti.";
@@ -382,344 +326,18 @@ $a->strings["UTC time: %s"] = "Ora UTC: %s";
 $a->strings["Current timezone: %s"] = "Fuso orario corrente: %s";
 $a->strings["Converted localtime: %s"] = "Ora locale convertita: %s";
 $a->strings["Please select your timezone:"] = "Selezionare il tuo fuso orario:";
-$a->strings["No more system notifications."] = "Nessuna nuova notifica di sistema.";
-$a->strings["System Notifications"] = "Notifiche di sistema";
-$a->strings["{0} wants to be your friend"] = "{0} vuole essere tuo amico";
-$a->strings["{0} sent you a message"] = "{0} ti ha inviato un messaggio";
-$a->strings["{0} requested registration"] = "{0} chiede la registrazione";
-$a->strings["Poke/Prod"] = "Tocca/Pungola";
-$a->strings["poke, prod or do other things to somebody"] = "tocca, pungola o fai altre cose a qualcuno";
-$a->strings["Recipient"] = "Destinatario";
-$a->strings["Choose what you wish to do to recipient"] = "Scegli cosa vuoi fare al destinatario";
-$a->strings["Make this post private"] = "Rendi questo post privato";
+$a->strings["Submit"] = "Invia";
 $a->strings["Public access denied."] = "Accesso negato.";
 $a->strings["Only logged in users are permitted to perform a probing."] = "Solo agli utenti loggati è permesso effettuare un probe.";
-$a->strings["Permission denied"] = "Permesso negato";
-$a->strings["Invalid profile identifier."] = "Identificativo del profilo non valido.";
-$a->strings["Profile Visibility Editor"] = "Modifica visibilità del profilo";
-$a->strings["Click on a contact to add or remove."] = "Clicca su un contatto per aggiungerlo o rimuoverlo.";
-$a->strings["Visible To"] = "Visibile a";
-$a->strings["All Contacts (with secure profile access)"] = "Tutti i contatti (con profilo ad accesso sicuro)";
-$a->strings["Account approved."] = "Account approvato.";
-$a->strings["Registration revoked for %s"] = "Registrazione revocata per %s";
-$a->strings["Please login."] = "Accedi.";
-$a->strings["Remove term"] = "Rimuovi termine";
-$a->strings["Saved Searches"] = "Ricerche salvate";
-$a->strings["Only logged in users are permitted to perform a search."] = "Solo agli utenti autenticati è permesso eseguire ricerche.";
-$a->strings["Too Many Requests"] = "Troppe richieste";
-$a->strings["Only one search per minute is permitted for not logged in users."] = "Solo una ricerca al minuto è permessa agli utenti non autenticati.";
-$a->strings["No results."] = "Nessun risultato.";
-$a->strings["Items tagged with: %s"] = "Elementi taggati con: %s";
-$a->strings["Results for: %s"] = "Risultati per: %s";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s sta seguendo %3\$s di %2\$s";
-$a->strings["Tag removed"] = "Tag rimosso";
-$a->strings["Remove Item Tag"] = "Rimuovi il tag";
-$a->strings["Select a tag to remove: "] = "Seleziona un tag da rimuovere: ";
-$a->strings["Remove"] = "Rimuovi";
-$a->strings["Export account"] = "Esporta 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."] = "Esporta le informazioni del tuo account e dei contatti. Usa questa funzione per fare un backup del tuo account o per spostarlo in un altro server.";
-$a->strings["Export all"] = "Esporta tutto";
-$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)"] = "Esporta le informazioni del tuo account, i tuoi contatti e tutti i tuoi elementi in json. Può diventare un file veramente molto grosso e metterci un sacco di tempo. Usa questa funzione per fare un backup completo del tuo account (le foto non sono esportate)";
-$a->strings["Export personal data"] = "Esporta dati personali";
-$a->strings["No contacts."] = "Nessun contatto.";
-$a->strings["Access denied."] = "Accesso negato.";
-$a->strings["Image exceeds size limit of %s"] = "La dimensione dell'immagine supera il limite di %s";
-$a->strings["Unable to process image."] = "Impossibile caricare l'immagine.";
-$a->strings["Wall Photos"] = "Foto della bacheca";
-$a->strings["Image upload failed."] = "Caricamento immagine fallito.";
-$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Numero giornaliero di messaggi per %s superato. Invio fallito.";
-$a->strings["No recipient selected."] = "Nessun destinatario selezionato.";
-$a->strings["Unable to check your home location."] = "Impossibile controllare la tua posizione di origine.";
-$a->strings["Message could not be sent."] = "Il messaggio non può essere inviato.";
-$a->strings["Message collection failure."] = "Errore recuperando il messaggio.";
-$a->strings["Message sent."] = "Messaggio inviato.";
-$a->strings["No recipient."] = "Nessun destinatario.";
-$a->strings["Send Private Message"] = "Invia un messaggio privato";
-$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Se vuoi che %s ti risponda, controlla che le tue impostazioni di privacy permettano la ricezione di messaggi privati da mittenti sconosciuti.";
-$a->strings["To:"] = "A:";
-$a->strings["Subject:"] = "Oggetto:";
-$a->strings["Your message:"] = "Il tuo messaggio:";
-$a->strings["Login"] = "Accedi";
-$a->strings["The post was created"] = "Il messaggio è stato creato";
-$a->strings["Item not found"] = "Oggetto non trovato";
-$a->strings["Edit post"] = "Modifica messaggio";
-$a->strings["CC: email addresses"] = "CC: indirizzi email";
-$a->strings["Example: bob@example.com, mary@example.com"] = "Esempio: bob@example.com, mary@example.com";
-$a->strings["Contact not found."] = "Contatto non trovato.";
-$a->strings["Friend suggestion sent."] = "Suggerimento di amicizia inviato.";
-$a->strings["Suggest Friends"] = "Suggerisci amici";
-$a->strings["Suggest a friend for %s"] = "Suggerisci un amico a %s";
-$a->strings["Personal Notes"] = "Note personali";
-$a->strings["Photo Albums"] = "Album foto";
-$a->strings["Recent Photos"] = "Foto recenti";
-$a->strings["Upload New Photos"] = "Carica nuove foto";
-$a->strings["everybody"] = "tutti";
-$a->strings["Contact information unavailable"] = "I dati di questo contatto non sono disponibili";
-$a->strings["Album not found."] = "Album non trovato.";
-$a->strings["Delete Album"] = "Rimuovi album";
-$a->strings["Do you really want to delete this photo album and all its photos?"] = "Vuoi davvero cancellare questo album e tutte le sue foto?";
-$a->strings["Delete Photo"] = "Rimuovi foto";
-$a->strings["Do you really want to delete this photo?"] = "Vuoi veramente cancellare questa foto?";
-$a->strings["a photo"] = "una foto";
-$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s è stato taggato in %2\$s da %3\$s";
-$a->strings["Image upload didn't complete, please try again"] = "Caricamento dell'immagine non completato. Prova di nuovo.";
-$a->strings["Image file is missing"] = "Il file dell'immagine è mancante";
-$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "Il server non può accettare il caricamento di un nuovo file in questo momento, contattare l'amministratore";
-$a->strings["Image file is empty."] = "Il file dell'immagine è vuoto.";
-$a->strings["No photos selected"] = "Nessuna foto selezionata";
-$a->strings["Access to this item is restricted."] = "Questo oggetto non è visibile a tutti.";
-$a->strings["Upload Photos"] = "Carica foto";
-$a->strings["New album name: "] = "Nome nuovo album: ";
-$a->strings["or existing album name: "] = "o nome di un album esistente: ";
-$a->strings["Do not show a status post for this upload"] = "Non creare un post per questo upload";
-$a->strings["Permissions"] = "Permessi";
-$a->strings["Show to Groups"] = "Mostra ai gruppi";
-$a->strings["Show to Contacts"] = "Mostra ai contatti";
-$a->strings["Edit Album"] = "Modifica album";
-$a->strings["Show Newest First"] = "Mostra nuove foto per prime";
-$a->strings["Show Oldest First"] = "Mostra vecchie foto per prime";
-$a->strings["View Photo"] = "Vedi foto";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Permesso negato. L'accesso a questo elemento può essere limitato.";
-$a->strings["Photo not available"] = "Foto non disponibile";
-$a->strings["View photo"] = "Vedi foto";
-$a->strings["Edit photo"] = "Modifica foto";
-$a->strings["Use as profile photo"] = "Usa come foto del profilo";
-$a->strings["Private Message"] = "Messaggio privato";
-$a->strings["View Full Size"] = "Vedi dimensione intera";
-$a->strings["Tags: "] = "Tag: ";
-$a->strings["[Remove any tag]"] = "[Rimuovi tutti i tag]";
-$a->strings["New album name"] = "Nuovo nome dell'album";
-$a->strings["Caption"] = "Titolo";
-$a->strings["Add a Tag"] = "Aggiungi tag";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Esempio: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
-$a->strings["Do not rotate"] = "Non ruotare";
-$a->strings["Rotate CW (right)"] = "Ruota a destra";
-$a->strings["Rotate CCW (left)"] = "Ruota a sinistra";
-$a->strings["I like this (toggle)"] = "Mi piace (clic per cambiare)";
-$a->strings["I don't like this (toggle)"] = "Non mi piace (clic per cambiare)";
-$a->strings["This is you"] = "Questo sei tu";
-$a->strings["Comment"] = "Commento";
-$a->strings["Map"] = "Mappa";
-$a->strings["View Album"] = "Sfoglia l'album";
-$a->strings["Do you really want to delete this video?"] = "Vuoi veramente cancellare questo video?";
-$a->strings["Delete Video"] = "Rimuovi video";
-$a->strings["No videos selected"] = "Nessun video selezionato";
-$a->strings["Recent Videos"] = "Video Recenti";
-$a->strings["Upload New Videos"] = "Carica Nuovo Video";
-$a->strings["Access to this profile has been restricted."] = "L'accesso a questo profilo è stato limitato.";
-$a->strings["Events"] = "Eventi";
-$a->strings["View"] = "Mostra";
-$a->strings["Previous"] = "Precedente";
-$a->strings["Next"] = "Successivo";
-$a->strings["today"] = "oggi";
-$a->strings["month"] = "mese";
-$a->strings["week"] = "settimana";
-$a->strings["day"] = "giorno";
-$a->strings["list"] = "lista";
-$a->strings["User not found"] = "Utente non trovato";
-$a->strings["This calendar format is not supported"] = "Questo formato di calendario non è supportato";
-$a->strings["No exportable data found"] = "Nessun dato esportabile trovato";
-$a->strings["calendar"] = "calendario";
-$a->strings["Network:"] = "Rete:";
-$a->strings["%d contact edited."] = [
-	0 => "%d contatto modificato.",
-	1 => "%d contatti modificati",
-];
-$a->strings["Could not access contact record."] = "Non è possibile accedere al contatto.";
-$a->strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato.";
-$a->strings["Contact updated."] = "Contatto aggiornato.";
-$a->strings["Failed to update contact record."] = "Errore nell'aggiornamento del contatto.";
-$a->strings["Contact has been blocked"] = "Il contatto è stato bloccato";
-$a->strings["Contact has been unblocked"] = "Il contatto è stato sbloccato";
-$a->strings["Contact has been ignored"] = "Il contatto è ignorato";
-$a->strings["Contact has been unignored"] = "Il contatto non è più ignorato";
-$a->strings["Contact has been archived"] = "Il contatto è stato archiviato";
-$a->strings["Contact has been unarchived"] = "Il contatto è stato dearchiviato";
-$a->strings["Drop contact"] = "Cancella contatto";
-$a->strings["Do you really want to delete this contact?"] = "Vuoi veramente cancellare questo contatto?";
-$a->strings["Contact has been removed."] = "Il contatto è stato rimosso.";
-$a->strings["You are mutual friends with %s"] = "Sei amico reciproco con %s";
-$a->strings["You are sharing with %s"] = "Stai condividendo con %s";
-$a->strings["%s is sharing with you"] = "%s sta condividendo con te";
-$a->strings["Private communications are not available for this contact."] = "Le comunicazioni private non sono disponibili per questo contatto.";
-$a->strings["Never"] = "Mai";
-$a->strings["(Update was successful)"] = "(L'aggiornamento è stato completato)";
-$a->strings["(Update was not successful)"] = "(L'aggiornamento non è stato completato)";
-$a->strings["Suggest friends"] = "Suggerisci amici";
-$a->strings["Network type: %s"] = "Tipo di rete: %s";
-$a->strings["Communications lost with this contact!"] = "Comunicazione con questo contatto persa!";
-$a->strings["Fetch further information for feeds"] = "Recupera maggiori informazioni per i feed";
-$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."] = "Recupera informazioni come immagini di anteprima, titolo e teaser dall'elemento del feed. Puoi attivare questa funzione se il feed non contiene molto testo. Le parole chiave sono recuperate dal tag meta nella pagina dell'elemento e inseriti come hashtag.";
-$a->strings["Disabled"] = "Disabilitato";
-$a->strings["Fetch information"] = "Recupera informazioni";
-$a->strings["Fetch keywords"] = "Recupera parole chiave";
-$a->strings["Fetch information and keywords"] = "Recupera informazioni e parole chiave";
-$a->strings["Disconnect/Unfollow"] = "Disconnetti/Non Seguire";
-$a->strings["Contact"] = "Contatto";
-$a->strings["Profile Visibility"] = "Visibilità del profilo";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro.";
-$a->strings["Contact Information / Notes"] = "Informazioni / Note sul contatto";
-$a->strings["Their personal note"] = "La loro nota personale";
-$a->strings["Edit contact notes"] = "Modifica note contatto";
-$a->strings["Block/Unblock contact"] = "Blocca/Sblocca contatto";
-$a->strings["Ignore contact"] = "Ignora il contatto";
-$a->strings["Repair URL settings"] = "Impostazioni riparazione URL";
-$a->strings["View conversations"] = "Vedi conversazioni";
-$a->strings["Last update:"] = "Ultimo aggiornamento:";
-$a->strings["Update public posts"] = "Aggiorna messaggi pubblici";
-$a->strings["Update now"] = "Aggiorna adesso";
-$a->strings["Unblock"] = "Sblocca";
-$a->strings["Block"] = "Blocca";
-$a->strings["Unignore"] = "Non ignorare";
-$a->strings["Ignore"] = "Ignora";
-$a->strings["Currently blocked"] = "Bloccato";
-$a->strings["Currently ignored"] = "Ignorato";
-$a->strings["Currently archived"] = "Al momento archiviato";
-$a->strings["Awaiting connection acknowledge"] = "In attesa di conferma della connessione";
-$a->strings["Hide this contact from others"] = "Nascondi questo contatto agli altri";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Risposte ai tuoi post pubblici <strong>possono</strong> essere comunque visibili";
-$a->strings["Notification for new posts"] = "Notifica per i nuovi messaggi";
-$a->strings["Send a notification of every new post of this contact"] = "Invia una notifica per ogni nuovo messaggio di questo contatto";
-$a->strings["Blacklisted keywords"] = "Parole chiave in blacklist";
-$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Lista separata da virgola di parole chiave che non dovranno essere convertite in hashtag, quando \"Recupera informazioni e parole chiave\" è selezionato";
-$a->strings["Profile URL"] = "URL Profilo";
-$a->strings["Location:"] = "Posizione:";
-$a->strings["XMPP:"] = "XMPP:";
-$a->strings["About:"] = "Informazioni:";
-$a->strings["Tags:"] = "Tag:";
-$a->strings["Actions"] = "Azioni";
-$a->strings["Status"] = "Stato";
-$a->strings["Contact Settings"] = "Impostazioni Contatto";
-$a->strings["Suggestions"] = "Suggerimenti";
-$a->strings["Suggest potential friends"] = "Suggerisci potenziali amici";
-$a->strings["All Contacts"] = "Tutti i contatti";
-$a->strings["Show all contacts"] = "Mostra tutti i contatti";
-$a->strings["Unblocked"] = "Sbloccato";
-$a->strings["Only show unblocked contacts"] = "Mostra solo contatti non bloccati";
-$a->strings["Blocked"] = "Bloccato";
-$a->strings["Only show blocked contacts"] = "Mostra solo contatti bloccati";
-$a->strings["Ignored"] = "Ignorato";
-$a->strings["Only show ignored contacts"] = "Mostra solo contatti ignorati";
-$a->strings["Archived"] = "Archiviato";
-$a->strings["Only show archived contacts"] = "Mostra solo contatti archiviati";
-$a->strings["Hidden"] = "Nascosto";
-$a->strings["Only show hidden contacts"] = "Mostra solo contatti nascosti";
-$a->strings["Search your contacts"] = "Cerca nei tuoi contatti";
-$a->strings["Find"] = "Trova";
-$a->strings["Update"] = "Aggiorna";
-$a->strings["Archive"] = "Archivia";
-$a->strings["Unarchive"] = "Dearchivia";
-$a->strings["Batch Actions"] = "Azioni Batch";
-$a->strings["Status Messages and Posts"] = "Messaggi di stato e post";
-$a->strings["Profile Details"] = "Dettagli del profilo";
-$a->strings["View all contacts"] = "Vedi tutti i contatti";
-$a->strings["View all common friends"] = "Vedi tutti gli amici in comune";
-$a->strings["Advanced"] = "Avanzate";
-$a->strings["Advanced Contact Settings"] = "Impostazioni avanzate Contatto";
-$a->strings["Mutual Friendship"] = "Amicizia reciproca";
-$a->strings["is a fan of yours"] = "è un tuo fan";
-$a->strings["you are a fan of"] = "sei un fan di";
-$a->strings["Toggle Blocked status"] = "Inverti stato \"Blocca\"";
-$a->strings["Toggle Ignored status"] = "Inverti stato \"Ignora\"";
-$a->strings["Toggle Archive status"] = "Inverti stato \"Archiviato\"";
-$a->strings["Delete contact"] = "Rimuovi contatto";
-$a->strings["Parent user not found."] = "Utente principale non trovato.";
-$a->strings["No parent user"] = "Nessun utente principale";
-$a->strings["Parent Password:"] = "Password Principale:";
-$a->strings["Please enter the password of the parent account to legitimize your request."] = "Inserisci la password dell'account principale per autorizzare la tua richiesta.";
-$a->strings["Parent User"] = "Utente Principale";
-$a->strings["Parent users have total control about this account, including the account settings. Please double check whom you give this access."] = "Gli utenti principali hanno il controllo totale su questo account, comprese le impostazioni. Assicurati di controllare due volte a chi stai fornendo questo accesso.";
-$a->strings["Save Settings"] = "Salva Impostazioni";
-$a->strings["Delegate Page Management"] = "Gestione delegati per la pagina";
-$a->strings["Delegates"] = "Delegati";
-$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."] = "I Delegati sono in grado di gestire tutti gli aspetti di questa pagina, tranne per le impostazioni di base dell'account. Non delegare il tuo account personale a nessuno di cui non ti fidi ciecamente.";
-$a->strings["Existing Page Delegates"] = "Delegati Pagina Esistenti";
-$a->strings["Potential Delegates"] = "Delegati Potenziali";
-$a->strings["Add"] = "Aggiungi";
-$a->strings["No entries."] = "Nessuna voce.";
-$a->strings["Event can not end before it has started."] = "Un evento non può finire prima di iniziare.";
-$a->strings["Event title and start time are required."] = "Titolo e ora di inizio dell'evento sono richiesti.";
-$a->strings["Create New Event"] = "Crea un nuovo evento";
-$a->strings["Event details"] = "Dettagli dell'evento";
-$a->strings["Starting date and Title are required."] = "La data di inizio e il titolo sono richiesti.";
-$a->strings["Event Starts:"] = "L'evento inizia:";
-$a->strings["Required"] = "Richiesto";
-$a->strings["Finish date/time is not known or not relevant"] = "La data/ora di fine non è definita";
-$a->strings["Event Finishes:"] = "L'evento finisce:";
-$a->strings["Adjust for viewer timezone"] = "Visualizza con il fuso orario di chi legge";
-$a->strings["Description:"] = "Descrizione:";
-$a->strings["Title:"] = "Titolo:";
-$a->strings["Share this event"] = "Condividi questo evento";
-$a->strings["Basic"] = "Base";
-$a->strings["Failed to remove event"] = "Rimozione evento fallita.";
-$a->strings["Event removed"] = "Evento rimosso";
-$a->strings["You must be logged in to use this module"] = "Devi aver essere autenticato per usare questo modulo";
-$a->strings["Source URL"] = "URL Sorgente";
-$a->strings["Post successful."] = "Inviato!";
 $a->strings["Subscribing to OStatus contacts"] = "Iscrizione a contatti OStatus";
 $a->strings["No contact provided."] = "Nessun contatto disponibile.";
 $a->strings["Couldn't fetch information for contact."] = "Non è stato possibile recuperare le informazioni del contatto.";
 $a->strings["Couldn't fetch friends for contact."] = "Non è stato possibile recuperare gli amici del contatto.";
+$a->strings["Done"] = "Fatto";
 $a->strings["success"] = "successo";
 $a->strings["failed"] = "fallito";
 $a->strings["ignored"] = "ignorato";
-$a->strings["Image uploaded but image cropping failed."] = "L'immagine è stata caricata, ma il non è stato possibile ritagliarla.";
-$a->strings["Image size reduction [%s] failed."] = "Il ridimensionamento dell'immagine [%s] è fallito.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Ricarica la pagina con shift+F5 o cancella la cache del browser se la nuova foto non viene mostrata immediatamente.";
-$a->strings["Unable to process image"] = "Impossibile elaborare l'immagine";
-$a->strings["Upload File:"] = "Carica un file:";
-$a->strings["Select a profile:"] = "Seleziona un profilo:";
-$a->strings["or"] = "o";
-$a->strings["skip this step"] = "salta questo passaggio";
-$a->strings["select a photo from your photo albums"] = "seleziona una foto dai tuoi album";
-$a->strings["Crop Image"] = "Ritaglia immagine";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Ritaglia l'immagine per una visualizzazione migliore.";
-$a->strings["Done Editing"] = "Finito";
-$a->strings["Image uploaded successfully."] = "Immagine caricata con successo.";
-$a->strings["Contact wasn't found or can't be unfollowed."] = "Il contatto non è stato trovato o non si può smettere di seguirlo.";
-$a->strings["Contact unfollowed"] = "Smesso di seguire il contatto";
-$a->strings["Submit Request"] = "Invia richiesta";
-$a->strings["You aren't a friend of this contact."] = "Non sei un amico di questo contatto";
-$a->strings["Unfollowing is currently not supported by your network."] = "Smettere di seguire non è al momento supportato dalla tua rete.";
-$a->strings["Your Identity Address:"] = "L'indirizzo della tua identità:";
-$a->strings["Gender:"] = "Genere:";
-$a->strings["Status:"] = "Stato:";
-$a->strings["Homepage:"] = "Homepage:";
-$a->strings["Global Directory"] = "Elenco globale";
-$a->strings["Find on this site"] = "Cerca nel sito";
-$a->strings["Results for:"] = "Risultati per:";
-$a->strings["Site Directory"] = "Elenco del sito";
-$a->strings["No entries (some entries may be hidden)."] = "Nessuna voce (qualche voce potrebbe essere nascosta).";
-$a->strings["People Search - %s"] = "Cerca persone - %s";
-$a->strings["Forum Search - %s"] = "Ricerca Forum  - %s";
-$a->strings["The contact could not be added."] = "Il contatto non può essere aggiunto.";
-$a->strings["You already added this contact."] = "Hai già aggiunto questo contatto.";
-$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Il supporto Diaspora non è abilitato. Il contatto non può essere aggiunto.";
-$a->strings["OStatus support is disabled. Contact can't be added."] = "Il supporto OStatus non è abilitato. Il contatto non può essere aggiunto.";
-$a->strings["The network type couldn't be detected. Contact can't be added."] = "Non è possibile rilevare il tipo di rete. Il contatto non può essere aggiunto.";
-$a->strings["Please answer the following:"] = "Rispondi:";
-$a->strings["Does %s know you?"] = "%s ti conosce?";
-$a->strings["Add a personal note:"] = "Aggiungi una nota personale:";
-$a->strings["No valid account found."] = "Nessun account valido trovato.";
-$a->strings["Password reset request issued. Check your email."] = "La richiesta per reimpostare la password è stata inviata. Controlla la tua 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."] = "\nGentile %1\$s,\n\tabbiamo ricevuto su \"%2\$s\" una richiesta di resettare la password del tuo account. Per confermare questa richiesta, selezionate il link di conferma qui sotto o incollatelo nella barra indirizzo del vostro browser.\n\nSe NON hai richiesto questa modifica, NON selezionare il link e ignora o cancella questa email.\n\nLa tua password non verrà modificata a meno che non possiamo verificare che tu abbia effettivamente richiesto la modifica.";
-$a->strings["\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"] = "\nSegui questo link per verificare la tua identità:\n\n%1\$s\n\nRiceverai in un successivo messaggio la nuova password.\nPotrai cambiarla dalla pagina \"Impostazioni\" del tuo account dopo esserti autenticato.\n\nI dettagli del tuo account sono:\n\tIndirizzo del sito: %2\$s\n\tNome utente: %3\$s";
-$a->strings["Password reset requested at %s"] = "Richiesta reimpostazione password su %s";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La richiesta non può essere verificata. (Puoi averla già richiesta precedentemente). Reimpostazione password fallita.";
-$a->strings["Request has expired, please make a new one."] = "La richiesta è scaduta, si prega di crearne una nuova.";
-$a->strings["Forgot your Password?"] = "Hai dimenticato la password?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Inserisci il tuo indirizzo email per reimpostare la password.";
-$a->strings["Nickname or Email: "] = "Nome utente o email: ";
-$a->strings["Reset"] = "Reimposta";
-$a->strings["Password Reset"] = "Reimpostazione password";
-$a->strings["Your password has been reset as requested."] = "La tua password è stata reimpostata come richiesto.";
-$a->strings["Your new password is"] = "La tua nuova password è";
-$a->strings["Save or copy your new password - and then"] = "Salva o copia la tua nuova password, quindi";
-$a->strings["click here to login"] = "clicca qui per entrare";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Puoi cambiare la tua password dalla pagina <em>Impostazioni</em> dopo aver effettuato l'accesso.";
-$a->strings["\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"] = "\nGentile %1\$s,\n\tLa tua password è stata modificata come richiesto.\nSalva questa password, o sostituiscila immediatamente con qualcosa che puoi ricordare.";
-$a->strings["\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"] = "\nI dettagli del tuo account sono:\n\n\tIndirizzo del sito: %1\$s\n\tNome utente: %2\$s\n\tPassword: %3\$s\n\nPuoi cambiare questa password dalla pagina \"Impostazioni\" del tuo account dopo esserti autenticato.";
-$a->strings["Your password has been changed at %s"] = "La tua password presso %s è stata cambiata";
+$a->strings["Keep this window open until done."] = "Tieni questa finestra aperta fino a che ha finito.";
 $a->strings["Source input"] = "Sorgente";
 $a->strings["BBCode::toPlaintext"] = "BBCode::toPlaintext";
 $a->strings["BBCode::convert (raw HTML)"] = "BBCode::convert (raw HTML)";
@@ -739,161 +357,23 @@ $a->strings["Source text"] = "Testo sorgente";
 $a->strings["BBCode"] = "BBCode";
 $a->strings["Markdown"] = "Markdown";
 $a->strings["HTML"] = "HTML";
-$a->strings["Community option not available."] = "Opzione Comunità non disponibile";
-$a->strings["Not available."] = "Non disponibile.";
-$a->strings["Local Community"] = "Comunità Locale";
-$a->strings["Posts from local users on this server"] = "Messaggi dagli utenti locali su questo sito";
-$a->strings["Global Community"] = "Comunità Globale";
-$a->strings["Posts from users of the whole federated network"] = "Messaggi dagli utenti della rete federata";
-$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "Questa pagina comunità mostra tutti i post pubblici ricevuti da questo nodo. Potrebbero non riflettere le opinioni degli utenti di questo nodo.";
-$a->strings["This is Friendica, version"] = "Questo è Friendica, versione";
-$a->strings["running at web location"] = "in esecuzione all'indirizzo web";
-$a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "Visita <a href=\"https://friendi.ca\">Friendi.ca</a> per saperne di più sul progetto Friendica.";
-$a->strings["Bug reports and issues: please visit"] = "Segnalazioni di bug e problemi: visita";
-$a->strings["the bugtracker at github"] = "il bugtracker su github";
-$a->strings["Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"] = "Per suggerimenti, lodi, ecc., invia una mail a info chiocciola friendi punto ca";
-$a->strings["Installed addons/apps:"] = "Addon/applicazioni installate";
-$a->strings["No installed addons/apps"] = "Nessun addons/applicazione installata";
-$a->strings["Read about the <a href=\"%1\$s/tos\">Terms of Service</a> of this node."] = "Leggi i <a href=\"%1\$s/tos\">Termini di Servizio</a> di questo nodo.";
-$a->strings["On this server the following remote servers are blocked."] = "In questo server i seguenti server remoti sono bloccati.";
-$a->strings["Blocked domain"] = "Dominio bloccato";
-$a->strings["Reason for the block"] = "Motivazione del blocco";
-$a->strings["Total invitation limit exceeded."] = "Limite totale degli inviti superato.";
-$a->strings["%s : Not a valid email address."] = "%s: non è un indirizzo email valido.";
-$a->strings["Please join us on Friendica"] = "Unisciti a noi su Friendica";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limite degli inviti superato. Contatta l'amministratore del tuo sito.";
-$a->strings["%s : Message delivery failed."] = "%s: la consegna del messaggio fallita.";
-$a->strings["%d message sent."] = [
-	0 => "%d messaggio inviato.",
-	1 => "%d messaggi inviati.",
-];
-$a->strings["You have no more invitations available"] = "Non hai altri inviti disponibili";
-$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."] = "Visita %s per una lista di siti pubblici a cui puoi iscriverti. I membri Friendica su altri siti possono collegarsi uno con l'altro, come con membri di molti altri social network.";
-$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Per accettare questo invito, visita e registrati su %s o su un'altro sito web Friendica aperto al pubblico.";
-$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."] = "I siti Friendica son tutti collegati tra loro per creare una grossa rete sociale rispettosa della privacy, posseduta e controllata dai suoi membri. I siti Friendica possono anche collegarsi a molti altri social network tradizionali. Vai su %s per una lista di siti Friendica alternativi a cui puoi iscriverti.";
-$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Ci scusiamo, questo sistema non è configurato per collegarsi con altri siti pubblici o per invitare membri.";
-$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."] = "I siti Friendica son tutti collegati tra loro per creare una grossa rete sociale rispettosa della privacy, posseduta e controllata dai suoi membri. I siti Friendica possono anche collegarsi a molti altri social network tradizionali.";
-$a->strings["To accept this invitation, please visit and register at %s."] = "Per accettare questo invito, visita e registrati su %s";
-$a->strings["Send invitations"] = "Invia inviti";
-$a->strings["Enter email addresses, one per line:"] = "Inserisci gli indirizzi email, uno per riga:";
-$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Sei cordialmente invitato/a ad unirti a me e ad altri amici su Friendica, e ad aiutarci a creare una rete sociale migliore.";
-$a->strings["You will need to supply this invitation code: \$invite_code"] = "Sarà necessario fornire questo codice invito: \$invite_code";
-$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Una volta registrato, connettiti con me dal mio profilo:";
-$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "Per maggiori informazioni sul progetto Friendica e perchè pensiamo sia importante, visita http://friendi.ca ";
-$a->strings["add"] = "aggiungi";
-$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
-	0 => "Attenzione: Questo gruppo contiene %s membro da una rete che non permette la ricezione di messaggi non pubblici.",
-	1 => "Attenzione: Questo gruppo contiene %s membri da reti che non permettono la ricezione di messaggi non pubblici.",
-];
-$a->strings["Messages in this group won't be send to these receivers."] = "I messaggi in questo gruppo non saranno inviati ai quei contatti.";
-$a->strings["No such group"] = "Nessun gruppo";
-$a->strings["Group is empty"] = "Il gruppo è vuoto";
-$a->strings["Group: %s"] = "Gruppo: %s";
-$a->strings["Private messages to this person are at risk of public disclosure."] = "I messaggi privati a questa persona potrebbero risultare visibili anche pubblicamente.";
-$a->strings["Invalid contact."] = "Contatto non valido.";
-$a->strings["Commented Order"] = "Ordina per commento";
-$a->strings["Sort by Comment Date"] = "Ordina per data commento";
-$a->strings["Posted Order"] = "Ordina per invio";
-$a->strings["Sort by Post Date"] = "Ordina per data messaggio";
-$a->strings["Personal"] = "Personale";
-$a->strings["Posts that mention or involve you"] = "Messaggi che ti citano o coinvolgono";
-$a->strings["New"] = "Nuovo";
-$a->strings["Activity Stream - by date"] = "Activity Stream - per data";
-$a->strings["Shared Links"] = "Links condivisi";
-$a->strings["Interesting Links"] = "Link Interessanti";
-$a->strings["Starred"] = "Preferiti";
-$a->strings["Favourite Posts"] = "Messaggi preferiti";
-$a->strings["Contact settings applied."] = "Contatto modificato.";
-$a->strings["Contact update failed."] = "Le modifiche al contatto non sono state salvate.";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ATTENZIONE: Queste sono impostazioni avanzate</strong> e se inserisci informazioni errate le tue comunicazioni con questo contatto potrebbero non funzionare più";
-$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Usa <strong>ora</strong> il tasto 'Indietro' del tuo browser se non sei sicuro di cosa fare in questa pagina.";
-$a->strings["No mirroring"] = "Non duplicare";
-$a->strings["Mirror as forwarded posting"] = "Duplica come messaggi ricondivisi";
-$a->strings["Mirror as my own posting"] = "Duplica come miei messaggi";
-$a->strings["Return to contact editor"] = "Ritorna alla modifica contatto";
-$a->strings["Refetch contact data"] = "Ricarica dati contatto";
-$a->strings["Remote Self"] = "Io remoto";
-$a->strings["Mirror postings from this contact"] = "Ripeti i messaggi di questo contatto";
-$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Imposta questo contatto come 'io remoto', questo farà si che friendica re invii i nuovi messaggi da questo contatto.";
-$a->strings["Name"] = "Nome";
-$a->strings["Account Nickname"] = "Nome utente";
-$a->strings["@Tagname - overrides Name/Nickname"] = "@TagName - al posto del nome utente";
-$a->strings["Account URL"] = "URL dell'utente";
-$a->strings["Friend Request URL"] = "URL Richiesta Amicizia";
-$a->strings["Friend Confirm URL"] = "URL Conferma Amicizia";
-$a->strings["Notification Endpoint URL"] = "URL Notifiche";
-$a->strings["Poll/Feed URL"] = "URL Feed";
-$a->strings["New photo from this URL"] = "Nuova foto da questo URL";
-$a->strings["%1\$s welcomes %2\$s"] = "%s dà il benvenuto a %s";
+$a->strings["[Embedded content - reload page to view]"] = "[Contenuto incorporato - ricarica la pagina per visualizzarlo correttamente]";
+$a->strings["Login"] = "Accedi";
+$a->strings["The post was created"] = "Il messaggio è stato creato";
+$a->strings["- select -"] = "- seleziona -";
 $a->strings["Help:"] = "Guida:";
 $a->strings["Help"] = "Guida";
+$a->strings["Not Found"] = "Non trovato";
 $a->strings["Page not found."] = "Pagina non trovata.";
-$a->strings["Friendica Communications Server - Setup"] = "Friendica Comunicazione Server - Impostazioni";
-$a->strings["Could not connect to database."] = " Impossibile collegarsi con il database.";
-$a->strings["Could not create table."] = "Impossibile creare le tabelle.";
-$a->strings["Your Friendica site database has been installed."] = "Il tuo Friendica è stato installato.";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Potresti dover importare il file \"database.sql\" manualmente con phpmyadmin o mysql";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Leggi il file \"INSTALL.txt\".";
-$a->strings["Database already in use."] = "Database già in uso.";
-$a->strings["System check"] = "Controllo sistema";
-$a->strings["Check again"] = "Controlla ancora";
-$a->strings["Database connection"] = "Connessione al database";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Per installare Friendica dobbiamo sapere come collegarci al tuo database.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Contatta il tuo fornitore di hosting o l'amministratore del sito se hai domande su queste impostazioni.";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Il database dovrà già esistere. Se non esiste, crealo prima di continuare.";
-$a->strings["Database Server Name"] = "Nome del database server";
-$a->strings["Database Login Name"] = "Nome utente database";
-$a->strings["Database Login Password"] = "Password utente database";
-$a->strings["For security reasons the password must not be empty"] = "Per motivi di sicurezza la password non puo' essere vuota.";
-$a->strings["Database Name"] = "Nome database";
-$a->strings["Site administrator email address"] = "Indirizzo email dell'amministratore del sito";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Il tuo indirizzo email deve corrispondere a questo per poter usare il pannello di amministrazione web.";
-$a->strings["Please select a default timezone for your website"] = "Seleziona il fuso orario predefinito per il tuo sito web";
-$a->strings["Site settings"] = "Impostazioni sito";
-$a->strings["System Language:"] = "Lingua di Sistema:";
-$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Imposta la lingua di default per l'interfaccia e l'invio delle email.";
-$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."] = "Il file di configurazione del database \".htconfig.php\" non può essere scritto. Usa il testo qui di seguito per creare un file di configurazione nella cartella principale del tuo sito.";
-$a->strings["<h1>What next</h1>"] = "<h1>Cosa fare ora</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "IMPORTANTE: Devi impostare [manualmente] la pianificazione del 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."] = "Vai nella <a href=\"%s/register\">pagina di registrazione</a> del tuo nuovo nodo Friendica e registra un nuovo utente. Ricorda di usare la stessa email che hai inserito come email dell'utente amministratore. Questo ti permetterà di entrare nel pannello di amministrazione del sito.";
-$a->strings["New Message"] = "Nuovo messaggio";
-$a->strings["Unable to locate contact information."] = "Impossibile trovare le informazioni del contatto.";
-$a->strings["Messages"] = "Messaggi";
-$a->strings["Do you really want to delete this message?"] = "Vuoi veramente cancellare questo messaggio?";
-$a->strings["Message deleted."] = "Messaggio eliminato.";
-$a->strings["Conversation removed."] = "Conversazione rimossa.";
-$a->strings["No messages."] = "Nessun messaggio.";
-$a->strings["Message not available."] = "Messaggio non disponibile.";
-$a->strings["Delete message"] = "Elimina il messaggio";
-$a->strings["D, d M Y - g:i A"] = "D d M Y - G:i";
-$a->strings["Delete conversation"] = "Elimina la conversazione";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Nessuna comunicazione sicura disponibile, <strong>Potresti</strong> essere in grado di rispondere dalla pagina del profilo del mittente.";
-$a->strings["Send Reply"] = "Invia la risposta";
-$a->strings["Unknown sender - %s"] = "Mittente sconosciuto - %s";
-$a->strings["You and %s"] = "Tu e %s";
-$a->strings["%s and You"] = "%s e Tu";
-$a->strings["%d message"] = [
-	0 => "%d messaggio",
-	1 => "%d messaggi",
-];
-$a->strings["Group created."] = "Gruppo creato.";
-$a->strings["Could not create group."] = "Impossibile creare il gruppo.";
-$a->strings["Group not found."] = "Gruppo non trovato.";
-$a->strings["Group name changed."] = "Il nome del gruppo è cambiato.";
-$a->strings["Save Group"] = "Salva gruppo";
-$a->strings["Create a group of contacts/friends."] = "Crea un gruppo di amici/contatti.";
-$a->strings["Group Name: "] = "Nome del gruppo:";
-$a->strings["Group removed."] = "Gruppo rimosso.";
-$a->strings["Unable to remove group."] = "Impossibile rimuovere il gruppo.";
-$a->strings["Delete Group"] = "Elimina Gruppo";
-$a->strings["Group Editor"] = "Modifica gruppo";
-$a->strings["Edit Group Name"] = "Modifica Nome Gruppo";
-$a->strings["Members"] = "Membri";
-$a->strings["Remove contact from group"] = "Rimuovi il contatto dal gruppo";
-$a->strings["Add contact to group"] = "Aggiungi il contatto al gruppo";
-$a->strings["OpenID protocol error. No ID returned."] = "Errore protocollo OpenID. Nessun ID ricevuto.";
-$a->strings["Account not found and OpenID registration is not permitted on this site."] = "L'account non è stato trovato, e la registrazione via OpenID non è permessa su questo sito.";
-$a->strings["Login failed."] = "Accesso fallito.";
+$a->strings["Welcome to %s"] = "Benvenuto su %s";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Questo sito ha superato il numero di registrazioni giornaliere consentite. Prova di nuovo domani.";
+$a->strings["Import"] = "Importa";
+$a->strings["Move account"] = "Muovi account";
+$a->strings["You can import an account from another Friendica server."] = "Puoi importare un account da un altro 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."] = "Devi esportare il tuo account dal vecchio server e caricarlo qui. Noi ricreeremo il tuo vecchio account qui, con tutti i tuoi contatti. Proveremo anche a informare i tuoi amici che ti sei spostato qui.";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Questa funzione è sperimentale. Non possiamo importare i contatti dalla rete OStatus (GNU Social/Statusnet) o da Diaspora";
+$a->strings["Account file"] = "File account";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Per esportare il tuo account, vai su \"Impostazioni -> Esporta i tuoi dati personali\" e seleziona \"Esporta account\"";
 $a->strings["Theme settings updated."] = "Impostazioni del tema aggiornate.";
 $a->strings["Information"] = "Informazioni";
 $a->strings["Overview"] = "Panoramica";
@@ -908,6 +388,7 @@ $a->strings["Terms of Service"] = "Codizioni del Servizio";
 $a->strings["Database"] = "Database";
 $a->strings["DB updates"] = "Aggiornamenti Database";
 $a->strings["Inspect Queue"] = "Ispeziona Coda di invio";
+$a->strings["Inspect worker Queue"] = "Analizza coda lavori";
 $a->strings["Tools"] = "Strumenti";
 $a->strings["Contact Blocklist"] = "Blocklist Contatti";
 $a->strings["Server Blocklist"] = "Server Blocklist";
@@ -929,7 +410,10 @@ $a->strings["Show some informations regarding the needed information to operate
 $a->strings["Privacy Statement Preview"] = "Anteprima Informativa sulla Privacy";
 $a->strings["The Terms of Service"] = "Le Codizioni del Servizio";
 $a->strings["Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below."] = "Inserisci i Termini di Servizio del tuo nodo qui. Puoi usare BBCode. Le intestazioni delle sezioni dovrebbero partire da [h2].";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Blocked domain"] = "Dominio bloccato";
 $a->strings["The blocked domain"] = "Il dominio bloccato";
+$a->strings["Reason for the block"] = "Motivazione del blocco";
 $a->strings["The reason why you blocked this domain."] = "Le ragioni per cui blocchi questo dominio.";
 $a->strings["Delete domain"] = "Elimina dominio";
 $a->strings["Check to delete this entry from the blocklist"] = "Seleziona per eliminare questa voce dalla blocklist";
@@ -957,11 +441,15 @@ $a->strings["This page allows you to prevent any message from a remote contact t
 $a->strings["Block Remote Contact"] = "Blocca Contatto Remoto";
 $a->strings["select all"] = "seleziona tutti";
 $a->strings["select none"] = "seleziona niente";
+$a->strings["Block"] = "Blocca";
+$a->strings["Unblock"] = "Sblocca";
 $a->strings["No remote contact is blocked from this node."] = "Nessun contatto remoto è bloccato da questo nodo.";
 $a->strings["Blocked Remote Contacts"] = "Contatti Remoti Bloccati";
 $a->strings["Block New Remote Contact"] = "Blocca Nuovo Contatto Remoto";
 $a->strings["Photo"] = "Foto";
+$a->strings["Name"] = "Nome";
 $a->strings["Address"] = "Indirizzo";
+$a->strings["Profile URL"] = "URL Profilo";
 $a->strings["%s total blocked contact"] = [
 	0 => "%scontatto bloccato totale",
 	1 => "%scontatti bloccati totali",
@@ -984,11 +472,16 @@ $a->strings["Network"] = "Rete";
 $a->strings["Created"] = "Creato";
 $a->strings["Last Tried"] = "Ultimo Tentativo";
 $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."] = "Questa pagina elenca il contenuto della coda di invio dei post. Questi sono post la cui consegna è fallita. Verranno inviati nuovamente più tardi ed eventualmente cancellati se la consegna continua a fallire.";
+$a->strings["Inspect Worker Queue"] = "Analizza coda lavori";
+$a->strings["Job Parameters"] = "Parametri lavoro";
+$a->strings["Priority"] = "Priorità";
+$a->strings["This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you've set up during install."] = "Questa pagina elenca i lavori in coda. Questi lavori sono gestiti dal cron che hai impostato durante l'installazione.";
 $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 />"] = "Stai ancora usando tabelle MyISAM. Dovresti cambiare il tipo motore a InnoDB. Siccome Friendica userà funzionalità specifiche di InnoDB nel futuro, dovresti modificarlo. Vedi <a href=\"%s\">qui</a>nel per una guida che puo' esserti utile nel convertire il motore delle tabelle. Puoi anche usare il comando <tt>php bin/console.php dbstructure toinnodb</tt> della tua installazione di Friendica per eseguire una conversione automatica. <br />";
 $a->strings["There is a new version of Friendica available for download. Your current version is %1\$s, upstream version is %2\$s"] = "È disponibile per il download una nuova versione di Friendica. La tua versione è %1\$s, la versione upstream è %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."] = "L'aggiornamento del database è fallito. Esegui \"php bin/console.php dbstructure update\" dalla riga di comando per poter vedere gli eventuali errori che potrebbero apparire.";
 $a->strings["The worker was never executed. Please check your database structure!"] = "Il worker non è mai stato eseguito. Controlla la struttura del tuo database!";
 $a->strings["The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings."] = "L'ultima esecuzione del worker è stata alle %sUTC, ovvero più di un'ora fa. Controlla le impostazioni del tuo crontab.";
+$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."] = "La configurazione di Friendica è adesso salvata in config/local.ini.php: copia config/local-sample.ini.php e sposta la tua configurazione da <code>.htconfig.php</code>. Vedi <a href=\"%s\">la pagina della guida sulla Configurazione</a> per avere aiuto con la transizione.";
 $a->strings["Normal Account"] = "Account normale";
 $a->strings["Automatic Follower Account"] = "Account Follower Automatico";
 $a->strings["Public Forum Account"] = "Account Forum Publico";
@@ -1009,6 +502,7 @@ $a->strings["No community page"] = "Nessuna pagina Comunità";
 $a->strings["Public postings from users of this site"] = "Messaggi pubblici dagli utenti di questo sito";
 $a->strings["Public postings from the federated network"] = "Messaggi pubblici dalla rete federata";
 $a->strings["Public postings from local users and the federated network"] = "Messaggi pubblici dagli utenti di questo sito e dalla rete federata";
+$a->strings["Disabled"] = "Disabilitato";
 $a->strings["Users, Global Contacts"] = "Utenti, Contatti Globali";
 $a->strings["Users, Global Contacts/fallback"] = "Utenti, Contatti Globali/fallback";
 $a->strings["One month"] = "Un mese";
@@ -1029,6 +523,7 @@ $a->strings["Republish users to directory"] = "Ripubblica gli utenti sulla direc
 $a->strings["Registration"] = "Registrazione";
 $a->strings["File upload"] = "Caricamento file";
 $a->strings["Policies"] = "Politiche";
+$a->strings["Advanced"] = "Avanzate";
 $a->strings["Auto Discovered Contact Directory"] = "Elenco Contatti Scoperto Automaticamente";
 $a->strings["Performance"] = "Performance";
 $a->strings["Worker"] = "Worker";
@@ -1069,6 +564,8 @@ $a->strings["Maximum Daily Registrations"] = "Massime registrazioni giornaliere"
 $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."] = "Se la registrazione è permessa, qui si definisce il massimo numero di nuovi utenti registrati da accettare giornalmente. Se la registrazione è chiusa, questa impostazione non ha effetto.";
 $a->strings["Register text"] = "Testo registrazione";
 $a->strings["Will be displayed prominently on the registration page. You can use BBCode here."] = "Sarà mostrato ben visibile nella pagina di registrazione. Puoi usare BBCode.";
+$a->strings["Forbidden Nicknames"] = "Nomi utente Vietati";
+$a->strings["Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142."] = "Lista separata da virgola di nomi utente che sono vietati nella registrazione. Il valore preimpostato è una lista di nomi di ruoli secondo RFC 2142.";
 $a->strings["Accounts abandoned after x days"] = "Account abbandonati dopo x giorni";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Non spreca risorse di sistema controllando siti esterni per gli account abbandonati. Immettere 0 per nessun limite di tempo.";
 $a->strings["Allowed friend domains"] = "Domini amici consentiti";
@@ -1083,6 +580,7 @@ $a->strings["Block public"] = "Blocca pagine pubbliche";
 $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Seleziona per bloccare l'accesso pubblico a tutte le pagine personali di questo sito, a meno di essere loggato.";
 $a->strings["Force publish"] = "Forza pubblicazione";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Seleziona per forzare tutti i profili di questo sito ad essere compresi  nell'elenco di questo sito.";
+$a->strings["Enabling this may violate privacy laws like the GDPR"] = "Abilitare questo potrebbe violare leggi sulla privacy come il GDPR";
 $a->strings["Global directory URL"] = "URL della directory globale";
 $a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL dell'elenco globale. Se vuoto, l'elenco globale sarà completamente disabilitato.";
 $a->strings["Private posts by default for new users"] = "Post privati di default per i nuovi utenti";
@@ -1093,6 +591,8 @@ $a->strings["Disallow public access to addons listed in the apps menu."] = "Disa
 $a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Selezionando questo box si limiterà ai soli membri l'accesso ai componenti aggiuntivi nel menu applicazioni";
 $a->strings["Don't embed private images in posts"] = "Non inglobare immagini private nei post";
 $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."] = "Non sostituire le foto locali nei post con una copia incorporata dell'immagine. Questo significa che i contatti che riceveranno i post contenenti foto private dovranno autenticarsi e caricare ogni immagine, cosa che può richiedere un po' di tempo.";
+$a->strings["Explicit Content"] = "Contenuto Esplicito";
+$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."] = "Imposta questo per avvisare che il tuo noto è usato principalmente per contenuto esplicito che potrebbe non essere adatto a minori. Questa informazione sarà pubblicata nella pagina di informazioni sul noto e potrà essere usata, per esempio nella directory globale, per filtrare il tuo nodo dalla lista di nodi su cui registrarsi. In più, una nota sarà mostrata nella pagina di registrazione.";
 $a->strings["Allow Users to set remote_self"] = "Permetti agli utenti di impostare 'io remoto'";
 $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."] = "Selezionando questo, a tutti gli utenti sarà permesso di impostare qualsiasi contatto come 'io remoto' nella pagina di modifica del contatto. Impostare questa opzione fa si che tutti i messaggi di quel contatto vengano ripetuti nello stream dell'utente.";
 $a->strings["Block multiple registrations"] = "Blocca registrazioni multiple";
@@ -1164,7 +664,7 @@ $a->strings["If you have a restricted system where the webserver can't access th
 $a->strings["Base path to installation"] = "Percorso base all'installazione";
 $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."] = "Se il sistema non è in grado di rilevare il percorso corretto per l'installazione, immettere il percorso corretto qui. Questa impostazione deve essere inserita solo se si utilizza un sistema limitato e/o collegamenti simbolici al tuo webroot.";
 $a->strings["Disable picture proxy"] = "Disabilita il proxy immagini";
-$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "Il proxy immagini aumenta le performance e la privacy. Non dovrebbe essere usato su server con poca banda disponibile.";
+$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth."] = "Il proxy immagini aumenta le performance e la privacy. Non dovrebbe essere usato su server con poca banda disponibile.";
 $a->strings["Only search in tags"] = "Cerca solo nei tag";
 $a->strings["On large systems the text search can slow down the system extremely."] = "Su server con molti dati, la ricerca nel testo può estremamente rallentare il sistema.";
 $a->strings["New base url"] = "Nuovo url base";
@@ -1173,7 +673,7 @@ $a->strings["RINO Encryption"] = "Crittografia RINO";
 $a->strings["Encryption layer between nodes."] = "Crittografia delle comunicazioni tra nodi.";
 $a->strings["Enabled"] = "Abilitato";
 $a->strings["Maximum number of parallel workers"] = "Massimo numero di lavori in parallelo";
-$a->strings["On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4."] = "Su host condivisi imposta a 2. Su sistemi più grandi, valori fino a 10 vanno bene. Il valore di default è 4.";
+$a->strings["On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d."] = "Con hosting condiviso, imposta a %d. Su sistemi più grandi, vanno bene valori come %d. Il valore di default è %d.";
 $a->strings["Don't use 'proc_open' with the worker"] = "Non usare 'proc_open' con il 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."] = "Abilita se il tuo sistema non consente l'utilizzo di 'proc_open'. Può succedere con gli hosting condivisi. Se abiliti questa opzione, dovresti aumentare la frequenza delle chiamate al worker nel tuo crontab.";
 $a->strings["Enable fastlane"] = "Abilita fastlane";
@@ -1194,6 +694,7 @@ $a->strings["Server tags"] = "Tags server";
 $a->strings["Comma separated list of tags for the 'tags' subscription."] = "Lista separata da virgola per la sottoscrizione 'tags'.";
 $a->strings["Allow user tags"] = "Permetti tag utente";
 $a->strings["If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'."] = "Se abilitato, i tag delle ricerche salvate saranno usate per la sottoscrizione 'tags' in aggiunta ai tag server.";
+$a->strings["Start Relocation"] = "Inizia il Trasloco";
 $a->strings["Update has been marked successful"] = "L'aggiornamento è stato segnato come  di successo";
 $a->strings["Database structure update %s was successfully applied."] = "Aggiornamento struttura database %s applicata con successo.";
 $a->strings["Executing of database structure update %s failed with error: %s"] = "Aggiornamento struttura database %s fallita con errore: %s";
@@ -1243,6 +744,7 @@ $a->strings["No registrations."] = "Nessuna registrazione.";
 $a->strings["Note from the user"] = "Nota dall'utente";
 $a->strings["Approve"] = "Approva";
 $a->strings["Deny"] = "Nega";
+$a->strings["User blocked"] = "Utente bloccato";
 $a->strings["Site admin"] = "Amministrazione sito";
 $a->strings["Account expired"] = "Account scaduto";
 $a->strings["New User"] = "Nuovo Utente";
@@ -1277,13 +779,184 @@ $a->strings["Log file"] = "File di Log";
 $a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Il server web deve avere i permessi di scrittura. Relativo alla tua directory Friendica.";
 $a->strings["Log level"] = "Livello di Log";
 $a->strings["PHP logging"] = "Log 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."] = "Per abilitare il log degli errori e degli avvisi di PHP puoi aggiungere le seguenti righe al file .htconfig.php nella tua installazione. La posizione del file impostato in 'error_log' è relativa alla directory principale della tua installazione Friendica e il server web deve avere i permessi di scrittura sul file. Il valore '1' per 'log_errors' e 'display_errors' abilita le opzioni, imposta '0' per disabilitarle.";
+$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."] = "Per abilitare temporaneamente il logging di errori e avvisi di PHP, puoi aggiungere le seguenti linee al file index.php della tua installazione. Il nome del file impostato in 'error_log' è relativo alla directory principale della tua installazione di Freidnica e deve essere scrivibile dal server web. L'opzione '1' di 'log_errors' e 'display_errors' server ad abilitare queste impostazioni. Metti '0' per disabilitarle.";
 $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."] = "Errore aprendo il file di log <strong>%1\$s</strong>. Controlla che il file %1\$s esista e sia leggibile.";
 $a->strings["Couldn't open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s is readable."] = "Non posso aprire il file di log <strong>%1\$s</strong> . Controlla che il file %1\$s esista e sia leggibile.";
 $a->strings["Off"] = "Spento";
 $a->strings["On"] = "Acceso";
 $a->strings["Lock feature %s"] = "Blocca funzionalità %s";
 $a->strings["Manage Additional Features"] = "Gestisci Funzionalità Aggiuntive";
+$a->strings["No friends to display."] = "Nessun amico da visualizzare.";
+$a->strings["Connect"] = "Connetti";
+$a->strings["Authorize application connection"] = "Autorizza la connessione dell'applicazione";
+$a->strings["Return to your app and insert this Securty Code:"] = "Torna alla tua applicazione e inserisci questo codice di sicurezza:";
+$a->strings["Please login to continue."] = "Effettua il login per continuare.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vuoi autorizzare questa applicazione per accedere ai messaggi e ai contatti, e / o creare nuovi messaggi per te?";
+$a->strings["No"] = "No";
+$a->strings["Item not available."] = "Oggetto non disponibile.";
+$a->strings["Item was not found."] = "Oggetto non trovato.";
+$a->strings["Access denied."] = "Accesso negato.";
+$a->strings["Access to this profile has been restricted."] = "L'accesso a questo profilo è stato limitato.";
+$a->strings["Events"] = "Eventi";
+$a->strings["View"] = "Mostra";
+$a->strings["Previous"] = "Precedente";
+$a->strings["Next"] = "Successivo";
+$a->strings["today"] = "oggi";
+$a->strings["month"] = "mese";
+$a->strings["week"] = "settimana";
+$a->strings["day"] = "giorno";
+$a->strings["list"] = "lista";
+$a->strings["User not found"] = "Utente non trovato";
+$a->strings["This calendar format is not supported"] = "Questo formato di calendario non è supportato";
+$a->strings["No exportable data found"] = "Nessun dato esportabile trovato";
+$a->strings["calendar"] = "calendario";
+$a->strings["No contacts in common."] = "Nessun contatto in comune.";
+$a->strings["Common Friends"] = "Amici in comune";
+$a->strings["Community option not available."] = "Opzione Comunità non disponibile";
+$a->strings["Not available."] = "Non disponibile.";
+$a->strings["Local Community"] = "Comunità Locale";
+$a->strings["Posts from local users on this server"] = "Messaggi dagli utenti locali su questo sito";
+$a->strings["Global Community"] = "Comunità Globale";
+$a->strings["Posts from users of the whole federated network"] = "Messaggi dagli utenti della rete federata";
+$a->strings["No results."] = "Nessun risultato.";
+$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "Questa pagina comunità mostra tutti i post pubblici ricevuti da questo nodo. Potrebbero non riflettere le opinioni degli utenti di questo nodo.";
+$a->strings["Network:"] = "Rete:";
+$a->strings["%d contact edited."] = [
+	0 => "%d contatto modificato.",
+	1 => "%d contatti modificati",
+];
+$a->strings["Could not access contact record."] = "Non è possibile accedere al contatto.";
+$a->strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato.";
+$a->strings["Contact updated."] = "Contatto aggiornato.";
+$a->strings["Failed to update contact record."] = "Errore nell'aggiornamento del contatto.";
+$a->strings["Contact has been blocked"] = "Il contatto è stato bloccato";
+$a->strings["Contact has been unblocked"] = "Il contatto è stato sbloccato";
+$a->strings["Contact has been ignored"] = "Il contatto è ignorato";
+$a->strings["Contact has been unignored"] = "Il contatto non è più ignorato";
+$a->strings["Contact has been archived"] = "Il contatto è stato archiviato";
+$a->strings["Contact has been unarchived"] = "Il contatto è stato dearchiviato";
+$a->strings["Drop contact"] = "Cancella contatto";
+$a->strings["Do you really want to delete this contact?"] = "Vuoi veramente cancellare questo contatto?";
+$a->strings["Contact has been removed."] = "Il contatto è stato rimosso.";
+$a->strings["You are mutual friends with %s"] = "Sei amico reciproco con %s";
+$a->strings["You are sharing with %s"] = "Stai condividendo con %s";
+$a->strings["%s is sharing with you"] = "%s sta condividendo con te";
+$a->strings["Private communications are not available for this contact."] = "Le comunicazioni private non sono disponibili per questo contatto.";
+$a->strings["Never"] = "Mai";
+$a->strings["(Update was successful)"] = "(L'aggiornamento è stato completato)";
+$a->strings["(Update was not successful)"] = "(L'aggiornamento non è stato completato)";
+$a->strings["Suggest friends"] = "Suggerisci amici";
+$a->strings["Network type: %s"] = "Tipo di rete: %s";
+$a->strings["Communications lost with this contact!"] = "Comunicazione con questo contatto persa!";
+$a->strings["Fetch further information for feeds"] = "Recupera maggiori informazioni per i feed";
+$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."] = "Recupera informazioni come immagini di anteprima, titolo e teaser dall'elemento del feed. Puoi attivare questa funzione se il feed non contiene molto testo. Le parole chiave sono recuperate dal tag meta nella pagina dell'elemento e inseriti come hashtag.";
+$a->strings["Fetch information"] = "Recupera informazioni";
+$a->strings["Fetch keywords"] = "Recupera parole chiave";
+$a->strings["Fetch information and keywords"] = "Recupera informazioni e parole chiave";
+$a->strings["Disconnect/Unfollow"] = "Disconnetti/Non Seguire";
+$a->strings["Contact"] = "Contatto";
+$a->strings["Profile Visibility"] = "Visibilità del profilo";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro.";
+$a->strings["Contact Information / Notes"] = "Informazioni / Note sul contatto";
+$a->strings["Their personal note"] = "La loro nota personale";
+$a->strings["Edit contact notes"] = "Modifica note contatto";
+$a->strings["Visit %s's profile [%s]"] = "Visita il profilo di %s [%s]";
+$a->strings["Block/Unblock contact"] = "Blocca/Sblocca contatto";
+$a->strings["Ignore contact"] = "Ignora il contatto";
+$a->strings["Repair URL settings"] = "Impostazioni riparazione URL";
+$a->strings["View conversations"] = "Vedi conversazioni";
+$a->strings["Last update:"] = "Ultimo aggiornamento:";
+$a->strings["Update public posts"] = "Aggiorna messaggi pubblici";
+$a->strings["Update now"] = "Aggiorna adesso";
+$a->strings["Unignore"] = "Non ignorare";
+$a->strings["Ignore"] = "Ignora";
+$a->strings["Currently blocked"] = "Bloccato";
+$a->strings["Currently ignored"] = "Ignorato";
+$a->strings["Currently archived"] = "Al momento archiviato";
+$a->strings["Awaiting connection acknowledge"] = "In attesa di conferma della connessione";
+$a->strings["Hide this contact from others"] = "Nascondi questo contatto agli altri";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Risposte ai tuoi post pubblici <strong>possono</strong> essere comunque visibili";
+$a->strings["Notification for new posts"] = "Notifica per i nuovi messaggi";
+$a->strings["Send a notification of every new post of this contact"] = "Invia una notifica per ogni nuovo messaggio di questo contatto";
+$a->strings["Blacklisted keywords"] = "Parole chiave in blacklist";
+$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Lista separata da virgola di parole chiave che non dovranno essere convertite in hashtag, quando \"Recupera informazioni e parole chiave\" è selezionato";
+$a->strings["Location:"] = "Posizione:";
+$a->strings["XMPP:"] = "XMPP:";
+$a->strings["About:"] = "Informazioni:";
+$a->strings["Tags:"] = "Tag:";
+$a->strings["Actions"] = "Azioni";
+$a->strings["Status"] = "Stato";
+$a->strings["Contact Settings"] = "Impostazioni Contatto";
+$a->strings["Suggestions"] = "Suggerimenti";
+$a->strings["Suggest potential friends"] = "Suggerisci potenziali amici";
+$a->strings["All Contacts"] = "Tutti i contatti";
+$a->strings["Show all contacts"] = "Mostra tutti i contatti";
+$a->strings["Unblocked"] = "Sbloccato";
+$a->strings["Only show unblocked contacts"] = "Mostra solo contatti non bloccati";
+$a->strings["Blocked"] = "Bloccato";
+$a->strings["Only show blocked contacts"] = "Mostra solo contatti bloccati";
+$a->strings["Ignored"] = "Ignorato";
+$a->strings["Only show ignored contacts"] = "Mostra solo contatti ignorati";
+$a->strings["Archived"] = "Archiviato";
+$a->strings["Only show archived contacts"] = "Mostra solo contatti archiviati";
+$a->strings["Hidden"] = "Nascosto";
+$a->strings["Only show hidden contacts"] = "Mostra solo contatti nascosti";
+$a->strings["Search your contacts"] = "Cerca nei tuoi contatti";
+$a->strings["Results for: %s"] = "Risultati per: %s";
+$a->strings["Find"] = "Trova";
+$a->strings["Update"] = "Aggiorna";
+$a->strings["Archive"] = "Archivia";
+$a->strings["Unarchive"] = "Dearchivia";
+$a->strings["Batch Actions"] = "Azioni Batch";
+$a->strings["Status Messages and Posts"] = "Messaggi di stato e post";
+$a->strings["Profile Details"] = "Dettagli del profilo";
+$a->strings["View all contacts"] = "Vedi tutti i contatti";
+$a->strings["View all common friends"] = "Vedi tutti gli amici in comune";
+$a->strings["Advanced Contact Settings"] = "Impostazioni avanzate Contatto";
+$a->strings["Mutual Friendship"] = "Amicizia reciproca";
+$a->strings["is a fan of yours"] = "è un tuo fan";
+$a->strings["you are a fan of"] = "sei un fan di";
+$a->strings["This is you"] = "Questo sei tu";
+$a->strings["Edit contact"] = "Modifica contatto";
+$a->strings["Toggle Blocked status"] = "Inverti stato \"Blocca\"";
+$a->strings["Toggle Ignored status"] = "Inverti stato \"Ignora\"";
+$a->strings["Toggle Archive status"] = "Inverti stato \"Archiviato\"";
+$a->strings["Delete contact"] = "Rimuovi contatto";
+$a->strings["Contact settings applied."] = "Contatto modificato.";
+$a->strings["Contact update failed."] = "Le modifiche al contatto non sono state salvate.";
+$a->strings["Contact not found."] = "Contatto non trovato.";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ATTENZIONE: Queste sono impostazioni avanzate</strong> e se inserisci informazioni errate le tue comunicazioni con questo contatto potrebbero non funzionare più";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Usa <strong>ora</strong> il tasto 'Indietro' del tuo browser se non sei sicuro di cosa fare in questa pagina.";
+$a->strings["No mirroring"] = "Non duplicare";
+$a->strings["Mirror as forwarded posting"] = "Duplica come messaggi ricondivisi";
+$a->strings["Mirror as my own posting"] = "Duplica come miei messaggi";
+$a->strings["Return to contact editor"] = "Ritorna alla modifica contatto";
+$a->strings["Refetch contact data"] = "Ricarica dati contatto";
+$a->strings["Remote Self"] = "Io remoto";
+$a->strings["Mirror postings from this contact"] = "Ripeti i messaggi di questo contatto";
+$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Imposta questo contatto come 'io remoto', questo farà si che friendica re invii i nuovi messaggi da questo contatto.";
+$a->strings["Account Nickname"] = "Nome utente";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@TagName - al posto del nome utente";
+$a->strings["Account URL"] = "URL dell'utente";
+$a->strings["Friend Request URL"] = "URL Richiesta Amicizia";
+$a->strings["Friend Confirm URL"] = "URL Conferma Amicizia";
+$a->strings["Notification Endpoint URL"] = "URL Notifiche";
+$a->strings["Poll/Feed URL"] = "URL Feed";
+$a->strings["New photo from this URL"] = "Nuova foto da questo URL";
+$a->strings["Parent user not found."] = "Utente principale non trovato.";
+$a->strings["No parent user"] = "Nessun utente principale";
+$a->strings["Parent Password:"] = "Password Principale:";
+$a->strings["Please enter the password of the parent account to legitimize your request."] = "Inserisci la password dell'account principale per autorizzare la tua richiesta.";
+$a->strings["Parent User"] = "Utente Principale";
+$a->strings["Parent users have total control about this account, including the account settings. Please double check whom you give this access."] = "Gli utenti principali hanno il controllo totale su questo account, comprese le impostazioni. Assicurati di controllare due volte a chi stai fornendo questo accesso.";
+$a->strings["Delegate Page Management"] = "Gestione delegati per la pagina";
+$a->strings["Delegates"] = "Delegati";
+$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."] = "I Delegati sono in grado di gestire tutti gli aspetti di questa pagina, tranne per le impostazioni di base dell'account. Non delegare il tuo account personale a nessuno di cui non ti fidi ciecamente.";
+$a->strings["Existing Page Delegates"] = "Delegati Pagina Esistenti";
+$a->strings["Potential Delegates"] = "Delegati Potenziali";
+$a->strings["Remove"] = "Rimuovi";
+$a->strings["Add"] = "Aggiungi";
+$a->strings["No entries."] = "Nessuna voce.";
 $a->strings["Profile not found."] = "Profilo non trovato.";
 $a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Questo può accadere occasionalmente se la richiesta di contatto era stata inviata da entrambe le persone e  già approvata.";
 $a->strings["Response from remote site was not understood."] = "Errore di comunicazione con l'altro sito.";
@@ -1302,6 +975,7 @@ $a->strings["The ID provided by your system is a duplicate on our system. It sho
 $a->strings["Unable to set your contact credentials on our system."] = "Impossibile impostare le credenziali del tuo contatto sul nostro sistema.";
 $a->strings["Unable to update your contact profile details on our system"] = "Impossibile aggiornare i dettagli del tuo contatto sul nostro sistema";
 $a->strings["[Name Withheld]"] = "[Nome Nascosto]";
+$a->strings["%1\$s welcomes %2\$s"] = "%s dà il benvenuto a %s";
 $a->strings["This introduction has already been accepted."] = "Questa presentazione è già stata accettata.";
 $a->strings["Profile location is not valid or does not contain profile information."] = "L'indirizzo del profilo non è valido o non contiene un profilo.";
 $a->strings["Warning: profile location has no identifiable owner name."] = "Attenzione: l'indirizzo del profilo non riporta il nome del proprietario.";
@@ -1333,26 +1007,230 @@ $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>."] = "Se non sei un membro del web sociale libero,  <a href=\"%s\">segui questo link per trovare un sito Friendica pubblico e unisciti a noi oggi</a>.";
 $a->strings["Friend/Connection Request"] = "Richieste di amicizia/connessione";
 $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"] = "Esempi: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de";
+$a->strings["Please answer the following:"] = "Rispondi:";
+$a->strings["Does %s know you?"] = "%s ti conosce?";
+$a->strings["Add a personal note:"] = "Aggiungi una nota personale:";
 $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."] = " - per favore non usare questa form. Invece, inserisci %s nella tua barra di ricerca su Diaspora.";
+$a->strings["Your Identity Address:"] = "L'indirizzo della tua identità:";
+$a->strings["Submit Request"] = "Invia richiesta";
+$a->strings["Gender:"] = "Genere:";
+$a->strings["Status:"] = "Stato:";
+$a->strings["Homepage:"] = "Homepage:";
+$a->strings["Global Directory"] = "Elenco globale";
+$a->strings["Find on this site"] = "Cerca nel sito";
+$a->strings["Results for:"] = "Risultati per:";
+$a->strings["Site Directory"] = "Elenco del sito";
+$a->strings["No entries (some entries may be hidden)."] = "Nessuna voce (qualche voce potrebbe essere nascosta).";
+$a->strings["People Search - %s"] = "Cerca persone - %s";
+$a->strings["Forum Search - %s"] = "Ricerca Forum  - %s";
+$a->strings["No matches"] = "Nessun risultato";
+$a->strings["Item not found"] = "Oggetto non trovato";
+$a->strings["Edit post"] = "Modifica messaggio";
+$a->strings["CC: email addresses"] = "CC: indirizzi email";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Esempio: bob@example.com, mary@example.com";
+$a->strings["Event can not end before it has started."] = "Un evento non può finire prima di iniziare.";
+$a->strings["Event title and start time are required."] = "Titolo e ora di inizio dell'evento sono richiesti.";
+$a->strings["Create New Event"] = "Crea un nuovo evento";
+$a->strings["Event details"] = "Dettagli dell'evento";
+$a->strings["Starting date and Title are required."] = "La data di inizio e il titolo sono richiesti.";
+$a->strings["Event Starts:"] = "L'evento inizia:";
+$a->strings["Required"] = "Richiesto";
+$a->strings["Finish date/time is not known or not relevant"] = "La data/ora di fine non è definita";
+$a->strings["Event Finishes:"] = "L'evento finisce:";
+$a->strings["Adjust for viewer timezone"] = "Visualizza con il fuso orario di chi legge";
+$a->strings["Description:"] = "Descrizione:";
+$a->strings["Title:"] = "Titolo:";
+$a->strings["Share this event"] = "Condividi questo evento";
+$a->strings["Basic"] = "Base";
+$a->strings["Permissions"] = "Permessi";
+$a->strings["Failed to remove event"] = "Rimozione evento fallita.";
+$a->strings["Event removed"] = "Evento rimosso";
+$a->strings["Photos"] = "Foto";
+$a->strings["Contact Photos"] = "Foto dei contatti";
+$a->strings["Upload"] = "Carica";
+$a->strings["Files"] = "File";
+$a->strings["You must be logged in to use this module"] = "Devi aver essere autenticato per usare questo modulo";
+$a->strings["Source URL"] = "URL Sorgente";
+$a->strings["The contact could not be added."] = "Il contatto non può essere aggiunto.";
+$a->strings["You already added this contact."] = "Hai già aggiunto questo contatto.";
+$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Il supporto Diaspora non è abilitato. Il contatto non può essere aggiunto.";
+$a->strings["OStatus support is disabled. Contact can't be added."] = "Il supporto OStatus non è abilitato. Il contatto non può essere aggiunto.";
+$a->strings["The network type couldn't be detected. Contact can't be added."] = "Non è possibile rilevare il tipo di rete. Il contatto non può essere aggiunto.";
+$a->strings["Friend suggestion sent."] = "Suggerimento di amicizia inviato.";
+$a->strings["Suggest Friends"] = "Suggerisci amici";
+$a->strings["Suggest a friend for %s"] = "Suggerisci un amico a %s";
+$a->strings["Group created."] = "Gruppo creato.";
+$a->strings["Could not create group."] = "Impossibile creare il gruppo.";
+$a->strings["Group not found."] = "Gruppo non trovato.";
+$a->strings["Group name changed."] = "Il nome del gruppo è cambiato.";
+$a->strings["Permission denied"] = "Permesso negato";
+$a->strings["Save Group"] = "Salva gruppo";
+$a->strings["Filter"] = "Filtro";
+$a->strings["Create a group of contacts/friends."] = "Crea un gruppo di amici/contatti.";
+$a->strings["Group Name: "] = "Nome del gruppo:";
+$a->strings["Contacts not in any group"] = "Contatti in nessun gruppo.";
+$a->strings["Group removed."] = "Gruppo rimosso.";
+$a->strings["Unable to remove group."] = "Impossibile rimuovere il gruppo.";
+$a->strings["Delete Group"] = "Elimina Gruppo";
+$a->strings["Edit Group Name"] = "Modifica Nome Gruppo";
+$a->strings["Members"] = "Membri";
+$a->strings["Group is empty"] = "Il gruppo è vuoto";
+$a->strings["Remove contact from group"] = "Rimuovi il contatto dal gruppo";
+$a->strings["Click on a contact to add or remove."] = "Clicca su un contatto per aggiungerlo o rimuoverlo.";
+$a->strings["Add contact to group"] = "Aggiungi il contatto al gruppo";
+$a->strings["No profile"] = "Nessun profilo";
+$a->strings["Friendica Communications Server - Setup"] = "Friendica Comunicazione Server - Impostazioni";
+$a->strings["Could not connect to database."] = " Impossibile collegarsi con il database.";
+$a->strings["Could not create table."] = "Impossibile creare le tabelle.";
+$a->strings["Your Friendica site database has been installed."] = "Il tuo Friendica è stato installato.";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Potresti dover importare il file \"database.sql\" manualmente con phpmyadmin o mysql";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Leggi il file \"INSTALL.txt\".";
+$a->strings["Database already in use."] = "Database già in uso.";
+$a->strings["System check"] = "Controllo sistema";
+$a->strings["Check again"] = "Controlla ancora";
+$a->strings["Database connection"] = "Connessione al database";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Per installare Friendica dobbiamo sapere come collegarci al tuo database.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Contatta il tuo fornitore di hosting o l'amministratore del sito se hai domande su queste impostazioni.";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Il database dovrà già esistere. Se non esiste, crealo prima di continuare.";
+$a->strings["Database Server Name"] = "Nome del database server";
+$a->strings["Database Login Name"] = "Nome utente database";
+$a->strings["Database Login Password"] = "Password utente database";
+$a->strings["For security reasons the password must not be empty"] = "Per motivi di sicurezza la password non puo' essere vuota.";
+$a->strings["Database Name"] = "Nome database";
+$a->strings["Site administrator email address"] = "Indirizzo email dell'amministratore del sito";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Il tuo indirizzo email deve corrispondere a questo per poter usare il pannello di amministrazione web.";
+$a->strings["Please select a default timezone for your website"] = "Seleziona il fuso orario predefinito per il tuo sito web";
+$a->strings["Site settings"] = "Impostazioni sito";
+$a->strings["System Language:"] = "Lingua di Sistema:";
+$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Imposta la lingua di default per l'interfaccia e l'invio delle email.";
+$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."] = "Il file di configurazione del database \"config/local.ini.php\" non puo' essere scritto. Usa il testo allegato per creare un file di configurazione nell tuo server web.";
+$a->strings["<h1>What next</h1>"] = "<h1>Cosa fare ora</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "IMPORTANTE: Devi impostare [manualmente] la pianificazione del 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."] = "Vai nella <a href=\"%s/register\">pagina di registrazione</a> del tuo nuovo nodo Friendica e registra un nuovo utente. Ricorda di usare la stessa email che hai inserito come email dell'utente amministratore. Questo ti permetterà di entrare nel pannello di amministrazione del sito.";
+$a->strings["Total invitation limit exceeded."] = "Limite totale degli inviti superato.";
+$a->strings["%s : Not a valid email address."] = "%s: non è un indirizzo email valido.";
+$a->strings["Please join us on Friendica"] = "Unisciti a noi su Friendica";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Limite degli inviti superato. Contatta l'amministratore del tuo sito.";
+$a->strings["%s : Message delivery failed."] = "%s: la consegna del messaggio fallita.";
+$a->strings["%d message sent."] = [
+	0 => "%d messaggio inviato.",
+	1 => "%d messaggi inviati.",
+];
+$a->strings["You have no more invitations available"] = "Non hai altri inviti disponibili";
+$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."] = "Visita %s per una lista di siti pubblici a cui puoi iscriverti. I membri Friendica su altri siti possono collegarsi uno con l'altro, come con membri di molti altri social network.";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Per accettare questo invito, visita e registrati su %s o su un'altro sito web Friendica aperto al pubblico.";
+$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."] = "I siti Friendica son tutti collegati tra loro per creare una grossa rete sociale rispettosa della privacy, posseduta e controllata dai suoi membri. I siti Friendica possono anche collegarsi a molti altri social network tradizionali. Vai su %s per una lista di siti Friendica alternativi a cui puoi iscriverti.";
+$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Ci scusiamo, questo sistema non è configurato per collegarsi con altri siti pubblici o per invitare membri.";
+$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."] = "I siti Friendica son tutti collegati tra loro per creare una grossa rete sociale rispettosa della privacy, posseduta e controllata dai suoi membri. I siti Friendica possono anche collegarsi a molti altri social network tradizionali.";
+$a->strings["To accept this invitation, please visit and register at %s."] = "Per accettare questo invito, visita e registrati su %s";
+$a->strings["Send invitations"] = "Invia inviti";
+$a->strings["Enter email addresses, one per line:"] = "Inserisci gli indirizzi email, uno per riga:";
+$a->strings["Your message:"] = "Il tuo messaggio:";
+$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Sei cordialmente invitato/a ad unirti a me e ad altri amici su Friendica, e ad aiutarci a creare una rete sociale migliore.";
+$a->strings["You will need to supply this invitation code: \$invite_code"] = "Sarà necessario fornire questo codice invito: \$invite_code";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Una volta registrato, connettiti con me dal mio profilo:";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "Per maggiori informazioni sul progetto Friendica e perchè pensiamo sia importante, visita http://friendi.ca ";
 $a->strings["Unable to locate original post."] = "Impossibile trovare il messaggio originale.";
 $a->strings["Empty post discarded."] = "Messaggio vuoto scartato.";
+$a->strings["Wall Photos"] = "Foto della bacheca";
 $a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Questo messaggio ti è stato inviato da %s, un membro del social network Friendica.";
 $a->strings["You may visit them online at %s"] = "Puoi visitarli online su %s";
 $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Contatta il mittente rispondendo a questo post se non vuoi ricevere questi messaggi.";
 $a->strings["%s posted an update."] = "%s ha inviato un aggiornamento.";
-$a->strings["Invalid request identifier."] = "L'identificativo della richiesta non è valido.";
+$a->strings["Remote privacy information not available."] = "Informazioni remote sulla privacy non disponibili.";
+$a->strings["Visible to:"] = "Visibile a:";
+$a->strings["No valid account found."] = "Nessun account valido trovato.";
+$a->strings["Password reset request issued. Check your email."] = "La richiesta per reimpostare la password è stata inviata. Controlla la tua 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."] = "\nGentile %1\$s,\n\tabbiamo ricevuto su \"%2\$s\" una richiesta di resettare la password del tuo account. Per confermare questa richiesta, selezionate il link di conferma qui sotto o incollatelo nella barra indirizzo del vostro browser.\n\nSe NON hai richiesto questa modifica, NON selezionare il link e ignora o cancella questa email.\n\nLa tua password non verrà modificata a meno che non possiamo verificare che tu abbia effettivamente richiesto la modifica.";
+$a->strings["\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"] = "\nSegui questo link per verificare la tua identità:\n\n%1\$s\n\nRiceverai in un successivo messaggio la nuova password.\nPotrai cambiarla dalla pagina \"Impostazioni\" del tuo account dopo esserti autenticato.\n\nI dettagli del tuo account sono:\n\tIndirizzo del sito: %2\$s\n\tNome utente: %3\$s";
+$a->strings["Password reset requested at %s"] = "Richiesta reimpostazione password su %s";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La richiesta non può essere verificata. (Puoi averla già richiesta precedentemente). Reimpostazione password fallita.";
+$a->strings["Request has expired, please make a new one."] = "La richiesta è scaduta, si prega di crearne una nuova.";
+$a->strings["Forgot your Password?"] = "Hai dimenticato la password?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Inserisci il tuo indirizzo email per reimpostare la password.";
+$a->strings["Nickname or Email: "] = "Nome utente o email: ";
+$a->strings["Reset"] = "Reimposta";
+$a->strings["Password Reset"] = "Reimpostazione password";
+$a->strings["Your password has been reset as requested."] = "La tua password è stata reimpostata come richiesto.";
+$a->strings["Your new password is"] = "La tua nuova password è";
+$a->strings["Save or copy your new password - and then"] = "Salva o copia la tua nuova password, quindi";
+$a->strings["click here to login"] = "clicca qui per entrare";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Puoi cambiare la tua password dalla pagina <em>Impostazioni</em> dopo aver effettuato l'accesso.";
+$a->strings["\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"] = "\nGentile %1\$s,\n\tLa tua password è stata modificata come richiesto.\nSalva questa password, o sostituiscila immediatamente con qualcosa che puoi ricordare.";
+$a->strings["\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"] = "\nI dettagli del tuo account sono:\n\n\tIndirizzo del sito: %1\$s\n\tNome utente: %2\$s\n\tPassword: %3\$s\n\nPuoi cambiare questa password dalla pagina \"Impostazioni\" del tuo account dopo esserti autenticato.";
+$a->strings["Your password has been changed at %s"] = "La tua password presso %s è stata cambiata";
+$a->strings["Manage Identities and/or Pages"] = "Gestisci identità e/o pagine";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Cambia tra differenti identità o pagine comunità/gruppi che condividono il tuo account o per cui hai i permessi di gestione";
+$a->strings["Select an identity to manage: "] = "Seleziona un'identità da gestire:";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "Nessuna parola chiave per l'abbinamento. Aggiungi parole chiave al tuo profilo predefinito.";
+$a->strings["is interested in:"] = "è interessato a:";
+$a->strings["Profile Match"] = "Profili corrispondenti";
+$a->strings["New Message"] = "Nuovo messaggio";
+$a->strings["No recipient selected."] = "Nessun destinatario selezionato.";
+$a->strings["Unable to locate contact information."] = "Impossibile trovare le informazioni del contatto.";
+$a->strings["Message could not be sent."] = "Il messaggio non può essere inviato.";
+$a->strings["Message collection failure."] = "Errore recuperando il messaggio.";
+$a->strings["Message sent."] = "Messaggio inviato.";
 $a->strings["Discard"] = "Scarta";
+$a->strings["Messages"] = "Messaggi";
+$a->strings["Do you really want to delete this message?"] = "Vuoi veramente cancellare questo messaggio?";
+$a->strings["Message deleted."] = "Messaggio eliminato.";
+$a->strings["Conversation removed."] = "Conversazione rimossa.";
+$a->strings["Send Private Message"] = "Invia un messaggio privato";
+$a->strings["To:"] = "A:";
+$a->strings["Subject:"] = "Oggetto:";
+$a->strings["No messages."] = "Nessun messaggio.";
+$a->strings["Message not available."] = "Messaggio non disponibile.";
+$a->strings["Delete message"] = "Elimina il messaggio";
+$a->strings["D, d M Y - g:i A"] = "D d M Y - G:i";
+$a->strings["Delete conversation"] = "Elimina la conversazione";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Nessuna comunicazione sicura disponibile, <strong>Potresti</strong> essere in grado di rispondere dalla pagina del profilo del mittente.";
+$a->strings["Send Reply"] = "Invia la risposta";
+$a->strings["Unknown sender - %s"] = "Mittente sconosciuto - %s";
+$a->strings["You and %s"] = "Tu e %s";
+$a->strings["%s and You"] = "%s e Tu";
+$a->strings["%d message"] = [
+	0 => "%d messaggio",
+	1 => "%d messaggi",
+];
+$a->strings["Remove term"] = "Rimuovi termine";
+$a->strings["Saved Searches"] = "Ricerche salvate";
+$a->strings["add"] = "aggiungi";
+$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
+	0 => "Attenzione: Questo gruppo contiene %s membro da una rete che non permette la ricezione di messaggi non pubblici.",
+	1 => "Attenzione: Questo gruppo contiene %s membri da reti che non permettono la ricezione di messaggi non pubblici.",
+];
+$a->strings["Messages in this group won't be send to these receivers."] = "I messaggi in questo gruppo non saranno inviati ai quei contatti.";
+$a->strings["No such group"] = "Nessun gruppo";
+$a->strings["Group: %s"] = "Gruppo: %s";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "I messaggi privati a questa persona potrebbero risultare visibili anche pubblicamente.";
+$a->strings["Invalid contact."] = "Contatto non valido.";
+$a->strings["Commented Order"] = "Ordina per commento";
+$a->strings["Sort by Comment Date"] = "Ordina per data commento";
+$a->strings["Posted Order"] = "Ordina per invio";
+$a->strings["Sort by Post Date"] = "Ordina per data messaggio";
+$a->strings["Personal"] = "Personale";
+$a->strings["Posts that mention or involve you"] = "Messaggi che ti citano o coinvolgono";
+$a->strings["New"] = "Nuovo";
+$a->strings["Activity Stream - by date"] = "Activity Stream - per data";
+$a->strings["Shared Links"] = "Links condivisi";
+$a->strings["Interesting Links"] = "Link Interessanti";
+$a->strings["Starred"] = "Preferiti";
+$a->strings["Favourite Posts"] = "Messaggi preferiti";
+$a->strings["Personal Notes"] = "Note personali";
+$a->strings["Invalid request identifier."] = "L'identificativo della richiesta non è valido.";
 $a->strings["Notifications"] = "Notifiche";
 $a->strings["Network Notifications"] = "Notifiche dalla rete";
+$a->strings["System Notifications"] = "Notifiche di sistema";
 $a->strings["Personal Notifications"] = "Notifiche personali";
 $a->strings["Home Notifications"] = "Notifiche bacheca";
 $a->strings["Show Ignored Requests"] = "Mostra richieste ignorate";
 $a->strings["Hide Ignored Requests"] = "Nascondi richieste ignorate";
-$a->strings["Notification type: "] = "Tipo di notifica: ";
-$a->strings["suggested by %s"] = "suggerito da %s";
+$a->strings["Notification type:"] = "Tipo di notifica:";
+$a->strings["Suggested by:"] = "Suggerito da:";
 $a->strings["Claims to be known to you: "] = "Dice di conoscerti: ";
 $a->strings["yes"] = "si";
 $a->strings["no"] = "no";
@@ -1367,11 +1245,88 @@ $a->strings["No introductions."] = "Nessuna presentazione.";
 $a->strings["Show unread"] = "Mostra non letti";
 $a->strings["Show all"] = "Mostra tutti";
 $a->strings["No more %s notifications."] = "Nessun'altra notifica %s.";
+$a->strings["No more system notifications."] = "Nessuna nuova notifica di sistema.";
+$a->strings["Post successful."] = "Inviato!";
+$a->strings["OpenID protocol error. No ID returned."] = "Errore protocollo OpenID. Nessun ID ricevuto.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "L'account non è stato trovato, e la registrazione via OpenID non è permessa su questo sito.";
+$a->strings["Login failed."] = "Accesso fallito.";
+$a->strings["Photo Albums"] = "Album foto";
+$a->strings["Recent Photos"] = "Foto recenti";
+$a->strings["Upload New Photos"] = "Carica nuove foto";
+$a->strings["everybody"] = "tutti";
+$a->strings["Contact information unavailable"] = "I dati di questo contatto non sono disponibili";
+$a->strings["Album not found."] = "Album non trovato.";
+$a->strings["Delete Album"] = "Rimuovi album";
+$a->strings["Do you really want to delete this photo album and all its photos?"] = "Vuoi davvero cancellare questo album e tutte le sue foto?";
+$a->strings["Delete Photo"] = "Rimuovi foto";
+$a->strings["Do you really want to delete this photo?"] = "Vuoi veramente cancellare questa foto?";
+$a->strings["a photo"] = "una foto";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s è stato taggato in %2\$s da %3\$s";
+$a->strings["Image exceeds size limit of %s"] = "La dimensione dell'immagine supera il limite di %s";
+$a->strings["Image upload didn't complete, please try again"] = "Caricamento dell'immagine non completato. Prova di nuovo.";
+$a->strings["Image file is missing"] = "Il file dell'immagine è mancante";
+$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "Il server non può accettare il caricamento di un nuovo file in questo momento, contattare l'amministratore";
+$a->strings["Image file is empty."] = "Il file dell'immagine è vuoto.";
+$a->strings["Unable to process image."] = "Impossibile caricare l'immagine.";
+$a->strings["Image upload failed."] = "Caricamento immagine fallito.";
+$a->strings["No photos selected"] = "Nessuna foto selezionata";
+$a->strings["Access to this item is restricted."] = "Questo oggetto non è visibile a tutti.";
+$a->strings["Upload Photos"] = "Carica foto";
+$a->strings["New album name: "] = "Nome nuovo album: ";
+$a->strings["or select existing album:"] = "o seleziona un album esistente:";
+$a->strings["Do not show a status post for this upload"] = "Non creare un post per questo upload";
+$a->strings["Show to Groups"] = "Mostra ai gruppi";
+$a->strings["Show to Contacts"] = "Mostra ai contatti";
+$a->strings["Edit Album"] = "Modifica album";
+$a->strings["Show Newest First"] = "Mostra nuove foto per prime";
+$a->strings["Show Oldest First"] = "Mostra vecchie foto per prime";
+$a->strings["View Photo"] = "Vedi foto";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Permesso negato. L'accesso a questo elemento può essere limitato.";
+$a->strings["Photo not available"] = "Foto non disponibile";
+$a->strings["View photo"] = "Vedi foto";
+$a->strings["Edit photo"] = "Modifica foto";
+$a->strings["Use as profile photo"] = "Usa come foto del profilo";
+$a->strings["Private Message"] = "Messaggio privato";
+$a->strings["View Full Size"] = "Vedi dimensione intera";
+$a->strings["Tags: "] = "Tag: ";
+$a->strings["[Remove any tag]"] = "[Rimuovi tutti i tag]";
+$a->strings["New album name"] = "Nuovo nome dell'album";
+$a->strings["Caption"] = "Titolo";
+$a->strings["Add a Tag"] = "Aggiungi tag";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Esempio: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
+$a->strings["Do not rotate"] = "Non ruotare";
+$a->strings["Rotate CW (right)"] = "Ruota a destra";
+$a->strings["Rotate CCW (left)"] = "Ruota a sinistra";
+$a->strings["I like this (toggle)"] = "Mi piace (clic per cambiare)";
+$a->strings["I don't like this (toggle)"] = "Non mi piace (clic per cambiare)";
+$a->strings["Comment"] = "Commento";
+$a->strings["Map"] = "Mappa";
+$a->strings["View Album"] = "Sfoglia l'album";
+$a->strings["{0} wants to be your friend"] = "{0} vuole essere tuo amico";
+$a->strings["{0} sent you a message"] = "{0} ti ha inviato un messaggio";
+$a->strings["{0} requested registration"] = "{0} chiede la registrazione";
+$a->strings["Poke/Prod"] = "Tocca/Pungola";
+$a->strings["poke, prod or do other things to somebody"] = "tocca, pungola o fai altre cose a qualcuno";
+$a->strings["Recipient"] = "Destinatario";
+$a->strings["Choose what you wish to do to recipient"] = "Scegli cosa vuoi fare al destinatario";
+$a->strings["Make this post private"] = "Rendi questo post privato";
 $a->strings["Requested profile is not available."] = "Profilo richiesto non disponibile.";
 $a->strings["%s's timeline"] = "la timeline di %s";
 $a->strings["%s's posts"] = "il messaggio di %s";
 $a->strings["%s's comments"] = "il commento di %s";
-$a->strings["Tips for New Members"] = "Consigli per i Nuovi Utenti";
+$a->strings["Image uploaded but image cropping failed."] = "L'immagine è stata caricata, ma il non è stato possibile ritagliarla.";
+$a->strings["Image size reduction [%s] failed."] = "Il ridimensionamento dell'immagine [%s] è fallito.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Ricarica la pagina con shift+F5 o cancella la cache del browser se la nuova foto non viene mostrata immediatamente.";
+$a->strings["Unable to process image"] = "Impossibile elaborare l'immagine";
+$a->strings["Upload File:"] = "Carica un file:";
+$a->strings["Select a profile:"] = "Seleziona un profilo:";
+$a->strings["or"] = "o";
+$a->strings["skip this step"] = "salta questo passaggio";
+$a->strings["select a photo from your photo albums"] = "seleziona una foto dai tuoi album";
+$a->strings["Crop Image"] = "Ritaglia immagine";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Ritaglia l'immagine per una visualizzazione migliore.";
+$a->strings["Done Editing"] = "Finito";
+$a->strings["Image uploaded successfully."] = "Immagine caricata con successo.";
 $a->strings["Profile deleted."] = "Profilo eliminato.";
 $a->strings["Profile-"] = "Profilo-";
 $a->strings["New profile created."] = "Il nuovo profilo è stato creato.";
@@ -1396,6 +1351,7 @@ $a->strings["Profile Actions"] = "Azioni Profilo";
 $a->strings["Edit Profile Details"] = "Modifica i dettagli del profilo";
 $a->strings["Change Profile Photo"] = "Cambia la foto del profilo";
 $a->strings["View this profile"] = "Visualizza questo profilo";
+$a->strings["View all profiles"] = "Vedi tutti i profili";
 $a->strings["Edit visibility"] = "Modifica visibilità";
 $a->strings["Create a new profile using these settings"] = "Crea un nuovo profilo usando queste impostazioni";
 $a->strings["Clone this profile"] = "Clona questo profilo";
@@ -1451,6 +1407,10 @@ $a->strings["visible to everybody"] = "visibile a tutti";
 $a->strings["Edit/Manage Profiles"] = "Modifica / Gestisci profili";
 $a->strings["Change profile photo"] = "Cambia la foto del profilo";
 $a->strings["Create New Profile"] = "Crea un nuovo profilo";
+$a->strings["Invalid profile identifier."] = "Identificativo del profilo non valido.";
+$a->strings["Profile Visibility Editor"] = "Modifica visibilità del profilo";
+$a->strings["Visible To"] = "Visibile a";
+$a->strings["All Contacts (with secure profile access)"] = "Tutti i contatti (con profilo ad accesso sicuro)";
 $a->strings["Registration successful. Please check your email for further instructions."] = "Registrazione completata. Controlla la tua mail per ulteriori informazioni.";
 $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."] = "Si è verificato un errore inviando l'email. I dettagli del tuo account:<br> login: %s<br> password: %s<br><br>Puoi cambiare la password dopo il login.";
 $a->strings["Registration successful."] = "Registrazione completata.";
@@ -1473,17 +1433,29 @@ $a->strings["Choose a profile nickname. This must begin with a text character. Y
 $a->strings["Choose a nickname: "] = "Scegli un nome utente: ";
 $a->strings["Register"] = "Registrati";
 $a->strings["Import your profile to this friendica instance"] = "Importa il tuo profilo in questo server friendica";
+$a->strings["Note: This node explicitly contains adult content"] = "Nota: Questo nodo contiene esplicitamente contenuti per adulti";
+$a->strings["Account approved."] = "Account approvato.";
+$a->strings["Registration revoked for %s"] = "Registrazione revocata per %s";
+$a->strings["Please login."] = "Accedi.";
 $a->strings["User deleted their account"] = "L'utente ha cancellato il suo account";
 $a->strings["On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups."] = "Sul tuo nodo Friendica un utente ha cancellato il suo account. Assicurati che i suoi dati siano rimossi dai backup.";
 $a->strings["The user id is %d"] = "L'id utente è %d";
 $a->strings["Remove My Account"] = "Rimuovi il mio account";
 $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Questo comando rimuoverà completamente il tuo account. Una volta rimosso non potrai più recuperarlo.";
 $a->strings["Please enter your password for verification:"] = "Inserisci la tua password per verifica:";
+$a->strings["Resubscribing to OStatus contacts"] = "Risottoscrivi i contatti OStatus";
+$a->strings["Error"] = "Errore";
+$a->strings["Only logged in users are permitted to perform a search."] = "Solo agli utenti autenticati è permesso eseguire ricerche.";
+$a->strings["Too Many Requests"] = "Troppe richieste";
+$a->strings["Only one search per minute is permitted for not logged in users."] = "Solo una ricerca al minuto è permessa agli utenti non autenticati.";
+$a->strings["Items tagged with: %s"] = "Elementi taggati con: %s";
 $a->strings["Account"] = "Account";
+$a->strings["Profiles"] = "Profili";
 $a->strings["Display"] = "Visualizzazione";
 $a->strings["Social Networks"] = "Social Networks";
 $a->strings["Delegations"] = "Delegazioni";
 $a->strings["Connected apps"] = "Applicazioni collegate";
+$a->strings["Export personal data"] = "Esporta dati personali";
 $a->strings["Remove account"] = "Rimuovi account";
 $a->strings["Missing some important data!"] = "Mancano alcuni dati importanti!";
 $a->strings["Failed to connect with email account using the settings provided."] = "Impossibile collegarsi all'account email con i parametri forniti.";
@@ -1569,7 +1541,7 @@ $a->strings["Don't show notices"] = "Non mostrare gli avvisi";
 $a->strings["Infinite scroll"] = "Scroll infinito";
 $a->strings["Automatic updates only at the top of the network page"] = "Aggiornamenti automatici solo in cima alla pagina \"rete\"";
 $a->strings["When disabled, the network page is updated all the time, which could be confusing while reading."] = "Quando disabilitato, la pagina \"rete\" è aggiornata continuamente, cosa che può confondere durante la lettura.";
-$a->strings["Bandwith Saver Mode"] = "Modalità Salva Banda";
+$a->strings["Bandwidth Saver Mode"] = "Modalità Salva Banda";
 $a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Quando abilitato, il contenuto embeddato non è mostrato quando la pagina si aggiorna automaticamente, ma solo quando la pagina viene ricaricata.";
 $a->strings["Smart Threading"] = "Smart Threading";
 $a->strings["When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled."] = "Quando è abilitato, rimuove i rientri eccessivi nella visualizzazione delle discussioni, mantenendoli dove sono importanti. Funziona solo se le conversazioni a thread sono disponibili e abilitate.";
@@ -1594,13 +1566,13 @@ $a->strings["Requires manual approval of contact requests."] = "Richiede l'appro
 $a->strings["OpenID:"] = "OpenID:";
 $a->strings["(Optional) Allow this OpenID to login to this account."] = "(Opzionale) Consente di loggarti in questo account con questo OpenID";
 $a->strings["Publish your default profile in your local site directory?"] = "Pubblica il tuo profilo predefinito nell'elenco locale del sito";
-$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."] = "Il tuo profilo sarà pubblicato nella directory globale di friendica (p.e. <a href=\"%s\">%s</a>). Il tuo profilo sarà visibile pubblicamente.";
-$a->strings["Publish your default profile in the global social directory?"] = "Pubblica il tuo profilo predefinito nell'elenco sociale globale";
 $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."] = "Il tuo profilo verrà pubblicato nella <a href=\"%s\">directory locale</a> di questo nodo. I dettagli del tuo profilo potrebbero essere visibili pubblicamente a seconda delle impostazioni di sistema.";
+$a->strings["Publish your default profile in the global social directory?"] = "Pubblica il tuo profilo predefinito nell'elenco sociale globale";
+$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."] = "Il tuo profilo sarà pubblicato nella directory globale di friendica (p.e. <a href=\"%s\">%s</a>). Il tuo profilo sarà visibile pubblicamente.";
 $a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Nascondi la lista dei tuoi contatti/amici dai visitatori del tuo profilo predefinito";
 $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"] = "La tua lista di contatti non sarà mostrata nella tua pagina profilo di default. Puoi decidere di mostrare la tua lista contatti separatamente per ogni profilo in più che crei.";
 $a->strings["Hide your profile details from anonymous viewers?"] = "Nascondi i dettagli del tuo profilo ai visitatori anonimi?";
-$a->strings["Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Disables posting public messages to Diaspora and other networks."] = "I visitatori anonimi vedranno nella tua pagina profilo solo la tua foto del profilo, il tuo nome e il nome utente che stai usando. Disabilita l'invio di messaggi pubblici verso Diaspora e altre reti.";
+$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."] = "I visitatori anonimi vedranno nella tua pagina profilo solo la tua foto del profilo, il tuo nome e il nome utente che stai usando. I tuoi post pubblici e le risposte saranno comunque accessibili in altre maniere.";
 $a->strings["Allow friends to post to your profile page?"] = "Permetti agli amici di scrivere sulla tua pagina profilo?";
 $a->strings["Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"] = "I tuoi contatti possono scrivere messaggi sulla tua pagina di profilo. Questi messaggi saranno distribuiti a tutti i tuoi contatti.";
 $a->strings["Allow friends to tag your posts?"] = "Permetti agli amici di aggiungere tag  ai tuoi messaggi?";
@@ -1664,6 +1636,46 @@ $a->strings["Change the behaviour of this account for special situations"] = "Mo
 $a->strings["Relocate"] = "Trasloca";
 $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."] = "Se hai spostato questo profilo da un'altro server, e alcuni dei tuoi contatti non ricevono i tuoi aggiornamenti, prova a premere questo bottone.";
 $a->strings["Resend relocate message to contacts"] = "Invia nuovamente il messaggio di trasloco ai contatti";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s sta seguendo %3\$s di %2\$s";
+$a->strings["Do you really want to delete this suggestion?"] = "Vuoi veramente cancellare questo suggerimento?";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Nessun suggerimento disponibile. Se questo è un sito nuovo, riprova tra 24 ore.";
+$a->strings["Ignore/Hide"] = "Ignora / Nascondi";
+$a->strings["Friend Suggestions"] = "Contatti suggeriti";
+$a->strings["Tag removed"] = "Tag rimosso";
+$a->strings["Remove Item Tag"] = "Rimuovi il tag";
+$a->strings["Select a tag to remove: "] = "Seleziona un tag da rimuovere: ";
+$a->strings["Export account"] = "Esporta 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."] = "Esporta le informazioni del tuo account e dei contatti. Usa questa funzione per fare un backup del tuo account o per spostarlo in un altro server.";
+$a->strings["Export all"] = "Esporta tutto";
+$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)"] = "Esporta le informazioni del tuo account, i tuoi contatti e tutti i tuoi elementi in json. Può diventare un file veramente molto grosso e metterci un sacco di tempo. Usa questa funzione per fare un backup completo del tuo account (le foto non sono esportate)";
+$a->strings["Contact wasn't found or can't be unfollowed."] = "Il contatto non è stato trovato o non si può smettere di seguirlo.";
+$a->strings["Contact unfollowed"] = "Smesso di seguire il contatto";
+$a->strings["You aren't a friend of this contact."] = "Non sei un amico di questo contatto";
+$a->strings["Unfollowing is currently not supported by your network."] = "Smettere di seguire non è al momento supportato dalla tua rete.";
+$a->strings["Do you really want to delete this video?"] = "Vuoi veramente cancellare questo video?";
+$a->strings["Delete Video"] = "Rimuovi video";
+$a->strings["No videos selected"] = "Nessun video selezionato";
+$a->strings["Recent Videos"] = "Video Recenti";
+$a->strings["Upload New Videos"] = "Carica Nuovo Video";
+$a->strings["No contacts."] = "Nessun contatto.";
+$a->strings["Invalid request."] = "Richiesta non valida.";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Mi spiace, forse il file che stai caricando è più grosso di quanto la configurazione di PHP permetta";
+$a->strings["Or - did you try to upload an empty file?"] = "O.. non avrai provato a caricare un file vuoto?";
+$a->strings["File exceeds size limit of %s"] = "Il file supera la dimensione massima di %s";
+$a->strings["File upload failed."] = "Caricamento del file non riuscito.";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Numero giornaliero di messaggi per %s superato. Invio fallito.";
+$a->strings["Unable to check your home location."] = "Impossibile controllare la tua posizione di origine.";
+$a->strings["No recipient."] = "Nessun destinatario.";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Se vuoi che %s ti risponda, controlla che le tue impostazioni di privacy permettano la ricezione di messaggi privati da mittenti sconosciuti.";
+$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."] = "Questo è Friendica, versione %s in esecuzione all'indirizzo web %s. La versione del database è %s, la versione post-aggiornamento è %s.";
+$a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "Visita <a href=\"https://friendi.ca\">Friendi.ca</a> per saperne di più sul progetto Friendica.";
+$a->strings["Bug reports and issues: please visit"] = "Segnalazioni di bug e problemi: visita";
+$a->strings["the bugtracker at github"] = "il bugtracker su github";
+$a->strings["Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"] = "Per suggerimenti, lodi, ecc., invia una mail a info chiocciola friendi punto ca";
+$a->strings["Installed addons/apps:"] = "Addon/applicazioni installate";
+$a->strings["No installed addons/apps"] = "Nessun addons/applicazione installata";
+$a->strings["Read about the <a href=\"%1\$s/tos\">Terms of Service</a> of this node."] = "Leggi i <a href=\"%1\$s/tos\">Termini di Servizio</a> di questo nodo.";
+$a->strings["On this server the following remote servers are blocked."] = "In questo server i seguenti server remoti sono bloccati.";
 $a->strings["default"] = "default";
 $a->strings["greenzero"] = "greenzero";
 $a->strings["purplezero"] = "purplezero";
@@ -1734,39 +1746,10 @@ $a->strings["Invite Friends"] = "Invita amici";
 $a->strings["Local Directory"] = "Elenco Locale";
 $a->strings["External link to forum"] = "Link esterno al forum";
 $a->strings["Quick Start"] = "Quick Start";
-$a->strings["Error decoding account file"] = "Errore decodificando il file account";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Errore! Nessuna informazione di versione nel file! Potrebbe non essere un file account di Friendica?";
-$a->strings["User '%s' already exists on this server!"] = "L'utente '%s' esiste già su questo server!";
-$a->strings["User creation error"] = "Errore creando l'utente";
-$a->strings["User profile creation error"] = "Errore creando il profilo dell'utente";
-$a->strings["%d contact not imported"] = [
-	0 => "%d contatto non importato",
-	1 => "%d contatti non importati",
-];
-$a->strings["Done. You can now login with your username and password"] = "Fatto. Ora puoi entrare con il tuo nome utente e la tua password";
-$a->strings["Post to Email"] = "Invia a email";
-$a->strings["Hide your profile details from unknown viewers?"] = "Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?";
-$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Connettore disabilitato, dato che \"%s\" è abilitato.";
-$a->strings["Visible to everybody"] = "Visibile a tutti";
-$a->strings["Close"] = "Chiudi";
-$a->strings["Enter new password: "] = "Inserisci la nuova password:";
-$a->strings["Password can't be empty"] = "La password non puo' essere vuota";
 $a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "Impossibile trovare contatti non archiviati a questo URL (%s)";
 $a->strings["The contact entries have been archived"] = "Il contatto è stato archiviato";
-$a->strings["System"] = "Sistema";
-$a->strings["Home"] = "Home";
-$a->strings["Introductions"] = "Presentazioni";
-$a->strings["%s commented on %s's post"] = "%s ha commentato il messaggio di %s";
-$a->strings["%s created a new post"] = "%s a creato un nuovo messaggio";
-$a->strings["%s liked %s's post"] = "a %s è piaciuto il messaggio di %s";
-$a->strings["%s disliked %s's post"] = "a %s non è piaciuto il messaggio di %s";
-$a->strings["%s is attending %s's event"] = "%s partecipa all'evento di %s";
-$a->strings["%s is not attending %s's event"] = "%s non partecipa all'evento di %s";
-$a->strings["%s may attend %s's event"] = "%s potrebbe partecipare all'evento di %s";
-$a->strings["%s is now friends with %s"] = "%s è ora amico di %s";
-$a->strings["Friend Suggestion"] = "Amico suggerito";
-$a->strings["Friend/Connect Request"] = "Richiesta amicizia/connessione";
-$a->strings["New Follower"] = "Qualcuno inizia a seguirti";
+$a->strings["Enter new password: "] = "Inserisci la nuova password:";
+$a->strings["Password can't be empty"] = "La password non puo' essere vuota";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "Non riesco a trovare la versione di PHP da riga di comando nel PATH del server web";
 $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>"] = "Se non hai la versione a riga di comando di PHP installata sul tuo server, non sarai in grado di eseguire i processi in background. Vedi <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the poller'</a>";
 $a->strings["PHP executable path"] = "Percorso eseguibile PHP";
@@ -1800,11 +1783,11 @@ $a->strings["Error: mb_string PHP module required but not installed."] = "Errore
 $a->strings["Error: iconv PHP module required but not installed."] = "Errore: il modulo PHP iconv è richiesto ma non installato.";
 $a->strings["Error: POSIX PHP module required but not installed."] = "Errore, il modulo PHP POSIX è richiesto ma non installato.";
 $a->strings["Error, XML PHP module required but not installed."] = "Errore, il modulo PHP XML è richiesto ma non installato.";
-$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."] = "L'installazione web deve poter creare un file chiamato \".htconfig.php\" nella cartella principale del tuo web server ma non è in grado di farlo.";
+$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."] = "L'installer web deve essere in grado di creare un file chiamato \"local.ini.php\"  nella cartella \"config\" del tuo server web, ma non è in grado di farlo.";
 $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."] = "Ciò è dovuto spesso a impostazioni di permessi, dato che il web server può non essere in grado di scrivere il file nella tua cartella, anche se tu puoi.";
-$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."] = "Alla fine di questa procedura, di daremo un testo da salvare in un file chiamato .htconfig.php nella tua cartella principale di 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."] = "Alla fine di questa procedura, ti daremo un testo da salvare in un file chiamato \"local.ini.php\" nella cartella \"config\" della tua installazione di Friendica.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Puoi in alternativa saltare questa procedura ed eseguire l'installazione manualmente. Vedi il file \"INSTALL.txt\" per le istruzioni.";
-$a->strings[".htconfig.php is writable"] = ".htconfig.php è scrivibile";
+$a->strings["config/local.ini.php is writable"] = "config/local.ini.php è scrivibile";
 $a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica usa il motore di template Smarty3 per renderizzare le sue pagine web. Smarty3 compila i template in PHP per velocizzare il rendering.";
 $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."] = "Per salvare questi template compilati, il server werb ha bisogno dell'accesso in scrittura alla cartella view/smarty3/ nella cartella principale dei Friendica.";
 $a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Per favore, controlla che l'utente con cui il tuo server web gira (es www-data) ha accesso in scrittura a questa cartella.";
@@ -1816,6 +1799,35 @@ $a->strings["Url rewrite is working"] = "La riscrittura degli url funziona";
 $a->strings["ImageMagick PHP extension is not installed"] = "L'estensione PHP ImageMagick non è installata";
 $a->strings["ImageMagick PHP extension is installed"] = "L'estensione PHP ImageMagick è installata";
 $a->strings["ImageMagick supports GIF"] = "ImageMagick supporta i GIF";
+$a->strings["Post to Email"] = "Invia a email";
+$a->strings["Hide your profile details from unknown viewers?"] = "Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Connettore disabilitato, dato che \"%s\" è abilitato.";
+$a->strings["Visible to everybody"] = "Visibile a tutti";
+$a->strings["Close"] = "Chiudi";
+$a->strings["System"] = "Sistema";
+$a->strings["Home"] = "Home";
+$a->strings["Introductions"] = "Presentazioni";
+$a->strings["%s commented on %s's post"] = "%s ha commentato il messaggio di %s";
+$a->strings["%s created a new post"] = "%s a creato un nuovo messaggio";
+$a->strings["%s liked %s's post"] = "a %s è piaciuto il messaggio di %s";
+$a->strings["%s disliked %s's post"] = "a %s non è piaciuto il messaggio di %s";
+$a->strings["%s is attending %s's event"] = "%s partecipa all'evento di %s";
+$a->strings["%s is not attending %s's event"] = "%s non partecipa all'evento di %s";
+$a->strings["%s may attend %s's event"] = "%s potrebbe partecipare all'evento di %s";
+$a->strings["%s is now friends with %s"] = "%s è ora amico di %s";
+$a->strings["Friend Suggestion"] = "Amico suggerito";
+$a->strings["Friend/Connect Request"] = "Richiesta amicizia/connessione";
+$a->strings["New Follower"] = "Qualcuno inizia a seguirti";
+$a->strings["Error decoding account file"] = "Errore decodificando il file account";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Errore! Nessuna informazione di versione nel file! Potrebbe non essere un file account di Friendica?";
+$a->strings["User '%s' already exists on this server!"] = "L'utente '%s' esiste già su questo server!";
+$a->strings["User creation error"] = "Errore creando l'utente";
+$a->strings["User profile creation error"] = "Errore creando il profilo dell'utente";
+$a->strings["%d contact not imported"] = [
+	0 => "%d contatto non importato",
+	1 => "%d contatti non importati",
+];
+$a->strings["Done. You can now login with your username and password"] = "Fatto. Ora puoi entrare con il tuo nome utente e la tua password";
 $a->strings["Birthday:"] = "Compleanno:";
 $a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-GG o MM-GG";
 $a->strings["never"] = "mai";
@@ -1839,11 +1851,60 @@ $a->strings["$1 wrote:"] = "$1 ha scritto:";
 $a->strings["Encrypted content"] = "Contenuto criptato";
 $a->strings["Invalid source protocol"] = "Protocollo sorgente non valido";
 $a->strings["Invalid link protocol"] = "Protocollo link non valido";
-$a->strings["Embedding disabled"] = "Embed disabilitato";
-$a->strings["Embedded content"] = "Contenuto incorporato";
 $a->strings["Export"] = "Esporta";
 $a->strings["Export calendar as ical"] = "Esporta il calendario in formato ical";
 $a->strings["Export calendar as csv"] = "Esporta il calendario in formato csv";
+$a->strings["General Features"] = "Funzionalità generali";
+$a->strings["Multiple Profiles"] = "Profili multipli";
+$a->strings["Ability to create multiple profiles"] = "Possibilità di creare profili multipli";
+$a->strings["Photo Location"] = "Località Foto";
+$a->strings["Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map."] = "I metadati delle foto vengono rimossi. Questa opzione estrae la località (se presenta) prima di rimuovere i metadati e la collega a una mappa.";
+$a->strings["Export Public Calendar"] = "Esporta calendario pubblico";
+$a->strings["Ability for visitors to download the public calendar"] = "Permesso ai visitatori di scaricare il calendario pubblico";
+$a->strings["Post Composition Features"] = "Funzionalità di composizione dei post";
+$a->strings["Post Preview"] = "Anteprima dei post";
+$a->strings["Allow previewing posts and comments before publishing them"] = "Permetti di avere un'anteprima di messaggi e commenti prima di pubblicarli";
+$a->strings["Auto-mention Forums"] = "Auto-cita i Forum";
+$a->strings["Add/remove mention when a forum page is selected/deselected in ACL window."] = "Aggiunge/rimuove una menzione quando una pagina forum è selezionata/deselezionata nella finestra dei permessi.";
+$a->strings["Network Sidebar"] = "Barra laterale nella pagina Rete";
+$a->strings["Ability to select posts by date ranges"] = "Permette di filtrare i post per data";
+$a->strings["List Forums"] = "Elenco forum";
+$a->strings["Enable widget to display the forums your are connected with"] = "Abilita il widget che mostra i forum ai quali sei connesso";
+$a->strings["Group Filter"] = "Filtra gruppi";
+$a->strings["Enable widget to display Network posts only from selected group"] = "Abilita il widget per filtrare i post solo per il gruppo selezionato";
+$a->strings["Network Filter"] = "Filtro reti";
+$a->strings["Enable widget to display Network posts only from selected network"] = "Abilita il widget per mostrare i post solo per la rete selezionata";
+$a->strings["Save search terms for re-use"] = "Salva i termini cercati per riutilizzarli";
+$a->strings["Network Tabs"] = "Schede pagina Rete";
+$a->strings["Network Personal Tab"] = "Scheda Personali";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Abilita la scheda per mostrare solo i post a cui hai partecipato";
+$a->strings["Network New Tab"] = "Scheda Nuovi";
+$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Abilita la scheda per mostrare solo i post nuovi (nelle ultime 12 ore)";
+$a->strings["Network Shared Links Tab"] = "Scheda Link Condivisi";
+$a->strings["Enable tab to display only Network posts with links in them"] = "Abilita la scheda per mostrare solo i post che contengono link";
+$a->strings["Post/Comment Tools"] = "Strumenti per messaggi/commenti";
+$a->strings["Multiple Deletion"] = "Eliminazione multipla";
+$a->strings["Select and delete multiple posts/comments at once"] = "Seleziona ed elimina vari messaggi e commenti in una volta sola";
+$a->strings["Edit Sent Posts"] = "Modifica i post inviati";
+$a->strings["Edit and correct posts and comments after sending"] = "Modifica e correggi messaggi e commenti dopo averli inviati";
+$a->strings["Tagging"] = "Aggiunta tag";
+$a->strings["Ability to tag existing posts"] = "Permette di aggiungere tag ai post già esistenti";
+$a->strings["Post Categories"] = "Categorie post";
+$a->strings["Add categories to your posts"] = "Aggiungi categorie ai tuoi post";
+$a->strings["Saved Folders"] = "Cartelle Salvate";
+$a->strings["Ability to file posts under folders"] = "Permette di archiviare i post in cartelle";
+$a->strings["Dislike Posts"] = "Non mi piace";
+$a->strings["Ability to dislike posts/comments"] = "Permetti di inviare \"non mi piace\" ai messaggi";
+$a->strings["Star Posts"] = "Post preferiti";
+$a->strings["Ability to mark special posts with a star indicator"] = "Permette di segnare i post preferiti con una stella";
+$a->strings["Mute Post Notifications"] = "Silenzia le notifiche di nuovi post";
+$a->strings["Ability to mute notifications for a thread"] = "Permette di silenziare le notifiche di nuovi post in una discussione";
+$a->strings["Advanced Profile Settings"] = "Impostazioni Avanzate Profilo";
+$a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Mostra ai visitatori i forum nella pagina Profilo Avanzato";
+$a->strings["Tag Cloud"] = "Tag Cloud";
+$a->strings["Provide a personal tag cloud on your profile page"] = "Mostra una nuvola dei tag personali sulla tua pagina di profilo";
+$a->strings["Display Membership Date"] = "Mostra la Data di Registrazione";
+$a->strings["Display membership date in profile"] = "Mostra la data in cui ti sei registrato nel profilo";
 $a->strings["Frequently"] = "Frequentemente";
 $a->strings["Hourly"] = "Ogni ora";
 $a->strings["Twice daily"] = "Due volte al dì";
@@ -1921,72 +1982,6 @@ $a->strings["Uncertain"] = "Incerto";
 $a->strings["It's complicated"] = "E' complicato";
 $a->strings["Don't care"] = "Non interessa";
 $a->strings["Ask me"] = "Chiedimelo";
-$a->strings["Add New Contact"] = "Aggiungi nuovo contatto";
-$a->strings["Enter address or web location"] = "Inserisci posizione o indirizzo web";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Esempio: bob@example.com, http://example.com/barbara";
-$a->strings["%d invitation available"] = [
-	0 => "%d invito disponibile",
-	1 => "%d inviti disponibili",
-];
-$a->strings["Networks"] = "Reti";
-$a->strings["All Networks"] = "Tutte le Reti";
-$a->strings["Saved Folders"] = "Cartelle Salvate";
-$a->strings["Everything"] = "Tutto";
-$a->strings["Categories"] = "Categorie";
-$a->strings["%d contact in common"] = [
-	0 => "%d contatto in comune",
-	1 => "%d contatti in comune",
-];
-$a->strings["General Features"] = "Funzionalità generali";
-$a->strings["Multiple Profiles"] = "Profili multipli";
-$a->strings["Ability to create multiple profiles"] = "Possibilità di creare profili multipli";
-$a->strings["Photo Location"] = "Località Foto";
-$a->strings["Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map."] = "I metadati delle foto vengono rimossi. Questa opzione estrae la località (se presenta) prima di rimuovere i metadati e la collega a una mappa.";
-$a->strings["Export Public Calendar"] = "Esporta calendario pubblico";
-$a->strings["Ability for visitors to download the public calendar"] = "Permesso ai visitatori di scaricare il calendario pubblico";
-$a->strings["Post Composition Features"] = "Funzionalità di composizione dei post";
-$a->strings["Post Preview"] = "Anteprima dei post";
-$a->strings["Allow previewing posts and comments before publishing them"] = "Permetti di avere un'anteprima di messaggi e commenti prima di pubblicarli";
-$a->strings["Auto-mention Forums"] = "Auto-cita i Forum";
-$a->strings["Add/remove mention when a forum page is selected/deselected in ACL window."] = "Aggiunge/rimuove una menzione quando una pagina forum è selezionata/deselezionata nella finestra dei permessi.";
-$a->strings["Network Sidebar"] = "Barra laterale nella pagina Rete";
-$a->strings["Ability to select posts by date ranges"] = "Permette di filtrare i post per data";
-$a->strings["List Forums"] = "Elenco forum";
-$a->strings["Enable widget to display the forums your are connected with"] = "Abilita il widget che mostra i forum ai quali sei connesso";
-$a->strings["Group Filter"] = "Filtra gruppi";
-$a->strings["Enable widget to display Network posts only from selected group"] = "Abilita il widget per filtrare i post solo per il gruppo selezionato";
-$a->strings["Network Filter"] = "Filtro reti";
-$a->strings["Enable widget to display Network posts only from selected network"] = "Abilita il widget per mostrare i post solo per la rete selezionata";
-$a->strings["Save search terms for re-use"] = "Salva i termini cercati per riutilizzarli";
-$a->strings["Network Tabs"] = "Schede pagina Rete";
-$a->strings["Network Personal Tab"] = "Scheda Personali";
-$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Abilita la scheda per mostrare solo i post a cui hai partecipato";
-$a->strings["Network New Tab"] = "Scheda Nuovi";
-$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Abilita la scheda per mostrare solo i post nuovi (nelle ultime 12 ore)";
-$a->strings["Network Shared Links Tab"] = "Scheda Link Condivisi";
-$a->strings["Enable tab to display only Network posts with links in them"] = "Abilita la scheda per mostrare solo i post che contengono link";
-$a->strings["Post/Comment Tools"] = "Strumenti per messaggi/commenti";
-$a->strings["Multiple Deletion"] = "Eliminazione multipla";
-$a->strings["Select and delete multiple posts/comments at once"] = "Seleziona ed elimina vari messaggi e commenti in una volta sola";
-$a->strings["Edit Sent Posts"] = "Modifica i post inviati";
-$a->strings["Edit and correct posts and comments after sending"] = "Modifica e correggi messaggi e commenti dopo averli inviati";
-$a->strings["Tagging"] = "Aggiunta tag";
-$a->strings["Ability to tag existing posts"] = "Permette di aggiungere tag ai post già esistenti";
-$a->strings["Post Categories"] = "Categorie post";
-$a->strings["Add categories to your posts"] = "Aggiungi categorie ai tuoi post";
-$a->strings["Ability to file posts under folders"] = "Permette di archiviare i post in cartelle";
-$a->strings["Dislike Posts"] = "Non mi piace";
-$a->strings["Ability to dislike posts/comments"] = "Permetti di inviare \"non mi piace\" ai messaggi";
-$a->strings["Star Posts"] = "Post preferiti";
-$a->strings["Ability to mark special posts with a star indicator"] = "Permette di segnare i post preferiti con una stella";
-$a->strings["Mute Post Notifications"] = "Silenzia le notifiche di nuovi post";
-$a->strings["Ability to mute notifications for a thread"] = "Permette di silenziare le notifiche di nuovi post in una discussione";
-$a->strings["Advanced Profile Settings"] = "Impostazioni Avanzate Profilo";
-$a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Mostra ai visitatori i forum nella pagina Profilo Avanzato";
-$a->strings["Tag Cloud"] = "Tag Cloud";
-$a->strings["Provide a personal tag cloud on your profile page"] = "Mostra una nuvola dei tag personali sulla tua pagina di profilo";
-$a->strings["Display Membership Date"] = "Mostra la Data di Registrazione";
-$a->strings["Display membership date in profile"] = "Mostra la data in cui ti sei registrato nel profilo";
 $a->strings["Nothing new here"] = "Niente di nuovo qui";
 $a->strings["Clear notifications"] = "Pulisci le notifiche";
 $a->strings["Personal notes"] = "Note personali";
@@ -2013,11 +2008,27 @@ $a->strings["Inbox"] = "In arrivo";
 $a->strings["Outbox"] = "Inviati";
 $a->strings["Manage"] = "Gestisci";
 $a->strings["Manage other pages"] = "Gestisci altre pagine";
-$a->strings["Profiles"] = "Profili";
 $a->strings["Manage/Edit Profiles"] = "Gestisci/Modifica i profili";
 $a->strings["Site setup and configuration"] = "Configurazione del sito";
 $a->strings["Navigation"] = "Navigazione";
 $a->strings["Site map"] = "Mappa del sito";
+$a->strings["Embedding disabled"] = "Embed disabilitato";
+$a->strings["Embedded content"] = "Contenuto incorporato";
+$a->strings["Add New Contact"] = "Aggiungi nuovo contatto";
+$a->strings["Enter address or web location"] = "Inserisci posizione o indirizzo web";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Esempio: bob@example.com, http://example.com/barbara";
+$a->strings["%d invitation available"] = [
+	0 => "%d invito disponibile",
+	1 => "%d inviti disponibili",
+];
+$a->strings["Networks"] = "Reti";
+$a->strings["All Networks"] = "Tutte le Reti";
+$a->strings["Everything"] = "Tutto";
+$a->strings["Categories"] = "Categorie";
+$a->strings["%d contact in common"] = [
+	0 => "%d contatto in comune",
+	1 => "%d contatti in comune",
+];
 $a->strings["There are no tables on MyISAM."] = "Non ci sono tabelle 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."] = "\nGli sviluppatori di Friendica hanno rilasciato l'aggiornamento %s\nrecentemente, ma quando ho provato a installarlo, qualcosa è \nandato terribilmente storto.\nBisogna sistemare le cose e non posso farlo da solo.\nContatta uno sviluppatore se non sei in grado di aiutarmi. Il mio database potrebbe essere invalido.";
 $a->strings["The error message is\n[pre]%s[/pre]"] = "Il messaggio di errore è\n[pre]%s[/pre]";
@@ -2025,7 +2036,24 @@ $a->strings["\nError %d occurred during database update:\n%s\n"] = "\nErrore %d
 $a->strings["Errors encountered performing database changes: "] = "Errori riscontrati eseguendo le modifiche al database:";
 $a->strings["%s: Database update"] = "%s: Aggiornamento database";
 $a->strings["%s: updating %s table."] = "%s: aggiornando la tabella %s.";
-$a->strings["[no subject]"] = "[nessun oggetto]";
+$a->strings["Drop Contact"] = "Rimuovi contatto";
+$a->strings["Organisation"] = "Organizzazione";
+$a->strings["News"] = "Notizie";
+$a->strings["Forum"] = "Forum";
+$a->strings["Connect URL missing."] = "URL di connessione mancante.";
+$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Il contatto non puo' essere aggiunto. Controlla le credenziali della rete nella tua pagina Impostazioni -> Reti Sociali";
+$a->strings["This site is not configured to allow communications with other networks."] = "Questo sito non è configurato per permettere la comunicazione con altri network.";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "Non sono stati trovati protocolli di comunicazione o feed compatibili.";
+$a->strings["The profile address specified does not provide adequate information."] = "L'indirizzo del profilo specificato non fornisce adeguate informazioni.";
+$a->strings["An author or name was not found."] = "Non è stato trovato un nome o un autore";
+$a->strings["No browser URL could be matched to this address."] = "Nessun URL può essere associato a questo indirizzo.";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Impossibile l'indirizzo identità con un protocollo conosciuto o con un contatto email.";
+$a->strings["Use mailto: in front of address to force email check."] = "Usa \"mailto:\" davanti all'indirizzo per forzare un controllo nelle email.";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "L'indirizzo del profilo specificato appartiene a un network che è stato disabilitato su questo sito.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Profilo limitato. Questa persona non sarà in grado di ricevere notifiche personali da te.";
+$a->strings["Unable to retrieve contact information."] = "Impossibile recuperare informazioni sul contatto.";
+$a->strings["%s's birthday"] = "Compleanno di %s";
+$a->strings["Happy Birthday %s"] = "Buon compleanno %s";
 $a->strings["Starts:"] = "Inizia:";
 $a->strings["Finishes:"] = "Finisce:";
 $a->strings["all-day"] = "tutto il giorno";
@@ -2045,9 +2073,35 @@ $a->strings["Default privacy group for new contacts"] = "Gruppo predefinito per
 $a->strings["Everybody"] = "Tutti";
 $a->strings["edit"] = "modifica";
 $a->strings["Edit group"] = "Modifica gruppo";
-$a->strings["Contacts not in any group"] = "Contatti in nessun gruppo.";
 $a->strings["Create a new group"] = "Crea un nuovo gruppo";
 $a->strings["Edit groups"] = "Modifica gruppi";
+$a->strings["[no subject]"] = "[nessun oggetto]";
+$a->strings["Login failed"] = "Accesso fallito.";
+$a->strings["Not enough information to authenticate"] = "Informazioni insufficienti per l'autenticazione";
+$a->strings["An invitation is required."] = "E' richiesto un invito.";
+$a->strings["Invitation could not be verified."] = "L'invito non puo' essere verificato.";
+$a->strings["Invalid OpenID url"] = "Url OpenID non valido";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Abbiamo incontrato un problema mentre contattavamo il server OpenID che ci hai fornito. Controlla di averlo scritto giusto.";
+$a->strings["The error message was:"] = "Il messaggio riportato era:";
+$a->strings["Please enter the required information."] = "Inserisci le informazioni richieste.";
+$a->strings["Please use a shorter name."] = "Usa un nome più corto.";
+$a->strings["Name too short."] = "Il nome è troppo corto.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Questo non sembra essere il tuo nome completo (Nome Cognome).";
+$a->strings["Your email domain is not among those allowed on this site."] = "Il dominio della tua email non è tra quelli autorizzati su questo sito.";
+$a->strings["Not a valid email address."] = "L'indirizzo email non è valido.";
+$a->strings["The nickname was blocked from registration by the nodes admin."] = "Il nome utente non è utilizzabile in registrazione, per impostazione dell'amministratore del nodo.";
+$a->strings["Cannot use that email."] = "Non puoi usare quell'email.";
+$a->strings["Your nickname can only contain a-z, 0-9 and _."] = "Il tuo nome utente può contenere solo a-z, 0-9 e _.";
+$a->strings["Nickname is already registered. Please choose another."] = "Nome utente già registrato. Scegline un altro.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERRORE GRAVE: La generazione delle chiavi di sicurezza è fallita.";
+$a->strings["An error occurred during registration. Please try again."] = "C'è stato un errore durante la registrazione. Prova ancora.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "C'è stato un errore nella creazione del tuo profilo. Prova ancora.";
+$a->strings["An error occurred creating your self contact. Please try again."] = "C'è stato un errore nella creazione del tuo contatto. Prova ancora.";
+$a->strings["An error occurred creating your default contact group. Please try again."] = "C'è stato un errore nella creazione del tuo gruppo contatti di default. Prova ancora.";
+$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"] = "\nGentile %1\$s,\n\tGrazie per la tua registrazione su %2\$s. Il tuo account è in attesa di approvazione da parte di un amministratore.\n\t";
+$a->strings["Registration at %s"] = "Registrazione su %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"] = "\nGentile %1\$s,\n\tGrazie per esserti registrato su %2\$s. Il tuo account è stato creato.\n\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."] = "\nI dettagli del tuo utente sono:\n    Indirizzo del sito: %3\$s\n    Nome utente:%1\$s \n    Password:%5\$s \n\nPuoi cambiare la tua password dalla pagina delle impostazioni del tuo account dopo esserti autenticato.\n\nPer favore, prenditi qualche momento per esaminare tutte le impostazioni presenti.\n\nPotresti voler aggiungere qualche informazione di base al tuo profilo predefinito (nella pagina \"Profili\"), così che le altre persone possano trovarti più facilmente.\n\nTi raccomandiamo di inserire il tuo nome completo, aggiungere una foto, aggiungere qualche parola chiave del profilo (molto utili per trovare nuovi contatti), e magari in quale nazione vivi, se non vuoi essere più specifico di così.\n\nNoi rispettiamo appieno la tua privacy, e nessuna di queste informazioni è necessaria o obbligatoria.\nSe sei nuovo e non conosci nessuno qui, possono aiutarti a trovare qualche nuovo e interessante contatto.\n\n\t\t\tSe mai vorrai cancellare il tuo account, lo potrai fare su %3\$s/removeme\n\nGrazie e benvenuto su %2\$s";
 $a->strings["Requested account is not available."] = "L'account richiesto non è disponibile.";
 $a->strings["Edit profile"] = "Modifica il profilo";
 $a->strings["Atom feed"] = "Feed Atom";
@@ -2059,7 +2113,7 @@ $a->strings["Birthday Reminders"] = "Promemoria compleanni";
 $a->strings["Birthdays this week:"] = "Compleanni questa settimana:";
 $a->strings["[No description]"] = "[Nessuna descrizione]";
 $a->strings["Event Reminders"] = "Promemoria";
-$a->strings["Events this week:"] = "Eventi di questa settimana:";
+$a->strings["Upcoming events the next 7 days:"] = "Eventi dei prossimi 7 giorni:";
 $a->strings["Member since:"] = "Membro dal:";
 $a->strings["j F, Y"] = "j F Y";
 $a->strings["j F"] = "j F";
@@ -2077,60 +2131,20 @@ $a->strings["Work/employment:"] = "Lavoro:";
 $a->strings["School/education:"] = "Scuola:";
 $a->strings["Forums:"] = "Forum:";
 $a->strings["Only You Can See This"] = "Solo tu puoi vedere questo";
-$a->strings["Login failed"] = "Accesso fallito.";
-$a->strings["Not enough information to authenticate"] = "Informazioni insufficienti per l'autenticazione";
-$a->strings["An invitation is required."] = "E' richiesto un invito.";
-$a->strings["Invitation could not be verified."] = "L'invito non puo' essere verificato.";
-$a->strings["Invalid OpenID url"] = "Url OpenID non valido";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Abbiamo incontrato un problema mentre contattavamo il server OpenID che ci hai fornito. Controlla di averlo scritto giusto.";
-$a->strings["The error message was:"] = "Il messaggio riportato era:";
-$a->strings["Please enter the required information."] = "Inserisci le informazioni richieste.";
-$a->strings["Please use a shorter name."] = "Usa un nome più corto.";
-$a->strings["Name too short."] = "Il nome è troppo corto.";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "Questo non sembra essere il tuo nome completo (Nome Cognome).";
-$a->strings["Your email domain is not among those allowed on this site."] = "Il dominio della tua email non è tra quelli autorizzati su questo sito.";
-$a->strings["Not a valid email address."] = "L'indirizzo email non è valido.";
-$a->strings["Cannot use that email."] = "Non puoi usare quell'email.";
-$a->strings["Your nickname can only contain a-z, 0-9 and _."] = "Il tuo nome utente può contenere solo a-z, 0-9 e _.";
-$a->strings["Nickname is already registered. Please choose another."] = "Nome utente già registrato. Scegline un altro.";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERRORE GRAVE: La generazione delle chiavi di sicurezza è fallita.";
-$a->strings["An error occurred during registration. Please try again."] = "C'è stato un errore durante la registrazione. Prova ancora.";
-$a->strings["An error occurred creating your default profile. Please try again."] = "C'è stato un errore nella creazione del tuo profilo. Prova ancora.";
-$a->strings["An error occurred creating your self contact. Please try again."] = "C'è stato un errore nella creazione del tuo contatto. Prova ancora.";
-$a->strings["An error occurred creating your default contact group. Please try again."] = "C'è stato un errore nella creazione del tuo gruppo contatti di default. Prova ancora.";
-$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"] = "\nGentile %1\$s,\n\tGrazie per la tua registrazione su %2\$s. Il tuo account è in attesa di approvazione da parte di un amministratore.\n\t";
-$a->strings["Registration at %s"] = "Registrazione su %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"] = "\nGentile %1\$s,\n\tGrazie per esserti registrato su %2\$s. Il tuo account è stato creato.\n\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."] = "\nI dettagli del tuo utente sono:\n    Indirizzo del sito: %3\$s\n    Nome utente:%1\$s \n    Password:%5\$s \n\nPuoi cambiare la tua password dalla pagina delle impostazioni del tuo account dopo esserti autenticato.\n\nPer favore, prenditi qualche momento per esaminare tutte le impostazioni presenti.\n\nPotresti voler aggiungere qualche informazione di base al tuo profilo predefinito (nella pagina \"Profili\"), così che le altre persone possano trovarti più facilmente.\n\nTi raccomandiamo di inserire il tuo nome completo, aggiungere una foto, aggiungere qualche parola chiave del profilo (molto utili per trovare nuovi contatti), e magari in quale nazione vivi, se non vuoi essere più specifico di così.\n\nNoi rispettiamo appieno la tua privacy, e nessuna di queste informazioni è necessaria o obbligatoria.\nSe sei nuovo e non conosci nessuno qui, possono aiutarti a trovare qualche nuovo e interessante contatto.\n\n\t\t\tSe mai vorrai cancellare il tuo account, lo potrai fare su %3\$s/removeme\n\nGrazie e benvenuto su %2\$s";
-$a->strings["Drop Contact"] = "Rimuovi contatto";
-$a->strings["Organisation"] = "Organizzazione";
-$a->strings["News"] = "Notizie";
-$a->strings["Forum"] = "Forum";
-$a->strings["Connect URL missing."] = "URL di connessione mancante.";
-$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Il contatto non puo' essere aggiunto. Controlla le credenziali della rete nella tua pagina Impostazioni -> Reti Sociali";
-$a->strings["This site is not configured to allow communications with other networks."] = "Questo sito non è configurato per permettere la comunicazione con altri network.";
-$a->strings["No compatible communication protocols or feeds were discovered."] = "Non sono stati trovati protocolli di comunicazione o feed compatibili.";
-$a->strings["The profile address specified does not provide adequate information."] = "L'indirizzo del profilo specificato non fornisce adeguate informazioni.";
-$a->strings["An author or name was not found."] = "Non è stato trovato un nome o un autore";
-$a->strings["No browser URL could be matched to this address."] = "Nessun URL può essere associato a questo indirizzo.";
-$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Impossibile l'indirizzo identità con un protocollo conosciuto o con un contatto email.";
-$a->strings["Use mailto: in front of address to force email check."] = "Usa \"mailto:\" davanti all'indirizzo per forzare un controllo nelle email.";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "L'indirizzo del profilo specificato appartiene a un network che è stato disabilitato su questo sito.";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Profilo limitato. Questa persona non sarà in grado di ricevere notifiche personali da te.";
-$a->strings["Unable to retrieve contact information."] = "Impossibile recuperare informazioni sul contatto.";
-$a->strings["%s's birthday"] = "Compleanno di %s";
-$a->strings["Happy Birthday %s"] = "Buon compleanno %s";
-$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s parteciperà a %3\$s di %2\$s";
-$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s non parteciperà a %3\$s di %2\$s";
-$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s forse parteciperà a %3\$s di %2\$s";
+$a->strings["Tips for New Members"] = "Consigli per i Nuovi Utenti";
+$a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s da il benvenuto a %2\$s";
+$a->strings["Sharing notification from Diaspora network"] = "Notifica di condivisione dal network Diaspora*";
+$a->strings["Attachments:"] = "Allegati:";
 $a->strings["%s is now following %s."] = "%s sta seguendo %s";
 $a->strings["following"] = "segue";
 $a->strings["%s stopped following %s."] = "%s ha smesso di seguire %s";
 $a->strings["stopped following"] = "tolto dai seguiti";
-$a->strings["Sharing notification from Diaspora network"] = "Notifica di condivisione dal network Diaspora*";
-$a->strings["Attachments:"] = "Allegati:";
 $a->strings["(no subject)"] = "(nessun oggetto)";
 $a->strings["Logged out."] = "Uscita effettuata.";
+$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."] = "Al momento della registrazione, e per fornire le comunicazioni tra l'account dell'utente e i suoi contatti, l'utente deve fornire un nome da visualizzare (pseudonimo), un nome utente (soprannome) e un indirizzo email funzionante. I nomi saranno accessibili sulla pagina profilo dell'account da parte di qualsiasi visitatore, anche quando altri dettagli del profilo non sono mostrati. L'indirizzo email sarà usato solo per inviare notifiche riguardo l'interazione coi contatti, ma non sarà mostrato. L'inserimento dell'account nella rubrica degli utenti del nodo o nella rubrica globale è opzionale, può essere impostato nelle impostazioni dell'utente, e  non è necessario ai fini delle comunicazioni.";
+$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."] = "Queste informazioni sono richiesta per la comunicazione e sono inviate ai nodi che partecipano alla comunicazione dove sono salvati. Gli utenti possono inserire aggiuntive informazioni private che potrebbero essere trasmesse agli account che partecipano alla comunicazione.";
+$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."] = "In qualsiasi momento un utente autenticato può esportare i dati del suo account dalle <a href=\"%1\$s/settings/uexport\">impostazioni dell'account</a>. Se l'utente vuole cancellare il suo account lo può fare da <a href=\"%1\$s/removeme\">%1\$s/removeme. L'eliminazione dell'account sarà permanente. L'eliminazione dei dati sarà altresì richiesta ai nodi che partecipano alle comunicazioni.";
+$a->strings["Privacy Statement"] = "Note sulla Privacy";
 $a->strings["Create a New Account"] = "Crea un nuovo account";
 $a->strings["Password: "] = "Password: ";
 $a->strings["Remember me"] = "Ricordati di me";
@@ -2140,12 +2154,9 @@ $a->strings["Website Terms of Service"] = "Condizioni di servizio del sito web "
 $a->strings["terms of service"] = "condizioni del servizio";
 $a->strings["Website Privacy Policy"] = "Politiche di privacy del sito";
 $a->strings["privacy policy"] = "politiche di privacy";
-$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."] = "Al momento della registrazione, e per fornire le comunicazioni tra l'account dell'utente e i suoi contatti, l'utente deve fornire un nome da visualizzare (pseudonimo), un nome utente (soprannome) e un indirizzo email funzionante. I nomi saranno accessibili sulla pagina profilo dell'account da parte di qualsiasi visitatore, anche quando altri dettagli del profilo non sono mostrati. L'indirizzo email sarà usato solo per inviare notifiche riguardo l'interazione coi contatti, ma non sarà mostrato. L'inserimento dell'account nella rubrica degli utenti del nodo o nella rubrica globale è opzionale, può essere impostato nelle impostazioni dell'utente, e  non è necessario ai fini delle comunicazioni.";
-$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."] = "Queste informazioni sono richiesta per la comunicazione e sono inviate ai nodi che partecipano alla comunicazione dove sono salvati. Gli utenti possono inserire aggiuntive informazioni private che potrebbero essere trasmesse agli account che partecipano alla comunicazione.";
-$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."] = "In qualsiasi momento un utente autenticato può esportare i dati del suo account dalle <a href=\"%1\$s/settings/uexport\">impostazioni dell'account</a>. Se l'utente vuole cancellare il suo account lo può fare da <a href=\"%1\$s/removeme\">%1\$s/removeme. L'eliminazione dell'account sarà permanente. L'eliminazione dei dati sarà altresì richiesta ai nodi che partecipano alle comunicazioni.";
-$a->strings["Privacy Statement"] = "Note sulla Privacy";
 $a->strings["This entry was edited"] = "Questa voce è stata modificata";
-$a->strings["Remove from your stream"] = "Rimuovi dal tuo stream";
+$a->strings["Delete globally"] = "Rimuovi globalmente";
+$a->strings["Remove locally"] = "Rimuovi localmente";
 $a->strings["save to folder"] = "salva nella cartella";
 $a->strings["I will attend"] = "Parteciperò";
 $a->strings["I will not attend"] = "Non parteciperò";
@@ -2181,6 +2192,7 @@ $a->strings["Video"] = "Video";
 $a->strings["Delete this item?"] = "Cancellare questo elemento?";
 $a->strings["show fewer"] = "mostra di meno";
 $a->strings["No system theme config value set."] = "Nessun tema di sistema impostato.";
-$a->strings["toggle mobile"] = "commuta tema mobile";
-$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Aggiornamento author-id e owner-id nelle tabelle item e thread";
 $a->strings["Update %s failed. See error logs."] = "aggiornamento %s fallito. Guarda i log di errore.";
+$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Aggiornamento author-id e owner-id nelle tabelle item e thread";
+$a->strings["%s: Updating post-type."] = "%s: Aggiorno tipo messaggio.";
+$a->strings["toggle mobile"] = "commuta tema mobile";
diff --git a/view/lang/nl/messages.po b/view/lang/nl/messages.po
index 776a73bf5..ae6e3e7ca 100644
--- a/view/lang/nl/messages.po
+++ b/view/lang/nl/messages.po
@@ -7,19 +7,21 @@
 # eddy2508 <eddy@naasthetnet.nl>, 2013
 # Gert Cauwenberg <gcauwenberg@gmail.com>, 2013
 # Gert Cauwenberg <gcauwenberg@gmail.com>, 2013
+# Jeroen De Meerleer <me@jeroened.be>, 2018
 # jeroenpraat <jeroenpraat@disroot.org>, 2012-2014
 # jeroenpraat <jeroenpraat@disroot.org>, 2012
 # Karel <karel@dasrakel.eu>, 2018
 # Karel <karel@dasrakel.eu>, 2015-2016,2018
-# Pascal Deklerck <pascal.deklerck@gmail.com>, 2018
+# Pascal <pascal.deklerck@gmail.com>, 2018
+# Pascal <pascal.deklerck@gmail.com>, 2018
 # Ralph <pcbee4you@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-30 05:30+0200\n"
-"PO-Revision-Date: 2018-05-31 13:32+0000\n"
-"Last-Translator: Pascal Deklerck <pascal.deklerck@gmail.com>\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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,724 +29,533 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/enotify.php:31
-msgid "Friendica Notification"
-msgstr "Friendica Notificatie"
-
-#: include/enotify.php:34
-msgid "Thank You,"
-msgstr "Bedankt"
-
-#: include/enotify.php:37
-#, php-format
-msgid "%s Administrator"
-msgstr "%s Beheerder"
-
-#: include/enotify.php:39
-#, php-format
-msgid "%1$s, %2$s Administrator"
-msgstr "%1$s, %2$s Beheerder"
-
-#: include/enotify.php:95
-#, php-format
-msgid "[Friendica:Notify] New mail received at %s"
-msgstr "[Friendica:Notificatie] Nieuw bericht ontvangen op %s"
-
-#: include/enotify.php:97
-#, 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:98
-msgid "a private message"
-msgstr "een prive bericht"
-
-#: include/enotify.php:98
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s stuurde jou %2$s."
-
-#: include/enotify.php:100
-#, 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:138
-#, 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:146
-#, 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:156
-#, 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:168
-#, 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:170
-#, 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:173 include/enotify.php:188 include/enotify.php:203
-#: include/enotify.php:218 include/enotify.php:237 include/enotify.php:252
-#, 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:180
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
-msgstr "[Friendica:Melding] %s plaatste een bericht op je tijdlijn"
-
-#: include/enotify.php:182
-#, 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:183
-#, 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:195
-#, php-format
-msgid "[Friendica:Notify] %s tagged you"
-msgstr "[Friendica:Notificatie] %s heeft jou genoemd"
-
-#: include/enotify.php:197
-#, php-format
-msgid "%1$s tagged you at %2$s"
-msgstr "%1$s heeft jou in %2$s genoemd"
-
-#: include/enotify.php:198
-#, php-format
-msgid "%1$s [url=%2$s]tagged you[/url]."
-msgstr "%1$s [url=%2$s]heeft jou genoemd[/url]."
-
-#: include/enotify.php:210
-#, php-format
-msgid "[Friendica:Notify] %s shared a new post"
-msgstr "[Friendica:Melding] %s deelde een nieuw bericht"
-
-#: include/enotify.php:212
-#, 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:213
-#, 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:225
-#, php-format
-msgid "[Friendica:Notify] %1$s poked you"
-msgstr "[Friendica:Melding] %1$s heeft jou gepord"
-
-#: include/enotify.php:227
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr "%1$s heeft jou gepord op %2$s"
-
-#: include/enotify.php:228
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr "%1$s [url=%2$s]porde jou[/url]"
-
-#: include/enotify.php:244
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
-msgstr "[Friendica:Notificatie] %s heeft jouw bericht gelabeld"
-
-#: include/enotify.php:246
-#, php-format
-msgid "%1$s tagged your post at %2$s"
-msgstr "%1$s heeft jouw bericht gelabeld in %2$s"
-
-#: include/enotify.php:247
-#, 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:259
-msgid "[Friendica:Notify] Introduction received"
-msgstr "[Friendica:Notificatie] Vriendschaps-/connectieverzoek ontvangen"
-
-#: include/enotify.php:261
-#, 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:262
-#, 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:267 include/enotify.php:313
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Je kunt hun profiel bezoeken op %s"
-
-#: include/enotify.php:269
-#, 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:277
-msgid "[Friendica:Notify] A new person is sharing with you"
-msgstr "[Friendica:Melding]  Iemand nieuw deelt met jou."
-
-#: include/enotify.php:279 include/enotify.php:280
-#, php-format
-msgid "%1$s is sharing with you at %2$s"
-msgstr "%1$s deelt met jou in %2$s"
-
-#: include/enotify.php:287
-msgid "[Friendica:Notify] You have a new follower"
-msgstr "[Friendica:Melding] Je hebt een nieuwe volger"
-
-#: include/enotify.php:289 include/enotify.php:290
-#, 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:302
-msgid "[Friendica:Notify] Friend suggestion received"
-msgstr "[Friendica:Melding] Vriendschapsvoorstel ontvangen"
-
-#: include/enotify.php:304
-#, 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:305
-#, 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:311
-msgid "Name:"
-msgstr "Naam:"
-
-#: include/enotify.php:312
-msgid "Photo:"
-msgstr "Foto: "
-
-#: include/enotify.php:315
-#, 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:323 include/enotify.php:338
-msgid "[Friendica:Notify] Connection accepted"
-msgstr "[Friendica:Melding] Verbinding aanvaard"
-
-#: include/enotify.php:325 include/enotify.php:340
-#, 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:326 include/enotify.php:341
-#, 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:331
-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:333
-#, 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:346
-#, 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:348
-#, 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:350
-#, 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:360 mod/removeme.php:45
-msgid "[Friendica System Notify]"
-msgstr "[Friendica systeem notificatie]"
-
-#: include/enotify.php:360
-msgid "registration request"
-msgstr "registratie verzoek"
-
-#: include/enotify.php:362
-#, 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:363
-#, 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:368
-#, php-format
-msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
-msgstr "Volledige naam:\t%1$s\\nAdres van de site\t%2$s\\nLoginnaam:\t%3$s (%4$s)"
-
-#: include/enotify.php:374
-#, php-format
-msgid "Please visit %s to approve or reject the request."
-msgstr "Bezoek %s om de aanvraag goed of af te keuren."
-
-#: include/security.php:81
-msgid "Welcome "
-msgstr "Welkom"
-
-#: include/security.php:82
-msgid "Please upload a profile photo."
-msgstr "Upload een profielfoto."
-
-#: include/security.php:84
-msgid "Welcome back "
-msgstr "Welkom terug "
-
-#: include/security.php:440
-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:303
-msgid "newer"
-msgstr "nieuwere berichten"
-
-#: include/text.php:304
-msgid "older"
-msgstr "oudere berichten"
-
-#: include/text.php:309
-msgid "first"
-msgstr "eerste"
-
-#: include/text.php:310
-msgid "prev"
-msgstr "vorige"
-
-#: include/text.php:344
-msgid "next"
-msgstr "volgende"
-
-#: include/text.php:345
-msgid "last"
-msgstr "laatste"
-
-#: include/text.php:399
-msgid "Loading more entries..."
-msgstr "Meer berichten aan het laden..."
-
-#: include/text.php:400
-msgid "The end"
-msgstr "Het einde"
-
-#: include/text.php:885
-msgid "No contacts"
-msgstr "Geen contacten"
-
-#: include/text.php:909
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] "%d contact"
-msgstr[1] "%d contacten"
-
-#: include/text.php:922
-msgid "View Contacts"
-msgstr "Bekijk contacten"
-
-#: include/text.php:1011 mod/filer.php:35 mod/editpost.php:110
-#: mod/notes.php:67
-msgid "Save"
-msgstr "Bewaren"
-
-#: include/text.php:1011
-msgid "Follow"
-msgstr "Volg"
-
-#: include/text.php:1017 mod/search.php:155 src/Content/Nav.php:142
-msgid "Search"
-msgstr "Zoeken"
-
-#: include/text.php:1020 src/Content/Nav.php:58
-msgid "@name, !forum, #tags, content"
-msgstr "@naam, !forum, #labels, inhoud"
-
-#: include/text.php:1026 src/Content/Nav.php:145
-msgid "Full Text"
-msgstr "Volledige tekst"
-
-#: include/text.php:1027 src/Content/Widget/TagCloud.php:54
-#: src/Content/Nav.php:146
-msgid "Tags"
-msgstr "Labels"
-
-#: include/text.php:1028 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 "Contacten"
-
-#: include/text.php:1031 view/theme/vier/theme.php:253
-#: src/Content/ForumManager.php:125 src/Content/Nav.php:151
+#: 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"
 
-#: include/text.php:1075
-msgid "poke"
-msgstr "por"
+#: view/theme/vier/theme.php:253 src/Content/ForumManager.php:127
+msgid "External link to forum"
+msgstr "Externe link naar het forum"
 
-#: include/text.php:1075
-msgid "poked"
-msgstr "porde"
+#: 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"
 
-#: include/text.php:1076
-msgid "ping"
-msgstr "ping"
+#: view/theme/vier/theme.php:289
+msgid "Quick Start"
+msgstr "Snelstart"
 
-#: include/text.php:1076
-msgid "pinged"
-msgstr "gepingd"
+#: view/theme/vier/theme.php:295 mod/help.php:56 src/Content/Nav.php:134
+msgid "Help"
+msgstr "Help"
 
-#: include/text.php:1077
-msgid "prod"
-msgstr "porren"
+#: view/theme/frio/config.php:102
+msgid "Custom"
+msgstr "Aangepast"
 
-#: include/text.php:1077
-msgid "prodded"
-msgstr "gepord"
+#: view/theme/frio/config.php:114
+msgid "Note"
+msgstr "Nota"
 
-#: include/text.php:1078
-msgid "slap"
-msgstr "slaan"
+#: 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 "
 
-#: include/text.php:1078
-msgid "slapped"
-msgstr "geslagen"
+#: view/theme/frio/config.php:121
+msgid "Select color scheme"
+msgstr "Selecteer kleurschema"
 
-#: include/text.php:1079
-msgid "finger"
-msgstr "finger"
+#: view/theme/frio/config.php:122
+msgid "Navigation bar background color"
+msgstr "Navigatie balk achtergrondkleur"
 
-#: include/text.php:1079
-msgid "fingered"
-msgstr "gerfingerd"
+#: view/theme/frio/config.php:123
+msgid "Navigation bar icon color "
+msgstr "Navigatie balk icoon kleur"
 
-#: include/text.php:1080
-msgid "rebuff"
-msgstr "afpoeieren"
+#: view/theme/frio/config.php:124
+msgid "Link color"
+msgstr "Link kleur"
 
-#: include/text.php:1080
-msgid "rebuffed"
-msgstr "afgepoeierd"
+#: view/theme/frio/config.php:125
+msgid "Set the background color"
+msgstr "Stel de achtergrondkleur in"
 
-#: include/text.php:1094 mod/settings.php:935 src/Model/Event.php:379
-msgid "Monday"
-msgstr "Maandag"
+#: view/theme/frio/config.php:126
+msgid "Content background opacity"
+msgstr "Content achtergrond opaciteit"
 
-#: include/text.php:1094 src/Model/Event.php:380
-msgid "Tuesday"
-msgstr "Dinsdag"
+#: view/theme/frio/config.php:127
+msgid "Set the background image"
+msgstr "Stel het achtergrondbeeld in"
 
-#: include/text.php:1094 src/Model/Event.php:381
-msgid "Wednesday"
-msgstr "Woensdag"
+#: view/theme/frio/config.php:128
+msgid "Background image style"
+msgstr "Achtergrond beeld stijl"
 
-#: include/text.php:1094 src/Model/Event.php:382
-msgid "Thursday"
-msgstr "Donderdag"
+#: view/theme/frio/config.php:133
+msgid "Login page background image"
+msgstr "Achtergrondafbeelding aanmeldpagina"
 
-#: include/text.php:1094 src/Model/Event.php:383
-msgid "Friday"
-msgstr "Vrijdag"
+#: view/theme/frio/config.php:137
+msgid "Login page background color"
+msgstr "Achtergrondkleur aanmeldpagina"
 
-#: include/text.php:1094 src/Model/Event.php:384
-msgid "Saturday"
-msgstr "Zaterdag"
+#: 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"
 
-#: include/text.php:1094 mod/settings.php:935 src/Model/Event.php:378
-msgid "Sunday"
-msgstr "Zondag"
+#: view/theme/frio/theme.php:248
+msgid "Guest"
+msgstr "Gast"
 
-#: include/text.php:1098 src/Model/Event.php:399
-msgid "January"
-msgstr "Januari"
+#: view/theme/frio/theme.php:253
+msgid "Visitor"
+msgstr "Bezoeker"
 
-#: include/text.php:1098 src/Model/Event.php:400
-msgid "February"
-msgstr "Februari"
+#: view/theme/frio/theme.php:266 src/Module/Login.php:309
+#: src/Content/Nav.php:97
+msgid "Logout"
+msgstr "Uitloggen"
 
-#: include/text.php:1098 src/Model/Event.php:401
-msgid "March"
-msgstr "Maart"
+#: view/theme/frio/theme.php:266 src/Content/Nav.php:97
+msgid "End this session"
+msgstr "Deze sessie beëindigen"
 
-#: include/text.php:1098 src/Model/Event.php:402
-msgid "April"
-msgstr "April"
+#: 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"
 
-#: include/text.php:1098 include/text.php:1115 src/Model/Event.php:390
-#: src/Model/Event.php:403
-msgid "May"
-msgstr "Mei"
+#: 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"
 
-#: include/text.php:1098 src/Model/Event.php:404
-msgid "June"
-msgstr "Juni"
+#: 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"
 
-#: include/text.php:1098 src/Model/Event.php:405
-msgid "July"
-msgstr "Juli"
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:101
+msgid "Your profile page"
+msgstr "Jouw profiel pagina"
 
-#: include/text.php:1098 src/Model/Event.php:406
-msgid "August"
-msgstr "Augustus"
+#: 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"
 
-#: include/text.php:1098 src/Model/Event.php:407
-msgid "September"
-msgstr "September"
+#: view/theme/frio/theme.php:271 src/Content/Nav.php:102
+msgid "Your photos"
+msgstr "Jouw foto's"
 
-#: include/text.php:1098 src/Model/Event.php:408
-msgid "October"
-msgstr "Oktober"
+#: 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"
 
-#: include/text.php:1098 src/Model/Event.php:409
-msgid "November"
-msgstr "November"
+#: view/theme/frio/theme.php:272 src/Content/Nav.php:103
+msgid "Your videos"
+msgstr "Je video's"
 
-#: include/text.php:1098 src/Model/Event.php:410
-msgid "December"
-msgstr "December"
+#: 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"
 
-#: include/text.php:1112 src/Model/Event.php:371
-msgid "Mon"
-msgstr "Maa"
+#: view/theme/frio/theme.php:273 src/Content/Nav.php:104
+msgid "Your events"
+msgstr "Jouw gebeurtenissen"
 
-#: include/text.php:1112 src/Model/Event.php:372
-msgid "Tue"
-msgstr "Din"
+#: view/theme/frio/theme.php:276 mod/admin.php:771
+#: src/Core/NotificationsManager.php:179 src/Content/Nav.php:183
+msgid "Network"
+msgstr "Netwerk"
 
-#: include/text.php:1112 src/Model/Event.php:373
-msgid "Wed"
-msgstr "Woe"
+#: view/theme/frio/theme.php:276 src/Content/Nav.php:183
+msgid "Conversations from your friends"
+msgstr "Gesprekken van je vrienden"
 
-#: include/text.php:1112 src/Model/Event.php:374
-msgid "Thu"
-msgstr "Don"
+#: 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"
 
-#: include/text.php:1112 src/Model/Event.php:375
-msgid "Fri"
-msgstr "Vrij"
+#: view/theme/frio/theme.php:278 mod/message.php:127 src/Content/Nav.php:196
+msgid "Messages"
+msgstr "Privéberichten"
 
-#: include/text.php:1112 src/Model/Event.php:376
-msgid "Sat"
-msgstr "Zat"
+#: view/theme/frio/theme.php:278 src/Content/Nav.php:196
+msgid "Private mail"
+msgstr "Privéberichten"
 
-#: include/text.php:1112 src/Model/Event.php:370
-msgid "Sun"
-msgstr "Zon"
+#: 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"
 
-#: include/text.php:1115 src/Model/Event.php:386
-msgid "Jan"
-msgstr "Jan"
+#: view/theme/frio/theme.php:279 src/Content/Nav.php:207
+msgid "Account settings"
+msgstr "Account instellingen"
 
-#: include/text.php:1115 src/Model/Event.php:387
-msgid "Feb"
-msgstr "Feb"
+#: 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"
 
-#: include/text.php:1115 src/Model/Event.php:388
-msgid "Mar"
-msgstr "Maa"
+#: view/theme/frio/theme.php:280 src/Content/Nav.php:213
+msgid "Manage/edit friends and contacts"
+msgstr "Beheer/Wijzig vrienden en contacten"
 
-#: include/text.php:1115 src/Model/Event.php:389
-msgid "Apr"
-msgstr "Apr"
+#: view/theme/frio/theme.php:367 include/conversation.php:866
+msgid "Follow Thread"
+msgstr "Gesprek volgen"
 
-#: include/text.php:1115 src/Model/Event.php:392
-msgid "Jul"
-msgstr "Jul"
+#: view/theme/frio/php/Image.php:24
+msgid "Top Banner"
+msgstr "Banner Bovenaan"
 
-#: include/text.php:1115 src/Model/Event.php:393
-msgid "Aug"
-msgstr "Aug"
+#: 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"
 
-#: include/text.php:1115
-msgid "Sep"
-msgstr "Sep"
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
+msgstr "Volledig scherm"
 
-#: include/text.php:1115 src/Model/Event.php:395
-msgid "Oct"
-msgstr "Okt"
+#: 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."
 
-#: include/text.php:1115 src/Model/Event.php:396
-msgid "Nov"
-msgstr "Nov"
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
+msgstr "Enkele rij mozaïek"
 
-#: include/text.php:1115 src/Model/Event.php:397
-msgid "Dec"
-msgstr "Dec"
+#: 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"
 
-#: include/text.php:1255
+#: 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 "Content warning: %s"
-msgstr "Waarschuwing inhoud: %s"
+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."
 
-#: include/text.php:1325 mod/videos.php:380
-msgid "View Video"
-msgstr "Bekijk Video"
+#: update.php:240
+#, php-format
+msgid "%s: Updating post-type."
+msgstr "%s: bericht-type bewerken"
 
-#: include/text.php:1342
-msgid "bytes"
-msgstr "bytes"
+#: 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/text.php:1375 include/text.php:1386 include/text.php:1419
-msgid "Click to open/close"
-msgstr "klik om te openen/sluiten"
+#: include/items.php:393
+msgid "Do you really want to delete this item?"
+msgstr "Wil je echt dit item verwijderen?"
 
-#: include/text.php:1534
-msgid "View on separate page"
-msgstr "Bekijk op aparte pagina"
+#: 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/text.php:1535
-msgid "view on separate page"
-msgstr "bekijk op aparte pagina"
+#: 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/text.php:1540 include/text.php:1547 src/Model/Event.php:594
-msgid "link to source"
-msgstr "Verwijzing naar bron"
+#: include/items.php:483 src/Content/Feature.php:96
+msgid "Archives"
+msgstr "Archieven"
 
-#: include/text.php:1749 include/conversation.php:144
-#: include/conversation.php:282 src/Model/Item.php:2003
+#: include/conversation.php:151 include/conversation.php:287
+#: include/text.php:1611
 msgid "event"
 msgstr "gebeurtenis"
 
-#: include/text.php:1751 include/conversation.php:152
-#: include/conversation.php:290 mod/subthread.php:97 mod/tagger.php:72
-#: src/Model/Item.php:2001
-msgid "photo"
-msgstr "foto"
-
-#: include/text.php:1753
-msgid "activity"
-msgstr "activiteit"
-
-#: include/text.php:1755 src/Object/Post.php:437 src/Object/Post.php:449
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "reactie"
-msgstr[1] "reacties"
-
-#: include/text.php:1758
-msgid "post"
-msgstr "bericht"
-
-#: include/text.php:1915
-msgid "Item filed"
-msgstr "Item bewaard"
-
-#: 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] "De dagelijkse limiet van %d bericht is bereikt. Dit bericht werd niet aanvaard."
-msgstr[1] "De dagelijkse limiet van %d berichten is bereikt.  Dit bericht werd niet aanvaard."
-
-#: 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] "De wekelijkse limiet van %d bericht is bereikt.  Dit bericht werd niet aanvaard."
-msgstr[1] "De wekelijkse limiet van %d berichten is bereikt.  Dit bericht werd niet aanvaard."
-
-#: include/api.php:1250
-#, php-format
-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:4522 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:1672 src/Model/User.php:553
-#: src/Model/User.php:561 src/Model/User.php:569
-msgid "Profile Photos"
-msgstr "Profielfoto's"
-
-#: include/conversation.php:147 include/conversation.php:157
-#: include/conversation.php:285 include/conversation.php:294
-#: mod/subthread.php:97 mod/tagger.php:72 src/Model/Item.php:2001
-#: src/Protocol/Diaspora.php:1957
+#: 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:164 src/Model/Item.php:1874
-#: src/Protocol/Diaspora.php:1953
+#: 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:167 src/Model/Item.php:1879
+#: 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:170
+#: 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:173
+#: 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:176
+#: 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:209
+#: 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:250
+#: include/conversation.php:255
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr "%1$s porde %2$s aan"
 
-#: include/conversation.php:304 mod/tagger.php:110
+#: 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"
@@ -758,561 +569,3304 @@ msgstr "bericht/item"
 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:613 mod/profiles.php:355 mod/photos.php:1489
+#: include/conversation.php:545 mod/profiles.php:352 mod/photos.php:1507
 msgid "Likes"
 msgstr "Houdt van"
 
-#: include/conversation.php:613 mod/profiles.php:359 mod/photos.php:1489
+#: include/conversation.php:545 mod/profiles.php:356 mod/photos.php:1507
 msgid "Dislikes"
 msgstr "Houdt niet van"
 
-#: include/conversation.php:614 include/conversation.php:1644
-#: mod/photos.php:1490
+#: 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:614 mod/photos.php:1490
+#: include/conversation.php:546 mod/photos.php:1508
 msgid "Not attending"
 msgstr "Nemen niet deel"
 
-#: include/conversation.php:614 mod/photos.php:1490
+#: include/conversation.php:546 mod/photos.php:1508
 msgid "Might attend"
 msgstr "Nemen misschien deel"
 
-#: include/conversation.php:726 mod/photos.php:1557 src/Object/Post.php:192
+#: include/conversation.php:626 mod/photos.php:1564 src/Object/Post.php:195
 msgid "Select"
 msgstr "Kies"
 
-#: include/conversation.php:727 mod/contacts.php:830 mod/contacts.php:1035
-#: mod/admin.php:1822 mod/photos.php:1558 mod/settings.php:730
-#: src/Object/Post.php:187
+#: 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:765 src/Object/Post.php:371
-#: src/Object/Post.php:372
+#: 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:777 src/Object/Post.php:359
+#: include/conversation.php:673 src/Object/Post.php:350
 msgid "Categories:"
 msgstr "Categorieën:"
 
-#: include/conversation.php:778 src/Object/Post.php:360
+#: include/conversation.php:674 src/Object/Post.php:351
 msgid "Filed under:"
 msgstr "Bewaard onder:"
 
-#: include/conversation.php:785 src/Object/Post.php:385
+#: include/conversation.php:681 src/Object/Post.php:376
 #, php-format
 msgid "%s from %s"
 msgstr "%s van %s"
 
-#: include/conversation.php:800
+#: include/conversation.php:696
 msgid "View in context"
 msgstr "In context bekijken"
 
-#: include/conversation.php:802 include/conversation.php:1317
-#: mod/wallmessage.php:145 mod/editpost.php:125 mod/message.php:245
-#: mod/message.php:414 mod/photos.php:1461 src/Object/Post.php:410
+#: 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:873
+#: include/conversation.php:762
 msgid "remove"
 msgstr "verwijder"
 
-#: include/conversation.php:877
+#: include/conversation.php:766
 msgid "Delete Selected Items"
 msgstr "Geselecteerde items verwijderen"
 
-#: include/conversation.php:1022 view/theme/frio/theme.php:352
-msgid "Follow Thread"
-msgstr "Gesprek volgen"
-
-#: include/conversation.php:1023 src/Model/Contact.php:662
+#: include/conversation.php:867 src/Model/Contact.php:937
 msgid "View Status"
 msgstr "Bekijk status"
 
-#: include/conversation.php:1024 include/conversation.php:1040
-#: 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
+#: 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:1025 src/Model/Contact.php:664
+#: include/conversation.php:869 src/Model/Contact.php:939
 msgid "View Photos"
 msgstr "Bekijk foto's"
 
-#: include/conversation.php:1026 src/Model/Contact.php:665
+#: include/conversation.php:870 src/Model/Contact.php:931
+#: src/Model/Contact.php:940
 msgid "Network Posts"
 msgstr "Netwerkberichten"
 
-#: include/conversation.php:1027 src/Model/Contact.php:666
+#: include/conversation.php:871 src/Model/Contact.php:932
+#: src/Model/Contact.php:941
 msgid "View Contact"
 msgstr "Bekijk contact"
 
-#: include/conversation.php:1028 src/Model/Contact.php:668
+#: include/conversation.php:872 src/Model/Contact.php:943
 msgid "Send PM"
 msgstr "Stuur een privébericht"
 
-#: include/conversation.php:1032 src/Model/Contact.php:669
+#: include/conversation.php:876 src/Model/Contact.php:944
 msgid "Poke"
 msgstr "Porren"
 
-#: include/conversation.php:1037 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 "Verbind/Volg"
-
-#: include/conversation.php:1156
+#: include/conversation.php:999
 #, php-format
 msgid "%s likes this."
 msgstr "%s vindt dit leuk."
 
-#: include/conversation.php:1159
+#: include/conversation.php:1002
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s vindt dit niet leuk."
 
-#: include/conversation.php:1162
+#: include/conversation.php:1005
 #, php-format
 msgid "%s attends."
 msgstr "%s neemt deel"
 
-#: include/conversation.php:1165
+#: include/conversation.php:1008
 #, php-format
 msgid "%s doesn't attend."
 msgstr "%s neemt niet deel"
 
-#: include/conversation.php:1168
+#: include/conversation.php:1011
 #, php-format
 msgid "%s attends maybe."
 msgstr "%s neemt misschien deel"
 
-#: include/conversation.php:1179
+#: include/conversation.php:1022
 msgid "and"
 msgstr "en"
 
-#: include/conversation.php:1185
+#: include/conversation.php:1028
 #, php-format
 msgid "and %d other people"
 msgstr "en %d anderen"
 
-#: include/conversation.php:1194
+#: 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:1195
+#: include/conversation.php:1038
 #, php-format
 msgid "%s like this."
 msgstr "%s vinden dit leuk."
 
-#: include/conversation.php:1198
+#: 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:1199
+#: include/conversation.php:1042
 #, php-format
 msgid "%s don't like this."
 msgstr "%s vinden dit niet leuk."
 
-#: include/conversation.php:1202
+#: 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:1203
+#: include/conversation.php:1046
 #, php-format
 msgid "%s attend."
 msgstr "%s nemen deel."
 
-#: include/conversation.php:1206
+#: 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:1207
+#: include/conversation.php:1050
 #, php-format
 msgid "%s don't attend."
 msgstr "%s nemen niet deel."
 
-#: include/conversation.php:1210
+#: 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:1211
+#: include/conversation.php:1054
 #, php-format
 msgid "%s attend maybe."
 msgstr "%s neemt misschien deel."
 
-#: include/conversation.php:1241 include/conversation.php:1257
+#: include/conversation.php:1084 include/conversation.php:1100
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Zichtbaar voor <strong>iedereen</strong>"
 
-#: include/conversation.php:1242 include/conversation.php:1258
-#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:181
-#: mod/message.php:188 mod/message.php:324 mod/message.php:331
+#: 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:1243 include/conversation.php:1259
+#: include/conversation.php:1086 include/conversation.php:1102
 msgid "Please enter a video link/URL:"
 msgstr "Vul een videolink/URL in:"
 
-#: include/conversation.php:1244 include/conversation.php:1260
+#: include/conversation.php:1087 include/conversation.php:1103
 msgid "Please enter an audio link/URL:"
 msgstr "Vul een audiolink/URL in:"
 
-#: include/conversation.php:1245 include/conversation.php:1261
+#: include/conversation.php:1088 include/conversation.php:1104
 msgid "Tag term:"
 msgstr "Label:"
 
-#: include/conversation.php:1246 include/conversation.php:1262
+#: include/conversation.php:1089 include/conversation.php:1105
 #: mod/filer.php:34
 msgid "Save to Folder:"
 msgstr "Bewaren in map:"
 
-#: include/conversation.php:1247 include/conversation.php:1263
+#: include/conversation.php:1090 include/conversation.php:1106
 msgid "Where are you right now?"
 msgstr "Waar ben je nu?"
 
-#: include/conversation.php:1248
+#: include/conversation.php:1091
 msgid "Delete item(s)?"
 msgstr "Item(s) verwijderen?"
 
-#: include/conversation.php:1295
+#: include/conversation.php:1138
 msgid "New Post"
 msgstr "Nieuw bericht"
 
-#: include/conversation.php:1298
+#: include/conversation.php:1141
 msgid "Share"
 msgstr "Delen"
 
-#: include/conversation.php:1299 mod/wallmessage.php:143 mod/editpost.php:111
-#: mod/message.php:243 mod/message.php:411
+#: 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:1300 mod/editpost.php:112
+#: include/conversation.php:1143 mod/editpost.php:102
 msgid "upload photo"
 msgstr "Foto uploaden"
 
-#: include/conversation.php:1301 mod/editpost.php:113
+#: include/conversation.php:1144 mod/editpost.php:103
 msgid "Attach file"
 msgstr "Bestand bijvoegen"
 
-#: include/conversation.php:1302 mod/editpost.php:114
+#: include/conversation.php:1145 mod/editpost.php:104
 msgid "attach file"
 msgstr "bestand bijvoegen"
 
-#: include/conversation.php:1303 mod/wallmessage.php:144 mod/editpost.php:115
-#: mod/message.php:244 mod/message.php:412
+#: 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:1304 mod/editpost.php:116
+#: include/conversation.php:1147 mod/editpost.php:106
 msgid "web link"
 msgstr "webadres"
 
-#: include/conversation.php:1305 mod/editpost.php:117
+#: include/conversation.php:1148 mod/editpost.php:107
 msgid "Insert video link"
 msgstr "Voeg video toe"
 
-#: include/conversation.php:1306 mod/editpost.php:118
+#: include/conversation.php:1149 mod/editpost.php:108
 msgid "video link"
 msgstr "video adres"
 
-#: include/conversation.php:1307 mod/editpost.php:119
+#: include/conversation.php:1150 mod/editpost.php:109
 msgid "Insert audio link"
 msgstr "Voeg audio adres toe"
 
-#: include/conversation.php:1308 mod/editpost.php:120
+#: include/conversation.php:1151 mod/editpost.php:110
 msgid "audio link"
 msgstr "audio adres"
 
-#: include/conversation.php:1309 mod/editpost.php:121
+#: include/conversation.php:1152 mod/editpost.php:111
 msgid "Set your location"
 msgstr "Stel je locatie in"
 
-#: include/conversation.php:1310 mod/editpost.php:122
+#: include/conversation.php:1153 mod/editpost.php:112
 msgid "set location"
 msgstr "Stel uw locatie in"
 
-#: include/conversation.php:1311 mod/editpost.php:123
+#: include/conversation.php:1154 mod/editpost.php:113
 msgid "Clear browser location"
 msgstr "Verwijder locatie uit uw webbrowser"
 
-#: include/conversation.php:1312 mod/editpost.php:124
+#: include/conversation.php:1155 mod/editpost.php:114
 msgid "clear location"
 msgstr "Verwijder locatie uit uw webbrowser"
 
-#: include/conversation.php:1314 mod/editpost.php:138
+#: include/conversation.php:1157 mod/editpost.php:129
 msgid "Set title"
 msgstr "Titel plaatsen"
 
-#: include/conversation.php:1316 mod/editpost.php:140
+#: include/conversation.php:1159 mod/editpost.php:131
 msgid "Categories (comma-separated list)"
 msgstr "Categorieën (komma-gescheiden lijst)"
 
-#: include/conversation.php:1318 mod/editpost.php:126
+#: include/conversation.php:1161 mod/editpost.php:116
 msgid "Permission settings"
 msgstr "Instellingen van rechten"
 
-#: include/conversation.php:1319 mod/editpost.php:155
+#: include/conversation.php:1162 mod/editpost.php:146
 msgid "permissions"
 msgstr "rechten"
 
-#: include/conversation.php:1327 mod/editpost.php:135
+#: include/conversation.php:1171 mod/editpost.php:126
 msgid "Public post"
 msgstr "Openbare post"
 
-#: include/conversation.php:1331 mod/editpost.php:146 mod/events.php:528
-#: mod/photos.php:1480 mod/photos.php:1519 mod/photos.php:1592
-#: src/Object/Post.php:813
+#: 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:1335 include/items.php:387 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 "Annuleren"
-
-#: include/conversation.php:1340
+#: include/conversation.php:1184
 msgid "Post to Groups"
 msgstr "Verzenden naar Groepen"
 
-#: include/conversation.php:1341
+#: include/conversation.php:1185
 msgid "Post to Contacts"
 msgstr "Verzenden naar Contacten"
 
-#: include/conversation.php:1342
+#: include/conversation.php:1186
 msgid "Private post"
 msgstr "Privé verzending"
 
-#: include/conversation.php:1347 mod/editpost.php:153
-#: src/Model/Profile.php:338
+#: include/conversation.php:1191 mod/editpost.php:144
+#: src/Model/Profile.php:344
 msgid "Message"
 msgstr "Bericht"
 
-#: include/conversation.php:1348 mod/editpost.php:154
+#: include/conversation.php:1192 mod/editpost.php:145
 msgid "Browser"
 msgstr "Browser"
 
-#: include/conversation.php:1615
+#: include/conversation.php:1463
 msgid "View all"
 msgstr "Toon alles"
 
-#: include/conversation.php:1638
+#: include/conversation.php:1486
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "Houdt van"
 msgstr[1] "Houdt van"
 
-#: include/conversation.php:1641
+#: include/conversation.php:1489
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "Houdt niet van"
 msgstr[1] "Houdt niet van"
 
-#: include/conversation.php:1647
+#: include/conversation.php:1495
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Neemt niet deel"
 msgstr[1] "Nemen niet deel"
 
-#: include/conversation.php:1650 src/Content/ContactSelector.php:125
+#: include/conversation.php:1498 src/Content/ContactSelector.php:122
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Onbeslist"
 msgstr[1] "Onbeslist"
 
-#: include/items.php:342 mod/notice.php:22 mod/viewsrc.php:21
-#: mod/admin.php:277 mod/admin.php:1878 mod/admin.php:2126 mod/display.php:72
-#: mod/display.php:255 mod/display.php:356
-msgid "Item not found."
-msgstr "Item niet gevonden."
+#: include/security.php:83
+msgid "Welcome "
+msgstr "Welkom"
 
-#: include/items.php:382
-msgid "Do you really want to delete this item?"
-msgstr "Wil je echt dit item verwijderen?"
+#: include/security.php:84
+msgid "Please upload a profile photo."
+msgstr "Upload een profielfoto."
 
-#: include/items.php:384 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 "Ja"
+#: include/security.php:86
+msgid "Welcome back "
+msgstr "Welkom terug "
 
-#: include/items.php:401 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/group.php:26
-#: mod/dfrn_confirm.php:68 mod/notifications.php:73 mod/profiles.php:182
-#: mod/profiles.php:513 mod/events.php:194 mod/item.php:160 mod/network.php:32
-#: mod/notes.php:30 mod/photos.php:174 mod/photos.php:1039 mod/register.php:54
-#: mod/settings.php:43 mod/settings.php:142 mod/settings.php:659 index.php:436
-msgid "Permission denied."
-msgstr "Toegang geweigerd"
+#: 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/items.php:471 src/Content/Feature.php:96
-msgid "Archives"
-msgstr "Archieven"
+#: include/enotify.php:52
+msgid "Friendica Notification"
+msgstr "Friendica Notificatie"
 
-#: include/items.php:477 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 "toon meer"
+#: include/enotify.php:55
+msgid "Thank You,"
+msgstr "Bedankt"
 
-#: mod/allfriends.php:51
-msgid "No friends to display."
-msgstr "Geen vrienden om te laten zien."
+#: include/enotify.php:58
+#, php-format
+msgid "%1$s, %2$s Administrator"
+msgstr "%1$s, %2$s Beheerder"
 
-#: 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/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."
+msgid_plural "Daily posting limit of %d posts reached. The post was rejected."
+msgstr[0] "De dagelijkse limiet van %d bericht is bereikt. Dit bericht werd niet aanvaard."
+msgstr[1] "De dagelijkse limiet van %d berichten is bereikt.  Dit bericht werd niet aanvaard."
+
+#: 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] "De wekelijkse limiet van %d bericht is bereikt.  Dit bericht werd niet aanvaard."
+msgstr[1] "De wekelijkse limiet van %d berichten is bereikt.  Dit bericht werd niet aanvaard."
+
+#: include/api.php:1166
+#, php-format
+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: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 "Profielfoto's"
+
+#: mod/crepair.php:89
+msgid "Contact settings applied."
+msgstr "Contactinstellingen toegepast."
+
+#: mod/crepair.php:91
+msgid "Contact update failed."
+msgstr "Aanpassen van contact mislukt."
+
+#: 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: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: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:131 mod/crepair.php:133
+msgid "No mirroring"
+msgstr "Geen mirroring"
+
+#: mod/crepair.php:131
+msgid "Mirror as forwarded posting"
+msgstr "Spiegel als geforward bericht"
+
+#: mod/crepair.php:131 mod/crepair.php:133
+msgid "Mirror as my own posting"
+msgstr "Spiegel als mijn eigen bericht"
+
+#: mod/crepair.php:146
+msgid "Return to contact editor"
+msgstr "Ga terug naar contactbewerker"
+
+#: mod/crepair.php:148
+msgid "Refetch contact data"
+msgstr "Contact data opnieuw ophalen"
+
+#: mod/crepair.php:151
+msgid "Remote Self"
+msgstr "Mijn identiteit elders"
+
+#: mod/crepair.php:154
+msgid "Mirror postings from this contact"
+msgstr "Berichten van dit contact spiegelen"
+
+#: 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/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:162
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@Labelnaam - krijgt voorrang op naam/bijnaam"
+
+#: mod/crepair.php:163
+msgid "Account URL"
+msgstr "URL account"
+
+#: mod/crepair.php:164
+msgid "Friend Request URL"
+msgstr "URL vriendschapsverzoek"
+
+#: mod/crepair.php:165
+msgid "Friend Confirm URL"
+msgstr "URL vriendschapsbevestiging"
+
+#: mod/crepair.php:166
+msgid "Notification Endpoint URL"
+msgstr "Notificatie Endpoint URL"
+
+#: mod/crepair.php:167
+msgid "Poll/Feed URL"
+msgstr "URL poll/feed"
+
+#: mod/crepair.php:168
+msgid "New photo from this URL"
+msgstr "Nieuwe foto van deze URL"
+
+#: 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/wallmessage.php:57 mod/message.php:74
+msgid "No recipient selected."
+msgstr "Geen ontvanger geselecteerd."
+
+#: mod/wallmessage.php:60
+msgid "Unable to check your home location."
+msgstr "Niet in staat om je tijdlijn-locatie vast te stellen"
+
+#: 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 ""
+"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/wallmessage.php:134 mod/message.php:250 mod/message.php:419
+msgid "To:"
+msgstr "Aan:"
+
+#: 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 ""
+"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:122 mod/install.php:166 mod/install.php:274
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Zie het bestand \"INSTALL.txt\"."
+
+#: mod/install.php:134
+msgid "Database already in use."
+msgstr "Database al in gebruik."
+
+#: 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 ""
+"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: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/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/install.php:194
+msgid "Database Server Name"
+msgstr "Servernaam database"
+
+#: mod/install.php:195
+msgid "Database Login Name"
+msgstr "Gebruikersnaam database"
+
+#: mod/install.php:196
+msgid "Database Login Password"
+msgstr "Wachtwoord database"
+
+#: 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: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:238
+msgid "Response from remote site was not understood."
+msgstr "Antwoord van de website op afstand werd niet begrepen."
+
+#: 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:260
+msgid "Confirmation completed successfully."
+msgstr "Bevestiging werd correct voltooid."
+
+#: 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:275
+msgid "Introduction failed or was revoked."
+msgstr "Verzoek mislukt of herroepen."
+
+#: mod/dfrn_confirm.php:280
+msgid "Remote site reported: "
+msgstr "Website op afstand berichtte: "
+
+#: mod/dfrn_confirm.php:392
+msgid "Unable to set contact photo."
+msgstr "Ik kan geen contact foto instellen."
+
+#: mod/dfrn_confirm.php:450
+#, php-format
+msgid "No user record found for '%s' "
+msgstr "Geen gebruiker gevonden voor '%s'"
+
+#: 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: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: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: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: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: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: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:614 mod/dfrn_request.php:561
+#: src/Model/Contact.php:1891
+msgid "[Name Withheld]"
+msgstr "[Naam achtergehouden]"
+
+#: mod/dirfind.php:53
+#, php-format
+msgid "People Search - %s"
+msgstr "Mensen Zoeken - %s"
+
+#: mod/dirfind.php:64
+#, php-format
+msgid "Forum Search - %s"
+msgstr "Forum doorzoeken - %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 "Verbinden"
 
-#: mod/api.php:85 mod/api.php:107
-msgid "Authorize application connection"
-msgstr "Verbinding met de applicatie goedkeuren"
+#: mod/dirfind.php:265 mod/match.php:125
+msgid "No matches"
+msgstr "Geen resultaten"
 
-#: 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/manage.php:180
+msgid "Manage Identities and/or Pages"
+msgstr "Beheer Identiteiten en/of Pagina's"
 
-#: mod/api.php:95
-msgid "Please login to continue."
-msgstr "Log in om verder te gaan."
-
-#: 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 "Wil je deze toepassing toestemming geven om jouw berichten en contacten in te kijken, en/of nieuwe berichten in jouw plaats aan te maken?"
+"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/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 "Selecteer een identiteit om te beheren:"
+
+#: mod/videos.php:138
+msgid "Do you really want to delete this video?"
+msgstr "Wil je deze video echt verwijderen?"
+
+#: mod/videos.php:143
+msgid "Delete Video"
+msgstr "Verwijder video"
+
+#: 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/videos.php:206
+msgid "No videos selected"
+msgstr "Geen video's geselecteerd"
+
+#: mod/videos.php:307 mod/photos.php:1050
+msgid "Access to this item is restricted."
+msgstr "Toegang tot dit item is beperkt."
+
+#: mod/videos.php:382 mod/photos.php:1699
+msgid "View Album"
+msgstr "Album bekijken"
+
+#: mod/videos.php:390
+msgid "Recent Videos"
+msgstr "Recente video's"
+
+#: mod/videos.php:392
+msgid "Upload New Videos"
+msgstr "Nieuwe video's uploaden"
+
+#: 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/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/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:421 src/Model/Profile.php:756
+msgid "Status:"
+msgstr "Tijdlijn:"
+
+#: mod/directory.php:158 src/Model/Profile.php:422 src/Model/Profile.php:773
+msgid "Homepage:"
+msgstr "Website:"
+
+#: 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"
+msgstr "Op deze website zoeken"
+
+#: mod/directory.php:211
+msgid "Results for:"
+msgstr "Resultaten voor:"
+
+#: mod/directory.php:213
+msgid "Site Directory"
+msgstr "Websitegids"
+
+#: mod/directory.php:218
+msgid "No entries (some entries may be hidden)."
+msgstr "Geen gegevens (sommige gegevens kunnen verborgen zijn)."
+
+#: 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."
+
+#: mod/match.php:104
+msgid "is interested in:"
+msgstr "Is geïnteresseerd in:"
+
+#: mod/match.php:120
+msgid "Profile Match"
+msgstr "Profielmatch"
+
+#: mod/settings.php:51 mod/photos.php:134
+msgid "everybody"
+msgstr "iedereen"
+
+#: mod/settings.php:56
+msgid "Account"
+msgstr "Account"
+
+#: 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"
+
+#: mod/settings.php:87 mod/settings.php:840
+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"
+
+#: mod/settings.php:108
+msgid "Connected apps"
+msgstr "Verbonden applicaties"
+
+#: mod/settings.php:115 mod/uexport.php:52
+msgid "Export personal data"
+msgstr "Persoonlijke gegevens exporteren"
+
+#: mod/settings.php:122
+msgid "Remove account"
+msgstr "Account verwijderen"
+
+#: mod/settings.php:174
+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."
+
+#: mod/settings.php:290
+msgid "Email settings updated."
+msgstr "E-mail instellingen opgeslagen"
+
+#: mod/settings.php:306
+msgid "Features updated"
+msgstr "Functies opgeslagen"
+
+#: mod/settings.php:379
+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:377
+msgid "Passwords do not match. Password unchanged."
+msgstr "Wachtwoorden komen niet overeen. Wachtwoord niet gewijzigd."
+
+#: mod/settings.php:396
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Lege wachtwoorden zijn niet toegelaten. Wachtwoord niet gewijzigd."
+
+#: 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 "The nieuwe paswoord is gecompromitteerd in een publieke data dump, kies alsjeblieft een ander."
+
+#: mod/settings.php:407
+msgid "Wrong password."
+msgstr "Verkeerd wachtwoord."
+
+#: mod/settings.php:414 src/Core/Console/NewPassword.php:89
+msgid "Password changed."
+msgstr "Wachtwoord gewijzigd."
+
+#: mod/settings.php:416 src/Core/Console/NewPassword.php:86
+msgid "Password update failed. Please try again."
+msgstr "Wachtwoord-)wijziging mislukt. Probeer opnieuw."
+
+#: mod/settings.php:500
+msgid " Please use a shorter name."
+msgstr "Gebruik een kortere naam."
+
+#: mod/settings.php:503
+msgid " Name too short."
+msgstr "Naam te kort."
+
+#: mod/settings.php:511
+msgid "Wrong Password"
+msgstr "Verkeerd wachtwoord"
+
+#: mod/settings.php:516
+msgid "Invalid email."
+msgstr "Ongeldig email adres."
+
+#: mod/settings.php:522
+msgid "Cannot change to that email."
+msgstr "Kan niet naar dat email adres veranderen."
+
+#: mod/settings.php:572
+msgid "Private forum has no privacy permissions. Using default privacy group."
+msgstr "Privéforum/-groep heeft geen privacyrechten. De standaard privacygroep wordt gebruikt."
+
+#: mod/settings.php:575
+msgid "Private forum has no privacy permissions and no default privacy group."
+msgstr "Privéforum/-groep heeft geen privacyrechten en geen standaard privacygroep."
+
+#: mod/settings.php:615
+msgid "Settings updated."
+msgstr "Instellingen opgeslagen"
+
+#: mod/settings.php:674 mod/settings.php:700 mod/settings.php:734
+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"
+
+#: mod/settings.php:679 mod/settings.php:705
+msgid "Consumer Secret"
+msgstr "Gebruikersgeheim"
+
+#: mod/settings.php:680 mod/settings.php:706
+msgid "Redirect"
+msgstr "Doorverwijzing"
+
+#: mod/settings.php:681 mod/settings.php:707
+msgid "Icon url"
+msgstr "URL pictogram"
+
+#: mod/settings.php:692
+msgid "You can't edit this application."
+msgstr "Je kunt deze toepassing niet wijzigen."
+
+#: mod/settings.php:733
+msgid "Connected Apps"
+msgstr "Verbonden applicaties"
+
+#: mod/settings.php:735 src/Object/Post.php:158 src/Object/Post.php:160
+msgid "Edit"
+msgstr "Bewerken"
+
+#: mod/settings.php:737
+msgid "Client key starts with"
+msgstr "Client sleutel begint met"
+
+#: mod/settings.php:738
+msgid "No name"
+msgstr "Geen naam"
+
+#: mod/settings.php:739
+msgid "Remove authorization"
+msgstr "Verwijder authorisatie"
+
+#: mod/settings.php:750
+msgid "No Addon settings configured"
+msgstr "Geen Addon instellingen geconfigureerd"
+
+#: mod/settings.php:759
+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:82
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: mod/settings.php:803 mod/settings.php:804
+msgid "enabled"
+msgstr "ingeschakeld"
+
+#: mod/settings.php:803 mod/settings.php:804
+msgid "disabled"
+msgstr "uitgeschakeld"
+
+#: mod/settings.php:803 mod/settings.php:804
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
+msgstr "Ingebouwde ondersteuning voor connectiviteit met %s is %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 "E-mailtoegang is op deze website uitgeschakeld."
+
+#: mod/settings.php:845
+msgid "General Social Media Settings"
+msgstr "Algemene Sociale Media Instellingen"
+
+#: mod/settings.php:846
+msgid "Disable Content Warning"
+msgstr "Deactiveer Content Waarschuwing"
+
+#: 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 "Gebruikers op netwerken als Mastodon en Pleroma kunnen een content waarschuwing instellen die hun bericht standaard inklapt. Dit deactiveert het automatisch inklappen en toont de content waarschuwing als titel van het bericht. Dit beïnvloedt andere content filters die je mogelijk ingesteld hebt niet."
+
+#: mod/settings.php:847
+msgid "Disable intelligent shortening"
+msgstr "Deactiveer intelligent afkorten"
+
+#: 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 "Normaal probeert het systeem de beste link te vinden om toe te voegen aan ingekorte berichten. Als deze optie geactiveerd is, dan zal elk ingekort bericht altijd verwijzen naar het originele friendica bericht."
+
+#: mod/settings.php:848
+msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
+msgstr "Volg automatisch alle GNU Social (OStatus) volgers/vermelders"
+
+#: 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 "Als je een boodschap ontvangt van een voor jou onbekende OStatus gebruiker, dan beslist deze optie wat er moet gebeuren. Als de optie is geactiveerd, dan zal voor elke onbekende gebruiker een nieuw contact aangemaakt worden."
+
+#: mod/settings.php:849
+msgid "Default group for OStatus contacts"
+msgstr "Standaard groep voor OStatus contacten"
+
+#: mod/settings.php:850
+msgid "Your legacy GNU Social account"
+msgstr "Je verouderd GNU Social account"
+
+#: 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 "Als je hier je oude GNU Social/Statusnet account naam invoert (in het formaat gebruiker@domein.tld), dan zullen je contacten automatisch toegevoegd worden. Het veld zal nadien leeg gemaakt worden."
+
+#: mod/settings.php:853
+msgid "Repair OStatus subscriptions"
+msgstr "Herstel OStatus inschrijvingen"
+
+#: mod/settings.php:857
+msgid "Email/Mailbox Setup"
+msgstr "E-mail Instellen"
+
+#: 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 "Als je wilt communiceren met e-mail contacten via deze dienst (optioneel), moet je hier opgeven hoe ik jouw mailbox kan bereiken."
+
+#: mod/settings.php:859
+msgid "Last successful email check:"
+msgstr "Laatste succesvolle e-mail controle:"
+
+#: mod/settings.php:861
+msgid "IMAP server name:"
+msgstr "IMAP server naam:"
+
+#: mod/settings.php:862
+msgid "IMAP port:"
+msgstr "IMAP poort:"
+
+#: mod/settings.php:863
+msgid "Security:"
+msgstr "Beveiliging:"
+
+#: mod/settings.php:863 mod/settings.php:868
+msgid "None"
+msgstr "Geen"
+
+#: mod/settings.php:864
+msgid "Email login name:"
+msgstr "E-mail login naam:"
+
+#: mod/settings.php:865
+msgid "Email password:"
+msgstr "E-mail wachtwoord:"
+
+#: mod/settings.php:866
+msgid "Reply-to address:"
+msgstr "Antwoord adres:"
+
+#: mod/settings.php:867
+msgid "Send public posts to all email contacts:"
+msgstr "Openbare posts naar alle e-mail contacten versturen:"
+
+#: mod/settings.php:868
+msgid "Action after import:"
+msgstr "Actie na importeren:"
+
+#: mod/settings.php:868 src/Content/Nav.php:193
+msgid "Mark as seen"
+msgstr "Als 'gelezen' markeren"
+
+#: mod/settings.php:868
+msgid "Move to folder"
+msgstr "Naar map verplaatsen"
+
+#: mod/settings.php:869
+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)"
+msgstr "%s - (Niet ondersteund)"
+
+#: mod/settings.php:914
+#, php-format
+msgid "%s - (Experimental)"
+msgstr "%s - (Experimenteel)"
+
+#: mod/settings.php:957
+msgid "Display Settings"
+msgstr "Scherminstellingen"
+
+#: mod/settings.php:963 mod/settings.php:987
+msgid "Display Theme:"
+msgstr "Schermthema:"
+
+#: mod/settings.php:964
+msgid "Mobile Theme:"
+msgstr "Mobiel thema:"
+
+#: mod/settings.php:965
+msgid "Suppress warning of insecure networks"
+msgstr "Onderdruk waarschuwingen over onbeveiligde netwerken"
+
+#: 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 "Moet het systeem waarschuwingen onderdrukken dat de huidige groep leden bevat van netwerken die geen niet-publieke berichten kunnen ontvangen."
+
+#: mod/settings.php:966
+msgid "Update browser every xx seconds"
+msgstr "Browser elke xx seconden verversen"
+
+#: mod/settings.php:966
+msgid "Minimum of 10 seconds. Enter -1 to disable it."
+msgstr "Minimum 10 seconden. Geef -1 op om te deactiveren."
+
+#: mod/settings.php:967
+msgid "Number of items to display per page:"
+msgstr "Aantal items te tonen per pagina:"
+
+#: mod/settings.php:967 mod/settings.php:968
+msgid "Maximum of 100 items"
+msgstr "Maximum 100 items"
+
+#: mod/settings.php:968
+msgid "Number of items to display per page when viewed from mobile device:"
+msgstr "Aantal items per pagina als je een mobiel toestel gebruikt:"
+
+#: mod/settings.php:969
+msgid "Don't show emoticons"
+msgstr "Emoticons niet tonen"
+
+#: mod/settings.php:970
+msgid "Calendar"
+msgstr "Kalender"
+
+#: mod/settings.php:971
+msgid "Beginning of week:"
+msgstr "Begin van de week:"
+
+#: mod/settings.php:972
+msgid "Don't show notices"
+msgstr "Toon geen aankondigingen"
+
+#: mod/settings.php:973
+msgid "Infinite scroll"
+msgstr "Oneindig scrollen"
+
+#: mod/settings.php:974
+msgid "Automatic updates only at the top of the network page"
+msgstr "Automatische updates alleen bovenaan de netwerk pagina"
+
+#: mod/settings.php:974
+msgid ""
+"When disabled, the network page is updated all the time, which could be "
+"confusing while reading."
+msgstr "Als deze parameter gedeactiveerd is, dan wordt de netwerk pagina constant geüpdate, wat verwarrend zou kunnen zijn tijdens het lezen."
+
+#: mod/settings.php:975
+msgid "Bandwidth Saver Mode"
+msgstr "Bandbreedte Besparen Mode"
+
+#: mod/settings.php:975
+msgid ""
+"When enabled, embedded content is not displayed on automatic updates, they "
+"only show on page reload."
+msgstr "Als deze parameter geactiveerd is, dan wordt embedded content niet getoond bij automatische updates, ze worden alleen getoond bij het herladen van de pagina."
+
+#: mod/settings.php:976
+msgid "Smart Threading"
+msgstr "Slimme Gespreksstroom"
+
+#: 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 "Als deze parameter geactiveerd is, dan dan wordt overbodig inspringen van reacties onderdrukt terwijl het behouden blijft waar het nodig is. Werkt alleen als gespreksstroom beschikbaar is en geactiveerd."
+
+#: mod/settings.php:978
+msgid "General Theme Settings"
+msgstr "Algemene Thema Instellingen"
+
+#: mod/settings.php:979
+msgid "Custom Theme Settings"
+msgstr "Speciale Thema Instellingen"
+
+#: mod/settings.php:980
+msgid "Content Settings"
+msgstr "Content 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."
+
+#: mod/settings.php:1039
+msgid "Account Types"
+msgstr "Account Types"
+
+#: mod/settings.php:1040
+msgid "Personal Page Subtypes"
+msgstr "Persoonlijke Pagina Subtypes"
+
+#: mod/settings.php:1041
+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 "
+"as \"Friends\"."
+msgstr "Account voor een populair profiel dat automatisch contact aanvragen goedkeurt als \"Vrienden\"."
+
+#: mod/settings.php:1080
+msgid "Private Forum [Experimental]"
+msgstr "Privé-forum [experimenteel]"
+
+#: mod/settings.php:1081
+msgid "Requires manual approval of contact requests."
+msgstr "Vereist manuele goedkeuring van contact aanvragen."
+
+#: mod/settings.php:1092
+msgid "OpenID:"
+msgstr "OpenID:"
+
+#: mod/settings.php:1092
+msgid "(Optional) Allow this OpenID to login to this account."
+msgstr "(Optioneel) Laat dit OpenID toe om in te loggen op deze account."
+
+#: mod/settings.php:1100
+msgid "Publish your default profile in your local site directory?"
+msgstr "Je standaardprofiel in je lokale gids publiceren?"
+
+#: 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 "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/apps.php:14 index.php:265
-msgid "You must be logged in to use addons. "
-msgstr "Je moet ingelogd zijn om deze addons te kunnen gebruiken. "
+#: mod/settings.php:1106
+msgid "Publish your default profile in the global social directory?"
+msgstr "Je standaardprofiel in de globale sociale gids publiceren?"
 
-#: mod/apps.php:19
-msgid "Applications"
-msgstr "Toepassingen"
+#: 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 "Je profiel zal gepubliceerd worden in de globale friendica gids (bvb. <a href=\"%s\">%s</a>). Je profiel zal publiek zichtbaar zijn."
 
-#: mod/apps.php:22
-msgid "No installed applications."
-msgstr "Geen toepassingen geïnstalleerd"
+#: mod/settings.php:1113
+msgid "Hide your contact/friend list from viewers of your default profile?"
+msgstr "Je vrienden/contacten verbergen voor bezoekers van je standaard profiel?"
 
-#: mod/attach.php:15
-msgid "Item not available."
-msgstr "Item niet beschikbaar"
+#: 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 "Je contact lijst zal niet getoond worden in je standaard profiel pagina. Je kan beslissen om je contact lijst apart te tonen per bijkomend profiel dat je aanmaakt."
 
-#: mod/attach.php:25
-msgid "Item was not found."
-msgstr "Item niet gevonden"
+#: mod/settings.php:1117
+msgid "Hide your profile details from anonymous viewers?"
+msgstr "Je profiel details verbergen voor anonieme bezoekers?"
 
-#: 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 "Anonieme bezoekers zullen alleen je profiel foto zien, je naam en de bijnaam die je gebruikt op je profiel pagina. Je publieke berichten en reacties zullen nog altijd toegankelijk zijn via andere wegen."
+
+#: mod/settings.php:1121
+msgid "Allow friends to post to your profile page?"
+msgstr "Vrienden toestaan om op jouw profielpagina te posten?"
+
+#: mod/settings.php:1121
+msgid ""
+"Your contacts may write posts on your profile wall. These posts will be "
+"distributed to your contacts"
+msgstr "Je contacten kunnen berichten schrijven op je tijdslijn. Deze berichten zullen verspreid worden naar je contacten"
+
+#: mod/settings.php:1125
+msgid "Allow friends to tag your posts?"
+msgstr "Sta vrienden toe om jouw berichten te labelen?"
+
+#: mod/settings.php:1125
+msgid "Your contacts can add additional tags to your posts."
+msgstr "Je contacten kunnen tags toevoegen aan je berichten."
+
+#: mod/settings.php:1129
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Sta je mij toe om jou als mogelijke vriend  voor te stellen aan nieuwe leden?"
+
+#: mod/settings.php:1129
+msgid ""
+"If you like, Friendica may suggest new members to add you as a contact."
+msgstr "Als je wil, kan Friendica je nieuwe leden suggereren als contacten."
+
+#: mod/settings.php:1133
+msgid "Permit unknown people to send you private mail?"
+msgstr "Mogen onbekende personen jou privé berichten sturen?"
+
+#: mod/settings.php:1133
+msgid ""
+"Friendica network users may send you private messages even if they are not "
+"in your contact list."
+msgstr "Friendica netwerk gebruikers kunnen je privé boodschappen sturen zelfs als ze niet in je contact lijst staan."
+
+#: mod/settings.php:1137
+msgid "Profile is <strong>not published</strong>."
+msgstr "Profiel is <strong>niet gepubliceerd</strong>."
+
+#: mod/settings.php:1143
+#, php-format
+msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
+msgstr "Je Identiteit adres is <strong>'%s'</strong> of '%s'."
+
+#: mod/settings.php:1150
+msgid "Automatically expire posts after this many days:"
+msgstr "Laat berichten automatisch vervallen na zo veel dagen:"
+
+#: mod/settings.php:1150
+msgid "If empty, posts will not expire. Expired posts will be deleted"
+msgstr "Berichten zullen niet vervallen indien leeg. Vervallen berichten zullen worden verwijderd."
+
+#: mod/settings.php:1151
+msgid "Advanced expiration settings"
+msgstr "Geavanceerde instellingen voor vervallen"
+
+#: mod/settings.php:1152
+msgid "Advanced Expiration"
+msgstr "Geavanceerd Verval:"
+
+#: mod/settings.php:1153
+msgid "Expire posts:"
+msgstr "Laat berichten vervallen:"
+
+#: mod/settings.php:1154
+msgid "Expire personal notes:"
+msgstr "Laat persoonlijke aantekeningen verlopen:"
+
+#: mod/settings.php:1155
+msgid "Expire starred posts:"
+msgstr "Laat berichten met ster verlopen"
+
+#: mod/settings.php:1156
+msgid "Expire photos:"
+msgstr "Laat foto's vervallen:"
+
+#: mod/settings.php:1157
+msgid "Only expire posts by others:"
+msgstr "Laat alleen berichten door anderen vervallen:"
+
+#: mod/settings.php:1187
+msgid "Account Settings"
+msgstr "Account Instellingen"
+
+#: mod/settings.php:1195
+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"
+
+#: mod/settings.php:1198
+msgid "Current Password:"
+msgstr "Huidig wachtwoord:"
+
+#: mod/settings.php:1198 mod/settings.php:1199
+msgid "Your current password to confirm the changes"
+msgstr "Je huidig wachtwoord om de wijzigingen te bevestigen"
+
+#: mod/settings.php:1199
+msgid "Password:"
+msgstr "Wachtwoord:"
+
+#: mod/settings.php:1203
+msgid "Basic Settings"
+msgstr "Basis Instellingen"
+
+#: mod/settings.php:1204 src/Model/Profile.php:725
+msgid "Full Name:"
+msgstr "Volledige Naam:"
+
+#: mod/settings.php:1205
+msgid "Email Address:"
+msgstr "E-mailadres:"
+
+#: mod/settings.php:1206
+msgid "Your Timezone:"
+msgstr "Je Tijdzone:"
+
+#: mod/settings.php:1207
+msgid "Your Language:"
+msgstr "Je taal:"
+
+#: mod/settings.php:1207
+msgid ""
+"Set the language we use to show you friendica interface and to send you "
+"emails"
+msgstr "Configureer de taal van die we gebruiken als friendica interface en om je emails te sturen"
+
+#: mod/settings.php:1208
+msgid "Default Post Location:"
+msgstr "Standaard locatie:"
+
+#: mod/settings.php:1209
+msgid "Use Browser Location:"
+msgstr "Gebruik Webbrowser Locatie:"
+
+#: mod/settings.php:1212
+msgid "Security and Privacy Settings"
+msgstr "Instellingen voor Beveiliging en Privacy"
+
+#: mod/settings.php:1214
+msgid "Maximum Friend Requests/Day:"
+msgstr "Maximum aantal vriendschapsverzoeken per dag:"
+
+#: mod/settings.php:1214 mod/settings.php:1243
+msgid "(to prevent spam abuse)"
+msgstr "(om spam misbruik te voorkomen)"
+
+#: mod/settings.php:1215
+msgid "Default Post Permissions"
+msgstr "Standaard rechten voor nieuwe berichten"
+
+#: mod/settings.php:1216
+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"
+
+#: mod/settings.php:1227
+msgid "Default Public Post"
+msgstr "Standaard Publieke Post"
+
+#: mod/settings.php:1231
+msgid "Default Permissions for New Posts"
+msgstr "Standaard rechten voor nieuwe berichten"
+
+#: mod/settings.php:1243
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Maximum aantal privé-berichten per dag van onbekende personen:"
+
+#: mod/settings.php:1246
+msgid "Notification Settings"
+msgstr "Notificatie Instellingen"
+
+#: mod/settings.php:1247
+msgid "Send a notification email when:"
+msgstr "Stuur een notificatie e-mail wanneer:"
+
+#: mod/settings.php:1248
+msgid "You receive an introduction"
+msgstr "Je ontvangt een vriendschaps- of connectieverzoek"
+
+#: mod/settings.php:1249
+msgid "Your introductions are confirmed"
+msgstr "Jouw vriendschaps- of connectieverzoeken zijn bevestigd"
+
+#: mod/settings.php:1250
+msgid "Someone writes on your profile wall"
+msgstr "Iemand iets op je tijdlijn schrijft"
+
+#: mod/settings.php:1251
+msgid "Someone writes a followup comment"
+msgstr "Iemand een reactie schrijft"
+
+#: mod/settings.php:1252
+msgid "You receive a private message"
+msgstr "Je een privé-bericht ontvangt"
+
+#: mod/settings.php:1253
+msgid "You receive a friend suggestion"
+msgstr "Je een suggestie voor een vriendschap ontvangt"
+
+#: mod/settings.php:1254
+msgid "You are tagged in a post"
+msgstr "Je expliciet in een bericht bent genoemd"
+
+#: mod/settings.php:1255
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Je in een bericht bent aangestoten/gepord/etc."
+
+#: mod/settings.php:1257
+msgid "Activate desktop notifications"
+msgstr "Activeer desktop notificaties"
+
+#: mod/settings.php:1257
+msgid "Show desktop popup on new notifications"
+msgstr "Toon desktop pop-up bij nieuwe notificaties"
+
+#: mod/settings.php:1259
+msgid "Text-only notification emails"
+msgstr "Alleen-tekst notificatie emails"
+
+#: mod/settings.php:1261
+msgid "Send text only notification emails, without the html part"
+msgstr "Stuur alleen-tekst notificatie emails, zonder het html gedeelte"
+
+#: mod/settings.php:1263
+msgid "Show detailled notifications"
+msgstr "Toon gedetailleerde notificaties"
+
+#: mod/settings.php:1265
+msgid ""
+"Per default, notifications are condensed to a single notification per item. "
+"When enabled every notification is displayed."
+msgstr "Standaard worden notificaties samengevoegd in een enkele notificatie per item. Als je deze parameter activeert wordt elke notificatie getoond."
+
+#: mod/settings.php:1267
+msgid "Advanced Account/Page Type Settings"
+msgstr "Geavanceerde Account/Pagina Type Instellingen"
+
+#: mod/settings.php:1268
+msgid "Change the behaviour of this account for special situations"
+msgstr "Pas het gedrag van dit account aan voor speciale situaties"
+
+#: mod/settings.php:1271
+msgid "Relocate"
+msgstr "Verhuis"
+
+#: 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 "Als je je profiel van een andere server hebt verhuisd, en er zijn contacten die geen updates van je ontvangen, probeer dan eens deze knop."
+
+#: mod/settings.php:1273
+msgid "Resend relocate message to contacts"
+msgstr "Stuur verhuis boodschap naar contacten"
+
+#: 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 "Items tagged with: %s"
+msgstr "Items getagd met: %s"
+
+#: mod/search.php:248 mod/contacts.php:841
+#, php-format
+msgid "Results for: %s"
+msgstr "Resultaten voor: %s"
+
+#: mod/common.php:93
 msgid "No contacts in common."
 msgstr "Geen gedeelde contacten."
 
-#: mod/common.php:140 mod/contacts.php:886
+#: mod/common.php:142 mod/contacts.php:916
 msgid "Common Friends"
 msgstr "Gedeelde Vrienden"
 
-#: mod/credits.php:18
-msgid "Credits"
-msgstr "Credits"
+#: mod/bookmarklet.php:24 src/Module/Login.php:310 src/Content/Nav.php:114
+msgid "Login"
+msgstr "Login"
 
-#: mod/credits.php:19
+#: 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 ""
-"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!"
+"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/fbrowser.php:34 view/theme/frio/theme.php:261 src/Content/Nav.php:102
-#: src/Model/Profile.php:902
-msgid "Photos"
-msgstr "Foto's"
+#: 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/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:1647 mod/photos.php:1661 src/Model/Photo.php:244
-#: src/Model/Photo.php:253
-msgid "Contact Photos"
-msgstr "Contactfoto's"
+#: mod/network.php:620
+msgid "No such group"
+msgstr "Zo'n groep bestaat niet"
 
-#: mod/fbrowser.php:105 mod/fbrowser.php:136 mod/profile_photo.php:250
-msgid "Upload"
-msgstr "Uploaden"
+#: mod/network.php:641 mod/group.php:247
+msgid "Group is empty"
+msgstr "De groep is leeg"
 
-#: mod/fbrowser.php:131
-msgid "Files"
-msgstr "Bestanden"
+#: mod/network.php:645
+#, php-format
+msgid "Group: %s"
+msgstr "Groep: %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 "Niet gevonden"
+#: 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/hcard.php:18
+#: 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"
+msgstr "Account exporteren"
+
+#: 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 "Je account informatie en contacten exporteren. Gebruik dit om een backup van je account te maken en/of om het te verhuizen naar een andere server."
+
+#: mod/uexport.php:45
+msgid "Export all"
+msgstr "Alles exporteren"
+
+#: 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 "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/repair_ostatus.php:21
+msgid "Resubscribing to OStatus contacts"
+msgstr "Opnieuw inschrijven bij OStatus contacten"
+
+#: mod/repair_ostatus.php:37
+msgid "Error"
+msgstr "Fout"
+
+#: mod/repair_ostatus.php:52 mod/ostatus_subscribe.php:65
+msgid "Done"
+msgstr "Klaar"
+
+#: 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/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/viewcontacts.php:90
+msgid "No contacts."
+msgstr "Geen contacten."
+
+#: mod/viewcontacts.php:106 mod/contacts.php:639 mod/contacts.php:1052
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Bekijk het profiel van %s [%s]"
+
+#: 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/unfollow.php:49
+msgid "Contact unfollowed"
+msgstr "Contact ontvolgd."
+
+#: mod/unfollow.php:67 mod/dfrn_request.php:654 mod/follow.php:62
+msgid "Submit Request"
+msgstr "Aanvraag indienen"
+
+#: mod/unfollow.php:76
+msgid "You aren't a friend of this contact."
+msgstr "Je bent niet bevriend met dit contact."
+
+#: 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 ""
+"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/lockview.php:38 mod/lockview.php:46
-msgid "Remote privacy information not available."
-msgstr "Privacyinformatie op afstand niet beschikbaar."
+#: mod/suggest.php:38
+msgid "Do you really want to delete this suggestion?"
+msgstr "Wil je echt dit voorstel verwijderen?"
 
-#: mod/lockview.php:55
-msgid "Visible to:"
-msgstr "Zichtbaar voor:"
+#: 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/maintenance.php:24
-msgid "System down for maintenance"
-msgstr "Systeem onbeschikbaar wegens onderhoud"
+#: 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
+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 "Dit is Friendica, versie %s en draait op op locatie %s. De databaseversie is %s, en de bericht update versie is %s."
+
+#: mod/friendica.php:84
+msgid ""
+"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
+"about the Friendica project."
+msgstr "Ga naar <a href=\"https://friendi.ca\">Friendi.ca</a> om meer te vernemen over het Friendica project."
+
+#: mod/friendica.php:88
+msgid "Bug reports and issues: please visit"
+msgstr "Bug rapporten en problemen: bezoek"
+
+#: mod/friendica.php:88
+msgid "the bugtracker at github"
+msgstr "de github bugtracker"
+
+#: mod/friendica.php:91
+msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
+msgstr "Suggesties, appreciatie, enz. - aub stuur een email naar \"info\" at \"friendi - dot - ca"
+
+#: mod/friendica.php:105
+msgid "Installed addons/apps:"
+msgstr "Geïnstalleerde addons/applicaties:"
+
+#: mod/friendica.php:119
+msgid "No installed addons/apps"
+msgstr "Geen geïnstalleerde addons/applicaties"
+
+#: mod/friendica.php:124
+#, php-format
+msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
+msgstr "Lees de <a href=\"%1$s/tos\">Gebruiksvoorwaarden</a> van deze node na."
+
+#: mod/friendica.php:129
+msgid "On this server the following remote servers are blocked."
+msgstr "De volgende remote servers zijn geblokkeerd."
+
+#: 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"
+
+#: mod/friendica.php:130 mod/admin.php:364 mod/admin.php:382
+msgid "Reason for the block"
+msgstr "Reden van de blokkering"
+
+#: 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."
+
+#: 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."
+
+#: 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 )"
+
+#: 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"
+
+#: 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"
+
+#: mod/wall_upload.php:248 mod/profile_photo.php:305 mod/photos.php:860
+msgid "Image upload failed."
+msgstr "Uploaden van afbeelding mislukt."
 
 #: mod/newmember.php:11
 msgid "Welcome to Friendica"
@@ -1345,11 +3899,6 @@ msgid ""
 " 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:1930 mod/admin.php:2199
-#: mod/settings.php:124 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"
@@ -1369,14 +3918,7 @@ msgid ""
 "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/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 "Profiel"
-
-#: 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 "Profielfoto uploaden"
 
@@ -1459,7 +4001,7 @@ msgid ""
 "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:414
+#: mod/newmember.php:43 src/Model/Group.php:402
 msgid "Groups"
 msgstr "Groepen"
 
@@ -1499,72 +4041,2333 @@ msgid ""
 " features and resources."
 msgstr "Je kunt onze <strong>help</strong> pagina's raadplegen voor gedetailleerde informatie over andere functies van dit programma."
 
-#: mod/nogroup.php:42 mod/viewcontacts.php:112 mod/contacts.php:619
-#: mod/contacts.php:959
+#: 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 "Visit %s's profile [%s]"
-msgstr "Bekijk het profiel van %s [%s]"
-
-#: mod/nogroup.php:43 mod/contacts.php:960
-msgid "Edit contact"
-msgstr "Contact bewerken"
-
-#: mod/nogroup.php:63
-msgid "Contacts who are not members of a group"
-msgstr "Contacten die geen leden zijn van een groep"
-
-#: mod/p.php:14
-msgid "Not Extended"
-msgstr ""
-
-#: mod/repair_ostatus.php:18
-msgid "Resubscribing to OStatus contacts"
-msgstr ""
-
-#: mod/repair_ostatus.php:34
-msgid "Error"
-msgstr "Fout"
-
-#: mod/repair_ostatus.php:48 mod/ostatus_subscribe.php:64
-msgid "Done"
-msgstr "Klaar"
-
-#: mod/repair_ostatus.php:54 mod/ostatus_subscribe.php:88
-msgid "Keep this window open until done."
-msgstr "Houd dit scherm open tot het klaar is"
-
-#: mod/suggest.php:36
-msgid "Do you really want to delete this suggestion?"
-msgstr "Wil je echt dit voorstel verwijderen?"
-
-#: mod/suggest.php:73
 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."
+"\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/suggest.php:84 mod/suggest.php:104
-msgid "Ignore/Hide"
-msgstr "Negeren/Verbergen"
-
-#: mod/suggest.php:114 view/theme/vier/theme.php:204 src/Content/Widget.php:64
-msgid "Friend Suggestions"
-msgstr "Vriendschapsvoorstellen"
-
-#: mod/update_community.php:27 mod/update_display.php:27
-#: mod/update_notes.php:40 mod/update_profile.php:39 mod/update_network.php:33
-msgid "[Embedded content - reload page to view]"
-msgstr "[Ingebedde inhoud - herlaad pagina om het te bekijken]"
-
-#: mod/uimport.php:55 mod/register.php:192
+#: mod/lostpass.php:57
+#, php-format
 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."
+"\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/uimport.php:70 mod/register.php:288
-msgid "Import"
-msgstr "Importeren"
+#: mod/lostpass.php:76
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Op %s werd gevraagd je wachtwoord opnieuw in te stellen"
+
+#: 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."
+
+#: mod/lostpass.php:105
+msgid "Request has expired, please make a new one."
+msgstr "Aanvraag is verlopen, gelieve een nieuwe aan te maken."
+
+#: mod/lostpass.php:120
+msgid "Forgot your Password?"
+msgstr "Wachtwoord vergeten?"
+
+#: 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."
+
+#: mod/lostpass.php:122 src/Module/Login.php:312
+msgid "Nickname or Email: "
+msgstr "Bijnaam of e-mail:"
+
+#: mod/lostpass.php:123
+msgid "Reset"
+msgstr "Opnieuw"
+
+#: mod/lostpass.php:139 src/Module/Login.php:324
+msgid "Password Reset"
+msgstr "Wachtwoord opnieuw instellen"
+
+#: mod/lostpass.php:140
+msgid "Your password has been reset as requested."
+msgstr "Je wachtwoord is opnieuw ingesteld zoals gevraagd."
+
+#: mod/lostpass.php:141
+msgid "Your new password is"
+msgstr "Je nieuwe wachtwoord is"
+
+#: mod/lostpass.php:142
+msgid "Save or copy your new password - and then"
+msgstr "Bewaar of kopieer je nieuw wachtwoord - en dan"
+
+#: mod/lostpass.php:143
+msgid "click here to login"
+msgstr "klik hier om in te loggen"
+
+#: 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."
+
+#: 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"
+
+#: 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"
+
+#: mod/lostpass.php:174
+#, php-format
+msgid "Your password has been changed at %s"
+msgstr "Je wachtwoord is veranderd op %s"
+
+#: 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/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"
@@ -1585,7 +6388,7 @@ msgstr "Je moet je account bij de oude server exporteren, en hier uploaden. We z
 msgid ""
 "This feature is experimental. We can't import contacts from the OStatus "
 "network (GNU Social/Statusnet) or from Diaspora"
-msgstr ""
+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"
@@ -1597,76 +6400,678 @@ msgid ""
 "select \"Export account\""
 msgstr "Om je account te exporteren, ga naar \"Instellingen->Exporteer je persoonlijke data\" en selecteer \"Exporteer account\""
 
-#: 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."
+#: mod/profperm.php:35 mod/profperm.php:68
+msgid "Invalid profile identifier."
+msgstr "Ongeldige profiel-identificatie."
 
-#: mod/match.php:104
-msgid "is interested in:"
-msgstr "Is geïnteresseerd in:"
+#: mod/profperm.php:114
+msgid "Profile Visibility Editor"
+msgstr "Profiel Zichtbaarheid Editor"
 
-#: mod/match.php:120
-msgid "Profile Match"
-msgstr "Profielmatch"
+#: mod/profperm.php:127
+msgid "Visible To"
+msgstr "Zichtbaar voor"
 
-#: mod/match.php:125 mod/dirfind.php:253
-msgid "No matches"
-msgstr "Geen resultaten"
+#: mod/profperm.php:143
+msgid "All Contacts (with secure profile access)"
+msgstr "Alle contacten (met veilige profieltoegang)"
 
-#: mod/manage.php:180
-msgid "Manage Identities and/or Pages"
-msgstr "Beheer Identiteiten en/of Pagina's"
+#: mod/cal.php:277 mod/events.php:391
+msgid "View"
+msgstr "Beeld"
 
-#: 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/cal.php:278 mod/events.php:393
+msgid "Previous"
+msgstr "Vorige"
 
-#: mod/manage.php:182
-msgid "Select an identity to manage: "
-msgstr "Selecteer een identiteit om te beheren:"
+#: mod/cal.php:282 mod/events.php:399 src/Model/Event.php:421
+msgid "today"
+msgstr "vandaag"
 
-#: 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/profiles.php:579
-#: mod/events.php:530 mod/photos.php:1068 mod/photos.php:1148
-#: mod/photos.php:1433 mod/photos.php:1479 mod/photos.php:1518
-#: mod/photos.php:1591 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 "Opslaan"
+#: mod/cal.php:283 mod/events.php:400 src/Util/Temporal.php:304
+#: src/Model/Event.php:422
+msgid "month"
+msgstr "maand"
 
-#: 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/cal.php:284 mod/events.php:401 src/Util/Temporal.php:305
+#: src/Model/Event.php:423
+msgid "week"
+msgstr "week"
 
-#: mod/wall_attach.php:101
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr ""
+#: mod/cal.php:285 mod/events.php:402 src/Util/Temporal.php:306
+#: src/Model/Event.php:424
+msgid "day"
+msgstr "dag"
 
-#: mod/wall_attach.php:101
-msgid "Or - did you try to upload an empty file?"
-msgstr ""
+#: mod/cal.php:286 mod/events.php:403
+msgid "list"
+msgstr "lijst"
 
-#: mod/wall_attach.php:112
+#: 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 "File exceeds size limit of %s"
-msgstr ""
+msgid "Registration revoked for %s"
+msgstr "Registratie ingetrokken voor %s"
 
-#: mod/wall_attach.php:136 mod/wall_attach.php:152
-msgid "File upload failed."
-msgstr "Uploaden van bestand mislukt."
+#: mod/regmod.php:102
+msgid "Please login."
+msgstr "Inloggen."
 
-#: mod/filer.php:34
-msgid "- select -"
-msgstr "- Kies -"
+#: mod/editpost.php:26 mod/editpost.php:36
+msgid "Item not found"
+msgstr "Item niet gevonden"
 
-#: mod/localtime.php:19 src/Model/Event.php:36 src/Model/Event.php:814
+#: 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"
 
@@ -1699,1317 +7104,60 @@ msgstr "Omgerekende lokale tijd: %s"
 msgid "Please select your timezone:"
 msgstr "Selecteer je tijdzone:"
 
-#: mod/notify.php:77
-msgid "No more system notifications."
-msgstr "Geen systeemnotificaties meer."
-
-#: mod/notify.php:81 mod/notifications.php:113
-msgid "System Notifications"
-msgstr "Systeemnotificaties"
-
-#: mod/ping.php:292
-msgid "{0} wants to be your friend"
-msgstr "{0} wilt je vriend worden"
-
-#: mod/ping.php:307
-msgid "{0} sent you a message"
-msgstr "{0} stuurde jou een bericht"
-
-#: mod/ping.php:322
-msgid "{0} requested registration"
-msgstr "{0} vroeg om zich te registreren"
-
-#: mod/poke.php:192
+#: mod/poke.php:188
 msgid "Poke/Prod"
 msgstr "Aanstoten/porren"
 
-#: mod/poke.php:193
+#: 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:194
+#: mod/poke.php:190
 msgid "Recipient"
 msgstr "Ontvanger"
 
-#: mod/poke.php:195
+#: 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:198
+#: mod/poke.php:194
 msgid "Make this post private"
 msgstr "Dit bericht privé maken"
 
-#: mod/probe.php:13 mod/viewcontacts.php:45 mod/webfinger.php:16
-#: mod/directory.php:42 mod/dfrn_request.php:602 mod/community.php:27
-#: 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 "Niet vrij toegankelijk"
-
-#: 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 "Toegang geweigerd"
-
-#: 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 ""
-
-#: mod/profperm.php:115 mod/group.php:265
-msgid "Click on a contact to add or remove."
-msgstr "Klik op een contact om het toe te voegen of te verwijderen."
-
-#: 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/regmod.php:68
-msgid "Account approved."
-msgstr "Account goedgekeurd."
-
-#: mod/regmod.php:93
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registratie ingetrokken voor %s"
-
-#: mod/regmod.php:102
-msgid "Please login."
-msgstr "Inloggen."
-
-#: mod/subthread.php:113
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s volgt %3$s van %2$s"
-
-#: mod/tagrm.php:47
-msgid "Tag removed"
-msgstr "Label verwijderd"
-
-#: mod/tagrm.php:85
-msgid "Remove Item Tag"
-msgstr "Verwijder label van item"
-
-#: mod/tagrm.php:87
-msgid "Select a tag to remove: "
-msgstr "Selecteer een label om te verwijderen: "
-
-#: mod/tagrm.php:98 mod/delegate.php:177
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: mod/uexport.php:44
-msgid "Export account"
-msgstr "Account exporteren"
-
-#: 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 "Je account informatie en contacten exporteren. Gebruik dit om een backup van je account te maken en/of om het te verhuizen naar een andere server."
-
-#: mod/uexport.php:45
-msgid "Export all"
-msgstr "Alles exporteren"
-
-#: 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 "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/uexport.php:52 mod/settings.php:108
-msgid "Export personal data"
-msgstr "Persoonlijke gegevens exporteren"
-
-#: mod/viewcontacts.php:87
-msgid "No contacts."
-msgstr "Geen contacten."
-
-#: mod/viewsrc.php:12 mod/community.php:34
-msgid "Access denied."
-msgstr "Toegang geweigerd"
-
-#: 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 ""
-
-#: mod/wall_upload.php:200 mod/profile_photo.php:162 mod/photos.php:806
-msgid "Unable to process image."
-msgstr "Niet in staat om de afbeelding te verwerken"
-
-#: 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 "Uploaden van afbeelding mislukt."
-
-#: mod/wallmessage.php:49 mod/wallmessage.php:112
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr ""
-
-#: mod/wallmessage.php:57 mod/message.php:73
-msgid "No recipient selected."
-msgstr "Geen ontvanger geselecteerd."
-
-#: mod/wallmessage.php:60
-msgid "Unable to check your home location."
-msgstr "Niet in staat om je tijdlijn-locatie vast te stellen"
-
-#: mod/wallmessage.php:63 mod/message.php:80
-msgid "Message could not be sent."
-msgstr "Bericht kon niet verzonden worden."
-
-#: mod/wallmessage.php:66 mod/message.php:83
-msgid "Message collection failure."
-msgstr "Fout bij het verzamelen van berichten."
-
-#: mod/wallmessage.php:69 mod/message.php:86
-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:231
-msgid "Send Private Message"
-msgstr "Verstuur privébericht"
-
-#: 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 "Als je wilt dat %s antwoordt moet je nakijken dat de privacy-instellingen op jouw website privéberichten van onbekende afzenders toelaat."
-
-#: mod/wallmessage.php:134 mod/message.php:232 mod/message.php:402
-msgid "To:"
-msgstr "Aan:"
-
-#: mod/wallmessage.php:135 mod/message.php:236 mod/message.php:404
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-#: mod/wallmessage.php:141 mod/invite.php:149 mod/message.php:240
-#: mod/message.php:407
-msgid "Your message:"
-msgstr "Jouw bericht:"
-
-#: mod/bookmarklet.php:23 src/Content/Nav.php:114 src/Module/Login.php:313
-msgid "Login"
-msgstr "Login"
-
-#: mod/bookmarklet.php:51
-msgid "The post was created"
-msgstr ""
-
-#: mod/editpost.php:25 mod/editpost.php:35
-msgid "Item not found"
-msgstr "Item niet gevonden"
-
-#: mod/editpost.php:42
-msgid "Edit post"
-msgstr "Bericht bewerken"
-
-#: mod/editpost.php:134 src/Core/ACL.php:315
-msgid "CC: email addresses"
-msgstr "CC: e-mailadressen"
-
-#: mod/editpost.php:141 src/Core/ACL.php:316
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Voorbeeld: bob@voorbeeld.nl, an@voorbeeld.be"
-
-#: mod/fsuggest.php:30 mod/fsuggest.php:96 mod/crepair.php:110
-#: mod/dfrn_confirm.php:129
-msgid "Contact not found."
-msgstr "Contact niet gevonden"
-
-#: 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/cal.php:142 mod/display.php:316 mod/profile.php:174
-msgid "Access to this profile has been restricted."
-msgstr "Toegang tot dit profiel is beperkt."
-
-#: 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 "Gebeurtenissen"
-
-#: mod/cal.php:275 mod/events.php:392
-msgid "View"
-msgstr ""
-
-#: mod/cal.php:276 mod/events.php:394
-msgid "Previous"
-msgstr "Vorige"
-
-#: mod/cal.php:277 mod/install.php:156 mod/events.php:395
-msgid "Next"
-msgstr "Volgende"
-
-#: mod/cal.php:280 mod/events.php:400 src/Model/Event.php:412
-msgid "today"
-msgstr "vandaag"
-
-#: mod/cal.php:281 mod/events.php:401 src/Util/Temporal.php:304
-#: src/Model/Event.php:413
-msgid "month"
-msgstr "maand"
-
-#: mod/cal.php:282 mod/events.php:402 src/Util/Temporal.php:305
-#: src/Model/Event.php:414
-msgid "week"
-msgstr "week"
-
-#: mod/cal.php:283 mod/events.php:403 src/Util/Temporal.php:306
-#: src/Model/Event.php:415
-msgid "day"
-msgstr "dag"
-
-#: 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 "Geen exporteerbare data gevonden"
-
-#: mod/cal.php:332
-msgid "calendar"
-msgstr ""
-
-#: mod/contacts.php:71 mod/notifications.php:259 src/Model/Profile.php:516
-msgid "Network:"
-msgstr "Netwerk:"
-
-#: mod/contacts.php:157
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/contacts.php:184 mod/contacts.php:400
-msgid "Could not access contact record."
-msgstr "Kon geen toegang krijgen tot de contactgegevens"
-
-#: mod/contacts.php:194
-msgid "Could not locate selected profile."
-msgstr "Kon het geselecteerde profiel niet vinden."
-
-#: mod/contacts.php:228
-msgid "Contact updated."
-msgstr "Contact bijgewerkt."
-
-#: mod/contacts.php:230 mod/dfrn_request.php:415
-msgid "Failed to update contact record."
-msgstr "Ik kon de contactgegevens niet aanpassen."
-
-#: mod/contacts.php:421
-msgid "Contact has been blocked"
-msgstr "Contact is geblokkeerd"
-
-#: mod/contacts.php:421
-msgid "Contact has been unblocked"
-msgstr "Contact is gedeblokkeerd"
-
-#: mod/contacts.php:432
-msgid "Contact has been ignored"
-msgstr "Contact wordt genegeerd"
-
-#: mod/contacts.php:432
-msgid "Contact has been unignored"
-msgstr "Contact wordt niet meer genegeerd"
-
-#: mod/contacts.php:443
-msgid "Contact has been archived"
-msgstr "Contact is gearchiveerd"
-
-#: mod/contacts.php:443
-msgid "Contact has been unarchived"
-msgstr "Contact is niet meer gearchiveerd"
-
-#: 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 "Wil je echt dit contact verwijderen?"
-
-#: mod/contacts.php:488
-msgid "Contact has been removed."
-msgstr "Contact is verwijderd."
-
-#: mod/contacts.php:519
-#, 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:527
-#, php-format
-msgid "%s is sharing with you"
-msgstr "%s deelt met jou"
-
-#: mod/contacts.php:547
-msgid "Private communications are not available for this contact."
-msgstr "Privécommunicatie met dit contact is niet beschikbaar."
-
-#: mod/contacts.php:549
-msgid "Never"
-msgstr "Nooit"
-
-#: mod/contacts.php:552
-msgid "(Update was successful)"
-msgstr "(Wijziging is geslaagd)"
-
-#: mod/contacts.php:552
-msgid "(Update was not successful)"
-msgstr "(Wijziging is niet geslaagd)"
-
-#: mod/contacts.php:554 mod/contacts.php:992
-msgid "Suggest friends"
-msgstr "Stel vrienden voor"
-
-#: mod/contacts.php:558
-#, php-format
-msgid "Network type: %s"
-msgstr "Netwerk type: %s"
-
-#: mod/contacts.php:563
-msgid "Communications lost with this contact!"
-msgstr "Communicatie met dit contact is verbroken!"
-
-#: 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:1283 mod/admin.php:1445
-#: mod/admin.php:1455
-msgid "Disabled"
-msgstr "Uitgeschakeld"
-
-#: 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 "Zichtbaarheid profiel"
-
-#: mod/contacts.php:612
-#, 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:613
-msgid "Contact Information / Notes"
-msgstr "Contactinformatie / aantekeningen"
-
-#: mod/contacts.php:614
-msgid "Their personal note"
-msgstr ""
-
-#: mod/contacts.php:616
-msgid "Edit contact notes"
-msgstr "Wijzig aantekeningen over dit contact"
-
-#: mod/contacts.php:620
-msgid "Block/Unblock contact"
-msgstr "Blokkeer/deblokkeer contact"
-
-#: mod/contacts.php:621
-msgid "Ignore contact"
-msgstr "Negeer contact"
-
-#: mod/contacts.php:622
-msgid "Repair URL settings"
-msgstr "Repareer URL-instellingen"
-
-#: mod/contacts.php:623
-msgid "View conversations"
-msgstr "Toon gesprekken"
-
-#: mod/contacts.php:628
-msgid "Last update:"
-msgstr "Laatste wijziging:"
-
-#: mod/contacts.php:630
-msgid "Update public posts"
-msgstr "Openbare posts aanpassen"
-
-#: mod/contacts.php:632 mod/contacts.php:1002
-msgid "Update now"
-msgstr "Wijzig nu"
-
-#: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:489 mod/admin.php:1824
-msgid "Unblock"
-msgstr "Blokkering opheffen"
-
-#: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:488 mod/admin.php:1823
-msgid "Block"
-msgstr "Blokkeren"
-
-#: mod/contacts.php:638 mod/contacts.php:828 mod/contacts.php:1019
-msgid "Unignore"
-msgstr "Negeer niet meer"
-
-#: 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 "Negeren"
-
-#: mod/contacts.php:642
-msgid "Currently blocked"
-msgstr "Op dit moment geblokkeerd"
-
-#: mod/contacts.php:643
-msgid "Currently ignored"
-msgstr "Op dit moment genegeerd"
-
-#: mod/contacts.php:644
-msgid "Currently archived"
-msgstr "Op dit moment gearchiveerd"
-
-#: 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 "Verberg dit contact voor anderen"
-
-#: mod/contacts.php:646
-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:647
-msgid "Notification for new posts"
-msgstr "Meldingen voor nieuwe berichten"
-
-#: 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/notifications.php:256 mod/admin.php:494 mod/admin.php:504
-msgid "Profile URL"
-msgstr "Profiel url"
-
-#: mod/contacts.php:660 mod/directory.php:148 mod/notifications.php:246
-#: mod/events.php:518 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 "Plaats:"
-
-#: mod/contacts.php:662 src/Model/Profile.php:420
-msgid "XMPP:"
-msgstr ""
-
-#: 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 "Over:"
-
-#: mod/contacts.php:666 mod/follow.php:174 mod/notifications.php:250
-#: src/Model/Profile.php:792
-msgid "Tags:"
-msgstr "Labels:"
-
-#: 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 "Tijdlijn"
-
-#: mod/contacts.php:670
-msgid "Contact Settings"
-msgstr ""
-
-#: mod/contacts.php:711
-msgid "Suggestions"
-msgstr "Voorstellen"
-
-#: mod/contacts.php:714
-msgid "Suggest potential friends"
-msgstr "Stel vrienden voor"
-
-#: mod/contacts.php:719 mod/group.php:215
-msgid "All Contacts"
-msgstr "Alle Contacten"
-
-#: mod/contacts.php:722
-msgid "Show all contacts"
-msgstr "Toon alle contacten"
-
-#: mod/contacts.php:727
-msgid "Unblocked"
-msgstr "Niet geblokkeerd"
-
-#: mod/contacts.php:730
-msgid "Only show unblocked contacts"
-msgstr "Toon alleen niet-geblokkeerde contacten"
-
-#: mod/contacts.php:735
-msgid "Blocked"
-msgstr "Geblokkeerd"
-
-#: mod/contacts.php:738
-msgid "Only show blocked contacts"
-msgstr "Toon alleen geblokkeerde contacten"
-
-#: mod/contacts.php:743
-msgid "Ignored"
-msgstr "Genegeerd"
-
-#: mod/contacts.php:746
-msgid "Only show ignored contacts"
-msgstr "Toon alleen genegeerde contacten"
-
-#: mod/contacts.php:751
-msgid "Archived"
-msgstr "Gearchiveerd"
-
-#: mod/contacts.php:754
-msgid "Only show archived contacts"
-msgstr "Toon alleen gearchiveerde contacten"
-
-#: mod/contacts.php:759
-msgid "Hidden"
-msgstr "Verborgen"
-
-#: mod/contacts.php:762
-msgid "Only show hidden contacts"
-msgstr "Toon alleen verborgen contacten"
-
-#: mod/contacts.php:818
-msgid "Search your contacts"
-msgstr "Doorzoek je contacten"
-
-#: 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 "Zoek"
-
-#: mod/contacts.php:826 mod/settings.php:169 mod/settings.php:695
-msgid "Update"
-msgstr "Wijzigen"
-
-#: mod/contacts.php:829 mod/contacts.php:1027
-msgid "Archive"
-msgstr "Archiveer"
-
-#: mod/contacts.php:829 mod/contacts.php:1027
-msgid "Unarchive"
-msgstr "Archiveer niet meer"
-
-#: 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 "Berichten op jouw tijdlijn"
-
-#: mod/contacts.php:866 src/Model/Profile.php:897
-msgid "Profile Details"
-msgstr "Profieldetails"
-
-#: mod/contacts.php:878
-msgid "View all contacts"
-msgstr "Alle contacten zien"
-
-#: mod/contacts.php:889
-msgid "View all common friends"
-msgstr ""
-
-#: mod/contacts.php:895 mod/admin.php:1358 mod/events.php:532
-#: src/Model/Profile.php:863
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-#: mod/contacts.php:898
-msgid "Advanced Contact Settings"
-msgstr "Geavanceerde instellingen voor contacten"
-
-#: mod/contacts.php:930
-msgid "Mutual Friendship"
-msgstr "Wederzijdse vriendschap"
-
-#: mod/contacts.php:934
-msgid "is a fan of yours"
-msgstr "Is een fan van jou"
-
-#: mod/contacts.php:938
-msgid "you are a fan of"
-msgstr "Jij bent een fan van"
-
-#: mod/contacts.php:953 mod/photos.php:1476 mod/photos.php:1515
-#: mod/photos.php:1588 src/Object/Post.php:801
-msgid "This is you"
-msgstr "Dit ben jij"
-
-#: mod/contacts.php:1013
-msgid "Toggle Blocked status"
-msgstr "Schakel geblokkeerde status"
-
-#: mod/contacts.php:1021
-msgid "Toggle Ignored status"
-msgstr "Schakel negeerstatus"
-
-#: mod/contacts.php:1029
-msgid "Toggle Archive status"
-msgstr "Schakel archiveringsstatus"
-
-#: mod/contacts.php:1037
-msgid "Delete contact"
-msgstr "Verwijder contact"
-
-#: 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:1353
-#: mod/admin.php:1989 mod/admin.php:2242 mod/admin.php:2316 mod/admin.php:2463
-#: mod/settings.php:669 mod/settings.php:776 mod/settings.php:864
-#: mod/settings.php:953 mod/settings.php:1183
-msgid "Save Settings"
-msgstr "Instellingen opslaan"
-
-#: mod/delegate.php:169 src/Content/Nav.php:205
-msgid "Delegate Page Management"
-msgstr "Paginabeheer uitbesteden"
-
-#: 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 "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:173
-msgid "Existing Page Delegates"
-msgstr "Bestaande personen waaraan het paginabeheer is uitbesteed"
-
-#: mod/delegate.php:175
-msgid "Potential Delegates"
-msgstr "Mogelijke personen waaraan het paginabeheer kan worden uitbesteed "
-
-#: mod/delegate.php:178
-msgid "Add"
-msgstr "Toevoegen"
-
-#: mod/delegate.php:179
-msgid "No entries."
-msgstr "Geen gegevens."
-
-#: 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 "Bericht succesvol geplaatst."
-
-#: mod/ostatus_subscribe.php:21
-msgid "Subscribing to OStatus contacts"
-msgstr ""
-
-#: 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 "Succesvol"
-
-#: mod/ostatus_subscribe.php:80
-msgid "failed"
-msgstr "Mislukt"
-
-#: mod/ostatus_subscribe.php:83 src/Object/Post.php:287
-msgid "ignored"
-msgstr "Verboden"
-
-#: mod/profile_photo.php:55
-msgid "Image uploaded but image cropping failed."
-msgstr "Afbeelding opgeladen, maar bijsnijden mislukt."
-
-#: 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 "Verkleining van de afbeelding [%s] mislukt."
-
-#: mod/profile_photo.php:125
-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:134
-msgid "Unable to process image"
-msgstr "Ik kan de afbeelding niet verwerken"
-
-#: mod/profile_photo.php:247
-msgid "Upload File:"
-msgstr "Upload bestand:"
-
-#: mod/profile_photo.php:248
-msgid "Select a profile:"
-msgstr "Kies een profiel:"
-
-#: mod/profile_photo.php:253
-msgid "or"
-msgstr "of"
-
-#: mod/profile_photo.php:253
-msgid "skip this step"
-msgstr "Deze stap overslaan"
-
-#: mod/profile_photo.php:253
-msgid "select a photo from your photo albums"
-msgstr "Kies een foto uit je fotoalbums"
-
-#: mod/profile_photo.php:266
-msgid "Crop Image"
-msgstr "Afbeelding bijsnijden"
-
-#: mod/profile_photo.php:267
-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:269
-msgid "Done Editing"
-msgstr "Wijzigingen compleet"
-
-#: mod/profile_photo.php:305
-msgid "Image uploaded successfully."
-msgstr "Uploaden van afbeelding gelukt."
-
-#: 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 "Aanvraag indienen"
-
-#: 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 "Adres van je identiteit:"
-
-#: mod/directory.php:151 mod/notifications.php:252 src/Model/Profile.php:416
-#: src/Model/Profile.php:743
-msgid "Gender:"
-msgstr "Geslacht:"
-
-#: mod/directory.php:152 src/Model/Profile.php:417 src/Model/Profile.php:767
-msgid "Status:"
-msgstr "Tijdlijn:"
-
-#: mod/directory.php:153 src/Model/Profile.php:418 src/Model/Profile.php:784
-msgid "Homepage:"
-msgstr "Website:"
-
-#: mod/directory.php:202 view/theme/vier/theme.php:208
-#: src/Content/Widget.php:68
-msgid "Global Directory"
-msgstr "Globale gids"
-
-#: mod/directory.php:204
-msgid "Find on this site"
-msgstr "Op deze website zoeken"
-
-#: mod/directory.php:206
-msgid "Results for:"
-msgstr ""
-
-#: mod/directory.php:208
-msgid "Site Directory"
-msgstr "Websitegids"
-
-#: mod/directory.php:213
-msgid "No entries (some entries may be hidden)."
-msgstr "Geen gegevens (sommige gegevens kunnen verborgen zijn)."
-
-#: mod/dirfind.php:49
-#, php-format
-msgid "People Search - %s"
-msgstr ""
-
-#: mod/dirfind.php:60
-#, php-format
-msgid "Forum Search - %s"
-msgstr ""
-
-#: mod/follow.php:45
-msgid "The contact could not be added."
-msgstr ""
-
-#: 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 ""
-
-#: mod/follow.php:90
-msgid "OStatus support is disabled. Contact can't be added."
-msgstr ""
-
-#: 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 "Beantwoord het volgende:"
-
-#: mod/follow.php:150 mod/dfrn_request.php:648
-#, php-format
-msgid "Does %s know you?"
-msgstr "Kent %s jou?"
-
-#: mod/follow.php:151 mod/dfrn_request.php:649
-msgid "Add a personal note:"
-msgstr "Voeg een persoonlijke opmerking toe:"
-
-#: mod/lostpass.php:27
-msgid "No valid account found."
-msgstr "Geen geldige account gevonden."
-
-#: mod/lostpass.php:39
-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:45
-#, 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:56
-#, 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:73
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Op %s werd gevraagd je wachtwoord opnieuw in te stellen"
-
-#: mod/lostpass.php:89
-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:102
-msgid "Request has expired, please make a new one."
-msgstr ""
-
-#: mod/lostpass.php:117
-msgid "Forgot your Password?"
-msgstr "Wachtwoord vergeten?"
-
-#: mod/lostpass.php:118
-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:119 src/Module/Login.php:315
-msgid "Nickname or Email: "
-msgstr "Bijnaam of e-mail:"
-
-#: mod/lostpass.php:120
-msgid "Reset"
-msgstr "Opnieuw"
-
-#: mod/lostpass.php:136 src/Module/Login.php:327
-msgid "Password Reset"
-msgstr "Wachtwoord opnieuw instellen"
-
-#: mod/lostpass.php:137
-msgid "Your password has been reset as requested."
-msgstr "Je wachtwoord is opnieuw ingesteld zoals gevraagd."
-
-#: mod/lostpass.php:138
-msgid "Your new password is"
-msgstr "Je nieuwe wachtwoord is"
-
-#: mod/lostpass.php:139
-msgid "Save or copy your new password - and then"
-msgstr "Bewaar of kopieer je nieuw wachtwoord - en dan"
-
-#: mod/lostpass.php:140
-msgid "click here to login"
-msgstr "klik hier om in te loggen"
-
-#: mod/lostpass.php:141
-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:149
-#, 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 ""
-
-#: mod/lostpass.php:155
-#, 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 ""
-
-#: mod/lostpass.php:169
-#, php-format
-msgid "Your password has been changed at %s"
-msgstr "Je wachtwoord is veranderd op %s"
-
-#: mod/babel.php:22
-msgid "Source input"
-msgstr ""
-
-#: mod/babel.php:28
-msgid "BBCode::toPlaintext"
-msgstr ""
-
-#: mod/babel.php:34
-msgid "BBCode::convert (raw HTML)"
-msgstr ""
-
-#: mod/babel.php:39
-msgid "BBCode::convert"
-msgstr ""
-
-#: mod/babel.php:45
-msgid "BBCode::convert => HTML::toBBCode"
-msgstr ""
-
-#: mod/babel.php:51
-msgid "BBCode::toMarkdown"
-msgstr ""
-
-#: mod/babel.php:57
-msgid "BBCode::toMarkdown => Markdown::convert"
-msgstr ""
-
-#: mod/babel.php:63
-msgid "BBCode::toMarkdown => Markdown::toBBCode"
-msgstr ""
-
-#: mod/babel.php:69
-msgid "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"
-msgstr ""
-
-#: mod/babel.php:76
-msgid "Source input \\x28Diaspora format\\x29"
-msgstr ""
-
-#: mod/babel.php:82
-msgid "Markdown::toBBCode"
-msgstr ""
-
-#: mod/babel.php:89
-msgid "Raw HTML input"
-msgstr ""
-
-#: mod/babel.php:94
-msgid "HTML Input"
-msgstr ""
-
-#: mod/babel.php:100
-msgid "HTML::toBBCode"
-msgstr ""
-
-#: mod/babel.php:106
-msgid "HTML::toPlaintext"
-msgstr ""
-
-#: mod/babel.php:114
-msgid "Source text"
-msgstr ""
-
-#: mod/babel.php:115
-msgid "BBCode"
-msgstr ""
-
-#: mod/babel.php:116
-msgid "Markdown"
-msgstr ""
-
-#: mod/babel.php:117
-msgid "HTML"
-msgstr ""
-
-#: mod/friendica.php:77
-msgid "This is Friendica, version"
-msgstr "Dit is Friendica, versie"
-
-#: mod/friendica.php:78
-msgid "running at web location"
-msgstr "draaiend op web-adres"
-
-#: mod/friendica.php:82
-msgid ""
-"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
-"about the Friendica project."
-msgstr ""
-
-#: mod/friendica.php:86
-msgid "Bug reports and issues: please visit"
-msgstr "Bug rapporten en problemen: bezoek"
-
-#: mod/friendica.php:86
-msgid "the bugtracker at github"
-msgstr ""
-
-#: 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 ""
-
-#: mod/friendica.php:127
-msgid "On this server the following remote servers are blocked."
-msgstr ""
-
-#: mod/friendica.php:128 mod/dfrn_request.php:347 mod/admin.php:357
-#: mod/admin.php:375 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
+#: mod/invite.php:34
 msgid "Total invitation limit exceeded."
 msgstr "Totale uitnodigingslimiet overschreden."
 
-#: mod/invite.php:55
+#: mod/invite.php:56
 #, php-format
 msgid "%s : Not a valid email address."
 msgstr "%s: Geen geldig e-mailadres."
 
-#: mod/invite.php:87
+#: mod/invite.php:88
 msgid "Please join us on Friendica"
 msgstr "Kom bij ons op Friendica"
 
-#: mod/invite.php:96
+#: 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:100
+#: mod/invite.php:101
 #, php-format
 msgid "%s : Message delivery failed."
 msgstr "%s : Aflevering van bericht mislukt."
 
-#: mod/invite.php:104
+#: 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:122
+#: mod/invite.php:123
 msgid "You have no more invitations available"
 msgstr "Je kunt geen uitnodigingen meer sturen"
 
-#: mod/invite.php:130
+#: mod/invite.php:131
 #, php-format
 msgid ""
 "Visit %s for a list of public sites that you can join. Friendica members on "
@@ -3017,14 +7165,14 @@ msgid ""
 " 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:132
+#: 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:133
+#: mod/invite.php:134
 #, php-format
 msgid ""
 "Friendica sites all inter-connect to create a huge privacy-enhanced social "
@@ -3033,890 +7181,158 @@ msgid ""
 "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:137
+#: 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:141
+#: 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 ""
+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:140
+#: mod/invite.php:141
 #, php-format
 msgid "To accept this invitation, please visit and register at %s."
-msgstr ""
+msgstr "Om deze uitnodiging te accepteren, ga naar en registreer op %s."
 
-#: mod/invite.php:147
+#: mod/invite.php:148
 msgid "Send invitations"
 msgstr "Verstuur uitnodigingen"
 
-#: mod/invite.php:148
+#: mod/invite.php:149
 msgid "Enter email addresses, one per line:"
 msgstr "Vul e-mailadressen in, één per lijn:"
 
-#: mod/invite.php:149
+#: 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:151
+#: 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:151
+#: 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:153
+#: 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 ""
+msgstr "Voor meer informatie over het Friendica project en waarom wij denken dat het belangrijk is kun je http://friendi.ca/ bezoeken"
 
-#: mod/crepair.php:87
-msgid "Contact settings applied."
-msgstr "Contactinstellingen toegepast."
+#: mod/notes.php:42 src/Model/Profile.php:933
+msgid "Personal Notes"
+msgstr "Persoonlijke Nota's"
 
-#: mod/crepair.php:89
-msgid "Contact update failed."
-msgstr "Aanpassen van contact mislukt."
-
-#: 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>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:115
-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: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 "Ga terug naar contactbewerker"
-
-#: 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 ""
-
-#: mod/crepair.php:158 mod/admin.php:494 mod/admin.php:1806 mod/admin.php:1817
-#: mod/admin.php:1830 mod/admin.php:1846 mod/settings.php:671
-#: mod/settings.php:697
-msgid "Name"
-msgstr "Naam"
-
-#: mod/crepair.php:159
-msgid "Account Nickname"
-msgstr "Bijnaam account"
-
-#: mod/crepair.php:160
-msgid "@Tagname - overrides Name/Nickname"
-msgstr "@Labelnaam - krijgt voorrang op naam/bijnaam"
-
-#: mod/crepair.php:161
-msgid "Account URL"
-msgstr "URL account"
-
-#: mod/crepair.php:162
-msgid "Friend Request URL"
-msgstr "URL vriendschapsverzoek"
-
-#: mod/crepair.php:163
-msgid "Friend Confirm URL"
-msgstr "URL vriendschapsbevestiging"
-
-#: mod/crepair.php:164
-msgid "Notification Endpoint URL"
-msgstr ""
-
-#: mod/crepair.php:165
-msgid "Poll/Feed URL"
-msgstr "URL poll/feed"
-
-#: mod/crepair.php:166
-msgid "New photo from this URL"
-msgstr "Nieuwe foto van deze URL"
-
-#: mod/dfrn_poll.php:123 mod/dfrn_poll.php:539
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr "%1$s heet %2$s van harte welkom"
-
-#: mod/help.php:48
-msgid "Help:"
-msgstr "Help:"
-
-#: mod/help.php:54 view/theme/vier/theme.php:297 src/Content/Nav.php:134
-msgid "Help"
-msgstr "Help"
-
-#: mod/help.php:63 index.php:317
-msgid "Page not found."
-msgstr "Pagina niet gevonden"
-
-#: mod/install.php:87
-msgid "Friendica Communications Server - Setup"
-msgstr ""
-
-#: 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:155 mod/install.php:267
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Zie het bestand \"INSTALL.txt\"."
-
-#: mod/install.php:121
-msgid "Database already in use."
-msgstr ""
-
-#: mod/install.php:152
-msgid "System check"
-msgstr "Systeemcontrole"
-
-#: mod/install.php:157
-msgid "Check again"
-msgstr "Controleer opnieuw"
-
-#: mod/install.php:177
-msgid "Database connection"
-msgstr "Verbinding met database"
-
-#: mod/install.php:178
-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:179
-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:180
-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:184
-msgid "Database Server Name"
-msgstr "Servernaam database"
-
-#: mod/install.php:185
-msgid "Database Login Name"
-msgstr "Gebruikersnaam database"
-
-#: mod/install.php:186
-msgid "Database Login Password"
-msgstr "Wachtwoord database"
-
-#: mod/install.php:186
-msgid "For security reasons the password must not be empty"
-msgstr ""
-
-#: mod/install.php:187
-msgid "Database Name"
-msgstr "Naam database"
-
-#: mod/install.php:188 mod/install.php:228
-msgid "Site administrator email address"
-msgstr "E-mailadres van de websitebeheerder"
-
-#: 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 "Het e-mailadres van je account moet hiermee overeenkomen om het administratiepaneel te kunnen gebruiken."
-
-#: mod/install.php:192 mod/install.php:231
-msgid "Please select a default timezone for your website"
-msgstr "Selecteer een standaard tijdzone voor je website"
-
-#: mod/install.php:218
-msgid "Site settings"
-msgstr "Website-instellingen"
-
-#: 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 ""
-
-#: 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 "Het databaseconfiguratiebestand \".htconfig.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:265
-msgid "<h1>What next</h1>"
-msgstr "<h1>Wat nu</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 "Nieuw Bericht"
-
-#: mod/message.php:77
-msgid "Unable to locate contact information."
-msgstr "Ik kan geen contact informatie vinden."
-
-#: mod/message.php:112 view/theme/frio/theme.php:268 src/Content/Nav.php:196
-msgid "Messages"
-msgstr "Privéberichten"
-
-#: mod/message.php:136
-msgid "Do you really want to delete this message?"
-msgstr "Wil je echt dit bericht verwijderen?"
-
-#: mod/message.php:152
-msgid "Message deleted."
-msgstr "Bericht verwijderd."
-
-#: mod/message.php:166
-msgid "Conversation removed."
-msgstr "Gesprek verwijderd."
-
-#: mod/message.php:272
-msgid "No messages."
-msgstr "Geen berichten."
-
-#: mod/message.php:311
-msgid "Message not available."
-msgstr "Bericht niet beschikbaar."
-
-#: mod/message.php:378
-msgid "Delete message"
-msgstr "Verwijder bericht"
-
-#: 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 "Verwijder gesprek"
-
-#: mod/message.php:397
-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:401
-msgid "Send Reply"
-msgstr "Verstuur Antwoord"
-
-#: mod/message.php:452
-#, php-format
-msgid "Unknown sender - %s"
-msgstr "Onbekende afzender - %s"
-
-#: mod/message.php:454
-#, php-format
-msgid "You and %s"
-msgstr "Jij en %s"
-
-#: mod/message.php:456
-#, php-format
-msgid "%s and You"
-msgstr "%s en jij"
-
-#: mod/message.php:484
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] "%d bericht"
-msgstr[1] "%d 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:157
-msgid "Group not found."
-msgstr "Groep niet gevonden."
-
-#: mod/group.php:70
-msgid "Group name changed."
-msgstr "Groepsnaam gewijzigd."
-
-#: mod/group.php:97
-msgid "Save Group"
-msgstr "Bewaar groep"
-
-#: mod/group.php:102
-msgid "Create a group of contacts/friends."
-msgstr "Maak een groep contacten/vrienden aan."
-
-#: mod/group.php:103 mod/group.php:199 src/Model/Group.php:421
-msgid "Group Name: "
-msgstr "Groepsnaam:"
-
-#: mod/group.php:127
-msgid "Group removed."
-msgstr "Groep verwijderd."
-
-#: mod/group.php:129
-msgid "Unable to remove group."
-msgstr "Niet in staat om groep te verwijderen."
-
-#: mod/group.php:192
-msgid "Delete Group"
-msgstr ""
-
-#: mod/group.php:198
-msgid "Group Editor"
-msgstr "Groepsbewerker"
-
-#: mod/group.php:203
-msgid "Edit Group Name"
-msgstr ""
-
-#: mod/group.php:213
-msgid "Members"
-msgstr "Leden"
-
-#: mod/group.php:216 mod/network.php:639
-msgid "Group is empty"
-msgstr "De groep is leeg"
-
-#: mod/group.php:229
-msgid "Remove contact from group"
-msgstr ""
-
-#: mod/group.php:253
-msgid "Add contact to group"
-msgstr ""
-
-#: 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:86 src/Module/Login.php:135
-msgid "Login failed."
-msgstr "Login mislukt."
-
-#: 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 "Profiel niet gevonden"
-
-#: mod/dfrn_confirm.php:130
-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:240
-msgid "Response from remote site was not understood."
-msgstr "Antwoord van de website op afstand werd niet begrepen."
-
-#: mod/dfrn_confirm.php:247 mod/dfrn_confirm.php:252
-msgid "Unexpected response from remote site: "
-msgstr "Onverwacht antwoord van website op afstand:"
-
-#: mod/dfrn_confirm.php:261
-msgid "Confirmation completed successfully."
-msgstr "Bevestiging werd correct voltooid."
-
-#: mod/dfrn_confirm.php:273
-msgid "Temporary failure. Please wait and try again."
-msgstr "Tijdelijke fout. Wacht even en probeer opnieuw."
-
-#: mod/dfrn_confirm.php:276
-msgid "Introduction failed or was revoked."
-msgstr "Verzoek mislukt of herroepen."
-
-#: mod/dfrn_confirm.php:281
-msgid "Remote site reported: "
-msgstr "Website op afstand berichtte: "
-
-#: mod/dfrn_confirm.php:392
-msgid "Unable to set contact photo."
-msgstr "Ik kan geen contact foto instellen."
-
-#: mod/dfrn_confirm.php:450
-#, php-format
-msgid "No user record found for '%s' "
-msgstr "Geen gebruiker gevonden voor '%s'"
-
-#: 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: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: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: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: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: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: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 "[Naam achtergehouden]"
-
-#: 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:355
-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:359
-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:362
-msgid "Warning: profile location has no profile photo."
-msgstr "Waarschuwing: Profieladres heeft geen profielfoto."
-
-#: 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] "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:162
-msgid "Introduction complete."
-msgstr "Verzoek voltooid."
-
-#: mod/dfrn_request.php:199
-msgid "Unrecoverable protocol error."
-msgstr "Onherstelbare protocolfout. "
-
-#: mod/dfrn_request.php:226
-msgid "Profile unavailable."
-msgstr "Profiel onbeschikbaar"
-
-#: mod/dfrn_request.php:248
-#, php-format
-msgid "%s has received too many connection requests today."
-msgstr "%s heeft te veel verzoeken gehad vandaag."
-
-#: mod/dfrn_request.php:249
-msgid "Spam protection measures have been invoked."
-msgstr "Beveiligingsmaatregelen tegen spam zijn in werking getreden."
-
-#: mod/dfrn_request.php:250
-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:276
-msgid "Invalid locator"
-msgstr "Ongeldige plaatsbepaler"
-
-#: mod/dfrn_request.php:312
-msgid "You have already introduced yourself here."
-msgstr "Je hebt jezelf hier al voorgesteld."
-
-#: mod/dfrn_request.php:315
-#, php-format
-msgid "Apparently you are already friends with %s."
-msgstr "Blijkbaar ben je al bevriend met %s."
-
-#: mod/dfrn_request.php:335
-msgid "Invalid profile URL."
-msgstr "Ongeldig profiel adres."
-
-#: mod/dfrn_request.php:341 src/Model/Contact.php:1276
-msgid "Disallowed profile URL."
-msgstr "Niet toegelaten profiel adres."
-
-#: mod/dfrn_request.php:435
-msgid "Your introduction has been sent."
-msgstr "Je verzoek is verzonden."
-
-#: 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 "Log in om je verzoek te bevestigen."
-
-#: mod/dfrn_request.php:497
-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:511 mod/dfrn_request.php:528
-msgid "Confirm"
-msgstr "Bevestig"
-
-#: mod/dfrn_request.php:523
-msgid "Hide this contact"
-msgstr "Verberg dit contact"
-
-#: mod/dfrn_request.php:526
-#, php-format
-msgid "Welcome home %s."
-msgstr "Welkom terug %s."
-
-#: mod/dfrn_request.php:527
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr "Bevestig je vriendschaps-/connectieverzoek voor %s."
-
-#: mod/dfrn_request.php:637
-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:640
-#, php-format
-msgid ""
-"If you are not yet a member of the free social web, <a href=\"%s\">follow "
-"this link to find a public Friendica site and join us today</a>."
-msgstr ""
-
-#: mod/dfrn_request.php:645
-msgid "Friend/Connection Request"
-msgstr "Vriendschaps-/connectieverzoek"
-
-#: mod/dfrn_request.php:646
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@gnusocial.de"
-msgstr ""
-
-#: mod/dfrn_request.php:651 src/Content/ContactSelector.php:79
-msgid "Friendica"
-msgstr "Friendica"
-
-#: mod/dfrn_request.php:652
-msgid "GNU Social (Pleroma, Mastodon)"
-msgstr ""
-
-#: mod/dfrn_request.php:653
-msgid "Diaspora (Socialhome, Hubzilla)"
-msgstr ""
-
-#: mod/dfrn_request.php:654
-#, 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/notifications.php:37
-msgid "Invalid request identifier."
-msgstr "Ongeldige <em>request identifier</em>."
-
-#: mod/notifications.php:46 mod/notifications.php:182
-#: mod/notifications.php:229
-msgid "Discard"
-msgstr "Verwerpen"
-
-#: mod/notifications.php:98 src/Content/Nav.php:191
-msgid "Notifications"
-msgstr "Notificaties"
-
-#: mod/notifications.php:107
-msgid "Network Notifications"
-msgstr "Netwerknotificaties"
-
-#: mod/notifications.php:119
-msgid "Personal Notifications"
-msgstr "Persoonlijke notificaties"
-
-#: mod/notifications.php:125
-msgid "Home Notifications"
-msgstr "Tijdlijn-notificaties"
-
-#: mod/notifications.php:155
-msgid "Show Ignored Requests"
-msgstr "Toon genegeerde verzoeken"
-
-#: mod/notifications.php:155
-msgid "Hide Ignored Requests"
-msgstr "Verberg genegeerde verzoeken"
-
-#: mod/notifications.php:167 mod/notifications.php:236
-msgid "Notification type: "
-msgstr "Notificatiesoort:"
-
-#: mod/notifications.php:170
-#, php-format
-msgid "suggested by %s"
-msgstr "Voorgesteld door %s"
-
-#: mod/notifications.php:178 mod/notifications.php:262 mod/admin.php:1820
-msgid "Approve"
-msgstr "Goedkeuren"
-
-#: 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 ""
-
-#: 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 "Vriend"
-
-#: mod/notifications.php:218
-msgid "Sharer"
-msgstr "Deler"
-
-#: mod/notifications.php:218
-msgid "Subscriber"
-msgstr ""
-
-#: mod/notifications.php:273
-msgid "No introductions."
-msgstr "Geen vriendschaps- of connectieverzoeken."
-
-#: 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 ""
-
-#: mod/profiles.php:58
+#: mod/profiles.php:57
 msgid "Profile deleted."
 msgstr "Profiel verwijderd"
 
-#: mod/profiles.php:74 mod/profiles.php:110
+#: mod/profiles.php:73 mod/profiles.php:109
 msgid "Profile-"
 msgstr "Profiel-"
 
-#: mod/profiles.php:93 mod/profiles.php:132
+#: mod/profiles.php:92 mod/profiles.php:131
 msgid "New profile created."
 msgstr "Nieuw profiel aangemaakt."
 
-#: mod/profiles.php:116
+#: mod/profiles.php:115
 msgid "Profile unavailable to clone."
 msgstr "Profiel niet beschikbaar om te klonen."
 
-#: mod/profiles.php:206
+#: mod/profiles.php:203
 msgid "Profile Name is required."
 msgstr "Profielnaam is vereist."
 
-#: mod/profiles.php:347
+#: mod/profiles.php:344
 msgid "Marital Status"
 msgstr "Echtelijke staat"
 
-#: mod/profiles.php:351
+#: mod/profiles.php:348
 msgid "Romantic Partner"
 msgstr "Romantische Partner"
 
-#: mod/profiles.php:363
+#: mod/profiles.php:360
 msgid "Work/Employment"
 msgstr "Werk"
 
-#: mod/profiles.php:366
+#: mod/profiles.php:363
 msgid "Religion"
 msgstr "Godsdienst"
 
-#: mod/profiles.php:370
+#: mod/profiles.php:367
 msgid "Political Views"
 msgstr "Politieke standpunten"
 
-#: mod/profiles.php:374
+#: mod/profiles.php:371
 msgid "Gender"
 msgstr "Geslacht"
 
-#: mod/profiles.php:378
+#: mod/profiles.php:375
 msgid "Sexual Preference"
 msgstr "Seksuele Voorkeur"
 
-#: mod/profiles.php:382
+#: mod/profiles.php:379
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
-#: mod/profiles.php:386
+#: mod/profiles.php:383
 msgid "Homepage"
 msgstr "Tijdlijn"
 
-#: mod/profiles.php:390 mod/profiles.php:593
+#: mod/profiles.php:387 mod/profiles.php:593
 msgid "Interests"
 msgstr "Interesses"
 
-#: mod/profiles.php:394 mod/admin.php:494
-msgid "Address"
-msgstr "Adres"
-
-#: mod/profiles.php:401 mod/profiles.php:589
+#: mod/profiles.php:398 mod/profiles.php:589
 msgid "Location"
 msgstr "Plaats"
 
-#: mod/profiles.php:483
+#: mod/profiles.php:481
 msgid "Profile updated."
-msgstr "Profiel bijgewerkt."
+msgstr "Profiel opgeslagen"
 
-#: mod/profiles.php:540
+#: mod/profiles.php:538
 msgid "Hide contacts and friends:"
-msgstr ""
+msgstr "Verberg contacten en vrienden:"
 
-#: mod/profiles.php:545
+#: 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:565
+#: mod/profiles.php:563
 msgid "Show more profile fields:"
-msgstr ""
+msgstr "Toon meer profiel velden:"
 
-#: mod/profiles.php:577
+#: mod/profiles.php:575
 msgid "Profile Actions"
-msgstr ""
+msgstr "Profiel Acties"
 
-#: mod/profiles.php:578
+#: mod/profiles.php:576
 msgid "Edit Profile Details"
 msgstr "Profieldetails bewerken"
 
-#: mod/profiles.php:580
+#: mod/profiles.php:578
 msgid "Change Profile Photo"
 msgstr "Profielfoto wijzigen"
 
-#: mod/profiles.php:581
+#: mod/profiles.php:580
 msgid "View this profile"
 msgstr "Dit profiel bekijken"
 
-#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:389
+#: 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"
 
@@ -3934,32 +7350,27 @@ msgstr "Dit profiel verwijderen"
 
 #: mod/profiles.php:587
 msgid "Basic information"
-msgstr ""
+msgstr "Basis informatie"
 
 #: mod/profiles.php:588
 msgid "Profile picture"
-msgstr ""
+msgstr "Profiel foto"
 
 #: mod/profiles.php:590
 msgid "Preferences"
-msgstr ""
+msgstr "Voorkeuren"
 
 #: mod/profiles.php:591
 msgid "Status information"
-msgstr ""
+msgstr "Status informatie"
 
 #: mod/profiles.php:592
 msgid "Additional information"
-msgstr ""
-
-#: mod/profiles.php:594 mod/network.php:962
-#: src/Core/NotificationsManager.php:185
-msgid "Personal"
-msgstr "Persoonlijk"
+msgstr "Bijkomende informatie"
 
 #: mod/profiles.php:595
 msgid "Relation"
-msgstr ""
+msgstr "Relatie"
 
 #: mod/profiles.php:596 src/Util/Temporal.php:81 src/Util/Temporal.php:83
 msgid "Miscellaneous"
@@ -3973,7 +7384,7 @@ msgstr "Je Geslacht:"
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span> Echtelijke Staat:"
 
-#: mod/profiles.php:601 src/Model/Profile.php:780
+#: mod/profiles.php:601 src/Model/Profile.php:769
 msgid "Sexual Preference:"
 msgstr "Seksuele Voorkeur:"
 
@@ -3985,10 +7396,6 @@ msgstr "Voorbeeld: vissen fotografie software"
 msgid "Profile Name:"
 msgstr "Profiel Naam:"
 
-#: mod/profiles.php:607 mod/events.php:508 mod/events.php:520
-msgid "Required"
-msgstr "Vereist"
-
 #: mod/profiles.php:609
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
@@ -4045,23 +7452,23 @@ msgstr "Vertel iets over jezelf..."
 
 #: mod/profiles.php:626
 msgid "XMPP (Jabber) address:"
-msgstr ""
+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 ""
+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:788
+#: mod/profiles.php:628 src/Model/Profile.php:777
 msgid "Hometown:"
 msgstr "Woonplaats:"
 
-#: mod/profiles.php:629 src/Model/Profile.php:796
+#: mod/profiles.php:629 src/Model/Profile.php:785
 msgid "Political Views:"
 msgstr "Politieke standpunten:"
 
@@ -4085,11 +7492,11 @@ msgstr "Privé Sleutelwoorden:"
 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:812
+#: mod/profiles.php:633 src/Model/Profile.php:801
 msgid "Likes:"
 msgstr "Houdt van:"
 
-#: mod/profiles.php:634 src/Model/Profile.php:816
+#: mod/profiles.php:634 src/Model/Profile.php:805
 msgid "Dislikes:"
 msgstr "Houdt niet van:"
 
@@ -4129,11 +7536,11 @@ msgstr "School/opleiding"
 msgid "Contact information and Social Networks"
 msgstr "Contactinformatie en sociale netwerken"
 
-#: mod/profiles.php:674 src/Model/Profile.php:385
+#: mod/profiles.php:674 src/Model/Profile.php:389
 msgid "Profile Image"
 msgstr "Profiel afbeelding"
 
-#: mod/profiles.php:676 src/Model/Profile.php:388
+#: mod/profiles.php:676 src/Model/Profile.php:392
 msgid "visible to everybody"
 msgstr "zichtbaar voor iedereen"
 
@@ -4141,3874 +7548,908 @@ msgstr "zichtbaar voor iedereen"
 msgid "Edit/Manage Profiles"
 msgstr "Wijzig/Beheer Profielen"
 
-#: 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 "Profiel foto wijzigen"
 
-#: mod/profiles.php:685 src/Model/Profile.php:376
+#: mod/profiles.php:685 src/Model/Profile.php:380
 msgid "Create New Profile"
 msgstr "Maak nieuw profiel"
 
-#: mod/admin.php:107
-msgid "Theme settings updated."
-msgstr "Thema-instellingen aangepast."
-
-#: mod/admin.php:180 src/Content/Nav.php:175
-msgid "Information"
-msgstr "Informatie"
-
-#: mod/admin.php:181
-msgid "Overview"
-msgstr ""
-
-#: mod/admin.php:182 mod/admin.php:717
-msgid "Federation Statistics"
-msgstr ""
-
-#: mod/admin.php:183
-msgid "Configuration"
-msgstr ""
-
-#: mod/admin.php:184 mod/admin.php:1352
-msgid "Site"
-msgstr "Website"
-
-#: mod/admin.php:185 mod/admin.php:1284 mod/admin.php:1812 mod/admin.php:1828
-msgid "Users"
-msgstr "Gebruiker"
-
-#: mod/admin.php:186 mod/admin.php:1928 mod/admin.php:1988 mod/settings.php:87
-msgid "Addons"
-msgstr ""
-
-#: mod/admin.php:187 mod/admin.php:2197 mod/admin.php:2241
-msgid "Themes"
-msgstr "Thema's"
-
-#: mod/admin.php:188 mod/settings.php:65
-msgid "Additional features"
-msgstr "Extra functies"
-
-#: 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
-msgid "Database"
-msgstr ""
-
-#: mod/admin.php:191
-msgid "DB updates"
-msgstr "DB aanpassingen"
-
-#: mod/admin.php:192 mod/admin.php:752
-msgid "Inspect Queue"
-msgstr ""
-
-#: mod/admin.php:193
-msgid "Tools"
-msgstr ""
-
-#: mod/admin.php:194
-msgid "Contact Blocklist"
-msgstr ""
-
-#: mod/admin.php:195 mod/admin.php:366
-msgid "Server Blocklist"
-msgstr ""
-
-#: mod/admin.php:196 mod/admin.php:525
-msgid "Delete Item"
-msgstr ""
-
-#: mod/admin.php:197 mod/admin.php:198 mod/admin.php:2315
-msgid "Logs"
-msgstr "Logs"
-
-#: mod/admin.php:199 mod/admin.php:2382
-msgid "View Logs"
-msgstr ""
-
-#: mod/admin.php:201
-msgid "Diagnostics"
-msgstr ""
-
-#: mod/admin.php:202
-msgid "PHP Info"
-msgstr ""
-
-#: mod/admin.php:203
-msgid "probe address"
-msgstr ""
-
-#: mod/admin.php:204
-msgid "check webfinger"
-msgstr ""
-
-#: mod/admin.php:223 src/Content/Nav.php:218
-msgid "Admin"
-msgstr "Beheer"
-
-#: mod/admin.php:224
-msgid "Addon Features"
-msgstr ""
-
-#: mod/admin.php:225
-msgid "User registrations waiting for confirmation"
-msgstr "Gebruikersregistraties wachten op bevestiging"
-
-#: 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:1351
-#: mod/admin.php:1811 mod/admin.php:1927 mod/admin.php:1987 mod/admin.php:2196
-#: mod/admin.php:2240 mod/admin.php:2314 mod/admin.php:2381
-msgid "Administration"
-msgstr "Beheer"
-
-#: mod/admin.php:305
-msgid "Display Terms of Service"
-msgstr ""
-
-#: mod/admin.php:305
-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
-msgid "Display Privacy Statement"
-msgstr ""
-
-#: mod/admin.php:306
-#, 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
-msgid "Privacy Statement Preview"
-msgstr ""
-
-#: mod/admin.php:309
-msgid "The Terms of Service"
-msgstr ""
-
-#: mod/admin.php:309
-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
-msgid "The blocked domain"
-msgstr ""
-
-#: mod/admin.php:358 mod/admin.php:371
-msgid "The reason why you blocked this domain."
-msgstr ""
-
-#: mod/admin.php:359
-msgid "Delete domain"
-msgstr ""
-
-#: mod/admin.php:359
-msgid "Check to delete this entry from the blocklist"
-msgstr ""
-
-#: mod/admin.php:367
-msgid ""
-"This page can be used to define a black list of servers from the federated "
-"network that are not allowed to interact with your node. For all entered "
-"domains you should also give a reason why you have blocked the remote "
-"server."
-msgstr ""
-
-#: mod/admin.php:368
-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
-msgid "Add new entry to block list"
-msgstr ""
-
-#: mod/admin.php:370
-msgid "Server Domain"
-msgstr ""
-
-#: mod/admin.php:370
-msgid ""
-"The domain of the new server to add to the block list. Do not include the "
-"protocol."
-msgstr ""
-
-#: mod/admin.php:371
-msgid "Block reason"
-msgstr ""
-
-#: mod/admin.php:372
-msgid "Add Entry"
-msgstr ""
-
-#: mod/admin.php:373
-msgid "Save changes to the blocklist"
-msgstr ""
-
-#: mod/admin.php:374
-msgid "Current Entries in the Blocklist"
-msgstr ""
-
-#: mod/admin.php:377
-msgid "Delete entry from blocklist"
-msgstr ""
-
-#: mod/admin.php:380
-msgid "Delete entry from blocklist?"
-msgstr ""
-
-#: mod/admin.php:406
-msgid "Server added to blocklist."
-msgstr ""
-
-#: mod/admin.php:422
-msgid "Site blocklist updated."
-msgstr ""
-
-#: mod/admin.php:445 src/Core/Console/GlobalCommunityBlock.php:72
-msgid "The contact has been blocked from the node"
-msgstr ""
-
-#: mod/admin.php:447 src/Core/Console/GlobalCommunityBlock.php:69
-#, php-format
-msgid "Could not find any contact entry for this URL (%s)"
-msgstr ""
-
-#: mod/admin.php:454
-#, php-format
-msgid "%s contact unblocked"
-msgid_plural "%s contacts unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/admin.php:483
-msgid "Remote Contact Blocklist"
-msgstr ""
-
-#: mod/admin.php:484
-msgid ""
-"This page allows you to prevent any message from a remote contact to reach "
-"your node."
-msgstr ""
-
-#: mod/admin.php:485
-msgid "Block Remote Contact"
-msgstr ""
-
-#: mod/admin.php:486 mod/admin.php:1814
-msgid "select all"
-msgstr "Alles selecteren"
-
-#: mod/admin.php:487
-msgid "select none"
-msgstr ""
-
-#: mod/admin.php:490
-msgid "No remote contact is blocked from this node."
-msgstr ""
-
-#: mod/admin.php:492
-msgid "Blocked Remote Contacts"
-msgstr ""
-
-#: mod/admin.php:493
-msgid "Block New Remote Contact"
-msgstr ""
-
-#: mod/admin.php:494
-msgid "Photo"
-msgstr ""
-
-#: mod/admin.php:502
-#, php-format
-msgid "%s total blocked contact"
-msgid_plural "%s total blocked contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/admin.php:504
-msgid "URL of the remote contact to block."
-msgstr ""
-
-#: mod/admin.php:526
-msgid "Delete this Item"
-msgstr ""
-
-#: mod/admin.php:527
-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
-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
-msgid "GUID"
-msgstr ""
-
-#: mod/admin.php:529
-msgid "The GUID of the item you want to delete."
-msgstr ""
-
-#: mod/admin.php:563
-msgid "Item marked for deletion."
-msgstr ""
-
-#: mod/admin.php:634
-msgid "unknown"
-msgstr ""
-
-#: mod/admin.php:710
-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
-msgid ""
-"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
-"will improve the data displayed here."
-msgstr ""
-
-#: mod/admin.php:723
-#, php-format
-msgid ""
-"Currently this node is aware of %d nodes with %d registered users from the "
-"following platforms:"
-msgstr ""
-
-#: mod/admin.php:754
-msgid "ID"
-msgstr "ID"
-
-#: mod/admin.php:755
-msgid "Recipient Name"
-msgstr ""
-
-#: mod/admin.php:756
-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 "Netwerk"
-
-#: mod/admin.php:758
-msgid "Created"
-msgstr ""
-
-#: mod/admin.php:759
-msgid "Last Tried"
-msgstr ""
-
-#: mod/admin.php:760
-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
-#, 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 ""
-
-#: mod/admin.php:791
-#, php-format
-msgid ""
-"There is a new version of Friendica available for download. Your current "
-"version is %1$s, upstream version is %2$s"
-msgstr ""
-
-#: mod/admin.php:801
-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
-msgid "The worker was never executed. Please check your database structure!"
-msgstr ""
-
-#: mod/admin.php:810
-#, 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
-msgid "Normal Account"
-msgstr "Normaal account"
-
-#: mod/admin.php:816
-msgid "Automatic Follower Account"
-msgstr ""
-
-#: mod/admin.php:817
-msgid "Public Forum Account"
-msgstr ""
-
-#: mod/admin.php:818
-msgid "Automatic Friend Account"
-msgstr "Automatisch Vriendschapsaccount"
-
-#: mod/admin.php:819
-msgid "Blog Account"
-msgstr "Blog Account"
-
-#: mod/admin.php:820
-msgid "Private Forum Account"
-msgstr ""
-
-#: mod/admin.php:842
-msgid "Message queues"
-msgstr "Bericht-wachtrijen"
-
-#: mod/admin.php:848
-msgid "Summary"
-msgstr "Samenvatting"
-
-#: mod/admin.php:850
-msgid "Registered users"
-msgstr "Geregistreerde gebruikers"
-
-#: mod/admin.php:852
-msgid "Pending registrations"
-msgstr "Registraties die in de wacht staan"
-
-#: mod/admin.php:853
-msgid "Version"
-msgstr "Versie"
-
-#: mod/admin.php:858
-msgid "Active addons"
-msgstr ""
-
-#: mod/admin.php:889
-msgid "Can not parse base url. Must have at least <scheme>://<domain>"
-msgstr ""
-
-#: mod/admin.php:1219
-msgid "Site settings updated."
-msgstr "Site instellingen gewijzigd."
-
-#: mod/admin.php:1246 mod/settings.php:897
-msgid "No special theme for mobile devices"
-msgstr "Geen speciaal thema voor mobiele apparaten"
-
-#: mod/admin.php:1275
-msgid "No community page for local users"
-msgstr ""
-
-#: mod/admin.php:1276
-msgid "No community page"
-msgstr ""
-
-#: mod/admin.php:1277
-msgid "Public postings from users of this site"
-msgstr ""
-
-#: mod/admin.php:1278
-msgid "Public postings from the federated network"
-msgstr ""
-
-#: mod/admin.php:1279
-msgid "Public postings from local users and the federated network"
-msgstr ""
-
-#: mod/admin.php:1285
-msgid "Users, Global Contacts"
-msgstr ""
-
-#: mod/admin.php:1286
-msgid "Users, Global Contacts/fallback"
-msgstr ""
-
-#: mod/admin.php:1290
-msgid "One month"
-msgstr ""
-
-#: mod/admin.php:1291
-msgid "Three months"
-msgstr ""
-
-#: mod/admin.php:1292
-msgid "Half a year"
-msgstr ""
-
-#: mod/admin.php:1293
-msgid "One year"
-msgstr ""
-
-#: mod/admin.php:1298
-msgid "Multi user instance"
-msgstr "Server voor meerdere gebruikers"
-
-#: mod/admin.php:1321
-msgid "Closed"
-msgstr "Gesloten"
-
-#: mod/admin.php:1322
-msgid "Requires approval"
-msgstr "Toestemming vereist"
-
-#: mod/admin.php:1323
-msgid "Open"
-msgstr "Open"
-
-#: mod/admin.php:1327
-msgid "No SSL policy, links will track page SSL state"
-msgstr "Geen SSL beleid, links zullen SSL status van pagina volgen"
-
-#: mod/admin.php:1328
-msgid "Force all links to use SSL"
-msgstr "Verplicht alle links om SSL te gebruiken"
-
-#: mod/admin.php:1329
-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:1333
-msgid "Don't check"
-msgstr ""
-
-#: mod/admin.php:1334
-msgid "check the stable version"
-msgstr ""
-
-#: mod/admin.php:1335
-msgid "check the development version"
-msgstr ""
-
-#: mod/admin.php:1354
-msgid "Republish users to directory"
-msgstr ""
-
-#: mod/admin.php:1355 mod/register.php:267
-msgid "Registration"
-msgstr "Registratie"
-
-#: mod/admin.php:1356
-msgid "File upload"
-msgstr "Uploaden bestand"
-
-#: mod/admin.php:1357
-msgid "Policies"
-msgstr "Beleid"
-
-#: mod/admin.php:1359
-msgid "Auto Discovered Contact Directory"
-msgstr ""
-
-#: mod/admin.php:1360
-msgid "Performance"
-msgstr "Performantie"
-
-#: mod/admin.php:1361
-msgid "Worker"
-msgstr ""
-
-#: mod/admin.php:1362
-msgid "Message Relay"
-msgstr ""
-
-#: mod/admin.php:1363
-msgid ""
-"Relocate - WARNING: advanced function. Could make this server unreachable."
-msgstr ""
-
-#: mod/admin.php:1366
-msgid "Site name"
-msgstr "Site naam"
-
-#: mod/admin.php:1367
-msgid "Host name"
-msgstr ""
-
-#: mod/admin.php:1368
-msgid "Sender Email"
-msgstr ""
-
-#: mod/admin.php:1368
-msgid ""
-"The email address your server shall use to send notification emails from."
-msgstr ""
-
-#: mod/admin.php:1369
-msgid "Banner/Logo"
-msgstr "Banner/Logo"
-
-#: mod/admin.php:1370
-msgid "Shortcut icon"
-msgstr ""
-
-#: mod/admin.php:1370
-msgid "Link to an icon that will be used for browsers."
-msgstr ""
-
-#: mod/admin.php:1371
-msgid "Touch icon"
-msgstr "Pictogram voor smartphones"
-
-#: mod/admin.php:1371
-msgid "Link to an icon that will be used for tablets and mobiles."
-msgstr ""
-
-#: mod/admin.php:1372
-msgid "Additional Info"
-msgstr ""
-
-#: mod/admin.php:1372
-#, php-format
-msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at %s/servers."
-msgstr ""
-
-#: mod/admin.php:1373
-msgid "System language"
-msgstr "Systeemtaal"
-
-#: mod/admin.php:1374
-msgid "System theme"
-msgstr "Systeem thema"
-
-#: mod/admin.php:1374
-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:1375
-msgid "Mobile system theme"
-msgstr "Mobiel systeem thema"
-
-#: mod/admin.php:1375
-msgid "Theme for mobile devices"
-msgstr "Thema voor mobiele apparaten"
-
-#: mod/admin.php:1376
-msgid "SSL link policy"
-msgstr "Beleid SSL-links"
-
-#: mod/admin.php:1376
-msgid "Determines whether generated links should be forced to use SSL"
-msgstr "Bepaald of gegenereerde verwijzingen verplicht SSL moeten gebruiken"
-
-#: mod/admin.php:1377
-msgid "Force SSL"
-msgstr ""
-
-#: mod/admin.php:1377
-msgid ""
-"Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
-" to endless loops."
-msgstr ""
-
-#: mod/admin.php:1378
-msgid "Hide help entry from navigation menu"
-msgstr "Verberg de 'help' uit het navigatiemenu"
-
-#: mod/admin.php:1378
-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:1379
-msgid "Single user instance"
-msgstr "Server voor één gebruiker"
-
-#: mod/admin.php:1379
-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:1380
-msgid "Maximum image size"
-msgstr "Maximum afbeeldingsgrootte"
-
-#: mod/admin.php:1380
-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:1381
-msgid "Maximum image length"
-msgstr "Maximum afbeeldingslengte"
-
-#: mod/admin.php:1381
-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:1382
-msgid "JPEG image quality"
-msgstr "JPEG afbeeldingskwaliteit"
-
-#: mod/admin.php:1382
-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:1384
-msgid "Register policy"
-msgstr "Registratiebeleid"
-
-#: mod/admin.php:1385
-msgid "Maximum Daily Registrations"
-msgstr "Maximum aantal registraties per dag"
-
-#: mod/admin.php:1385
-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:1386
-msgid "Register text"
-msgstr "Registratietekst"
-
-#: mod/admin.php:1386
-msgid ""
-"Will be displayed prominently on the registration page. You can use BBCode "
-"here."
-msgstr ""
-
-#: mod/admin.php:1387
-msgid "Accounts abandoned after x days"
-msgstr "Verlaten accounts na x dagen"
-
-#: mod/admin.php:1387
-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:1388
-msgid "Allowed friend domains"
-msgstr "Toegelaten vriend domeinen"
-
-#: mod/admin.php:1388
-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:1389
-msgid "Allowed email domains"
-msgstr "Toegelaten e-mail domeinen"
-
-#: mod/admin.php:1389
-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:1390
-msgid "No OEmbed rich content"
-msgstr ""
-
-#: mod/admin.php:1390
-msgid ""
-"Don't show the rich content (e.g. embedded PDF), except from the domains "
-"listed below."
-msgstr ""
-
-#: mod/admin.php:1391
-msgid "Allowed OEmbed domains"
-msgstr ""
-
-#: mod/admin.php:1391
-msgid ""
-"Comma separated list of domains which oembed content is allowed to be "
-"displayed. Wildcards are accepted."
-msgstr ""
-
-#: mod/admin.php:1392
-msgid "Block public"
-msgstr "Openbare toegang blokkeren"
-
-#: mod/admin.php:1392
-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:1393
-msgid "Force publish"
-msgstr "Dwing publiceren af"
-
-#: mod/admin.php:1393
-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:1393
-msgid "Enabling this may violate privacy laws like the GDPR"
-msgstr ""
-
-#: mod/admin.php:1394
-msgid "Global directory URL"
-msgstr ""
-
-#: mod/admin.php:1394
-msgid ""
-"URL to the global directory. If this is not set, the global directory is "
-"completely unavailable to the application."
-msgstr ""
-
-#: mod/admin.php:1395
-msgid "Private posts by default for new users"
-msgstr "Privéberichten als standaard voor nieuwe gebruikers"
-
-#: mod/admin.php:1395
-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:1396
-msgid "Don't include post content in email notifications"
-msgstr "De inhoud van het bericht niet insluiten bij e-mailnotificaties"
-
-#: mod/admin.php:1396
-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:1397
-msgid "Disallow public access to addons listed in the apps menu."
-msgstr ""
-
-#: mod/admin.php:1397
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
-msgstr ""
-
-#: mod/admin.php:1398
-msgid "Don't embed private images in posts"
-msgstr ""
-
-#: mod/admin.php:1398
-msgid ""
-"Don't replace locally-hosted private photos in posts with an embedded copy "
-"of the image. This means that contacts who receive posts containing private "
-"photos will have to authenticate and load each image, which may take a "
-"while."
-msgstr ""
-
-#: mod/admin.php:1399
-msgid "Allow Users to set remote_self"
-msgstr ""
-
-#: mod/admin.php:1399
-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:1400
-msgid "Block multiple registrations"
-msgstr "Blokkeer meerdere registraties"
-
-#: mod/admin.php:1400
-msgid "Disallow users to register additional accounts for use as pages."
-msgstr "Laat niet toe dat gebruikers meerdere accounts aanmaken."
-
-#: mod/admin.php:1401
-msgid "OpenID support"
-msgstr "OpenID ondersteuning"
-
-#: mod/admin.php:1401
-msgid "OpenID support for registration and logins."
-msgstr "OpenID ondersteuning voor registraties en logins."
-
-#: mod/admin.php:1402
-msgid "Fullname check"
-msgstr "Controleer volledige naam"
-
-#: mod/admin.php:1402
-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:1403
-msgid "Community pages for visitors"
-msgstr ""
-
-#: mod/admin.php:1403
-msgid ""
-"Which community pages should be available for visitors. Local users always "
-"see both pages."
-msgstr ""
-
-#: mod/admin.php:1404
-msgid "Posts per user on community page"
-msgstr ""
-
-#: mod/admin.php:1404
-msgid ""
-"The maximum number of posts per user on the community page. (Not valid for "
-"'Global Community')"
-msgstr ""
-
-#: mod/admin.php:1405
-msgid "Enable OStatus support"
-msgstr "Activeer OStatus ondersteuning"
-
-#: mod/admin.php:1405
-msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
-msgstr ""
-
-#: mod/admin.php:1406
-msgid "Only import OStatus threads from our contacts"
-msgstr ""
-
-#: mod/admin.php:1406
-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:1407
-msgid "OStatus support can only be enabled if threading is enabled."
-msgstr ""
-
-#: mod/admin.php:1409
-msgid ""
-"Diaspora support can't be enabled because Friendica was installed into a sub"
-" directory."
-msgstr ""
-
-#: mod/admin.php:1410
-msgid "Enable Diaspora support"
-msgstr "Activeer Diaspora ondersteuning"
-
-#: mod/admin.php:1410
-msgid "Provide built-in Diaspora network compatibility."
-msgstr "Bied ingebouwde ondersteuning voor het Diaspora netwerk."
-
-#: mod/admin.php:1411
-msgid "Only allow Friendica contacts"
-msgstr "Laat alleen Friendica contacten toe"
-
-#: mod/admin.php:1411
-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:1412
-msgid "Verify SSL"
-msgstr "Controleer SSL"
-
-#: mod/admin.php:1412
-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:1413
-msgid "Proxy user"
-msgstr "Proxy-gebruiker"
-
-#: mod/admin.php:1414
-msgid "Proxy URL"
-msgstr "Proxy-URL"
-
-#: mod/admin.php:1415
-msgid "Network timeout"
-msgstr "Netwerk timeout"
-
-#: mod/admin.php:1415
-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:1416
-msgid "Maximum Load Average"
-msgstr "Maximum gemiddelde belasting"
-
-#: mod/admin.php:1416
-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:1417
-msgid "Maximum Load Average (Frontend)"
-msgstr ""
-
-#: mod/admin.php:1417
-msgid "Maximum system load before the frontend quits service - default 50."
-msgstr ""
-
-#: mod/admin.php:1418
-msgid "Minimal Memory"
-msgstr ""
-
-#: mod/admin.php:1418
-msgid ""
-"Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
-"default 0 (deactivated)."
-msgstr ""
-
-#: mod/admin.php:1419
-msgid "Maximum table size for optimization"
-msgstr ""
-
-#: mod/admin.php:1419
-msgid ""
-"Maximum table size (in MB) for the automatic optimization. Enter -1 to "
-"disable it."
-msgstr ""
-
-#: mod/admin.php:1420
-msgid "Minimum level of fragmentation"
-msgstr ""
-
-#: mod/admin.php:1420
-msgid ""
-"Minimum fragmenation level to start the automatic optimization - default "
-"value is 30%."
-msgstr ""
-
-#: mod/admin.php:1422
-msgid "Periodical check of global contacts"
-msgstr ""
-
-#: mod/admin.php:1422
-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:1423
-msgid "Days between requery"
-msgstr ""
-
-#: mod/admin.php:1423
-msgid "Number of days after which a server is requeried for his contacts."
-msgstr ""
-
-#: mod/admin.php:1424
-msgid "Discover contacts from other servers"
-msgstr ""
-
-#: mod/admin.php:1424
-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 ""
-
-#: mod/admin.php:1425
-msgid "Timeframe for fetching global contacts"
-msgstr ""
-
-#: mod/admin.php:1425
-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:1426
-msgid "Search the local directory"
-msgstr ""
-
-#: mod/admin.php:1426
-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:1428
-msgid "Publish server information"
-msgstr ""
-
-#: mod/admin.php:1428
-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 ""
-
-#: mod/admin.php:1430
-msgid "Check upstream version"
-msgstr ""
-
-#: mod/admin.php:1430
-msgid ""
-"Enables checking for new Friendica versions at github. If there is a new "
-"version, you will be informed in the admin panel overview."
-msgstr ""
-
-#: mod/admin.php:1431
-msgid "Suppress Tags"
-msgstr ""
-
-#: mod/admin.php:1431
-msgid "Suppress showing a list of hashtags at the end of the posting."
-msgstr ""
-
-#: mod/admin.php:1432
-msgid "Clean database"
-msgstr ""
-
-#: mod/admin.php:1432
-msgid ""
-"Remove old remote items, orphaned database records and old content from some"
-" other helper tables."
-msgstr ""
-
-#: mod/admin.php:1433
-msgid "Lifespan of remote items"
-msgstr ""
-
-#: mod/admin.php:1433
-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:1434
-msgid "Lifespan of unclaimed items"
-msgstr ""
-
-#: mod/admin.php:1434
-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 ""
-
-#: mod/admin.php:1435
-msgid "Path to item cache"
-msgstr "Pad naar cache voor items"
-
-#: mod/admin.php:1435
-msgid "The item caches buffers generated bbcode and external images."
-msgstr ""
-
-#: mod/admin.php:1436
-msgid "Cache duration in seconds"
-msgstr "Cache tijdsduur in seconden"
-
-#: mod/admin.php:1436
-msgid ""
-"How long should the cache files be hold? Default value is 86400 seconds (One"
-" day). To disable the item cache, set the value to -1."
-msgstr ""
-
-#: mod/admin.php:1437
-msgid "Maximum numbers of comments per post"
-msgstr ""
-
-#: mod/admin.php:1437
-msgid "How much comments should be shown for each post? Default value is 100."
-msgstr ""
-
-#: mod/admin.php:1438
-msgid "Temp path"
-msgstr "Tijdelijk pad"
-
-#: mod/admin.php:1438
-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:1439
-msgid "Base path to installation"
-msgstr "Basispad voor installatie"
-
-#: mod/admin.php:1439
-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:1440
-msgid "Disable picture proxy"
-msgstr ""
-
-#: mod/admin.php:1440
-msgid ""
-"The picture proxy increases performance and privacy. It shouldn't be used on"
-" systems with very low bandwith."
-msgstr ""
-
-#: mod/admin.php:1441
-msgid "Only search in tags"
-msgstr ""
-
-#: mod/admin.php:1441
-msgid "On large systems the text search can slow down the system extremely."
-msgstr ""
-
-#: mod/admin.php:1443
-msgid "New base url"
-msgstr ""
-
-#: mod/admin.php:1443
-msgid ""
-"Change base url for this server. Sends relocate message to all Friendica and"
-" Diaspora* contacts of all users."
-msgstr ""
-
-#: mod/admin.php:1445
-msgid "RINO Encryption"
-msgstr ""
-
-#: mod/admin.php:1445
-msgid "Encryption layer between nodes."
-msgstr ""
-
-#: mod/admin.php:1445
-msgid "Enabled"
-msgstr ""
-
-#: mod/admin.php:1447
-msgid "Maximum number of parallel workers"
-msgstr ""
-
-#: mod/admin.php:1447
-msgid ""
-"On shared hosters set this to 2. On larger systems, values of 10 are great. "
-"Default value is 4."
-msgstr ""
-
-#: mod/admin.php:1448
-msgid "Don't use 'proc_open' with the worker"
-msgstr ""
-
-#: mod/admin.php:1448
-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:1449
-msgid "Enable fastlane"
-msgstr ""
-
-#: mod/admin.php:1449
-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:1450
-msgid "Enable frontend worker"
-msgstr ""
-
-#: mod/admin.php:1450
-#, 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 ""
-
-#: mod/admin.php:1452
-msgid "Subscribe to relay"
-msgstr ""
-
-#: mod/admin.php:1452
-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:1453
-msgid "Relay server"
-msgstr ""
-
-#: mod/admin.php:1453
-msgid ""
-"Address of the relay server where public posts should be send to. For "
-"example https://relay.diasp.org"
-msgstr ""
-
-#: mod/admin.php:1454
-msgid "Direct relay transfer"
-msgstr ""
-
-#: mod/admin.php:1454
-msgid ""
-"Enables the direct transfer to other servers without using the relay servers"
-msgstr ""
-
-#: mod/admin.php:1455
-msgid "Relay scope"
-msgstr ""
-
-#: mod/admin.php:1455
-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:1455
-msgid "all"
-msgstr ""
-
-#: mod/admin.php:1455
-msgid "tags"
-msgstr ""
-
-#: mod/admin.php:1456
-msgid "Server tags"
-msgstr ""
-
-#: mod/admin.php:1456
-msgid "Comma separated list of tags for the 'tags' subscription."
-msgstr ""
-
-#: mod/admin.php:1457
-msgid "Allow user tags"
-msgstr ""
-
-#: mod/admin.php:1457
-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:1485
-msgid "Update has been marked successful"
-msgstr "Wijziging succesvol gemarkeerd "
-
-#: mod/admin.php:1492
-#, php-format
-msgid "Database structure update %s was successfully applied."
-msgstr ""
-
-#: mod/admin.php:1495
-#, php-format
-msgid "Executing of database structure update %s failed with error: %s"
-msgstr ""
-
-#: mod/admin.php:1508
-#, php-format
-msgid "Executing %s failed with error: %s"
-msgstr ""
-
-#: mod/admin.php:1510
-#, php-format
-msgid "Update %s was successfully applied."
-msgstr "Wijziging %s geslaagd."
-
-#: mod/admin.php:1513
-#, 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:1516
-#, php-format
-msgid "There was no additional update function %s that needed to be called."
-msgstr ""
-
-#: mod/admin.php:1536
-msgid "No failed updates."
-msgstr "Geen mislukte wijzigingen"
-
-#: mod/admin.php:1537
-msgid "Check database structure"
-msgstr ""
-
-#: mod/admin.php:1542
-msgid "Failed Updates"
-msgstr "Mislukte wijzigingen"
-
-#: mod/admin.php:1543
-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:1544
-msgid "Mark success (if update was manually applied)"
-msgstr "Markeren als succes (als aanpassing manueel doorgevoerd werd)"
-
-#: mod/admin.php:1545
-msgid "Attempt to execute this update step automatically"
-msgstr "Probeer deze stap automatisch uit te voeren"
-
-#: mod/admin.php:1584
-#, 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 ""
-
-#: mod/admin.php:1587
-#, 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 ""
-
-#: mod/admin.php:1621 src/Model/User.php:663
-#, php-format
-msgid "Registration details for %s"
-msgstr "Registratie details voor %s"
-
-#: mod/admin.php:1631
-#, 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:1637
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] "%s gebruiker verwijderd"
-msgstr[1] "%s gebruikers verwijderd"
-
-#: mod/admin.php:1684
-#, php-format
-msgid "User '%s' deleted"
-msgstr "Gebruiker '%s' verwijderd"
-
-#: mod/admin.php:1692
-#, php-format
-msgid "User '%s' unblocked"
-msgstr "Gebruiker '%s' niet meer geblokkeerd"
-
-#: mod/admin.php:1692
-#, php-format
-msgid "User '%s' blocked"
-msgstr "Gebruiker '%s' geblokkeerd"
-
-#: mod/admin.php:1749 mod/settings.php:1058
-msgid "Normal Account Page"
-msgstr "Normale accountpagina"
-
-#: mod/admin.php:1750 mod/settings.php:1062
-msgid "Soapbox Page"
-msgstr "Zeepkist-pagina"
-
-#: mod/admin.php:1751 mod/settings.php:1066
-msgid "Public Forum"
-msgstr ""
-
-#: mod/admin.php:1752 mod/settings.php:1070
-msgid "Automatic Friend Page"
-msgstr "Automatisch Vriendschapspagina"
-
-#: mod/admin.php:1753
-msgid "Private Forum"
-msgstr ""
-
-#: mod/admin.php:1756 mod/settings.php:1042
-msgid "Personal Page"
-msgstr ""
-
-#: mod/admin.php:1757 mod/settings.php:1046
-msgid "Organisation Page"
-msgstr ""
-
-#: mod/admin.php:1758 mod/settings.php:1050
-msgid "News Page"
-msgstr ""
-
-#: mod/admin.php:1759 mod/settings.php:1054
-msgid "Community Forum"
-msgstr ""
-
-#: mod/admin.php:1806 mod/admin.php:1817 mod/admin.php:1830 mod/admin.php:1848
-#: src/Content/ContactSelector.php:82
-msgid "Email"
-msgstr "E-mail"
-
-#: mod/admin.php:1806 mod/admin.php:1830
-msgid "Register date"
-msgstr "Registratiedatum"
-
-#: mod/admin.php:1806 mod/admin.php:1830
-msgid "Last login"
-msgstr "Laatste login"
-
-#: mod/admin.php:1806 mod/admin.php:1830
-msgid "Last item"
-msgstr "Laatste item"
-
-#: mod/admin.php:1806
-msgid "Type"
-msgstr ""
-
-#: mod/admin.php:1813
-msgid "Add User"
-msgstr "Gebruiker toevoegen"
-
-#: mod/admin.php:1815
-msgid "User registrations waiting for confirm"
-msgstr "Gebruikersregistraties wachten op een bevestiging"
-
-#: mod/admin.php:1816
-msgid "User waiting for permanent deletion"
-msgstr ""
-
-#: mod/admin.php:1817
-msgid "Request date"
-msgstr "Registratiedatum"
-
-#: mod/admin.php:1818
-msgid "No registrations."
-msgstr "Geen registraties."
-
-#: mod/admin.php:1819
-msgid "Note from the user"
-msgstr ""
-
-#: mod/admin.php:1821
-msgid "Deny"
-msgstr "Weiger"
-
-#: mod/admin.php:1825
-msgid "Site admin"
-msgstr "Sitebeheerder"
-
-#: mod/admin.php:1826
-msgid "Account expired"
-msgstr "Account verlopen"
-
-#: mod/admin.php:1829
-msgid "New User"
-msgstr "Nieuwe gebruiker"
-
-#: mod/admin.php:1830
-msgid "Deleted since"
-msgstr "Verwijderd sinds"
-
-#: mod/admin.php:1835
-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:1836
-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:1846
-msgid "Name of the new user."
-msgstr "Naam van nieuwe gebruiker"
-
-#: mod/admin.php:1847
-msgid "Nickname"
-msgstr "Bijnaam"
-
-#: mod/admin.php:1847
-msgid "Nickname of the new user."
-msgstr "Bijnaam van nieuwe gebruiker"
-
-#: mod/admin.php:1848
-msgid "Email address of the new user."
-msgstr "E-mailadres van nieuwe gebruiker"
-
-#: mod/admin.php:1890
-#, php-format
-msgid "Addon %s disabled."
-msgstr ""
-
-#: mod/admin.php:1894
-#, php-format
-msgid "Addon %s enabled."
-msgstr ""
-
-#: mod/admin.php:1904 mod/admin.php:2153
-msgid "Disable"
-msgstr "Uitschakelen"
-
-#: mod/admin.php:1907 mod/admin.php:2156
-msgid "Enable"
-msgstr "Inschakelen"
-
-#: mod/admin.php:1929 mod/admin.php:2198
-msgid "Toggle"
-msgstr "Schakelaar"
-
-#: mod/admin.php:1937 mod/admin.php:2207
-msgid "Author: "
-msgstr "Auteur:"
-
-#: mod/admin.php:1938 mod/admin.php:2208
-msgid "Maintainer: "
-msgstr "Onderhoud:"
-
-#: mod/admin.php:1990
-msgid "Reload active addons"
-msgstr ""
-
-#: mod/admin.php:1995
-#, 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 ""
-
-#: mod/admin.php:2115
-msgid "No themes found."
-msgstr "Geen thema's gevonden."
-
-#: mod/admin.php:2189
-msgid "Screenshot"
-msgstr "Schermafdruk"
-
-#: mod/admin.php:2243
-msgid "Reload active themes"
-msgstr ""
-
-#: mod/admin.php:2248
-#, php-format
-msgid "No themes found on the system. They should be placed in %1$s"
-msgstr ""
-
-#: mod/admin.php:2249
-msgid "[Experimental]"
-msgstr "[Experimenteel]"
-
-#: mod/admin.php:2250
-msgid "[Unsupported]"
-msgstr "[Niet ondersteund]"
-
-#: mod/admin.php:2274
-msgid "Log settings updated."
-msgstr "Log instellingen gewijzigd"
-
-#: mod/admin.php:2306
-msgid "PHP log currently enabled."
-msgstr ""
-
-#: mod/admin.php:2308
-msgid "PHP log currently disabled."
-msgstr ""
-
-#: mod/admin.php:2317
-msgid "Clear"
-msgstr "Wis"
-
-#: mod/admin.php:2321
-msgid "Enable Debugging"
-msgstr ""
-
-#: mod/admin.php:2322
-msgid "Log file"
-msgstr "Logbestand"
-
-#: mod/admin.php:2322
-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:2323
-msgid "Log level"
-msgstr "Log niveau"
-
-#: mod/admin.php:2325
-msgid "PHP logging"
-msgstr ""
-
-#: mod/admin.php:2326
-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 "
-"'display_errors' is to enable these options, set to '0' to disable them."
-msgstr ""
-
-#: mod/admin.php:2357
-#, php-format
-msgid ""
-"Error trying to open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see "
-"if file %1$s exist and is readable."
-msgstr ""
-
-#: mod/admin.php:2361
-#, php-format
-msgid ""
-"Couldn't open <strong>%1$s</strong> log file.\\r\\n<br/>Check to see if file"
-" %1$s is readable."
-msgstr ""
-
-#: mod/admin.php:2452 mod/admin.php:2453 mod/settings.php:767
-msgid "Off"
-msgstr "Uit"
-
-#: mod/admin.php:2452 mod/admin.php:2453 mod/settings.php:767
-msgid "On"
-msgstr "Aan"
-
-#: mod/admin.php:2453
-#, php-format
-msgid "Lock feature %s"
-msgstr ""
-
-#: mod/admin.php:2461
-msgid "Manage Additional Features"
-msgstr ""
-
-#: mod/community.php:51
-msgid "Community option not available."
-msgstr ""
-
-#: mod/community.php:68
-msgid "Not available."
-msgstr "Niet beschikbaar"
-
-#: 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 "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 ""
-
-#: 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 "Titel en begintijd van de gebeurtenis zijn vereist."
-
-#: mod/events.php:393
-msgid "Create New Event"
-msgstr "Maak een nieuwe gebeurtenis"
-
-#: mod/events.php:506
-msgid "Event details"
-msgstr "Gebeurtenis details"
-
-#: mod/events.php:507
-msgid "Starting date and Title are required."
-msgstr ""
-
-#: mod/events.php:508 mod/events.php:509
-msgid "Event Starts:"
-msgstr "Gebeurtenis begint:"
-
-#: mod/events.php:510 mod/events.php:526
-msgid "Finish date/time is not known or not relevant"
-msgstr "Einddatum/tijd is niet gekend of niet relevant"
-
-#: mod/events.php:512 mod/events.php:513
-msgid "Event Finishes:"
-msgstr "Gebeurtenis eindigt:"
-
-#: mod/events.php:514 mod/events.php:527
-msgid "Adjust for viewer timezone"
-msgstr "Pas aan aan de tijdzone van de gebruiker"
-
-#: mod/events.php:516
-msgid "Description:"
-msgstr "Beschrijving:"
-
-#: mod/events.php:520 mod/events.php:522
-msgid "Title:"
-msgstr "Titel:"
-
-#: mod/events.php:523 mod/events.php:524
-msgid "Share this event"
-msgstr "Deel deze gebeurtenis"
-
-#: mod/events.php:531 src/Model/Profile.php:862
-msgid "Basic"
-msgstr ""
-
-#: mod/events.php:533 mod/photos.php:1086 mod/photos.php:1429
-#: src/Core/ACL.php:318
-msgid "Permissions"
-msgstr "Rechten"
-
-#: mod/events.php:552
-msgid "Failed to remove event"
-msgstr ""
-
-#: mod/events.php:554
-msgid "Event removed"
-msgstr ""
-
-#: mod/item.php:114
-msgid "Unable to locate original post."
-msgstr "Ik kan de originele post niet meer vinden."
-
-#: mod/item.php:274
-msgid "Empty post discarded."
-msgstr "Lege post weggegooid."
-
-#: mod/item.php:804
-#, 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:806
-#, php-format
-msgid "You may visit them online at %s"
-msgstr "Je kunt ze online bezoeken op %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 "Contacteer de afzender door op dit bericht te antwoorden als je deze berichten niet wilt ontvangen."
-
-#: mod/item.php:811
-#, php-format
-msgid "%s posted an update."
-msgstr "%s heeft een wijziging geplaatst."
-
-#: mod/network.php:194 mod/search.php:37
-msgid "Remove term"
-msgstr "Verwijder zoekterm"
-
-#: mod/network.php:201 mod/search.php:46 src/Content/Feature.php:100
-msgid "Saved Searches"
-msgstr "Opgeslagen zoekopdrachten"
-
-#: mod/network.php:202 src/Model/Group.php:413
-msgid "add"
-msgstr "toevoegen"
-
-#: 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] ""
-msgstr[1] ""
-
-#: 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 "Zo'n groep bestaat niet"
-
-#: mod/network.php:643
-#, php-format
-msgid "Group: %s"
-msgstr ""
-
-#: mod/network.php:669
-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:672
-msgid "Invalid contact."
-msgstr "Ongeldig contact."
-
-#: mod/network.php:943
-msgid "Commented Order"
-msgstr "Nieuwe reacties bovenaan"
-
-#: mod/network.php:946
-msgid "Sort by Comment Date"
-msgstr "Berichten met nieuwe reacties bovenaan"
-
-#: mod/network.php:951
-msgid "Posted Order"
-msgstr "Nieuwe berichten bovenaan"
-
-#: mod/network.php:954
-msgid "Sort by Post Date"
-msgstr "Nieuwe berichten bovenaan"
-
-#: mod/network.php:965
-msgid "Posts that mention or involve you"
-msgstr "Alleen berichten die jou vermelden of op jou betrekking hebben"
-
-#: mod/network.php:973
-msgid "New"
-msgstr "Nieuw"
-
-#: mod/network.php:976
-msgid "Activity Stream - by date"
-msgstr "Activiteitenstroom - volgens datum"
-
-#: mod/network.php:984
-msgid "Shared Links"
-msgstr "Gedeelde links"
-
-#: mod/network.php:987
-msgid "Interesting Links"
-msgstr "Interessante links"
-
-#: mod/network.php:995
-msgid "Starred"
-msgstr "Met ster"
-
-#: mod/network.php:998
-msgid "Favourite Posts"
-msgstr "Favoriete berichten"
-
-#: mod/notes.php:52 src/Model/Profile.php:944
-msgid "Personal Notes"
-msgstr "Persoonlijke Nota's"
-
-#: mod/photos.php:108 src/Model/Profile.php:905
+#: mod/photos.php:112 src/Model/Profile.php:894
 msgid "Photo Albums"
 msgstr "Fotoalbums"
 
-#: mod/photos.php:109 mod/photos.php:1701
+#: mod/photos.php:113 mod/photos.php:1708
 msgid "Recent Photos"
 msgstr "Recente foto's"
 
-#: mod/photos.php:112 mod/photos.php:1198 mod/photos.php:1703
+#: mod/photos.php:116 mod/photos.php:1230 mod/photos.php:1710
 msgid "Upload New Photos"
 msgstr "Nieuwe foto's uploaden"
 
-#: mod/photos.php:126 mod/settings.php:51
-msgid "everybody"
-msgstr "iedereen"
-
-#: mod/photos.php:184
+#: mod/photos.php:190
 msgid "Contact information unavailable"
 msgstr "Contactinformatie niet beschikbaar"
 
-#: mod/photos.php:204
+#: mod/photos.php:209
 msgid "Album not found."
 msgstr "Album niet gevonden"
 
-#: mod/photos.php:234 mod/photos.php:245 mod/photos.php:1149
+#: mod/photos.php:239 mod/photos.php:252 mod/photos.php:1181
 msgid "Delete Album"
 msgstr "Verwijder album"
 
-#: mod/photos.php:243
+#: 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:303 mod/photos.php:314 mod/photos.php:1434
+#: mod/photos.php:312 mod/photos.php:324 mod/photos.php:1453
 msgid "Delete Photo"
 msgstr "Verwijder foto"
 
-#: mod/photos.php:312
+#: mod/photos.php:322
 msgid "Do you really want to delete this photo?"
 msgstr "Wil je echt deze foto verwijderen?"
 
-#: mod/photos.php:655
+#: mod/photos.php:679
 msgid "a photo"
 msgstr "een foto"
 
-#: mod/photos.php:655
+#: 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:757
+#: mod/photos.php:782
 msgid "Image upload didn't complete, please try again"
-msgstr ""
+msgstr "Opladen van het beeld is niet compleet, probeer het opnieuw"
 
-#: mod/photos.php:760
+#: mod/photos.php:785
 msgid "Image file is missing"
-msgstr ""
+msgstr "Beeld bestand ontbreekt"
 
-#: mod/photos.php:765
+#: mod/photos.php:790
 msgid ""
 "Server can't accept new file upload at this time, please contact your "
 "administrator"
-msgstr ""
+msgstr "De server kan op dit moment geen nieuw bestand opladen, contacteer alsjeblieft je beheerder"
 
-#: mod/photos.php:791
+#: mod/photos.php:816
 msgid "Image file is empty."
 msgstr "Afbeeldingsbestand is leeg."
 
-#: mod/photos.php:928
+#: mod/photos.php:953
 msgid "No photos selected"
 msgstr "Geen foto's geselecteerd"
 
-#: mod/photos.php:1024 mod/videos.php:309
-msgid "Access to this item is restricted."
-msgstr "Toegang tot dit item is beperkt."
-
-#: mod/photos.php:1078
+#: mod/photos.php:1104
 msgid "Upload Photos"
 msgstr "Upload foto's"
 
-#: mod/photos.php:1082 mod/photos.php:1144
+#: mod/photos.php:1108 mod/photos.php:1176
 msgid "New album name: "
 msgstr "Nieuwe albumnaam: "
 
-#: mod/photos.php:1083
-msgid "or existing album name: "
-msgstr "of bestaande albumnaam: "
+#: mod/photos.php:1109
+msgid "or select existing album:"
+msgstr "Of selecteer bestaand album:"
 
-#: mod/photos.php:1084
+#: 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:1094 mod/photos.php:1437 mod/settings.php:1218
-msgid "Show to Groups"
-msgstr "Tonen aan groepen"
-
-#: mod/photos.php:1095 mod/photos.php:1438 mod/settings.php:1219
-msgid "Show to Contacts"
-msgstr "Tonen aan contacten"
-
-#: mod/photos.php:1155
+#: mod/photos.php:1187
 msgid "Edit Album"
 msgstr "Album wijzigen"
 
-#: mod/photos.php:1160
+#: mod/photos.php:1192
 msgid "Show Newest First"
 msgstr "Toon niewste eerst"
 
-#: mod/photos.php:1162
+#: mod/photos.php:1194
 msgid "Show Oldest First"
 msgstr "Toon oudste eerst"
 
-#: mod/photos.php:1183 mod/photos.php:1686
+#: mod/photos.php:1215 mod/photos.php:1693
 msgid "View Photo"
 msgstr "Bekijk foto"
 
-#: mod/photos.php:1224
+#: 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:1226
+#: mod/photos.php:1258
 msgid "Photo not available"
 msgstr "Foto is niet beschikbaar"
 
-#: mod/photos.php:1289
+#: mod/photos.php:1333
 msgid "View photo"
 msgstr "Bekijk foto"
 
-#: mod/photos.php:1289
+#: mod/photos.php:1333
 msgid "Edit photo"
 msgstr "Bewerk foto"
 
-#: mod/photos.php:1290
+#: mod/photos.php:1334
 msgid "Use as profile photo"
 msgstr "Gebruik als profielfoto"
 
-#: mod/photos.php:1296 src/Object/Post.php:149
+#: mod/photos.php:1340 src/Object/Post.php:151
 msgid "Private Message"
 msgstr "Privébericht"
 
-#: mod/photos.php:1315
+#: mod/photos.php:1360
 msgid "View Full Size"
 msgstr "Bekijk in volledig formaat"
 
-#: mod/photos.php:1402
+#: mod/photos.php:1421
 msgid "Tags: "
 msgstr "Labels: "
 
-#: mod/photos.php:1405
+#: mod/photos.php:1424
 msgid "[Remove any tag]"
 msgstr "[Alle labels verwijderen]"
 
-#: mod/photos.php:1420
+#: mod/photos.php:1439
 msgid "New album name"
 msgstr "Nieuwe albumnaam"
 
-#: mod/photos.php:1421
+#: mod/photos.php:1440
 msgid "Caption"
 msgstr "Onderschrift"
 
-#: mod/photos.php:1422
+#: mod/photos.php:1441
 msgid "Add a Tag"
 msgstr "Een label toevoegen"
 
-#: mod/photos.php:1422
+#: 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:1423
+#: mod/photos.php:1442
 msgid "Do not rotate"
-msgstr ""
+msgstr "Niet roteren"
 
-#: mod/photos.php:1424
+#: mod/photos.php:1443
 msgid "Rotate CW (right)"
 msgstr "Roteren met de klok mee (rechts)"
 
-#: mod/photos.php:1425
+#: mod/photos.php:1444
 msgid "Rotate CCW (left)"
 msgstr "Roteren tegen de klok in (links)"
 
-#: mod/photos.php:1459 src/Object/Post.php:304
+#: mod/photos.php:1478 src/Object/Post.php:293
 msgid "I like this (toggle)"
 msgstr "Vind ik leuk"
 
-#: mod/photos.php:1460 src/Object/Post.php:305
+#: mod/photos.php:1479 src/Object/Post.php:294
 msgid "I don't like this (toggle)"
 msgstr "Vind ik niet leuk"
 
-#: mod/photos.php:1478 mod/photos.php:1517 mod/photos.php:1590
-#: src/Object/Post.php:407 src/Object/Post.php:803
+#: 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:1622
+#: mod/photos.php:1627
 msgid "Map"
-msgstr ""
+msgstr "Kaart"
 
-#: mod/photos.php:1692 mod/videos.php:387
-msgid "View Album"
-msgstr "Album bekijken"
-
-#: mod/profile.php:37 src/Model/Profile.php:118
-msgid "Requested profile is not available."
-msgstr "Gevraagde profiel is niet beschikbaar."
-
-#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1250
-#, php-format
-msgid "%s's timeline"
-msgstr ""
-
-#: mod/profile.php:79 src/Protocol/OStatus.php:1251
-#, php-format
-msgid "%s's posts"
-msgstr ""
-
-#: mod/profile.php:80 src/Protocol/OStatus.php:1252
-#, php-format
-msgid "%s's comments"
-msgstr ""
-
-#: mod/profile.php:195
-msgid "Tips for New Members"
-msgstr "Tips voor nieuwe leden"
-
-#: mod/register.php:100
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr "Registratie geslaagd. Kijk je e-mail na voor verdere instructies."
-
-#: mod/register.php:104
+#: 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 ""
+"<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>"
 
-#: 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 "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
 
-#: mod/register.php:116
-msgid "Your registration can not be processed."
-msgstr "Je registratie kan niet verwerkt worden."
-
-#: mod/register.php:163
-msgid "Your registration is pending approval by the site owner."
-msgstr "Jouw registratie wacht op goedkeuring van de beheerder."
-
-#: mod/register.php:221
-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:222
-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:223
-msgid "Your OpenID (optional): "
-msgstr "Je OpenID (optioneel):"
-
-#: mod/register.php:235
-msgid "Include your profile in member directory?"
-msgstr "Je profiel in de ledengids opnemen?"
-
-#: 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 "Lidmaatschap van deze website is uitsluitend op uitnodiging."
-
-#: 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 "Nieuw Wachtwoord:"
-
-#: mod/register.php:276
-msgid "Leave empty for an auto generated password."
-msgstr ""
-
-#: mod/register.php:277 mod/settings.php:1191
-msgid "Confirm:"
-msgstr "Bevestig:"
-
-#: 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>'."
-msgstr ""
+"<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>"
 
-#: mod/register.php:279
-msgid "Choose a nickname: "
-msgstr "Kies een bijnaam:"
-
-#: mod/register.php:282 src/Content/Nav.php:128 src/Module/Login.php:284
-msgid "Register"
-msgstr "Registreer"
-
-#: mod/register.php:289
-msgid "Import your profile to this friendica instance"
-msgstr ""
-
-#: 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 ""
+msgid "Update %s failed. See error logs."
+msgstr "Wijziging %s mislukt. Lees de error logbestanden."
 
-#: mod/removeme.php:78 mod/removeme.php:81
-msgid "Remove My Account"
-msgstr "Verwijder mijn account"
+#: src/Database/DBStructure.php:33
+msgid "There are no tables on MyISAM."
+msgstr "Er zijn geen MyISAM tabellen."
 
-#: mod/removeme.php:79
-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:80
-msgid "Please enter your password for verification:"
-msgstr "Voer je wachtwoord in voor verificatie:"
-
-#: 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 ""
-
-#: mod/settings.php:56
-msgid "Account"
-msgstr "Account"
-
-#: mod/settings.php:73
-msgid "Display"
-msgstr "Weergave"
-
-#: mod/settings.php:80 mod/settings.php:834
-msgid "Social Networks"
-msgstr "Sociale netwerken"
-
-#: mod/settings.php:94 src/Content/Nav.php:205
-msgid "Delegations"
-msgstr ""
-
-#: mod/settings.php:101
-msgid "Connected apps"
-msgstr "Verbonden applicaties"
-
-#: mod/settings.php:115
-msgid "Remove account"
-msgstr "Account verwijderen"
-
-#: mod/settings.php:167
-msgid "Missing some important data!"
-msgstr "Een belangrijk gegeven ontbreekt!"
-
-#: mod/settings.php:278
-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."
-
-#: mod/settings.php:283
-msgid "Email settings updated."
-msgstr "E-mail instellingen bijgewerkt.."
-
-#: mod/settings.php:299
-msgid "Features updated"
-msgstr "Functies bijgewerkt"
-
-#: mod/settings.php:372
-msgid "Relocate message has been send to your contacts"
-msgstr ""
-
-#: mod/settings.php:384 src/Model/User.php:339
-msgid "Passwords do not match. Password unchanged."
-msgstr "Wachtwoorden komen niet overeen. Wachtwoord niet gewijzigd."
-
-#: mod/settings.php:389
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Lege wachtwoorden zijn niet toegelaten. Wachtwoord niet gewijzigd."
-
-#: 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 "Verkeerd wachtwoord."
-
-#: mod/settings.php:407 src/Core/Console/NewPassword.php:94
-msgid "Password changed."
-msgstr "Wachtwoord gewijzigd."
-
-#: mod/settings.php:409 src/Core/Console/NewPassword.php:91
-msgid "Password update failed. Please try again."
-msgstr "Wachtwoord-)wijziging mislukt. Probeer opnieuw."
-
-#: mod/settings.php:493
-msgid " Please use a shorter name."
-msgstr "Gebruik een kortere naam."
-
-#: mod/settings.php:496
-msgid " Name too short."
-msgstr "Naam te kort."
-
-#: mod/settings.php:504
-msgid "Wrong Password"
-msgstr "Verkeerd wachtwoord"
-
-#: 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 "Privéforum/-groep heeft geen privacyrechten. De standaard privacygroep wordt gebruikt."
-
-#: mod/settings.php:569
-msgid "Private forum has no privacy permissions and no default privacy group."
-msgstr "Privéforum/-groep heeft geen privacyrechten en geen standaard privacygroep."
-
-#: mod/settings.php:609
-msgid "Settings updated."
-msgstr "Instellingen bijgewerkt."
-
-#: mod/settings.php:668 mod/settings.php:694 mod/settings.php:728
-msgid "Add application"
-msgstr "Toepassing toevoegen"
-
-#: mod/settings.php:672 mod/settings.php:698
-msgid "Consumer Key"
-msgstr "Gebruikerssleutel"
-
-#: mod/settings.php:673 mod/settings.php:699
-msgid "Consumer Secret"
-msgstr "Gebruikersgeheim"
-
-#: mod/settings.php:674 mod/settings.php:700
-msgid "Redirect"
-msgstr "Doorverwijzing"
-
-#: mod/settings.php:675 mod/settings.php:701
-msgid "Icon url"
-msgstr "URL pictogram"
-
-#: mod/settings.php:686
-msgid "You can't edit this application."
-msgstr "Je kunt deze toepassing niet wijzigen."
-
-#: mod/settings.php:727
-msgid "Connected Apps"
-msgstr "Verbonden applicaties"
-
-#: mod/settings.php:729 src/Object/Post.php:155 src/Object/Post.php:157
-msgid "Edit"
-msgstr "Bewerken"
-
-#: mod/settings.php:731
-msgid "Client key starts with"
-msgstr ""
-
-#: mod/settings.php:732
-msgid "No name"
-msgstr "Geen naam"
-
-#: mod/settings.php:733
-msgid "Remove authorization"
-msgstr "Verwijder authorisatie"
-
-#: 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 "Extra functies"
-
-#: mod/settings.php:797 src/Content/ContactSelector.php:83
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: mod/settings.php:797 mod/settings.php:798
-msgid "enabled"
-msgstr "ingeschakeld"
-
-#: mod/settings.php:797 mod/settings.php:798
-msgid "disabled"
-msgstr "uitgeschakeld"
-
-#: mod/settings.php:797 mod/settings.php:798
-#, php-format
-msgid "Built-in support for %s connectivity is %s"
-msgstr "Ingebouwde ondersteuning voor connectiviteit met %s is %s"
-
-#: mod/settings.php:798
-msgid "GNU Social (OStatus)"
-msgstr ""
-
-#: mod/settings.php:829
-msgid "Email access is disabled on this site."
-msgstr "E-mailtoegang is op deze website uitgeschakeld."
-
-#: 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 ""
-
-#: 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 ""
-
-#: mod/settings.php:844
-msgid "Your legacy GNU Social account"
-msgstr ""
-
-#: 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 ""
-
-#: mod/settings.php:847
-msgid "Repair OStatus subscriptions"
-msgstr ""
-
-#: mod/settings.php:851
-msgid "Email/Mailbox Setup"
-msgstr "E-mail Instellen"
-
-#: 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 "Als je wilt communiceren met e-mail contacten via deze dienst (optioneel), moet je hier opgeven hoe ik jouw mailbox kan bereiken."
-
-#: mod/settings.php:853
-msgid "Last successful email check:"
-msgstr "Laatste succesvolle e-mail controle:"
-
-#: mod/settings.php:855
-msgid "IMAP server name:"
-msgstr "IMAP server naam:"
-
-#: mod/settings.php:856
-msgid "IMAP port:"
-msgstr "IMAP poort:"
-
-#: mod/settings.php:857
-msgid "Security:"
-msgstr "Beveiliging:"
-
-#: mod/settings.php:857 mod/settings.php:862
-msgid "None"
-msgstr "Geen"
-
-#: mod/settings.php:858
-msgid "Email login name:"
-msgstr "E-mail login naam:"
-
-#: mod/settings.php:859
-msgid "Email password:"
-msgstr "E-mail wachtwoord:"
-
-#: mod/settings.php:860
-msgid "Reply-to address:"
-msgstr "Antwoord adres:"
-
-#: mod/settings.php:861
-msgid "Send public posts to all email contacts:"
-msgstr "Openbare posts naar alle e-mail contacten versturen:"
-
-#: mod/settings.php:862
-msgid "Action after import:"
-msgstr "Actie na importeren:"
-
-#: mod/settings.php:862 src/Content/Nav.php:193
-msgid "Mark as seen"
-msgstr "Als 'gelezen' markeren"
-
-#: mod/settings.php:862
-msgid "Move to folder"
-msgstr "Naar map verplaatsen"
-
-#: mod/settings.php:863
-msgid "Move to folder:"
-msgstr "Verplaatsen naar map:"
-
-#: mod/settings.php:906
-#, php-format
-msgid "%s - (Unsupported)"
-msgstr ""
-
-#: mod/settings.php:908
-#, php-format
-msgid "%s - (Experimental)"
-msgstr ""
-
-#: mod/settings.php:951
-msgid "Display Settings"
-msgstr "Scherminstellingen"
-
-#: mod/settings.php:957 mod/settings.php:981
-msgid "Display Theme:"
-msgstr "Schermthema:"
-
-#: mod/settings.php:958
-msgid "Mobile Theme:"
-msgstr "Mobiel thema:"
-
-#: 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 "Browser elke xx seconden verversen"
-
-#: mod/settings.php:960
-msgid "Minimum of 10 seconds. Enter -1 to disable it."
-msgstr ""
-
-#: mod/settings.php:961
-msgid "Number of items to display per page:"
-msgstr "Aantal items te tonen per pagina:"
-
-#: mod/settings.php:961 mod/settings.php:962
-msgid "Maximum of 100 items"
-msgstr "Maximum 100 items"
-
-#: mod/settings.php:962
-msgid "Number of items to display per page when viewed from mobile device:"
-msgstr "Aantal items per pagina als je een mobiel toestel gebruikt:"
-
-#: mod/settings.php:963
-msgid "Don't show emoticons"
-msgstr "Emoticons niet tonen"
-
-#: 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 "Oneindig scrollen"
-
-#: 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 "Bandwith 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 "Thema-instellingen"
-
-#: 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 "Privé-forum [experimenteel]"
-
-#: 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 "(Optioneel) Laat dit OpenID toe om in te loggen op deze account."
-
-#: mod/settings.php:1094
-msgid "Publish your default profile in your local site directory?"
-msgstr "Je standaardprofiel in je lokale gids publiceren?"
-
-#: 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."
-msgstr ""
+"\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."
 
-#: mod/settings.php:1100
-msgid "Publish your default profile in the global social directory?"
-msgstr "Je standaardprofiel in de globale sociale gids publiceren?"
-
-#: 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 "De foutboodschap is\n[pre]%s[/pre]"
 
-#: mod/settings.php:1107
-msgid "Hide your contact/friend list from viewers of your default profile?"
-msgstr "Je vrienden/contacten verbergen voor bezoekers van je standaard profiel?"
-
-#: 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 "\nFout %d is opgetreden tijdens database update:\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 "Fouten opgetreden tijdens database aanpassingen:"
 
-#: 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 "Vrienden toestaan om op jou profielpagina te posten?"
-
-#: 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 "Sta vrienden toe om jouw berichten te labelen?"
-
-#: 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 "Sta je mij toe om jou als mogelijke vriend  voor te stellen aan nieuwe leden?"
-
-#: mod/settings.php:1123
-msgid ""
-"If you like, Friendica may suggest new members to add you as a contact."
-msgstr ""
-
-#: mod/settings.php:1127
-msgid "Permit unknown people to send you private mail?"
-msgstr "Mogen onbekende personen jou privé berichten sturen?"
-
-#: mod/settings.php:1127
-msgid ""
-"Friendica network users may send you private messages even if they are not "
-"in your contact list."
-msgstr ""
-
-#: mod/settings.php:1131
-msgid "Profile is <strong>not published</strong>."
-msgstr "Profiel is <strong>niet gepubliceerd</strong>."
-
-#: mod/settings.php:1137
+#: src/Database/DBStructure.php:211
 #, php-format
-msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
-msgstr ""
+msgid "%s: Database update"
+msgstr "%s: Database update"
 
-#: mod/settings.php:1144
-msgid "Automatically expire posts after this many days:"
-msgstr "Laat berichten automatisch vervallen na zo veel dagen:"
-
-#: mod/settings.php:1144
-msgid "If empty, posts will not expire. Expired posts will be deleted"
-msgstr "Berichten zullen niet vervallen indien leeg. Vervallen berichten zullen worden verwijderd."
-
-#: mod/settings.php:1145
-msgid "Advanced expiration settings"
-msgstr "Geavanceerde instellingen voor vervallen"
-
-#: mod/settings.php:1146
-msgid "Advanced Expiration"
-msgstr "Geavanceerd Verval:"
-
-#: mod/settings.php:1147
-msgid "Expire posts:"
-msgstr "Laat berichten vervallen:"
-
-#: mod/settings.php:1148
-msgid "Expire personal notes:"
-msgstr "Laat persoonlijke aantekeningen verlopen:"
-
-#: mod/settings.php:1149
-msgid "Expire starred posts:"
-msgstr "Laat berichten met ster verlopen"
-
-#: mod/settings.php:1150
-msgid "Expire photos:"
-msgstr "Laat foto's vervallen:"
-
-#: mod/settings.php:1151
-msgid "Only expire posts by others:"
-msgstr "Laat alleen berichten door anderen vervallen:"
-
-#: mod/settings.php:1181
-msgid "Account Settings"
-msgstr "Account Instellingen"
-
-#: mod/settings.php:1189
-msgid "Password Settings"
-msgstr "Wachtwoord Instellingen"
-
-#: mod/settings.php:1191
-msgid "Leave password fields blank unless changing"
-msgstr "Laat de wachtwoord-velden leeg, tenzij je het wilt veranderen"
-
-#: mod/settings.php:1192
-msgid "Current Password:"
-msgstr "Huidig wachtwoord:"
-
-#: mod/settings.php:1192 mod/settings.php:1193
-msgid "Your current password to confirm the changes"
-msgstr "Je huidig wachtwoord om de wijzigingen te bevestigen"
-
-#: mod/settings.php:1193
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: mod/settings.php:1197
-msgid "Basic Settings"
-msgstr "Basis Instellingen"
-
-#: mod/settings.php:1198 src/Model/Profile.php:736
-msgid "Full Name:"
-msgstr "Volledige Naam:"
-
-#: mod/settings.php:1199
-msgid "Email Address:"
-msgstr "E-mailadres:"
-
-#: mod/settings.php:1200
-msgid "Your Timezone:"
-msgstr "Je Tijdzone:"
-
-#: 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"
-msgstr ""
-
-#: mod/settings.php:1202
-msgid "Default Post Location:"
-msgstr "Standaard locatie:"
-
-#: mod/settings.php:1203
-msgid "Use Browser Location:"
-msgstr "Gebruik Webbrowser Locatie:"
-
-#: mod/settings.php:1206
-msgid "Security and Privacy Settings"
-msgstr "Instellingen voor Beveiliging en Privacy"
-
-#: mod/settings.php:1208
-msgid "Maximum Friend Requests/Day:"
-msgstr "Maximum aantal vriendschapsverzoeken per dag:"
-
-#: mod/settings.php:1208 mod/settings.php:1237
-msgid "(to prevent spam abuse)"
-msgstr "(om spam misbruik te voorkomen)"
-
-#: mod/settings.php:1209
-msgid "Default Post Permissions"
-msgstr "Standaard rechten voor nieuwe berichten"
-
-#: mod/settings.php:1210
-msgid "(click to open/close)"
-msgstr "(klik om te openen/sluiten)"
-
-#: mod/settings.php:1220
-msgid "Default Private Post"
-msgstr "Standaard Privé Post"
-
-#: mod/settings.php:1221
-msgid "Default Public Post"
-msgstr "Standaard Publieke Post"
-
-#: mod/settings.php:1225
-msgid "Default Permissions for New Posts"
-msgstr "Standaard rechten voor nieuwe berichten"
-
-#: mod/settings.php:1237
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Maximum aantal privé-berichten per dag van onbekende personen:"
-
-#: mod/settings.php:1240
-msgid "Notification Settings"
-msgstr "Notificatie Instellingen"
-
-#: mod/settings.php:1241
-msgid "Send a notification email when:"
-msgstr "Stuur een notificatie e-mail wanneer:"
-
-#: mod/settings.php:1242
-msgid "You receive an introduction"
-msgstr "Je ontvangt een vriendschaps- of connectieverzoek"
-
-#: mod/settings.php:1243
-msgid "Your introductions are confirmed"
-msgstr "Jouw vriendschaps- of connectieverzoeken zijn bevestigd"
-
-#: mod/settings.php:1244
-msgid "Someone writes on your profile wall"
-msgstr "Iemand iets op je tijdlijn schrijft"
-
-#: mod/settings.php:1245
-msgid "Someone writes a followup comment"
-msgstr "Iemand een reactie schrijft"
-
-#: mod/settings.php:1246
-msgid "You receive a private message"
-msgstr "Je een privé-bericht ontvangt"
-
-#: mod/settings.php:1247
-msgid "You receive a friend suggestion"
-msgstr "Je een suggestie voor een vriendschap ontvangt"
-
-#: mod/settings.php:1248
-msgid "You are tagged in a post"
-msgstr "Je expliciet in een bericht bent genoemd"
-
-#: mod/settings.php:1249
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Je in een bericht bent aangestoten/gepord/etc."
-
-#: 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 ""
-
-#: 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/videos.php:139
-msgid "Do you really want to delete this video?"
-msgstr "Wil je deze video echt verwijderen?"
-
-#: mod/videos.php:144
-msgid "Delete Video"
-msgstr "Verwijder video"
-
-#: mod/videos.php:207
-msgid "No videos selected"
-msgstr "Geen video's geselecteerd"
-
-#: mod/videos.php:396
-msgid "Recent Videos"
-msgstr "Recente video's"
-
-#: mod/videos.php:398
-msgid "Upload New Videos"
-msgstr "Nieuwe video's uploaden"
-
-#: view/theme/duepuntozero/config.php:54 src/Model/User.php:502
-msgid "default"
-msgstr "standaard"
-
-#: view/theme/duepuntozero/config.php:55
-msgid "greenzero"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:56
-msgid "purplezero"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:57
-msgid "easterbunny"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:58
-msgid "darkzero"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:59
-msgid "comix"
-msgstr ""
-
-#: view/theme/duepuntozero/config.php:60
-msgid "slackr"
-msgstr ""
-
-#: 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 "Link kleur"
-
-#: 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 "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:238
-msgid "Guest"
-msgstr "Gast"
-
-#: view/theme/frio/theme.php:243
-msgid "Visitor"
-msgstr "Bezoeker"
-
-#: view/theme/frio/theme.php:256 src/Content/Nav.php:97
-#: src/Module/Login.php:312
-msgid "Logout"
-msgstr "Uitloggen"
-
-#: view/theme/frio/theme.php:256 src/Content/Nav.php:97
-msgid "End this session"
-msgstr "Deze sessie beëindigen"
-
-#: 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"
-
-#: view/theme/frio/theme.php:260 src/Content/Nav.php:101
-msgid "Your profile page"
-msgstr "Jouw profiel pagina"
-
-#: view/theme/frio/theme.php:261 src/Content/Nav.php:102
-msgid "Your photos"
-msgstr "Jouw foto's"
-
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:103
-#: src/Model/Profile.php:910 src/Model/Profile.php:913
-msgid "Videos"
-msgstr "Video's"
-
-#: 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 "Jouw gebeurtenissen"
-
-#: view/theme/frio/theme.php:266 src/Content/Nav.php:183
-msgid "Conversations from your friends"
-msgstr "Gesprekken van je vrienden"
-
-#: 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 "Gebeurtenissen en kalender"
-
-#: view/theme/frio/theme.php:268 src/Content/Nav.php:196
-msgid "Private mail"
-msgstr "Privéberichten"
-
-#: view/theme/frio/theme.php:269 src/Content/Nav.php:207
-msgid "Account settings"
-msgstr "Account instellingen"
-
-#: view/theme/frio/theme.php:270 src/Content/Nav.php:213
-msgid "Manage/edit friends and contacts"
-msgstr "Beheer/Wijzig vrienden en contacten"
-
-#: 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:309
-msgid "don't show"
-msgstr "niet tonen"
-
-#: view/theme/vier/config.php:115 src/Core/ACL.php:308
-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:150
-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:388
-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:181
-msgid "Last users"
-msgstr "Laatste gebruikers"
-
-#: view/theme/vier/theme.php:199 src/Content/Widget.php:59
-msgid "Find People"
-msgstr "Zoek mensen"
-
-#: view/theme/vier/theme.php:200 src/Content/Widget.php:60
-msgid "Enter name or interest"
-msgstr "Vul naam of interesse in"
-
-#: view/theme/vier/theme.php:202 src/Content/Widget.php:62
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Voorbeelden: Jan Peeters, Vissen"
-
-#: view/theme/vier/theme.php:205 src/Content/Widget.php:65
-msgid "Similar Interests"
-msgstr "Dezelfde interesses"
-
-#: view/theme/vier/theme.php:206 src/Content/Widget.php:66
-msgid "Random Profile"
-msgstr "Willekeurig Profiel"
-
-#: view/theme/vier/theme.php:207 src/Content/Widget.php:67
-msgid "Invite Friends"
-msgstr "Vrienden uitnodigen"
-
-#: view/theme/vier/theme.php:210 src/Content/Widget.php:70
-msgid "Local Directory"
-msgstr "Lokale gids"
-
-#: 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 "Snelstart"
-
-#: 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 ""
-
-#: src/Core/UserImport.php:118
+#: src/Database/DBStructure.php:473
 #, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "Gebruiker '%s' bestaat al op deze server!"
+msgid "%s: updating %s table."
+msgstr "%s: tabel %s aan het updaten."
 
-#: src/Core/UserImport.php:151
-msgid "User creation error"
-msgstr "Fout bij het aanmaken van de gebruiker"
-
-#: src/Core/UserImport.php:169
-msgid "User profile creation error"
-msgstr "Fout bij het aanmaken van het gebruikersprofiel"
-
-#: src/Core/UserImport.php:213
-#, 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:278
-msgid "Done. You can now login with your username and password"
-msgstr "Gebeurd. Je kunt nu inloggen met je gebruikersnaam en wachtwoord"
-
-#: src/Core/ACL.php:295
-msgid "Post to Email"
-msgstr "Verzenden per e-mail"
-
-#: src/Core/ACL.php:301
-msgid "Hide your profile details from unknown viewers?"
-msgstr "Je profieldetails verbergen voor onbekende bezoekers?"
-
-#: src/Core/ACL.php:300
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr ""
-
-#: src/Core/ACL.php:307
-msgid "Visible to everybody"
-msgstr "Zichtbaar voor iedereen"
-
-#: src/Core/ACL.php:319
-msgid "Close"
-msgstr "Afsluiten"
-
-#: 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 "Systeem"
-
-#: src/Core/NotificationsManager.php:192 src/Content/Nav.php:124
-#: src/Content/Nav.php:186
-msgid "Home"
-msgstr "Tijdlijn"
-
-#: src/Core/NotificationsManager.php:199 src/Content/Nav.php:190
-msgid "Introductions"
-msgstr "Verzoeken"
-
-#: src/Core/NotificationsManager.php:256 src/Core/NotificationsManager.php:268
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s gaf een reactie op het bericht van %s"
-
-#: src/Core/NotificationsManager.php:267
-#, php-format
-msgid "%s created a new post"
-msgstr "%s schreef een nieuw bericht"
-
-#: src/Core/NotificationsManager.php:281
-#, php-format
-msgid "%s liked %s's post"
-msgstr "%s vond het bericht van %s leuk"
-
-#: src/Core/NotificationsManager.php:294
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "%s vond het bericht van %s niet leuk"
-
-#: src/Core/NotificationsManager.php:307
-#, php-format
-msgid "%s is attending %s's event"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:320
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:333
-#, php-format
-msgid "%s may attend %s's event"
-msgstr ""
-
-#: src/Core/NotificationsManager.php:350
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s is nu bevriend met %s"
-
-#: src/Core/NotificationsManager.php:825
-msgid "Friend Suggestion"
-msgstr "Vriendschapsvoorstel"
-
-#: src/Core/NotificationsManager.php:851
-msgid "Friend/Connect Request"
-msgstr "Vriendschapsverzoek"
-
-#: src/Core/NotificationsManager.php:851
-msgid "New Follower"
-msgstr "Nieuwe Volger"
-
-#: 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 "Kan geen command-line-versie van PHP vinden in het PATH van de webserver."
 
-#: 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 "
 "href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
 "up-the-worker'>'Setup the worker'</a>"
-msgstr ""
+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:162
+#: src/Core/Install.php:143
 msgid "PHP executable path"
 msgstr "PATH van het PHP commando"
 
-#: 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 "Vul het volledige pad in naar het php programma. Je kunt dit leeg laten om de installatie verder te zetten."
 
-#: src/Core/Install.php:167
+#: src/Core/Install.php:148
 msgid "Command line PHP"
 msgstr "PHP-opdrachtregel"
 
-#: 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 ""
+msgstr "PHP uitvoerbaar bestand is niet de php cli binary (zou kunnen de cgi-fgci versie zijn)"
 
-#: src/Core/Install.php:177
+#: src/Core/Install.php:158
 msgid "Found PHP version: "
 msgstr "Gevonden PHP versie:"
 
-#: src/Core/Install.php:179
+#: src/Core/Install.php:160
 msgid "PHP cli binary"
-msgstr ""
+msgstr "PHP cli binary"
 
-#: 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 "De command-line versie van PHP op jouw systeem heeft \"register_argc_argv\" niet geactiveerd."
 
-#: src/Core/Install.php:190
+#: 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: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 ""
+msgstr "Fout: de \"openssl_pkey_new\" functie op dit systeem kan geen encryptie sleutels genereren"
 
-#: 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 "Zie \"http://www.php.net/manual/en/openssl.installation.php\" wanneer u Friendica onder Windows draait."
 
-#: src/Core/Install.php:223
+#: src/Core/Install.php:204
 msgid "Generate encryption keys"
-msgstr ""
+msgstr "Genereer encryptie sleutels"
 
-#: src/Core/Install.php:244
+#: src/Core/Install.php:225
 msgid "libCurl PHP module"
 msgstr "libCurl PHP module"
 
-#: src/Core/Install.php:245
+#: src/Core/Install.php:226
 msgid "GD graphics PHP module"
 msgstr "GD graphics PHP module"
 
-#: src/Core/Install.php:246
+#: src/Core/Install.php:227
 msgid "OpenSSL PHP module"
 msgstr "OpenSSL PHP module"
 
-#: src/Core/Install.php:247
+#: src/Core/Install.php:228
 msgid "PDO or MySQLi PHP module"
-msgstr ""
+msgstr "PDO of MySQLi PHP module"
 
-#: src/Core/Install.php:248
+#: src/Core/Install.php:229
 msgid "mb_string PHP module"
 msgstr "mb_string PHP module"
 
-#: src/Core/Install.php:249
+#: src/Core/Install.php:230
 msgid "XML PHP module"
-msgstr ""
+msgstr "XML PHP module"
 
-#: src/Core/Install.php:250
+#: src/Core/Install.php:231
 msgid "iconv PHP module"
-msgstr ""
+msgstr "iconv PHP module"
 
-#: src/Core/Install.php:251
+#: src/Core/Install.php:232
 msgid "POSIX PHP module"
-msgstr ""
+msgstr "POSIX PHP module"
 
-#: 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 module"
 
-#: src/Core/Install.php:255
+#: 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:263
+#: 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:267
+#: 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:271
+#: 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:275
+#: src/Core/Install.php:256
 msgid "Error: PDO or MySQLi PHP module required but not installed."
-msgstr ""
+msgstr "Fout: PDO of MySQLi PHP module vereist maar niet geïnstalleerd."
 
-#: src/Core/Install.php:279
+#: src/Core/Install.php:260
 msgid "Error: The MySQL driver for PDO is not installed."
-msgstr ""
+msgstr "Fout: de MySQL driver voor PDO is niet geïnstalleerd."
 
-#: src/Core/Install.php:283
+#: 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:287
+#: src/Core/Install.php:268
 msgid "Error: iconv PHP module required but not installed."
-msgstr ""
+msgstr "Fout: iconv PHP module vereist maar niet geïnstalleerd."
 
-#: src/Core/Install.php:291
+#: src/Core/Install.php:272
 msgid "Error: POSIX PHP module required but not installed."
-msgstr ""
+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 "Error, XML PHP module required but not installed."
-msgstr ""
-
-#: src/Core/Install.php:320
 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 "Het installatieprogramma moet een bestand \".htconfig.php\" in de bovenste map van je webserver aanmaken, maar kan dit niet doen."
+"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: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 "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: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 "Op het einde van deze procedure zal ik je een tekst geven om te bewaren in een bestand .htconfig.php in je hoogste Friendica map."
+"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: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 "Je kunt ook deze procedure overslaan, en een manuele installatie uitvoeren. Lees het bestand \"INSTALL.txt\" voor instructies."
 
-#: src/Core/Install.php:326
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php is schrijfbaar"
+#: src/Core/Install.php:307
+msgid "config/local.ini.php is writable"
+msgstr "config/local.ini.php is schrijfbaar "
 
-#: 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 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: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 "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: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 "Zorg ervoor dat de gebruiker waaronder je webserver runt (bijv. www-data) schrijf-toegang heeft tot deze map."
 
-#: 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 "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:350
+#: src/Core/Install.php:331
 msgid "view/smarty3 is writable"
 msgstr "view/smarty3 is schrijfbaar"
 
-#: src/Core/Install.php:375
+#: src/Core/Install.php:356
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
-msgstr ""
+msgstr "Url rewrite in .htaccess werkt niet. Kijk je server configuratie na."
 
-#: src/Core/Install.php:377
+#: src/Core/Install.php:358
 msgid "Error message from Curl when fetching"
-msgstr ""
+msgstr "Fout boodschap van Curl bij ophalen"
 
-#: src/Core/Install.php:381
+#: src/Core/Install.php:362
 msgid "Url rewrite is working"
-msgstr ""
+msgstr "Url rewrite werkt correct"
 
-#: src/Core/Install.php:408
+#: src/Core/Install.php:389
 msgid "ImageMagick PHP extension is not installed"
-msgstr ""
+msgstr "ImageMagick PHP extensie is niet geïnstalleerd"
 
-#: src/Core/Install.php:410
+#: src/Core/Install.php:391
 msgid "ImageMagick PHP extension is installed"
-msgstr ""
+msgstr "ImageMagick PHP extensie is geïnstalleerd"
 
-#: src/Core/Install.php:412
+#: 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
+msgid "Could not find any unarchived contact entry for this URL (%s)"
+msgstr "Kon geen niet-gearchiveerde contacten vinden voor deze URL (%s)"
+
+#: src/Core/Console/ArchiveContact.php:70
+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/Util/Temporal.php:147 src/Model/Profile.php:756
+#: 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:269
+msgid "Password can't be empty"
+msgstr "Paswoord mag niet leeg zijn"
+
+#: src/Core/NotificationsManager.php:172
+msgid "System"
+msgstr "Systeem"
+
+#: src/Core/NotificationsManager.php:193 src/Content/Nav.php:124
+#: src/Content/Nav.php:186
+msgid "Home"
+msgstr "Tijdlijn"
+
+#: src/Core/NotificationsManager.php:200 src/Content/Nav.php:190
+msgid "Introductions"
+msgstr "Verzoeken"
+
+#: 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:273
+#, php-format
+msgid "%s created a new post"
+msgstr "%s schreef een nieuw bericht"
+
+#: 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:300
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "%s vond het bericht van %s niet leuk"
+
+#: 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:326
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr "%s woont het event van %s niet bij"
+
+#: 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:360
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s is nu bevriend met %s"
+
+#: src/Core/NotificationsManager.php:626
+msgid "Friend Suggestion"
+msgstr "Vriendschapsvoorstel"
+
+#: src/Core/NotificationsManager.php:656
+msgid "Friend/Connect Request"
+msgstr "Vriendschapsverzoek"
+
+#: src/Core/NotificationsManager.php:656
+msgid "New Follower"
+msgstr "Nieuwe Volger"
+
+#: src/Core/UserImport.php:100
+msgid "Error decoding account file"
+msgstr "Fout bij decoderen van het account bestand"
+
+#: 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:114
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "Gebruiker '%s' bestaat al op deze server!"
+
+#: src/Core/UserImport.php:147
+msgid "User creation error"
+msgstr "Fout bij het aanmaken van de gebruiker"
+
+#: src/Core/UserImport.php:165
+msgid "User profile creation error"
+msgstr "Fout bij het aanmaken van het gebruikersprofiel"
+
+#: 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:274
+msgid "Done. You can now login with your username and password"
+msgstr "Gebeurd. Je kunt nu inloggen met je gebruikersnaam en wachtwoord"
+
+#: 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:"
 
 #: src/Util/Temporal.php:151
 msgid "YYYY-MM-DD or MM-DD"
-msgstr ""
+msgstr "JJJJ-MM-DD of MM-DD"
 
 #: src/Util/Temporal.php:294
 msgid "never"
@@ -8060,370 +8501,445 @@ msgstr "seconde"
 
 #: src/Util/Temporal.php:309
 msgid "seconds"
-msgstr "secondes"
+msgstr "seconden"
 
 #: src/Util/Temporal.php:318
 #, php-format
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s geleden"
 
-#: src/Content/Text/BBCode.php:426
-msgid "view full size"
-msgstr "Volledig formaat"
-
-#: src/Content/Text/BBCode.php:852 src/Content/Text/BBCode.php:1621
-#: src/Content/Text/BBCode.php:1622
-msgid "Image/photo"
-msgstr "Afbeelding/foto"
-
-#: src/Content/Text/BBCode.php:990
-#, php-format
-msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
-msgstr ""
+#: src/Model/Mail.php:39 src/Model/Mail.php:171
+msgid "[no subject]"
+msgstr "[geen onderwerp]"
+
+#: src/Model/Contact.php:942
+msgid "Drop Contact"
+msgstr "Verwijder contact"
+
+#: 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/Content/Text/BBCode.php:1548 src/Content/Text/BBCode.php:1570
-msgid "$1 wrote:"
-msgstr "$1 schreef:"
+#: 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/Content/Text/BBCode.php:1630 src/Content/Text/BBCode.php:1631
-msgid "Encrypted content"
-msgstr "Versleutelde inhoud"
+#: 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/Content/Text/BBCode.php:1750
-msgid "Invalid source protocol"
-msgstr ""
+#: src/Model/User.php:447
+msgid "Not a valid email address."
+msgstr "Geen geldig e-mailadres."
 
-#: src/Content/Text/BBCode.php:1761
-msgid "Invalid link protocol"
-msgstr ""
+#: 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/Content/OEmbed.php:253
-msgid "Embedding disabled"
-msgstr "Inbedden uitgeschakeld"
+#: src/Model/User.php:454 src/Model/User.php:462
+msgid "Cannot use that email."
+msgstr "Ik kan die e-mail niet gebruiken."
 
-#: src/Content/OEmbed.php:373
-msgid "Embedded content"
-msgstr "Ingebedde inhoud"
+#: 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/Content/Widget/CalendarExport.php:61
-msgid "Export"
-msgstr "Exporteer"
+#: 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/Content/Widget/CalendarExport.php:62
-msgid "Export calendar as ical"
-msgstr "Exporteer kalender als ical"
+#: src/Model/User.php:486
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "ERNSTIGE FOUT: aanmaken van beveiligingssleutels mislukt."
 
-#: src/Content/Widget/CalendarExport.php:63
-msgid "Export calendar as csv"
-msgstr "Exporteer kalender als csv"
+#: 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/Content/ContactSelector.php:55
-msgid "Frequently"
-msgstr "Frequent"
+#: 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/Content/ContactSelector.php:56
-msgid "Hourly"
-msgstr "Ieder uur"
+#: 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/Content/ContactSelector.php:57
-msgid "Twice daily"
-msgstr "Twee maal daags"
-
-#: src/Content/ContactSelector.php:58
-msgid "Daily"
-msgstr "Dagelijks"
-
-#: src/Content/ContactSelector.php:59
-msgid "Weekly"
-msgstr "Wekelijks"
-
-#: src/Content/ContactSelector.php:60
-msgid "Monthly"
-msgstr "Maandelijks"
-
-#: 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/Chat"
-
-#: 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 "Twitter"
-
-#: src/Content/ContactSelector.php:92
-msgid "Diaspora Connector"
-msgstr "Diaspora Connector"
-
-#: src/Content/ContactSelector.php:93
-msgid "GNU Social Connector"
-msgstr "GNU Social Connector"
-
-#: src/Content/ContactSelector.php:94
-msgid "pnut"
-msgstr "pnut"
-
-#: src/Content/ContactSelector.php:95
-msgid "App.net"
-msgstr "App.net"
-
-#: src/Content/ContactSelector.php:125
-msgid "Male"
-msgstr "Mannelijk"
-
-#: src/Content/ContactSelector.php:125
-msgid "Female"
-msgstr "Vrouwelijk"
-
-#: src/Content/ContactSelector.php:125
-msgid "Currently Male"
-msgstr "Momenteel mannelijk"
-
-#: src/Content/ContactSelector.php:125
-msgid "Currently Female"
-msgstr "Momenteel vrouwelijk"
-
-#: src/Content/ContactSelector.php:125
-msgid "Mostly Male"
-msgstr "Hoofdzakelijk mannelijk"
-
-#: src/Content/ContactSelector.php:125
-msgid "Mostly Female"
-msgstr "Hoofdzakelijk vrouwelijk"
-
-#: src/Content/ContactSelector.php:125
-msgid "Transgender"
-msgstr "Transgender"
-
-#: src/Content/ContactSelector.php:125
-msgid "Intersex"
-msgstr "Intersex"
-
-#: src/Content/ContactSelector.php:125
-msgid "Transsexual"
-msgstr "Transeksueel"
-
-#: src/Content/ContactSelector.php:125
-msgid "Hermaphrodite"
-msgstr "Hermafrodiet"
-
-#: src/Content/ContactSelector.php:125
-msgid "Neuter"
-msgstr "Onzijdig"
-
-#: src/Content/ContactSelector.php:125
-msgid "Non-specific"
-msgstr "Niet-specifiek"
-
-#: src/Content/ContactSelector.php:125
-msgid "Other"
-msgstr "Anders"
-
-#: src/Content/ContactSelector.php:147
-msgid "Males"
-msgstr "Mannen"
-
-#: src/Content/ContactSelector.php:147
-msgid "Females"
-msgstr "Vrouwen"
-
-#: src/Content/ContactSelector.php:147
-msgid "Gay"
-msgstr "Homo"
-
-#: src/Content/ContactSelector.php:147
-msgid "Lesbian"
-msgstr "Lesbienne"
-
-#: src/Content/ContactSelector.php:147
-msgid "No Preference"
-msgstr "Geen voorkeur"
-
-#: src/Content/ContactSelector.php:147
-msgid "Bisexual"
-msgstr "Biseksueel"
-
-#: src/Content/ContactSelector.php:147
-msgid "Autosexual"
-msgstr "Autoseksueel"
-
-#: src/Content/ContactSelector.php:147
-msgid "Abstinent"
-msgstr "Onthouder"
-
-#: src/Content/ContactSelector.php:147
-msgid "Virgin"
-msgstr "Maagd"
-
-#: src/Content/ContactSelector.php:147
-msgid "Deviant"
-msgstr "Afwijkend"
-
-#: src/Content/ContactSelector.php:147
-msgid "Fetish"
-msgstr "Fetisj"
-
-#: src/Content/ContactSelector.php:147
-msgid "Oodles"
-msgstr "Veel"
-
-#: src/Content/ContactSelector.php:147
-msgid "Nonsexual"
-msgstr "Niet seksueel"
-
-#: src/Content/ContactSelector.php:169
-msgid "Single"
-msgstr "Alleenstaand"
-
-#: src/Content/ContactSelector.php:169
-msgid "Lonely"
-msgstr "Eenzaam"
-
-#: src/Content/ContactSelector.php:169
-msgid "Available"
-msgstr "Beschikbaar"
-
-#: src/Content/ContactSelector.php:169
-msgid "Unavailable"
-msgstr "Onbeschikbaar"
-
-#: src/Content/ContactSelector.php:169
-msgid "Has crush"
-msgstr "Verliefd"
-
-#: src/Content/ContactSelector.php:169
-msgid "Infatuated"
-msgstr "Smoorverliefd"
-
-#: src/Content/ContactSelector.php:169
-msgid "Dating"
-msgstr "Aan het daten"
-
-#: src/Content/ContactSelector.php:169
-msgid "Unfaithful"
-msgstr "Ontrouw"
-
-#: src/Content/ContactSelector.php:169
-msgid "Sex Addict"
-msgstr "Seksverslaafd"
-
-#: src/Content/ContactSelector.php:169 src/Model/User.php:519
+#: src/Model/User.php:561 src/Content/ContactSelector.php:166
 msgid "Friends"
 msgstr "Vrienden"
 
-#: src/Content/ContactSelector.php:169
-msgid "Friends/Benefits"
-msgstr "Vriendschap plus"
+#: 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/Content/ContactSelector.php:169
-msgid "Casual"
-msgstr "Ongebonden/vluchtig"
+#: 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 "\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/ContactSelector.php:169
-msgid "Engaged"
-msgstr "Verloofd"
+#: src/Model/User.php:649
+#, php-format
+msgid "Registration at %s"
+msgstr "Registratie bij %s"
 
-#: src/Content/ContactSelector.php:169
-msgid "Married"
-msgstr "Getrouwd"
+#: 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/ContactSelector.php:169
-msgid "Imaginarily married"
-msgstr "Denkbeeldig getrouwd"
+#: 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/ContactSelector.php:169
-msgid "Partners"
-msgstr "Partners"
+#: 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/ContactSelector.php:169
-msgid "Cohabiting"
-msgstr "Samenwonend"
+#: src/Model/Group.php:329
+msgid "Default privacy group for new contacts"
+msgstr "Standaard privacy groep voor nieuwe contacten"
 
-#: src/Content/ContactSelector.php:169
-msgid "Common law"
-msgstr "getrouwd voor-de-wet"
+#: src/Model/Group.php:362
+msgid "Everybody"
+msgstr "Iedereen"
 
-#: src/Content/ContactSelector.php:169
-msgid "Happy"
-msgstr "Blij"
+#: src/Model/Group.php:382
+msgid "edit"
+msgstr "verander"
 
-#: src/Content/ContactSelector.php:169
-msgid "Not looking"
-msgstr "Niet op zoek"
+#: src/Model/Group.php:406
+msgid "Edit group"
+msgstr "Verander groep"
 
-#: src/Content/ContactSelector.php:169
-msgid "Swinger"
-msgstr "Swinger"
+#: src/Model/Group.php:409
+msgid "Create a new group"
+msgstr "Maak nieuwe groep"
 
-#: src/Content/ContactSelector.php:169
-msgid "Betrayed"
-msgstr "Bedrogen"
+#: src/Model/Group.php:411
+msgid "Edit groups"
+msgstr "Bewerk groepen"
 
-#: src/Content/ContactSelector.php:169
-msgid "Separated"
-msgstr "Uit elkaar"
+#: src/Model/Profile.php:97
+msgid "Requested account is not available."
+msgstr "Gevraagde account is niet beschikbaar."
 
-#: src/Content/ContactSelector.php:169
-msgid "Unstable"
-msgstr "Onstabiel"
+#: src/Model/Profile.php:163 src/Model/Profile.php:399
+#: src/Model/Profile.php:846
+msgid "Edit profile"
+msgstr "Bewerk profiel"
 
-#: src/Content/ContactSelector.php:169
-msgid "Divorced"
-msgstr "Gescheiden"
+#: src/Model/Profile.php:333
+msgid "Atom feed"
+msgstr "Atom feed"
 
-#: src/Content/ContactSelector.php:169
-msgid "Imaginarily divorced"
-msgstr "Denkbeeldig gescheiden"
+#: src/Model/Profile.php:372
+msgid "Manage/edit profiles"
+msgstr "Beheer/wijzig profielen"
 
-#: src/Content/ContactSelector.php:169
-msgid "Widowed"
-msgstr "Weduwnaar/weduwe"
+#: src/Model/Profile.php:550 src/Model/Profile.php:639
+msgid "g A l F d"
+msgstr "G l j F"
 
-#: src/Content/ContactSelector.php:169
-msgid "Uncertain"
-msgstr "Onzeker"
+#: src/Model/Profile.php:551
+msgid "F d"
+msgstr "d F"
 
-#: src/Content/ContactSelector.php:169
-msgid "It's complicated"
-msgstr "Het is gecompliceerd"
+#: src/Model/Profile.php:604 src/Model/Profile.php:690
+msgid "[today]"
+msgstr "[vandaag]"
 
-#: src/Content/ContactSelector.php:169
-msgid "Don't care"
-msgstr "Kan me niet schelen"
+#: src/Model/Profile.php:615
+msgid "Birthday Reminders"
+msgstr "Verjaardagsherinneringen"
 
-#: src/Content/ContactSelector.php:169
-msgid "Ask me"
-msgstr "Vraag me"
+#: 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"
@@ -8444,33 +8960,329 @@ msgid_plural "%d invitations available"
 msgstr[0] "%d uitnodiging beschikbaar"
 msgstr[1] "%d uitnodigingen beschikbaar"
 
-#: src/Content/Widget.php:164
+#: src/Content/Widget.php:157
 msgid "Networks"
 msgstr "Netwerken"
 
-#: src/Content/Widget.php:167
+#: src/Content/Widget.php:160
 msgid "All Networks"
 msgstr "Alle netwerken"
 
-#: src/Content/Widget.php:205 src/Content/Feature.php:118
+#: src/Content/Widget.php:198 src/Content/Feature.php:118
 msgid "Saved Folders"
 msgstr "Bewaarde Mappen"
 
-#: src/Content/Widget.php:208 src/Content/Widget.php:248
+#: src/Content/Widget.php:201 src/Content/Widget.php:241
 msgid "Everything"
 msgstr "Alles"
 
-#: src/Content/Widget.php:245
+#: src/Content/Widget.php:238
 msgid "Categories"
 msgstr "Categorieën"
 
-#: 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 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"
 msgstr "Algemene functies"
@@ -8485,13 +9297,13 @@ msgstr "Mogelijkheid om meerdere profielen aan te maken"
 
 #: src/Content/Feature.php:82
 msgid "Photo Location"
-msgstr ""
+msgstr "Foto Locatie"
 
 #: src/Content/Feature.php:82
 msgid ""
 "Photo metadata is normally stripped. This extracts the location (if present)"
 " prior to stripping metadata and links it to a map."
-msgstr ""
+msgstr "Foto metadata wordt normaal verwijderd. Dit extraheert de locatie (indien aanwezig) vooraleer de metadata te verwijderen en verbindt die met een kaart."
 
 #: src/Content/Feature.php:83
 msgid "Export Public Calendar"
@@ -8499,7 +9311,7 @@ msgstr "Exporteer Publieke Kalender"
 
 #: src/Content/Feature.php:83
 msgid "Ability for visitors to download the public calendar"
-msgstr ""
+msgstr "Mogelijkheid voor bezoekers om de publieke kalender te downloaden"
 
 #: src/Content/Feature.php:88
 msgid "Post Composition Features"
@@ -8511,20 +9323,20 @@ msgstr "Voorvertoning bericht"
 
 #: src/Content/Feature.php:89
 msgid "Allow previewing posts and comments before publishing them"
-msgstr ""
+msgstr "Sta toe dat berichten en reacties eerst bekeken worden worden vooraleer te publiceren"
 
 #: src/Content/Feature.php:90
 msgid "Auto-mention Forums"
-msgstr ""
+msgstr "Auto-vermelding Forums"
 
 #: src/Content/Feature.php:90
 msgid ""
 "Add/remove mention when a forum page is selected/deselected in ACL window."
-msgstr ""
+msgstr "Voeg toe/verwijder vermelding wanneer een forum pagina geselecteerd/gedeselecteerd wordt in het ACL venster."
 
 #: src/Content/Feature.php:95
 msgid "Network Sidebar"
-msgstr ""
+msgstr "Netwerk Zijbalk"
 
 #: src/Content/Feature.php:96
 msgid "Ability to select posts by date ranges"
@@ -8532,11 +9344,11 @@ msgstr "Mogelijkheid om berichten te selecteren volgens datumbereik"
 
 #: src/Content/Feature.php:97 src/Content/Feature.php:127
 msgid "List Forums"
-msgstr ""
+msgstr "Lijst Fora op"
 
 #: src/Content/Feature.php:97
 msgid "Enable widget to display the forums your are connected with"
-msgstr ""
+msgstr "Sta de widget toe om de fora te tonen waarmee je geconnecteerd bent"
 
 #: src/Content/Feature.php:98
 msgid "Group Filter"
@@ -8580,11 +9392,11 @@ msgstr "Laat de tab alleen nieuwe netwerkberichten tonen (van de laatste 12 uur)
 
 #: src/Content/Feature.php:108
 msgid "Network Shared Links Tab"
-msgstr ""
+msgstr "Netwerk Gedeelde Links Tab"
 
 #: src/Content/Feature.php:108
 msgid "Enable tab to display only Network posts with links in them"
-msgstr ""
+msgstr "Activeer tab om alleen Netwerk berichten met links in te tonen"
 
 #: src/Content/Feature.php:113
 msgid "Post/Comment Tools"
@@ -8640,39 +9452,39 @@ msgstr "Geef berichten een ster"
 
 #: src/Content/Feature.php:120
 msgid "Ability to mark special posts with a star indicator"
-msgstr ""
+msgstr "Mogelijkheid om speciale berichten te markeren met een ster indicator"
 
 #: src/Content/Feature.php:121
 msgid "Mute Post Notifications"
-msgstr ""
+msgstr "Toon geen Bericht Notificaties"
 
 #: src/Content/Feature.php:121
 msgid "Ability to mute notifications for a thread"
-msgstr ""
+msgstr "Mogelijkheid notificaties in een gesprek niet te tonen"
 
 #: src/Content/Feature.php:126
 msgid "Advanced Profile Settings"
-msgstr ""
+msgstr "Geavanceerde Profiel Instellingen"
 
 #: src/Content/Feature.php:127
 msgid "Show visitors public community forums at the Advanced Profile Page"
-msgstr ""
+msgstr "Toon bezoekers de publieke groepsfora in de Geavanceerde Profiel Pagina"
 
 #: src/Content/Feature.php:128
 msgid "Tag Cloud"
-msgstr ""
+msgstr "Tag Wolk"
 
 #: src/Content/Feature.php:128
 msgid "Provide a personal tag cloud on your profile page"
-msgstr ""
+msgstr "Voorzie een persoonlijk tag wolk op je profiel pagina"
 
 #: src/Content/Feature.php:129
 msgid "Display Membership Date"
-msgstr ""
+msgstr "Toon Lidmaatschap Datum"
 
 #: src/Content/Feature.php:129
 msgid "Display membership date in profile"
-msgstr ""
+msgstr "Toon lidmaatschap datum in profiel"
 
 #: src/Content/Nav.php:53
 msgid "Nothing new here"
@@ -8688,7 +9500,7 @@ msgstr "Persoonlijke nota's"
 
 #: src/Content/Nav.php:105
 msgid "Your personal notes"
-msgstr ""
+msgstr "Je persoonlijke nota's"
 
 #: src/Content/Nav.php:114
 msgid "Sign in"
@@ -8724,7 +9536,7 @@ msgstr "Website"
 
 #: src/Content/Nav.php:166
 msgid "Conversations on this and other servers"
-msgstr ""
+msgstr "Gesprekken op deze en andere servers"
 
 #: src/Content/Nav.php:173
 msgid "Directory"
@@ -8736,11 +9548,11 @@ msgstr "Personengids"
 
 #: src/Content/Nav.php:175
 msgid "Information about this friendica instance"
-msgstr ""
+msgstr "informatie over deze friendica server"
 
 #: src/Content/Nav.php:178
 msgid "Terms of Service of this Friendica instance"
-msgstr ""
+msgstr "Gebruiksvoorwaarden op deze Friendica server"
 
 #: src/Content/Nav.php:184
 msgid "Network Reset"
@@ -8778,10 +9590,6 @@ msgstr "Beheren"
 msgid "Manage other pages"
 msgstr "Andere pagina's beheren"
 
-#: src/Content/Nav.php:210 src/Model/Profile.php:368
-msgid "Profiles"
-msgstr "Profielen"
-
 #: src/Content/Nav.php:210
 msgid "Manage/Edit Profiles"
 msgstr "Beheer/Wijzig Profielen"
@@ -8798,758 +9606,47 @@ msgstr "Navigatie"
 msgid "Site map"
 msgstr "Sitemap"
 
-#: src/Database/DBStructure.php:32
-msgid "There are no tables on MyISAM."
-msgstr "Er zijn geen MyISAM tabellen."
-
-#: 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 "\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:80
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "De foutboodschap is\n[pre]%s[/pre]"
-
-#: src/Database/DBStructure.php:191
-#, php-format
-msgid ""
-"\n"
-"Error %d occurred during database update:\n"
-"%s\n"
-msgstr ""
-
-#: 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 ""
-
-#: src/Model/Mail.php:40 src/Model/Mail.php:174
-msgid "[no subject]"
-msgstr "[geen onderwerp]"
-
-#: src/Model/Event.php:53 src/Model/Event.php:70 src/Model/Event.php:419
-#: src/Model/Event.php:882
-msgid "Starts:"
-msgstr "Begint:"
-
-#: src/Model/Event.php:56 src/Model/Event.php:76 src/Model/Event.php:420
-#: src/Model/Event.php:886
-msgid "Finishes:"
-msgstr "Eindigt:"
-
-#: src/Model/Event.php:368
-msgid "all-day"
-msgstr ""
-
-#: src/Model/Event.php:391
-msgid "Jun"
-msgstr "Jun"
-
-#: src/Model/Event.php:394
-msgid "Sept"
-msgstr "Sep"
-
-#: src/Model/Event.php:417
-msgid "No events to display"
-msgstr ""
-
-#: src/Model/Event.php:543
-msgid "l, F j"
-msgstr "l j F"
-
-#: src/Model/Event.php:566
-msgid "Edit event"
-msgstr "Gebeurtenis bewerken"
-
-#: 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 "D g:i A"
-
-#: src/Model/Event.php:816
-msgid "g:i A"
-msgstr "g:i A"
-
-#: src/Model/Event.php:901 src/Model/Event.php:903
-msgid "Show map"
-msgstr "Toon kaart"
-
-#: src/Model/Event.php:902
-msgid "Hide map"
-msgstr "Verberg kaart"
-
-#: 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 "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:341
-msgid "Default privacy group for new contacts"
-msgstr ""
-
-#: src/Model/Group.php:374
-msgid "Everybody"
-msgstr "Iedereen"
-
-#: src/Model/Group.php:394
-msgid "edit"
-msgstr "verander"
-
-#: src/Model/Group.php:418
-msgid "Edit group"
-msgstr "Verander groep"
-
-#: src/Model/Group.php:419
-msgid "Contacts not in any group"
-msgstr ""
-
-#: src/Model/Group.php:420
-msgid "Create a new group"
-msgstr "Maak nieuwe groep"
-
-#: src/Model/Group.php:422
-msgid "Edit groups"
-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:346
-msgid "An invitation is required."
-msgstr "Een uitnodiging is vereist."
-
-#: src/Model/User.php:350
-msgid "Invitation could not be verified."
-msgstr "Uitnodiging kon niet geverifieerd worden."
-
-#: src/Model/User.php:357
-msgid "Invalid OpenID url"
-msgstr "Ongeldige OpenID url"
-
-#: src/Model/User.php:370 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 ""
-
-#: src/Model/User.php:370 src/Module/Login.php:101
-msgid "The error message was:"
-msgstr "De foutboodschap was:"
-
-#: src/Model/User.php:376
-msgid "Please enter the required information."
-msgstr "Vul de vereiste informatie in."
-
-#: src/Model/User.php:389
-msgid "Please use a shorter name."
-msgstr "gebruik een kortere naam"
-
-#: src/Model/User.php:392
-msgid "Name too short."
-msgstr "Naam te kort"
-
-#: src/Model/User.php:400
-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:405
-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:409
-msgid "Not a valid email address."
-msgstr "Geen geldig e-mailadres."
-
-#: src/Model/User.php:413 src/Model/User.php:421
-msgid "Cannot use that email."
-msgstr "Ik kan die e-mail niet gebruiken."
-
-#: src/Model/User.php:428
-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:435 src/Model/User.php:491
-msgid "Nickname is already registered. Please choose another."
-msgstr "Bijnaam is al geregistreerd. Kies een andere."
-
-#: src/Model/User.php:445
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "ERNSTIGE FOUT: aanmaken van beveiligingssleutels mislukt."
-
-#: src/Model/User.php:478 src/Model/User.php:482
-msgid "An error occurred during registration. Please try again."
-msgstr ""
-
-#: src/Model/User.php:507
-msgid "An error occurred creating your default profile. Please try again."
-msgstr ""
-
-#: src/Model/User.php:514
-msgid "An error occurred creating your self contact. Please try again."
-msgstr ""
-
-#: src/Model/User.php:523
-msgid ""
-"An error occurred creating your default contact group. Please try again."
-msgstr ""
-
-#: src/Model/User.php:597
-#, 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:607
-#, php-format
-msgid "Registration at %s"
-msgstr "Registratie bij %s"
-
-#: src/Model/User.php:625
-#, 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:629
-#, 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/Contact.php:667
-msgid "Drop Contact"
-msgstr "Verwijder contact"
-
-#: src/Model/Contact.php:1101
-msgid "Organisation"
-msgstr "Organisatie"
-
-#: src/Model/Contact.php:1104
-msgid "News"
-msgstr "Nieuws"
-
-#: src/Model/Contact.php:1107
-msgid "Forum"
-msgstr "Forum"
-
-#: src/Model/Contact.php:1286
-msgid "Connect URL missing."
-msgstr "Connectie URL ontbreekt."
-
-#: 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 "Het contact kon niet toegevoegd worden. Gelieve de relevante netwerk gegevens na te kijken in Instellingen -> Sociale Netwerken."
-
-#: src/Model/Contact.php:1342
-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:1343 src/Model/Contact.php:1357
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "Er werden geen compatibele communicatieprotocols of feeds ontdekt."
-
-#: 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 ""
-
-#: src/Model/Contact.php:1366
-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:1367
-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: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 "Het was niet mogelijk informatie over dit contact op te halen."
-
-#: src/Model/Contact.php:1646 src/Protocol/DFRN.php:1513
-#, php-format
-msgid "%s's birthday"
-msgstr "%s's verjaardag"
-
-#: src/Model/Contact.php:1647 src/Protocol/DFRN.php:1514
-#, php-format
-msgid "Happy Birthday %s"
-msgstr "Gefeliciteerd %s"
-
-#: src/Model/Item.php:1884
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr ""
-
-#: src/Model/Item.php:1889
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr ""
-
-#: src/Model/Item.php:1894
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr ""
-
-#: src/Model/Profile.php:97
-msgid "Requested account is not available."
-msgstr "Gevraagde account is niet beschikbaar."
-
-#: src/Model/Profile.php:164 src/Model/Profile.php:395
-#: src/Model/Profile.php:857
-msgid "Edit profile"
-msgstr "Bewerk profiel"
-
-#: src/Model/Profile.php:332
-msgid "Atom feed"
-msgstr ""
-
-#: src/Model/Profile.php:368
-msgid "Manage/edit profiles"
-msgstr "Beheer/wijzig profielen"
-
-#: src/Model/Profile.php:546 src/Model/Profile.php:639
-msgid "g A l F d"
-msgstr "G l j F"
-
-#: src/Model/Profile.php:547
-msgid "F d"
-msgstr "d F"
-
-#: src/Model/Profile.php:604 src/Model/Profile.php:701
-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:688
-msgid "[No description]"
-msgstr "[Geen omschrijving]"
-
-#: src/Model/Profile.php:715
-msgid "Event Reminders"
-msgstr "Gebeurtenisherinneringen"
-
-#: src/Model/Profile.php:716
-msgid "Events this week:"
-msgstr "Gebeurtenissen deze week:"
-
-#: src/Model/Profile.php:739
-msgid "Member since:"
-msgstr "Lid sinds:"
-
-#: src/Model/Profile.php:747
-msgid "j F, Y"
-msgstr "F j Y"
-
-#: src/Model/Profile.php:748
-msgid "j F"
-msgstr "F j"
-
-#: src/Model/Profile.php:763
-msgid "Age:"
-msgstr "Leeftijd:"
-
-#: src/Model/Profile.php:776
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "voor %1$d %2$s"
-
-#: src/Model/Profile.php:800
-msgid "Religion:"
-msgstr "Religie:"
-
-#: src/Model/Profile.php:808
-msgid "Hobbies/Interests:"
-msgstr "Hobby:"
-
-#: src/Model/Profile.php:820
-msgid "Contact information and Social Networks:"
-msgstr "Contactinformatie en sociale netwerken:"
-
-#: src/Model/Profile.php:824
-msgid "Musical interests:"
-msgstr "Muzikale interesse "
-
-#: src/Model/Profile.php:828
-msgid "Books, literature:"
-msgstr "Boeken, literatuur:"
-
-#: src/Model/Profile.php:832
-msgid "Television:"
-msgstr "Televisie"
-
-#: src/Model/Profile.php:836
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/dans/cultuur/ontspanning:"
-
-#: src/Model/Profile.php:840
-msgid "Love/Romance:"
-msgstr "Liefde/romance:"
-
-#: src/Model/Profile.php:844
-msgid "Work/employment:"
-msgstr "Werk/beroep:"
-
-#: src/Model/Profile.php:848
-msgid "School/education:"
-msgstr "School/opleiding:"
-
-#: src/Model/Profile.php:853
-msgid "Forums:"
-msgstr ""
-
-#: src/Model/Profile.php:947
-msgid "Only You Can See This"
-msgstr "Alleen jij kunt dit zien"
-
-#: src/Protocol/Diaspora.php:2521
-msgid "Sharing notification from Diaspora network"
-msgstr "Deelt notificatie van het Diaspora netwerk"
-
-#: src/Protocol/Diaspora.php:3609
-msgid "Attachments:"
-msgstr "Bijlagen:"
-
-#: src/Protocol/OStatus.php:1798
-#, php-format
-msgid "%s is now following %s."
-msgstr "%s volgt nu %s."
-
-#: src/Protocol/OStatus.php:1799
-msgid "following"
-msgstr "volgend"
-
-#: src/Protocol/OStatus.php:1802
-#, php-format
-msgid "%s stopped following %s."
-msgstr "%s stopte %s te volgen."
-
-#: src/Protocol/OStatus.php:1803
-msgid "stopped following"
-msgstr ""
-
-#: src/Worker/Delivery.php:415
-msgid "(no subject)"
-msgstr "(geen onderwerp)"
-
-#: src/Module/Logout.php:28
-msgid "Logged out."
-msgstr "Uitgelogd."
-
-#: src/Module/Login.php:283
-msgid "Create a New Account"
-msgstr "Nieuwe account aanmaken"
-
-#: src/Module/Login.php:316
-msgid "Password: "
-msgstr "Wachtwoord:"
-
-#: src/Module/Login.php:317
-msgid "Remember me"
-msgstr "Onthou me"
-
-#: src/Module/Login.php:320
-msgid "Or login using OpenID: "
-msgstr "Of log in met OpenID:"
-
-#: src/Module/Login.php:326
-msgid "Forgot your password?"
-msgstr "Wachtwoord vergeten?"
-
-#: src/Module/Login.php:329
-msgid "Website Terms of Service"
-msgstr "Gebruikersvoorwaarden website"
-
-#: src/Module/Login.php:330
-msgid "terms of service"
-msgstr "servicevoorwaarden"
-
-#: src/Module/Login.php:332
-msgid "Website Privacy Policy"
-msgstr "Privacybeleid website"
-
-#: src/Module/Login.php:333
-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 ""
-
-#: 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 "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 ""
-
-#: src/Object/Post.php:128
-msgid "This entry was edited"
-msgstr ""
-
-#: src/Object/Post.php:187
-msgid "Remove from your stream"
-msgstr ""
-
-#: src/Object/Post.php:200
-msgid "save to folder"
-msgstr "Bewaren in map"
-
-#: src/Object/Post.php:243
-msgid "I will attend"
-msgstr "Ik zal er zijn"
-
-#: src/Object/Post.php:243
-msgid "I will not attend"
-msgstr "Ik zal er niet zijn"
-
-#: src/Object/Post.php:243
-msgid "I might attend"
-msgstr "Ik ga misschien"
-
-#: src/Object/Post.php:271
-msgid "add star"
-msgstr "ster toevoegen"
-
-#: src/Object/Post.php:272
-msgid "remove star"
-msgstr "ster verwijderen"
-
-#: src/Object/Post.php:273
-msgid "toggle star status"
-msgstr "ster toevoegen of verwijderen"
-
-#: src/Object/Post.php:276
-msgid "starred"
-msgstr "met ster"
-
-#: 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 "label toevoegen"
-
-#: src/Object/Post.php:304
-msgid "like"
-msgstr "leuk"
-
-#: src/Object/Post.php:305
-msgid "dislike"
-msgstr "niet leuk"
-
-#: src/Object/Post.php:308
-msgid "Share this"
-msgstr "Delen"
-
-#: src/Object/Post.php:308
-msgid "share"
-msgstr "Delen"
-
-#: src/Object/Post.php:373
-msgid "to"
-msgstr "aan"
-
-#: src/Object/Post.php:374
-msgid "via"
-msgstr "via"
-
-#: src/Object/Post.php:375
-msgid "Wall-to-Wall"
-msgstr "wall-to-wall"
-
-#: src/Object/Post.php:376
-msgid "via Wall-To-Wall:"
-msgstr "via wall-to-wall"
-
-#: src/Object/Post.php:435
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] "%d reactie"
-msgstr[1] "%d reacties"
-
-#: src/Object/Post.php:805
-msgid "Bold"
-msgstr "Vet"
-
-#: src/Object/Post.php:806
-msgid "Italic"
-msgstr "Cursief"
-
-#: src/Object/Post.php:807
-msgid "Underline"
-msgstr "Onderstrepen"
-
-#: src/Object/Post.php:808
-msgid "Quote"
-msgstr "Citeren"
-
-#: src/Object/Post.php:809
-msgid "Code"
-msgstr "Broncode"
-
-#: src/Object/Post.php:810
-msgid "Image"
-msgstr "Afbeelding"
-
-#: src/Object/Post.php:811
-msgid "Link"
-msgstr "Link"
-
-#: src/Object/Post.php:812
-msgid "Video"
-msgstr "Video"
-
-#: src/App.php:526
-msgid "Delete this item?"
-msgstr "Dit item verwijderen?"
-
-#: src/App.php:528
-msgid "show fewer"
-msgstr "Minder tonen"
-
-#: src/App.php:1117
-msgid "No system theme config value set."
-msgstr ""
-
-#: index.php:464
-msgid "toggle mobile"
-msgstr "mobiel thema omwisselen"
-
-#: update.php:193
-#, php-format
-msgid "%s: Updating author-id and owner-id in item and thread table. "
-msgstr ""
-
-#: boot.php:796
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Wijziging %s mislukt. Lees de error logbestanden."
+#: 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"
+
+#: src/Content/OEmbed.php:376
+msgid "Embedded content"
+msgstr "Ingebedde inhoud"
+
+#: 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"
diff --git a/view/lang/nl/strings.php b/view/lang/nl/strings.php
index de0f325fe..caaf48754 100644
--- a/view/lang/nl/strings.php
+++ b/view/lang/nl/strings.php
@@ -6,155 +6,6 @@ function string_plural_select_nl($n){
 	return ($n != 1);;
 }}
 ;
-$a->strings["Friendica Notification"] = "Friendica Notificatie";
-$a->strings["Thank You,"] = "Bedankt";
-$a->strings["%s Administrator"] = "%s Beheerder";
-$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Beheerder";
-$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Notificatie] Nieuw bericht ontvangen op %s";
-$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s sent you a new private message at %2\$s.";
-$a->strings["a private message"] = "een prive bericht";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s stuurde jou %2\$s.";
-$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bezoek %s om je privé-berichten te bekijken en/of te beantwoorden.";
-$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s gaf een reactie op [url=%2\$s]a %3\$s[/url]";
-$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s gaf een reactie op [url=%2\$s]%3\$s's %4\$s[/url]";
-$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s gaf een reactie op [url=%2\$s]jouw %3\$s[/url]";
-$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Notificatie] Reactie op gesprek #%1\$d door %2\$s";
-$a->strings["%s commented on an item/conversation you have been following."] = "%s gaf een reactie op een bericht/gesprek die jij volgt.";
-$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bezoek %s om het gesprek te bekijken en/of te beantwoorden.";
-$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Melding] %s plaatste een bericht op je tijdlijn";
-$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$splaatste een bericht op je tijdlijn op %2\$s";
-$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s schreef op [url=%2\$s]jouw tijdlijn[/url]";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notificatie] %s heeft jou genoemd";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s heeft jou in %2\$s genoemd";
-$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]heeft jou genoemd[/url].";
-$a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Melding] %s deelde een nieuw bericht";
-$a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s deelde een nieuw bericht op %2\$s";
-$a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]deelde een bericht[/url].";
-$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Melding] %1\$s heeft jou gepord";
-$a->strings["%1\$s poked you at %2\$s"] = "%1\$s heeft jou gepord op %2\$s";
-$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]porde jou[/url]";
-$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notificatie] %s heeft jouw bericht gelabeld";
-$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s heeft jouw bericht gelabeld in %2\$s";
-$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s labelde [url=%2\$s]jouw bericht[/url]";
-$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Notificatie] Vriendschaps-/connectieverzoek ontvangen";
-$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Je hebt een vriendschaps- of connectieverzoek ontvangen van '%1\$s' om %2\$s";
-$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Je ontving [url=%1\$s]een vriendschaps- of connectieverzoek[/url] van %2\$s.";
-$a->strings["You may visit their profile at %s"] = "Je kunt hun profiel bezoeken op %s";
-$a->strings["Please visit %s to approve or reject the introduction."] = "Bezoek %s om het verzoek goed of af te keuren.";
-$a->strings["[Friendica:Notify] A new person is sharing with you"] = "[Friendica:Melding]  Iemand nieuw deelt met jou.";
-$a->strings["%1\$s is sharing with you at %2\$s"] = "%1\$s deelt met jou in %2\$s";
-$a->strings["[Friendica:Notify] You have a new follower"] = "[Friendica:Melding] Je hebt een nieuwe volger";
-$a->strings["You have a new follower at %2\$s : %1\$s"] = "Je hebt een nieuwe volger op %2\$s: %1\$s";
-$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Melding] Vriendschapsvoorstel ontvangen";
-$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Je kreeg een vriendschapssuggestie van '%1\$s' op %2\$s";
-$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Je kreeg een [url=%1\$s]vriendschapssuggestie[/url] voor %2\$s op %3\$s.";
-$a->strings["Name:"] = "Naam:";
-$a->strings["Photo:"] = "Foto: ";
-$a->strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om de suggestie goed of af te keuren.";
-$a->strings["[Friendica:Notify] Connection accepted"] = "[Friendica:Melding] Verbinding aanvaard";
-$a->strings["'%1\$s' has accepted your connection request at %2\$s"] = "'%1\$s' aanvaarde je contactaanvraag op %2\$s";
-$a->strings["%2\$s has accepted your [url=%1\$s]connection request[/url]."] = "%2\$saanvaardde jouw [url=%1\$s]contactaanvraag[/url].";
-$a->strings["You are now mutual friends and may exchange status updates, photos, and email without restriction."] = "Jullie zijn nu in contact met elkaar en kunnen statusberichten, foto's en email delen zonder beperkingen.";
-$a->strings["Please visit %s if you wish to make any changes to this relationship."] = "Bezoek alstublieft %s als je deze relatie wil wijzigen.";
-$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' 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.";
-$a->strings["'%1\$s' may choose to extend this into a two-way or more permissive relationship in the future."] = "'%1\$s' kan er later voor kiezen om deze beperkingen aan te passen.";
-$a->strings["Please visit %s  if you wish to make any changes to this relationship."] = "Bezoek %s wanneer je deze relatie wil wijzigen.";
-$a->strings["[Friendica System Notify]"] = "[Friendica systeem notificatie]";
-$a->strings["registration request"] = "registratie verzoek";
-$a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Je kreeg een registratieaanvraag van '%1\$s' op %2\$s";
-$a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Je kreeg een [url=%1\$s]registratieaanvraag[/url] van %2\$s.";
-$a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"] = "Volledige naam:\t%1\$s\\nAdres van de site\t%2\$s\\nLoginnaam:\t%3\$s (%4\$s)";
-$a->strings["Please visit %s to approve or reject the request."] = "Bezoek %s om de aanvraag goed of af te keuren.";
-$a->strings["Welcome "] = "Welkom";
-$a->strings["Please upload a profile photo."] = "Upload een profielfoto.";
-$a->strings["Welcome back "] = "Welkom terug ";
-$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."] = "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.";
-$a->strings["newer"] = "nieuwere berichten";
-$a->strings["older"] = "oudere berichten";
-$a->strings["first"] = "eerste";
-$a->strings["prev"] = "vorige";
-$a->strings["next"] = "volgende";
-$a->strings["last"] = "laatste";
-$a->strings["Loading more entries..."] = "Meer berichten aan het laden...";
-$a->strings["The end"] = "Het einde";
-$a->strings["No contacts"] = "Geen contacten";
-$a->strings["%d Contact"] = [
-	0 => "%d contact",
-	1 => "%d contacten",
-];
-$a->strings["View Contacts"] = "Bekijk contacten";
-$a->strings["Save"] = "Bewaren";
-$a->strings["Follow"] = "Volg";
-$a->strings["Search"] = "Zoeken";
-$a->strings["@name, !forum, #tags, content"] = "@naam, !forum, #labels, inhoud";
-$a->strings["Full Text"] = "Volledige tekst";
-$a->strings["Tags"] = "Labels";
-$a->strings["Contacts"] = "Contacten";
-$a->strings["Forums"] = "Forums";
-$a->strings["poke"] = "por";
-$a->strings["poked"] = "porde";
-$a->strings["ping"] = "ping";
-$a->strings["pinged"] = "gepingd";
-$a->strings["prod"] = "porren";
-$a->strings["prodded"] = "gepord";
-$a->strings["slap"] = "slaan";
-$a->strings["slapped"] = "geslagen";
-$a->strings["finger"] = "finger";
-$a->strings["fingered"] = "gerfingerd";
-$a->strings["rebuff"] = "afpoeieren";
-$a->strings["rebuffed"] = "afgepoeierd";
-$a->strings["Monday"] = "Maandag";
-$a->strings["Tuesday"] = "Dinsdag";
-$a->strings["Wednesday"] = "Woensdag";
-$a->strings["Thursday"] = "Donderdag";
-$a->strings["Friday"] = "Vrijdag";
-$a->strings["Saturday"] = "Zaterdag";
-$a->strings["Sunday"] = "Zondag";
-$a->strings["January"] = "Januari";
-$a->strings["February"] = "Februari";
-$a->strings["March"] = "Maart";
-$a->strings["April"] = "April";
-$a->strings["May"] = "Mei";
-$a->strings["June"] = "Juni";
-$a->strings["July"] = "Juli";
-$a->strings["August"] = "Augustus";
-$a->strings["September"] = "September";
-$a->strings["October"] = "Oktober";
-$a->strings["November"] = "November";
-$a->strings["December"] = "December";
-$a->strings["Mon"] = "Maa";
-$a->strings["Tue"] = "Din";
-$a->strings["Wed"] = "Woe";
-$a->strings["Thu"] = "Don";
-$a->strings["Fri"] = "Vrij";
-$a->strings["Sat"] = "Zat";
-$a->strings["Sun"] = "Zon";
-$a->strings["Jan"] = "Jan";
-$a->strings["Feb"] = "Feb";
-$a->strings["Mar"] = "Maa";
-$a->strings["Apr"] = "Apr";
-$a->strings["Jul"] = "Jul";
-$a->strings["Aug"] = "Aug";
-$a->strings["Sep"] = "Sep";
-$a->strings["Oct"] = "Okt";
-$a->strings["Nov"] = "Nov";
-$a->strings["Dec"] = "Dec";
-$a->strings["Content warning: %s"] = "Waarschuwing inhoud: %s";
-$a->strings["View Video"] = "Bekijk Video";
-$a->strings["bytes"] = "bytes";
-$a->strings["Click to open/close"] = "klik om te openen/sluiten";
-$a->strings["View on separate page"] = "Bekijk op aparte pagina";
-$a->strings["view on separate page"] = "bekijk op aparte pagina";
-$a->strings["link to source"] = "Verwijzing naar bron";
-$a->strings["event"] = "gebeurtenis";
-$a->strings["photo"] = "foto";
-$a->strings["activity"] = "activiteit";
-$a->strings["comment"] = [
-	0 => "reactie",
-	1 => "reacties",
-];
-$a->strings["post"] = "bericht";
-$a->strings["Item filed"] = "Item bewaard";
 $a->strings["Daily posting limit of %d post reached. The post was rejected."] = [
 	0 => "De dagelijkse limiet van %d bericht is bereikt. Dit bericht werd niet aanvaard.",
 	1 => "De dagelijkse limiet van %d berichten is bereikt.  Dit bericht werd niet aanvaard.",
@@ -165,7 +16,9 @@ $a->strings["Weekly posting limit of %d post reached. The post was rejected."] =
 ];
 $a->strings["Monthly posting limit of %d post reached. The post was rejected."] = "De maandelijkse limiet van %d berichten is bereikt.  Dit bericht werd niet aanvaard.";
 $a->strings["Profile Photos"] = "Profielfoto's";
+$a->strings["event"] = "gebeurtenis";
 $a->strings["status"] = "status";
+$a->strings["photo"] = "foto";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s vindt het %3\$s van %2\$s leuk";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s vindt het %3\$s van %2\$s niet leuk";
 $a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$s neemt deel aan %2\$ss %3\$s deel";
@@ -273,37 +126,164 @@ $a->strings["Undecided"] = [
 	0 => "Onbeslist",
 	1 => "Onbeslist",
 ];
+$a->strings["Friendica Notification"] = "Friendica Notificatie";
+$a->strings["Thank You,"] = "Bedankt";
+$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Beheerder";
+$a->strings["%s Administrator"] = "%s Beheerder";
+$a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Notificatie] Nieuw bericht ontvangen op %s";
+$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s sent you a new private message at %2\$s.";
+$a->strings["a private message"] = "een prive bericht";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s stuurde jou %2\$s.";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bezoek %s om je privé-berichten te bekijken en/of te beantwoorden.";
+$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s gaf een reactie op [url=%2\$s]a %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s gaf een reactie op [url=%2\$s]%3\$s's %4\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s gaf een reactie op [url=%2\$s]jouw %3\$s[/url]";
+$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica:Notificatie] Reactie op gesprek #%1\$d door %2\$s";
+$a->strings["%s commented on an item/conversation you have been following."] = "%s gaf een reactie op een bericht/gesprek die jij volgt.";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bezoek %s om het gesprek te bekijken en/of te beantwoorden.";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Melding] %s plaatste een bericht op je tijdlijn";
+$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$splaatste een bericht op je tijdlijn op %2\$s";
+$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s schreef op [url=%2\$s]jouw tijdlijn[/url]";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notificatie] %s heeft jou genoemd";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s heeft jou in %2\$s genoemd";
+$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]heeft jou genoemd[/url].";
+$a->strings["[Friendica:Notify] %s shared a new post"] = "[Friendica:Melding] %s deelde een nieuw bericht";
+$a->strings["%1\$s shared a new post at %2\$s"] = "%1\$s deelde een nieuw bericht op %2\$s";
+$a->strings["%1\$s [url=%2\$s]shared a post[/url]."] = "%1\$s [url=%2\$s]deelde een bericht[/url].";
+$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Melding] %1\$s heeft jou gepord";
+$a->strings["%1\$s poked you at %2\$s"] = "%1\$s heeft jou gepord op %2\$s";
+$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s [url=%2\$s]porde jou[/url]";
+$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notificatie] %s heeft jouw bericht gelabeld";
+$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s heeft jouw bericht gelabeld in %2\$s";
+$a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s labelde [url=%2\$s]jouw bericht[/url]";
+$a->strings["[Friendica:Notify] Introduction received"] = "[Friendica:Notificatie] Vriendschaps-/connectieverzoek ontvangen";
+$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Je hebt een vriendschaps- of connectieverzoek ontvangen van '%1\$s' om %2\$s";
+$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Je ontving [url=%1\$s]een vriendschaps- of connectieverzoek[/url] van %2\$s.";
+$a->strings["You may visit their profile at %s"] = "Je kunt hun profiel bezoeken op %s";
+$a->strings["Please visit %s to approve or reject the introduction."] = "Bezoek %s om het verzoek goed of af te keuren.";
+$a->strings["[Friendica:Notify] A new person is sharing with you"] = "[Friendica:Melding]  Iemand nieuw deelt met jou.";
+$a->strings["%1\$s is sharing with you at %2\$s"] = "%1\$s deelt met jou in %2\$s";
+$a->strings["[Friendica:Notify] You have a new follower"] = "[Friendica:Melding] Je hebt een nieuwe volger";
+$a->strings["You have a new follower at %2\$s : %1\$s"] = "Je hebt een nieuwe volger op %2\$s: %1\$s";
+$a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica:Melding] Vriendschapsvoorstel ontvangen";
+$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Je kreeg een vriendschapssuggestie van '%1\$s' op %2\$s";
+$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Je kreeg een [url=%1\$s]vriendschapssuggestie[/url] voor %2\$s op %3\$s.";
+$a->strings["Name:"] = "Naam:";
+$a->strings["Photo:"] = "Foto: ";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "Bezoek %s om de suggestie goed of af te keuren.";
+$a->strings["[Friendica:Notify] Connection accepted"] = "[Friendica:Melding] Verbinding aanvaard";
+$a->strings["'%1\$s' has accepted your connection request at %2\$s"] = "'%1\$s' aanvaarde je contactaanvraag op %2\$s";
+$a->strings["%2\$s has accepted your [url=%1\$s]connection request[/url]."] = "%2\$saanvaardde jouw [url=%1\$s]contactaanvraag[/url].";
+$a->strings["You are now mutual friends and may exchange status updates, photos, and email without restriction."] = "Jullie zijn nu in contact met elkaar en kunnen statusberichten, foto's en email delen zonder beperkingen.";
+$a->strings["Please visit %s if you wish to make any changes to this relationship."] = "Bezoek alstublieft %s als je deze relatie wil wijzigen.";
+$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' 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.";
+$a->strings["'%1\$s' may choose to extend this into a two-way or more permissive relationship in the future."] = "'%1\$s' kan er later voor kiezen om deze beperkingen aan te passen.";
+$a->strings["Please visit %s  if you wish to make any changes to this relationship."] = "Bezoek %s wanneer je deze relatie wil wijzigen.";
+$a->strings["[Friendica System Notify]"] = "[Friendica systeem notificatie]";
+$a->strings["registration request"] = "registratie verzoek";
+$a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Je kreeg een registratieaanvraag van '%1\$s' op %2\$s";
+$a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Je kreeg een [url=%1\$s]registratieaanvraag[/url] van %2\$s.";
+$a->strings["Full Name:\t%s\nSite Location:\t%s\nLogin Name:\t%s (%s)"] = "Volledige naam:\t%s\nAdres van de site:\t%s\nLoginnaam:\t%s (%s)";
+$a->strings["Please visit %s to approve or reject the request."] = "Bezoek %s om de aanvraag goed of af te keuren.";
 $a->strings["Item not found."] = "Item niet gevonden.";
 $a->strings["Do you really want to delete this item?"] = "Wil je echt dit item verwijderen?";
 $a->strings["Yes"] = "Ja";
 $a->strings["Permission denied."] = "Toegang geweigerd";
 $a->strings["Archives"] = "Archieven";
 $a->strings["show more"] = "toon meer";
-$a->strings["No friends to display."] = "Geen vrienden om te laten zien.";
-$a->strings["Connect"] = "Verbinden";
-$a->strings["Authorize application connection"] = "Verbinding met de applicatie goedkeuren";
-$a->strings["Return to your app and insert this Securty Code:"] = "Keer terug naar jouw app en voeg deze beveiligingscode in:";
-$a->strings["Please login to continue."] = "Log in om verder te gaan.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Wil je deze toepassing toestemming geven om jouw berichten en contacten in te kijken, en/of nieuwe berichten in jouw plaats aan te maken?";
-$a->strings["No"] = "Nee";
+$a->strings["Welcome "] = "Welkom";
+$a->strings["Please upload a profile photo."] = "Upload een profielfoto.";
+$a->strings["Welcome back "] = "Welkom terug ";
+$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."] = "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.";
+$a->strings["newer"] = "nieuwere berichten";
+$a->strings["older"] = "oudere berichten";
+$a->strings["first"] = "eerste";
+$a->strings["prev"] = "vorige";
+$a->strings["next"] = "volgende";
+$a->strings["last"] = "laatste";
+$a->strings["Loading more entries..."] = "Meer berichten aan het laden...";
+$a->strings["The end"] = "Het einde";
+$a->strings["No contacts"] = "Geen contacten";
+$a->strings["%d Contact"] = [
+	0 => "%d contact",
+	1 => "%d contacten",
+];
+$a->strings["View Contacts"] = "Bekijk contacten";
+$a->strings["Save"] = "Bewaren";
+$a->strings["Follow"] = "Volg";
+$a->strings["Search"] = "Zoeken";
+$a->strings["@name, !forum, #tags, content"] = "@naam, !forum, #labels, inhoud";
+$a->strings["Full Text"] = "Volledige tekst";
+$a->strings["Tags"] = "Labels";
+$a->strings["Contacts"] = "Contacten";
+$a->strings["Forums"] = "Forums";
+$a->strings["poke"] = "por";
+$a->strings["poked"] = "porde";
+$a->strings["ping"] = "ping";
+$a->strings["pinged"] = "gepingd";
+$a->strings["prod"] = "porren";
+$a->strings["prodded"] = "gepord";
+$a->strings["slap"] = "slaan";
+$a->strings["slapped"] = "geslagen";
+$a->strings["finger"] = "finger";
+$a->strings["fingered"] = "gerfingerd";
+$a->strings["rebuff"] = "afpoeieren";
+$a->strings["rebuffed"] = "afgepoeierd";
+$a->strings["Monday"] = "Maandag";
+$a->strings["Tuesday"] = "Dinsdag";
+$a->strings["Wednesday"] = "Woensdag";
+$a->strings["Thursday"] = "Donderdag";
+$a->strings["Friday"] = "Vrijdag";
+$a->strings["Saturday"] = "Zaterdag";
+$a->strings["Sunday"] = "Zondag";
+$a->strings["January"] = "Januari";
+$a->strings["February"] = "Februari";
+$a->strings["March"] = "Maart";
+$a->strings["April"] = "April";
+$a->strings["May"] = "Mei";
+$a->strings["June"] = "Juni";
+$a->strings["July"] = "Juli";
+$a->strings["August"] = "Augustus";
+$a->strings["September"] = "September";
+$a->strings["October"] = "Oktober";
+$a->strings["November"] = "November";
+$a->strings["December"] = "December";
+$a->strings["Mon"] = "Maa";
+$a->strings["Tue"] = "Din";
+$a->strings["Wed"] = "Woe";
+$a->strings["Thu"] = "Don";
+$a->strings["Fri"] = "Vrij";
+$a->strings["Sat"] = "Zat";
+$a->strings["Sun"] = "Zon";
+$a->strings["Jan"] = "Jan";
+$a->strings["Feb"] = "Feb";
+$a->strings["Mar"] = "Maa";
+$a->strings["Apr"] = "Apr";
+$a->strings["Jul"] = "Jul";
+$a->strings["Aug"] = "Aug";
+$a->strings["Sep"] = "Sep";
+$a->strings["Oct"] = "Okt";
+$a->strings["Nov"] = "Nov";
+$a->strings["Dec"] = "Dec";
+$a->strings["Content warning: %s"] = "Waarschuwing inhoud: %s";
+$a->strings["View Video"] = "Bekijk Video";
+$a->strings["bytes"] = "bytes";
+$a->strings["Click to open/close"] = "klik om te openen/sluiten";
+$a->strings["View on separate page"] = "Bekijk op aparte pagina";
+$a->strings["view on separate page"] = "bekijk op aparte pagina";
+$a->strings["link to source"] = "Verwijzing naar bron";
+$a->strings["activity"] = "activiteit";
+$a->strings["comment"] = [
+	0 => "reactie",
+	1 => "reacties",
+];
+$a->strings["post"] = "bericht";
+$a->strings["Item filed"] = "Item bewaard";
 $a->strings["You must be logged in to use addons. "] = "Je moet ingelogd zijn om deze addons te kunnen gebruiken. ";
 $a->strings["Applications"] = "Toepassingen";
 $a->strings["No installed applications."] = "Geen toepassingen geïnstalleerd";
-$a->strings["Item not available."] = "Item niet beschikbaar";
-$a->strings["Item was not found."] = "Item niet gevonden";
-$a->strings["No contacts in common."] = "Geen gedeelde contacten.";
-$a->strings["Common Friends"] = "Gedeelde Vrienden";
 $a->strings["Credits"] = "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 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!";
-$a->strings["Photos"] = "Foto's";
-$a->strings["Contact Photos"] = "Contactfoto's";
-$a->strings["Upload"] = "Uploaden";
-$a->strings["Files"] = "Bestanden";
-$a->strings["Not Found"] = "Niet gevonden";
-$a->strings["No profile"] = "Geen profiel";
-$a->strings["Welcome to %s"] = "Welkom op %s";
-$a->strings["Remote privacy information not available."] = "Privacyinformatie op afstand niet beschikbaar.";
-$a->strings["Visible to:"] = "Zichtbaar voor:";
 $a->strings["System down for maintenance"] = "Systeem onbeschikbaar wegens onderhoud";
 $a->strings["Welcome to Friendica"] = "Welkom bij Friendica";
 $a->strings["New Member Checklist"] = "Checklist voor nieuwe leden";
@@ -339,41 +319,6 @@ $a->strings["Friendica respects your privacy. By default, your posts will only s
 $a->strings["Getting Help"] = "Hulp krijgen";
 $a->strings["Go to the Help Section"] = "Ga naar de help";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Je kunt onze <strong>help</strong> pagina's raadplegen voor gedetailleerde informatie over andere functies van dit programma.";
-$a->strings["Visit %s's profile [%s]"] = "Bekijk het profiel van %s [%s]";
-$a->strings["Edit contact"] = "Contact bewerken";
-$a->strings["Contacts who are not members of a group"] = "Contacten die geen leden zijn van een groep";
-$a->strings["Not Extended"] = "";
-$a->strings["Resubscribing to OStatus contacts"] = "";
-$a->strings["Error"] = "Fout";
-$a->strings["Done"] = "Klaar";
-$a->strings["Keep this window open until done."] = "Houd dit scherm open tot het klaar is";
-$a->strings["Do you really want to delete this suggestion?"] = "Wil je echt dit voorstel verwijderen?";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Geen voorstellen beschikbaar. Als dit een nieuwe website is, kun je het over 24 uur nog eens proberen.";
-$a->strings["Ignore/Hide"] = "Negeren/Verbergen";
-$a->strings["Friend Suggestions"] = "Vriendschapsvoorstellen";
-$a->strings["[Embedded content - reload page to view]"] = "[Ingebedde inhoud - herlaad pagina om het te bekijken]";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Deze website heeft het toegelaten dagelijkse aantal registraties overschreden. Probeer morgen opnieuw.";
-$a->strings["Import"] = "Importeren";
-$a->strings["Move account"] = "Account verplaatsen";
-$a->strings["You can import an account from another Friendica server."] = "Je kunt een account van een andere Friendica server importeren.";
-$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."] = "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.";
-$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "";
-$a->strings["Account file"] = "Account bestand";
-$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Om je account te exporteren, ga naar \"Instellingen->Exporteer je persoonlijke data\" en selecteer \"Exporteer account\"";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "Geen sleutelwoorden om te zoeken. Voeg sleutelwoorden toe aan je standaard profiel.";
-$a->strings["is interested in:"] = "Is geïnteresseerd in:";
-$a->strings["Profile Match"] = "Profielmatch";
-$a->strings["No matches"] = "Geen resultaten";
-$a->strings["Manage Identities and/or Pages"] = "Beheer Identiteiten en/of Pagina's";
-$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wissel tussen verschillende identiteiten of forum/groeppagina's die jouw accountdetails delen of waar je \"beheerdersrechten\" hebt gekregen.";
-$a->strings["Select an identity to manage: "] = "Selecteer een identiteit om te beheren:";
-$a->strings["Submit"] = "Opslaan";
-$a->strings["Invalid request."] = "";
-$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "";
-$a->strings["Or - did you try to upload an empty file?"] = "";
-$a->strings["File exceeds size limit of %s"] = "";
-$a->strings["File upload failed."] = "Uploaden van bestand mislukt.";
-$a->strings["- select -"] = "- Kies -";
 $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
 $a->strings["Time Conversion"] = "Tijdsconversie";
 $a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica biedt deze dienst aan om gebeurtenissen te delen met andere netwerken en vrienden in onbekende tijdzones.";
@@ -381,87 +326,508 @@ $a->strings["UTC time: %s"] = "UTC tijd: %s";
 $a->strings["Current timezone: %s"] = "Huidige Tijdzone: %s";
 $a->strings["Converted localtime: %s"] = "Omgerekende lokale tijd: %s";
 $a->strings["Please select your timezone:"] = "Selecteer je tijdzone:";
-$a->strings["No more system notifications."] = "Geen systeemnotificaties meer.";
-$a->strings["System Notifications"] = "Systeemnotificaties";
-$a->strings["{0} wants to be your friend"] = "{0} wilt je vriend worden";
-$a->strings["{0} sent you a message"] = "{0} stuurde jou een bericht";
-$a->strings["{0} requested registration"] = "{0} vroeg om zich te registreren";
-$a->strings["Poke/Prod"] = "Aanstoten/porren";
-$a->strings["poke, prod or do other things to somebody"] = "aanstoten, porren of andere dingen met iemand doen";
-$a->strings["Recipient"] = "Ontvanger";
-$a->strings["Choose what you wish to do to recipient"] = "Kies wat je met de ontvanger wil doen";
-$a->strings["Make this post private"] = "Dit bericht privé maken";
+$a->strings["Submit"] = "Opslaan";
 $a->strings["Public access denied."] = "Niet vrij toegankelijk";
-$a->strings["Only logged in users are permitted to perform a probing."] = "";
-$a->strings["Permission denied"] = "Toegang geweigerd";
-$a->strings["Invalid profile identifier."] = "Ongeldige profiel-identificatie.";
-$a->strings["Profile Visibility Editor"] = "";
-$a->strings["Click on a contact to add or remove."] = "Klik op een contact om het toe te voegen of te verwijderen.";
-$a->strings["Visible To"] = "Zichtbaar voor";
-$a->strings["All Contacts (with secure profile access)"] = "Alle contacten (met veilige profieltoegang)";
-$a->strings["Account approved."] = "Account goedgekeurd.";
-$a->strings["Registration revoked for %s"] = "Registratie ingetrokken voor %s";
-$a->strings["Please login."] = "Inloggen.";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s volgt %3\$s van %2\$s";
-$a->strings["Tag removed"] = "Label verwijderd";
-$a->strings["Remove Item Tag"] = "Verwijder label van item";
-$a->strings["Select a tag to remove: "] = "Selecteer een label om te verwijderen: ";
-$a->strings["Remove"] = "Verwijderen";
-$a->strings["Export account"] = "Account exporteren";
-$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."] = "Je account informatie en contacten exporteren. Gebruik dit om een backup van je account te maken en/of om het te verhuizen naar een andere server.";
-$a->strings["Export all"] = "Alles exporteren";
-$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)"] = "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)";
-$a->strings["Export personal data"] = "Persoonlijke gegevens exporteren";
-$a->strings["No contacts."] = "Geen contacten.";
-$a->strings["Access denied."] = "Toegang geweigerd";
-$a->strings["Image exceeds size limit of %s"] = "";
-$a->strings["Unable to process image."] = "Niet in staat om de afbeelding te verwerken";
-$a->strings["Wall Photos"] = "";
-$a->strings["Image upload failed."] = "Uploaden van afbeelding mislukt.";
-$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "";
-$a->strings["No recipient selected."] = "Geen ontvanger geselecteerd.";
-$a->strings["Unable to check your home location."] = "Niet in staat om je tijdlijn-locatie vast te stellen";
-$a->strings["Message could not be sent."] = "Bericht kon niet verzonden worden.";
-$a->strings["Message collection failure."] = "Fout bij het verzamelen van berichten.";
-$a->strings["Message sent."] = "Bericht verzonden.";
-$a->strings["No recipient."] = "Geen ontvanger.";
-$a->strings["Send Private Message"] = "Verstuur privébericht";
-$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Als je wilt dat %s antwoordt moet je nakijken dat de privacy-instellingen op jouw website privéberichten van onbekende afzenders toelaat.";
-$a->strings["To:"] = "Aan:";
-$a->strings["Subject:"] = "Onderwerp:";
-$a->strings["Your message:"] = "Jouw bericht:";
+$a->strings["Only logged in users are permitted to perform a probing."] = "Alleen ingelogde gebruikers hebben toelating om aan probing te doen.";
+$a->strings["Subscribing to OStatus contacts"] = "Inschrijven bij OStatus contacten";
+$a->strings["No contact provided."] = "Geen contact opgegeven.";
+$a->strings["Couldn't fetch information for contact."] = "Kon de informatie voor het contact niet ophalen.";
+$a->strings["Couldn't fetch friends for contact."] = "Kon de vrienden van contact niet ophalen.";
+$a->strings["Done"] = "Klaar";
+$a->strings["success"] = "Succesvol";
+$a->strings["failed"] = "Mislukt";
+$a->strings["ignored"] = "Verboden";
+$a->strings["Keep this window open until done."] = "Houd dit scherm open tot het klaar is";
+$a->strings["Source input"] = "Bron input";
+$a->strings["BBCode::toPlaintext"] = "BBCode::toPlaintext";
+$a->strings["BBCode::convert (raw HTML)"] = "BBCode::convert (raw HTML)";
+$a->strings["BBCode::convert"] = "BBCode::convert";
+$a->strings["BBCode::convert => HTML::toBBCode"] = "BBCode::convert => HTML::toBBCode";
+$a->strings["BBCode::toMarkdown"] = "BBCode::toMarkdown";
+$a->strings["BBCode::toMarkdown => Markdown::convert"] = "BBCode::toMarkdown => Markdown::convert";
+$a->strings["BBCode::toMarkdown => Markdown::toBBCode"] = "BBCode::toMarkdown => Markdown::toBBCode";
+$a->strings["BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"] = "BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode";
+$a->strings["Source input \\x28Diaspora format\\x29"] = "Bron input \\x28Diaspora formaat\\x29";
+$a->strings["Markdown::toBBCode"] = "Markdown::toBBCode";
+$a->strings["Raw HTML input"] = "Onverwerkte HTML input";
+$a->strings["HTML Input"] = "HTML Input";
+$a->strings["HTML::toBBCode"] = "HTML::toBBCode";
+$a->strings["HTML::toPlaintext"] = "HTML::toPlaintext";
+$a->strings["Source text"] = "Brontekst";
+$a->strings["BBCode"] = "BBCode";
+$a->strings["Markdown"] = "Markdown";
+$a->strings["HTML"] = "HTML";
+$a->strings["[Embedded content - reload page to view]"] = "[Ingebedde inhoud - herlaad pagina om het te bekijken]";
 $a->strings["Login"] = "Login";
-$a->strings["The post was created"] = "";
-$a->strings["Item not found"] = "Item niet gevonden";
-$a->strings["Edit post"] = "Bericht bewerken";
-$a->strings["CC: email addresses"] = "CC: e-mailadressen";
-$a->strings["Example: bob@example.com, mary@example.com"] = "Voorbeeld: bob@voorbeeld.nl, an@voorbeeld.be";
-$a->strings["Contact not found."] = "Contact niet gevonden";
-$a->strings["Friend suggestion sent."] = "Vriendschapsvoorstel verzonden.";
-$a->strings["Suggest Friends"] = "Stel vrienden voor";
-$a->strings["Suggest a friend for %s"] = "Stel een vriend voor aan %s";
+$a->strings["The post was created"] = "Het bericht is aangemaakt";
+$a->strings["- select -"] = "- Kies -";
+$a->strings["Help:"] = "Help:";
+$a->strings["Help"] = "Help";
+$a->strings["Not Found"] = "Niet gevonden";
+$a->strings["Page not found."] = "Pagina niet gevonden";
+$a->strings["Welcome to %s"] = "Welkom op %s";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Deze website heeft het toegelaten dagelijkse aantal registraties overschreden. Probeer morgen opnieuw.";
+$a->strings["Import"] = "Importeren";
+$a->strings["Move account"] = "Account verplaatsen";
+$a->strings["You can import an account from another Friendica server."] = "Je kunt een account van een andere Friendica server importeren.";
+$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."] = "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.";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Dit feature is experimenteel. We kunnen contacten van het OStatus netwerk (GNU Social/Statusnet) of van Diaspora niet importeren.";
+$a->strings["Account file"] = "Account bestand";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Om je account te exporteren, ga naar \"Instellingen->Exporteer je persoonlijke data\" en selecteer \"Exporteer account\"";
+$a->strings["Theme settings updated."] = "Thema-instellingen opgeslagen";
+$a->strings["Information"] = "Informatie";
+$a->strings["Overview"] = "Overzicht";
+$a->strings["Federation Statistics"] = "Federatie Statistieken";
+$a->strings["Configuration"] = "Configuratie";
+$a->strings["Site"] = "Website";
+$a->strings["Users"] = "Gebruiker";
+$a->strings["Addons"] = "Addons";
+$a->strings["Themes"] = "Thema's";
+$a->strings["Additional features"] = "Extra functies";
+$a->strings["Terms of Service"] = "Gebruiksvoorwaarden";
+$a->strings["Database"] = "Database";
+$a->strings["DB updates"] = "DB aanpassingen";
+$a->strings["Inspect Queue"] = "Wachtrij Inspecteren";
+$a->strings["Inspect worker Queue"] = "Taakwachtrij inspecteren";
+$a->strings["Tools"] = "Hulpmiddelen";
+$a->strings["Contact Blocklist"] = "Contact Blokkeerlijst";
+$a->strings["Server Blocklist"] = "Server Blokkeerlijst";
+$a->strings["Delete Item"] = "Verwijder Item";
+$a->strings["Logs"] = "Logs";
+$a->strings["View Logs"] = "Bekijk Logs";
+$a->strings["Diagnostics"] = "Diagnostiek";
+$a->strings["PHP Info"] = "PHP Info";
+$a->strings["probe address"] = "probe adres";
+$a->strings["check webfinger"] = "check webfinger";
+$a->strings["Admin"] = "Beheer";
+$a->strings["Addon Features"] = "Addon Features";
+$a->strings["User registrations waiting for confirmation"] = "Gebruikersregistraties wachten op bevestiging";
+$a->strings["Administration"] = "Beheer";
+$a->strings["Display Terms of Service"] = "Toon Gebruiksvoorwaarden";
+$a->strings["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."] = "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.";
+$a->strings["Display Privacy Statement"] = "Toon Privacy Verklaring";
+$a->strings["Show some informations regarding the needed information to operate the node according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."] = "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).";
+$a->strings["Privacy Statement Preview"] = "Privacy Verklaring Voorbeeldweergave";
+$a->strings["The Terms of Service"] = "De Gebruiksvoorwaarden";
+$a->strings["Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below."] = "Geef hier de Gebruiksvoorwaarden van je node op. Je kan BBCode gebruiken. Sectie headers moeten [h2] zijn of lager.";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Blocked domain"] = "Domein geblokeerd";
+$a->strings["The blocked domain"] = "Het geblokkeerde domein";
+$a->strings["Reason for the block"] = "Reden van de blokkering";
+$a->strings["The reason why you blocked this domain."] = "De reden waarom je dit domein geblokkeerd hebt.";
+$a->strings["Delete domain"] = "Verwijder domein";
+$a->strings["Check to delete this entry from the blocklist"] = "Vink aan om dit item van de blokkeerlijst te verwijderen";
+$a->strings["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."] = "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.";
+$a->strings["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."] = "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.";
+$a->strings["Add new entry to block list"] = "Voeg nieuw item toe aan de blokkeerlijst";
+$a->strings["Server Domain"] = "Server Domein";
+$a->strings["The domain of the new server to add to the block list. Do not include the protocol."] = "Het domein van de nieuwe server om toe te voegen aan de blokkeerlijst. Laat het protocol weg.";
+$a->strings["Block reason"] = "Reden voor blokkering";
+$a->strings["Add Entry"] = "Voeg Item toe";
+$a->strings["Save changes to the blocklist"] = "Sla veranderingen in de blokkeerlijst op";
+$a->strings["Current Entries in the Blocklist"] = "Huidige Items in de blokkeerlijst";
+$a->strings["Delete entry from blocklist"] = "Verwijder item uit de blokkeerlijst";
+$a->strings["Delete entry from blocklist?"] = "Item verwijderen uit de blokkeerlijst?";
+$a->strings["Server added to blocklist."] = "Server toegevoegd aan blokkeerlijst.";
+$a->strings["Site blocklist updated."] = "Site blokkeerlijst opgeslagen";
+$a->strings["The contact has been blocked from the node"] = "Het contact is geblokkeerd van deze node";
+$a->strings["Could not find any contact entry for this URL (%s)"] = "Kon geen contact vinden op deze URL (%s)";
+$a->strings["%s contact unblocked"] = [
+	0 => "%s contact is niet langer geblokkeerd",
+	1 => "%s contacten zijn niet langer geblokkeerd",
+];
+$a->strings["Remote Contact Blocklist"] = "Remote Contact Blokkeerlijst";
+$a->strings["This page allows you to prevent any message from a remote contact to reach your node."] = "De pagina laat je toe om te vermijden dat boodschappen van een remote contact je node bereiken.";
+$a->strings["Block Remote Contact"] = "Blokkeer Remote Contact";
+$a->strings["select all"] = "Alles selecteren";
+$a->strings["select none"] = "selecteer geen";
+$a->strings["Block"] = "Blokkeren";
+$a->strings["Unblock"] = "Blokkering opheffen";
+$a->strings["No remote contact is blocked from this node."] = "Geen enkel remote contact is geblokkeerd van deze node.";
+$a->strings["Blocked Remote Contacts"] = "Geblokkeerde Remote Contacts";
+$a->strings["Block New Remote Contact"] = "Blokkeer Nieuwe Remote Contacten";
+$a->strings["Photo"] = "Foto";
+$a->strings["Name"] = "Naam";
+$a->strings["Address"] = "Adres";
+$a->strings["Profile URL"] = "Profiel url";
+$a->strings["%s total blocked contact"] = [
+	0 => "%s geblokkeerde contacten in totaal",
+	1 => "%s geblokkeerde contacten in totaal",
+];
+$a->strings["URL of the remote contact to block."] = "URL van de remote contact die je wil blokkeren.";
+$a->strings["Delete this Item"] = "Verwijder dit Item";
+$a->strings["On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted."] = "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.";
+$a->strings["You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456."] = "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.";
+$a->strings["GUID"] = "GUID";
+$a->strings["The GUID of the item you want to delete."] = "De GUID van het item dat je wil verwijderen.";
+$a->strings["Item marked for deletion."] = "Item gemarkeerd om te verwijderen.";
+$a->strings["unknown"] = "onbekend";
+$a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "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.";
+$a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "Het <em>Automatisch Achterhaalde Contact Gids</em> feature is niet geactiveerd, het zal de hier getoonde informatie verbeteren.";
+$a->strings["Currently this node is aware of %d nodes with %d registered users from the following platforms:"] = "Op dit moment kent deze node %d nodes met %d geregistreerde gebruikers op basis van de volgende patformen:";
+$a->strings["ID"] = "ID";
+$a->strings["Recipient Name"] = "Naam van de Ontvanger";
+$a->strings["Recipient Profile"] = "Profiel van de Ontvanger";
+$a->strings["Network"] = "Netwerk";
+$a->strings["Created"] = "Aangemaakt";
+$a->strings["Last Tried"] = "Laatste poging";
+$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."] = "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.";
+$a->strings["Inspect Worker Queue"] = "Taakwachtrij inspecteren";
+$a->strings["Job Parameters"] = "Taak parameters";
+$a->strings["Priority"] = "Prioriteit";
+$a->strings["This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you've set up during install."] = "Deze pagina toont alle taken in de wachtrij. Deze taken worden behandeld door de geplande taak die je hebt ingesteld tijdens installatie.";
+$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 />"] = "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 />";
+$a->strings["There is a new version of Friendica available for download. Your current version is %1\$s, upstream version is %2\$s"] = "Er is een nieuwe versie van Friendica beschikbaar om te downloaden. Je huidige versie is %1\$s, upstream versie is %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."] = "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.";
+$a->strings["The worker was never executed. Please check your database structure!"] = "De worker werd nooit uitgevoerd. Best je database structuur eens nakijken!";
+$a->strings["The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings."] = "De laatste worker uitvoering was op %s UTC. Dit is langer dan 1 uur geleden. Best je crontab instellingen nakijken.";
+$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."] = "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.";
+$a->strings["Normal Account"] = "Normaal account";
+$a->strings["Automatic Follower Account"] = "Automatische Volger Account";
+$a->strings["Public Forum Account"] = "Publiek Forum account";
+$a->strings["Automatic Friend Account"] = "Automatisch Vriendschapsaccount";
+$a->strings["Blog Account"] = "Blog Account";
+$a->strings["Private Forum Account"] = "Privé Forum Account";
+$a->strings["Message queues"] = "Bericht-wachtrijen";
+$a->strings["Summary"] = "Samenvatting";
+$a->strings["Registered users"] = "Geregistreerde gebruikers";
+$a->strings["Pending registrations"] = "Registraties die in de wacht staan";
+$a->strings["Version"] = "Versie";
+$a->strings["Active addons"] = "Actieve addons";
+$a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] = "Kan de basis url niet verwerken. Moet minstens zijn <scheme>://<domain>";
+$a->strings["Site settings updated."] = "Site instellingen opgeslagen";
+$a->strings["No special theme for mobile devices"] = "Geen speciaal thema voor mobiele apparaten";
+$a->strings["No community page for local users"] = "Geen groepspagina voor lokale gebruikers";
+$a->strings["No community page"] = "Geen groepspagina";
+$a->strings["Public postings from users of this site"] = "Publieke berichten van gebruikers van deze site";
+$a->strings["Public postings from the federated network"] = "Publieke berichten van het gefedereerde netwerk";
+$a->strings["Public postings from local users and the federated network"] = "Publieke berichten van lokale gebruikers en van het gefedereerde netwerk";
+$a->strings["Disabled"] = "Uitgeschakeld";
+$a->strings["Users, Global Contacts"] = "Gebruikers, Globale contacten";
+$a->strings["Users, Global Contacts/fallback"] = "Gebruikers, Globale Contacten/noodoplossing";
+$a->strings["One month"] = "Een maand";
+$a->strings["Three months"] = "Drie maanden";
+$a->strings["Half a year"] = "Een half jaar";
+$a->strings["One year"] = "Een jaar";
+$a->strings["Multi user instance"] = "Server voor meerdere gebruikers";
+$a->strings["Closed"] = "Gesloten";
+$a->strings["Requires approval"] = "Toestemming vereist";
+$a->strings["Open"] = "Open";
+$a->strings["No SSL policy, links will track page SSL state"] = "Geen SSL beleid, links zullen SSL status van pagina volgen";
+$a->strings["Force all links to use SSL"] = "Verplicht alle links om SSL te gebruiken";
+$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Zelf-ondertekend certificaat, gebruik SSL alleen voor lokale links (afgeraden)";
+$a->strings["Don't check"] = "Geen rekening mee houden";
+$a->strings["check the stable version"] = "Neem de stabiele versie in rekening";
+$a->strings["check the development version"] = "Neem de ontwikkel versie in rekening";
+$a->strings["Republish users to directory"] = "Opnieuw de gebruikers naar de gids publiceren";
+$a->strings["Registration"] = "Registratie";
+$a->strings["File upload"] = "Uploaden bestand";
+$a->strings["Policies"] = "Beleid";
+$a->strings["Advanced"] = "Geavanceerd";
+$a->strings["Auto Discovered Contact Directory"] = "Automatisch Achterhaalde Contact Gids";
+$a->strings["Performance"] = "Performantie";
+$a->strings["Worker"] = "Worker";
+$a->strings["Message Relay"] = "Boodschap Relais";
+$a->strings["Relocate - WARNING: advanced function. Could make this server unreachable."] = "Verhuizen - WAARSCHUWING: geavanceerde functie. Zou deze server onbereikbaar kunnen maken.";
+$a->strings["Site name"] = "Site naam";
+$a->strings["Host name"] = "Host naam";
+$a->strings["Sender Email"] = "Verzender Email";
+$a->strings["The email address your server shall use to send notification emails from."] = "Het email adres als afzender van notificatie emails.";
+$a->strings["Banner/Logo"] = "Banner/Logo";
+$a->strings["Shortcut icon"] = "Snelkoppeling icoon";
+$a->strings["Link to an icon that will be used for browsers."] = "Link naar een icoon dat zal gebruikt worden voor browsers.";
+$a->strings["Touch icon"] = "Pictogram voor smartphones";
+$a->strings["Link to an icon that will be used for tablets and mobiles."] = "Link naar een icoon dat zal gebruikt worden voor tablets en mobiele telefoons.";
+$a->strings["Additional Info"] = "Bijkomende Info";
+$a->strings["For public servers: you can add additional information here that will be listed at %s/servers."] = "Voor publieke servers: je kan bijkomende informatie hier toevoegen die zal opgelijst zijn op %s/servers.";
+$a->strings["System language"] = "Systeemtaal";
+$a->strings["System theme"] = "Systeem thema";
+$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Standaard systeem thema - kan door gebruikersprofielen veranderd worden - <a href='#' id='cnftheme'>verander thema instellingen</a>";
+$a->strings["Mobile system theme"] = "Mobiel systeem thema";
+$a->strings["Theme for mobile devices"] = "Thema voor mobiele apparaten";
+$a->strings["SSL link policy"] = "Beleid SSL-links";
+$a->strings["Determines whether generated links should be forced to use SSL"] = "Bepaald of gegenereerde verwijzingen verplicht SSL moeten gebruiken";
+$a->strings["Force SSL"] = "Dwing SSL af";
+$a->strings["Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops."] = "Forceer alle Niet-SSL aanvragen naar SSL - Pas op: dit kan op sommige systeem resulteren in oneindige lussen.";
+$a->strings["Hide help entry from navigation menu"] = "Verberg de 'help' uit het navigatiemenu";
+$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Verbergt het menu-item voor de Help pagina's uit het navigatiemenu. Je kunt ze nog altijd vinden door /help direct in te geven.";
+$a->strings["Single user instance"] = "Server voor één gebruiker";
+$a->strings["Make this instance multi-user or single-user for the named user"] = "Stel deze server in voor meerdere gebruikers, of enkel voor de geselecteerde gebruiker.";
+$a->strings["Maximum image size"] = "Maximum afbeeldingsgrootte";
+$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximum afmeting in bytes van afbeeldingen. Standaard is 0, dus geen beperking.";
+$a->strings["Maximum image length"] = "Maximum afbeeldingslengte";
+$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maximum lengte in pixels van de langste kant van afbeeldingen. Standaard is -1, dus geen beperkingen.";
+$a->strings["JPEG image quality"] = "JPEG afbeeldingskwaliteit";
+$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "JPEGS zullen met deze kwaliteitsinstelling bewaard worden [0-100]. Standaard is 100, dit is volledige kwaliteit.";
+$a->strings["Register policy"] = "Registratiebeleid";
+$a->strings["Maximum Daily Registrations"] = "Maximum aantal registraties per dag";
+$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."] = "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.";
+$a->strings["Register text"] = "Registratietekst";
+$a->strings["Will be displayed prominently on the registration page. You can use BBCode here."] = "Zal prominent op de registratie pagina getoond worden. Je kan hierin BBCode gebruiken.";
+$a->strings["Forbidden Nicknames"] = "Verboden bijnamen";
+$a->strings["Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142."] = "Kommagescheiden lijst van bijnamen die verboden zijn voor registratie. De lijst uit RFC2142 is op voorhand ingesteld.";
+$a->strings["Accounts abandoned after x days"] = "Verlaten accounts na x dagen";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Dit zal geen systeembronnen verspillen aan het nakijken van externe sites voor verlaten accounts. Geef 0 is voor geen tijdslimiet.";
+$a->strings["Allowed friend domains"] = "Toegelaten vriend domeinen";
+$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Komma-gescheiden lijst van domeinen die een vriendschapsband met deze website mogen aangaan. Jokers zijn toegelaten. Laat leeg om alle domeinen toe te laten.";
+$a->strings["Allowed email domains"] = "Toegelaten e-mail domeinen";
+$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"] = "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.";
+$a->strings["No OEmbed rich content"] = "Geen OEmbed richt content";
+$a->strings["Don't show the rich content (e.g. embedded PDF), except from the domains listed below."] = "Toon geen rich content (bvb. embedded PDF), behalve van domeinen hieronder opgelijst.";
+$a->strings["Allowed OEmbed domains"] = "Sta OEmbed domeinen toe";
+$a->strings["Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted."] = "Met komma's gescheiden lijst van domeinen waarvoor oembed content mag getoond worden. Wildcards zijn toegelaten.";
+$a->strings["Block public"] = "Openbare toegang blokkeren";
+$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Kruis dit aan om alle openbare persoonlijke pagina's alleen toegankelijk te maken voor ingelogde gebruikers.";
+$a->strings["Force publish"] = "Dwing publiceren af";
+$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Kruis dit aan om af te dwingen dat alle profielen op deze website in de gids van deze website gepubliceerd worden.";
+$a->strings["Enabling this may violate privacy laws like the GDPR"] = "Dit activeren zou privacy wetten zoals GDPR (AVG) kunnen overtreden";
+$a->strings["Global directory URL"] = "Algemene gids URL";
+$a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL naar de globale gids. Als dit niet geconfigureerd is, dan zal de globale gids volledig onbeschikbaar zijn voor de applicatie.";
+$a->strings["Private posts by default for new users"] = "Privéberichten als standaard voor nieuwe gebruikers";
+$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Stel de standaardrechten van berichten voor nieuwe leden op de standaard privacygroep in, in plaats van openbaar.";
+$a->strings["Don't include post content in email notifications"] = "De inhoud van het bericht niet insluiten bij e-mailnotificaties";
+$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "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.";
+$a->strings["Disallow public access to addons listed in the apps menu."] = "Publieke toegang ontzeggen tot addons die opgelijst zijn in het applicatie menu.";
+$a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Dit vakje aanvinken zal de lijst van addons in het applicatie menu beperken tot alleen leden.";
+$a->strings["Don't embed private images in posts"] = "Privé beelden in berichten niet inwerken";
+$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."] = "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.";
+$a->strings["Explicit Content"] = "Expliciete inhoud";
+$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."] = "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.";
+$a->strings["Allow Users to set remote_self"] = "Sta Gebruikers toe om remote_self te configureren";
+$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."] = "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. ";
+$a->strings["Block multiple registrations"] = "Blokkeer meerdere registraties";
+$a->strings["Disallow users to register additional accounts for use as pages."] = "Laat niet toe dat gebruikers meerdere accounts aanmaken.";
+$a->strings["OpenID support"] = "OpenID ondersteuning";
+$a->strings["OpenID support for registration and logins."] = "OpenID ondersteuning voor registraties en logins.";
+$a->strings["Fullname check"] = "Controleer volledige naam";
+$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Verplicht gebruikers om zich te registreren met een spatie tussen voornaam en achternaam, als anti-spam maatregel";
+$a->strings["Community pages for visitors"] = "Groepspagina voor bezoekers";
+$a->strings["Which community pages should be available for visitors. Local users always see both pages."] = "Welke groepspagina's moeten beschikbaar zijn voor bezoekers. Lokale gebruikers zien altijd beide pagina's.";
+$a->strings["Posts per user on community page"] = "Berichten per gebruiker op de groepspagina";
+$a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "Het maximum aantal berichten per gebruiker op de groepspagina. (Niet geldig voor 'Globale Gemeenschap')";
+$a->strings["Enable OStatus support"] = "OStatus ondersteuning activeren";
+$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "Verschaf ingebouwde OStatus (StatusNet, GNU Social enz.) compatibiliteit. Alle communicatie in OStatus is publiek, dus privacy waarschuwingen zullen occasioneel getoond worden.";
+$a->strings["Only import OStatus threads from our contacts"] = "Alleen OStatus gesprekken importeren van onze contacten";
+$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."] = "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.";
+$a->strings["OStatus support can only be enabled if threading is enabled."] = "OStatus ondersteuning kan alleen geactiveerd worden als de gespreksstroom geactiveerd is.";
+$a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "Diaspora ondersteuning is niet mogelijk omdat Friendica in een sub folder geïnstalleerd is.";
+$a->strings["Enable Diaspora support"] = "Diaspora ondersteuning activeren";
+$a->strings["Provide built-in Diaspora network compatibility."] = "Bied ingebouwde ondersteuning voor het Diaspora netwerk.";
+$a->strings["Only allow Friendica contacts"] = "Laat alleen Friendica contacten toe";
+$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle contacten moeten een Friendica protocol gebruiken. Alle andere ingebouwde communicatieprotocols worden uitgeschakeld.";
+$a->strings["Verify SSL"] = "Controleer SSL";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "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.";
+$a->strings["Proxy user"] = "Proxy-gebruiker";
+$a->strings["Proxy URL"] = "Proxy-URL";
+$a->strings["Network timeout"] = "Netwerk timeout";
+$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen).";
+$a->strings["Maximum Load Average"] = "Maximum gemiddelde belasting";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximum systeembelasting voordat aflever- en poll-processen uitgesteld worden - standaard 50.";
+$a->strings["Maximum Load Average (Frontend)"] = "Maximum Gemiddelde Belasting (Frontend)";
+$a->strings["Maximum system load before the frontend quits service - default 50."] = "Maximum systeem belasting wanneer de frontend ermee ophoudt - standaard waarde 50.";
+$a->strings["Minimal Memory"] = "Minimaal Geheugen";
+$a->strings["Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated)."] = "Minimum vrij geheugen in MB voor de worker. Toegang nodig tot /proc/meminfo - standaard waarde 0 (gedeactiveerd).";
+$a->strings["Maximum table size for optimization"] = "Maximum tabel grootte voor optimisatie";
+$a->strings["Maximum table size (in MB) for the automatic optimization. Enter -1 to disable it."] = "Maximum tabel grootte (in MB) voor de automatisch optimisatie. Geef -1 op om dit te deactiveren.";
+$a->strings["Minimum level of fragmentation"] = "Minimum niveau van fragmentatie";
+$a->strings["Minimum fragmenation level to start the automatic optimization - default value is 30%."] = "Minimum fragmentatie niveau om de automatische optimisatie te starten - standaard waarde is 30%.";
+$a->strings["Periodical check of global contacts"] = "Regematige controle van de globale contacten";
+$a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "Als dit geactiveerd is, dan worden de globale contacten regelmatig gecheckt naar ontbrekende of verlopen data and the vitaliteit van de contacten en servers.";
+$a->strings["Days between requery"] = "Dagen tussen herbevraging";
+$a->strings["Number of days after which a server is requeried for his contacts."] = "Aantal dagen waarna de server opnieuw bevraagd wordt naar zijn contacten.";
+$a->strings["Discover contacts from other servers"] = "Ontdek contacten van andere servers";
+$a->strings["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'."] = "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'.";
+$a->strings["Timeframe for fetching global contacts"] = "Tijdspanne voor het ophalen van globale contacten";
+$a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "Wanneer ontdekking is geactiveerd, dan definieert deze waarde de tijdspanne voor de activiteit van globale contacten die opgehaald worden van andere servers.";
+$a->strings["Search the local directory"] = "Doorzoek de lokale gids";
+$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."] = "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.";
+$a->strings["Publish server information"] = "Publiceer server informatie";
+$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."] = "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.";
+$a->strings["Check upstream version"] = "Controleer upstream versie";
+$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."] = "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.";
+$a->strings["Suppress Tags"] = "Onderdruk Tags";
+$a->strings["Suppress showing a list of hashtags at the end of the posting."] = "Onderdruk het tonen van een lijst van hastags op het einde van het bericht.";
+$a->strings["Clean database"] = "Database opruimen";
+$a->strings["Remove old remote items, orphaned database records and old content from some other helper tables."] = "Verwijder oude remote items, database weesrecords en oude content van andere helper tabellen.";
+$a->strings["Lifespan of remote items"] = "Levensduur van remote items";
+$a->strings["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."] = "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.";
+$a->strings["Lifespan of unclaimed items"] = "Levensduur van niet geclaimde items";
+$a->strings["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."] = "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.";
+$a->strings["Path to item cache"] = "Pad naar cache voor items";
+$a->strings["The item caches buffers generated bbcode and external images."] = "Item caches bufferen gegenereerde bbcodes en externe beelden.";
+$a->strings["Cache duration in seconds"] = "Cache tijdsduur in seconden";
+$a->strings["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."] = "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.";
+$a->strings["Maximum numbers of comments per post"] = "Maximum aantal reacties per bericht";
+$a->strings["How much comments should be shown for each post? Default value is 100."] = "Hoeveel reacties moeten getoond worden per bericht? Standaard waarde is 100.";
+$a->strings["Temp path"] = "Tijdelijk pad";
+$a->strings["If you have a restricted system where the webserver can't access the system temp path, enter another path here."] = "Als je een systeem met restricties hebt waarbij de webserver geen toegang heeft tot het systeem pad, geef hier dan een ander pad in. ";
+$a->strings["Base path to installation"] = "Basispad voor installatie";
+$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."] = "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.";
+$a->strings["Disable picture proxy"] = "Schakel beeld proxy uit";
+$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth."] = "De beeld proxy verhoogt de performantie en privacy. Gebruik dit niet op systemen met erg lage bandbreedte.";
+$a->strings["Only search in tags"] = "Zoek alleen in tags";
+$a->strings["On large systems the text search can slow down the system extremely."] = "Het opzoeken van tekst kan grote systemen extreem vertragen.";
+$a->strings["New base url"] = "Nieuwe basis url";
+$a->strings["Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users."] = "Verander de basis url voor deze server. Stuurt een verhuis boodschap naar all Friendica en Diaspora* contacten.";
+$a->strings["RINO Encryption"] = "RINO encryptie";
+$a->strings["Encryption layer between nodes."] = "Encryptie laag tussen nodes.";
+$a->strings["Enabled"] = "Geactiveerd";
+$a->strings["Maximum number of parallel workers"] = "Maximum aantal parallelle workers";
+$a->strings["On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d."] = "Op gedeelde hosts zet dit op %d. Op grotere systemen, waarden als %d zijn goed. standaard waarde is %d";
+$a->strings["Don't use 'proc_open' with the worker"] = "Gebruik 'proc_open' niet met de 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."] = "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.";
+$a->strings["Enable fastlane"] = "Activeer fastlane";
+$a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "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.";
+$a->strings["Enable frontend worker"] = "Activeer frontend worker";
+$a->strings["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."] = "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.";
+$a->strings["Subscribe to relay"] = "Schrijf in op relais";
+$a->strings["Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page."] = "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.";
+$a->strings["Relay server"] = "Relais server";
+$a->strings["Address of the relay server where public posts should be send to. For example https://relay.diasp.org"] = "Adres van de relais server waar publieke berichten naartoe moeten gezonden worden. Bijvoorbeeld https://relay.diasp.org";
+$a->strings["Direct relay transfer"] = "Directe relais transfer";
+$a->strings["Enables the direct transfer to other servers without using the relay servers"] = "Activeert directe relais transfer naar andere servers zonder gebruik van relais servers";
+$a->strings["Relay scope"] = "Scope van de relais";
+$a->strings["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."] = "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.";
+$a->strings["all"] = "alle";
+$a->strings["tags"] = "tags";
+$a->strings["Server tags"] = "Server tags";
+$a->strings["Comma separated list of tags for the 'tags' subscription."] = "Door komma's gescheiden lijst van tags voor de 'tags' inschrijving.";
+$a->strings["Allow user tags"] = "Sta gebruiker tags toe.";
+$a->strings["If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'."] = "Als deze parameter geactiveerd is, dan zullen de tags uit de opgeslagen zoekresultaten gebruikt worden voor de 'tags' inschrijving bovenop de 'relais_server_tags'.";
+$a->strings["Start Relocation"] = "Start verhuis";
+$a->strings["Update has been marked successful"] = "Wijziging succesvol gemarkeerd ";
+$a->strings["Database structure update %s was successfully applied."] = "Database structuur update %s werd met succes toegepast.";
+$a->strings["Executing of database structure update %s failed with error: %s"] = "Uitvoering van de database structuur update %s is mislukt met fout: %s";
+$a->strings["Executing %s failed with error: %s"] = "Uitvoering van %s mislukt met fout: %s";
+$a->strings["Update %s was successfully applied."] = "Wijziging %s geslaagd.";
+$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Wijziging %s gaf geen status terug. We weten niet of de wijziging geslaagd is.";
+$a->strings["There was no additional update function %s that needed to be called."] = "Er was geen bijkomende update functie %s die moest opgeroepen worden.";
+$a->strings["No failed updates."] = "Geen mislukte wijzigingen";
+$a->strings["Check database structure"] = "Controleer de database structuur";
+$a->strings["Failed Updates"] = "Mislukte wijzigingen";
+$a->strings["This does not include updates prior to 1139, which did not return a status."] = "Dit is zonder de wijzigingen voor 1139, welke geen status teruggaven.";
+$a->strings["Mark success (if update was manually applied)"] = "Markeren als succes (als aanpassing manueel doorgevoerd werd)";
+$a->strings["Attempt to execute this update step automatically"] = "Probeer deze stap automatisch uit te voeren";
+$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\tBeste %1\$s,\n\t\t\t\tde beheerder van %2\$s heeft een account aangemaakt voor jou.";
+$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\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.";
+$a->strings["Registration details for %s"] = "Registratie details voor %s";
+$a->strings["%s user blocked/unblocked"] = [
+	0 => "%s gebruiker geblokkeerd/niet geblokkeerd",
+	1 => "%s gebruikers geblokkeerd/niet geblokkeerd",
+];
+$a->strings["%s user deleted"] = [
+	0 => "%s gebruiker verwijderd",
+	1 => "%s gebruikers verwijderd",
+];
+$a->strings["User '%s' deleted"] = "Gebruiker '%s' verwijderd";
+$a->strings["User '%s' unblocked"] = "Gebruiker '%s' niet meer geblokkeerd";
+$a->strings["User '%s' blocked"] = "Gebruiker '%s' geblokkeerd";
+$a->strings["Normal Account Page"] = "Normale accountpagina";
+$a->strings["Soapbox Page"] = "Zeepkist-pagina";
+$a->strings["Public Forum"] = "Publiek Forum";
+$a->strings["Automatic Friend Page"] = "Automatisch Vriendschapspagina";
+$a->strings["Private Forum"] = "Privé Forum";
+$a->strings["Personal Page"] = "Persoonlijke pagina";
+$a->strings["Organisation Page"] = "Organisatie Pagina";
+$a->strings["News Page"] = "Nieuws pagina";
+$a->strings["Community Forum"] = "Groepsforum";
+$a->strings["Email"] = "E-mail";
+$a->strings["Register date"] = "Registratiedatum";
+$a->strings["Last login"] = "Laatste login";
+$a->strings["Last item"] = "Laatste item";
+$a->strings["Type"] = "Type";
+$a->strings["Add User"] = "Gebruiker toevoegen";
+$a->strings["User registrations waiting for confirm"] = "Gebruikersregistraties wachten op een bevestiging";
+$a->strings["User waiting for permanent deletion"] = "Gebruiker wacht op permanente verwijdering";
+$a->strings["Request date"] = "Registratiedatum";
+$a->strings["No registrations."] = "Geen registraties.";
+$a->strings["Note from the user"] = "Nota van de gebruiker";
+$a->strings["Approve"] = "Goedkeuren";
+$a->strings["Deny"] = "Weiger";
+$a->strings["User blocked"] = "Gebruiker geblokeerd";
+$a->strings["Site admin"] = "Sitebeheerder";
+$a->strings["Account expired"] = "Account verlopen";
+$a->strings["New User"] = "Nieuwe gebruiker";
+$a->strings["Deleted since"] = "Verwijderd sinds";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Geselecteerde gebruikers zullen verwijderd worden!\\n\\nAlles wat deze gebruikers gepost hebben op deze website zal permanent verwijderd worden!\\n\\nBen je zeker?";
+$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?"] = "De gebruiker {0} zal verwijderd worden!\\n\\nAlles wat deze gebruiker gepost heeft op deze website zal permanent verwijderd worden!\\n\\nBen je zeker?";
+$a->strings["Name of the new user."] = "Naam van nieuwe gebruiker";
+$a->strings["Nickname"] = "Bijnaam";
+$a->strings["Nickname of the new user."] = "Bijnaam van nieuwe gebruiker";
+$a->strings["Email address of the new user."] = "E-mailadres van nieuwe gebruiker";
+$a->strings["Addon %s disabled."] = "Addon %s gedeactiveerd";
+$a->strings["Addon %s enabled."] = "Addon %s geactiveerd";
+$a->strings["Disable"] = "Uitschakelen";
+$a->strings["Enable"] = "Inschakelen";
+$a->strings["Toggle"] = "Schakelaar";
+$a->strings["Author: "] = "Auteur:";
+$a->strings["Maintainer: "] = "Onderhoud:";
+$a->strings["Reload active addons"] = "Herlaad actieve addons";
+$a->strings["There are currently no addons available on your node. You can find the official addon repository at %1\$s and might find other interesting addons in the open addon registry at %2\$s"] = "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";
+$a->strings["No themes found."] = "Geen thema's gevonden.";
+$a->strings["Screenshot"] = "Schermafdruk";
+$a->strings["Reload active themes"] = "Herlaad actieve thema's";
+$a->strings["No themes found on the system. They should be placed in %1\$s"] = "Geen thema's gevonden op het systeem. Ze zouden zich moeten bevinden in %1\$s";
+$a->strings["[Experimental]"] = "[Experimenteel]";
+$a->strings["[Unsupported]"] = "[Niet ondersteund]";
+$a->strings["Log settings updated."] = "Log instellingen opgeslagen";
+$a->strings["PHP log currently enabled."] = "PHP log momenteel geactiveerd";
+$a->strings["PHP log currently disabled."] = "PHP log momenteel gedeactiveerd";
+$a->strings["Clear"] = "Wis";
+$a->strings["Enable Debugging"] = "Activeer Debugging";
+$a->strings["Log file"] = "Logbestand";
+$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "De webserver moet hier kunnen schrijven. Relatief t.o.v. de hoogste folder binnen je Friendica-installatie.";
+$a->strings["Log level"] = "Log niveau";
+$a->strings["PHP logging"] = "PHP logging";
+$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."] = "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. ";
+$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."] = "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.";
+$a->strings["Couldn't open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s is readable."] = "Kon log file <strong>%1\$s</strong> niet openen.\\r\\n<br/>Kijk na of bestand %1\$s mag gelezen worden.";
+$a->strings["Off"] = "Uit";
+$a->strings["On"] = "Aan";
+$a->strings["Lock feature %s"] = "Fixeer feature %s ";
+$a->strings["Manage Additional Features"] = "Beheer Bijkomende Features";
+$a->strings["No friends to display."] = "Geen vrienden om te laten zien.";
+$a->strings["Connect"] = "Verbinden";
+$a->strings["Authorize application connection"] = "Verbinding met de applicatie goedkeuren";
+$a->strings["Return to your app and insert this Securty Code:"] = "Keer terug naar jouw app en voeg deze beveiligingscode in:";
+$a->strings["Please login to continue."] = "Log in om verder te gaan.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Wil je deze toepassing toestemming geven om jouw berichten en contacten in te kijken, en/of nieuwe berichten in jouw plaats aan te maken?";
+$a->strings["No"] = "Nee";
+$a->strings["Item not available."] = "Item niet beschikbaar";
+$a->strings["Item was not found."] = "Item niet gevonden";
+$a->strings["Access denied."] = "Toegang geweigerd";
 $a->strings["Access to this profile has been restricted."] = "Toegang tot dit profiel is beperkt.";
 $a->strings["Events"] = "Gebeurtenissen";
-$a->strings["View"] = "";
+$a->strings["View"] = "Beeld";
 $a->strings["Previous"] = "Vorige";
 $a->strings["Next"] = "Volgende";
 $a->strings["today"] = "vandaag";
 $a->strings["month"] = "maand";
 $a->strings["week"] = "week";
 $a->strings["day"] = "dag";
-$a->strings["list"] = "";
-$a->strings["User not found"] = "";
-$a->strings["This calendar format is not supported"] = "";
+$a->strings["list"] = "lijst";
+$a->strings["User not found"] = "Gebruiker niet gevonden";
+$a->strings["This calendar format is not supported"] = "Dit kalender formaat is niet ondersteund";
 $a->strings["No exportable data found"] = "Geen exporteerbare data gevonden";
-$a->strings["calendar"] = "";
+$a->strings["calendar"] = "kalender";
+$a->strings["No contacts in common."] = "Geen gedeelde contacten.";
+$a->strings["Common Friends"] = "Gedeelde Vrienden";
+$a->strings["Community option not available."] = "Groepsoptie niet beschikbaar";
+$a->strings["Not available."] = "Niet beschikbaar";
+$a->strings["Local Community"] = "Lokale Groep";
+$a->strings["Posts from local users on this server"] = "Berichten van lokale gebruikers op deze server";
+$a->strings["Global Community"] = "Globale gemeenschap";
+$a->strings["Posts from users of the whole federated network"] = "Berichten van gebruikers van het hele gefedereerde netwerk";
+$a->strings["No results."] = "Geen resultaten.";
+$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "Deze groepsstroom toont alle publieke berichten die deze node ontvangen heeft. Ze kunnen mogelijks niet de mening van de gebruikers van deze node weerspiegelen.";
 $a->strings["Network:"] = "Netwerk:";
 $a->strings["%d contact edited."] = [
-	0 => "",
-	1 => "",
+	0 => "%d contact bewerkt.",
+	1 => "%d contacten bewerkt.",
 ];
 $a->strings["Could not access contact record."] = "Kon geen toegang krijgen tot de contactgegevens";
 $a->strings["Could not locate selected profile."] = "Kon het geselecteerde profiel niet vinden.";
-$a->strings["Contact updated."] = "Contact bijgewerkt.";
+$a->strings["Contact updated."] = "Contact opgeslagen";
 $a->strings["Failed to update contact record."] = "Ik kon de contactgegevens niet aanpassen.";
 $a->strings["Contact has been blocked"] = "Contact is geblokkeerd";
 $a->strings["Contact has been unblocked"] = "Contact is gedeblokkeerd";
@@ -469,7 +835,7 @@ $a->strings["Contact has been ignored"] = "Contact wordt genegeerd";
 $a->strings["Contact has been unignored"] = "Contact wordt niet meer genegeerd";
 $a->strings["Contact has been archived"] = "Contact is gearchiveerd";
 $a->strings["Contact has been unarchived"] = "Contact is niet meer gearchiveerd";
-$a->strings["Drop contact"] = "";
+$a->strings["Drop contact"] = "Contact vergeten";
 $a->strings["Do you really want to delete this contact?"] = "Wil je echt dit contact verwijderen?";
 $a->strings["Contact has been removed."] = "Contact is verwijderd.";
 $a->strings["You are mutual friends with %s"] = "Je bent wederzijds bevriend met %s";
@@ -482,19 +848,19 @@ $a->strings["(Update was not successful)"] = "(Wijziging is niet geslaagd)";
 $a->strings["Suggest friends"] = "Stel vrienden voor";
 $a->strings["Network type: %s"] = "Netwerk type: %s";
 $a->strings["Communications lost with this contact!"] = "Communicatie met dit contact is verbroken!";
-$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"] = "Uitgeschakeld";
-$a->strings["Fetch information"] = "";
-$a->strings["Fetch keywords"] = "";
-$a->strings["Fetch information and keywords"] = "";
-$a->strings["Disconnect/Unfollow"] = "";
-$a->strings["Contact"] = "";
+$a->strings["Fetch further information for feeds"] = "Haal meer informatie op van de 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."] = "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.";
+$a->strings["Fetch information"] = "Haal informatie op";
+$a->strings["Fetch keywords"] = "Haal sleutelwoorden op";
+$a->strings["Fetch information and keywords"] = "Haal informatie en sleutelwoorden op";
+$a->strings["Disconnect/Unfollow"] = "Disconnecteer/stop met volgen";
+$a->strings["Contact"] = "Contact";
 $a->strings["Profile Visibility"] = "Zichtbaarheid profiel";
 $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Kies het profiel dat getoond moet worden wanneer %s je profiel bezoekt. ";
 $a->strings["Contact Information / Notes"] = "Contactinformatie / aantekeningen";
-$a->strings["Their personal note"] = "";
+$a->strings["Their personal note"] = "Hun persoonlijke nota";
 $a->strings["Edit contact notes"] = "Wijzig aantekeningen over dit contact";
+$a->strings["Visit %s's profile [%s]"] = "Bekijk het profiel van %s [%s]";
 $a->strings["Block/Unblock contact"] = "Blokkeer/deblokkeer contact";
 $a->strings["Ignore contact"] = "Negeer contact";
 $a->strings["Repair URL settings"] = "Repareer URL-instellingen";
@@ -502,28 +868,25 @@ $a->strings["View conversations"] = "Toon gesprekken";
 $a->strings["Last update:"] = "Laatste wijziging:";
 $a->strings["Update public posts"] = "Openbare posts aanpassen";
 $a->strings["Update now"] = "Wijzig nu";
-$a->strings["Unblock"] = "Blokkering opheffen";
-$a->strings["Block"] = "Blokkeren";
 $a->strings["Unignore"] = "Negeer niet meer";
 $a->strings["Ignore"] = "Negeren";
 $a->strings["Currently blocked"] = "Op dit moment geblokkeerd";
 $a->strings["Currently ignored"] = "Op dit moment genegeerd";
 $a->strings["Currently archived"] = "Op dit moment gearchiveerd";
-$a->strings["Awaiting connection acknowledge"] = "";
+$a->strings["Awaiting connection acknowledge"] = "Wait op bevestiging van de connectie";
 $a->strings["Hide this contact from others"] = "Verberg dit contact voor anderen";
 $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antwoorden of 'vind ik leuk's op je openbare posts <strong>kunnen</strong> nog zichtbaar zijn";
 $a->strings["Notification for new posts"] = "Meldingen voor nieuwe berichten";
-$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"] = "Profiel url";
+$a->strings["Send a notification of every new post of this contact"] = "Stuur een notificatie voor elk bericht van dit contact";
+$a->strings["Blacklisted keywords"] = "Sleutelwoorden op de zwarte lijst";
+$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Door komma's gescheiden lijst van sleutelwoorden die niet in hashtags mogen omgezet worden, wanneer \"Haal informatie en sleutelwoorden op\" is geselecteerd";
 $a->strings["Location:"] = "Plaats:";
-$a->strings["XMPP:"] = "";
+$a->strings["XMPP:"] = "XMPP:";
 $a->strings["About:"] = "Over:";
 $a->strings["Tags:"] = "Labels:";
-$a->strings["Actions"] = "";
+$a->strings["Actions"] = "Acties";
 $a->strings["Status"] = "Tijdlijn";
-$a->strings["Contact Settings"] = "";
+$a->strings["Contact Settings"] = "Contact instellingen";
 $a->strings["Suggestions"] = "Voorstellen";
 $a->strings["Suggest potential friends"] = "Stel vrienden voor";
 $a->strings["All Contacts"] = "Alle Contacten";
@@ -539,252 +902,61 @@ $a->strings["Only show archived contacts"] = "Toon alleen gearchiveerde contacte
 $a->strings["Hidden"] = "Verborgen";
 $a->strings["Only show hidden contacts"] = "Toon alleen verborgen contacten";
 $a->strings["Search your contacts"] = "Doorzoek je contacten";
-$a->strings["Results for: %s"] = "";
+$a->strings["Results for: %s"] = "Resultaten voor: %s";
 $a->strings["Find"] = "Zoek";
 $a->strings["Update"] = "Wijzigen";
 $a->strings["Archive"] = "Archiveer";
 $a->strings["Unarchive"] = "Archiveer niet meer";
-$a->strings["Batch Actions"] = "";
+$a->strings["Batch Actions"] = "Bulk Acties";
 $a->strings["Status Messages and Posts"] = "Berichten op jouw tijdlijn";
 $a->strings["Profile Details"] = "Profieldetails";
 $a->strings["View all contacts"] = "Alle contacten zien";
-$a->strings["View all common friends"] = "";
-$a->strings["Advanced"] = "Geavanceerd";
+$a->strings["View all common friends"] = "Bekijk alle gemeenschappelijke vrienden";
 $a->strings["Advanced Contact Settings"] = "Geavanceerde instellingen voor contacten";
 $a->strings["Mutual Friendship"] = "Wederzijdse vriendschap";
 $a->strings["is a fan of yours"] = "Is een fan van jou";
 $a->strings["you are a fan of"] = "Jij bent een fan van";
 $a->strings["This is you"] = "Dit ben jij";
+$a->strings["Edit contact"] = "Contact bewerken";
 $a->strings["Toggle Blocked status"] = "Schakel geblokkeerde status";
 $a->strings["Toggle Ignored status"] = "Schakel negeerstatus";
 $a->strings["Toggle Archive status"] = "Schakel archiveringsstatus";
 $a->strings["Delete contact"] = "Verwijder 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"] = "Instellingen opslaan";
-$a->strings["Delegate Page Management"] = "Paginabeheer uitbesteden";
-$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."] = "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.";
-$a->strings["Existing Page Delegates"] = "Bestaande personen waaraan het paginabeheer is uitbesteed";
-$a->strings["Potential Delegates"] = "Mogelijke personen waaraan het paginabeheer kan worden uitbesteed ";
-$a->strings["Add"] = "Toevoegen";
-$a->strings["No entries."] = "Geen gegevens.";
-$a->strings["You must be logged in to use this module"] = "";
-$a->strings["Source URL"] = "";
-$a->strings["Post successful."] = "Bericht succesvol geplaatst.";
-$a->strings["Subscribing to OStatus contacts"] = "";
-$a->strings["No contact provided."] = "";
-$a->strings["Couldn't fetch information for contact."] = "";
-$a->strings["Couldn't fetch friends for contact."] = "";
-$a->strings["success"] = "Succesvol";
-$a->strings["failed"] = "Mislukt";
-$a->strings["ignored"] = "Verboden";
-$a->strings["Image uploaded but image cropping failed."] = "Afbeelding opgeladen, maar bijsnijden mislukt.";
-$a->strings["Image size reduction [%s] failed."] = "Verkleining van de afbeelding [%s] mislukt.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Shift-herlaad de pagina, of maak de browser cache leeg als nieuwe foto's niet onmiddellijk verschijnen.";
-$a->strings["Unable to process image"] = "Ik kan de afbeelding niet verwerken";
-$a->strings["Upload File:"] = "Upload bestand:";
-$a->strings["Select a profile:"] = "Kies een profiel:";
-$a->strings["or"] = "of";
-$a->strings["skip this step"] = "Deze stap overslaan";
-$a->strings["select a photo from your photo albums"] = "Kies een foto uit je fotoalbums";
-$a->strings["Crop Image"] = "Afbeelding bijsnijden";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Pas het afsnijden van de afbeelding aan voor het beste resultaat.";
-$a->strings["Done Editing"] = "Wijzigingen compleet";
-$a->strings["Image uploaded successfully."] = "Uploaden van afbeelding gelukt.";
-$a->strings["Contact wasn't found or can't be unfollowed."] = "";
-$a->strings["Contact unfollowed"] = "";
-$a->strings["Submit Request"] = "Aanvraag indienen";
-$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:"] = "Adres van je identiteit:";
-$a->strings["Gender:"] = "Geslacht:";
-$a->strings["Status:"] = "Tijdlijn:";
-$a->strings["Homepage:"] = "Website:";
-$a->strings["Global Directory"] = "Globale gids";
-$a->strings["Find on this site"] = "Op deze website zoeken";
-$a->strings["Results for:"] = "";
-$a->strings["Site Directory"] = "Websitegids";
-$a->strings["No entries (some entries may be hidden)."] = "Geen gegevens (sommige gegevens kunnen verborgen zijn).";
-$a->strings["People Search - %s"] = "";
-$a->strings["Forum Search - %s"] = "";
-$a->strings["The contact could not be added."] = "";
-$a->strings["You already added this contact."] = "Je hebt deze kontakt al toegevoegd";
-$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "";
-$a->strings["OStatus support is disabled. Contact can't be added."] = "";
-$a->strings["The network type couldn't be detected. Contact can't be added."] = "";
-$a->strings["Please answer the following:"] = "Beantwoord het volgende:";
-$a->strings["Does %s know you?"] = "Kent %s jou?";
-$a->strings["Add a personal note:"] = "Voeg een persoonlijke opmerking toe:";
-$a->strings["No valid account found."] = "Geen geldige account gevonden.";
-$a->strings["Password reset request issued. Check your email."] = "Verzoek om wachtwoord opnieuw in te stellen werd verstuurd. Kijk uw e-mail na.";
-$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."] = "\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.";
-$a->strings["\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"] = "\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";
-$a->strings["Password reset requested at %s"] = "Op %s werd gevraagd je wachtwoord opnieuw in te stellen";
-$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Verzoek kon niet geverifieerd worden. (Misschien heb je het voordien al ingediend.) Wachtwoord niet opnieuw ingesteld.";
-$a->strings["Request has expired, please make a new one."] = "";
-$a->strings["Forgot your Password?"] = "Wachtwoord vergeten?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Voer je e-mailadres in en verstuur het om je wachtwoord opnieuw in te stellen. Kijk dan je e-mail na voor verdere instructies.";
-$a->strings["Nickname or Email: "] = "Bijnaam of e-mail:";
-$a->strings["Reset"] = "Opnieuw";
-$a->strings["Password Reset"] = "Wachtwoord opnieuw instellen";
-$a->strings["Your password has been reset as requested."] = "Je wachtwoord is opnieuw ingesteld zoals gevraagd.";
-$a->strings["Your new password is"] = "Je nieuwe wachtwoord is";
-$a->strings["Save or copy your new password - and then"] = "Bewaar of kopieer je nieuw wachtwoord - en dan";
-$a->strings["click here to login"] = "klik hier om in te loggen";
-$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Je kunt dit wachtwoord veranderen nadat je bent ingelogd op de <em>Instellingen></em> pagina.";
-$a->strings["\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"] = "";
-$a->strings["\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"] = "";
-$a->strings["Your password has been changed at %s"] = "Je wachtwoord is veranderd op %s";
-$a->strings["Source input"] = "";
-$a->strings["BBCode::toPlaintext"] = "";
-$a->strings["BBCode::convert (raw HTML)"] = "";
-$a->strings["BBCode::convert"] = "";
-$a->strings["BBCode::convert => HTML::toBBCode"] = "";
-$a->strings["BBCode::toMarkdown"] = "";
-$a->strings["BBCode::toMarkdown => Markdown::convert"] = "";
-$a->strings["BBCode::toMarkdown => Markdown::toBBCode"] = "";
-$a->strings["BBCode::toMarkdown =>  Markdown::convert => HTML::toBBCode"] = "";
-$a->strings["Source input \\x28Diaspora format\\x29"] = "";
-$a->strings["Markdown::toBBCode"] = "";
-$a->strings["Raw HTML input"] = "";
-$a->strings["HTML Input"] = "";
-$a->strings["HTML::toBBCode"] = "";
-$a->strings["HTML::toPlaintext"] = "";
-$a->strings["Source text"] = "";
-$a->strings["BBCode"] = "";
-$a->strings["Markdown"] = "";
-$a->strings["HTML"] = "";
-$a->strings["This is Friendica, version"] = "Dit is Friendica, versie";
-$a->strings["running at web location"] = "draaiend op web-adres";
-$a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "";
-$a->strings["Bug reports and issues: please visit"] = "Bug rapporten en problemen: bezoek";
-$a->strings["the bugtracker at 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->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."] = "Totale uitnodigingslimiet overschreden.";
-$a->strings["%s : Not a valid email address."] = "%s: Geen geldig e-mailadres.";
-$a->strings["Please join us on Friendica"] = "Kom bij ons op Friendica";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Uitnodigingslimiet overschreden. Neem contact op met de beheerder van je website.";
-$a->strings["%s : Message delivery failed."] = "%s : Aflevering van bericht mislukt.";
-$a->strings["%d message sent."] = [
-	0 => "%d bericht verzonden.",
-	1 => "%d berichten verzonden.",
-];
-$a->strings["You have no more invitations available"] = "Je kunt geen uitnodigingen meer sturen";
-$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."] = "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.";
-$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Om deze uitnodiging te accepteren kan je je op %s registreren of op een andere vrij toegankelijke Friendica-website.";
-$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 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.";
-$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Onze verontschuldigingen. Dit systeem is momenteel niet ingesteld om verbinding te maken met andere openbare plaatsen of leden uit te nodigen.";
-$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."] = "";
-$a->strings["To accept this invitation, please visit and register at %s."] = "";
-$a->strings["Send invitations"] = "Verstuur uitnodigingen";
-$a->strings["Enter email addresses, one per line:"] = "Vul e-mailadressen in, één per lijn:";
-$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "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.";
-$a->strings["You will need to supply this invitation code: \$invite_code"] = "Je zult deze uitnodigingscode moeten invullen: \$invite_code";
-$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Eens je geregistreerd bent kun je contact leggen met mij via mijn profielpagina op:";
-$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "";
 $a->strings["Contact settings applied."] = "Contactinstellingen toegepast.";
 $a->strings["Contact update failed."] = "Aanpassen van contact mislukt.";
+$a->strings["Contact not found."] = "Contact niet gevonden";
 $a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>WAARSCHUWING: Dit is zeer geavanceerd</strong> en als je verkeerde informatie invult, zal je mogelijk niet meer kunnen communiceren met deze contactpersoon.";
 $a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Gebruik <strong>nu</strong> de \"terug\"-knop in je webbrowser wanneer je niet weet wat je op deze pagina moet doen.";
-$a->strings["No mirroring"] = "";
-$a->strings["Mirror as forwarded posting"] = "";
-$a->strings["Mirror as my own posting"] = "";
+$a->strings["No mirroring"] = "Geen mirroring";
+$a->strings["Mirror as forwarded posting"] = "Spiegel als geforward bericht";
+$a->strings["Mirror as my own posting"] = "Spiegel als mijn eigen bericht";
 $a->strings["Return to contact editor"] = "Ga terug naar contactbewerker";
-$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."] = "";
-$a->strings["Name"] = "Naam";
+$a->strings["Refetch contact data"] = "Contact data opnieuw ophalen";
+$a->strings["Remote Self"] = "Mijn identiteit elders";
+$a->strings["Mirror postings from this contact"] = "Berichten van dit contact spiegelen";
+$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Markeer dit contact als remote_self, hierdoor zal friendica nieuwe berichten van dit contact opnieuw posten.";
 $a->strings["Account Nickname"] = "Bijnaam account";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@Labelnaam - krijgt voorrang op naam/bijnaam";
 $a->strings["Account URL"] = "URL account";
 $a->strings["Friend Request URL"] = "URL vriendschapsverzoek";
 $a->strings["Friend Confirm URL"] = "URL vriendschapsbevestiging";
-$a->strings["Notification Endpoint URL"] = "";
+$a->strings["Notification Endpoint URL"] = "Notificatie Endpoint URL";
 $a->strings["Poll/Feed URL"] = "URL poll/feed";
 $a->strings["New photo from this URL"] = "Nieuwe foto van deze URL";
-$a->strings["%1\$s welcomes %2\$s"] = "%1\$s heet %2\$s van harte welkom";
-$a->strings["Help:"] = "Help:";
-$a->strings["Help"] = "Help";
-$a->strings["Page not found."] = "Pagina niet gevonden";
-$a->strings["Friendica Communications Server - Setup"] = "";
-$a->strings["Could not connect to database."] = "Kon geen toegang krijgen tot de database.";
-$a->strings["Could not create table."] = "Kon tabel niet aanmaken.";
-$a->strings["Your Friendica site database has been installed."] = "De database van je Friendica-website is geïnstalleerd.";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Het kan nodig zijn om het bestand \"database.sql\" manueel te importeren met phpmyadmin of mysql.";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Zie het bestand \"INSTALL.txt\".";
-$a->strings["Database already in use."] = "";
-$a->strings["System check"] = "Systeemcontrole";
-$a->strings["Check again"] = "Controleer opnieuw";
-$a->strings["Database connection"] = "Verbinding met database";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Om Friendica te kunnen installeren moet ik weten hoe ik jouw database kan bereiken.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Neem contact op met jouw hostingprovider of websitebeheerder, wanneer je vragen hebt over deze instellingen. ";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "De database die je hier opgeeft zou al moeten bestaan. Maak anders de database aan voordat je verder gaat.";
-$a->strings["Database Server Name"] = "Servernaam database";
-$a->strings["Database Login Name"] = "Gebruikersnaam database";
-$a->strings["Database Login Password"] = "Wachtwoord database";
-$a->strings["For security reasons the password must not be empty"] = "";
-$a->strings["Database Name"] = "Naam database";
-$a->strings["Site administrator email address"] = "E-mailadres van de websitebeheerder";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Het e-mailadres van je account moet hiermee overeenkomen om het administratiepaneel te kunnen gebruiken.";
-$a->strings["Please select a default timezone for your website"] = "Selecteer een standaard tijdzone voor je website";
-$a->strings["Site settings"] = "Website-instellingen";
-$a->strings["System Language:"] = "";
-$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "";
-$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."] = "Het databaseconfiguratiebestand \".htconfig.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.";
-$a->strings["<h1>What next</h1>"] = "<h1>Wat nu</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"] = "Nieuw Bericht";
-$a->strings["Unable to locate contact information."] = "Ik kan geen contact informatie vinden.";
-$a->strings["Messages"] = "Privéberichten";
-$a->strings["Do you really want to delete this message?"] = "Wil je echt dit bericht verwijderen?";
-$a->strings["Message deleted."] = "Bericht verwijderd.";
-$a->strings["Conversation removed."] = "Gesprek verwijderd.";
-$a->strings["No messages."] = "Geen berichten.";
-$a->strings["Message not available."] = "Bericht niet beschikbaar.";
-$a->strings["Delete message"] = "Verwijder bericht";
-$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
-$a->strings["Delete conversation"] = "Verwijder gesprek";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Geen beveiligde communicatie beschikbaar. Je kunt <strong>misschien</strong> antwoorden vanaf de profiel-pagina van de afzender.";
-$a->strings["Send Reply"] = "Verstuur Antwoord";
-$a->strings["Unknown sender - %s"] = "Onbekende afzender - %s";
-$a->strings["You and %s"] = "Jij en %s";
-$a->strings["%s and You"] = "%s en jij";
-$a->strings["%d message"] = [
-	0 => "%d bericht",
-	1 => "%d berichten",
-];
-$a->strings["Group created."] = "Groep aangemaakt.";
-$a->strings["Could not create group."] = "Kon de groep niet aanmaken.";
-$a->strings["Group not found."] = "Groep niet gevonden.";
-$a->strings["Group name changed."] = "Groepsnaam gewijzigd.";
-$a->strings["Save Group"] = "Bewaar groep";
-$a->strings["Create a group of contacts/friends."] = "Maak een groep contacten/vrienden aan.";
-$a->strings["Group Name: "] = "Groepsnaam:";
-$a->strings["Group removed."] = "Groep verwijderd.";
-$a->strings["Unable to remove group."] = "Niet in staat om groep te verwijderen.";
-$a->strings["Delete Group"] = "";
-$a->strings["Group Editor"] = "Groepsbewerker";
-$a->strings["Edit Group Name"] = "";
-$a->strings["Members"] = "Leden";
-$a->strings["Group is empty"] = "De groep is leeg";
-$a->strings["Remove contact from group"] = "";
-$a->strings["Add contact to group"] = "";
-$a->strings["OpenID protocol error. No ID returned."] = "OpenID protocol fout. Geen ID Gevonden.";
-$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account niet gevonden, en OpenID-registratie is niet toegelaten op deze website.";
-$a->strings["Login failed."] = "Login mislukt.";
+$a->strings["Parent user not found."] = "Ouderlijke gebruiker niet gevonden.";
+$a->strings["No parent user"] = "Ouderlijke gebruiker ontbreekt";
+$a->strings["Parent Password:"] = "Ouderlijk paswoord:";
+$a->strings["Please enter the password of the parent account to legitimize your request."] = "Geef alstublieft het paswoord van het ouderlijke account om je verzoek te legitimeren.";
+$a->strings["Parent User"] = "Ouderlijke gebruiker";
+$a->strings["Parent users have total control about this account, including the account settings. Please double check whom you give this access."] = "Ouderlijke gebruikers hebben totale controle over dit account, de account instellingen inbegrepen. Dubbel check dus alstublieft aan wie je deze toegang geeft.";
+$a->strings["Delegate Page Management"] = "Paginabeheer uitbesteden";
+$a->strings["Delegates"] = "Gemachtigden";
+$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."] = "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.";
+$a->strings["Existing Page Delegates"] = "Bestaande personen waaraan het paginabeheer is uitbesteed";
+$a->strings["Potential Delegates"] = "Mogelijke personen waaraan het paginabeheer kan worden uitbesteed ";
+$a->strings["Remove"] = "Verwijderen";
+$a->strings["Add"] = "Toevoegen";
+$a->strings["No entries."] = "Geen gegevens.";
 $a->strings["Profile not found."] = "Profiel niet gevonden";
 $a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Dit kan soms gebeuren als het contact door beide personen werd gevraagd, en het werd al goedgekeurd.";
 $a->strings["Response from remote site was not understood."] = "Antwoord van de website op afstand werd niet begrepen.";
@@ -801,8 +973,9 @@ $a->strings["Contact record was not found for you on our site."] = "We vonden op
 $a->strings["Site public key not available in contact record for URL %s."] = "Publieke sleutel voor webstek niet beschikbaar in contactrecord voor URL %s.";
 $a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Het ID dat jouw systeem aangeeft is een dubbel op ons systeem. Als je opnieuw probeert zou het moeten werken.";
 $a->strings["Unable to set your contact credentials on our system."] = "Niet in staat om op dit systeem je contactreferenties in te stellen.";
-$a->strings["Unable to update your contact profile details on our system"] = "";
+$a->strings["Unable to update your contact profile details on our system"] = "Kan je contact profiel details op ons systeem niet aanpassen";
 $a->strings["[Name Withheld]"] = "[Naam achtergehouden]";
+$a->strings["%1\$s welcomes %2\$s"] = "%1\$s heet %2\$s van harte welkom";
 $a->strings["This introduction has already been accepted."] = "Verzoek is al goedgekeurd";
 $a->strings["Profile location is not valid or does not contain profile information."] = "Profiel is ongeldig of bevat geen informatie";
 $a->strings["Warning: profile location has no identifiable owner name."] = "Waarschuwing: de profiellocatie heeft geen identificeerbare eigenaar.";
@@ -823,7 +996,7 @@ $a->strings["Apparently you are already friends with %s."] = "Blijkbaar ben je a
 $a->strings["Invalid profile URL."] = "Ongeldig profiel adres.";
 $a->strings["Disallowed profile URL."] = "Niet toegelaten profiel adres.";
 $a->strings["Your introduction has been sent."] = "Je verzoek is verzonden.";
-$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "";
+$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Remote inschrijving kan niet op jouw netwerk. Gelieve direct op je systeem in te schrijven.";
 $a->strings["Please login to confirm introduction."] = "Log in om je verzoek te bevestigen.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Je huidige identiteit is niet de juiste. Log met <strong>dit</strong> profiel in.";
 $a->strings["Confirm"] = "Bevestig";
@@ -831,38 +1004,329 @@ $a->strings["Hide this contact"] = "Verberg dit contact";
 $a->strings["Welcome home %s."] = "Welkom terug %s.";
 $a->strings["Please confirm your introduction/connection request to %s."] = "Bevestig je vriendschaps-/connectieverzoek voor %s.";
 $a->strings["Please enter your 'Identity Address' from one of the following supported communications networks:"] = "Vul hier uw 'Identiteitsadres' in van een van de volgende ondersteunde communicatienetwerken:";
-$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->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>."] = "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>";
 $a->strings["Friend/Connection Request"] = "Vriendschaps-/connectieverzoek";
-$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"] = "";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"] = "Voorbeelden: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de";
+$a->strings["Please answer the following:"] = "Beantwoord het volgende:";
+$a->strings["Does %s know you?"] = "Kent %s jou?";
+$a->strings["Add a personal note:"] = "Voeg een persoonlijke opmerking toe:";
 $a->strings["Friendica"] = "Friendica";
-$a->strings["GNU Social (Pleroma, Mastodon)"] = "";
-$a->strings["Diaspora (Socialhome, Hubzilla)"] = "";
+$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."] = "- Gebruik niet dit formulier. Vul %s in in je Diaspora zoekbalk.";
-$a->strings["Invalid request identifier."] = "Ongeldige <em>request identifier</em>.";
+$a->strings["Your Identity Address:"] = "Adres van je identiteit:";
+$a->strings["Submit Request"] = "Aanvraag indienen";
+$a->strings["Gender:"] = "Geslacht:";
+$a->strings["Status:"] = "Tijdlijn:";
+$a->strings["Homepage:"] = "Website:";
+$a->strings["Global Directory"] = "Globale gids";
+$a->strings["Find on this site"] = "Op deze website zoeken";
+$a->strings["Results for:"] = "Resultaten voor:";
+$a->strings["Site Directory"] = "Websitegids";
+$a->strings["No entries (some entries may be hidden)."] = "Geen gegevens (sommige gegevens kunnen verborgen zijn).";
+$a->strings["People Search - %s"] = "Mensen Zoeken - %s";
+$a->strings["Forum Search - %s"] = "Forum doorzoeken - %s";
+$a->strings["No matches"] = "Geen resultaten";
+$a->strings["Item not found"] = "Item niet gevonden";
+$a->strings["Edit post"] = "Bericht bewerken";
+$a->strings["CC: email addresses"] = "CC: e-mailadressen";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Voorbeeld: bob@voorbeeld.nl, an@voorbeeld.be";
+$a->strings["Event can not end before it has started."] = "Gebeurtenis kan niet eindigen voor het begin.";
+$a->strings["Event title and start time are required."] = "Titel en begintijd van de gebeurtenis zijn vereist.";
+$a->strings["Create New Event"] = "Maak een nieuwe gebeurtenis";
+$a->strings["Event details"] = "Gebeurtenis details";
+$a->strings["Starting date and Title are required."] = "Start datum en Titel zijn verplicht.";
+$a->strings["Event Starts:"] = "Gebeurtenis begint:";
+$a->strings["Required"] = "Vereist";
+$a->strings["Finish date/time is not known or not relevant"] = "Einddatum/tijd is niet gekend of niet relevant";
+$a->strings["Event Finishes:"] = "Gebeurtenis eindigt:";
+$a->strings["Adjust for viewer timezone"] = "Pas aan aan de tijdzone van de gebruiker";
+$a->strings["Description:"] = "Beschrijving:";
+$a->strings["Title:"] = "Titel:";
+$a->strings["Share this event"] = "Deel deze gebeurtenis";
+$a->strings["Basic"] = "Basis";
+$a->strings["Permissions"] = "Rechten";
+$a->strings["Failed to remove event"] = "Kon remote event niet verwijderen";
+$a->strings["Event removed"] = "Gebeurtenis verwijderd";
+$a->strings["Photos"] = "Foto's";
+$a->strings["Contact Photos"] = "Contactfoto's";
+$a->strings["Upload"] = "Uploaden";
+$a->strings["Files"] = "Bestanden";
+$a->strings["You must be logged in to use this module"] = "Je moet ingelogd zijn om deze module te gebruiken";
+$a->strings["Source URL"] = "Bron URL";
+$a->strings["The contact could not be added."] = "Het contact kon niet toegevoegd worden.";
+$a->strings["You already added this contact."] = "Je hebt deze kontakt al toegevoegd";
+$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Diaspora ondersteuning is niet geactiveerd. Contact kan niet toegevoegd worden.";
+$a->strings["OStatus support is disabled. Contact can't be added."] = "OStatus ondersteuning is niet geactiveerd. Contact kan niet toegevoegd woren.";
+$a->strings["The network type couldn't be detected. Contact can't be added."] = "Het type netwerk kon niet gedetecteerd worden. Contact kan niet toegevoegd worden.";
+$a->strings["Friend suggestion sent."] = "Vriendschapsvoorstel verzonden.";
+$a->strings["Suggest Friends"] = "Stel vrienden voor";
+$a->strings["Suggest a friend for %s"] = "Stel een vriend voor aan %s";
+$a->strings["Group created."] = "Groep aangemaakt.";
+$a->strings["Could not create group."] = "Kon de groep niet aanmaken.";
+$a->strings["Group not found."] = "Groep niet gevonden.";
+$a->strings["Group name changed."] = "Groepsnaam gewijzigd.";
+$a->strings["Permission denied"] = "Toegang geweigerd";
+$a->strings["Save Group"] = "Bewaar groep";
+$a->strings["Filter"] = "filter";
+$a->strings["Create a group of contacts/friends."] = "Maak een groep contacten/vrienden aan.";
+$a->strings["Group Name: "] = "Groepsnaam:";
+$a->strings["Contacts not in any group"] = "Contacten bestaan in geen enkele groep";
+$a->strings["Group removed."] = "Groep verwijderd.";
+$a->strings["Unable to remove group."] = "Niet in staat om groep te verwijderen.";
+$a->strings["Delete Group"] = "Verwijder Groep";
+$a->strings["Edit Group Name"] = "Bewerk Groep Naam";
+$a->strings["Members"] = "Leden";
+$a->strings["Group is empty"] = "De groep is leeg";
+$a->strings["Remove contact from group"] = "Verwijder contact uit de groep";
+$a->strings["Click on a contact to add or remove."] = "Klik op een contact om het toe te voegen of te verwijderen.";
+$a->strings["Add contact to group"] = "Voeg contact toe aan de groep";
+$a->strings["No profile"] = "Geen profiel";
+$a->strings["Friendica Communications Server - Setup"] = "Friendica Communicatie Server - Setup";
+$a->strings["Could not connect to database."] = "Kon geen toegang krijgen tot de database.";
+$a->strings["Could not create table."] = "Kon tabel niet aanmaken.";
+$a->strings["Your Friendica site database has been installed."] = "De database van je Friendica-website is geïnstalleerd.";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Het kan nodig zijn om het bestand \"database.sql\" manueel te importeren met phpmyadmin of mysql.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Zie het bestand \"INSTALL.txt\".";
+$a->strings["Database already in use."] = "Database al in gebruik.";
+$a->strings["System check"] = "Systeemcontrole";
+$a->strings["Check again"] = "Controleer opnieuw";
+$a->strings["Database connection"] = "Verbinding met database";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "Om Friendica te kunnen installeren moet ik weten hoe ik jouw database kan bereiken.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Neem contact op met jouw hostingprovider of websitebeheerder, wanneer je vragen hebt over deze instellingen. ";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "De database die je hier opgeeft zou al moeten bestaan. Maak anders de database aan voordat je verder gaat.";
+$a->strings["Database Server Name"] = "Servernaam database";
+$a->strings["Database Login Name"] = "Gebruikersnaam database";
+$a->strings["Database Login Password"] = "Wachtwoord database";
+$a->strings["For security reasons the password must not be empty"] = "Om veiligheidsreden mag het paswoord niet leeg zijn";
+$a->strings["Database Name"] = "Naam database";
+$a->strings["Site administrator email address"] = "E-mailadres van de websitebeheerder";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Het e-mailadres van je account moet hiermee overeenkomen om het administratiepaneel te kunnen gebruiken.";
+$a->strings["Please select a default timezone for your website"] = "Selecteer een standaard tijdzone voor je website";
+$a->strings["Site settings"] = "Website-instellingen";
+$a->strings["System Language:"] = "Systeem taal:";
+$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Stel de standaard taal in voor je Friendica installatie interface en emails.";
+$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."] = "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. ";
+$a->strings["<h1>What next</h1>"] = "<h1>Wat nu</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "BELANGRIJK: Je zal [manueel] een geplande taak moeten opzetten voor de 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."] = "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.";
+$a->strings["Total invitation limit exceeded."] = "Totale uitnodigingslimiet overschreden.";
+$a->strings["%s : Not a valid email address."] = "%s: Geen geldig e-mailadres.";
+$a->strings["Please join us on Friendica"] = "Kom bij ons op Friendica";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Uitnodigingslimiet overschreden. Neem contact op met de beheerder van je website.";
+$a->strings["%s : Message delivery failed."] = "%s : Aflevering van bericht mislukt.";
+$a->strings["%d message sent."] = [
+	0 => "%d bericht verzonden.",
+	1 => "%d berichten verzonden.",
+];
+$a->strings["You have no more invitations available"] = "Je kunt geen uitnodigingen meer sturen";
+$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."] = "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.";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Om deze uitnodiging te accepteren kan je je op %s registreren of op een andere vrij toegankelijke Friendica-website.";
+$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 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.";
+$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Onze verontschuldigingen. Dit systeem is momenteel niet ingesteld om verbinding te maken met andere openbare plaatsen of leden uit te nodigen.";
+$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 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.";
+$a->strings["To accept this invitation, please visit and register at %s."] = "Om deze uitnodiging te accepteren, ga naar en registreer op %s.";
+$a->strings["Send invitations"] = "Verstuur uitnodigingen";
+$a->strings["Enter email addresses, one per line:"] = "Vul e-mailadressen in, één per lijn:";
+$a->strings["Your message:"] = "Jouw bericht:";
+$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "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.";
+$a->strings["You will need to supply this invitation code: \$invite_code"] = "Je zult deze uitnodigingscode moeten invullen: \$invite_code";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Eens je geregistreerd bent kun je contact leggen met mij via mijn profielpagina op:";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "Voor meer informatie over het Friendica project en waarom wij denken dat het belangrijk is kun je http://friendi.ca/ bezoeken";
+$a->strings["Unable to locate original post."] = "Ik kan de originele post niet meer vinden.";
+$a->strings["Empty post discarded."] = "Lege post weggegooid.";
+$a->strings["Wall Photos"] = "Tijdlijn foto's";
+$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Dit bericht werd naar jou gestuurd door %s, een lid van het Friendica sociale netwerk.";
+$a->strings["You may visit them online at %s"] = "Je kunt ze online bezoeken op %s";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Contacteer de afzender door op dit bericht te antwoorden als je deze berichten niet wilt ontvangen.";
+$a->strings["%s posted an update."] = "%s heeft een wijziging geplaatst.";
+$a->strings["Remote privacy information not available."] = "Privacyinformatie op afstand niet beschikbaar.";
+$a->strings["Visible to:"] = "Zichtbaar voor:";
+$a->strings["No valid account found."] = "Geen geldige account gevonden.";
+$a->strings["Password reset request issued. Check your email."] = "Verzoek om wachtwoord opnieuw in te stellen werd verstuurd. Kijk uw e-mail na.";
+$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."] = "\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.";
+$a->strings["\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"] = "\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";
+$a->strings["Password reset requested at %s"] = "Op %s werd gevraagd je wachtwoord opnieuw in te stellen";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Verzoek kon niet geverifieerd worden. (Misschien heb je het voordien al ingediend.) Wachtwoord niet opnieuw ingesteld.";
+$a->strings["Request has expired, please make a new one."] = "Aanvraag is verlopen, gelieve een nieuwe aan te maken.";
+$a->strings["Forgot your Password?"] = "Wachtwoord vergeten?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Voer je e-mailadres in en verstuur het om je wachtwoord opnieuw in te stellen. Kijk dan je e-mail na voor verdere instructies.";
+$a->strings["Nickname or Email: "] = "Bijnaam of e-mail:";
+$a->strings["Reset"] = "Opnieuw";
+$a->strings["Password Reset"] = "Wachtwoord opnieuw instellen";
+$a->strings["Your password has been reset as requested."] = "Je wachtwoord is opnieuw ingesteld zoals gevraagd.";
+$a->strings["Your new password is"] = "Je nieuwe wachtwoord is";
+$a->strings["Save or copy your new password - and then"] = "Bewaar of kopieer je nieuw wachtwoord - en dan";
+$a->strings["click here to login"] = "klik hier om in te loggen";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Je kunt dit wachtwoord veranderen nadat je bent ingelogd op de <em>Instellingen></em> pagina.";
+$a->strings["\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"] = "\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";
+$a->strings["\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"] = "\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";
+$a->strings["Your password has been changed at %s"] = "Je wachtwoord is veranderd op %s";
+$a->strings["Manage Identities and/or Pages"] = "Beheer Identiteiten en/of Pagina's";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wissel tussen verschillende identiteiten of forum/groeppagina's die jouw accountdetails delen of waar je \"beheerdersrechten\" hebt gekregen.";
+$a->strings["Select an identity to manage: "] = "Selecteer een identiteit om te beheren:";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "Geen sleutelwoorden om te zoeken. Voeg sleutelwoorden toe aan je standaard profiel.";
+$a->strings["is interested in:"] = "Is geïnteresseerd in:";
+$a->strings["Profile Match"] = "Profielmatch";
+$a->strings["New Message"] = "Nieuw Bericht";
+$a->strings["No recipient selected."] = "Geen ontvanger geselecteerd.";
+$a->strings["Unable to locate contact information."] = "Ik kan geen contact informatie vinden.";
+$a->strings["Message could not be sent."] = "Bericht kon niet verzonden worden.";
+$a->strings["Message collection failure."] = "Fout bij het verzamelen van berichten.";
+$a->strings["Message sent."] = "Bericht verzonden.";
 $a->strings["Discard"] = "Verwerpen";
+$a->strings["Messages"] = "Privéberichten";
+$a->strings["Do you really want to delete this message?"] = "Wil je echt dit bericht verwijderen?";
+$a->strings["Message deleted."] = "Bericht verwijderd.";
+$a->strings["Conversation removed."] = "Gesprek verwijderd.";
+$a->strings["Send Private Message"] = "Verstuur privébericht";
+$a->strings["To:"] = "Aan:";
+$a->strings["Subject:"] = "Onderwerp:";
+$a->strings["No messages."] = "Geen berichten.";
+$a->strings["Message not available."] = "Bericht niet beschikbaar.";
+$a->strings["Delete message"] = "Verwijder bericht";
+$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:i A";
+$a->strings["Delete conversation"] = "Verwijder gesprek";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Geen beveiligde communicatie beschikbaar. Je kunt <strong>misschien</strong> antwoorden vanaf de profiel-pagina van de afzender.";
+$a->strings["Send Reply"] = "Verstuur Antwoord";
+$a->strings["Unknown sender - %s"] = "Onbekende afzender - %s";
+$a->strings["You and %s"] = "Jij en %s";
+$a->strings["%s and You"] = "%s en jij";
+$a->strings["%d message"] = [
+	0 => "%d bericht",
+	1 => "%d berichten",
+];
+$a->strings["Remove term"] = "Verwijder zoekterm";
+$a->strings["Saved Searches"] = "Opgeslagen zoekopdrachten";
+$a->strings["add"] = "toevoegen";
+$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
+	0 => "Waarschuwing: Deze groep bevat %s lid van een netwerk dat geen niet-publieke boodschappen toelaat.",
+	1 => "Waarschuwing: Deze groep bevat %s leden van een netwerk dat geen niet-publieke boodschappen toelaat.",
+];
+$a->strings["Messages in this group won't be send to these receivers."] = "Boodschappen in deze groep zullen niet verzonden worden naar deze ontvangers.";
+$a->strings["No such group"] = "Zo'n groep bestaat niet";
+$a->strings["Group: %s"] = "Groep: %s";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "Privéberichten naar deze persoon kunnen openbaar gemaakt worden.";
+$a->strings["Invalid contact."] = "Ongeldig contact.";
+$a->strings["Commented Order"] = "Nieuwe reacties bovenaan";
+$a->strings["Sort by Comment Date"] = "Berichten met nieuwe reacties bovenaan";
+$a->strings["Posted Order"] = "Nieuwe berichten bovenaan";
+$a->strings["Sort by Post Date"] = "Nieuwe berichten bovenaan";
+$a->strings["Personal"] = "Persoonlijk";
+$a->strings["Posts that mention or involve you"] = "Alleen berichten die jou vermelden of op jou betrekking hebben";
+$a->strings["New"] = "Nieuw";
+$a->strings["Activity Stream - by date"] = "Activiteitenstroom - volgens datum";
+$a->strings["Shared Links"] = "Gedeelde links";
+$a->strings["Interesting Links"] = "Interessante links";
+$a->strings["Starred"] = "Met ster";
+$a->strings["Favourite Posts"] = "Favoriete berichten";
+$a->strings["Personal Notes"] = "Persoonlijke Nota's";
+$a->strings["Invalid request identifier."] = "Ongeldige <em>request identifier</em>.";
 $a->strings["Notifications"] = "Notificaties";
 $a->strings["Network Notifications"] = "Netwerknotificaties";
+$a->strings["System Notifications"] = "Systeemnotificaties";
 $a->strings["Personal Notifications"] = "Persoonlijke notificaties";
 $a->strings["Home Notifications"] = "Tijdlijn-notificaties";
 $a->strings["Show Ignored Requests"] = "Toon genegeerde verzoeken";
 $a->strings["Hide Ignored Requests"] = "Verberg genegeerde verzoeken";
-$a->strings["Notification type: "] = "Notificatiesoort:";
-$a->strings["suggested by %s"] = "Voorgesteld door %s";
-$a->strings["Approve"] = "Goedkeuren";
+$a->strings["Notification type:"] = "Notificatiesoort:";
+$a->strings["Suggested by:"] = "Voorgesteld door:";
 $a->strings["Claims to be known to you: "] = "Denkt dat je hem of haar kent:";
 $a->strings["yes"] = "Ja";
 $a->strings["no"] = "Nee";
-$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["Shall your connection be bidirectional or not?"] = "Zal je connectie bidirectioneel zijn of niet?";
+$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."] = "%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.";
+$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."] = "%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.";
+$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."] = "%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.";
 $a->strings["Friend"] = "Vriend";
 $a->strings["Sharer"] = "Deler";
-$a->strings["Subscriber"] = "";
+$a->strings["Subscriber"] = "Volger";
 $a->strings["No introductions."] = "Geen vriendschaps- of connectieverzoeken.";
-$a->strings["Show unread"] = "";
-$a->strings["Show all"] = "";
-$a->strings["No more %s notifications."] = "";
+$a->strings["Show unread"] = "Toon ongelezen";
+$a->strings["Show all"] = "Toon alles";
+$a->strings["No more %s notifications."] = "Geen %s notificaties meer.";
+$a->strings["No more system notifications."] = "Geen systeemnotificaties meer.";
+$a->strings["Post successful."] = "Bericht succesvol geplaatst.";
+$a->strings["OpenID protocol error. No ID returned."] = "OpenID protocol fout. Geen ID Gevonden.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account niet gevonden, en OpenID-registratie is niet toegelaten op deze website.";
+$a->strings["Login failed."] = "Login mislukt.";
+$a->strings["Photo Albums"] = "Fotoalbums";
+$a->strings["Recent Photos"] = "Recente foto's";
+$a->strings["Upload New Photos"] = "Nieuwe foto's uploaden";
+$a->strings["everybody"] = "iedereen";
+$a->strings["Contact information unavailable"] = "Contactinformatie niet beschikbaar";
+$a->strings["Album not found."] = "Album niet gevonden";
+$a->strings["Delete Album"] = "Verwijder album";
+$a->strings["Do you really want to delete this photo album and all its photos?"] = "Wil je echt dit fotoalbum en alle foto's erin verwijderen?";
+$a->strings["Delete Photo"] = "Verwijder foto";
+$a->strings["Do you really want to delete this photo?"] = "Wil je echt deze foto verwijderen?";
+$a->strings["a photo"] = "een foto";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s is gelabeld in %2\$s door %3\$s";
+$a->strings["Image exceeds size limit of %s"] = "Beeld is groter dan de limiet ( %s )";
+$a->strings["Image upload didn't complete, please try again"] = "Opladen van het beeld is niet compleet, probeer het opnieuw";
+$a->strings["Image file is missing"] = "Beeld bestand ontbreekt";
+$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "De server kan op dit moment geen nieuw bestand opladen, contacteer alsjeblieft je beheerder";
+$a->strings["Image file is empty."] = "Afbeeldingsbestand is leeg.";
+$a->strings["Unable to process image."] = "Niet in staat om de afbeelding te verwerken";
+$a->strings["Image upload failed."] = "Uploaden van afbeelding mislukt.";
+$a->strings["No photos selected"] = "Geen foto's geselecteerd";
+$a->strings["Access to this item is restricted."] = "Toegang tot dit item is beperkt.";
+$a->strings["Upload Photos"] = "Upload foto's";
+$a->strings["New album name: "] = "Nieuwe albumnaam: ";
+$a->strings["or select existing album:"] = "Of selecteer bestaand album:";
+$a->strings["Do not show a status post for this upload"] = "Toon geen bericht op je tijdlijn van deze upload";
+$a->strings["Show to Groups"] = "Tonen aan groepen";
+$a->strings["Show to Contacts"] = "Tonen aan contacten";
+$a->strings["Edit Album"] = "Album wijzigen";
+$a->strings["Show Newest First"] = "Toon niewste eerst";
+$a->strings["Show Oldest First"] = "Toon oudste eerst";
+$a->strings["View Photo"] = "Bekijk foto";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Toegang geweigerd. Toegang tot dit item is mogelijk beperkt.";
+$a->strings["Photo not available"] = "Foto is niet beschikbaar";
+$a->strings["View photo"] = "Bekijk foto";
+$a->strings["Edit photo"] = "Bewerk foto";
+$a->strings["Use as profile photo"] = "Gebruik als profielfoto";
+$a->strings["Private Message"] = "Privébericht";
+$a->strings["View Full Size"] = "Bekijk in volledig formaat";
+$a->strings["Tags: "] = "Labels: ";
+$a->strings["[Remove any tag]"] = "[Alle labels verwijderen]";
+$a->strings["New album name"] = "Nieuwe albumnaam";
+$a->strings["Caption"] = "Onderschrift";
+$a->strings["Add a Tag"] = "Een label toevoegen";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl, #Ardennen, #camping ";
+$a->strings["Do not rotate"] = "Niet roteren";
+$a->strings["Rotate CW (right)"] = "Roteren met de klok mee (rechts)";
+$a->strings["Rotate CCW (left)"] = "Roteren tegen de klok in (links)";
+$a->strings["I like this (toggle)"] = "Vind ik leuk";
+$a->strings["I don't like this (toggle)"] = "Vind ik niet leuk";
+$a->strings["Comment"] = "Reacties";
+$a->strings["Map"] = "Kaart";
+$a->strings["View Album"] = "Album bekijken";
+$a->strings["{0} wants to be your friend"] = "{0} wilt je vriend worden";
+$a->strings["{0} sent you a message"] = "{0} stuurde jou een bericht";
+$a->strings["{0} requested registration"] = "{0} vroeg om zich te registreren";
+$a->strings["Poke/Prod"] = "Aanstoten/porren";
+$a->strings["poke, prod or do other things to somebody"] = "aanstoten, porren of andere dingen met iemand doen";
+$a->strings["Recipient"] = "Ontvanger";
+$a->strings["Choose what you wish to do to recipient"] = "Kies wat je met de ontvanger wil doen";
+$a->strings["Make this post private"] = "Dit bericht privé maken";
+$a->strings["Requested profile is not available."] = "Gevraagde profiel is niet beschikbaar.";
+$a->strings["%s's timeline"] = "Tijdslijn van %s";
+$a->strings["%s's posts"] = "Berichten van %s";
+$a->strings["%s's comments"] = "reactie van %s";
+$a->strings["Image uploaded but image cropping failed."] = "Afbeelding opgeladen, maar bijsnijden mislukt.";
+$a->strings["Image size reduction [%s] failed."] = "Verkleining van de afbeelding [%s] mislukt.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Shift-herlaad de pagina, of maak de browser cache leeg als nieuwe foto's niet onmiddellijk verschijnen.";
+$a->strings["Unable to process image"] = "Ik kan de afbeelding niet verwerken";
+$a->strings["Upload File:"] = "Upload bestand:";
+$a->strings["Select a profile:"] = "Kies een profiel:";
+$a->strings["or"] = "of";
+$a->strings["skip this step"] = "Deze stap overslaan";
+$a->strings["select a photo from your photo albums"] = "Kies een foto uit je fotoalbums";
+$a->strings["Crop Image"] = "Afbeelding bijsnijden";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Pas het afsnijden van de afbeelding aan voor het beste resultaat.";
+$a->strings["Done Editing"] = "Wijzigingen compleet";
+$a->strings["Image uploaded successfully."] = "Uploaden van afbeelding gelukt.";
 $a->strings["Profile deleted."] = "Profiel verwijderd";
 $a->strings["Profile-"] = "Profiel-";
 $a->strings["New profile created."] = "Nieuw profiel aangemaakt.";
@@ -875,37 +1339,35 @@ $a->strings["Religion"] = "Godsdienst";
 $a->strings["Political Views"] = "Politieke standpunten";
 $a->strings["Gender"] = "Geslacht";
 $a->strings["Sexual Preference"] = "Seksuele Voorkeur";
-$a->strings["XMPP"] = "";
+$a->strings["XMPP"] = "XMPP";
 $a->strings["Homepage"] = "Tijdlijn";
 $a->strings["Interests"] = "Interesses";
-$a->strings["Address"] = "Adres";
 $a->strings["Location"] = "Plaats";
-$a->strings["Profile updated."] = "Profiel bijgewerkt.";
-$a->strings["Hide contacts and friends:"] = "";
+$a->strings["Profile updated."] = "Profiel opgeslagen";
+$a->strings["Hide contacts and friends:"] = "Verberg contacten en vrienden:";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "Je vrienden/contacten verbergen voor bezoekers van dit profiel?";
-$a->strings["Show more profile fields:"] = "";
-$a->strings["Profile Actions"] = "";
+$a->strings["Show more profile fields:"] = "Toon meer profiel velden:";
+$a->strings["Profile Actions"] = "Profiel Acties";
 $a->strings["Edit Profile Details"] = "Profieldetails bewerken";
 $a->strings["Change Profile Photo"] = "Profielfoto wijzigen";
 $a->strings["View this profile"] = "Dit profiel bekijken";
+$a->strings["View all profiles"] = "Toon alle profielen";
 $a->strings["Edit visibility"] = "Pas zichtbaarheid aan";
 $a->strings["Create a new profile using these settings"] = "Nieuw profiel aanmaken met deze instellingen";
 $a->strings["Clone this profile"] = "Dit profiel klonen";
 $a->strings["Delete this profile"] = "Dit profiel verwijderen";
-$a->strings["Basic information"] = "";
-$a->strings["Profile picture"] = "";
-$a->strings["Preferences"] = "";
-$a->strings["Status information"] = "";
-$a->strings["Additional information"] = "";
-$a->strings["Personal"] = "Persoonlijk";
-$a->strings["Relation"] = "";
+$a->strings["Basic information"] = "Basis informatie";
+$a->strings["Profile picture"] = "Profiel foto";
+$a->strings["Preferences"] = "Voorkeuren";
+$a->strings["Status information"] = "Status informatie";
+$a->strings["Additional information"] = "Bijkomende informatie";
+$a->strings["Relation"] = "Relatie";
 $a->strings["Miscellaneous"] = "Diversen";
 $a->strings["Your Gender:"] = "Je Geslacht:";
 $a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Echtelijke Staat:";
 $a->strings["Sexual Preference:"] = "Seksuele Voorkeur:";
 $a->strings["Example: fishing photography software"] = "Voorbeeld: vissen fotografie software";
 $a->strings["Profile Name:"] = "Profiel Naam:";
-$a->strings["Required"] = "Vereist";
 $a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dit is jouw <strong>publiek</strong> profiel.<br />Het <strong>kan</strong> zichtbaar zijn voor iedereen op het internet.";
 $a->strings["Your Full Name:"] = "Je volledige naam:";
 $a->strings["Title/Description:"] = "Titel/Beschrijving:";
@@ -919,8 +1381,8 @@ $a->strings["Who: (if applicable)"] = "Wie: (indien toepasbaar)";
 $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Voorbeelden: Kathleen123, Kathleen Peeters, kathleen@voorbeeld.nl";
 $a->strings["Since [date]:"] = "Sinds [datum]:";
 $a->strings["Tell us about yourself..."] = "Vertel iets over jezelf...";
-$a->strings["XMPP (Jabber) address:"] = "";
-$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "";
+$a->strings["XMPP (Jabber) address:"] = "XMPP (Jabber) adres:";
+$a->strings["The XMPP address will be propagated to your contacts so that they can follow you."] = "Het XMPP adres zal doorgegeven worden aan je contacten zodat zij je kunnen volgen.";
 $a->strings["Homepage URL:"] = "Adres tijdlijn:";
 $a->strings["Hometown:"] = "Woonplaats:";
 $a->strings["Political Views:"] = "Politieke standpunten:";
@@ -945,560 +1407,75 @@ $a->strings["visible to everybody"] = "zichtbaar voor iedereen";
 $a->strings["Edit/Manage Profiles"] = "Wijzig/Beheer Profielen";
 $a->strings["Change profile photo"] = "Profiel foto wijzigen";
 $a->strings["Create New Profile"] = "Maak nieuw profiel";
-$a->strings["Theme settings updated."] = "Thema-instellingen aangepast.";
-$a->strings["Information"] = "Informatie";
-$a->strings["Overview"] = "";
-$a->strings["Federation Statistics"] = "";
-$a->strings["Configuration"] = "";
-$a->strings["Site"] = "Website";
-$a->strings["Users"] = "Gebruiker";
-$a->strings["Addons"] = "";
-$a->strings["Themes"] = "Thema's";
-$a->strings["Additional features"] = "Extra functies";
-$a->strings["Terms of Service"] = "";
-$a->strings["Database"] = "";
-$a->strings["DB updates"] = "DB aanpassingen";
-$a->strings["Inspect Queue"] = "";
-$a->strings["Tools"] = "";
-$a->strings["Contact Blocklist"] = "";
-$a->strings["Server Blocklist"] = "";
-$a->strings["Delete Item"] = "";
-$a->strings["Logs"] = "Logs";
-$a->strings["View Logs"] = "";
-$a->strings["Diagnostics"] = "";
-$a->strings["PHP Info"] = "";
-$a->strings["probe address"] = "";
-$a->strings["check webfinger"] = "";
-$a->strings["Admin"] = "Beheer";
-$a->strings["Addon Features"] = "";
-$a->strings["User registrations waiting for confirmation"] = "Gebruikersregistraties wachten op bevestiging";
-$a->strings["Administration"] = "Beheer";
-$a->strings["Display Terms of Service"] = "";
-$a->strings["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."] = "";
-$a->strings["Display Privacy Statement"] = "";
-$a->strings["Show some informations regarding the needed information to operate the node according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."] = "";
-$a->strings["Privacy Statement Preview"] = "";
-$a->strings["The Terms of Service"] = "";
-$a->strings["Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below."] = "";
-$a->strings["The blocked domain"] = "";
-$a->strings["The reason why you blocked this domain."] = "";
-$a->strings["Delete domain"] = "";
-$a->strings["Check to delete this entry from the blocklist"] = "";
-$a->strings["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."] = "";
-$a->strings["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."] = "";
-$a->strings["Add new entry to block list"] = "";
-$a->strings["Server Domain"] = "";
-$a->strings["The domain of the new server to add to the block list. Do not include the protocol."] = "";
-$a->strings["Block reason"] = "";
-$a->strings["Add Entry"] = "";
-$a->strings["Save changes to the blocklist"] = "";
-$a->strings["Current Entries in the Blocklist"] = "";
-$a->strings["Delete entry from blocklist"] = "";
-$a->strings["Delete entry from blocklist?"] = "";
-$a->strings["Server added to blocklist."] = "";
-$a->strings["Site blocklist updated."] = "";
-$a->strings["The contact has been blocked from the node"] = "";
-$a->strings["Could not find any contact entry for this URL (%s)"] = "";
-$a->strings["%s contact unblocked"] = [
-	0 => "",
-	1 => "",
-];
-$a->strings["Remote Contact Blocklist"] = "";
-$a->strings["This page allows you to prevent any message from a remote contact to reach your node."] = "";
-$a->strings["Block Remote Contact"] = "";
-$a->strings["select all"] = "Alles selecteren";
-$a->strings["select none"] = "";
-$a->strings["No remote contact is blocked from this node."] = "";
-$a->strings["Blocked Remote Contacts"] = "";
-$a->strings["Block New Remote Contact"] = "";
-$a->strings["Photo"] = "";
-$a->strings["%s total blocked contact"] = [
-	0 => "",
-	1 => "",
-];
-$a->strings["URL of the remote contact to block."] = "";
-$a->strings["Delete this Item"] = "";
-$a->strings["On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted."] = "";
-$a->strings["You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456."] = "";
-$a->strings["GUID"] = "";
-$a->strings["The GUID of the item you want to delete."] = "";
-$a->strings["Item marked for deletion."] = "";
-$a->strings["unknown"] = "";
-$a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "";
-$a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "";
-$a->strings["Currently this node is aware of %d nodes with %d registered users from the following platforms:"] = "";
-$a->strings["ID"] = "ID";
-$a->strings["Recipient Name"] = "";
-$a->strings["Recipient Profile"] = "";
-$a->strings["Network"] = "Netwerk";
-$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["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"] = "";
-$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["Normal Account"] = "Normaal account";
-$a->strings["Automatic Follower Account"] = "";
-$a->strings["Public Forum Account"] = "";
-$a->strings["Automatic Friend Account"] = "Automatisch Vriendschapsaccount";
-$a->strings["Blog Account"] = "Blog Account";
-$a->strings["Private Forum Account"] = "";
-$a->strings["Message queues"] = "Bericht-wachtrijen";
-$a->strings["Summary"] = "Samenvatting";
-$a->strings["Registered users"] = "Geregistreerde gebruikers";
-$a->strings["Pending registrations"] = "Registraties die in de wacht staan";
-$a->strings["Version"] = "Versie";
-$a->strings["Active addons"] = "";
-$a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] = "";
-$a->strings["Site settings updated."] = "Site instellingen gewijzigd.";
-$a->strings["No special theme for mobile devices"] = "Geen speciaal thema voor mobiele apparaten";
-$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["Users, Global Contacts"] = "";
-$a->strings["Users, Global Contacts/fallback"] = "";
-$a->strings["One month"] = "";
-$a->strings["Three months"] = "";
-$a->strings["Half a year"] = "";
-$a->strings["One year"] = "";
-$a->strings["Multi user instance"] = "Server voor meerdere gebruikers";
-$a->strings["Closed"] = "Gesloten";
-$a->strings["Requires approval"] = "Toestemming vereist";
-$a->strings["Open"] = "Open";
-$a->strings["No SSL policy, links will track page SSL state"] = "Geen SSL beleid, links zullen SSL status van pagina volgen";
-$a->strings["Force all links to use SSL"] = "Verplicht alle links om SSL te gebruiken";
-$a->strings["Self-signed certificate, use SSL for local links only (discouraged)"] = "Zelf-ondertekend certificaat, gebruik SSL alleen voor lokale links (afgeraden)";
-$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"] = "Registratie";
-$a->strings["File upload"] = "Uploaden bestand";
-$a->strings["Policies"] = "Beleid";
-$a->strings["Auto Discovered Contact Directory"] = "";
-$a->strings["Performance"] = "Performantie";
-$a->strings["Worker"] = "";
-$a->strings["Message Relay"] = "";
-$a->strings["Relocate - WARNING: advanced function. Could make this server unreachable."] = "";
-$a->strings["Site name"] = "Site naam";
-$a->strings["Host name"] = "";
-$a->strings["Sender Email"] = "";
-$a->strings["The email address your server shall use to send notification emails from."] = "";
-$a->strings["Banner/Logo"] = "Banner/Logo";
-$a->strings["Shortcut icon"] = "";
-$a->strings["Link to an icon that will be used for browsers."] = "";
-$a->strings["Touch icon"] = "Pictogram voor smartphones";
-$a->strings["Link to an icon that will be used for tablets and mobiles."] = "";
-$a->strings["Additional Info"] = "";
-$a->strings["For public servers: you can add additional information here that will be listed at %s/servers."] = "";
-$a->strings["System language"] = "Systeemtaal";
-$a->strings["System theme"] = "Systeem thema";
-$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Standaard systeem thema - kan door gebruikersprofielen veranderd worden - <a href='#' id='cnftheme'>verander thema instellingen</a>";
-$a->strings["Mobile system theme"] = "Mobiel systeem thema";
-$a->strings["Theme for mobile devices"] = "Thema voor mobiele apparaten";
-$a->strings["SSL link policy"] = "Beleid SSL-links";
-$a->strings["Determines whether generated links should be forced to use SSL"] = "Bepaald of gegenereerde verwijzingen verplicht SSL moeten gebruiken";
-$a->strings["Force SSL"] = "";
-$a->strings["Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops."] = "";
-$a->strings["Hide help entry from navigation menu"] = "Verberg de 'help' uit het navigatiemenu";
-$a->strings["Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly."] = "Verbergt het menu-item voor de Help pagina's uit het navigatiemenu. Je kunt ze nog altijd vinden door /help direct in te geven.";
-$a->strings["Single user instance"] = "Server voor één gebruiker";
-$a->strings["Make this instance multi-user or single-user for the named user"] = "Stel deze server in voor meerdere gebruikers, of enkel voor de geselecteerde gebruiker.";
-$a->strings["Maximum image size"] = "Maximum afbeeldingsgrootte";
-$a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximum afmeting in bytes van afbeeldingen. Standaard is 0, dus geen beperking.";
-$a->strings["Maximum image length"] = "Maximum afbeeldingslengte";
-$a->strings["Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits."] = "Maximum lengte in pixels van de langste kant van afbeeldingen. Standaard is -1, dus geen beperkingen.";
-$a->strings["JPEG image quality"] = "JPEG afbeeldingskwaliteit";
-$a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "JPEGS zullen met deze kwaliteitsinstelling bewaard worden [0-100]. Standaard is 100, dit is volledige kwaliteit.";
-$a->strings["Register policy"] = "Registratiebeleid";
-$a->strings["Maximum Daily Registrations"] = "Maximum aantal registraties per dag";
-$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."] = "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.";
-$a->strings["Register text"] = "Registratietekst";
-$a->strings["Will be displayed prominently on the registration page. You can use BBCode here."] = "";
-$a->strings["Accounts abandoned after x days"] = "Verlaten accounts na x dagen";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Dit zal geen systeembronnen verspillen aan het nakijken van externe sites voor verlaten accounts. Geef 0 is voor geen tijdslimiet.";
-$a->strings["Allowed friend domains"] = "Toegelaten vriend domeinen";
-$a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Komma-gescheiden lijst van domeinen die een vriendschapsband met deze website mogen aangaan. Jokers zijn toegelaten. Laat leeg om alle domeinen toe te laten.";
-$a->strings["Allowed email domains"] = "Toegelaten e-mail domeinen";
-$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"] = "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.";
-$a->strings["No OEmbed rich content"] = "";
-$a->strings["Don't show the rich content (e.g. embedded PDF), except from the domains listed below."] = "";
-$a->strings["Allowed OEmbed domains"] = "";
-$a->strings["Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted."] = "";
-$a->strings["Block public"] = "Openbare toegang blokkeren";
-$a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Kruis dit aan om alle openbare persoonlijke pagina's alleen toegankelijk te maken voor ingelogde gebruikers.";
-$a->strings["Force publish"] = "Dwing publiceren af";
-$a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Kruis dit aan om af te dwingen dat alle profielen op deze website in de gids van deze website gepubliceerd worden.";
-$a->strings["Enabling this may violate privacy laws like the GDPR"] = "";
-$a->strings["Global directory URL"] = "";
-$a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "";
-$a->strings["Private posts by default for new users"] = "Privéberichten als standaard voor nieuwe gebruikers";
-$a->strings["Set default post permissions for all new members to the default privacy group rather than public."] = "Stel de standaardrechten van berichten voor nieuwe leden op de standaard privacygroep in, in plaats van openbaar.";
-$a->strings["Don't include post content in email notifications"] = "De inhoud van het bericht niet insluiten bij e-mailnotificaties";
-$a->strings["Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure."] = "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.";
-$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["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"] = "Blokkeer meerdere registraties";
-$a->strings["Disallow users to register additional accounts for use as pages."] = "Laat niet toe dat gebruikers meerdere accounts aanmaken.";
-$a->strings["OpenID support"] = "OpenID ondersteuning";
-$a->strings["OpenID support for registration and logins."] = "OpenID ondersteuning voor registraties en logins.";
-$a->strings["Fullname check"] = "Controleer volledige naam";
-$a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Verplicht gebruikers om zich te registreren met een spatie tussen voornaam en achternaam, als anti-spam maatregel";
-$a->strings["Community pages for visitors"] = "";
-$a->strings["Which community pages should be available for visitors. Local users always see both pages."] = "";
-$a->strings["Posts per user on community page"] = "";
-$a->strings["The maximum number of posts per user on the community page. (Not valid for 'Global Community')"] = "";
-$a->strings["Enable OStatus support"] = "Activeer OStatus ondersteuning";
-$a->strings["Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed."] = "";
-$a->strings["Only import OStatus threads from our contacts"] = "";
-$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."] = "";
-$a->strings["OStatus support can only be enabled if threading is enabled."] = "";
-$a->strings["Diaspora support can't be enabled because Friendica was installed into a sub directory."] = "";
-$a->strings["Enable Diaspora support"] = "Activeer Diaspora ondersteuning";
-$a->strings["Provide built-in Diaspora network compatibility."] = "Bied ingebouwde ondersteuning voor het Diaspora netwerk.";
-$a->strings["Only allow Friendica contacts"] = "Laat alleen Friendica contacten toe";
-$a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle contacten moeten een Friendica protocol gebruiken. Alle andere ingebouwde communicatieprotocols worden uitgeschakeld.";
-$a->strings["Verify SSL"] = "Controleer SSL";
-$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "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.";
-$a->strings["Proxy user"] = "Proxy-gebruiker";
-$a->strings["Proxy URL"] = "Proxy-URL";
-$a->strings["Network timeout"] = "Netwerk timeout";
-$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Waarde is in seconden. Zet op 0 voor onbeperkt (niet aanbevolen).";
-$a->strings["Maximum Load Average"] = "Maximum gemiddelde belasting";
-$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximum systeembelasting voordat aflever- en poll-processen uitgesteld worden - standaard 50.";
-$a->strings["Maximum Load Average (Frontend)"] = "";
-$a->strings["Maximum system load before the frontend quits service - default 50."] = "";
-$a->strings["Minimal Memory"] = "";
-$a->strings["Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated)."] = "";
-$a->strings["Maximum table size for optimization"] = "";
-$a->strings["Maximum table size (in MB) for the automatic optimization. Enter -1 to disable it."] = "";
-$a->strings["Minimum level of fragmentation"] = "";
-$a->strings["Minimum fragmenation level to start the automatic optimization - default value is 30%."] = "";
-$a->strings["Periodical check of global contacts"] = "";
-$a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "";
-$a->strings["Days between requery"] = "";
-$a->strings["Number of days after which a server is requeried for his contacts."] = "";
-$a->strings["Discover contacts from other servers"] = "";
-$a->strings["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'."] = "";
-$a->strings["Timeframe for fetching global contacts"] = "";
-$a->strings["When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."] = "";
-$a->strings["Search the local directory"] = "";
-$a->strings["Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated."] = "";
-$a->strings["Publish server information"] = "";
-$a->strings["If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See <a href='http://the-federation.info/'>the-federation.info</a> for details."] = "";
-$a->strings["Check upstream version"] = "";
-$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."] = "";
-$a->strings["Suppress Tags"] = "";
-$a->strings["Suppress showing a list of hashtags at the end of the posting."] = "";
-$a->strings["Clean database"] = "";
-$a->strings["Remove old remote items, orphaned database records and old content from some other helper tables."] = "";
-$a->strings["Lifespan of remote items"] = "";
-$a->strings["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."] = "";
-$a->strings["Lifespan of unclaimed items"] = "";
-$a->strings["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."] = "";
-$a->strings["Path to item cache"] = "Pad naar cache voor items";
-$a->strings["The item caches buffers generated bbcode and external images."] = "";
-$a->strings["Cache duration in seconds"] = "Cache tijdsduur in seconden";
-$a->strings["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."] = "";
-$a->strings["Maximum numbers of comments per post"] = "";
-$a->strings["How much comments should be shown for each post? Default value is 100."] = "";
-$a->strings["Temp path"] = "Tijdelijk pad";
-$a->strings["If you have a restricted system where the webserver can't access the system temp path, enter another path here."] = "";
-$a->strings["Base path to installation"] = "Basispad voor installatie";
-$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."] = "";
-$a->strings["Disable picture proxy"] = "";
-$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "";
-$a->strings["Only search in tags"] = "";
-$a->strings["On large systems the text search can slow down the system extremely."] = "";
-$a->strings["New base url"] = "";
-$a->strings["Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users."] = "";
-$a->strings["RINO Encryption"] = "";
-$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["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"] = "";
-$a->strings["When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority."] = "";
-$a->strings["Enable frontend worker"] = "";
-$a->strings["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."] = "";
-$a->strings["Subscribe to relay"] = "";
-$a->strings["Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page."] = "";
-$a->strings["Relay server"] = "";
-$a->strings["Address of the relay server where public posts should be send to. For example https://relay.diasp.org"] = "";
-$a->strings["Direct relay transfer"] = "";
-$a->strings["Enables the direct transfer to other servers without using the relay servers"] = "";
-$a->strings["Relay scope"] = "";
-$a->strings["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."] = "";
-$a->strings["all"] = "";
-$a->strings["tags"] = "";
-$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["Update has been marked successful"] = "Wijziging succesvol gemarkeerd ";
-$a->strings["Database structure update %s was successfully applied."] = "";
-$a->strings["Executing of database structure update %s failed with error: %s"] = "";
-$a->strings["Executing %s failed with error: %s"] = "";
-$a->strings["Update %s was successfully applied."] = "Wijziging %s geslaagd.";
-$a->strings["Update %s did not return a status. Unknown if it succeeded."] = "Wijziging %s gaf geen status terug. We weten niet of de wijziging geslaagd is.";
-$a->strings["There was no additional update function %s that needed to be called."] = "";
-$a->strings["No failed updates."] = "Geen mislukte wijzigingen";
-$a->strings["Check database structure"] = "";
-$a->strings["Failed Updates"] = "Mislukte wijzigingen";
-$a->strings["This does not include updates prior to 1139, which did not return a status."] = "Dit is zonder de wijzigingen voor 1139, welke geen status teruggaven.";
-$a->strings["Mark success (if update was manually applied)"] = "Markeren als succes (als aanpassing manueel doorgevoerd werd)";
-$a->strings["Attempt to execute this update step automatically"] = "Probeer deze stap automatisch uit te voeren";
-$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tthe administrator of %2\$s has set up an account for you."] = "";
-$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."] = "";
-$a->strings["Registration details for %s"] = "Registratie details voor %s";
-$a->strings["%s user blocked/unblocked"] = [
-	0 => "%s gebruiker geblokkeerd/niet geblokkeerd",
-	1 => "%s gebruikers geblokkeerd/niet geblokkeerd",
-];
-$a->strings["%s user deleted"] = [
-	0 => "%s gebruiker verwijderd",
-	1 => "%s gebruikers verwijderd",
-];
-$a->strings["User '%s' deleted"] = "Gebruiker '%s' verwijderd";
-$a->strings["User '%s' unblocked"] = "Gebruiker '%s' niet meer geblokkeerd";
-$a->strings["User '%s' blocked"] = "Gebruiker '%s' geblokkeerd";
-$a->strings["Normal Account Page"] = "Normale accountpagina";
-$a->strings["Soapbox Page"] = "Zeepkist-pagina";
-$a->strings["Public Forum"] = "";
-$a->strings["Automatic Friend Page"] = "Automatisch Vriendschapspagina";
-$a->strings["Private Forum"] = "";
-$a->strings["Personal Page"] = "";
-$a->strings["Organisation Page"] = "";
-$a->strings["News Page"] = "";
-$a->strings["Community Forum"] = "";
-$a->strings["Email"] = "E-mail";
-$a->strings["Register date"] = "Registratiedatum";
-$a->strings["Last login"] = "Laatste login";
-$a->strings["Last item"] = "Laatste item";
-$a->strings["Type"] = "";
-$a->strings["Add User"] = "Gebruiker toevoegen";
-$a->strings["User registrations waiting for confirm"] = "Gebruikersregistraties wachten op een bevestiging";
-$a->strings["User waiting for permanent deletion"] = "";
-$a->strings["Request date"] = "Registratiedatum";
-$a->strings["No registrations."] = "Geen registraties.";
-$a->strings["Note from the user"] = "";
-$a->strings["Deny"] = "Weiger";
-$a->strings["Site admin"] = "Sitebeheerder";
-$a->strings["Account expired"] = "Account verlopen";
-$a->strings["New User"] = "Nieuwe gebruiker";
-$a->strings["Deleted since"] = "Verwijderd sinds";
-$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Geselecteerde gebruikers zullen verwijderd worden!\\n\\nAlles wat deze gebruikers gepost hebben op deze website zal permanent verwijderd worden!\\n\\nBen je zeker?";
-$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?"] = "De gebruiker {0} zal verwijderd worden!\\n\\nAlles wat deze gebruiker gepost heeft op deze website zal permanent verwijderd worden!\\n\\nBen je zeker?";
-$a->strings["Name of the new user."] = "Naam van nieuwe gebruiker";
-$a->strings["Nickname"] = "Bijnaam";
-$a->strings["Nickname of the new user."] = "Bijnaam van nieuwe gebruiker";
-$a->strings["Email address of the new user."] = "E-mailadres van nieuwe gebruiker";
-$a->strings["Addon %s disabled."] = "";
-$a->strings["Addon %s enabled."] = "";
-$a->strings["Disable"] = "Uitschakelen";
-$a->strings["Enable"] = "Inschakelen";
-$a->strings["Toggle"] = "Schakelaar";
-$a->strings["Author: "] = "Auteur:";
-$a->strings["Maintainer: "] = "Onderhoud:";
-$a->strings["Reload active addons"] = "";
-$a->strings["There are currently no addons available on your node. You can find the official addon repository at %1\$s and might find other interesting addons in the open addon registry at %2\$s"] = "";
-$a->strings["No themes found."] = "Geen thema's gevonden.";
-$a->strings["Screenshot"] = "Schermafdruk";
-$a->strings["Reload active themes"] = "";
-$a->strings["No themes found on the system. They should be placed in %1\$s"] = "";
-$a->strings["[Experimental]"] = "[Experimenteel]";
-$a->strings["[Unsupported]"] = "[Niet ondersteund]";
-$a->strings["Log settings updated."] = "Log instellingen gewijzigd";
-$a->strings["PHP log currently enabled."] = "";
-$a->strings["PHP log currently disabled."] = "";
-$a->strings["Clear"] = "Wis";
-$a->strings["Enable Debugging"] = "";
-$a->strings["Log file"] = "Logbestand";
-$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "De webserver moet hier kunnen schrijven. Relatief t.o.v. de hoogste folder binnen je Friendica-installatie.";
-$a->strings["Log level"] = "Log niveau";
-$a->strings["PHP logging"] = "";
-$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["Error trying to open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s exist and is readable."] = "";
-$a->strings["Couldn't open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s is readable."] = "";
-$a->strings["Off"] = "Uit";
-$a->strings["On"] = "Aan";
-$a->strings["Lock feature %s"] = "";
-$a->strings["Manage Additional Features"] = "";
-$a->strings["Community option not available."] = "";
-$a->strings["Not available."] = "Niet beschikbaar";
-$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."] = "Geen resultaten.";
-$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["Event can not end before it has started."] = "";
-$a->strings["Event title and start time are required."] = "Titel en begintijd van de gebeurtenis zijn vereist.";
-$a->strings["Create New Event"] = "Maak een nieuwe gebeurtenis";
-$a->strings["Event details"] = "Gebeurtenis details";
-$a->strings["Starting date and Title are required."] = "";
-$a->strings["Event Starts:"] = "Gebeurtenis begint:";
-$a->strings["Finish date/time is not known or not relevant"] = "Einddatum/tijd is niet gekend of niet relevant";
-$a->strings["Event Finishes:"] = "Gebeurtenis eindigt:";
-$a->strings["Adjust for viewer timezone"] = "Pas aan aan de tijdzone van de gebruiker";
-$a->strings["Description:"] = "Beschrijving:";
-$a->strings["Title:"] = "Titel:";
-$a->strings["Share this event"] = "Deel deze gebeurtenis";
-$a->strings["Basic"] = "";
-$a->strings["Permissions"] = "Rechten";
-$a->strings["Failed to remove event"] = "";
-$a->strings["Event removed"] = "";
-$a->strings["Unable to locate original post."] = "Ik kan de originele post niet meer vinden.";
-$a->strings["Empty post discarded."] = "Lege post weggegooid.";
-$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Dit bericht werd naar jou gestuurd door %s, een lid van het Friendica sociale netwerk.";
-$a->strings["You may visit them online at %s"] = "Je kunt ze online bezoeken op %s";
-$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Contacteer de afzender door op dit bericht te antwoorden als je deze berichten niet wilt ontvangen.";
-$a->strings["%s posted an update."] = "%s heeft een wijziging geplaatst.";
-$a->strings["Remove term"] = "Verwijder zoekterm";
-$a->strings["Saved Searches"] = "Opgeslagen zoekopdrachten";
-$a->strings["add"] = "toevoegen";
-$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
-	0 => "",
-	1 => "",
-];
-$a->strings["Messages in this group won't be send to these receivers."] = "";
-$a->strings["No such group"] = "Zo'n groep bestaat niet";
-$a->strings["Group: %s"] = "";
-$a->strings["Private messages to this person are at risk of public disclosure."] = "Privéberichten naar deze persoon kunnen openbaar gemaakt worden.";
-$a->strings["Invalid contact."] = "Ongeldig contact.";
-$a->strings["Commented Order"] = "Nieuwe reacties bovenaan";
-$a->strings["Sort by Comment Date"] = "Berichten met nieuwe reacties bovenaan";
-$a->strings["Posted Order"] = "Nieuwe berichten bovenaan";
-$a->strings["Sort by Post Date"] = "Nieuwe berichten bovenaan";
-$a->strings["Posts that mention or involve you"] = "Alleen berichten die jou vermelden of op jou betrekking hebben";
-$a->strings["New"] = "Nieuw";
-$a->strings["Activity Stream - by date"] = "Activiteitenstroom - volgens datum";
-$a->strings["Shared Links"] = "Gedeelde links";
-$a->strings["Interesting Links"] = "Interessante links";
-$a->strings["Starred"] = "Met ster";
-$a->strings["Favourite Posts"] = "Favoriete berichten";
-$a->strings["Personal Notes"] = "Persoonlijke Nota's";
-$a->strings["Photo Albums"] = "Fotoalbums";
-$a->strings["Recent Photos"] = "Recente foto's";
-$a->strings["Upload New Photos"] = "Nieuwe foto's uploaden";
-$a->strings["everybody"] = "iedereen";
-$a->strings["Contact information unavailable"] = "Contactinformatie niet beschikbaar";
-$a->strings["Album not found."] = "Album niet gevonden";
-$a->strings["Delete Album"] = "Verwijder album";
-$a->strings["Do you really want to delete this photo album and all its photos?"] = "Wil je echt dit fotoalbum en alle foto's erin verwijderen?";
-$a->strings["Delete Photo"] = "Verwijder foto";
-$a->strings["Do you really want to delete this photo?"] = "Wil je echt deze foto verwijderen?";
-$a->strings["a photo"] = "een foto";
-$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$s is gelabeld in %2\$s door %3\$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."] = "Afbeeldingsbestand is leeg.";
-$a->strings["No photos selected"] = "Geen foto's geselecteerd";
-$a->strings["Access to this item is restricted."] = "Toegang tot dit item is beperkt.";
-$a->strings["Upload Photos"] = "Upload foto's";
-$a->strings["New album name: "] = "Nieuwe albumnaam: ";
-$a->strings["or existing album name: "] = "of bestaande albumnaam: ";
-$a->strings["Do not show a status post for this upload"] = "Toon geen bericht op je tijdlijn van deze upload";
-$a->strings["Show to Groups"] = "Tonen aan groepen";
-$a->strings["Show to Contacts"] = "Tonen aan contacten";
-$a->strings["Edit Album"] = "Album wijzigen";
-$a->strings["Show Newest First"] = "Toon niewste eerst";
-$a->strings["Show Oldest First"] = "Toon oudste eerst";
-$a->strings["View Photo"] = "Bekijk foto";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Toegang geweigerd. Toegang tot dit item is mogelijk beperkt.";
-$a->strings["Photo not available"] = "Foto is niet beschikbaar";
-$a->strings["View photo"] = "Bekijk foto";
-$a->strings["Edit photo"] = "Bewerk foto";
-$a->strings["Use as profile photo"] = "Gebruik als profielfoto";
-$a->strings["Private Message"] = "Privébericht";
-$a->strings["View Full Size"] = "Bekijk in volledig formaat";
-$a->strings["Tags: "] = "Labels: ";
-$a->strings["[Remove any tag]"] = "[Alle labels verwijderen]";
-$a->strings["New album name"] = "Nieuwe albumnaam";
-$a->strings["Caption"] = "Onderschrift";
-$a->strings["Add a Tag"] = "Een label toevoegen";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl, #Ardennen, #camping ";
-$a->strings["Do not rotate"] = "";
-$a->strings["Rotate CW (right)"] = "Roteren met de klok mee (rechts)";
-$a->strings["Rotate CCW (left)"] = "Roteren tegen de klok in (links)";
-$a->strings["I like this (toggle)"] = "Vind ik leuk";
-$a->strings["I don't like this (toggle)"] = "Vind ik niet leuk";
-$a->strings["Comment"] = "Reacties";
-$a->strings["Map"] = "";
-$a->strings["View Album"] = "Album bekijken";
-$a->strings["Requested profile is not available."] = "Gevraagde profiel is niet beschikbaar.";
-$a->strings["%s's timeline"] = "";
-$a->strings["%s's posts"] = "";
-$a->strings["%s's comments"] = "";
-$a->strings["Tips for New Members"] = "Tips voor nieuwe leden";
+$a->strings["Invalid profile identifier."] = "Ongeldige profiel-identificatie.";
+$a->strings["Profile Visibility Editor"] = "Profiel Zichtbaarheid Editor";
+$a->strings["Visible To"] = "Zichtbaar voor";
+$a->strings["All Contacts (with secure profile access)"] = "Alle contacten (met veilige profieltoegang)";
 $a->strings["Registration successful. Please check your email for further instructions."] = "Registratie geslaagd. Kijk je e-mail na voor verdere instructies.";
-$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."] = "";
-$a->strings["Registration successful."] = "";
+$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."] = "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.";
+$a->strings["Registration successful."] = "Registratie succes.";
 $a->strings["Your registration can not be processed."] = "Je registratie kan niet verwerkt worden.";
 $a->strings["Your registration is pending approval by the site owner."] = "Jouw registratie wacht op goedkeuring van de beheerder.";
 $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Je kunt (optioneel) dit formulier invullen via OpenID door je OpenID in te geven en op 'Registreren' te klikken.";
 $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Laat dit veld leeg als je niet vertrouwd bent met OpenID, en vul de rest van de items in.";
 $a->strings["Your OpenID (optional): "] = "Je OpenID (optioneel):";
 $a->strings["Include your profile in member directory?"] = "Je profiel in de ledengids opnemen?";
-$a->strings["Note for the admin"] = "";
-$a->strings["Leave a message for the admin, why you want to join this node"] = "";
+$a->strings["Note for the admin"] = "Nota voor de beheerder";
+$a->strings["Leave a message for the admin, why you want to join this node"] = "Laat een boodschap na voor de beheerder, waarom je bij deze node wil komen";
 $a->strings["Membership on this site is by invitation only."] = "Lidmaatschap van deze website is uitsluitend op uitnodiging.";
-$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["Your invitation code: "] = "Je uitnodigingscode:";
+$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Je volledige naam (bvb. Jan Smit, echt of echt lijkend):";
+$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Je Email Adres: (Initiële informatie zal hier naartoe gezonden worden, dus dit moet een bestaand adres zijn.)";
 $a->strings["New Password:"] = "Nieuw Wachtwoord:";
-$a->strings["Leave empty for an auto generated password."] = "";
+$a->strings["Leave empty for an auto generated password."] = "Laat leeg voor een automatisch gegenereerd paswoord.";
 $a->strings["Confirm:"] = "Bevestig:";
-$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 profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@%s</strong>'."] = "Kies een bijnaam. Deze moet beginnen met een letter. Je profiel adres op deze site zal dan '<strong>nickname@%s</strong>' zijn.";
 $a->strings["Choose a nickname: "] = "Kies een bijnaam:";
 $a->strings["Register"] = "Registreer";
-$a->strings["Import your profile to this friendica instance"] = "";
-$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"] = "";
+$a->strings["Import your profile to this friendica instance"] = "Importeer je profiel op deze friendica server";
+$a->strings["Note: This node explicitly contains adult content"] = "Waarschuwing: Deze node heeft inhoud enkel bedoeld voor volwassenen.";
+$a->strings["Account approved."] = "Account goedgekeurd.";
+$a->strings["Registration revoked for %s"] = "Registratie ingetrokken voor %s";
+$a->strings["Please login."] = "Inloggen.";
+$a->strings["User deleted their account"] = "Gebruiker verwijderde zijn of haar account";
+$a->strings["On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups."] = "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.";
+$a->strings["The user id is %d"] = "De gebruikers id is %d";
 $a->strings["Remove My Account"] = "Verwijder mijn account";
 $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dit zal je account volledig verwijderen. Dit kan niet hersteld worden als het eenmaal uitgevoerd is.";
 $a->strings["Please enter your password for verification:"] = "Voer je wachtwoord in voor verificatie:";
-$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"] = "";
+$a->strings["Resubscribing to OStatus contacts"] = "Opnieuw inschrijven bij OStatus contacten";
+$a->strings["Error"] = "Fout";
+$a->strings["Only logged in users are permitted to perform a search."] = "Alleen ingelogde gebruikers mogen een zoekopdracht starten.";
+$a->strings["Too Many Requests"] = "Teveel aanvragen";
+$a->strings["Only one search per minute is permitted for not logged in users."] = "Niet ingelogde gebruikers mogen slechts 1 opzoeking doen per minuut";
+$a->strings["Items tagged with: %s"] = "Items getagd met: %s";
 $a->strings["Account"] = "Account";
+$a->strings["Profiles"] = "Profielen";
 $a->strings["Display"] = "Weergave";
 $a->strings["Social Networks"] = "Sociale netwerken";
-$a->strings["Delegations"] = "";
+$a->strings["Delegations"] = "Delegaties";
 $a->strings["Connected apps"] = "Verbonden applicaties";
+$a->strings["Export personal data"] = "Persoonlijke gegevens exporteren";
 $a->strings["Remove account"] = "Account verwijderen";
 $a->strings["Missing some important data!"] = "Een belangrijk gegeven ontbreekt!";
 $a->strings["Failed to connect with email account using the settings provided."] = "Ik kon geen verbinding maken met het e-mail account met de gegeven instellingen.";
-$a->strings["Email settings updated."] = "E-mail instellingen bijgewerkt..";
-$a->strings["Features updated"] = "Functies bijgewerkt";
-$a->strings["Relocate message has been send to your contacts"] = "";
+$a->strings["Email settings updated."] = "E-mail instellingen opgeslagen";
+$a->strings["Features updated"] = "Functies opgeslagen";
+$a->strings["Relocate message has been send to your contacts"] = "Verhuis boodschap is verzonden naar je contacten";
 $a->strings["Passwords do not match. Password unchanged."] = "Wachtwoorden komen niet overeen. Wachtwoord niet gewijzigd.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "Lege wachtwoorden zijn niet toegelaten. Wachtwoord niet gewijzigd.";
-$a->strings["The new password has been exposed in a public data dump, please choose another."] = "";
+$a->strings["The new password has been exposed in a public data dump, please choose another."] = "The nieuwe paswoord is gecompromitteerd in een publieke data dump, kies alsjeblieft een ander.";
 $a->strings["Wrong password."] = "Verkeerd wachtwoord.";
 $a->strings["Password changed."] = "Wachtwoord gewijzigd.";
 $a->strings["Password update failed. Please try again."] = "Wachtwoord-)wijziging mislukt. Probeer opnieuw.";
 $a->strings[" Please use a shorter name."] = "Gebruik een kortere naam.";
 $a->strings[" Name too short."] = "Naam te kort.";
 $a->strings["Wrong Password"] = "Verkeerd wachtwoord";
-$a->strings["Invalid email."] = "";
-$a->strings["Cannot change to that email."] = "";
+$a->strings["Invalid email."] = "Ongeldig email adres.";
+$a->strings["Cannot change to that email."] = "Kan niet naar dat email adres veranderen.";
 $a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Privéforum/-groep heeft geen privacyrechten. De standaard privacygroep wordt gebruikt.";
 $a->strings["Private forum has no privacy permissions and no default privacy group."] = "Privéforum/-groep heeft geen privacyrechten en geen standaard privacygroep.";
-$a->strings["Settings updated."] = "Instellingen bijgewerkt.";
+$a->strings["Settings updated."] = "Instellingen opgeslagen";
 $a->strings["Add application"] = "Toepassing toevoegen";
 $a->strings["Consumer Key"] = "Gebruikerssleutel";
 $a->strings["Consumer Secret"] = "Gebruikersgeheim";
@@ -1507,29 +1484,29 @@ $a->strings["Icon url"] = "URL pictogram";
 $a->strings["You can't edit this application."] = "Je kunt deze toepassing niet wijzigen.";
 $a->strings["Connected Apps"] = "Verbonden applicaties";
 $a->strings["Edit"] = "Bewerken";
-$a->strings["Client key starts with"] = "";
+$a->strings["Client key starts with"] = "Client sleutel begint met";
 $a->strings["No name"] = "Geen naam";
 $a->strings["Remove authorization"] = "Verwijder authorisatie";
-$a->strings["No Addon settings configured"] = "";
-$a->strings["Addon Settings"] = "";
+$a->strings["No Addon settings configured"] = "Geen Addon instellingen geconfigureerd";
+$a->strings["Addon Settings"] = "Addon instellingen";
 $a->strings["Additional Features"] = "Extra functies";
 $a->strings["Diaspora"] = "Diaspora";
 $a->strings["enabled"] = "ingeschakeld";
 $a->strings["disabled"] = "uitgeschakeld";
 $a->strings["Built-in support for %s connectivity is %s"] = "Ingebouwde ondersteuning voor connectiviteit met %s is %s";
-$a->strings["GNU Social (OStatus)"] = "";
+$a->strings["GNU Social (OStatus)"] = "GNU Social (OStatus)";
 $a->strings["Email access is disabled on this site."] = "E-mailtoegang is op deze website uitgeschakeld.";
-$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"] = "";
-$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"] = "";
-$a->strings["Your legacy GNU Social account"] = "";
-$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."] = "";
-$a->strings["Repair OStatus subscriptions"] = "";
+$a->strings["General Social Media Settings"] = "Algemene Sociale Media Instellingen";
+$a->strings["Disable Content Warning"] = "Deactiveer Content Waarschuwing";
+$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."] = "Gebruikers op netwerken als Mastodon en Pleroma kunnen een content waarschuwing instellen die hun bericht standaard inklapt. Dit deactiveert het automatisch inklappen en toont de content waarschuwing als titel van het bericht. Dit beïnvloedt andere content filters die je mogelijk ingesteld hebt niet.";
+$a->strings["Disable intelligent shortening"] = "Deactiveer intelligent afkorten";
+$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."] = "Normaal probeert het systeem de beste link te vinden om toe te voegen aan ingekorte berichten. Als deze optie geactiveerd is, dan zal elk ingekort bericht altijd verwijzen naar het originele friendica bericht.";
+$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "Volg automatisch alle GNU Social (OStatus) volgers/vermelders";
+$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."] = "Als je een boodschap ontvangt van een voor jou onbekende OStatus gebruiker, dan beslist deze optie wat er moet gebeuren. Als de optie is geactiveerd, dan zal voor elke onbekende gebruiker een nieuw contact aangemaakt worden.";
+$a->strings["Default group for OStatus contacts"] = "Standaard groep voor OStatus contacten";
+$a->strings["Your legacy GNU Social account"] = "Je verouderd GNU Social account";
+$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."] = "Als je hier je oude GNU Social/Statusnet account naam invoert (in het formaat gebruiker@domein.tld), dan zullen je contacten automatisch toegevoegd worden. Het veld zal nadien leeg gemaakt worden.";
+$a->strings["Repair OStatus subscriptions"] = "Herstel OStatus inschrijvingen";
 $a->strings["Email/Mailbox Setup"] = "E-mail Instellen";
 $a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Als je wilt communiceren met e-mail contacten via deze dienst (optioneel), moet je hier opgeven hoe ik jouw mailbox kan bereiken.";
 $a->strings["Last successful email check:"] = "Laatste succesvolle e-mail controle:";
@@ -1545,67 +1522,67 @@ $a->strings["Action after import:"] = "Actie na importeren:";
 $a->strings["Mark as seen"] = "Als 'gelezen' markeren";
 $a->strings["Move to folder"] = "Naar map verplaatsen";
 $a->strings["Move to folder:"] = "Verplaatsen naar map:";
-$a->strings["%s - (Unsupported)"] = "";
-$a->strings["%s - (Experimental)"] = "";
+$a->strings["%s - (Unsupported)"] = "%s - (Niet ondersteund)";
+$a->strings["%s - (Experimental)"] = "%s - (Experimenteel)";
 $a->strings["Display Settings"] = "Scherminstellingen";
 $a->strings["Display Theme:"] = "Schermthema:";
 $a->strings["Mobile Theme:"] = "Mobiel thema:";
-$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["Suppress warning of insecure networks"] = "Onderdruk waarschuwingen over onbeveiligde netwerken";
+$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "Moet het systeem waarschuwingen onderdrukken dat de huidige groep leden bevat van netwerken die geen niet-publieke berichten kunnen ontvangen.";
 $a->strings["Update browser every xx seconds"] = "Browser elke xx seconden verversen";
-$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "";
+$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum 10 seconden. Geef -1 op om te deactiveren.";
 $a->strings["Number of items to display per page:"] = "Aantal items te tonen per pagina:";
 $a->strings["Maximum of 100 items"] = "Maximum 100 items";
 $a->strings["Number of items to display per page when viewed from mobile device:"] = "Aantal items per pagina als je een mobiel toestel gebruikt:";
 $a->strings["Don't show emoticons"] = "Emoticons niet tonen";
-$a->strings["Calendar"] = "";
-$a->strings["Beginning of week:"] = "";
-$a->strings["Don't show notices"] = "";
+$a->strings["Calendar"] = "Kalender";
+$a->strings["Beginning of week:"] = "Begin van de week:";
+$a->strings["Don't show notices"] = "Toon geen aankondigingen";
 $a->strings["Infinite scroll"] = "Oneindig scrollen";
-$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["Bandwith 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["Automatic updates only at the top of the network page"] = "Automatische updates alleen bovenaan de netwerk pagina";
+$a->strings["When disabled, the network page is updated all the time, which could be confusing while reading."] = "Als deze parameter gedeactiveerd is, dan wordt de netwerk pagina constant geüpdate, wat verwarrend zou kunnen zijn tijdens het lezen.";
+$a->strings["Bandwidth Saver Mode"] = "Bandbreedte Besparen Mode";
+$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Als deze parameter geactiveerd is, dan wordt embedded content niet getoond bij automatische updates, ze worden alleen getoond bij het herladen van de pagina.";
+$a->strings["Smart Threading"] = "Slimme Gespreksstroom";
+$a->strings["When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled."] = "Als deze parameter geactiveerd is, dan dan wordt overbodig inspringen van reacties onderdrukt terwijl het behouden blijft waar het nodig is. Werkt alleen als gespreksstroom beschikbaar is en geactiveerd.";
+$a->strings["General Theme Settings"] = "Algemene Thema Instellingen";
+$a->strings["Custom Theme Settings"] = "Speciale Thema Instellingen";
+$a->strings["Content Settings"] = "Content Instellingen";
 $a->strings["Theme settings"] = "Thema-instellingen";
-$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["Unable to find your profile. Please contact your admin."] = "Kan je profiel niet vinden. Contacteer alsjeblieft je beheerder.";
+$a->strings["Account Types"] = "Account Types";
+$a->strings["Personal Page Subtypes"] = "Persoonlijke Pagina Subtypes";
+$a->strings["Community Forum Subtypes"] = "Groepsforum Subtypes";
+$a->strings["Account for a personal profile."] = "Account voor een persoonlijk profiel";
+$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "Account voor een organisatie die automatisch contact aanvragen goedkeurt als \"Volgers\".";
+$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "Account voor een nieuws reflector die automatisch contact aanvragen goedkeurt als \"Volgers\".";
+$a->strings["Account for community discussions."] = "Account voor groepsdiscussies.";
+$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "Account voor een normaal persoonlijk profiel dat manuele goedkeuring vereist van \"Vrienden\" en \"Volgers\".";
+$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Account voor een publiek profiel dat automatisch contact aanvragen goedkeurt als \"Volgers\".";
+$a->strings["Automatically approves all contact requests."] = "Aanvaardt automatisch all contact aanvragen.";
+$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "Account voor een populair profiel dat automatisch contact aanvragen goedkeurt als \"Vrienden\".";
 $a->strings["Private Forum [Experimental]"] = "Privé-forum [experimenteel]";
-$a->strings["Requires manual approval of contact requests."] = "";
+$a->strings["Requires manual approval of contact requests."] = "Vereist manuele goedkeuring van contact aanvragen.";
 $a->strings["OpenID:"] = "OpenID:";
 $a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optioneel) Laat dit OpenID toe om in te loggen op deze account.";
 $a->strings["Publish your default profile in your local site directory?"] = "Je standaardprofiel in je lokale gids publiceren?";
-$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["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."] = "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.";
 $a->strings["Publish your default profile in the global social directory?"] = "Je standaardprofiel in de globale sociale gids publiceren?";
-$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["Your profile will be published in the global friendica directories (e.g. <a href=\"%s\">%s</a>). Your profile will be visible in public."] = "Je profiel zal gepubliceerd worden in de globale friendica gids (bvb. <a href=\"%s\">%s</a>). Je profiel zal publiek zichtbaar zijn.";
 $a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Je vrienden/contacten verbergen voor bezoekers van je standaard profiel?";
-$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?"] = "Vrienden toestaan om op jou profielpagina te posten?";
-$a->strings["Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"] = "";
+$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"] = "Je contact lijst zal niet getoond worden in je standaard profiel pagina. Je kan beslissen om je contact lijst apart te tonen per bijkomend profiel dat je aanmaakt.";
+$a->strings["Hide your profile details from anonymous viewers?"] = "Je profiel details verbergen voor anonieme bezoekers?";
+$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."] = "Anonieme bezoekers zullen alleen je profiel foto zien, je naam en de bijnaam die je gebruikt op je profiel pagina. Je publieke berichten en reacties zullen nog altijd toegankelijk zijn via andere wegen.";
+$a->strings["Allow friends to post to your profile page?"] = "Vrienden toestaan om op jouw profielpagina te posten?";
+$a->strings["Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"] = "Je contacten kunnen berichten schrijven op je tijdslijn. Deze berichten zullen verspreid worden naar je contacten";
 $a->strings["Allow friends to tag your posts?"] = "Sta vrienden toe om jouw berichten te labelen?";
-$a->strings["Your contacts can add additional tags to your posts."] = "";
+$a->strings["Your contacts can add additional tags to your posts."] = "Je contacten kunnen tags toevoegen aan je berichten.";
 $a->strings["Allow us to suggest you as a potential friend to new members?"] = "Sta je mij toe om jou als mogelijke vriend  voor te stellen aan nieuwe leden?";
-$a->strings["If you like, Friendica may suggest new members to add you as a contact."] = "";
+$a->strings["If you like, Friendica may suggest new members to add you as a contact."] = "Als je wil, kan Friendica je nieuwe leden suggereren als contacten.";
 $a->strings["Permit unknown people to send you private mail?"] = "Mogen onbekende personen jou privé berichten sturen?";
-$a->strings["Friendica network users may send you private messages even if they are not in your contact list."] = "";
+$a->strings["Friendica network users may send you private messages even if they are not in your contact list."] = "Friendica netwerk gebruikers kunnen je privé boodschappen sturen zelfs als ze niet in je contact lijst staan.";
 $a->strings["Profile is <strong>not published</strong>."] = "Profiel is <strong>niet gepubliceerd</strong>.";
-$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "";
+$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "Je Identiteit adres is <strong>'%s'</strong> of '%s'.";
 $a->strings["Automatically expire posts after this many days:"] = "Laat berichten automatisch vervallen na zo veel dagen:";
 $a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Berichten zullen niet vervallen indien leeg. Vervallen berichten zullen worden verwijderd.";
 $a->strings["Advanced expiration settings"] = "Geavanceerde instellingen voor vervallen";
@@ -1625,8 +1602,8 @@ $a->strings["Basic Settings"] = "Basis Instellingen";
 $a->strings["Full Name:"] = "Volledige Naam:";
 $a->strings["Email Address:"] = "E-mailadres:";
 $a->strings["Your Timezone:"] = "Je Tijdzone:";
-$a->strings["Your Language:"] = "";
-$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "";
+$a->strings["Your Language:"] = "Je taal:";
+$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "Configureer de taal van die we gebruiken als friendica interface en om je emails te sturen";
 $a->strings["Default Post Location:"] = "Standaard locatie:";
 $a->strings["Use Browser Location:"] = "Gebruik Webbrowser Locatie:";
 $a->strings["Security and Privacy Settings"] = "Instellingen voor Beveiliging en Privacy";
@@ -1648,49 +1625,84 @@ $a->strings["You receive a private message"] = "Je een privé-bericht ontvangt";
 $a->strings["You receive a friend suggestion"] = "Je een suggestie voor een vriendschap ontvangt";
 $a->strings["You are tagged in a post"] = "Je expliciet in een bericht bent genoemd";
 $a->strings["You are poked/prodded/etc. in a post"] = "Je in een bericht bent aangestoten/gepord/etc.";
-$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"] = "";
-$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["Activate desktop notifications"] = "Activeer desktop notificaties";
+$a->strings["Show desktop popup on new notifications"] = "Toon desktop pop-up bij nieuwe notificaties";
+$a->strings["Text-only notification emails"] = "Alleen-tekst notificatie emails";
+$a->strings["Send text only notification emails, without the html part"] = "Stuur alleen-tekst notificatie emails, zonder het html gedeelte";
+$a->strings["Show detailled notifications"] = "Toon gedetailleerde notificaties";
+$a->strings["Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed."] = "Standaard worden notificaties samengevoegd in een enkele notificatie per item. Als je deze parameter activeert wordt elke notificatie getoond.";
+$a->strings["Advanced Account/Page Type Settings"] = "Geavanceerde Account/Pagina Type Instellingen";
+$a->strings["Change the behaviour of this account for special situations"] = "Pas het gedrag van dit account aan voor speciale situaties";
+$a->strings["Relocate"] = "Verhuis";
+$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."] = "Als je je profiel van een andere server hebt verhuisd, en er zijn contacten die geen updates van je ontvangen, probeer dan eens deze knop.";
+$a->strings["Resend relocate message to contacts"] = "Stuur verhuis boodschap naar contacten";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$s volgt %3\$s van %2\$s";
+$a->strings["Do you really want to delete this suggestion?"] = "Wil je echt dit voorstel verwijderen?";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Geen voorstellen beschikbaar. Als dit een nieuwe website is, kun je het over 24 uur nog eens proberen.";
+$a->strings["Ignore/Hide"] = "Negeren/Verbergen";
+$a->strings["Friend Suggestions"] = "Vriendschapsvoorstellen";
+$a->strings["Tag removed"] = "Label verwijderd";
+$a->strings["Remove Item Tag"] = "Verwijder label van item";
+$a->strings["Select a tag to remove: "] = "Selecteer een label om te verwijderen: ";
+$a->strings["Export account"] = "Account exporteren";
+$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."] = "Je account informatie en contacten exporteren. Gebruik dit om een backup van je account te maken en/of om het te verhuizen naar een andere server.";
+$a->strings["Export all"] = "Alles exporteren";
+$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)"] = "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)";
+$a->strings["Contact wasn't found or can't be unfollowed."] = "Contact kon niet gevonden worden or can niet ontvolgd worden.";
+$a->strings["Contact unfollowed"] = "Contact ontvolgd.";
+$a->strings["You aren't a friend of this contact."] = "Je bent niet bevriend met dit contact.";
+$a->strings["Unfollowing is currently not supported by your network."] = "Ontvolgen is momenteel niet gesupporteerd door je netwerk.";
 $a->strings["Do you really want to delete this video?"] = "Wil je deze video echt verwijderen?";
 $a->strings["Delete Video"] = "Verwijder video";
 $a->strings["No videos selected"] = "Geen video's geselecteerd";
 $a->strings["Recent Videos"] = "Recente video's";
 $a->strings["Upload New Videos"] = "Nieuwe video's uploaden";
+$a->strings["No contacts."] = "Geen contacten.";
+$a->strings["Invalid request."] = "Ongeldige aanvraag.";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Sorry, je op te laden bestand is groter dan deze PHP configuratie toelaat";
+$a->strings["Or - did you try to upload an empty file?"] = "Of - probeerde je een lege file op te laden?";
+$a->strings["File exceeds size limit of %s"] = "Bestand is groter dan de limiet ( %s )";
+$a->strings["File upload failed."] = "Uploaden van bestand mislukt.";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Maximum aantal dagelijkse tijdlijn boodschappen van %s overschreden. Kon boodschap niet plaatsen.";
+$a->strings["Unable to check your home location."] = "Niet in staat om je tijdlijn-locatie vast te stellen";
+$a->strings["No recipient."] = "Geen ontvanger.";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Als je wilt dat %s antwoordt moet je nakijken dat de privacy-instellingen op jouw website privéberichten van onbekende afzenders toelaat.";
+$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."] = "Dit is Friendica, versie %s en draait op op locatie %s. De databaseversie is %s, en de bericht update versie is %s.";
+$a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "Ga naar <a href=\"https://friendi.ca\">Friendi.ca</a> om meer te vernemen over het Friendica project.";
+$a->strings["Bug reports and issues: please visit"] = "Bug rapporten en problemen: bezoek";
+$a->strings["the bugtracker at github"] = "de github bugtracker";
+$a->strings["Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"] = "Suggesties, appreciatie, enz. - aub stuur een email naar \"info\" at \"friendi - dot - ca";
+$a->strings["Installed addons/apps:"] = "Geïnstalleerde addons/applicaties:";
+$a->strings["No installed addons/apps"] = "Geen geïnstalleerde addons/applicaties";
+$a->strings["Read about the <a href=\"%1\$s/tos\">Terms of Service</a> of this node."] = "Lees de <a href=\"%1\$s/tos\">Gebruiksvoorwaarden</a> van deze node na.";
+$a->strings["On this server the following remote servers are blocked."] = "De volgende remote servers zijn geblokkeerd.";
 $a->strings["default"] = "standaard";
-$a->strings["greenzero"] = "";
-$a->strings["purplezero"] = "";
-$a->strings["easterbunny"] = "";
-$a->strings["darkzero"] = "";
-$a->strings["comix"] = "";
-$a->strings["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["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"] = "Variaties";
+$a->strings["Top Banner"] = "Banner Bovenaan";
+$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Pas het beeld aan aan de breedte van het scherm en toon achtergrondkleur onder lange pagina's";
+$a->strings["Full screen"] = "Volledig scherm";
+$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Pas het beeld aan om het hele scherm te vullen, met ofwel de rechter- of de onderkant afgeknipt.";
+$a->strings["Single row mosaic"] = "Enkele rij mozaïek";
+$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Pas het beeld aan zodat het herhaald wordt op een enkele rij, ofwel vertikaal ofwel horizontaal";
+$a->strings["Mosaic"] = "Mozaïek";
+$a->strings["Repeat image to fill the screen."] = "Herhaal beeld om het scherm te vullen.";
+$a->strings["Custom"] = "Aangepast";
+$a->strings["Note"] = "Nota";
+$a->strings["Check image permissions if all users are allowed to see the image"] = "Controleer of alle gebruikers permissie hebben om het beeld te zien ";
+$a->strings["Select color scheme"] = "Selecteer kleurschema";
+$a->strings["Navigation bar background color"] = "Navigatie balk achtergrondkleur";
+$a->strings["Navigation bar icon color "] = "Navigatie balk icoon kleur";
 $a->strings["Link color"] = "Link kleur";
-$a->strings["Set the background color"] = "";
-$a->strings["Content background opacity"] = "";
-$a->strings["Set the background image"] = "";
-$a->strings["Background image style"] = "";
+$a->strings["Set the background color"] = "Stel de achtergrondkleur in";
+$a->strings["Content background opacity"] = "Content achtergrond opaciteit";
+$a->strings["Set the background image"] = "Stel het achtergrondbeeld in";
+$a->strings["Background image style"] = "Achtergrond beeld stijl";
 $a->strings["Login page background image"] = "Achtergrondafbeelding aanmeldpagina";
 $a->strings["Login page background color"] = "Achtergrondkleur aanmeldpagina";
 $a->strings["Leave background image and color empty for theme defaults"] = "Laat de achtergrondafbeelding en kleur leeg om de standaard van het thema te gebruiken";
@@ -1702,7 +1714,7 @@ $a->strings["Your posts and conversations"] = "Jouw berichten en gesprekken";
 $a->strings["Your profile page"] = "Jouw profiel pagina";
 $a->strings["Your photos"] = "Jouw foto's";
 $a->strings["Videos"] = "Video's";
-$a->strings["Your videos"] = "";
+$a->strings["Your videos"] = "Je video's";
 $a->strings["Your events"] = "Jouw gebeurtenissen";
 $a->strings["Conversations from your friends"] = "Gesprekken van je vrienden";
 $a->strings["Events and Calendar"] = "Gebeurtenissen en kalender";
@@ -1732,10 +1744,82 @@ $a->strings["Similar Interests"] = "Dezelfde interesses";
 $a->strings["Random Profile"] = "Willekeurig Profiel";
 $a->strings["Invite Friends"] = "Vrienden uitnodigen";
 $a->strings["Local Directory"] = "Lokale gids";
-$a->strings["External link to forum"] = "";
+$a->strings["External link to forum"] = "Externe link naar het forum";
 $a->strings["Quick Start"] = "Snelstart";
-$a->strings["Error decoding account file"] = "";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "";
+$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "Kon geen niet-gearchiveerde contacten vinden voor deze URL (%s)";
+$a->strings["The contact entries have been archived"] = "The contacten zijn gearchiveerd";
+$a->strings["Enter new password: "] = "Geef nieuw paswoord:";
+$a->strings["Password can't be empty"] = "Paswoord mag niet leeg zijn";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Kan geen command-line-versie van PHP vinden in het PATH van de webserver.";
+$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>"] = "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>";
+$a->strings["PHP executable path"] = "PATH van het PHP commando";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Vul het volledige pad in naar het php programma. Je kunt dit leeg laten om de installatie verder te zetten.";
+$a->strings["Command line PHP"] = "PHP-opdrachtregel";
+$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "PHP uitvoerbaar bestand is niet de php cli binary (zou kunnen de cgi-fgci versie zijn)";
+$a->strings["Found PHP version: "] = "Gevonden PHP versie:";
+$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."] = "De command-line versie van PHP op jouw systeem heeft \"register_argc_argv\" niet geactiveerd.";
+$a->strings["This is required for message delivery to work."] = "Dit is nodig om het verzenden van berichten mogelijk te maken.";
+$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"] = "Fout: de \"openssl_pkey_new\" functie op dit systeem kan geen encryptie sleutels genereren";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Zie \"http://www.php.net/manual/en/openssl.installation.php\" wanneer u Friendica onder Windows draait.";
+$a->strings["Generate encryption keys"] = "Genereer encryptie sleutels";
+$a->strings["libCurl PHP module"] = "libCurl PHP module";
+$a->strings["GD graphics PHP module"] = "GD graphics PHP module";
+$a->strings["OpenSSL PHP module"] = "OpenSSL PHP module";
+$a->strings["PDO or MySQLi PHP module"] = "PDO of MySQLi PHP module";
+$a->strings["mb_string PHP module"] = "mb_string PHP module";
+$a->strings["XML PHP module"] = "XML PHP module";
+$a->strings["iconv PHP module"] = "iconv PHP module";
+$a->strings["POSIX PHP module"] = "POSIX PHP module";
+$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fout: Apache-module mod-rewrite is vereist, maar niet geïnstalleerd.";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Fout: PHP-module libCURL is vereist, maar niet geïnstalleerd.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fout: PHP-module GD graphics met JPEG support is vereist, maar niet geïnstalleerd.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Fout: PHP-module openssl is vereist, maar niet geïnstalleerd.";
+$a->strings["Error: PDO or MySQLi PHP module required but not installed."] = "Fout: PDO of MySQLi PHP module vereist maar niet geïnstalleerd.";
+$a->strings["Error: The MySQL driver for PDO is not installed."] = "Fout: de MySQL driver voor PDO is niet geïnstalleerd.";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Fout: PHP-module mb_string is vereist, maar niet geïnstalleerd.";
+$a->strings["Error: iconv PHP module required but not installed."] = "Fout: iconv PHP module vereist maar niet geïnstalleerd.";
+$a->strings["Error: POSIX PHP module required but not installed."] = "Fout: POSIX PHP module vereist maar niet geïnstalleerd.";
+$a->strings["Error, XML PHP module required but not installed."] = "Fout: XML PHP module vereist maar niet geinstalleerd.";
+$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."] = "Het installatieprogramma moet een bestand \"local.ini.php\" in de \"config\" map van je webserver aanmaken, maar kan dit niet doen. ";
+$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."] = "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.";
+$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."] = "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. ";
+$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Je kunt ook deze procedure overslaan, en een manuele installatie uitvoeren. Lees het bestand \"INSTALL.txt\" voor instructies.";
+$a->strings["config/local.ini.php is writable"] = "config/local.ini.php is schrijfbaar ";
+$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica gebruikt het Smarty3 sjabloon systeem om zijn webpagina's weer te geven. Smarty3 compileert sjablonen naar PHP om de weergave te versnellen.";
+$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."] = "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.";
+$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Zorg ervoor dat de gebruiker waaronder je webserver runt (bijv. www-data) schrijf-toegang heeft tot deze map.";
+$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."] = "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.";
+$a->strings["view/smarty3 is writable"] = "view/smarty3 is schrijfbaar";
+$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "Url rewrite in .htaccess werkt niet. Kijk je server configuratie na.";
+$a->strings["Error message from Curl when fetching"] = "Fout boodschap van Curl bij ophalen";
+$a->strings["Url rewrite is working"] = "Url rewrite werkt correct";
+$a->strings["ImageMagick PHP extension is not installed"] = "ImageMagick PHP extensie is niet geïnstalleerd";
+$a->strings["ImageMagick PHP extension is installed"] = "ImageMagick PHP extensie is geïnstalleerd";
+$a->strings["ImageMagick supports GIF"] = "ImageMagick ondersteunt GIF";
+$a->strings["Post to Email"] = "Verzenden per e-mail";
+$a->strings["Hide your profile details from unknown viewers?"] = "Je profieldetails verbergen voor onbekende bezoekers?";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Connectoren gedeactiveerd, aangezien \"%s\" geactiveerd is.";
+$a->strings["Visible to everybody"] = "Zichtbaar voor iedereen";
+$a->strings["Close"] = "Afsluiten";
+$a->strings["System"] = "Systeem";
+$a->strings["Home"] = "Tijdlijn";
+$a->strings["Introductions"] = "Verzoeken";
+$a->strings["%s commented on %s's post"] = "%s gaf een reactie op het bericht van %s";
+$a->strings["%s created a new post"] = "%s schreef een nieuw bericht";
+$a->strings["%s liked %s's post"] = "%s vond het bericht van %s leuk";
+$a->strings["%s disliked %s's post"] = "%s vond het bericht van %s niet leuk";
+$a->strings["%s is attending %s's event"] = "%s woont het event van %s bij";
+$a->strings["%s is not attending %s's event"] = "%s woont het event van %s niet bij";
+$a->strings["%s may attend %s's event"] = "%s woont het event van %s misschien bij";
+$a->strings["%s is now friends with %s"] = "%s is nu bevriend met %s";
+$a->strings["Friend Suggestion"] = "Vriendschapsvoorstel";
+$a->strings["Friend/Connect Request"] = "Vriendschapsverzoek";
+$a->strings["New Follower"] = "Nieuwe Volger";
+$a->strings["Error decoding account file"] = "Fout bij decoderen van het account bestand";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Fout! Geen versie data in het bestand! Is dit wel een Friendica account bestand?";
 $a->strings["User '%s' already exists on this server!"] = "Gebruiker '%s' bestaat al op deze server!";
 $a->strings["User creation error"] = "Fout bij het aanmaken van de gebruiker";
 $a->strings["User profile creation error"] = "Fout bij het aanmaken van het gebruikersprofiel";
@@ -1744,80 +1828,8 @@ $a->strings["%d contact not imported"] = [
 	1 => "%d contacten werden niet geïmporteerd",
 ];
 $a->strings["Done. You can now login with your username and password"] = "Gebeurd. Je kunt nu inloggen met je gebruikersnaam en wachtwoord";
-$a->strings["Post to Email"] = "Verzenden per e-mail";
-$a->strings["Hide your profile details from unknown viewers?"] = "Je profieldetails verbergen voor onbekende bezoekers?";
-$a->strings["Connectors disabled, since \"%s\" is enabled."] = "";
-$a->strings["Visible to everybody"] = "Zichtbaar voor iedereen";
-$a->strings["Close"] = "Afsluiten";
-$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"] = "Systeem";
-$a->strings["Home"] = "Tijdlijn";
-$a->strings["Introductions"] = "Verzoeken";
-$a->strings["%s commented on %s's post"] = "%s gaf een reactie op het bericht van %s";
-$a->strings["%s created a new post"] = "%s schreef een nieuw bericht";
-$a->strings["%s liked %s's post"] = "%s vond het bericht van %s leuk";
-$a->strings["%s disliked %s's post"] = "%s vond het bericht van %s niet leuk";
-$a->strings["%s is attending %s's event"] = "";
-$a->strings["%s is not attending %s's event"] = "";
-$a->strings["%s may attend %s's event"] = "";
-$a->strings["%s is now friends with %s"] = "%s is nu bevriend met %s";
-$a->strings["Friend Suggestion"] = "Vriendschapsvoorstel";
-$a->strings["Friend/Connect Request"] = "Vriendschapsverzoek";
-$a->strings["New Follower"] = "Nieuwe Volger";
-$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Kan geen command-line-versie van PHP vinden in het PATH van de webserver.";
-$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"] = "PATH van het PHP commando";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Vul het volledige pad in naar het php programma. Je kunt dit leeg laten om de installatie verder te zetten.";
-$a->strings["Command line PHP"] = "PHP-opdrachtregel";
-$a->strings["PHP executable is not the php cli binary (could be cgi-fgci version)"] = "";
-$a->strings["Found PHP version: "] = "Gevonden PHP versie:";
-$a->strings["PHP cli binary"] = "";
-$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "De command-line versie van PHP op jouw systeem heeft \"register_argc_argv\" niet geactiveerd.";
-$a->strings["This is required for message delivery to work."] = "Dit is nodig om het verzenden van berichten mogelijk te maken.";
-$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"] = "";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Zie \"http://www.php.net/manual/en/openssl.installation.php\" wanneer u Friendica onder Windows draait.";
-$a->strings["Generate encryption keys"] = "";
-$a->strings["libCurl PHP module"] = "libCurl PHP module";
-$a->strings["GD graphics PHP module"] = "GD graphics PHP module";
-$a->strings["OpenSSL PHP module"] = "OpenSSL PHP module";
-$a->strings["PDO or MySQLi PHP module"] = "";
-$a->strings["mb_string PHP module"] = "mb_string PHP module";
-$a->strings["XML PHP module"] = "";
-$a->strings["iconv PHP module"] = "";
-$a->strings["POSIX PHP module"] = "";
-$a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fout: Apache-module mod-rewrite is vereist, maar niet geïnstalleerd.";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Fout: PHP-module libCURL is vereist, maar niet geïnstalleerd.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fout: PHP-module GD graphics met JPEG support is vereist, maar niet geïnstalleerd.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Fout: PHP-module openssl is vereist, maar niet geïnstalleerd.";
-$a->strings["Error: PDO or MySQLi PHP module required but not installed."] = "";
-$a->strings["Error: The MySQL driver for PDO is not installed."] = "";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Fout: PHP-module mb_string is vereist, maar niet geïnstalleerd.";
-$a->strings["Error: iconv PHP module required but not installed."] = "";
-$a->strings["Error: POSIX PHP module required but not installed."] = "";
-$a->strings["Error, XML PHP module required but not installed."] = "";
-$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."] = "Het installatieprogramma moet een bestand \".htconfig.php\" in de bovenste map van je webserver aanmaken, maar kan dit niet doen.";
-$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."] = "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.";
-$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."] = "Op het einde van deze procedure zal ik je een tekst geven om te bewaren in een bestand .htconfig.php in je hoogste Friendica map.";
-$a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Je kunt ook deze procedure overslaan, en een manuele installatie uitvoeren. Lees het bestand \"INSTALL.txt\" voor instructies.";
-$a->strings[".htconfig.php is writable"] = ".htconfig.php is schrijfbaar";
-$a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica gebruikt het Smarty3 sjabloon systeem om zijn webpagina's weer te geven. Smarty3 compileert sjablonen naar PHP om de weergave te versnellen.";
-$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."] = "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.";
-$a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Zorg ervoor dat de gebruiker waaronder je webserver runt (bijv. www-data) schrijf-toegang heeft tot deze map.";
-$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."] = "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.";
-$a->strings["view/smarty3 is writable"] = "view/smarty3 is schrijfbaar";
-$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "";
-$a->strings["Error message from Curl when fetching"] = "";
-$a->strings["Url rewrite is working"] = "";
-$a->strings["ImageMagick PHP extension is not installed"] = "";
-$a->strings["ImageMagick PHP extension is installed"] = "";
-$a->strings["ImageMagick supports GIF"] = "";
 $a->strings["Birthday:"] = "Verjaardag:";
-$a->strings["YYYY-MM-DD or MM-DD"] = "";
+$a->strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-DD of MM-DD";
 $a->strings["never"] = "nooit";
 $a->strings["less than a second ago"] = "minder dan een seconde geleden";
 $a->strings["year"] = "jaar";
@@ -1830,20 +1842,69 @@ $a->strings["hours"] = "uren";
 $a->strings["minute"] = "minuut";
 $a->strings["minutes"] = "minuten";
 $a->strings["second"] = "seconde";
-$a->strings["seconds"] = "secondes";
+$a->strings["seconds"] = "seconden";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s geleden";
 $a->strings["view full size"] = "Volledig formaat";
 $a->strings["Image/photo"] = "Afbeelding/foto";
-$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s";
 $a->strings["$1 wrote:"] = "$1 schreef:";
 $a->strings["Encrypted content"] = "Versleutelde inhoud";
-$a->strings["Invalid source protocol"] = "";
-$a->strings["Invalid link protocol"] = "";
-$a->strings["Embedding disabled"] = "Inbedden uitgeschakeld";
-$a->strings["Embedded content"] = "Ingebedde inhoud";
+$a->strings["Invalid source protocol"] = "Ongeldig bron protocol";
+$a->strings["Invalid link protocol"] = "Ongeldig verbinding protocol";
 $a->strings["Export"] = "Exporteer";
 $a->strings["Export calendar as ical"] = "Exporteer kalender als ical";
 $a->strings["Export calendar as csv"] = "Exporteer kalender als csv";
+$a->strings["General Features"] = "Algemene functies";
+$a->strings["Multiple Profiles"] = "Meerdere profielen";
+$a->strings["Ability to create multiple profiles"] = "Mogelijkheid om meerdere profielen aan te maken";
+$a->strings["Photo Location"] = "Foto Locatie";
+$a->strings["Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map."] = "Foto metadata wordt normaal verwijderd. Dit extraheert de locatie (indien aanwezig) vooraleer de metadata te verwijderen en verbindt die met een kaart.";
+$a->strings["Export Public Calendar"] = "Exporteer Publieke Kalender";
+$a->strings["Ability for visitors to download the public calendar"] = "Mogelijkheid voor bezoekers om de publieke kalender te downloaden";
+$a->strings["Post Composition Features"] = "Functies voor het opstellen van berichten";
+$a->strings["Post Preview"] = "Voorvertoning bericht";
+$a->strings["Allow previewing posts and comments before publishing them"] = "Sta toe dat berichten en reacties eerst bekeken worden worden vooraleer te publiceren";
+$a->strings["Auto-mention Forums"] = "Auto-vermelding Forums";
+$a->strings["Add/remove mention when a forum page is selected/deselected in ACL window."] = "Voeg toe/verwijder vermelding wanneer een forum pagina geselecteerd/gedeselecteerd wordt in het ACL venster.";
+$a->strings["Network Sidebar"] = "Netwerk Zijbalk";
+$a->strings["Ability to select posts by date ranges"] = "Mogelijkheid om berichten te selecteren volgens datumbereik";
+$a->strings["List Forums"] = "Lijst Fora op";
+$a->strings["Enable widget to display the forums your are connected with"] = "Sta de widget toe om de fora te tonen waarmee je geconnecteerd bent";
+$a->strings["Group Filter"] = "Groepsfilter";
+$a->strings["Enable widget to display Network posts only from selected group"] = "Sta de widget toe om netwerkberichten te tonen van bepaalde groepen";
+$a->strings["Network Filter"] = "Netwerkfilter";
+$a->strings["Enable widget to display Network posts only from selected network"] = "Sta de widget toe om netwerkberichten te tonen van bepaalde netwerken";
+$a->strings["Save search terms for re-use"] = "Sla zoekopdrachten op voor hergebruik";
+$a->strings["Network Tabs"] = "Netwerktabs";
+$a->strings["Network Personal Tab"] = "Persoonlijke netwerktab";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had";
+$a->strings["Network New Tab"] = "Nieuwe netwerktab";
+$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Laat de tab alleen nieuwe netwerkberichten tonen (van de laatste 12 uur)";
+$a->strings["Network Shared Links Tab"] = "Netwerk Gedeelde Links Tab";
+$a->strings["Enable tab to display only Network posts with links in them"] = "Activeer tab om alleen Netwerk berichten met links in te tonen";
+$a->strings["Post/Comment Tools"] = "Bericht-/reactiehulpmiddelen";
+$a->strings["Multiple Deletion"] = "Meervoudige verwijdering";
+$a->strings["Select and delete multiple posts/comments at once"] = "Selecteer en verwijder meerdere berichten/reacties in een keer";
+$a->strings["Edit Sent Posts"] = "Bewerk verzonden berichten";
+$a->strings["Edit and correct posts and comments after sending"] = "Bewerk en corrigeer berichten en reacties na verzending";
+$a->strings["Tagging"] = "Labelen";
+$a->strings["Ability to tag existing posts"] = "Mogelijkheid om bestaande berichten te labelen";
+$a->strings["Post Categories"] = "Categorieën berichten";
+$a->strings["Add categories to your posts"] = "Voeg categorieën toe aan je berichten";
+$a->strings["Saved Folders"] = "Bewaarde Mappen";
+$a->strings["Ability to file posts under folders"] = "Mogelijkheid om berichten in mappen te bewaren";
+$a->strings["Dislike Posts"] = "Vind berichten niet leuk";
+$a->strings["Ability to dislike posts/comments"] = "Mogelijkheid om berichten of reacties niet leuk te vinden";
+$a->strings["Star Posts"] = "Geef berichten een ster";
+$a->strings["Ability to mark special posts with a star indicator"] = "Mogelijkheid om speciale berichten te markeren met een ster indicator";
+$a->strings["Mute Post Notifications"] = "Toon geen Bericht Notificaties";
+$a->strings["Ability to mute notifications for a thread"] = "Mogelijkheid notificaties in een gesprek niet te tonen";
+$a->strings["Advanced Profile Settings"] = "Geavanceerde Profiel Instellingen";
+$a->strings["Show visitors public community forums at the Advanced Profile Page"] = "Toon bezoekers de publieke groepsfora in de Geavanceerde Profiel Pagina";
+$a->strings["Tag Cloud"] = "Tag Wolk";
+$a->strings["Provide a personal tag cloud on your profile page"] = "Voorzie een persoonlijk tag wolk op je profiel pagina";
+$a->strings["Display Membership Date"] = "Toon Lidmaatschap Datum";
+$a->strings["Display membership date in profile"] = "Toon lidmaatschap datum in profiel";
 $a->strings["Frequently"] = "Frequent";
 $a->strings["Hourly"] = "Ieder uur";
 $a->strings["Twice daily"] = "Twee maal daags";
@@ -1921,76 +1982,10 @@ $a->strings["Uncertain"] = "Onzeker";
 $a->strings["It's complicated"] = "Het is gecompliceerd";
 $a->strings["Don't care"] = "Kan me niet schelen";
 $a->strings["Ask me"] = "Vraag me";
-$a->strings["Add New Contact"] = "Nieuw Contact toevoegen";
-$a->strings["Enter address or web location"] = "Voeg een webadres of -locatie in:";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Voorbeeld: jan@voorbeeld.be, http://voorbeeld.nl/barbara";
-$a->strings["%d invitation available"] = [
-	0 => "%d uitnodiging beschikbaar",
-	1 => "%d uitnodigingen beschikbaar",
-];
-$a->strings["Networks"] = "Netwerken";
-$a->strings["All Networks"] = "Alle netwerken";
-$a->strings["Saved Folders"] = "Bewaarde Mappen";
-$a->strings["Everything"] = "Alles";
-$a->strings["Categories"] = "Categorieën";
-$a->strings["%d contact in common"] = [
-	0 => "%d gedeeld contact",
-	1 => "%d gedeelde contacten",
-];
-$a->strings["General Features"] = "Algemene functies";
-$a->strings["Multiple Profiles"] = "Meerdere profielen";
-$a->strings["Ability to create multiple profiles"] = "Mogelijkheid om meerdere profielen aan te maken";
-$a->strings["Photo Location"] = "";
-$a->strings["Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map."] = "";
-$a->strings["Export Public Calendar"] = "Exporteer Publieke Kalender";
-$a->strings["Ability for visitors to download the public calendar"] = "";
-$a->strings["Post Composition Features"] = "Functies voor het opstellen van berichten";
-$a->strings["Post Preview"] = "Voorvertoning bericht";
-$a->strings["Allow previewing posts and comments before publishing them"] = "";
-$a->strings["Auto-mention Forums"] = "";
-$a->strings["Add/remove mention when a forum page is selected/deselected in ACL window."] = "";
-$a->strings["Network Sidebar"] = "";
-$a->strings["Ability to select posts by date ranges"] = "Mogelijkheid om berichten te selecteren volgens datumbereik";
-$a->strings["List Forums"] = "";
-$a->strings["Enable widget to display the forums your are connected with"] = "";
-$a->strings["Group Filter"] = "Groepsfilter";
-$a->strings["Enable widget to display Network posts only from selected group"] = "Sta de widget toe om netwerkberichten te tonen van bepaalde groepen";
-$a->strings["Network Filter"] = "Netwerkfilter";
-$a->strings["Enable widget to display Network posts only from selected network"] = "Sta de widget toe om netwerkberichten te tonen van bepaalde netwerken";
-$a->strings["Save search terms for re-use"] = "Sla zoekopdrachten op voor hergebruik";
-$a->strings["Network Tabs"] = "Netwerktabs";
-$a->strings["Network Personal Tab"] = "Persoonlijke netwerktab";
-$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had";
-$a->strings["Network New Tab"] = "Nieuwe netwerktab";
-$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Laat de tab alleen nieuwe netwerkberichten tonen (van de laatste 12 uur)";
-$a->strings["Network Shared Links Tab"] = "";
-$a->strings["Enable tab to display only Network posts with links in them"] = "";
-$a->strings["Post/Comment Tools"] = "Bericht-/reactiehulpmiddelen";
-$a->strings["Multiple Deletion"] = "Meervoudige verwijdering";
-$a->strings["Select and delete multiple posts/comments at once"] = "Selecteer en verwijder meerdere berichten/reacties in een keer";
-$a->strings["Edit Sent Posts"] = "Bewerk verzonden berichten";
-$a->strings["Edit and correct posts and comments after sending"] = "Bewerk en corrigeer berichten en reacties na verzending";
-$a->strings["Tagging"] = "Labelen";
-$a->strings["Ability to tag existing posts"] = "Mogelijkheid om bestaande berichten te labelen";
-$a->strings["Post Categories"] = "Categorieën berichten";
-$a->strings["Add categories to your posts"] = "Voeg categorieën toe aan je berichten";
-$a->strings["Ability to file posts under folders"] = "Mogelijkheid om berichten in mappen te bewaren";
-$a->strings["Dislike Posts"] = "Vind berichten niet leuk";
-$a->strings["Ability to dislike posts/comments"] = "Mogelijkheid om berichten of reacties niet leuk te vinden";
-$a->strings["Star Posts"] = "Geef berichten een ster";
-$a->strings["Ability to mark special posts with a star indicator"] = "";
-$a->strings["Mute Post Notifications"] = "";
-$a->strings["Ability to mute notifications for a thread"] = "";
-$a->strings["Advanced Profile Settings"] = "";
-$a->strings["Show visitors public community forums at the Advanced Profile Page"] = "";
-$a->strings["Tag Cloud"] = "";
-$a->strings["Provide a personal tag cloud on your profile page"] = "";
-$a->strings["Display Membership Date"] = "";
-$a->strings["Display membership date in profile"] = "";
 $a->strings["Nothing new here"] = "Niets nieuw hier";
 $a->strings["Clear notifications"] = "Notificaties verwijderen";
 $a->strings["Personal notes"] = "Persoonlijke nota's";
-$a->strings["Your personal notes"] = "";
+$a->strings["Your personal notes"] = "Je persoonlijke nota's";
 $a->strings["Sign in"] = "Inloggen";
 $a->strings["Home Page"] = "Jouw tijdlijn";
 $a->strings["Create an account"] = "Maak een accoount";
@@ -1999,11 +1994,11 @@ $a->strings["Apps"] = "Apps";
 $a->strings["Addon applications, utilities, games"] = "Extra toepassingen, hulpmiddelen of spelletjes";
 $a->strings["Search site content"] = "Doorzoek de inhoud van de website";
 $a->strings["Community"] = "Website";
-$a->strings["Conversations on this and other servers"] = "";
+$a->strings["Conversations on this and other servers"] = "Gesprekken op deze en andere servers";
 $a->strings["Directory"] = "Gids";
 $a->strings["People directory"] = "Personengids";
-$a->strings["Information about this friendica instance"] = "";
-$a->strings["Terms of Service of this Friendica instance"] = "";
+$a->strings["Information about this friendica instance"] = "informatie over deze friendica server";
+$a->strings["Terms of Service of this Friendica instance"] = "Gebruiksvoorwaarden op deze Friendica server";
 $a->strings["Network Reset"] = "Netwerkpagina opnieuw instellen";
 $a->strings["Load Network page with no filters"] = "Laad de netwerkpagina zonder filters";
 $a->strings["Friend Requests"] = "Vriendschapsverzoeken";
@@ -2013,66 +2008,34 @@ $a->strings["Inbox"] = "Inbox";
 $a->strings["Outbox"] = "Verzonden berichten";
 $a->strings["Manage"] = "Beheren";
 $a->strings["Manage other pages"] = "Andere pagina's beheren";
-$a->strings["Profiles"] = "Profielen";
 $a->strings["Manage/Edit Profiles"] = "Beheer/Wijzig Profielen";
 $a->strings["Site setup and configuration"] = "Website opzetten en configureren";
 $a->strings["Navigation"] = "Navigatie";
 $a->strings["Site map"] = "Sitemap";
+$a->strings["Embedding disabled"] = "Inbedden uitgeschakeld";
+$a->strings["Embedded content"] = "Ingebedde inhoud";
+$a->strings["Add New Contact"] = "Nieuw Contact toevoegen";
+$a->strings["Enter address or web location"] = "Voeg een webadres of -locatie in:";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Voorbeeld: jan@voorbeeld.be, http://voorbeeld.nl/barbara";
+$a->strings["%d invitation available"] = [
+	0 => "%d uitnodiging beschikbaar",
+	1 => "%d uitnodigingen beschikbaar",
+];
+$a->strings["Networks"] = "Netwerken";
+$a->strings["All Networks"] = "Alle netwerken";
+$a->strings["Everything"] = "Alles";
+$a->strings["Categories"] = "Categorieën";
+$a->strings["%d contact in common"] = [
+	0 => "%d gedeeld contact",
+	1 => "%d gedeelde contacten",
+];
 $a->strings["There are no tables on MyISAM."] = "Er zijn geen MyISAM tabellen.";
 $a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\t\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.";
 $a->strings["The error message is\n[pre]%s[/pre]"] = "De foutboodschap is\n[pre]%s[/pre]";
-$a->strings["\nError %d occurred during database update:\n%s\n"] = "";
-$a->strings["Errors encountered performing database changes: "] = "";
-$a->strings["%s: Database update"] = "";
-$a->strings["%s: updating %s table."] = "";
-$a->strings["[no subject]"] = "[geen onderwerp]";
-$a->strings["Starts:"] = "Begint:";
-$a->strings["Finishes:"] = "Eindigt:";
-$a->strings["all-day"] = "";
-$a->strings["Jun"] = "Jun";
-$a->strings["Sept"] = "Sep";
-$a->strings["No events to display"] = "";
-$a->strings["l, F j"] = "l j F";
-$a->strings["Edit event"] = "Gebeurtenis bewerken";
-$a->strings["Duplicate event"] = "";
-$a->strings["Delete event"] = "";
-$a->strings["D g:i A"] = "D g:i A";
-$a->strings["g:i A"] = "g:i A";
-$a->strings["Show map"] = "Toon kaart";
-$a->strings["Hide map"] = "Verberg kaart";
-$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."] = "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. ";
-$a->strings["Default privacy group for new contacts"] = "";
-$a->strings["Everybody"] = "Iedereen";
-$a->strings["edit"] = "verander";
-$a->strings["Edit group"] = "Verander groep";
-$a->strings["Contacts not in any group"] = "";
-$a->strings["Create a new group"] = "Maak nieuwe groep";
-$a->strings["Edit groups"] = "";
-$a->strings["Login failed"] = "";
-$a->strings["Not enough information to authenticate"] = "";
-$a->strings["An invitation is required."] = "Een uitnodiging is vereist.";
-$a->strings["Invitation could not be verified."] = "Uitnodiging kon niet geverifieerd worden.";
-$a->strings["Invalid OpenID url"] = "Ongeldige OpenID url";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "";
-$a->strings["The error message was:"] = "De foutboodschap was:";
-$a->strings["Please enter the required information."] = "Vul de vereiste informatie in.";
-$a->strings["Please use a shorter name."] = "gebruik een kortere naam";
-$a->strings["Name too short."] = "Naam te kort";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "Dat lijkt niet je volledige naam (voor- en achternaam) te zijn.";
-$a->strings["Your email domain is not among those allowed on this site."] = "Je e-maildomein is op deze website niet toegestaan.";
-$a->strings["Not a valid email address."] = "Geen geldig e-mailadres.";
-$a->strings["Cannot use that email."] = "Ik kan die e-mail niet gebruiken.";
-$a->strings["Your nickname can only contain a-z, 0-9 and _."] = "Je bijnaam mag alleen a-z, 0-9 of _ bevatten.";
-$a->strings["Nickname is already registered. Please choose another."] = "Bijnaam is al geregistreerd. Kies een andere.";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERNSTIGE FOUT: aanmaken van beveiligingssleutels mislukt.";
-$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"] = "\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";
-$a->strings["Registration at %s"] = "Registratie bij %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\tBeste %1\$s,\n\t\t\t\tBedankt voor je registratie bij %2\$s. Je account is aangemaakt.\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\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.";
+$a->strings["\nError %d occurred during database update:\n%s\n"] = "\nFout %d is opgetreden tijdens database update:\n%s\n";
+$a->strings["Errors encountered performing database changes: "] = "Fouten opgetreden tijdens database aanpassingen:";
+$a->strings["%s: Database update"] = "%s: Database update";
+$a->strings["%s: updating %s table."] = "%s: tabel %s aan het updaten.";
 $a->strings["Drop Contact"] = "Verwijder contact";
 $a->strings["Organisation"] = "Organisatie";
 $a->strings["News"] = "Nieuws";
@@ -2081,22 +2044,67 @@ $a->strings["Connect URL missing."] = "Connectie URL ontbreekt.";
 $a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Het contact kon niet toegevoegd worden. Gelieve de relevante netwerk gegevens na te kijken in Instellingen -> Sociale Netwerken.";
 $a->strings["This site is not configured to allow communications with other networks."] = "Deze website is niet geconfigureerd voor communicatie met andere netwerken.";
 $a->strings["No compatible communication protocols or feeds were discovered."] = "Er werden geen compatibele communicatieprotocols of feeds ontdekt.";
-$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."] = "";
+$a->strings["The profile address specified does not provide adequate information."] = "Het opgegeven profiel adres bevat geen adequate informatie.";
+$a->strings["An author or name was not found."] = "Er werd geen auteur of naam gevonden.";
+$a->strings["No browser URL could be matched to this address."] = "Er kan geen browser URL gematcht worden met dit adres.";
 $a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Het @-stijl-identiteitsadres komt niet overeen met een nekend protocol of e-mailcontact.";
 $a->strings["Use mailto: in front of address to force email check."] = "Gebruik mailto: voor het adres om een e-mailcontrole af te dwingen.";
-$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["The profile address specified belongs to a network which has been disabled on this site."] = "Het opgegeven profiel adres behoort tot een netwerk dat gedeactiveerd is op deze site.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Profiel met restricties. Deze peresoon zal geen directe/persoonlijke notificaties van jou kunnen ontvangen.";
 $a->strings["Unable to retrieve contact information."] = "Het was niet mogelijk informatie over dit contact op te halen.";
 $a->strings["%s's birthday"] = "%s's verjaardag";
 $a->strings["Happy Birthday %s"] = "Gefeliciteerd %s";
-$a->strings["%1\$s is attending %2\$s's %3\$s"] = "";
-$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "";
-$a->strings["%1\$s may attend %2\$s's %3\$s"] = "";
+$a->strings["Starts:"] = "Begint:";
+$a->strings["Finishes:"] = "Eindigt:";
+$a->strings["all-day"] = "de hele dag";
+$a->strings["Jun"] = "Jun";
+$a->strings["Sept"] = "Sep";
+$a->strings["No events to display"] = "Geen gebeurtenissen te tonen";
+$a->strings["l, F j"] = "l j F";
+$a->strings["Edit event"] = "Gebeurtenis bewerken";
+$a->strings["Duplicate event"] = "Duplicate gebeurtenis";
+$a->strings["Delete event"] = "Verwijder gebeurtenis";
+$a->strings["D g:i A"] = "D g:i A";
+$a->strings["g:i A"] = "g:i A";
+$a->strings["Show map"] = "Toon kaart";
+$a->strings["Hide map"] = "Verberg kaart";
+$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."] = "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. ";
+$a->strings["Default privacy group for new contacts"] = "Standaard privacy groep voor nieuwe contacten";
+$a->strings["Everybody"] = "Iedereen";
+$a->strings["edit"] = "verander";
+$a->strings["Edit group"] = "Verander groep";
+$a->strings["Create a new group"] = "Maak nieuwe groep";
+$a->strings["Edit groups"] = "Bewerk groepen";
+$a->strings["[no subject]"] = "[geen onderwerp]";
+$a->strings["Login failed"] = "Login mislukt";
+$a->strings["Not enough information to authenticate"] = "Niet genoeg informatie om te authentificeren";
+$a->strings["An invitation is required."] = "Een uitnodiging is vereist.";
+$a->strings["Invitation could not be verified."] = "Uitnodiging kon niet geverifieerd worden.";
+$a->strings["Invalid OpenID url"] = "Ongeldige OpenID url";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Er is een probleem opgetreden bij het inloggen met het opgegeven OpenID. Kijk alsjeblieft de spelling van deze ID na.";
+$a->strings["The error message was:"] = "De foutboodschap was:";
+$a->strings["Please enter the required information."] = "Vul de vereiste informatie in.";
+$a->strings["Please use a shorter name."] = "gebruik een kortere naam";
+$a->strings["Name too short."] = "Naam te kort";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Dat lijkt niet je volledige naam (voor- en achternaam) te zijn.";
+$a->strings["Your email domain is not among those allowed on this site."] = "Je e-maildomein is op deze website niet toegestaan.";
+$a->strings["Not a valid email address."] = "Geen geldig e-mailadres.";
+$a->strings["The nickname was blocked from registration by the nodes admin."] = "De bijnaam werd geblokkeerd voor registratie door de node admin";
+$a->strings["Cannot use that email."] = "Ik kan die e-mail niet gebruiken.";
+$a->strings["Your nickname can only contain a-z, 0-9 and _."] = "Je bijnaam mag alleen a-z, 0-9 of _ bevatten.";
+$a->strings["Nickname is already registered. Please choose another."] = "Bijnaam is al geregistreerd. Kies een andere.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "ERNSTIGE FOUT: aanmaken van beveiligingssleutels mislukt.";
+$a->strings["An error occurred during registration. Please try again."] = "Er is een fout opgetreden tijdens de registratie. Probeer opnieuw.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Er is een fout opgetreden bij het aanmaken van je standaard profiel. Probeer opnieuw.";
+$a->strings["An error occurred creating your self contact. Please try again."] = "Er is een fout opgetreden bij het aanmaken van je self contact. Probeer opnieuw.";
+$a->strings["An error occurred creating your default contact group. Please try again."] = "Er is een fout opgetreden bij het aanmaken van je standaard contact groep. Probeer opnieuw.";
+$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\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";
+$a->strings["Registration at %s"] = "Registratie bij %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\tBeste %1\$s,\n\t\t\t\tBedankt voor je registratie bij %2\$s. Je account is aangemaakt.\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\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.";
 $a->strings["Requested account is not available."] = "Gevraagde account is niet beschikbaar.";
 $a->strings["Edit profile"] = "Bewerk profiel";
-$a->strings["Atom feed"] = "";
+$a->strings["Atom feed"] = "Atom feed";
 $a->strings["Manage/edit profiles"] = "Beheer/wijzig profielen";
 $a->strings["g A l F d"] = "G l j F";
 $a->strings["F d"] = "d F";
@@ -2105,7 +2113,7 @@ $a->strings["Birthday Reminders"] = "Verjaardagsherinneringen";
 $a->strings["Birthdays this week:"] = "Verjaardagen deze week:";
 $a->strings["[No description]"] = "[Geen omschrijving]";
 $a->strings["Event Reminders"] = "Gebeurtenisherinneringen";
-$a->strings["Events this week:"] = "Gebeurtenissen deze week:";
+$a->strings["Upcoming events the next 7 days:"] = "Evenementen de komende 7 dagen:";
 $a->strings["Member since:"] = "Lid sinds:";
 $a->strings["j F, Y"] = "F j Y";
 $a->strings["j F"] = "F j";
@@ -2121,16 +2129,22 @@ $a->strings["Film/dance/culture/entertainment:"] = "Film/dans/cultuur/ontspannin
 $a->strings["Love/Romance:"] = "Liefde/romance:";
 $a->strings["Work/employment:"] = "Werk/beroep:";
 $a->strings["School/education:"] = "School/opleiding:";
-$a->strings["Forums:"] = "";
+$a->strings["Forums:"] = "Fora:";
 $a->strings["Only You Can See This"] = "Alleen jij kunt dit zien";
+$a->strings["Tips for New Members"] = "Tips voor nieuwe leden";
+$a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s verwelkomt %2\$s";
 $a->strings["Sharing notification from Diaspora network"] = "Deelt notificatie van het Diaspora netwerk";
 $a->strings["Attachments:"] = "Bijlagen:";
 $a->strings["%s is now following %s."] = "%s volgt nu %s.";
 $a->strings["following"] = "volgend";
 $a->strings["%s stopped following %s."] = "%s stopte %s te volgen.";
-$a->strings["stopped following"] = "";
+$a->strings["stopped following"] = "is gestopt met volgen";
 $a->strings["(no subject)"] = "(geen onderwerp)";
 $a->strings["Logged out."] = "Uitgelogd.";
+$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."] = "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.";
+$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."] = "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.";
+$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."] = "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.";
+$a->strings["Privacy Statement"] = "Privacy Verklaring";
 $a->strings["Create a New Account"] = "Nieuwe account aanmaken";
 $a->strings["Password: "] = "Wachtwoord:";
 $a->strings["Remember me"] = "Onthou me";
@@ -2140,12 +2154,9 @@ $a->strings["Website Terms of Service"] = "Gebruikersvoorwaarden website";
 $a->strings["terms of service"] = "servicevoorwaarden";
 $a->strings["Website Privacy Policy"] = "Privacybeleid website";
 $a->strings["privacy policy"] = "privacybeleid";
-$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."] = "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.";
-$a->strings["Privacy Statement"] = "";
-$a->strings["This entry was edited"] = "";
-$a->strings["Remove from your stream"] = "";
+$a->strings["This entry was edited"] = "Deze entry werd bewerkt";
+$a->strings["Delete globally"] = "Verwijder globaal";
+$a->strings["Remove locally"] = "Verwijder lokaal";
 $a->strings["save to folder"] = "Bewaren in map";
 $a->strings["I will attend"] = "Ik zal er zijn";
 $a->strings["I will not attend"] = "Ik zal er niet zijn";
@@ -2154,9 +2165,9 @@ $a->strings["add star"] = "ster toevoegen";
 $a->strings["remove star"] = "ster verwijderen";
 $a->strings["toggle star status"] = "ster toevoegen of verwijderen";
 $a->strings["starred"] = "met ster";
-$a->strings["ignore thread"] = "";
-$a->strings["unignore thread"] = "";
-$a->strings["toggle ignore status"] = "";
+$a->strings["ignore thread"] = "Negeer gesprek";
+$a->strings["unignore thread"] = "Stop met gesprek te negeren";
+$a->strings["toggle ignore status"] = "verwissel negeer status";
 $a->strings["add tag"] = "label toevoegen";
 $a->strings["like"] = "leuk";
 $a->strings["dislike"] = "niet leuk";
@@ -2180,7 +2191,8 @@ $a->strings["Link"] = "Link";
 $a->strings["Video"] = "Video";
 $a->strings["Delete this item?"] = "Dit item verwijderen?";
 $a->strings["show fewer"] = "Minder tonen";
-$a->strings["No system theme config value set."] = "";
-$a->strings["toggle mobile"] = "mobiel thema omwisselen";
-$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "";
+$a->strings["No system theme config value set."] = "Geen systeem thema configuratie ingesteld.";
 $a->strings["Update %s failed. See error logs."] = "Wijziging %s mislukt. Lees de error logbestanden.";
+$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: author-id en owner-id in item en gesprekstabel aan het updaten.";
+$a->strings["%s: Updating post-type."] = "%s: bericht-type bewerken";
+$a->strings["toggle mobile"] = "mobiel thema omwisselen";
diff --git a/view/lang/pl/messages.po b/view/lang/pl/messages.po
index f2669ebe1..cf922f22f 100644
--- a/view/lang/pl/messages.po
+++ b/view/lang/pl/messages.po
@@ -32,14 +32,15 @@
 # emilia.krawczyk <rightxhere1@gmail.com>, 2012
 # Sam, 2013
 # rcmaniac <szsargalski@interia.pl>, 2012-2013
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
 # Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 # Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-20 14:22+0200\n"
-"PO-Revision-Date: 2018-05-24 16:34+0000\n"
+"POT-Creation-Date: 2018-08-25 15:34+0000\n"
+"PO-Revision-Date: 2018-08-26 14:19+0000\n"
 "Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -48,409 +49,533 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: include/enotify.php:31
-msgid "Friendica Notification"
-msgstr "Powiadomienia Friendica"
+#: index.php:261 mod/apps.php:14
+msgid "You must be logged in to use addons. "
+msgstr "Musisz być zalogowany, aby korzystać z dodatków."
 
-#: include/enotify.php:34
-msgid "Thank You,"
-msgstr "Dziękuję,"
+#: index.php:308 mod/fetch.php:20 mod/fetch.php:47 mod/fetch.php:54
+#: mod/help.php:62
+msgid "Not Found"
+msgstr "Nie znaleziono"
 
-#: include/enotify.php:37
-#, php-format
-msgid "%s Administrator"
-msgstr "%s Administrator"
+#: 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 "Strona nie znaleziona."
 
-#: include/enotify.php:39
-#, php-format
-msgid "%1$s, %2$s Administrator"
-msgstr "%1$s,%2$sAdministrator"
+#: index.php:431 mod/group.php:83 mod/profperm.php:29
+msgid "Permission denied"
+msgstr "Odmowa dostępu"
 
-#: include/enotify.php:95
-#, php-format
-msgid "[Friendica:Notify] New mail received at %s"
-msgstr "[Friendica:Powiadomienie] Nowa wiadomość otrzymana od %s"
+#: 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 "Brak uprawnień."
 
-#: include/enotify.php:97
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr "%1$swysłał ci nową prywatną wiadomość na %2$s "
+#: index.php:460
+msgid "toggle mobile"
+msgstr "przełącz na mobilny"
 
-#: include/enotify.php:98
-msgid "a private message"
-msgstr "prywatna wiadomość"
+#: view/theme/duepuntozero/config.php:54 src/Model/User.php:544
+msgid "default"
+msgstr "standardowe"
 
-#: include/enotify.php:98
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s wysyła ci %2$s"
+#: view/theme/duepuntozero/config.php:55
+msgid "greenzero"
+msgstr "zielone zero"
 
-#: include/enotify.php:100
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "Odwiedź %s żeby zobaczyć i/lub odpowiedzieć na twoje prywatne wiadomości"
+#: view/theme/duepuntozero/config.php:56
+msgid "purplezero"
+msgstr "fioletowe zero"
 
-#: include/enotify.php:138
-#, php-format
-msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
-msgstr "%1$s skomentował [url=%2$s]a %3$s[/url]"
+#: view/theme/duepuntozero/config.php:57
+msgid "easterbunny"
+msgstr "zajączek wielkanocny"
 
-#: include/enotify.php:146
-#, php-format
-msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
-msgstr "%1$sskomentował  [url=%2$s]%3$s %4$s[/url]"
+#: view/theme/duepuntozero/config.php:58
+msgid "darkzero"
+msgstr "ciemne zero"
 
-#: include/enotify.php:156
-#, php-format
-msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
-msgstr "%1$s skomentował [url=%2$s] twój %3$s[/ url]"
+#: view/theme/duepuntozero/config.php:59
+msgid "comix"
+msgstr "comix"
 
-#: include/enotify.php:168
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Friendica:Powiadomienie] Komentarz do rozmowy #%1$d przez %2$s"
+#: view/theme/duepuntozero/config.php:60
+msgid "slackr"
+msgstr "luźny"
 
-#: include/enotify.php:170
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr "%s skomentował rozmowę którą śledzisz"
+#: 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 "Potwierdź"
 
-#: include/enotify.php:173 include/enotify.php:188 include/enotify.php:203
-#: include/enotify.php:218 include/enotify.php:237 include/enotify.php:252
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "Odwiedź %s żeby zobaczyć i/lub odpowiedzieć na rozmowę"
+#: 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 "Ustawienia motywu"
 
-#: include/enotify.php:180
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
-msgstr "[Friendica:Powiadomienie] %s napisał na twoim profilu"
+#: view/theme/duepuntozero/config.php:74
+msgid "Variations"
+msgstr "Zmiana"
 
-#: include/enotify.php:182
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr "%1$sopublikowano na ścianie profilu w %2$s "
+#: view/theme/quattro/config.php:76
+msgid "Alignment"
+msgstr "Wyrównanie"
 
-#: include/enotify.php:183
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
-msgstr "%1$s wysłano do [url =%2$s]twojej strony[/url] "
+#: view/theme/quattro/config.php:76
+msgid "Left"
+msgstr "Lewo"
 
-#: include/enotify.php:195
-#, php-format
-msgid "[Friendica:Notify] %s tagged you"
-msgstr "[Friendica:Powiadomienie] %s dodał Cię"
+#: view/theme/quattro/config.php:76
+msgid "Center"
+msgstr "Środek"
 
-#: include/enotify.php:197
-#, php-format
-msgid "%1$s tagged you at %2$s"
-msgstr "%1$s oznaczono Cię tagiem %2$s"
+#: view/theme/quattro/config.php:77
+msgid "Color scheme"
+msgstr "Zestaw kolorów"
 
-#: include/enotify.php:198
-#, php-format
-msgid "%1$s [url=%2$s]tagged you[/url]."
-msgstr "%1$s [url=%2$s]oznaczył Cię[/url]. "
+#: view/theme/quattro/config.php:78
+msgid "Posts font size"
+msgstr "Rozmiar czcionki postów"
 
-#: include/enotify.php:210
-#, php-format
-msgid "[Friendica:Notify] %s shared a new post"
-msgstr "[Friendica:Powiadomienie] %s udostępnił nowy wpis"
+#: view/theme/quattro/config.php:79
+msgid "Textareas font size"
+msgstr "Rozmiar czcionki Textareas"
 
-#: include/enotify.php:212
-#, php-format
-msgid "%1$s shared a new post at %2$s"
-msgstr "%1$sudostępnił nowy wpis na %2$s "
+#: view/theme/vier/config.php:75
+msgid "Comma separated list of helper forums"
+msgstr "Lista pomocników oddzielona przecinkami"
 
-#: include/enotify.php:213
-#, php-format
-msgid "%1$s [url=%2$s]shared a post[/url]."
-msgstr "%1$s[url=%2$s]udostępnił wpis[/url]."
+#: view/theme/vier/config.php:115 src/Core/ACL.php:298
+msgid "don't show"
+msgstr "nie pokazuj"
 
-#: include/enotify.php:225
-#, php-format
-msgid "[Friendica:Notify] %1$s poked you"
-msgstr "[Friendica: Powiadomienie] %1$s zaczepia Cię"
+#: view/theme/vier/config.php:115 src/Core/ACL.php:297
+msgid "show"
+msgstr "pokaż"
 
-#: include/enotify.php:227
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr "%1$s zaczepił Cię %2$s"
+#: view/theme/vier/config.php:122
+msgid "Set style"
+msgstr "Ustaw styl"
 
-#: include/enotify.php:228
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr "%1$s[url=%2$s] zaczepił Cię[/url]."
+#: view/theme/vier/config.php:123
+msgid "Community Pages"
+msgstr "Strony społeczności"
 
-#: include/enotify.php:244
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
-msgstr "[Friendica:Powiadomienie] %s otagował Twój post"
+#: view/theme/vier/config.php:124 view/theme/vier/theme.php:149
+msgid "Community Profiles"
+msgstr "Profile społeczności"
 
-#: include/enotify.php:246
-#, php-format
-msgid "%1$s tagged your post at %2$s"
-msgstr "%1$soznaczyłeś swój wpis na %2$s "
+#: view/theme/vier/config.php:125
+msgid "Help or @NewHere ?"
+msgstr "Pomóż lub @NowyTutaj?"
 
-#: include/enotify.php:247
-#, php-format
-msgid "%1$s tagged [url=%2$s]your post[/url]"
-msgstr "%1$soznacz [url=%2$s]twój post[/url]"
+#: view/theme/vier/config.php:126 view/theme/vier/theme.php:386
+msgid "Connect Services"
+msgstr "Połączone serwisy"
 
-#: include/enotify.php:259
-msgid "[Friendica:Notify] Introduction received"
-msgstr "[Friendica:Powiadomienie] Zapoznanie odebrane"
+#: view/theme/vier/config.php:127
+msgid "Find Friends"
+msgstr "Znajdź znajomych"
 
-#: include/enotify.php:261
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
-msgstr "Otrzymałeś wstęp od '%1$s' z %2$s"
+#: view/theme/vier/config.php:128 view/theme/vier/theme.php:179
+msgid "Last users"
+msgstr "Ostatni użytkownicy"
 
-#: include/enotify.php:262
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
-msgstr "Zostałeś [url=%1$s] przyjęty [/ url] z %2$s."
+#: view/theme/vier/theme.php:197 src/Content/Widget.php:59
+msgid "Find People"
+msgstr "Znajdź ludzi"
 
-#: include/enotify.php:267 include/enotify.php:313
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "Możesz odwiedzić ich profil na stronie %s"
+#: view/theme/vier/theme.php:198 src/Content/Widget.php:60
+msgid "Enter name or interest"
+msgstr "Wpisz nazwę lub zainteresowanie"
 
-#: include/enotify.php:269
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr "Odwiedż %s aby zatwierdzić lub odrzucić przedstawienie."
+#: 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 "Połącz/Obserwuj"
 
-#: include/enotify.php:277
-msgid "[Friendica:Notify] A new person is sharing with you"
-msgstr "[Friendica:Powiadomienie] Nowa osoba dzieli się z tobą"
+#: view/theme/vier/theme.php:200 src/Content/Widget.php:62
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Przykład: Jan Kowalski, Wędkarstwo"
 
-#: include/enotify.php:279 include/enotify.php:280
-#, php-format
-msgid "%1$s is sharing with you at %2$s"
-msgstr "%1$sdzieli się z tobą w %2$s "
+#: view/theme/vier/theme.php:201 mod/directory.php:214 mod/contacts.php:842
+#: src/Content/Widget.php:63
+msgid "Find"
+msgstr "Znajdź"
 
-#: include/enotify.php:287
-msgid "[Friendica:Notify] You have a new follower"
-msgstr "[Friendica:Powiadomienie] Masz nowego obserwatora"
+#: view/theme/vier/theme.php:202 mod/suggest.php:117 src/Content/Widget.php:64
+msgid "Friend Suggestions"
+msgstr "Osoby, które możesz znać"
 
-#: include/enotify.php:289 include/enotify.php:290
-#, php-format
-msgid "You have a new follower at %2$s : %1$s"
-msgstr "Masz nowego obserwatora na %2$s : %1$s"
+#: view/theme/vier/theme.php:203 src/Content/Widget.php:65
+msgid "Similar Interests"
+msgstr "Podobne zainteresowania"
 
-#: include/enotify.php:302
-msgid "[Friendica:Notify] Friend suggestion received"
-msgstr "[Friendica: Powiadomienie] Otrzymano sugestię znajomego"
+#: view/theme/vier/theme.php:204 src/Content/Widget.php:66
+msgid "Random Profile"
+msgstr "Domyślny profil"
 
-#: include/enotify.php:304
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr "Otrzymałeś od znajomego sugestię '%1$s' na %2$s"
+#: view/theme/vier/theme.php:205 src/Content/Widget.php:67
+msgid "Invite Friends"
+msgstr "Zaproś znajomych"
 
-#: include/enotify.php:305
-#, php-format
+#: view/theme/vier/theme.php:206 mod/directory.php:207
+#: src/Content/Widget.php:68
+msgid "Global Directory"
+msgstr "Katalog Globalny"
+
+#: view/theme/vier/theme.php:208 src/Content/Widget.php:70
+msgid "Local Directory"
+msgstr "Katalog lokalny"
+
+#: view/theme/vier/theme.php:251 include/text.php:909 src/Content/Nav.php:151
+#: src/Content/ForumManager.php:125
+msgid "Forums"
+msgstr "Fora"
+
+#: view/theme/vier/theme.php:253 src/Content/ForumManager.php:127
+msgid "External link to forum"
+msgstr "Zewnętrzny link do 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 "Pokaż więcej"
+
+#: view/theme/vier/theme.php:289
+msgid "Quick Start"
+msgstr "Szybki start"
+
+#: view/theme/vier/theme.php:295 mod/help.php:56 src/Content/Nav.php:134
+msgid "Help"
+msgstr "Pomoc"
+
+#: view/theme/frio/config.php:102
+msgid "Custom"
+msgstr "Niestandardowe"
+
+#: view/theme/frio/config.php:114
+msgid "Note"
+msgstr "Uwaga"
+
+#: view/theme/frio/config.php:114
+msgid "Check image permissions if all users are allowed to see the image"
+msgstr "Sprawdź uprawnienia do zdjęć, jeśli wszyscy użytkownicy mogą zobaczyć obraz"
+
+#: view/theme/frio/config.php:121
+msgid "Select color scheme"
+msgstr "Wybierz schemat kolorów"
+
+#: view/theme/frio/config.php:122
+msgid "Navigation bar background color"
+msgstr "Kolor tła paska nawigacyjnego"
+
+#: view/theme/frio/config.php:123
+msgid "Navigation bar icon color "
+msgstr "Kolor ikony paska nawigacyjnego"
+
+#: view/theme/frio/config.php:124
+msgid "Link color"
+msgstr "Kolor łączy"
+
+#: view/theme/frio/config.php:125
+msgid "Set the background color"
+msgstr "Ustaw kolor tła"
+
+#: view/theme/frio/config.php:126
+msgid "Content background opacity"
+msgstr "Nieprzezroczystość tła treści"
+
+#: view/theme/frio/config.php:127
+msgid "Set the background image"
+msgstr "Ustaw obraz tła"
+
+#: view/theme/frio/config.php:128
+msgid "Background image style"
+msgstr "Styl tła"
+
+#: view/theme/frio/config.php:133
+msgid "Login page background image"
+msgstr "Obraz tła strony logowania"
+
+#: view/theme/frio/config.php:137
+msgid "Login page background color"
+msgstr "Kolor tła strony logowania"
+
+#: view/theme/frio/config.php:137
+msgid "Leave background image and color empty for theme defaults"
+msgstr "Pozostaw obraz tła i kolor pusty dla domyślnych ustawień kompozycji"
+
+#: view/theme/frio/theme.php:248
+msgid "Guest"
+msgstr "Gość"
+
+#: view/theme/frio/theme.php:253
+msgid "Visitor"
+msgstr "Odwiedzający"
+
+#: view/theme/frio/theme.php:266 src/Module/Login.php:309
+#: src/Content/Nav.php:97
+msgid "Logout"
+msgstr "Wyloguj"
+
+#: view/theme/frio/theme.php:266 src/Content/Nav.php:97
+msgid "End this session"
+msgstr "Zakończ sesję"
+
+#: 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 "Status"
+
+#: view/theme/frio/theme.php:269 src/Content/Nav.php:100
+#: src/Content/Nav.php:186
+msgid "Your posts and conversations"
+msgstr "Twoje posty i rozmowy"
+
+#: 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 "Profil użytkownika"
+
+#: view/theme/frio/theme.php:270 src/Content/Nav.php:101
+msgid "Your profile page"
+msgstr "Twoja strona profilowa"
+
+#: view/theme/frio/theme.php:271 mod/fbrowser.php:35 src/Model/Profile.php:891
+#: src/Content/Nav.php:102
+msgid "Photos"
+msgstr "Zdjęcia"
+
+#: view/theme/frio/theme.php:271 src/Content/Nav.php:102
+msgid "Your photos"
+msgstr "Twoje zdjęcia"
+
+#: view/theme/frio/theme.php:272 src/Model/Profile.php:899
+#: src/Model/Profile.php:902 src/Content/Nav.php:103
+msgid "Videos"
+msgstr "Filmy"
+
+#: view/theme/frio/theme.php:272 src/Content/Nav.php:103
+msgid "Your videos"
+msgstr "Twoje filmy"
+
+#: 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 "Wydarzenia"
+
+#: view/theme/frio/theme.php:273 src/Content/Nav.php:104
+msgid "Your events"
+msgstr "Twoje wydarzenia"
+
+#: view/theme/frio/theme.php:276 mod/admin.php:771
+#: src/Core/NotificationsManager.php:179 src/Content/Nav.php:183
+msgid "Network"
+msgstr "Sieć"
+
+#: view/theme/frio/theme.php:276 src/Content/Nav.php:183
+msgid "Conversations from your friends"
+msgstr "Rozmowy Twoich przyjaciół"
+
+#: 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 "Wydarzenia i kalendarz"
+
+#: view/theme/frio/theme.php:278 mod/message.php:127 src/Content/Nav.php:196
+msgid "Messages"
+msgstr "Wiadomości"
+
+#: view/theme/frio/theme.php:278 src/Content/Nav.php:196
+msgid "Private mail"
+msgstr "Prywatne maile"
+
+#: 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 "Ustawienia"
+
+#: view/theme/frio/theme.php:279 src/Content/Nav.php:207
+msgid "Account settings"
+msgstr "Ustawienia konta"
+
+#: 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 "Kontakty"
+
+#: view/theme/frio/theme.php:280 src/Content/Nav.php:213
+msgid "Manage/edit friends and contacts"
+msgstr "Zarządzaj listą przyjaciół i kontaktami"
+
+#: view/theme/frio/theme.php:367 include/conversation.php:866
+msgid "Follow Thread"
+msgstr "Śledź wątek"
+
+#: view/theme/frio/php/Image.php:24
+msgid "Top Banner"
+msgstr "Górny Baner"
+
+#: view/theme/frio/php/Image.php:24
 msgid ""
-"You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
-msgstr "Otrzymałeś [url=%1$s] sugestię znajomego [/url] dla %2$s od %3$s."
+"Resize image to the width of the screen and show background color below on "
+"long pages."
+msgstr "Zmień rozmiar obrazu na szerokość ekranu i pokaż kolor tła poniżej na długich stronach."
 
-#: include/enotify.php:311
-msgid "Name:"
-msgstr "Imię:"
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
+msgstr "Pełny ekran"
 
-#: include/enotify.php:312
-msgid "Photo:"
-msgstr "Zdjęcie:"
-
-#: include/enotify.php:315
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "Odwiedź stronę %s, aby zatwierdzić lub odrzucić sugestię."
-
-#: include/enotify.php:323 include/enotify.php:338
-msgid "[Friendica:Notify] Connection accepted"
-msgstr "[Friendica: Powiadomienie] Połączenie zostało zaakceptowane"
-
-#: include/enotify.php:325 include/enotify.php:340
-#, php-format
-msgid "'%1$s' has accepted your connection request at %2$s"
-msgstr "'%1$s' zaakceptował Twoją prośbę o połączenie na %2$s"
-
-#: include/enotify.php:326 include/enotify.php:341
-#, php-format
-msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
-msgstr "%2$szaakceptował twoje [url=%1$s] żądanie połączenia [/url]. "
-
-#: include/enotify.php:331
+#: view/theme/frio/php/Image.php:25
 msgid ""
-"You are now mutual friends and may exchange status updates, photos, and "
-"email without restriction."
-msgstr "Jesteście teraz przyjaciółmi i możesz wymieniać aktualizacje statusu, zdjęcia i e-maile bez ograniczeń."
+"Resize image to fill entire screen, clipping either the right or the bottom."
+msgstr "Zmień rozmiar obrazu, aby wypełnić cały ekran, przycinając prawy lub dolny."
 
-#: include/enotify.php:333
-#, php-format
-msgid "Please visit %s if you wish to make any changes to this relationship."
-msgstr "Odwiedź stronę %s jeśli chcesz wprowadzić zmiany w tym związku."
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
+msgstr "Mozaika jednorzędowa"
 
-#: include/enotify.php:346
-#, php-format
+#: view/theme/frio/php/Image.php:26
 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' zdecydował się zaakceptować Cię jako fana, który ogranicza niektóre formy komunikacji - takie jak prywatne wiadomości i niektóre interakcje w profilu. Jeśli jest to strona celebrytów lub społeczności, ustawienia te zostały zastosowane automatycznie."
+"Resize image to repeat it on a single row, either vertical or horizontal."
+msgstr "Zmień rozmiar obrazu, aby powtórzyć go w jednym wierszu, w pionie lub w poziomie."
 
-#: include/enotify.php:348
+#: view/theme/frio/php/Image.php:27
+msgid "Mosaic"
+msgstr "Mozaika"
+
+#: view/theme/frio/php/Image.php:27
+msgid "Repeat image to fill the screen."
+msgstr "Powtórz obraz, aby wypełnić ekran."
+
+#: update.php:194
 #, php-format
-msgid ""
-"'%1$s' may choose to extend this into a two-way or more permissive "
-"relationship in the future."
-msgstr "'%1$s' możesz zdecydować o przedłużeniu tego w dwukierunkową lub bardziej ścisłą relację w przyszłości. "
+msgid "%s: Updating author-id and owner-id in item and thread table. "
+msgstr "%s: Aktualizowanie ID autora i właściciela w tabeli pozycji i wątku."
 
-#: include/enotify.php:350
+#: update.php:240
 #, php-format
-msgid "Please visit %s  if you wish to make any changes to this relationship."
-msgstr "Odwiedź stronę %s, jeśli chcesz wprowadzić zmiany w tej relacji."
+msgid "%s: Updating post-type."
+msgstr "%s: Aktualizowanie typu postu."
 
-#: include/enotify.php:360 mod/removeme.php:44
-msgid "[Friendica System Notify]"
-msgstr "[Powiadomienie Systemu Friendica]"
+#: 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 "Element nie znaleziony."
 
-#: include/enotify.php:360
-msgid "registration request"
-msgstr "prośba o rejestrację"
+#: include/items.php:393
+msgid "Do you really want to delete this item?"
+msgstr "Czy na pewno chcesz usunąć ten element?"
 
-#: include/enotify.php:362
-#, php-format
-msgid "You've received a registration request from '%1$s' at %2$s"
-msgstr "Otrzymałeś wniosek rejestracyjny od '%1$s' na %2$s"
+#: 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 "Tak"
 
-#: include/enotify.php:363
-#, php-format
-msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
-msgstr "Otrzymałeś [url=%1$s] żądanie rejestracji [/url] od %2$s."
+#: 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 "Anuluj"
 
-#: include/enotify.php:368
-#, php-format
-msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
-msgstr "Pełna nazwa:\t%1$s \\nSite Lokalizacja:\t%2$s\\nLogin użytkownika: \t%3$s(%4$s)"
+#: include/items.php:483 src/Content/Feature.php:96
+msgid "Archives"
+msgstr "Archiwum"
 
-#: include/enotify.php:374
-#, php-format
-msgid "Please visit %s to approve or reject the request."
-msgstr "Odwiedź stronę %s, aby zatwierdzić lub odrzucić wniosek."
-
-#: include/security.php:81
-msgid "Welcome "
-msgstr "Witaj "
-
-#: include/security.php:82
-msgid "Please upload a profile photo."
-msgstr "Proszę dodać zdjęcie profilowe."
-
-#: include/security.php:84
-msgid "Welcome back "
-msgstr "Witaj ponownie "
-
-#: include/security.php:440
-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 "Znacznik zabezpieczeń formularza nie był poprawny. Prawdopodobnie stało się tak, ponieważ formularz został otwarty zbyt długo (> 3 godziny) przed jego przesłaniem."
-
-#: include/dba.php:59
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "Nie można zlokalizować serwera DNS dla bazy danych '%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] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: 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] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: include/api.php:1250
-#, php-format
-msgid "Monthly posting limit of %d post reached. The post was rejected."
-msgstr "Miesięczny limit %d wysyłania postów. Post został odrzucony."
-
-#: include/api.php:4522 mod/photos.php:88 mod/photos.php:194
-#: mod/photos.php:722 mod/photos.php:1149 mod/photos.php:1166
-#: mod/photos.php:1684 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 src/Model/User.php:553
-#: src/Model/User.php:561 src/Model/User.php:569
-msgid "Profile Photos"
-msgstr "Zdjęcie profilowe"
-
-#: include/conversation.php:144 include/conversation.php:282
-#: include/text.php:1749 src/Model/Item.php:1970
+#: include/conversation.php:151 include/conversation.php:287
+#: include/text.php:1611
 msgid "event"
 msgstr "wydarzenie"
 
-#: include/conversation.php:147 include/conversation.php:157
-#: include/conversation.php:285 include/conversation.php:294
-#: mod/subthread.php:97 mod/tagger.php:72 src/Model/Item.php:1968
-#: src/Protocol/Diaspora.php:1957
+#: 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:152 include/conversation.php:290
-#: include/text.php:1751 mod/subthread.php:97 mod/tagger.php:72
-#: src/Model/Item.php:1968
+#: include/conversation.php:159 include/conversation.php:295
+#: include/text.php:1613 mod/tagger.php:70 mod/subthread.php:87
 msgid "photo"
 msgstr "zdjęcie"
 
-#: include/conversation.php:164 src/Model/Item.php:1841
-#: src/Protocol/Diaspora.php:1953
+#: include/conversation.php:171
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s lubi to %2$s's %3$s"
 
-#: include/conversation.php:167 src/Model/Item.php:1846
+#: include/conversation.php:173
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s nie lubi %2$s's %3$s"
 
-#: include/conversation.php:170
+#: include/conversation.php:175
 #, php-format
 msgid "%1$s attends %2$s's %3$s"
 msgstr "%1$sbierze udział w %2$s's%3$s "
 
-#: include/conversation.php:173
+#: include/conversation.php:177
 #, php-format
 msgid "%1$s doesn't attend %2$s's %3$s"
 msgstr "%1$s nie uczestniczy %2$s 's %3$s"
 
-#: include/conversation.php:176
+#: include/conversation.php:179
 #, php-format
 msgid "%1$s attends maybe %2$s's %3$s"
 msgstr "%1$s może bierze udział %2$s 's %3$s"
 
-#: include/conversation.php:209
+#: include/conversation.php:214
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr "%1$s jest teraz znajomym z %2$s"
 
-#: include/conversation.php:250
+#: include/conversation.php:255
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr "%1$s zaczepił Cię %2$s"
 
-#: include/conversation.php:304 mod/tagger.php:110
+#: 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 zaznaczył %2$s'go %3$s przy użyciu %4$s"
@@ -464,487 +589,728 @@ msgstr "stanowisko/pozycja"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s oznacz %2$s's %3$s jako ulubione"
 
-#: include/conversation.php:608 mod/photos.php:1501 mod/profiles.php:355
+#: include/conversation.php:545 mod/profiles.php:352 mod/photos.php:1507
 msgid "Likes"
 msgstr "Lubię to"
 
-#: include/conversation.php:608 mod/photos.php:1501 mod/profiles.php:359
+#: include/conversation.php:545 mod/profiles.php:356 mod/photos.php:1507
 msgid "Dislikes"
 msgstr "Nie lubię tego"
 
-#: include/conversation.php:609 include/conversation.php:1639
-#: mod/photos.php:1502
+#: include/conversation.php:546 include/conversation.php:1492
+#: mod/photos.php:1508
 msgid "Attending"
 msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Uczestniczę"
+msgstr[1] "Uczestniczy"
+msgstr[2] "Uczestniczą"
+msgstr[3] "Uczestniczą"
 
-#: include/conversation.php:609 mod/photos.php:1502
+#: include/conversation.php:546 mod/photos.php:1508
 msgid "Not attending"
-msgstr "Nie uczestniczyłem"
+msgstr "Nie uczestniczę"
 
-#: include/conversation.php:609 mod/photos.php:1502
+#: include/conversation.php:546 mod/photos.php:1508
 msgid "Might attend"
 msgstr "Może wziąć udział"
 
-#: include/conversation.php:721 mod/photos.php:1569 src/Object/Post.php:192
+#: include/conversation.php:626 mod/photos.php:1564 src/Object/Post.php:195
 msgid "Select"
 msgstr "Wybierz"
 
-#: include/conversation.php:722 mod/photos.php:1570 mod/contacts.php:830
-#: mod/contacts.php:1035 mod/admin.php:1827 mod/settings.php:730
-#: src/Object/Post.php:187
+#: 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 "Usuń"
 
-#: include/conversation.php:760 src/Object/Post.php:371
-#: src/Object/Post.php:372
+#: include/conversation.php:661 src/Object/Post.php:362
+#: src/Object/Post.php:363
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Pokaż %s's profil @ %s"
 
-#: include/conversation.php:772 src/Object/Post.php:359
+#: include/conversation.php:673 src/Object/Post.php:350
 msgid "Categories:"
 msgstr "Kategorie:"
 
-#: include/conversation.php:773 src/Object/Post.php:360
+#: include/conversation.php:674 src/Object/Post.php:351
 msgid "Filed under:"
 msgstr "Zapisano w:"
 
-#: include/conversation.php:780 src/Object/Post.php:385
+#: include/conversation.php:681 src/Object/Post.php:376
 #, php-format
 msgid "%s from %s"
 msgstr "%s od %s"
 
-#: include/conversation.php:795
+#: include/conversation.php:696
 msgid "View in context"
 msgstr "Zobacz w kontekście"
 
-#: include/conversation.php:797 include/conversation.php:1312
-#: mod/wallmessage.php:145 mod/editpost.php:125 mod/photos.php:1473
-#: mod/message.php:245 mod/message.php:414 src/Object/Post.php:410
+#: 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 "Proszę czekać"
 
-#: include/conversation.php:868
+#: include/conversation.php:762
 msgid "remove"
 msgstr "usuń"
 
-#: include/conversation.php:872
+#: include/conversation.php:766
 msgid "Delete Selected Items"
 msgstr "Usuń zaznaczone elementy"
 
-#: include/conversation.php:1017 view/theme/frio/theme.php:352
-msgid "Follow Thread"
-msgstr "Śledź wątek"
-
-#: include/conversation.php:1018 src/Model/Contact.php:662
+#: include/conversation.php:867 src/Model/Contact.php:937
 msgid "View Status"
 msgstr "Zobacz status"
 
-#: include/conversation.php:1019 include/conversation.php:1035
-#: 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
+#: 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 "Zobacz profil"
 
-#: include/conversation.php:1020 src/Model/Contact.php:664
+#: include/conversation.php:869 src/Model/Contact.php:939
 msgid "View Photos"
 msgstr "Zobacz zdjęcia"
 
-#: include/conversation.php:1021 src/Model/Contact.php:665
+#: include/conversation.php:870 src/Model/Contact.php:931
+#: src/Model/Contact.php:940
 msgid "Network Posts"
 msgstr "Wiadomości sieciowe"
 
-#: include/conversation.php:1022 src/Model/Contact.php:666
+#: include/conversation.php:871 src/Model/Contact.php:932
+#: src/Model/Contact.php:941
 msgid "View Contact"
 msgstr "Pokaż kontakt"
 
-#: include/conversation.php:1023 src/Model/Contact.php:668
+#: include/conversation.php:872 src/Model/Contact.php:943
 msgid "Send PM"
 msgstr "Wyślij prywatną wiadomość"
 
-#: include/conversation.php:1027 src/Model/Contact.php:669
+#: include/conversation.php:876 src/Model/Contact.php:944
 msgid "Poke"
 msgstr "Zaczepka"
 
-#: include/conversation.php:1032 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 "Połącz/Obserwuj"
-
-#: include/conversation.php:1151
+#: include/conversation.php:999
 #, php-format
 msgid "%s likes this."
 msgstr "%s lubi to."
 
-#: include/conversation.php:1154
+#: include/conversation.php:1002
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s nie lubi tego."
 
-#: include/conversation.php:1157
+#: include/conversation.php:1005
 #, php-format
 msgid "%s attends."
 msgstr "%s uczestniczy."
 
-#: include/conversation.php:1160
+#: include/conversation.php:1008
 #, php-format
 msgid "%s doesn't attend."
 msgstr "%s nie uczestniczy."
 
-#: include/conversation.php:1163
+#: include/conversation.php:1011
 #, php-format
 msgid "%s attends maybe."
 msgstr "%s może bierze udział."
 
-#: include/conversation.php:1174
+#: include/conversation.php:1022
 msgid "and"
 msgstr "i"
 
-#: include/conversation.php:1180
+#: include/conversation.php:1028
 #, php-format
 msgid "and %d other people"
 msgstr "i %d inni ludzie"
 
-#: include/conversation.php:1189
+#: include/conversation.php:1037
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this"
 msgstr "<span  %1$s>%2$d ludzi </span> lubi to"
 
-#: include/conversation.php:1190
+#: include/conversation.php:1038
 #, php-format
 msgid "%s like this."
 msgstr "%s lubię to."
 
-#: include/conversation.php:1193
+#: include/conversation.php:1041
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr "<span  %1$s>%2$d ludzi </span>nie lubi tego "
 
-#: include/conversation.php:1194
+#: include/conversation.php:1042
 #, php-format
 msgid "%s don't like this."
 msgstr "%s nie lubię tego."
 
-#: include/conversation.php:1197
+#: include/conversation.php:1045
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend"
 msgstr "<span  %1$s>%2$dosoby</span> uczestniczą"
 
-#: include/conversation.php:1198
+#: include/conversation.php:1046
 #, php-format
 msgid "%s attend."
 msgstr "%suczestniczy"
 
-#: include/conversation.php:1201
+#: include/conversation.php:1049
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't attend"
 msgstr "<span  %1$s>%2$dludzie</span> nie uczestniczą"
 
-#: include/conversation.php:1202
+#: include/conversation.php:1050
 #, php-format
 msgid "%s don't attend."
 msgstr "%s nie uczestnicz"
 
-#: include/conversation.php:1205
+#: include/conversation.php:1053
 #, php-format
 msgid "<span  %1$s>%2$d people</span> attend maybe"
 msgstr "<span  %1$s>%2$dprzyjaciele</span>mogą uczestniczyć "
 
-#: include/conversation.php:1206
+#: include/conversation.php:1054
 #, php-format
 msgid "%s attend maybe."
 msgstr "%sbyć może uczestniczyć. "
 
-#: include/conversation.php:1236 include/conversation.php:1252
+#: include/conversation.php:1084 include/conversation.php:1100
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Widoczne dla <strong>wszystkich</strong>"
 
-#: include/conversation.php:1237 include/conversation.php:1253
-#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:181
-#: mod/message.php:188 mod/message.php:324 mod/message.php:331
+#: 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 "Proszę wpisać adres URL:"
 
-#: include/conversation.php:1238 include/conversation.php:1254
+#: include/conversation.php:1086 include/conversation.php:1102
 msgid "Please enter a video link/URL:"
 msgstr "Podaj link do filmu"
 
-#: include/conversation.php:1239 include/conversation.php:1255
+#: include/conversation.php:1087 include/conversation.php:1103
 msgid "Please enter an audio link/URL:"
 msgstr "Podaj link do muzyki"
 
-#: include/conversation.php:1240 include/conversation.php:1256
+#: include/conversation.php:1088 include/conversation.php:1104
 msgid "Tag term:"
 msgstr "Termin tagu:"
 
-#: include/conversation.php:1241 include/conversation.php:1257
+#: include/conversation.php:1089 include/conversation.php:1105
 #: mod/filer.php:34
 msgid "Save to Folder:"
 msgstr "Zapisz w folderze:"
 
-#: include/conversation.php:1242 include/conversation.php:1258
+#: include/conversation.php:1090 include/conversation.php:1106
 msgid "Where are you right now?"
 msgstr "Gdzie teraz jesteś?"
 
-#: include/conversation.php:1243
+#: include/conversation.php:1091
 msgid "Delete item(s)?"
 msgstr "Usunąć pozycję (pozycje)?"
 
-#: include/conversation.php:1290
+#: include/conversation.php:1138
 msgid "New Post"
 msgstr "Nowy Post"
 
-#: include/conversation.php:1293
+#: include/conversation.php:1141
 msgid "Share"
 msgstr "Podziel się"
 
-#: include/conversation.php:1294 mod/wallmessage.php:143 mod/editpost.php:111
-#: mod/message.php:243 mod/message.php:411
+#: include/conversation.php:1142 mod/wallmessage.php:143 mod/message.php:261
+#: mod/message.php:428 mod/editpost.php:101
 msgid "Upload photo"
 msgstr "Wyślij zdjęcie"
 
-#: include/conversation.php:1295 mod/editpost.php:112
+#: include/conversation.php:1143 mod/editpost.php:102
 msgid "upload photo"
 msgstr "dodaj zdjęcie"
 
-#: include/conversation.php:1296 mod/editpost.php:113
+#: include/conversation.php:1144 mod/editpost.php:103
 msgid "Attach file"
 msgstr "Załącz plik"
 
-#: include/conversation.php:1297 mod/editpost.php:114
+#: include/conversation.php:1145 mod/editpost.php:104
 msgid "attach file"
 msgstr "załącz plik"
 
-#: include/conversation.php:1298 mod/wallmessage.php:144 mod/editpost.php:115
-#: mod/message.php:244 mod/message.php:412
+#: 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 "Wstaw link"
 
-#: include/conversation.php:1299 mod/editpost.php:116
+#: include/conversation.php:1147 mod/editpost.php:106
 msgid "web link"
 msgstr "Adres www"
 
-#: include/conversation.php:1300 mod/editpost.php:117
+#: include/conversation.php:1148 mod/editpost.php:107
 msgid "Insert video link"
 msgstr "Wstaw link do filmu"
 
-#: include/conversation.php:1301 mod/editpost.php:118
+#: include/conversation.php:1149 mod/editpost.php:108
 msgid "video link"
 msgstr "link do filmu"
 
-#: include/conversation.php:1302 mod/editpost.php:119
+#: include/conversation.php:1150 mod/editpost.php:109
 msgid "Insert audio link"
 msgstr "Wstaw link do audio"
 
-#: include/conversation.php:1303 mod/editpost.php:120
+#: include/conversation.php:1151 mod/editpost.php:110
 msgid "audio link"
-msgstr "Link do nagrania audio"
+msgstr "link do audio"
 
-#: include/conversation.php:1304 mod/editpost.php:121
+#: include/conversation.php:1152 mod/editpost.php:111
 msgid "Set your location"
 msgstr "Ustaw swoją lokalizację"
 
-#: include/conversation.php:1305 mod/editpost.php:122
+#: include/conversation.php:1153 mod/editpost.php:112
 msgid "set location"
 msgstr "wybierz lokalizację"
 
-#: include/conversation.php:1306 mod/editpost.php:123
+#: include/conversation.php:1154 mod/editpost.php:113
 msgid "Clear browser location"
 msgstr "Wyczyść lokalizację przeglądarki"
 
-#: include/conversation.php:1307 mod/editpost.php:124
+#: include/conversation.php:1155 mod/editpost.php:114
 msgid "clear location"
 msgstr "wyczyść lokalizację"
 
-#: include/conversation.php:1309 mod/editpost.php:138
+#: include/conversation.php:1157 mod/editpost.php:129
 msgid "Set title"
 msgstr "Podaj tytuł"
 
-#: include/conversation.php:1311 mod/editpost.php:140
+#: include/conversation.php:1159 mod/editpost.php:131
 msgid "Categories (comma-separated list)"
 msgstr "Kategorie (lista słów oddzielonych przecinkiem)"
 
-#: include/conversation.php:1313 mod/editpost.php:126
+#: include/conversation.php:1161 mod/editpost.php:116
 msgid "Permission settings"
 msgstr "Ustawienia uprawnień"
 
-#: include/conversation.php:1314 mod/editpost.php:155
+#: include/conversation.php:1162 mod/editpost.php:146
 msgid "permissions"
 msgstr "zezwolenia"
 
-#: include/conversation.php:1322 mod/editpost.php:135
+#: include/conversation.php:1171 mod/editpost.php:126
 msgid "Public post"
 msgstr "Publiczny post"
 
-#: include/conversation.php:1326 mod/editpost.php:146 mod/photos.php:1492
-#: mod/photos.php:1531 mod/photos.php:1604 mod/events.php:528
-#: src/Object/Post.php:813
+#: 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 "Podgląd"
 
-#: include/conversation.php:1330 include/items.php:387 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/photos.php:248 mod/photos.php:324
-#: mod/videos.php:147 mod/contacts.php:475 mod/unfollow.php:117
-#: mod/follow.php:161 mod/message.php:141 mod/dfrn_request.php:658
-#: mod/settings.php:670 mod/settings.php:696
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: include/conversation.php:1335
+#: include/conversation.php:1184
 msgid "Post to Groups"
 msgstr "Opublikuj w grupach"
 
-#: include/conversation.php:1336
+#: include/conversation.php:1185
 msgid "Post to Contacts"
 msgstr "Wstaw do kontaktów"
 
-#: include/conversation.php:1337
+#: include/conversation.php:1186
 msgid "Private post"
 msgstr "Prywatne posty"
 
-#: include/conversation.php:1342 mod/editpost.php:153
-#: src/Model/Profile.php:338
+#: include/conversation.php:1191 mod/editpost.php:144
+#: src/Model/Profile.php:344
 msgid "Message"
 msgstr "Wiadomość"
 
-#: include/conversation.php:1343 mod/editpost.php:154
+#: include/conversation.php:1192 mod/editpost.php:145
 msgid "Browser"
 msgstr "Przeglądarka"
 
-#: include/conversation.php:1610
+#: include/conversation.php:1463
 msgid "View all"
 msgstr "Pokaż wszystkie"
 
-#: include/conversation.php:1633
+#: include/conversation.php:1486
 msgid "Like"
 msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Ostatnie polubienie"
+msgstr[1] "Ostatnie polubienia"
+msgstr[2] "Ostatnich polubienień"
+msgstr[3] "Ostatnie polubienia"
 
-#: include/conversation.php:1636
+#: include/conversation.php:1489
 msgid "Dislike"
 msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Nie lubię"
+msgstr[1] "Nie lubią"
+msgstr[2] "Nie lubią"
+msgstr[3] "Nie lubi"
 
-#: include/conversation.php:1642
+#: include/conversation.php:1495
 msgid "Not Attending"
 msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Nie uczestniczę"
+msgstr[1] "Nie uczestniczy"
+msgstr[2] "Nie uczestniczą"
+msgstr[3] "Nie uczestniczą"
 
-#: include/conversation.php:1645 src/Content/ContactSelector.php:125
+#: include/conversation.php:1498 src/Content/ContactSelector.php:122
 msgid "Undecided"
 msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "Niezdecydowany"
+msgstr[1] "Niezdecydowani"
+msgstr[2] "Niezdecydowani"
+msgstr[3] "Niezdecydowani"
 
-#: include/items.php:342 mod/notice.php:22 mod/viewsrc.php:21
-#: mod/admin.php:277 mod/admin.php:1883 mod/admin.php:2131 mod/display.php:72
-#: mod/display.php:255 mod/display.php:356
-msgid "Item not found."
-msgstr "Element nie znaleziony."
+#: include/security.php:83
+msgid "Welcome "
+msgstr "Witaj "
 
-#: include/items.php:382
-msgid "Do you really want to delete this item?"
-msgstr "Czy na pewno chcesz usunąć ten element?"
+#: include/security.php:84
+msgid "Please upload a profile photo."
+msgstr "Proszę dodać zdjęcie profilowe."
 
-#: include/items.php:384 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 "Tak"
+#: include/security.php:86
+msgid "Welcome back "
+msgstr "Witaj ponownie "
 
-#: include/items.php:401 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/notes.php:30 mod/photos.php:174
-#: mod/photos.php:1051 mod/cal.php:304 mod/contacts.php:386
-#: mod/delegate.php:25 mod/delegate.php:43 mod/delegate.php:54
-#: mod/events.php:194 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/network.php:32
-#: mod/crepair.php:98 mod/message.php:59 mod/message.php:104 mod/group.php:26
-#: mod/dfrn_confirm.php:68 mod/item.php:160 mod/notifications.php:73
-#: 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 "Brak uprawnień."
+#: 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 "Znacznik zabezpieczeń formularza nie był poprawny. Prawdopodobnie stało się tak, ponieważ formularz został otwarty zbyt długo (> 3 godziny) przed jego przesłaniem."
 
-#: include/items.php:471 src/Content/Feature.php:96
-msgid "Archives"
-msgstr "Archiwum"
+#: include/enotify.php:52
+msgid "Friendica Notification"
+msgstr "Powiadomienia Friendica"
 
-#: include/items.php:477 view/theme/vier/theme.php:258
-#: src/Content/ForumManager.php:130 src/Content/Widget.php:317
-#: src/Object/Post.php:438 src/App.php:525
-msgid "show more"
-msgstr "Pokaż więcej"
+#: include/enotify.php:55
+msgid "Thank You,"
+msgstr "Dziękuję,"
 
-#: include/text.php:303
+#: include/enotify.php:58
+#, php-format
+msgid "%1$s, %2$s Administrator"
+msgstr "%1$s,%2$sAdministrator"
+
+#: include/enotify.php:60
+#, php-format
+msgid "%s Administrator"
+msgstr "%s Administrator"
+
+#: include/enotify.php:123
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr "[Friendica:Powiadomienie] Nowa wiadomość otrzymana od %s"
+
+#: include/enotify.php:125
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
+msgstr "%1$swysłał ci nową prywatną wiadomość na %2$s "
+
+#: include/enotify.php:126
+msgid "a private message"
+msgstr "prywatna wiadomość"
+
+#: include/enotify.php:126
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s wysyła ci %2$s"
+
+#: include/enotify.php:128
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "Odwiedź %s żeby zobaczyć i/lub odpowiedzieć na twoje prywatne wiadomości"
+
+#: include/enotify.php:161
+#, php-format
+msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
+msgstr "%1$s skomentował [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$sskomentował  [url=%2$s]%3$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 skomentował [url=%2$s] twój %3$s[/ url]"
+
+#: include/enotify.php:191
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Friendica:Powiadomienie] Komentarz do rozmowy #%1$d przez %2$s"
+
+#: include/enotify.php:193
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s skomentował rozmowę którą śledzisz"
+
+#: 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 "Odwiedź %s żeby zobaczyć i/lub odpowiedzieć na rozmowę"
+
+#: include/enotify.php:203
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica:Powiadomienie] %s napisał na twoim profilu"
+
+#: include/enotify.php:205
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
+msgstr "%1$sopublikowano na ścianie profilu w %2$s "
+
+#: include/enotify.php:206
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr "%1$s wysłano do [url =%2$s]twojej strony[/url] "
+
+#: include/enotify.php:218
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr "[Friendica:Powiadomienie] %s dodał Cię"
+
+#: include/enotify.php:220
+#, php-format
+msgid "%1$s tagged you at %2$s"
+msgstr "%1$s oznaczono Cię tagiem %2$s"
+
+#: include/enotify.php:221
+#, php-format
+msgid "%1$s [url=%2$s]tagged you[/url]."
+msgstr "%1$s [url=%2$s]oznaczył Cię[/url]. "
+
+#: include/enotify.php:233
+#, php-format
+msgid "[Friendica:Notify] %s shared a new post"
+msgstr "[Friendica:Powiadomienie] %s udostępnił nowy wpis"
+
+#: include/enotify.php:235
+#, php-format
+msgid "%1$s shared a new post at %2$s"
+msgstr "%1$sudostępnił nowy wpis na %2$s "
+
+#: include/enotify.php:236
+#, php-format
+msgid "%1$s [url=%2$s]shared a post[/url]."
+msgstr "%1$s[url=%2$s]udostępnił wpis[/url]."
+
+#: include/enotify.php:248
+#, php-format
+msgid "[Friendica:Notify] %1$s poked you"
+msgstr "[Friendica: Powiadomienie] %1$s zaczepia Cię"
+
+#: include/enotify.php:250
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr "%1$s zaczepił Cię %2$s"
+
+#: include/enotify.php:251
+#, php-format
+msgid "%1$s [url=%2$s]poked you[/url]."
+msgstr "%1$s[url=%2$s] zaczepił Cię[/url]."
+
+#: include/enotify.php:268
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr "[Friendica:Powiadomienie] %s otagował Twój post"
+
+#: include/enotify.php:270
+#, php-format
+msgid "%1$s tagged your post at %2$s"
+msgstr "%1$soznaczyłeś swój wpis na %2$s "
+
+#: include/enotify.php:271
+#, php-format
+msgid "%1$s tagged [url=%2$s]your post[/url]"
+msgstr "%1$soznacz [url=%2$s]twój post[/url]"
+
+#: include/enotify.php:283
+msgid "[Friendica:Notify] Introduction received"
+msgstr "[Friendica:Powiadomienie] Zapoznanie odebrane"
+
+#: include/enotify.php:285
+#, php-format
+msgid "You've received an introduction from '%1$s' at %2$s"
+msgstr "Otrzymałeś wstęp od '%1$s' z %2$s"
+
+#: include/enotify.php:286
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+msgstr "Zostałeś [url=%1$s] przyjęty [/ url] z %2$s."
+
+#: include/enotify.php:291 include/enotify.php:337
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "Możesz odwiedzić ich profil na stronie %s"
+
+#: include/enotify.php:293
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "Odwiedż %s aby zatwierdzić lub odrzucić przedstawienie."
+
+#: include/enotify.php:300
+msgid "[Friendica:Notify] A new person is sharing with you"
+msgstr "[Friendica:Powiadomienie] Nowa osoba dzieli się z tobą"
+
+#: include/enotify.php:302 include/enotify.php:303
+#, php-format
+msgid "%1$s is sharing with you at %2$s"
+msgstr "%1$sdzieli się z tobą w %2$s "
+
+#: include/enotify.php:310
+msgid "[Friendica:Notify] You have a new follower"
+msgstr "[Friendica:Powiadomienie] Masz nowego obserwatora"
+
+#: include/enotify.php:312 include/enotify.php:313
+#, php-format
+msgid "You have a new follower at %2$s : %1$s"
+msgstr "Masz nowego obserwatora na %2$s : %1$s"
+
+#: include/enotify.php:326
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr "[Friendica: Powiadomienie] Otrzymano sugestię znajomego"
+
+#: include/enotify.php:328
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
+msgstr "Otrzymałeś od znajomego sugestię '%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 "Otrzymałeś [url=%1$s] sugestię znajomego [/url] dla %2$s od %3$s."
+
+#: include/enotify.php:335
+msgid "Name:"
+msgstr "Imię:"
+
+#: include/enotify.php:336
+msgid "Photo:"
+msgstr "Zdjęcie:"
+
+#: include/enotify.php:339
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "Odwiedź stronę %s, aby zatwierdzić lub odrzucić sugestię."
+
+#: include/enotify.php:347 include/enotify.php:362
+msgid "[Friendica:Notify] Connection accepted"
+msgstr "[Friendica: Powiadomienie] Połączenie zostało zaakceptowane"
+
+#: include/enotify.php:349 include/enotify.php:364
+#, php-format
+msgid "'%1$s' has accepted your connection request at %2$s"
+msgstr "'%1$s' zaakceptował Twoją prośbę o połączenie na %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$szaakceptował twoje [url=%1$s] żądanie połączenia [/url]. "
+
+#: include/enotify.php:355
+msgid ""
+"You are now mutual friends and may exchange status updates, photos, and "
+"email without restriction."
+msgstr "Jesteście teraz przyjaciółmi i możesz wymieniać aktualizacje statusu, zdjęcia i e-maile bez ograniczeń."
+
+#: include/enotify.php:357
+#, php-format
+msgid "Please visit %s if you wish to make any changes to this relationship."
+msgstr "Odwiedź stronę %s jeśli chcesz wprowadzić zmiany w tym związku."
+
+#: 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' zdecydował się zaakceptować Cię jako fana, który ogranicza niektóre formy komunikacji - takie jak prywatne wiadomości i niektóre interakcje w profilu. Jeśli jest to strona celebrytów lub społeczności, ustawienia te zostały zastosowane automatycznie."
+
+#: 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' możesz zdecydować o przedłużeniu tego w dwukierunkową lub bardziej ścisłą relację w przyszłości. "
+
+#: include/enotify.php:374
+#, php-format
+msgid "Please visit %s  if you wish to make any changes to this relationship."
+msgstr "Odwiedź stronę %s, jeśli chcesz wprowadzić zmiany w tej relacji."
+
+#: include/enotify.php:384 mod/removeme.php:47
+msgid "[Friendica System Notify]"
+msgstr "[Powiadomienie Systemu Friendica]"
+
+#: include/enotify.php:384
+msgid "registration request"
+msgstr "prośba o rejestrację"
+
+#: include/enotify.php:386
+#, php-format
+msgid "You've received a registration request from '%1$s' at %2$s"
+msgstr "Otrzymałeś wniosek rejestracyjny od '%1$s' na %2$s"
+
+#: include/enotify.php:387
+#, php-format
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
+msgstr "Otrzymałeś [url=%1$s] żądanie rejestracji [/url] od %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 "Imię i Nazwisko:\t%s\nLokalizacja witryny:\t%s\nNazwa użytkownika:\t%s(%s)"
+
+#: include/enotify.php:398
+#, php-format
+msgid "Please visit %s to approve or reject the request."
+msgstr "Odwiedź stronę %s, aby zatwierdzić lub odrzucić wniosek."
+
+#: include/text.php:302
 msgid "newer"
 msgstr "nowsze"
 
-#: include/text.php:304
+#: include/text.php:303
 msgid "older"
 msgstr "starsze"
 
-#: include/text.php:309
+#: include/text.php:308
 msgid "first"
 msgstr "pierwszy"
 
-#: include/text.php:310
+#: include/text.php:309
 msgid "prev"
 msgstr "poprzedni"
 
-#: include/text.php:344
+#: include/text.php:343
 msgid "next"
 msgstr "następny"
 
-#: include/text.php:345
+#: include/text.php:344
 msgid "last"
 msgstr "ostatni"
 
-#: include/text.php:399
+#: include/text.php:398
 msgid "Loading more entries..."
 msgstr "Ładuję więcej wpisów..."
 
-#: include/text.php:400
+#: include/text.php:399
 msgid "The end"
 msgstr "Koniec"
 
-#: include/text.php:885
+#: include/text.php:767
 msgid "No contacts"
 msgstr "Brak kontaktów"
 
-#: include/text.php:909
+#: include/text.php:791
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
@@ -953,274 +1319,262 @@ msgstr[1] "%d kontaktów"
 msgstr[2] "%d kontakty"
 msgstr[3] "%d Kontakty"
 
-#: include/text.php:922
+#: include/text.php:804
 msgid "View Contacts"
 msgstr "Widok kontaktów"
 
-#: include/text.php:1011 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 "Zapisz"
 
-#: include/text.php:1011
+#: include/text.php:889
 msgid "Follow"
 msgstr "Śledź"
 
-#: include/text.php:1017 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 "Szukaj"
 
-#: include/text.php:1020 src/Content/Nav.php:58
+#: include/text.php:898 src/Content/Nav.php:58
 msgid "@name, !forum, #tags, content"
 msgstr "@imię, !forum, #tagi, treść"
 
-#: include/text.php:1026 src/Content/Nav.php:145
+#: include/text.php:904 src/Content/Nav.php:145
 msgid "Full Text"
 msgstr "Pełny tekst"
 
-#: include/text.php:1027 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 "Tagi"
 
-#: include/text.php:1028 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 "Kontakty"
-
-#: include/text.php:1031 view/theme/vier/theme.php:253
-#: src/Content/ForumManager.php:125 src/Content/Nav.php:151
-msgid "Forums"
-msgstr "Fora"
-
-#: include/text.php:1075
+#: include/text.php:953
 msgid "poke"
 msgstr "zaczep"
 
-#: include/text.php:1075
+#: include/text.php:953
 msgid "poked"
 msgstr "zaczepił Cię"
 
-#: include/text.php:1076
+#: include/text.php:954
 msgid "ping"
 msgstr "ping"
 
-#: include/text.php:1076
+#: include/text.php:954
 msgid "pinged"
 msgstr "napięcia"
 
-#: include/text.php:1077
+#: include/text.php:955
 msgid "prod"
 msgstr "zaczep"
 
-#: include/text.php:1077
+#: include/text.php:955
 msgid "prodded"
 msgstr "zaczepiać"
 
-#: include/text.php:1078
+#: include/text.php:956
 msgid "slap"
 msgstr "klask"
 
-#: include/text.php:1078
+#: include/text.php:956
 msgid "slapped"
 msgstr "spoliczkowany"
 
-#: include/text.php:1079
+#: include/text.php:957
 msgid "finger"
 msgstr "wskaż"
 
-#: include/text.php:1079
+#: include/text.php:957
 msgid "fingered"
 msgstr "dotknięty"
 
-#: include/text.php:1080
+#: include/text.php:958
 msgid "rebuff"
 msgstr "odrzuć"
 
-#: include/text.php:1080
+#: include/text.php:958
 msgid "rebuffed"
 msgstr "odrzucony"
 
-#: include/text.php:1094 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 "Poniedziałek"
 
-#: include/text.php:1094 src/Model/Event.php:380
+#: include/text.php:972 src/Model/Event.php:389
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: include/text.php:1094 src/Model/Event.php:381
+#: include/text.php:972 src/Model/Event.php:390
 msgid "Wednesday"
 msgstr "Środa"
 
-#: include/text.php:1094 src/Model/Event.php:382
+#: include/text.php:972 src/Model/Event.php:391
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: include/text.php:1094 src/Model/Event.php:383
+#: include/text.php:972 src/Model/Event.php:392
 msgid "Friday"
 msgstr "Piątek"
 
-#: include/text.php:1094 src/Model/Event.php:384
+#: include/text.php:972 src/Model/Event.php:393
 msgid "Saturday"
 msgstr "Sobota"
 
-#: include/text.php:1094 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 "Niedziela"
 
-#: include/text.php:1098 src/Model/Event.php:399
+#: include/text.php:976 src/Model/Event.php:408
 msgid "January"
 msgstr "Styczeń"
 
-#: include/text.php:1098 src/Model/Event.php:400
+#: include/text.php:976 src/Model/Event.php:409
 msgid "February"
 msgstr "Luty"
 
-#: include/text.php:1098 src/Model/Event.php:401
+#: include/text.php:976 src/Model/Event.php:410
 msgid "March"
 msgstr "Marzec"
 
-#: include/text.php:1098 src/Model/Event.php:402
+#: include/text.php:976 src/Model/Event.php:411
 msgid "April"
 msgstr "Kwiecień"
 
-#: include/text.php:1098 include/text.php:1115 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 "Maj"
 
-#: include/text.php:1098 src/Model/Event.php:404
+#: include/text.php:976 src/Model/Event.php:413
 msgid "June"
 msgstr "Czerwiec"
 
-#: include/text.php:1098 src/Model/Event.php:405
+#: include/text.php:976 src/Model/Event.php:414
 msgid "July"
 msgstr "Lipiec"
 
-#: include/text.php:1098 src/Model/Event.php:406
+#: include/text.php:976 src/Model/Event.php:415
 msgid "August"
 msgstr "Sierpień"
 
-#: include/text.php:1098 src/Model/Event.php:407
+#: include/text.php:976 src/Model/Event.php:416
 msgid "September"
 msgstr "Wrzesień"
 
-#: include/text.php:1098 src/Model/Event.php:408
+#: include/text.php:976 src/Model/Event.php:417
 msgid "October"
 msgstr "Październik"
 
-#: include/text.php:1098 src/Model/Event.php:409
+#: include/text.php:976 src/Model/Event.php:418
 msgid "November"
 msgstr "Listopad"
 
-#: include/text.php:1098 src/Model/Event.php:410
+#: include/text.php:976 src/Model/Event.php:419
 msgid "December"
 msgstr "Grudzień"
 
-#: include/text.php:1112 src/Model/Event.php:371
+#: include/text.php:990 src/Model/Event.php:380
 msgid "Mon"
 msgstr "Pon"
 
-#: include/text.php:1112 src/Model/Event.php:372
+#: include/text.php:990 src/Model/Event.php:381
 msgid "Tue"
 msgstr "Wt"
 
-#: include/text.php:1112 src/Model/Event.php:373
+#: include/text.php:990 src/Model/Event.php:382
 msgid "Wed"
 msgstr "Śr"
 
-#: include/text.php:1112 src/Model/Event.php:374
+#: include/text.php:990 src/Model/Event.php:383
 msgid "Thu"
 msgstr "Czw"
 
-#: include/text.php:1112 src/Model/Event.php:375
+#: include/text.php:990 src/Model/Event.php:384
 msgid "Fri"
 msgstr "Pt"
 
-#: include/text.php:1112 src/Model/Event.php:376
+#: include/text.php:990 src/Model/Event.php:385
 msgid "Sat"
 msgstr "Sob"
 
-#: include/text.php:1112 src/Model/Event.php:370
+#: include/text.php:990 src/Model/Event.php:379
 msgid "Sun"
 msgstr "Niedz"
 
-#: include/text.php:1115 src/Model/Event.php:386
+#: include/text.php:993 src/Model/Event.php:395
 msgid "Jan"
 msgstr "Sty"
 
-#: include/text.php:1115 src/Model/Event.php:387
+#: include/text.php:993 src/Model/Event.php:396
 msgid "Feb"
 msgstr "Lut"
 
-#: include/text.php:1115 src/Model/Event.php:388
+#: include/text.php:993 src/Model/Event.php:397
 msgid "Mar"
 msgstr "Mar"
 
-#: include/text.php:1115 src/Model/Event.php:389
+#: include/text.php:993 src/Model/Event.php:398
 msgid "Apr"
 msgstr "Kwi"
 
-#: include/text.php:1115 src/Model/Event.php:392
+#: include/text.php:993 src/Model/Event.php:401
 msgid "Jul"
 msgstr "Lip"
 
-#: include/text.php:1115 src/Model/Event.php:393
+#: include/text.php:993 src/Model/Event.php:402
 msgid "Aug"
 msgstr "Sie"
 
-#: include/text.php:1115
+#: include/text.php:993
 msgid "Sep"
 msgstr "Wrz"
 
-#: include/text.php:1115 src/Model/Event.php:395
+#: include/text.php:993 src/Model/Event.php:404
 msgid "Oct"
 msgstr "Paź"
 
-#: include/text.php:1115 src/Model/Event.php:396
+#: include/text.php:993 src/Model/Event.php:405
 msgid "Nov"
 msgstr "Lis"
 
-#: include/text.php:1115 src/Model/Event.php:397
+#: include/text.php:993 src/Model/Event.php:406
 msgid "Dec"
 msgstr "Gru"
 
-#: include/text.php:1255
+#: include/text.php:1139
 #, php-format
 msgid "Content warning: %s"
 msgstr "Ostrzeżenie o treści: %s"
 
-#: include/text.php:1325 mod/videos.php:380
+#: include/text.php:1204 mod/videos.php:375
 msgid "View Video"
 msgstr "Zobacz film"
 
-#: include/text.php:1342
+#: include/text.php:1221
 msgid "bytes"
 msgstr "bajty"
 
-#: include/text.php:1375 include/text.php:1386 include/text.php:1419
+#: include/text.php:1254 include/text.php:1265 include/text.php:1300
 msgid "Click to open/close"
 msgstr "Kliknij aby otworzyć/zamknąć"
 
-#: include/text.php:1534
+#: include/text.php:1415
 msgid "View on separate page"
 msgstr "Zobacz na oddzielnej stronie"
 
-#: include/text.php:1535
+#: include/text.php:1416
 msgid "view on separate page"
 msgstr "zobacz na oddzielnej stronie"
 
-#: include/text.php:1540 include/text.php:1547 src/Model/Event.php:594
+#: include/text.php:1421 include/text.php:1428 src/Model/Event.php:609
 msgid "link to source"
 msgstr "link do źródła"
 
-#: include/text.php:1753
+#: include/text.php:1615
 msgid "activity"
 msgstr "aktywność"
 
-#: 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] ""
@@ -1228,135 +1582,2333 @@ msgstr[1] ""
 msgstr[2] "komentarz"
 msgstr[3] "komentarz"
 
-#: include/text.php:1758
+#: include/text.php:1620
 msgid "post"
 msgstr "post"
 
-#: include/text.php:1915
+#: include/text.php:1775
 msgid "Item filed"
 msgstr "Element złożony"
 
-#: mod/allfriends.php:51
-msgid "No friends to display."
-msgstr "Brak znajomych do wyświetlenia"
+#: 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] "Dzienny limit opublikowanych %d posta. Post został odrzucony."
+msgstr[1] "Dzienny limit opublikowanych %d postów. Post został odrzucony."
+msgstr[2] "Dzienny limit opublikowanych %d postów. Post został odrzucony."
+msgstr[3] "Dzienny limit opublikowanych %d postów. Post został odrzucony."
 
-#: 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] "Tygodniowy limit wysyłania %d posta. Post został odrzucony."
+msgstr[1] "Tygodniowy limit wysyłania %d postów. Post został odrzucony."
+msgstr[2] "Tygodniowy limit wysyłania %d postów. Post został odrzucony."
+msgstr[3] "Tygodniowy limit wysyłania %d postów. Post został odrzucony."
+
+#: include/api.php:1166
+#, php-format
+msgid "Monthly posting limit of %d post reached. The post was rejected."
+msgstr "Miesięczny limit %d wysyłania postów. Post został odrzucony."
+
+#: 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 "Zdjęcie profilowe"
+
+#: mod/crepair.php:89
+msgid "Contact settings applied."
+msgstr "Ustawienia kontaktu zaktualizowane."
+
+#: mod/crepair.php:91
+msgid "Contact update failed."
+msgstr "Nie udało się zaktualizować kontaktu."
+
+#: 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 "Kontakt nie znaleziony"
+
+#: 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>OSTRZEŻENIE: Jest to bardzo zaawansowane</strong> i jeśli wprowadzisz niepoprawne informacje, twoja komunikacja z tym kontaktem może przestać działać."
+
+#: 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 "Jeśli nie jesteś pewien, co zrobić na tej stronie, użyj <strong>teraz</strong> przycisku 'powrót' na swojej przeglądarce."
+
+#: mod/crepair.php:131 mod/crepair.php:133
+msgid "No mirroring"
+msgstr "Bez dublowania"
+
+#: mod/crepair.php:131
+msgid "Mirror as forwarded posting"
+msgstr "Przesłany lustrzany post"
+
+#: mod/crepair.php:131 mod/crepair.php:133
+msgid "Mirror as my own posting"
+msgstr "Lustro mojego własnego komentarza"
+
+#: mod/crepair.php:146
+msgid "Return to contact editor"
+msgstr "Wróć do edytora kontaktów"
+
+#: mod/crepair.php:148
+msgid "Refetch contact data"
+msgstr "Odśwież dane kontaktowe"
+
+#: mod/crepair.php:151
+msgid "Remote Self"
+msgstr "Zdalny Self"
+
+#: mod/crepair.php:154
+msgid "Mirror postings from this contact"
+msgstr "Publikacje lustrzane od tego kontaktu"
+
+#: mod/crepair.php:156
+msgid ""
+"Mark this contact as remote_self, this will cause friendica to repost new "
+"entries from this contact."
+msgstr "Oznacz ten kontakt jako remote_self, spowoduje to, że friendica odeśle nowe wpisy z tego 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
+#: mod/admin.php:1931
+msgid "Name"
+msgstr "Nazwa"
+
+#: mod/crepair.php:161
+msgid "Account Nickname"
+msgstr "Nazwa konta"
+
+#: mod/crepair.php:162
+msgid "@Tagname - overrides Name/Nickname"
+msgstr "@Tagname - zastępuje Imię/Pseudonim"
+
+#: mod/crepair.php:163
+msgid "Account URL"
+msgstr "Adres URL konta"
+
+#: mod/crepair.php:164
+msgid "Friend Request URL"
+msgstr "Adres URL żądający znajomości"
+
+#: mod/crepair.php:165
+msgid "Friend Confirm URL"
+msgstr "URL potwierdzający znajomość"
+
+#: mod/crepair.php:166
+msgid "Notification Endpoint URL"
+msgstr "Zgłoszenie Punktu Końcowego URL"
+
+#: mod/crepair.php:167
+msgid "Poll/Feed URL"
+msgstr "Adres Ankiety/RSS"
+
+#: mod/crepair.php:168
+msgid "New photo from this URL"
+msgstr "Nowe zdjęcie z tego adresu URL"
+
+#: mod/wallmessage.php:49 mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr "Dzienny limit wiadomości %s został przekroczony. Wiadomość została odrzucona."
+
+#: mod/wallmessage.php:57 mod/message.php:74
+msgid "No recipient selected."
+msgstr "Nie wybrano odbiorcy."
+
+#: mod/wallmessage.php:60
+msgid "Unable to check your home location."
+msgstr "Nie można sprawdzić twojej lokalizacji."
+
+#: mod/wallmessage.php:63 mod/message.php:81
+msgid "Message could not be sent."
+msgstr "Wiadomość nie może zostać wysłana"
+
+#: mod/wallmessage.php:66 mod/message.php:84
+msgid "Message collection failure."
+msgstr "Błąd zbierania komunikatów."
+
+#: mod/wallmessage.php:69 mod/message.php:87
+msgid "Message sent."
+msgstr "Wysłano."
+
+#: mod/wallmessage.php:86 mod/wallmessage.php:95
+msgid "No recipient."
+msgstr "Brak odbiorcy."
+
+#: mod/wallmessage.php:132 mod/message.php:249
+msgid "Send Private Message"
+msgstr "Wyślij prywatną wiadomość"
+
+#: 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 "Jeśli chcesz %s odpowiedzieć, sprawdź, czy ustawienia prywatności w Twojej witrynie zezwalają na prywatne wiadomości od nieznanych nadawców."
+
+#: mod/wallmessage.php:134 mod/message.php:250 mod/message.php:419
+msgid "To:"
+msgstr "Do:"
+
+#: mod/wallmessage.php:135 mod/message.php:254 mod/message.php:421
+msgid "Subject:"
+msgstr "Temat:"
+
+#: mod/wallmessage.php:141 mod/message.php:258 mod/message.php:424
+#: mod/invite.php:150
+msgid "Your message:"
+msgstr "Twoja wiadomość:"
+
+#: mod/lockview.php:42 mod/lockview.php:50
+msgid "Remote privacy information not available."
+msgstr "Nie są dostępne zdalne informacje o prywatności."
+
+#: mod/lockview.php:59
+msgid "Visible to:"
+msgstr "Widoczne dla:"
+
+#: mod/install.php:100
+msgid "Friendica Communications Server - Setup"
+msgstr "Friendica Serwer Komunikacyjny - Instalacja"
+
+#: mod/install.php:106
+msgid "Could not connect to database."
+msgstr "Nie można nawiązać połączenia z bazą danych"
+
+#: mod/install.php:110
+msgid "Could not create table."
+msgstr "Nie mogę stworzyć tabeli."
+
+#: mod/install.php:116
+msgid "Your Friendica site database has been installed."
+msgstr "Twoja baza danych witryny Friendica została zainstalowana."
+
+#: mod/install.php:121
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr "Może być konieczne zaimportowanie pliku \"database.sql\" ręcznie, używając phpmyadmin lub mysql."
+
+#: mod/install.php:122 mod/install.php:166 mod/install.php:274
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Proszę przejrzeć plik \"INSTALL.txt\"."
+
+#: mod/install.php:134
+msgid "Database already in use."
+msgstr "Baza danych jest już w użyciu."
+
+#: mod/install.php:163
+msgid "System check"
+msgstr "Sprawdzanie systemu"
+
+#: mod/install.php:167 mod/cal.php:279 mod/events.php:394
+msgid "Next"
+msgstr "Następny"
+
+#: mod/install.php:168
+msgid "Check again"
+msgstr "Sprawdź ponownie"
+
+#: mod/install.php:187
+msgid "Database connection"
+msgstr "Połączenie z bazą danych"
+
+#: mod/install.php:188
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
+msgstr "W celu zainstalowania Friendica musimy wiedzieć jak połączyć się z twoją bazą danych."
+
+#: mod/install.php:189
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr "Proszę skontaktuj się ze swoim dostawcą usług hostingowych bądź administratorem strony jeśli masz pytania co do tych ustawień ."
+
+#: mod/install.php:190
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
+msgstr "Wymieniona przez Ciebie baza danych powinna już istnieć. Jeżeli nie, utwórz ją przed kontynuacją."
+
+#: mod/install.php:194
+msgid "Database Server Name"
+msgstr "Nazwa serwera bazy danych"
+
+#: mod/install.php:195
+msgid "Database Login Name"
+msgstr "Nazwa użytkownika bazy danych"
+
+#: mod/install.php:196
+msgid "Database Login Password"
+msgstr "Hasło logowania do bazy danych"
+
+#: mod/install.php:196
+msgid "For security reasons the password must not be empty"
+msgstr "Ze względów bezpieczeństwa hasło nie może być puste"
+
+#: mod/install.php:197
+msgid "Database Name"
+msgstr "Nazwa bazy danych"
+
+#: mod/install.php:198 mod/install.php:235
+msgid "Site administrator email address"
+msgstr "Adres e-mail administratora strony"
+
+#: 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 "Adres e-mail konta musi pasować do tego, aby móc korzystać z panelu administracyjnego."
+
+#: mod/install.php:200 mod/install.php:238
+msgid "Please select a default timezone for your website"
+msgstr "Proszę wybrać domyślną strefę czasową dla swojej strony"
+
+#: mod/install.php:225
+msgid "Site settings"
+msgstr "Ustawienia strony"
+
+#: mod/install.php:239
+msgid "System Language:"
+msgstr "Język systemu:"
+
+#: mod/install.php:239
+msgid ""
+"Set the default language for your Friendica installation interface and to "
+"send emails."
+msgstr "Ustaw domyślny język dla interfejsu instalacyjnego Friendica i wysyłaj e-maile."
+
+#: 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 "Plik konfiguracyjny bazy danych \"config/local.ini.php\" nie mógł zostać zapisany. Proszę użyć załączonego tekstu, aby utworzyć plik konfiguracyjny w katalogu głównym serwera."
+
+#: mod/install.php:272
+msgid "<h1>What next</h1>"
+msgstr "<h1>Co dalej</h1>"
+
+#: mod/install.php:273
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the "
+"worker."
+msgstr "WAŻNE: Będziesz musiał [ręcznie] ustawić zaplanowane zadanie dla pracownika."
+
+#: 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 "Przejdź do <a href=\"%s/register\">strony rejestracji</a> nowego węzła Friendica i zarejestruj się jako nowy użytkownik. Pamiętaj, aby użyć adresu e-mail wprowadzonego jako e-mail administratora. To pozwoli Ci wejść do panelu administratora witryny."
+
+#: 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 "Nie znaleziono profilu."
+
+#: mod/dfrn_confirm.php:128
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it"
+" has already been approved."
+msgstr "Może się to zdarzyć, gdy kontakt został zgłoszony przez obie osoby i został już zatwierdzony."
+
+#: mod/dfrn_confirm.php:238
+msgid "Response from remote site was not understood."
+msgstr "Odpowiedź do zdalnej strony nie została zrozumiana"
+
+#: mod/dfrn_confirm.php:245 mod/dfrn_confirm.php:251
+msgid "Unexpected response from remote site: "
+msgstr "Nieoczekiwana odpowiedź od strony zdalnej:"
+
+#: mod/dfrn_confirm.php:260
+msgid "Confirmation completed successfully."
+msgstr "Potwierdzenie zostało pomyślnie zakończone."
+
+#: mod/dfrn_confirm.php:272
+msgid "Temporary failure. Please wait and try again."
+msgstr "Tymczasowa awaria. Proszę czekać i spróbuj ponownie."
+
+#: mod/dfrn_confirm.php:275
+msgid "Introduction failed or was revoked."
+msgstr "Wprowadzenie nie powiodło się lub zostało odwołane."
+
+#: mod/dfrn_confirm.php:280
+msgid "Remote site reported: "
+msgstr "Zdalna witryna zgłoszona:"
+
+#: mod/dfrn_confirm.php:392
+msgid "Unable to set contact photo."
+msgstr "Nie można ustawić zdjęcia kontaktu."
+
+#: mod/dfrn_confirm.php:450
+#, php-format
+msgid "No user record found for '%s' "
+msgstr "Nie znaleziono użytkownika dla '%s'"
+
+#: mod/dfrn_confirm.php:460
+msgid "Our site encryption key is apparently messed up."
+msgstr "Klucz kodujący jest najwyraźniej uszkodzony."
+
+#: mod/dfrn_confirm.php:471
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr "Został podany pusty adres URL witryny lub nie można go odszyfrować."
+
+#: mod/dfrn_confirm.php:487
+msgid "Contact record was not found for you on our site."
+msgstr "Nie znaleziono kontaktu na naszej stronie"
+
+#: mod/dfrn_confirm.php:501
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr "Publiczny klucz witryny jest niedostępny w rekordzie kontaktu dla adresu 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 "Identyfikator dostarczony przez Twój system jest duplikatem w naszym systemie. Powinien działać, jeśli spróbujesz ponownie."
+
+#: mod/dfrn_confirm.php:528
+msgid "Unable to set your contact credentials on our system."
+msgstr "Nie można ustawić danych kontaktowych w naszym systemie."
+
+#: mod/dfrn_confirm.php:584
+msgid "Unable to update your contact profile details on our system"
+msgstr "Nie można zaktualizować danych Twojego profilu kontaktowego w naszym systemie"
+
+#: mod/dfrn_confirm.php:614 mod/dfrn_request.php:561
+#: src/Model/Contact.php:1891
+msgid "[Name Withheld]"
+msgstr "[Nazwa zastrzeżona]"
+
+#: mod/dirfind.php:53
+#, php-format
+msgid "People Search - %s"
+msgstr "Szukaj osób - %s"
+
+#: mod/dirfind.php:64
+#, php-format
+msgid "Forum Search - %s"
+msgstr "Przeszukiwanie forum - %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 "Połącz"
 
-#: mod/api.php:85 mod/api.php:107
-msgid "Authorize application connection"
-msgstr "Autoryzacja połączenia aplikacji"
+#: mod/dirfind.php:265 mod/match.php:125
+msgid "No matches"
+msgstr "Brak wyników"
 
-#: mod/api.php:86
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Powróć do swojej aplikacji i wpisz ten Kod Bezpieczeństwa:"
+#: mod/manage.php:180
+msgid "Manage Identities and/or Pages"
+msgstr "Zarządzaj Tożsamościami i/lub Stronami."
 
-#: mod/api.php:95
-msgid "Please login to continue."
-msgstr "Zaloguj się aby kontynuować."
-
-#: 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 "Czy chcesz zezwolić tej aplikacji na dostęp do swoich postów i kontaktów i/lub tworzenie nowych postów?"
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
+msgstr "Przełącz między różnymi tożsamościami lub stronami społeczność/grupy, które udostępniają dane Twojego konta lub które otrzymałeś uprawnienia \"zarządzaj\""
 
-#: 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 "Wybierz tożsamość do zarządzania:"
+
+#: mod/videos.php:138
+msgid "Do you really want to delete this video?"
+msgstr "Czy na pewno chcesz usunąć ten film wideo?"
+
+#: mod/videos.php:143
+msgid "Delete Video"
+msgstr "Usuń wideo"
+
+#: 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 "Publiczny dostęp zabroniony"
+
+#: mod/videos.php:206
+msgid "No videos selected"
+msgstr "Nie zaznaczono filmów"
+
+#: mod/videos.php:307 mod/photos.php:1050
+msgid "Access to this item is restricted."
+msgstr "Dostęp do tego obiektu jest ograniczony."
+
+#: mod/videos.php:382 mod/photos.php:1699
+msgid "View Album"
+msgstr "Zobacz album"
+
+#: mod/videos.php:390
+msgid "Recent Videos"
+msgstr "Ostatnio dodane filmy"
+
+#: mod/videos.php:392
+msgid "Upload New Videos"
+msgstr "Wstaw nowe filmy"
+
+#: mod/webfinger.php:17 mod/probe.php:14
+msgid "Only logged in users are permitted to perform a probing."
+msgstr "Tylko zalogowani użytkownicy mogą wykonywać sondowanie."
+
+#: 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 "Lokalizacja"
+
+#: mod/directory.php:156 mod/notifications.php:259 src/Model/Profile.php:420
+#: src/Model/Profile.php:732
+msgid "Gender:"
+msgstr "Płeć:"
+
+#: mod/directory.php:157 src/Model/Profile.php:421 src/Model/Profile.php:756
+msgid "Status:"
+msgstr "Status:"
+
+#: mod/directory.php:158 src/Model/Profile.php:422 src/Model/Profile.php:773
+msgid "Homepage:"
+msgstr "Strona główna:"
+
+#: 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 "O:"
+
+#: mod/directory.php:209
+msgid "Find on this site"
+msgstr "Znajdź na tej stronie"
+
+#: mod/directory.php:211
+msgid "Results for:"
+msgstr "Wyniki dla:"
+
+#: mod/directory.php:213
+msgid "Site Directory"
+msgstr "Katalog Witryny"
+
+#: mod/directory.php:218
+msgid "No entries (some entries may be hidden)."
+msgstr "Brak odwiedzin (niektóre odwiedziny mogą być ukryte)."
+
+#: mod/match.php:48
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Brak pasujących słów kluczowych. Dodaj słowa kluczowe do domyślnego profilu."
+
+#: mod/match.php:104
+msgid "is interested in:"
+msgstr "interesuje się:"
+
+#: mod/match.php:120
+msgid "Profile Match"
+msgstr "Dopasowanie profilu"
+
+#: mod/settings.php:51 mod/photos.php:134
+msgid "everybody"
+msgstr "wszyscy"
+
+#: mod/settings.php:56
+msgid "Account"
+msgstr "Konto"
+
+#: mod/settings.php:64 src/Model/Profile.php:372 src/Content/Nav.php:210
+msgid "Profiles"
+msgstr "Profile"
+
+#: mod/settings.php:72 mod/admin.php:190
+msgid "Additional features"
+msgstr "Dodatkowe funkcje"
+
+#: mod/settings.php:80
+msgid "Display"
+msgstr "Wygląd"
+
+#: mod/settings.php:87 mod/settings.php:840
+msgid "Social Networks"
+msgstr "Portale społecznościowe"
+
+#: mod/settings.php:94 mod/admin.php:188 mod/admin.php:2013 mod/admin.php:2073
+msgid "Addons"
+msgstr "Dodatki"
+
+#: mod/settings.php:101 src/Content/Nav.php:205
+msgid "Delegations"
+msgstr "Delegowanie"
+
+#: mod/settings.php:108
+msgid "Connected apps"
+msgstr "Powiązane aplikacje"
+
+#: mod/settings.php:115 mod/uexport.php:52
+msgid "Export personal data"
+msgstr "Eksportuje dane personalne"
+
+#: mod/settings.php:122
+msgid "Remove account"
+msgstr "Usuń konto"
+
+#: mod/settings.php:174
+msgid "Missing some important data!"
+msgstr "Brakuje ważnych danych!"
+
+#: mod/settings.php:176 mod/settings.php:701 mod/contacts.php:848
+msgid "Update"
+msgstr "Zaktualizuj"
+
+#: mod/settings.php:285
+msgid "Failed to connect with email account using the settings provided."
+msgstr "Połączenie z kontem email używając wybranych ustawień nie powiodło się."
+
+#: mod/settings.php:290
+msgid "Email settings updated."
+msgstr "Zaktualizowano ustawienia email."
+
+#: mod/settings.php:306
+msgid "Features updated"
+msgstr "Funkcje zaktualizowane"
+
+#: mod/settings.php:379
+msgid "Relocate message has been send to your contacts"
+msgstr "Przeniesienie wiadomości zostało wysłane do Twoich kontaktów"
+
+#: mod/settings.php:391 src/Model/User.php:377
+msgid "Passwords do not match. Password unchanged."
+msgstr "Hasła nie pasują do siebie. Hasło niezmienione."
+
+#: mod/settings.php:396
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Puste hasła są niedozwolone. Hasło niezmienione."
+
+#: 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 "Nowe hasło zostało ujawnione w publicznym zrzucie danych, wybierz inne."
+
+#: mod/settings.php:407
+msgid "Wrong password."
+msgstr "Złe hasło."
+
+#: mod/settings.php:414 src/Core/Console/NewPassword.php:89
+msgid "Password changed."
+msgstr "Hasło zostało zmienione."
+
+#: mod/settings.php:416 src/Core/Console/NewPassword.php:86
+msgid "Password update failed. Please try again."
+msgstr "Aktualizacja hasła nie powiodła się. Proszę spróbować ponownie."
+
+#: mod/settings.php:500
+msgid " Please use a shorter name."
+msgstr "Proszę użyć krótszej nazwy."
+
+#: mod/settings.php:503
+msgid " Name too short."
+msgstr "Za krótka nazwa."
+
+#: mod/settings.php:511
+msgid "Wrong Password"
+msgstr "Złe hasło"
+
+#: mod/settings.php:516
+msgid "Invalid email."
+msgstr "Niepoprawny e-mail."
+
+#: mod/settings.php:522
+msgid "Cannot change to that email."
+msgstr "Nie można zmienić tego e-maila."
+
+#: mod/settings.php:572
+msgid "Private forum has no privacy permissions. Using default privacy group."
+msgstr "Prywatne forum nie ma uprawnień do prywatności. Użyj domyślnej grupy prywatnej."
+
+#: mod/settings.php:575
+msgid "Private forum has no privacy permissions and no default privacy group."
+msgstr "Prywatne forum nie ma uprawnień do prywatności ani domyślnej grupy prywatności."
+
+#: mod/settings.php:615
+msgid "Settings updated."
+msgstr "Zaktualizowano ustawienia."
+
+#: mod/settings.php:674 mod/settings.php:700 mod/settings.php:734
+msgid "Add application"
+msgstr "Dodaj aplikację"
+
+#: 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 "Zapisz ustawienia"
+
+#: mod/settings.php:678 mod/settings.php:704
+msgid "Consumer Key"
+msgstr "Klucz klienta"
+
+#: mod/settings.php:679 mod/settings.php:705
+msgid "Consumer Secret"
+msgstr "Tajny klucz klienta"
+
+#: mod/settings.php:680 mod/settings.php:706
+msgid "Redirect"
+msgstr "Przekierowanie"
+
+#: mod/settings.php:681 mod/settings.php:707
+msgid "Icon url"
+msgstr "Adres Url ikony"
+
+#: mod/settings.php:692
+msgid "You can't edit this application."
+msgstr "Nie możesz edytować tej aplikacji."
+
+#: mod/settings.php:733
+msgid "Connected Apps"
+msgstr "Powiązane aplikacje"
+
+#: mod/settings.php:735 src/Object/Post.php:158 src/Object/Post.php:160
+msgid "Edit"
+msgstr "Edytuj"
+
+#: mod/settings.php:737
+msgid "Client key starts with"
+msgstr "Klucz klienta zaczyna się od"
+
+#: mod/settings.php:738
+msgid "No name"
+msgstr "Bez nazwy"
+
+#: mod/settings.php:739
+msgid "Remove authorization"
+msgstr "Odwołaj upoważnienie"
+
+#: mod/settings.php:750
+msgid "No Addon settings configured"
+msgstr "Brak skonfigurowanych ustawień dodatków"
+
+#: mod/settings.php:759
+msgid "Addon Settings"
+msgstr "Ustawienia Dodatków"
+
+#: mod/settings.php:773 mod/admin.php:2539 mod/admin.php:2540
+msgid "Off"
+msgstr "Wyłącz"
+
+#: mod/settings.php:773 mod/admin.php:2539 mod/admin.php:2540
+msgid "On"
+msgstr "Włącz"
+
+#: mod/settings.php:780
+msgid "Additional Features"
+msgstr "Dodatkowe funkcje"
+
+#: mod/settings.php:803 src/Content/ContactSelector.php:82
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: mod/settings.php:803 mod/settings.php:804
+msgid "enabled"
+msgstr "włączony"
+
+#: mod/settings.php:803 mod/settings.php:804
+msgid "disabled"
+msgstr "wyłączony"
+
+#: mod/settings.php:803 mod/settings.php:804
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
+msgstr "Wbudowane wsparcie dla %s łączność jest %s"
+
+#: mod/settings.php:804
+msgid "GNU Social (OStatus)"
+msgstr "GNU Społeczny (OStatus)"
+
+#: mod/settings.php:835
+msgid "Email access is disabled on this site."
+msgstr "Dostęp do e-maila nie jest w pełni sprawny na tej stronie"
+
+#: mod/settings.php:845
+msgid "General Social Media Settings"
+msgstr "Ogólne ustawienia mediów społecznościowych"
+
+#: mod/settings.php:846
+msgid "Disable Content Warning"
+msgstr "Wyłącz ostrzeżenie o treści"
+
+#: 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 "Użytkownicy w sieciach takich jak Mastodon lub Pleroma mogą ustawić pole ostrzeżenia o treści, które domyślnie zwijać będzie swój wpis. Powoduje wyłączenie automatycznego zwijania i ustawia ostrzeżenie o treści jako tytuł postu. Nie ma wpływu na żadne inne filtrowanie treści, które ostatecznie utworzyłeś."
+
+#: mod/settings.php:847
+msgid "Disable intelligent shortening"
+msgstr "Wyłącz inteligentne skracanie"
+
+#: 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 "Zwykle system próbuje znaleźć najlepszy link do dodania do skróconych postów. Jeśli ta opcja jest włączona, każdy skrócony wpis zawsze wskazuje oryginalny post znajomej osoby."
+
+#: mod/settings.php:848
+msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
+msgstr "Automatycznie podążaj za wszystkimi obserwatorami/rzecznikami GNU Społeczności (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 "Jeśli otrzymasz wiadomość od nieznanego użytkownika OStatus, ta opcja decyduje, co zrobić. Jeśli zostanie zaznaczone, dla każdego nieznanego użytkownika zostanie utworzony nowy kontakt."
+
+#: mod/settings.php:849
+msgid "Default group for OStatus contacts"
+msgstr "Domyślna grupa dla kontaktów OStatus"
+
+#: mod/settings.php:850
+msgid "Your legacy GNU Social account"
+msgstr "Twoje starsze konto społecznościowe GNU"
+
+#: 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 "Jeśli podasz swoją starą nazwę konta GNU Social/Statusnet tutaj (w formacie user@domain.tld), twoje kontakty zostaną dodane automatycznie. Pole zostanie opróżnione po zakończeniu."
+
+#: mod/settings.php:853
+msgid "Repair OStatus subscriptions"
+msgstr "Napraw subskrypcje OStatus"
+
+#: mod/settings.php:857
+msgid "Email/Mailbox Setup"
+msgstr "Ustawienia  emaila/skrzynki mailowej"
+
+#: 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 "Jeśli chcesz komunikować się z kontaktami e-mail za pomocą tej usługi (opcjonalnie), określ sposób łączenia się ze skrzynką pocztową."
+
+#: mod/settings.php:859
+msgid "Last successful email check:"
+msgstr "Ostatni sprawdzony e-mail:"
+
+#: mod/settings.php:861
+msgid "IMAP server name:"
+msgstr "Nazwa serwera IMAP:"
+
+#: mod/settings.php:862
+msgid "IMAP port:"
+msgstr "Port IMAP:"
+
+#: mod/settings.php:863
+msgid "Security:"
+msgstr "Ochrona:"
+
+#: mod/settings.php:863 mod/settings.php:868
+msgid "None"
+msgstr "Brak"
+
+#: mod/settings.php:864
+msgid "Email login name:"
+msgstr "Nazwa logowania e-mail:"
+
+#: mod/settings.php:865
+msgid "Email password:"
+msgstr "E-mail hasło:"
+
+#: mod/settings.php:866
+msgid "Reply-to address:"
+msgstr "Adres zwrotny:"
+
+#: mod/settings.php:867
+msgid "Send public posts to all email contacts:"
+msgstr "Wyślij publiczny post do wszystkich kontaktów e-mail"
+
+#: mod/settings.php:868
+msgid "Action after import:"
+msgstr "Akcja po zaimportowaniu:"
+
+#: mod/settings.php:868 src/Content/Nav.php:193
+msgid "Mark as seen"
+msgstr "Oznacz jako przeczytane"
+
+#: mod/settings.php:868
+msgid "Move to folder"
+msgstr "Przenieś do folderu"
+
+#: mod/settings.php:869
+msgid "Move to folder:"
+msgstr "Przenieś do folderu:"
+
+#: mod/settings.php:903 mod/admin.php:1316
+msgid "No special theme for mobile devices"
+msgstr "Brak specialnego motywu dla urządzeń mobilnych"
+
+#: mod/settings.php:912
+#, php-format
+msgid "%s - (Unsupported)"
+msgstr "%s - (Nieobsługiwane)"
+
+#: mod/settings.php:914
+#, php-format
+msgid "%s - (Experimental)"
+msgstr "%s- (Eksperymentalne)"
+
+#: mod/settings.php:957
+msgid "Display Settings"
+msgstr "Ustawienia wyglądu"
+
+#: mod/settings.php:963 mod/settings.php:987
+msgid "Display Theme:"
+msgstr "Wyświetl motyw:"
+
+#: mod/settings.php:964
+msgid "Mobile Theme:"
+msgstr "Motyw dla urządzeń mobilnych:"
+
+#: mod/settings.php:965
+msgid "Suppress warning of insecure networks"
+msgstr "Ukryj ostrzeżenie przed niebezpiecznymi sieciami"
+
+#: 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 "System powinien pominąć ostrzeżenie, że bieżąca grupa zawiera członków sieci, którzy nie mogą otrzymywać komentarzy niepublicznych"
+
+#: mod/settings.php:966
+msgid "Update browser every xx seconds"
+msgstr "Odświeżaj stronę co xx sekund"
+
+#: mod/settings.php:966
+msgid "Minimum of 10 seconds. Enter -1 to disable it."
+msgstr "Minimum 10 sekund. Wprowadź -1, aby go wyłączyć."
+
+#: mod/settings.php:967
+msgid "Number of items to display per page:"
+msgstr "Liczba elementów do wyświetlenia na stronie:"
+
+#: mod/settings.php:967 mod/settings.php:968
+msgid "Maximum of 100 items"
+msgstr "Maksymalnie 100 elementów"
+
+#: mod/settings.php:968
+msgid "Number of items to display per page when viewed from mobile device:"
+msgstr "Liczba elementów do wyświetlenia na stronie podczas przeglądania z urządzenia mobilnego:"
+
+#: mod/settings.php:969
+msgid "Don't show emoticons"
+msgstr "Nie pokazuj emotikonek"
+
+#: mod/settings.php:970
+msgid "Calendar"
+msgstr "Kalendarz"
+
+#: mod/settings.php:971
+msgid "Beginning of week:"
+msgstr "Początek tygodnia:"
+
+#: mod/settings.php:972
+msgid "Don't show notices"
+msgstr "Nie pokazuj powiadomień"
+
+#: mod/settings.php:973
+msgid "Infinite scroll"
+msgstr "Nieskończone przewijanie"
+
+#: mod/settings.php:974
+msgid "Automatic updates only at the top of the network page"
+msgstr "Automatyczne aktualizacje tylko w górnej części strony sieci"
+
+#: mod/settings.php:974
+msgid ""
+"When disabled, the network page is updated all the time, which could be "
+"confusing while reading."
+msgstr "Po wyłączeniu strona sieciowa jest cały czas aktualizowana, co może być mylące podczas czytania."
+
+#: mod/settings.php:975
+msgid "Bandwidth Saver Mode"
+msgstr "Tryb oszczędzania przepustowości"
+
+#: mod/settings.php:975
+msgid ""
+"When enabled, embedded content is not displayed on automatic updates, they "
+"only show on page reload."
+msgstr "Po włączeniu wbudowana zawartość nie jest wyświetlana w automatycznych aktualizacjach, wyświetlają się tylko przy przeładowaniu strony."
+
+#: mod/settings.php:976
+msgid "Smart Threading"
+msgstr "Inteligentne wątki"
+
+#: 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 "Włączenie tej opcji powoduje pomijanie wcięcia wątków zewnętrznych, zachowując je w dowolnym miejscu. Działa tylko wtedy, gdy wątki są dostępne i włączone."
+
+#: mod/settings.php:978
+msgid "General Theme Settings"
+msgstr "Ogólne ustawienia motywu"
+
+#: mod/settings.php:979
+msgid "Custom Theme Settings"
+msgstr "Niestandardowe ustawienia motywów"
+
+#: mod/settings.php:980
+msgid "Content Settings"
+msgstr "Ustawienia zawartości"
+
+#: mod/settings.php:1000
+msgid "Unable to find your profile. Please contact your admin."
+msgstr "Nie można znaleźć Twojego profilu. Skontaktuj się z administratorem."
+
+#: mod/settings.php:1039
+msgid "Account Types"
+msgstr "Rodzaje kont"
+
+#: mod/settings.php:1040
+msgid "Personal Page Subtypes"
+msgstr "Podtypy osobistych stron"
+
+#: mod/settings.php:1041
+msgid "Community Forum Subtypes"
+msgstr "Podtypy społeczności forum"
+
+#: mod/settings.php:1048 mod/admin.php:1841
+msgid "Personal Page"
+msgstr "Strona osobista"
+
+#: mod/settings.php:1049
+msgid "Account for a personal profile."
+msgstr "Konto dla profilu osobistego."
+
+#: mod/settings.php:1052 mod/admin.php:1842
+msgid "Organisation Page"
+msgstr "Strona Organizacji"
+
+#: mod/settings.php:1053
+msgid ""
+"Account for an organisation that automatically approves contact requests as "
+"\"Followers\"."
+msgstr "Konto dla organizacji, która automatycznie zatwierdza prośby o kontakt jako \"Obserwatorzy\"."
+
+#: mod/settings.php:1056 mod/admin.php:1843
+msgid "News Page"
+msgstr "Strona Wiadomości"
+
+#: mod/settings.php:1057
+msgid ""
+"Account for a news reflector that automatically approves contact requests as"
+" \"Followers\"."
+msgstr "Konto dla reflektora wiadomości, który automatycznie zatwierdza prośby o kontakt jako \"Obserwatorzy\"."
+
+#: mod/settings.php:1060 mod/admin.php:1844
+msgid "Community Forum"
+msgstr "Forum społecznościowe"
+
+#: mod/settings.php:1061
+msgid "Account for community discussions."
+msgstr "Konto do dyskusji w społeczności."
+
+#: mod/settings.php:1064 mod/admin.php:1834
+msgid "Normal Account Page"
+msgstr "Normalna strona konta"
+
+#: mod/settings.php:1065
+msgid ""
+"Account for a regular personal profile that requires manual approval of "
+"\"Friends\" and \"Followers\"."
+msgstr "Konto dla zwykłego profilu osobistego, który wymaga ręcznej zgody \"Przyjaciół\" i \"Obserwatorów\"."
+
+#: mod/settings.php:1068 mod/admin.php:1835
+msgid "Soapbox Page"
+msgstr "Strona Soapbox"
+
+#: mod/settings.php:1069
+msgid ""
+"Account for a public profile that automatically approves contact requests as"
+" \"Followers\"."
+msgstr "Konto dla profilu publicznego, który automatycznie zatwierdza prośby o kontakt jako \"Obserwatorzy\"."
+
+#: mod/settings.php:1072 mod/admin.php:1836
+msgid "Public Forum"
+msgstr "Forum publiczne"
+
+#: mod/settings.php:1073
+msgid "Automatically approves all contact requests."
+msgstr "Automatycznie zatwierdza wszystkie prośby o kontakt."
+
+#: mod/settings.php:1076 mod/admin.php:1837
+msgid "Automatic Friend Page"
+msgstr "Automatyczna strona znajomego"
+
+#: mod/settings.php:1077
+msgid ""
+"Account for a popular profile that automatically approves contact requests "
+"as \"Friends\"."
+msgstr "Konto popularnego profilu, które automatycznie zatwierdza prośby o kontakt jako \"Przyjaciele\"."
+
+#: mod/settings.php:1080
+msgid "Private Forum [Experimental]"
+msgstr "Prywatne Forum [Eksperymentalne]"
+
+#: mod/settings.php:1081
+msgid "Requires manual approval of contact requests."
+msgstr "Wymaga ręcznego zatwierdzania żądań kontaktów."
+
+#: mod/settings.php:1092
+msgid "OpenID:"
+msgstr "OpenID:"
+
+#: mod/settings.php:1092
+msgid "(Optional) Allow this OpenID to login to this account."
+msgstr "(Opcjonalnie) Pozwól zalogować się na to konto przy pomocy OpenID."
+
+#: mod/settings.php:1100
+msgid "Publish your default profile in your local site directory?"
+msgstr "Opublikować Twój domyślny profil w Twoim lokalnym katalogu stron?"
+
+#: 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 "Twój profil zostanie opublikowany w lokalnym katalogu tego <a href=\"%s\">węzła</a>. Dane Twojego profilu mogą być publicznie widoczne w zależności od ustawień systemu."
+
+#: 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 "Nie"
 
-#: mod/apps.php:14 index.php:265
-msgid "You must be logged in to use addons. "
-msgstr "Musisz być zalogowany, aby korzystać z dodatków."
+#: mod/settings.php:1106
+msgid "Publish your default profile in the global social directory?"
+msgstr "Opublikować Twój domyślny profil w globalnym, społecznościowym katalogu?"
 
-#: mod/apps.php:19
-msgid "Applications"
-msgstr "Aplikacje"
+#: 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 "Twój profil zostanie opublikowany w globalnych katalogach friendica (np.<a href=\"%s\">%s</a>). Twój profil będzie widoczny publicznie."
 
-#: mod/apps.php:22
-msgid "No installed applications."
-msgstr "Brak zainstalowanych aplikacji."
+#: mod/settings.php:1113
+msgid "Hide your contact/friend list from viewers of your default profile?"
+msgstr "Ukryć listę znajomych przed odwiedzającymi Twój profil?"
 
-#: mod/attach.php:15
-msgid "Item not available."
-msgstr "Element niedostępny."
+#: 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 "Twoja lista kontaktów nie będzie wyświetlana na domyślnej stronie profilu. Możesz zdecydować o wyświetleniu listy kontaktów osobno dla każdego tworzonego dodatkowego profilu."
 
-#: mod/attach.php:25
-msgid "Item was not found."
-msgstr "Element nie znaleziony."
+#: mod/settings.php:1117
+msgid "Hide your profile details from anonymous viewers?"
+msgstr "Ukryć dane Twojego profilu przed anonimowymi widzami?"
 
-#: 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 "Anonimowi użytkownicy zobaczą tylko Twoje zdjęcie profilowe, swoją wyświetlaną nazwę i pseudonim, którego używasz na stronie profilu. Twoje publiczne posty i odpowiedzi będą nadal dostępne w inny sposób."
+
+#: mod/settings.php:1121
+msgid "Allow friends to post to your profile page?"
+msgstr "Zezwalać znajomym na publikowanie postów na stronie Twojego profilu?"
+
+#: mod/settings.php:1121
+msgid ""
+"Your contacts may write posts on your profile wall. These posts will be "
+"distributed to your contacts"
+msgstr "Twoi znajomi mogą pisać posty na stronie Twojego profilu. Posty zostaną przesłane do Twoich kontaktów."
+
+#: mod/settings.php:1125
+msgid "Allow friends to tag your posts?"
+msgstr "Zezwolić na oznaczanie Twoich postów przez znajomych?"
+
+#: mod/settings.php:1125
+msgid "Your contacts can add additional tags to your posts."
+msgstr "Twoje kontakty mogą dodawać do tagów dodatkowe posty."
+
+#: mod/settings.php:1129
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr "Zezwolić na zaproponowanie Cię jako potencjalnego przyjaciela dla nowych członków?"
+
+#: mod/settings.php:1129
+msgid ""
+"If you like, Friendica may suggest new members to add you as a contact."
+msgstr "Jeśli chcesz, Friendica może zaproponować nowym członkom dodanie Cię jako kontakt."
+
+#: mod/settings.php:1133
+msgid "Permit unknown people to send you private mail?"
+msgstr "Zezwolić nieznanym osobom na wysyłanie prywatnych wiadomości?"
+
+#: mod/settings.php:1133
+msgid ""
+"Friendica network users may send you private messages even if they are not "
+"in your contact list."
+msgstr "Użytkownicy sieci w serwisie Friendica mogą wysyłać prywatne wiadomości, nawet jeśli nie znajdują się one na liście kontaktów."
+
+#: mod/settings.php:1137
+msgid "Profile is <strong>not published</strong>."
+msgstr "Profil <strong>nie jest opublikowany</strong>"
+
+#: mod/settings.php:1143
+#, php-format
+msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
+msgstr "Twój adres tożsamości to <strong>'%s'</strong> lub '%s'."
+
+#: mod/settings.php:1150
+msgid "Automatically expire posts after this many days:"
+msgstr "Posty wygasną automatycznie po następującej liczbie dni:"
+
+#: mod/settings.php:1150
+msgid "If empty, posts will not expire. Expired posts will be deleted"
+msgstr "Pole puste, wiadomość nie wygaśnie. Niezapisane wpisy zostaną usunięte."
+
+#: mod/settings.php:1151
+msgid "Advanced expiration settings"
+msgstr "Zaawansowane ustawienia wygaszania"
+
+#: mod/settings.php:1152
+msgid "Advanced Expiration"
+msgstr "Zaawansowane wygaszanie"
+
+#: mod/settings.php:1153
+msgid "Expire posts:"
+msgstr "Wygasające posty:"
+
+#: mod/settings.php:1154
+msgid "Expire personal notes:"
+msgstr "Wygaszanie osobistych notatek:"
+
+#: mod/settings.php:1155
+msgid "Expire starred posts:"
+msgstr "Wygaszaj posty oznaczone gwiazdką:"
+
+#: mod/settings.php:1156
+msgid "Expire photos:"
+msgstr "Wygasanie zdjęć:"
+
+#: mod/settings.php:1157
+msgid "Only expire posts by others:"
+msgstr "Wygaszaj tylko te posty, które zostały napisane przez inne osoby:"
+
+#: mod/settings.php:1187
+msgid "Account Settings"
+msgstr "Ustawienia konta"
+
+#: mod/settings.php:1195
+msgid "Password Settings"
+msgstr "Ustawienia hasła"
+
+#: mod/settings.php:1196 mod/register.php:275
+msgid "New Password:"
+msgstr "Nowe hasło:"
+
+#: mod/settings.php:1197 mod/register.php:276
+msgid "Confirm:"
+msgstr "Potwierdź:"
+
+#: mod/settings.php:1197
+msgid "Leave password fields blank unless changing"
+msgstr "Pozostaw pole hasła puste, chyba że chcesz je zmienić."
+
+#: mod/settings.php:1198
+msgid "Current Password:"
+msgstr "Aktualne hasło:"
+
+#: mod/settings.php:1198 mod/settings.php:1199
+msgid "Your current password to confirm the changes"
+msgstr "Wpisz aktualne hasło, aby potwierdzić zmiany"
+
+#: mod/settings.php:1199
+msgid "Password:"
+msgstr "Hasło:"
+
+#: mod/settings.php:1203
+msgid "Basic Settings"
+msgstr "Ustawienia podstawowe"
+
+#: mod/settings.php:1204 src/Model/Profile.php:725
+msgid "Full Name:"
+msgstr "Imię i Nazwisko:"
+
+#: mod/settings.php:1205
+msgid "Email Address:"
+msgstr "Adres email:"
+
+#: mod/settings.php:1206
+msgid "Your Timezone:"
+msgstr "Twoja strefa czasowa:"
+
+#: mod/settings.php:1207
+msgid "Your Language:"
+msgstr "Twój język:"
+
+#: mod/settings.php:1207
+msgid ""
+"Set the language we use to show you friendica interface and to send you "
+"emails"
+msgstr "Wybierz język, którego używasz, aby pokazać interfejs użytkownika friendica i do wysłania Ci e-maili"
+
+#: mod/settings.php:1208
+msgid "Default Post Location:"
+msgstr "Domyślna lokalizacja wiadomości:"
+
+#: mod/settings.php:1209
+msgid "Use Browser Location:"
+msgstr "Użyj lokalizacji przeglądarki:"
+
+#: mod/settings.php:1212
+msgid "Security and Privacy Settings"
+msgstr "Ustawienia bezpieczeństwa i prywatności"
+
+#: mod/settings.php:1214
+msgid "Maximum Friend Requests/Day:"
+msgstr "Maksymalna dzienna liczba zaproszeń do grona przyjaciół:"
+
+#: mod/settings.php:1214 mod/settings.php:1243
+msgid "(to prevent spam abuse)"
+msgstr "(aby zapobiec spamowaniu)"
+
+#: mod/settings.php:1215
+msgid "Default Post Permissions"
+msgstr "Domyślne prawa dostępu wiadomości"
+
+#: mod/settings.php:1216
+msgid "(click to open/close)"
+msgstr "(kliknij by otworzyć/zamknąć)"
+
+#: mod/settings.php:1224 mod/photos.php:1126 mod/photos.php:1456
+msgid "Show to Groups"
+msgstr "Pokaż Grupy"
+
+#: mod/settings.php:1225 mod/photos.php:1127 mod/photos.php:1457
+msgid "Show to Contacts"
+msgstr "Pokaż kontakty"
+
+#: mod/settings.php:1226
+msgid "Default Private Post"
+msgstr "Domyślny Prywatny Wpis"
+
+#: mod/settings.php:1227
+msgid "Default Public Post"
+msgstr "Domyślny Publiczny Post"
+
+#: mod/settings.php:1231
+msgid "Default Permissions for New Posts"
+msgstr "Uprawnienia domyślne dla nowych postów"
+
+#: mod/settings.php:1243
+msgid "Maximum private messages per day from unknown people:"
+msgstr "Maksymalna liczba prywatnych wiadomości dziennie od nieznanych osób:"
+
+#: mod/settings.php:1246
+msgid "Notification Settings"
+msgstr "Ustawienia powiadomień"
+
+#: mod/settings.php:1247
+msgid "Send a notification email when:"
+msgstr "Wyślij powiadmonienia na email, kiedy:"
+
+#: mod/settings.php:1248
+msgid "You receive an introduction"
+msgstr "Otrzymałeś zaproszenie"
+
+#: mod/settings.php:1249
+msgid "Your introductions are confirmed"
+msgstr "Twoje zaproszenie jest potwierdzone"
+
+#: mod/settings.php:1250
+msgid "Someone writes on your profile wall"
+msgstr "Ktoś pisze na twoim profilu"
+
+#: mod/settings.php:1251
+msgid "Someone writes a followup comment"
+msgstr "Ktoś pisze komentarz nawiązujący."
+
+#: mod/settings.php:1252
+msgid "You receive a private message"
+msgstr "Otrzymałeś prywatną wiadomość"
+
+#: mod/settings.php:1253
+msgid "You receive a friend suggestion"
+msgstr "Otrzymałeś propozycję od znajomych"
+
+#: mod/settings.php:1254
+msgid "You are tagged in a post"
+msgstr "Jesteś oznaczony tagiem w poście"
+
+#: mod/settings.php:1255
+msgid "You are poked/prodded/etc. in a post"
+msgstr "Jesteś zaczepiony/zaczepiona/itp. w poście"
+
+#: mod/settings.php:1257
+msgid "Activate desktop notifications"
+msgstr "Aktywuj powiadomienia na pulpicie"
+
+#: mod/settings.php:1257
+msgid "Show desktop popup on new notifications"
+msgstr "Pokaż wyskakujące okienko dla nowych powiadomień"
+
+#: mod/settings.php:1259
+msgid "Text-only notification emails"
+msgstr "E-maile z powiadomieniami tekstowymi"
+
+#: mod/settings.php:1261
+msgid "Send text only notification emails, without the html part"
+msgstr "Wysyłaj tylko e-maile z powiadomieniami tekstowymi, bez części html"
+
+#: mod/settings.php:1263
+msgid "Show detailled notifications"
+msgstr "Pokaż szczegółowe powiadomienia"
+
+#: mod/settings.php:1265
+msgid ""
+"Per default, notifications are condensed to a single notification per item. "
+"When enabled every notification is displayed."
+msgstr "Domyślne powiadomienia są skondensowane z jednym powiadomieniem dla każdego przedmiotu. Po włączeniu wyświetlane jest każde powiadomienie."
+
+#: mod/settings.php:1267
+msgid "Advanced Account/Page Type Settings"
+msgstr "Zaawansowane ustawienia konta/rodzaju strony"
+
+#: mod/settings.php:1268
+msgid "Change the behaviour of this account for special situations"
+msgstr "Zmień zachowanie tego konta w sytuacjach specjalnych"
+
+#: mod/settings.php:1271
+msgid "Relocate"
+msgstr "Przeniesienie"
+
+#: 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 "Jeśli ten profil został przeniesiony z innego serwera, a niektóre z Twoich kontaktów nie otrzymają aktualizacji, spróbuj nacisnąć ten przycisk."
+
+#: mod/settings.php:1273
+msgid "Resend relocate message to contacts"
+msgstr "Wyślij ponownie przenieść wiadomości do kontaktów"
+
+#: mod/ping.php:289
+msgid "{0} wants to be your friend"
+msgstr "{0} chce być Twoim znajomym"
+
+#: mod/ping.php:305
+msgid "{0} sent you a message"
+msgstr "{0} wysłałem Ci wiadomość"
+
+#: mod/ping.php:321
+msgid "{0} requested registration"
+msgstr "{0} wymagana rejestracja"
+
+#: mod/search.php:39 mod/network.php:194
+msgid "Remove term"
+msgstr "Usuń wpis"
+
+#: mod/search.php:48 mod/network.php:201 src/Content/Feature.php:100
+msgid "Saved Searches"
+msgstr "Zapisywanie wyszukiwania"
+
+#: mod/search.php:112
+msgid "Only logged in users are permitted to perform a search."
+msgstr "Tylko zalogowani użytkownicy mogą wyszukiwać."
+
+#: mod/search.php:136
+msgid "Too Many Requests"
+msgstr "Zbyt dużo próśb"
+
+#: mod/search.php:137
+msgid "Only one search per minute is permitted for not logged in users."
+msgstr "Dla niezalogowanych użytkowników dozwolone jest tylko jedno wyszukiwanie na minutę."
+
+#: mod/search.php:240 mod/community.php:161
+msgid "No results."
+msgstr "Brak wyników."
+
+#: mod/search.php:246
+#, php-format
+msgid "Items tagged with: %s"
+msgstr "Przedmioty oznaczone tagiem: %s"
+
+#: mod/search.php:248 mod/contacts.php:841
+#, php-format
+msgid "Results for: %s"
+msgstr "Wyniki dla: %s"
+
+#: mod/common.php:93
 msgid "No contacts in common."
 msgstr "Brak wspólnych kontaktów."
 
-#: mod/common.php:140 mod/contacts.php:886
+#: mod/common.php:142 mod/contacts.php:916
 msgid "Common Friends"
 msgstr "Wspólni znajomi"
 
-#: mod/credits.php:18
-msgid "Credits"
-msgstr "Zaufany"
+#: mod/bookmarklet.php:24 src/Module/Login.php:310 src/Content/Nav.php:114
+msgid "Login"
+msgstr "Zaloguj się"
 
-#: mod/credits.php:19
+#: mod/bookmarklet.php:52
+msgid "The post was created"
+msgstr "Post został utworzony"
+
+#: mod/network.php:202 src/Model/Group.php:401
+msgid "add"
+msgstr "dodaj"
+
+#: 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 to projekt społecznościowy, który nie byłby możliwy bez pomocy wielu osób. Oto lista osób, które przyczyniły się do tworzenia kodu lub tłumaczenia Friendica. Dziękuję wam wszystkim!"
+"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] "Ostrzeżenie: Ta grupa zawiera %s członka z sieci, która nie dopuszcza wiadomości niepublicznych."
+msgstr[1] "Ostrzeżenie: Ta grupa zawiera %s członków z sieci, która nie dopuszcza wiadomości niepublicznych."
+msgstr[2] "Ostrzeżenie: Ta grupa zawiera %s członków z sieci, która nie dopuszcza wiadomości niepublicznych."
+msgstr[3] "Ostrzeżenie: Ta grupa zawiera %s członków z sieci, która nie dopuszcza wiadomości niepublicznych."
 
-#: mod/fbrowser.php:34 view/theme/frio/theme.php:261 src/Content/Nav.php:102
-#: src/Model/Profile.php:902
-msgid "Photos"
-msgstr "Zdjęcia"
+#: mod/network.php:551
+msgid "Messages in this group won't be send to these receivers."
+msgstr "Wiadomości z tej grupy nie będą wysyłane do tych odbiorców."
 
-#: mod/fbrowser.php:43 mod/fbrowser.php:68 mod/photos.php:194
-#: mod/photos.php:1062 mod/photos.php:1149 mod/photos.php:1166
-#: mod/photos.php:1659 mod/photos.php:1673 src/Model/Photo.php:244
-#: src/Model/Photo.php:253
-msgid "Contact Photos"
-msgstr "Zdjęcia kontaktu"
+#: mod/network.php:620
+msgid "No such group"
+msgstr "Nie ma takiej grupy"
 
-#: mod/fbrowser.php:105 mod/fbrowser.php:136 mod/profile_photo.php:250
-msgid "Upload"
-msgstr "Załaduj"
+#: mod/network.php:641 mod/group.php:247
+msgid "Group is empty"
+msgstr "Grupa jest pusta"
 
-#: mod/fbrowser.php:131
-msgid "Files"
-msgstr "Pliki"
+#: mod/network.php:645
+#, php-format
+msgid "Group: %s"
+msgstr "Grupa: %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 "Nie znaleziono"
+#: mod/network.php:671
+msgid "Private messages to this person are at risk of public disclosure."
+msgstr "Prywatne wiadomości do tej osoby mogą zostać publicznie ujawnione "
 
-#: mod/hcard.php:18
+#: mod/network.php:674
+msgid "Invalid contact."
+msgstr "Nieprawidłowy kontakt."
+
+#: mod/network.php:945
+msgid "Commented Order"
+msgstr "Porządek według komentarzy"
+
+#: mod/network.php:948
+msgid "Sort by Comment Date"
+msgstr "Sortuj według daty komentarza"
+
+#: mod/network.php:953
+msgid "Posted Order"
+msgstr "Porządek według wpisów"
+
+#: mod/network.php:956
+msgid "Sort by Post Date"
+msgstr "Sortuj według daty postów"
+
+#: mod/network.php:964 mod/profiles.php:594
+#: src/Core/NotificationsManager.php:186
+msgid "Personal"
+msgstr "Osobiste"
+
+#: mod/network.php:967
+msgid "Posts that mention or involve you"
+msgstr "Posty, które wspominają lub angażują Ciebie"
+
+#: mod/network.php:975
+msgid "New"
+msgstr "Nowy"
+
+#: mod/network.php:978
+msgid "Activity Stream - by date"
+msgstr "Strumień aktywności - według daty"
+
+#: mod/network.php:986
+msgid "Shared Links"
+msgstr "Udostępnione łącza"
+
+#: mod/network.php:989
+msgid "Interesting Links"
+msgstr "Interesujące linki"
+
+#: mod/network.php:997
+msgid "Starred"
+msgstr "Ulubione"
+
+#: mod/network.php:1000
+msgid "Favourite Posts"
+msgstr "Ulubione posty"
+
+#: mod/group.php:36
+msgid "Group created."
+msgstr "Grupa utworzona."
+
+#: mod/group.php:42
+msgid "Could not create group."
+msgstr "Nie mogę stworzyć grupy"
+
+#: mod/group.php:56 mod/group.php:187
+msgid "Group not found."
+msgstr "Nie znaleziono grupy"
+
+#: mod/group.php:70
+msgid "Group name changed."
+msgstr "Nazwa grupy zmieniona"
+
+#: mod/group.php:101
+msgid "Save Group"
+msgstr "Zapisz grupę"
+
+#: mod/group.php:102
+msgid "Filter"
+msgstr "Filtr"
+
+#: mod/group.php:107
+msgid "Create a group of contacts/friends."
+msgstr "Stwórz grupę znajomych."
+
+#: mod/group.php:108 mod/group.php:134 mod/group.php:229
+#: src/Model/Group.php:410
+msgid "Group Name: "
+msgstr "Nazwa grupy: "
+
+#: mod/group.php:125 src/Model/Group.php:407
+msgid "Contacts not in any group"
+msgstr "Kontakt nie jest w żadnej grupie"
+
+#: mod/group.php:157
+msgid "Group removed."
+msgstr "Grupa usunięta."
+
+#: mod/group.php:159
+msgid "Unable to remove group."
+msgstr "Nie można usunąć grupy."
+
+#: mod/group.php:222
+msgid "Delete Group"
+msgstr "Usuń grupę"
+
+#: mod/group.php:233
+msgid "Edit Group Name"
+msgstr "Edytuj nazwę grupy"
+
+#: mod/group.php:244
+msgid "Members"
+msgstr "Członkowie"
+
+#: mod/group.php:246 mod/contacts.php:739
+msgid "All Contacts"
+msgstr "Wszystkie kontakty"
+
+#: mod/group.php:260
+msgid "Remove contact from group"
+msgstr "Usuń kontakt z grupy"
+
+#: mod/group.php:278 mod/profperm.php:118
+msgid "Click on a contact to add or remove."
+msgstr "Kliknij na kontakt w celu dodania lub usunięcia."
+
+#: mod/group.php:292
+msgid "Add contact to group"
+msgstr "Dodaj kontakt do grupy"
+
+#: mod/delegate.php:39
+msgid "Parent user not found."
+msgstr "Nie znaleziono użytkownika nadrzędnego."
+
+#: mod/delegate.php:146
+msgid "No parent user"
+msgstr "Brak nadrzędnego użytkownika"
+
+#: mod/delegate.php:161
+msgid "Parent Password:"
+msgstr "Hasło nadrzędne:"
+
+#: mod/delegate.php:161
+msgid ""
+"Please enter the password of the parent account to legitimize your request."
+msgstr "Wprowadź hasło konta nadrzędnego, aby legalizować swoje żądanie."
+
+#: mod/delegate.php:166
+msgid "Parent User"
+msgstr "Użytkownik nadrzędny"
+
+#: 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 "Użytkownicy nadrzędni mają pełną kontrolę nad tym kontem, w tym także ustawienia konta. Sprawdź dokładnie, komu przyznasz ten dostęp."
+
+#: mod/delegate.php:171 src/Content/Nav.php:205
+msgid "Delegate Page Management"
+msgstr "Deleguj zarządzanie stronami"
+
+#: mod/delegate.php:172
+msgid "Delegates"
+msgstr "Oddeleguj"
+
+#: 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 "Delegaci mogą zarządzać wszystkimi aspektami tego konta/strony, z wyjątkiem podstawowych ustawień konta. Nie przekazuj swojego konta osobistego nikomu, komu nie ufasz całkowicie."
+
+#: mod/delegate.php:175
+msgid "Existing Page Delegates"
+msgstr "Obecni delegaci stron"
+
+#: mod/delegate.php:177
+msgid "Potential Delegates"
+msgstr "Potencjalni delegaci"
+
+#: mod/delegate.php:179 mod/tagrm.php:90
+msgid "Remove"
+msgstr "Usuń"
+
+#: mod/delegate.php:180
+msgid "Add"
+msgstr "Dodaj"
+
+#: mod/delegate.php:181
+msgid "No entries."
+msgstr "Brak wpisów."
+
+#: mod/uexport.php:44
+msgid "Export account"
+msgstr "Eksportuj konto"
+
+#: 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 "Eksportuj informacje o swoim koncie i kontaktach. Użyj tego do utworzenia kopii zapasowej konta i/lub przeniesienia go na inny serwer."
+
+#: mod/uexport.php:45
+msgid "Export all"
+msgstr "Eksportuj wszystko"
+
+#: 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 "Wyeksportuj informacje o koncie, kontaktach i wszystkie swoje pozycje jako json. Może to być bardzo duży plik i może zająć dużo czasu. Użyj tej opcji, aby utworzyć pełną kopię zapasową swojego konta (zdjęcia nie są eksportowane)"
+
+#: mod/repair_ostatus.php:21
+msgid "Resubscribing to OStatus contacts"
+msgstr "Ponowne subskrybowanie kontaktów OStatus"
+
+#: mod/repair_ostatus.php:37
+msgid "Error"
+msgstr "Błąd"
+
+#: mod/repair_ostatus.php:52 mod/ostatus_subscribe.php:65
+msgid "Done"
+msgstr "Gotowe"
+
+#: mod/repair_ostatus.php:58 mod/ostatus_subscribe.php:89
+msgid "Keep this window open until done."
+msgstr "Pozostaw to okno otwarte, dopóki nie będzie gotowe."
+
+#: 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 "Brak dostępu"
+
+#: mod/viewcontacts.php:90
+msgid "No contacts."
+msgstr "Brak kontaktów"
+
+#: mod/viewcontacts.php:106 mod/contacts.php:639 mod/contacts.php:1052
+#, php-format
+msgid "Visit %s's profile [%s]"
+msgstr "Obejrzyj %s's profil [%s]"
+
+#: mod/unfollow.php:36
+msgid "Contact wasn't found or can't be unfollowed."
+msgstr "Kontakt nie został znaleziony lub nie można go pominąć."
+
+#: mod/unfollow.php:49
+msgid "Contact unfollowed"
+msgstr "Skontaktuj się z obserwowanym"
+
+#: mod/unfollow.php:67 mod/dfrn_request.php:654 mod/follow.php:62
+msgid "Submit Request"
+msgstr "Wyślij zgłoszenie"
+
+#: mod/unfollow.php:76
+msgid "You aren't a friend of this contact."
+msgstr "Nie jesteś przyjacielem tego kontaktu."
+
+#: mod/unfollow.php:82
+msgid "Unfollowing is currently not supported by your network."
+msgstr "Brak obserwowania nie jest obecnie obsługiwany przez twoją sieć."
+
+#: mod/unfollow.php:103 mod/contacts.php:601
+msgid "Disconnect/Unfollow"
+msgstr "Rozłącz/Nie obserwuj"
+
+#: mod/unfollow.php:116 mod/dfrn_request.php:652 mod/follow.php:157
+msgid "Your Identity Address:"
+msgstr "Twój adres tożsamości:"
+
+#: 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 "Adres URL profilu"
+
+#: mod/unfollow.php:135 mod/contacts.php:888 mod/follow.php:189
+#: src/Model/Profile.php:878
+msgid "Status Messages and Posts"
+msgstr "Status wiadomości i postów"
+
+#: 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 "[Dodatkowa zawartość - odśwież stronę by zobaczyć]"
+
+#: mod/register.php:99
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr "Rejestracja zakończona pomyślnie. Dalsze instrukcje zostały wysłane na twojego e-maila."
+
+#: 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 "Nie udało się wysłać wiadomości e-mail. Tutaj szczegóły twojego konta:<br> login: %s<br>hasło: %s<br><br>Możesz zmienić swoje hasło po zalogowaniu."
+
+#: mod/register.php:110
+msgid "Registration successful."
+msgstr "Rejestracja udana."
+
+#: mod/register.php:115
+msgid "Your registration can not be processed."
+msgstr "Twoja rejestracja nie może zostać przeprowadzona. "
+
+#: mod/register.php:162
+msgid "Your registration is pending approval by the site owner."
+msgstr "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny."
+
+#: 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 "Strona przekroczyła ilość dozwolonych rejestracji na dzień. Proszę spróbuj ponownie jutro."
+
+#: mod/register.php:220
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr "Możesz (opcjonalnie) wypełnić ten formularz za pośrednictwem OpenID, podając swój OpenID i klikając 'Register'."
+
+#: 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 "Jeśli nie jesteś zaznajomiony z OpenID, zostaw to pole puste i uzupełnij resztę elementów."
+
+#: mod/register.php:222
+msgid "Your OpenID (optional): "
+msgstr "Twój OpenID (opcjonalnie):"
+
+#: mod/register.php:234
+msgid "Include your profile in member directory?"
+msgstr "Czy dołączyć twój profil do katalogu członków?"
+
+#: mod/register.php:261
+msgid "Note for the admin"
+msgstr "Uwaga dla administratora"
+
+#: mod/register.php:261
+msgid "Leave a message for the admin, why you want to join this node"
+msgstr "Pozostaw wiadomość dla administratora, dlaczego chcesz dołączyć do tego węzła"
+
+#: mod/register.php:262
+msgid "Membership on this site is by invitation only."
+msgstr "Członkostwo na tej stronie możliwe tylko dzięki zaproszeniu."
+
+#: mod/register.php:263
+msgid "Your invitation code: "
+msgstr "Twój kod zaproszenia:"
+
+#: mod/register.php:266 mod/admin.php:1428
+msgid "Registration"
+msgstr "Rejestracja"
+
+#: mod/register.php:272
+msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
+msgstr "Twoje Imię i Nazwisko (np. Jan Kowalski, prawdziwe lub wyglądające na prawdziwe):"
+
+#: mod/register.php:273
+msgid ""
+"Your Email Address: (Initial information will be send there, so this has to "
+"be an existing address.)"
+msgstr "Twój adres e-mail: (Informacje początkowe zostaną wysłane tam, więc musi to być istniejący adres)."
+
+#: mod/register.php:275
+msgid "Leave empty for an auto generated password."
+msgstr "Pozostaw puste dla wygenerowanego automatycznie hasła."
+
+#: 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 "Wybierz pseudonim profilu. Nazwa musi zaczynać się od znaku tekstowego. Twój adres profilu na tej stronie będzie wówczas '<strong>pseudonimem%s</strong>'."
+
+#: mod/register.php:278
+msgid "Choose a nickname: "
+msgstr "Wybierz pseudonim:"
+
+#: mod/register.php:281 src/Module/Login.php:281 src/Content/Nav.php:128
+msgid "Register"
+msgstr "Zarejestruj"
+
+#: mod/register.php:287 mod/uimport.php:70
+msgid "Import"
+msgstr "Import"
+
+#: mod/register.php:288
+msgid "Import your profile to this friendica instance"
+msgstr "Zaimportuj swój profil do tej instancji 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 "Warunki usługi"
+
+#: mod/register.php:296
+msgid "Note: This node explicitly contains adult content"
+msgstr "Uwaga: Ten węzeł jawnie zawiera treści dla dorosłych"
+
+#: mod/notifications.php:35
+msgid "Invalid request identifier."
+msgstr "Nieprawidłowe żądanie identyfikatora."
+
+#: mod/notifications.php:44 mod/notifications.php:183
+#: mod/notifications.php:235 mod/message.php:114
+msgid "Discard"
+msgstr "Odrzuć"
+
+#: 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 "Ignoruj"
+
+#: mod/notifications.php:93 src/Content/Nav.php:191
+msgid "Notifications"
+msgstr "Powiadomienia"
+
+#: mod/notifications.php:101
+msgid "Network Notifications"
+msgstr "Powiadomienia sieciowe"
+
+#: mod/notifications.php:106 mod/notify.php:81
+msgid "System Notifications"
+msgstr "Powiadomienia systemowe"
+
+#: mod/notifications.php:111
+msgid "Personal Notifications"
+msgstr "Prywatne powiadomienia"
+
+#: mod/notifications.php:116
+msgid "Home Notifications"
+msgstr "Powiadomienia domowe"
+
+#: mod/notifications.php:148
+msgid "Show Ignored Requests"
+msgstr "Pokaż ignorowane żądania"
+
+#: mod/notifications.php:148
+msgid "Hide Ignored Requests"
+msgstr "Ukryj zignorowane prośby"
+
+#: mod/notifications.php:161 mod/notifications.php:243
+msgid "Notification type:"
+msgstr "Typ powiadomienia:"
+
+#: mod/notifications.php:164
+msgid "Suggested by:"
+msgstr "Sugerowany przez:"
+
+#: mod/notifications.php:176 mod/notifications.php:260 mod/contacts.php:666
+msgid "Hide this contact from others"
+msgstr "Ukryj ten kontakt przed innymi"
+
+#: mod/notifications.php:179 mod/notifications.php:269 mod/admin.php:1904
+msgid "Approve"
+msgstr "Zatwierdź"
+
+#: mod/notifications.php:202
+msgid "Claims to be known to you: "
+msgstr "Twierdzi, że go znasz:"
+
+#: mod/notifications.php:203
+msgid "yes"
+msgstr "tak"
+
+#: mod/notifications.php:203
+msgid "no"
+msgstr "nie"
+
+#: mod/notifications.php:204 mod/notifications.php:209
+msgid "Shall your connection be bidirectional or not?"
+msgstr "Czy twoje połączenie ma być dwukierunkowe, czy nie?"
+
+#: 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 "Przyjmowanie %s jako znajomego pozwala %s zasubskrybować twoje posty, a także otrzymywać od nich aktualizacje w swoim kanale wiadomości."
+
+#: 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 "Zaakceptowanie %s jako subskrybenta umożliwia im subskrybowanie Twoich postów, ale nie otrzymasz od nich aktualizacji w swoim kanale wiadomości."
+
+#: 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 "Akceptowanie %s jako udostępniający pozwala im subskrybować twoje posty, ale nie otrzymasz od nich aktualizacji w swoim kanale wiadomości."
+
+#: mod/notifications.php:222
+msgid "Friend"
+msgstr "Znajomy"
+
+#: mod/notifications.php:223
+msgid "Sharer"
+msgstr "Udostępniający/a"
+
+#: mod/notifications.php:223
+msgid "Subscriber"
+msgstr "Subskrybent"
+
+#: mod/notifications.php:257 mod/contacts.php:686 mod/follow.php:177
+#: src/Model/Profile.php:781
+msgid "Tags:"
+msgstr "Tagi:"
+
+#: mod/notifications.php:266 mod/contacts.php:76 src/Model/Profile.php:520
+msgid "Network:"
+msgstr "Sieć:"
+
+#: mod/notifications.php:280
+msgid "No introductions."
+msgstr "Brak dostępu."
+
+#: mod/notifications.php:318
+msgid "Show unread"
+msgstr "Pokaż nieprzeczytane"
+
+#: mod/notifications.php:318
+msgid "Show all"
+msgstr "Pokaż wszystko"
+
+#: mod/notifications.php:323
+#, php-format
+msgid "No more %s notifications."
+msgstr "Nigdy więcej %s powiadomień."
+
+#: mod/message.php:31 mod/message.php:120 src/Content/Nav.php:199
+msgid "New Message"
+msgstr "Nowa wiadomość"
+
+#: mod/message.php:78
+msgid "Unable to locate contact information."
+msgstr "Nie można znaleźć informacji kontaktowych."
+
+#: mod/message.php:152
+msgid "Do you really want to delete this message?"
+msgstr "Czy na pewno chcesz usunąć tę wiadomość?"
+
+#: mod/message.php:169
+msgid "Message deleted."
+msgstr "Wiadomość usunięta."
+
+#: mod/message.php:184
+msgid "Conversation removed."
+msgstr "Rozmowa usunięta."
+
+#: mod/message.php:290
+msgid "No messages."
+msgstr "Brak wiadomości."
+
+#: mod/message.php:331
+msgid "Message not available."
+msgstr "Wiadomość nie jest dostępna."
+
+#: mod/message.php:395
+msgid "Delete message"
+msgstr "Usuń wiadomość"
+
+#: mod/message.php:397 mod/message.php:498
+msgid "D, d M Y - g:i A"
+msgstr "D, d M Y - g:m A"
+
+#: mod/message.php:412 mod/message.php:495
+msgid "Delete conversation"
+msgstr "Usuń rozmowę"
+
+#: mod/message.php:414
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Brak bezpiecznej komunikacji. <strong>Możesz</strong> odpowiedzieć na stronie profilu nadawcy."
+
+#: mod/message.php:418
+msgid "Send Reply"
+msgstr "Odpowiedz"
+
+#: mod/message.php:469
+#, php-format
+msgid "Unknown sender - %s"
+msgstr "Nieznany nadawca - %s"
+
+#: mod/message.php:471
+#, php-format
+msgid "You and %s"
+msgstr "Ty i %s"
+
+#: mod/message.php:473
+#, php-format
+msgid "%s and You"
+msgstr "%s i ty"
+
+#: mod/message.php:501
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] " %d wiadomość"
+msgstr[1] " %d wiadomości"
+msgstr[2] " %d wiadomości"
+msgstr[3] " %d wiadomości"
+
+#: mod/hcard.php:19
 msgid "No profile"
 msgstr "Brak profilu"
 
+#: mod/ostatus_subscribe.php:22
+msgid "Subscribing to OStatus contacts"
+msgstr "Subskrybowanie kontaktów OStatus"
+
+#: mod/ostatus_subscribe.php:34
+msgid "No contact provided."
+msgstr "Brak kontaktu."
+
+#: mod/ostatus_subscribe.php:41
+msgid "Couldn't fetch information for contact."
+msgstr "Nie można pobrać informacji o kontakcie."
+
+#: mod/ostatus_subscribe.php:51
+msgid "Couldn't fetch friends for contact."
+msgstr "Nie można pobrać znajomych do kontaktu."
+
+#: mod/ostatus_subscribe.php:79
+msgid "success"
+msgstr "powodzenie"
+
+#: mod/ostatus_subscribe.php:81
+msgid "failed"
+msgstr "nie powiodło się"
+
+#: mod/ostatus_subscribe.php:84 src/Object/Post.php:264
+msgid "ignored"
+msgstr "Ignoruj"
+
+#: mod/dfrn_poll.php:126 mod/dfrn_poll.php:549
+#, php-format
+msgid "%1$s welcomes %2$s"
+msgstr "%1$s witamy %2$s"
+
+#: mod/removeme.php:47
+msgid "User deleted their account"
+msgstr "Użytkownik usunął swoje konto"
+
+#: 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 "W twoim węźle Friendica użytkownik usunął swoje konto. Upewnij się, że ich dane zostały usunięte z kopii zapasowych."
+
+#: mod/removeme.php:49
+#, php-format
+msgid "The user id is %d"
+msgstr "Identyfikatorem użytkownika jest %d"
+
+#: mod/removeme.php:81 mod/removeme.php:84
+msgid "Remove My Account"
+msgstr "Usuń moje konto"
+
+#: mod/removeme.php:82
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr "Spowoduje to całkowite usunięcie Twojego konta. Po wykonaniu tej czynności nie można jej cofnąć."
+
+#: mod/removeme.php:83
+msgid "Please enter your password for verification:"
+msgstr "Wprowadź hasło w celu weryfikacji."
+
+#: mod/tagrm.php:43
+msgid "Tag removed"
+msgstr "Tag usunięty"
+
+#: mod/tagrm.php:77
+msgid "Remove Item Tag"
+msgstr "Usuń pozycję Tag"
+
+#: mod/tagrm.php:79
+msgid "Select a tag to remove: "
+msgstr "Wybierz tag do usunięcia"
+
 #: mod/home.php:39
 #, php-format
 msgid "Welcome to %s"
 msgstr "Witamy w %s"
 
-#: mod/lockview.php:38 mod/lockview.php:46
-msgid "Remote privacy information not available."
-msgstr "Nie są dostępne zdalne informacje o prywatności."
+#: mod/suggest.php:38
+msgid "Do you really want to delete this suggestion?"
+msgstr "Czy na pewno chcesz usunąć te sugestie ?"
 
-#: mod/lockview.php:55
-msgid "Visible to:"
-msgstr "Widoczne dla:"
+#: mod/suggest.php:74
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Brak dostępnych sugestii. Jeśli jest to nowa witryna, spróbuj ponownie za 24 godziny."
 
-#: mod/maintenance.php:24
-msgid "System down for maintenance"
-msgstr "System wyłączony w celu konserwacji"
+#: mod/suggest.php:87 mod/suggest.php:107
+msgid "Ignore/Hide"
+msgstr "Ignoruj/Ukryj"
+
+#: mod/filer.php:34
+msgid "- select -"
+msgstr "- wybierz -"
+
+#: 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 "To jest wersja Friendica, %s która działa w lokalizacji internetowej %s. Wersja bazy danych to %s wersja po aktualizacji %s."
+
+#: mod/friendica.php:84
+msgid ""
+"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
+"about the Friendica project."
+msgstr "Odwiedź stronę <a href=\"https://friendi.ca\">Friendi.ca</a> aby dowiedzieć się więcej o projekcie Friendica."
+
+#: mod/friendica.php:88
+msgid "Bug reports and issues: please visit"
+msgstr "Raporty o błędach i problemy: odwiedź stronę"
+
+#: mod/friendica.php:88
+msgid "the bugtracker at github"
+msgstr "śledzenie błędów na github"
+
+#: mod/friendica.php:91
+msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
+msgstr "Sugestie, pochwały itp. - napisz e-mail \"info\" na \"friendi.ca\""
+
+#: mod/friendica.php:105
+msgid "Installed addons/apps:"
+msgstr "Zainstalowane dodatki/aplikacje:"
+
+#: mod/friendica.php:119
+msgid "No installed addons/apps"
+msgstr "Brak zainstalowanych dodatków/aplikacji"
+
+#: mod/friendica.php:124
+#, php-format
+msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
+msgstr "Przeczytaj o <a href=\"%1$s/tos\">Warunkach świadczenia usług</a> tego węzła."
+
+#: mod/friendica.php:129
+msgid "On this server the following remote servers are blocked."
+msgstr "Na tym serwerze następujące serwery zdalne są blokowane."
+
+#: 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 "Zablokowana domena"
+
+#: mod/friendica.php:130 mod/admin.php:364 mod/admin.php:382
+msgid "Reason for the block"
+msgstr "Powód blokowania"
+
+#: mod/display.php:303 mod/cal.php:144 mod/profile.php:175
+msgid "Access to this profile has been restricted."
+msgstr "Dostęp do tego profilu został ograniczony."
+
+#: 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 "Nieprawidłowe żądanie."
+
+#: 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 "Obraz przekracza limit rozmiaru wynoszący %s"
+
+#: mod/wall_upload.php:209 mod/profile_photo.php:160 mod/photos.php:831
+msgid "Unable to process image."
+msgstr "Przetwarzanie obrazu nie powiodło się."
+
+#: 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 "Tablica zdjęć"
+
+#: mod/wall_upload.php:248 mod/profile_photo.php:305 mod/photos.php:860
+msgid "Image upload failed."
+msgstr "Przesyłanie obrazu nie powiodło się"
 
 #: mod/newmember.php:11
 msgid "Welcome to Friendica"
@@ -1389,11 +3941,6 @@ msgid ""
 " join."
 msgstr "Na stronie <em>Szybki start</em> - znajdź krótkie wprowadzenie do swojego profilu i kart sieciowych, stwórz nowe połączenia i znajdź kilka grup do przyłączenia się."
 
-#: mod/newmember.php:19 mod/admin.php:1935 mod/admin.php:2204
-#: mod/settings.php:124 view/theme/frio/theme.php:269 src/Content/Nav.php:207
-msgid "Settings"
-msgstr "Ustawienia"
-
 #: mod/newmember.php:21
 msgid "Go to Your Settings"
 msgstr "Idź do swoich ustawień"
@@ -1403,7 +3950,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 stronie Ustawienia - zmień swoje początkowe hasło. Zanotuj także swój adres tożsamości. Wygląda to jak adres e-mail - i będzie przydatny w nawiązywaniu znajomości w bezpłatnej sieci społecznościowej."
+msgstr "Na stronie Ustawienia - zmień swoje początkowe hasło. Zanotuj także swój adres tożsamości. Wygląda to jak adres e-mail - będzie przydatny w nawiązywaniu znajomości w bezpłatnej sieci społecznościowej."
 
 #: mod/newmember.php:22
 msgid ""
@@ -1413,14 +3960,7 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr "Przejrzyj pozostałe ustawienia, w szczególności ustawienia prywatności. Niepublikowany wykaz katalogów jest podobny do niepublicznego numeru telefonu. Ogólnie rzecz biorąc, powinieneś opublikować swój wpis - chyba, że wszyscy twoi znajomi i potencjalni znajomi dokładnie wiedzą, jak Cię znaleźć."
 
-#: 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 "Profil użytkownika"
-
-#: 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 "Wyślij zdjęcie profilowe"
 
@@ -1503,7 +4043,7 @@ msgid ""
 "hours."
 msgstr "Na bocznym panelu strony Kontaktów znajduje się kilka narzędzi do znajdowania nowych przyjaciół. Możemy dopasować osoby według zainteresowań, wyszukiwać osoby według nazwisk i zainteresowań oraz dostarczać sugestie oparte na relacjach sieciowych. Na zupełnie nowej stronie sugestie znajomych zwykle zaczynają być wypełniane w ciągu 24 godzin"
 
-#: mod/newmember.php:43 src/Model/Group.php:414
+#: mod/newmember.php:43 src/Model/Group.php:402
 msgid "Groups"
 msgstr "Grupy"
 
@@ -1543,1559 +4083,15 @@ msgid ""
 " features and resources."
 msgstr "Na naszych stronach <strong>pomocy</strong> można znaleźć szczegółowe informacje na temat innych funkcji programu i zasobów."
 
-#: 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 "Obejrzyj %s's profil [%s]"
-
-#: mod/nogroup.php:43 mod/contacts.php:960
-msgid "Edit contact"
-msgstr "Edytuj kontakt"
-
-#: mod/nogroup.php:63
-msgid "Contacts who are not members of a group"
-msgstr "Kontakty spoza członków grupy"
-
-#: mod/p.php:14
-msgid "Not Extended"
-msgstr "Nie rozszerzony"
-
-#: mod/repair_ostatus.php:18
-msgid "Resubscribing to OStatus contacts"
-msgstr "Ponowne subskrybowanie kontaktów OStatus"
-
-#: mod/repair_ostatus.php:34
-msgid "Error"
-msgstr "Błąd"
-
-#: mod/repair_ostatus.php:48 mod/ostatus_subscribe.php:64
-msgid "Done"
-msgstr "Gotowe"
-
-#: mod/repair_ostatus.php:54 mod/ostatus_subscribe.php:88
-msgid "Keep this window open until done."
-msgstr "Pozostaw to okno otwarte, dopóki nie będzie gotowe."
-
-#: mod/suggest.php:36
-msgid "Do you really want to delete this suggestion?"
-msgstr "Czy na pewno chcesz usunąć te sugestie ?"
-
-#: mod/suggest.php:73
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "Brak dostępnych sugestii. Jeśli jest to nowa witryna, spróbuj ponownie za 24 godziny."
-
-#: mod/suggest.php:84 mod/suggest.php:104
-msgid "Ignore/Hide"
-msgstr "Ignoruj/Ukryj"
-
-#: mod/suggest.php:114 view/theme/vier/theme.php:204 src/Content/Widget.php:64
-msgid "Friend Suggestions"
-msgstr "Osoby, które możesz znać"
-
-#: mod/update_community.php:27 mod/update_display.php:27
-#: mod/update_notes.php:40 mod/update_profile.php:39 mod/update_network.php:33
-msgid "[Embedded content - reload page to view]"
-msgstr "[Dodatkowa zawartość - odśwież stronę by zobaczyć]"
-
-#: 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 "Strona przekroczyła ilość dozwolonych rejestracji na dzień. Proszę spróbuj ponownie jutro."
-
-#: mod/uimport.php:70 mod/register.php:288
-msgid "Import"
-msgstr "Import"
-
-#: mod/uimport.php:72
-msgid "Move account"
-msgstr "Przenieś konto"
-
-#: mod/uimport.php:73
-msgid "You can import an account from another Friendica server."
-msgstr "Możesz zaimportować konto z innego serwera 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 "Musisz wyeksportować konto ze starego serwera i przesłać je tutaj. Odtworzymy twoje stare konto tutaj ze wszystkimi twoimi kontaktami. Postaramy się również poinformować twoich znajomych, że się tutaj przeniosłeś."
-
-#: 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 "Ta funkcja jest eksperymentalna. Nie możemy importować kontaktów z sieci OStatus (GNU Social/Statusnet) lub z Diaspory"
-
-#: mod/uimport.php:76
-msgid "Account file"
-msgstr "Pliki konta"
-
-#: mod/uimport.php:76
-msgid ""
-"To export your account, go to \"Settings->Export your personal data\" and "
-"select \"Export account\""
-msgstr "Aby eksportować konto, wejdź w \"Ustawienia->Eksport danych osobistych\" i wybierz \"Eksportuj konto\""
-
-#: mod/match.php:48
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Brak pasujących słów kluczowych. Dodaj słowa kluczowe do domyślnego profilu."
-
-#: mod/match.php:104
-msgid "is interested in:"
-msgstr "interesuje się:"
-
-#: mod/match.php:120
-msgid "Profile Match"
-msgstr "Dopasowanie profilu"
-
-#: mod/match.php:125 mod/dirfind.php:253
-msgid "No matches"
-msgstr "Brak wyników"
-
-#: mod/manage.php:180
-msgid "Manage Identities and/or Pages"
-msgstr "Zarządzaj Tożsamościami i/lub Stronami."
-
-#: 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 "Przełącz między różnymi tożsamościami lub stronami społeczność/grupy, które udostępniają dane Twojego konta lub które otrzymałeś uprawnienia \"zarządzaj\""
-
-#: mod/manage.php:182
-msgid "Select an identity to manage: "
-msgstr "Wybierz tożsamość do zarządzania:"
-
-#: mod/manage.php:184 mod/localtime.php:56 mod/poke.php:199
-#: mod/fsuggest.php:114 mod/photos.php:1080 mod/photos.php:1160
-#: mod/photos.php:1445 mod/photos.php:1491 mod/photos.php:1530
-#: mod/photos.php:1603 mod/contacts.php:610 mod/events.php:530
-#: 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/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 "Potwierdź"
-
-#: 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 "Nieprawidłowe żądanie."
-
-#: mod/wall_attach.php:101
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
-msgstr "Przepraszam, może twój przesyłany plik jest większy niż pozwala konfiguracja PHP"
-
-#: mod/wall_attach.php:101
-msgid "Or - did you try to upload an empty file?"
-msgstr "Lub - czy próbowałeś załadować pusty plik?"
-
-#: mod/wall_attach.php:112
-#, php-format
-msgid "File exceeds size limit of %s"
-msgstr "Plik przekracza limit rozmiaru wynoszący %s"
-
-#: mod/wall_attach.php:136 mod/wall_attach.php:152
-msgid "File upload failed."
-msgstr "Przesyłanie pliku nie powiodło się."
-
-#: mod/filer.php:34
-msgid "- select -"
-msgstr "- wybierz -"
-
-#: mod/localtime.php:19 src/Model/Event.php:36 src/Model/Event.php:814
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
-#: mod/localtime.php:33
-msgid "Time Conversion"
-msgstr "Zmiana czasu"
-
-#: mod/localtime.php:35
-msgid ""
-"Friendica provides this service for sharing events with other networks and "
-"friends in unknown timezones."
-msgstr "Friendica udostępnia tę usługę do udostępniania wydarzeń innym sieciom i znajomym w nieznanych strefach czasowych."
-
-#: mod/localtime.php:39
-#, php-format
-msgid "UTC time: %s"
-msgstr "Czas UTC %s"
-
-#: mod/localtime.php:42
-#, php-format
-msgid "Current timezone: %s"
-msgstr "Obecna strefa czasowa: %s"
-
-#: mod/localtime.php:46
-#, php-format
-msgid "Converted localtime: %s"
-msgstr "Zmień strefę czasową: %s"
-
-#: mod/localtime.php:52
-msgid "Please select your timezone:"
-msgstr "Wybierz swoją strefę czasową:"
-
-#: mod/notify.php:77
-msgid "No more system notifications."
-msgstr "Nie ma więcej powiadomień systemowych."
-
-#: mod/notify.php:81 mod/notifications.php:113
-msgid "System Notifications"
-msgstr "Powiadomienia systemowe"
-
-#: mod/ping.php:292
-msgid "{0} wants to be your friend"
-msgstr "{0} chce być Twoim znajomym"
-
-#: mod/ping.php:307
-msgid "{0} sent you a message"
-msgstr "{0} wysłałem Ci wiadomość"
-
-#: mod/ping.php:322
-msgid "{0} requested registration"
-msgstr "{0} wymagana rejestracja"
-
-#: mod/poke.php:192
-msgid "Poke/Prod"
-msgstr "Zaczepić"
-
-#: mod/poke.php:193
-msgid "poke, prod or do other things to somebody"
-msgstr "szturchać, zaczepić lub robić inne rzeczy"
-
-#: mod/poke.php:194
-msgid "Recipient"
-msgstr "Odbiorca"
-
-#: mod/poke.php:195
-msgid "Choose what you wish to do to recipient"
-msgstr "Wybierz, co chcesz zrobić"
-
-#: mod/poke.php:198
-msgid "Make this post private"
-msgstr "Ustaw ten post jako prywatny"
-
-#: mod/probe.php:13 mod/search.php:98 mod/search.php:104
-#: mod/viewcontacts.php:45 mod/webfinger.php:16 mod/photos.php:932
-#: mod/videos.php:199 mod/directory.php:42 mod/community.php:27
-#: mod/dfrn_request.php:602 mod/display.php:203
-msgid "Public access denied."
-msgstr "Publiczny dostęp zabroniony"
-
-#: mod/probe.php:14 mod/webfinger.php:17
-msgid "Only logged in users are permitted to perform a probing."
-msgstr "Tylko zalogowani użytkownicy mogą wykonywać sondowanie."
-
-#: mod/profperm.php:28 mod/group.php:83 index.php:435
-msgid "Permission denied"
-msgstr "Odmowa dostępu"
-
-#: mod/profperm.php:34 mod/profperm.php:65
-msgid "Invalid profile identifier."
-msgstr "Nieprawidłowa nazwa użytkownika."
-
-#: mod/profperm.php:111
-msgid "Profile Visibility Editor"
-msgstr "Ustawienia widoczności profilu"
-
-#: mod/profperm.php:115 mod/group.php:265
-msgid "Click on a contact to add or remove."
-msgstr "Kliknij na kontakt w celu dodania lub usunięcia."
-
-#: mod/profperm.php:124
-msgid "Visible To"
-msgstr "Widoczne dla"
-
-#: mod/profperm.php:140
-msgid "All Contacts (with secure profile access)"
-msgstr "Wszystkie kontakty (z bezpiecznym dostępem do profilu)"
-
-#: mod/regmod.php:68
-msgid "Account approved."
-msgstr "Konto zatwierdzone."
-
-#: mod/regmod.php:93
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Rejestracja odwołana dla %s"
-
-#: mod/regmod.php:102
-msgid "Please login."
-msgstr "Proszę się zalogować."
-
-#: mod/search.php:37 mod/network.php:194
-msgid "Remove term"
-msgstr "Usuń wpis"
-
-#: mod/search.php:46 mod/network.php:201 src/Content/Feature.php:100
-msgid "Saved Searches"
-msgstr "Zapisywanie wyszukiwania"
-
-#: mod/search.php:105
-msgid "Only logged in users are permitted to perform a search."
-msgstr "Tylko zalogowani użytkownicy mogą wyszukiwać."
-
-#: mod/search.php:129
-msgid "Too Many Requests"
-msgstr "Zbyt dużo próśb"
-
-#: mod/search.php:130
-msgid "Only one search per minute is permitted for not logged in users."
-msgstr "Dla niezalogowanych użytkowników dozwolone jest tylko jedno wyszukiwanie na minutę."
-
-#: mod/search.php:228 mod/community.php:141
-msgid "No results."
-msgstr "Brak wyników."
-
-#: mod/search.php:234
-#, php-format
-msgid "Items tagged with: %s"
-msgstr "Przedmioty oznaczone tagiem: %s"
-
-#: mod/search.php:236 mod/contacts.php:819
-#, php-format
-msgid "Results for: %s"
-msgstr "Wyniki dla: %s"
-
-#: mod/subthread.php:113
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$skolejny %2$s %3$s "
-
-#: mod/tagrm.php:47
-msgid "Tag removed"
-msgstr "Tag usunięty"
-
-#: mod/tagrm.php:85
-msgid "Remove Item Tag"
-msgstr "Usuń pozycję Tag"
-
-#: mod/tagrm.php:87
-msgid "Select a tag to remove: "
-msgstr "Wybierz tag do usunięcia"
-
-#: mod/tagrm.php:98 mod/delegate.php:177
-msgid "Remove"
-msgstr "Usuń"
-
-#: mod/uexport.php:44
-msgid "Export account"
-msgstr "Eksportuj konto"
-
-#: 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 "Eksportuj informacje o swoim koncie i kontaktach. Użyj tego do utworzenia kopii zapasowej konta i/lub przeniesienia go na inny serwer."
-
-#: mod/uexport.php:45
-msgid "Export all"
-msgstr "Eksportuj wszystko"
-
-#: 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 "Wyeksportuj informacje o koncie, kontaktach i wszystkie swoje pozycje jako json. Może to być bardzo duży plik i może zająć dużo czasu. Użyj tej opcji, aby utworzyć pełną kopię zapasową swojego konta (zdjęcia nie są eksportowane)"
-
-#: mod/uexport.php:52 mod/settings.php:108
-msgid "Export personal data"
-msgstr "Eksportuje dane personalne"
-
-#: mod/viewcontacts.php:87
-msgid "No contacts."
-msgstr "brak kontaktów"
-
-#: mod/viewsrc.php:12 mod/community.php:34
-msgid "Access denied."
-msgstr "Brak dostępu"
-
-#: mod/wall_upload.php:186 mod/photos.php:763 mod/photos.php:766
-#: mod/photos.php:795 mod/profile_photo.php:153
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "Obraz przekracza limit rozmiaru wynoszący %s"
-
-#: mod/wall_upload.php:200 mod/photos.php:818 mod/profile_photo.php:162
-msgid "Unable to process image."
-msgstr "Przetwarzanie obrazu nie powiodło się."
-
-#: 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 "Tablica zdjęć"
-
-#: mod/wall_upload.php:239 mod/photos.php:847 mod/profile_photo.php:307
-msgid "Image upload failed."
-msgstr "Przesyłanie obrazu nie powiodło się"
-
-#: mod/wallmessage.php:49 mod/wallmessage.php:112
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
-msgstr "Dzienny limit wiadomości %s został przekroczony. Wiadomość została odrzucona."
-
-#: mod/wallmessage.php:57 mod/message.php:73
-msgid "No recipient selected."
-msgstr "Nie wybrano odbiorcy."
-
-#: mod/wallmessage.php:60
-msgid "Unable to check your home location."
-msgstr "Nie można sprawdzić twojej lokalizacji."
-
-#: mod/wallmessage.php:63 mod/message.php:80
-msgid "Message could not be sent."
-msgstr "Wiadomość nie może zostać wysłana"
-
-#: mod/wallmessage.php:66 mod/message.php:83
-msgid "Message collection failure."
-msgstr "Błąd zbierania komunikatów."
-
-#: mod/wallmessage.php:69 mod/message.php:86
-msgid "Message sent."
-msgstr "Wysłano."
-
-#: mod/wallmessage.php:86 mod/wallmessage.php:95
-msgid "No recipient."
-msgstr "Brak odbiorcy."
-
-#: mod/wallmessage.php:132 mod/message.php:231
-msgid "Send Private Message"
-msgstr "Wyślij prywatną wiadomość"
-
-#: 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 "Jeśli chcesz %s odpowiedzieć, sprawdź, czy ustawienia prywatności w Twojej witrynie zezwalają na prywatne wiadomości od nieznanych nadawców."
-
-#: mod/wallmessage.php:134 mod/message.php:232 mod/message.php:402
-msgid "To:"
-msgstr "Do:"
-
-#: mod/wallmessage.php:135 mod/message.php:236 mod/message.php:404
-msgid "Subject:"
-msgstr "Temat:"
-
-#: mod/wallmessage.php:141 mod/invite.php:149 mod/message.php:240
-#: mod/message.php:407
-msgid "Your message:"
-msgstr "Twoja wiadomość:"
-
-#: mod/bookmarklet.php:23 src/Content/Nav.php:114 src/Module/Login.php:313
-msgid "Login"
-msgstr "Zaloguj się"
-
-#: mod/bookmarklet.php:51
-msgid "The post was created"
-msgstr "Post został utworzony"
-
-#: mod/editpost.php:25 mod/editpost.php:35
-msgid "Item not found"
-msgstr "Nie znaleziono elementu"
-
-#: mod/editpost.php:42
-msgid "Edit post"
-msgstr "Edytuj post"
-
-#: mod/editpost.php:134 src/Core/ACL.php:315
-msgid "CC: email addresses"
-msgstr "CC: adresy e-mail"
-
-#: mod/editpost.php:141 src/Core/ACL.php:316
-msgid "Example: bob@example.com, mary@example.com"
-msgstr "Przykład: bob@example.com, mary@example.com"
-
-#: mod/fsuggest.php:30 mod/fsuggest.php:96 mod/crepair.php:110
-#: mod/dfrn_confirm.php:129
-msgid "Contact not found."
-msgstr "Kontakt nie znaleziony"
-
-#: mod/fsuggest.php:72
-msgid "Friend suggestion sent."
-msgstr "Wysłana propozycja dodania do znajomych."
-
-#: mod/fsuggest.php:101
-msgid "Suggest Friends"
-msgstr "Zaproponuj znajomych"
-
-#: mod/fsuggest.php:103
-#, php-format
-msgid "Suggest a friend for %s"
-msgstr "Zaproponuj znajomych dla %s"
-
-#: mod/notes.php:52 src/Model/Profile.php:944
-msgid "Personal Notes"
-msgstr "Notatki"
-
-#: mod/photos.php:108 src/Model/Profile.php:905
-msgid "Photo Albums"
-msgstr "Albumy zdjęć"
-
-#: mod/photos.php:109 mod/photos.php:1713
-msgid "Recent Photos"
-msgstr "Ostatnio dodane zdjęcia"
-
-#: mod/photos.php:112 mod/photos.php:1210 mod/photos.php:1715
-msgid "Upload New Photos"
-msgstr "Wyślij nowe zdjęcie"
-
-#: mod/photos.php:126 mod/settings.php:51
-msgid "everybody"
-msgstr "wszyscy"
-
-#: mod/photos.php:184
-msgid "Contact information unavailable"
-msgstr "Informacje kontaktowe są niedostępne."
-
-#: mod/photos.php:204
-msgid "Album not found."
-msgstr "Album nie znaleziony"
-
-#: mod/photos.php:234 mod/photos.php:245 mod/photos.php:1161
-msgid "Delete Album"
-msgstr "Usuń album"
-
-#: mod/photos.php:243
-msgid "Do you really want to delete this photo album and all its photos?"
-msgstr "Czy na pewno chcesz usunąć ten album i wszystkie zdjęcia z tego albumu?"
-
-#: mod/photos.php:310 mod/photos.php:321 mod/photos.php:1446
-msgid "Delete Photo"
-msgstr "Usuń zdjęcie"
-
-#: mod/photos.php:319
-msgid "Do you really want to delete this photo?"
-msgstr "Czy na pewno chcesz usunąć to zdjęcie ?"
-
-#: mod/photos.php:667
-msgid "a photo"
-msgstr "zdjęcie"
-
-#: mod/photos.php:667
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
-msgstr "%1$szostał oznaczony tagiem %2$s przez %3$s"
-
-#: mod/photos.php:769
-msgid "Image upload didn't complete, please try again"
-msgstr "Przesyłanie zdjęć nie zostało zakończone, spróbuj ponownie"
-
-#: mod/photos.php:772
-msgid "Image file is missing"
-msgstr "Brak pliku obrazu"
-
-#: mod/photos.php:777
-msgid ""
-"Server can't accept new file upload at this time, please contact your "
-"administrator"
-msgstr "Serwer nie może teraz przyjąć nowego pliku, skontaktuj się z administratorem"
-
-#: mod/photos.php:803
-msgid "Image file is empty."
-msgstr "Plik obrazka jest pusty."
-
-#: mod/photos.php:940
-msgid "No photos selected"
-msgstr "Nie zaznaczono zdjęć"
-
-#: mod/photos.php:1036 mod/videos.php:309
-msgid "Access to this item is restricted."
-msgstr "Dostęp do tego obiektu jest ograniczony."
-
-#: mod/photos.php:1090
-msgid "Upload Photos"
-msgstr "Prześlij zdjęcia"
-
-#: mod/photos.php:1094 mod/photos.php:1156
-msgid "New album name: "
-msgstr "Nazwa nowego albumu:"
-
-#: mod/photos.php:1095
-msgid "or existing album name: "
-msgstr "lub istniejąca nazwa albumu:"
-
-#: mod/photos.php:1096
-msgid "Do not show a status post for this upload"
-msgstr "Nie pokazuj statusu postów dla tego wysłania"
-
-#: mod/photos.php:1098 mod/photos.php:1441 mod/events.php:533
-#: src/Core/ACL.php:318
-msgid "Permissions"
-msgstr "Uprawnienia"
-
-#: mod/photos.php:1106 mod/photos.php:1449 mod/settings.php:1218
-msgid "Show to Groups"
-msgstr "Pokaż Grupy"
-
-#: mod/photos.php:1107 mod/photos.php:1450 mod/settings.php:1219
-msgid "Show to Contacts"
-msgstr "Pokaż kontakty"
-
-#: mod/photos.php:1167
-msgid "Edit Album"
-msgstr "Edytuj album"
-
-#: mod/photos.php:1172
-msgid "Show Newest First"
-msgstr "Najpierw pokaż najnowsze"
-
-#: mod/photos.php:1174
-msgid "Show Oldest First"
-msgstr "Najpierw pokaż najstarsze"
-
-#: mod/photos.php:1195 mod/photos.php:1698
-msgid "View Photo"
-msgstr "Zobacz zdjęcie"
-
-#: mod/photos.php:1236
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Odmowa dostępu. Dostęp do tych danych może być ograniczony."
-
-#: mod/photos.php:1238
-msgid "Photo not available"
-msgstr "Zdjęcie niedostępne"
-
-#: mod/photos.php:1301
-msgid "View photo"
-msgstr "Zobacz zdjęcie"
-
-#: mod/photos.php:1301
-msgid "Edit photo"
-msgstr "Edytuj zdjęcie"
-
-#: mod/photos.php:1302
-msgid "Use as profile photo"
-msgstr "Ustaw jako zdjęcie profilowe"
-
-#: mod/photos.php:1308 src/Object/Post.php:149
-msgid "Private Message"
-msgstr "Wiadomość prywatna"
-
-#: mod/photos.php:1327
-msgid "View Full Size"
-msgstr "Zobacz w pełnym rozmiarze"
-
-#: mod/photos.php:1414
-msgid "Tags: "
-msgstr "Tagi:"
-
-#: mod/photos.php:1417
-msgid "[Remove any tag]"
-msgstr "[Usuń dowolny tag]"
-
-#: mod/photos.php:1432
-msgid "New album name"
-msgstr "Nazwa nowego albumu"
-
-#: mod/photos.php:1433
-msgid "Caption"
-msgstr "Zawartość"
-
-#: mod/photos.php:1434
-msgid "Add a Tag"
-msgstr "Dodaj tag"
-
-#: mod/photos.php:1434
-msgid ""
-"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr "Przykładowo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-
-#: mod/photos.php:1435
-msgid "Do not rotate"
-msgstr "Nie obracaj"
-
-#: mod/photos.php:1436
-msgid "Rotate CW (right)"
-msgstr "Obróć CW (w prawo)"
-
-#: mod/photos.php:1437
-msgid "Rotate CCW (left)"
-msgstr "Obróć CCW (w lewo)"
-
-#: mod/photos.php:1471 src/Object/Post.php:304
-msgid "I like this (toggle)"
-msgstr "Lubię to (zmień)"
-
-#: mod/photos.php:1472 src/Object/Post.php:305
-msgid "I don't like this (toggle)"
-msgstr "Nie lubię tego (zmień)"
-
-#: mod/photos.php:1488 mod/photos.php:1527 mod/photos.php:1600
-#: mod/contacts.php:953 src/Object/Post.php:801
-msgid "This is you"
-msgstr "To jesteś ty"
-
-#: mod/photos.php:1490 mod/photos.php:1529 mod/photos.php:1602
-#: src/Object/Post.php:407 src/Object/Post.php:803
-msgid "Comment"
-msgstr "Komentarz"
-
-#: mod/photos.php:1634
-msgid "Map"
-msgstr "Mapa"
-
-#: mod/photos.php:1704 mod/videos.php:387
-msgid "View Album"
-msgstr "Zobacz album"
-
-#: mod/videos.php:139
-msgid "Do you really want to delete this video?"
-msgstr "Czy na pewno chcesz usunąć ten film wideo?"
-
-#: mod/videos.php:144
-msgid "Delete Video"
-msgstr "Usuń wideo"
-
-#: mod/videos.php:207
-msgid "No videos selected"
-msgstr "Nie zaznaczono filmów"
-
-#: mod/videos.php:396
-msgid "Recent Videos"
-msgstr "Ostatnio dodane filmy"
-
-#: mod/videos.php:398
-msgid "Upload New Videos"
-msgstr "Wstaw nowe filmy"
-
-#: mod/cal.php:142 mod/display.php:316 mod/profile.php:174
-msgid "Access to this profile has been restricted."
-msgstr "Dostęp do tego profilu został ograniczony."
-
-#: 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 "Wydarzenia"
-
-#: mod/cal.php:275 mod/events.php:392
-msgid "View"
-msgstr "Widok"
-
-#: mod/cal.php:276 mod/events.php:394
-msgid "Previous"
-msgstr "Poprzedni"
-
-#: mod/cal.php:277 mod/events.php:395 mod/install.php:156
-msgid "Next"
-msgstr "Następny"
-
-#: mod/cal.php:280 mod/events.php:400 src/Model/Event.php:412
-msgid "today"
-msgstr "dzisiaj"
-
-#: mod/cal.php:281 mod/events.php:401 src/Util/Temporal.php:304
-#: src/Model/Event.php:413
-msgid "month"
-msgstr "miesiąc"
-
-#: mod/cal.php:282 mod/events.php:402 src/Util/Temporal.php:305
-#: src/Model/Event.php:414
-msgid "week"
-msgstr "tydzień"
-
-#: mod/cal.php:283 mod/events.php:403 src/Util/Temporal.php:306
-#: src/Model/Event.php:415
-msgid "day"
-msgstr "dzień"
-
-#: mod/cal.php:284 mod/events.php:404
-msgid "list"
-msgstr "lista"
-
-#: mod/cal.php:297 src/Core/Console/NewPassword.php:73 src/Model/User.php:214
-msgid "User not found"
-msgstr "Użytkownik nie znaleziony"
-
-#: mod/cal.php:313
-msgid "This calendar format is not supported"
-msgstr "Ten format kalendarza nie jest obsługiwany"
-
-#: mod/cal.php:315
-msgid "No exportable data found"
-msgstr "Nie znaleziono danych do eksportu"
-
-#: mod/cal.php:332
-msgid "calendar"
-msgstr "kalendarz"
-
-#: mod/contacts.php:71 mod/notifications.php:259 src/Model/Profile.php:516
-msgid "Network:"
-msgstr "Sieć:"
-
-#: mod/contacts.php:157
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: mod/contacts.php:184 mod/contacts.php:400
-msgid "Could not access contact record."
-msgstr "Nie można uzyskać dostępu do rejestru kontaktów."
-
-#: mod/contacts.php:194
-msgid "Could not locate selected profile."
-msgstr "Nie można znaleźć wybranego profilu."
-
-#: mod/contacts.php:228
-msgid "Contact updated."
-msgstr "Kontakt zaktualizowany"
-
-#: mod/contacts.php:230 mod/dfrn_request.php:415
-msgid "Failed to update contact record."
-msgstr "Aktualizacja rekordu kontaktu nie powiodła się."
-
-#: mod/contacts.php:421
-msgid "Contact has been blocked"
-msgstr "Kontakt został zablokowany"
-
-#: mod/contacts.php:421
-msgid "Contact has been unblocked"
-msgstr "Kontakt został odblokowany"
-
-#: mod/contacts.php:432
-msgid "Contact has been ignored"
-msgstr "Kontakt jest ignorowany"
-
-#: mod/contacts.php:432
-msgid "Contact has been unignored"
-msgstr "Kontakt nie jest ignorowany"
-
-#: mod/contacts.php:443
-msgid "Contact has been archived"
-msgstr "Kontakt został zarchiwizowany"
-
-#: mod/contacts.php:443
-msgid "Contact has been unarchived"
-msgstr "Kontakt został przywrócony"
-
-#: mod/contacts.php:467
-msgid "Drop contact"
-msgstr "Usuń kontakt"
-
-#: mod/contacts.php:470 mod/contacts.php:823
-msgid "Do you really want to delete this contact?"
-msgstr "Czy na pewno chcesz usunąć ten kontakt?"
-
-#: mod/contacts.php:488
-msgid "Contact has been removed."
-msgstr "Kontakt został usunięty."
-
-#: mod/contacts.php:519
-#, php-format
-msgid "You are mutual friends with %s"
-msgstr "Jesteś już znajomym z %s"
-
-#: mod/contacts.php:523
-#, php-format
-msgid "You are sharing with %s"
-msgstr "Współdzielisz z %s"
-
-#: mod/contacts.php:527
-#, php-format
-msgid "%s is sharing with you"
-msgstr "%s współdzieli z tobą"
-
-#: mod/contacts.php:547
-msgid "Private communications are not available for this contact."
-msgstr "Prywatna rozmowa jest niemożliwa dla tego kontaktu"
-
-#: mod/contacts.php:549
-msgid "Never"
-msgstr "Nigdy"
-
-#: mod/contacts.php:552
-msgid "(Update was successful)"
-msgstr "(Aktualizacja przebiegła pomyślnie)"
-
-#: mod/contacts.php:552
-msgid "(Update was not successful)"
-msgstr "(Aktualizacja nie powiodła się)"
-
-#: mod/contacts.php:554 mod/contacts.php:992
-msgid "Suggest friends"
-msgstr "Osoby, które możesz znać"
-
-#: mod/contacts.php:558
-#, php-format
-msgid "Network type: %s"
-msgstr "Typ sieci: %s"
-
-#: mod/contacts.php:563
-msgid "Communications lost with this contact!"
-msgstr "Utracono komunikację z tym kontaktem!"
-
-#: mod/contacts.php:569
-msgid "Fetch further information for feeds"
-msgstr "Pobierz dalsze informacje dla kanałów"
-
-#: 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 "Pobieranie informacji, takich jak zdjęcia podglądu, tytuł i zwiastun z elementu kanału. Możesz to aktywować, jeśli plik danych nie zawiera dużo tekstu. Słowa kluczowe są pobierane z nagłówka meta w elemencie kanału i są publikowane jako znaczniki haszowania."
-
-#: mod/contacts.php:572 mod/admin.php:1288 mod/admin.php:1450
-#: mod/admin.php:1460
-msgid "Disabled"
-msgstr "Wyłączony"
-
-#: mod/contacts.php:573
-msgid "Fetch information"
-msgstr "Pobierz informacje"
-
-#: mod/contacts.php:574
-msgid "Fetch keywords"
-msgstr "Pobierz słowa kluczowe"
-
-#: mod/contacts.php:575
-msgid "Fetch information and keywords"
-msgstr "Pobierz informacje i słowa kluczowe"
-
-#: mod/contacts.php:599 mod/unfollow.php:100
-msgid "Disconnect/Unfollow"
-msgstr "Rozłącz/Nie obserwuj"
-
-#: mod/contacts.php:608
-msgid "Contact"
-msgstr "Kontakt"
-
-#: mod/contacts.php:611
-msgid "Profile Visibility"
-msgstr "Widoczność profilu"
-
-#: mod/contacts.php:612
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
-msgstr "Wybierz profil, który chcesz bezpiecznie wyświetlić %s"
-
-#: mod/contacts.php:613
-msgid "Contact Information / Notes"
-msgstr "Informacje kontaktowe/Notatki"
-
-#: mod/contacts.php:614
-msgid "Their personal note"
-msgstr "Ich osobista uwaga"
-
-#: mod/contacts.php:616
-msgid "Edit contact notes"
-msgstr "Edytuj notatki kontaktu"
-
-#: mod/contacts.php:620
-msgid "Block/Unblock contact"
-msgstr "Zablokuj/odblokuj kontakt"
-
-#: mod/contacts.php:621
-msgid "Ignore contact"
-msgstr "Ignoruj kontakt"
-
-#: mod/contacts.php:622
-msgid "Repair URL settings"
-msgstr "Napraw ustawienia adresu"
-
-#: mod/contacts.php:623
-msgid "View conversations"
-msgstr "Wyświetl rozmowy"
-
-#: mod/contacts.php:628
-msgid "Last update:"
-msgstr "Ostatnia aktualizacja:"
-
-#: mod/contacts.php:630
-msgid "Update public posts"
-msgstr "Zaktualizuj publiczne posty"
-
-#: mod/contacts.php:632 mod/contacts.php:1002
-msgid "Update now"
-msgstr "Aktualizuj teraz"
-
-#: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:489 mod/admin.php:1829
-msgid "Unblock"
-msgstr "Odblokuj"
-
-#: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:488 mod/admin.php:1828
-msgid "Block"
-msgstr "Zablokuj"
-
-#: mod/contacts.php:638 mod/contacts.php:828 mod/contacts.php:1019
-msgid "Unignore"
-msgstr "Odblokuj"
-
-#: 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 "Ignoruj"
-
-#: mod/contacts.php:642
-msgid "Currently blocked"
-msgstr "Obecnie zablokowany"
-
-#: mod/contacts.php:643
-msgid "Currently ignored"
-msgstr "Obecnie zignorowany"
-
-#: mod/contacts.php:644
-msgid "Currently archived"
-msgstr "Obecnie zarchiwizowany"
-
-#: mod/contacts.php:645
-msgid "Awaiting connection acknowledge"
-msgstr "Oczekiwanie na potwierdzenie połączenia"
-
-#: mod/contacts.php:646 mod/notifications.php:175 mod/notifications.php:253
-msgid "Hide this contact from others"
-msgstr "Ukryj ten kontakt przed innymi"
-
-#: mod/contacts.php:646
-msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
-msgstr "Odpowiedzi/kliknięcia \"lubię to\" do twoich publicznych postów nadal <strong>mogą</strong> być widoczne"
-
-#: mod/contacts.php:647
-msgid "Notification for new posts"
-msgstr "Powiadomienie o nowych postach"
-
-#: mod/contacts.php:647
-msgid "Send a notification of every new post of this contact"
-msgstr "Wyślij powiadomienie o każdym nowym poście tego kontaktu"
-
-#: mod/contacts.php:650
-msgid "Blacklisted keywords"
-msgstr "Słowa kluczowe na czarnej liście"
-
-#: 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 "Rozdzielana przecinkami lista słów kluczowych, które nie powinny zostać przekonwertowane na hashtagi, gdy wybrana jest opcja 'Pobierz informacje i słowa kluczowe'"
-
-#: 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 "Adres URL profilu"
-
-#: mod/contacts.php:660 mod/events.php:518 mod/directory.php:148
-#: 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 "Lokalizacja"
-
-#: 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 "O:"
-
-#: mod/contacts.php:666 mod/follow.php:174 mod/notifications.php:250
-#: src/Model/Profile.php:792
-msgid "Tags:"
-msgstr "Tagi:"
-
-#: mod/contacts.php:667
-msgid "Actions"
-msgstr "Akcja"
-
-#: 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 "Status"
-
-#: mod/contacts.php:670
-msgid "Contact Settings"
-msgstr "Ustawienia kontaktów"
-
-#: mod/contacts.php:711
-msgid "Suggestions"
-msgstr "Sugestie"
-
-#: mod/contacts.php:714
-msgid "Suggest potential friends"
-msgstr "Sugerowani znajomi"
-
-#: mod/contacts.php:719 mod/group.php:215
-msgid "All Contacts"
-msgstr "Wszystkie kontakty"
-
-#: mod/contacts.php:722
-msgid "Show all contacts"
-msgstr "Pokaż wszystkie kontakty"
-
-#: mod/contacts.php:727
-msgid "Unblocked"
-msgstr "Odblokowany"
-
-#: mod/contacts.php:730
-msgid "Only show unblocked contacts"
-msgstr "Pokaż tylko odblokowane kontakty"
-
-#: mod/contacts.php:735
-msgid "Blocked"
-msgstr "Zablokowany"
-
-#: mod/contacts.php:738
-msgid "Only show blocked contacts"
-msgstr "Pokaż tylko zablokowane kontakty"
-
-#: mod/contacts.php:743
-msgid "Ignored"
-msgstr "Zignorowany"
-
-#: mod/contacts.php:746
-msgid "Only show ignored contacts"
-msgstr "Pokaż tylko ignorowane kontakty"
-
-#: mod/contacts.php:751
-msgid "Archived"
-msgstr "Zarchiwizowane"
-
-#: mod/contacts.php:754
-msgid "Only show archived contacts"
-msgstr "Pokaż tylko zarchiwizowane kontakty"
-
-#: mod/contacts.php:759
-msgid "Hidden"
-msgstr "Ukryty"
-
-#: mod/contacts.php:762
-msgid "Only show hidden contacts"
-msgstr "Pokaż tylko ukryte kontakty"
-
-#: mod/contacts.php:818
-msgid "Search your contacts"
-msgstr "Wyszukaj w kontaktach"
-
-#: mod/contacts.php:820 mod/directory.php:209 view/theme/vier/theme.php:203
-#: src/Content/Widget.php:63
-msgid "Find"
-msgstr "Znajdź"
-
-#: mod/contacts.php:826 mod/settings.php:169 mod/settings.php:695
-msgid "Update"
-msgstr "Zaktualizuj"
-
-#: mod/contacts.php:829 mod/contacts.php:1027
-msgid "Archive"
-msgstr "Archiwum"
-
-#: mod/contacts.php:829 mod/contacts.php:1027
-msgid "Unarchive"
-msgstr "Przywróć z archiwum"
-
-#: mod/contacts.php:832
-msgid "Batch Actions"
-msgstr "Akcje wsadowe"
-
-#: mod/contacts.php:858 mod/unfollow.php:132 mod/follow.php:186
-#: src/Model/Profile.php:889
-msgid "Status Messages and Posts"
-msgstr "Status wiadomości i postów"
-
-#: mod/contacts.php:866 src/Model/Profile.php:897
-msgid "Profile Details"
-msgstr "Szczegóły profilu"
-
-#: mod/contacts.php:878
-msgid "View all contacts"
-msgstr "Zobacz wszystkie kontakty"
-
-#: mod/contacts.php:889
-msgid "View all common friends"
-msgstr "Zobacz wszystkich popularnych znajomych"
-
-#: mod/contacts.php:895 mod/events.php:532 mod/admin.php:1363
-#: src/Model/Profile.php:863
-msgid "Advanced"
-msgstr "Zaawansowany"
-
-#: mod/contacts.php:898
-msgid "Advanced Contact Settings"
-msgstr "Zaawansowane ustawienia kontaktów"
-
-#: mod/contacts.php:930
-msgid "Mutual Friendship"
-msgstr "Wzajemna przyjaźń"
-
-#: mod/contacts.php:934
-msgid "is a fan of yours"
-msgstr "jest twoim fanem"
-
-#: mod/contacts.php:938
-msgid "you are a fan of"
-msgstr "jesteś fanem"
-
-#: mod/contacts.php:1013
-msgid "Toggle Blocked status"
-msgstr "Przełącz na Zablokowany"
-
-#: mod/contacts.php:1021
-msgid "Toggle Ignored status"
-msgstr "Przełącz ignorowany status"
-
-#: mod/contacts.php:1029
-msgid "Toggle Archive status"
-msgstr "Przełącz status archiwum"
-
-#: mod/contacts.php:1037
-msgid "Delete contact"
-msgstr "Usuń kontakt"
-
-#: mod/delegate.php:37
-msgid "Parent user not found."
-msgstr "Nie znaleziono użytkownika nadrzędnego."
-
-#: mod/delegate.php:144
-msgid "No parent user"
-msgstr "Brak nadrzędnego użytkownika"
-
-#: mod/delegate.php:159
-msgid "Parent Password:"
-msgstr "Hasło nadrzędne:"
-
-#: mod/delegate.php:159
-msgid ""
-"Please enter the password of the parent account to legitimize your request."
-msgstr "Wprowadź hasło konta nadrzędnego, aby legalizować swoje żądanie."
-
-#: mod/delegate.php:164
-msgid "Parent User"
-msgstr "Użytkownik nadrzędny"
-
-#: 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 "Użytkownicy nadrzędni mają pełną kontrolę nad tym kontem, w tym także ustawienia konta. Sprawdź dokładnie, komu przyznasz ten dostęp."
-
-#: mod/delegate.php:168 mod/admin.php:311 mod/admin.php:1358
-#: mod/admin.php:1994 mod/admin.php:2247 mod/admin.php:2321 mod/admin.php:2468
-#: mod/settings.php:669 mod/settings.php:776 mod/settings.php:864
-#: mod/settings.php:953 mod/settings.php:1183
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
-
-#: mod/delegate.php:169 src/Content/Nav.php:205
-msgid "Delegate Page Management"
-msgstr "Deleguj zarządzanie stronami"
-
-#: mod/delegate.php:170
-msgid "Delegates"
-msgstr "Oddeleguj"
-
-#: 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 "Delegaci mogą zarządzać wszystkimi aspektami tego konta/strony, z wyjątkiem podstawowych ustawień konta. Nie przekazuj swojego konta osobistego nikomu, komu nie ufasz całkowicie."
-
-#: mod/delegate.php:173
-msgid "Existing Page Delegates"
-msgstr "Obecni delegaci stron"
-
-#: mod/delegate.php:175
-msgid "Potential Delegates"
-msgstr "Potencjalni delegaci"
-
-#: mod/delegate.php:178
-msgid "Add"
-msgstr "Dodaj"
-
-#: mod/delegate.php:179
-msgid "No entries."
-msgstr "Brak wpisów."
-
-#: mod/events.php:105 mod/events.php:107
-msgid "Event can not end before it has started."
-msgstr "Wydarzenie nie może się zakończyć przed jego rozpoczęciem."
-
-#: mod/events.php:114 mod/events.php:116
-msgid "Event title and start time are required."
-msgstr "Wymagany tytuł wydarzenia i czas rozpoczęcia."
-
-#: mod/events.php:393
-msgid "Create New Event"
-msgstr "Stwórz nowe wydarzenie"
-
-#: mod/events.php:506
-msgid "Event details"
-msgstr "Szczegóły wydarzenia"
-
-#: mod/events.php:507
-msgid "Starting date and Title are required."
-msgstr "Data rozpoczęcia i tytuł są wymagane."
-
-#: mod/events.php:508 mod/events.php:509
-msgid "Event Starts:"
-msgstr "Rozpoczęcie wydarzenia:"
-
-#: mod/events.php:508 mod/events.php:520 mod/profiles.php:607
-msgid "Required"
-msgstr "Wymagany"
-
-#: mod/events.php:510 mod/events.php:526
-msgid "Finish date/time is not known or not relevant"
-msgstr "Data/czas zakończenia nie jest znana lub jest nieistotna"
-
-#: mod/events.php:512 mod/events.php:513
-msgid "Event Finishes:"
-msgstr "Zakończenie wydarzenia:"
-
-#: mod/events.php:514 mod/events.php:527
-msgid "Adjust for viewer timezone"
-msgstr "Dopasuj dla strefy czasowej widza"
-
-#: mod/events.php:516
-msgid "Description:"
-msgstr "Opis:"
-
-#: mod/events.php:520 mod/events.php:522
-msgid "Title:"
-msgstr "Tytuł:"
-
-#: mod/events.php:523 mod/events.php:524
-msgid "Share this event"
-msgstr "Udostępnij te wydarzenie"
-
-#: mod/events.php:531 src/Model/Profile.php:862
-msgid "Basic"
-msgstr "Podstawowy"
-
-#: mod/events.php:552
-msgid "Failed to remove event"
-msgstr "Nie udało się usunąć wydarzenia"
-
-#: mod/events.php:554
-msgid "Event removed"
-msgstr "Wydarzenie zostało usunięte"
-
-#: mod/feedtest.php:20
-msgid "You must be logged in to use this module"
-msgstr "Musisz być zalogowany, aby korzystać z tego modułu"
-
-#: mod/feedtest.php:48
-msgid "Source URL"
-msgstr "Źródłowy adres URL"
-
-#: mod/oexchange.php:30
-msgid "Post successful."
-msgstr "Post dodany pomyślnie"
-
-#: mod/ostatus_subscribe.php:21
-msgid "Subscribing to OStatus contacts"
-msgstr "Subskrybowanie kontaktów OStatus"
-
-#: mod/ostatus_subscribe.php:33
-msgid "No contact provided."
-msgstr "Brak kontaktu."
-
-#: mod/ostatus_subscribe.php:40
-msgid "Couldn't fetch information for contact."
-msgstr "Nie można pobrać informacji o kontakcie."
-
-#: mod/ostatus_subscribe.php:50
-msgid "Couldn't fetch friends for contact."
-msgstr "Nie można pobrać znajomych do kontaktu."
-
-#: mod/ostatus_subscribe.php:78
-msgid "success"
-msgstr "powodzenie"
-
-#: mod/ostatus_subscribe.php:80
-msgid "failed"
-msgstr "nie powiodło się"
-
-#: mod/ostatus_subscribe.php:83 src/Object/Post.php:287
-msgid "ignored"
-msgstr "Ignoruj"
-
-#: mod/profile_photo.php:55
-msgid "Image uploaded but image cropping failed."
-msgstr "Zdjęcie zostało przesłane, ale przycinanie obrazu nie powiodło się."
-
-#: 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 "Redukcja rozmiaru obrazka [%s] nie powiodła się."
-
-#: mod/profile_photo.php:125
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Ponownie załaduj stronę lub wyczyść pamięć podręczną przeglądarki, jeśli nowe zdjęcie nie pojawi się natychmiast."
-
-#: mod/profile_photo.php:134
-msgid "Unable to process image"
-msgstr "Nie udało się przetworzyć obrazu."
-
-#: mod/profile_photo.php:247
-msgid "Upload File:"
-msgstr "Wyślij plik:"
-
-#: mod/profile_photo.php:248
-msgid "Select a profile:"
-msgstr "Wybierz profil:"
-
-#: mod/profile_photo.php:253
-msgid "or"
-msgstr "lub"
-
-#: mod/profile_photo.php:253
-msgid "skip this step"
-msgstr "pomiń ten krok"
-
-#: mod/profile_photo.php:253
-msgid "select a photo from your photo albums"
-msgstr "wybierz zdjęcie z twojego albumu"
-
-#: mod/profile_photo.php:266
-msgid "Crop Image"
-msgstr "Przytnij zdjęcie"
-
-#: mod/profile_photo.php:267
-msgid "Please adjust the image cropping for optimum viewing."
-msgstr "Dostosuj kadrowanie obrazu, aby uzyskać optymalny obraz."
-
-#: mod/profile_photo.php:269
-msgid "Done Editing"
-msgstr "Zakończono edycję"
-
-#: mod/profile_photo.php:305
-msgid "Image uploaded successfully."
-msgstr "Zdjęcie wczytano pomyślnie "
-
-#: mod/unfollow.php:34
-msgid "Contact wasn't found or can't be unfollowed."
-msgstr "Kontakt nie został znaleziony lub nie można go pominąć."
-
-#: mod/unfollow.php:47
-msgid "Contact unfollowed"
-msgstr "Skontaktuj się z obserwowanym"
-
-#: mod/unfollow.php:65 mod/follow.php:62 mod/dfrn_request.php:657
-msgid "Submit Request"
-msgstr "Wyślij zgłoszenie"
-
-#: mod/unfollow.php:73
-msgid "You aren't a friend of this contact."
-msgstr "Nie jesteś przyjacielem tego kontaktu."
-
-#: mod/unfollow.php:79
-msgid "Unfollowing is currently not supported by your network."
-msgstr "Brak obserwowania nie jest obecnie obsługiwany przez twoją sieć."
-
-#: mod/unfollow.php:113 mod/follow.php:157 mod/dfrn_request.php:655
-msgid "Your Identity Address:"
-msgstr "Twój adres tożsamości:"
-
-#: mod/directory.php:151 mod/notifications.php:252 src/Model/Profile.php:416
-#: src/Model/Profile.php:743
-msgid "Gender:"
-msgstr "Płeć:"
-
-#: mod/directory.php:152 src/Model/Profile.php:417 src/Model/Profile.php:767
-msgid "Status:"
-msgstr "Status:"
-
-#: mod/directory.php:153 src/Model/Profile.php:418 src/Model/Profile.php:784
-msgid "Homepage:"
-msgstr "Strona główna:"
-
-#: mod/directory.php:202 view/theme/vier/theme.php:208
-#: src/Content/Widget.php:68
-msgid "Global Directory"
-msgstr "Globalny Katalog"
-
-#: mod/directory.php:204
-msgid "Find on this site"
-msgstr "Znajdź na tej stronie"
-
-#: mod/directory.php:206
-msgid "Results for:"
-msgstr "Wyniki dla:"
-
-#: mod/directory.php:208
-msgid "Site Directory"
-msgstr "Katalog Witryny"
-
-#: mod/directory.php:213
-msgid "No entries (some entries may be hidden)."
-msgstr "Brak odwiedzin (niektóre odwiedziny mogą być ukryte)."
-
-#: mod/dirfind.php:49
-#, php-format
-msgid "People Search - %s"
-msgstr "Szukaj osób - %s"
-
-#: mod/dirfind.php:60
-#, php-format
-msgid "Forum Search - %s"
-msgstr "Przeszukiwanie forum - %s"
-
-#: mod/follow.php:45
-msgid "The contact could not be added."
-msgstr "Nie można dodać kontaktu."
-
-#: mod/follow.php:73
-msgid "You already added this contact."
-msgstr "Już dodałeś ten kontakt."
-
-#: mod/follow.php:83
-msgid "Diaspora support isn't enabled. Contact can't be added."
-msgstr "Obsługa Diaspory nie jest włączona. Kontakt nie może zostać dodany."
-
-#: mod/follow.php:90
-msgid "OStatus support is disabled. Contact can't be added."
-msgstr "Obsługa OStatus jest wyłączona. Kontakt nie może zostać dodany."
-
-#: mod/follow.php:97
-msgid "The network type couldn't be detected. Contact can't be added."
-msgstr "Nie można wykryć typu sieci. Kontakt nie może zostać dodany."
-
-#: mod/follow.php:149 mod/dfrn_request.php:647
-msgid "Please answer the following:"
-msgstr "Proszę odpowiedzieć na następujące pytania:"
-
-#: mod/follow.php:150 mod/dfrn_request.php:648
-#, php-format
-msgid "Does %s know you?"
-msgstr "Czy %s Cię zna?"
-
-#: mod/follow.php:151 mod/dfrn_request.php:649
-msgid "Add a personal note:"
-msgstr "Dodaj osobistą notkę:"
-
-#: mod/lostpass.php:27
+#: mod/lostpass.php:28
 msgid "No valid account found."
 msgstr "Nie znaleziono ważnego konta."
 
-#: mod/lostpass.php:39
+#: mod/lostpass.php:40
 msgid "Password reset request issued. Check your email."
 msgstr "Prośba o zresetowanie hasła została zatwierdzona. Sprawdź swój e-mail."
 
-#: mod/lostpass.php:45
+#: mod/lostpass.php:46
 #, php-format
 msgid ""
 "\n"
@@ -3109,9 +4105,9 @@ msgid ""
 "\n"
 "\t\tYour password will not be changed unless we can verify that you\n"
 "\t\tissued this request."
-msgstr "\n\t\tDrodzy %1$s, \n\t\t\tOtrzymano niedawno prośbę o ''%2$s\" zresetowanie konta \n\t\thasło. Aby potwierdzić tę prośbę, wybierz link weryfikacyjny \n\t\tponiżej lub wklej go na pasek adresu przeglądarki internetowej. \n \n\t\tJeśli NIE poprosiłeś o tę zmianę, NIE wykonuj tego linku \n\t\tpod warunkiem, że zignorujesz i/lub usuniesz ten e-mail, prośba wkrótce wygaśnie. \n \n\t\tTwoje hasło nie zostanie zmienione, chyba że będziemy mogli to potwierdzić \n\t\twydał to żądanie."
+msgstr "\n\t\tSzanowny Użytkowniku %1$s, \n\t\t\tOtrzymano prośbę o ''%2$s\" zresetowanie hasła do konta. \n\t\tAby potwierdzić tę prośbę, kliknij link weryfikacyjny \n\t\tponiżej lub wklej go w pasek adresu przeglądarki internetowej. \n \n\t\tJeśli nie prosisz o tę zmianę, nie klikaj w link.\n\t\tJeśli zignorujesz i/lub usuniesz ten e-mail, prośba wkrótce wygaśnie. \n \n\t\tTwoje hasło nie zostanie zmienione, chyba że będziemy mogli potwierdzić \n\t\tTwoje żądanie."
 
-#: mod/lostpass.php:56
+#: mod/lostpass.php:57
 #, php-format
 msgid ""
 "\n"
@@ -3126,68 +4122,68 @@ msgid ""
 "\n"
 "\t\tSite Location:\t%2$s\n"
 "\t\tLogin Name:\t%3$s"
-msgstr "\nWkrótce skorzystaj z tego linku, aby zweryfikować swoją tożsamość: \n\n\t\t%1$s\n\n\t\tOtrzymasz następnie komunikat uzupełniający zawierający nowe hasło. \n\t\tMożesz zmienić to hasło ze strony ustawień swojego konta po zalogowaniu. \n \n\t\tDane logowania są następujące: \n \nLokalizacja strony: \t%2$s\nNazwa użytkownika:\t%3$s"
+msgstr "\nPostępuj zgodnie z poniższym linkiem, aby zweryfikować swoją tożsamość: \n\n\t\t%1$s\n\n\t\tOtrzymasz następnie komunikat uzupełniający zawierający nowe hasło. \n\t\tMożesz zmienić to hasło ze strony ustawień swojego konta po zalogowaniu. \n \n\t\tDane logowania są następujące: \n \nLokalizacja strony: \t%2$s\nNazwa użytkownika:\t%3$s"
 
-#: mod/lostpass.php:73
+#: mod/lostpass.php:76
 #, php-format
 msgid "Password reset requested at %s"
 msgstr "Prośba o reset hasła na %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 "Prośba nie może być zweryfikowana. (Mogłeś już ją poprzednio wysłać.) Reset hasła nie powiódł się."
 
-#: mod/lostpass.php:102
+#: mod/lostpass.php:105
 msgid "Request has expired, please make a new one."
 msgstr "Żądanie wygasło. Zrób nowe."
 
-#: mod/lostpass.php:117
+#: mod/lostpass.php:120
 msgid "Forgot your Password?"
 msgstr "Zapomniałeś hasła?"
 
-#: 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 "Wpisz swój adres email i wyślij, aby zresetować hasło. Później sprawdź swojego emaila w celu uzyskania dalszych instrukcji."
 
-#: mod/lostpass.php:119 src/Module/Login.php:315
+#: mod/lostpass.php:122 src/Module/Login.php:312
 msgid "Nickname or Email: "
 msgstr "Pseudonim lub Email:"
 
-#: mod/lostpass.php:120
+#: mod/lostpass.php:123
 msgid "Reset"
 msgstr "Zresetuj"
 
-#: mod/lostpass.php:136 src/Module/Login.php:327
+#: mod/lostpass.php:139 src/Module/Login.php:324
 msgid "Password Reset"
 msgstr "Zresetuj hasło"
 
-#: mod/lostpass.php:137
+#: mod/lostpass.php:140
 msgid "Your password has been reset as requested."
 msgstr "Twoje hasło zostało zresetowane zgodnie z żądaniem."
 
-#: mod/lostpass.php:138
+#: mod/lostpass.php:141
 msgid "Your new password is"
 msgstr "Twoje nowe hasło to"
 
-#: mod/lostpass.php:139
+#: mod/lostpass.php:142
 msgid "Save or copy your new password - and then"
 msgstr "Zapisz lub skopiuj nowe hasło - a następnie"
 
-#: mod/lostpass.php:140
+#: mod/lostpass.php:143
 msgid "click here to login"
 msgstr "Kliknij tutaj aby się zalogować"
 
-#: mod/lostpass.php:141
+#: mod/lostpass.php:144
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr "Twoje hasło może być zmienione w <em>Ustawieniach</em> po udanym zalogowaniu."
 
-#: mod/lostpass.php:149
+#: mod/lostpass.php:152
 #, php-format
 msgid ""
 "\n"
@@ -3196,9 +4192,9 @@ msgid ""
 "\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\tDrogi %1$s, \n\t\t\t\tTwoje hasło zostało zmienione zgodnie z życzeniem. Proszę, zachowaj te \n\t\t\tinformacje dotyczące twoich rekordów (lub natychmiast zmień hasło na \n\t\t\tcoś, co zapamiętasz).\n\t\t"
+msgstr "\n\t\t\tSzanowny Użytkowniku %1$s, \n\t\t\t\tTwoje hasło zostało zmienione zgodnie z życzeniem. Proszę, zachowaj te \n\t\t\tinformacje dotyczące twoich rekordów (lub natychmiast zmień hasło na \n\t\t\tcoś, co zapamiętasz).\n\t\t"
 
-#: mod/lostpass.php:155
+#: mod/lostpass.php:158
 #, php-format
 msgid ""
 "\n"
@@ -3212,7 +4208,7 @@ msgid ""
 "\t\t"
 msgstr "\n\t\t\tDane logowania są następujące:\n\n\t\t\tLokalizacja witryny:\t%1$s\n\t\t\tNazwa użytkownika:\t%2$s\n\t\t\tHasło:\t%3$s\n\n\t\t\tMożesz zmienić hasło na stronie ustawień konta po zalogowaniu.\n\t\t"
 
-#: mod/lostpass.php:169
+#: mod/lostpass.php:174
 #, php-format
 msgid "Your password has been changed at %s"
 msgstr "Twoje hasło zostało zmienione na %s"
@@ -3293,846 +4289,165 @@ msgstr "Markdown"
 msgid "HTML"
 msgstr "HTML"
 
-#: mod/community.php:51
-msgid "Community option not available."
-msgstr "Opcja wspólnotowa jest niedostępna."
-
-#: mod/community.php:68
-msgid "Not available."
-msgstr "Niedostępne."
-
-#: mod/community.php:81
-msgid "Local Community"
-msgstr "Lokalna społeczność"
-
-#: mod/community.php:84
-msgid "Posts from local users on this server"
-msgstr "Wpisy od lokalnych użytkowników na tym serwerze"
-
-#: mod/community.php:92
-msgid "Global Community"
-msgstr "Globalna społeczność"
-
-#: mod/community.php:95
-msgid "Posts from users of the whole federated network"
-msgstr "Wpisy od użytkowników całej sieci stowarzyszonej"
-
-#: 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 "Ten strumień społeczności pokazuje wszystkie publiczne posty otrzymane przez ten węzeł. Mogą nie odzwierciedlać opinii użytkowników tego węzła."
-
-#: mod/friendica.php:77
-msgid "This is Friendica, version"
-msgstr "To jest Friendica, wersja"
-
-#: mod/friendica.php:78
-msgid "running at web location"
-msgstr "otwierane na serwerze"
-
-#: mod/friendica.php:82
-msgid ""
-"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
-"about the Friendica project."
-msgstr "Odwiedź stronę <a href=\"https://friendi.ca\">Friendi.ca</a> aby dowiedzieć się więcej o projekcie Friendica."
-
-#: mod/friendica.php:86
-msgid "Bug reports and issues: please visit"
-msgstr "Raporty o błędach i problemy: odwiedź stronę"
-
-#: mod/friendica.php:86
-msgid "the bugtracker at github"
-msgstr "bugtracker na github"
-
-#: mod/friendica.php:89
-msgid "Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"
-msgstr "Sugestie, pochwały itp. - napisz e-mail \"info\" na \"friendi - kropka - ca"
-
-#: mod/friendica.php:103
-msgid "Installed addons/apps:"
-msgstr "Zainstalowane dodatki/aplikacje:"
-
-#: mod/friendica.php:117
-msgid "No installed addons/apps"
-msgstr "Brak zainstalowanych dodatków/aplikacji"
-
-#: mod/friendica.php:122
-#, php-format
-msgid "Read about the <a href=\"%1$s/tos\">Terms of Service</a> of this node."
-msgstr "Przeczytaj o <a href=\"%1$s/tos\">Warunkach świadczenia usług</a> tego węzła."
-
-#: mod/friendica.php:127
-msgid "On this server the following remote servers are blocked."
-msgstr "Na tym serwerze następujące serwery zdalne są blokowane."
-
-#: 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 "Zablokowana domena"
-
-#: mod/friendica.php:128 mod/admin.php:358 mod/admin.php:376
-msgid "Reason for the block"
-msgstr "Powód blokowania"
-
-#: mod/invite.php:33
-msgid "Total invitation limit exceeded."
-msgstr "Przekroczono limit zaproszeń ogółem."
-
-#: mod/invite.php:55
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : Nieprawidłowy adres e-mail."
-
-#: mod/invite.php:87
-msgid "Please join us on Friendica"
-msgstr "Dołącz do nas na Friendica"
-
-#: mod/invite.php:96
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Przekroczono limit zaproszeń. Skontaktuj się z administratorem witryny."
-
-#: mod/invite.php:100
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Nie udało się dostarczyć wiadomości."
-
-#: mod/invite.php:104
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d wiadomość wysłana."
-msgstr[1] "%d wiadomości wysłane."
-msgstr[2] "%d wysłano ."
-msgstr[3] "%d wiadomość wysłano."
-
-#: mod/invite.php:122
-msgid "You have no more invitations available"
-msgstr "Nie masz już dostępnych zaproszeń"
-
-#: 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 "Odwiedź %s listę publicznych witryn, do których możesz dołączyć. Członkowie Friendica na innych stronach mogą łączyć się ze sobą, jak również z członkami wielu innych sieci społecznościowych."
-
-#: mod/invite.php:132
-#, php-format
-msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
-msgstr "Aby zaakceptować to zaproszenie, odwiedź i zarejestruj się %s lub w dowolnej innej publicznej witrynie internetowej 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 "Strony Friendica łączą się ze sobą, tworząc ogromną sieć społecznościową o zwiększonej prywatności, która jest własnością i jest kontrolowana przez jej członków. Mogą również łączyć się z wieloma tradycyjnymi sieciami społecznościowymi. Zobacz %s listę alternatywnych witryn Friendica, do których możesz dołączyć."
-
-#: mod/invite.php:137
-msgid ""
-"Our apologies. This system is not currently configured to connect with other"
-" public sites or invite members."
-msgstr "Przepraszamy. System nie jest obecnie skonfigurowany do łączenia się z innymi publicznymi witrynami lub zapraszania członków."
-
-#: 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 "Strony Friendica łączą się ze sobą, tworząc ogromną sieć społecznościową o zwiększonej prywatności, która jest własnością i jest kontrolowana przez jej członków. Mogą również łączyć się z wieloma tradycyjnymi sieciami społecznościowymi."
-
-#: mod/invite.php:140
-#, php-format
-msgid "To accept this invitation, please visit and register at %s."
-msgstr "Aby zaakceptować to zaproszenie, odwiedź stronę i zarejestruj się na stronie %s."
-
-#: mod/invite.php:147
-msgid "Send invitations"
-msgstr "Wyślij zaproszenie"
-
-#: mod/invite.php:148
-msgid "Enter email addresses, one per line:"
-msgstr "Wprowadź adresy e-mail, po jednym w wierszu:"
-
-#: 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 "Serdecznie zapraszam do przyłączenia się do mnie i innych bliskich znajomych na stronie Friendica - i pomóż nam stworzyć lepszą sieć społecznościową."
-
-#: mod/invite.php:151
-msgid "You will need to supply this invitation code: $invite_code"
-msgstr "Musisz podać ten kod zaproszenia: $invite_code"
-
-#: mod/invite.php:151
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
-msgstr "Po rejestracji połącz się ze mną na stronie mojego profilu pod adresem:"
-
-#: 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 "Aby uzyskać więcej informacji na temat projektu Friendica i dlaczego uważamy, że jest to ważne, odwiedź http://friendi.ca"
-
-#: mod/network.php:202 src/Model/Group.php:413
-msgid "add"
-msgstr "dodaj"
-
-#: 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] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: mod/network.php:550
-msgid "Messages in this group won't be send to these receivers."
-msgstr "Wiadomości z tej grupy nie będą wysyłane do tych odbiorców."
-
-#: mod/network.php:618
-msgid "No such group"
-msgstr "Nie ma takiej grupy"
-
-#: mod/network.php:639 mod/group.php:216
-msgid "Group is empty"
-msgstr "Grupa jest pusta"
-
-#: mod/network.php:643
-#, php-format
-msgid "Group: %s"
-msgstr "Grupa: %s"
-
-#: mod/network.php:669
-msgid "Private messages to this person are at risk of public disclosure."
-msgstr "Prywatne wiadomości do tej osoby mogą zostać publicznie ujawnione "
-
-#: mod/network.php:672
-msgid "Invalid contact."
-msgstr "Nieprawidłowy kontakt."
-
-#: mod/network.php:937
-msgid "Commented Order"
-msgstr "Porządek według komentarzy"
-
-#: mod/network.php:940
-msgid "Sort by Comment Date"
-msgstr "Sortuj według daty komentarza"
-
-#: mod/network.php:945
-msgid "Posted Order"
-msgstr "Porządek według wpisów"
-
-#: mod/network.php:948
-msgid "Sort by Post Date"
-msgstr "Sortuj według daty postów"
-
-#: mod/network.php:956 mod/profiles.php:594
-#: src/Core/NotificationsManager.php:185
-msgid "Personal"
-msgstr "Osobiste"
-
-#: mod/network.php:959
-msgid "Posts that mention or involve you"
-msgstr "Posty, które wspominają lub angażują Ciebie"
-
-#: mod/network.php:967
-msgid "New"
-msgstr "Nowy"
-
-#: mod/network.php:970
-msgid "Activity Stream - by date"
-msgstr "Strumień aktywności - według daty"
-
-#: mod/network.php:978
-msgid "Shared Links"
-msgstr "Udostępnione łącza"
-
-#: mod/network.php:981
-msgid "Interesting Links"
-msgstr "Interesujące linki"
-
-#: mod/network.php:989
-msgid "Starred"
-msgstr "Ulubione"
-
-#: mod/network.php:992
-msgid "Favourite Posts"
-msgstr "Ulubione posty"
-
-#: mod/crepair.php:87
-msgid "Contact settings applied."
-msgstr "Ustawienia kontaktu zaktualizowane."
-
-#: mod/crepair.php:89
-msgid "Contact update failed."
-msgstr "Nie udało się zaktualizować kontaktu."
-
-#: 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>OSTRZEŻENIE: Jest to bardzo zaawansowane</strong> i jeśli wprowadzisz niepoprawne informacje, twoja komunikacja z tym kontaktem może przestać działać."
-
-#: 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 "Jeśli nie jesteś pewien, co zrobić na tej stronie, użyj <strong>teraz</strong> przycisku 'powrót' na swojej przeglądarce."
-
-#: mod/crepair.php:129 mod/crepair.php:131
-msgid "No mirroring"
-msgstr "Bez dublowania"
-
-#: mod/crepair.php:129
-msgid "Mirror as forwarded posting"
-msgstr "Przesłany lustrzany post"
-
-#: mod/crepair.php:129 mod/crepair.php:131
-msgid "Mirror as my own posting"
-msgstr "Lustro mojego własnego komentarza"
-
-#: mod/crepair.php:144
-msgid "Return to contact editor"
-msgstr "Wróć do edytora kontaktów"
-
-#: mod/crepair.php:146
-msgid "Refetch contact data"
-msgstr "Odśwież dane kontaktowe"
-
-#: mod/crepair.php:149
-msgid "Remote Self"
-msgstr "Zdalny Self"
-
-#: mod/crepair.php:152
-msgid "Mirror postings from this contact"
-msgstr "Publikacje lustrzane od tego kontaktu"
-
-#: mod/crepair.php:154
-msgid ""
-"Mark this contact as remote_self, this will cause friendica to repost new "
-"entries from this contact."
-msgstr "Oznacz ten kontakt jako remote_self, spowoduje to, że friendica odeśle nowe wpisy z tego kontaktu."
-
-#: mod/crepair.php:158 mod/admin.php:494 mod/admin.php:1811 mod/admin.php:1822
-#: mod/admin.php:1835 mod/admin.php:1851 mod/settings.php:671
-#: mod/settings.php:697
-msgid "Name"
-msgstr "Nazwa"
-
-#: mod/crepair.php:159
-msgid "Account Nickname"
-msgstr "Nazwa konta"
-
-#: mod/crepair.php:160
-msgid "@Tagname - overrides Name/Nickname"
-msgstr "@Zmienna - zastępuje Imię/Pseudonim"
-
-#: mod/crepair.php:161
-msgid "Account URL"
-msgstr "URL konta"
-
-#: mod/crepair.php:162
-msgid "Friend Request URL"
-msgstr "URL żądajacy znajomości"
-
-#: mod/crepair.php:163
-msgid "Friend Confirm URL"
-msgstr "URL potwierdzający znajomość"
-
-#: mod/crepair.php:164
-msgid "Notification Endpoint URL"
-msgstr "Zgłoszenie Punktu Końcowego URL"
-
-#: mod/crepair.php:165
-msgid "Poll/Feed URL"
-msgstr "Adres Ankiety/RSS"
-
-#: mod/crepair.php:166
-msgid "New photo from this URL"
-msgstr "Nowe zdjęcie z tego adresu URL"
-
-#: mod/dfrn_poll.php:123 mod/dfrn_poll.php:539
-#, php-format
-msgid "%1$s welcomes %2$s"
-msgstr "%1$s witamy %2$s"
-
-#: mod/help.php:48
-msgid "Help:"
-msgstr "Pomoc:"
-
-#: mod/help.php:54 view/theme/vier/theme.php:297 src/Content/Nav.php:134
-msgid "Help"
-msgstr "Pomoc"
-
-#: mod/help.php:63 index.php:317
-msgid "Page not found."
-msgstr "Strona nie znaleziona."
-
-#: mod/install.php:87
-msgid "Friendica Communications Server - Setup"
-msgstr "Friendica Serwer Komunikacyjny - Instalacja"
-
-#: mod/install.php:93
-msgid "Could not connect to database."
-msgstr "Nie można nawiązać połączenia z bazą danych"
-
-#: mod/install.php:97
-msgid "Could not create table."
-msgstr "Nie mogę stworzyć tabeli."
-
-#: mod/install.php:103
-msgid "Your Friendica site database has been installed."
-msgstr "Twoja baza danych witryny Friendica została zainstalowana."
-
-#: mod/install.php:108
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
-msgstr "Może być konieczne zaimportowanie pliku \"database.sql\" ręcznie, używając phpmyadmin lub mysql."
-
-#: mod/install.php:109 mod/install.php:155 mod/install.php:267
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr "Proszę przejrzeć plik \"INSTALL.txt\"."
-
-#: mod/install.php:121
-msgid "Database already in use."
-msgstr "Baza danych jest już w użyciu."
-
-#: mod/install.php:152
-msgid "System check"
-msgstr "Sprawdzanie systemu"
-
-#: mod/install.php:157
-msgid "Check again"
-msgstr "Sprawdź ponownie"
-
-#: mod/install.php:177
-msgid "Database connection"
-msgstr "Połączenie z bazą danych"
-
-#: mod/install.php:178
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
-msgstr "W celu zainstalowania Friendica musimy wiedzieć jak połączyć się z twoją bazą danych."
-
-#: mod/install.php:179
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
-msgstr "Proszę skontaktuj się ze swoim dostawcą usług hostingowych bądź administratorem strony jeśli masz pytania co do tych ustawień ."
-
-#: mod/install.php:180
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
-msgstr "Wymieniona przez Ciebie baza danych powinna już istnieć. Jeżeli nie, utwórz ją przed kontynuacją."
-
-#: mod/install.php:184
-msgid "Database Server Name"
-msgstr "Nazwa serwera bazy danych"
-
-#: mod/install.php:185
-msgid "Database Login Name"
-msgstr "Nazwa użytkownika bazy danych"
-
-#: mod/install.php:186
-msgid "Database Login Password"
-msgstr "Hasło logowania do bazy danych"
-
-#: mod/install.php:186
-msgid "For security reasons the password must not be empty"
-msgstr "Ze względów bezpieczeństwa hasło nie może być puste"
-
-#: mod/install.php:187
-msgid "Database Name"
-msgstr "Nazwa bazy danych"
-
-#: mod/install.php:188 mod/install.php:228
-msgid "Site administrator email address"
-msgstr "Adres e-mail administratora strony"
-
-#: 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 "Adres e-mail konta musi pasować do tego, aby móc korzystać z panelu administracyjnego."
-
-#: mod/install.php:192 mod/install.php:231
-msgid "Please select a default timezone for your website"
-msgstr "Proszę wybrać domyślną strefę czasową dla swojej strony"
-
-#: mod/install.php:218
-msgid "Site settings"
-msgstr "Ustawienia strony"
-
-#: mod/install.php:232
-msgid "System Language:"
-msgstr "Język systemu:"
-
-#: mod/install.php:232
-msgid ""
-"Set the default language for your Friendica installation interface and to "
-"send emails."
-msgstr "Ustaw domyślny język dla interfejsu instalacyjnego Friendica i wysyłaj e-maile."
-
-#: 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 "Konfiguracja bazy danych pliku \".htconfig.php\" nie mogła zostać zapisana. Proszę użyć załączonego tekstu, aby utworzyć folder konfiguracyjny w sieci serwera."
-
-#: mod/install.php:265
-msgid "<h1>What next</h1>"
-msgstr "<h1>Co dalej</h1>"
-
-#: mod/install.php:266
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the "
-"worker."
-msgstr "WAŻNE: Będziesz musiał [ręcznie] ustawić zaplanowane zadanie dla pracownika."
-
-#: 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 "Przejdź do <a href=\"%s/register\">strony rejestracji</a> nowego węzła Friendica i zarejestruj się jako nowy użytkownik. Pamiętaj, aby użyć adresu e-mail wprowadzonego jako e-mail administratora. To pozwoli Ci wejść do panelu administratora witryny."
-
-#: mod/message.php:30 src/Content/Nav.php:199
-msgid "New Message"
-msgstr "Nowa wiadomość"
-
-#: mod/message.php:77
-msgid "Unable to locate contact information."
-msgstr "Nie można znaleźć informacji kontaktowych."
-
-#: mod/message.php:112 view/theme/frio/theme.php:268 src/Content/Nav.php:196
-msgid "Messages"
-msgstr "Wiadomości"
-
-#: mod/message.php:136
-msgid "Do you really want to delete this message?"
-msgstr "Czy na pewno chcesz usunąć tę wiadomość?"
-
-#: mod/message.php:152
-msgid "Message deleted."
-msgstr "Wiadomość usunięta."
-
-#: mod/message.php:166
-msgid "Conversation removed."
-msgstr "Rozmowa usunięta."
-
-#: mod/message.php:272
-msgid "No messages."
-msgstr "Brak wiadomości."
-
-#: mod/message.php:311
-msgid "Message not available."
-msgstr "Wiadomość nie jest dostępna."
-
-#: mod/message.php:378
-msgid "Delete message"
-msgstr "Usuń wiadomość"
-
-#: mod/message.php:380 mod/message.php:481
-msgid "D, d M Y - g:i A"
-msgstr "D, d M R - g:m AM/PM"
-
-#: mod/message.php:395 mod/message.php:478
-msgid "Delete conversation"
-msgstr "Usuń rozmowę"
-
-#: mod/message.php:397
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Brak bezpiecznej komunikacji. <strong>Możesz</strong> odpowiedzieć na stronie profilu nadawcy."
-
-#: mod/message.php:401
-msgid "Send Reply"
-msgstr "Odpowiedz"
-
-#: mod/message.php:452
-#, php-format
-msgid "Unknown sender - %s"
-msgstr "Nieznany nadawca - %s"
-
-#: mod/message.php:454
-#, php-format
-msgid "You and %s"
-msgstr "Ty i %s"
-
-#: mod/message.php:456
-#, php-format
-msgid "%s and You"
-msgstr "%s i ty"
-
-#: mod/message.php:484
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] " %d wiadomość"
-msgstr[1] " %d wiadomości"
-msgstr[2] " %d wiadomości"
-msgstr[3] " %d wiadomości"
-
-#: mod/group.php:36
-msgid "Group created."
-msgstr "Grupa utworzona."
-
-#: mod/group.php:42
-msgid "Could not create group."
-msgstr "Nie mogę stworzyć grupy"
-
-#: mod/group.php:56 mod/group.php:157
-msgid "Group not found."
-msgstr "Nie znaleziono grupy"
-
-#: mod/group.php:70
-msgid "Group name changed."
-msgstr "Nazwa grupy zmieniona"
-
-#: mod/group.php:97
-msgid "Save Group"
-msgstr "Zapisz grupę"
-
-#: mod/group.php:102
-msgid "Create a group of contacts/friends."
-msgstr "Stwórz grupę znajomych."
-
-#: mod/group.php:103 mod/group.php:199 src/Model/Group.php:421
-msgid "Group Name: "
-msgstr "Nazwa grupy: "
-
-#: mod/group.php:127
-msgid "Group removed."
-msgstr "Grupa usunięta."
-
-#: mod/group.php:129
-msgid "Unable to remove group."
-msgstr "Nie można usunąć grupy."
-
-#: mod/group.php:192
-msgid "Delete Group"
-msgstr "Usuń grupę"
-
-#: mod/group.php:198
-msgid "Group Editor"
-msgstr "Edycja grup"
-
-#: mod/group.php:203
-msgid "Edit Group Name"
-msgstr "Edytuj nazwę grupy"
-
-#: mod/group.php:213
-msgid "Members"
-msgstr "Członkowie"
-
-#: mod/group.php:229
-msgid "Remove contact from group"
-msgstr "Usuń kontakt z grupy"
-
-#: mod/group.php:253
-msgid "Add contact to group"
-msgstr "Dodaj kontakt do grupy"
-
-#: mod/openid.php:29
-msgid "OpenID protocol error. No ID returned."
-msgstr "Błąd protokołu OpenID. Nie znaleziono identyfikatora."
-
-#: mod/openid.php:66
-msgid ""
-"Account not found and OpenID registration is not permitted on this site."
-msgstr "Konto nie zostało znalezione, a rejestracja OpenID nie jest dozwolona na tej stronie."
-
-#: mod/openid.php:116 src/Module/Login.php:86 src/Module/Login.php:135
-msgid "Login failed."
-msgstr "Logowanie nieudane."
-
-#: mod/admin.php:107
+#: mod/admin.php:109
 msgid "Theme settings updated."
 msgstr "Zaktualizowano ustawienia motywów."
 
-#: mod/admin.php:180 src/Content/Nav.php:175
+#: mod/admin.php:182 src/Content/Nav.php:175
 msgid "Information"
 msgstr "Informacje"
 
-#: mod/admin.php:181
+#: mod/admin.php:183
 msgid "Overview"
 msgstr "Przegląd"
 
-#: mod/admin.php:182 mod/admin.php:722
+#: mod/admin.php:184 mod/admin.php:723
 msgid "Federation Statistics"
 msgstr "Statystyki Organizacji"
 
-#: mod/admin.php:183
+#: mod/admin.php:185
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: mod/admin.php:184 mod/admin.php:1357
+#: mod/admin.php:186 mod/admin.php:1425
 msgid "Site"
 msgstr "Strona"
 
-#: mod/admin.php:185 mod/admin.php:1289 mod/admin.php:1817 mod/admin.php:1833
+#: mod/admin.php:187 mod/admin.php:1354 mod/admin.php:1896 mod/admin.php:1913
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: mod/admin.php:186 mod/admin.php:1933 mod/admin.php:1993 mod/settings.php:87
-msgid "Addons"
-msgstr "Dodatki"
-
-#: mod/admin.php:187 mod/admin.php:2202 mod/admin.php:2246
+#: mod/admin.php:189 mod/admin.php:2283 mod/admin.php:2327
 msgid "Themes"
 msgstr "Wygląd"
 
-#: mod/admin.php:188 mod/settings.php:65
-msgid "Additional features"
-msgstr "Dodatkowe funkcje"
-
-#: 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 "Warunki usługi"
-
-#: mod/admin.php:190
+#: mod/admin.php:192
 msgid "Database"
 msgstr "Baza danych"
 
-#: mod/admin.php:191
+#: mod/admin.php:193
 msgid "DB updates"
 msgstr "Aktualizacje DB"
 
-#: mod/admin.php:192 mod/admin.php:757
+#: mod/admin.php:194 mod/admin.php:766
 msgid "Inspect Queue"
 msgstr "Sprawdź kolejkę"
 
-#: mod/admin.php:193
+#: mod/admin.php:195
+msgid "Inspect worker Queue"
+msgstr "Sprawdź kolejkę pracowników"
+
+#: mod/admin.php:196
 msgid "Tools"
 msgstr "Narzędzia"
 
-#: mod/admin.php:194
+#: mod/admin.php:197
 msgid "Contact Blocklist"
 msgstr "Lista zablokowanych kontaktów"
 
-#: mod/admin.php:195 mod/admin.php:366
+#: mod/admin.php:198 mod/admin.php:372
 msgid "Server Blocklist"
 msgstr "Lista zablokowanych serwerów"
 
-#: mod/admin.php:196 mod/admin.php:525
+#: mod/admin.php:199 mod/admin.php:531
 msgid "Delete Item"
 msgstr "Usuń przedmiot"
 
-#: mod/admin.php:197 mod/admin.php:198 mod/admin.php:2320
+#: mod/admin.php:200 mod/admin.php:201 mod/admin.php:2402
 msgid "Logs"
 msgstr "Logi"
 
-#: mod/admin.php:199 mod/admin.php:2387
+#: mod/admin.php:202 mod/admin.php:2469
 msgid "View Logs"
 msgstr "Zobacz rejestry"
 
-#: mod/admin.php:201
+#: mod/admin.php:204
 msgid "Diagnostics"
 msgstr "Diagnostyka"
 
-#: mod/admin.php:202
+#: mod/admin.php:205
 msgid "PHP Info"
 msgstr "Informacje o PHP"
 
-#: mod/admin.php:203
+#: mod/admin.php:206
 msgid "probe address"
 msgstr "adres sondy"
 
-#: mod/admin.php:204
+#: mod/admin.php:207
 msgid "check webfinger"
 msgstr "sprawdź webfinger"
 
-#: mod/admin.php:223 src/Content/Nav.php:218
+#: mod/admin.php:226 src/Content/Nav.php:218
 msgid "Admin"
 msgstr "Administator"
 
-#: mod/admin.php:224
+#: mod/admin.php:227
 msgid "Addon Features"
 msgstr "Funkcje dodatkowe"
 
-#: mod/admin.php:225
+#: mod/admin.php:228
 msgid "User registrations waiting for confirmation"
 msgstr "Rejestracje użytkownika czekają na potwierdzenie."
 
-#: mod/admin.php:303 mod/admin.php:365 mod/admin.php:482 mod/admin.php:524
-#: mod/admin.php:721 mod/admin.php:756 mod/admin.php:852 mod/admin.php:1356
-#: mod/admin.php:1816 mod/admin.php:1932 mod/admin.php:1992 mod/admin.php:2201
-#: mod/admin.php:2245 mod/admin.php:2319 mod/admin.php:2386
+#: 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 "Administracja"
 
-#: mod/admin.php:305
+#: mod/admin.php:311
 msgid "Display Terms of Service"
 msgstr "Wyświetl Warunki korzystania z usługi"
 
-#: 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 "Włącz stronę Warunki świadczenia usług. Jeśli ta opcja jest włączona, link do warunków zostanie dodany do formularza rejestracyjnego i strony z informacjami ogólnymi."
 
-#: mod/admin.php:306
+#: mod/admin.php:312
 msgid "Display Privacy Statement"
 msgstr "Wyświetl oświadczenie o prywatności"
 
-#: 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 "Pokaż niektóre informacje dotyczące potrzebnych informacji do obsługi węzła zgodnie np. do <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."
 
-#: mod/admin.php:307
+#: mod/admin.php:313
 msgid "Privacy Statement Preview"
 msgstr "Podgląd oświadczenia o prywatności"
 
-#: mod/admin.php:309
+#: mod/admin.php:315
 msgid "The Terms of Service"
 msgstr "Warunki świadczenia usług"
 
-#: 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 "Wprowadź tutaj Warunki świadczenia usług dla swojego węzła. Możesz użyć BBCode. Nagłówki sekcji powinny być [h2] i poniżej."
 
-#: mod/admin.php:357
+#: mod/admin.php:363
 msgid "The blocked domain"
 msgstr "Zablokowana domena"
 
-#: 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 "Powód zablokowania tej domeny."
 
-#: mod/admin.php:359
+#: mod/admin.php:365
 msgid "Delete domain"
 msgstr "Usuń domenę"
 
-#: mod/admin.php:359
+#: mod/admin.php:365
 msgid "Check to delete this entry from the blocklist"
 msgstr "Zaznacz, aby usunąć ten wpis z listy bloków"
 
-#: 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 "
@@ -4140,218 +4455,241 @@ msgid ""
 "server."
 msgstr "Na tej stronie można zdefiniować czarną listę serwerów ze stowarzyszonej sieci, które nie mogą współdziałać z danym węzłem. Dla wszystkich wprowadzonych domen powinieneś podać powód, dla którego zablokowałeś serwer zdalny."
 
-#: 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 "Lista zablokowanych serwerów zostanie publicznie udostępniona na stronie /friendica, dzięki czemu użytkownicy i osoby badające problemy z komunikacją mogą łatwo znaleźć przyczynę."
 
-#: mod/admin.php:369
+#: mod/admin.php:375
 msgid "Add new entry to block list"
 msgstr "Dodaj nowy wpis do listy bloków"
 
-#: mod/admin.php:370
+#: mod/admin.php:376
 msgid "Server Domain"
 msgstr "Domena serwera"
 
-#: 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 "Domena nowego serwera do dodania do listy bloków. Nie dołączaj protokołu."
 
-#: mod/admin.php:371
+#: mod/admin.php:377
 msgid "Block reason"
 msgstr "Powód zablokowania"
 
-#: mod/admin.php:372
+#: mod/admin.php:378
 msgid "Add Entry"
 msgstr "Dodaj wpis"
 
-#: mod/admin.php:373
+#: mod/admin.php:379
 msgid "Save changes to the blocklist"
 msgstr "Zapisz zmiany w liście zablokowanych"
 
-#: mod/admin.php:374
+#: mod/admin.php:380
 msgid "Current Entries in the Blocklist"
 msgstr "Aktualne wpisy na liście zablokowanych"
 
-#: mod/admin.php:377
+#: mod/admin.php:383
 msgid "Delete entry from blocklist"
 msgstr "Usuń wpis z listy zablokowanych"
 
-#: mod/admin.php:380
+#: mod/admin.php:386
 msgid "Delete entry from blocklist?"
 msgstr "Usunąć wpis z listy zablokowanych?"
 
-#: mod/admin.php:406
+#: mod/admin.php:412
 msgid "Server added to blocklist."
 msgstr "Serwer dodany do listy zablokowanych."
 
-#: mod/admin.php:422
+#: mod/admin.php:428
 msgid "Site blocklist updated."
 msgstr "Zaktualizowano listę bloków witryny."
 
-#: 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 "Kontakt został zablokowany w węźle"
 
-#: 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 "Nie można znaleźć żadnego kontaktu dla tego adresu URL (%s)"
 
-#: mod/admin.php:454
+#: mod/admin.php:460
 #, php-format
 msgid "%s contact unblocked"
 msgid_plural "%s contacts unblocked"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%s kontakt odblokowany"
+msgstr[1] "%s kontakty odblokowane"
+msgstr[2] "%s kontaktów odblokowanych"
+msgstr[3] "%s kontaktów odblokowanych"
 
-#: mod/admin.php:483
+#: mod/admin.php:489
 msgid "Remote Contact Blocklist"
 msgstr "Lista zablokowanych kontaktów zdalnych"
 
-#: 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 "Ta strona pozwala zapobiec wysyłaniu do węzła wiadomości od kontaktu zdalnego."
 
-#: mod/admin.php:485
+#: mod/admin.php:491
 msgid "Block Remote Contact"
 msgstr "Zablokuj kontakt zdalny"
 
-#: mod/admin.php:486 mod/admin.php:1819
+#: mod/admin.php:492 mod/admin.php:1898
 msgid "select all"
 msgstr "Zaznacz wszystko"
 
-#: mod/admin.php:487
+#: mod/admin.php:493
 msgid "select none"
 msgstr "wybierz brak"
 
-#: 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 "Zablokuj"
+
+#: mod/admin.php:495 mod/admin.php:1909 mod/contacts.php:657
+#: mod/contacts.php:849 mod/contacts.php:1105
+msgid "Unblock"
+msgstr "Odblokuj"
+
+#: mod/admin.php:496
 msgid "No remote contact is blocked from this node."
 msgstr "Z tego węzła nie jest blokowany kontakt zdalny."
 
-#: mod/admin.php:492
+#: mod/admin.php:498
 msgid "Blocked Remote Contacts"
 msgstr "Zablokowane kontakty zdalne"
 
-#: mod/admin.php:493
+#: mod/admin.php:499
 msgid "Block New Remote Contact"
 msgstr "Zablokuj nowy kontakt zdalny"
 
-#: mod/admin.php:494
+#: mod/admin.php:500
 msgid "Photo"
 msgstr "Zdjęcie"
 
-#: mod/admin.php:494 mod/profiles.php:394
+#: mod/admin.php:500 mod/profiles.php:391
 msgid "Address"
 msgstr "Adres"
 
-#: mod/admin.php:502
+#: mod/admin.php:508
 #, php-format
 msgid "%s total blocked contact"
 msgid_plural "%s total blocked contacts"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%s całkowicie zablokowany kontakt "
+msgstr[1] "%s całkowicie zablokowany kontakt"
+msgstr[2] "%s całkowicie zablokowane kontakty "
+msgstr[3] "%s całkowicie zablokowane kontakty"
 
-#: mod/admin.php:504
+#: mod/admin.php:510
 msgid "URL of the remote contact to block."
 msgstr "Adres URL kontaktu zdalnego do zablokowania."
 
-#: mod/admin.php:526
+#: mod/admin.php:532
 msgid "Delete this Item"
 msgstr "Usuń ten przedmiot"
 
-#: 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 "Na tej stronie możesz usunąć przedmiot ze swojego węzła. Jeśli element jest publikowaniem na najwyższym poziomie, cały wątek zostanie usunięty."
 
-#: 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 "Musisz znać identyfikator GUID tego przedmiotu. Możesz go znaleźć np. patrząc na wyświetlany adres URL. Ostatnia część http://example.com/display/123456 to GUID, tutaj 123456."
 
-#: 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 "Identyfikator elementu GUID, który chcesz usunąć."
 
-#: mod/admin.php:568
+#: mod/admin.php:569
 msgid "Item marked for deletion."
 msgstr "Przedmiot oznaczony do usunięcia."
 
-#: mod/admin.php:639
+#: mod/admin.php:640
 msgid "unknown"
 msgstr "nieznany"
 
-#: mod/admin.php:715
+#: 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 "Ta strona zawiera kilka numerów do znanej części federacyjnej sieci społecznościowej, do której należy Twój węzeł Friendica. Liczby te nie są kompletne, ale odzwierciedlają tylko część sieci, o której wie twój węzeł."
 
-#: mod/admin.php:716
+#: mod/admin.php:717
 msgid ""
 "The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
 "will improve the data displayed here."
 msgstr "Funkcja <em>Katalog kontaktów automatycznie odkrytych</em> nie jest włączona, poprawi ona wyświetlane tutaj dane."
 
-#: mod/admin.php:728
+#: mod/admin.php:729
 #, php-format
 msgid ""
 "Currently this node is aware of %d nodes with %d registered users from the "
 "following platforms:"
 msgstr "Obecnie węzeł ten jest świadomy %dwęzłów z %d zarejestrowanymi użytkownikami z następujących platform:"
 
-#: mod/admin.php:759
+#: mod/admin.php:768 mod/admin.php:809
 msgid "ID"
 msgstr "ID"
 
-#: mod/admin.php:760
+#: mod/admin.php:769
 msgid "Recipient Name"
 msgstr "Nazwa odbiorcy"
 
-#: mod/admin.php:761
+#: mod/admin.php:770
 msgid "Recipient Profile"
 msgstr "Profil odbiorcy"
 
-#: mod/admin.php:762 view/theme/frio/theme.php:266
-#: src/Core/NotificationsManager.php:178 src/Content/Nav.php:183
-msgid "Network"
-msgstr "Sieć"
-
-#: mod/admin.php:763
+#: mod/admin.php:772 mod/admin.php:811
 msgid "Created"
 msgstr "Utwórz"
 
-#: mod/admin.php:764
+#: mod/admin.php:773
 msgid "Last Tried"
 msgstr "Ostatnia wypróbowana"
 
-#: mod/admin.php:765
+#: 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 "Na tej stronie znajduje się zawartość kolejki dla wysyłek wychodzących. Są to posty, dla których początkowe wysyłanie nie powiodło się. Zostaną one ponownie wysłane później i ostatecznie usunięte, jeśli doręczenie zakończy się trwale."
 
-#: mod/admin.php:789
+#: mod/admin.php:807
+msgid "Inspect Worker Queue"
+msgstr "Sprawdź Kolejkę Pracowników"
+
+#: mod/admin.php:810
+msgid "Job Parameters"
+msgstr "Parametry zadania"
+
+#: mod/admin.php:812
+msgid "Priority"
+msgstr "Priorytet"
+
+#: 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 "Ta strona zawiera listę aktualnie ustawionych zadań dla pracowników. Te zadania są obsługiwane przez cronjob pracownika, który skonfigurowałeś podczas instalacji."
+
+#: mod/admin.php:837
 #, php-format
 msgid ""
 "Your DB still runs with MyISAM tables. You should change the engine type to "
@@ -4362,488 +4700,521 @@ msgid ""
 " an automatic conversion.<br />"
 msgstr "Twoja baza danych nadal działa z tabelami MyISAM. Powinieneś zmienić typ silnika na InnoDB. Ponieważ Friendica będzie używać funkcji związanych z InnoDB tylko w przyszłości, powinieneś to zmienić! Zobacz <a href=\"%s\">tutaj</a> przewodnik, który może być pomocny w konwersji silników stołowych. Możesz także użyć polecenia <tt>php bin/console.php dbstructure toinnodb</tt> instalacji Friendica do automatycznej konwersji.<br />"
 
-#: mod/admin.php:796
+#: 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 "Dostępna jest nowa wersja aplikacji Friendica. Twoja aktualna wersja to %1$s wyższa wersja to %2$s"
 
-#: mod/admin.php:806
+#: 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 "Aktualizacja bazy danych nie powiodła się. Uruchom polecenie \"php bin/console.php dbstructure update\" z wiersza poleceń i sprawdź błędy, które mogą się pojawić."
 
-#: mod/admin.php:812
+#: mod/admin.php:860
 msgid "The worker was never executed. Please check your database structure!"
 msgstr "Pracownik nigdy nie został stracony. Sprawdź swoją strukturę bazy danych!"
 
-#: mod/admin.php:815
+#: 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 "Ostatnie wykonanie robota było w %s UTC. To jest starsze niż jedna godzina. Sprawdź ustawienia crontab."
 
-#: mod/admin.php:820
+#: 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 "Konfiguracja Friendica jest teraz przechowywana w config/local.ini.php, skopiuj config/local-sample.ini.php i przenieś konfigurację z <code>.htconfig.php</code>. Zobacz <a href=\"%s\">stronę pomocy konfiguracji</a>, aby uzyskać pomoc dotyczącą przejścia."
+
+#: 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>nie jest osiągalny w twoim systemie. Jest to problem konfiguracji sieci, który uniemożliwia komunikację. Zobacz pomoc na <a href=\"%s\">stronie instalacji</a>."
+
+#: mod/admin.php:882
 msgid "Normal Account"
 msgstr "Konto normalne"
 
-#: mod/admin.php:821
+#: mod/admin.php:883
 msgid "Automatic Follower Account"
 msgstr "Automatyczne konto obserwatora"
 
-#: mod/admin.php:822
+#: mod/admin.php:884
 msgid "Public Forum Account"
 msgstr "Publiczne konto na forum"
 
-#: mod/admin.php:823
+#: mod/admin.php:885
 msgid "Automatic Friend Account"
 msgstr "Automatyczny przyjaciel konta"
 
-#: mod/admin.php:824
+#: mod/admin.php:886
 msgid "Blog Account"
 msgstr "Konto Bloga"
 
-#: mod/admin.php:825
+#: mod/admin.php:887
 msgid "Private Forum Account"
 msgstr "Prywatne konto na forum"
 
-#: mod/admin.php:847
+#: mod/admin.php:909
 msgid "Message queues"
 msgstr "Wiadomości"
 
-#: mod/admin.php:853
+#: mod/admin.php:915
 msgid "Summary"
 msgstr "Podsumowanie"
 
-#: mod/admin.php:855
+#: mod/admin.php:917
 msgid "Registered users"
 msgstr "Zarejestrowani użytkownicy"
 
-#: mod/admin.php:857
+#: mod/admin.php:919
 msgid "Pending registrations"
 msgstr "Rejestracje w toku."
 
-#: mod/admin.php:858
+#: mod/admin.php:920
 msgid "Version"
 msgstr "Wersja"
 
-#: mod/admin.php:863
+#: mod/admin.php:925
 msgid "Active addons"
 msgstr "Aktywne dodatki"
 
-#: mod/admin.php:894
+#: mod/admin.php:956
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr "Nie można zanalizować podstawowego adresu URL. Musi mieć co najmniej <scheme>: //<domain>"
 
-#: mod/admin.php:1224
+#: mod/admin.php:1289
 msgid "Site settings updated."
 msgstr "Ustawienia strony zaktualizowane"
 
-#: mod/admin.php:1251 mod/settings.php:897
-msgid "No special theme for mobile devices"
-msgstr "Brak specialnego motywu dla urządzeń mobilnych"
-
-#: mod/admin.php:1280
+#: mod/admin.php:1345
 msgid "No community page for local users"
 msgstr "Brak strony społeczności dla użytkowników lokalnych"
 
-#: mod/admin.php:1281
+#: mod/admin.php:1346
 msgid "No community page"
 msgstr "Brak strony społeczności"
 
-#: mod/admin.php:1282
+#: mod/admin.php:1347
 msgid "Public postings from users of this site"
 msgstr "Publikacje publiczne od użytkowników tej strony"
 
-#: mod/admin.php:1283
+#: mod/admin.php:1348
 msgid "Public postings from the federated network"
 msgstr "Publikacje wpisy ze sfederowanej sieci"
 
-#: mod/admin.php:1284
+#: mod/admin.php:1349
 msgid "Public postings from local users and the federated network"
 msgstr "Publikacje publiczne od użytkowników lokalnych i sieci federacyjnej"
 
-#: mod/admin.php:1290
+#: mod/admin.php:1353 mod/admin.php:1520 mod/admin.php:1530
+#: mod/contacts.php:577
+msgid "Disabled"
+msgstr "Wyłączony"
+
+#: mod/admin.php:1355
 msgid "Users, Global Contacts"
 msgstr "Użytkownicy, kontakty globalne"
 
-#: mod/admin.php:1291
+#: mod/admin.php:1356
 msgid "Users, Global Contacts/fallback"
 msgstr "Użytkownicy, kontakty globalne/awaryjne"
 
-#: mod/admin.php:1295
+#: mod/admin.php:1360
 msgid "One month"
 msgstr "Miesiąc"
 
-#: mod/admin.php:1296
+#: mod/admin.php:1361
 msgid "Three months"
 msgstr "Trzy miesiące"
 
-#: mod/admin.php:1297
+#: mod/admin.php:1362
 msgid "Half a year"
 msgstr "Pół roku"
 
-#: mod/admin.php:1298
+#: mod/admin.php:1363
 msgid "One year"
 msgstr "Rok"
 
-#: mod/admin.php:1303
+#: mod/admin.php:1368
 msgid "Multi user instance"
 msgstr "Tryb wielu użytkowników"
 
-#: mod/admin.php:1326
+#: mod/admin.php:1394
 msgid "Closed"
 msgstr "Zamknięte"
 
-#: mod/admin.php:1327
+#: mod/admin.php:1395
 msgid "Requires approval"
 msgstr "Wymagane zatwierdzenie."
 
-#: mod/admin.php:1328
+#: mod/admin.php:1396
 msgid "Open"
 msgstr "Otwarta"
 
-#: mod/admin.php:1332
+#: mod/admin.php:1400
 msgid "No SSL policy, links will track page SSL state"
 msgstr "Brak SSL , linki będą śledzić stan SSL ."
 
-#: mod/admin.php:1333
+#: mod/admin.php:1401
 msgid "Force all links to use SSL"
 msgstr "Wymuś by linki używały SSL."
 
-#: mod/admin.php:1334
+#: mod/admin.php:1402
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Wewnętrzne Certyfikaty , użyj SSL tylko dla linków lokalnych . "
 
-#: mod/admin.php:1338
+#: mod/admin.php:1406
 msgid "Don't check"
 msgstr "Nie sprawdzaj"
 
-#: mod/admin.php:1339
+#: mod/admin.php:1407
 msgid "check the stable version"
 msgstr "sprawdź wersję stabilną"
 
-#: mod/admin.php:1340
+#: mod/admin.php:1408
 msgid "check the development version"
 msgstr "sprawdź wersję rozwojową"
 
-#: mod/admin.php:1359
+#: mod/admin.php:1427
 msgid "Republish users to directory"
 msgstr "Ponownie opublikuj użytkowników w katalogu"
 
-#: mod/admin.php:1360 mod/register.php:267
-msgid "Registration"
-msgstr "Rejestracja"
-
-#: mod/admin.php:1361
+#: mod/admin.php:1429
 msgid "File upload"
 msgstr "Przesyłanie plików"
 
-#: mod/admin.php:1362
+#: mod/admin.php:1430
 msgid "Policies"
 msgstr "Zasady"
 
-#: mod/admin.php:1364
+#: mod/admin.php:1431 mod/contacts.php:926 mod/events.php:535
+#: src/Model/Profile.php:852
+msgid "Advanced"
+msgstr "Zaawansowany"
+
+#: mod/admin.php:1432
 msgid "Auto Discovered Contact Directory"
 msgstr "Katalog kontaktów automatycznie odkrytych"
 
-#: mod/admin.php:1365
+#: mod/admin.php:1433
 msgid "Performance"
 msgstr "Ustawienia"
 
-#: mod/admin.php:1366
+#: mod/admin.php:1434
 msgid "Worker"
 msgstr "Pracownik"
 
-#: mod/admin.php:1367
+#: mod/admin.php:1435
 msgid "Message Relay"
 msgstr "Przekazywanie wiadomości"
 
-#: mod/admin.php:1368
+#: mod/admin.php:1436
 msgid ""
 "Relocate - WARNING: advanced function. Could make this server unreachable."
 msgstr "Relokacja - OSTRZEŻENIE: funkcja zaawansowana. Może spowodować, że serwer będzie nieosiągalny."
 
-#: mod/admin.php:1371
+#: mod/admin.php:1439
 msgid "Site name"
 msgstr "Nazwa strony"
 
-#: mod/admin.php:1372
+#: mod/admin.php:1440
 msgid "Host name"
 msgstr "Nazwa hosta"
 
-#: mod/admin.php:1373
+#: mod/admin.php:1441
 msgid "Sender Email"
 msgstr "E-mail nadawcy"
 
-#: mod/admin.php:1373
+#: mod/admin.php:1441
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr "Adres e-mail używany przez Twój serwer do wysyłania e-maili z powiadomieniami."
 
-#: mod/admin.php:1374
+#: mod/admin.php:1442
 msgid "Banner/Logo"
 msgstr "Logo"
 
-#: mod/admin.php:1375
+#: mod/admin.php:1443
 msgid "Shortcut icon"
 msgstr "Ikona skrótu"
 
-#: mod/admin.php:1375
+#: mod/admin.php:1443
 msgid "Link to an icon that will be used for browsers."
 msgstr "Link do ikony, która będzie używana w przeglądarkach."
 
-#: mod/admin.php:1376
+#: mod/admin.php:1444
 msgid "Touch icon"
 msgstr "Dołącz ikonę"
 
-#: mod/admin.php:1376
+#: mod/admin.php:1444
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr "Link do ikony, która będzie używana w tabletach i telefonach komórkowych."
 
-#: mod/admin.php:1377
+#: mod/admin.php:1445
 msgid "Additional Info"
 msgstr "Dodatkowe informacje"
 
-#: mod/admin.php:1377
+#: mod/admin.php:1445
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
 msgstr "W przypadku serwerów publicznych: możesz tu dodać dodatkowe informacje, które będą wymienione na %s/servers."
 
-#: mod/admin.php:1378
+#: mod/admin.php:1446
 msgid "System language"
 msgstr "Język systemu"
 
-#: mod/admin.php:1379
+#: mod/admin.php:1447
 msgid "System theme"
 msgstr "Motyw systemowy"
 
-#: mod/admin.php:1379
+#: mod/admin.php:1447
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Domyślny motyw systemu - może być nadpisany przez profil użytkownika  <a href='#' id='cnftheme'>zmień ustawienia motywów</a>"
 
-#: mod/admin.php:1380
+#: mod/admin.php:1448
 msgid "Mobile system theme"
 msgstr "Motyw systemu mobilnego"
 
-#: mod/admin.php:1380
+#: mod/admin.php:1448
 msgid "Theme for mobile devices"
 msgstr "Motyw na urządzenia mobilne"
 
-#: mod/admin.php:1381
+#: mod/admin.php:1449
 msgid "SSL link policy"
 msgstr "polityka SSL"
 
-#: mod/admin.php:1381
+#: mod/admin.php:1449
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Określa kiedy generowane linki powinny używać wymuszonego SSl."
 
-#: mod/admin.php:1382
+#: mod/admin.php:1450
 msgid "Force SSL"
 msgstr "Wymuś SSL"
 
-#: mod/admin.php:1382
+#: mod/admin.php:1450
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
 msgstr "Wymuszaj wszystkie żądania SSL bez SSL - Uwaga: w niektórych systemach może to prowadzić do niekończących się pętli."
 
-#: mod/admin.php:1383
+#: mod/admin.php:1451
 msgid "Hide help entry from navigation menu"
 msgstr "Wyłącz pomoc w menu nawigacyjnym "
 
-#: mod/admin.php:1383
+#: 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 "Chowa pozycje menu dla stron pomocy ze strony nawigacyjnej. Możesz nadal ją wywołać poprzez komendę /help."
 
-#: mod/admin.php:1384
+#: mod/admin.php:1452
 msgid "Single user instance"
 msgstr "Tryb pojedynczego użytkownika"
 
-#: mod/admin.php:1384
+#: mod/admin.php:1452
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "Ustawia tryb dla wielu użytkowników lub pojedynczego użytkownika dla nazwanego użytkownika"
 
-#: mod/admin.php:1385
+#: mod/admin.php:1453
 msgid "Maximum image size"
 msgstr "Maksymalny rozmiar zdjęcia"
 
-#: mod/admin.php:1385
+#: mod/admin.php:1453
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maksymalny rozmiar w bitach dla wczytywanego obrazu . Domyślnie jest to  0 , co oznacza bez limitu ."
 
-#: mod/admin.php:1386
+#: mod/admin.php:1454
 msgid "Maximum image length"
 msgstr "Maksymalna długość obrazu"
 
-#: mod/admin.php:1386
+#: mod/admin.php:1454
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "Maksymalna długość w pikselach dłuższego boku przesyłanego obrazu. Wartością domyślną jest -1, co oznacza brak ograniczeń."
 
-#: mod/admin.php:1387
+#: mod/admin.php:1455
 msgid "JPEG image quality"
 msgstr "Jakość obrazu JPEG"
 
-#: mod/admin.php:1387
+#: mod/admin.php:1455
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr "Przesłane pliki JPEG zostaną zapisane w tym ustawieniu jakości [0-100]. Domyślna wartość to 100, która jest pełną jakością."
 
-#: mod/admin.php:1389
+#: mod/admin.php:1457
 msgid "Register policy"
 msgstr "Zasady rejestracji"
 
-#: mod/admin.php:1390
+#: mod/admin.php:1458
 msgid "Maximum Daily Registrations"
 msgstr "Maksymalna dzienna rejestracja"
 
-#: mod/admin.php:1390
+#: 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 "Jeśli rejestracja powyżej jest dozwolona, to określa maksymalną liczbę nowych rejestracji użytkowników do zaakceptowania na dzień. Jeśli rejestracja jest ustawiona na \"Zamknięta\", to ustawienie to nie ma wpływu."
 
-#: mod/admin.php:1391
+#: mod/admin.php:1459
 msgid "Register text"
 msgstr "Zarejestruj tekst"
 
-#: mod/admin.php:1391
+#: mod/admin.php:1459
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
 msgstr "Będą wyświetlane w widocznym miejscu na stronie rejestracji. Możesz użyć BBCode tutaj."
 
-#: mod/admin.php:1392
+#: mod/admin.php:1460
+msgid "Forbidden Nicknames"
+msgstr "Zakazane pseudonimy"
+
+#: 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 "Lista oddzielonych przecinkami pseudonimów, których nie wolno rejestrować. Preset to lista nazw ról zgodnie z RFC 2142."
+
+#: mod/admin.php:1461
 msgid "Accounts abandoned after x days"
 msgstr "Konto porzucone od x dni."
 
-#: mod/admin.php:1392
+#: mod/admin.php:1461
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Nie będzie marnować zasobów systemu wypytując zewnętrzne strony o opuszczone konta. Ustaw 0 dla braku limitu czasu ."
 
-#: mod/admin.php:1393
+#: mod/admin.php:1462
 msgid "Allowed friend domains"
 msgstr "Dozwolone domeny przyjaciół"
 
-#: mod/admin.php:1393
+#: 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 "Rozdzielana przecinkami lista domen, które mogą nawiązywać przyjaźnie z tą witryną. Symbole wieloznaczne są akceptowane. Pozostaw puste by zezwolić każdej domenie na zaprzyjaźnienie."
 
-#: mod/admin.php:1394
+#: mod/admin.php:1463
 msgid "Allowed email domains"
 msgstr "Dozwolone domeny e-mailowe"
 
-#: mod/admin.php:1394
+#: 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 "Rozdzielana przecinkami lista domen dozwolonych w adresach e-mail do rejestracji na tej stronie. Symbole wieloznaczne są akceptowane. Opróżnij, aby zezwolić na dowolne domeny"
 
-#: mod/admin.php:1395
+#: mod/admin.php:1464
 msgid "No OEmbed rich content"
 msgstr "Brak treści multimedialnych ze znaczkiem HTML"
 
-#: mod/admin.php:1395
+#: mod/admin.php:1464
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
 msgstr "Nie wyświetlaj zasobów treści (np. osadzonego pliku PDF), z wyjątkiem domen wymienionych poniżej."
 
-#: mod/admin.php:1396
+#: mod/admin.php:1465
 msgid "Allowed OEmbed domains"
 msgstr "Dozwolone domeny OEmbed"
 
-#: mod/admin.php:1396
+#: mod/admin.php:1465
 msgid ""
 "Comma separated list of domains which oembed content is allowed to be "
 "displayed. Wildcards are accepted."
 msgstr "Rozdzielana przecinkami lista domen, w których wyświetlana jest treść, może być wyświetlana. Symbole wieloznaczne są akceptowane."
 
-#: mod/admin.php:1397
+#: mod/admin.php:1466
 msgid "Block public"
 msgstr "Blokuj publicznie"
 
-#: mod/admin.php:1397
+#: 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 "Zaznacz, aby zablokować publiczny dostęp do wszystkich publicznych stron prywatnych w tej witrynie, chyba że jesteś zalogowany."
 
-#: mod/admin.php:1398
+#: mod/admin.php:1467
 msgid "Force publish"
 msgstr "Wymuś publikację"
 
-#: mod/admin.php:1398
+#: mod/admin.php:1467
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Zaznacz, aby wymusić umieszczenie wszystkich profili w tej witrynie w katalogu witryny."
 
-#: mod/admin.php:1399
+#: mod/admin.php:1467
+msgid "Enabling this may violate privacy laws like the GDPR"
+msgstr "Włączenie tego może naruszyć prawa ochrony prywatności, takie jak GDPR"
+
+#: mod/admin.php:1468
 msgid "Global directory URL"
 msgstr "Globalny adres URL katalogu"
 
-#: mod/admin.php:1399
+#: 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 "Adres URL do katalogu globalnego. Jeśli nie zostanie to ustawione, katalog globalny jest całkowicie niedostępny dla aplikacji."
 
-#: mod/admin.php:1400
+#: mod/admin.php:1469
 msgid "Private posts by default for new users"
 msgstr "Prywatne posty domyślnie dla nowych użytkowników"
 
-#: mod/admin.php:1400
+#: mod/admin.php:1469
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr "Ustaw domyślne uprawnienia do publikowania dla wszystkich nowych członków na domyślną grupę prywatności, a nie publiczną."
 
-#: mod/admin.php:1401
+#: mod/admin.php:1470
 msgid "Don't include post content in email notifications"
 msgstr "Nie wklejaj zawartości postu do powiadomienia o poczcie"
 
-#: mod/admin.php:1401
+#: 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 "W celu ochrony prywatności, nie włączaj zawartości postu/komentarza/wiadomości prywatnej/etc. do powiadomień w wiadomościach mailowych wysyłanych z tej strony."
 
-#: mod/admin.php:1402
+#: mod/admin.php:1471
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr "Nie zezwalaj na publiczny dostęp do dodatkowych wtyczek wyszczególnionych w menu aplikacji."
 
-#: mod/admin.php:1402
+#: mod/admin.php:1471
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr "Zaznaczenie tego pola spowoduje ograniczenie dodatków wymienionych w menu aplikacji tylko dla członków."
 
-#: mod/admin.php:1403
+#: mod/admin.php:1472
 msgid "Don't embed private images in posts"
 msgstr "Nie umieszczaj prywatnych zdjęć w postach"
 
-#: mod/admin.php:1403
+#: 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 "
@@ -4851,210 +5222,223 @@ msgid ""
 "while."
 msgstr "Nie zastępuj lokalnie hostowanych zdjęć prywatnych we wpisach za pomocą osadzonej kopii obrazu. Oznacza to, że osoby, które otrzymują posty zawierające prywatne zdjęcia, będą musiały uwierzytelnić i wczytać każdy obraz, co może trochę potrwać."
 
-#: mod/admin.php:1404
+#: mod/admin.php:1473
+msgid "Explicit Content"
+msgstr "Treści dla dorosłych"
+
+#: 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 "Ustaw to, aby ogłosić, że Twój węzeł jest używany głównie do jawnej treści, która może nie być odpowiednia dla nieletnich. Informacje te zostaną opublikowane w informacjach o węźle i mogą zostać wykorzystane, np. w katalogu globalnym, aby filtrować węzeł z list węzłów do przyłączenia. Dodatkowo notatka o tym zostanie pokazana na stronie rejestracji użytkownika."
+
+#: mod/admin.php:1474
 msgid "Allow Users to set remote_self"
 msgstr "Zezwól użytkownikom na ustawienie remote_self"
 
-#: mod/admin.php:1404
+#: 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 "Po sprawdzeniu tego każdy użytkownik może zaznaczyć każdy kontakt jako zdalny w oknie dialogowym kontaktu naprawczego. Ustawienie tej flagi na kontakcie powoduje dublowanie każdego wpisu tego kontaktu w strumieniu użytkowników."
 
-#: mod/admin.php:1405
+#: mod/admin.php:1475
 msgid "Block multiple registrations"
 msgstr "Zablokuj wielokrotną rejestrację"
 
-#: mod/admin.php:1405
+#: mod/admin.php:1475
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Nie pozwalaj użytkownikom na zakładanie dodatkowych kont do używania jako strony. "
 
-#: mod/admin.php:1406
+#: mod/admin.php:1476
 msgid "OpenID support"
 msgstr "Wsparcie OpenID"
 
-#: mod/admin.php:1406
+#: mod/admin.php:1476
 msgid "OpenID support for registration and logins."
 msgstr "Obsługa OpenID do rejestracji i logowania."
 
-#: mod/admin.php:1407
+#: mod/admin.php:1477
 msgid "Fullname check"
 msgstr "Sprawdzanie pełnej nazwy"
 
-#: mod/admin.php:1407
+#: mod/admin.php:1477
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr "Aby ograniczyć spam, wymagaj by użytkownik przy rejestracji w polu Imię i nazwisko użył spacji pomiędzy imieniem i nazwiskiem."
 
-#: mod/admin.php:1408
+#: mod/admin.php:1478
 msgid "Community pages for visitors"
 msgstr "Strony społecznościowe dla odwiedzających"
 
-#: mod/admin.php:1408
+#: mod/admin.php:1478
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
 msgstr "Które strony społeczności powinny być dostępne dla odwiedzających. Lokalni użytkownicy zawsze widzą obie strony."
 
-#: mod/admin.php:1409
+#: mod/admin.php:1479
 msgid "Posts per user on community page"
 msgstr "Lista postów użytkownika na stronie społeczności"
 
-#: mod/admin.php:1409
+#: mod/admin.php:1479
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
 msgstr "Maksymalna liczba postów na użytkownika na stronie społeczności. (Nie dotyczy 'społeczności globalnej')"
 
-#: mod/admin.php:1410
+#: mod/admin.php:1480
 msgid "Enable OStatus support"
 msgstr "Włącz wsparcie OStatus"
 
-#: mod/admin.php:1410
+#: 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 "Zapewnij kompatybilność z OStatus (StatusNet, GNU Social itp.). Cała komunikacja w stanie OStatus jest jawna, dlatego ostrzeżenia o prywatności będą czasami wyświetlane."
 
-#: mod/admin.php:1411
+#: mod/admin.php:1481
 msgid "Only import OStatus threads from our contacts"
 msgstr "Importuj wątki OStatus tylko z naszych kontaktów"
 
-#: mod/admin.php:1411
+#: 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 "Normalnie importujemy każdą treść z naszych kontaktów OStatus. W tej opcji przechowujemy tylko wątki uruchomione przez kontakt znany w naszym systemie."
 
-#: mod/admin.php:1412
+#: mod/admin.php:1482
 msgid "OStatus support can only be enabled if threading is enabled."
 msgstr "Obsługa OStatus może być włączona tylko wtedy, gdy włączone jest wątkowanie."
 
-#: mod/admin.php:1414
+#: mod/admin.php:1484
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub"
 " directory."
 msgstr "Obsługa Diaspory nie może być włączona, ponieważ Friendica została zainstalowana w podkatalogu."
 
-#: mod/admin.php:1415
+#: mod/admin.php:1485
 msgid "Enable Diaspora support"
 msgstr "Włączyć obsługę Diaspory"
 
-#: mod/admin.php:1415
+#: mod/admin.php:1485
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Zapewnij wbudowaną kompatybilność z siecią Diaspora."
 
-#: mod/admin.php:1416
+#: mod/admin.php:1486
 msgid "Only allow Friendica contacts"
 msgstr "Dopuść tylko kontakty Friendrica"
 
-#: mod/admin.php:1416
+#: mod/admin.php:1486
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "Wszyscy znajomi muszą używać protokołów Friendica. Wszystkie inne wbudowane protokoły komunikacyjne są wyłączone."
 
-#: mod/admin.php:1417
+#: mod/admin.php:1487
 msgid "Verify SSL"
 msgstr "Weryfikacja SSL"
 
-#: mod/admin.php:1417
+#: 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 "Jeśli chcesz, możesz włączyć ścisłe sprawdzanie certyfikatu. Oznacza to, że nie możesz połączyć się (w ogóle) z własnoręcznie podpisanymi stronami SSL."
 
-#: mod/admin.php:1418
+#: mod/admin.php:1488
 msgid "Proxy user"
 msgstr "Użytkownik proxy"
 
-#: mod/admin.php:1419
+#: mod/admin.php:1489
 msgid "Proxy URL"
 msgstr "URL Proxy"
 
-#: mod/admin.php:1420
+#: mod/admin.php:1490
 msgid "Network timeout"
 msgstr "Network timeout"
 
-#: mod/admin.php:1420
+#: mod/admin.php:1490
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Wartość jest w sekundach. Ustaw na 0 dla nieograniczonej (niezalecane)."
 
-#: mod/admin.php:1421
+#: mod/admin.php:1491
 msgid "Maximum Load Average"
 msgstr "Maksymalne obciążenie średnie"
 
-#: mod/admin.php:1421
+#: mod/admin.php:1491
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maksymalne obciążenie systemu przed dostawą i odpytywaniem jest odłożone - domyślnie 50."
 
-#: mod/admin.php:1422
+#: mod/admin.php:1492
 msgid "Maximum Load Average (Frontend)"
 msgstr "Maksymalne obciążenie średnie (Frontend)"
 
-#: mod/admin.php:1422
+#: mod/admin.php:1492
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr "Maksymalne obciążenie systemu, zanim frontend zakończy pracę - domyślnie 50."
 
-#: mod/admin.php:1423
+#: mod/admin.php:1493
 msgid "Minimal Memory"
 msgstr "Minimalna pamięć"
 
-#: mod/admin.php:1423
+#: mod/admin.php:1493
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
 msgstr "Minimalna wolna pamięć w MB dla pracownika. Potrzebuje dostępu do /proc/ meminfo - domyślnie 0 (wyłączone)."
 
-#: mod/admin.php:1424
+#: mod/admin.php:1494
 msgid "Maximum table size for optimization"
 msgstr "Maksymalny rozmiar stołu do optymalizacji"
 
-#: mod/admin.php:1424
+#: mod/admin.php:1494
 msgid ""
 "Maximum table size (in MB) for the automatic optimization. Enter -1 to "
 "disable it."
 msgstr "Maksymalny rozmiar tablicy (w MB) do automatycznej optymalizacji. Wprowadź -1, aby go wyłączyć."
 
-#: mod/admin.php:1425
+#: mod/admin.php:1495
 msgid "Minimum level of fragmentation"
 msgstr "Minimalny poziom fragmentacji"
 
-#: mod/admin.php:1425
+#: mod/admin.php:1495
 msgid ""
 "Minimum fragmenation level to start the automatic optimization - default "
 "value is 30%."
 msgstr "Minimalny poziom fragmentacji, aby rozpocząć automatyczną optymalizację - domyślna wartość to 30%."
 
-#: mod/admin.php:1427
+#: mod/admin.php:1497
 msgid "Periodical check of global contacts"
 msgstr "Okresowa kontrola kontaktów globalnych"
 
-#: mod/admin.php:1427
+#: 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 "Jeśli jest włączona, kontakty globalne są okresowo sprawdzane pod kątem brakujących lub nieaktualnych danych oraz żywotności kontaktów i serwerów."
 
-#: mod/admin.php:1428
+#: mod/admin.php:1498
 msgid "Days between requery"
 msgstr "Dni między żądaniem"
 
-#: mod/admin.php:1428
+#: mod/admin.php:1498
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr "Liczba dni, po upływie których serwer jest żądany dla swoich kontaktów."
 
-#: mod/admin.php:1429
+#: mod/admin.php:1499
 msgid "Discover contacts from other servers"
 msgstr "Odkryj kontakty z innych serwerów"
 
-#: mod/admin.php:1429
+#: 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 "
@@ -5064,32 +5448,32 @@ msgid ""
 "Global Contacts'."
 msgstr "Okresowo wysyłaj zapytanie do innych serwerów o kontakty. Możesz wybierać pomiędzy 'użytkownikami': użytkownikami w systemie zdalnym, 'Kontakty globalne': aktywne kontakty znane w systemie. Zastępowanie jest przeznaczone dla serwerów Redmatrix i starszych serwerów Friendica, w których kontakty globalne nie były dostępne. Funkcja awaryjna zwiększa obciążenie serwera, dlatego zalecanym ustawieniem jest 'Użytkownicy, kontakty globalne'."
 
-#: mod/admin.php:1430
+#: mod/admin.php:1500
 msgid "Timeframe for fetching global contacts"
 msgstr "Czas pobierania globalnych kontaktów"
 
-#: mod/admin.php:1430
+#: 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 "Po aktywowaniu wykrywania ta wartość określa czas działania globalnych kontaktów pobieranych z innych serwerów."
 
-#: mod/admin.php:1431
+#: mod/admin.php:1501
 msgid "Search the local directory"
 msgstr "Wyszukaj w lokalnym katalogu"
 
-#: mod/admin.php:1431
+#: 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 "Wyszukaj lokalny katalog zamiast katalogu globalnego. Podczas wyszukiwania lokalnie każde wyszukiwanie zostanie wykonane w katalogu globalnym w tle. Poprawia to wyniki wyszukiwania, gdy wyszukiwanie jest powtarzane."
 
-#: mod/admin.php:1433
+#: mod/admin.php:1503
 msgid "Publish server information"
 msgstr "Publikuj informacje o serwerze"
 
-#: mod/admin.php:1433
+#: 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 "
@@ -5097,50 +5481,50 @@ msgid ""
 " href='http://the-federation.info/'>the-federation.info</a> for details."
 msgstr "Jeśli opcja jest włączona, ogólne dane serwera i użytkowania zostaną opublikowane. Dane zawierają nazwę i wersję serwera, liczbę użytkowników z profilami publicznymi, liczbę postów oraz aktywowane protokoły i konektory. Aby uzyskać szczegółowe informacje, patrz <a href='http://the-federation.info/'>the-federation.info</a>."
 
-#: mod/admin.php:1435
+#: mod/admin.php:1505
 msgid "Check upstream version"
 msgstr "Sprawdź wersję powyżej"
 
-#: mod/admin.php:1435
+#: 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 "Umożliwia sprawdzenie nowych wersji Friendica na github. Jeśli pojawi się nowa wersja, zostaniesz o tym poinformowany w panelu administracyjnym."
 
-#: mod/admin.php:1436
+#: mod/admin.php:1506
 msgid "Suppress Tags"
 msgstr "Ukryj tagi"
 
-#: mod/admin.php:1436
+#: mod/admin.php:1506
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr "Pomiń wyświetlenie listy hashtagów na końcu postu."
 
-#: mod/admin.php:1437
+#: mod/admin.php:1507
 msgid "Clean database"
 msgstr "Wyczyść bazę danych"
 
-#: mod/admin.php:1437
+#: mod/admin.php:1507
 msgid ""
 "Remove old remote items, orphaned database records and old content from some"
 " other helper tables."
 msgstr "Usuń stare zdalne pozycje, osierocone rekordy bazy danych i starą zawartość z innych tabel pomocników."
 
-#: mod/admin.php:1438
+#: mod/admin.php:1508
 msgid "Lifespan of remote items"
 msgstr "Żywotność odległych przedmiotów"
 
-#: mod/admin.php:1438
+#: 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 "Po włączeniu czyszczenia bazy danych określa dni, po których zdalne elementy zostaną usunięte. Własne przedmioty oraz oznaczone lub wypełnione pozycje są zawsze przechowywane. 0 wyłącza to zachowanie."
 
-#: mod/admin.php:1439
+#: mod/admin.php:1509
 msgid "Lifespan of unclaimed items"
 msgstr "Żywotność nieodebranych przedmiotów"
 
-#: mod/admin.php:1439
+#: 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. "
@@ -5148,129 +5532,130 @@ msgid ""
 "items if set to 0."
 msgstr "Po włączeniu czyszczenia bazy danych określa się dni, po których usunięte zostaną nieodebrane zdalne elementy (głównie zawartość z przekaźnika). Wartość domyślna to 90 dni. Wartość domyślna dla ogólnej długości życia zdalnych pozycji, jeśli jest ustawiona na 0."
 
-#: mod/admin.php:1440
+#: mod/admin.php:1510
 msgid "Path to item cache"
 msgstr "Ścieżka do pamięci podręcznej"
 
-#: mod/admin.php:1440
+#: mod/admin.php:1510
 msgid "The item caches buffers generated bbcode and external images."
 msgstr "Pozycja buforuje bufory generowane bbcode i obrazy zewnętrzne."
 
-#: mod/admin.php:1441
+#: mod/admin.php:1511
 msgid "Cache duration in seconds"
 msgstr "Czas trwania w sekundach"
 
-#: mod/admin.php:1441
+#: 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 "Jak długo powinny być przechowywane pliki pamięci podręcznej? Wartość domyślna to 86400 sekund (jeden dzień). Aby wyłączyć pamięć podręczną elementów, ustaw wartość na -1."
 
-#: mod/admin.php:1442
+#: mod/admin.php:1512
 msgid "Maximum numbers of comments per post"
 msgstr "Maksymalna liczba komentarzy na post"
 
-#: mod/admin.php:1442
+#: mod/admin.php:1512
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr "Ile komentarzy powinno być pokazywanych dla każdego posta? Domyślna wartość to 100."
 
-#: mod/admin.php:1443
+#: mod/admin.php:1513
 msgid "Temp path"
 msgstr "Ścieżka do Temp"
 
-#: mod/admin.php:1443
+#: 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 "Jeśli masz zastrzeżony system, w którym serwer internetowy nie może uzyskać dostępu do ścieżki temp systemu, wprowadź tutaj inną ścieżkę."
 
-#: mod/admin.php:1444
+#: mod/admin.php:1514
 msgid "Base path to installation"
 msgstr "Podstawowa ścieżka do instalacji"
 
-#: mod/admin.php:1444
+#: 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 "Jeśli system nie może wykryć poprawnej ścieżki do instalacji, wprowadź tutaj poprawną ścieżkę. To ustawienie powinno być ustawione tylko wtedy, gdy używasz ograniczonego systemu i dowiązań symbolicznych do twojego webroota."
 
-#: mod/admin.php:1445
+#: mod/admin.php:1515
 msgid "Disable picture proxy"
 msgstr "Wyłącz obraz proxy"
 
-#: mod/admin.php:1445
+#: mod/admin.php:1515
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
-" systems with very low bandwith."
-msgstr "Proxy obrazu zwiększa wydajność i prywatność. Nie należy go stosować w systemach o bardzo niskiej przepustowości."
+" systems with very low bandwidth."
+msgstr "Serwer proxy zwiększa wydajność i prywatność. Nie powinno być używane w systemach o bardzo niskiej przepustowości."
 
-#: mod/admin.php:1446
+#: mod/admin.php:1516
 msgid "Only search in tags"
 msgstr "Szukaj tylko w tagach"
 
-#: mod/admin.php:1446
+#: mod/admin.php:1516
 msgid "On large systems the text search can slow down the system extremely."
 msgstr "W dużych systemach wyszukiwanie tekstu może wyjątkowo spowolnić system."
 
-#: mod/admin.php:1448
+#: mod/admin.php:1518
 msgid "New base url"
 msgstr "Nowy bazowy adres url"
 
-#: mod/admin.php:1448
+#: mod/admin.php:1518
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and"
 " Diaspora* contacts of all users."
 msgstr "Zmień bazowy adres URL dla tego serwera. Wysyła wiadomość o przeniesieniu do wszystkich kontaktów Friendica i Diaspora* wszystkich użytkowników."
 
-#: mod/admin.php:1450
+#: mod/admin.php:1520
 msgid "RINO Encryption"
 msgstr "Szyfrowanie RINO"
 
-#: mod/admin.php:1450
+#: mod/admin.php:1520
 msgid "Encryption layer between nodes."
 msgstr "Warstwa szyfrowania między węzłami."
 
-#: mod/admin.php:1450
+#: mod/admin.php:1520
 msgid "Enabled"
 msgstr "Włącz"
 
-#: mod/admin.php:1452
+#: mod/admin.php:1522
 msgid "Maximum number of parallel workers"
 msgstr "Maksymalna liczba równoległych pracowników"
 
-#: mod/admin.php:1452
+#: 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."
-msgstr "Na współdzielonych hostach ustaw to na 2. W większych systemach wartości 10 są świetne. Domyślna wartość to 4."
+"On shared hosters set this to %d. On larger systems, values of %d are great."
+" Default value is %d."
+msgstr "Na udostępnionych usługach hostingowych ustaw tę opcję %d. W większych systemach wartości %dsą świetne . Wartość domyślna to %d."
 
-#: mod/admin.php:1453
+#: mod/admin.php:1523
 msgid "Don't use 'proc_open' with the worker"
 msgstr "Nie używaj 'proc_open' z robotnikiem"
 
-#: mod/admin.php:1453
+#: 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 "Włącz to, jeśli twój system nie zezwala na użycie 'proc_open'. Może się to zdarzyć w przypadku współdzielonych hosterów. Jeśli ta opcja jest włączona, powinieneś zwiększyć częstotliwość wywołań pracowniczych w twoim pliku crontab."
 
-#: mod/admin.php:1454
+#: mod/admin.php:1524
 msgid "Enable fastlane"
 msgstr "Włącz Fastlane"
 
-#: mod/admin.php:1454
+#: 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 "Po włączeniu system Fastlane uruchamia dodatkowego pracownika, jeśli procesy o wyższym priorytecie są blokowane przez procesy o niższym priorytecie."
 
-#: mod/admin.php:1455
+#: mod/admin.php:1525
 msgid "Enable frontend worker"
 msgstr "Włącz pracownika frontend"
 
-#: mod/admin.php:1455
+#: mod/admin.php:1525
 #, php-format
 msgid ""
 "When enabled the Worker process is triggered when backend access is "
@@ -5280,140 +5665,144 @@ msgid ""
 " on your server."
 msgstr "Po włączeniu proces roboczy jest wyzwalany, gdy wykonywany jest dostęp do zaplecza \\x28e.g. wiadomości są dostarczane\\x29. W mniejszych witrynach możesz chcieć wywoływać %s/robotnika regularnie przez zewnętrzne zadanie cron. Tę opcję należy włączyć tylko wtedy, gdy nie można używać zadań cron/zaplanowanych na serwerze."
 
-#: mod/admin.php:1457
+#: mod/admin.php:1527
 msgid "Subscribe to relay"
 msgstr "Subskrybuj przekaźnik"
 
-#: mod/admin.php:1457
+#: 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 "Umożliwia odbieranie publicznych wiadomości z przekaźnika. Zostaną uwzględnione w tagach wyszukiwania, subskrybowanych i na stronie społeczności globalnej."
 
-#: mod/admin.php:1458
+#: mod/admin.php:1528
 msgid "Relay server"
 msgstr "Serwer przekazujący"
 
-#: mod/admin.php:1458
+#: 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 serwera przekazującego, do którego należy wysyłać publiczne posty. Na przykład https://relay.diasp.org"
 
-#: mod/admin.php:1459
+#: mod/admin.php:1529
 msgid "Direct relay transfer"
 msgstr "Bezpośredni transfer przekaźników"
 
-#: mod/admin.php:1459
+#: mod/admin.php:1529
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr "Umożliwia bezpośredni transfer do innych serwerów bez korzystania z serwerów przekazujących"
 
-#: mod/admin.php:1460
+#: mod/admin.php:1530
 msgid "Relay scope"
 msgstr "Zakres przekaźnika"
 
-#: mod/admin.php:1460
+#: 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 "Może być 'wszystkim' lub 'tagami'. 'wszystko' oznacza, że ​​każdy post publiczny powinien zostać odebrany. 'tagi' oznaczają, że powinny być odbierane tylko posty z wybranymi tagami."
 
-#: mod/admin.php:1460
+#: mod/admin.php:1530
 msgid "all"
 msgstr "wszystko"
 
-#: mod/admin.php:1460
+#: mod/admin.php:1530
 msgid "tags"
 msgstr "tagi"
 
-#: mod/admin.php:1461
+#: mod/admin.php:1531
 msgid "Server tags"
 msgstr "Serwer tagów"
 
-#: mod/admin.php:1461
+#: mod/admin.php:1531
 msgid "Comma separated list of tags for the 'tags' subscription."
 msgstr "Lista oddzielonych przecinkami znaczników dla subskrypcji 'tagów'."
 
-#: mod/admin.php:1462
+#: mod/admin.php:1532
 msgid "Allow user tags"
 msgstr "Pozwól na tagi użytkowników"
 
-#: mod/admin.php:1462
+#: 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 "Po włączeniu tagi z zapisanych wyszukiwań będą używane do subskrypcji 'tagów' oprócz 'relay_server_tags'."
 
-#: mod/admin.php:1490
+#: mod/admin.php:1535
+msgid "Start Relocation"
+msgstr "Rozpocznij przenoszenie"
+
+#: mod/admin.php:1561
 msgid "Update has been marked successful"
 msgstr "Aktualizacja została oznaczona jako udana"
 
-#: mod/admin.php:1497
+#: mod/admin.php:1568
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr "Pomyślnie zastosowano aktualizację %s struktury bazy danych."
 
-#: mod/admin.php:1500
+#: mod/admin.php:1571
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr "Wykonanie aktualizacji %s struktury bazy danych nie powiodło się z powodu błędu:%s"
 
-#: mod/admin.php:1513
+#: mod/admin.php:1587
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr "Wykonanie %s nie powiodło się z powodu błędu:%s"
 
-#: mod/admin.php:1515
+#: mod/admin.php:1589
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Aktualizacja %s została pomyślnie zastosowana."
 
-#: mod/admin.php:1518
+#: mod/admin.php:1592
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Aktualizacja %s nie zwróciła statusu. Nieznane, jeśli się udało."
 
-#: mod/admin.php:1521
+#: mod/admin.php:1595
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr "Nie było dodatkowej funkcji %s aktualizacji, która musiała zostać wywołana."
 
-#: mod/admin.php:1541
+#: mod/admin.php:1618
 msgid "No failed updates."
 msgstr "Brak błędów aktualizacji."
 
-#: mod/admin.php:1542
+#: mod/admin.php:1619
 msgid "Check database structure"
 msgstr "Sprawdź strukturę bazy danych"
 
-#: mod/admin.php:1547
+#: mod/admin.php:1624
 msgid "Failed Updates"
 msgstr "Błąd aktualizacji"
 
-#: mod/admin.php:1548
+#: mod/admin.php:1625
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "Nie dotyczy to aktualizacji przed 1139, który nie zwrócił statusu."
 
-#: mod/admin.php:1549
+#: mod/admin.php:1626
 msgid "Mark success (if update was manually applied)"
 msgstr "Oznacz sukces (jeśli aktualizacja została ręcznie zastosowana)"
 
-#: mod/admin.php:1550
+#: mod/admin.php:1627
 msgid "Attempt to execute this update step automatically"
 msgstr "Spróbuj automatycznie wykonać ten krok aktualizacji"
 
-#: mod/admin.php:1589
+#: 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\tSzanowny/a Panie/Pani %1$s, \n\t\t\t\tadministrator %2$s założył dla ciebie konto."
+msgstr "\n\t\t\tSzanowny Użytkowniku %1$s, \n\t\t\t\tadministrator %2$s założył dla ciebie konto."
 
-#: mod/admin.php:1592
+#: mod/admin.php:1669
 #, php-format
 msgid ""
 "\n"
@@ -5443,23 +5832,23 @@ 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\tDane logowania są następuje:\n\t\t\tLokalizacja witryny:\t%1$s\n\t\t\tNazwa użytkownika:%2$s\n\t\t\tHasło:%3$s\n\n\t\t\tPo zalogowaniu możesz zmienić hasło do swojego konta na stronie \"Ustawienia\"\n \t\t\tProszę poświęć chwilę, aby przejrzeć inne ustawienia konta na tej stronie.\n\n\t\t\tMożesz również dodać podstawowe informacje do swojego domyślnego profilu\n\t\t\t(na stronie \"Profil\"), aby inne osoby mogły łatwo Cię znaleźć.\n\n\t\t\tZalecamy ustawienie imienia i nazwiska, dodanie zdjęcia profilowego,\n\t\t\tdodanie niektórych \"słów kluczowych\" profilu (bardzo przydatne w nawiązywaniu nowych znajomości) - i\n\t\t\tbyć może w jakim kraju mieszkasz; jeśli nie chcesz być bardziej szczegółowy.\n\n\t\t\tW pełni szanujemy Twoje prawo do prywatności i żaden z tych elementów nie jest konieczny.\n\t\t\tJeśli jesteś nowy i nie znasz tutaj nikogo, oni mogą ci pomóc\n\t\t\tmożesz zdobyć nowych interesujących przyjaciół\n\n\t\t\tJeśli kiedykolwiek zechcesz usunąć swoje konto, możesz to zrobić w %1$s/Usuń konto\n\n\t\t\tDziękujemy i Zapraszamy do%4$s"
+msgstr "\n\t\t\tDane logowania są następuje:\n\t\t\tLokalizacja witryny:\t%1$s\n\t\t\tNazwa użytkownika:%2$s\n\t\t\tHasło:%3$s\n\n\t\t\tPo zalogowaniu możesz zmienić hasło do swojego konta na stronie \"Ustawienia\".\n \t\t\tProszę poświęć chwilę, aby przejrzeć inne ustawienia konta na tej stronie.\n\n\t\t\tMożesz również dodać podstawowe informacje do swojego domyślnego profilu\n\t\t\t(na stronie \"Profil użytkownika\"), aby inne osoby mogły łatwo Cię znaleźć.\n\n\t\t\tZalecamy ustawienie imienia i nazwiska, dodanie zdjęcia profilowego,\n\t\t\tdodanie niektórych \"słów kluczowych\" profilu (bardzo przydatne w nawiązywaniu nowych znajomości) \n\t\t\ti być może gdzie mieszkasz; jeśli nie chcesz podać więcej szczegów.\n\n\t\t\tW pełni szanujemy Twoje prawo do prywatności i żaden z tych elementów nie jest konieczny.\n\t\t\tJeśli jesteś nowy i nie znasz tutaj nikogo, oni mogą ci pomóc,\n\t\t\tmożesz zdobyć nowych interesujących przyjaciół.\n\n\t\t\tJeśli kiedykolwiek zechcesz usunąć swoje konto, możesz to zrobić na stronie %1$s/removeme\n\n\t\t\tDziękujemy i Zapraszamy do%4$s"
 
-#: mod/admin.php:1626 src/Model/User.php:663
+#: mod/admin.php:1706 src/Model/User.php:707
 #, php-format
 msgid "Registration details for %s"
 msgstr "Szczegóły rejestracji dla %s"
 
-#: mod/admin.php:1636
+#: mod/admin.php:1716
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%s użytkownik zablokowany/odblokowany"
+msgstr[1] "%s użytkowników zablokowanych/odblokowanych"
+msgstr[2] "%sużytkowników zablokowanych/odblokowanych "
+msgstr[3] "%sużytkowników zablokowanych/odblokowanych "
 
-#: mod/admin.php:1642
+#: mod/admin.php:1722
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
@@ -5468,189 +5857,157 @@ msgstr[1] " %s użytkownicy usunięci"
 msgstr[2] " %s usuniętych użytkowników "
 msgstr[3] " %s usuniętych użytkowników "
 
-#: mod/admin.php:1689
+#: mod/admin.php:1769
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Użytkownik '%s' usunięty"
 
-#: mod/admin.php:1697
+#: mod/admin.php:1777
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Użytkownik '%s' odblokowany"
 
-#: mod/admin.php:1697
+#: mod/admin.php:1777
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Użytkownik '%s' zablokowany"
 
-#: mod/admin.php:1754 mod/settings.php:1058
-msgid "Normal Account Page"
-msgstr "Normalna strona konta"
-
-#: mod/admin.php:1755 mod/settings.php:1062
-msgid "Soapbox Page"
-msgstr "Strona Soapbox"
-
-#: mod/admin.php:1756 mod/settings.php:1066
-msgid "Public Forum"
-msgstr "Forum publiczne"
-
-#: mod/admin.php:1757 mod/settings.php:1070
-msgid "Automatic Friend Page"
-msgstr "Automatyczna strona znajomego"
-
-#: mod/admin.php:1758
+#: mod/admin.php:1838
 msgid "Private Forum"
 msgstr "Prywatne forum"
 
-#: mod/admin.php:1761 mod/settings.php:1042
-msgid "Personal Page"
-msgstr "Strona osobista"
-
-#: mod/admin.php:1762 mod/settings.php:1046
-msgid "Organisation Page"
-msgstr "Strona Organizacji"
-
-#: mod/admin.php:1763 mod/settings.php:1050
-msgid "News Page"
-msgstr "Strona Wiadomości"
-
-#: mod/admin.php:1764 mod/settings.php:1054
-msgid "Community Forum"
-msgstr "Forum społecznościowe"
-
-#: mod/admin.php:1811 mod/admin.php:1822 mod/admin.php:1835 mod/admin.php:1853
-#: 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 "E-mail"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1890 mod/admin.php:1915
 msgid "Register date"
 msgstr "Data rejestracji"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1890 mod/admin.php:1915
 msgid "Last login"
 msgstr "Ostatnie logowanie"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1890 mod/admin.php:1915
 msgid "Last item"
 msgstr "Ostatni element"
 
-#: mod/admin.php:1811
+#: mod/admin.php:1890
 msgid "Type"
 msgstr "Typu"
 
-#: mod/admin.php:1818
+#: mod/admin.php:1897
 msgid "Add User"
 msgstr "Dodaj użytkownika"
 
-#: mod/admin.php:1820
+#: mod/admin.php:1899
 msgid "User registrations waiting for confirm"
 msgstr "Zarejestrowani użytkownicy czekający na potwierdzenie"
 
-#: mod/admin.php:1821
+#: mod/admin.php:1900
 msgid "User waiting for permanent deletion"
 msgstr "Użytkownik czekający na trwałe usunięcie"
 
-#: mod/admin.php:1822
+#: mod/admin.php:1901
 msgid "Request date"
 msgstr "Data prośby"
 
-#: mod/admin.php:1823
+#: mod/admin.php:1902
 msgid "No registrations."
 msgstr "Brak rejestracji."
 
-#: mod/admin.php:1824
+#: mod/admin.php:1903
 msgid "Note from the user"
 msgstr "Uwaga od użytkownika"
 
-#: mod/admin.php:1825 mod/notifications.php:178 mod/notifications.php:262
-msgid "Approve"
-msgstr "Zatwierdź"
-
-#: mod/admin.php:1826
+#: mod/admin.php:1905
 msgid "Deny"
 msgstr "Odmów"
 
-#: mod/admin.php:1830
+#: mod/admin.php:1908
+msgid "User blocked"
+msgstr "Użytkownik zablokowany"
+
+#: mod/admin.php:1910
 msgid "Site admin"
 msgstr "Administracja stroną"
 
-#: mod/admin.php:1831
+#: mod/admin.php:1911
 msgid "Account expired"
 msgstr "Konto wygasło."
 
-#: mod/admin.php:1834
+#: mod/admin.php:1914
 msgid "New User"
 msgstr "Nowy użytkownik"
 
-#: mod/admin.php:1835
+#: mod/admin.php:1915
 msgid "Deleted since"
 msgstr "Skasowany od"
 
-#: mod/admin.php:1840
+#: 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 "Zaznaczeni użytkownicy zostaną usunięci!\\n\\nWszystko co zamieścili na tej stronie będzie trwale skasowane!\\n\\nJesteś pewien?"
+msgstr "Zaznaczeni użytkownicy zostaną usunięci!\\n\\n Wszystko co zamieścili na tej stronie będzie trwale skasowane!\\n\\n Jesteś pewien?"
 
-#: mod/admin.php:1841
+#: 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 "Użytkownik {0} zostanie usunięty!\\n\\nWszystko co zamieścił na tej stronie będzie trwale skasowane!\\n\\nJesteś pewien?"
+msgstr "Użytkownik {0} zostanie usunięty!\\n\\n Wszystko co zamieścił na tej stronie będzie trwale skasowane!\\n\\n Jesteś pewien?"
 
-#: mod/admin.php:1851
+#: mod/admin.php:1931
 msgid "Name of the new user."
 msgstr "Nazwa nowego użytkownika."
 
-#: mod/admin.php:1852
+#: mod/admin.php:1932
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: mod/admin.php:1852
+#: mod/admin.php:1932
 msgid "Nickname of the new user."
 msgstr "Pseudonim nowego użytkownika."
 
-#: mod/admin.php:1853
+#: mod/admin.php:1933
 msgid "Email address of the new user."
 msgstr "Adres email nowego użytkownika."
 
-#: mod/admin.php:1895
+#: mod/admin.php:1975
 #, php-format
 msgid "Addon %s disabled."
 msgstr "Dodatek %s wyłączony."
 
-#: mod/admin.php:1899
+#: mod/admin.php:1979
 #, php-format
 msgid "Addon %s enabled."
 msgstr "Dodatek %s włączony."
 
-#: mod/admin.php:1909 mod/admin.php:2158
+#: mod/admin.php:1989 mod/admin.php:2238
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: mod/admin.php:1912 mod/admin.php:2161
+#: mod/admin.php:1992 mod/admin.php:2241
 msgid "Enable"
 msgstr "Zezwól"
 
-#: mod/admin.php:1934 mod/admin.php:2203
+#: mod/admin.php:2014 mod/admin.php:2284
 msgid "Toggle"
 msgstr "Włącz"
 
-#: mod/admin.php:1942 mod/admin.php:2212
+#: mod/admin.php:2022 mod/admin.php:2293
 msgid "Author: "
 msgstr "Autor: "
 
-#: mod/admin.php:1943 mod/admin.php:2213
+#: mod/admin.php:2023 mod/admin.php:2294
 msgid "Maintainer: "
 msgstr "Opiekun:"
 
-#: mod/admin.php:1995
+#: mod/admin.php:2075
 msgid "Reload active addons"
 msgstr "Załaduj ponownie aktywne dodatki"
 
-#: mod/admin.php:2000
+#: mod/admin.php:2080
 #, php-format
 msgid ""
 "There are currently no addons available on your node. You can find the "
@@ -5658,206 +6015,131 @@ msgid ""
 " the open addon registry at %2$s"
 msgstr "W twoim węźle nie ma obecnie żadnych dodatków. Możesz znaleźć oficjalne repozytorium dodatków na %1$s i możesz znaleźć inne interesujące dodatki w otwartym rejestrze dodatków na %2$s"
 
-#: mod/admin.php:2120
+#: mod/admin.php:2200
 msgid "No themes found."
 msgstr "Nie znaleziono motywów."
 
-#: mod/admin.php:2194
+#: mod/admin.php:2275
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
-#: mod/admin.php:2248
+#: mod/admin.php:2329
 msgid "Reload active themes"
 msgstr "Przeładuj aktywne motywy"
 
-#: mod/admin.php:2253
+#: mod/admin.php:2334
 #, php-format
 msgid "No themes found on the system. They should be placed in %1$s"
 msgstr "Nie znaleziono motywów w systemie. Powinny zostać umieszczone %1$s"
 
-#: mod/admin.php:2254
+#: mod/admin.php:2335
 msgid "[Experimental]"
 msgstr "[Eksperymentalne]"
 
-#: mod/admin.php:2255
+#: mod/admin.php:2336
 msgid "[Unsupported]"
 msgstr "[Niewspieralne]"
 
-#: mod/admin.php:2279
+#: mod/admin.php:2360
 msgid "Log settings updated."
 msgstr "Zaktualizowano ustawienia logów."
 
-#: mod/admin.php:2311
+#: mod/admin.php:2393
 msgid "PHP log currently enabled."
 msgstr "Dziennik PHP jest obecnie włączony."
 
-#: mod/admin.php:2313
+#: mod/admin.php:2395
 msgid "PHP log currently disabled."
 msgstr "Dziennik PHP jest obecnie wyłączony."
 
-#: mod/admin.php:2322
+#: mod/admin.php:2404
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: mod/admin.php:2326
+#: mod/admin.php:2408
 msgid "Enable Debugging"
 msgstr "Włącz debugowanie"
 
-#: mod/admin.php:2327
+#: mod/admin.php:2409
 msgid "Log file"
 msgstr "Plik logów"
 
-#: mod/admin.php:2327
+#: mod/admin.php:2409
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Musi być zapisywalny przez serwer sieciowy. W stosunku do katalogu najwyższego poziomu Friendica."
 
-#: mod/admin.php:2328
+#: mod/admin.php:2410
 msgid "Log level"
 msgstr "Poziom logów"
 
-#: mod/admin.php:2330
+#: mod/admin.php:2412
 msgid "PHP logging"
 msgstr "Logowanie w PHP"
 
-#: mod/admin.php:2331
+#: 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 "Aby włączyć rejestrowanie błędów i ostrzeżeń PHP, możesz dodać następujące dane do pliku .htconfig.php instalacji. Nazwa pliku ustawiona w linii 'error_log' odnosi się do katalogu najwyższego poziomu friendiki i musi być zapisywalna przez serwer WWW. Opcja '1' dla 'log_errors' i 'display_errors' polega na włączeniu tych opcji, ustawieniu na '0', aby je wyłączyć."
+msgstr "Aby tymczasowo włączyć rejestrowanie błędów i ostrzeżeń PHP, możesz dołączyć do pliku index.php swojej instalacji. Nazwa pliku ustawiona w linii 'error_log' odnosi się do katalogu najwyższego poziomu friendiki i musi być zapisywalna przez serwer WWW. Opcja '1' dla 'log_errors' i 'display_errors' polega na włączeniu tych opcji, ustawieniu na '0', aby je wyłączyć."
 
-#: mod/admin.php:2362
+#: 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 "Błąd podczas próby otwarcia <strong>%1$s</strong> pliku dziennika. \\r\\n <br/>Sprawdź, czy plik %1$s istnieje i czy można go odczytać."
 
-#: mod/admin.php:2366
+#: 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 "Nie można otworzyć <strong>%1$s</strong>pliku dziennika. \\r\\n<br/>Sprawdź, czy plik %1$s jest czytelny."
 
-#: mod/admin.php:2457 mod/admin.php:2458 mod/settings.php:767
-msgid "Off"
-msgstr "Wyłącz"
-
-#: mod/admin.php:2457 mod/admin.php:2458 mod/settings.php:767
-msgid "On"
-msgstr "Włącz"
-
-#: mod/admin.php:2458
+#: mod/admin.php:2540
 #, php-format
 msgid "Lock feature %s"
 msgstr "Funkcja blokady %s"
 
-#: mod/admin.php:2466
+#: mod/admin.php:2548
 msgid "Manage Additional Features"
 msgstr "Zarządzanie dodatkowymi funkcjami"
 
-#: 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 "Nie znaleziono profilu."
+#: mod/openid.php:29
+msgid "OpenID protocol error. No ID returned."
+msgstr "Błąd protokołu OpenID. Nie znaleziono identyfikatora."
 
-#: mod/dfrn_confirm.php:130
+#: mod/openid.php:66
 msgid ""
-"This may occasionally happen if contact was requested by both persons and it"
-" has already been approved."
-msgstr "Może się to zdarzyć, gdy kontakt został zgłoszony przez obie osoby i został już zatwierdzony."
+"Account not found and OpenID registration is not permitted on this site."
+msgstr "Konto nie zostało znalezione, a rejestracja OpenID nie jest dozwolona na tej stronie."
 
-#: mod/dfrn_confirm.php:240
-msgid "Response from remote site was not understood."
-msgstr "Odpowiedź do zdalnej strony nie została zrozumiana"
-
-#: mod/dfrn_confirm.php:247 mod/dfrn_confirm.php:252
-msgid "Unexpected response from remote site: "
-msgstr "Nieoczekiwana odpowiedź od strony zdalnej:"
-
-#: mod/dfrn_confirm.php:261
-msgid "Confirmation completed successfully."
-msgstr "Potwierdzenie zostało pomyślnie zakończone."
-
-#: mod/dfrn_confirm.php:273
-msgid "Temporary failure. Please wait and try again."
-msgstr "Tymczasowa awaria. Proszę czekać i spróbuj ponownie."
-
-#: mod/dfrn_confirm.php:276
-msgid "Introduction failed or was revoked."
-msgstr "Wprowadzenie nie powiodło się lub zostało odwołane."
-
-#: mod/dfrn_confirm.php:281
-msgid "Remote site reported: "
-msgstr "Zdalna witryna zgłoszona:"
-
-#: mod/dfrn_confirm.php:392
-msgid "Unable to set contact photo."
-msgstr "Nie można ustawić zdjęcia kontaktu."
-
-#: mod/dfrn_confirm.php:450
-#, php-format
-msgid "No user record found for '%s' "
-msgstr "Nie znaleziono użytkownika dla '%s'"
-
-#: mod/dfrn_confirm.php:460
-msgid "Our site encryption key is apparently messed up."
-msgstr "Klucz kodujący jest najwyraźniej uszkodzony."
-
-#: mod/dfrn_confirm.php:471
-msgid "Empty site URL was provided or URL could not be decrypted by us."
-msgstr "Został podany pusty adres URL witryny lub nie można go odszyfrować."
-
-#: mod/dfrn_confirm.php:487
-msgid "Contact record was not found for you on our site."
-msgstr "Nie znaleziono kontaktu na naszej stronie"
-
-#: mod/dfrn_confirm.php:501
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
-msgstr "Publiczny klucz witryny jest niedostępny w rekordzie kontaktu dla adresu 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 "Identyfikator dostarczony przez Twój system jest duplikatem w naszym systemie. Powinien działać, jeśli spróbujesz ponownie."
-
-#: mod/dfrn_confirm.php:528
-msgid "Unable to set your contact credentials on our system."
-msgstr "Nie można ustawić danych kontaktowych w naszym systemie."
-
-#: mod/dfrn_confirm.php:583
-msgid "Unable to update your contact profile details on our system"
-msgstr "Nie można zaktualizować danych Twojego profilu kontaktowego w naszym systemie"
-
-#: mod/dfrn_confirm.php:613 mod/dfrn_request.php:564
-#: src/Model/Contact.php:1578
-msgid "[Name Withheld]"
-msgstr "[Nazwa zastrzeżona]"
+#: mod/openid.php:116 src/Module/Login.php:85 src/Module/Login.php:134
+msgid "Login failed."
+msgstr "Logowanie nieudane."
 
 #: mod/dfrn_request.php:94
 msgid "This introduction has already been accepted."
 msgstr "To wprowadzenie zostało już zaakceptowane."
 
-#: mod/dfrn_request.php:112 mod/dfrn_request.php:355
+#: mod/dfrn_request.php:112 mod/dfrn_request.php:353
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "Lokalizacja profilu jest nieprawidłowa lub nie zawiera informacji o profilu."
 
-#: mod/dfrn_request.php:116 mod/dfrn_request.php:359
+#: mod/dfrn_request.php:116 mod/dfrn_request.php:357
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "Ostrzeżenie: położenie profilu ma taką samą nazwę jak użytkownik."
 
-#: mod/dfrn_request.php:119 mod/dfrn_request.php:362
+#: mod/dfrn_request.php:119 mod/dfrn_request.php:360
 msgid "Warning: profile location has no profile photo."
 msgstr "Ostrzeżenie: położenie profilu nie zawiera zdjęcia."
 
-#: mod/dfrn_request.php:123 mod/dfrn_request.php:366
+#: 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"
@@ -5866,391 +6148,1247 @@ msgstr[1] "%d wymagane parametry nie zostały znalezione w podanej lokacji"
 msgstr[2] "%d wymagany parametr nie został znaleziony w podanej lokacji"
 msgstr[3] "%d wymagany parametr nie został znaleziony w podanej lokacji"
 
-#: mod/dfrn_request.php:162
+#: mod/dfrn_request.php:161
 msgid "Introduction complete."
 msgstr "Wprowadzanie zakończone."
 
-#: mod/dfrn_request.php:199
+#: mod/dfrn_request.php:197
 msgid "Unrecoverable protocol error."
 msgstr "Nieodwracalny błąd protokołu."
 
-#: mod/dfrn_request.php:226
+#: mod/dfrn_request.php:224
 msgid "Profile unavailable."
 msgstr "Profil niedostępny."
 
-#: mod/dfrn_request.php:248
+#: mod/dfrn_request.php:246
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr "%s otrzymał dziś zbyt wiele żądań połączeń."
 
-#: mod/dfrn_request.php:249
+#: mod/dfrn_request.php:247
 msgid "Spam protection measures have been invoked."
 msgstr "Wprowadzono zabezpieczenia przed spamem."
 
-#: mod/dfrn_request.php:250
+#: mod/dfrn_request.php:248
 msgid "Friends are advised to please try again in 24 hours."
 msgstr "Przyjaciele namawiają do spróbowania za 24h."
 
-#: mod/dfrn_request.php:276
+#: mod/dfrn_request.php:274
 msgid "Invalid locator"
 msgstr "Nieprawidłowy lokalizator"
 
-#: mod/dfrn_request.php:312
+#: mod/dfrn_request.php:310
 msgid "You have already introduced yourself here."
 msgstr "Już się tu przedstawiłeś."
 
-#: mod/dfrn_request.php:315
+#: mod/dfrn_request.php:313
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "Wygląda na to, że już jesteście przyjaciółmi z %s"
 
-#: mod/dfrn_request.php:335
+#: mod/dfrn_request.php:333
 msgid "Invalid profile URL."
-msgstr "Nieprawidłowy URL profilu."
+msgstr "Nieprawidłowy adres URL profilu."
 
-#: mod/dfrn_request.php:341 src/Model/Contact.php:1276
+#: mod/dfrn_request.php:339 src/Model/Contact.php:1577
 msgid "Disallowed profile URL."
 msgstr "Nie dozwolony adres URL profilu."
 
-#: mod/dfrn_request.php:435
+#: mod/dfrn_request.php:412 mod/contacts.php:235
+msgid "Failed to update contact record."
+msgstr "Aktualizacja rekordu kontaktu nie powiodła się."
+
+#: mod/dfrn_request.php:432
 msgid "Your introduction has been sent."
 msgstr "Twoje dane zostały wysłane."
 
-#: mod/dfrn_request.php:473
+#: mod/dfrn_request.php:470
 msgid ""
 "Remote subscription can't be done for your network. Please subscribe "
 "directly on your system."
 msgstr "Zdalnej subskrypcji nie można wykonać dla swojej sieci. Proszę zasubskrybuj bezpośrednio w swoim systemie."
 
-#: mod/dfrn_request.php:489
+#: mod/dfrn_request.php:486
 msgid "Please login to confirm introduction."
 msgstr "Zaloguj się, aby potwierdzić wprowadzenie."
 
-#: mod/dfrn_request.php:497
+#: mod/dfrn_request.php:494
 msgid ""
 "Incorrect identity currently logged in. Please login to "
 "<strong>this</strong> profile."
 msgstr "Niepoprawna tożsamość obecnego użytkownika. Proszę zalogować się na <strong>tego</strong> użytkownika. "
 
-#: mod/dfrn_request.php:511 mod/dfrn_request.php:528
+#: mod/dfrn_request.php:508 mod/dfrn_request.php:525
 msgid "Confirm"
 msgstr "Potwierdź"
 
-#: mod/dfrn_request.php:523
+#: mod/dfrn_request.php:520
 msgid "Hide this contact"
 msgstr "Ukryj kontakt"
 
-#: mod/dfrn_request.php:526
+#: mod/dfrn_request.php:523
 #, php-format
 msgid "Welcome home %s."
 msgstr "Witaj na stronie domowej %s."
 
-#: mod/dfrn_request.php:527
+#: mod/dfrn_request.php:524
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "Proszę potwierdzić swój wstęp/prośbę o połączenie do %s."
 
-#: mod/dfrn_request.php:637
+#: mod/dfrn_request.php:634
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr "Wprowadź swój 'Adres tożsamości' z jednej z następujących obsługiwanych sieci komunikacyjnych:"
 
-#: mod/dfrn_request.php:640
+#: 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 "Jeśli nie jesteś jeszcze członkiem darmowej sieci społecznościowej, <a href=\"%s\">kliknij ten link, aby znaleźć publiczną witrynę Friendica i dołącz do nas już dziś</a>."
 
-#: mod/dfrn_request.php:645
+#: mod/dfrn_request.php:642
 msgid "Friend/Connection Request"
 msgstr "Przyjaciel/Prośba o połączenie"
 
-#: mod/dfrn_request.php:646
+#: mod/dfrn_request.php:643
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@gnusocial.de"
 msgstr "Przykłady: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"
 
-#: mod/dfrn_request.php:651 src/Content/ContactSelector.php:79
+#: mod/dfrn_request.php:644 mod/follow.php:149
+msgid "Please answer the following:"
+msgstr "Proszę odpowiedzieć na następujące pytania:"
+
+#: mod/dfrn_request.php:645 mod/follow.php:150
+#, php-format
+msgid "Does %s know you?"
+msgstr "Czy %s Cię zna?"
+
+#: mod/dfrn_request.php:646 mod/follow.php:151
+msgid "Add a personal note:"
+msgstr "Dodaj osobistą notkę:"
+
+#: mod/dfrn_request.php:648 src/Content/ContactSelector.php:78
 msgid "Friendica"
 msgstr "Friendica"
 
-#: mod/dfrn_request.php:652
+#: mod/dfrn_request.php:649
 msgid "GNU Social (Pleroma, Mastodon)"
 msgstr "GNU Social (Pleroma, Mastodon)"
 
-#: mod/dfrn_request.php:653
+#: mod/dfrn_request.php:650
 msgid "Diaspora (Socialhome, Hubzilla)"
 msgstr "Diaspora (Socialhome, Hubzilla)"
 
-#: mod/dfrn_request.php:654
+#: mod/dfrn_request.php:651
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search"
 " bar."
 msgstr "- proszę nie używać tego formularza. Zamiast tego wpisz %s do paska wyszukiwania Diaspory."
 
-#: mod/item.php:114
+#: mod/api.php:85 mod/api.php:107
+msgid "Authorize application connection"
+msgstr "Autoryzacja połączenia aplikacji"
+
+#: mod/api.php:86
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Powróć do swojej aplikacji i wpisz ten Kod Bezpieczeństwa:"
+
+#: mod/api.php:95
+msgid "Please login to continue."
+msgstr "Zaloguj się aby kontynuować."
+
+#: 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 "Czy chcesz zezwolić tej aplikacji na dostęp do swoich postów i kontaktów i/lub tworzenie nowych postów?"
+
+#: mod/profile_photo.php:55
+msgid "Image uploaded but image cropping failed."
+msgstr "Zdjęcie zostało przesłane, ale przycinanie obrazu nie powiodło się."
+
+#: 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 "Redukcja rozmiaru obrazka [%s] nie powiodła się."
+
+#: mod/profile_photo.php:124
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Ponownie załaduj stronę lub wyczyść pamięć podręczną przeglądarki, jeśli nowe zdjęcie nie pojawi się natychmiast."
+
+#: mod/profile_photo.php:132
+msgid "Unable to process image"
+msgstr "Nie udało się przetworzyć obrazu."
+
+#: mod/profile_photo.php:244
+msgid "Upload File:"
+msgstr "Wyślij plik:"
+
+#: mod/profile_photo.php:245
+msgid "Select a profile:"
+msgstr "Wybierz profil:"
+
+#: mod/profile_photo.php:247 mod/fbrowser.php:106 mod/fbrowser.php:137
+msgid "Upload"
+msgstr "Załaduj"
+
+#: mod/profile_photo.php:250
+msgid "or"
+msgstr "lub"
+
+#: mod/profile_photo.php:251
+msgid "skip this step"
+msgstr "pomiń ten krok"
+
+#: mod/profile_photo.php:251
+msgid "select a photo from your photo albums"
+msgstr "wybierz zdjęcie z twojego albumu"
+
+#: mod/profile_photo.php:264
+msgid "Crop Image"
+msgstr "Przytnij zdjęcie"
+
+#: mod/profile_photo.php:265
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Dostosuj kadrowanie obrazu, aby uzyskać optymalny obraz."
+
+#: mod/profile_photo.php:267
+msgid "Done Editing"
+msgstr "Zakończono edycję"
+
+#: mod/profile_photo.php:303
+msgid "Image uploaded successfully."
+msgstr "Zdjęcie wczytano pomyślnie "
+
+#: mod/wall_attach.php:107
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+msgstr "Przepraszam, Twój przesyłany plik jest większy niż pozwala konfiguracja PHP"
+
+#: mod/wall_attach.php:107
+msgid "Or - did you try to upload an empty file?"
+msgstr "Lub - czy próbowałeś załadować pusty plik?"
+
+#: mod/wall_attach.php:118
+#, php-format
+msgid "File exceeds size limit of %s"
+msgstr "Plik przekracza limit rozmiaru wynoszący %s"
+
+#: mod/wall_attach.php:142 mod/wall_attach.php:158
+msgid "File upload failed."
+msgstr "Przesyłanie pliku nie powiodło się."
+
+#: mod/item.php:117
 msgid "Unable to locate original post."
 msgstr "Nie można zlokalizować oryginalnej wiadomości."
 
-#: mod/item.php:274
+#: mod/item.php:285
 msgid "Empty post discarded."
 msgstr "Pusty wpis został odrzucony."
 
-#: mod/item.php:804
+#: mod/item.php:809
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "Wiadomość została wysłana do ciebie od %s , członka portalu Friendica"
 
-#: mod/item.php:806
+#: mod/item.php:811
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "Możesz odwiedzić ich online pod adresem %s"
 
-#: mod/item.php:807
+#: mod/item.php:812
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "Skontaktuj się z nadawcą odpowiadając na ten post jeśli nie chcesz otrzymywać tych wiadomości."
 
-#: mod/item.php:811
+#: mod/item.php:816
 #, php-format
 msgid "%s posted an update."
 msgstr "%s zaktualizował wpis."
 
-#: mod/notifications.php:37
-msgid "Invalid request identifier."
-msgstr "Nieprawidłowe żądanie identyfikatora."
+#: mod/help.php:49
+msgid "Help:"
+msgstr "Pomoc:"
 
-#: mod/notifications.php:46 mod/notifications.php:182
-#: mod/notifications.php:229
-msgid "Discard"
-msgstr "Odrzuć"
+#: mod/uimport.php:72
+msgid "Move account"
+msgstr "Przenieś konto"
 
-#: mod/notifications.php:98 src/Content/Nav.php:191
-msgid "Notifications"
-msgstr "Powiadomienia"
+#: mod/uimport.php:73
+msgid "You can import an account from another Friendica server."
+msgstr "Możesz zaimportować konto z innego serwera Friendica."
 
-#: mod/notifications.php:107
-msgid "Network Notifications"
-msgstr "Powiadomienia sieciowe"
-
-#: mod/notifications.php:119
-msgid "Personal Notifications"
-msgstr "Prywatne powiadomienia"
-
-#: mod/notifications.php:125
-msgid "Home Notifications"
-msgstr "Powiadomienia domowe"
-
-#: mod/notifications.php:155
-msgid "Show Ignored Requests"
-msgstr "Pokaż ignorowane żądania"
-
-#: mod/notifications.php:155
-msgid "Hide Ignored Requests"
-msgstr "Ukryj zignorowane prośby"
-
-#: mod/notifications.php:167 mod/notifications.php:236
-msgid "Notification type: "
-msgstr "Typ powiadomienia:"
-
-#: mod/notifications.php:170
-#, php-format
-msgid "suggested by %s"
-msgstr "zaproponowane przez %s"
-
-#: mod/notifications.php:197
-msgid "Claims to be known to you: "
-msgstr "Twierdzi, że go znasz:"
-
-#: mod/notifications.php:198
-msgid "yes"
-msgstr "tak"
-
-#: mod/notifications.php:198
-msgid "no"
-msgstr "nie"
-
-#: mod/notifications.php:199 mod/notifications.php:204
-msgid "Shall your connection be bidirectional or not?"
-msgstr "Czy twoje połączenie ma być dwukierunkowe, czy nie?"
-
-#: mod/notifications.php:200 mod/notifications.php:205
-#, php-format
+#: mod/uimport.php:74
 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 "Przyjmowanie %s jako znajomego pozwala %s zasubskrybować twoje posty, a także otrzymywać od nich aktualizacje w swoim kanale wiadomości."
+"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 "Musisz wyeksportować konto ze starego serwera i przesłać je tutaj. Odtworzymy twoje stare konto tutaj ze wszystkimi twoimi kontaktami. Postaramy się również poinformować twoich znajomych, że się tutaj przeniosłeś."
 
-#: mod/notifications.php:201
-#, php-format
+#: mod/uimport.php:75
 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 "Zaakceptowanie %s jako subskrybenta umożliwia im subskrybowanie Twoich postów, ale nie otrzymasz od nich aktualizacji w swoim kanale wiadomości."
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (GNU Social/Statusnet) or from Diaspora"
+msgstr "Ta funkcja jest eksperymentalna. Nie możemy importować kontaktów z sieci OStatus (GNU Social/Statusnet) lub z Diaspory"
 
-#: mod/notifications.php:206
-#, php-format
+#: mod/uimport.php:76
+msgid "Account file"
+msgstr "Pliki konta"
+
+#: mod/uimport.php:76
 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 "Akceptowanie %s jako udostępniający pozwala im subskrybować twoje posty, ale nie otrzymasz od nich aktualizacji w swoim kanale wiadomości."
+"To export your account, go to \"Settings->Export your personal data\" and "
+"select \"Export account\""
+msgstr "Aby eksportować konto, wejdź w \"Ustawienia->Eksport danych osobistych\" i wybierz \"Eksportuj konto\""
 
-#: mod/notifications.php:217
-msgid "Friend"
-msgstr "Znajomy"
+#: mod/profperm.php:35 mod/profperm.php:68
+msgid "Invalid profile identifier."
+msgstr "Nieprawidłowa nazwa użytkownika."
 
-#: mod/notifications.php:218
-msgid "Sharer"
-msgstr "Udostępniający/a"
+#: mod/profperm.php:114
+msgid "Profile Visibility Editor"
+msgstr "Ustawienia widoczności profilu"
 
-#: mod/notifications.php:218
-msgid "Subscriber"
-msgstr "Subskrybent"
+#: mod/profperm.php:127
+msgid "Visible To"
+msgstr "Widoczne dla"
 
-#: mod/notifications.php:273
-msgid "No introductions."
-msgstr "Brak dostępu."
+#: mod/profperm.php:143
+msgid "All Contacts (with secure profile access)"
+msgstr "Wszystkie kontakty (z bezpiecznym dostępem do profilu)"
 
-#: mod/notifications.php:314
-msgid "Show unread"
-msgstr "Pokaż nieprzeczytane"
+#: mod/cal.php:277 mod/events.php:391
+msgid "View"
+msgstr "Widok"
 
-#: mod/notifications.php:314
-msgid "Show all"
-msgstr "Pokaż wszystko"
+#: mod/cal.php:278 mod/events.php:393
+msgid "Previous"
+msgstr "Poprzedni"
 
-#: mod/notifications.php:320
+#: mod/cal.php:282 mod/events.php:399 src/Model/Event.php:421
+msgid "today"
+msgstr "dzisiaj"
+
+#: mod/cal.php:283 mod/events.php:400 src/Util/Temporal.php:304
+#: src/Model/Event.php:422
+msgid "month"
+msgstr "miesiąc"
+
+#: mod/cal.php:284 mod/events.php:401 src/Util/Temporal.php:305
+#: src/Model/Event.php:423
+msgid "week"
+msgstr "tydzień"
+
+#: mod/cal.php:285 mod/events.php:402 src/Util/Temporal.php:306
+#: src/Model/Event.php:424
+msgid "day"
+msgstr "dzień"
+
+#: mod/cal.php:286 mod/events.php:403
+msgid "list"
+msgstr "lista"
+
+#: mod/cal.php:299 src/Core/Console/NewPassword.php:68 src/Model/User.php:221
+msgid "User not found"
+msgstr "Użytkownik nie znaleziony"
+
+#: mod/cal.php:315
+msgid "This calendar format is not supported"
+msgstr "Ten format kalendarza nie jest obsługiwany"
+
+#: mod/cal.php:317
+msgid "No exportable data found"
+msgstr "Nie znaleziono danych do eksportu"
+
+#: mod/cal.php:334
+msgid "calendar"
+msgstr "kalendarz"
+
+#: mod/regmod.php:70
+msgid "Account approved."
+msgstr "Konto zatwierdzone."
+
+#: mod/regmod.php:95
 #, php-format
-msgid "No more %s notifications."
-msgstr "Nigdy więcej %s powiadomień."
+msgid "Registration revoked for %s"
+msgstr "Rejestracja odwołana dla %s"
 
-#: mod/profile.php:37 src/Model/Profile.php:118
+#: mod/regmod.php:102
+msgid "Please login."
+msgstr "Proszę się zalogować."
+
+#: mod/editpost.php:26 mod/editpost.php:36
+msgid "Item not found"
+msgstr "Nie znaleziono elementu"
+
+#: mod/editpost.php:43
+msgid "Edit post"
+msgstr "Edytuj post"
+
+#: mod/editpost.php:125 src/Core/ACL.php:304
+msgid "CC: email addresses"
+msgstr "CC: adresy e-mail"
+
+#: mod/editpost.php:132 src/Core/ACL.php:305
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Przykład: bob@example.com, mary@example.com"
+
+#: mod/apps.php:19
+msgid "Applications"
+msgstr "Aplikacje"
+
+#: mod/apps.php:22
+msgid "No installed applications."
+msgstr "Brak zainstalowanych aplikacji."
+
+#: mod/feedtest.php:21
+msgid "You must be logged in to use this module"
+msgstr "Musisz być zalogowany, aby korzystać z tego modułu"
+
+#: mod/feedtest.php:49
+msgid "Source URL"
+msgstr "Źródłowy adres URL"
+
+#: mod/fsuggest.php:72
+msgid "Friend suggestion sent."
+msgstr "Wysłana propozycja dodania do znajomych."
+
+#: mod/fsuggest.php:101
+msgid "Suggest Friends"
+msgstr "Zaproponuj znajomych"
+
+#: mod/fsuggest.php:103
+#, php-format
+msgid "Suggest a friend for %s"
+msgstr "Zaproponuj znajomych dla %s"
+
+#: mod/maintenance.php:24
+msgid "System down for maintenance"
+msgstr "System wyłączony w celu konserwacji"
+
+#: mod/profile.php:38 src/Model/Profile.php:115
 msgid "Requested profile is not available."
 msgstr "Żądany profil jest niedostępny"
 
-#: mod/profile.php:78 mod/profile.php:81 src/Protocol/OStatus.php:1251
+#: mod/profile.php:79 mod/profile.php:82 src/Protocol/OStatus.php:1275
 #, php-format
 msgid "%s's timeline"
 msgstr "%s oś czasu "
 
-#: mod/profile.php:79 src/Protocol/OStatus.php:1252
+#: mod/profile.php:80 src/Protocol/OStatus.php:1276
 #, php-format
 msgid "%s's posts"
 msgstr "%s posty "
 
-#: mod/profile.php:80 src/Protocol/OStatus.php:1253
+#: mod/profile.php:81 src/Protocol/OStatus.php:1277
 #, php-format
 msgid "%s's comments"
 msgstr "%s komentarze "
 
-#: mod/profile.php:195
-msgid "Tips for New Members"
-msgstr "Wskazówki dla nowych użytkowników"
+#: mod/allfriends.php:53
+msgid "No friends to display."
+msgstr "Brak znajomych do wyświetlenia"
 
-#: mod/profiles.php:58
+#: mod/contacts.php:162
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] "%d edytuj kontakty."
+msgstr[1] "%d edytuj kontakty."
+msgstr[2] "%dedytuj kontakty. "
+msgstr[3] "%dedytuj kontakty. "
+
+#: mod/contacts.php:189 mod/contacts.php:395
+msgid "Could not access contact record."
+msgstr "Nie można uzyskać dostępu do rejestru kontaktów."
+
+#: mod/contacts.php:199
+msgid "Could not locate selected profile."
+msgstr "Nie można znaleźć wybranego profilu."
+
+#: mod/contacts.php:233
+msgid "Contact updated."
+msgstr "Kontakt zaktualizowany"
+
+#: mod/contacts.php:416
+msgid "Contact has been blocked"
+msgstr "Kontakt został zablokowany"
+
+#: mod/contacts.php:416
+msgid "Contact has been unblocked"
+msgstr "Kontakt został odblokowany"
+
+#: mod/contacts.php:426
+msgid "Contact has been ignored"
+msgstr "Kontakt jest ignorowany"
+
+#: mod/contacts.php:426
+msgid "Contact has been unignored"
+msgstr "Kontakt nie jest ignorowany"
+
+#: mod/contacts.php:436
+msgid "Contact has been archived"
+msgstr "Kontakt został zarchiwizowany"
+
+#: mod/contacts.php:436
+msgid "Contact has been unarchived"
+msgstr "Kontakt został przywrócony"
+
+#: mod/contacts.php:460
+msgid "Drop contact"
+msgstr "Usuń kontakt"
+
+#: mod/contacts.php:463 mod/contacts.php:845
+msgid "Do you really want to delete this contact?"
+msgstr "Czy na pewno chcesz usunąć ten kontakt?"
+
+#: mod/contacts.php:481
+msgid "Contact has been removed."
+msgstr "Kontakt został usunięty."
+
+#: mod/contacts.php:518
+#, php-format
+msgid "You are mutual friends with %s"
+msgstr "Jesteś już znajomym z %s"
+
+#: mod/contacts.php:523
+#, php-format
+msgid "You are sharing with %s"
+msgstr "Współdzielisz z %s"
+
+#: mod/contacts.php:528
+#, php-format
+msgid "%s is sharing with you"
+msgstr "%s współdzieli z tobą"
+
+#: mod/contacts.php:552
+msgid "Private communications are not available for this contact."
+msgstr "Prywatna rozmowa jest niemożliwa dla tego kontaktu"
+
+#: mod/contacts.php:554
+msgid "Never"
+msgstr "Nigdy"
+
+#: mod/contacts.php:557
+msgid "(Update was successful)"
+msgstr "(Aktualizacja przebiegła pomyślnie)"
+
+#: mod/contacts.php:557
+msgid "(Update was not successful)"
+msgstr "(Aktualizacja nie powiodła się)"
+
+#: mod/contacts.php:559 mod/contacts.php:1086
+msgid "Suggest friends"
+msgstr "Osoby, które możesz znać"
+
+#: mod/contacts.php:563
+#, php-format
+msgid "Network type: %s"
+msgstr "Typ sieci: %s"
+
+#: mod/contacts.php:568
+msgid "Communications lost with this contact!"
+msgstr "Utracono komunikację z tym kontaktem!"
+
+#: mod/contacts.php:574
+msgid "Fetch further information for feeds"
+msgstr "Pobierz dalsze informacje dla kanałów"
+
+#: 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 "Pobieranie informacji, takich jak zdjęcia podglądu, tytuł i zwiastun z elementu kanału. Możesz to aktywować, jeśli plik danych nie zawiera dużo tekstu. Słowa kluczowe są pobierane z nagłówka meta w elemencie kanału i są publikowane jako znaczniki haszowania."
+
+#: mod/contacts.php:578
+msgid "Fetch information"
+msgstr "Pobierz informacje"
+
+#: mod/contacts.php:579
+msgid "Fetch keywords"
+msgstr "Pobierz słowa kluczowe"
+
+#: mod/contacts.php:580
+msgid "Fetch information and keywords"
+msgstr "Pobierz informacje i słowa kluczowe"
+
+#: mod/contacts.php:617
+msgid "Profile Visibility"
+msgstr "Widoczność profilu"
+
+#: mod/contacts.php:618
+msgid "Contact Information / Notes"
+msgstr "Informacje kontaktowe/Notatki"
+
+#: mod/contacts.php:619
+msgid "Contact Settings"
+msgstr "Ustawienia kontaktów"
+
+#: mod/contacts.php:628
+msgid "Contact"
+msgstr "Kontakt"
+
+#: mod/contacts.php:632
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr "Wybierz profil, który chcesz bezpiecznie wyświetlić %s"
+
+#: mod/contacts.php:634
+msgid "Their personal note"
+msgstr "Ich osobista uwaga"
+
+#: mod/contacts.php:636
+msgid "Edit contact notes"
+msgstr "Edytuj notatki kontaktu"
+
+#: mod/contacts.php:640
+msgid "Block/Unblock contact"
+msgstr "Zablokuj/odblokuj kontakt"
+
+#: mod/contacts.php:641
+msgid "Ignore contact"
+msgstr "Ignoruj kontakt"
+
+#: mod/contacts.php:642
+msgid "Repair URL settings"
+msgstr "Napraw ustawienia adresów URL"
+
+#: mod/contacts.php:643
+msgid "View conversations"
+msgstr "Wyświetl rozmowy"
+
+#: mod/contacts.php:648
+msgid "Last update:"
+msgstr "Ostatnia aktualizacja:"
+
+#: mod/contacts.php:650
+msgid "Update public posts"
+msgstr "Zaktualizuj publiczne posty"
+
+#: mod/contacts.php:652 mod/contacts.php:1096
+msgid "Update now"
+msgstr "Aktualizuj teraz"
+
+#: mod/contacts.php:658 mod/contacts.php:850 mod/contacts.php:1113
+msgid "Unignore"
+msgstr "Odblokuj"
+
+#: mod/contacts.php:662
+msgid "Currently blocked"
+msgstr "Obecnie zablokowany"
+
+#: mod/contacts.php:663
+msgid "Currently ignored"
+msgstr "Obecnie zignorowany"
+
+#: mod/contacts.php:664
+msgid "Currently archived"
+msgstr "Obecnie zarchiwizowany"
+
+#: mod/contacts.php:665
+msgid "Awaiting connection acknowledge"
+msgstr "Oczekiwanie na potwierdzenie połączenia"
+
+#: mod/contacts.php:666
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
+msgstr "Odpowiedzi/kliknięcia \"lubię to\" do twoich publicznych postów nadal <strong>mogą</strong> być widoczne"
+
+#: mod/contacts.php:667
+msgid "Notification for new posts"
+msgstr "Powiadomienie o nowych postach"
+
+#: mod/contacts.php:667
+msgid "Send a notification of every new post of this contact"
+msgstr "Wyślij powiadomienie o każdym nowym poście tego kontaktu"
+
+#: mod/contacts.php:670
+msgid "Blacklisted keywords"
+msgstr "Słowa kluczowe na czarnej liście"
+
+#: 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 "Rozdzielana przecinkami lista słów kluczowych, które nie powinny zostać przekonwertowane na hashtagi, gdy wybrana jest opcja 'Pobierz informacje i słowa kluczowe'"
+
+#: mod/contacts.php:682 src/Model/Profile.php:424
+msgid "XMPP:"
+msgstr "XMPP:"
+
+#: mod/contacts.php:687
+msgid "Actions"
+msgstr "Akcja"
+
+#: mod/contacts.php:731
+msgid "Suggestions"
+msgstr "Sugestie"
+
+#: mod/contacts.php:734
+msgid "Suggest potential friends"
+msgstr "Sugerowani znajomi"
+
+#: mod/contacts.php:742
+msgid "Show all contacts"
+msgstr "Pokaż wszystkie kontakty"
+
+#: mod/contacts.php:747
+msgid "Unblocked"
+msgstr "Odblokowany"
+
+#: mod/contacts.php:750
+msgid "Only show unblocked contacts"
+msgstr "Pokaż tylko odblokowane kontakty"
+
+#: mod/contacts.php:755
+msgid "Blocked"
+msgstr "Zablokowany"
+
+#: mod/contacts.php:758
+msgid "Only show blocked contacts"
+msgstr "Pokaż tylko zablokowane kontakty"
+
+#: mod/contacts.php:763
+msgid "Ignored"
+msgstr "Zignorowany"
+
+#: mod/contacts.php:766
+msgid "Only show ignored contacts"
+msgstr "Pokaż tylko ignorowane kontakty"
+
+#: mod/contacts.php:771
+msgid "Archived"
+msgstr "Zarchiwizowane"
+
+#: mod/contacts.php:774
+msgid "Only show archived contacts"
+msgstr "Pokaż tylko zarchiwizowane kontakty"
+
+#: mod/contacts.php:779
+msgid "Hidden"
+msgstr "Ukryty"
+
+#: mod/contacts.php:782
+msgid "Only show hidden contacts"
+msgstr "Pokaż tylko ukryte kontakty"
+
+#: mod/contacts.php:840
+msgid "Search your contacts"
+msgstr "Wyszukaj w kontaktach"
+
+#: mod/contacts.php:851 mod/contacts.php:1122
+msgid "Archive"
+msgstr "Archiwum"
+
+#: mod/contacts.php:851 mod/contacts.php:1122
+msgid "Unarchive"
+msgstr "Przywróć z archiwum"
+
+#: mod/contacts.php:854
+msgid "Batch Actions"
+msgstr "Akcje wsadowe"
+
+#: mod/contacts.php:880
+msgid "Conversations started by this contact"
+msgstr "Rozmowy rozpoczęły się od tego kontaktu"
+
+#: mod/contacts.php:885
+msgid "Posts and Comments"
+msgstr "Posty i komentarze"
+
+#: mod/contacts.php:896 src/Model/Profile.php:886
+msgid "Profile Details"
+msgstr "Szczegóły profilu"
+
+#: mod/contacts.php:908
+msgid "View all contacts"
+msgstr "Zobacz wszystkie kontakty"
+
+#: mod/contacts.php:919
+msgid "View all common friends"
+msgstr "Zobacz wszystkich popularnych znajomych"
+
+#: mod/contacts.php:929
+msgid "Advanced Contact Settings"
+msgstr "Zaawansowane ustawienia kontaktów"
+
+#: mod/contacts.php:1019
+msgid "Mutual Friendship"
+msgstr "Wzajemna przyjaźń"
+
+#: mod/contacts.php:1024
+msgid "is a fan of yours"
+msgstr "jest twoim fanem"
+
+#: mod/contacts.php:1029
+msgid "you are a fan of"
+msgstr "jesteś fanem"
+
+#: 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 "To jesteś ty"
+
+#: mod/contacts.php:1053
+msgid "Edit contact"
+msgstr "Edytuj kontakt"
+
+#: mod/contacts.php:1107
+msgid "Toggle Blocked status"
+msgstr "Przełącz status na Zablokowany"
+
+#: mod/contacts.php:1115
+msgid "Toggle Ignored status"
+msgstr "Przełącz status na Ignorowany"
+
+#: mod/contacts.php:1124
+msgid "Toggle Archive status"
+msgstr "Przełącz  status na Archiwalny"
+
+#: mod/contacts.php:1132
+msgid "Delete contact"
+msgstr "Usuń kontakt"
+
+#: mod/events.php:103 mod/events.php:105
+msgid "Event can not end before it has started."
+msgstr "Wydarzenie nie może się zakończyć przed jego rozpoczęciem."
+
+#: mod/events.php:112 mod/events.php:114
+msgid "Event title and start time are required."
+msgstr "Wymagany tytuł wydarzenia i czas rozpoczęcia."
+
+#: mod/events.php:392
+msgid "Create New Event"
+msgstr "Stwórz nowe wydarzenie"
+
+#: mod/events.php:509
+msgid "Event details"
+msgstr "Szczegóły wydarzenia"
+
+#: mod/events.php:510
+msgid "Starting date and Title are required."
+msgstr "Data rozpoczęcia i tytuł są wymagane."
+
+#: mod/events.php:511 mod/events.php:512
+msgid "Event Starts:"
+msgstr "Rozpoczęcie wydarzenia:"
+
+#: mod/events.php:511 mod/events.php:523 mod/profiles.php:607
+msgid "Required"
+msgstr "Wymagany"
+
+#: mod/events.php:513 mod/events.php:529
+msgid "Finish date/time is not known or not relevant"
+msgstr "Data/czas zakończenia nie jest znana lub jest nieistotna"
+
+#: mod/events.php:515 mod/events.php:516
+msgid "Event Finishes:"
+msgstr "Zakończenie wydarzenia:"
+
+#: mod/events.php:517 mod/events.php:530
+msgid "Adjust for viewer timezone"
+msgstr "Dopasuj dla strefy czasowej widza"
+
+#: mod/events.php:519
+msgid "Description:"
+msgstr "Opis:"
+
+#: mod/events.php:523 mod/events.php:525
+msgid "Title:"
+msgstr "Tytuł:"
+
+#: mod/events.php:526 mod/events.php:527
+msgid "Share this event"
+msgstr "Udostępnij te wydarzenie"
+
+#: mod/events.php:534 src/Model/Profile.php:851
+msgid "Basic"
+msgstr "Podstawowy"
+
+#: mod/events.php:536 mod/photos.php:1112 mod/photos.php:1448
+#: src/Core/ACL.php:307
+msgid "Permissions"
+msgstr "Uprawnienia"
+
+#: mod/events.php:555
+msgid "Failed to remove event"
+msgstr "Nie udało się usunąć wydarzenia"
+
+#: mod/events.php:557
+msgid "Event removed"
+msgstr "Wydarzenie zostało usunięte"
+
+#: mod/follow.php:45
+msgid "The contact could not be added."
+msgstr "Nie można dodać kontaktu."
+
+#: mod/follow.php:73
+msgid "You already added this contact."
+msgstr "Już dodałeś ten kontakt."
+
+#: mod/follow.php:83
+msgid "Diaspora support isn't enabled. Contact can't be added."
+msgstr "Obsługa Diaspory nie jest włączona. Kontakt nie może zostać dodany."
+
+#: mod/follow.php:90
+msgid "OStatus support is disabled. Contact can't be added."
+msgstr "Obsługa OStatus jest wyłączona. Kontakt nie może zostać dodany."
+
+#: mod/follow.php:97
+msgid "The network type couldn't be detected. Contact can't be added."
+msgstr "Nie można wykryć typu sieci. Kontakt nie może zostać dodany."
+
+#: 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 "Zdjęcia kontaktu"
+
+#: mod/fbrowser.php:132
+msgid "Files"
+msgstr "Pliki"
+
+#: mod/oexchange.php:30
+msgid "Post successful."
+msgstr "Post dodany pomyślnie"
+
+#: mod/subthread.php:103
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$skolejny %2$s %3$s "
+
+#: mod/credits.php:18
+msgid "Credits"
+msgstr "Zaufany"
+
+#: 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 to projekt społecznościowy, który nie byłby możliwy bez pomocy wielu osób. Oto lista osób, które przyczyniły się do tworzenia kodu lub tłumaczenia Friendica. Dziękuję wam wszystkim!"
+
+#: mod/attach.php:16
+msgid "Item not available."
+msgstr "Element niedostępny."
+
+#: mod/attach.php:26
+msgid "Item was not found."
+msgstr "Element nie znaleziony."
+
+#: mod/notify.php:77
+msgid "No more system notifications."
+msgstr "Nie ma więcej powiadomień systemowych."
+
+#: mod/community.php:71
+msgid "Community option not available."
+msgstr "Opcja wspólnotowa jest niedostępna."
+
+#: mod/community.php:88
+msgid "Not available."
+msgstr "Niedostępne."
+
+#: mod/community.php:101
+msgid "Local Community"
+msgstr "Lokalna społeczność"
+
+#: mod/community.php:104
+msgid "Posts from local users on this server"
+msgstr "Wpisy od lokalnych użytkowników na tym serwerze"
+
+#: mod/community.php:112
+msgid "Global Community"
+msgstr "Globalna społeczność"
+
+#: mod/community.php:115
+msgid "Posts from users of the whole federated network"
+msgstr "Wpisy od użytkowników całej sieci stowarzyszonej"
+
+#: 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 "Ten strumień społeczności pokazuje wszystkie publiczne posty otrzymane przez ten węzeł. Mogą nie odzwierciedlać opinii użytkowników tego węzła."
+
+#: 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 "Zmiana czasu"
+
+#: mod/localtime.php:35
+msgid ""
+"Friendica provides this service for sharing events with other networks and "
+"friends in unknown timezones."
+msgstr "Friendica udostępnia tę usługę do udostępniania wydarzeń innym sieciom i znajomym w nieznanych strefach czasowych."
+
+#: mod/localtime.php:39
+#, php-format
+msgid "UTC time: %s"
+msgstr "Czas UTC %s"
+
+#: mod/localtime.php:42
+#, php-format
+msgid "Current timezone: %s"
+msgstr "Obecna strefa czasowa: %s"
+
+#: mod/localtime.php:46
+#, php-format
+msgid "Converted localtime: %s"
+msgstr "Zmień strefę czasową: %s"
+
+#: mod/localtime.php:52
+msgid "Please select your timezone:"
+msgstr "Wybierz swoją strefę czasową:"
+
+#: mod/poke.php:188
+msgid "Poke/Prod"
+msgstr "Zaczepić"
+
+#: mod/poke.php:189
+msgid "poke, prod or do other things to somebody"
+msgstr "szturchać, zaczepić lub robić inne rzeczy"
+
+#: mod/poke.php:190
+msgid "Recipient"
+msgstr "Odbiorca"
+
+#: mod/poke.php:191
+msgid "Choose what you wish to do to recipient"
+msgstr "Wybierz, co chcesz zrobić"
+
+#: mod/poke.php:194
+msgid "Make this post private"
+msgstr "Ustaw ten post jako prywatny"
+
+#: mod/invite.php:34
+msgid "Total invitation limit exceeded."
+msgstr "Przekroczono limit zaproszeń ogółem."
+
+#: mod/invite.php:56
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : Nieprawidłowy adres e-mail."
+
+#: mod/invite.php:88
+msgid "Please join us on Friendica"
+msgstr "Dołącz do nas na Friendica"
+
+#: mod/invite.php:97
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Przekroczono limit zaproszeń. Skontaktuj się z administratorem witryny."
+
+#: mod/invite.php:101
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Nie udało się dostarczyć wiadomości."
+
+#: mod/invite.php:105
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d wiadomość wysłana."
+msgstr[1] "%d wiadomości wysłane."
+msgstr[2] "%d wysłano ."
+msgstr[3] "%d wiadomość wysłano."
+
+#: mod/invite.php:123
+msgid "You have no more invitations available"
+msgstr "Nie masz już dostępnych zaproszeń"
+
+#: 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 "Odwiedź %s listę publicznych witryn, do których możesz dołączyć. Członkowie Friendica na innych stronach mogą łączyć się ze sobą, jak również z członkami wielu innych sieci społecznościowych."
+
+#: mod/invite.php:133
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
+msgstr "Aby zaakceptować to zaproszenie, odwiedź i zarejestruj się %s lub w dowolnej innej publicznej witrynie internetowej 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 "Strony Friendica łączą się ze sobą, tworząc ogromną sieć społecznościową o zwiększonej prywatności, która jest własnością i jest kontrolowana przez jej członków. Mogą również łączyć się z wieloma tradycyjnymi sieciami społecznościowymi. Zobacz %s listę alternatywnych witryn Friendica, do których możesz dołączyć."
+
+#: mod/invite.php:138
+msgid ""
+"Our apologies. This system is not currently configured to connect with other"
+" public sites or invite members."
+msgstr "Przepraszamy. System nie jest obecnie skonfigurowany do łączenia się z innymi publicznymi witrynami lub zapraszania członków."
+
+#: 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 "Strony Friendica łączą się ze sobą, tworząc ogromną sieć społecznościową o zwiększonej prywatności, która jest własnością i jest kontrolowana przez jej członków. Mogą również łączyć się z wieloma tradycyjnymi sieciami społecznościowymi."
+
+#: mod/invite.php:141
+#, php-format
+msgid "To accept this invitation, please visit and register at %s."
+msgstr "Aby zaakceptować to zaproszenie, odwiedź stronę i zarejestruj się na stronie %s."
+
+#: mod/invite.php:148
+msgid "Send invitations"
+msgstr "Wyślij zaproszenie"
+
+#: mod/invite.php:149
+msgid "Enter email addresses, one per line:"
+msgstr "Wprowadź adresy e-mail, po jednym w wierszu:"
+
+#: 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 "Serdecznie zapraszam do przyłączenia się do mnie i innych bliskich znajomych na stronie Friendica - i pomóż nam stworzyć lepszą sieć społecznościową."
+
+#: mod/invite.php:152
+msgid "You will need to supply this invitation code: $invite_code"
+msgstr "Musisz podać ten kod zaproszenia: $invite_code"
+
+#: mod/invite.php:152
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr "Po rejestracji połącz się ze mną na stronie mojego profilu pod adresem:"
+
+#: 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 "Aby uzyskać więcej informacji na temat projektu Friendica i dlaczego uważamy, że jest to ważne, odwiedź http://friendi.ca"
+
+#: mod/notes.php:42 src/Model/Profile.php:933
+msgid "Personal Notes"
+msgstr "Notatki"
+
+#: mod/profiles.php:57
 msgid "Profile deleted."
 msgstr "Konto usunięte."
 
-#: mod/profiles.php:74 mod/profiles.php:110
+#: mod/profiles.php:73 mod/profiles.php:109
 msgid "Profile-"
 msgstr "Profil-"
 
-#: mod/profiles.php:93 mod/profiles.php:132
+#: mod/profiles.php:92 mod/profiles.php:131
 msgid "New profile created."
 msgstr "Utworzono nowy profil."
 
-#: mod/profiles.php:116
+#: mod/profiles.php:115
 msgid "Profile unavailable to clone."
 msgstr "Nie można powileić profilu "
 
-#: mod/profiles.php:206
+#: mod/profiles.php:203
 msgid "Profile Name is required."
 msgstr "Nazwa Profilu jest wymagana"
 
-#: mod/profiles.php:347
+#: mod/profiles.php:344
 msgid "Marital Status"
 msgstr "Stan cywilny"
 
-#: mod/profiles.php:351
+#: mod/profiles.php:348
 msgid "Romantic Partner"
 msgstr "Romantyczny partner"
 
-#: mod/profiles.php:363
+#: mod/profiles.php:360
 msgid "Work/Employment"
 msgstr "Praca/Zatrudnienie"
 
-#: mod/profiles.php:366
+#: mod/profiles.php:363
 msgid "Religion"
 msgstr "Religia"
 
-#: mod/profiles.php:370
+#: mod/profiles.php:367
 msgid "Political Views"
 msgstr "Poglądy polityczne"
 
-#: mod/profiles.php:374
+#: mod/profiles.php:371
 msgid "Gender"
 msgstr "Płeć"
 
-#: mod/profiles.php:378
+#: mod/profiles.php:375
 msgid "Sexual Preference"
 msgstr "Orientacja seksualna"
 
-#: mod/profiles.php:382
+#: mod/profiles.php:379
 msgid "XMPP"
 msgstr "XMPP"
 
-#: mod/profiles.php:386
+#: mod/profiles.php:383
 msgid "Homepage"
 msgstr "Strona Główna"
 
-#: mod/profiles.php:390 mod/profiles.php:593
+#: mod/profiles.php:387 mod/profiles.php:593
 msgid "Interests"
 msgstr "Zainteresowania"
 
-#: mod/profiles.php:401 mod/profiles.php:589
+#: mod/profiles.php:398 mod/profiles.php:589
 msgid "Location"
 msgstr "Lokalizacja"
 
-#: mod/profiles.php:483
+#: mod/profiles.php:481
 msgid "Profile updated."
 msgstr "Profil zaktualizowany."
 
-#: mod/profiles.php:540
+#: mod/profiles.php:538
 msgid "Hide contacts and friends:"
 msgstr "Ukryj kontakty i znajomych:"
 
-#: mod/profiles.php:545
+#: mod/profiles.php:543
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "Czy chcesz ukryć listę kontaktów dla przeglądających to konto?"
 
-#: mod/profiles.php:565
+#: mod/profiles.php:563
 msgid "Show more profile fields:"
 msgstr "Pokaż więcej pól profilu:"
 
-#: mod/profiles.php:577
+#: mod/profiles.php:575
 msgid "Profile Actions"
 msgstr "Akcje profilowe"
 
-#: mod/profiles.php:578
+#: mod/profiles.php:576
 msgid "Edit Profile Details"
 msgstr "Edytuj profil."
 
-#: mod/profiles.php:580
+#: mod/profiles.php:578
 msgid "Change Profile Photo"
 msgstr "Zmień zdjęcie profilowe"
 
-#: mod/profiles.php:581
+#: mod/profiles.php:580
 msgid "View this profile"
 msgstr "Wyświetl ten profil"
 
-#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:389
+#: mod/profiles.php:581
+msgid "View all profiles"
+msgstr "Wyświetl wszystkie profile"
+
+#: mod/profiles.php:582 mod/profiles.php:677 src/Model/Profile.php:393
 msgid "Edit visibility"
 msgstr "Edytuj widoczność"
 
@@ -6302,7 +7440,7 @@ msgstr "Płeć:"
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr "<span class=\"heart\">&hearts;</span> Stan cywilny:"
 
-#: mod/profiles.php:601 src/Model/Profile.php:780
+#: mod/profiles.php:601 src/Model/Profile.php:769
 msgid "Sexual Preference:"
 msgstr "Preferencje seksualne:"
 
@@ -6382,11 +7520,11 @@ msgstr "Adres XMPP będzie propagowany do Twoich kontaktów, aby mogli Cię śle
 msgid "Homepage URL:"
 msgstr "Adres URL strony domowej:"
 
-#: mod/profiles.php:628 src/Model/Profile.php:788
+#: mod/profiles.php:628 src/Model/Profile.php:777
 msgid "Hometown:"
 msgstr "Miasto rodzinne:"
 
-#: mod/profiles.php:629 src/Model/Profile.php:796
+#: mod/profiles.php:629 src/Model/Profile.php:785
 msgid "Political Views:"
 msgstr "Poglądy polityczne:"
 
@@ -6410,11 +7548,11 @@ msgstr "Prywatne słowa kluczowe:"
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(Używany do wyszukiwania profili, niepokazywany innym)"
 
-#: mod/profiles.php:633 src/Model/Profile.php:812
+#: mod/profiles.php:633 src/Model/Profile.php:801
 msgid "Likes:"
-msgstr "Lubią to:"
+msgstr "Lubię to:"
 
-#: mod/profiles.php:634 src/Model/Profile.php:816
+#: mod/profiles.php:634 src/Model/Profile.php:805
 msgid "Dislikes:"
 msgstr "Nie lubię tego:"
 
@@ -6454,11 +7592,11 @@ msgstr "Szkoła/edukacja"
 msgid "Contact information and Social Networks"
 msgstr "Dane kontaktowe i Sieci społecznościowe"
 
-#: mod/profiles.php:674 src/Model/Profile.php:385
+#: mod/profiles.php:674 src/Model/Profile.php:389
 msgid "Profile Image"
 msgstr "Zdjęcie profilowe"
 
-#: mod/profiles.php:676 src/Model/Profile.php:388
+#: mod/profiles.php:676 src/Model/Profile.php:392
 msgid "visible to everybody"
 msgstr "widoczne dla wszystkich"
 
@@ -6466,1603 +7604,906 @@ msgstr "widoczne dla wszystkich"
 msgid "Edit/Manage Profiles"
 msgstr "Edycja/Zarządzanie profilami"
 
-#: 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 "Zmień zdjęcie profilowe"
 
-#: mod/profiles.php:685 src/Model/Profile.php:376
+#: mod/profiles.php:685 src/Model/Profile.php:380
 msgid "Create New Profile"
 msgstr "Utwórz nowy profil"
 
-#: mod/register.php:100
-msgid ""
-"Registration successful. Please check your email for further instructions."
-msgstr "Rejestracja zakończona pomyślnie. Dalsze instrukcje zostały wysłane na twojego e-maila."
+#: mod/photos.php:112 src/Model/Profile.php:894
+msgid "Photo Albums"
+msgstr "Albumy zdjęć"
 
-#: mod/register.php:104
+#: mod/photos.php:113 mod/photos.php:1708
+msgid "Recent Photos"
+msgstr "Ostatnio dodane zdjęcia"
+
+#: mod/photos.php:116 mod/photos.php:1230 mod/photos.php:1710
+msgid "Upload New Photos"
+msgstr "Wyślij nowe zdjęcie"
+
+#: mod/photos.php:190
+msgid "Contact information unavailable"
+msgstr "Informacje kontaktowe są niedostępne."
+
+#: mod/photos.php:209
+msgid "Album not found."
+msgstr "Album nie znaleziony"
+
+#: mod/photos.php:239 mod/photos.php:252 mod/photos.php:1181
+msgid "Delete Album"
+msgstr "Usuń album"
+
+#: mod/photos.php:250
+msgid "Do you really want to delete this photo album and all its photos?"
+msgstr "Czy na pewno chcesz usunąć ten album i wszystkie zdjęcia z tego albumu?"
+
+#: mod/photos.php:312 mod/photos.php:324 mod/photos.php:1453
+msgid "Delete Photo"
+msgstr "Usuń zdjęcie"
+
+#: mod/photos.php:322
+msgid "Do you really want to delete this photo?"
+msgstr "Czy na pewno chcesz usunąć to zdjęcie ?"
+
+#: mod/photos.php:679
+msgid "a photo"
+msgstr "zdjęcie"
+
+#: mod/photos.php:679
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
+msgstr "%1$szostał oznaczony tagiem %2$s przez %3$s"
+
+#: mod/photos.php:782
+msgid "Image upload didn't complete, please try again"
+msgstr "Przesyłanie zdjęć nie zostało zakończone, spróbuj ponownie"
+
+#: mod/photos.php:785
+msgid "Image file is missing"
+msgstr "Brak pliku obrazu"
+
+#: mod/photos.php:790
+msgid ""
+"Server can't accept new file upload at this time, please contact your "
+"administrator"
+msgstr "Serwer nie może teraz przyjąć nowego pliku, skontaktuj się z administratorem"
+
+#: mod/photos.php:816
+msgid "Image file is empty."
+msgstr "Plik obrazka jest pusty."
+
+#: mod/photos.php:953
+msgid "No photos selected"
+msgstr "Nie zaznaczono zdjęć"
+
+#: mod/photos.php:1104
+msgid "Upload Photos"
+msgstr "Prześlij zdjęcia"
+
+#: mod/photos.php:1108 mod/photos.php:1176
+msgid "New album name: "
+msgstr "Nazwa nowego albumu:"
+
+#: mod/photos.php:1109
+msgid "or select existing album:"
+msgstr "lub wybierz istniejący album:"
+
+#: mod/photos.php:1110
+msgid "Do not show a status post for this upload"
+msgstr "Nie pokazuj statusu postów dla tego wysłania"
+
+#: mod/photos.php:1187
+msgid "Edit Album"
+msgstr "Edytuj album"
+
+#: mod/photos.php:1192
+msgid "Show Newest First"
+msgstr "Pokaż najpierw najnowsze"
+
+#: mod/photos.php:1194
+msgid "Show Oldest First"
+msgstr "Pokaż najpierw najstarsze"
+
+#: mod/photos.php:1215 mod/photos.php:1693
+msgid "View Photo"
+msgstr "Zobacz zdjęcie"
+
+#: mod/photos.php:1256
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Odmowa dostępu. Dostęp do tych danych może być ograniczony."
+
+#: mod/photos.php:1258
+msgid "Photo not available"
+msgstr "Zdjęcie niedostępne"
+
+#: mod/photos.php:1333
+msgid "View photo"
+msgstr "Zobacz zdjęcie"
+
+#: mod/photos.php:1333
+msgid "Edit photo"
+msgstr "Edytuj zdjęcie"
+
+#: mod/photos.php:1334
+msgid "Use as profile photo"
+msgstr "Ustaw jako zdjęcie profilowe"
+
+#: mod/photos.php:1340 src/Object/Post.php:151
+msgid "Private Message"
+msgstr "Wiadomość prywatna"
+
+#: mod/photos.php:1360
+msgid "View Full Size"
+msgstr "Zobacz w pełnym rozmiarze"
+
+#: mod/photos.php:1421
+msgid "Tags: "
+msgstr "Tagi:"
+
+#: mod/photos.php:1424
+msgid "[Remove any tag]"
+msgstr "[Usuń dowolny tag]"
+
+#: mod/photos.php:1439
+msgid "New album name"
+msgstr "Nazwa nowego albumu"
+
+#: mod/photos.php:1440
+msgid "Caption"
+msgstr "Zawartość"
+
+#: mod/photos.php:1441
+msgid "Add a Tag"
+msgstr "Dodaj tag"
+
+#: mod/photos.php:1441
+msgid ""
+"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr "Przykładowo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+
+#: mod/photos.php:1442
+msgid "Do not rotate"
+msgstr "Nie obracaj"
+
+#: mod/photos.php:1443
+msgid "Rotate CW (right)"
+msgstr "Obróć CW (w prawo)"
+
+#: mod/photos.php:1444
+msgid "Rotate CCW (left)"
+msgstr "Obróć CCW (w lewo)"
+
+#: mod/photos.php:1478 src/Object/Post.php:293
+msgid "I like this (toggle)"
+msgstr "Lubię to (zmień)"
+
+#: mod/photos.php:1479 src/Object/Post.php:294
+msgid "I don't like this (toggle)"
+msgstr "Nie lubię tego (zmień)"
+
+#: 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 "Komentarz"
+
+#: mod/photos.php:1627
+msgid "Map"
+msgstr "Mapa"
+
+#: 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 "Nie udało się wysłać wiadomości e-mail. Tutaj szczegóły twojego konta:<br> login: %s<br>hasło: %s<br><br>Możesz zmienić swoje hasło po zalogowaniu."
+"<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>napisał następujący<a href=\"%s\" target=\"_blank\">post</a>"
 
-#: mod/register.php:111
-msgid "Registration successful."
-msgstr "Rejestracja udana."
+#: 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"
 
-#: mod/register.php:116
-msgid "Your registration can not be processed."
-msgstr "Twoja rejestracja nie może zostać przeprowadzona. "
-
-#: mod/register.php:163
-msgid "Your registration is pending approval by the site owner."
-msgstr "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny."
-
-#: mod/register.php:221
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr "Możesz (opcjonalnie) wypełnić ten formularz za pośrednictwem OpenID, podając swój OpenID i klikając 'Register'."
-
-#: 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 "Jeśli nie jesteś zaznajomiony z OpenID, zostaw to pole puste i uzupełnij resztę elementów."
-
-#: mod/register.php:223
-msgid "Your OpenID (optional): "
-msgstr "Twój OpenID (opcjonalnie):"
-
-#: mod/register.php:235
-msgid "Include your profile in member directory?"
-msgstr "Czy dołączyć twój profil do katalogu członków?"
-
-#: mod/register.php:262
-msgid "Note for the admin"
-msgstr "Uwaga dla administratora"
-
-#: mod/register.php:262
-msgid "Leave a message for the admin, why you want to join this node"
-msgstr "Pozostaw wiadomość dla administratora, dlaczego chcesz dołączyć do tego węzła"
-
-#: mod/register.php:263
-msgid "Membership on this site is by invitation only."
-msgstr "Członkostwo na tej stronie możliwe tylko dzięki zaproszeniu."
-
-#: mod/register.php:264
-msgid "Your invitation code: "
-msgstr "Twój kod zaproszenia:"
-
-#: mod/register.php:273
-msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
-msgstr "Twoje Imię i Nazwisko (np. Jan Kowalski, prawdziwe lub wyglądające na prawdziwe):"
-
-#: mod/register.php:274
-msgid ""
-"Your Email Address: (Initial information will be send there, so this has to "
-"be an existing address.)"
-msgstr "Twój adres e-mail: (Informacje początkowe zostaną wysłane tam, więc musi to być istniejący adres)."
-
-#: mod/register.php:276 mod/settings.php:1190
-msgid "New Password:"
-msgstr "Nowe hasło:"
-
-#: mod/register.php:276
-msgid "Leave empty for an auto generated password."
-msgstr "Pozostaw puste dla wygenerowanego automatycznie hasła."
-
-#: mod/register.php:277 mod/settings.php:1191
-msgid "Confirm:"
-msgstr "Potwierdź:"
-
-#: 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>'."
-msgstr "Wybierz pseudonim profilu. Nazwa musi zaczynać się od znaku tekstowego. Twój adres profilu na tej stronie będzie wówczas '<strong>pseudonimem%s</strong>'."
+"<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>napisał następujący<a href=\"%s\" target=\"_blank\">post</a>"
 
-#: mod/register.php:279
-msgid "Choose a nickname: "
-msgstr "Wybierz pseudonim:"
-
-#: mod/register.php:282 src/Content/Nav.php:128 src/Module/Login.php:284
-msgid "Register"
-msgstr "Zarejestruj"
-
-#: mod/register.php:289
-msgid "Import your profile to this friendica instance"
-msgstr "Zaimportuj swój profil do tej instancji friendica"
-
-#: mod/removeme.php:44
-msgid "User deleted their account"
-msgstr "Użytkownik usunął swoje konto"
-
-#: mod/removeme.php:45
-msgid ""
-"On your Friendica node an user deleted their account. Please ensure that "
-"their data is removed from the backups."
-msgstr "W twoim węźle Friendica użytkownik usunął swoje konto. Upewnij się, że ich dane zostały usunięte z kopii zapasowych."
-
-#: mod/removeme.php:46
+#: boot.php:653
 #, php-format
-msgid "The user id is %d"
-msgstr "Identyfikatorem użytkownika jest %d"
+msgid "Update %s failed. See error logs."
+msgstr "Aktualizacja %s nie powiodła się. Zobacz dziennik błędów."
 
-#: mod/removeme.php:77 mod/removeme.php:80
-msgid "Remove My Account"
-msgstr "Usuń moje konto"
+#: src/Database/DBStructure.php:33
+msgid "There are no tables on MyISAM."
+msgstr "W MyISAM nie ma tabel."
 
-#: mod/removeme.php:78
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr "Spowoduje to całkowite usunięcie Twojego konta. Po wykonaniu tej czynności nie można jej cofnąć."
-
-#: mod/removeme.php:79
-msgid "Please enter your password for verification:"
-msgstr "Wprowadź hasło w celu weryfikacji."
-
-#: mod/settings.php:56
-msgid "Account"
-msgstr "Konto"
-
-#: mod/settings.php:73
-msgid "Display"
-msgstr "Wygląd"
-
-#: mod/settings.php:80 mod/settings.php:834
-msgid "Social Networks"
-msgstr "Portale społecznościowe"
-
-#: mod/settings.php:94 src/Content/Nav.php:205
-msgid "Delegations"
-msgstr "Delegowanie"
-
-#: mod/settings.php:101
-msgid "Connected apps"
-msgstr "Powiązane aplikacje"
-
-#: mod/settings.php:115
-msgid "Remove account"
-msgstr "Usuń konto"
-
-#: mod/settings.php:167
-msgid "Missing some important data!"
-msgstr "Brakuje ważnych danych!"
-
-#: mod/settings.php:278
-msgid "Failed to connect with email account using the settings provided."
-msgstr "Połączenie z kontem email używając wybranych ustawień nie powiodło się."
-
-#: mod/settings.php:283
-msgid "Email settings updated."
-msgstr "Zaktualizowano ustawienia email."
-
-#: mod/settings.php:299
-msgid "Features updated"
-msgstr "Funkcje zaktualizowane"
-
-#: mod/settings.php:372
-msgid "Relocate message has been send to your contacts"
-msgstr "Przeniesienie wiadomości zostało wysłane do Twoich kontaktów"
-
-#: mod/settings.php:384 src/Model/User.php:339
-msgid "Passwords do not match. Password unchanged."
-msgstr "Hasła nie pasują do siebie. Hasło niezmienione."
-
-#: mod/settings.php:389
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr "Puste hasła są niedozwolone. Hasło niezmienione."
-
-#: 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 "Nowe hasło zostało ujawnione w publicznym zrzucie danych, wybierz inne."
-
-#: mod/settings.php:400
-msgid "Wrong password."
-msgstr "Złe hasło."
-
-#: mod/settings.php:407 src/Core/Console/NewPassword.php:94
-msgid "Password changed."
-msgstr "Hasło zostało zmianione."
-
-#: mod/settings.php:409 src/Core/Console/NewPassword.php:91
-msgid "Password update failed. Please try again."
-msgstr "Aktualizacja hasła nie powiodła się. Proszę spróbować ponownie."
-
-#: mod/settings.php:493
-msgid " Please use a shorter name."
-msgstr "Proszę użyć krótszej nazwy."
-
-#: mod/settings.php:496
-msgid " Name too short."
-msgstr "Za krótka nazwa."
-
-#: mod/settings.php:504
-msgid "Wrong Password"
-msgstr "Złe hasło"
-
-#: mod/settings.php:509
-msgid "Invalid email."
-msgstr "Niepoprawny e-mail."
-
-#: mod/settings.php:516
-msgid "Cannot change to that email."
-msgstr "Nie można zmienić tego e-maila."
-
-#: mod/settings.php:566
-msgid "Private forum has no privacy permissions. Using default privacy group."
-msgstr "Prywatne forum nie ma uprawnień do prywatności. Użyj domyślnej grupy prywatnej."
-
-#: mod/settings.php:569
-msgid "Private forum has no privacy permissions and no default privacy group."
-msgstr "Prywatne forum nie ma uprawnień do prywatności ani domyślnej grupy prywatności."
-
-#: mod/settings.php:609
-msgid "Settings updated."
-msgstr "Zaktualizowano ustawienia."
-
-#: mod/settings.php:668 mod/settings.php:694 mod/settings.php:728
-msgid "Add application"
-msgstr "Dodaj aplikację"
-
-#: mod/settings.php:672 mod/settings.php:698
-msgid "Consumer Key"
-msgstr "Klucz klienta"
-
-#: mod/settings.php:673 mod/settings.php:699
-msgid "Consumer Secret"
-msgstr "Tajny klucz klienta"
-
-#: mod/settings.php:674 mod/settings.php:700
-msgid "Redirect"
-msgstr "Przekierowanie"
-
-#: mod/settings.php:675 mod/settings.php:701
-msgid "Icon url"
-msgstr "Adres Url ikony"
-
-#: mod/settings.php:686
-msgid "You can't edit this application."
-msgstr "Nie możesz edytować tej aplikacji."
-
-#: mod/settings.php:727
-msgid "Connected Apps"
-msgstr "Powiązane aplikacje"
-
-#: mod/settings.php:729 src/Object/Post.php:155 src/Object/Post.php:157
-msgid "Edit"
-msgstr "Edytuj"
-
-#: mod/settings.php:731
-msgid "Client key starts with"
-msgstr "Klucz klienta zaczyna się od"
-
-#: mod/settings.php:732
-msgid "No name"
-msgstr "Bez nazwy"
-
-#: mod/settings.php:733
-msgid "Remove authorization"
-msgstr "Odwołaj upoważnienie"
-
-#: mod/settings.php:744
-msgid "No Addon settings configured"
-msgstr "Brak skonfigurowanych ustawień dodatków"
-
-#: mod/settings.php:753
-msgid "Addon Settings"
-msgstr "Ustawienia Dodatków"
-
-#: mod/settings.php:774
-msgid "Additional Features"
-msgstr "Dodatkowe funkcje"
-
-#: mod/settings.php:797 src/Content/ContactSelector.php:83
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: mod/settings.php:797 mod/settings.php:798
-msgid "enabled"
-msgstr "włączony"
-
-#: mod/settings.php:797 mod/settings.php:798
-msgid "disabled"
-msgstr "wyłączony"
-
-#: mod/settings.php:797 mod/settings.php:798
-#, php-format
-msgid "Built-in support for %s connectivity is %s"
-msgstr "Wbudowane wsparcie dla %s łączność jest %s"
-
-#: mod/settings.php:798
-msgid "GNU Social (OStatus)"
-msgstr "GNU Społeczny (OStatus)"
-
-#: mod/settings.php:829
-msgid "Email access is disabled on this site."
-msgstr "Dostęp do e-maila nie jest w pełni sprawny na tej stronie"
-
-#: mod/settings.php:839
-msgid "General Social Media Settings"
-msgstr "Ogólne ustawienia mediów społecznościowych"
-
-#: mod/settings.php:840
-msgid "Disable Content Warning"
-msgstr "Wyłącz ostrzeżenie o treści"
-
-#: 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 "Użytkownicy w sieciach takich jak Mastodon lub Pleroma mogą ustawić pole ostrzeżenia o treści, które domyślnie zwijać będzie swój wpis. Powoduje wyłączenie automatycznego zwijania i ustawia ostrzeżenie o treści jako tytuł postu. Nie ma wpływu na żadne inne filtrowanie treści, które ostatecznie utworzyłeś."
-
-#: mod/settings.php:841
-msgid "Disable intelligent shortening"
-msgstr "Wyłącz inteligentne skracanie"
-
-#: 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 "Zwykle system próbuje znaleźć najlepszy link do dodania do skróconych postów. Jeśli ta opcja jest włączona, każdy skrócony wpis zawsze wskazuje oryginalny post znajomej osoby."
-
-#: mod/settings.php:842
-msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
-msgstr "Automatycznie podążaj za wszystkimi obserwatorami/rzecznikami GNU Społeczności (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 "Jeśli otrzymasz wiadomość od nieznanego użytkownika OStatus, ta opcja decyduje, co zrobić. Jeśli zostanie zaznaczone, dla każdego nieznanego użytkownika zostanie utworzony nowy kontakt."
-
-#: mod/settings.php:843
-msgid "Default group for OStatus contacts"
-msgstr "Domyślna grupa dla kontaktów OStatus"
-
-#: mod/settings.php:844
-msgid "Your legacy GNU Social account"
-msgstr "Twoje starsze konto społecznościowe GNU"
-
-#: 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 "Jeśli podasz swoją starą nazwę konta GNU Social/Statusnet tutaj (w formacie user@domain.tld), twoje kontakty zostaną dodane automatycznie. Pole zostanie opróżnione po zakończeniu."
-
-#: mod/settings.php:847
-msgid "Repair OStatus subscriptions"
-msgstr "Napraw subskrypcje OStatus"
-
-#: mod/settings.php:851
-msgid "Email/Mailbox Setup"
-msgstr "Ustawienia  emaila/skrzynki mailowej"
-
-#: 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 "Jeśli chcesz komunikować się z kontaktami e-mail za pomocą tej usługi (opcjonalnie), określ sposób łączenia się ze skrzynką pocztową."
-
-#: mod/settings.php:853
-msgid "Last successful email check:"
-msgstr "Ostatni sprawdzony e-mail:"
-
-#: mod/settings.php:855
-msgid "IMAP server name:"
-msgstr "Nazwa serwera IMAP:"
-
-#: mod/settings.php:856
-msgid "IMAP port:"
-msgstr "Port IMAP:"
-
-#: mod/settings.php:857
-msgid "Security:"
-msgstr "Ochrona:"
-
-#: mod/settings.php:857 mod/settings.php:862
-msgid "None"
-msgstr "Brak"
-
-#: mod/settings.php:858
-msgid "Email login name:"
-msgstr "Nazwa logowania e-mail:"
-
-#: mod/settings.php:859
-msgid "Email password:"
-msgstr "E-mail hasło:"
-
-#: mod/settings.php:860
-msgid "Reply-to address:"
-msgstr "Adres zwrotny:"
-
-#: mod/settings.php:861
-msgid "Send public posts to all email contacts:"
-msgstr "Wyślij publiczny post do wszystkich kontaktów e-mail"
-
-#: mod/settings.php:862
-msgid "Action after import:"
-msgstr "Akcja po zaimportowaniu:"
-
-#: mod/settings.php:862 src/Content/Nav.php:193
-msgid "Mark as seen"
-msgstr "Oznacz jako przeczytane"
-
-#: mod/settings.php:862
-msgid "Move to folder"
-msgstr "Przenieś do folderu"
-
-#: mod/settings.php:863
-msgid "Move to folder:"
-msgstr "Przenieś do folderu:"
-
-#: mod/settings.php:906
-#, php-format
-msgid "%s - (Unsupported)"
-msgstr "%s - (Nieobsługiwane)"
-
-#: mod/settings.php:908
-#, php-format
-msgid "%s - (Experimental)"
-msgstr "%s- (Eksperymentalne)"
-
-#: mod/settings.php:951
-msgid "Display Settings"
-msgstr "Ustawienia wyglądu"
-
-#: mod/settings.php:957 mod/settings.php:981
-msgid "Display Theme:"
-msgstr "Wyświetl motyw:"
-
-#: mod/settings.php:958
-msgid "Mobile Theme:"
-msgstr "Motyw dla urządzeń mobilnych:"
-
-#: mod/settings.php:959
-msgid "Suppress warning of insecure networks"
-msgstr "Ukryj ostrzeżenie przed niebezpiecznymi sieciami"
-
-#: 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 "System powinien pominąć ostrzeżenie, że bieżąca grupa zawiera członków sieci, którzy nie mogą otrzymywać komentarzy niepublicznych"
-
-#: mod/settings.php:960
-msgid "Update browser every xx seconds"
-msgstr "Odświeżaj stronę co xx sekund"
-
-#: mod/settings.php:960
-msgid "Minimum of 10 seconds. Enter -1 to disable it."
-msgstr "Minimum 10 sekund. Wprowadź -1, aby go wyłączyć."
-
-#: mod/settings.php:961
-msgid "Number of items to display per page:"
-msgstr "Liczba elementów do wyświetlenia na stronie:"
-
-#: mod/settings.php:961 mod/settings.php:962
-msgid "Maximum of 100 items"
-msgstr "Maksymalnie 100 elementów"
-
-#: mod/settings.php:962
-msgid "Number of items to display per page when viewed from mobile device:"
-msgstr "Liczba elementów do wyświetlenia na stronie podczas przeglądania z urządzenia mobilnego:"
-
-#: mod/settings.php:963
-msgid "Don't show emoticons"
-msgstr "Nie pokazuj emotikonek"
-
-#: mod/settings.php:964
-msgid "Calendar"
-msgstr "Kalendarz"
-
-#: mod/settings.php:965
-msgid "Beginning of week:"
-msgstr "Początek tygodnia:"
-
-#: mod/settings.php:966
-msgid "Don't show notices"
-msgstr "Nie pokazuj powiadomień"
-
-#: mod/settings.php:967
-msgid "Infinite scroll"
-msgstr "Nieskończone przewijanie"
-
-#: mod/settings.php:968
-msgid "Automatic updates only at the top of the network page"
-msgstr "Automatyczne aktualizacje tylko u góry strony sieci"
-
-#: mod/settings.php:968
-msgid ""
-"When disabled, the network page is updated all the time, which could be "
-"confusing while reading."
-msgstr "Po wyłączeniu strona sieciowa jest cały czas aktualizowana, co może być mylące podczas czytania."
-
-#: mod/settings.php:969
-msgid "Bandwith Saver Mode"
-msgstr "Tryb oszczędzania przepustowości"
-
-#: mod/settings.php:969
-msgid ""
-"When enabled, embedded content is not displayed on automatic updates, they "
-"only show on page reload."
-msgstr "Po włączeniu wbudowana zawartość nie jest wyświetlana w automatycznych aktualizacjach, wyświetlają się tylko przy przeładowaniu strony."
-
-#: mod/settings.php:970
-msgid "Smart Threading"
-msgstr "Inteligentne wątki"
-
-#: 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 "Włączenie tej opcji powoduje pomijanie wcięcia wątków zewnętrznych, zachowując je w dowolnym miejscu. Działa tylko wtedy, gdy wątki są dostępne i włączone."
-
-#: mod/settings.php:972
-msgid "General Theme Settings"
-msgstr "Ogólne ustawienia motywu"
-
-#: mod/settings.php:973
-msgid "Custom Theme Settings"
-msgstr "Niestandardowe ustawienia motywów"
-
-#: mod/settings.php:974
-msgid "Content Settings"
-msgstr "Ustawienia zawartości"
-
-#: 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 "Ustawienia motywu"
-
-#: mod/settings.php:994
-msgid "Unable to find your profile. Please contact your admin."
-msgstr "Nie można znaleźć Twojego profilu. Skontaktuj się z administratorem."
-
-#: mod/settings.php:1033
-msgid "Account Types"
-msgstr "Rodzaje kont"
-
-#: mod/settings.php:1034
-msgid "Personal Page Subtypes"
-msgstr "Podtypy osobistych stron"
-
-#: mod/settings.php:1035
-msgid "Community Forum Subtypes"
-msgstr "Podtypy społeczności forum"
-
-#: mod/settings.php:1043
-msgid "Account for a personal profile."
-msgstr "Konto dla profilu osobistego."
-
-#: mod/settings.php:1047
-msgid ""
-"Account for an organisation that automatically approves contact requests as "
-"\"Followers\"."
-msgstr "Konto dla organizacji, która automatycznie zatwierdza prośby o kontakt jako \"Obserwatorzy\"."
-
-#: mod/settings.php:1051
-msgid ""
-"Account for a news reflector that automatically approves contact requests as"
-" \"Followers\"."
-msgstr "Konto dla reflektora wiadomości, który automatycznie zatwierdza prośby o kontakt jako \"Obserwatorzy\"."
-
-#: mod/settings.php:1055
-msgid "Account for community discussions."
-msgstr "Konto do dyskusji w społeczności."
-
-#: mod/settings.php:1059
-msgid ""
-"Account for a regular personal profile that requires manual approval of "
-"\"Friends\" and \"Followers\"."
-msgstr "Konto dla zwykłego profilu osobistego, który wymaga ręcznej zgody \"Przyjaciół\" i \"Obserwatorów\"."
-
-#: mod/settings.php:1063
-msgid ""
-"Account for a public profile that automatically approves contact requests as"
-" \"Followers\"."
-msgstr "Konto dla profilu publicznego, który automatycznie zatwierdza prośby o kontakt jako \"Obserwatorzy\"."
-
-#: mod/settings.php:1067
-msgid "Automatically approves all contact requests."
-msgstr "Automatycznie zatwierdza wszystkie prośby o kontakt."
-
-#: mod/settings.php:1071
-msgid ""
-"Account for a popular profile that automatically approves contact requests "
-"as \"Friends\"."
-msgstr "Konto popularnego profilu, które automatycznie zatwierdza prośby o kontakt jako \"Przyjaciele\"."
-
-#: mod/settings.php:1074
-msgid "Private Forum [Experimental]"
-msgstr "Prywatne Forum [Eksperymentalne]"
-
-#: mod/settings.php:1075
-msgid "Requires manual approval of contact requests."
-msgstr "Wymaga ręcznego zatwierdzania żądań kontaktów."
-
-#: mod/settings.php:1086
-msgid "OpenID:"
-msgstr "OpenID:"
-
-#: mod/settings.php:1086
-msgid "(Optional) Allow this OpenID to login to this account."
-msgstr "(Opcjonalnie) Pozwól zalogować się na to konto przy pomocy OpenID."
-
-#: mod/settings.php:1094
-msgid "Publish your default profile in your local site directory?"
-msgstr "Opublikować Twój domyślny profil w Twoim lokalnym katalogu stron?"
-
-#: mod/settings.php:1094
+#: src/Database/DBStructure.php:76
 #, 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 "Twój profil zostanie opublikowany w globalnych katalogach friendica (np.<a href=\"%s\">%s</a>). Twój profil będzie widoczny publicznie."
+"\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\tDeweloperzy friendica wydali niedawno aktualizację %s,\n\t\t\t\tale podczas próby instalacji, coś poszło nie tak.\n\t\t\t\tZostanie to naprawione wkrótce i nie mogę tego zrobić sam. Proszę skontaktować się z \n\t\t\t\tprogramistami friendica, jeśli nie możesz mi pomóc na własną rękę. Moja baza danych może być nieprawidłowa."
 
-#: mod/settings.php:1100
-msgid "Publish your default profile in the global social directory?"
-msgstr "Opublikować Twój domyślny profil w globalnym, społecznościowym katalogu?"
-
-#: mod/settings.php:1100
+#: src/Database/DBStructure.php:81
 #, 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 "Twój profil zostanie opublikowany w lokalnym katalogu tego <a href=\"%s\">węzła</a>. Dane Twojego profilu mogą być publicznie widoczne w zależności od ustawień systemu."
+"The error message is\n"
+"[pre]%s[/pre]"
+msgstr "Komunikat o błędzie jest \n[pre]%s[/ pre]"
 
-#: mod/settings.php:1107
-msgid "Hide your contact/friend list from viewers of your default profile?"
-msgstr "Ukryć listę znajomych przed odwiedzającymi Twój profil?"
-
-#: 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 "Twoja lista kontaktów nie będzie wyświetlana na domyślnej stronie profilu. Możesz zdecydować o wyświetleniu listy kontaktów osobno dla każdego tworzonego dodatkowego profilu."
+"\n"
+"Error %d occurred during database update:\n"
+"%s\n"
+msgstr "\nWystąpił błąd %d podczas aktualizacji bazy danych:\n%s\n"
 
-#: mod/settings.php:1111
-msgid "Hide your profile details from anonymous viewers?"
-msgstr "Ukryć dane Twojego profilu przed anonimowymi widzami?"
+#: src/Database/DBStructure.php:195
+msgid "Errors encountered performing database changes: "
+msgstr "Napotkane błędy powodujące zmiany w bazie danych:"
 
-#: 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. Disables posting public "
-"messages to Diaspora and other networks."
-msgstr "Anonimowi użytkownicy zobaczą tylko Twoje zdjęcie profilowe, Twoją wyświetlaną nazwę i pseudonim, którego używasz na stronie profilu. Wyłącza wysyłanie publicznych wiadomości do Diaspory i innych sieci."
-
-#: mod/settings.php:1115
-msgid "Allow friends to post to your profile page?"
-msgstr "Zezwalać znajomym na publikowanie postów na stronie Twojego profilu?"
-
-#: mod/settings.php:1115
-msgid ""
-"Your contacts may write posts on your profile wall. These posts will be "
-"distributed to your contacts"
-msgstr "Twoi znajomi mogą pisać posty na stronie Twojego profilu. Posty zostaną przesłane do Twoich kontaktów."
-
-#: mod/settings.php:1119
-msgid "Allow friends to tag your posts?"
-msgstr "Zezwolić na oznaczanie Twoich postów przez znajomych?"
-
-#: mod/settings.php:1119
-msgid "Your contacts can add additional tags to your posts."
-msgstr "Twoje kontakty mogą dodawać do tagów dodatkowe posty."
-
-#: mod/settings.php:1123
-msgid "Allow us to suggest you as a potential friend to new members?"
-msgstr "Zezwolić na zaproponowanie Cię jako potencjalnego przyjaciela dla nowych członków?"
-
-#: mod/settings.php:1123
-msgid ""
-"If you like, Friendica may suggest new members to add you as a contact."
-msgstr "Jeśli chcesz, Friendica może zaproponować nowym członkom dodanie Cię jako kontakt."
-
-#: mod/settings.php:1127
-msgid "Permit unknown people to send you private mail?"
-msgstr "Zezwolić nieznanym osobom na wysyłanie prywatnych wiadomości?"
-
-#: mod/settings.php:1127
-msgid ""
-"Friendica network users may send you private messages even if they are not "
-"in your contact list."
-msgstr "Użytkownicy sieci w serwisie Friendica mogą wysyłać prywatne wiadomości, nawet jeśli nie znajdują się one na liście kontaktów."
-
-#: mod/settings.php:1131
-msgid "Profile is <strong>not published</strong>."
-msgstr "Profil <strong>nie jest opublikowany</strong>"
-
-#: mod/settings.php:1137
+#: src/Database/DBStructure.php:211
 #, php-format
-msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
-msgstr "Twój adres tożsamości to <strong>'%s'</strong> lub '%s'."
+msgid "%s: Database update"
+msgstr "%s: Aktualizacja bazy danych:"
 
-#: mod/settings.php:1144
-msgid "Automatically expire posts after this many days:"
-msgstr "Posty wygasną automatycznie po następującej liczbie dni:"
-
-#: mod/settings.php:1144
-msgid "If empty, posts will not expire. Expired posts will be deleted"
-msgstr "Pole puste, wiadomość nie wygaśnie. Niezapisane wpisy zostaną usunięte."
-
-#: mod/settings.php:1145
-msgid "Advanced expiration settings"
-msgstr "Zaawansowane ustawienia wygasania"
-
-#: mod/settings.php:1146
-msgid "Advanced Expiration"
-msgstr "Zaawansowane wygasanie"
-
-#: mod/settings.php:1147
-msgid "Expire posts:"
-msgstr "Wygasające posty:"
-
-#: mod/settings.php:1148
-msgid "Expire personal notes:"
-msgstr "Wygasanie osobistych notatek:"
-
-#: mod/settings.php:1149
-msgid "Expire starred posts:"
-msgstr "Wygasaj posty oznaczone gwiazdką:"
-
-#: mod/settings.php:1150
-msgid "Expire photos:"
-msgstr "Wygasanie zdjęć:"
-
-#: mod/settings.php:1151
-msgid "Only expire posts by others:"
-msgstr "Wygaszaj tylko te posty, które zostały napisane przez inne osoby:"
-
-#: mod/settings.php:1181
-msgid "Account Settings"
-msgstr "Ustawienia konta"
-
-#: mod/settings.php:1189
-msgid "Password Settings"
-msgstr "Ustawienia hasła"
-
-#: mod/settings.php:1191
-msgid "Leave password fields blank unless changing"
-msgstr "Pozostaw pole hasła puste, chyba że chcesz je zmienić."
-
-#: mod/settings.php:1192
-msgid "Current Password:"
-msgstr "Aktualne hasło:"
-
-#: mod/settings.php:1192 mod/settings.php:1193
-msgid "Your current password to confirm the changes"
-msgstr "Wpisz aktualne hasło, aby potwierdzić zmiany"
-
-#: mod/settings.php:1193
-msgid "Password:"
-msgstr "Hasło:"
-
-#: mod/settings.php:1197
-msgid "Basic Settings"
-msgstr "Ustawienia podstawowe"
-
-#: mod/settings.php:1198 src/Model/Profile.php:736
-msgid "Full Name:"
-msgstr "Imię i Nazwisko:"
-
-#: mod/settings.php:1199
-msgid "Email Address:"
-msgstr "Adres email:"
-
-#: mod/settings.php:1200
-msgid "Your Timezone:"
-msgstr "Twoja strefa czasowa:"
-
-#: mod/settings.php:1201
-msgid "Your Language:"
-msgstr "Twój język:"
-
-#: mod/settings.php:1201
-msgid ""
-"Set the language we use to show you friendica interface and to send you "
-"emails"
-msgstr "Wybierz język, którego używasz, aby pokazać interfejs użytkownika friendica i do wysłania Ci e-maili"
-
-#: mod/settings.php:1202
-msgid "Default Post Location:"
-msgstr "Domyślna lokalizacja wiadomości:"
-
-#: mod/settings.php:1203
-msgid "Use Browser Location:"
-msgstr "Użyj lokalizacji przeglądarki:"
-
-#: mod/settings.php:1206
-msgid "Security and Privacy Settings"
-msgstr "Ustawienia bezpieczeństwa i prywatności"
-
-#: mod/settings.php:1208
-msgid "Maximum Friend Requests/Day:"
-msgstr "Maksymalna dzienna liczba zaproszeń do grona przyjaciół:"
-
-#: mod/settings.php:1208 mod/settings.php:1237
-msgid "(to prevent spam abuse)"
-msgstr "(aby zapobiec spamowaniu)"
-
-#: mod/settings.php:1209
-msgid "Default Post Permissions"
-msgstr "Domyślne prawa dostępu wiadomości"
-
-#: mod/settings.php:1210
-msgid "(click to open/close)"
-msgstr "(kliknij by otworzyć/zamknąć)"
-
-#: mod/settings.php:1220
-msgid "Default Private Post"
-msgstr "Domyślny Prywatny Wpis"
-
-#: mod/settings.php:1221
-msgid "Default Public Post"
-msgstr "Domyślny Publiczny Post"
-
-#: mod/settings.php:1225
-msgid "Default Permissions for New Posts"
-msgstr "Uprawnienia domyślne dla nowych postów"
-
-#: mod/settings.php:1237
-msgid "Maximum private messages per day from unknown people:"
-msgstr "Maksymalna liczba prywatnych wiadomości dziennie od nieznanych osób:"
-
-#: mod/settings.php:1240
-msgid "Notification Settings"
-msgstr "Ustawienia powiadomień"
-
-#: mod/settings.php:1241
-msgid "Send a notification email when:"
-msgstr "Wyślij powiadmonienia na email, kiedy:"
-
-#: mod/settings.php:1242
-msgid "You receive an introduction"
-msgstr "Otrzymałeś zaproszenie"
-
-#: mod/settings.php:1243
-msgid "Your introductions are confirmed"
-msgstr "Twoje zaproszenie jest potwierdzone"
-
-#: mod/settings.php:1244
-msgid "Someone writes on your profile wall"
-msgstr "Ktoś pisze na twoim profilu"
-
-#: mod/settings.php:1245
-msgid "Someone writes a followup comment"
-msgstr "Ktoś pisze komentarz nawiązujący."
-
-#: mod/settings.php:1246
-msgid "You receive a private message"
-msgstr "Otrzymałeś prywatną wiadomość"
-
-#: mod/settings.php:1247
-msgid "You receive a friend suggestion"
-msgstr "Otrzymałeś propozycję od znajomych"
-
-#: mod/settings.php:1248
-msgid "You are tagged in a post"
-msgstr "Jesteś oznaczony tagiem w poście"
-
-#: mod/settings.php:1249
-msgid "You are poked/prodded/etc. in a post"
-msgstr "Jesteś zaczepiony/zaczepiona/itp. w poście"
-
-#: mod/settings.php:1251
-msgid "Activate desktop notifications"
-msgstr "Aktywuj powiadomienia na pulpicie"
-
-#: mod/settings.php:1251
-msgid "Show desktop popup on new notifications"
-msgstr "Pokaż wyskakujące okienko dla nowych powiadomień"
-
-#: mod/settings.php:1253
-msgid "Text-only notification emails"
-msgstr "E-maile z powiadomieniami tekstowymi"
-
-#: mod/settings.php:1255
-msgid "Send text only notification emails, without the html part"
-msgstr "Wysyłaj tylko e-maile z powiadomieniami tekstowymi, bez części html"
-
-#: mod/settings.php:1257
-msgid "Show detailled notifications"
-msgstr "Pokaż szczegółowe powiadomienia"
-
-#: mod/settings.php:1259
-msgid ""
-"Per default, notifications are condensed to a single notification per item. "
-"When enabled every notification is displayed."
-msgstr "Domyślne powiadomienia są skondensowane z jednym powiadomieniem dla każdego przedmiotu. Po włączeniu wyświetlane jest każde powiadomienie."
-
-#: mod/settings.php:1261
-msgid "Advanced Account/Page Type Settings"
-msgstr "Zaawansowane ustawienia konta/rodzaju strony"
-
-#: mod/settings.php:1262
-msgid "Change the behaviour of this account for special situations"
-msgstr "Zmień zachowanie tego konta w sytuacjach specjalnych"
-
-#: mod/settings.php:1265
-msgid "Relocate"
-msgstr "Przeniesienie"
-
-#: 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 "Jeśli ten profil został przeniesiony z innego serwera, a niektóre z Twoich kontaktów nie otrzymają aktualizacji, spróbuj nacisnąć ten przycisk."
-
-#: mod/settings.php:1267
-msgid "Resend relocate message to contacts"
-msgstr "Wyślij ponownie przenieść wiadomości do kontaktów"
-
-#: view/theme/duepuntozero/config.php:54 src/Model/User.php:502
-msgid "default"
-msgstr "standardowe"
-
-#: 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 "Zajączek wielkanocny"
-
-#: 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 ""
-
-#: view/theme/duepuntozero/config.php:74
-msgid "Variations"
-msgstr "Zmiana"
-
-#: view/theme/frio/php/Image.php:24
-msgid "Top Banner"
-msgstr "Górny Baner"
-
-#: 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 "Zmień rozmiar obrazu na szerokość ekranu i pokaż kolor tła poniżej na długich stronach."
-
-#: view/theme/frio/php/Image.php:25
-msgid "Full screen"
-msgstr "Pełny ekran"
-
-#: view/theme/frio/php/Image.php:25
-msgid ""
-"Resize image to fill entire screen, clipping either the right or the bottom."
-msgstr "Zmień rozmiar obrazu, aby wypełnić cały ekran, przycinając prawy lub dolny."
-
-#: view/theme/frio/php/Image.php:26
-msgid "Single row mosaic"
-msgstr "Mozaika jednorzędowa"
-
-#: view/theme/frio/php/Image.php:26
-msgid ""
-"Resize image to repeat it on a single row, either vertical or horizontal."
-msgstr "Zmień rozmiar obrazu, aby powtórzyć go w jednym wierszu, w pionie lub w poziomie."
-
-#: view/theme/frio/php/Image.php:27
-msgid "Mosaic"
-msgstr "Mozaika"
-
-#: view/theme/frio/php/Image.php:27
-msgid "Repeat image to fill the screen."
-msgstr "Powtórz obraz, aby wypełnić ekran."
-
-#: view/theme/frio/config.php:102
-msgid "Custom"
-msgstr "Niestandardowe"
-
-#: view/theme/frio/config.php:114
-msgid "Note"
-msgstr "Uwaga"
-
-#: view/theme/frio/config.php:114
-msgid "Check image permissions if all users are allowed to see the image"
-msgstr "Sprawdź uprawnienia do zdjęć, jeśli wszyscy użytkownicy mogą zobaczyć obraz"
-
-#: view/theme/frio/config.php:121
-msgid "Select color scheme"
-msgstr "Wybierz schemat kolorów"
-
-#: view/theme/frio/config.php:122
-msgid "Navigation bar background color"
-msgstr "Kolor tła paska nawigacyjnego"
-
-#: view/theme/frio/config.php:123
-msgid "Navigation bar icon color "
-msgstr "Kolor ikony paska nawigacyjnego"
-
-#: view/theme/frio/config.php:124
-msgid "Link color"
-msgstr "Kolor łączy"
-
-#: view/theme/frio/config.php:125
-msgid "Set the background color"
-msgstr "Ustaw kolor tła"
-
-#: view/theme/frio/config.php:126
-msgid "Content background opacity"
-msgstr "Nieprzezroczystość tła treści"
-
-#: view/theme/frio/config.php:127
-msgid "Set the background image"
-msgstr "Ustaw obraz tła"
-
-#: view/theme/frio/config.php:128
-msgid "Background image style"
-msgstr "Styl tła"
-
-#: view/theme/frio/config.php:133
-msgid "Login page background image"
-msgstr "Obraz tła strony logowania"
-
-#: view/theme/frio/config.php:137
-msgid "Login page background color"
-msgstr "Kolor tła strony logowania"
-
-#: view/theme/frio/config.php:137
-msgid "Leave background image and color empty for theme defaults"
-msgstr "Pozostaw obraz tła i kolor pusty dla domyślnych ustawień kompozycji"
-
-#: view/theme/frio/theme.php:238
-msgid "Guest"
-msgstr "Gość"
-
-#: view/theme/frio/theme.php:243
-msgid "Visitor"
-msgstr "Odwiedzający"
-
-#: view/theme/frio/theme.php:256 src/Content/Nav.php:97
-#: src/Module/Login.php:312
-msgid "Logout"
-msgstr "Wyloguj się"
-
-#: view/theme/frio/theme.php:256 src/Content/Nav.php:97
-msgid "End this session"
-msgstr "Zakończ sesję"
-
-#: view/theme/frio/theme.php:259 src/Content/Nav.php:100
-#: src/Content/Nav.php:186
-msgid "Your posts and conversations"
-msgstr "Twoje posty i rozmowy"
-
-#: view/theme/frio/theme.php:260 src/Content/Nav.php:101
-msgid "Your profile page"
-msgstr "Twoja strona profilowa"
-
-#: view/theme/frio/theme.php:261 src/Content/Nav.php:102
-msgid "Your photos"
-msgstr "Twoje zdjęcia"
-
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:103
-#: src/Model/Profile.php:910 src/Model/Profile.php:913
-msgid "Videos"
-msgstr "Filmy"
-
-#: view/theme/frio/theme.php:262 src/Content/Nav.php:103
-msgid "Your videos"
-msgstr "Twoje filmy"
-
-#: view/theme/frio/theme.php:263 src/Content/Nav.php:104
-msgid "Your events"
-msgstr "Twoje wydarzenia"
-
-#: view/theme/frio/theme.php:266 src/Content/Nav.php:183
-msgid "Conversations from your friends"
-msgstr "Rozmowy Twoich przyjaciół"
-
-#: 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 "Wydarzenia i kalendarz"
-
-#: view/theme/frio/theme.php:268 src/Content/Nav.php:196
-msgid "Private mail"
-msgstr "Prywatne maile"
-
-#: view/theme/frio/theme.php:269 src/Content/Nav.php:207
-msgid "Account settings"
-msgstr "Ustawienia konta"
-
-#: view/theme/frio/theme.php:270 src/Content/Nav.php:213
-msgid "Manage/edit friends and contacts"
-msgstr "Zarządzaj listą przyjaciół i kontaktami"
-
-#: view/theme/quattro/config.php:76
-msgid "Alignment"
-msgstr "Wyrównanie"
-
-#: view/theme/quattro/config.php:76
-msgid "Left"
-msgstr "Lewo"
-
-#: view/theme/quattro/config.php:76
-msgid "Center"
-msgstr "Środek"
-
-#: view/theme/quattro/config.php:77
-msgid "Color scheme"
-msgstr "Zestaw kolorów"
-
-#: view/theme/quattro/config.php:78
-msgid "Posts font size"
-msgstr "Rozmiar czcionki postów"
-
-#: view/theme/quattro/config.php:79
-msgid "Textareas font size"
-msgstr "Rozmiar czcionki Textareas"
-
-#: view/theme/vier/config.php:75
-msgid "Comma separated list of helper forums"
-msgstr "Lista pomocników oddzielona przecinkami"
-
-#: view/theme/vier/config.php:115 src/Core/ACL.php:309
-msgid "don't show"
-msgstr "nie pokazuj"
-
-#: view/theme/vier/config.php:115 src/Core/ACL.php:308
-msgid "show"
-msgstr "pokaż"
-
-#: view/theme/vier/config.php:122
-msgid "Set style"
-msgstr "Ustaw styl"
-
-#: view/theme/vier/config.php:123
-msgid "Community Pages"
-msgstr "Strony społeczności"
-
-#: view/theme/vier/config.php:124 view/theme/vier/theme.php:150
-msgid "Community Profiles"
-msgstr "Profile społeczności"
-
-#: view/theme/vier/config.php:125
-msgid "Help or @NewHere ?"
-msgstr "Pomóż lub @NowyTutaj?"
-
-#: view/theme/vier/config.php:126 view/theme/vier/theme.php:388
-msgid "Connect Services"
-msgstr "Połączone serwisy"
-
-#: view/theme/vier/config.php:127
-msgid "Find Friends"
-msgstr "Znajdź znajomych"
-
-#: view/theme/vier/config.php:128 view/theme/vier/theme.php:181
-msgid "Last users"
-msgstr "Ostatni użytkownicy"
-
-#: view/theme/vier/theme.php:199 src/Content/Widget.php:59
-msgid "Find People"
-msgstr "Znajdź ludzi"
-
-#: view/theme/vier/theme.php:200 src/Content/Widget.php:60
-msgid "Enter name or interest"
-msgstr "Wpisz nazwę lub zainteresowanie"
-
-#: view/theme/vier/theme.php:202 src/Content/Widget.php:62
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Przykład: Jan Kowalski, Wędkarstwo"
-
-#: view/theme/vier/theme.php:205 src/Content/Widget.php:65
-msgid "Similar Interests"
-msgstr "Podobne zainteresowania"
-
-#: view/theme/vier/theme.php:206 src/Content/Widget.php:66
-msgid "Random Profile"
-msgstr "Domyślny profil"
-
-#: view/theme/vier/theme.php:207 src/Content/Widget.php:67
-msgid "Invite Friends"
-msgstr "Zaproś znajomych"
-
-#: view/theme/vier/theme.php:210 src/Content/Widget.php:70
-msgid "Local Directory"
-msgstr "Katalog lokalny"
-
-#: view/theme/vier/theme.php:255 src/Content/ForumManager.php:127
-msgid "External link to forum"
-msgstr "Zewnętrzny link do forum"
-
-#: view/theme/vier/theme.php:291
-msgid "Quick Start"
-msgstr "Szybki start"
-
-#: src/Core/UserImport.php:104
-msgid "Error decoding account file"
-msgstr "Błąd podczas odczytu pliku konta"
-
-#: src/Core/UserImport.php:110
-msgid "Error! No version data in file! This is not a Friendica account file?"
-msgstr "Błąd! Brak danych wersji w pliku! To nie jest plik konta Friendica?"
-
-#: src/Core/UserImport.php:118
+#: src/Database/DBStructure.php:473
 #, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "Użytkownik '%s' już istnieje na tym serwerze!"
+msgid "%s: updating %s table."
+msgstr "%s: aktualizowanie %s tabeli."
 
-#: src/Core/UserImport.php:151
-msgid "User creation error"
-msgstr "Błąd tworzenia użytkownika"
-
-#: src/Core/UserImport.php:169
-msgid "User profile creation error"
-msgstr "Błąd tworzenia profilu użytkownika"
-
-#: src/Core/UserImport.php:213
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] "Nie zaimportowano %d kontaktu."
-msgstr[1] "Nie zaimportowano %d kontaktów."
-msgstr[2] "Nie zaimportowano %d kontaktów."
-msgstr[3] "%dkontakty nie zostały zaimportowane "
-
-#: src/Core/UserImport.php:278
-msgid "Done. You can now login with your username and password"
-msgstr "Gotowe. Możesz teraz zalogować się, podając swoją nazwę użytkownika i hasło."
-
-#: src/Core/ACL.php:295
-msgid "Post to Email"
-msgstr "Prześlij e-mailem"
-
-#: src/Core/ACL.php:301
-msgid "Hide your profile details from unknown viewers?"
-msgstr "Ukryć szczegóły twojego profilu przed nieznajomymi?"
-
-#: src/Core/ACL.php:300
-#, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
-msgstr "Wtyczki są wyłączone, ponieważ \"%s\" jest włączone."
-
-#: src/Core/ACL.php:307
-msgid "Visible to everybody"
-msgstr "Widoczny dla wszystkich"
-
-#: src/Core/ACL.php:319
-msgid "Close"
-msgstr "Zamknij"
-
-#: src/Core/Console/NewPassword.php:78
-msgid "Enter new password: "
-msgstr "Wprowadź nowe hasło:"
-
-#: src/Core/Console/NewPassword.php:83 src/Model/User.php:262
-msgid "Password can't be empty"
-msgstr "Hasło nie może być puste"
-
-#: src/Core/Console/ArchiveContact.php:67
-#, php-format
-msgid "Could not find any unarchived contact entry for this URL (%s)"
-msgstr "Nie można znaleźć żadnego wpisu kontaktu zarchiwizowanego dla tego adresu URL (%s)"
-
-#: src/Core/Console/ArchiveContact.php:72
-msgid "The contact entries have been archived"
-msgstr "Wpisy kontaktów zostały zarchiwizowane"
-
-#: src/Core/NotificationsManager.php:171
-msgid "System"
-msgstr "System"
-
-#: src/Core/NotificationsManager.php:192 src/Content/Nav.php:124
-#: src/Content/Nav.php:186
-msgid "Home"
-msgstr "Strona domowa"
-
-#: src/Core/NotificationsManager.php:199 src/Content/Nav.php:190
-msgid "Introductions"
-msgstr "Zapoznanie"
-
-#: src/Core/NotificationsManager.php:256 src/Core/NotificationsManager.php:268
-#, php-format
-msgid "%s commented on %s's post"
-msgstr "%s skomentował wpis %s"
-
-#: src/Core/NotificationsManager.php:267
-#, php-format
-msgid "%s created a new post"
-msgstr "%s dodał nowy wpis"
-
-#: src/Core/NotificationsManager.php:281
-#, php-format
-msgid "%s liked %s's post"
-msgstr "%s polubił wpis %s"
-
-#: src/Core/NotificationsManager.php:294
-#, php-format
-msgid "%s disliked %s's post"
-msgstr "%s nie lubi tych %s postów"
-
-#: src/Core/NotificationsManager.php:307
-#, php-format
-msgid "%s is attending %s's event"
-msgstr "%suczestniczy %sw wydarzeniu "
-
-#: src/Core/NotificationsManager.php:320
-#, php-format
-msgid "%s is not attending %s's event"
-msgstr "%snie uczestniczy %s w wydarzeniu "
-
-#: src/Core/NotificationsManager.php:333
-#, php-format
-msgid "%s may attend %s's event"
-msgstr "%smoże uczestniczyć %s w wydarzeniu"
-
-#: src/Core/NotificationsManager.php:350
-#, php-format
-msgid "%s is now friends with %s"
-msgstr "%s jest teraz znajomym %s"
-
-#: src/Core/NotificationsManager.php:825
-msgid "Friend Suggestion"
-msgstr "Propozycja znajomych"
-
-#: src/Core/NotificationsManager.php:851
-msgid "Friend/Connect Request"
-msgstr "Prośba o dodanie do przyjaciół/powiązanych"
-
-#: src/Core/NotificationsManager.php:851
-msgid "New Follower"
-msgstr "Nowy obserwujący"
-
-#: 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 "Nie można znaleźć wersji PHP komendy w serwerze 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 "
 "href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-"
 "up-the-worker'>'Setup the worker'</a>"
-msgstr "Jeśli nie masz zainstalowanej na serwerze wersji PHP z wiersza poleceń, nie będziesz mógł uruchomić przetwarzania w tle. Zobacz <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Konfiguracja pracownika'</a>"
+msgstr "Jeśli nie masz zainstalowanej na serwerze wersji PHP z wierszem poleceń, nie będziesz mógł uruchomić przetwarzania w tle. Zobacz <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Konfiguracja pracownika'</a>"
 
-#: src/Core/Install.php:162
+#: src/Core/Install.php:143
 msgid "PHP executable path"
 msgstr "Ścieżka wykonywalna 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 "Wprowadź pełną ścieżkę do pliku wykonywalnego php. Możesz pozostawić to pole puste, aby kontynuować instalację."
 
-#: src/Core/Install.php:167
+#: src/Core/Install.php:148
 msgid "Command line PHP"
 msgstr "Linia komend 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 "Plik wykonywalny PHP nie jest php cli binarny (może być wersją cgi-fgci)"
 
-#: src/Core/Install.php:177
+#: src/Core/Install.php:158
 msgid "Found PHP version: "
 msgstr "Znaleziono wersje PHP:"
 
-#: src/Core/Install.php:179
+#: src/Core/Install.php:160
 msgid "PHP cli binary"
 msgstr "PHP cli binarny"
 
-#: 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 "Wersja linii poleceń PHP w twoim systemie nie ma aktywowanego \"register_argc_argv\"."
 
-#: src/Core/Install.php:190
+#: src/Core/Install.php:171
 msgid "This is required for message delivery to work."
 msgstr "Jest wymagane, aby dostarczanie wiadomości działało."
 
-#: 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 "Błąd: funkcja \"openssl_pkey_new\" w tym systemie nie jest w stanie wygenerować kluczy szyfrujących"
 
-#: 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 "Jeśli korzystasz z Windowsa, proszę odwiedzić \"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: src/Core/Install.php:223
+#: src/Core/Install.php:204
 msgid "Generate encryption keys"
 msgstr "Generuj klucz kodowania"
 
-#: src/Core/Install.php:244
+#: src/Core/Install.php:225
 msgid "libCurl PHP module"
 msgstr "Moduł libCurl PHP"
 
-#: src/Core/Install.php:245
+#: src/Core/Install.php:226
 msgid "GD graphics PHP module"
 msgstr "Moduł PHP-GD"
 
-#: src/Core/Install.php:246
+#: src/Core/Install.php:227
 msgid "OpenSSL PHP module"
 msgstr "Moduł PHP OpenSSL"
 
-#: src/Core/Install.php:247
+#: src/Core/Install.php:228
 msgid "PDO or MySQLi PHP module"
 msgstr "Moduł PDO lub MySQLi PHP"
 
-#: src/Core/Install.php:248
+#: src/Core/Install.php:229
 msgid "mb_string PHP module"
 msgstr "Moduł mb_string PHP"
 
-#: src/Core/Install.php:249
+#: src/Core/Install.php:230
 msgid "XML PHP module"
 msgstr "Moduł XML PHP"
 
-#: src/Core/Install.php:250
+#: src/Core/Install.php:231
 msgid "iconv PHP module"
 msgstr "Moduł PHP iconv"
 
-#: src/Core/Install.php:251
+#: src/Core/Install.php:232
 msgid "POSIX PHP module"
 msgstr "Moduł 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 "Moduł 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 "Błąd: moduł Apache webserver mod-rewrite jest potrzebny, jednakże nie jest zainstalowany."
 
-#: src/Core/Install.php:263
+#: src/Core/Install.php:244
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Błąd: libCURL PHP wymagany moduł, lecz nie zainstalowany."
 
-#: src/Core/Install.php:267
+#: src/Core/Install.php:248
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Błąd: moduł graficzny GD z PHP potrzebuje wsparcia technicznego JPEG, jednakże on nie jest zainstalowany."
 
-#: src/Core/Install.php:271
+#: src/Core/Install.php:252
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Błąd: openssl PHP wymagany moduł, lecz nie zainstalowany."
 
-#: src/Core/Install.php:275
+#: src/Core/Install.php:256
 msgid "Error: PDO or MySQLi PHP module required but not installed."
 msgstr "Błąd: Wymagany moduł PDO lub MySQLi PHP, ale nie zainstalowany."
 
-#: src/Core/Install.php:279
+#: src/Core/Install.php:260
 msgid "Error: The MySQL driver for PDO is not installed."
 msgstr "Błąd: Sterownik MySQL dla PDO nie jest zainstalowany."
 
-#: src/Core/Install.php:283
+#: src/Core/Install.php:264
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Błąd: moduł PHP mb_string  jest wymagany ale nie jest zainstalowany"
 
-#: src/Core/Install.php:287
+#: src/Core/Install.php:268
 msgid "Error: iconv PHP module required but not installed."
 msgstr "Błąd: wymagany moduł PHP iconv, ale nie zainstalowany."
 
-#: src/Core/Install.php:291
+#: src/Core/Install.php:272
 msgid "Error: POSIX PHP module required but not installed."
 msgstr "Błąd: wymagany moduł POSIX PHP, ale nie zainstalowany."
 
-#: src/Core/Install.php:301
+#: src/Core/Install.php:282
 msgid "Error, XML PHP module required but not installed."
 msgstr "Błąd, wymagany moduł XML PHP, ale nie zainstalowany."
 
-#: 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 "Instalator WWW musi być w stanie utworzyć plik o nazwie \". Htconfig.php\"  i nie jest w stanie tego zrobić."
+"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 "Instalator internetowy musi mieć możliwość utworzenia pliku o nazwie \"local.ini.php\" w folderze \"config\" na serwerze internetowym i nie może tego zrobić."
 
-#: 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 "Jest to najczęściej ustawienie uprawnień, ponieważ serwer sieciowy może nie być w stanie zapisywać plików w folderze - nawet jeśli możesz."
 
-#: 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 "Pod koniec tej procedury podamy Ci tekst do zapisania w pliku o nazwie .htconfig.php w twoim górnym folderze Friendica."
+"named local.ini.php in your Friendica \"config\" folder."
+msgstr "Po zakończeniu tej procedury damy ci tekst do zapisania w pliku o nazwie local.ini.php w twoim folderze \"config\" Friendica."
 
-#: 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 "Alternatywnie można pominąć tę procedurę i wykonać ręczną instalację. Proszę zobaczyć plik 'INSTALL.txt' z instrukcjami."
 
-#: src/Core/Install.php:326
-msgid ".htconfig.php is writable"
-msgstr ".htconfig.php jest zapisywalny"
+#: src/Core/Install.php:307
+msgid "config/local.ini.php is writable"
+msgstr "config/local.ini.php jest zapisywalny"
 
-#: 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 używa silnika szablonów Smarty3 do renderowania swoich widoków. Smarty3 kompiluje szablony do PHP, aby przyspieszyć renderowanie."
 
-#: 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 "Aby przechowywać te skompilowane szablony, serwer WWW musi mieć dostęp do zapisu do katalogu view/smarty3/ w folderze najwyższego poziomu 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 "Upewnij się, że użytkownik, na którym działa serwer WWW (np. www-data), ma prawo do zapisu do tego folderu."
 
-#: 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 "Uwaga: jako środek bezpieczeństwa, powinieneś dać serwerowi dostęp do zapisu view/smarty3/ jedynie - nie do plików szablonów (.tpl), które zawiera."
 
-#: src/Core/Install.php:350
+#: src/Core/Install.php:331
 msgid "view/smarty3 is writable"
 msgstr "view/smarty3 jest zapisywalny"
 
-#: src/Core/Install.php:375
+#: src/Core/Install.php:356
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr "Nie działa URL w .htaccess popraw. Sprawdź konfigurację serwera."
 
-#: src/Core/Install.php:377
+#: src/Core/Install.php:358
 msgid "Error message from Curl when fetching"
 msgstr "Komunikat o błędzie z Curl podczas pobierania"
 
-#: src/Core/Install.php:381
+#: src/Core/Install.php:362
 msgid "Url rewrite is working"
 msgstr "Działający adres URL"
 
-#: src/Core/Install.php:408
+#: src/Core/Install.php:389
 msgid "ImageMagick PHP extension is not installed"
 msgstr "Rozszerzenie PHP ImageMagick nie jest zainstalowane"
 
-#: src/Core/Install.php:410
+#: src/Core/Install.php:391
 msgid "ImageMagick PHP extension is installed"
 msgstr "Rozszerzenie PHP ImageMagick jest zainstalowane"
 
-#: src/Core/Install.php:412
+#: src/Core/Install.php:393
 msgid "ImageMagick supports GIF"
 msgstr "ImageMagick obsługuje GIF"
 
-#: src/Util/Temporal.php:147 src/Model/Profile.php:756
+#: src/Core/ACL.php:284
+msgid "Post to Email"
+msgstr "Prześlij e-mailem"
+
+#: src/Core/ACL.php:290
+msgid "Hide your profile details from unknown viewers?"
+msgstr "Ukryć szczegóły twojego profilu przed nieznajomymi?"
+
+#: src/Core/ACL.php:289
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
+msgstr "Wtyczki są wyłączone, ponieważ \"%s\" jest włączone."
+
+#: src/Core/ACL.php:296
+msgid "Visible to everybody"
+msgstr "Widoczny dla wszystkich"
+
+#: src/Core/ACL.php:308
+msgid "Close"
+msgstr "Zamknij"
+
+#: src/Core/Console/ArchiveContact.php:65
+#, php-format
+msgid "Could not find any unarchived contact entry for this URL (%s)"
+msgstr "Nie można znaleźć żadnego wpisu kontaktu zarchiwizowanego dla tego adresu URL (%s)"
+
+#: src/Core/Console/ArchiveContact.php:70
+msgid "The contact entries have been archived"
+msgstr "Wpisy kontaktów zostały zarchiwizowane"
+
+#: src/Core/Console/PostUpdate.php:32
+msgid "Execute pending post updates."
+msgstr "Wykonaj oczekujące aktualizacje postów."
+
+#: src/Core/Console/PostUpdate.php:38
+msgid "All pending post updates are done."
+msgstr "Wszystkie oczekujące aktualizacje postów są gotowe."
+
+#: src/Core/Console/NewPassword.php:73
+msgid "Enter new password: "
+msgstr "Wprowadź nowe hasło:"
+
+#: src/Core/Console/NewPassword.php:78 src/Model/User.php:269
+msgid "Password can't be empty"
+msgstr "Hasło nie może być puste"
+
+#: src/Core/NotificationsManager.php:172
+msgid "System"
+msgstr "System"
+
+#: src/Core/NotificationsManager.php:193 src/Content/Nav.php:124
+#: src/Content/Nav.php:186
+msgid "Home"
+msgstr "Strona domowa"
+
+#: src/Core/NotificationsManager.php:200 src/Content/Nav.php:190
+msgid "Introductions"
+msgstr "Zapoznanie"
+
+#: src/Core/NotificationsManager.php:262 src/Core/NotificationsManager.php:274
+#, php-format
+msgid "%s commented on %s's post"
+msgstr "%s skomentował wpis %s"
+
+#: src/Core/NotificationsManager.php:273
+#, php-format
+msgid "%s created a new post"
+msgstr "%s dodał nowy wpis"
+
+#: src/Core/NotificationsManager.php:287
+#, php-format
+msgid "%s liked %s's post"
+msgstr "%s polubił wpis %s"
+
+#: src/Core/NotificationsManager.php:300
+#, php-format
+msgid "%s disliked %s's post"
+msgstr "%s nie lubi tych %s postów"
+
+#: src/Core/NotificationsManager.php:313
+#, php-format
+msgid "%s is attending %s's event"
+msgstr "%s uczestniczy %sw wydarzeniu "
+
+#: src/Core/NotificationsManager.php:326
+#, php-format
+msgid "%s is not attending %s's event"
+msgstr "%s nie uczestniczy %s w wydarzeniu "
+
+#: src/Core/NotificationsManager.php:339
+#, php-format
+msgid "%s may attend %s's event"
+msgstr "%s może uczestniczyć %s w wydarzeniu"
+
+#: src/Core/NotificationsManager.php:360
+#, php-format
+msgid "%s is now friends with %s"
+msgstr "%s jest teraz znajomym %s"
+
+#: src/Core/NotificationsManager.php:626
+msgid "Friend Suggestion"
+msgstr "Propozycja znajomych"
+
+#: src/Core/NotificationsManager.php:656
+msgid "Friend/Connect Request"
+msgstr "Prośba o dodanie do przyjaciół/powiązanych"
+
+#: src/Core/NotificationsManager.php:656
+msgid "New Follower"
+msgstr "Nowy obserwujący"
+
+#: src/Core/UserImport.php:100
+msgid "Error decoding account file"
+msgstr "Błąd podczas odczytu pliku konta"
+
+#: src/Core/UserImport.php:106
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr "Błąd! Brak danych wersji w pliku! To nie jest plik konta Friendica?"
+
+#: src/Core/UserImport.php:114
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "Użytkownik '%s' już istnieje na tym serwerze!"
+
+#: src/Core/UserImport.php:147
+msgid "User creation error"
+msgstr "Błąd tworzenia użytkownika"
+
+#: src/Core/UserImport.php:165
+msgid "User profile creation error"
+msgstr "Błąd tworzenia profilu użytkownika"
+
+#: src/Core/UserImport.php:209
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] "Nie zaimportowano %d kontaktu."
+msgstr[1] "Nie zaimportowano %d kontaktów."
+msgstr[2] "Nie zaimportowano %d kontaktów."
+msgstr[3] "%d kontakty nie zostały zaimportowane "
+
+#: src/Core/UserImport.php:274
+msgid "Done. You can now login with your username and password"
+msgstr "Gotowe. Możesz teraz zalogować się, podając swoją nazwę użytkownika i hasło."
+
+#: src/Worker/Delivery.php:423
+msgid "(no subject)"
+msgstr "(bez tematu)"
+
+#: src/Object/Post.php:130
+msgid "This entry was edited"
+msgstr "Ten wpis został zedytowany"
+
+#: src/Object/Post.php:190
+msgid "Delete globally"
+msgstr "Usuń globalnie"
+
+#: src/Object/Post.php:190
+msgid "Remove locally"
+msgstr "Usuń lokalnie"
+
+#: src/Object/Post.php:203
+msgid "save to folder"
+msgstr "zapisz w folderze"
+
+#: src/Object/Post.php:232
+msgid "I will attend"
+msgstr "Będę uczestniczyć"
+
+#: src/Object/Post.php:232
+msgid "I will not attend"
+msgstr "Nie będę uczestniczyć"
+
+#: src/Object/Post.php:232
+msgid "I might attend"
+msgstr "Mogę wziąć udział"
+
+#: src/Object/Post.php:259
+msgid "ignore thread"
+msgstr "zignoruj ​​wątek"
+
+#: src/Object/Post.php:260
+msgid "unignore thread"
+msgstr "odignoruj ​​wątek"
+
+#: src/Object/Post.php:261
+msgid "toggle ignore status"
+msgstr "przełącz status ignorowania"
+
+#: src/Object/Post.php:272
+msgid "add star"
+msgstr "dodaj gwiazdkę"
+
+#: src/Object/Post.php:273
+msgid "remove star"
+msgstr "anuluj gwiazdkę"
+
+#: src/Object/Post.php:274
+msgid "toggle star status"
+msgstr "włącz status gwiazdy"
+
+#: src/Object/Post.php:277
+msgid "starred"
+msgstr "gwiazdką"
+
+#: src/Object/Post.php:282
+msgid "add tag"
+msgstr "dodaj tag"
+
+#: src/Object/Post.php:293
+msgid "like"
+msgstr "lubię to"
+
+#: src/Object/Post.php:294
+msgid "dislike"
+msgstr "nie lubię tego"
+
+#: src/Object/Post.php:297
+msgid "Share this"
+msgstr "Udostępnij to"
+
+#: src/Object/Post.php:297
+msgid "share"
+msgstr "udostępnij"
+
+#: src/Object/Post.php:364
+msgid "to"
+msgstr "do"
+
+#: src/Object/Post.php:365
+msgid "via"
+msgstr "przez"
+
+#: 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 komentarz"
+msgstr[1] " %d komentarzy"
+msgstr[2] " %d komentarzy"
+msgstr[3] " %d komentarzy"
+
+#: src/Object/Post.php:796
+msgid "Bold"
+msgstr "Pogrubienie"
+
+#: src/Object/Post.php:797
+msgid "Italic"
+msgstr "Kursywa"
+
+#: src/Object/Post.php:798
+msgid "Underline"
+msgstr "Podkreślenie"
+
+#: src/Object/Post.php:799
+msgid "Quote"
+msgstr "Cytat"
+
+#: src/Object/Post.php:800
+msgid "Code"
+msgstr "Kod"
+
+#: src/Object/Post.php:801
+msgid "Image"
+msgstr "Obraz"
+
+#: 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 "Usunąć ten element?"
+
+#: src/App.php:787
+msgid "show fewer"
+msgstr "Pokaż mniej"
+
+#: src/App.php:1385
+msgid "No system theme config value set."
+msgstr "Nie ustawiono wartości konfiguracyjnej zestawu tematycznego."
+
+#: src/Module/Logout.php:28
+msgid "Logged out."
+msgstr "Wylogowano."
+
+#: 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 "Napotkaliśmy problem podczas logowania z podanym przez nas identyfikatorem OpenID. Sprawdź poprawną pisownię identyfikatora."
+
+#: src/Module/Login.php:100 src/Model/User.php:408
+msgid "The error message was:"
+msgstr "Komunikat o błędzie:"
+
+#: src/Module/Login.php:280
+msgid "Create a New Account"
+msgstr "Załóż nowe konto"
+
+#: src/Module/Login.php:313
+msgid "Password: "
+msgstr "Hasło:"
+
+#: src/Module/Login.php:314
+msgid "Remember me"
+msgstr "Zapamiętaj mnie"
+
+#: src/Module/Login.php:317
+msgid "Or login using OpenID: "
+msgstr "Lub zaloguj się korzystając z OpenID:"
+
+#: src/Module/Login.php:323
+msgid "Forgot your password?"
+msgstr "Zapomniałeś swojego hasła?"
+
+#: src/Module/Login.php:326
+msgid "Website Terms of Service"
+msgstr "Warunki korzystania z witryny"
+
+#: src/Module/Login.php:327
+msgid "terms of service"
+msgstr "warunki użytkowania"
+
+#: src/Module/Login.php:329
+msgid "Website Privacy Policy"
+msgstr "Polityka Prywatności Witryny"
+
+#: src/Module/Login.php:330
+msgid "privacy policy"
+msgstr "polityka prywatności"
+
+#: 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 "W momencie rejestracji oraz w celu zapewnienia komunikacji między kontem użytkownika, a jego kontaktami, użytkownik musi podać nazwę wyświetlaną (pseudonim), nazwę użytkownika (przydomek) i działający adres e-mail. Nazwy będą dostępne na stronie profilu konta dla każdego odwiedzającego stronę, nawet jeśli inne szczegóły profilu nie zostaną wyświetlone. Adres e-mail będzie używany tylko do wysyłania powiadomień użytkownika o interakcjach, ale nie będzie wyświetlany w widoczny sposób. Lista kont w katalogu użytkownika węzła lub globalnym katalogu użytkownika jest opcjonalna i może być kontrolowana w ustawieniach użytkownika, nie jest konieczna do komunikacji."
+
+#: 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 "Te dane są wymagane do komunikacji i są przekazywane do węzłów partnerów komunikacyjnych i są tam przechowywane. Użytkownicy mogą wprowadzać dodatkowe prywatne dane, które mogą być przesyłane na konta partnerów komunikacyjnych."
+
+#: 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 "W dowolnym momencie zalogowany użytkownik może wyeksportować dane swojego konta z <a href=\"%1$s/settings/uexport\">ustawień konta</a>. Jeśli użytkownik chce usunąć swoje konto, może to zrobić w<a href=\"%1$s/removeme\">%1$s / Usuń mnie</a>. Usunięcie konta będzie trwałe. Skasowanie danych będzie również wymagane od węzłów partnerów komunikacyjnych."
+
+#: src/Module/Tos.php:39 src/Module/Tos.php:73
+msgid "Privacy Statement"
+msgstr "Oświadczenie o prywatności"
+
+#: src/Protocol/OStatus.php:1813
+#, php-format
+msgid "%s is now following %s."
+msgstr "%sjest teraz następujące %s. "
+
+#: src/Protocol/OStatus.php:1814
+msgid "following"
+msgstr "następujący"
+
+#: src/Protocol/OStatus.php:1817
+#, php-format
+msgid "%s stopped following %s."
+msgstr "%sprzestał śledzić %s. "
+
+#: src/Protocol/OStatus.php:1818
+msgid "stopped following"
+msgstr "przestał śledzić"
+
+#: src/Protocol/DFRN.php:1525 src/Model/Contact.php:1956
+#, php-format
+msgid "%s's birthday"
+msgstr "%s urodzin"
+
+#: src/Protocol/DFRN.php:1526 src/Model/Contact.php:1957
+#, php-format
+msgid "Happy Birthday %s"
+msgstr "Urodziny %s"
+
+#: src/Protocol/Diaspora.php:2417
+msgid "Sharing notification from Diaspora network"
+msgstr "Wspólne powiadomienie z sieci Diaspora"
+
+#: src/Protocol/Diaspora.php:3514
+msgid "Attachments:"
+msgstr "Załączniki:"
+
+#: src/Util/Temporal.php:147 src/Model/Profile.php:745
 msgid "Birthday:"
 msgstr "Urodziny:"
 
@@ -8127,363 +8568,438 @@ msgstr "sekundy"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s temu"
 
-#: src/Content/Text/BBCode.php:416
-msgid "view full size"
-msgstr "Zobacz w pełnym wymiarze"
-
-#: src/Content/Text/BBCode.php:842 src/Content/Text/BBCode.php:1611
-#: src/Content/Text/BBCode.php:1612
-msgid "Image/photo"
-msgstr "Obrazek/zdjęcie"
-
-#: src/Content/Text/BBCode.php:980
-#, 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"
+#: src/Model/Mail.php:39 src/Model/Mail.php:171
+msgid "[no subject]"
+msgstr "[bez tematu]"
+
+#: src/Model/Contact.php:942
+msgid "Drop Contact"
+msgstr "Upuść kontakt"
+
+#: src/Model/Contact.php:1399
+msgid "Organisation"
+msgstr "Organizacja"
+
+#: src/Model/Contact.php:1403
+msgid "News"
+msgstr "Aktualności"
+
+#: src/Model/Contact.php:1407
+msgid "Forum"
+msgstr "Forum"
+
+#: src/Model/Contact.php:1587
+msgid "Connect URL missing."
+msgstr "Brak adresu URL połączenia."
+
+#: 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 "Nie można dodać kontaktu. Sprawdź odpowiednie poświadczenia sieciowe na stronie Ustawienia -> Sieci społecznościowe."
+
+#: src/Model/Contact.php:1635
+msgid ""
+"This site is not configured to allow communications with other networks."
+msgstr "Ta strona nie jest skonfigurowana do pozwalania na komunikację z innymi sieciami"
+
+#: src/Model/Contact.php:1636 src/Model/Contact.php:1650
+msgid "No compatible communication protocols or feeds were discovered."
+msgstr "Nie znaleziono żadnych kompatybilnych protokołów komunikacyjnych ani źródeł."
+
+#: src/Model/Contact.php:1648
+msgid "The profile address specified does not provide adequate information."
+msgstr "Dany adres profilu nie dostarcza odpowiednich informacji."
+
+#: src/Model/Contact.php:1653
+msgid "An author or name was not found."
+msgstr "Autor lub nazwa nie zostało znalezione."
+
+#: src/Model/Contact.php:1656
+msgid "No browser URL could be matched to this address."
+msgstr "Przeglądarka WWW nie może odnaleźć podanego adresu"
+
+#: src/Model/Contact.php:1659
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr "Nie można dopasować @-stylu Adres identyfikacyjny ze znanym protokołem lub kontaktem e-mail."
+
+#: src/Model/Contact.php:1660
+msgid "Use mailto: in front of address to force email check."
+msgstr "Użyj mailto: przed adresem, aby wymusić sprawdzanie poczty e-mail."
+
+#: src/Model/Contact.php:1666
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr "Określony adres profilu należy do sieci, która została wyłączona na tej stronie."
+
+#: src/Model/Contact.php:1671
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr "Profil ograniczony. Ta osoba będzie niezdolna do odbierania osobistych powiadomień od ciebie."
+
+#: src/Model/Contact.php:1722
+msgid "Unable to retrieve contact information."
+msgstr "Nie można otrzymać informacji kontaktowych"
+
+#: src/Model/Event.php:59 src/Model/Event.php:76 src/Model/Event.php:428
+#: src/Model/Event.php:897
+msgid "Starts:"
+msgstr "Rozpoczęcie:"
+
+#: src/Model/Event.php:62 src/Model/Event.php:82 src/Model/Event.php:429
+#: src/Model/Event.php:901
+msgid "Finishes:"
+msgstr "Zakończenie:"
+
+#: src/Model/Event.php:377
+msgid "all-day"
+msgstr "cały dzień"
+
+#: src/Model/Event.php:400
+msgid "Jun"
+msgstr "cze"
+
+#: src/Model/Event.php:403
+msgid "Sept"
+msgstr "wrz"
+
+#: src/Model/Event.php:426
+msgid "No events to display"
+msgstr "Brak wydarzeń do wyświetlenia"
+
+#: src/Model/Event.php:550
+msgid "l, F j"
+msgstr "l, F j"
+
+#: src/Model/Event.php:581
+msgid "Edit event"
+msgstr "Edytuj wydarzenie"
+
+#: src/Model/Event.php:582
+msgid "Duplicate event"
+msgstr "Zduplikowane zdarzenie"
+
+#: src/Model/Event.php:583
+msgid "Delete event"
+msgstr "Usuń wydarzenie"
+
+#: 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 "Pokaż mapę"
+
+#: src/Model/Event.php:917
+msgid "Hide map"
+msgstr "Ukryj mapę"
+
+#: src/Model/User.php:168
+msgid "Login failed"
+msgstr "Logowanie nieudane"
+
+#: src/Model/User.php:199
+msgid "Not enough information to authenticate"
+msgstr "Za mało informacji do uwierzytelnienia"
+
+#: src/Model/User.php:384
+msgid "An invitation is required."
+msgstr "Wymagane zaproszenie."
+
+#: src/Model/User.php:388
+msgid "Invitation could not be verified."
+msgstr "Zaproszenie niezweryfikowane."
+
+#: src/Model/User.php:395
+msgid "Invalid OpenID url"
+msgstr "Nieprawidłowy adres url OpenID"
+
+#: src/Model/User.php:414
+msgid "Please enter the required information."
+msgstr "Wprowadź wymagane informacje"
+
+#: src/Model/User.php:427
+msgid "Please use a shorter name."
+msgstr "Użyj dłuższej nazwy."
+
+#: src/Model/User.php:430
+msgid "Name too short."
+msgstr "Nazwa jest za krótka."
 
-#: src/Content/Text/BBCode.php:1538 src/Content/Text/BBCode.php:1560
-msgid "$1 wrote:"
-msgstr "$1 napisał:"
+#: src/Model/User.php:438
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "Wydaje mi się, że to nie jest twoje pełne imię (pierwsze imię) i nazwisko."
 
-#: src/Content/Text/BBCode.php:1620 src/Content/Text/BBCode.php:1621
-msgid "Encrypted content"
-msgstr "Szyfrowana treść"
+#: src/Model/User.php:443
+msgid "Your email domain is not among those allowed on this site."
+msgstr "Twoja domena internetowa nie jest obsługiwana na tej stronie."
 
-#: src/Content/Text/BBCode.php:1740
-msgid "Invalid source protocol"
-msgstr "Nieprawidłowy protokół źródłowy"
+#: src/Model/User.php:447
+msgid "Not a valid email address."
+msgstr "Niepoprawny adres e mail.."
 
-#: src/Content/Text/BBCode.php:1751
-msgid "Invalid link protocol"
-msgstr "Niepoprawny link protokołu"
+#: src/Model/User.php:450
+msgid "The nickname was blocked from registration by the nodes admin."
+msgstr "Pseudonim został zablokowany przed rejestracją przez administratora węzłów."
 
-#: src/Content/OEmbed.php:253
-msgid "Embedding disabled"
-msgstr "Osadzanie wyłączone"
+#: src/Model/User.php:454 src/Model/User.php:462
+msgid "Cannot use that email."
+msgstr "Nie możesz użyć tego e-maila. "
 
-#: src/Content/OEmbed.php:373
-msgid "Embedded content"
-msgstr "Osadzona zawartość"
+#: src/Model/User.php:469
+msgid "Your nickname can only contain a-z, 0-9 and _."
+msgstr "Twój pseudonim może zawierać tylko a-z, 0-9 i _."
 
-#: src/Content/Widget/CalendarExport.php:61
-msgid "Export"
-msgstr "Eksport"
+#: src/Model/User.php:476 src/Model/User.php:533
+msgid "Nickname is already registered. Please choose another."
+msgstr "Ten login jest zajęty. Wybierz inny."
 
-#: src/Content/Widget/CalendarExport.php:62
-msgid "Export calendar as ical"
-msgstr "Wyeksportuj kalendarz jako ical"
+#: src/Model/User.php:486
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "POWAŻNY BŁĄD: niepowodzenie podczas tworzenia kluczy zabezpieczeń."
 
-#: src/Content/Widget/CalendarExport.php:63
-msgid "Export calendar as csv"
-msgstr "Eksportuj kalendarz jako csv"
+#: src/Model/User.php:520 src/Model/User.php:524
+msgid "An error occurred during registration. Please try again."
+msgstr "Wystąpił bład podczas rejestracji, Spróbuj ponownie."
 
-#: src/Content/ContactSelector.php:55
-msgid "Frequently"
-msgstr "Często"
+#: src/Model/User.php:549
+msgid "An error occurred creating your default profile. Please try again."
+msgstr "Wystąpił błąd podczas tworzenia profilu. Spróbuj ponownie."
 
-#: src/Content/ContactSelector.php:56
-msgid "Hourly"
-msgstr "Co godzinę"
+#: src/Model/User.php:556
+msgid "An error occurred creating your self contact. Please try again."
+msgstr "Wystąpił błąd podczas tworzenia własnego kontaktu. Proszę spróbuj ponownie."
 
-#: src/Content/ContactSelector.php:57
-msgid "Twice daily"
-msgstr "Dwa razy dziennie"
-
-#: src/Content/ContactSelector.php:58
-msgid "Daily"
-msgstr "Codziennie"
-
-#: src/Content/ContactSelector.php:59
-msgid "Weekly"
-msgstr "Co tydzień"
-
-#: src/Content/ContactSelector.php:60
-msgid "Monthly"
-msgstr "Miesięczne"
-
-#: 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 "Twitter"
-
-#: src/Content/ContactSelector.php:92
-msgid "Diaspora Connector"
-msgstr "Łącze Diaspora"
-
-#: src/Content/ContactSelector.php:93
-msgid "GNU Social Connector"
-msgstr "GNU Połączenie Społecznościowe"
-
-#: src/Content/ContactSelector.php:94
-msgid "pnut"
-msgstr "orzech"
-
-#: src/Content/ContactSelector.php:95
-msgid "App.net"
-msgstr "App.net"
-
-#: src/Content/ContactSelector.php:125
-msgid "Male"
-msgstr "Mężczyzna"
-
-#: src/Content/ContactSelector.php:125
-msgid "Female"
-msgstr "Kobieta"
-
-#: src/Content/ContactSelector.php:125
-msgid "Currently Male"
-msgstr "Obecnie mężczyzna"
-
-#: src/Content/ContactSelector.php:125
-msgid "Currently Female"
-msgstr "Obecnie Kobieta"
-
-#: src/Content/ContactSelector.php:125
-msgid "Mostly Male"
-msgstr "Głównie mężczyzna"
-
-#: src/Content/ContactSelector.php:125
-msgid "Mostly Female"
-msgstr "Głównie kobieta"
-
-#: src/Content/ContactSelector.php:125
-msgid "Transgender"
-msgstr "Transseksualny"
-
-#: src/Content/ContactSelector.php:125
-msgid "Intersex"
-msgstr "Interseksualne"
-
-#: src/Content/ContactSelector.php:125
-msgid "Transsexual"
-msgstr "Transseksualny"
-
-#: src/Content/ContactSelector.php:125
-msgid "Hermaphrodite"
-msgstr "Hermafrodyta"
-
-#: src/Content/ContactSelector.php:125
-msgid "Neuter"
-msgstr "Rodzaj nijaki"
-
-#: src/Content/ContactSelector.php:125
-msgid "Non-specific"
-msgstr "Niespecyficzne"
-
-#: src/Content/ContactSelector.php:125
-msgid "Other"
-msgstr "Inne"
-
-#: src/Content/ContactSelector.php:147
-msgid "Males"
-msgstr "Mężczyźni"
-
-#: src/Content/ContactSelector.php:147
-msgid "Females"
-msgstr "Kobiety"
-
-#: src/Content/ContactSelector.php:147
-msgid "Gay"
-msgstr "Gej"
-
-#: src/Content/ContactSelector.php:147
-msgid "Lesbian"
-msgstr "Lesbijka"
-
-#: src/Content/ContactSelector.php:147
-msgid "No Preference"
-msgstr "Brak preferencji"
-
-#: src/Content/ContactSelector.php:147
-msgid "Bisexual"
-msgstr "Biseksualny"
-
-#: src/Content/ContactSelector.php:147
-msgid "Autosexual"
-msgstr "Niezidentyfikowany"
-
-#: src/Content/ContactSelector.php:147
-msgid "Abstinent"
-msgstr "Abstynent"
-
-#: src/Content/ContactSelector.php:147
-msgid "Virgin"
-msgstr "Dziewica"
-
-#: src/Content/ContactSelector.php:147
-msgid "Deviant"
-msgstr "Zboczeniec"
-
-#: src/Content/ContactSelector.php:147
-msgid "Fetish"
-msgstr "Fetysz"
-
-#: src/Content/ContactSelector.php:147
-msgid "Oodles"
-msgstr "Nadmiar"
-
-#: src/Content/ContactSelector.php:147
-msgid "Nonsexual"
-msgstr "Nieseksualny"
-
-#: src/Content/ContactSelector.php:169
-msgid "Single"
-msgstr "Singiel"
-
-#: src/Content/ContactSelector.php:169
-msgid "Lonely"
-msgstr "Samotny"
-
-#: src/Content/ContactSelector.php:169
-msgid "Available"
-msgstr "Dostępny"
-
-#: src/Content/ContactSelector.php:169
-msgid "Unavailable"
-msgstr "Niedostępny"
-
-#: src/Content/ContactSelector.php:169
-msgid "Has crush"
-msgstr "Ma sympatii"
-
-#: src/Content/ContactSelector.php:169
-msgid "Infatuated"
-msgstr "Zakochany"
-
-#: src/Content/ContactSelector.php:169
-msgid "Dating"
-msgstr "Randki"
-
-#: src/Content/ContactSelector.php:169
-msgid "Unfaithful"
-msgstr "Niewierny"
-
-#: src/Content/ContactSelector.php:169
-msgid "Sex Addict"
-msgstr "Uzależniony od seksu"
-
-#: src/Content/ContactSelector.php:169 src/Model/User.php:519
+#: src/Model/User.php:561 src/Content/ContactSelector.php:166
 msgid "Friends"
 msgstr "Przyjaciele"
 
-#: src/Content/ContactSelector.php:169
-msgid "Friends/Benefits"
-msgstr "Przyjaciele/Korzyści"
+#: src/Model/User.php:565
+msgid ""
+"An error occurred creating your default contact group. Please try again."
+msgstr "Wystąpił błąd podczas tworzenia domyślnej grupy kontaktów. Proszę spróbuj ponownie."
 
-#: src/Content/ContactSelector.php:169
-msgid "Casual"
-msgstr "Przypadkowy"
+#: 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 "\n\t\t\tSzanowny Użytkowniku  %1$s, \n\t\t\t\tDziękujemy za rejestrację na stronie %2$s. Twoje konto czeka na zatwierdzenie przez administratora."
 
-#: src/Content/ContactSelector.php:169
-msgid "Engaged"
-msgstr "Zaręczeni"
+#: src/Model/User.php:649
+#, php-format
+msgid "Registration at %s"
+msgstr "Rejestracja w %s"
 
-#: src/Content/ContactSelector.php:169
-msgid "Married"
-msgstr "Małżeństwo"
+#: 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\tSzanowny Użytkowniku  %1$s, \n\t\t\t\tDziękujemy za rejestrację na stronie %2$s. Twoje konto zostało utworzone."
 
-#: src/Content/ContactSelector.php:169
-msgid "Imaginarily married"
-msgstr "Fikcyjnie w związku małżeńskim"
+#: 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\tDane logowania są następuje:\n\t\t\tLokalizacja witryny:\t%3$s\n\t\t\tNazwa użytkownika:\t\t%1$s\n\t\t\tHasło:\t\t%5$s\n\n\t\t\tPo zalogowaniu możesz zmienić hasło do swojego konta na stronie \"Ustawienia\".\n \t\t\tProszę poświęć chwilę, aby przejrzeć inne ustawienia konta na tej stronie.\n\n\t\t\tMożesz również dodać podstawowe informacje do swojego domyślnego profilu\n\t\t\t(na stronie \"Profil użytkownika\"), aby inne osoby mogły łatwo Cię znaleźć.\n\n\t\t\tZalecamy ustawienie imienia i nazwiska, dodanie zdjęcia profilowego,\n\t\t\tdodanie niektórych \"słów kluczowych\" profilu (bardzo przydatne w nawiązywaniu nowych znajomości) \n\t\t\ti być może gdzie mieszkasz; jeśli nie chcesz podać więcej szczegów.\n\n\t\t\tW pełni szanujemy Twoje prawo do prywatności i żaden z tych elementów nie jest konieczny.\n\t\t\tJeśli jesteś nowy i nie znasz tutaj nikogo, oni mogą ci pomóc\n\t\t\tmożesz zdobyć nowych interesujących przyjaciół.\n\n\t\t\tJeśli kiedykolwiek zechcesz usunąć swoje konto, możesz to zrobić na stronie %3$s/removeme\n\n\t\t\tDziękujemy i Zapraszamy do %2$s."
 
-#: src/Content/ContactSelector.php:169
-msgid "Partners"
-msgstr "Partnerzy"
+#: 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 "Skasowana grupa o tej nazwie została przywrócona. Istniejące uprawnienia do pozycji <strong>mogą</strong> dotyczyć tej grupy i wszystkich przyszłych członków. Jeśli nie jest to zamierzone, utwórz inną grupę o innej nazwie."
 
-#: src/Content/ContactSelector.php:169
-msgid "Cohabiting"
-msgstr "Konkubinat"
+#: src/Model/Group.php:329
+msgid "Default privacy group for new contacts"
+msgstr "Domyślne ustawienia prywatności dla nowych kontaktów"
 
-#: src/Content/ContactSelector.php:169
-msgid "Common law"
-msgstr "Prawo zwyczajowe"
+#: src/Model/Group.php:362
+msgid "Everybody"
+msgstr "Wszyscy"
 
-#: src/Content/ContactSelector.php:169
-msgid "Happy"
-msgstr "Szczęśliwy"
+#: src/Model/Group.php:382
+msgid "edit"
+msgstr "edytuj"
 
-#: src/Content/ContactSelector.php:169
-msgid "Not looking"
-msgstr "Nie patrzę"
+#: src/Model/Group.php:406
+msgid "Edit group"
+msgstr "Edytuj grupy"
 
-#: src/Content/ContactSelector.php:169
-msgid "Swinger"
-msgstr "Swinger"
+#: src/Model/Group.php:409
+msgid "Create a new group"
+msgstr "Stwórz nową grupę"
 
-#: src/Content/ContactSelector.php:169
-msgid "Betrayed"
-msgstr "Zdradzony"
+#: src/Model/Group.php:411
+msgid "Edit groups"
+msgstr "Edytuj grupy"
 
-#: src/Content/ContactSelector.php:169
-msgid "Separated"
-msgstr "W separacji"
+#: src/Model/Profile.php:97
+msgid "Requested account is not available."
+msgstr "Żądane konto jest niedostępne."
 
-#: src/Content/ContactSelector.php:169
-msgid "Unstable"
-msgstr "Niestabilny"
+#: src/Model/Profile.php:163 src/Model/Profile.php:399
+#: src/Model/Profile.php:846
+msgid "Edit profile"
+msgstr "Edytuj profil"
 
-#: src/Content/ContactSelector.php:169
-msgid "Divorced"
-msgstr "Rozwiedzeni"
+#: src/Model/Profile.php:333
+msgid "Atom feed"
+msgstr "Kanał Atom"
 
-#: src/Content/ContactSelector.php:169
-msgid "Imaginarily divorced"
-msgstr "Fikcyjnie rozwiedziony/a"
+#: src/Model/Profile.php:372
+msgid "Manage/edit profiles"
+msgstr "Zarządzaj profilami"
 
-#: src/Content/ContactSelector.php:169
-msgid "Widowed"
-msgstr "Wdowiec"
+#: src/Model/Profile.php:550 src/Model/Profile.php:639
+msgid "g A l F d"
+msgstr "g A I F d"
 
-#: src/Content/ContactSelector.php:169
-msgid "Uncertain"
-msgstr "Nieokreślony"
+#: src/Model/Profile.php:551
+msgid "F d"
+msgstr "F d"
 
-#: src/Content/ContactSelector.php:169
-msgid "It's complicated"
-msgstr "To skomplikowane"
+#: src/Model/Profile.php:604 src/Model/Profile.php:690
+msgid "[today]"
+msgstr "[dziś]"
 
-#: src/Content/ContactSelector.php:169
-msgid "Don't care"
-msgstr "Nie przejmuj się"
+#: src/Model/Profile.php:615
+msgid "Birthday Reminders"
+msgstr "Przypomnienia o urodzinach"
 
-#: src/Content/ContactSelector.php:169
-msgid "Ask me"
-msgstr "Zapytaj mnie "
+#: src/Model/Profile.php:616
+msgid "Birthdays this week:"
+msgstr "Urodziny w tym tygodniu:"
+
+#: src/Model/Profile.php:677
+msgid "[No description]"
+msgstr "[Brak opisu]"
+
+#: src/Model/Profile.php:704
+msgid "Event Reminders"
+msgstr "Przypominacze wydarzeń"
+
+#: src/Model/Profile.php:705
+msgid "Upcoming events the next 7 days:"
+msgstr "Nadchodzące wydarzenia w ciągu następnych 7 dni:"
+
+#: src/Model/Profile.php:728
+msgid "Member since:"
+msgstr "Członek od:"
+
+#: src/Model/Profile.php:736
+msgid "j F, Y"
+msgstr "d M, R"
+
+#: src/Model/Profile.php:737
+msgid "j F"
+msgstr "d M"
+
+#: src/Model/Profile.php:752
+msgid "Age:"
+msgstr "Wiek:"
+
+#: src/Model/Profile.php:765
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "od %1$d %2$s"
+
+#: src/Model/Profile.php:789
+msgid "Religion:"
+msgstr "Religia:"
+
+#: src/Model/Profile.php:797
+msgid "Hobbies/Interests:"
+msgstr "Hobby/Zainteresowania:"
+
+#: src/Model/Profile.php:809
+msgid "Contact information and Social Networks:"
+msgstr "Informacje kontaktowe i sieci społeczne"
+
+#: src/Model/Profile.php:813
+msgid "Musical interests:"
+msgstr "Zainteresowania muzyczne:"
+
+#: src/Model/Profile.php:817
+msgid "Books, literature:"
+msgstr "Książki, literatura:"
+
+#: src/Model/Profile.php:821
+msgid "Television:"
+msgstr "Telewizja:"
+
+#: src/Model/Profile.php:825
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/taniec/kultura/rozrywka"
+
+#: src/Model/Profile.php:829
+msgid "Love/Romance:"
+msgstr "Miłość/Romans:"
+
+#: src/Model/Profile.php:833
+msgid "Work/employment:"
+msgstr "Praca/zatrudnienie:"
+
+#: src/Model/Profile.php:837
+msgid "School/education:"
+msgstr "Szkoła/edukacja:"
+
+#: src/Model/Profile.php:842
+msgid "Forums:"
+msgstr "Fora:"
+
+#: src/Model/Profile.php:936
+msgid "Only You Can See This"
+msgstr "Tylko ty możesz to zobaczyć"
+
+#: src/Model/Profile.php:944 src/Model/Profile.php:947
+msgid "Tips for New Members"
+msgstr "Wskazówki dla nowych użytkowników"
+
+#: src/Model/Profile.php:1106
+#, php-format
+msgid "OpenWebAuth: %1$s welcomes %2$s"
+msgstr "OpenWebAuth: %1$s wita %2$s"
 
 #: src/Content/Widget.php:33
 msgid "Add New Contact"
@@ -8506,34 +9022,330 @@ msgstr[1] "%d zaproszeń dostępnych"
 msgstr[2] "%d zaproszenia dostępne"
 msgstr[3] "%d zaproszenia dostępne"
 
-#: src/Content/Widget.php:164
+#: src/Content/Widget.php:157
 msgid "Networks"
 msgstr "Sieci"
 
-#: src/Content/Widget.php:167
+#: src/Content/Widget.php:160
 msgid "All Networks"
 msgstr "Wszystkie Sieci"
 
-#: src/Content/Widget.php:205 src/Content/Feature.php:118
+#: src/Content/Widget.php:198 src/Content/Feature.php:118
 msgid "Saved Folders"
 msgstr "Zapisz w folderach"
 
-#: src/Content/Widget.php:208 src/Content/Widget.php:248
+#: src/Content/Widget.php:201 src/Content/Widget.php:241
 msgid "Everything"
 msgstr "Wszystko"
 
-#: src/Content/Widget.php:245
+#: src/Content/Widget.php:238
 msgid "Categories"
 msgstr "Kategorie"
 
-#: 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] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "%dwspólny kontakt "
+msgstr[1] "%dwspólny kontakt"
+msgstr[2] "%dwspólne kontakty "
+msgstr[3] "%dwspólnych kontaktów"
+
+#: src/Content/ContactSelector.php:54
+msgid "Frequently"
+msgstr "Często"
+
+#: src/Content/ContactSelector.php:55
+msgid "Hourly"
+msgstr "Co godzinę"
+
+#: src/Content/ContactSelector.php:56
+msgid "Twice daily"
+msgstr "Dwa razy dziennie"
+
+#: src/Content/ContactSelector.php:57
+msgid "Daily"
+msgstr "Codziennie"
+
+#: src/Content/ContactSelector.php:58
+msgid "Weekly"
+msgstr "Co tydzień"
+
+#: src/Content/ContactSelector.php:59
+msgid "Monthly"
+msgstr "Miesięczne"
+
+#: 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 "Twitter"
+
+#: src/Content/ContactSelector.php:90
+msgid "Diaspora Connector"
+msgstr "Łącze Diaspora"
+
+#: src/Content/ContactSelector.php:91
+msgid "GNU Social Connector"
+msgstr "Łącze GNU Social"
+
+#: src/Content/ContactSelector.php:92
+msgid "pnut"
+msgstr "orzech"
+
+#: src/Content/ContactSelector.php:122
+msgid "Male"
+msgstr "Mężczyzna"
+
+#: src/Content/ContactSelector.php:122
+msgid "Female"
+msgstr "Kobieta"
+
+#: src/Content/ContactSelector.php:122
+msgid "Currently Male"
+msgstr "Obecnie mężczyzna"
+
+#: src/Content/ContactSelector.php:122
+msgid "Currently Female"
+msgstr "Obecnie Kobieta"
+
+#: src/Content/ContactSelector.php:122
+msgid "Mostly Male"
+msgstr "Najczęściej męskie"
+
+#: src/Content/ContactSelector.php:122
+msgid "Mostly Female"
+msgstr "Najczęściej żeńskie"
+
+#: src/Content/ContactSelector.php:122
+msgid "Transgender"
+msgstr "Transseksualny"
+
+#: src/Content/ContactSelector.php:122
+msgid "Intersex"
+msgstr "Interseksualne"
+
+#: src/Content/ContactSelector.php:122
+msgid "Transsexual"
+msgstr "Transseksualny"
+
+#: src/Content/ContactSelector.php:122
+msgid "Hermaphrodite"
+msgstr "Hermafrodyta"
+
+#: src/Content/ContactSelector.php:122
+msgid "Neuter"
+msgstr "Rodzaj nijaki"
+
+#: src/Content/ContactSelector.php:122
+msgid "Non-specific"
+msgstr "Niespecyficzne"
+
+#: src/Content/ContactSelector.php:122
+msgid "Other"
+msgstr "Inne"
+
+#: src/Content/ContactSelector.php:144
+msgid "Males"
+msgstr "Mężczyźni"
+
+#: src/Content/ContactSelector.php:144
+msgid "Females"
+msgstr "Kobiety"
+
+#: src/Content/ContactSelector.php:144
+msgid "Gay"
+msgstr "Gej"
+
+#: src/Content/ContactSelector.php:144
+msgid "Lesbian"
+msgstr "Lesbijka"
+
+#: src/Content/ContactSelector.php:144
+msgid "No Preference"
+msgstr "Brak preferencji"
+
+#: src/Content/ContactSelector.php:144
+msgid "Bisexual"
+msgstr "Biseksualny"
+
+#: src/Content/ContactSelector.php:144
+msgid "Autosexual"
+msgstr "Niezidentyfikowany"
+
+#: src/Content/ContactSelector.php:144
+msgid "Abstinent"
+msgstr "Abstynent"
+
+#: src/Content/ContactSelector.php:144
+msgid "Virgin"
+msgstr "Dziewica"
+
+#: src/Content/ContactSelector.php:144
+msgid "Deviant"
+msgstr "Zboczeniec"
+
+#: src/Content/ContactSelector.php:144
+msgid "Fetish"
+msgstr "Fetysz"
+
+#: src/Content/ContactSelector.php:144
+msgid "Oodles"
+msgstr "Nadmiar"
+
+#: src/Content/ContactSelector.php:144
+msgid "Nonsexual"
+msgstr "Nieseksualny"
+
+#: src/Content/ContactSelector.php:166
+msgid "Single"
+msgstr "Singiel"
+
+#: src/Content/ContactSelector.php:166
+msgid "Lonely"
+msgstr "Samotny"
+
+#: src/Content/ContactSelector.php:166
+msgid "Available"
+msgstr "Dostępny"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unavailable"
+msgstr "Niedostępny"
+
+#: src/Content/ContactSelector.php:166
+msgid "Has crush"
+msgstr "Ma sympatii"
+
+#: src/Content/ContactSelector.php:166
+msgid "Infatuated"
+msgstr "Zakochany"
+
+#: src/Content/ContactSelector.php:166
+msgid "Dating"
+msgstr "Randki"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unfaithful"
+msgstr "Niewierny"
+
+#: src/Content/ContactSelector.php:166
+msgid "Sex Addict"
+msgstr "Uzależniony od seksu"
+
+#: src/Content/ContactSelector.php:166
+msgid "Friends/Benefits"
+msgstr "Przyjaciele/Korzyści"
+
+#: src/Content/ContactSelector.php:166
+msgid "Casual"
+msgstr "Przypadkowy"
+
+#: src/Content/ContactSelector.php:166
+msgid "Engaged"
+msgstr "Zaręczeni"
+
+#: src/Content/ContactSelector.php:166
+msgid "Married"
+msgstr "Małżeństwo"
+
+#: src/Content/ContactSelector.php:166
+msgid "Imaginarily married"
+msgstr "Fikcyjnie w związku małżeńskim"
+
+#: src/Content/ContactSelector.php:166
+msgid "Partners"
+msgstr "Partnerzy"
+
+#: src/Content/ContactSelector.php:166
+msgid "Cohabiting"
+msgstr "Konkubinat"
+
+#: src/Content/ContactSelector.php:166
+msgid "Common law"
+msgstr "Prawo zwyczajowe"
+
+#: src/Content/ContactSelector.php:166
+msgid "Happy"
+msgstr "Szczęśliwy"
+
+#: src/Content/ContactSelector.php:166
+msgid "Not looking"
+msgstr "Nie patrzę"
+
+#: src/Content/ContactSelector.php:166
+msgid "Swinger"
+msgstr "Swinger"
+
+#: src/Content/ContactSelector.php:166
+msgid "Betrayed"
+msgstr "Zdradzony"
+
+#: src/Content/ContactSelector.php:166
+msgid "Separated"
+msgstr "W separacji"
+
+#: src/Content/ContactSelector.php:166
+msgid "Unstable"
+msgstr "Niestabilny"
+
+#: src/Content/ContactSelector.php:166
+msgid "Divorced"
+msgstr "Rozwiedzeni"
+
+#: src/Content/ContactSelector.php:166
+msgid "Imaginarily divorced"
+msgstr "Fikcyjnie rozwiedziony/a"
+
+#: src/Content/ContactSelector.php:166
+msgid "Widowed"
+msgstr "Wdowiec"
+
+#: src/Content/ContactSelector.php:166
+msgid "Uncertain"
+msgstr "Nieokreślony"
+
+#: src/Content/ContactSelector.php:166
+msgid "It's complicated"
+msgstr "To skomplikowane"
+
+#: src/Content/ContactSelector.php:166
+msgid "Don't care"
+msgstr "Nie przejmuj się"
+
+#: src/Content/ContactSelector.php:166
+msgid "Ask me"
+msgstr "Zapytaj mnie "
 
 #: src/Content/Feature.php:79
 msgid "General Features"
@@ -8842,10 +9654,6 @@ msgstr "Zarządzaj"
 msgid "Manage other pages"
 msgstr "Zarządzaj innymi stronami"
 
-#: src/Content/Nav.php:210 src/Model/Profile.php:368
-msgid "Profiles"
-msgstr "Profile"
-
 #: src/Content/Nav.php:210
 msgid "Manage/Edit Profiles"
 msgstr "Zarządzaj/Edytuj profile"
@@ -8862,760 +9670,47 @@ msgstr "Nawigacja"
 msgid "Site map"
 msgstr "Mapa strony"
 
-#: src/Database/DBStructure.php:32
-msgid "There are no tables on MyISAM."
-msgstr "W MyISAM nie ma tabel."
-
-#: 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 "\n\t\t\t\tDeweloperzy friendica wydali niedawno aktualizację %s,\n\t\t\t\tale podczas próby instalacji, coś poszło nie tak.\n\t\t\t\tZostanie to naprawione wkrótce i nie mogę tego zrobić sam. Proszę skontaktować się z \n\t\t\t\tprogramistami friendica, jeśli nie możesz mi pomóc na własną rękę. Moja baza danych może być nieprawidłowa."
-
-#: src/Database/DBStructure.php:80
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr "Komunikat o błędzie jest \n[pre]%s[/ pre]"
-
-#: src/Database/DBStructure.php:191
-#, php-format
-msgid ""
-"\n"
-"Error %d occurred during database update:\n"
-"%s\n"
-msgstr "\nWystąpił błąd %d podczas aktualizacji bazy danych:\n%s\n"
-
-#: src/Database/DBStructure.php:194
-msgid "Errors encountered performing database changes: "
-msgstr "Napotkane błędy powodujące zmiany w bazie danych:"
-
-#: src/Database/DBStructure.php:210
-#, php-format
-msgid "%s: Database update"
-msgstr "%s: Aktualizacja bazy danych:"
-
-#: src/Database/DBStructure.php:460
-#, php-format
-msgid "%s: updating %s table."
-msgstr "%s: aktualizowanie %s tabeli."
-
-#: src/Model/Mail.php:40 src/Model/Mail.php:174
-msgid "[no subject]"
-msgstr "[bez tematu]"
-
-#: src/Model/Event.php:53 src/Model/Event.php:70 src/Model/Event.php:419
-#: src/Model/Event.php:882
-msgid "Starts:"
-msgstr "Rozpoczęcie:"
-
-#: src/Model/Event.php:56 src/Model/Event.php:76 src/Model/Event.php:420
-#: src/Model/Event.php:886
-msgid "Finishes:"
-msgstr "Zakończenie:"
-
-#: src/Model/Event.php:368
-msgid "all-day"
-msgstr "cały dzień"
-
-#: src/Model/Event.php:391
-msgid "Jun"
-msgstr "cze"
-
-#: src/Model/Event.php:394
-msgid "Sept"
-msgstr "wrz"
-
-#: src/Model/Event.php:417
-msgid "No events to display"
-msgstr "Brak wydarzeń do wyświetlenia"
-
-#: src/Model/Event.php:543
-msgid "l, F j"
-msgstr "d, M d "
-
-#: src/Model/Event.php:566
-msgid "Edit event"
-msgstr "Edytuj wydarzenie"
-
-#: src/Model/Event.php:567
-msgid "Duplicate event"
-msgstr "Zduplikowane zdarzenie"
-
-#: src/Model/Event.php:568
-msgid "Delete event"
-msgstr "Usuń wydarzenie"
-
-#: src/Model/Event.php:815
-msgid "D g:i A"
-msgstr "D g:m AM/PM"
-
-#: src/Model/Event.php:816
-msgid "g:i A"
-msgstr "g:m AM/PM"
-
-#: src/Model/Event.php:901 src/Model/Event.php:903
-msgid "Show map"
-msgstr "Pokaż mapę"
-
-#: src/Model/Event.php:902
-msgid "Hide map"
-msgstr "Ukryj mapę"
-
-#: 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 "Skasowana grupa o tej nazwie została przywrócona. Istniejące uprawnienia do pozycji <strong>mogą</strong> dotyczyć tej grupy i wszystkich przyszłych członków. Jeśli nie jest to zamierzone, utwórz inną grupę o innej nazwie."
-
-#: src/Model/Group.php:341
-msgid "Default privacy group for new contacts"
-msgstr "Domyślne ustawienia prywatności dla nowych kontaktów"
-
-#: src/Model/Group.php:374
-msgid "Everybody"
-msgstr "Wszyscy"
-
-#: src/Model/Group.php:394
-msgid "edit"
-msgstr "edytuj"
-
-#: src/Model/Group.php:418
-msgid "Edit group"
-msgstr "Edytuj grupy"
-
-#: src/Model/Group.php:419
-msgid "Contacts not in any group"
-msgstr "Kontakt nie jest w żadnej grupie"
-
-#: src/Model/Group.php:420
-msgid "Create a new group"
-msgstr "Stwórz nową grupę"
-
-#: src/Model/Group.php:422
-msgid "Edit groups"
-msgstr "Edytuj grupy"
-
-#: src/Model/Profile.php:97
-msgid "Requested account is not available."
-msgstr "Żądane konto jest niedostępne."
-
-#: src/Model/Profile.php:164 src/Model/Profile.php:395
-#: src/Model/Profile.php:857
-msgid "Edit profile"
-msgstr "Edytuj profil"
-
-#: src/Model/Profile.php:332
-msgid "Atom feed"
-msgstr "Kanał Atom"
-
-#: src/Model/Profile.php:368
-msgid "Manage/edit profiles"
-msgstr "Zarządzaj profilami"
-
-#: src/Model/Profile.php:546 src/Model/Profile.php:639
-msgid "g A l F d"
-msgstr "g A I F d"
-
-#: src/Model/Profile.php:547
-msgid "F d"
-msgstr ""
-
-#: src/Model/Profile.php:604 src/Model/Profile.php:701
-msgid "[today]"
-msgstr "[dziś]"
-
-#: src/Model/Profile.php:615
-msgid "Birthday Reminders"
-msgstr "Przypomnienia o urodzinach"
-
-#: src/Model/Profile.php:616
-msgid "Birthdays this week:"
-msgstr "Urodziny w tym tygodniu:"
-
-#: src/Model/Profile.php:688
-msgid "[No description]"
-msgstr "[Brak opisu]"
-
-#: src/Model/Profile.php:715
-msgid "Event Reminders"
-msgstr "Przypominacze wydarzeń"
-
-#: src/Model/Profile.php:716
-msgid "Events this week:"
-msgstr "Wydarzenia w tym tygodniu:"
-
-#: src/Model/Profile.php:739
-msgid "Member since:"
-msgstr "Członek od:"
-
-#: src/Model/Profile.php:747
-msgid "j F, Y"
-msgstr "d M, R"
-
-#: src/Model/Profile.php:748
-msgid "j F"
-msgstr "d M"
-
-#: src/Model/Profile.php:763
-msgid "Age:"
-msgstr "Wiek:"
-
-#: src/Model/Profile.php:776
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "od %1$d %2$s"
-
-#: src/Model/Profile.php:800
-msgid "Religion:"
-msgstr "Religia:"
-
-#: src/Model/Profile.php:808
-msgid "Hobbies/Interests:"
-msgstr "Hobby/Zainteresowania:"
-
-#: src/Model/Profile.php:820
-msgid "Contact information and Social Networks:"
-msgstr "Informacje kontaktowe i sieci społeczne"
-
-#: src/Model/Profile.php:824
-msgid "Musical interests:"
-msgstr "Zainteresowania muzyczne:"
-
-#: src/Model/Profile.php:828
-msgid "Books, literature:"
-msgstr "Książki, literatura:"
-
-#: src/Model/Profile.php:832
-msgid "Television:"
-msgstr "Telewizja:"
-
-#: src/Model/Profile.php:836
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/taniec/kultura/rozrywka"
-
-#: src/Model/Profile.php:840
-msgid "Love/Romance:"
-msgstr "Miłość/Romans:"
-
-#: src/Model/Profile.php:844
-msgid "Work/employment:"
-msgstr "Praca/zatrudnienie:"
-
-#: src/Model/Profile.php:848
-msgid "School/education:"
-msgstr "Szkoła/edukacja:"
-
-#: src/Model/Profile.php:853
-msgid "Forums:"
-msgstr "Fora:"
-
-#: src/Model/Profile.php:947
-msgid "Only You Can See This"
-msgstr "Tylko ty możesz to zobaczyć"
-
-#: src/Model/User.php:154
-msgid "Login failed"
-msgstr "Logowanie nieudane"
-
-#: src/Model/User.php:185
-msgid "Not enough information to authenticate"
-msgstr "Za mało informacji do uwierzytelnienia"
-
-#: src/Model/User.php:346
-msgid "An invitation is required."
-msgstr "Wymagane zaproszenie."
-
-#: src/Model/User.php:350
-msgid "Invitation could not be verified."
-msgstr "Zaproszenie niezweryfikowane."
-
-#: src/Model/User.php:357
-msgid "Invalid OpenID url"
-msgstr "Nieprawidłowy adres url OpenID"
-
-#: src/Model/User.php:370 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 "Napotkaliśmy problem podczas logowania z podanym przez nas identyfikatorem OpenID. Sprawdź poprawną pisownię identyfikatora."
-
-#: src/Model/User.php:370 src/Module/Login.php:101
-msgid "The error message was:"
-msgstr "Komunikat o błędzie:"
-
-#: src/Model/User.php:376
-msgid "Please enter the required information."
-msgstr "Wprowadź wymagane informacje"
-
-#: src/Model/User.php:389
-msgid "Please use a shorter name."
-msgstr "Użyj dłuższej nazwy."
-
-#: src/Model/User.php:392
-msgid "Name too short."
-msgstr "Nazwa jest za krótka."
-
-#: src/Model/User.php:400
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "Wydaje mi się, że to nie jest twoje pełne imię (pierwsze imię) i nazwisko."
-
-#: src/Model/User.php:405
-msgid "Your email domain is not among those allowed on this site."
-msgstr "Twoja domena internetowa nie jest obsługiwana na tej stronie."
-
-#: src/Model/User.php:409
-msgid "Not a valid email address."
-msgstr "Niepoprawny adres e mail.."
-
-#: src/Model/User.php:413 src/Model/User.php:421
-msgid "Cannot use that email."
-msgstr "Nie możesz użyć tego e-maila. "
-
-#: src/Model/User.php:428
-msgid "Your nickname can only contain a-z, 0-9 and _."
-msgstr "Twój pseudonim może zawierać tylko a-z, 0-9 i _."
-
-#: src/Model/User.php:435 src/Model/User.php:491
-msgid "Nickname is already registered. Please choose another."
-msgstr "Ten login jest zajęty. Wybierz inny."
-
-#: src/Model/User.php:445
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "POWAŻNY BŁĄD: niepowodzenie podczas tworzenia kluczy zabezpieczeń."
-
-#: src/Model/User.php:478 src/Model/User.php:482
-msgid "An error occurred during registration. Please try again."
-msgstr "Wystąpił bład podczas rejestracji, Spróbuj ponownie."
-
-#: src/Model/User.php:507
-msgid "An error occurred creating your default profile. Please try again."
-msgstr "Wystąpił błąd podczas tworzenia profilu. Spróbuj ponownie."
-
-#: src/Model/User.php:514
-msgid "An error occurred creating your self contact. Please try again."
-msgstr "Wystąpił błąd podczas tworzenia własnego kontaktu. Proszę spróbuj ponownie."
-
-#: src/Model/User.php:523
-msgid ""
-"An error occurred creating your default contact group. Please try again."
-msgstr "Wystąpił błąd podczas tworzenia domyślnej grupy kontaktów. Proszę spróbuj ponownie."
-
-#: src/Model/User.php:597
-#, 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\tDrodzy %1$s, \n\t\t\t\tDziękujemy za rejestrację na stronie %2$s. Twoje konto czeka na zatwierdzenie przez administratora."
-
-#: src/Model/User.php:607
-#, php-format
-msgid "Registration at %s"
-msgstr "Rejestracja w %s"
-
-#: src/Model/User.php:625
-#, 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\tDrodzy %1$s, \n\t\t\t\tDziękujemy za rejestrację na stronie %2$s. Twoje konto zostało utworzone."
-
-#: src/Model/User.php:629
-#, 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\tDane logowania są następuje:\n\t\t\tLokalizacja witryny:\t%3$s\n\t\t\tNazwa użytkownika:\t\t%1$s\n\t\t\tHasło:\t\t%5$s\n\n\t\t\tPo zalogowaniu możesz zmienić hasło do swojego konta na stronie \"Ustawienia\"\n \t\t\tProszę poświęć chwilę, aby przejrzeć inne ustawienia konta na tej stronie.\n\n\t\t\tMożesz również dodać podstawowe informacje do swojego domyślnego profilu\n\t\t\t(na stronie \"Profil\"), aby inne osoby mogły łatwo Cię znaleźć.\n\n\t\t\tZalecamy ustawienie imienia i nazwiska, dodanie zdjęcia profilowego,\n\t\t\tdodanie niektórych \"słów kluczowych\" profilu (bardzo przydatne w nawiązywaniu nowych znajomości) - i\n\t\t\tbyć może w jakim kraju mieszkasz; jeśli nie chcesz być bardziej szczegółowy.\n\n\t\t\tW pełni szanujemy Twoje prawo do prywatności i żaden z tych elementów nie jest konieczny.\n\t\t\tJeśli jesteś nowy i nie znasz tutaj nikogo, oni mogą ci pomóc\n\t\t\tmożesz zdobyć nowych interesujących przyjaciół\n\n\t\t\tJeśli kiedykolwiek zechcesz usunąć swoje konto, możesz to zrobić w %3$s/Usuń konto\n\n\t\t\tDziękujemy i Zapraszamy do %2$s."
-
-#: src/Model/Contact.php:667
-msgid "Drop Contact"
-msgstr "Upuść kontakt"
-
-#: src/Model/Contact.php:1101
-msgid "Organisation"
-msgstr "Organizacja"
-
-#: src/Model/Contact.php:1104
-msgid "News"
-msgstr "Aktualności"
-
-#: src/Model/Contact.php:1107
-msgid "Forum"
-msgstr "Forum"
-
-#: src/Model/Contact.php:1286
-msgid "Connect URL missing."
-msgstr "Brak adresu URL połączenia."
-
-#: 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 "Nie można dodać kontaktu. Sprawdź odpowiednie poświadczenia sieciowe na stronie Ustawienia -> Sieci społecznościowe."
-
-#: src/Model/Contact.php:1342
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr "Ta strona nie jest skonfigurowana do pozwalania na komunikację z innymi sieciami"
-
-#: src/Model/Contact.php:1343 src/Model/Contact.php:1357
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr "Nie znaleziono żadnych kompatybilnych protokołów komunikacyjnych ani źródeł."
-
-#: src/Model/Contact.php:1355
-msgid "The profile address specified does not provide adequate information."
-msgstr "Dany adres profilu nie dostarcza odpowiednich informacji."
-
-#: src/Model/Contact.php:1360
-msgid "An author or name was not found."
-msgstr "Autor lub nazwa nie zostało znalezione."
-
-#: src/Model/Contact.php:1363
-msgid "No browser URL could be matched to this address."
-msgstr "Przeglądarka WWW nie może odnaleźć podanego adresu"
-
-#: src/Model/Contact.php:1366
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr "Nie można dopasować @-stylu Adres identyfikacyjny ze znanym protokołem lub kontaktem e-mail."
-
-#: src/Model/Contact.php:1367
-msgid "Use mailto: in front of address to force email check."
-msgstr "Użyj mailto: przed adresem, aby wymusić sprawdzanie poczty e-mail."
-
-#: src/Model/Contact.php:1373
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr "Określony adres profilu należy do sieci, która została wyłączona na tej stronie."
-
-#: src/Model/Contact.php:1378
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr "Profil ograniczony. Ta osoba będzie niezdolna do odbierania osobistych powiadomień od ciebie."
-
-#: src/Model/Contact.php:1429
-msgid "Unable to retrieve contact information."
-msgstr "Nie można otrzymać informacji kontaktowych"
-
-#: src/Model/Contact.php:1646 src/Protocol/DFRN.php:1513
-#, php-format
-msgid "%s's birthday"
-msgstr "Urodziny %s"
-
-#: src/Model/Contact.php:1647 src/Protocol/DFRN.php:1514
-#, php-format
-msgid "Happy Birthday %s"
-msgstr "Urodziny %s"
-
-#: src/Model/Item.php:1851
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$suczestniczy %2$s's %3$s "
-
-#: src/Model/Item.php:1856
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$snie uczestniczy %2$s's %3$s "
-
-#: src/Model/Item.php:1861
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$smogą uczestniczyć %2$s's %3$s "
-
-#: src/Protocol/OStatus.php:1799
-#, php-format
-msgid "%s is now following %s."
-msgstr "%sjest teraz następujące %s. "
-
-#: src/Protocol/OStatus.php:1800
-msgid "following"
-msgstr "następujący"
-
-#: src/Protocol/OStatus.php:1803
-#, php-format
-msgid "%s stopped following %s."
-msgstr "%sprzestał śledzić %s. "
-
-#: src/Protocol/OStatus.php:1804
-msgid "stopped following"
-msgstr "przestał śledzić"
-
-#: src/Protocol/Diaspora.php:2521
-msgid "Sharing notification from Diaspora network"
-msgstr "Wspólne powiadomienie z sieci Diaspora"
-
-#: src/Protocol/Diaspora.php:3609
-msgid "Attachments:"
-msgstr "Załączniki:"
-
-#: src/Worker/Delivery.php:415
-msgid "(no subject)"
-msgstr "(bez tematu)"
-
-#: src/Module/Logout.php:28
-msgid "Logged out."
-msgstr "Wyloguj"
-
-#: src/Module/Login.php:283
-msgid "Create a New Account"
-msgstr "Załóż nowe konto"
-
-#: src/Module/Login.php:316
-msgid "Password: "
-msgstr "Hasło:"
-
-#: src/Module/Login.php:317
-msgid "Remember me"
-msgstr "Zapamiętaj mnie"
-
-#: src/Module/Login.php:320
-msgid "Or login using OpenID: "
-msgstr "Lub zaloguj się korzystając z OpenID:"
-
-#: src/Module/Login.php:326
-msgid "Forgot your password?"
-msgstr "Zapomniałeś swojego hasła?"
-
-#: src/Module/Login.php:329
-msgid "Website Terms of Service"
-msgstr "Warunki korzystania z witryny"
-
-#: src/Module/Login.php:330
-msgid "terms of service"
-msgstr "warunki użytkowania"
-
-#: src/Module/Login.php:332
-msgid "Website Privacy Policy"
-msgstr "Polityka Prywatności Witryny"
-
-#: src/Module/Login.php:333
-msgid "privacy policy"
-msgstr "polityka prywatności"
-
-#: 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 "W momencie rejestracji oraz w celu zapewnienia komunikacji między kontem użytkownika, a jego kontaktami, użytkownik musi podać nazwę wyświetlaną (pseudonim), nazwę użytkownika (przydomek) i działający adres e-mail. Nazwy będą dostępne na stronie profilu konta dla każdego odwiedzającego stronę, nawet jeśli inne szczegóły profilu nie zostaną wyświetlone. Adres e-mail będzie używany tylko do wysyłania powiadomień użytkownika o interakcjach, ale nie będzie wyświetlany w widoczny sposób. Lista kont w katalogu użytkownika węzła lub globalnym katalogu użytkownika jest opcjonalna i może być kontrolowana w ustawieniach użytkownika, nie jest konieczna do komunikacji."
-
-#: 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 "Te dane są wymagane do komunikacji i są przekazywane do węzłów partnerów komunikacyjnych i są tam przechowywane. Użytkownicy mogą wprowadzać dodatkowe prywatne dane, które mogą być przesyłane na konta partnerów komunikacyjnych."
-
-#: 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 "W dowolnym momencie zalogowany użytkownik może wyeksportować dane swojego konta z <a href=\"%1$s/settings/uexport\">ustawień konta</a>. Jeśli użytkownik chce usunąć swoje konto, może to zrobić w<a href=\"%1$s/removeme\">%1$s / Usuń mnie</a>. Usunięcie konta będzie trwałe. Skasowanie danych będzie również wymagane od węzłów partnerów komunikacyjnych."
-
-#: src/Module/Tos.php:39 src/Module/Tos.php:73
-msgid "Privacy Statement"
-msgstr "Oświadczenie o prywatności"
-
-#: src/Object/Post.php:128
-msgid "This entry was edited"
-msgstr "Ten wpis został zedytowany"
-
-#: src/Object/Post.php:187
-msgid "Remove from your stream"
-msgstr "Usuń ze swojego strumienia"
-
-#: src/Object/Post.php:200
-msgid "save to folder"
-msgstr "zapisz w folderze"
-
-#: src/Object/Post.php:243
-msgid "I will attend"
-msgstr "Będę uczestniczyć"
-
-#: src/Object/Post.php:243
-msgid "I will not attend"
-msgstr "Nie będę uczestniczyć"
-
-#: src/Object/Post.php:243
-msgid "I might attend"
-msgstr "Mogę wziąć udział"
-
-#: src/Object/Post.php:271
-msgid "add star"
-msgstr "dodaj gwiazdkę"
-
-#: src/Object/Post.php:272
-msgid "remove star"
-msgstr "anuluj gwiazdkę"
-
-#: src/Object/Post.php:273
-msgid "toggle star status"
-msgstr "włącz status gwiazdy"
-
-#: src/Object/Post.php:276
-msgid "starred"
-msgstr "gwiazdką"
-
-#: src/Object/Post.php:282
-msgid "ignore thread"
-msgstr "zignoruj ​​wątek"
-
-#: src/Object/Post.php:283
-msgid "unignore thread"
-msgstr "odignoruj ​​wątek"
-
-#: src/Object/Post.php:284
-msgid "toggle ignore status"
-msgstr "przełącz status ignorowania"
-
-#: src/Object/Post.php:293
-msgid "add tag"
-msgstr "dodaj tag"
-
-#: src/Object/Post.php:304
-msgid "like"
-msgstr "lubię to"
-
-#: src/Object/Post.php:305
-msgid "dislike"
-msgstr "nie lubię tego"
-
-#: src/Object/Post.php:308
-msgid "Share this"
-msgstr "Udostępnij to"
-
-#: src/Object/Post.php:308
-msgid "share"
-msgstr "udostępnij"
-
-#: src/Object/Post.php:373
-msgid "to"
-msgstr "do"
-
-#: src/Object/Post.php:374
-msgid "via"
-msgstr "przez"
-
-#: src/Object/Post.php:375
-msgid "Wall-to-Wall"
-msgstr "Wall-to-Wall"
-
-#: src/Object/Post.php:376
-msgid "via Wall-To-Wall:"
-msgstr "via Wall-To-Wall:"
-
-#: src/Object/Post.php:435
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] " %d komentarz"
-msgstr[1] " %d komentarzy"
-msgstr[2] " %d komentarzy"
-msgstr[3] " %d komentarzy"
-
-#: src/Object/Post.php:805
-msgid "Bold"
-msgstr "Pogrubienie"
-
-#: src/Object/Post.php:806
-msgid "Italic"
-msgstr "Kursywa"
-
-#: src/Object/Post.php:807
-msgid "Underline"
-msgstr "Podkreślenie"
-
-#: src/Object/Post.php:808
-msgid "Quote"
-msgstr "Cytat"
-
-#: src/Object/Post.php:809
-msgid "Code"
-msgstr "Kod"
-
-#: src/Object/Post.php:810
-msgid "Image"
-msgstr "Obraz"
-
-#: src/Object/Post.php:811
-msgid "Link"
-msgstr "Link"
-
-#: src/Object/Post.php:812
-msgid "Video"
-msgstr "Video"
-
-#: src/App.php:524
-msgid "Delete this item?"
-msgstr "Usunąć ten element?"
-
-#: src/App.php:526
-msgid "show fewer"
-msgstr "Pokaż mniej"
-
-#: src/App.php:1114
-msgid "No system theme config value set."
-msgstr "Nie ustawiono wartości konfiguracyjnej zestawu tematycznego."
-
-#: index.php:464
-msgid "toggle mobile"
-msgstr "przełącz na mobilny"
-
-#: update.php:193
-#, php-format
-msgid "%s: Updating author-id and owner-id in item and thread table. "
-msgstr "%s: Aktualizowanie ID autora i właściciela w tabeli pozycji i wątku."
-
-#: boot.php:796
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "Aktualizacja %s nie powiodła się. Zobacz dziennik błędów."
+#: src/Content/Widget/CalendarExport.php:65
+msgid "Export"
+msgstr "Eksport"
+
+#: src/Content/Widget/CalendarExport.php:66
+msgid "Export calendar as ical"
+msgstr "Wyeksportuj kalendarz jako ical"
+
+#: src/Content/Widget/CalendarExport.php:67
+msgid "Export calendar as csv"
+msgstr "Eksportuj kalendarz jako csv"
+
+#: src/Content/OEmbed.php:256
+msgid "Embedding disabled"
+msgstr "Osadzanie wyłączone"
+
+#: src/Content/OEmbed.php:376
+msgid "Embedded content"
+msgstr "Osadzona zawartość"
+
+#: src/Content/Text/BBCode.php:423
+msgid "view full size"
+msgstr "Zobacz w pełnym wymiarze"
+
+#: src/Content/Text/BBCode.php:853 src/Content/Text/BBCode.php:1626
+#: src/Content/Text/BBCode.php:1627
+msgid "Image/photo"
+msgstr "Obrazek/zdjęcie"
+
+#: src/Content/Text/BBCode.php:1553 src/Content/Text/BBCode.php:1575
+msgid "$1 wrote:"
+msgstr "$1 napisał:"
+
+#: src/Content/Text/BBCode.php:1635 src/Content/Text/BBCode.php:1636
+msgid "Encrypted content"
+msgstr "Szyfrowana treść"
+
+#: src/Content/Text/BBCode.php:1755
+msgid "Invalid source protocol"
+msgstr "Nieprawidłowy protokół źródłowy"
+
+#: src/Content/Text/BBCode.php:1766
+msgid "Invalid link protocol"
+msgstr "Niepoprawny link protokołu"
diff --git a/view/lang/pl/strings.php b/view/lang/pl/strings.php
index 8ccf61ecc..82876b12a 100644
--- a/view/lang/pl/strings.php
+++ b/view/lang/pl/strings.php
@@ -6,10 +6,232 @@ function string_plural_select_pl($n){
 	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
 ;
+$a->strings["You must be logged in to use addons. "] = "Musisz być zalogowany, aby korzystać z dodatków.";
+$a->strings["Not Found"] = "Nie znaleziono";
+$a->strings["Page not found."] = "Strona nie znaleziona.";
+$a->strings["Permission denied"] = "Odmowa dostępu";
+$a->strings["Permission denied."] = "Brak uprawnień.";
+$a->strings["toggle mobile"] = "przełącz na mobilny";
+$a->strings["default"] = "standardowe";
+$a->strings["greenzero"] = "zielone zero";
+$a->strings["purplezero"] = "fioletowe zero";
+$a->strings["easterbunny"] = "zajączek wielkanocny";
+$a->strings["darkzero"] = "ciemne zero";
+$a->strings["comix"] = "comix";
+$a->strings["slackr"] = "luźny";
+$a->strings["Submit"] = "Potwierdź";
+$a->strings["Theme settings"] = "Ustawienia motywu";
+$a->strings["Variations"] = "Zmiana";
+$a->strings["Alignment"] = "Wyrównanie";
+$a->strings["Left"] = "Lewo";
+$a->strings["Center"] = "Środek";
+$a->strings["Color scheme"] = "Zestaw kolorów";
+$a->strings["Posts font size"] = "Rozmiar czcionki postów";
+$a->strings["Textareas font size"] = "Rozmiar czcionki Textareas";
+$a->strings["Comma separated list of helper forums"] = "Lista pomocników oddzielona przecinkami";
+$a->strings["don't show"] = "nie pokazuj";
+$a->strings["show"] = "pokaż";
+$a->strings["Set style"] = "Ustaw styl";
+$a->strings["Community Pages"] = "Strony społeczności";
+$a->strings["Community Profiles"] = "Profile społeczności";
+$a->strings["Help or @NewHere ?"] = "Pomóż lub @NowyTutaj?";
+$a->strings["Connect Services"] = "Połączone serwisy";
+$a->strings["Find Friends"] = "Znajdź znajomych";
+$a->strings["Last users"] = "Ostatni użytkownicy";
+$a->strings["Find People"] = "Znajdź ludzi";
+$a->strings["Enter name or interest"] = "Wpisz nazwę lub zainteresowanie";
+$a->strings["Connect/Follow"] = "Połącz/Obserwuj";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "Przykład: Jan Kowalski, Wędkarstwo";
+$a->strings["Find"] = "Znajdź";
+$a->strings["Friend Suggestions"] = "Osoby, które możesz znać";
+$a->strings["Similar Interests"] = "Podobne zainteresowania";
+$a->strings["Random Profile"] = "Domyślny profil";
+$a->strings["Invite Friends"] = "Zaproś znajomych";
+$a->strings["Global Directory"] = "Katalog Globalny";
+$a->strings["Local Directory"] = "Katalog lokalny";
+$a->strings["Forums"] = "Fora";
+$a->strings["External link to forum"] = "Zewnętrzny link do forum";
+$a->strings["show more"] = "Pokaż więcej";
+$a->strings["Quick Start"] = "Szybki start";
+$a->strings["Help"] = "Pomoc";
+$a->strings["Custom"] = "Niestandardowe";
+$a->strings["Note"] = "Uwaga";
+$a->strings["Check image permissions if all users are allowed to see the image"] = "Sprawdź uprawnienia do zdjęć, jeśli wszyscy użytkownicy mogą zobaczyć obraz";
+$a->strings["Select color scheme"] = "Wybierz schemat kolorów";
+$a->strings["Navigation bar background color"] = "Kolor tła paska nawigacyjnego";
+$a->strings["Navigation bar icon color "] = "Kolor ikony paska nawigacyjnego";
+$a->strings["Link color"] = "Kolor łączy";
+$a->strings["Set the background color"] = "Ustaw kolor tła";
+$a->strings["Content background opacity"] = "Nieprzezroczystość tła treści";
+$a->strings["Set the background image"] = "Ustaw obraz tła";
+$a->strings["Background image style"] = "Styl tła";
+$a->strings["Login page background image"] = "Obraz tła strony logowania";
+$a->strings["Login page background color"] = "Kolor tła strony logowania";
+$a->strings["Leave background image and color empty for theme defaults"] = "Pozostaw obraz tła i kolor pusty dla domyślnych ustawień kompozycji";
+$a->strings["Guest"] = "Gość";
+$a->strings["Visitor"] = "Odwiedzający";
+$a->strings["Logout"] = "Wyloguj";
+$a->strings["End this session"] = "Zakończ sesję";
+$a->strings["Status"] = "Status";
+$a->strings["Your posts and conversations"] = "Twoje posty i rozmowy";
+$a->strings["Profile"] = "Profil użytkownika";
+$a->strings["Your profile page"] = "Twoja strona profilowa";
+$a->strings["Photos"] = "Zdjęcia";
+$a->strings["Your photos"] = "Twoje zdjęcia";
+$a->strings["Videos"] = "Filmy";
+$a->strings["Your videos"] = "Twoje filmy";
+$a->strings["Events"] = "Wydarzenia";
+$a->strings["Your events"] = "Twoje wydarzenia";
+$a->strings["Network"] = "Sieć";
+$a->strings["Conversations from your friends"] = "Rozmowy Twoich przyjaciół";
+$a->strings["Events and Calendar"] = "Wydarzenia i kalendarz";
+$a->strings["Messages"] = "Wiadomości";
+$a->strings["Private mail"] = "Prywatne maile";
+$a->strings["Settings"] = "Ustawienia";
+$a->strings["Account settings"] = "Ustawienia konta";
+$a->strings["Contacts"] = "Kontakty";
+$a->strings["Manage/edit friends and contacts"] = "Zarządzaj listą przyjaciół i kontaktami";
+$a->strings["Follow Thread"] = "Śledź wątek";
+$a->strings["Top Banner"] = "Górny Baner";
+$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Zmień rozmiar obrazu na szerokość ekranu i pokaż kolor tła poniżej na długich stronach.";
+$a->strings["Full screen"] = "Pełny ekran";
+$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Zmień rozmiar obrazu, aby wypełnić cały ekran, przycinając prawy lub dolny.";
+$a->strings["Single row mosaic"] = "Mozaika jednorzędowa";
+$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Zmień rozmiar obrazu, aby powtórzyć go w jednym wierszu, w pionie lub w poziomie.";
+$a->strings["Mosaic"] = "Mozaika";
+$a->strings["Repeat image to fill the screen."] = "Powtórz obraz, aby wypełnić ekran.";
+$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Aktualizowanie ID autora i właściciela w tabeli pozycji i wątku.";
+$a->strings["%s: Updating post-type."] = "%s: Aktualizowanie typu postu.";
+$a->strings["Item not found."] = "Element nie znaleziony.";
+$a->strings["Do you really want to delete this item?"] = "Czy na pewno chcesz usunąć ten element?";
+$a->strings["Yes"] = "Tak";
+$a->strings["Cancel"] = "Anuluj";
+$a->strings["Archives"] = "Archiwum";
+$a->strings["event"] = "wydarzenie";
+$a->strings["status"] = "status";
+$a->strings["photo"] = "zdjęcie";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s lubi to %2\$s's %3\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s nie lubi %2\$s's %3\$s";
+$a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$sbierze udział w %2\$s's%3\$s ";
+$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s nie uczestniczy %2\$s 's %3\$s";
+$a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s może bierze udział %2\$s 's %3\$s";
+$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s jest teraz znajomym z %2\$s";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s zaczepił Cię %2\$s";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s zaznaczył %2\$s'go %3\$s przy użyciu %4\$s";
+$a->strings["post/item"] = "stanowisko/pozycja";
+$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s oznacz %2\$s's %3\$s jako ulubione";
+$a->strings["Likes"] = "Lubię to";
+$a->strings["Dislikes"] = "Nie lubię tego";
+$a->strings["Attending"] = [
+	0 => "Uczestniczę",
+	1 => "Uczestniczy",
+	2 => "Uczestniczą",
+	3 => "Uczestniczą",
+];
+$a->strings["Not attending"] = "Nie uczestniczę";
+$a->strings["Might attend"] = "Może wziąć udział";
+$a->strings["Select"] = "Wybierz";
+$a->strings["Delete"] = "Usuń";
+$a->strings["View %s's profile @ %s"] = "Pokaż %s's profil @ %s";
+$a->strings["Categories:"] = "Kategorie:";
+$a->strings["Filed under:"] = "Zapisano w:";
+$a->strings["%s from %s"] = "%s od %s";
+$a->strings["View in context"] = "Zobacz w kontekście";
+$a->strings["Please wait"] = "Proszę czekać";
+$a->strings["remove"] = "usuń";
+$a->strings["Delete Selected Items"] = "Usuń zaznaczone elementy";
+$a->strings["View Status"] = "Zobacz status";
+$a->strings["View Profile"] = "Zobacz profil";
+$a->strings["View Photos"] = "Zobacz zdjęcia";
+$a->strings["Network Posts"] = "Wiadomości sieciowe";
+$a->strings["View Contact"] = "Pokaż kontakt";
+$a->strings["Send PM"] = "Wyślij prywatną wiadomość";
+$a->strings["Poke"] = "Zaczepka";
+$a->strings["%s likes this."] = "%s lubi to.";
+$a->strings["%s doesn't like this."] = "%s nie lubi tego.";
+$a->strings["%s attends."] = "%s uczestniczy.";
+$a->strings["%s doesn't attend."] = "%s nie uczestniczy.";
+$a->strings["%s attends maybe."] = "%s może bierze udział.";
+$a->strings["and"] = "i";
+$a->strings["and %d other people"] = "i %d inni ludzie";
+$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d ludzi </span> lubi to";
+$a->strings["%s like this."] = "%s lubię to.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d ludzi </span>nie lubi tego ";
+$a->strings["%s don't like this."] = "%s nie lubię tego.";
+$a->strings["<span  %1\$s>%2\$d people</span> attend"] = "<span  %1\$s>%2\$dosoby</span> uczestniczą";
+$a->strings["%s attend."] = "%suczestniczy";
+$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span  %1\$s>%2\$dludzie</span> nie uczestniczą";
+$a->strings["%s don't attend."] = "%s nie uczestnicz";
+$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span  %1\$s>%2\$dprzyjaciele</span>mogą uczestniczyć ";
+$a->strings["%s attend maybe."] = "%sbyć może uczestniczyć. ";
+$a->strings["Visible to <strong>everybody</strong>"] = "Widoczne dla <strong>wszystkich</strong>";
+$a->strings["Please enter a link URL:"] = "Proszę wpisać adres URL:";
+$a->strings["Please enter a video link/URL:"] = "Podaj link do filmu";
+$a->strings["Please enter an audio link/URL:"] = "Podaj link do muzyki";
+$a->strings["Tag term:"] = "Termin tagu:";
+$a->strings["Save to Folder:"] = "Zapisz w folderze:";
+$a->strings["Where are you right now?"] = "Gdzie teraz jesteś?";
+$a->strings["Delete item(s)?"] = "Usunąć pozycję (pozycje)?";
+$a->strings["New Post"] = "Nowy Post";
+$a->strings["Share"] = "Podziel się";
+$a->strings["Upload photo"] = "Wyślij zdjęcie";
+$a->strings["upload photo"] = "dodaj zdjęcie";
+$a->strings["Attach file"] = "Załącz plik";
+$a->strings["attach file"] = "załącz plik";
+$a->strings["Insert web link"] = "Wstaw link";
+$a->strings["web link"] = "Adres www";
+$a->strings["Insert video link"] = "Wstaw link do filmu";
+$a->strings["video link"] = "link do filmu";
+$a->strings["Insert audio link"] = "Wstaw link do audio";
+$a->strings["audio link"] = "link do audio";
+$a->strings["Set your location"] = "Ustaw swoją lokalizację";
+$a->strings["set location"] = "wybierz lokalizację";
+$a->strings["Clear browser location"] = "Wyczyść lokalizację przeglądarki";
+$a->strings["clear location"] = "wyczyść lokalizację";
+$a->strings["Set title"] = "Podaj tytuł";
+$a->strings["Categories (comma-separated list)"] = "Kategorie (lista słów oddzielonych przecinkiem)";
+$a->strings["Permission settings"] = "Ustawienia uprawnień";
+$a->strings["permissions"] = "zezwolenia";
+$a->strings["Public post"] = "Publiczny post";
+$a->strings["Preview"] = "Podgląd";
+$a->strings["Post to Groups"] = "Opublikuj w grupach";
+$a->strings["Post to Contacts"] = "Wstaw do kontaktów";
+$a->strings["Private post"] = "Prywatne posty";
+$a->strings["Message"] = "Wiadomość";
+$a->strings["Browser"] = "Przeglądarka";
+$a->strings["View all"] = "Pokaż wszystkie";
+$a->strings["Like"] = [
+	0 => "Ostatnie polubienie",
+	1 => "Ostatnie polubienia",
+	2 => "Ostatnich polubienień",
+	3 => "Ostatnie polubienia",
+];
+$a->strings["Dislike"] = [
+	0 => "Nie lubię",
+	1 => "Nie lubią",
+	2 => "Nie lubią",
+	3 => "Nie lubi",
+];
+$a->strings["Not Attending"] = [
+	0 => "Nie uczestniczę",
+	1 => "Nie uczestniczy",
+	2 => "Nie uczestniczą",
+	3 => "Nie uczestniczą",
+];
+$a->strings["Undecided"] = [
+	0 => "Niezdecydowany",
+	1 => "Niezdecydowani",
+	2 => "Niezdecydowani",
+	3 => "Niezdecydowani",
+];
+$a->strings["Welcome "] = "Witaj ";
+$a->strings["Please upload a profile photo."] = "Proszę dodać zdjęcie profilowe.";
+$a->strings["Welcome back "] = "Witaj ponownie ";
+$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."] = "Znacznik zabezpieczeń formularza nie był poprawny. Prawdopodobnie stało się tak, ponieważ formularz został otwarty zbyt długo (> 3 godziny) przed jego przesłaniem.";
 $a->strings["Friendica Notification"] = "Powiadomienia Friendica";
 $a->strings["Thank You,"] = "Dziękuję,";
-$a->strings["%s Administrator"] = "%s Administrator";
 $a->strings["%1\$s, %2\$s Administrator"] = "%1\$s,%2\$sAdministrator";
+$a->strings["%s Administrator"] = "%s Administrator";
 $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica:Powiadomienie] Nowa wiadomość otrzymana od %s";
 $a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$swysłał ci nową prywatną wiadomość na %2\$s ";
 $a->strings["a private message"] = "prywatna wiadomość";
@@ -63,153 +285,8 @@ $a->strings["[Friendica System Notify]"] = "[Powiadomienie Systemu Friendica]";
 $a->strings["registration request"] = "prośba o rejestrację";
 $a->strings["You've received a registration request from '%1\$s' at %2\$s"] = "Otrzymałeś wniosek rejestracyjny od '%1\$s' na %2\$s";
 $a->strings["You've received a [url=%1\$s]registration request[/url] from %2\$s."] = "Otrzymałeś [url=%1\$s] żądanie rejestracji [/url] od %2\$s.";
-$a->strings["Full Name:\t%1\$s\\nSite Location:\t%2\$s\\nLogin Name:\t%3\$s (%4\$s)"] = "Pełna nazwa:\t%1\$s \\nSite Lokalizacja:\t%2\$s\\nLogin użytkownika: \t%3\$s(%4\$s)";
+$a->strings["Full Name:\t%s\nSite Location:\t%s\nLogin Name:\t%s (%s)"] = "Imię i Nazwisko:\t%s\nLokalizacja witryny:\t%s\nNazwa użytkownika:\t%s(%s)";
 $a->strings["Please visit %s to approve or reject the request."] = "Odwiedź stronę %s, aby zatwierdzić lub odrzucić wniosek.";
-$a->strings["Welcome "] = "Witaj ";
-$a->strings["Please upload a profile photo."] = "Proszę dodać zdjęcie profilowe.";
-$a->strings["Welcome back "] = "Witaj ponownie ";
-$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."] = "Znacznik zabezpieczeń formularza nie był poprawny. Prawdopodobnie stało się tak, ponieważ formularz został otwarty zbyt długo (> 3 godziny) przed jego przesłaniem.";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "Nie można zlokalizować serwera DNS dla bazy danych '%s'";
-$a->strings["Daily posting limit of %d post reached. The post was rejected."] = [
-	0 => "",
-	1 => "",
-	2 => "",
-	3 => "",
-];
-$a->strings["Weekly posting limit of %d post reached. The post was rejected."] = [
-	0 => "",
-	1 => "",
-	2 => "",
-	3 => "",
-];
-$a->strings["Monthly posting limit of %d post reached. The post was rejected."] = "Miesięczny limit %d wysyłania postów. Post został odrzucony.";
-$a->strings["Profile Photos"] = "Zdjęcie profilowe";
-$a->strings["event"] = "wydarzenie";
-$a->strings["status"] = "status";
-$a->strings["photo"] = "zdjęcie";
-$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s lubi to %2\$s's %3\$s";
-$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s nie lubi %2\$s's %3\$s";
-$a->strings["%1\$s attends %2\$s's %3\$s"] = "%1\$sbierze udział w %2\$s's%3\$s ";
-$a->strings["%1\$s doesn't attend %2\$s's %3\$s"] = "%1\$s nie uczestniczy %2\$s 's %3\$s";
-$a->strings["%1\$s attends maybe %2\$s's %3\$s"] = "%1\$s może bierze udział %2\$s 's %3\$s";
-$a->strings["%1\$s is now friends with %2\$s"] = "%1\$s jest teraz znajomym z %2\$s";
-$a->strings["%1\$s poked %2\$s"] = "%1\$s zaczepił Cię %2\$s";
-$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s zaznaczył %2\$s'go %3\$s przy użyciu %4\$s";
-$a->strings["post/item"] = "stanowisko/pozycja";
-$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s oznacz %2\$s's %3\$s jako ulubione";
-$a->strings["Likes"] = "Lubię to";
-$a->strings["Dislikes"] = "Nie lubię tego";
-$a->strings["Attending"] = [
-	0 => "",
-	1 => "",
-	2 => "",
-	3 => "",
-];
-$a->strings["Not attending"] = "Nie uczestniczyłem";
-$a->strings["Might attend"] = "Może wziąć udział";
-$a->strings["Select"] = "Wybierz";
-$a->strings["Delete"] = "Usuń";
-$a->strings["View %s's profile @ %s"] = "Pokaż %s's profil @ %s";
-$a->strings["Categories:"] = "Kategorie:";
-$a->strings["Filed under:"] = "Zapisano w:";
-$a->strings["%s from %s"] = "%s od %s";
-$a->strings["View in context"] = "Zobacz w kontekście";
-$a->strings["Please wait"] = "Proszę czekać";
-$a->strings["remove"] = "usuń";
-$a->strings["Delete Selected Items"] = "Usuń zaznaczone elementy";
-$a->strings["Follow Thread"] = "Śledź wątek";
-$a->strings["View Status"] = "Zobacz status";
-$a->strings["View Profile"] = "Zobacz profil";
-$a->strings["View Photos"] = "Zobacz zdjęcia";
-$a->strings["Network Posts"] = "Wiadomości sieciowe";
-$a->strings["View Contact"] = "Pokaż kontakt";
-$a->strings["Send PM"] = "Wyślij prywatną wiadomość";
-$a->strings["Poke"] = "Zaczepka";
-$a->strings["Connect/Follow"] = "Połącz/Obserwuj";
-$a->strings["%s likes this."] = "%s lubi to.";
-$a->strings["%s doesn't like this."] = "%s nie lubi tego.";
-$a->strings["%s attends."] = "%s uczestniczy.";
-$a->strings["%s doesn't attend."] = "%s nie uczestniczy.";
-$a->strings["%s attends maybe."] = "%s może bierze udział.";
-$a->strings["and"] = "i";
-$a->strings["and %d other people"] = "i %d inni ludzie";
-$a->strings["<span  %1\$s>%2\$d people</span> like this"] = "<span  %1\$s>%2\$d ludzi </span> lubi to";
-$a->strings["%s like this."] = "%s lubię to.";
-$a->strings["<span  %1\$s>%2\$d people</span> don't like this"] = "<span  %1\$s>%2\$d ludzi </span>nie lubi tego ";
-$a->strings["%s don't like this."] = "%s nie lubię tego.";
-$a->strings["<span  %1\$s>%2\$d people</span> attend"] = "<span  %1\$s>%2\$dosoby</span> uczestniczą";
-$a->strings["%s attend."] = "%suczestniczy";
-$a->strings["<span  %1\$s>%2\$d people</span> don't attend"] = "<span  %1\$s>%2\$dludzie</span> nie uczestniczą";
-$a->strings["%s don't attend."] = "%s nie uczestnicz";
-$a->strings["<span  %1\$s>%2\$d people</span> attend maybe"] = "<span  %1\$s>%2\$dprzyjaciele</span>mogą uczestniczyć ";
-$a->strings["%s attend maybe."] = "%sbyć może uczestniczyć. ";
-$a->strings["Visible to <strong>everybody</strong>"] = "Widoczne dla <strong>wszystkich</strong>";
-$a->strings["Please enter a link URL:"] = "Proszę wpisać adres URL:";
-$a->strings["Please enter a video link/URL:"] = "Podaj link do filmu";
-$a->strings["Please enter an audio link/URL:"] = "Podaj link do muzyki";
-$a->strings["Tag term:"] = "Termin tagu:";
-$a->strings["Save to Folder:"] = "Zapisz w folderze:";
-$a->strings["Where are you right now?"] = "Gdzie teraz jesteś?";
-$a->strings["Delete item(s)?"] = "Usunąć pozycję (pozycje)?";
-$a->strings["New Post"] = "Nowy Post";
-$a->strings["Share"] = "Podziel się";
-$a->strings["Upload photo"] = "Wyślij zdjęcie";
-$a->strings["upload photo"] = "dodaj zdjęcie";
-$a->strings["Attach file"] = "Załącz plik";
-$a->strings["attach file"] = "załącz plik";
-$a->strings["Insert web link"] = "Wstaw link";
-$a->strings["web link"] = "Adres www";
-$a->strings["Insert video link"] = "Wstaw link do filmu";
-$a->strings["video link"] = "link do filmu";
-$a->strings["Insert audio link"] = "Wstaw link do audio";
-$a->strings["audio link"] = "Link do nagrania audio";
-$a->strings["Set your location"] = "Ustaw swoją lokalizację";
-$a->strings["set location"] = "wybierz lokalizację";
-$a->strings["Clear browser location"] = "Wyczyść lokalizację przeglądarki";
-$a->strings["clear location"] = "wyczyść lokalizację";
-$a->strings["Set title"] = "Podaj tytuł";
-$a->strings["Categories (comma-separated list)"] = "Kategorie (lista słów oddzielonych przecinkiem)";
-$a->strings["Permission settings"] = "Ustawienia uprawnień";
-$a->strings["permissions"] = "zezwolenia";
-$a->strings["Public post"] = "Publiczny post";
-$a->strings["Preview"] = "Podgląd";
-$a->strings["Cancel"] = "Anuluj";
-$a->strings["Post to Groups"] = "Opublikuj w grupach";
-$a->strings["Post to Contacts"] = "Wstaw do kontaktów";
-$a->strings["Private post"] = "Prywatne posty";
-$a->strings["Message"] = "Wiadomość";
-$a->strings["Browser"] = "Przeglądarka";
-$a->strings["View all"] = "Pokaż wszystkie";
-$a->strings["Like"] = [
-	0 => "",
-	1 => "",
-	2 => "",
-	3 => "",
-];
-$a->strings["Dislike"] = [
-	0 => "",
-	1 => "",
-	2 => "",
-	3 => "",
-];
-$a->strings["Not Attending"] = [
-	0 => "",
-	1 => "",
-	2 => "",
-	3 => "",
-];
-$a->strings["Undecided"] = [
-	0 => "",
-	1 => "",
-	2 => "",
-	3 => "",
-];
-$a->strings["Item not found."] = "Element nie znaleziony.";
-$a->strings["Do you really want to delete this item?"] = "Czy na pewno chcesz usunąć ten element?";
-$a->strings["Yes"] = "Tak";
-$a->strings["Permission denied."] = "Brak uprawnień.";
-$a->strings["Archives"] = "Archiwum";
-$a->strings["show more"] = "Pokaż więcej";
 $a->strings["newer"] = "nowsze";
 $a->strings["older"] = "starsze";
 $a->strings["first"] = "pierwszy";
@@ -232,8 +309,6 @@ $a->strings["Search"] = "Szukaj";
 $a->strings["@name, !forum, #tags, content"] = "@imię, !forum, #tagi, treść";
 $a->strings["Full Text"] = "Pełny tekst";
 $a->strings["Tags"] = "Tagi";
-$a->strings["Contacts"] = "Kontakty";
-$a->strings["Forums"] = "Fora";
 $a->strings["poke"] = "zaczep";
 $a->strings["poked"] = "zaczepił Cię";
 $a->strings["ping"] = "ping";
@@ -298,43 +373,556 @@ $a->strings["comment"] = [
 ];
 $a->strings["post"] = "post";
 $a->strings["Item filed"] = "Element złożony";
-$a->strings["No friends to display."] = "Brak znajomych do wyświetlenia";
-$a->strings["Connect"] = "Połącz";
-$a->strings["Authorize application connection"] = "Autoryzacja połączenia aplikacji";
-$a->strings["Return to your app and insert this Securty Code:"] = "Powróć do swojej aplikacji i wpisz ten Kod Bezpieczeństwa:";
-$a->strings["Please login to continue."] = "Zaloguj się aby kontynuować.";
-$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Czy chcesz zezwolić tej aplikacji na dostęp do swoich postów i kontaktów i/lub tworzenie nowych postów?";
-$a->strings["No"] = "Nie";
-$a->strings["You must be logged in to use addons. "] = "Musisz być zalogowany, aby korzystać z dodatków.";
-$a->strings["Applications"] = "Aplikacje";
-$a->strings["No installed applications."] = "Brak zainstalowanych aplikacji.";
-$a->strings["Item not available."] = "Element niedostępny.";
-$a->strings["Item was not found."] = "Element nie znaleziony.";
-$a->strings["No contacts in common."] = "Brak wspólnych kontaktów.";
-$a->strings["Common Friends"] = "Wspólni znajomi";
-$a->strings["Credits"] = "Zaufany";
-$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 to projekt społecznościowy, który nie byłby możliwy bez pomocy wielu osób. Oto lista osób, które przyczyniły się do tworzenia kodu lub tłumaczenia Friendica. Dziękuję wam wszystkim!";
-$a->strings["Photos"] = "Zdjęcia";
-$a->strings["Contact Photos"] = "Zdjęcia kontaktu";
-$a->strings["Upload"] = "Załaduj";
-$a->strings["Files"] = "Pliki";
-$a->strings["Not Found"] = "Nie znaleziono";
-$a->strings["No profile"] = "Brak profilu";
-$a->strings["Welcome to %s"] = "Witamy w %s";
+$a->strings["Daily posting limit of %d post reached. The post was rejected."] = [
+	0 => "Dzienny limit opublikowanych %d posta. Post został odrzucony.",
+	1 => "Dzienny limit opublikowanych %d postów. Post został odrzucony.",
+	2 => "Dzienny limit opublikowanych %d postów. Post został odrzucony.",
+	3 => "Dzienny limit opublikowanych %d postów. Post został odrzucony.",
+];
+$a->strings["Weekly posting limit of %d post reached. The post was rejected."] = [
+	0 => "Tygodniowy limit wysyłania %d posta. Post został odrzucony.",
+	1 => "Tygodniowy limit wysyłania %d postów. Post został odrzucony.",
+	2 => "Tygodniowy limit wysyłania %d postów. Post został odrzucony.",
+	3 => "Tygodniowy limit wysyłania %d postów. Post został odrzucony.",
+];
+$a->strings["Monthly posting limit of %d post reached. The post was rejected."] = "Miesięczny limit %d wysyłania postów. Post został odrzucony.";
+$a->strings["Profile Photos"] = "Zdjęcie profilowe";
+$a->strings["Contact settings applied."] = "Ustawienia kontaktu zaktualizowane.";
+$a->strings["Contact update failed."] = "Nie udało się zaktualizować kontaktu.";
+$a->strings["Contact not found."] = "Kontakt nie znaleziony";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>OSTRZEŻENIE: Jest to bardzo zaawansowane</strong> i jeśli wprowadzisz niepoprawne informacje, twoja komunikacja z tym kontaktem może przestać działać.";
+$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Jeśli nie jesteś pewien, co zrobić na tej stronie, użyj <strong>teraz</strong> przycisku 'powrót' na swojej przeglądarce.";
+$a->strings["No mirroring"] = "Bez dublowania";
+$a->strings["Mirror as forwarded posting"] = "Przesłany lustrzany post";
+$a->strings["Mirror as my own posting"] = "Lustro mojego własnego komentarza";
+$a->strings["Return to contact editor"] = "Wróć do edytora kontaktów";
+$a->strings["Refetch contact data"] = "Odśwież dane kontaktowe";
+$a->strings["Remote Self"] = "Zdalny Self";
+$a->strings["Mirror postings from this contact"] = "Publikacje lustrzane od tego kontaktu";
+$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Oznacz ten kontakt jako remote_self, spowoduje to, że friendica odeśle nowe wpisy z tego kontaktu.";
+$a->strings["Name"] = "Nazwa";
+$a->strings["Account Nickname"] = "Nazwa konta";
+$a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - zastępuje Imię/Pseudonim";
+$a->strings["Account URL"] = "Adres URL konta";
+$a->strings["Friend Request URL"] = "Adres URL żądający znajomości";
+$a->strings["Friend Confirm URL"] = "URL potwierdzający znajomość";
+$a->strings["Notification Endpoint URL"] = "Zgłoszenie Punktu Końcowego URL";
+$a->strings["Poll/Feed URL"] = "Adres Ankiety/RSS";
+$a->strings["New photo from this URL"] = "Nowe zdjęcie z tego adresu URL";
+$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Dzienny limit wiadomości %s został przekroczony. Wiadomość została odrzucona.";
+$a->strings["No recipient selected."] = "Nie wybrano odbiorcy.";
+$a->strings["Unable to check your home location."] = "Nie można sprawdzić twojej lokalizacji.";
+$a->strings["Message could not be sent."] = "Wiadomość nie może zostać wysłana";
+$a->strings["Message collection failure."] = "Błąd zbierania komunikatów.";
+$a->strings["Message sent."] = "Wysłano.";
+$a->strings["No recipient."] = "Brak odbiorcy.";
+$a->strings["Send Private Message"] = "Wyślij prywatną wiadomość";
+$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Jeśli chcesz %s odpowiedzieć, sprawdź, czy ustawienia prywatności w Twojej witrynie zezwalają na prywatne wiadomości od nieznanych nadawców.";
+$a->strings["To:"] = "Do:";
+$a->strings["Subject:"] = "Temat:";
+$a->strings["Your message:"] = "Twoja wiadomość:";
 $a->strings["Remote privacy information not available."] = "Nie są dostępne zdalne informacje o prywatności.";
 $a->strings["Visible to:"] = "Widoczne dla:";
-$a->strings["System down for maintenance"] = "System wyłączony w celu konserwacji";
+$a->strings["Friendica Communications Server - Setup"] = "Friendica Serwer Komunikacyjny - Instalacja";
+$a->strings["Could not connect to database."] = "Nie można nawiązać połączenia z bazą danych";
+$a->strings["Could not create table."] = "Nie mogę stworzyć tabeli.";
+$a->strings["Your Friendica site database has been installed."] = "Twoja baza danych witryny Friendica została zainstalowana.";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Może być konieczne zaimportowanie pliku \"database.sql\" ręcznie, używając phpmyadmin lub mysql.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Proszę przejrzeć plik \"INSTALL.txt\".";
+$a->strings["Database already in use."] = "Baza danych jest już w użyciu.";
+$a->strings["System check"] = "Sprawdzanie systemu";
+$a->strings["Next"] = "Następny";
+$a->strings["Check again"] = "Sprawdź ponownie";
+$a->strings["Database connection"] = "Połączenie z bazą danych";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "W celu zainstalowania Friendica musimy wiedzieć jak połączyć się z twoją bazą danych.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Proszę skontaktuj się ze swoim dostawcą usług hostingowych bądź administratorem strony jeśli masz pytania co do tych ustawień .";
+$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Wymieniona przez Ciebie baza danych powinna już istnieć. Jeżeli nie, utwórz ją przed kontynuacją.";
+$a->strings["Database Server Name"] = "Nazwa serwera bazy danych";
+$a->strings["Database Login Name"] = "Nazwa użytkownika bazy danych";
+$a->strings["Database Login Password"] = "Hasło logowania do bazy danych";
+$a->strings["For security reasons the password must not be empty"] = "Ze względów bezpieczeństwa hasło nie może być puste";
+$a->strings["Database Name"] = "Nazwa bazy danych";
+$a->strings["Site administrator email address"] = "Adres e-mail administratora strony";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "Adres e-mail konta musi pasować do tego, aby móc korzystać z panelu administracyjnego.";
+$a->strings["Please select a default timezone for your website"] = "Proszę wybrać domyślną strefę czasową dla swojej strony";
+$a->strings["Site settings"] = "Ustawienia strony";
+$a->strings["System Language:"] = "Język systemu:";
+$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Ustaw domyślny język dla interfejsu instalacyjnego Friendica i wysyłaj e-maile.";
+$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."] = "Plik konfiguracyjny bazy danych \"config/local.ini.php\" nie mógł zostać zapisany. Proszę użyć załączonego tekstu, aby utworzyć plik konfiguracyjny w katalogu głównym serwera.";
+$a->strings["<h1>What next</h1>"] = "<h1>Co dalej</h1>";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "WAŻNE: Będziesz musiał [ręcznie] ustawić zaplanowane zadanie dla pracownika.";
+$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."] = "Przejdź do <a href=\"%s/register\">strony rejestracji</a> nowego węzła Friendica i zarejestruj się jako nowy użytkownik. Pamiętaj, aby użyć adresu e-mail wprowadzonego jako e-mail administratora. To pozwoli Ci wejść do panelu administratora witryny.";
+$a->strings["Profile not found."] = "Nie znaleziono profilu.";
+$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Może się to zdarzyć, gdy kontakt został zgłoszony przez obie osoby i został już zatwierdzony.";
+$a->strings["Response from remote site was not understood."] = "Odpowiedź do zdalnej strony nie została zrozumiana";
+$a->strings["Unexpected response from remote site: "] = "Nieoczekiwana odpowiedź od strony zdalnej:";
+$a->strings["Confirmation completed successfully."] = "Potwierdzenie zostało pomyślnie zakończone.";
+$a->strings["Temporary failure. Please wait and try again."] = "Tymczasowa awaria. Proszę czekać i spróbuj ponownie.";
+$a->strings["Introduction failed or was revoked."] = "Wprowadzenie nie powiodło się lub zostało odwołane.";
+$a->strings["Remote site reported: "] = "Zdalna witryna zgłoszona:";
+$a->strings["Unable to set contact photo."] = "Nie można ustawić zdjęcia kontaktu.";
+$a->strings["No user record found for '%s' "] = "Nie znaleziono użytkownika dla '%s'";
+$a->strings["Our site encryption key is apparently messed up."] = "Klucz kodujący jest najwyraźniej uszkodzony.";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Został podany pusty adres URL witryny lub nie można go odszyfrować.";
+$a->strings["Contact record was not found for you on our site."] = "Nie znaleziono kontaktu na naszej stronie";
+$a->strings["Site public key not available in contact record for URL %s."] = "Publiczny klucz witryny jest niedostępny w rekordzie kontaktu dla adresu URL %s";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Identyfikator dostarczony przez Twój system jest duplikatem w naszym systemie. Powinien działać, jeśli spróbujesz ponownie.";
+$a->strings["Unable to set your contact credentials on our system."] = "Nie można ustawić danych kontaktowych w naszym systemie.";
+$a->strings["Unable to update your contact profile details on our system"] = "Nie można zaktualizować danych Twojego profilu kontaktowego w naszym systemie";
+$a->strings["[Name Withheld]"] = "[Nazwa zastrzeżona]";
+$a->strings["People Search - %s"] = "Szukaj osób - %s";
+$a->strings["Forum Search - %s"] = "Przeszukiwanie forum - %s";
+$a->strings["Connect"] = "Połącz";
+$a->strings["No matches"] = "Brak wyników";
+$a->strings["Manage Identities and/or Pages"] = "Zarządzaj Tożsamościami i/lub Stronami.";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Przełącz między różnymi tożsamościami lub stronami społeczność/grupy, które udostępniają dane Twojego konta lub które otrzymałeś uprawnienia \"zarządzaj\"";
+$a->strings["Select an identity to manage: "] = "Wybierz tożsamość do zarządzania:";
+$a->strings["Do you really want to delete this video?"] = "Czy na pewno chcesz usunąć ten film wideo?";
+$a->strings["Delete Video"] = "Usuń wideo";
+$a->strings["Public access denied."] = "Publiczny dostęp zabroniony";
+$a->strings["No videos selected"] = "Nie zaznaczono filmów";
+$a->strings["Access to this item is restricted."] = "Dostęp do tego obiektu jest ograniczony.";
+$a->strings["View Album"] = "Zobacz album";
+$a->strings["Recent Videos"] = "Ostatnio dodane filmy";
+$a->strings["Upload New Videos"] = "Wstaw nowe filmy";
+$a->strings["Only logged in users are permitted to perform a probing."] = "Tylko zalogowani użytkownicy mogą wykonywać sondowanie.";
+$a->strings["Location:"] = "Lokalizacja";
+$a->strings["Gender:"] = "Płeć:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Strona główna:";
+$a->strings["About:"] = "O:";
+$a->strings["Find on this site"] = "Znajdź na tej stronie";
+$a->strings["Results for:"] = "Wyniki dla:";
+$a->strings["Site Directory"] = "Katalog Witryny";
+$a->strings["No entries (some entries may be hidden)."] = "Brak odwiedzin (niektóre odwiedziny mogą być ukryte).";
+$a->strings["No keywords to match. Please add keywords to your default profile."] = "Brak pasujących słów kluczowych. Dodaj słowa kluczowe do domyślnego profilu.";
+$a->strings["is interested in:"] = "interesuje się:";
+$a->strings["Profile Match"] = "Dopasowanie profilu";
+$a->strings["everybody"] = "wszyscy";
+$a->strings["Account"] = "Konto";
+$a->strings["Profiles"] = "Profile";
+$a->strings["Additional features"] = "Dodatkowe funkcje";
+$a->strings["Display"] = "Wygląd";
+$a->strings["Social Networks"] = "Portale społecznościowe";
+$a->strings["Addons"] = "Dodatki";
+$a->strings["Delegations"] = "Delegowanie";
+$a->strings["Connected apps"] = "Powiązane aplikacje";
+$a->strings["Export personal data"] = "Eksportuje dane personalne";
+$a->strings["Remove account"] = "Usuń konto";
+$a->strings["Missing some important data!"] = "Brakuje ważnych danych!";
+$a->strings["Update"] = "Zaktualizuj";
+$a->strings["Failed to connect with email account using the settings provided."] = "Połączenie z kontem email używając wybranych ustawień nie powiodło się.";
+$a->strings["Email settings updated."] = "Zaktualizowano ustawienia email.";
+$a->strings["Features updated"] = "Funkcje zaktualizowane";
+$a->strings["Relocate message has been send to your contacts"] = "Przeniesienie wiadomości zostało wysłane do Twoich kontaktów";
+$a->strings["Passwords do not match. Password unchanged."] = "Hasła nie pasują do siebie. Hasło niezmienione.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Puste hasła są niedozwolone. Hasło niezmienione.";
+$a->strings["The new password has been exposed in a public data dump, please choose another."] = "Nowe hasło zostało ujawnione w publicznym zrzucie danych, wybierz inne.";
+$a->strings["Wrong password."] = "Złe hasło.";
+$a->strings["Password changed."] = "Hasło zostało zmienione.";
+$a->strings["Password update failed. Please try again."] = "Aktualizacja hasła nie powiodła się. Proszę spróbować ponownie.";
+$a->strings[" Please use a shorter name."] = "Proszę użyć krótszej nazwy.";
+$a->strings[" Name too short."] = "Za krótka nazwa.";
+$a->strings["Wrong Password"] = "Złe hasło";
+$a->strings["Invalid email."] = "Niepoprawny e-mail.";
+$a->strings["Cannot change to that email."] = "Nie można zmienić tego e-maila.";
+$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Prywatne forum nie ma uprawnień do prywatności. Użyj domyślnej grupy prywatnej.";
+$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Prywatne forum nie ma uprawnień do prywatności ani domyślnej grupy prywatności.";
+$a->strings["Settings updated."] = "Zaktualizowano ustawienia.";
+$a->strings["Add application"] = "Dodaj aplikację";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Consumer Key"] = "Klucz klienta";
+$a->strings["Consumer Secret"] = "Tajny klucz klienta";
+$a->strings["Redirect"] = "Przekierowanie";
+$a->strings["Icon url"] = "Adres Url ikony";
+$a->strings["You can't edit this application."] = "Nie możesz edytować tej aplikacji.";
+$a->strings["Connected Apps"] = "Powiązane aplikacje";
+$a->strings["Edit"] = "Edytuj";
+$a->strings["Client key starts with"] = "Klucz klienta zaczyna się od";
+$a->strings["No name"] = "Bez nazwy";
+$a->strings["Remove authorization"] = "Odwołaj upoważnienie";
+$a->strings["No Addon settings configured"] = "Brak skonfigurowanych ustawień dodatków";
+$a->strings["Addon Settings"] = "Ustawienia Dodatków";
+$a->strings["Off"] = "Wyłącz";
+$a->strings["On"] = "Włącz";
+$a->strings["Additional Features"] = "Dodatkowe funkcje";
+$a->strings["Diaspora"] = "Diaspora";
+$a->strings["enabled"] = "włączony";
+$a->strings["disabled"] = "wyłączony";
+$a->strings["Built-in support for %s connectivity is %s"] = "Wbudowane wsparcie dla %s łączność jest %s";
+$a->strings["GNU Social (OStatus)"] = "GNU Społeczny (OStatus)";
+$a->strings["Email access is disabled on this site."] = "Dostęp do e-maila nie jest w pełni sprawny na tej stronie";
+$a->strings["General Social Media Settings"] = "Ogólne ustawienia mediów społecznościowych";
+$a->strings["Disable Content Warning"] = "Wyłącz ostrzeżenie o treści";
+$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."] = "Użytkownicy w sieciach takich jak Mastodon lub Pleroma mogą ustawić pole ostrzeżenia o treści, które domyślnie zwijać będzie swój wpis. Powoduje wyłączenie automatycznego zwijania i ustawia ostrzeżenie o treści jako tytuł postu. Nie ma wpływu na żadne inne filtrowanie treści, które ostatecznie utworzyłeś.";
+$a->strings["Disable intelligent shortening"] = "Wyłącz inteligentne skracanie";
+$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."] = "Zwykle system próbuje znaleźć najlepszy link do dodania do skróconych postów. Jeśli ta opcja jest włączona, każdy skrócony wpis zawsze wskazuje oryginalny post znajomej osoby.";
+$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "Automatycznie podążaj za wszystkimi obserwatorami/rzecznikami GNU Społeczności (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."] = "Jeśli otrzymasz wiadomość od nieznanego użytkownika OStatus, ta opcja decyduje, co zrobić. Jeśli zostanie zaznaczone, dla każdego nieznanego użytkownika zostanie utworzony nowy kontakt.";
+$a->strings["Default group for OStatus contacts"] = "Domyślna grupa dla kontaktów OStatus";
+$a->strings["Your legacy GNU Social account"] = "Twoje starsze konto społecznościowe GNU";
+$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."] = "Jeśli podasz swoją starą nazwę konta GNU Social/Statusnet tutaj (w formacie user@domain.tld), twoje kontakty zostaną dodane automatycznie. Pole zostanie opróżnione po zakończeniu.";
+$a->strings["Repair OStatus subscriptions"] = "Napraw subskrypcje OStatus";
+$a->strings["Email/Mailbox Setup"] = "Ustawienia  emaila/skrzynki mailowej";
+$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Jeśli chcesz komunikować się z kontaktami e-mail za pomocą tej usługi (opcjonalnie), określ sposób łączenia się ze skrzynką pocztową.";
+$a->strings["Last successful email check:"] = "Ostatni sprawdzony e-mail:";
+$a->strings["IMAP server name:"] = "Nazwa serwera IMAP:";
+$a->strings["IMAP port:"] = "Port IMAP:";
+$a->strings["Security:"] = "Ochrona:";
+$a->strings["None"] = "Brak";
+$a->strings["Email login name:"] = "Nazwa logowania e-mail:";
+$a->strings["Email password:"] = "E-mail hasło:";
+$a->strings["Reply-to address:"] = "Adres zwrotny:";
+$a->strings["Send public posts to all email contacts:"] = "Wyślij publiczny post do wszystkich kontaktów e-mail";
+$a->strings["Action after import:"] = "Akcja po zaimportowaniu:";
+$a->strings["Mark as seen"] = "Oznacz jako przeczytane";
+$a->strings["Move to folder"] = "Przenieś do folderu";
+$a->strings["Move to folder:"] = "Przenieś do folderu:";
+$a->strings["No special theme for mobile devices"] = "Brak specialnego motywu dla urządzeń mobilnych";
+$a->strings["%s - (Unsupported)"] = "%s - (Nieobsługiwane)";
+$a->strings["%s - (Experimental)"] = "%s- (Eksperymentalne)";
+$a->strings["Display Settings"] = "Ustawienia wyglądu";
+$a->strings["Display Theme:"] = "Wyświetl motyw:";
+$a->strings["Mobile Theme:"] = "Motyw dla urządzeń mobilnych:";
+$a->strings["Suppress warning of insecure networks"] = "Ukryj ostrzeżenie przed niebezpiecznymi sieciami";
+$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "System powinien pominąć ostrzeżenie, że bieżąca grupa zawiera członków sieci, którzy nie mogą otrzymywać komentarzy niepublicznych";
+$a->strings["Update browser every xx seconds"] = "Odświeżaj stronę co xx sekund";
+$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum 10 sekund. Wprowadź -1, aby go wyłączyć.";
+$a->strings["Number of items to display per page:"] = "Liczba elementów do wyświetlenia na stronie:";
+$a->strings["Maximum of 100 items"] = "Maksymalnie 100 elementów";
+$a->strings["Number of items to display per page when viewed from mobile device:"] = "Liczba elementów do wyświetlenia na stronie podczas przeglądania z urządzenia mobilnego:";
+$a->strings["Don't show emoticons"] = "Nie pokazuj emotikonek";
+$a->strings["Calendar"] = "Kalendarz";
+$a->strings["Beginning of week:"] = "Początek tygodnia:";
+$a->strings["Don't show notices"] = "Nie pokazuj powiadomień";
+$a->strings["Infinite scroll"] = "Nieskończone przewijanie";
+$a->strings["Automatic updates only at the top of the network page"] = "Automatyczne aktualizacje tylko w górnej części strony sieci";
+$a->strings["When disabled, the network page is updated all the time, which could be confusing while reading."] = "Po wyłączeniu strona sieciowa jest cały czas aktualizowana, co może być mylące podczas czytania.";
+$a->strings["Bandwidth Saver Mode"] = "Tryb oszczędzania przepustowości";
+$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Po włączeniu wbudowana zawartość nie jest wyświetlana w automatycznych aktualizacjach, wyświetlają się tylko przy przeładowaniu strony.";
+$a->strings["Smart Threading"] = "Inteligentne wątki";
+$a->strings["When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled."] = "Włączenie tej opcji powoduje pomijanie wcięcia wątków zewnętrznych, zachowując je w dowolnym miejscu. Działa tylko wtedy, gdy wątki są dostępne i włączone.";
+$a->strings["General Theme Settings"] = "Ogólne ustawienia motywu";
+$a->strings["Custom Theme Settings"] = "Niestandardowe ustawienia motywów";
+$a->strings["Content Settings"] = "Ustawienia zawartości";
+$a->strings["Unable to find your profile. Please contact your admin."] = "Nie można znaleźć Twojego profilu. Skontaktuj się z administratorem.";
+$a->strings["Account Types"] = "Rodzaje kont";
+$a->strings["Personal Page Subtypes"] = "Podtypy osobistych stron";
+$a->strings["Community Forum Subtypes"] = "Podtypy społeczności forum";
+$a->strings["Personal Page"] = "Strona osobista";
+$a->strings["Account for a personal profile."] = "Konto dla profilu osobistego.";
+$a->strings["Organisation Page"] = "Strona Organizacji";
+$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "Konto dla organizacji, która automatycznie zatwierdza prośby o kontakt jako \"Obserwatorzy\".";
+$a->strings["News Page"] = "Strona Wiadomości";
+$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "Konto dla reflektora wiadomości, który automatycznie zatwierdza prośby o kontakt jako \"Obserwatorzy\".";
+$a->strings["Community Forum"] = "Forum społecznościowe";
+$a->strings["Account for community discussions."] = "Konto do dyskusji w społeczności.";
+$a->strings["Normal Account Page"] = "Normalna strona konta";
+$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "Konto dla zwykłego profilu osobistego, który wymaga ręcznej zgody \"Przyjaciół\" i \"Obserwatorów\".";
+$a->strings["Soapbox Page"] = "Strona Soapbox";
+$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Konto dla profilu publicznego, który automatycznie zatwierdza prośby o kontakt jako \"Obserwatorzy\".";
+$a->strings["Public Forum"] = "Forum publiczne";
+$a->strings["Automatically approves all contact requests."] = "Automatycznie zatwierdza wszystkie prośby o kontakt.";
+$a->strings["Automatic Friend Page"] = "Automatyczna strona znajomego";
+$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "Konto popularnego profilu, które automatycznie zatwierdza prośby o kontakt jako \"Przyjaciele\".";
+$a->strings["Private Forum [Experimental]"] = "Prywatne Forum [Eksperymentalne]";
+$a->strings["Requires manual approval of contact requests."] = "Wymaga ręcznego zatwierdzania żądań kontaktów.";
+$a->strings["OpenID:"] = "OpenID:";
+$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Opcjonalnie) Pozwól zalogować się na to konto przy pomocy OpenID.";
+$a->strings["Publish your default profile in your local site directory?"] = "Opublikować Twój domyślny profil w Twoim lokalnym katalogu stron?";
+$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."] = "Twój profil zostanie opublikowany w lokalnym katalogu tego <a href=\"%s\">węzła</a>. Dane Twojego profilu mogą być publicznie widoczne w zależności od ustawień systemu.";
+$a->strings["No"] = "Nie";
+$a->strings["Publish your default profile in the global social directory?"] = "Opublikować Twój domyślny profil w globalnym, społecznościowym katalogu?";
+$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."] = "Twój profil zostanie opublikowany w globalnych katalogach friendica (np.<a href=\"%s\">%s</a>). Twój profil będzie widoczny publicznie.";
+$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Ukryć listę znajomych przed odwiedzającymi Twój profil?";
+$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"] = "Twoja lista kontaktów nie będzie wyświetlana na domyślnej stronie profilu. Możesz zdecydować o wyświetleniu listy kontaktów osobno dla każdego tworzonego dodatkowego profilu.";
+$a->strings["Hide your profile details from anonymous viewers?"] = "Ukryć dane Twojego profilu przed anonimowymi widzami?";
+$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."] = "Anonimowi użytkownicy zobaczą tylko Twoje zdjęcie profilowe, swoją wyświetlaną nazwę i pseudonim, którego używasz na stronie profilu. Twoje publiczne posty i odpowiedzi będą nadal dostępne w inny sposób.";
+$a->strings["Allow friends to post to your profile page?"] = "Zezwalać znajomym na publikowanie postów na stronie Twojego profilu?";
+$a->strings["Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"] = "Twoi znajomi mogą pisać posty na stronie Twojego profilu. Posty zostaną przesłane do Twoich kontaktów.";
+$a->strings["Allow friends to tag your posts?"] = "Zezwolić na oznaczanie Twoich postów przez znajomych?";
+$a->strings["Your contacts can add additional tags to your posts."] = "Twoje kontakty mogą dodawać do tagów dodatkowe posty.";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Zezwolić na zaproponowanie Cię jako potencjalnego przyjaciela dla nowych członków?";
+$a->strings["If you like, Friendica may suggest new members to add you as a contact."] = "Jeśli chcesz, Friendica może zaproponować nowym członkom dodanie Cię jako kontakt.";
+$a->strings["Permit unknown people to send you private mail?"] = "Zezwolić nieznanym osobom na wysyłanie prywatnych wiadomości?";
+$a->strings["Friendica network users may send you private messages even if they are not in your contact list."] = "Użytkownicy sieci w serwisie Friendica mogą wysyłać prywatne wiadomości, nawet jeśli nie znajdują się one na liście kontaktów.";
+$a->strings["Profile is <strong>not published</strong>."] = "Profil <strong>nie jest opublikowany</strong>";
+$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "Twój adres tożsamości to <strong>'%s'</strong> lub '%s'.";
+$a->strings["Automatically expire posts after this many days:"] = "Posty wygasną automatycznie po następującej liczbie dni:";
+$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Pole puste, wiadomość nie wygaśnie. Niezapisane wpisy zostaną usunięte.";
+$a->strings["Advanced expiration settings"] = "Zaawansowane ustawienia wygaszania";
+$a->strings["Advanced Expiration"] = "Zaawansowane wygaszanie";
+$a->strings["Expire posts:"] = "Wygasające posty:";
+$a->strings["Expire personal notes:"] = "Wygaszanie osobistych notatek:";
+$a->strings["Expire starred posts:"] = "Wygaszaj posty oznaczone gwiazdką:";
+$a->strings["Expire photos:"] = "Wygasanie zdjęć:";
+$a->strings["Only expire posts by others:"] = "Wygaszaj tylko te posty, które zostały napisane przez inne osoby:";
+$a->strings["Account Settings"] = "Ustawienia konta";
+$a->strings["Password Settings"] = "Ustawienia hasła";
+$a->strings["New Password:"] = "Nowe hasło:";
+$a->strings["Confirm:"] = "Potwierdź:";
+$a->strings["Leave password fields blank unless changing"] = "Pozostaw pole hasła puste, chyba że chcesz je zmienić.";
+$a->strings["Current Password:"] = "Aktualne hasło:";
+$a->strings["Your current password to confirm the changes"] = "Wpisz aktualne hasło, aby potwierdzić zmiany";
+$a->strings["Password:"] = "Hasło:";
+$a->strings["Basic Settings"] = "Ustawienia podstawowe";
+$a->strings["Full Name:"] = "Imię i Nazwisko:";
+$a->strings["Email Address:"] = "Adres email:";
+$a->strings["Your Timezone:"] = "Twoja strefa czasowa:";
+$a->strings["Your Language:"] = "Twój język:";
+$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "Wybierz język, którego używasz, aby pokazać interfejs użytkownika friendica i do wysłania Ci e-maili";
+$a->strings["Default Post Location:"] = "Domyślna lokalizacja wiadomości:";
+$a->strings["Use Browser Location:"] = "Użyj lokalizacji przeglądarki:";
+$a->strings["Security and Privacy Settings"] = "Ustawienia bezpieczeństwa i prywatności";
+$a->strings["Maximum Friend Requests/Day:"] = "Maksymalna dzienna liczba zaproszeń do grona przyjaciół:";
+$a->strings["(to prevent spam abuse)"] = "(aby zapobiec spamowaniu)";
+$a->strings["Default Post Permissions"] = "Domyślne prawa dostępu wiadomości";
+$a->strings["(click to open/close)"] = "(kliknij by otworzyć/zamknąć)";
+$a->strings["Show to Groups"] = "Pokaż Grupy";
+$a->strings["Show to Contacts"] = "Pokaż kontakty";
+$a->strings["Default Private Post"] = "Domyślny Prywatny Wpis";
+$a->strings["Default Public Post"] = "Domyślny Publiczny Post";
+$a->strings["Default Permissions for New Posts"] = "Uprawnienia domyślne dla nowych postów";
+$a->strings["Maximum private messages per day from unknown people:"] = "Maksymalna liczba prywatnych wiadomości dziennie od nieznanych osób:";
+$a->strings["Notification Settings"] = "Ustawienia powiadomień";
+$a->strings["Send a notification email when:"] = "Wyślij powiadmonienia na email, kiedy:";
+$a->strings["You receive an introduction"] = "Otrzymałeś zaproszenie";
+$a->strings["Your introductions are confirmed"] = "Twoje zaproszenie jest potwierdzone";
+$a->strings["Someone writes on your profile wall"] = "Ktoś pisze na twoim profilu";
+$a->strings["Someone writes a followup comment"] = "Ktoś pisze komentarz nawiązujący.";
+$a->strings["You receive a private message"] = "Otrzymałeś prywatną wiadomość";
+$a->strings["You receive a friend suggestion"] = "Otrzymałeś propozycję od znajomych";
+$a->strings["You are tagged in a post"] = "Jesteś oznaczony tagiem w poście";
+$a->strings["You are poked/prodded/etc. in a post"] = "Jesteś zaczepiony/zaczepiona/itp. w poście";
+$a->strings["Activate desktop notifications"] = "Aktywuj powiadomienia na pulpicie";
+$a->strings["Show desktop popup on new notifications"] = "Pokaż wyskakujące okienko dla nowych powiadomień";
+$a->strings["Text-only notification emails"] = "E-maile z powiadomieniami tekstowymi";
+$a->strings["Send text only notification emails, without the html part"] = "Wysyłaj tylko e-maile z powiadomieniami tekstowymi, bez części html";
+$a->strings["Show detailled notifications"] = "Pokaż szczegółowe powiadomienia";
+$a->strings["Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed."] = "Domyślne powiadomienia są skondensowane z jednym powiadomieniem dla każdego przedmiotu. Po włączeniu wyświetlane jest każde powiadomienie.";
+$a->strings["Advanced Account/Page Type Settings"] = "Zaawansowane ustawienia konta/rodzaju strony";
+$a->strings["Change the behaviour of this account for special situations"] = "Zmień zachowanie tego konta w sytuacjach specjalnych";
+$a->strings["Relocate"] = "Przeniesienie";
+$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."] = "Jeśli ten profil został przeniesiony z innego serwera, a niektóre z Twoich kontaktów nie otrzymają aktualizacji, spróbuj nacisnąć ten przycisk.";
+$a->strings["Resend relocate message to contacts"] = "Wyślij ponownie przenieść wiadomości do kontaktów";
+$a->strings["{0} wants to be your friend"] = "{0} chce być Twoim znajomym";
+$a->strings["{0} sent you a message"] = "{0} wysłałem Ci wiadomość";
+$a->strings["{0} requested registration"] = "{0} wymagana rejestracja";
+$a->strings["Remove term"] = "Usuń wpis";
+$a->strings["Saved Searches"] = "Zapisywanie wyszukiwania";
+$a->strings["Only logged in users are permitted to perform a search."] = "Tylko zalogowani użytkownicy mogą wyszukiwać.";
+$a->strings["Too Many Requests"] = "Zbyt dużo próśb";
+$a->strings["Only one search per minute is permitted for not logged in users."] = "Dla niezalogowanych użytkowników dozwolone jest tylko jedno wyszukiwanie na minutę.";
+$a->strings["No results."] = "Brak wyników.";
+$a->strings["Items tagged with: %s"] = "Przedmioty oznaczone tagiem: %s";
+$a->strings["Results for: %s"] = "Wyniki dla: %s";
+$a->strings["No contacts in common."] = "Brak wspólnych kontaktów.";
+$a->strings["Common Friends"] = "Wspólni znajomi";
+$a->strings["Login"] = "Zaloguj się";
+$a->strings["The post was created"] = "Post został utworzony";
+$a->strings["add"] = "dodaj";
+$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
+	0 => "Ostrzeżenie: Ta grupa zawiera %s członka z sieci, która nie dopuszcza wiadomości niepublicznych.",
+	1 => "Ostrzeżenie: Ta grupa zawiera %s członków z sieci, która nie dopuszcza wiadomości niepublicznych.",
+	2 => "Ostrzeżenie: Ta grupa zawiera %s członków z sieci, która nie dopuszcza wiadomości niepublicznych.",
+	3 => "Ostrzeżenie: Ta grupa zawiera %s członków z sieci, która nie dopuszcza wiadomości niepublicznych.",
+];
+$a->strings["Messages in this group won't be send to these receivers."] = "Wiadomości z tej grupy nie będą wysyłane do tych odbiorców.";
+$a->strings["No such group"] = "Nie ma takiej grupy";
+$a->strings["Group is empty"] = "Grupa jest pusta";
+$a->strings["Group: %s"] = "Grupa: %s";
+$a->strings["Private messages to this person are at risk of public disclosure."] = "Prywatne wiadomości do tej osoby mogą zostać publicznie ujawnione ";
+$a->strings["Invalid contact."] = "Nieprawidłowy kontakt.";
+$a->strings["Commented Order"] = "Porządek według komentarzy";
+$a->strings["Sort by Comment Date"] = "Sortuj według daty komentarza";
+$a->strings["Posted Order"] = "Porządek według wpisów";
+$a->strings["Sort by Post Date"] = "Sortuj według daty postów";
+$a->strings["Personal"] = "Osobiste";
+$a->strings["Posts that mention or involve you"] = "Posty, które wspominają lub angażują Ciebie";
+$a->strings["New"] = "Nowy";
+$a->strings["Activity Stream - by date"] = "Strumień aktywności - według daty";
+$a->strings["Shared Links"] = "Udostępnione łącza";
+$a->strings["Interesting Links"] = "Interesujące linki";
+$a->strings["Starred"] = "Ulubione";
+$a->strings["Favourite Posts"] = "Ulubione posty";
+$a->strings["Group created."] = "Grupa utworzona.";
+$a->strings["Could not create group."] = "Nie mogę stworzyć grupy";
+$a->strings["Group not found."] = "Nie znaleziono grupy";
+$a->strings["Group name changed."] = "Nazwa grupy zmieniona";
+$a->strings["Save Group"] = "Zapisz grupę";
+$a->strings["Filter"] = "Filtr";
+$a->strings["Create a group of contacts/friends."] = "Stwórz grupę znajomych.";
+$a->strings["Group Name: "] = "Nazwa grupy: ";
+$a->strings["Contacts not in any group"] = "Kontakt nie jest w żadnej grupie";
+$a->strings["Group removed."] = "Grupa usunięta.";
+$a->strings["Unable to remove group."] = "Nie można usunąć grupy.";
+$a->strings["Delete Group"] = "Usuń grupę";
+$a->strings["Edit Group Name"] = "Edytuj nazwę grupy";
+$a->strings["Members"] = "Członkowie";
+$a->strings["All Contacts"] = "Wszystkie kontakty";
+$a->strings["Remove contact from group"] = "Usuń kontakt z grupy";
+$a->strings["Click on a contact to add or remove."] = "Kliknij na kontakt w celu dodania lub usunięcia.";
+$a->strings["Add contact to group"] = "Dodaj kontakt do grupy";
+$a->strings["Parent user not found."] = "Nie znaleziono użytkownika nadrzędnego.";
+$a->strings["No parent user"] = "Brak nadrzędnego użytkownika";
+$a->strings["Parent Password:"] = "Hasło nadrzędne:";
+$a->strings["Please enter the password of the parent account to legitimize your request."] = "Wprowadź hasło konta nadrzędnego, aby legalizować swoje żądanie.";
+$a->strings["Parent User"] = "Użytkownik nadrzędny";
+$a->strings["Parent users have total control about this account, including the account settings. Please double check whom you give this access."] = "Użytkownicy nadrzędni mają pełną kontrolę nad tym kontem, w tym także ustawienia konta. Sprawdź dokładnie, komu przyznasz ten dostęp.";
+$a->strings["Delegate Page Management"] = "Deleguj zarządzanie stronami";
+$a->strings["Delegates"] = "Oddeleguj";
+$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."] = "Delegaci mogą zarządzać wszystkimi aspektami tego konta/strony, z wyjątkiem podstawowych ustawień konta. Nie przekazuj swojego konta osobistego nikomu, komu nie ufasz całkowicie.";
+$a->strings["Existing Page Delegates"] = "Obecni delegaci stron";
+$a->strings["Potential Delegates"] = "Potencjalni delegaci";
+$a->strings["Remove"] = "Usuń";
+$a->strings["Add"] = "Dodaj";
+$a->strings["No entries."] = "Brak wpisów.";
+$a->strings["Export account"] = "Eksportuj konto";
+$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."] = "Eksportuj informacje o swoim koncie i kontaktach. Użyj tego do utworzenia kopii zapasowej konta i/lub przeniesienia go na inny serwer.";
+$a->strings["Export all"] = "Eksportuj wszystko";
+$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)"] = "Wyeksportuj informacje o koncie, kontaktach i wszystkie swoje pozycje jako json. Może to być bardzo duży plik i może zająć dużo czasu. Użyj tej opcji, aby utworzyć pełną kopię zapasową swojego konta (zdjęcia nie są eksportowane)";
+$a->strings["Resubscribing to OStatus contacts"] = "Ponowne subskrybowanie kontaktów OStatus";
+$a->strings["Error"] = "Błąd";
+$a->strings["Done"] = "Gotowe";
+$a->strings["Keep this window open until done."] = "Pozostaw to okno otwarte, dopóki nie będzie gotowe.";
+$a->strings["Access denied."] = "Brak dostępu";
+$a->strings["No contacts."] = "Brak kontaktów";
+$a->strings["Visit %s's profile [%s]"] = "Obejrzyj %s's profil [%s]";
+$a->strings["Contact wasn't found or can't be unfollowed."] = "Kontakt nie został znaleziony lub nie można go pominąć.";
+$a->strings["Contact unfollowed"] = "Skontaktuj się z obserwowanym";
+$a->strings["Submit Request"] = "Wyślij zgłoszenie";
+$a->strings["You aren't a friend of this contact."] = "Nie jesteś przyjacielem tego kontaktu.";
+$a->strings["Unfollowing is currently not supported by your network."] = "Brak obserwowania nie jest obecnie obsługiwany przez twoją sieć.";
+$a->strings["Disconnect/Unfollow"] = "Rozłącz/Nie obserwuj";
+$a->strings["Your Identity Address:"] = "Twój adres tożsamości:";
+$a->strings["Profile URL"] = "Adres URL profilu";
+$a->strings["Status Messages and Posts"] = "Status wiadomości i postów";
+$a->strings["[Embedded content - reload page to view]"] = "[Dodatkowa zawartość - odśwież stronę by zobaczyć]";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Rejestracja zakończona pomyślnie. Dalsze instrukcje zostały wysłane na twojego e-maila.";
+$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."] = "Nie udało się wysłać wiadomości e-mail. Tutaj szczegóły twojego konta:<br> login: %s<br>hasło: %s<br><br>Możesz zmienić swoje hasło po zalogowaniu.";
+$a->strings["Registration successful."] = "Rejestracja udana.";
+$a->strings["Your registration can not be processed."] = "Twoja rejestracja nie może zostać przeprowadzona. ";
+$a->strings["Your registration is pending approval by the site owner."] = "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny.";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Strona przekroczyła ilość dozwolonych rejestracji na dzień. Proszę spróbuj ponownie jutro.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Możesz (opcjonalnie) wypełnić ten formularz za pośrednictwem OpenID, podając swój OpenID i klikając 'Register'.";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Jeśli nie jesteś zaznajomiony z OpenID, zostaw to pole puste i uzupełnij resztę elementów.";
+$a->strings["Your OpenID (optional): "] = "Twój OpenID (opcjonalnie):";
+$a->strings["Include your profile in member directory?"] = "Czy dołączyć twój profil do katalogu członków?";
+$a->strings["Note for the admin"] = "Uwaga dla administratora";
+$a->strings["Leave a message for the admin, why you want to join this node"] = "Pozostaw wiadomość dla administratora, dlaczego chcesz dołączyć do tego węzła";
+$a->strings["Membership on this site is by invitation only."] = "Członkostwo na tej stronie możliwe tylko dzięki zaproszeniu.";
+$a->strings["Your invitation code: "] = "Twój kod zaproszenia:";
+$a->strings["Registration"] = "Rejestracja";
+$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Twoje Imię i Nazwisko (np. Jan Kowalski, prawdziwe lub wyglądające na prawdziwe):";
+$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Twój adres e-mail: (Informacje początkowe zostaną wysłane tam, więc musi to być istniejący adres).";
+$a->strings["Leave empty for an auto generated password."] = "Pozostaw puste dla wygenerowanego automatycznie hasła.";
+$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>'."] = "Wybierz pseudonim profilu. Nazwa musi zaczynać się od znaku tekstowego. Twój adres profilu na tej stronie będzie wówczas '<strong>pseudonimem%s</strong>'.";
+$a->strings["Choose a nickname: "] = "Wybierz pseudonim:";
+$a->strings["Register"] = "Zarejestruj";
+$a->strings["Import"] = "Import";
+$a->strings["Import your profile to this friendica instance"] = "Zaimportuj swój profil do tej instancji friendica";
+$a->strings["Terms of Service"] = "Warunki usługi";
+$a->strings["Note: This node explicitly contains adult content"] = "Uwaga: Ten węzeł jawnie zawiera treści dla dorosłych";
+$a->strings["Invalid request identifier."] = "Nieprawidłowe żądanie identyfikatora.";
+$a->strings["Discard"] = "Odrzuć";
+$a->strings["Ignore"] = "Ignoruj";
+$a->strings["Notifications"] = "Powiadomienia";
+$a->strings["Network Notifications"] = "Powiadomienia sieciowe";
+$a->strings["System Notifications"] = "Powiadomienia systemowe";
+$a->strings["Personal Notifications"] = "Prywatne powiadomienia";
+$a->strings["Home Notifications"] = "Powiadomienia domowe";
+$a->strings["Show Ignored Requests"] = "Pokaż ignorowane żądania";
+$a->strings["Hide Ignored Requests"] = "Ukryj zignorowane prośby";
+$a->strings["Notification type:"] = "Typ powiadomienia:";
+$a->strings["Suggested by:"] = "Sugerowany przez:";
+$a->strings["Hide this contact from others"] = "Ukryj ten kontakt przed innymi";
+$a->strings["Approve"] = "Zatwierdź";
+$a->strings["Claims to be known to you: "] = "Twierdzi, że go znasz:";
+$a->strings["yes"] = "tak";
+$a->strings["no"] = "nie";
+$a->strings["Shall your connection be bidirectional or not?"] = "Czy twoje połączenie ma być dwukierunkowe, czy nie?";
+$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."] = "Przyjmowanie %s jako znajomego pozwala %s zasubskrybować twoje posty, a także otrzymywać od nich aktualizacje w swoim kanale wiadomości.";
+$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."] = "Zaakceptowanie %s jako subskrybenta umożliwia im subskrybowanie Twoich postów, ale nie otrzymasz od nich aktualizacji w swoim kanale wiadomości.";
+$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."] = "Akceptowanie %s jako udostępniający pozwala im subskrybować twoje posty, ale nie otrzymasz od nich aktualizacji w swoim kanale wiadomości.";
+$a->strings["Friend"] = "Znajomy";
+$a->strings["Sharer"] = "Udostępniający/a";
+$a->strings["Subscriber"] = "Subskrybent";
+$a->strings["Tags:"] = "Tagi:";
+$a->strings["Network:"] = "Sieć:";
+$a->strings["No introductions."] = "Brak dostępu.";
+$a->strings["Show unread"] = "Pokaż nieprzeczytane";
+$a->strings["Show all"] = "Pokaż wszystko";
+$a->strings["No more %s notifications."] = "Nigdy więcej %s powiadomień.";
+$a->strings["New Message"] = "Nowa wiadomość";
+$a->strings["Unable to locate contact information."] = "Nie można znaleźć informacji kontaktowych.";
+$a->strings["Do you really want to delete this message?"] = "Czy na pewno chcesz usunąć tę wiadomość?";
+$a->strings["Message deleted."] = "Wiadomość usunięta.";
+$a->strings["Conversation removed."] = "Rozmowa usunięta.";
+$a->strings["No messages."] = "Brak wiadomości.";
+$a->strings["Message not available."] = "Wiadomość nie jest dostępna.";
+$a->strings["Delete message"] = "Usuń wiadomość";
+$a->strings["D, d M Y - g:i A"] = "D, d M Y - g:m A";
+$a->strings["Delete conversation"] = "Usuń rozmowę";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Brak bezpiecznej komunikacji. <strong>Możesz</strong> odpowiedzieć na stronie profilu nadawcy.";
+$a->strings["Send Reply"] = "Odpowiedz";
+$a->strings["Unknown sender - %s"] = "Nieznany nadawca - %s";
+$a->strings["You and %s"] = "Ty i %s";
+$a->strings["%s and You"] = "%s i ty";
+$a->strings["%d message"] = [
+	0 => " %d wiadomość",
+	1 => " %d wiadomości",
+	2 => " %d wiadomości",
+	3 => " %d wiadomości",
+];
+$a->strings["No profile"] = "Brak profilu";
+$a->strings["Subscribing to OStatus contacts"] = "Subskrybowanie kontaktów OStatus";
+$a->strings["No contact provided."] = "Brak kontaktu.";
+$a->strings["Couldn't fetch information for contact."] = "Nie można pobrać informacji o kontakcie.";
+$a->strings["Couldn't fetch friends for contact."] = "Nie można pobrać znajomych do kontaktu.";
+$a->strings["success"] = "powodzenie";
+$a->strings["failed"] = "nie powiodło się";
+$a->strings["ignored"] = "Ignoruj";
+$a->strings["%1\$s welcomes %2\$s"] = "%1\$s witamy %2\$s";
+$a->strings["User deleted their account"] = "Użytkownik usunął swoje konto";
+$a->strings["On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups."] = "W twoim węźle Friendica użytkownik usunął swoje konto. Upewnij się, że ich dane zostały usunięte z kopii zapasowych.";
+$a->strings["The user id is %d"] = "Identyfikatorem użytkownika jest %d";
+$a->strings["Remove My Account"] = "Usuń moje konto";
+$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Spowoduje to całkowite usunięcie Twojego konta. Po wykonaniu tej czynności nie można jej cofnąć.";
+$a->strings["Please enter your password for verification:"] = "Wprowadź hasło w celu weryfikacji.";
+$a->strings["Tag removed"] = "Tag usunięty";
+$a->strings["Remove Item Tag"] = "Usuń pozycję Tag";
+$a->strings["Select a tag to remove: "] = "Wybierz tag do usunięcia";
+$a->strings["Welcome to %s"] = "Witamy w %s";
+$a->strings["Do you really want to delete this suggestion?"] = "Czy na pewno chcesz usunąć te sugestie ?";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Brak dostępnych sugestii. Jeśli jest to nowa witryna, spróbuj ponownie za 24 godziny.";
+$a->strings["Ignore/Hide"] = "Ignoruj/Ukryj";
+$a->strings["- select -"] = "- wybierz -";
+$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."] = "To jest wersja Friendica, %s która działa w lokalizacji internetowej %s. Wersja bazy danych to %s wersja po aktualizacji %s.";
+$a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "Odwiedź stronę <a href=\"https://friendi.ca\">Friendi.ca</a> aby dowiedzieć się więcej o projekcie Friendica.";
+$a->strings["Bug reports and issues: please visit"] = "Raporty o błędach i problemy: odwiedź stronę";
+$a->strings["the bugtracker at github"] = "śledzenie błędów na github";
+$a->strings["Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"] = "Sugestie, pochwały itp. - napisz e-mail \"info\" na \"friendi.ca\"";
+$a->strings["Installed addons/apps:"] = "Zainstalowane dodatki/aplikacje:";
+$a->strings["No installed addons/apps"] = "Brak zainstalowanych dodatków/aplikacji";
+$a->strings["Read about the <a href=\"%1\$s/tos\">Terms of Service</a> of this node."] = "Przeczytaj o <a href=\"%1\$s/tos\">Warunkach świadczenia usług</a> tego węzła.";
+$a->strings["On this server the following remote servers are blocked."] = "Na tym serwerze następujące serwery zdalne są blokowane.";
+$a->strings["Blocked domain"] = "Zablokowana domena";
+$a->strings["Reason for the block"] = "Powód blokowania";
+$a->strings["Access to this profile has been restricted."] = "Dostęp do tego profilu został ograniczony.";
+$a->strings["Invalid request."] = "Nieprawidłowe żądanie.";
+$a->strings["Image exceeds size limit of %s"] = "Obraz przekracza limit rozmiaru wynoszący %s";
+$a->strings["Unable to process image."] = "Przetwarzanie obrazu nie powiodło się.";
+$a->strings["Wall Photos"] = "Tablica zdjęć";
+$a->strings["Image upload failed."] = "Przesyłanie obrazu nie powiodło się";
 $a->strings["Welcome to Friendica"] = "Witamy na Friendica";
 $a->strings["New Member Checklist"] = "Lista nowych członków";
 $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."] = "Chcielibyśmy zaproponować kilka porad i linków, które pomogą uczynić twoje doświadczenie przyjemnym. Kliknij dowolny element, aby odwiedzić odpowiednią stronę. Link do tej strony będzie widoczny na stronie głównej przez dwa tygodnie od czasu rejestracji, a następnie zniknie.";
 $a->strings["Getting Started"] = "Pierwsze kroki";
 $a->strings["Friendica Walk-Through"] = "Friendica Przejdź-Przez";
 $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 stronie <em>Szybki start</em> - znajdź krótkie wprowadzenie do swojego profilu i kart sieciowych, stwórz nowe połączenia i znajdź kilka grup do przyłączenia się.";
-$a->strings["Settings"] = "Ustawienia";
 $a->strings["Go to Your Settings"] = "Idź do swoich ustawień";
-$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 stronie Ustawienia - zmień swoje początkowe hasło. Zanotuj także swój adres tożsamości. Wygląda to jak adres e-mail - i będzie przydatny w nawiązywaniu znajomości w bezpłatnej sieci społecznościowej.";
+$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 stronie Ustawienia - zmień swoje początkowe hasło. Zanotuj także swój adres tożsamości. Wygląda to jak adres e-mail - będzie przydatny w nawiązywaniu znajomości w bezpłatnej sieci społecznościowej.";
 $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."] = "Przejrzyj pozostałe ustawienia, w szczególności ustawienia prywatności. Niepublikowany wykaz katalogów jest podobny do niepublicznego numeru telefonu. Ogólnie rzecz biorąc, powinieneś opublikować swój wpis - chyba, że wszyscy twoi znajomi i potencjalni znajomi dokładnie wiedzą, jak Cię znaleźć.";
-$a->strings["Profile"] = "Profil użytkownika";
 $a->strings["Upload Profile Photo"] = "Wyślij zdjęcie profilowe";
 $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."] = "Dodaj swoje zdjęcie profilowe jeśli jeszcze tego nie zrobiłeś. Twoje szanse na zwiększenie liczby znajomych rosną dziesięciokrotnie, kiedy na tym zdjęciu jesteś ty.";
 $a->strings["Edit Your Profile"] = "Edytuj własny profil";
@@ -358,372 +946,10 @@ $a->strings["Friendica respects your privacy. By default, your posts will only s
 $a->strings["Getting Help"] = "Otrzymaj pomoc";
 $a->strings["Go to the Help Section"] = "Przejdź do sekcji pomocy";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Na naszych stronach <strong>pomocy</strong> można znaleźć szczegółowe informacje na temat innych funkcji programu i zasobów.";
-$a->strings["Visit %s's profile [%s]"] = "Obejrzyj %s's profil [%s]";
-$a->strings["Edit contact"] = "Edytuj kontakt";
-$a->strings["Contacts who are not members of a group"] = "Kontakty spoza członków grupy";
-$a->strings["Not Extended"] = "Nie rozszerzony";
-$a->strings["Resubscribing to OStatus contacts"] = "Ponowne subskrybowanie kontaktów OStatus";
-$a->strings["Error"] = "Błąd";
-$a->strings["Done"] = "Gotowe";
-$a->strings["Keep this window open until done."] = "Pozostaw to okno otwarte, dopóki nie będzie gotowe.";
-$a->strings["Do you really want to delete this suggestion?"] = "Czy na pewno chcesz usunąć te sugestie ?";
-$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Brak dostępnych sugestii. Jeśli jest to nowa witryna, spróbuj ponownie za 24 godziny.";
-$a->strings["Ignore/Hide"] = "Ignoruj/Ukryj";
-$a->strings["Friend Suggestions"] = "Osoby, które możesz znać";
-$a->strings["[Embedded content - reload page to view]"] = "[Dodatkowa zawartość - odśwież stronę by zobaczyć]";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Strona przekroczyła ilość dozwolonych rejestracji na dzień. Proszę spróbuj ponownie jutro.";
-$a->strings["Import"] = "Import";
-$a->strings["Move account"] = "Przenieś konto";
-$a->strings["You can import an account from another Friendica server."] = "Możesz zaimportować konto z innego serwera 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."] = "Musisz wyeksportować konto ze starego serwera i przesłać je tutaj. Odtworzymy twoje stare konto tutaj ze wszystkimi twoimi kontaktami. Postaramy się również poinformować twoich znajomych, że się tutaj przeniosłeś.";
-$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Ta funkcja jest eksperymentalna. Nie możemy importować kontaktów z sieci OStatus (GNU Social/Statusnet) lub z Diaspory";
-$a->strings["Account file"] = "Pliki konta";
-$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Aby eksportować konto, wejdź w \"Ustawienia->Eksport danych osobistych\" i wybierz \"Eksportuj konto\"";
-$a->strings["No keywords to match. Please add keywords to your default profile."] = "Brak pasujących słów kluczowych. Dodaj słowa kluczowe do domyślnego profilu.";
-$a->strings["is interested in:"] = "interesuje się:";
-$a->strings["Profile Match"] = "Dopasowanie profilu";
-$a->strings["No matches"] = "Brak wyników";
-$a->strings["Manage Identities and/or Pages"] = "Zarządzaj Tożsamościami i/lub Stronami.";
-$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Przełącz między różnymi tożsamościami lub stronami społeczność/grupy, które udostępniają dane Twojego konta lub które otrzymałeś uprawnienia \"zarządzaj\"";
-$a->strings["Select an identity to manage: "] = "Wybierz tożsamość do zarządzania:";
-$a->strings["Submit"] = "Potwierdź";
-$a->strings["Invalid request."] = "Nieprawidłowe żądanie.";
-$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Przepraszam, może twój przesyłany plik jest większy niż pozwala konfiguracja PHP";
-$a->strings["Or - did you try to upload an empty file?"] = "Lub - czy próbowałeś załadować pusty plik?";
-$a->strings["File exceeds size limit of %s"] = "Plik przekracza limit rozmiaru wynoszący %s";
-$a->strings["File upload failed."] = "Przesyłanie pliku nie powiodło się.";
-$a->strings["- select -"] = "- wybierz -";
-$a->strings["l F d, Y \\@ g:i A"] = "";
-$a->strings["Time Conversion"] = "Zmiana czasu";
-$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica udostępnia tę usługę do udostępniania wydarzeń innym sieciom i znajomym w nieznanych strefach czasowych.";
-$a->strings["UTC time: %s"] = "Czas UTC %s";
-$a->strings["Current timezone: %s"] = "Obecna strefa czasowa: %s";
-$a->strings["Converted localtime: %s"] = "Zmień strefę czasową: %s";
-$a->strings["Please select your timezone:"] = "Wybierz swoją strefę czasową:";
-$a->strings["No more system notifications."] = "Nie ma więcej powiadomień systemowych.";
-$a->strings["System Notifications"] = "Powiadomienia systemowe";
-$a->strings["{0} wants to be your friend"] = "{0} chce być Twoim znajomym";
-$a->strings["{0} sent you a message"] = "{0} wysłałem Ci wiadomość";
-$a->strings["{0} requested registration"] = "{0} wymagana rejestracja";
-$a->strings["Poke/Prod"] = "Zaczepić";
-$a->strings["poke, prod or do other things to somebody"] = "szturchać, zaczepić lub robić inne rzeczy";
-$a->strings["Recipient"] = "Odbiorca";
-$a->strings["Choose what you wish to do to recipient"] = "Wybierz, co chcesz zrobić";
-$a->strings["Make this post private"] = "Ustaw ten post jako prywatny";
-$a->strings["Public access denied."] = "Publiczny dostęp zabroniony";
-$a->strings["Only logged in users are permitted to perform a probing."] = "Tylko zalogowani użytkownicy mogą wykonywać sondowanie.";
-$a->strings["Permission denied"] = "Odmowa dostępu";
-$a->strings["Invalid profile identifier."] = "Nieprawidłowa nazwa użytkownika.";
-$a->strings["Profile Visibility Editor"] = "Ustawienia widoczności profilu";
-$a->strings["Click on a contact to add or remove."] = "Kliknij na kontakt w celu dodania lub usunięcia.";
-$a->strings["Visible To"] = "Widoczne dla";
-$a->strings["All Contacts (with secure profile access)"] = "Wszystkie kontakty (z bezpiecznym dostępem do profilu)";
-$a->strings["Account approved."] = "Konto zatwierdzone.";
-$a->strings["Registration revoked for %s"] = "Rejestracja odwołana dla %s";
-$a->strings["Please login."] = "Proszę się zalogować.";
-$a->strings["Remove term"] = "Usuń wpis";
-$a->strings["Saved Searches"] = "Zapisywanie wyszukiwania";
-$a->strings["Only logged in users are permitted to perform a search."] = "Tylko zalogowani użytkownicy mogą wyszukiwać.";
-$a->strings["Too Many Requests"] = "Zbyt dużo próśb";
-$a->strings["Only one search per minute is permitted for not logged in users."] = "Dla niezalogowanych użytkowników dozwolone jest tylko jedno wyszukiwanie na minutę.";
-$a->strings["No results."] = "Brak wyników.";
-$a->strings["Items tagged with: %s"] = "Przedmioty oznaczone tagiem: %s";
-$a->strings["Results for: %s"] = "Wyniki dla: %s";
-$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$skolejny %2\$s %3\$s ";
-$a->strings["Tag removed"] = "Tag usunięty";
-$a->strings["Remove Item Tag"] = "Usuń pozycję Tag";
-$a->strings["Select a tag to remove: "] = "Wybierz tag do usunięcia";
-$a->strings["Remove"] = "Usuń";
-$a->strings["Export account"] = "Eksportuj konto";
-$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."] = "Eksportuj informacje o swoim koncie i kontaktach. Użyj tego do utworzenia kopii zapasowej konta i/lub przeniesienia go na inny serwer.";
-$a->strings["Export all"] = "Eksportuj wszystko";
-$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)"] = "Wyeksportuj informacje o koncie, kontaktach i wszystkie swoje pozycje jako json. Może to być bardzo duży plik i może zająć dużo czasu. Użyj tej opcji, aby utworzyć pełną kopię zapasową swojego konta (zdjęcia nie są eksportowane)";
-$a->strings["Export personal data"] = "Eksportuje dane personalne";
-$a->strings["No contacts."] = "brak kontaktów";
-$a->strings["Access denied."] = "Brak dostępu";
-$a->strings["Image exceeds size limit of %s"] = "Obraz przekracza limit rozmiaru wynoszący %s";
-$a->strings["Unable to process image."] = "Przetwarzanie obrazu nie powiodło się.";
-$a->strings["Wall Photos"] = "Tablica zdjęć";
-$a->strings["Image upload failed."] = "Przesyłanie obrazu nie powiodło się";
-$a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Dzienny limit wiadomości %s został przekroczony. Wiadomość została odrzucona.";
-$a->strings["No recipient selected."] = "Nie wybrano odbiorcy.";
-$a->strings["Unable to check your home location."] = "Nie można sprawdzić twojej lokalizacji.";
-$a->strings["Message could not be sent."] = "Wiadomość nie może zostać wysłana";
-$a->strings["Message collection failure."] = "Błąd zbierania komunikatów.";
-$a->strings["Message sent."] = "Wysłano.";
-$a->strings["No recipient."] = "Brak odbiorcy.";
-$a->strings["Send Private Message"] = "Wyślij prywatną wiadomość";
-$a->strings["If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders."] = "Jeśli chcesz %s odpowiedzieć, sprawdź, czy ustawienia prywatności w Twojej witrynie zezwalają na prywatne wiadomości od nieznanych nadawców.";
-$a->strings["To:"] = "Do:";
-$a->strings["Subject:"] = "Temat:";
-$a->strings["Your message:"] = "Twoja wiadomość:";
-$a->strings["Login"] = "Zaloguj się";
-$a->strings["The post was created"] = "Post został utworzony";
-$a->strings["Item not found"] = "Nie znaleziono elementu";
-$a->strings["Edit post"] = "Edytuj post";
-$a->strings["CC: email addresses"] = "CC: adresy e-mail";
-$a->strings["Example: bob@example.com, mary@example.com"] = "Przykład: bob@example.com, mary@example.com";
-$a->strings["Contact not found."] = "Kontakt nie znaleziony";
-$a->strings["Friend suggestion sent."] = "Wysłana propozycja dodania do znajomych.";
-$a->strings["Suggest Friends"] = "Zaproponuj znajomych";
-$a->strings["Suggest a friend for %s"] = "Zaproponuj znajomych dla %s";
-$a->strings["Personal Notes"] = "Notatki";
-$a->strings["Photo Albums"] = "Albumy zdjęć";
-$a->strings["Recent Photos"] = "Ostatnio dodane zdjęcia";
-$a->strings["Upload New Photos"] = "Wyślij nowe zdjęcie";
-$a->strings["everybody"] = "wszyscy";
-$a->strings["Contact information unavailable"] = "Informacje kontaktowe są niedostępne.";
-$a->strings["Album not found."] = "Album nie znaleziony";
-$a->strings["Delete Album"] = "Usuń album";
-$a->strings["Do you really want to delete this photo album and all its photos?"] = "Czy na pewno chcesz usunąć ten album i wszystkie zdjęcia z tego albumu?";
-$a->strings["Delete Photo"] = "Usuń zdjęcie";
-$a->strings["Do you really want to delete this photo?"] = "Czy na pewno chcesz usunąć to zdjęcie ?";
-$a->strings["a photo"] = "zdjęcie";
-$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$szostał oznaczony tagiem %2\$s przez %3\$s";
-$a->strings["Image upload didn't complete, please try again"] = "Przesyłanie zdjęć nie zostało zakończone, spróbuj ponownie";
-$a->strings["Image file is missing"] = "Brak pliku obrazu";
-$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "Serwer nie może teraz przyjąć nowego pliku, skontaktuj się z administratorem";
-$a->strings["Image file is empty."] = "Plik obrazka jest pusty.";
-$a->strings["No photos selected"] = "Nie zaznaczono zdjęć";
-$a->strings["Access to this item is restricted."] = "Dostęp do tego obiektu jest ograniczony.";
-$a->strings["Upload Photos"] = "Prześlij zdjęcia";
-$a->strings["New album name: "] = "Nazwa nowego albumu:";
-$a->strings["or existing album name: "] = "lub istniejąca nazwa albumu:";
-$a->strings["Do not show a status post for this upload"] = "Nie pokazuj statusu postów dla tego wysłania";
-$a->strings["Permissions"] = "Uprawnienia";
-$a->strings["Show to Groups"] = "Pokaż Grupy";
-$a->strings["Show to Contacts"] = "Pokaż kontakty";
-$a->strings["Edit Album"] = "Edytuj album";
-$a->strings["Show Newest First"] = "Najpierw pokaż najnowsze";
-$a->strings["Show Oldest First"] = "Najpierw pokaż najstarsze";
-$a->strings["View Photo"] = "Zobacz zdjęcie";
-$a->strings["Permission denied. Access to this item may be restricted."] = "Odmowa dostępu. Dostęp do tych danych może być ograniczony.";
-$a->strings["Photo not available"] = "Zdjęcie niedostępne";
-$a->strings["View photo"] = "Zobacz zdjęcie";
-$a->strings["Edit photo"] = "Edytuj zdjęcie";
-$a->strings["Use as profile photo"] = "Ustaw jako zdjęcie profilowe";
-$a->strings["Private Message"] = "Wiadomość prywatna";
-$a->strings["View Full Size"] = "Zobacz w pełnym rozmiarze";
-$a->strings["Tags: "] = "Tagi:";
-$a->strings["[Remove any tag]"] = "[Usuń dowolny tag]";
-$a->strings["New album name"] = "Nazwa nowego albumu";
-$a->strings["Caption"] = "Zawartość";
-$a->strings["Add a Tag"] = "Dodaj tag";
-$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Przykładowo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
-$a->strings["Do not rotate"] = "Nie obracaj";
-$a->strings["Rotate CW (right)"] = "Obróć CW (w prawo)";
-$a->strings["Rotate CCW (left)"] = "Obróć CCW (w lewo)";
-$a->strings["I like this (toggle)"] = "Lubię to (zmień)";
-$a->strings["I don't like this (toggle)"] = "Nie lubię tego (zmień)";
-$a->strings["This is you"] = "To jesteś ty";
-$a->strings["Comment"] = "Komentarz";
-$a->strings["Map"] = "Mapa";
-$a->strings["View Album"] = "Zobacz album";
-$a->strings["Do you really want to delete this video?"] = "Czy na pewno chcesz usunąć ten film wideo?";
-$a->strings["Delete Video"] = "Usuń wideo";
-$a->strings["No videos selected"] = "Nie zaznaczono filmów";
-$a->strings["Recent Videos"] = "Ostatnio dodane filmy";
-$a->strings["Upload New Videos"] = "Wstaw nowe filmy";
-$a->strings["Access to this profile has been restricted."] = "Dostęp do tego profilu został ograniczony.";
-$a->strings["Events"] = "Wydarzenia";
-$a->strings["View"] = "Widok";
-$a->strings["Previous"] = "Poprzedni";
-$a->strings["Next"] = "Następny";
-$a->strings["today"] = "dzisiaj";
-$a->strings["month"] = "miesiąc";
-$a->strings["week"] = "tydzień";
-$a->strings["day"] = "dzień";
-$a->strings["list"] = "lista";
-$a->strings["User not found"] = "Użytkownik nie znaleziony";
-$a->strings["This calendar format is not supported"] = "Ten format kalendarza nie jest obsługiwany";
-$a->strings["No exportable data found"] = "Nie znaleziono danych do eksportu";
-$a->strings["calendar"] = "kalendarz";
-$a->strings["Network:"] = "Sieć:";
-$a->strings["%d contact edited."] = [
-	0 => "",
-	1 => "",
-	2 => "",
-	3 => "",
-];
-$a->strings["Could not access contact record."] = "Nie można uzyskać dostępu do rejestru kontaktów.";
-$a->strings["Could not locate selected profile."] = "Nie można znaleźć wybranego profilu.";
-$a->strings["Contact updated."] = "Kontakt zaktualizowany";
-$a->strings["Failed to update contact record."] = "Aktualizacja rekordu kontaktu nie powiodła się.";
-$a->strings["Contact has been blocked"] = "Kontakt został zablokowany";
-$a->strings["Contact has been unblocked"] = "Kontakt został odblokowany";
-$a->strings["Contact has been ignored"] = "Kontakt jest ignorowany";
-$a->strings["Contact has been unignored"] = "Kontakt nie jest ignorowany";
-$a->strings["Contact has been archived"] = "Kontakt został zarchiwizowany";
-$a->strings["Contact has been unarchived"] = "Kontakt został przywrócony";
-$a->strings["Drop contact"] = "Usuń kontakt";
-$a->strings["Do you really want to delete this contact?"] = "Czy na pewno chcesz usunąć ten kontakt?";
-$a->strings["Contact has been removed."] = "Kontakt został usunięty.";
-$a->strings["You are mutual friends with %s"] = "Jesteś już znajomym z %s";
-$a->strings["You are sharing with %s"] = "Współdzielisz z %s";
-$a->strings["%s is sharing with you"] = "%s współdzieli z tobą";
-$a->strings["Private communications are not available for this contact."] = "Prywatna rozmowa jest niemożliwa dla tego kontaktu";
-$a->strings["Never"] = "Nigdy";
-$a->strings["(Update was successful)"] = "(Aktualizacja przebiegła pomyślnie)";
-$a->strings["(Update was not successful)"] = "(Aktualizacja nie powiodła się)";
-$a->strings["Suggest friends"] = "Osoby, które możesz znać";
-$a->strings["Network type: %s"] = "Typ sieci: %s";
-$a->strings["Communications lost with this contact!"] = "Utracono komunikację z tym kontaktem!";
-$a->strings["Fetch further information for feeds"] = "Pobierz dalsze informacje dla kanałów";
-$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."] = "Pobieranie informacji, takich jak zdjęcia podglądu, tytuł i zwiastun z elementu kanału. Możesz to aktywować, jeśli plik danych nie zawiera dużo tekstu. Słowa kluczowe są pobierane z nagłówka meta w elemencie kanału i są publikowane jako znaczniki haszowania.";
-$a->strings["Disabled"] = "Wyłączony";
-$a->strings["Fetch information"] = "Pobierz informacje";
-$a->strings["Fetch keywords"] = "Pobierz słowa kluczowe";
-$a->strings["Fetch information and keywords"] = "Pobierz informacje i słowa kluczowe";
-$a->strings["Disconnect/Unfollow"] = "Rozłącz/Nie obserwuj";
-$a->strings["Contact"] = "Kontakt";
-$a->strings["Profile Visibility"] = "Widoczność profilu";
-$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Wybierz profil, który chcesz bezpiecznie wyświetlić %s";
-$a->strings["Contact Information / Notes"] = "Informacje kontaktowe/Notatki";
-$a->strings["Their personal note"] = "Ich osobista uwaga";
-$a->strings["Edit contact notes"] = "Edytuj notatki kontaktu";
-$a->strings["Block/Unblock contact"] = "Zablokuj/odblokuj kontakt";
-$a->strings["Ignore contact"] = "Ignoruj kontakt";
-$a->strings["Repair URL settings"] = "Napraw ustawienia adresu";
-$a->strings["View conversations"] = "Wyświetl rozmowy";
-$a->strings["Last update:"] = "Ostatnia aktualizacja:";
-$a->strings["Update public posts"] = "Zaktualizuj publiczne posty";
-$a->strings["Update now"] = "Aktualizuj teraz";
-$a->strings["Unblock"] = "Odblokuj";
-$a->strings["Block"] = "Zablokuj";
-$a->strings["Unignore"] = "Odblokuj";
-$a->strings["Ignore"] = "Ignoruj";
-$a->strings["Currently blocked"] = "Obecnie zablokowany";
-$a->strings["Currently ignored"] = "Obecnie zignorowany";
-$a->strings["Currently archived"] = "Obecnie zarchiwizowany";
-$a->strings["Awaiting connection acknowledge"] = "Oczekiwanie na potwierdzenie połączenia";
-$a->strings["Hide this contact from others"] = "Ukryj ten kontakt przed innymi";
-$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpowiedzi/kliknięcia \"lubię to\" do twoich publicznych postów nadal <strong>mogą</strong> być widoczne";
-$a->strings["Notification for new posts"] = "Powiadomienie o nowych postach";
-$a->strings["Send a notification of every new post of this contact"] = "Wyślij powiadomienie o każdym nowym poście tego kontaktu";
-$a->strings["Blacklisted keywords"] = "Słowa kluczowe na czarnej liście";
-$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Rozdzielana przecinkami lista słów kluczowych, które nie powinny zostać przekonwertowane na hashtagi, gdy wybrana jest opcja 'Pobierz informacje i słowa kluczowe'";
-$a->strings["Profile URL"] = "Adres URL profilu";
-$a->strings["Location:"] = "Lokalizacja";
-$a->strings["XMPP:"] = "XMPP:";
-$a->strings["About:"] = "O:";
-$a->strings["Tags:"] = "Tagi:";
-$a->strings["Actions"] = "Akcja";
-$a->strings["Status"] = "Status";
-$a->strings["Contact Settings"] = "Ustawienia kontaktów";
-$a->strings["Suggestions"] = "Sugestie";
-$a->strings["Suggest potential friends"] = "Sugerowani znajomi";
-$a->strings["All Contacts"] = "Wszystkie kontakty";
-$a->strings["Show all contacts"] = "Pokaż wszystkie kontakty";
-$a->strings["Unblocked"] = "Odblokowany";
-$a->strings["Only show unblocked contacts"] = "Pokaż tylko odblokowane kontakty";
-$a->strings["Blocked"] = "Zablokowany";
-$a->strings["Only show blocked contacts"] = "Pokaż tylko zablokowane kontakty";
-$a->strings["Ignored"] = "Zignorowany";
-$a->strings["Only show ignored contacts"] = "Pokaż tylko ignorowane kontakty";
-$a->strings["Archived"] = "Zarchiwizowane";
-$a->strings["Only show archived contacts"] = "Pokaż tylko zarchiwizowane kontakty";
-$a->strings["Hidden"] = "Ukryty";
-$a->strings["Only show hidden contacts"] = "Pokaż tylko ukryte kontakty";
-$a->strings["Search your contacts"] = "Wyszukaj w kontaktach";
-$a->strings["Find"] = "Znajdź";
-$a->strings["Update"] = "Zaktualizuj";
-$a->strings["Archive"] = "Archiwum";
-$a->strings["Unarchive"] = "Przywróć z archiwum";
-$a->strings["Batch Actions"] = "Akcje wsadowe";
-$a->strings["Status Messages and Posts"] = "Status wiadomości i postów";
-$a->strings["Profile Details"] = "Szczegóły profilu";
-$a->strings["View all contacts"] = "Zobacz wszystkie kontakty";
-$a->strings["View all common friends"] = "Zobacz wszystkich popularnych znajomych";
-$a->strings["Advanced"] = "Zaawansowany";
-$a->strings["Advanced Contact Settings"] = "Zaawansowane ustawienia kontaktów";
-$a->strings["Mutual Friendship"] = "Wzajemna przyjaźń";
-$a->strings["is a fan of yours"] = "jest twoim fanem";
-$a->strings["you are a fan of"] = "jesteś fanem";
-$a->strings["Toggle Blocked status"] = "Przełącz na Zablokowany";
-$a->strings["Toggle Ignored status"] = "Przełącz ignorowany status";
-$a->strings["Toggle Archive status"] = "Przełącz status archiwum";
-$a->strings["Delete contact"] = "Usuń kontakt";
-$a->strings["Parent user not found."] = "Nie znaleziono użytkownika nadrzędnego.";
-$a->strings["No parent user"] = "Brak nadrzędnego użytkownika";
-$a->strings["Parent Password:"] = "Hasło nadrzędne:";
-$a->strings["Please enter the password of the parent account to legitimize your request."] = "Wprowadź hasło konta nadrzędnego, aby legalizować swoje żądanie.";
-$a->strings["Parent User"] = "Użytkownik nadrzędny";
-$a->strings["Parent users have total control about this account, including the account settings. Please double check whom you give this access."] = "Użytkownicy nadrzędni mają pełną kontrolę nad tym kontem, w tym także ustawienia konta. Sprawdź dokładnie, komu przyznasz ten dostęp.";
-$a->strings["Save Settings"] = "Zapisz ustawienia";
-$a->strings["Delegate Page Management"] = "Deleguj zarządzanie stronami";
-$a->strings["Delegates"] = "Oddeleguj";
-$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."] = "Delegaci mogą zarządzać wszystkimi aspektami tego konta/strony, z wyjątkiem podstawowych ustawień konta. Nie przekazuj swojego konta osobistego nikomu, komu nie ufasz całkowicie.";
-$a->strings["Existing Page Delegates"] = "Obecni delegaci stron";
-$a->strings["Potential Delegates"] = "Potencjalni delegaci";
-$a->strings["Add"] = "Dodaj";
-$a->strings["No entries."] = "Brak wpisów.";
-$a->strings["Event can not end before it has started."] = "Wydarzenie nie może się zakończyć przed jego rozpoczęciem.";
-$a->strings["Event title and start time are required."] = "Wymagany tytuł wydarzenia i czas rozpoczęcia.";
-$a->strings["Create New Event"] = "Stwórz nowe wydarzenie";
-$a->strings["Event details"] = "Szczegóły wydarzenia";
-$a->strings["Starting date and Title are required."] = "Data rozpoczęcia i tytuł są wymagane.";
-$a->strings["Event Starts:"] = "Rozpoczęcie wydarzenia:";
-$a->strings["Required"] = "Wymagany";
-$a->strings["Finish date/time is not known or not relevant"] = "Data/czas zakończenia nie jest znana lub jest nieistotna";
-$a->strings["Event Finishes:"] = "Zakończenie wydarzenia:";
-$a->strings["Adjust for viewer timezone"] = "Dopasuj dla strefy czasowej widza";
-$a->strings["Description:"] = "Opis:";
-$a->strings["Title:"] = "Tytuł:";
-$a->strings["Share this event"] = "Udostępnij te wydarzenie";
-$a->strings["Basic"] = "Podstawowy";
-$a->strings["Failed to remove event"] = "Nie udało się usunąć wydarzenia";
-$a->strings["Event removed"] = "Wydarzenie zostało usunięte";
-$a->strings["You must be logged in to use this module"] = "Musisz być zalogowany, aby korzystać z tego modułu";
-$a->strings["Source URL"] = "Źródłowy adres URL";
-$a->strings["Post successful."] = "Post dodany pomyślnie";
-$a->strings["Subscribing to OStatus contacts"] = "Subskrybowanie kontaktów OStatus";
-$a->strings["No contact provided."] = "Brak kontaktu.";
-$a->strings["Couldn't fetch information for contact."] = "Nie można pobrać informacji o kontakcie.";
-$a->strings["Couldn't fetch friends for contact."] = "Nie można pobrać znajomych do kontaktu.";
-$a->strings["success"] = "powodzenie";
-$a->strings["failed"] = "nie powiodło się";
-$a->strings["ignored"] = "Ignoruj";
-$a->strings["Image uploaded but image cropping failed."] = "Zdjęcie zostało przesłane, ale przycinanie obrazu nie powiodło się.";
-$a->strings["Image size reduction [%s] failed."] = "Redukcja rozmiaru obrazka [%s] nie powiodła się.";
-$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Ponownie załaduj stronę lub wyczyść pamięć podręczną przeglądarki, jeśli nowe zdjęcie nie pojawi się natychmiast.";
-$a->strings["Unable to process image"] = "Nie udało się przetworzyć obrazu.";
-$a->strings["Upload File:"] = "Wyślij plik:";
-$a->strings["Select a profile:"] = "Wybierz profil:";
-$a->strings["or"] = "lub";
-$a->strings["skip this step"] = "pomiń ten krok";
-$a->strings["select a photo from your photo albums"] = "wybierz zdjęcie z twojego albumu";
-$a->strings["Crop Image"] = "Przytnij zdjęcie";
-$a->strings["Please adjust the image cropping for optimum viewing."] = "Dostosuj kadrowanie obrazu, aby uzyskać optymalny obraz.";
-$a->strings["Done Editing"] = "Zakończono edycję";
-$a->strings["Image uploaded successfully."] = "Zdjęcie wczytano pomyślnie ";
-$a->strings["Contact wasn't found or can't be unfollowed."] = "Kontakt nie został znaleziony lub nie można go pominąć.";
-$a->strings["Contact unfollowed"] = "Skontaktuj się z obserwowanym";
-$a->strings["Submit Request"] = "Wyślij zgłoszenie";
-$a->strings["You aren't a friend of this contact."] = "Nie jesteś przyjacielem tego kontaktu.";
-$a->strings["Unfollowing is currently not supported by your network."] = "Brak obserwowania nie jest obecnie obsługiwany przez twoją sieć.";
-$a->strings["Your Identity Address:"] = "Twój adres tożsamości:";
-$a->strings["Gender:"] = "Płeć:";
-$a->strings["Status:"] = "Status:";
-$a->strings["Homepage:"] = "Strona główna:";
-$a->strings["Global Directory"] = "Globalny Katalog";
-$a->strings["Find on this site"] = "Znajdź na tej stronie";
-$a->strings["Results for:"] = "Wyniki dla:";
-$a->strings["Site Directory"] = "Katalog Witryny";
-$a->strings["No entries (some entries may be hidden)."] = "Brak odwiedzin (niektóre odwiedziny mogą być ukryte).";
-$a->strings["People Search - %s"] = "Szukaj osób - %s";
-$a->strings["Forum Search - %s"] = "Przeszukiwanie forum - %s";
-$a->strings["The contact could not be added."] = "Nie można dodać kontaktu.";
-$a->strings["You already added this contact."] = "Już dodałeś ten kontakt.";
-$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Obsługa Diaspory nie jest włączona. Kontakt nie może zostać dodany.";
-$a->strings["OStatus support is disabled. Contact can't be added."] = "Obsługa OStatus jest wyłączona. Kontakt nie może zostać dodany.";
-$a->strings["The network type couldn't be detected. Contact can't be added."] = "Nie można wykryć typu sieci. Kontakt nie może zostać dodany.";
-$a->strings["Please answer the following:"] = "Proszę odpowiedzieć na następujące pytania:";
-$a->strings["Does %s know you?"] = "Czy %s Cię zna?";
-$a->strings["Add a personal note:"] = "Dodaj osobistą notkę:";
 $a->strings["No valid account found."] = "Nie znaleziono ważnego konta.";
 $a->strings["Password reset request issued. Check your email."] = "Prośba o zresetowanie hasła została zatwierdzona. Sprawdź swój e-mail.";
-$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."] = "\n\t\tDrodzy %1\$s, \n\t\t\tOtrzymano niedawno prośbę o ''%2\$s\" zresetowanie konta \n\t\thasło. Aby potwierdzić tę prośbę, wybierz link weryfikacyjny \n\t\tponiżej lub wklej go na pasek adresu przeglądarki internetowej. \n \n\t\tJeśli NIE poprosiłeś o tę zmianę, NIE wykonuj tego linku \n\t\tpod warunkiem, że zignorujesz i/lub usuniesz ten e-mail, prośba wkrótce wygaśnie. \n \n\t\tTwoje hasło nie zostanie zmienione, chyba że będziemy mogli to potwierdzić \n\t\twydał to żądanie.";
-$a->strings["\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"] = "\nWkrótce skorzystaj z tego linku, aby zweryfikować swoją tożsamość: \n\n\t\t%1\$s\n\n\t\tOtrzymasz następnie komunikat uzupełniający zawierający nowe hasło. \n\t\tMożesz zmienić to hasło ze strony ustawień swojego konta po zalogowaniu. \n \n\t\tDane logowania są następujące: \n \nLokalizacja strony: \t%2\$s\nNazwa użytkownika:\t%3\$s";
+$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."] = "\n\t\tSzanowny Użytkowniku %1\$s, \n\t\t\tOtrzymano prośbę o ''%2\$s\" zresetowanie hasła do konta. \n\t\tAby potwierdzić tę prośbę, kliknij link weryfikacyjny \n\t\tponiżej lub wklej go w pasek adresu przeglądarki internetowej. \n \n\t\tJeśli nie prosisz o tę zmianę, nie klikaj w link.\n\t\tJeśli zignorujesz i/lub usuniesz ten e-mail, prośba wkrótce wygaśnie. \n \n\t\tTwoje hasło nie zostanie zmienione, chyba że będziemy mogli potwierdzić \n\t\tTwoje żądanie.";
+$a->strings["\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"] = "\nPostępuj zgodnie z poniższym linkiem, aby zweryfikować swoją tożsamość: \n\n\t\t%1\$s\n\n\t\tOtrzymasz następnie komunikat uzupełniający zawierający nowe hasło. \n\t\tMożesz zmienić to hasło ze strony ustawień swojego konta po zalogowaniu. \n \n\t\tDane logowania są następujące: \n \nLokalizacja strony: \t%2\$s\nNazwa użytkownika:\t%3\$s";
 $a->strings["Password reset requested at %s"] = "Prośba o reset hasła na %s";
 $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Prośba nie może być zweryfikowana. (Mogłeś już ją poprzednio wysłać.) Reset hasła nie powiódł się.";
 $a->strings["Request has expired, please make a new one."] = "Żądanie wygasło. Zrób nowe.";
@@ -737,7 +963,7 @@ $a->strings["Your new password is"] = "Twoje nowe hasło to";
 $a->strings["Save or copy your new password - and then"] = "Zapisz lub skopiuj nowe hasło - a następnie";
 $a->strings["click here to login"] = "Kliknij tutaj aby się zalogować";
 $a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Twoje hasło może być zmienione w <em>Ustawieniach</em> po udanym zalogowaniu.";
-$a->strings["\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"] = "\n\t\t\tDrogi %1\$s, \n\t\t\t\tTwoje hasło zostało zmienione zgodnie z życzeniem. Proszę, zachowaj te \n\t\t\tinformacje dotyczące twoich rekordów (lub natychmiast zmień hasło na \n\t\t\tcoś, co zapamiętasz).\n\t\t";
+$a->strings["\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"] = "\n\t\t\tSzanowny Użytkowniku %1\$s, \n\t\t\t\tTwoje hasło zostało zmienione zgodnie z życzeniem. Proszę, zachowaj te \n\t\t\tinformacje dotyczące twoich rekordów (lub natychmiast zmień hasło na \n\t\t\tcoś, co zapamiętasz).\n\t\t";
 $a->strings["\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"] = "\n\t\t\tDane logowania są następujące:\n\n\t\t\tLokalizacja witryny:\t%1\$s\n\t\t\tNazwa użytkownika:\t%2\$s\n\t\t\tHasło:\t%3\$s\n\n\t\t\tMożesz zmienić hasło na stronie ustawień konta po zalogowaniu.\n\t\t";
 $a->strings["Your password has been changed at %s"] = "Twoje hasło zostało zmienione na %s";
 $a->strings["Source input"] = "Źródło wejściowe";
@@ -759,167 +985,6 @@ $a->strings["Source text"] = "Tekst źródłowy";
 $a->strings["BBCode"] = "BBCode";
 $a->strings["Markdown"] = "Markdown";
 $a->strings["HTML"] = "HTML";
-$a->strings["Community option not available."] = "Opcja wspólnotowa jest niedostępna.";
-$a->strings["Not available."] = "Niedostępne.";
-$a->strings["Local Community"] = "Lokalna społeczność";
-$a->strings["Posts from local users on this server"] = "Wpisy od lokalnych użytkowników na tym serwerze";
-$a->strings["Global Community"] = "Globalna społeczność";
-$a->strings["Posts from users of the whole federated network"] = "Wpisy od użytkowników całej sieci stowarzyszonej";
-$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "Ten strumień społeczności pokazuje wszystkie publiczne posty otrzymane przez ten węzeł. Mogą nie odzwierciedlać opinii użytkowników tego węzła.";
-$a->strings["This is Friendica, version"] = "To jest Friendica, wersja";
-$a->strings["running at web location"] = "otwierane na serwerze";
-$a->strings["Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more about the Friendica project."] = "Odwiedź stronę <a href=\"https://friendi.ca\">Friendi.ca</a> aby dowiedzieć się więcej o projekcie Friendica.";
-$a->strings["Bug reports and issues: please visit"] = "Raporty o błędach i problemy: odwiedź stronę";
-$a->strings["the bugtracker at github"] = "bugtracker na github";
-$a->strings["Suggestions, praise, etc. - please email \"info\" at \"friendi - dot - ca"] = "Sugestie, pochwały itp. - napisz e-mail \"info\" na \"friendi - kropka - ca";
-$a->strings["Installed addons/apps:"] = "Zainstalowane dodatki/aplikacje:";
-$a->strings["No installed addons/apps"] = "Brak zainstalowanych dodatków/aplikacji";
-$a->strings["Read about the <a href=\"%1\$s/tos\">Terms of Service</a> of this node."] = "Przeczytaj o <a href=\"%1\$s/tos\">Warunkach świadczenia usług</a> tego węzła.";
-$a->strings["On this server the following remote servers are blocked."] = "Na tym serwerze następujące serwery zdalne są blokowane.";
-$a->strings["Blocked domain"] = "Zablokowana domena";
-$a->strings["Reason for the block"] = "Powód blokowania";
-$a->strings["Total invitation limit exceeded."] = "Przekroczono limit zaproszeń ogółem.";
-$a->strings["%s : Not a valid email address."] = "%s : Nieprawidłowy adres e-mail.";
-$a->strings["Please join us on Friendica"] = "Dołącz do nas na Friendica";
-$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Przekroczono limit zaproszeń. Skontaktuj się z administratorem witryny.";
-$a->strings["%s : Message delivery failed."] = "%s : Nie udało się dostarczyć wiadomości.";
-$a->strings["%d message sent."] = [
-	0 => "%d wiadomość wysłana.",
-	1 => "%d wiadomości wysłane.",
-	2 => "%d wysłano .",
-	3 => "%d wiadomość wysłano.",
-];
-$a->strings["You have no more invitations available"] = "Nie masz już dostępnych zaproszeń";
-$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."] = "Odwiedź %s listę publicznych witryn, do których możesz dołączyć. Członkowie Friendica na innych stronach mogą łączyć się ze sobą, jak również z członkami wielu innych sieci społecznościowych.";
-$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Aby zaakceptować to zaproszenie, odwiedź i zarejestruj się %s lub w dowolnej innej publicznej witrynie internetowej 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."] = "Strony Friendica łączą się ze sobą, tworząc ogromną sieć społecznościową o zwiększonej prywatności, która jest własnością i jest kontrolowana przez jej członków. Mogą również łączyć się z wieloma tradycyjnymi sieciami społecznościowymi. Zobacz %s listę alternatywnych witryn Friendica, do których możesz dołączyć.";
-$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Przepraszamy. System nie jest obecnie skonfigurowany do łączenia się z innymi publicznymi witrynami lub zapraszania członków.";
-$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."] = "Strony Friendica łączą się ze sobą, tworząc ogromną sieć społecznościową o zwiększonej prywatności, która jest własnością i jest kontrolowana przez jej członków. Mogą również łączyć się z wieloma tradycyjnymi sieciami społecznościowymi.";
-$a->strings["To accept this invitation, please visit and register at %s."] = "Aby zaakceptować to zaproszenie, odwiedź stronę i zarejestruj się na stronie %s.";
-$a->strings["Send invitations"] = "Wyślij zaproszenie";
-$a->strings["Enter email addresses, one per line:"] = "Wprowadź adresy e-mail, po jednym w wierszu:";
-$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Serdecznie zapraszam do przyłączenia się do mnie i innych bliskich znajomych na stronie Friendica - i pomóż nam stworzyć lepszą sieć społecznościową.";
-$a->strings["You will need to supply this invitation code: \$invite_code"] = "Musisz podać ten kod zaproszenia: \$invite_code";
-$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Po rejestracji połącz się ze mną na stronie mojego profilu pod adresem:";
-$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "Aby uzyskać więcej informacji na temat projektu Friendica i dlaczego uważamy, że jest to ważne, odwiedź http://friendi.ca";
-$a->strings["add"] = "dodaj";
-$a->strings["Warning: This group contains %s member from a network that doesn't allow non public messages."] = [
-	0 => "",
-	1 => "",
-	2 => "",
-	3 => "",
-];
-$a->strings["Messages in this group won't be send to these receivers."] = "Wiadomości z tej grupy nie będą wysyłane do tych odbiorców.";
-$a->strings["No such group"] = "Nie ma takiej grupy";
-$a->strings["Group is empty"] = "Grupa jest pusta";
-$a->strings["Group: %s"] = "Grupa: %s";
-$a->strings["Private messages to this person are at risk of public disclosure."] = "Prywatne wiadomości do tej osoby mogą zostać publicznie ujawnione ";
-$a->strings["Invalid contact."] = "Nieprawidłowy kontakt.";
-$a->strings["Commented Order"] = "Porządek według komentarzy";
-$a->strings["Sort by Comment Date"] = "Sortuj według daty komentarza";
-$a->strings["Posted Order"] = "Porządek według wpisów";
-$a->strings["Sort by Post Date"] = "Sortuj według daty postów";
-$a->strings["Personal"] = "Osobiste";
-$a->strings["Posts that mention or involve you"] = "Posty, które wspominają lub angażują Ciebie";
-$a->strings["New"] = "Nowy";
-$a->strings["Activity Stream - by date"] = "Strumień aktywności - według daty";
-$a->strings["Shared Links"] = "Udostępnione łącza";
-$a->strings["Interesting Links"] = "Interesujące linki";
-$a->strings["Starred"] = "Ulubione";
-$a->strings["Favourite Posts"] = "Ulubione posty";
-$a->strings["Contact settings applied."] = "Ustawienia kontaktu zaktualizowane.";
-$a->strings["Contact update failed."] = "Nie udało się zaktualizować kontaktu.";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>OSTRZEŻENIE: Jest to bardzo zaawansowane</strong> i jeśli wprowadzisz niepoprawne informacje, twoja komunikacja z tym kontaktem może przestać działać.";
-$a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Jeśli nie jesteś pewien, co zrobić na tej stronie, użyj <strong>teraz</strong> przycisku 'powrót' na swojej przeglądarce.";
-$a->strings["No mirroring"] = "Bez dublowania";
-$a->strings["Mirror as forwarded posting"] = "Przesłany lustrzany post";
-$a->strings["Mirror as my own posting"] = "Lustro mojego własnego komentarza";
-$a->strings["Return to contact editor"] = "Wróć do edytora kontaktów";
-$a->strings["Refetch contact data"] = "Odśwież dane kontaktowe";
-$a->strings["Remote Self"] = "Zdalny Self";
-$a->strings["Mirror postings from this contact"] = "Publikacje lustrzane od tego kontaktu";
-$a->strings["Mark this contact as remote_self, this will cause friendica to repost new entries from this contact."] = "Oznacz ten kontakt jako remote_self, spowoduje to, że friendica odeśle nowe wpisy z tego kontaktu.";
-$a->strings["Name"] = "Nazwa";
-$a->strings["Account Nickname"] = "Nazwa konta";
-$a->strings["@Tagname - overrides Name/Nickname"] = "@Zmienna - zastępuje Imię/Pseudonim";
-$a->strings["Account URL"] = "URL konta";
-$a->strings["Friend Request URL"] = "URL żądajacy znajomości";
-$a->strings["Friend Confirm URL"] = "URL potwierdzający znajomość";
-$a->strings["Notification Endpoint URL"] = "Zgłoszenie Punktu Końcowego URL";
-$a->strings["Poll/Feed URL"] = "Adres Ankiety/RSS";
-$a->strings["New photo from this URL"] = "Nowe zdjęcie z tego adresu URL";
-$a->strings["%1\$s welcomes %2\$s"] = "%1\$s witamy %2\$s";
-$a->strings["Help:"] = "Pomoc:";
-$a->strings["Help"] = "Pomoc";
-$a->strings["Page not found."] = "Strona nie znaleziona.";
-$a->strings["Friendica Communications Server - Setup"] = "Friendica Serwer Komunikacyjny - Instalacja";
-$a->strings["Could not connect to database."] = "Nie można nawiązać połączenia z bazą danych";
-$a->strings["Could not create table."] = "Nie mogę stworzyć tabeli.";
-$a->strings["Your Friendica site database has been installed."] = "Twoja baza danych witryny Friendica została zainstalowana.";
-$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Może być konieczne zaimportowanie pliku \"database.sql\" ręcznie, używając phpmyadmin lub mysql.";
-$a->strings["Please see the file \"INSTALL.txt\"."] = "Proszę przejrzeć plik \"INSTALL.txt\".";
-$a->strings["Database already in use."] = "Baza danych jest już w użyciu.";
-$a->strings["System check"] = "Sprawdzanie systemu";
-$a->strings["Check again"] = "Sprawdź ponownie";
-$a->strings["Database connection"] = "Połączenie z bazą danych";
-$a->strings["In order to install Friendica we need to know how to connect to your database."] = "W celu zainstalowania Friendica musimy wiedzieć jak połączyć się z twoją bazą danych.";
-$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Proszę skontaktuj się ze swoim dostawcą usług hostingowych bądź administratorem strony jeśli masz pytania co do tych ustawień .";
-$a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "Wymieniona przez Ciebie baza danych powinna już istnieć. Jeżeli nie, utwórz ją przed kontynuacją.";
-$a->strings["Database Server Name"] = "Nazwa serwera bazy danych";
-$a->strings["Database Login Name"] = "Nazwa użytkownika bazy danych";
-$a->strings["Database Login Password"] = "Hasło logowania do bazy danych";
-$a->strings["For security reasons the password must not be empty"] = "Ze względów bezpieczeństwa hasło nie może być puste";
-$a->strings["Database Name"] = "Nazwa bazy danych";
-$a->strings["Site administrator email address"] = "Adres e-mail administratora strony";
-$a->strings["Your account email address must match this in order to use the web admin panel."] = "Adres e-mail konta musi pasować do tego, aby móc korzystać z panelu administracyjnego.";
-$a->strings["Please select a default timezone for your website"] = "Proszę wybrać domyślną strefę czasową dla swojej strony";
-$a->strings["Site settings"] = "Ustawienia strony";
-$a->strings["System Language:"] = "Język systemu:";
-$a->strings["Set the default language for your Friendica installation interface and to send emails."] = "Ustaw domyślny język dla interfejsu instalacyjnego Friendica i wysyłaj e-maile.";
-$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."] = "Konfiguracja bazy danych pliku \".htconfig.php\" nie mogła zostać zapisana. Proszę użyć załączonego tekstu, aby utworzyć folder konfiguracyjny w sieci serwera.";
-$a->strings["<h1>What next</h1>"] = "<h1>Co dalej</h1>";
-$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the worker."] = "WAŻNE: Będziesz musiał [ręcznie] ustawić zaplanowane zadanie dla pracownika.";
-$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."] = "Przejdź do <a href=\"%s/register\">strony rejestracji</a> nowego węzła Friendica i zarejestruj się jako nowy użytkownik. Pamiętaj, aby użyć adresu e-mail wprowadzonego jako e-mail administratora. To pozwoli Ci wejść do panelu administratora witryny.";
-$a->strings["New Message"] = "Nowa wiadomość";
-$a->strings["Unable to locate contact information."] = "Nie można znaleźć informacji kontaktowych.";
-$a->strings["Messages"] = "Wiadomości";
-$a->strings["Do you really want to delete this message?"] = "Czy na pewno chcesz usunąć tę wiadomość?";
-$a->strings["Message deleted."] = "Wiadomość usunięta.";
-$a->strings["Conversation removed."] = "Rozmowa usunięta.";
-$a->strings["No messages."] = "Brak wiadomości.";
-$a->strings["Message not available."] = "Wiadomość nie jest dostępna.";
-$a->strings["Delete message"] = "Usuń wiadomość";
-$a->strings["D, d M Y - g:i A"] = "D, d M R - g:m AM/PM";
-$a->strings["Delete conversation"] = "Usuń rozmowę";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Brak bezpiecznej komunikacji. <strong>Możesz</strong> odpowiedzieć na stronie profilu nadawcy.";
-$a->strings["Send Reply"] = "Odpowiedz";
-$a->strings["Unknown sender - %s"] = "Nieznany nadawca - %s";
-$a->strings["You and %s"] = "Ty i %s";
-$a->strings["%s and You"] = "%s i ty";
-$a->strings["%d message"] = [
-	0 => " %d wiadomość",
-	1 => " %d wiadomości",
-	2 => " %d wiadomości",
-	3 => " %d wiadomości",
-];
-$a->strings["Group created."] = "Grupa utworzona.";
-$a->strings["Could not create group."] = "Nie mogę stworzyć grupy";
-$a->strings["Group not found."] = "Nie znaleziono grupy";
-$a->strings["Group name changed."] = "Nazwa grupy zmieniona";
-$a->strings["Save Group"] = "Zapisz grupę";
-$a->strings["Create a group of contacts/friends."] = "Stwórz grupę znajomych.";
-$a->strings["Group Name: "] = "Nazwa grupy: ";
-$a->strings["Group removed."] = "Grupa usunięta.";
-$a->strings["Unable to remove group."] = "Nie można usunąć grupy.";
-$a->strings["Delete Group"] = "Usuń grupę";
-$a->strings["Group Editor"] = "Edycja grup";
-$a->strings["Edit Group Name"] = "Edytuj nazwę grupy";
-$a->strings["Members"] = "Członkowie";
-$a->strings["Remove contact from group"] = "Usuń kontakt z grupy";
-$a->strings["Add contact to group"] = "Dodaj kontakt do grupy";
-$a->strings["OpenID protocol error. No ID returned."] = "Błąd protokołu OpenID. Nie znaleziono identyfikatora.";
-$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Konto nie zostało znalezione, a rejestracja OpenID nie jest dozwolona na tej stronie.";
-$a->strings["Login failed."] = "Logowanie nieudane.";
 $a->strings["Theme settings updated."] = "Zaktualizowano ustawienia motywów.";
 $a->strings["Information"] = "Informacje";
 $a->strings["Overview"] = "Przegląd";
@@ -927,13 +992,11 @@ $a->strings["Federation Statistics"] = "Statystyki Organizacji";
 $a->strings["Configuration"] = "Konfiguracja";
 $a->strings["Site"] = "Strona";
 $a->strings["Users"] = "Użytkownicy";
-$a->strings["Addons"] = "Dodatki";
 $a->strings["Themes"] = "Wygląd";
-$a->strings["Additional features"] = "Dodatkowe funkcje";
-$a->strings["Terms of Service"] = "Warunki usługi";
 $a->strings["Database"] = "Baza danych";
 $a->strings["DB updates"] = "Aktualizacje DB";
 $a->strings["Inspect Queue"] = "Sprawdź kolejkę";
+$a->strings["Inspect worker Queue"] = "Sprawdź kolejkę pracowników";
 $a->strings["Tools"] = "Narzędzia";
 $a->strings["Contact Blocklist"] = "Lista zablokowanych kontaktów";
 $a->strings["Server Blocklist"] = "Lista zablokowanych serwerów";
@@ -975,26 +1038,28 @@ $a->strings["Site blocklist updated."] = "Zaktualizowano listę bloków witryny.
 $a->strings["The contact has been blocked from the node"] = "Kontakt został zablokowany w węźle";
 $a->strings["Could not find any contact entry for this URL (%s)"] = "Nie można znaleźć żadnego kontaktu dla tego adresu URL (%s)";
 $a->strings["%s contact unblocked"] = [
-	0 => "",
-	1 => "",
-	2 => "",
-	3 => "",
+	0 => "%s kontakt odblokowany",
+	1 => "%s kontakty odblokowane",
+	2 => "%s kontaktów odblokowanych",
+	3 => "%s kontaktów odblokowanych",
 ];
 $a->strings["Remote Contact Blocklist"] = "Lista zablokowanych kontaktów zdalnych";
 $a->strings["This page allows you to prevent any message from a remote contact to reach your node."] = "Ta strona pozwala zapobiec wysyłaniu do węzła wiadomości od kontaktu zdalnego.";
 $a->strings["Block Remote Contact"] = "Zablokuj kontakt zdalny";
 $a->strings["select all"] = "Zaznacz wszystko";
 $a->strings["select none"] = "wybierz brak";
+$a->strings["Block"] = "Zablokuj";
+$a->strings["Unblock"] = "Odblokuj";
 $a->strings["No remote contact is blocked from this node."] = "Z tego węzła nie jest blokowany kontakt zdalny.";
 $a->strings["Blocked Remote Contacts"] = "Zablokowane kontakty zdalne";
 $a->strings["Block New Remote Contact"] = "Zablokuj nowy kontakt zdalny";
 $a->strings["Photo"] = "Zdjęcie";
 $a->strings["Address"] = "Adres";
 $a->strings["%s total blocked contact"] = [
-	0 => "",
-	1 => "",
-	2 => "",
-	3 => "",
+	0 => "%s całkowicie zablokowany kontakt ",
+	1 => "%s całkowicie zablokowany kontakt",
+	2 => "%s całkowicie zablokowane kontakty ",
+	3 => "%s całkowicie zablokowane kontakty",
 ];
 $a->strings["URL of the remote contact to block."] = "Adres URL kontaktu zdalnego do zablokowania.";
 $a->strings["Delete this Item"] = "Usuń ten przedmiot";
@@ -1010,15 +1075,20 @@ $a->strings["Currently this node is aware of %d nodes with %d registered users f
 $a->strings["ID"] = "ID";
 $a->strings["Recipient Name"] = "Nazwa odbiorcy";
 $a->strings["Recipient Profile"] = "Profil odbiorcy";
-$a->strings["Network"] = "Sieć";
 $a->strings["Created"] = "Utwórz";
 $a->strings["Last Tried"] = "Ostatnia wypróbowana";
 $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."] = "Na tej stronie znajduje się zawartość kolejki dla wysyłek wychodzących. Są to posty, dla których początkowe wysyłanie nie powiodło się. Zostaną one ponownie wysłane później i ostatecznie usunięte, jeśli doręczenie zakończy się trwale.";
+$a->strings["Inspect Worker Queue"] = "Sprawdź Kolejkę Pracowników";
+$a->strings["Job Parameters"] = "Parametry zadania";
+$a->strings["Priority"] = "Priorytet";
+$a->strings["This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you've set up during install."] = "Ta strona zawiera listę aktualnie ustawionych zadań dla pracowników. Te zadania są obsługiwane przez cronjob pracownika, który skonfigurowałeś podczas instalacji.";
 $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 />"] = "Twoja baza danych nadal działa z tabelami MyISAM. Powinieneś zmienić typ silnika na InnoDB. Ponieważ Friendica będzie używać funkcji związanych z InnoDB tylko w przyszłości, powinieneś to zmienić! Zobacz <a href=\"%s\">tutaj</a> przewodnik, który może być pomocny w konwersji silników stołowych. Możesz także użyć polecenia <tt>php bin/console.php dbstructure toinnodb</tt> instalacji Friendica do automatycznej konwersji.<br />";
 $a->strings["There is a new version of Friendica available for download. Your current version is %1\$s, upstream version is %2\$s"] = "Dostępna jest nowa wersja aplikacji Friendica. Twoja aktualna wersja to %1\$s wyższa wersja to %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."] = "Aktualizacja bazy danych nie powiodła się. Uruchom polecenie \"php bin/console.php dbstructure update\" z wiersza poleceń i sprawdź błędy, które mogą się pojawić.";
 $a->strings["The worker was never executed. Please check your database structure!"] = "Pracownik nigdy nie został stracony. Sprawdź swoją strukturę bazy danych!";
 $a->strings["The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings."] = "Ostatnie wykonanie robota było w %s UTC. To jest starsze niż jedna godzina. Sprawdź ustawienia crontab.";
+$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."] = "Konfiguracja Friendica jest teraz przechowywana w config/local.ini.php, skopiuj config/local-sample.ini.php i przenieś konfigurację z <code>.htconfig.php</code>. Zobacz <a href=\"%s\">stronę pomocy konfiguracji</a>, aby uzyskać pomoc dotyczącą przejścia.";
+$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>nie jest osiągalny w twoim systemie. Jest to problem konfiguracji sieci, który uniemożliwia komunikację. Zobacz pomoc na <a href=\"%s\">stronie instalacji</a>.";
 $a->strings["Normal Account"] = "Konto normalne";
 $a->strings["Automatic Follower Account"] = "Automatyczne konto obserwatora";
 $a->strings["Public Forum Account"] = "Publiczne konto na forum";
@@ -1033,12 +1103,12 @@ $a->strings["Version"] = "Wersja";
 $a->strings["Active addons"] = "Aktywne dodatki";
 $a->strings["Can not parse base url. Must have at least <scheme>://<domain>"] = "Nie można zanalizować podstawowego adresu URL. Musi mieć co najmniej <scheme>: //<domain>";
 $a->strings["Site settings updated."] = "Ustawienia strony zaktualizowane";
-$a->strings["No special theme for mobile devices"] = "Brak specialnego motywu dla urządzeń mobilnych";
 $a->strings["No community page for local users"] = "Brak strony społeczności dla użytkowników lokalnych";
 $a->strings["No community page"] = "Brak strony społeczności";
 $a->strings["Public postings from users of this site"] = "Publikacje publiczne od użytkowników tej strony";
 $a->strings["Public postings from the federated network"] = "Publikacje wpisy ze sfederowanej sieci";
 $a->strings["Public postings from local users and the federated network"] = "Publikacje publiczne od użytkowników lokalnych i sieci federacyjnej";
+$a->strings["Disabled"] = "Wyłączony";
 $a->strings["Users, Global Contacts"] = "Użytkownicy, kontakty globalne";
 $a->strings["Users, Global Contacts/fallback"] = "Użytkownicy, kontakty globalne/awaryjne";
 $a->strings["One month"] = "Miesiąc";
@@ -1056,9 +1126,9 @@ $a->strings["Don't check"] = "Nie sprawdzaj";
 $a->strings["check the stable version"] = "sprawdź wersję stabilną";
 $a->strings["check the development version"] = "sprawdź wersję rozwojową";
 $a->strings["Republish users to directory"] = "Ponownie opublikuj użytkowników w katalogu";
-$a->strings["Registration"] = "Rejestracja";
 $a->strings["File upload"] = "Przesyłanie plików";
 $a->strings["Policies"] = "Zasady";
+$a->strings["Advanced"] = "Zaawansowany";
 $a->strings["Auto Discovered Contact Directory"] = "Katalog kontaktów automatycznie odkrytych";
 $a->strings["Performance"] = "Ustawienia";
 $a->strings["Worker"] = "Pracownik";
@@ -1099,6 +1169,8 @@ $a->strings["Maximum Daily Registrations"] = "Maksymalna dzienna rejestracja";
 $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."] = "Jeśli rejestracja powyżej jest dozwolona, to określa maksymalną liczbę nowych rejestracji użytkowników do zaakceptowania na dzień. Jeśli rejestracja jest ustawiona na \"Zamknięta\", to ustawienie to nie ma wpływu.";
 $a->strings["Register text"] = "Zarejestruj tekst";
 $a->strings["Will be displayed prominently on the registration page. You can use BBCode here."] = "Będą wyświetlane w widocznym miejscu na stronie rejestracji. Możesz użyć BBCode tutaj.";
+$a->strings["Forbidden Nicknames"] = "Zakazane pseudonimy";
+$a->strings["Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142."] = "Lista oddzielonych przecinkami pseudonimów, których nie wolno rejestrować. Preset to lista nazw ról zgodnie z RFC 2142.";
 $a->strings["Accounts abandoned after x days"] = "Konto porzucone od x dni.";
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Nie będzie marnować zasobów systemu wypytując zewnętrzne strony o opuszczone konta. Ustaw 0 dla braku limitu czasu .";
 $a->strings["Allowed friend domains"] = "Dozwolone domeny przyjaciół";
@@ -1113,6 +1185,7 @@ $a->strings["Block public"] = "Blokuj publicznie";
 $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Zaznacz, aby zablokować publiczny dostęp do wszystkich publicznych stron prywatnych w tej witrynie, chyba że jesteś zalogowany.";
 $a->strings["Force publish"] = "Wymuś publikację";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Zaznacz, aby wymusić umieszczenie wszystkich profili w tej witrynie w katalogu witryny.";
+$a->strings["Enabling this may violate privacy laws like the GDPR"] = "Włączenie tego może naruszyć prawa ochrony prywatności, takie jak GDPR";
 $a->strings["Global directory URL"] = "Globalny adres URL katalogu";
 $a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "Adres URL do katalogu globalnego. Jeśli nie zostanie to ustawione, katalog globalny jest całkowicie niedostępny dla aplikacji.";
 $a->strings["Private posts by default for new users"] = "Prywatne posty domyślnie dla nowych użytkowników";
@@ -1123,6 +1196,8 @@ $a->strings["Disallow public access to addons listed in the apps menu."] = "Nie
 $a->strings["Checking this box will restrict addons listed in the apps menu to members only."] = "Zaznaczenie tego pola spowoduje ograniczenie dodatków wymienionych w menu aplikacji tylko dla członków.";
 $a->strings["Don't embed private images in posts"] = "Nie umieszczaj prywatnych zdjęć w postach";
 $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."] = "Nie zastępuj lokalnie hostowanych zdjęć prywatnych we wpisach za pomocą osadzonej kopii obrazu. Oznacza to, że osoby, które otrzymują posty zawierające prywatne zdjęcia, będą musiały uwierzytelnić i wczytać każdy obraz, co może trochę potrwać.";
+$a->strings["Explicit Content"] = "Treści dla dorosłych";
+$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."] = "Ustaw to, aby ogłosić, że Twój węzeł jest używany głównie do jawnej treści, która może nie być odpowiednia dla nieletnich. Informacje te zostaną opublikowane w informacjach o węźle i mogą zostać wykorzystane, np. w katalogu globalnym, aby filtrować węzeł z list węzłów do przyłączenia. Dodatkowo notatka o tym zostanie pokazana na stronie rejestracji użytkownika.";
 $a->strings["Allow Users to set remote_self"] = "Zezwól użytkownikom na ustawienie 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."] = "Po sprawdzeniu tego każdy użytkownik może zaznaczyć każdy kontakt jako zdalny w oknie dialogowym kontaktu naprawczego. Ustawienie tej flagi na kontakcie powoduje dublowanie każdego wpisu tego kontaktu w strumieniu użytkowników.";
 $a->strings["Block multiple registrations"] = "Zablokuj wielokrotną rejestrację";
@@ -1194,7 +1269,7 @@ $a->strings["If you have a restricted system where the webserver can't access th
 $a->strings["Base path to installation"] = "Podstawowa ścieżka do instalacji";
 $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."] = "Jeśli system nie może wykryć poprawnej ścieżki do instalacji, wprowadź tutaj poprawną ścieżkę. To ustawienie powinno być ustawione tylko wtedy, gdy używasz ograniczonego systemu i dowiązań symbolicznych do twojego webroota.";
 $a->strings["Disable picture proxy"] = "Wyłącz obraz proxy";
-$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "Proxy obrazu zwiększa wydajność i prywatność. Nie należy go stosować w systemach o bardzo niskiej przepustowości.";
+$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth."] = "Serwer proxy zwiększa wydajność i prywatność. Nie powinno być używane w systemach o bardzo niskiej przepustowości.";
 $a->strings["Only search in tags"] = "Szukaj tylko w tagach";
 $a->strings["On large systems the text search can slow down the system extremely."] = "W dużych systemach wyszukiwanie tekstu może wyjątkowo spowolnić system.";
 $a->strings["New base url"] = "Nowy bazowy adres url";
@@ -1203,7 +1278,7 @@ $a->strings["RINO Encryption"] = "Szyfrowanie RINO";
 $a->strings["Encryption layer between nodes."] = "Warstwa szyfrowania między węzłami.";
 $a->strings["Enabled"] = "Włącz";
 $a->strings["Maximum number of parallel workers"] = "Maksymalna liczba równoległych pracowników";
-$a->strings["On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4."] = "Na współdzielonych hostach ustaw to na 2. W większych systemach wartości 10 są świetne. Domyślna wartość to 4.";
+$a->strings["On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d."] = "Na udostępnionych usługach hostingowych ustaw tę opcję %d. W większych systemach wartości %dsą świetne . Wartość domyślna to %d.";
 $a->strings["Don't use 'proc_open' with the worker"] = "Nie używaj 'proc_open' z robotnikiem";
 $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."] = "Włącz to, jeśli twój system nie zezwala na użycie 'proc_open'. Może się to zdarzyć w przypadku współdzielonych hosterów. Jeśli ta opcja jest włączona, powinieneś zwiększyć częstotliwość wywołań pracowniczych w twoim pliku crontab.";
 $a->strings["Enable fastlane"] = "Włącz Fastlane";
@@ -1224,6 +1299,7 @@ $a->strings["Server tags"] = "Serwer tagów";
 $a->strings["Comma separated list of tags for the 'tags' subscription."] = "Lista oddzielonych przecinkami znaczników dla subskrypcji 'tagów'.";
 $a->strings["Allow user tags"] = "Pozwól na tagi użytkowników";
 $a->strings["If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'."] = "Po włączeniu tagi z zapisanych wyszukiwań będą używane do subskrypcji 'tagów' oprócz 'relay_server_tags'.";
+$a->strings["Start Relocation"] = "Rozpocznij przenoszenie";
 $a->strings["Update has been marked successful"] = "Aktualizacja została oznaczona jako udana";
 $a->strings["Database structure update %s was successfully applied."] = "Pomyślnie zastosowano aktualizację %s struktury bazy danych.";
 $a->strings["Executing of database structure update %s failed with error: %s"] = "Wykonanie aktualizacji %s struktury bazy danych nie powiodło się z powodu błędu:%s";
@@ -1237,14 +1313,14 @@ $a->strings["Failed Updates"] = "Błąd aktualizacji";
 $a->strings["This does not include updates prior to 1139, which did not return a status."] = "Nie dotyczy to aktualizacji przed 1139, który nie zwrócił statusu.";
 $a->strings["Mark success (if update was manually applied)"] = "Oznacz sukces (jeśli aktualizacja została ręcznie zastosowana)";
 $a->strings["Attempt to execute this update step automatically"] = "Spróbuj automatycznie wykonać ten krok aktualizacji";
-$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\tSzanowny/a Panie/Pani %1\$s, \n\t\t\t\tadministrator %2\$s założył dla ciebie konto.";
-$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\tDane logowania są następuje:\n\t\t\tLokalizacja witryny:\t%1\$s\n\t\t\tNazwa użytkownika:%2\$s\n\t\t\tHasło:%3\$s\n\n\t\t\tPo zalogowaniu możesz zmienić hasło do swojego konta na stronie \"Ustawienia\"\n \t\t\tProszę poświęć chwilę, aby przejrzeć inne ustawienia konta na tej stronie.\n\n\t\t\tMożesz również dodać podstawowe informacje do swojego domyślnego profilu\n\t\t\t(na stronie \"Profil\"), aby inne osoby mogły łatwo Cię znaleźć.\n\n\t\t\tZalecamy ustawienie imienia i nazwiska, dodanie zdjęcia profilowego,\n\t\t\tdodanie niektórych \"słów kluczowych\" profilu (bardzo przydatne w nawiązywaniu nowych znajomości) - i\n\t\t\tbyć może w jakim kraju mieszkasz; jeśli nie chcesz być bardziej szczegółowy.\n\n\t\t\tW pełni szanujemy Twoje prawo do prywatności i żaden z tych elementów nie jest konieczny.\n\t\t\tJeśli jesteś nowy i nie znasz tutaj nikogo, oni mogą ci pomóc\n\t\t\tmożesz zdobyć nowych interesujących przyjaciół\n\n\t\t\tJeśli kiedykolwiek zechcesz usunąć swoje konto, możesz to zrobić w %1\$s/Usuń konto\n\n\t\t\tDziękujemy i Zapraszamy do%4\$s";
+$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\tSzanowny Użytkowniku %1\$s, \n\t\t\t\tadministrator %2\$s założył dla ciebie konto.";
+$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\tDane logowania są następuje:\n\t\t\tLokalizacja witryny:\t%1\$s\n\t\t\tNazwa użytkownika:%2\$s\n\t\t\tHasło:%3\$s\n\n\t\t\tPo zalogowaniu możesz zmienić hasło do swojego konta na stronie \"Ustawienia\".\n \t\t\tProszę poświęć chwilę, aby przejrzeć inne ustawienia konta na tej stronie.\n\n\t\t\tMożesz również dodać podstawowe informacje do swojego domyślnego profilu\n\t\t\t(na stronie \"Profil użytkownika\"), aby inne osoby mogły łatwo Cię znaleźć.\n\n\t\t\tZalecamy ustawienie imienia i nazwiska, dodanie zdjęcia profilowego,\n\t\t\tdodanie niektórych \"słów kluczowych\" profilu (bardzo przydatne w nawiązywaniu nowych znajomości) \n\t\t\ti być może gdzie mieszkasz; jeśli nie chcesz podać więcej szczegów.\n\n\t\t\tW pełni szanujemy Twoje prawo do prywatności i żaden z tych elementów nie jest konieczny.\n\t\t\tJeśli jesteś nowy i nie znasz tutaj nikogo, oni mogą ci pomóc,\n\t\t\tmożesz zdobyć nowych interesujących przyjaciół.\n\n\t\t\tJeśli kiedykolwiek zechcesz usunąć swoje konto, możesz to zrobić na stronie %1\$s/removeme\n\n\t\t\tDziękujemy i Zapraszamy do%4\$s";
 $a->strings["Registration details for %s"] = "Szczegóły rejestracji dla %s";
 $a->strings["%s user blocked/unblocked"] = [
-	0 => "",
-	1 => "",
-	2 => "",
-	3 => "",
+	0 => "%s użytkownik zablokowany/odblokowany",
+	1 => "%s użytkowników zablokowanych/odblokowanych",
+	2 => "%sużytkowników zablokowanych/odblokowanych ",
+	3 => "%sużytkowników zablokowanych/odblokowanych ",
 ];
 $a->strings["%s user deleted"] = [
 	0 => " %s użytkownik usunięty",
@@ -1255,15 +1331,7 @@ $a->strings["%s user deleted"] = [
 $a->strings["User '%s' deleted"] = "Użytkownik '%s' usunięty";
 $a->strings["User '%s' unblocked"] = "Użytkownik '%s' odblokowany";
 $a->strings["User '%s' blocked"] = "Użytkownik '%s' zablokowany";
-$a->strings["Normal Account Page"] = "Normalna strona konta";
-$a->strings["Soapbox Page"] = "Strona Soapbox";
-$a->strings["Public Forum"] = "Forum publiczne";
-$a->strings["Automatic Friend Page"] = "Automatyczna strona znajomego";
 $a->strings["Private Forum"] = "Prywatne forum";
-$a->strings["Personal Page"] = "Strona osobista";
-$a->strings["Organisation Page"] = "Strona Organizacji";
-$a->strings["News Page"] = "Strona Wiadomości";
-$a->strings["Community Forum"] = "Forum społecznościowe";
 $a->strings["Email"] = "E-mail";
 $a->strings["Register date"] = "Data rejestracji";
 $a->strings["Last login"] = "Ostatnie logowanie";
@@ -1275,14 +1343,14 @@ $a->strings["User waiting for permanent deletion"] = "Użytkownik czekający na
 $a->strings["Request date"] = "Data prośby";
 $a->strings["No registrations."] = "Brak rejestracji.";
 $a->strings["Note from the user"] = "Uwaga od użytkownika";
-$a->strings["Approve"] = "Zatwierdź";
 $a->strings["Deny"] = "Odmów";
+$a->strings["User blocked"] = "Użytkownik zablokowany";
 $a->strings["Site admin"] = "Administracja stroną";
 $a->strings["Account expired"] = "Konto wygasło.";
 $a->strings["New User"] = "Nowy użytkownik";
 $a->strings["Deleted since"] = "Skasowany 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?"] = "Zaznaczeni użytkownicy zostaną usunięci!\\n\\nWszystko co zamieścili na tej stronie będzie trwale skasowane!\\n\\nJesteś pewien?";
-$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Użytkownik {0} zostanie usunięty!\\n\\nWszystko co zamieścił na tej stronie będzie trwale skasowane!\\n\\nJesteś pewien?";
+$a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Zaznaczeni użytkownicy zostaną usunięci!\\n\\n Wszystko co zamieścili na tej stronie będzie trwale skasowane!\\n\\n Jesteś pewien?";
+$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Użytkownik {0} zostanie usunięty!\\n\\n Wszystko co zamieścił na tej stronie będzie trwale skasowane!\\n\\n Jesteś pewien?";
 $a->strings["Name of the new user."] = "Nazwa nowego użytkownika.";
 $a->strings["Nickname"] = "Pseudonim";
 $a->strings["Nickname of the new user."] = "Pseudonim nowego użytkownika.";
@@ -1311,31 +1379,14 @@ $a->strings["Log file"] = "Plik logów";
 $a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Musi być zapisywalny przez serwer sieciowy. W stosunku do katalogu najwyższego poziomu Friendica.";
 $a->strings["Log level"] = "Poziom logów";
 $a->strings["PHP logging"] = "Logowanie w 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."] = "Aby włączyć rejestrowanie błędów i ostrzeżeń PHP, możesz dodać następujące dane do pliku .htconfig.php instalacji. Nazwa pliku ustawiona w linii 'error_log' odnosi się do katalogu najwyższego poziomu friendiki i musi być zapisywalna przez serwer WWW. Opcja '1' dla 'log_errors' i 'display_errors' polega na włączeniu tych opcji, ustawieniu na '0', aby je wyłączyć.";
+$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."] = "Aby tymczasowo włączyć rejestrowanie błędów i ostrzeżeń PHP, możesz dołączyć do pliku index.php swojej instalacji. Nazwa pliku ustawiona w linii 'error_log' odnosi się do katalogu najwyższego poziomu friendiki i musi być zapisywalna przez serwer WWW. Opcja '1' dla 'log_errors' i 'display_errors' polega na włączeniu tych opcji, ustawieniu na '0', aby je wyłączyć.";
 $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."] = "Błąd podczas próby otwarcia <strong>%1\$s</strong> pliku dziennika. \\r\\n <br/>Sprawdź, czy plik %1\$s istnieje i czy można go odczytać.";
 $a->strings["Couldn't open <strong>%1\$s</strong> log file.\\r\\n<br/>Check to see if file %1\$s is readable."] = "Nie można otworzyć <strong>%1\$s</strong>pliku dziennika. \\r\\n<br/>Sprawdź, czy plik %1\$s jest czytelny.";
-$a->strings["Off"] = "Wyłącz";
-$a->strings["On"] = "Włącz";
 $a->strings["Lock feature %s"] = "Funkcja blokady %s";
 $a->strings["Manage Additional Features"] = "Zarządzanie dodatkowymi funkcjami";
-$a->strings["Profile not found."] = "Nie znaleziono profilu.";
-$a->strings["This may occasionally happen if contact was requested by both persons and it has already been approved."] = "Może się to zdarzyć, gdy kontakt został zgłoszony przez obie osoby i został już zatwierdzony.";
-$a->strings["Response from remote site was not understood."] = "Odpowiedź do zdalnej strony nie została zrozumiana";
-$a->strings["Unexpected response from remote site: "] = "Nieoczekiwana odpowiedź od strony zdalnej:";
-$a->strings["Confirmation completed successfully."] = "Potwierdzenie zostało pomyślnie zakończone.";
-$a->strings["Temporary failure. Please wait and try again."] = "Tymczasowa awaria. Proszę czekać i spróbuj ponownie.";
-$a->strings["Introduction failed or was revoked."] = "Wprowadzenie nie powiodło się lub zostało odwołane.";
-$a->strings["Remote site reported: "] = "Zdalna witryna zgłoszona:";
-$a->strings["Unable to set contact photo."] = "Nie można ustawić zdjęcia kontaktu.";
-$a->strings["No user record found for '%s' "] = "Nie znaleziono użytkownika dla '%s'";
-$a->strings["Our site encryption key is apparently messed up."] = "Klucz kodujący jest najwyraźniej uszkodzony.";
-$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Został podany pusty adres URL witryny lub nie można go odszyfrować.";
-$a->strings["Contact record was not found for you on our site."] = "Nie znaleziono kontaktu na naszej stronie";
-$a->strings["Site public key not available in contact record for URL %s."] = "Publiczny klucz witryny jest niedostępny w rekordzie kontaktu dla adresu URL %s";
-$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Identyfikator dostarczony przez Twój system jest duplikatem w naszym systemie. Powinien działać, jeśli spróbujesz ponownie.";
-$a->strings["Unable to set your contact credentials on our system."] = "Nie można ustawić danych kontaktowych w naszym systemie.";
-$a->strings["Unable to update your contact profile details on our system"] = "Nie można zaktualizować danych Twojego profilu kontaktowego w naszym systemie";
-$a->strings["[Name Withheld]"] = "[Nazwa zastrzeżona]";
+$a->strings["OpenID protocol error. No ID returned."] = "Błąd protokołu OpenID. Nie znaleziono identyfikatora.";
+$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Konto nie zostało znalezione, a rejestracja OpenID nie jest dozwolona na tej stronie.";
+$a->strings["Login failed."] = "Logowanie nieudane.";
 $a->strings["This introduction has already been accepted."] = "To wprowadzenie zostało już zaakceptowane.";
 $a->strings["Profile location is not valid or does not contain profile information."] = "Lokalizacja profilu jest nieprawidłowa lub nie zawiera informacji o profilu.";
 $a->strings["Warning: profile location has no identifiable owner name."] = "Ostrzeżenie: położenie profilu ma taką samą nazwę jak użytkownik.";
@@ -1355,8 +1406,9 @@ $a->strings["Friends are advised to please try again in 24 hours."] = "Przyjacie
 $a->strings["Invalid locator"] = "Nieprawidłowy lokalizator";
 $a->strings["You have already introduced yourself here."] = "Już się tu przedstawiłeś.";
 $a->strings["Apparently you are already friends with %s."] = "Wygląda na to, że już jesteście przyjaciółmi z %s";
-$a->strings["Invalid profile URL."] = "Nieprawidłowy URL profilu.";
+$a->strings["Invalid profile URL."] = "Nieprawidłowy adres URL profilu.";
 $a->strings["Disallowed profile URL."] = "Nie dozwolony adres URL profilu.";
+$a->strings["Failed to update contact record."] = "Aktualizacja rekordu kontaktu nie powiodła się.";
 $a->strings["Your introduction has been sent."] = "Twoje dane zostały wysłane.";
 $a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Zdalnej subskrypcji nie można wykonać dla swojej sieci. Proszę zasubskrybuj bezpośrednio w swoim systemie.";
 $a->strings["Please login to confirm introduction."] = "Zaloguj się, aby potwierdzić wprowadzenie.";
@@ -1369,45 +1421,249 @@ $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>."] = "Jeśli nie jesteś jeszcze członkiem darmowej sieci społecznościowej, <a href=\"%s\">kliknij ten link, aby znaleźć publiczną witrynę Friendica i dołącz do nas już dziś</a>.";
 $a->strings["Friend/Connection Request"] = "Przyjaciel/Prośba o połączenie";
 $a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de"] = "Przykłady: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de";
+$a->strings["Please answer the following:"] = "Proszę odpowiedzieć na następujące pytania:";
+$a->strings["Does %s know you?"] = "Czy %s Cię zna?";
+$a->strings["Add a personal note:"] = "Dodaj osobistą notkę:";
 $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."] = "- proszę nie używać tego formularza. Zamiast tego wpisz %s do paska wyszukiwania Diaspory.";
+$a->strings["Authorize application connection"] = "Autoryzacja połączenia aplikacji";
+$a->strings["Return to your app and insert this Securty Code:"] = "Powróć do swojej aplikacji i wpisz ten Kod Bezpieczeństwa:";
+$a->strings["Please login to continue."] = "Zaloguj się aby kontynuować.";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Czy chcesz zezwolić tej aplikacji na dostęp do swoich postów i kontaktów i/lub tworzenie nowych postów?";
+$a->strings["Image uploaded but image cropping failed."] = "Zdjęcie zostało przesłane, ale przycinanie obrazu nie powiodło się.";
+$a->strings["Image size reduction [%s] failed."] = "Redukcja rozmiaru obrazka [%s] nie powiodła się.";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Ponownie załaduj stronę lub wyczyść pamięć podręczną przeglądarki, jeśli nowe zdjęcie nie pojawi się natychmiast.";
+$a->strings["Unable to process image"] = "Nie udało się przetworzyć obrazu.";
+$a->strings["Upload File:"] = "Wyślij plik:";
+$a->strings["Select a profile:"] = "Wybierz profil:";
+$a->strings["Upload"] = "Załaduj";
+$a->strings["or"] = "lub";
+$a->strings["skip this step"] = "pomiń ten krok";
+$a->strings["select a photo from your photo albums"] = "wybierz zdjęcie z twojego albumu";
+$a->strings["Crop Image"] = "Przytnij zdjęcie";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Dostosuj kadrowanie obrazu, aby uzyskać optymalny obraz.";
+$a->strings["Done Editing"] = "Zakończono edycję";
+$a->strings["Image uploaded successfully."] = "Zdjęcie wczytano pomyślnie ";
+$a->strings["Sorry, maybe your upload is bigger than the PHP configuration allows"] = "Przepraszam, Twój przesyłany plik jest większy niż pozwala konfiguracja PHP";
+$a->strings["Or - did you try to upload an empty file?"] = "Lub - czy próbowałeś załadować pusty plik?";
+$a->strings["File exceeds size limit of %s"] = "Plik przekracza limit rozmiaru wynoszący %s";
+$a->strings["File upload failed."] = "Przesyłanie pliku nie powiodło się.";
 $a->strings["Unable to locate original post."] = "Nie można zlokalizować oryginalnej wiadomości.";
 $a->strings["Empty post discarded."] = "Pusty wpis został odrzucony.";
 $a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "Wiadomość została wysłana do ciebie od %s , członka portalu Friendica";
 $a->strings["You may visit them online at %s"] = "Możesz odwiedzić ich online pod adresem %s";
 $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Skontaktuj się z nadawcą odpowiadając na ten post jeśli nie chcesz otrzymywać tych wiadomości.";
 $a->strings["%s posted an update."] = "%s zaktualizował wpis.";
-$a->strings["Invalid request identifier."] = "Nieprawidłowe żądanie identyfikatora.";
-$a->strings["Discard"] = "Odrzuć";
-$a->strings["Notifications"] = "Powiadomienia";
-$a->strings["Network Notifications"] = "Powiadomienia sieciowe";
-$a->strings["Personal Notifications"] = "Prywatne powiadomienia";
-$a->strings["Home Notifications"] = "Powiadomienia domowe";
-$a->strings["Show Ignored Requests"] = "Pokaż ignorowane żądania";
-$a->strings["Hide Ignored Requests"] = "Ukryj zignorowane prośby";
-$a->strings["Notification type: "] = "Typ powiadomienia:";
-$a->strings["suggested by %s"] = "zaproponowane przez %s";
-$a->strings["Claims to be known to you: "] = "Twierdzi, że go znasz:";
-$a->strings["yes"] = "tak";
-$a->strings["no"] = "nie";
-$a->strings["Shall your connection be bidirectional or not?"] = "Czy twoje połączenie ma być dwukierunkowe, czy nie?";
-$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."] = "Przyjmowanie %s jako znajomego pozwala %s zasubskrybować twoje posty, a także otrzymywać od nich aktualizacje w swoim kanale wiadomości.";
-$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."] = "Zaakceptowanie %s jako subskrybenta umożliwia im subskrybowanie Twoich postów, ale nie otrzymasz od nich aktualizacji w swoim kanale wiadomości.";
-$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."] = "Akceptowanie %s jako udostępniający pozwala im subskrybować twoje posty, ale nie otrzymasz od nich aktualizacji w swoim kanale wiadomości.";
-$a->strings["Friend"] = "Znajomy";
-$a->strings["Sharer"] = "Udostępniający/a";
-$a->strings["Subscriber"] = "Subskrybent";
-$a->strings["No introductions."] = "Brak dostępu.";
-$a->strings["Show unread"] = "Pokaż nieprzeczytane";
-$a->strings["Show all"] = "Pokaż wszystko";
-$a->strings["No more %s notifications."] = "Nigdy więcej %s powiadomień.";
+$a->strings["Help:"] = "Pomoc:";
+$a->strings["Move account"] = "Przenieś konto";
+$a->strings["You can import an account from another Friendica server."] = "Możesz zaimportować konto z innego serwera 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."] = "Musisz wyeksportować konto ze starego serwera i przesłać je tutaj. Odtworzymy twoje stare konto tutaj ze wszystkimi twoimi kontaktami. Postaramy się również poinformować twoich znajomych, że się tutaj przeniosłeś.";
+$a->strings["This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"] = "Ta funkcja jest eksperymentalna. Nie możemy importować kontaktów z sieci OStatus (GNU Social/Statusnet) lub z Diaspory";
+$a->strings["Account file"] = "Pliki konta";
+$a->strings["To export your account, go to \"Settings->Export your personal data\" and select \"Export account\""] = "Aby eksportować konto, wejdź w \"Ustawienia->Eksport danych osobistych\" i wybierz \"Eksportuj konto\"";
+$a->strings["Invalid profile identifier."] = "Nieprawidłowa nazwa użytkownika.";
+$a->strings["Profile Visibility Editor"] = "Ustawienia widoczności profilu";
+$a->strings["Visible To"] = "Widoczne dla";
+$a->strings["All Contacts (with secure profile access)"] = "Wszystkie kontakty (z bezpiecznym dostępem do profilu)";
+$a->strings["View"] = "Widok";
+$a->strings["Previous"] = "Poprzedni";
+$a->strings["today"] = "dzisiaj";
+$a->strings["month"] = "miesiąc";
+$a->strings["week"] = "tydzień";
+$a->strings["day"] = "dzień";
+$a->strings["list"] = "lista";
+$a->strings["User not found"] = "Użytkownik nie znaleziony";
+$a->strings["This calendar format is not supported"] = "Ten format kalendarza nie jest obsługiwany";
+$a->strings["No exportable data found"] = "Nie znaleziono danych do eksportu";
+$a->strings["calendar"] = "kalendarz";
+$a->strings["Account approved."] = "Konto zatwierdzone.";
+$a->strings["Registration revoked for %s"] = "Rejestracja odwołana dla %s";
+$a->strings["Please login."] = "Proszę się zalogować.";
+$a->strings["Item not found"] = "Nie znaleziono elementu";
+$a->strings["Edit post"] = "Edytuj post";
+$a->strings["CC: email addresses"] = "CC: adresy e-mail";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Przykład: bob@example.com, mary@example.com";
+$a->strings["Applications"] = "Aplikacje";
+$a->strings["No installed applications."] = "Brak zainstalowanych aplikacji.";
+$a->strings["You must be logged in to use this module"] = "Musisz być zalogowany, aby korzystać z tego modułu";
+$a->strings["Source URL"] = "Źródłowy adres URL";
+$a->strings["Friend suggestion sent."] = "Wysłana propozycja dodania do znajomych.";
+$a->strings["Suggest Friends"] = "Zaproponuj znajomych";
+$a->strings["Suggest a friend for %s"] = "Zaproponuj znajomych dla %s";
+$a->strings["System down for maintenance"] = "System wyłączony w celu konserwacji";
 $a->strings["Requested profile is not available."] = "Żądany profil jest niedostępny";
 $a->strings["%s's timeline"] = "%s oś czasu ";
 $a->strings["%s's posts"] = "%s posty ";
 $a->strings["%s's comments"] = "%s komentarze ";
-$a->strings["Tips for New Members"] = "Wskazówki dla nowych użytkowników";
+$a->strings["No friends to display."] = "Brak znajomych do wyświetlenia";
+$a->strings["%d contact edited."] = [
+	0 => "%d edytuj kontakty.",
+	1 => "%d edytuj kontakty.",
+	2 => "%dedytuj kontakty. ",
+	3 => "%dedytuj kontakty. ",
+];
+$a->strings["Could not access contact record."] = "Nie można uzyskać dostępu do rejestru kontaktów.";
+$a->strings["Could not locate selected profile."] = "Nie można znaleźć wybranego profilu.";
+$a->strings["Contact updated."] = "Kontakt zaktualizowany";
+$a->strings["Contact has been blocked"] = "Kontakt został zablokowany";
+$a->strings["Contact has been unblocked"] = "Kontakt został odblokowany";
+$a->strings["Contact has been ignored"] = "Kontakt jest ignorowany";
+$a->strings["Contact has been unignored"] = "Kontakt nie jest ignorowany";
+$a->strings["Contact has been archived"] = "Kontakt został zarchiwizowany";
+$a->strings["Contact has been unarchived"] = "Kontakt został przywrócony";
+$a->strings["Drop contact"] = "Usuń kontakt";
+$a->strings["Do you really want to delete this contact?"] = "Czy na pewno chcesz usunąć ten kontakt?";
+$a->strings["Contact has been removed."] = "Kontakt został usunięty.";
+$a->strings["You are mutual friends with %s"] = "Jesteś już znajomym z %s";
+$a->strings["You are sharing with %s"] = "Współdzielisz z %s";
+$a->strings["%s is sharing with you"] = "%s współdzieli z tobą";
+$a->strings["Private communications are not available for this contact."] = "Prywatna rozmowa jest niemożliwa dla tego kontaktu";
+$a->strings["Never"] = "Nigdy";
+$a->strings["(Update was successful)"] = "(Aktualizacja przebiegła pomyślnie)";
+$a->strings["(Update was not successful)"] = "(Aktualizacja nie powiodła się)";
+$a->strings["Suggest friends"] = "Osoby, które możesz znać";
+$a->strings["Network type: %s"] = "Typ sieci: %s";
+$a->strings["Communications lost with this contact!"] = "Utracono komunikację z tym kontaktem!";
+$a->strings["Fetch further information for feeds"] = "Pobierz dalsze informacje dla kanałów";
+$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."] = "Pobieranie informacji, takich jak zdjęcia podglądu, tytuł i zwiastun z elementu kanału. Możesz to aktywować, jeśli plik danych nie zawiera dużo tekstu. Słowa kluczowe są pobierane z nagłówka meta w elemencie kanału i są publikowane jako znaczniki haszowania.";
+$a->strings["Fetch information"] = "Pobierz informacje";
+$a->strings["Fetch keywords"] = "Pobierz słowa kluczowe";
+$a->strings["Fetch information and keywords"] = "Pobierz informacje i słowa kluczowe";
+$a->strings["Profile Visibility"] = "Widoczność profilu";
+$a->strings["Contact Information / Notes"] = "Informacje kontaktowe/Notatki";
+$a->strings["Contact Settings"] = "Ustawienia kontaktów";
+$a->strings["Contact"] = "Kontakt";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Wybierz profil, który chcesz bezpiecznie wyświetlić %s";
+$a->strings["Their personal note"] = "Ich osobista uwaga";
+$a->strings["Edit contact notes"] = "Edytuj notatki kontaktu";
+$a->strings["Block/Unblock contact"] = "Zablokuj/odblokuj kontakt";
+$a->strings["Ignore contact"] = "Ignoruj kontakt";
+$a->strings["Repair URL settings"] = "Napraw ustawienia adresów URL";
+$a->strings["View conversations"] = "Wyświetl rozmowy";
+$a->strings["Last update:"] = "Ostatnia aktualizacja:";
+$a->strings["Update public posts"] = "Zaktualizuj publiczne posty";
+$a->strings["Update now"] = "Aktualizuj teraz";
+$a->strings["Unignore"] = "Odblokuj";
+$a->strings["Currently blocked"] = "Obecnie zablokowany";
+$a->strings["Currently ignored"] = "Obecnie zignorowany";
+$a->strings["Currently archived"] = "Obecnie zarchiwizowany";
+$a->strings["Awaiting connection acknowledge"] = "Oczekiwanie na potwierdzenie połączenia";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Odpowiedzi/kliknięcia \"lubię to\" do twoich publicznych postów nadal <strong>mogą</strong> być widoczne";
+$a->strings["Notification for new posts"] = "Powiadomienie o nowych postach";
+$a->strings["Send a notification of every new post of this contact"] = "Wyślij powiadomienie o każdym nowym poście tego kontaktu";
+$a->strings["Blacklisted keywords"] = "Słowa kluczowe na czarnej liście";
+$a->strings["Comma separated list of keywords that should not be converted to hashtags, when \"Fetch information and keywords\" is selected"] = "Rozdzielana przecinkami lista słów kluczowych, które nie powinny zostać przekonwertowane na hashtagi, gdy wybrana jest opcja 'Pobierz informacje i słowa kluczowe'";
+$a->strings["XMPP:"] = "XMPP:";
+$a->strings["Actions"] = "Akcja";
+$a->strings["Suggestions"] = "Sugestie";
+$a->strings["Suggest potential friends"] = "Sugerowani znajomi";
+$a->strings["Show all contacts"] = "Pokaż wszystkie kontakty";
+$a->strings["Unblocked"] = "Odblokowany";
+$a->strings["Only show unblocked contacts"] = "Pokaż tylko odblokowane kontakty";
+$a->strings["Blocked"] = "Zablokowany";
+$a->strings["Only show blocked contacts"] = "Pokaż tylko zablokowane kontakty";
+$a->strings["Ignored"] = "Zignorowany";
+$a->strings["Only show ignored contacts"] = "Pokaż tylko ignorowane kontakty";
+$a->strings["Archived"] = "Zarchiwizowane";
+$a->strings["Only show archived contacts"] = "Pokaż tylko zarchiwizowane kontakty";
+$a->strings["Hidden"] = "Ukryty";
+$a->strings["Only show hidden contacts"] = "Pokaż tylko ukryte kontakty";
+$a->strings["Search your contacts"] = "Wyszukaj w kontaktach";
+$a->strings["Archive"] = "Archiwum";
+$a->strings["Unarchive"] = "Przywróć z archiwum";
+$a->strings["Batch Actions"] = "Akcje wsadowe";
+$a->strings["Conversations started by this contact"] = "Rozmowy rozpoczęły się od tego kontaktu";
+$a->strings["Posts and Comments"] = "Posty i komentarze";
+$a->strings["Profile Details"] = "Szczegóły profilu";
+$a->strings["View all contacts"] = "Zobacz wszystkie kontakty";
+$a->strings["View all common friends"] = "Zobacz wszystkich popularnych znajomych";
+$a->strings["Advanced Contact Settings"] = "Zaawansowane ustawienia kontaktów";
+$a->strings["Mutual Friendship"] = "Wzajemna przyjaźń";
+$a->strings["is a fan of yours"] = "jest twoim fanem";
+$a->strings["you are a fan of"] = "jesteś fanem";
+$a->strings["This is you"] = "To jesteś ty";
+$a->strings["Edit contact"] = "Edytuj kontakt";
+$a->strings["Toggle Blocked status"] = "Przełącz status na Zablokowany";
+$a->strings["Toggle Ignored status"] = "Przełącz status na Ignorowany";
+$a->strings["Toggle Archive status"] = "Przełącz  status na Archiwalny";
+$a->strings["Delete contact"] = "Usuń kontakt";
+$a->strings["Event can not end before it has started."] = "Wydarzenie nie może się zakończyć przed jego rozpoczęciem.";
+$a->strings["Event title and start time are required."] = "Wymagany tytuł wydarzenia i czas rozpoczęcia.";
+$a->strings["Create New Event"] = "Stwórz nowe wydarzenie";
+$a->strings["Event details"] = "Szczegóły wydarzenia";
+$a->strings["Starting date and Title are required."] = "Data rozpoczęcia i tytuł są wymagane.";
+$a->strings["Event Starts:"] = "Rozpoczęcie wydarzenia:";
+$a->strings["Required"] = "Wymagany";
+$a->strings["Finish date/time is not known or not relevant"] = "Data/czas zakończenia nie jest znana lub jest nieistotna";
+$a->strings["Event Finishes:"] = "Zakończenie wydarzenia:";
+$a->strings["Adjust for viewer timezone"] = "Dopasuj dla strefy czasowej widza";
+$a->strings["Description:"] = "Opis:";
+$a->strings["Title:"] = "Tytuł:";
+$a->strings["Share this event"] = "Udostępnij te wydarzenie";
+$a->strings["Basic"] = "Podstawowy";
+$a->strings["Permissions"] = "Uprawnienia";
+$a->strings["Failed to remove event"] = "Nie udało się usunąć wydarzenia";
+$a->strings["Event removed"] = "Wydarzenie zostało usunięte";
+$a->strings["The contact could not be added."] = "Nie można dodać kontaktu.";
+$a->strings["You already added this contact."] = "Już dodałeś ten kontakt.";
+$a->strings["Diaspora support isn't enabled. Contact can't be added."] = "Obsługa Diaspory nie jest włączona. Kontakt nie może zostać dodany.";
+$a->strings["OStatus support is disabled. Contact can't be added."] = "Obsługa OStatus jest wyłączona. Kontakt nie może zostać dodany.";
+$a->strings["The network type couldn't be detected. Contact can't be added."] = "Nie można wykryć typu sieci. Kontakt nie może zostać dodany.";
+$a->strings["Contact Photos"] = "Zdjęcia kontaktu";
+$a->strings["Files"] = "Pliki";
+$a->strings["Post successful."] = "Post dodany pomyślnie";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "%1\$skolejny %2\$s %3\$s ";
+$a->strings["Credits"] = "Zaufany";
+$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 to projekt społecznościowy, który nie byłby możliwy bez pomocy wielu osób. Oto lista osób, które przyczyniły się do tworzenia kodu lub tłumaczenia Friendica. Dziękuję wam wszystkim!";
+$a->strings["Item not available."] = "Element niedostępny.";
+$a->strings["Item was not found."] = "Element nie znaleziony.";
+$a->strings["No more system notifications."] = "Nie ma więcej powiadomień systemowych.";
+$a->strings["Community option not available."] = "Opcja wspólnotowa jest niedostępna.";
+$a->strings["Not available."] = "Niedostępne.";
+$a->strings["Local Community"] = "Lokalna społeczność";
+$a->strings["Posts from local users on this server"] = "Wpisy od lokalnych użytkowników na tym serwerze";
+$a->strings["Global Community"] = "Globalna społeczność";
+$a->strings["Posts from users of the whole federated network"] = "Wpisy od użytkowników całej sieci stowarzyszonej";
+$a->strings["This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users."] = "Ten strumień społeczności pokazuje wszystkie publiczne posty otrzymane przez ten węzeł. Mogą nie odzwierciedlać opinii użytkowników tego węzła.";
+$a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
+$a->strings["Time Conversion"] = "Zmiana czasu";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica udostępnia tę usługę do udostępniania wydarzeń innym sieciom i znajomym w nieznanych strefach czasowych.";
+$a->strings["UTC time: %s"] = "Czas UTC %s";
+$a->strings["Current timezone: %s"] = "Obecna strefa czasowa: %s";
+$a->strings["Converted localtime: %s"] = "Zmień strefę czasową: %s";
+$a->strings["Please select your timezone:"] = "Wybierz swoją strefę czasową:";
+$a->strings["Poke/Prod"] = "Zaczepić";
+$a->strings["poke, prod or do other things to somebody"] = "szturchać, zaczepić lub robić inne rzeczy";
+$a->strings["Recipient"] = "Odbiorca";
+$a->strings["Choose what you wish to do to recipient"] = "Wybierz, co chcesz zrobić";
+$a->strings["Make this post private"] = "Ustaw ten post jako prywatny";
+$a->strings["Total invitation limit exceeded."] = "Przekroczono limit zaproszeń ogółem.";
+$a->strings["%s : Not a valid email address."] = "%s : Nieprawidłowy adres e-mail.";
+$a->strings["Please join us on Friendica"] = "Dołącz do nas na Friendica";
+$a->strings["Invitation limit exceeded. Please contact your site administrator."] = "Przekroczono limit zaproszeń. Skontaktuj się z administratorem witryny.";
+$a->strings["%s : Message delivery failed."] = "%s : Nie udało się dostarczyć wiadomości.";
+$a->strings["%d message sent."] = [
+	0 => "%d wiadomość wysłana.",
+	1 => "%d wiadomości wysłane.",
+	2 => "%d wysłano .",
+	3 => "%d wiadomość wysłano.",
+];
+$a->strings["You have no more invitations available"] = "Nie masz już dostępnych zaproszeń";
+$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."] = "Odwiedź %s listę publicznych witryn, do których możesz dołączyć. Członkowie Friendica na innych stronach mogą łączyć się ze sobą, jak również z członkami wielu innych sieci społecznościowych.";
+$a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Aby zaakceptować to zaproszenie, odwiedź i zarejestruj się %s lub w dowolnej innej publicznej witrynie internetowej 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."] = "Strony Friendica łączą się ze sobą, tworząc ogromną sieć społecznościową o zwiększonej prywatności, która jest własnością i jest kontrolowana przez jej członków. Mogą również łączyć się z wieloma tradycyjnymi sieciami społecznościowymi. Zobacz %s listę alternatywnych witryn Friendica, do których możesz dołączyć.";
+$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Przepraszamy. System nie jest obecnie skonfigurowany do łączenia się z innymi publicznymi witrynami lub zapraszania członków.";
+$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."] = "Strony Friendica łączą się ze sobą, tworząc ogromną sieć społecznościową o zwiększonej prywatności, która jest własnością i jest kontrolowana przez jej członków. Mogą również łączyć się z wieloma tradycyjnymi sieciami społecznościowymi.";
+$a->strings["To accept this invitation, please visit and register at %s."] = "Aby zaakceptować to zaproszenie, odwiedź stronę i zarejestruj się na stronie %s.";
+$a->strings["Send invitations"] = "Wyślij zaproszenie";
+$a->strings["Enter email addresses, one per line:"] = "Wprowadź adresy e-mail, po jednym w wierszu:";
+$a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Serdecznie zapraszam do przyłączenia się do mnie i innych bliskich znajomych na stronie Friendica - i pomóż nam stworzyć lepszą sieć społecznościową.";
+$a->strings["You will need to supply this invitation code: \$invite_code"] = "Musisz podać ten kod zaproszenia: \$invite_code";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Po rejestracji połącz się ze mną na stronie mojego profilu pod adresem:";
+$a->strings["For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca"] = "Aby uzyskać więcej informacji na temat projektu Friendica i dlaczego uważamy, że jest to ważne, odwiedź http://friendi.ca";
+$a->strings["Personal Notes"] = "Notatki";
 $a->strings["Profile deleted."] = "Konto usunięte.";
 $a->strings["Profile-"] = "Profil-";
 $a->strings["New profile created."] = "Utworzono nowy profil.";
@@ -1432,6 +1688,7 @@ $a->strings["Profile Actions"] = "Akcje profilowe";
 $a->strings["Edit Profile Details"] = "Edytuj profil.";
 $a->strings["Change Profile Photo"] = "Zmień zdjęcie profilowe";
 $a->strings["View this profile"] = "Wyświetl ten profil";
+$a->strings["View all profiles"] = "Wyświetl wszystkie profile";
 $a->strings["Edit visibility"] = "Edytuj widoczność";
 $a->strings["Create a new profile using these settings"] = "Stwórz nowy profil wykorzystując te ustawienia";
 $a->strings["Clone this profile"] = "Sklonuj ten profil";
@@ -1471,7 +1728,7 @@ $a->strings["Public Keywords:"] = "Publiczne słowa kluczowe:";
 $a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Używany do sugerowania potencjalnych znajomych, jest widoczny dla innych)";
 $a->strings["Private Keywords:"] = "Prywatne słowa kluczowe:";
 $a->strings["(Used for searching profiles, never shown to others)"] = "(Używany do wyszukiwania profili, niepokazywany innym)";
-$a->strings["Likes:"] = "Lubią to:";
+$a->strings["Likes:"] = "Lubię to:";
 $a->strings["Dislikes:"] = "Nie lubię tego:";
 $a->strings["Musical interests"] = "Muzyka";
 $a->strings["Books, literature"] = "Literatura";
@@ -1487,326 +1744,63 @@ $a->strings["visible to everybody"] = "widoczne dla wszystkich";
 $a->strings["Edit/Manage Profiles"] = "Edycja/Zarządzanie profilami";
 $a->strings["Change profile photo"] = "Zmień zdjęcie profilowe";
 $a->strings["Create New Profile"] = "Utwórz nowy profil";
-$a->strings["Registration successful. Please check your email for further instructions."] = "Rejestracja zakończona pomyślnie. Dalsze instrukcje zostały wysłane na twojego e-maila.";
-$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."] = "Nie udało się wysłać wiadomości e-mail. Tutaj szczegóły twojego konta:<br> login: %s<br>hasło: %s<br><br>Możesz zmienić swoje hasło po zalogowaniu.";
-$a->strings["Registration successful."] = "Rejestracja udana.";
-$a->strings["Your registration can not be processed."] = "Twoja rejestracja nie może zostać przeprowadzona. ";
-$a->strings["Your registration is pending approval by the site owner."] = "Twoja rejestracja oczekuje na zaakceptowanie przez właściciela witryny.";
-$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Możesz (opcjonalnie) wypełnić ten formularz za pośrednictwem OpenID, podając swój OpenID i klikając 'Register'.";
-$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Jeśli nie jesteś zaznajomiony z OpenID, zostaw to pole puste i uzupełnij resztę elementów.";
-$a->strings["Your OpenID (optional): "] = "Twój OpenID (opcjonalnie):";
-$a->strings["Include your profile in member directory?"] = "Czy dołączyć twój profil do katalogu członków?";
-$a->strings["Note for the admin"] = "Uwaga dla administratora";
-$a->strings["Leave a message for the admin, why you want to join this node"] = "Pozostaw wiadomość dla administratora, dlaczego chcesz dołączyć do tego węzła";
-$a->strings["Membership on this site is by invitation only."] = "Członkostwo na tej stronie możliwe tylko dzięki zaproszeniu.";
-$a->strings["Your invitation code: "] = "Twój kod zaproszenia:";
-$a->strings["Your Full Name (e.g. Joe Smith, real or real-looking): "] = "Twoje Imię i Nazwisko (np. Jan Kowalski, prawdziwe lub wyglądające na prawdziwe):";
-$a->strings["Your Email Address: (Initial information will be send there, so this has to be an existing address.)"] = "Twój adres e-mail: (Informacje początkowe zostaną wysłane tam, więc musi to być istniejący adres).";
-$a->strings["New Password:"] = "Nowe hasło:";
-$a->strings["Leave empty for an auto generated password."] = "Pozostaw puste dla wygenerowanego automatycznie hasła.";
-$a->strings["Confirm:"] = "Potwierdź:";
-$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>'."] = "Wybierz pseudonim profilu. Nazwa musi zaczynać się od znaku tekstowego. Twój adres profilu na tej stronie będzie wówczas '<strong>pseudonimem%s</strong>'.";
-$a->strings["Choose a nickname: "] = "Wybierz pseudonim:";
-$a->strings["Register"] = "Zarejestruj";
-$a->strings["Import your profile to this friendica instance"] = "Zaimportuj swój profil do tej instancji friendica";
-$a->strings["User deleted their account"] = "Użytkownik usunął swoje konto";
-$a->strings["On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups."] = "W twoim węźle Friendica użytkownik usunął swoje konto. Upewnij się, że ich dane zostały usunięte z kopii zapasowych.";
-$a->strings["The user id is %d"] = "Identyfikatorem użytkownika jest %d";
-$a->strings["Remove My Account"] = "Usuń moje konto";
-$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Spowoduje to całkowite usunięcie Twojego konta. Po wykonaniu tej czynności nie można jej cofnąć.";
-$a->strings["Please enter your password for verification:"] = "Wprowadź hasło w celu weryfikacji.";
-$a->strings["Account"] = "Konto";
-$a->strings["Display"] = "Wygląd";
-$a->strings["Social Networks"] = "Portale społecznościowe";
-$a->strings["Delegations"] = "Delegowanie";
-$a->strings["Connected apps"] = "Powiązane aplikacje";
-$a->strings["Remove account"] = "Usuń konto";
-$a->strings["Missing some important data!"] = "Brakuje ważnych danych!";
-$a->strings["Failed to connect with email account using the settings provided."] = "Połączenie z kontem email używając wybranych ustawień nie powiodło się.";
-$a->strings["Email settings updated."] = "Zaktualizowano ustawienia email.";
-$a->strings["Features updated"] = "Funkcje zaktualizowane";
-$a->strings["Relocate message has been send to your contacts"] = "Przeniesienie wiadomości zostało wysłane do Twoich kontaktów";
-$a->strings["Passwords do not match. Password unchanged."] = "Hasła nie pasują do siebie. Hasło niezmienione.";
-$a->strings["Empty passwords are not allowed. Password unchanged."] = "Puste hasła są niedozwolone. Hasło niezmienione.";
-$a->strings["The new password has been exposed in a public data dump, please choose another."] = "Nowe hasło zostało ujawnione w publicznym zrzucie danych, wybierz inne.";
-$a->strings["Wrong password."] = "Złe hasło.";
-$a->strings["Password changed."] = "Hasło zostało zmianione.";
-$a->strings["Password update failed. Please try again."] = "Aktualizacja hasła nie powiodła się. Proszę spróbować ponownie.";
-$a->strings[" Please use a shorter name."] = "Proszę użyć krótszej nazwy.";
-$a->strings[" Name too short."] = "Za krótka nazwa.";
-$a->strings["Wrong Password"] = "Złe hasło";
-$a->strings["Invalid email."] = "Niepoprawny e-mail.";
-$a->strings["Cannot change to that email."] = "Nie można zmienić tego e-maila.";
-$a->strings["Private forum has no privacy permissions. Using default privacy group."] = "Prywatne forum nie ma uprawnień do prywatności. Użyj domyślnej grupy prywatnej.";
-$a->strings["Private forum has no privacy permissions and no default privacy group."] = "Prywatne forum nie ma uprawnień do prywatności ani domyślnej grupy prywatności.";
-$a->strings["Settings updated."] = "Zaktualizowano ustawienia.";
-$a->strings["Add application"] = "Dodaj aplikację";
-$a->strings["Consumer Key"] = "Klucz klienta";
-$a->strings["Consumer Secret"] = "Tajny klucz klienta";
-$a->strings["Redirect"] = "Przekierowanie";
-$a->strings["Icon url"] = "Adres Url ikony";
-$a->strings["You can't edit this application."] = "Nie możesz edytować tej aplikacji.";
-$a->strings["Connected Apps"] = "Powiązane aplikacje";
-$a->strings["Edit"] = "Edytuj";
-$a->strings["Client key starts with"] = "Klucz klienta zaczyna się od";
-$a->strings["No name"] = "Bez nazwy";
-$a->strings["Remove authorization"] = "Odwołaj upoważnienie";
-$a->strings["No Addon settings configured"] = "Brak skonfigurowanych ustawień dodatków";
-$a->strings["Addon Settings"] = "Ustawienia Dodatków";
-$a->strings["Additional Features"] = "Dodatkowe funkcje";
-$a->strings["Diaspora"] = "Diaspora";
-$a->strings["enabled"] = "włączony";
-$a->strings["disabled"] = "wyłączony";
-$a->strings["Built-in support for %s connectivity is %s"] = "Wbudowane wsparcie dla %s łączność jest %s";
-$a->strings["GNU Social (OStatus)"] = "GNU Społeczny (OStatus)";
-$a->strings["Email access is disabled on this site."] = "Dostęp do e-maila nie jest w pełni sprawny na tej stronie";
-$a->strings["General Social Media Settings"] = "Ogólne ustawienia mediów społecznościowych";
-$a->strings["Disable Content Warning"] = "Wyłącz ostrzeżenie o treści";
-$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."] = "Użytkownicy w sieciach takich jak Mastodon lub Pleroma mogą ustawić pole ostrzeżenia o treści, które domyślnie zwijać będzie swój wpis. Powoduje wyłączenie automatycznego zwijania i ustawia ostrzeżenie o treści jako tytuł postu. Nie ma wpływu na żadne inne filtrowanie treści, które ostatecznie utworzyłeś.";
-$a->strings["Disable intelligent shortening"] = "Wyłącz inteligentne skracanie";
-$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."] = "Zwykle system próbuje znaleźć najlepszy link do dodania do skróconych postów. Jeśli ta opcja jest włączona, każdy skrócony wpis zawsze wskazuje oryginalny post znajomej osoby.";
-$a->strings["Automatically follow any GNU Social (OStatus) followers/mentioners"] = "Automatycznie podążaj za wszystkimi obserwatorami/rzecznikami GNU Społeczności (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."] = "Jeśli otrzymasz wiadomość od nieznanego użytkownika OStatus, ta opcja decyduje, co zrobić. Jeśli zostanie zaznaczone, dla każdego nieznanego użytkownika zostanie utworzony nowy kontakt.";
-$a->strings["Default group for OStatus contacts"] = "Domyślna grupa dla kontaktów OStatus";
-$a->strings["Your legacy GNU Social account"] = "Twoje starsze konto społecznościowe GNU";
-$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."] = "Jeśli podasz swoją starą nazwę konta GNU Social/Statusnet tutaj (w formacie user@domain.tld), twoje kontakty zostaną dodane automatycznie. Pole zostanie opróżnione po zakończeniu.";
-$a->strings["Repair OStatus subscriptions"] = "Napraw subskrypcje OStatus";
-$a->strings["Email/Mailbox Setup"] = "Ustawienia  emaila/skrzynki mailowej";
-$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Jeśli chcesz komunikować się z kontaktami e-mail za pomocą tej usługi (opcjonalnie), określ sposób łączenia się ze skrzynką pocztową.";
-$a->strings["Last successful email check:"] = "Ostatni sprawdzony e-mail:";
-$a->strings["IMAP server name:"] = "Nazwa serwera IMAP:";
-$a->strings["IMAP port:"] = "Port IMAP:";
-$a->strings["Security:"] = "Ochrona:";
-$a->strings["None"] = "Brak";
-$a->strings["Email login name:"] = "Nazwa logowania e-mail:";
-$a->strings["Email password:"] = "E-mail hasło:";
-$a->strings["Reply-to address:"] = "Adres zwrotny:";
-$a->strings["Send public posts to all email contacts:"] = "Wyślij publiczny post do wszystkich kontaktów e-mail";
-$a->strings["Action after import:"] = "Akcja po zaimportowaniu:";
-$a->strings["Mark as seen"] = "Oznacz jako przeczytane";
-$a->strings["Move to folder"] = "Przenieś do folderu";
-$a->strings["Move to folder:"] = "Przenieś do folderu:";
-$a->strings["%s - (Unsupported)"] = "%s - (Nieobsługiwane)";
-$a->strings["%s - (Experimental)"] = "%s- (Eksperymentalne)";
-$a->strings["Display Settings"] = "Ustawienia wyglądu";
-$a->strings["Display Theme:"] = "Wyświetl motyw:";
-$a->strings["Mobile Theme:"] = "Motyw dla urządzeń mobilnych:";
-$a->strings["Suppress warning of insecure networks"] = "Ukryj ostrzeżenie przed niebezpiecznymi sieciami";
-$a->strings["Should the system suppress the warning that the current group contains members of networks that can't receive non public postings."] = "System powinien pominąć ostrzeżenie, że bieżąca grupa zawiera członków sieci, którzy nie mogą otrzymywać komentarzy niepublicznych";
-$a->strings["Update browser every xx seconds"] = "Odświeżaj stronę co xx sekund";
-$a->strings["Minimum of 10 seconds. Enter -1 to disable it."] = "Minimum 10 sekund. Wprowadź -1, aby go wyłączyć.";
-$a->strings["Number of items to display per page:"] = "Liczba elementów do wyświetlenia na stronie:";
-$a->strings["Maximum of 100 items"] = "Maksymalnie 100 elementów";
-$a->strings["Number of items to display per page when viewed from mobile device:"] = "Liczba elementów do wyświetlenia na stronie podczas przeglądania z urządzenia mobilnego:";
-$a->strings["Don't show emoticons"] = "Nie pokazuj emotikonek";
-$a->strings["Calendar"] = "Kalendarz";
-$a->strings["Beginning of week:"] = "Początek tygodnia:";
-$a->strings["Don't show notices"] = "Nie pokazuj powiadomień";
-$a->strings["Infinite scroll"] = "Nieskończone przewijanie";
-$a->strings["Automatic updates only at the top of the network page"] = "Automatyczne aktualizacje tylko u góry strony sieci";
-$a->strings["When disabled, the network page is updated all the time, which could be confusing while reading."] = "Po wyłączeniu strona sieciowa jest cały czas aktualizowana, co może być mylące podczas czytania.";
-$a->strings["Bandwith Saver Mode"] = "Tryb oszczędzania przepustowości";
-$a->strings["When enabled, embedded content is not displayed on automatic updates, they only show on page reload."] = "Po włączeniu wbudowana zawartość nie jest wyświetlana w automatycznych aktualizacjach, wyświetlają się tylko przy przeładowaniu strony.";
-$a->strings["Smart Threading"] = "Inteligentne wątki";
-$a->strings["When enabled, suppress extraneous thread indentation while keeping it where it matters. Only works if threading is available and enabled."] = "Włączenie tej opcji powoduje pomijanie wcięcia wątków zewnętrznych, zachowując je w dowolnym miejscu. Działa tylko wtedy, gdy wątki są dostępne i włączone.";
-$a->strings["General Theme Settings"] = "Ogólne ustawienia motywu";
-$a->strings["Custom Theme Settings"] = "Niestandardowe ustawienia motywów";
-$a->strings["Content Settings"] = "Ustawienia zawartości";
-$a->strings["Theme settings"] = "Ustawienia motywu";
-$a->strings["Unable to find your profile. Please contact your admin."] = "Nie można znaleźć Twojego profilu. Skontaktuj się z administratorem.";
-$a->strings["Account Types"] = "Rodzaje kont";
-$a->strings["Personal Page Subtypes"] = "Podtypy osobistych stron";
-$a->strings["Community Forum Subtypes"] = "Podtypy społeczności forum";
-$a->strings["Account for a personal profile."] = "Konto dla profilu osobistego.";
-$a->strings["Account for an organisation that automatically approves contact requests as \"Followers\"."] = "Konto dla organizacji, która automatycznie zatwierdza prośby o kontakt jako \"Obserwatorzy\".";
-$a->strings["Account for a news reflector that automatically approves contact requests as \"Followers\"."] = "Konto dla reflektora wiadomości, który automatycznie zatwierdza prośby o kontakt jako \"Obserwatorzy\".";
-$a->strings["Account for community discussions."] = "Konto do dyskusji w społeczności.";
-$a->strings["Account for a regular personal profile that requires manual approval of \"Friends\" and \"Followers\"."] = "Konto dla zwykłego profilu osobistego, który wymaga ręcznej zgody \"Przyjaciół\" i \"Obserwatorów\".";
-$a->strings["Account for a public profile that automatically approves contact requests as \"Followers\"."] = "Konto dla profilu publicznego, który automatycznie zatwierdza prośby o kontakt jako \"Obserwatorzy\".";
-$a->strings["Automatically approves all contact requests."] = "Automatycznie zatwierdza wszystkie prośby o kontakt.";
-$a->strings["Account for a popular profile that automatically approves contact requests as \"Friends\"."] = "Konto popularnego profilu, które automatycznie zatwierdza prośby o kontakt jako \"Przyjaciele\".";
-$a->strings["Private Forum [Experimental]"] = "Prywatne Forum [Eksperymentalne]";
-$a->strings["Requires manual approval of contact requests."] = "Wymaga ręcznego zatwierdzania żądań kontaktów.";
-$a->strings["OpenID:"] = "OpenID:";
-$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Opcjonalnie) Pozwól zalogować się na to konto przy pomocy OpenID.";
-$a->strings["Publish your default profile in your local site directory?"] = "Opublikować Twój domyślny profil w Twoim lokalnym katalogu stron?";
-$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."] = "Twój profil zostanie opublikowany w globalnych katalogach friendica (np.<a href=\"%s\">%s</a>). Twój profil będzie widoczny publicznie.";
-$a->strings["Publish your default profile in the global social directory?"] = "Opublikować Twój domyślny profil w globalnym, społecznościowym katalogu?";
-$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."] = "Twój profil zostanie opublikowany w lokalnym katalogu tego <a href=\"%s\">węzła</a>. Dane Twojego profilu mogą być publicznie widoczne w zależności od ustawień systemu.";
-$a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Ukryć listę znajomych przed odwiedzającymi Twój profil?";
-$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"] = "Twoja lista kontaktów nie będzie wyświetlana na domyślnej stronie profilu. Możesz zdecydować o wyświetleniu listy kontaktów osobno dla każdego tworzonego dodatkowego profilu.";
-$a->strings["Hide your profile details from anonymous viewers?"] = "Ukryć dane Twojego profilu przed anonimowymi widzami?";
-$a->strings["Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Disables posting public messages to Diaspora and other networks."] = "Anonimowi użytkownicy zobaczą tylko Twoje zdjęcie profilowe, Twoją wyświetlaną nazwę i pseudonim, którego używasz na stronie profilu. Wyłącza wysyłanie publicznych wiadomości do Diaspory i innych sieci.";
-$a->strings["Allow friends to post to your profile page?"] = "Zezwalać znajomym na publikowanie postów na stronie Twojego profilu?";
-$a->strings["Your contacts may write posts on your profile wall. These posts will be distributed to your contacts"] = "Twoi znajomi mogą pisać posty na stronie Twojego profilu. Posty zostaną przesłane do Twoich kontaktów.";
-$a->strings["Allow friends to tag your posts?"] = "Zezwolić na oznaczanie Twoich postów przez znajomych?";
-$a->strings["Your contacts can add additional tags to your posts."] = "Twoje kontakty mogą dodawać do tagów dodatkowe posty.";
-$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Zezwolić na zaproponowanie Cię jako potencjalnego przyjaciela dla nowych członków?";
-$a->strings["If you like, Friendica may suggest new members to add you as a contact."] = "Jeśli chcesz, Friendica może zaproponować nowym członkom dodanie Cię jako kontakt.";
-$a->strings["Permit unknown people to send you private mail?"] = "Zezwolić nieznanym osobom na wysyłanie prywatnych wiadomości?";
-$a->strings["Friendica network users may send you private messages even if they are not in your contact list."] = "Użytkownicy sieci w serwisie Friendica mogą wysyłać prywatne wiadomości, nawet jeśli nie znajdują się one na liście kontaktów.";
-$a->strings["Profile is <strong>not published</strong>."] = "Profil <strong>nie jest opublikowany</strong>";
-$a->strings["Your Identity Address is <strong>'%s'</strong> or '%s'."] = "Twój adres tożsamości to <strong>'%s'</strong> lub '%s'.";
-$a->strings["Automatically expire posts after this many days:"] = "Posty wygasną automatycznie po następującej liczbie dni:";
-$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Pole puste, wiadomość nie wygaśnie. Niezapisane wpisy zostaną usunięte.";
-$a->strings["Advanced expiration settings"] = "Zaawansowane ustawienia wygasania";
-$a->strings["Advanced Expiration"] = "Zaawansowane wygasanie";
-$a->strings["Expire posts:"] = "Wygasające posty:";
-$a->strings["Expire personal notes:"] = "Wygasanie osobistych notatek:";
-$a->strings["Expire starred posts:"] = "Wygasaj posty oznaczone gwiazdką:";
-$a->strings["Expire photos:"] = "Wygasanie zdjęć:";
-$a->strings["Only expire posts by others:"] = "Wygaszaj tylko te posty, które zostały napisane przez inne osoby:";
-$a->strings["Account Settings"] = "Ustawienia konta";
-$a->strings["Password Settings"] = "Ustawienia hasła";
-$a->strings["Leave password fields blank unless changing"] = "Pozostaw pole hasła puste, chyba że chcesz je zmienić.";
-$a->strings["Current Password:"] = "Aktualne hasło:";
-$a->strings["Your current password to confirm the changes"] = "Wpisz aktualne hasło, aby potwierdzić zmiany";
-$a->strings["Password:"] = "Hasło:";
-$a->strings["Basic Settings"] = "Ustawienia podstawowe";
-$a->strings["Full Name:"] = "Imię i Nazwisko:";
-$a->strings["Email Address:"] = "Adres email:";
-$a->strings["Your Timezone:"] = "Twoja strefa czasowa:";
-$a->strings["Your Language:"] = "Twój język:";
-$a->strings["Set the language we use to show you friendica interface and to send you emails"] = "Wybierz język, którego używasz, aby pokazać interfejs użytkownika friendica i do wysłania Ci e-maili";
-$a->strings["Default Post Location:"] = "Domyślna lokalizacja wiadomości:";
-$a->strings["Use Browser Location:"] = "Użyj lokalizacji przeglądarki:";
-$a->strings["Security and Privacy Settings"] = "Ustawienia bezpieczeństwa i prywatności";
-$a->strings["Maximum Friend Requests/Day:"] = "Maksymalna dzienna liczba zaproszeń do grona przyjaciół:";
-$a->strings["(to prevent spam abuse)"] = "(aby zapobiec spamowaniu)";
-$a->strings["Default Post Permissions"] = "Domyślne prawa dostępu wiadomości";
-$a->strings["(click to open/close)"] = "(kliknij by otworzyć/zamknąć)";
-$a->strings["Default Private Post"] = "Domyślny Prywatny Wpis";
-$a->strings["Default Public Post"] = "Domyślny Publiczny Post";
-$a->strings["Default Permissions for New Posts"] = "Uprawnienia domyślne dla nowych postów";
-$a->strings["Maximum private messages per day from unknown people:"] = "Maksymalna liczba prywatnych wiadomości dziennie od nieznanych osób:";
-$a->strings["Notification Settings"] = "Ustawienia powiadomień";
-$a->strings["Send a notification email when:"] = "Wyślij powiadmonienia na email, kiedy:";
-$a->strings["You receive an introduction"] = "Otrzymałeś zaproszenie";
-$a->strings["Your introductions are confirmed"] = "Twoje zaproszenie jest potwierdzone";
-$a->strings["Someone writes on your profile wall"] = "Ktoś pisze na twoim profilu";
-$a->strings["Someone writes a followup comment"] = "Ktoś pisze komentarz nawiązujący.";
-$a->strings["You receive a private message"] = "Otrzymałeś prywatną wiadomość";
-$a->strings["You receive a friend suggestion"] = "Otrzymałeś propozycję od znajomych";
-$a->strings["You are tagged in a post"] = "Jesteś oznaczony tagiem w poście";
-$a->strings["You are poked/prodded/etc. in a post"] = "Jesteś zaczepiony/zaczepiona/itp. w poście";
-$a->strings["Activate desktop notifications"] = "Aktywuj powiadomienia na pulpicie";
-$a->strings["Show desktop popup on new notifications"] = "Pokaż wyskakujące okienko dla nowych powiadomień";
-$a->strings["Text-only notification emails"] = "E-maile z powiadomieniami tekstowymi";
-$a->strings["Send text only notification emails, without the html part"] = "Wysyłaj tylko e-maile z powiadomieniami tekstowymi, bez części html";
-$a->strings["Show detailled notifications"] = "Pokaż szczegółowe powiadomienia";
-$a->strings["Per default, notifications are condensed to a single notification per item. When enabled every notification is displayed."] = "Domyślne powiadomienia są skondensowane z jednym powiadomieniem dla każdego przedmiotu. Po włączeniu wyświetlane jest każde powiadomienie.";
-$a->strings["Advanced Account/Page Type Settings"] = "Zaawansowane ustawienia konta/rodzaju strony";
-$a->strings["Change the behaviour of this account for special situations"] = "Zmień zachowanie tego konta w sytuacjach specjalnych";
-$a->strings["Relocate"] = "Przeniesienie";
-$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."] = "Jeśli ten profil został przeniesiony z innego serwera, a niektóre z Twoich kontaktów nie otrzymają aktualizacji, spróbuj nacisnąć ten przycisk.";
-$a->strings["Resend relocate message to contacts"] = "Wyślij ponownie przenieść wiadomości do kontaktów";
-$a->strings["default"] = "standardowe";
-$a->strings["greenzero"] = "greenzero";
-$a->strings["purplezero"] = "purplezero";
-$a->strings["easterbunny"] = "Zajączek wielkanocny";
-$a->strings["darkzero"] = "darkzero";
-$a->strings["comix"] = "comix";
-$a->strings["slackr"] = "";
-$a->strings["Variations"] = "Zmiana";
-$a->strings["Top Banner"] = "Górny Baner";
-$a->strings["Resize image to the width of the screen and show background color below on long pages."] = "Zmień rozmiar obrazu na szerokość ekranu i pokaż kolor tła poniżej na długich stronach.";
-$a->strings["Full screen"] = "Pełny ekran";
-$a->strings["Resize image to fill entire screen, clipping either the right or the bottom."] = "Zmień rozmiar obrazu, aby wypełnić cały ekran, przycinając prawy lub dolny.";
-$a->strings["Single row mosaic"] = "Mozaika jednorzędowa";
-$a->strings["Resize image to repeat it on a single row, either vertical or horizontal."] = "Zmień rozmiar obrazu, aby powtórzyć go w jednym wierszu, w pionie lub w poziomie.";
-$a->strings["Mosaic"] = "Mozaika";
-$a->strings["Repeat image to fill the screen."] = "Powtórz obraz, aby wypełnić ekran.";
-$a->strings["Custom"] = "Niestandardowe";
-$a->strings["Note"] = "Uwaga";
-$a->strings["Check image permissions if all users are allowed to see the image"] = "Sprawdź uprawnienia do zdjęć, jeśli wszyscy użytkownicy mogą zobaczyć obraz";
-$a->strings["Select color scheme"] = "Wybierz schemat kolorów";
-$a->strings["Navigation bar background color"] = "Kolor tła paska nawigacyjnego";
-$a->strings["Navigation bar icon color "] = "Kolor ikony paska nawigacyjnego";
-$a->strings["Link color"] = "Kolor łączy";
-$a->strings["Set the background color"] = "Ustaw kolor tła";
-$a->strings["Content background opacity"] = "Nieprzezroczystość tła treści";
-$a->strings["Set the background image"] = "Ustaw obraz tła";
-$a->strings["Background image style"] = "Styl tła";
-$a->strings["Login page background image"] = "Obraz tła strony logowania";
-$a->strings["Login page background color"] = "Kolor tła strony logowania";
-$a->strings["Leave background image and color empty for theme defaults"] = "Pozostaw obraz tła i kolor pusty dla domyślnych ustawień kompozycji";
-$a->strings["Guest"] = "Gość";
-$a->strings["Visitor"] = "Odwiedzający";
-$a->strings["Logout"] = "Wyloguj się";
-$a->strings["End this session"] = "Zakończ sesję";
-$a->strings["Your posts and conversations"] = "Twoje posty i rozmowy";
-$a->strings["Your profile page"] = "Twoja strona profilowa";
-$a->strings["Your photos"] = "Twoje zdjęcia";
-$a->strings["Videos"] = "Filmy";
-$a->strings["Your videos"] = "Twoje filmy";
-$a->strings["Your events"] = "Twoje wydarzenia";
-$a->strings["Conversations from your friends"] = "Rozmowy Twoich przyjaciół";
-$a->strings["Events and Calendar"] = "Wydarzenia i kalendarz";
-$a->strings["Private mail"] = "Prywatne maile";
-$a->strings["Account settings"] = "Ustawienia konta";
-$a->strings["Manage/edit friends and contacts"] = "Zarządzaj listą przyjaciół i kontaktami";
-$a->strings["Alignment"] = "Wyrównanie";
-$a->strings["Left"] = "Lewo";
-$a->strings["Center"] = "Środek";
-$a->strings["Color scheme"] = "Zestaw kolorów";
-$a->strings["Posts font size"] = "Rozmiar czcionki postów";
-$a->strings["Textareas font size"] = "Rozmiar czcionki Textareas";
-$a->strings["Comma separated list of helper forums"] = "Lista pomocników oddzielona przecinkami";
-$a->strings["don't show"] = "nie pokazuj";
-$a->strings["show"] = "pokaż";
-$a->strings["Set style"] = "Ustaw styl";
-$a->strings["Community Pages"] = "Strony społeczności";
-$a->strings["Community Profiles"] = "Profile społeczności";
-$a->strings["Help or @NewHere ?"] = "Pomóż lub @NowyTutaj?";
-$a->strings["Connect Services"] = "Połączone serwisy";
-$a->strings["Find Friends"] = "Znajdź znajomych";
-$a->strings["Last users"] = "Ostatni użytkownicy";
-$a->strings["Find People"] = "Znajdź ludzi";
-$a->strings["Enter name or interest"] = "Wpisz nazwę lub zainteresowanie";
-$a->strings["Examples: Robert Morgenstein, Fishing"] = "Przykład: Jan Kowalski, Wędkarstwo";
-$a->strings["Similar Interests"] = "Podobne zainteresowania";
-$a->strings["Random Profile"] = "Domyślny profil";
-$a->strings["Invite Friends"] = "Zaproś znajomych";
-$a->strings["Local Directory"] = "Katalog lokalny";
-$a->strings["External link to forum"] = "Zewnętrzny link do forum";
-$a->strings["Quick Start"] = "Szybki start";
-$a->strings["Error decoding account file"] = "Błąd podczas odczytu pliku konta";
-$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Błąd! Brak danych wersji w pliku! To nie jest plik konta Friendica?";
-$a->strings["User '%s' already exists on this server!"] = "Użytkownik '%s' już istnieje na tym serwerze!";
-$a->strings["User creation error"] = "Błąd tworzenia użytkownika";
-$a->strings["User profile creation error"] = "Błąd tworzenia profilu użytkownika";
-$a->strings["%d contact not imported"] = [
-	0 => "Nie zaimportowano %d kontaktu.",
-	1 => "Nie zaimportowano %d kontaktów.",
-	2 => "Nie zaimportowano %d kontaktów.",
-	3 => "%dkontakty nie zostały zaimportowane ",
-];
-$a->strings["Done. You can now login with your username and password"] = "Gotowe. Możesz teraz zalogować się, podając swoją nazwę użytkownika i hasło.";
-$a->strings["Post to Email"] = "Prześlij e-mailem";
-$a->strings["Hide your profile details from unknown viewers?"] = "Ukryć szczegóły twojego profilu przed nieznajomymi?";
-$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Wtyczki są wyłączone, ponieważ \"%s\" jest włączone.";
-$a->strings["Visible to everybody"] = "Widoczny dla wszystkich";
-$a->strings["Close"] = "Zamknij";
-$a->strings["Enter new password: "] = "Wprowadź nowe hasło:";
-$a->strings["Password can't be empty"] = "Hasło nie może być puste";
-$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "Nie można znaleźć żadnego wpisu kontaktu zarchiwizowanego dla tego adresu URL (%s)";
-$a->strings["The contact entries have been archived"] = "Wpisy kontaktów zostały zarchiwizowane";
-$a->strings["System"] = "System";
-$a->strings["Home"] = "Strona domowa";
-$a->strings["Introductions"] = "Zapoznanie";
-$a->strings["%s commented on %s's post"] = "%s skomentował wpis %s";
-$a->strings["%s created a new post"] = "%s dodał nowy wpis";
-$a->strings["%s liked %s's post"] = "%s polubił wpis %s";
-$a->strings["%s disliked %s's post"] = "%s nie lubi tych %s postów";
-$a->strings["%s is attending %s's event"] = "%suczestniczy %sw wydarzeniu ";
-$a->strings["%s is not attending %s's event"] = "%snie uczestniczy %s w wydarzeniu ";
-$a->strings["%s may attend %s's event"] = "%smoże uczestniczyć %s w wydarzeniu";
-$a->strings["%s is now friends with %s"] = "%s jest teraz znajomym %s";
-$a->strings["Friend Suggestion"] = "Propozycja znajomych";
-$a->strings["Friend/Connect Request"] = "Prośba o dodanie do przyjaciół/powiązanych";
-$a->strings["New Follower"] = "Nowy obserwujący";
+$a->strings["Photo Albums"] = "Albumy zdjęć";
+$a->strings["Recent Photos"] = "Ostatnio dodane zdjęcia";
+$a->strings["Upload New Photos"] = "Wyślij nowe zdjęcie";
+$a->strings["Contact information unavailable"] = "Informacje kontaktowe są niedostępne.";
+$a->strings["Album not found."] = "Album nie znaleziony";
+$a->strings["Delete Album"] = "Usuń album";
+$a->strings["Do you really want to delete this photo album and all its photos?"] = "Czy na pewno chcesz usunąć ten album i wszystkie zdjęcia z tego albumu?";
+$a->strings["Delete Photo"] = "Usuń zdjęcie";
+$a->strings["Do you really want to delete this photo?"] = "Czy na pewno chcesz usunąć to zdjęcie ?";
+$a->strings["a photo"] = "zdjęcie";
+$a->strings["%1\$s was tagged in %2\$s by %3\$s"] = "%1\$szostał oznaczony tagiem %2\$s przez %3\$s";
+$a->strings["Image upload didn't complete, please try again"] = "Przesyłanie zdjęć nie zostało zakończone, spróbuj ponownie";
+$a->strings["Image file is missing"] = "Brak pliku obrazu";
+$a->strings["Server can't accept new file upload at this time, please contact your administrator"] = "Serwer nie może teraz przyjąć nowego pliku, skontaktuj się z administratorem";
+$a->strings["Image file is empty."] = "Plik obrazka jest pusty.";
+$a->strings["No photos selected"] = "Nie zaznaczono zdjęć";
+$a->strings["Upload Photos"] = "Prześlij zdjęcia";
+$a->strings["New album name: "] = "Nazwa nowego albumu:";
+$a->strings["or select existing album:"] = "lub wybierz istniejący album:";
+$a->strings["Do not show a status post for this upload"] = "Nie pokazuj statusu postów dla tego wysłania";
+$a->strings["Edit Album"] = "Edytuj album";
+$a->strings["Show Newest First"] = "Pokaż najpierw najnowsze";
+$a->strings["Show Oldest First"] = "Pokaż najpierw najstarsze";
+$a->strings["View Photo"] = "Zobacz zdjęcie";
+$a->strings["Permission denied. Access to this item may be restricted."] = "Odmowa dostępu. Dostęp do tych danych może być ograniczony.";
+$a->strings["Photo not available"] = "Zdjęcie niedostępne";
+$a->strings["View photo"] = "Zobacz zdjęcie";
+$a->strings["Edit photo"] = "Edytuj zdjęcie";
+$a->strings["Use as profile photo"] = "Ustaw jako zdjęcie profilowe";
+$a->strings["Private Message"] = "Wiadomość prywatna";
+$a->strings["View Full Size"] = "Zobacz w pełnym rozmiarze";
+$a->strings["Tags: "] = "Tagi:";
+$a->strings["[Remove any tag]"] = "[Usuń dowolny tag]";
+$a->strings["New album name"] = "Nazwa nowego albumu";
+$a->strings["Caption"] = "Zawartość";
+$a->strings["Add a Tag"] = "Dodaj tag";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Przykładowo: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
+$a->strings["Do not rotate"] = "Nie obracaj";
+$a->strings["Rotate CW (right)"] = "Obróć CW (w prawo)";
+$a->strings["Rotate CCW (left)"] = "Obróć CCW (w lewo)";
+$a->strings["I like this (toggle)"] = "Lubię to (zmień)";
+$a->strings["I don't like this (toggle)"] = "Nie lubię tego (zmień)";
+$a->strings["Comment"] = "Komentarz";
+$a->strings["Map"] = "Mapa";
+$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>"] = "<span><a href=\"%s\" target=\"_blank\" class=\"shared-wall-item-name\">%s</a>napisał następujący<a href=\"%s\" target=\"_blank\">post</a>";
+$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<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>"] = "<span><a href=\"%s\" target=\"_blank\">%s</a>napisał następujący<a href=\"%s\" target=\"_blank\">post</a>";
+$a->strings["Update %s failed. See error logs."] = "Aktualizacja %s nie powiodła się. Zobacz dziennik błędów.";
+$a->strings["There are no tables on MyISAM."] = "W MyISAM nie ma tabel.";
+$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\t\tDeweloperzy friendica wydali niedawno aktualizację %s,\n\t\t\t\tale podczas próby instalacji, coś poszło nie tak.\n\t\t\t\tZostanie to naprawione wkrótce i nie mogę tego zrobić sam. Proszę skontaktować się z \n\t\t\t\tprogramistami friendica, jeśli nie możesz mi pomóc na własną rękę. Moja baza danych może być nieprawidłowa.";
+$a->strings["The error message is\n[pre]%s[/pre]"] = "Komunikat o błędzie jest \n[pre]%s[/ pre]";
+$a->strings["\nError %d occurred during database update:\n%s\n"] = "\nWystąpił błąd %d podczas aktualizacji bazy danych:\n%s\n";
+$a->strings["Errors encountered performing database changes: "] = "Napotkane błędy powodujące zmiany w bazie danych:";
+$a->strings["%s: Database update"] = "%s: Aktualizacja bazy danych:";
+$a->strings["%s: updating %s table."] = "%s: aktualizowanie %s tabeli.";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "Nie można znaleźć wersji PHP komendy w serwerze 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>"] = "Jeśli nie masz zainstalowanej na serwerze wersji PHP z wiersza poleceń, nie będziesz mógł uruchomić przetwarzania w tle. Zobacz <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Konfiguracja pracownika'</a>";
+$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>"] = "Jeśli nie masz zainstalowanej na serwerze wersji PHP z wierszem poleceń, nie będziesz mógł uruchomić przetwarzania w tle. Zobacz <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Konfiguracja pracownika'</a>";
 $a->strings["PHP executable path"] = "Ścieżka wykonywalna PHP";
 $a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Wprowadź pełną ścieżkę do pliku wykonywalnego php. Możesz pozostawić to pole puste, aby kontynuować instalację.";
 $a->strings["Command line PHP"] = "Linia komend PHP";
@@ -1838,11 +1832,11 @@ $a->strings["Error: mb_string PHP module required but not installed."] = "Błąd
 $a->strings["Error: iconv PHP module required but not installed."] = "Błąd: wymagany moduł PHP iconv, ale nie zainstalowany.";
 $a->strings["Error: POSIX PHP module required but not installed."] = "Błąd: wymagany moduł POSIX PHP, ale nie zainstalowany.";
 $a->strings["Error, XML PHP module required but not installed."] = "Błąd, wymagany moduł XML PHP, ale nie zainstalowany.";
-$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."] = "Instalator WWW musi być w stanie utworzyć plik o nazwie \". Htconfig.php\"  i nie jest w stanie tego zrobić.";
+$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."] = "Instalator internetowy musi mieć możliwość utworzenia pliku o nazwie \"local.ini.php\" w folderze \"config\" na serwerze internetowym i nie może tego zrobić.";
 $a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "Jest to najczęściej ustawienie uprawnień, ponieważ serwer sieciowy może nie być w stanie zapisywać plików w folderze - nawet jeśli możesz.";
-$a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Pod koniec tej procedury podamy Ci tekst do zapisania w pliku o nazwie .htconfig.php w twoim górnym folderze 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."] = "Po zakończeniu tej procedury damy ci tekst do zapisania w pliku o nazwie local.ini.php w twoim folderze \"config\" Friendica.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternatywnie można pominąć tę procedurę i wykonać ręczną instalację. Proszę zobaczyć plik 'INSTALL.txt' z instrukcjami.";
-$a->strings[".htconfig.php is writable"] = ".htconfig.php jest zapisywalny";
+$a->strings["config/local.ini.php is writable"] = "config/local.ini.php jest zapisywalny";
 $a->strings["Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Friendica używa silnika szablonów Smarty3 do renderowania swoich widoków. Smarty3 kompiluje szablony do PHP, aby przyspieszyć renderowanie.";
 $a->strings["In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder."] = "Aby przechowywać te skompilowane szablony, serwer WWW musi mieć dostęp do zapisu do katalogu view/smarty3/ w folderze najwyższego poziomu Friendica.";
 $a->strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Upewnij się, że użytkownik, na którym działa serwer WWW (np. www-data), ma prawo do zapisu do tego folderu.";
@@ -1854,6 +1848,108 @@ $a->strings["Url rewrite is working"] = "Działający adres URL";
 $a->strings["ImageMagick PHP extension is not installed"] = "Rozszerzenie PHP ImageMagick nie jest zainstalowane";
 $a->strings["ImageMagick PHP extension is installed"] = "Rozszerzenie PHP ImageMagick jest zainstalowane";
 $a->strings["ImageMagick supports GIF"] = "ImageMagick obsługuje GIF";
+$a->strings["Post to Email"] = "Prześlij e-mailem";
+$a->strings["Hide your profile details from unknown viewers?"] = "Ukryć szczegóły twojego profilu przed nieznajomymi?";
+$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Wtyczki są wyłączone, ponieważ \"%s\" jest włączone.";
+$a->strings["Visible to everybody"] = "Widoczny dla wszystkich";
+$a->strings["Close"] = "Zamknij";
+$a->strings["Could not find any unarchived contact entry for this URL (%s)"] = "Nie można znaleźć żadnego wpisu kontaktu zarchiwizowanego dla tego adresu URL (%s)";
+$a->strings["The contact entries have been archived"] = "Wpisy kontaktów zostały zarchiwizowane";
+$a->strings["Execute pending post updates."] = "Wykonaj oczekujące aktualizacje postów.";
+$a->strings["All pending post updates are done."] = "Wszystkie oczekujące aktualizacje postów są gotowe.";
+$a->strings["Enter new password: "] = "Wprowadź nowe hasło:";
+$a->strings["Password can't be empty"] = "Hasło nie może być puste";
+$a->strings["System"] = "System";
+$a->strings["Home"] = "Strona domowa";
+$a->strings["Introductions"] = "Zapoznanie";
+$a->strings["%s commented on %s's post"] = "%s skomentował wpis %s";
+$a->strings["%s created a new post"] = "%s dodał nowy wpis";
+$a->strings["%s liked %s's post"] = "%s polubił wpis %s";
+$a->strings["%s disliked %s's post"] = "%s nie lubi tych %s postów";
+$a->strings["%s is attending %s's event"] = "%s uczestniczy %sw wydarzeniu ";
+$a->strings["%s is not attending %s's event"] = "%s nie uczestniczy %s w wydarzeniu ";
+$a->strings["%s may attend %s's event"] = "%s może uczestniczyć %s w wydarzeniu";
+$a->strings["%s is now friends with %s"] = "%s jest teraz znajomym %s";
+$a->strings["Friend Suggestion"] = "Propozycja znajomych";
+$a->strings["Friend/Connect Request"] = "Prośba o dodanie do przyjaciół/powiązanych";
+$a->strings["New Follower"] = "Nowy obserwujący";
+$a->strings["Error decoding account file"] = "Błąd podczas odczytu pliku konta";
+$a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Błąd! Brak danych wersji w pliku! To nie jest plik konta Friendica?";
+$a->strings["User '%s' already exists on this server!"] = "Użytkownik '%s' już istnieje na tym serwerze!";
+$a->strings["User creation error"] = "Błąd tworzenia użytkownika";
+$a->strings["User profile creation error"] = "Błąd tworzenia profilu użytkownika";
+$a->strings["%d contact not imported"] = [
+	0 => "Nie zaimportowano %d kontaktu.",
+	1 => "Nie zaimportowano %d kontaktów.",
+	2 => "Nie zaimportowano %d kontaktów.",
+	3 => "%d kontakty nie zostały zaimportowane ",
+];
+$a->strings["Done. You can now login with your username and password"] = "Gotowe. Możesz teraz zalogować się, podając swoją nazwę użytkownika i hasło.";
+$a->strings["(no subject)"] = "(bez tematu)";
+$a->strings["This entry was edited"] = "Ten wpis został zedytowany";
+$a->strings["Delete globally"] = "Usuń globalnie";
+$a->strings["Remove locally"] = "Usuń lokalnie";
+$a->strings["save to folder"] = "zapisz w folderze";
+$a->strings["I will attend"] = "Będę uczestniczyć";
+$a->strings["I will not attend"] = "Nie będę uczestniczyć";
+$a->strings["I might attend"] = "Mogę wziąć udział";
+$a->strings["ignore thread"] = "zignoruj ​​wątek";
+$a->strings["unignore thread"] = "odignoruj ​​wątek";
+$a->strings["toggle ignore status"] = "przełącz status ignorowania";
+$a->strings["add star"] = "dodaj gwiazdkę";
+$a->strings["remove star"] = "anuluj gwiazdkę";
+$a->strings["toggle star status"] = "włącz status gwiazdy";
+$a->strings["starred"] = "gwiazdką";
+$a->strings["add tag"] = "dodaj tag";
+$a->strings["like"] = "lubię to";
+$a->strings["dislike"] = "nie lubię tego";
+$a->strings["Share this"] = "Udostępnij to";
+$a->strings["share"] = "udostępnij";
+$a->strings["to"] = "do";
+$a->strings["via"] = "przez";
+$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
+$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
+$a->strings["%d comment"] = [
+	0 => " %d komentarz",
+	1 => " %d komentarzy",
+	2 => " %d komentarzy",
+	3 => " %d komentarzy",
+];
+$a->strings["Bold"] = "Pogrubienie";
+$a->strings["Italic"] = "Kursywa";
+$a->strings["Underline"] = "Podkreślenie";
+$a->strings["Quote"] = "Cytat";
+$a->strings["Code"] = "Kod";
+$a->strings["Image"] = "Obraz";
+$a->strings["Link"] = "Link";
+$a->strings["Video"] = "Video";
+$a->strings["Delete this item?"] = "Usunąć ten element?";
+$a->strings["show fewer"] = "Pokaż mniej";
+$a->strings["No system theme config value set."] = "Nie ustawiono wartości konfiguracyjnej zestawu tematycznego.";
+$a->strings["Logged out."] = "Wylogowano.";
+$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Napotkaliśmy problem podczas logowania z podanym przez nas identyfikatorem OpenID. Sprawdź poprawną pisownię identyfikatora.";
+$a->strings["The error message was:"] = "Komunikat o błędzie:";
+$a->strings["Create a New Account"] = "Załóż nowe konto";
+$a->strings["Password: "] = "Hasło:";
+$a->strings["Remember me"] = "Zapamiętaj mnie";
+$a->strings["Or login using OpenID: "] = "Lub zaloguj się korzystając z OpenID:";
+$a->strings["Forgot your password?"] = "Zapomniałeś swojego hasła?";
+$a->strings["Website Terms of Service"] = "Warunki korzystania z witryny";
+$a->strings["terms of service"] = "warunki użytkowania";
+$a->strings["Website Privacy Policy"] = "Polityka Prywatności Witryny";
+$a->strings["privacy policy"] = "polityka prywatności";
+$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."] = "W momencie rejestracji oraz w celu zapewnienia komunikacji między kontem użytkownika, a jego kontaktami, użytkownik musi podać nazwę wyświetlaną (pseudonim), nazwę użytkownika (przydomek) i działający adres e-mail. Nazwy będą dostępne na stronie profilu konta dla każdego odwiedzającego stronę, nawet jeśli inne szczegóły profilu nie zostaną wyświetlone. Adres e-mail będzie używany tylko do wysyłania powiadomień użytkownika o interakcjach, ale nie będzie wyświetlany w widoczny sposób. Lista kont w katalogu użytkownika węzła lub globalnym katalogu użytkownika jest opcjonalna i może być kontrolowana w ustawieniach użytkownika, nie jest konieczna do komunikacji.";
+$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."] = "Te dane są wymagane do komunikacji i są przekazywane do węzłów partnerów komunikacyjnych i są tam przechowywane. Użytkownicy mogą wprowadzać dodatkowe prywatne dane, które mogą być przesyłane na konta partnerów komunikacyjnych.";
+$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."] = "W dowolnym momencie zalogowany użytkownik może wyeksportować dane swojego konta z <a href=\"%1\$s/settings/uexport\">ustawień konta</a>. Jeśli użytkownik chce usunąć swoje konto, może to zrobić w<a href=\"%1\$s/removeme\">%1\$s / Usuń mnie</a>. Usunięcie konta będzie trwałe. Skasowanie danych będzie również wymagane od węzłów partnerów komunikacyjnych.";
+$a->strings["Privacy Statement"] = "Oświadczenie o prywatności";
+$a->strings["%s is now following %s."] = "%sjest teraz następujące %s. ";
+$a->strings["following"] = "następujący";
+$a->strings["%s stopped following %s."] = "%sprzestał śledzić %s. ";
+$a->strings["stopped following"] = "przestał śledzić";
+$a->strings["%s's birthday"] = "%s urodzin";
+$a->strings["Happy Birthday %s"] = "Urodziny %s";
+$a->strings["Sharing notification from Diaspora network"] = "Wspólne powiadomienie z sieci Diaspora";
+$a->strings["Attachments:"] = "Załączniki:";
 $a->strings["Birthday:"] = "Urodziny:";
 $a->strings["YYYY-MM-DD or MM-DD"] = "RRRR-MM-DD lub MM-DD";
 $a->strings["never"] = "nigdy";
@@ -1870,18 +1966,120 @@ $a->strings["minutes"] = "minuty";
 $a->strings["second"] = "sekunda";
 $a->strings["seconds"] = "sekundy";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s temu";
-$a->strings["view full size"] = "Zobacz w pełnym wymiarze";
-$a->strings["Image/photo"] = "Obrazek/zdjęcie";
-$a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"%1\$s\" target=\"_blank\">%2\$s</a>%3\$s";
-$a->strings["$1 wrote:"] = "$1 napisał:";
-$a->strings["Encrypted content"] = "Szyfrowana treść";
-$a->strings["Invalid source protocol"] = "Nieprawidłowy protokół źródłowy";
-$a->strings["Invalid link protocol"] = "Niepoprawny link protokołu";
-$a->strings["Embedding disabled"] = "Osadzanie wyłączone";
-$a->strings["Embedded content"] = "Osadzona zawartość";
-$a->strings["Export"] = "Eksport";
-$a->strings["Export calendar as ical"] = "Wyeksportuj kalendarz jako ical";
-$a->strings["Export calendar as csv"] = "Eksportuj kalendarz jako csv";
+$a->strings["[no subject]"] = "[bez tematu]";
+$a->strings["Drop Contact"] = "Upuść kontakt";
+$a->strings["Organisation"] = "Organizacja";
+$a->strings["News"] = "Aktualności";
+$a->strings["Forum"] = "Forum";
+$a->strings["Connect URL missing."] = "Brak adresu URL połączenia.";
+$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Nie można dodać kontaktu. Sprawdź odpowiednie poświadczenia sieciowe na stronie Ustawienia -> Sieci społecznościowe.";
+$a->strings["This site is not configured to allow communications with other networks."] = "Ta strona nie jest skonfigurowana do pozwalania na komunikację z innymi sieciami";
+$a->strings["No compatible communication protocols or feeds were discovered."] = "Nie znaleziono żadnych kompatybilnych protokołów komunikacyjnych ani źródeł.";
+$a->strings["The profile address specified does not provide adequate information."] = "Dany adres profilu nie dostarcza odpowiednich informacji.";
+$a->strings["An author or name was not found."] = "Autor lub nazwa nie zostało znalezione.";
+$a->strings["No browser URL could be matched to this address."] = "Przeglądarka WWW nie może odnaleźć podanego adresu";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Nie można dopasować @-stylu Adres identyfikacyjny ze znanym protokołem lub kontaktem e-mail.";
+$a->strings["Use mailto: in front of address to force email check."] = "Użyj mailto: przed adresem, aby wymusić sprawdzanie poczty e-mail.";
+$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Określony adres profilu należy do sieci, która została wyłączona na tej stronie.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Profil ograniczony. Ta osoba będzie niezdolna do odbierania osobistych powiadomień od ciebie.";
+$a->strings["Unable to retrieve contact information."] = "Nie można otrzymać informacji kontaktowych";
+$a->strings["Starts:"] = "Rozpoczęcie:";
+$a->strings["Finishes:"] = "Zakończenie:";
+$a->strings["all-day"] = "cały dzień";
+$a->strings["Jun"] = "cze";
+$a->strings["Sept"] = "wrz";
+$a->strings["No events to display"] = "Brak wydarzeń do wyświetlenia";
+$a->strings["l, F j"] = "l, F j";
+$a->strings["Edit event"] = "Edytuj wydarzenie";
+$a->strings["Duplicate event"] = "Zduplikowane zdarzenie";
+$a->strings["Delete event"] = "Usuń wydarzenie";
+$a->strings["D g:i A"] = "D g:i A";
+$a->strings["g:i A"] = "g:i A";
+$a->strings["Show map"] = "Pokaż mapę";
+$a->strings["Hide map"] = "Ukryj mapę";
+$a->strings["Login failed"] = "Logowanie nieudane";
+$a->strings["Not enough information to authenticate"] = "Za mało informacji do uwierzytelnienia";
+$a->strings["An invitation is required."] = "Wymagane zaproszenie.";
+$a->strings["Invitation could not be verified."] = "Zaproszenie niezweryfikowane.";
+$a->strings["Invalid OpenID url"] = "Nieprawidłowy adres url OpenID";
+$a->strings["Please enter the required information."] = "Wprowadź wymagane informacje";
+$a->strings["Please use a shorter name."] = "Użyj dłuższej nazwy.";
+$a->strings["Name too short."] = "Nazwa jest za krótka.";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Wydaje mi się, że to nie jest twoje pełne imię (pierwsze imię) i nazwisko.";
+$a->strings["Your email domain is not among those allowed on this site."] = "Twoja domena internetowa nie jest obsługiwana na tej stronie.";
+$a->strings["Not a valid email address."] = "Niepoprawny adres e mail..";
+$a->strings["The nickname was blocked from registration by the nodes admin."] = "Pseudonim został zablokowany przed rejestracją przez administratora węzłów.";
+$a->strings["Cannot use that email."] = "Nie możesz użyć tego e-maila. ";
+$a->strings["Your nickname can only contain a-z, 0-9 and _."] = "Twój pseudonim może zawierać tylko a-z, 0-9 i _.";
+$a->strings["Nickname is already registered. Please choose another."] = "Ten login jest zajęty. Wybierz inny.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "POWAŻNY BŁĄD: niepowodzenie podczas tworzenia kluczy zabezpieczeń.";
+$a->strings["An error occurred during registration. Please try again."] = "Wystąpił bład podczas rejestracji, Spróbuj ponownie.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Wystąpił błąd podczas tworzenia profilu. Spróbuj ponownie.";
+$a->strings["An error occurred creating your self contact. Please try again."] = "Wystąpił błąd podczas tworzenia własnego kontaktu. Proszę spróbuj ponownie.";
+$a->strings["Friends"] = "Przyjaciele";
+$a->strings["An error occurred creating your default contact group. Please try again."] = "Wystąpił błąd podczas tworzenia domyślnej grupy kontaktów. Proszę spróbuj ponownie.";
+$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\tSzanowny Użytkowniku  %1\$s, \n\t\t\t\tDziękujemy za rejestrację na stronie %2\$s. Twoje konto czeka na zatwierdzenie przez administratora.";
+$a->strings["Registration at %s"] = "Rejestracja w %s";
+$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\n\t\t\tSzanowny Użytkowniku  %1\$s, \n\t\t\t\tDziękujemy za rejestrację na stronie %2\$s. Twoje konto zostało utworzone.";
+$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\n\t\t\tDane logowania są następuje:\n\t\t\tLokalizacja witryny:\t%3\$s\n\t\t\tNazwa użytkownika:\t\t%1\$s\n\t\t\tHasło:\t\t%5\$s\n\n\t\t\tPo zalogowaniu możesz zmienić hasło do swojego konta na stronie \"Ustawienia\".\n \t\t\tProszę poświęć chwilę, aby przejrzeć inne ustawienia konta na tej stronie.\n\n\t\t\tMożesz również dodać podstawowe informacje do swojego domyślnego profilu\n\t\t\t(na stronie \"Profil użytkownika\"), aby inne osoby mogły łatwo Cię znaleźć.\n\n\t\t\tZalecamy ustawienie imienia i nazwiska, dodanie zdjęcia profilowego,\n\t\t\tdodanie niektórych \"słów kluczowych\" profilu (bardzo przydatne w nawiązywaniu nowych znajomości) \n\t\t\ti być może gdzie mieszkasz; jeśli nie chcesz podać więcej szczegów.\n\n\t\t\tW pełni szanujemy Twoje prawo do prywatności i żaden z tych elementów nie jest konieczny.\n\t\t\tJeśli jesteś nowy i nie znasz tutaj nikogo, oni mogą ci pomóc\n\t\t\tmożesz zdobyć nowych interesujących przyjaciół.\n\n\t\t\tJeśli kiedykolwiek zechcesz usunąć swoje konto, możesz to zrobić na stronie %3\$s/removeme\n\n\t\t\tDziękujemy i Zapraszamy do %2\$s.";
+$a->strings["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."] = "Skasowana grupa o tej nazwie została przywrócona. Istniejące uprawnienia do pozycji <strong>mogą</strong> dotyczyć tej grupy i wszystkich przyszłych członków. Jeśli nie jest to zamierzone, utwórz inną grupę o innej nazwie.";
+$a->strings["Default privacy group for new contacts"] = "Domyślne ustawienia prywatności dla nowych kontaktów";
+$a->strings["Everybody"] = "Wszyscy";
+$a->strings["edit"] = "edytuj";
+$a->strings["Edit group"] = "Edytuj grupy";
+$a->strings["Create a new group"] = "Stwórz nową grupę";
+$a->strings["Edit groups"] = "Edytuj grupy";
+$a->strings["Requested account is not available."] = "Żądane konto jest niedostępne.";
+$a->strings["Edit profile"] = "Edytuj profil";
+$a->strings["Atom feed"] = "Kanał Atom";
+$a->strings["Manage/edit profiles"] = "Zarządzaj profilami";
+$a->strings["g A l F d"] = "g A I F d";
+$a->strings["F d"] = "F d";
+$a->strings["[today]"] = "[dziś]";
+$a->strings["Birthday Reminders"] = "Przypomnienia o urodzinach";
+$a->strings["Birthdays this week:"] = "Urodziny w tym tygodniu:";
+$a->strings["[No description]"] = "[Brak opisu]";
+$a->strings["Event Reminders"] = "Przypominacze wydarzeń";
+$a->strings["Upcoming events the next 7 days:"] = "Nadchodzące wydarzenia w ciągu następnych 7 dni:";
+$a->strings["Member since:"] = "Członek od:";
+$a->strings["j F, Y"] = "d M, R";
+$a->strings["j F"] = "d M";
+$a->strings["Age:"] = "Wiek:";
+$a->strings["for %1\$d %2\$s"] = "od %1\$d %2\$s";
+$a->strings["Religion:"] = "Religia:";
+$a->strings["Hobbies/Interests:"] = "Hobby/Zainteresowania:";
+$a->strings["Contact information and Social Networks:"] = "Informacje kontaktowe i sieci społeczne";
+$a->strings["Musical interests:"] = "Zainteresowania muzyczne:";
+$a->strings["Books, literature:"] = "Książki, literatura:";
+$a->strings["Television:"] = "Telewizja:";
+$a->strings["Film/dance/culture/entertainment:"] = "Film/taniec/kultura/rozrywka";
+$a->strings["Love/Romance:"] = "Miłość/Romans:";
+$a->strings["Work/employment:"] = "Praca/zatrudnienie:";
+$a->strings["School/education:"] = "Szkoła/edukacja:";
+$a->strings["Forums:"] = "Fora:";
+$a->strings["Only You Can See This"] = "Tylko ty możesz to zobaczyć";
+$a->strings["Tips for New Members"] = "Wskazówki dla nowych użytkowników";
+$a->strings["OpenWebAuth: %1\$s welcomes %2\$s"] = "OpenWebAuth: %1\$s wita %2\$s";
+$a->strings["Add New Contact"] = "Dodaj nowy kontakt";
+$a->strings["Enter address or web location"] = "Wpisz adres lub lokalizację sieciową";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Przykład: bob@przykład.com, http://przykład.com/barbara";
+$a->strings["%d invitation available"] = [
+	0 => "%d zaproszenie dostępne",
+	1 => "%d zaproszeń dostępnych",
+	2 => "%d zaproszenia dostępne",
+	3 => "%d zaproszenia dostępne",
+];
+$a->strings["Networks"] = "Sieci";
+$a->strings["All Networks"] = "Wszystkie Sieci";
+$a->strings["Saved Folders"] = "Zapisz w folderach";
+$a->strings["Everything"] = "Wszystko";
+$a->strings["Categories"] = "Kategorie";
+$a->strings["%d contact in common"] = [
+	0 => "%dwspólny kontakt ",
+	1 => "%dwspólny kontakt",
+	2 => "%dwspólne kontakty ",
+	3 => "%dwspólnych kontaktów",
+];
 $a->strings["Frequently"] = "Często";
 $a->strings["Hourly"] = "Co godzinę";
 $a->strings["Twice daily"] = "Dwa razy dziennie";
@@ -1890,7 +2088,6 @@ $a->strings["Weekly"] = "Co tydzień";
 $a->strings["Monthly"] = "Miesięczne";
 $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";
@@ -1899,15 +2096,14 @@ $a->strings["Google+"] = "Google+";
 $a->strings["pump.io"] = "pump.io";
 $a->strings["Twitter"] = "Twitter";
 $a->strings["Diaspora Connector"] = "Łącze Diaspora";
-$a->strings["GNU Social Connector"] = "GNU Połączenie Społecznościowe";
+$a->strings["GNU Social Connector"] = "Łącze GNU Social";
 $a->strings["pnut"] = "orzech";
-$a->strings["App.net"] = "App.net";
 $a->strings["Male"] = "Mężczyzna";
 $a->strings["Female"] = "Kobieta";
 $a->strings["Currently Male"] = "Obecnie mężczyzna";
 $a->strings["Currently Female"] = "Obecnie Kobieta";
-$a->strings["Mostly Male"] = "Głównie mężczyzna";
-$a->strings["Mostly Female"] = "Głównie kobieta";
+$a->strings["Mostly Male"] = "Najczęściej męskie";
+$a->strings["Mostly Female"] = "Najczęściej żeńskie";
 $a->strings["Transgender"] = "Transseksualny";
 $a->strings["Intersex"] = "Interseksualne";
 $a->strings["Transsexual"] = "Transseksualny";
@@ -1937,7 +2133,6 @@ $a->strings["Infatuated"] = "Zakochany";
 $a->strings["Dating"] = "Randki";
 $a->strings["Unfaithful"] = "Niewierny";
 $a->strings["Sex Addict"] = "Uzależniony od seksu";
-$a->strings["Friends"] = "Przyjaciele";
 $a->strings["Friends/Benefits"] = "Przyjaciele/Korzyści";
 $a->strings["Casual"] = "Przypadkowy";
 $a->strings["Engaged"] = "Zaręczeni";
@@ -1959,26 +2154,6 @@ $a->strings["Uncertain"] = "Nieokreślony";
 $a->strings["It's complicated"] = "To skomplikowane";
 $a->strings["Don't care"] = "Nie przejmuj się";
 $a->strings["Ask me"] = "Zapytaj mnie ";
-$a->strings["Add New Contact"] = "Dodaj nowy kontakt";
-$a->strings["Enter address or web location"] = "Wpisz adres lub lokalizację sieciową";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Przykład: bob@przykład.com, http://przykład.com/barbara";
-$a->strings["%d invitation available"] = [
-	0 => "%d zaproszenie dostępne",
-	1 => "%d zaproszeń dostępnych",
-	2 => "%d zaproszenia dostępne",
-	3 => "%d zaproszenia dostępne",
-];
-$a->strings["Networks"] = "Sieci";
-$a->strings["All Networks"] = "Wszystkie Sieci";
-$a->strings["Saved Folders"] = "Zapisz w folderach";
-$a->strings["Everything"] = "Wszystko";
-$a->strings["Categories"] = "Kategorie";
-$a->strings["%d contact in common"] = [
-	0 => "",
-	1 => "",
-	2 => "",
-	3 => "",
-];
 $a->strings["General Features"] = "Funkcje ogólne";
 $a->strings["Multiple Profiles"] = "Wiele profili";
 $a->strings["Ability to create multiple profiles"] = "Umożliwia tworzenia wielu profili";
@@ -2055,176 +2230,18 @@ $a->strings["Inbox"] = "Odebrane";
 $a->strings["Outbox"] = "Wysłane";
 $a->strings["Manage"] = "Zarządzaj";
 $a->strings["Manage other pages"] = "Zarządzaj innymi stronami";
-$a->strings["Profiles"] = "Profile";
 $a->strings["Manage/Edit Profiles"] = "Zarządzaj/Edytuj profile";
 $a->strings["Site setup and configuration"] = "Konfiguracja i ustawienia instancji";
 $a->strings["Navigation"] = "Nawigacja";
 $a->strings["Site map"] = "Mapa strony";
-$a->strings["There are no tables on MyISAM."] = "W MyISAM nie ma tabel.";
-$a->strings["\n\t\t\t\tThe friendica developers released update %s recently,\n\t\t\t\tbut when I tried to install it, something went terribly wrong.\n\t\t\t\tThis needs to be fixed soon and I can't do it alone. Please contact a\n\t\t\t\tfriendica developer if you can not help me on your own. My database might be invalid."] = "\n\t\t\t\tDeweloperzy friendica wydali niedawno aktualizację %s,\n\t\t\t\tale podczas próby instalacji, coś poszło nie tak.\n\t\t\t\tZostanie to naprawione wkrótce i nie mogę tego zrobić sam. Proszę skontaktować się z \n\t\t\t\tprogramistami friendica, jeśli nie możesz mi pomóc na własną rękę. Moja baza danych może być nieprawidłowa.";
-$a->strings["The error message is\n[pre]%s[/pre]"] = "Komunikat o błędzie jest \n[pre]%s[/ pre]";
-$a->strings["\nError %d occurred during database update:\n%s\n"] = "\nWystąpił błąd %d podczas aktualizacji bazy danych:\n%s\n";
-$a->strings["Errors encountered performing database changes: "] = "Napotkane błędy powodujące zmiany w bazie danych:";
-$a->strings["%s: Database update"] = "%s: Aktualizacja bazy danych:";
-$a->strings["%s: updating %s table."] = "%s: aktualizowanie %s tabeli.";
-$a->strings["[no subject]"] = "[bez tematu]";
-$a->strings["Starts:"] = "Rozpoczęcie:";
-$a->strings["Finishes:"] = "Zakończenie:";
-$a->strings["all-day"] = "cały dzień";
-$a->strings["Jun"] = "cze";
-$a->strings["Sept"] = "wrz";
-$a->strings["No events to display"] = "Brak wydarzeń do wyświetlenia";
-$a->strings["l, F j"] = "d, M d ";
-$a->strings["Edit event"] = "Edytuj wydarzenie";
-$a->strings["Duplicate event"] = "Zduplikowane zdarzenie";
-$a->strings["Delete event"] = "Usuń wydarzenie";
-$a->strings["D g:i A"] = "D g:m AM/PM";
-$a->strings["g:i A"] = "g:m AM/PM";
-$a->strings["Show map"] = "Pokaż mapę";
-$a->strings["Hide map"] = "Ukryj mapę";
-$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."] = "Skasowana grupa o tej nazwie została przywrócona. Istniejące uprawnienia do pozycji <strong>mogą</strong> dotyczyć tej grupy i wszystkich przyszłych członków. Jeśli nie jest to zamierzone, utwórz inną grupę o innej nazwie.";
-$a->strings["Default privacy group for new contacts"] = "Domyślne ustawienia prywatności dla nowych kontaktów";
-$a->strings["Everybody"] = "Wszyscy";
-$a->strings["edit"] = "edytuj";
-$a->strings["Edit group"] = "Edytuj grupy";
-$a->strings["Contacts not in any group"] = "Kontakt nie jest w żadnej grupie";
-$a->strings["Create a new group"] = "Stwórz nową grupę";
-$a->strings["Edit groups"] = "Edytuj grupy";
-$a->strings["Requested account is not available."] = "Żądane konto jest niedostępne.";
-$a->strings["Edit profile"] = "Edytuj profil";
-$a->strings["Atom feed"] = "Kanał Atom";
-$a->strings["Manage/edit profiles"] = "Zarządzaj profilami";
-$a->strings["g A l F d"] = "g A I F d";
-$a->strings["F d"] = "";
-$a->strings["[today]"] = "[dziś]";
-$a->strings["Birthday Reminders"] = "Przypomnienia o urodzinach";
-$a->strings["Birthdays this week:"] = "Urodziny w tym tygodniu:";
-$a->strings["[No description]"] = "[Brak opisu]";
-$a->strings["Event Reminders"] = "Przypominacze wydarzeń";
-$a->strings["Events this week:"] = "Wydarzenia w tym tygodniu:";
-$a->strings["Member since:"] = "Członek od:";
-$a->strings["j F, Y"] = "d M, R";
-$a->strings["j F"] = "d M";
-$a->strings["Age:"] = "Wiek:";
-$a->strings["for %1\$d %2\$s"] = "od %1\$d %2\$s";
-$a->strings["Religion:"] = "Religia:";
-$a->strings["Hobbies/Interests:"] = "Hobby/Zainteresowania:";
-$a->strings["Contact information and Social Networks:"] = "Informacje kontaktowe i sieci społeczne";
-$a->strings["Musical interests:"] = "Zainteresowania muzyczne:";
-$a->strings["Books, literature:"] = "Książki, literatura:";
-$a->strings["Television:"] = "Telewizja:";
-$a->strings["Film/dance/culture/entertainment:"] = "Film/taniec/kultura/rozrywka";
-$a->strings["Love/Romance:"] = "Miłość/Romans:";
-$a->strings["Work/employment:"] = "Praca/zatrudnienie:";
-$a->strings["School/education:"] = "Szkoła/edukacja:";
-$a->strings["Forums:"] = "Fora:";
-$a->strings["Only You Can See This"] = "Tylko ty możesz to zobaczyć";
-$a->strings["Login failed"] = "Logowanie nieudane";
-$a->strings["Not enough information to authenticate"] = "Za mało informacji do uwierzytelnienia";
-$a->strings["An invitation is required."] = "Wymagane zaproszenie.";
-$a->strings["Invitation could not be verified."] = "Zaproszenie niezweryfikowane.";
-$a->strings["Invalid OpenID url"] = "Nieprawidłowy adres url OpenID";
-$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Napotkaliśmy problem podczas logowania z podanym przez nas identyfikatorem OpenID. Sprawdź poprawną pisownię identyfikatora.";
-$a->strings["The error message was:"] = "Komunikat o błędzie:";
-$a->strings["Please enter the required information."] = "Wprowadź wymagane informacje";
-$a->strings["Please use a shorter name."] = "Użyj dłuższej nazwy.";
-$a->strings["Name too short."] = "Nazwa jest za krótka.";
-$a->strings["That doesn't appear to be your full (First Last) name."] = "Wydaje mi się, że to nie jest twoje pełne imię (pierwsze imię) i nazwisko.";
-$a->strings["Your email domain is not among those allowed on this site."] = "Twoja domena internetowa nie jest obsługiwana na tej stronie.";
-$a->strings["Not a valid email address."] = "Niepoprawny adres e mail..";
-$a->strings["Cannot use that email."] = "Nie możesz użyć tego e-maila. ";
-$a->strings["Your nickname can only contain a-z, 0-9 and _."] = "Twój pseudonim może zawierać tylko a-z, 0-9 i _.";
-$a->strings["Nickname is already registered. Please choose another."] = "Ten login jest zajęty. Wybierz inny.";
-$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "POWAŻNY BŁĄD: niepowodzenie podczas tworzenia kluczy zabezpieczeń.";
-$a->strings["An error occurred during registration. Please try again."] = "Wystąpił bład podczas rejestracji, Spróbuj ponownie.";
-$a->strings["An error occurred creating your default profile. Please try again."] = "Wystąpił błąd podczas tworzenia profilu. Spróbuj ponownie.";
-$a->strings["An error occurred creating your self contact. Please try again."] = "Wystąpił błąd podczas tworzenia własnego kontaktu. Proszę spróbuj ponownie.";
-$a->strings["An error occurred creating your default contact group. Please try again."] = "Wystąpił błąd podczas tworzenia domyślnej grupy kontaktów. Proszę spróbuj ponownie.";
-$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\tDrodzy %1\$s, \n\t\t\t\tDziękujemy za rejestrację na stronie %2\$s. Twoje konto czeka na zatwierdzenie przez administratora.";
-$a->strings["Registration at %s"] = "Rejestracja w %s";
-$a->strings["\n\t\t\tDear %1\$s,\n\t\t\t\tThank you for registering at %2\$s. Your account has been created.\n\t\t"] = "\n\t\t\tDrodzy %1\$s, \n\t\t\t\tDziękujemy za rejestrację na stronie %2\$s. Twoje konto zostało utworzone.";
-$a->strings["\n\t\t\tThe login details are as follows:\n\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t\t%1\$s\n\t\t\tPassword:\t\t%5\$s\n\n\t\t\tYou may change your password from your account \"Settings\" page after logging\n\t\t\tin.\n\n\t\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\t\tYou may also wish to add some basic information to your default profile\n\t\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\t\tWe recommend setting your full name, adding a profile photo,\n\t\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\t\tthan that.\n\n\t\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\t\tIf you are new and do not know anybody here, they may help\n\t\t\tyou to make some new and interesting friends.\n\n\t\t\tIf you ever want to delete your account, you can do so at %3\$s/removeme\n\n\t\t\tThank you and welcome to %2\$s."] = "\n\t\t\tDane logowania są następuje:\n\t\t\tLokalizacja witryny:\t%3\$s\n\t\t\tNazwa użytkownika:\t\t%1\$s\n\t\t\tHasło:\t\t%5\$s\n\n\t\t\tPo zalogowaniu możesz zmienić hasło do swojego konta na stronie \"Ustawienia\"\n \t\t\tProszę poświęć chwilę, aby przejrzeć inne ustawienia konta na tej stronie.\n\n\t\t\tMożesz również dodać podstawowe informacje do swojego domyślnego profilu\n\t\t\t(na stronie \"Profil\"), aby inne osoby mogły łatwo Cię znaleźć.\n\n\t\t\tZalecamy ustawienie imienia i nazwiska, dodanie zdjęcia profilowego,\n\t\t\tdodanie niektórych \"słów kluczowych\" profilu (bardzo przydatne w nawiązywaniu nowych znajomości) - i\n\t\t\tbyć może w jakim kraju mieszkasz; jeśli nie chcesz być bardziej szczegółowy.\n\n\t\t\tW pełni szanujemy Twoje prawo do prywatności i żaden z tych elementów nie jest konieczny.\n\t\t\tJeśli jesteś nowy i nie znasz tutaj nikogo, oni mogą ci pomóc\n\t\t\tmożesz zdobyć nowych interesujących przyjaciół\n\n\t\t\tJeśli kiedykolwiek zechcesz usunąć swoje konto, możesz to zrobić w %3\$s/Usuń konto\n\n\t\t\tDziękujemy i Zapraszamy do %2\$s.";
-$a->strings["Drop Contact"] = "Upuść kontakt";
-$a->strings["Organisation"] = "Organizacja";
-$a->strings["News"] = "Aktualności";
-$a->strings["Forum"] = "Forum";
-$a->strings["Connect URL missing."] = "Brak adresu URL połączenia.";
-$a->strings["The contact could not be added. Please check the relevant network credentials in your Settings -> Social Networks page."] = "Nie można dodać kontaktu. Sprawdź odpowiednie poświadczenia sieciowe na stronie Ustawienia -> Sieci społecznościowe.";
-$a->strings["This site is not configured to allow communications with other networks."] = "Ta strona nie jest skonfigurowana do pozwalania na komunikację z innymi sieciami";
-$a->strings["No compatible communication protocols or feeds were discovered."] = "Nie znaleziono żadnych kompatybilnych protokołów komunikacyjnych ani źródeł.";
-$a->strings["The profile address specified does not provide adequate information."] = "Dany adres profilu nie dostarcza odpowiednich informacji.";
-$a->strings["An author or name was not found."] = "Autor lub nazwa nie zostało znalezione.";
-$a->strings["No browser URL could be matched to this address."] = "Przeglądarka WWW nie może odnaleźć podanego adresu";
-$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Nie można dopasować @-stylu Adres identyfikacyjny ze znanym protokołem lub kontaktem e-mail.";
-$a->strings["Use mailto: in front of address to force email check."] = "Użyj mailto: przed adresem, aby wymusić sprawdzanie poczty e-mail.";
-$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Określony adres profilu należy do sieci, która została wyłączona na tej stronie.";
-$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Profil ograniczony. Ta osoba będzie niezdolna do odbierania osobistych powiadomień od ciebie.";
-$a->strings["Unable to retrieve contact information."] = "Nie można otrzymać informacji kontaktowych";
-$a->strings["%s's birthday"] = "Urodziny %s";
-$a->strings["Happy Birthday %s"] = "Urodziny %s";
-$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$suczestniczy %2\$s's %3\$s ";
-$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$snie uczestniczy %2\$s's %3\$s ";
-$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$smogą uczestniczyć %2\$s's %3\$s ";
-$a->strings["%s is now following %s."] = "%sjest teraz następujące %s. ";
-$a->strings["following"] = "następujący";
-$a->strings["%s stopped following %s."] = "%sprzestał śledzić %s. ";
-$a->strings["stopped following"] = "przestał śledzić";
-$a->strings["Sharing notification from Diaspora network"] = "Wspólne powiadomienie z sieci Diaspora";
-$a->strings["Attachments:"] = "Załączniki:";
-$a->strings["(no subject)"] = "(bez tematu)";
-$a->strings["Logged out."] = "Wyloguj";
-$a->strings["Create a New Account"] = "Załóż nowe konto";
-$a->strings["Password: "] = "Hasło:";
-$a->strings["Remember me"] = "Zapamiętaj mnie";
-$a->strings["Or login using OpenID: "] = "Lub zaloguj się korzystając z OpenID:";
-$a->strings["Forgot your password?"] = "Zapomniałeś swojego hasła?";
-$a->strings["Website Terms of Service"] = "Warunki korzystania z witryny";
-$a->strings["terms of service"] = "warunki użytkowania";
-$a->strings["Website Privacy Policy"] = "Polityka Prywatności Witryny";
-$a->strings["privacy policy"] = "polityka prywatności";
-$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."] = "W momencie rejestracji oraz w celu zapewnienia komunikacji między kontem użytkownika, a jego kontaktami, użytkownik musi podać nazwę wyświetlaną (pseudonim), nazwę użytkownika (przydomek) i działający adres e-mail. Nazwy będą dostępne na stronie profilu konta dla każdego odwiedzającego stronę, nawet jeśli inne szczegóły profilu nie zostaną wyświetlone. Adres e-mail będzie używany tylko do wysyłania powiadomień użytkownika o interakcjach, ale nie będzie wyświetlany w widoczny sposób. Lista kont w katalogu użytkownika węzła lub globalnym katalogu użytkownika jest opcjonalna i może być kontrolowana w ustawieniach użytkownika, nie jest konieczna do komunikacji.";
-$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."] = "Te dane są wymagane do komunikacji i są przekazywane do węzłów partnerów komunikacyjnych i są tam przechowywane. Użytkownicy mogą wprowadzać dodatkowe prywatne dane, które mogą być przesyłane na konta partnerów komunikacyjnych.";
-$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."] = "W dowolnym momencie zalogowany użytkownik może wyeksportować dane swojego konta z <a href=\"%1\$s/settings/uexport\">ustawień konta</a>. Jeśli użytkownik chce usunąć swoje konto, może to zrobić w<a href=\"%1\$s/removeme\">%1\$s / Usuń mnie</a>. Usunięcie konta będzie trwałe. Skasowanie danych będzie również wymagane od węzłów partnerów komunikacyjnych.";
-$a->strings["Privacy Statement"] = "Oświadczenie o prywatności";
-$a->strings["This entry was edited"] = "Ten wpis został zedytowany";
-$a->strings["Remove from your stream"] = "Usuń ze swojego strumienia";
-$a->strings["save to folder"] = "zapisz w folderze";
-$a->strings["I will attend"] = "Będę uczestniczyć";
-$a->strings["I will not attend"] = "Nie będę uczestniczyć";
-$a->strings["I might attend"] = "Mogę wziąć udział";
-$a->strings["add star"] = "dodaj gwiazdkę";
-$a->strings["remove star"] = "anuluj gwiazdkę";
-$a->strings["toggle star status"] = "włącz status gwiazdy";
-$a->strings["starred"] = "gwiazdką";
-$a->strings["ignore thread"] = "zignoruj ​​wątek";
-$a->strings["unignore thread"] = "odignoruj ​​wątek";
-$a->strings["toggle ignore status"] = "przełącz status ignorowania";
-$a->strings["add tag"] = "dodaj tag";
-$a->strings["like"] = "lubię to";
-$a->strings["dislike"] = "nie lubię tego";
-$a->strings["Share this"] = "Udostępnij to";
-$a->strings["share"] = "udostępnij";
-$a->strings["to"] = "do";
-$a->strings["via"] = "przez";
-$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
-$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
-$a->strings["%d comment"] = [
-	0 => " %d komentarz",
-	1 => " %d komentarzy",
-	2 => " %d komentarzy",
-	3 => " %d komentarzy",
-];
-$a->strings["Bold"] = "Pogrubienie";
-$a->strings["Italic"] = "Kursywa";
-$a->strings["Underline"] = "Podkreślenie";
-$a->strings["Quote"] = "Cytat";
-$a->strings["Code"] = "Kod";
-$a->strings["Image"] = "Obraz";
-$a->strings["Link"] = "Link";
-$a->strings["Video"] = "Video";
-$a->strings["Delete this item?"] = "Usunąć ten element?";
-$a->strings["show fewer"] = "Pokaż mniej";
-$a->strings["No system theme config value set."] = "Nie ustawiono wartości konfiguracyjnej zestawu tematycznego.";
-$a->strings["toggle mobile"] = "przełącz na mobilny";
-$a->strings["%s: Updating author-id and owner-id in item and thread table. "] = "%s: Aktualizowanie ID autora i właściciela w tabeli pozycji i wątku.";
-$a->strings["Update %s failed. See error logs."] = "Aktualizacja %s nie powiodła się. Zobacz dziennik błędów.";
+$a->strings["Export"] = "Eksport";
+$a->strings["Export calendar as ical"] = "Wyeksportuj kalendarz jako ical";
+$a->strings["Export calendar as csv"] = "Eksportuj kalendarz jako csv";
+$a->strings["Embedding disabled"] = "Osadzanie wyłączone";
+$a->strings["Embedded content"] = "Osadzona zawartość";
+$a->strings["view full size"] = "Zobacz w pełnym wymiarze";
+$a->strings["Image/photo"] = "Obrazek/zdjęcie";
+$a->strings["$1 wrote:"] = "$1 napisał:";
+$a->strings["Encrypted content"] = "Szyfrowana treść";
+$a->strings["Invalid source protocol"] = "Nieprawidłowy protokół źródłowy";
+$a->strings["Invalid link protocol"] = "Niepoprawny link protokołu";
diff --git a/view/lang/zh-cn/messages.po b/view/lang/zh-cn/messages.po
index 95869adc6..b6de38259 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-05-20 14:22+0200\n"
-"PO-Revision-Date: 2018-05-26 10:28+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,403 +24,533 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: include/enotify.php:31
-msgid "Friendica Notification"
-msgstr "Friendica 通知"
+#: index.php:261 mod/apps.php:14
+msgid "You must be logged in to use addons. "
+msgstr "您用插件前要登录"
 
-#: include/enotify.php:34
-msgid "Thank You,"
-msgstr "谢谢，"
+#: index.php:308 mod/fetch.php:20 mod/fetch.php:47 mod/fetch.php:54
+#: mod/help.php:62
+msgid "Not Found"
+msgstr "未发现"
 
-#: include/enotify.php:37
-#, php-format
-msgid "%s Administrator"
-msgstr "%s管理员"
+#: 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 "页发现。"
 
-#: include/enotify.php:39
-#, php-format
-msgid "%1$s, %2$s Administrator"
-msgstr "%1$s, %2$s 的管理员"
+#: index.php:431 mod/group.php:83 mod/profperm.php:29
+msgid "Permission denied"
+msgstr "权限不够"
 
-#: include/enotify.php:95
-#, php-format
-msgid "[Friendica:Notify] New mail received at %s"
-msgstr "[Friendica:Notify]收到新邮件在%s"
+#: 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 "权限不够。"
 
-#: include/enotify.php:97
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
-msgstr "%1$s发给您新私人通知在%2$s."
+#: index.php:460
+msgid "toggle mobile"
+msgstr "切换移动设备"
 
-#: include/enotify.php:98
-msgid "a private message"
-msgstr "一条私人信息"
+#: view/theme/duepuntozero/config.php:54 src/Model/User.php:544
+msgid "default"
+msgstr "默认"
 
-#: include/enotify.php:98
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr "%1$s发给您%2$s."
+#: view/theme/duepuntozero/config.php:55
+msgid "greenzero"
+msgstr "greenzero"
 
-#: include/enotify.php:100
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr "请访问 %s 来查看并且/或者回复你的私信。"
+#: view/theme/duepuntozero/config.php:56
+msgid "purplezero"
+msgstr "purplezero"
 
-#: include/enotify.php:138
-#, php-format
-msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
-msgstr "%1$s于[url=%2$s]a %3$s[/url]评论了"
+#: view/theme/duepuntozero/config.php:57
+msgid "easterbunny"
+msgstr "easterbunny"
 
-#: include/enotify.php:146
-#, 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]评论了"
+#: view/theme/duepuntozero/config.php:58
+msgid "darkzero"
+msgstr "darkzero"
 
-#: include/enotify.php:156
-#, php-format
-msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
-msgstr "%1$s于[url=%2$s]您的%3$s[/url]评论了"
+#: view/theme/duepuntozero/config.php:59
+msgid "comix"
+msgstr "comix"
 
-#: include/enotify.php:168
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
-msgstr "[Friendica:Notify]于交流#%1$d由%2$s评论"
+#: view/theme/duepuntozero/config.php:60
+msgid "slackr"
+msgstr "slackr"
 
-#: include/enotify.php:170
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr "%s对你有兴趣的项目／ 交谈发表意见"
+#: 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 "提交"
 
-#: include/enotify.php:173 include/enotify.php:188 include/enotify.php:203
-#: include/enotify.php:218 include/enotify.php:237 include/enotify.php:252
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr "请访问%s来查看并且/或者回复这个对话。"
+#: 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 "主题设置"
 
-#: include/enotify.php:180
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
-msgstr "[Friendica:Notify] %s贴在您的简介墙"
+#: view/theme/duepuntozero/config.php:74
+msgid "Variations"
+msgstr "变化"
 
-#: include/enotify.php:182
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
-msgstr "%1$s放在您的简介墙在%2$s"
+#: view/theme/quattro/config.php:76
+msgid "Alignment"
+msgstr "对齐"
 
-#: include/enotify.php:183
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
-msgstr "%1$s放在[url=%2$s]您的墙[/url]"
+#: view/theme/quattro/config.php:76
+msgid "Left"
+msgstr "左边"
 
-#: include/enotify.php:195
-#, php-format
-msgid "[Friendica:Notify] %s tagged you"
-msgstr "[Friendica:Notify] %s标签您"
+#: view/theme/quattro/config.php:76
+msgid "Center"
+msgstr "中间"
 
-#: include/enotify.php:197
-#, php-format
-msgid "%1$s tagged you at %2$s"
-msgstr "%1$s把您在%2$s标签"
+#: view/theme/quattro/config.php:77
+msgid "Color scheme"
+msgstr "色彩方案"
 
-#: include/enotify.php:198
-#, php-format
-msgid "%1$s [url=%2$s]tagged you[/url]."
-msgstr "%1$s[url=%2$s]把您标签[/url]."
+#: view/theme/quattro/config.php:78
+msgid "Posts font size"
+msgstr "文章"
 
-#: include/enotify.php:210
-#, php-format
-msgid "[Friendica:Notify] %s shared a new post"
-msgstr "[Friendica:Notify] %s分享新的消息"
+#: view/theme/quattro/config.php:79
+msgid "Textareas font size"
+msgstr "文本区字体大小"
 
-#: include/enotify.php:212
-#, php-format
-msgid "%1$s shared a new post at %2$s"
-msgstr "%1$s分享新的消息在%2$s"
+#: view/theme/vier/config.php:75
+msgid "Comma separated list of helper forums"
+msgstr ""
 
-#: include/enotify.php:213
-#, php-format
-msgid "%1$s [url=%2$s]shared a post[/url]."
-msgstr "%1$s [url=%2$s]分享一个消息[/url]."
+#: view/theme/vier/config.php:115 src/Core/ACL.php:298
+msgid "don't show"
+msgstr "不要显示"
 
-#: include/enotify.php:225
-#, php-format
-msgid "[Friendica:Notify] %1$s poked you"
-msgstr "[Friendica:Notify]您被%1$s戳"
+#: view/theme/vier/config.php:115 src/Core/ACL.php:297
+msgid "show"
+msgstr "显示"
 
-#: include/enotify.php:227
-#, php-format
-msgid "%1$s poked you at %2$s"
-msgstr "您被%1$s戳在%2$s"
+#: view/theme/vier/config.php:122
+msgid "Set style"
+msgstr "设置风格"
 
-#: include/enotify.php:228
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
-msgstr "%1$s[url=%2$s]把您戳[/url]。"
+#: view/theme/vier/config.php:123
+msgid "Community Pages"
+msgstr "社会页"
 
-#: include/enotify.php:244
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
-msgstr "[Friendica:Notify] %s标前您的文章"
+#: view/theme/vier/config.php:124 view/theme/vier/theme.php:149
+msgid "Community Profiles"
+msgstr "社会简介"
 
-#: include/enotify.php:246
-#, php-format
-msgid "%1$s tagged your post at %2$s"
-msgstr "%1$s把您的文章在%2$s标签"
+#: view/theme/vier/config.php:125
+msgid "Help or @NewHere ?"
+msgstr "需要帮助或@第一次来这儿？"
 
-#: include/enotify.php:247
-#, php-format
-msgid "%1$s tagged [url=%2$s]your post[/url]"
-msgstr "%1$s把[url=%2$s]您的文章[/url]标签"
+#: view/theme/vier/config.php:126 view/theme/vier/theme.php:386
+msgid "Connect Services"
+msgstr "连接服务"
 
-#: include/enotify.php:259
-msgid "[Friendica:Notify] Introduction received"
-msgstr "[Friendica:Notify] 收到介绍"
+#: view/theme/vier/config.php:127
+msgid "Find Friends"
+msgstr "找朋友们"
 
-#: include/enotify.php:261
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
-msgstr "您从「%1$s」受到一个介绍在%2$s"
+#: view/theme/vier/config.php:128 view/theme/vier/theme.php:179
+msgid "Last users"
+msgstr "上次用户"
 
-#: include/enotify.php:262
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
-msgstr "您从%2$s收到[url=%1$s]一个介绍[/url]。"
+#: view/theme/vier/theme.php:197 src/Content/Widget.php:59
+msgid "Find People"
+msgstr "找人物"
 
-#: include/enotify.php:267 include/enotify.php:313
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr "你能看他的简介在%s"
+#: view/theme/vier/theme.php:198 src/Content/Widget.php:60
+msgid "Enter name or interest"
+msgstr "输入名字或兴趣"
 
-#: include/enotify.php:269
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
-msgstr "请批准或拒绝介绍在%s"
+#: 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 "连接/关注"
 
-#: include/enotify.php:277
-msgid "[Friendica:Notify] A new person is sharing with you"
-msgstr "[Friendica:Notify] 一个新的人正在和你分享"
+#: view/theme/vier/theme.php:200 src/Content/Widget.php:62
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "比如：罗伯特·摩根斯坦，钓鱼"
 
-#: include/enotify.php:279 include/enotify.php:280
-#, php-format
-msgid "%1$s is sharing with you at %2$s"
-msgstr "%1$s 正在 %2$s 和你分享"
+#: view/theme/vier/theme.php:201 mod/directory.php:214 mod/contacts.php:842
+#: src/Content/Widget.php:63
+msgid "Find"
+msgstr "搜索"
 
-#: include/enotify.php:287
-msgid "[Friendica:Notify] You have a new follower"
-msgstr "[Friendica:Notify] 你有一个新的粉丝"
+#: view/theme/vier/theme.php:202 mod/suggest.php:117 src/Content/Widget.php:64
+msgid "Friend Suggestions"
+msgstr "朋友推荐"
 
-#: include/enotify.php:289 include/enotify.php:290
-#, php-format
-msgid "You have a new follower at %2$s : %1$s"
-msgstr "你在 %2$s 有一个新的关注者： %1$s"
+#: view/theme/vier/theme.php:203 src/Content/Widget.php:65
+msgid "Similar Interests"
+msgstr "相似兴趣"
 
-#: include/enotify.php:302
-msgid "[Friendica:Notify] Friend suggestion received"
-msgstr "[Friendica:Notify] 收到朋友建议"
+#: view/theme/vier/theme.php:204 src/Content/Widget.php:66
+msgid "Random Profile"
+msgstr "随机简介"
 
-#: include/enotify.php:304
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
-msgstr "您从「%2$s」收到[url=%1$s]一个朋友建议[/url]。"
+#: view/theme/vier/theme.php:205 src/Content/Widget.php:67
+msgid "Invite Friends"
+msgstr "邀请朋友们"
 
-#: include/enotify.php:305
-#, php-format
+#: 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 ""
-"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。"
+"Resize image to the width of the screen and show background color below on "
+"long pages."
+msgstr ""
 
-#: include/enotify.php:311
-msgid "Name:"
-msgstr "名字："
+#: view/theme/frio/php/Image.php:25
+msgid "Full screen"
+msgstr ""
 
-#: include/enotify.php:312
-msgid "Photo:"
-msgstr "照片："
-
-#: include/enotify.php:315
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr "请访问%s来批准或拒绝这个建议。"
-
-#: include/enotify.php:323 include/enotify.php:338
-msgid "[Friendica:Notify] Connection accepted"
-msgstr "[Friendica:Notify] 连接被接受"
-
-#: include/enotify.php:325 include/enotify.php:340
-#, 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
-#, 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
+#: view/theme/frio/php/Image.php:25
 msgid ""
-"You are now mutual friends and may exchange status updates, photos, and "
-"email without restriction."
-msgstr "你们现在已经互为朋友了，可以不受限制地交换状态更新、照片和邮件。"
+"Resize image to fill entire screen, clipping either the right or the bottom."
+msgstr ""
 
-#: include/enotify.php:333
-#, php-format
-msgid "Please visit %s if you wish to make any changes to this relationship."
-msgstr "请访问%s如果你希望对这个关系做任何改变。"
+#: view/theme/frio/php/Image.php:26
+msgid "Single row mosaic"
+msgstr ""
 
-#: include/enotify.php:346
-#, php-format
+#: view/theme/frio/php/Image.php:26
 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."
+"Resize image to repeat it on a single row, either vertical or horizontal."
 msgstr ""
 
-#: include/enotify.php:348
-#, php-format
-msgid ""
-"'%1$s' may choose to extend this into a two-way or more permissive "
-"relationship in the future."
+#: view/theme/frio/php/Image.php:27
+msgid "Mosaic"
 msgstr ""
 
-#: include/enotify.php:350
-#, 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:44
-msgid "[Friendica System Notify]"
+#: view/theme/frio/php/Image.php:27
+msgid "Repeat image to fill the screen."
 msgstr ""
 
-#: include/enotify.php:360
-msgid "registration request"
+#: update.php:194
+#, php-format
+msgid "%s: Updating author-id and owner-id in item and thread table. "
 msgstr ""
 
-#: include/enotify.php:362
+#: update.php:240
 #, php-format
-msgid "You've received a registration request from '%1$s' at %2$s"
+msgid "%s: Updating post-type."
 msgstr ""
 
-#: include/enotify.php:363
-#, php-format
-msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
-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/enotify.php:368
-#, php-format
-msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
-msgstr ""
+#: include/items.php:393
+msgid "Do you really want to delete this item?"
+msgstr "您真的想删除这个项目吗？"
 
-#: include/enotify.php:374
-#, php-format
-msgid "Please visit %s to approve or reject the request."
-msgstr "请访问%s来批准或拒绝这个请求。"
+#: 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/security.php:81
-msgid "Welcome "
-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/security.php:82
-msgid "Please upload a profile photo."
-msgstr "请上传一张简介照片"
+#: include/items.php:483 src/Content/Feature.php:96
+msgid "Archives"
+msgstr "档案"
 
-#: include/security.php:84
-msgid "Welcome back "
-msgstr "欢迎回来"
-
-#: include/security.php:440
-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/dba.php:59
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr "找不到DNS信息为数据库服务器「%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:4522 mod/photos.php:88 mod/photos.php:194
-#: mod/photos.php:722 mod/photos.php:1149 mod/photos.php:1166
-#: mod/photos.php:1684 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 src/Model/User.php:553
-#: src/Model/User.php:561 src/Model/User.php:569
-msgid "Profile Photos"
-msgstr "简介照片"
-
-#: include/conversation.php:144 include/conversation.php:282
-#: include/text.php:1749 src/Model/Item.php:1970
+#: include/conversation.php:151 include/conversation.php:287
+#: include/text.php:1611
 msgid "event"
 msgstr "事件"
 
-#: include/conversation.php:147 include/conversation.php:157
-#: include/conversation.php:285 include/conversation.php:294
-#: mod/subthread.php:97 mod/tagger.php:72 src/Model/Item.php:1968
-#: src/Protocol/Diaspora.php:1957
+#: 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:152 include/conversation.php:290
-#: include/text.php:1751 mod/subthread.php:97 mod/tagger.php:72
-#: src/Model/Item.php:1968
+#: 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:164 src/Model/Item.php:1841
-#: src/Protocol/Diaspora.php:1953
+#: 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:167 src/Model/Item.php:1846
+#: 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:170
+#: 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:173
+#: 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:176
+#: include/conversation.php:179
 #, php-format
 msgid "%1$s attends maybe %2$s's %3$s"
 msgstr ""
 
-#: include/conversation.php:209
+#: include/conversation.php:214
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr "%1$s是成为%2$s的朋友"
 
-#: include/conversation.php:250
+#: include/conversation.php:255
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr "%1$s把%2$s戳"
 
-#: include/conversation.php:304 mod/tagger.php:110
+#: 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"
@@ -433,878 +564,3293 @@ msgstr "文章／项目"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s标注%2$s的%3$s为偏爱"
 
-#: include/conversation.php:608 mod/photos.php:1501 mod/profiles.php:355
+#: include/conversation.php:545 mod/profiles.php:352 mod/photos.php:1507
 msgid "Likes"
 msgstr "喜欢"
 
-#: include/conversation.php:608 mod/photos.php:1501 mod/profiles.php:359
+#: include/conversation.php:545 mod/profiles.php:356 mod/photos.php:1507
 msgid "Dislikes"
 msgstr "不喜欢"
 
-#: include/conversation.php:609 include/conversation.php:1639
-#: mod/photos.php:1502
+#: include/conversation.php:546 include/conversation.php:1492
+#: mod/photos.php:1508
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "正在参加"
 
-#: include/conversation.php:609 mod/photos.php:1502
+#: include/conversation.php:546 mod/photos.php:1508
 msgid "Not attending"
 msgstr "不在参加"
 
-#: include/conversation.php:609 mod/photos.php:1502
+#: include/conversation.php:546 mod/photos.php:1508
 msgid "Might attend"
 msgstr "可以参加"
 
-#: include/conversation.php:721 mod/photos.php:1569 src/Object/Post.php:192
+#: include/conversation.php:626 mod/photos.php:1564 src/Object/Post.php:195
 msgid "Select"
 msgstr "选择"
 
-#: include/conversation.php:722 mod/photos.php:1570 mod/contacts.php:830
-#: mod/contacts.php:1035 mod/admin.php:1827 mod/settings.php:730
-#: src/Object/Post.php:187
+#: 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:760 src/Object/Post.php:371
-#: src/Object/Post.php:372
+#: 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:772 src/Object/Post.php:359
+#: include/conversation.php:673 src/Object/Post.php:350
 msgid "Categories:"
 msgstr "种类："
 
-#: include/conversation.php:773 src/Object/Post.php:360
+#: include/conversation.php:674 src/Object/Post.php:351
 msgid "Filed under:"
 msgstr "归档在："
 
-#: include/conversation.php:780 src/Object/Post.php:385
+#: include/conversation.php:681 src/Object/Post.php:376
 #, php-format
 msgid "%s from %s"
 msgstr "%s从%s"
 
-#: include/conversation.php:795
+#: include/conversation.php:696
 msgid "View in context"
 msgstr "看在上下文"
 
-#: include/conversation.php:797 include/conversation.php:1312
-#: mod/wallmessage.php:145 mod/editpost.php:125 mod/photos.php:1473
-#: mod/message.php:245 mod/message.php:414 src/Object/Post.php:410
+#: 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:868
+#: include/conversation.php:762
 msgid "remove"
 msgstr "删除"
 
-#: include/conversation.php:872
+#: include/conversation.php:766
 msgid "Delete Selected Items"
 msgstr "删除选的项目"
 
-#: include/conversation.php:1017 view/theme/frio/theme.php:352
-msgid "Follow Thread"
-msgstr ""
-
-#: include/conversation.php:1018 src/Model/Contact.php:662
+#: include/conversation.php:867 src/Model/Contact.php:937
 msgid "View Status"
 msgstr "看现状"
 
-#: include/conversation.php:1019 include/conversation.php:1035
-#: 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
+#: 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:1020 src/Model/Contact.php:664
+#: include/conversation.php:869 src/Model/Contact.php:939
 msgid "View Photos"
 msgstr "看照片"
 
-#: include/conversation.php:1021 src/Model/Contact.php:665
+#: include/conversation.php:870 src/Model/Contact.php:931
+#: src/Model/Contact.php:940
 msgid "Network Posts"
 msgstr "网络文章"
 
-#: include/conversation.php:1022 src/Model/Contact.php:666
+#: include/conversation.php:871 src/Model/Contact.php:932
+#: src/Model/Contact.php:941
 msgid "View Contact"
 msgstr "查看联系人"
 
-#: include/conversation.php:1023 src/Model/Contact.php:668
+#: include/conversation.php:872 src/Model/Contact.php:943
 msgid "Send PM"
 msgstr "发送私信"
 
-#: include/conversation.php:1027 src/Model/Contact.php:669
+#: include/conversation.php:876 src/Model/Contact.php:944
 msgid "Poke"
 msgstr "戳"
 
-#: include/conversation.php:1032 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:1151
+#: include/conversation.php:999
 #, php-format
 msgid "%s likes this."
 msgstr "%s喜欢这个."
 
-#: include/conversation.php:1154
+#: include/conversation.php:1002
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s没有喜欢这个."
 
-#: include/conversation.php:1157
+#: include/conversation.php:1005
 #, php-format
 msgid "%s attends."
 msgstr "%s 参加。"
 
-#: include/conversation.php:1160
+#: include/conversation.php:1008
 #, php-format
 msgid "%s doesn't attend."
 msgstr "%s 不参加。"
 
-#: include/conversation.php:1163
+#: include/conversation.php:1011
 #, php-format
 msgid "%s attends maybe."
 msgstr ""
 
-#: include/conversation.php:1174
+#: include/conversation.php:1022
 msgid "and"
 msgstr "和"
 
-#: include/conversation.php:1180
+#: include/conversation.php:1028
 #, php-format
 msgid "and %d other people"
 msgstr "和 %d 个其他人"
 
-#: include/conversation.php:1189
+#: 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:1190
+#: include/conversation.php:1038
 #, php-format
 msgid "%s like this."
 msgstr "%s 赞了这个。"
 
-#: include/conversation.php:1193
+#: 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:1194
+#: include/conversation.php:1042
 #, php-format
 msgid "%s don't like this."
 msgstr "%s 踩了这个。"
 
-#: include/conversation.php:1197
+#: 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:1198
+#: include/conversation.php:1046
 #, php-format
 msgid "%s attend."
 msgstr "%s 参加。"
 
-#: include/conversation.php:1201
+#: 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:1202
+#: include/conversation.php:1050
 #, php-format
 msgid "%s don't attend."
 msgstr "%s 不参加。"
 
-#: include/conversation.php:1205
+#: 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:1206
+#: include/conversation.php:1054
 #, php-format
 msgid "%s attend maybe."
 msgstr ""
 
-#: include/conversation.php:1236 include/conversation.php:1252
+#: include/conversation.php:1084 include/conversation.php:1100
 msgid "Visible to <strong>everybody</strong>"
 msgstr "<strong>大家</strong>可见的"
 
-#: include/conversation.php:1237 include/conversation.php:1253
-#: mod/wallmessage.php:120 mod/wallmessage.php:127 mod/message.php:181
-#: mod/message.php:188 mod/message.php:324 mod/message.php:331
+#: 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:1238 include/conversation.php:1254
+#: include/conversation.php:1086 include/conversation.php:1102
 msgid "Please enter a video link/URL:"
 msgstr "请输入视频连接／URL："
 
-#: include/conversation.php:1239 include/conversation.php:1255
+#: include/conversation.php:1087 include/conversation.php:1103
 msgid "Please enter an audio link/URL:"
 msgstr "请输入音响连接／URL："
 
-#: include/conversation.php:1240 include/conversation.php:1256
+#: include/conversation.php:1088 include/conversation.php:1104
 msgid "Tag term:"
 msgstr "标签:"
 
-#: include/conversation.php:1241 include/conversation.php:1257
+#: include/conversation.php:1089 include/conversation.php:1105
 #: mod/filer.php:34
 msgid "Save to Folder:"
 msgstr "保存再文件夹："
 
-#: include/conversation.php:1242 include/conversation.php:1258
+#: include/conversation.php:1090 include/conversation.php:1106
 msgid "Where are you right now?"
 msgstr "你在哪里?"
 
-#: include/conversation.php:1243
+#: include/conversation.php:1091
 msgid "Delete item(s)?"
 msgstr "把项目删除吗？"
 
-#: include/conversation.php:1290
+#: include/conversation.php:1138
 msgid "New Post"
 msgstr ""
 
-#: include/conversation.php:1293
+#: include/conversation.php:1141
 msgid "Share"
 msgstr "分享"
 
-#: include/conversation.php:1294 mod/wallmessage.php:143 mod/editpost.php:111
-#: mod/message.php:243 mod/message.php:411
+#: 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:1295 mod/editpost.php:112
+#: include/conversation.php:1143 mod/editpost.php:102
 msgid "upload photo"
 msgstr "上传照片"
 
-#: include/conversation.php:1296 mod/editpost.php:113
+#: include/conversation.php:1144 mod/editpost.php:103
 msgid "Attach file"
 msgstr "附上文件"
 
-#: include/conversation.php:1297 mod/editpost.php:114
+#: include/conversation.php:1145 mod/editpost.php:104
 msgid "attach file"
 msgstr "附上文件"
 
-#: include/conversation.php:1298 mod/wallmessage.php:144 mod/editpost.php:115
-#: mod/message.php:244 mod/message.php:412
+#: 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:1299 mod/editpost.php:116
+#: include/conversation.php:1147 mod/editpost.php:106
 msgid "web link"
 msgstr "网页链接"
 
-#: include/conversation.php:1300 mod/editpost.php:117
+#: include/conversation.php:1148 mod/editpost.php:107
 msgid "Insert video link"
 msgstr "插入视频链接"
 
-#: include/conversation.php:1301 mod/editpost.php:118
+#: include/conversation.php:1149 mod/editpost.php:108
 msgid "video link"
 msgstr "视频链接"
 
-#: include/conversation.php:1302 mod/editpost.php:119
+#: include/conversation.php:1150 mod/editpost.php:109
 msgid "Insert audio link"
 msgstr "插入音频链接"
 
-#: include/conversation.php:1303 mod/editpost.php:120
+#: include/conversation.php:1151 mod/editpost.php:110
 msgid "audio link"
 msgstr "音频链接"
 
-#: include/conversation.php:1304 mod/editpost.php:121
+#: include/conversation.php:1152 mod/editpost.php:111
 msgid "Set your location"
 msgstr "设定您的位置"
 
-#: include/conversation.php:1305 mod/editpost.php:122
+#: include/conversation.php:1153 mod/editpost.php:112
 msgid "set location"
 msgstr "指定位置"
 
-#: include/conversation.php:1306 mod/editpost.php:123
+#: include/conversation.php:1154 mod/editpost.php:113
 msgid "Clear browser location"
 msgstr "清空浏览器位置"
 
-#: include/conversation.php:1307 mod/editpost.php:124
+#: include/conversation.php:1155 mod/editpost.php:114
 msgid "clear location"
 msgstr "清除位置"
 
-#: include/conversation.php:1309 mod/editpost.php:138
+#: include/conversation.php:1157 mod/editpost.php:129
 msgid "Set title"
 msgstr "指定标题"
 
-#: include/conversation.php:1311 mod/editpost.php:140
+#: include/conversation.php:1159 mod/editpost.php:131
 msgid "Categories (comma-separated list)"
 msgstr "种类（逗号分隔单）"
 
-#: include/conversation.php:1313 mod/editpost.php:126
+#: include/conversation.php:1161 mod/editpost.php:116
 msgid "Permission settings"
 msgstr "权设置"
 
-#: include/conversation.php:1314 mod/editpost.php:155
+#: include/conversation.php:1162 mod/editpost.php:146
 msgid "permissions"
 msgstr "权利"
 
-#: include/conversation.php:1322 mod/editpost.php:135
+#: include/conversation.php:1171 mod/editpost.php:126
 msgid "Public post"
 msgstr "公开的消息"
 
-#: include/conversation.php:1326 mod/editpost.php:146 mod/photos.php:1492
-#: mod/photos.php:1531 mod/photos.php:1604 mod/events.php:528
-#: src/Object/Post.php:813
+#: 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:1330 include/items.php:387 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/photos.php:248 mod/photos.php:324
-#: mod/videos.php:147 mod/contacts.php:475 mod/unfollow.php:117
-#: mod/follow.php:161 mod/message.php:141 mod/dfrn_request.php:658
-#: mod/settings.php:670 mod/settings.php:696
-msgid "Cancel"
-msgstr "取消"
-
-#: include/conversation.php:1335
+#: include/conversation.php:1184
 msgid "Post to Groups"
 msgstr "发到组"
 
-#: include/conversation.php:1336
+#: include/conversation.php:1185
 msgid "Post to Contacts"
 msgstr "发给联系人"
 
-#: include/conversation.php:1337
+#: include/conversation.php:1186
 msgid "Private post"
 msgstr "私人文章"
 
-#: include/conversation.php:1342 mod/editpost.php:153
-#: src/Model/Profile.php:338
+#: include/conversation.php:1191 mod/editpost.php:144
+#: src/Model/Profile.php:344
 msgid "Message"
 msgstr "通知"
 
-#: include/conversation.php:1343 mod/editpost.php:154
+#: include/conversation.php:1192 mod/editpost.php:145
 msgid "Browser"
 msgstr "浏览器"
 
-#: include/conversation.php:1610
+#: include/conversation.php:1463
 msgid "View all"
 msgstr "查看全部"
 
-#: include/conversation.php:1633
+#: include/conversation.php:1486
 msgid "Like"
 msgid_plural "Likes"
 msgstr[0] "喜欢"
 
-#: include/conversation.php:1636
+#: include/conversation.php:1489
 msgid "Dislike"
 msgid_plural "Dislikes"
 msgstr[0] "不喜欢"
 
-#: include/conversation.php:1642
+#: include/conversation.php:1495
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "不在参加"
 
-#: include/conversation.php:1645 src/Content/ContactSelector.php:125
+#: include/conversation.php:1498 src/Content/ContactSelector.php:122
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "未决定的"
 
-#: include/items.php:342 mod/notice.php:22 mod/viewsrc.php:21
-#: mod/admin.php:277 mod/admin.php:1883 mod/admin.php:2131 mod/display.php:72
-#: mod/display.php:255 mod/display.php:356
-msgid "Item not found."
-msgstr "项目找不到。"
+#: include/security.php:83
+msgid "Welcome "
+msgstr "欢迎"
 
-#: include/items.php:382
-msgid "Do you really want to delete this item?"
-msgstr "您真的想删除这个项目吗？"
+#: include/security.php:84
+msgid "Please upload a profile photo."
+msgstr "请上传一张简介照片"
 
-#: include/items.php:384 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/security.php:86
+msgid "Welcome back "
+msgstr "欢迎回来"
 
-#: include/items.php:401 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/notes.php:30 mod/photos.php:174
-#: mod/photos.php:1051 mod/cal.php:304 mod/contacts.php:386
-#: mod/delegate.php:25 mod/delegate.php:43 mod/delegate.php:54
-#: mod/events.php:194 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/network.php:32
-#: mod/crepair.php:98 mod/message.php:59 mod/message.php:104 mod/group.php:26
-#: mod/dfrn_confirm.php:68 mod/item.php:160 mod/notifications.php:73
-#: 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/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/items.php:471 src/Content/Feature.php:96
-msgid "Archives"
-msgstr "档案"
+#: include/enotify.php:52
+msgid "Friendica Notification"
+msgstr "Friendica 通知"
 
-#: include/items.php:477 view/theme/vier/theme.php:258
-#: src/Content/ForumManager.php:130 src/Content/Widget.php:317
-#: src/Object/Post.php:438 src/App.php:525
-msgid "show more"
-msgstr "显示更多"
+#: include/enotify.php:55
+msgid "Thank You,"
+msgstr "谢谢，"
 
-#: include/text.php:303
+#: include/enotify.php:58
+#, php-format
+msgid "%1$s, %2$s Administrator"
+msgstr "%1$s, %2$s 的管理员"
+
+#: 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:125
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
+msgstr "%1$s发给您新私人通知在%2$s."
+
+#: include/enotify.php:126
+msgid "a private message"
+msgstr "一条私人信息"
+
+#: include/enotify.php:126
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr "%1$s发给您%2$s."
+
+#: include/enotify.php:128
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr "请访问 %s 来查看并且/或者回复你的私信。"
+
+#: 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: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: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:191
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+msgstr "[Friendica:Notify]于交流#%1$d由%2$s评论"
+
+#: include/enotify.php:193
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr "%s对你有兴趣的项目／ 交谈发表意见"
+
+#: 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:203
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr "[Friendica:Notify] %s贴在您的简介墙"
+
+#: 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:206
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
+msgstr "%1$s放在[url=%2$s]您的墙[/url]"
+
+#: include/enotify.php:218
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr "[Friendica:Notify] %s标签您"
+
+#: include/enotify.php:220
+#, php-format
+msgid "%1$s tagged you at %2$s"
+msgstr "%1$s把您在%2$s标签"
+
+#: 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:233
+#, php-format
+msgid "[Friendica:Notify] %s shared a new post"
+msgstr "[Friendica:Notify] %s分享新的消息"
+
+#: include/enotify.php:235
+#, php-format
+msgid "%1$s shared a new post at %2$s"
+msgstr "%1$s分享新的消息在%2$s"
+
+#: 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:248
+#, php-format
+msgid "[Friendica:Notify] %1$s poked you"
+msgstr "[Friendica:Notify]您被%1$s戳"
+
+#: include/enotify.php:250
+#, php-format
+msgid "%1$s poked you at %2$s"
+msgstr "您被%1$s戳在%2$s"
+
+#: 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:268
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr "[Friendica:Notify] %s标前您的文章"
+
+#: include/enotify.php:270
+#, php-format
+msgid "%1$s tagged your post at %2$s"
+msgstr "%1$s把您的文章在%2$s标签"
+
+#: 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:283
+msgid "[Friendica:Notify] Introduction received"
+msgstr "[Friendica:Notify] 收到介绍"
+
+#: 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: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:291 include/enotify.php:337
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr "你能看他的简介在%s"
+
+#: include/enotify.php:293
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr "请批准或拒绝介绍在%s"
+
+#: include/enotify.php:300
+msgid "[Friendica:Notify] A new person is sharing with you"
+msgstr "[Friendica:Notify] 一个新的人正在和你分享"
+
+#: 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:310
+msgid "[Friendica:Notify] You have a new follower"
+msgstr "[Friendica:Notify] 你有一个新的粉丝"
+
+#: 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:326
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr "[Friendica:Notify] 收到朋友建议"
+
+#: 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: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:335
+msgid "Name:"
+msgstr "名字："
+
+#: include/enotify.php:336
+msgid "Photo:"
+msgstr "照片："
+
+#: include/enotify.php:339
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr "请访问%s来批准或拒绝这个建议。"
+
+#: include/enotify.php:347 include/enotify.php:362
+msgid "[Friendica:Notify] Connection accepted"
+msgstr "[Friendica:Notify] 连接被接受"
+
+#: 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: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:355
+msgid ""
+"You are now mutual friends and may exchange status updates, photos, and "
+"email without restriction."
+msgstr "你们现在已经互为朋友了，可以不受限制地交换状态更新、照片和邮件。"
+
+#: 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: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 ""
+
+#: 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:374
+#, php-format
+msgid "Please visit %s  if you wish to make any changes to this relationship."
+msgstr "请访问 %s  如果你希望对修改这个关系。"
+
+#: include/enotify.php:384 mod/removeme.php:47
+msgid "[Friendica System Notify]"
+msgstr ""
+
+#: include/enotify.php:384
+msgid "registration request"
+msgstr "注册请求"
+
+#: include/enotify.php:386
+#, php-format
+msgid "You've received a registration request from '%1$s' at %2$s"
+msgstr ""
+
+#: include/enotify.php:387
+#, php-format
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
+msgstr ""
+
+#: include/enotify.php:392
+#, php-format
+msgid ""
+"Full Name:\t%s\n"
+"Site Location:\t%s\n"
+"Login Name:\t%s (%s)"
+msgstr ""
+
+#: include/enotify.php:398
+#, php-format
+msgid "Please visit %s to approve or reject the request."
+msgstr "请访问%s来批准或拒绝这个请求。"
+
+#: include/text.php:302
 msgid "newer"
 msgstr "更新"
 
-#: include/text.php:304
+#: include/text.php:303
 msgid "older"
 msgstr "更旧"
 
-#: include/text.php:309
+#: include/text.php:308
 msgid "first"
 msgstr "首先"
 
-#: include/text.php:310
+#: include/text.php:309
 msgid "prev"
 msgstr "上个"
 
-#: include/text.php:344
+#: include/text.php:343
 msgid "next"
 msgstr "下个"
 
-#: include/text.php:345
+#: include/text.php:344
 msgid "last"
 msgstr "最后"
 
-#: include/text.php:399
+#: include/text.php:398
 msgid "Loading more entries..."
 msgstr "没有项目..."
 
-#: include/text.php:400
+#: include/text.php:399
 msgid "The end"
 msgstr ""
 
-#: include/text.php:885
+#: include/text.php:767
 msgid "No contacts"
 msgstr "没有联系人"
 
-#: include/text.php:909
+#: include/text.php:791
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d 联系人"
 
-#: include/text.php:922
+#: include/text.php:804
 msgid "View Contacts"
 msgstr "查看联系人"
 
-#: include/text.php:1011 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:1011
+#: include/text.php:889
 msgid "Follow"
 msgstr "关注"
 
-#: include/text.php:1017 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:1020 src/Content/Nav.php:58
+#: include/text.php:898 src/Content/Nav.php:58
 msgid "@name, !forum, #tags, content"
 msgstr ""
 
-#: include/text.php:1026 src/Content/Nav.php:145
+#: include/text.php:904 src/Content/Nav.php:145
 msgid "Full Text"
 msgstr "全文"
 
-#: include/text.php:1027 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:1028 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:1031 view/theme/vier/theme.php:253
-#: src/Content/ForumManager.php:125 src/Content/Nav.php:151
-msgid "Forums"
-msgstr "论坛"
-
-#: include/text.php:1075
+#: include/text.php:953
 msgid "poke"
 msgstr "戳"
 
-#: include/text.php:1075
+#: include/text.php:953
 msgid "poked"
 msgstr "戳了"
 
-#: include/text.php:1076
+#: include/text.php:954
 msgid "ping"
 msgstr "砰"
 
-#: include/text.php:1076
+#: include/text.php:954
 msgid "pinged"
 msgstr "砰了"
 
-#: include/text.php:1077
+#: include/text.php:955
 msgid "prod"
 msgstr "柔戳"
 
-#: include/text.php:1077
+#: include/text.php:955
 msgid "prodded"
 msgstr "柔戳了"
 
-#: include/text.php:1078
+#: include/text.php:956
 msgid "slap"
 msgstr "掌击"
 
-#: include/text.php:1078
+#: include/text.php:956
 msgid "slapped"
 msgstr "掌击了"
 
-#: include/text.php:1079
+#: include/text.php:957
 msgid "finger"
 msgstr "指"
 
-#: include/text.php:1079
+#: include/text.php:957
 msgid "fingered"
 msgstr "指了"
 
-#: include/text.php:1080
+#: include/text.php:958
 msgid "rebuff"
 msgstr "拒绝"
 
-#: include/text.php:1080
+#: include/text.php:958
 msgid "rebuffed"
 msgstr "已拒绝"
 
-#: include/text.php:1094 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:1094 src/Model/Event.php:380
+#: include/text.php:972 src/Model/Event.php:389
 msgid "Tuesday"
 msgstr "星期二"
 
-#: include/text.php:1094 src/Model/Event.php:381
+#: include/text.php:972 src/Model/Event.php:390
 msgid "Wednesday"
 msgstr "星期三"
 
-#: include/text.php:1094 src/Model/Event.php:382
+#: include/text.php:972 src/Model/Event.php:391
 msgid "Thursday"
 msgstr "星期四"
 
-#: include/text.php:1094 src/Model/Event.php:383
+#: include/text.php:972 src/Model/Event.php:392
 msgid "Friday"
 msgstr "星期五"
 
-#: include/text.php:1094 src/Model/Event.php:384
+#: include/text.php:972 src/Model/Event.php:393
 msgid "Saturday"
 msgstr "星期六"
 
-#: include/text.php:1094 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:1098 src/Model/Event.php:399
+#: include/text.php:976 src/Model/Event.php:408
 msgid "January"
 msgstr "一月"
 
-#: include/text.php:1098 src/Model/Event.php:400
+#: include/text.php:976 src/Model/Event.php:409
 msgid "February"
 msgstr "二月"
 
-#: include/text.php:1098 src/Model/Event.php:401
+#: include/text.php:976 src/Model/Event.php:410
 msgid "March"
 msgstr "三月"
 
-#: include/text.php:1098 src/Model/Event.php:402
+#: include/text.php:976 src/Model/Event.php:411
 msgid "April"
 msgstr "四月"
 
-#: include/text.php:1098 include/text.php:1115 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:1098 src/Model/Event.php:404
+#: include/text.php:976 src/Model/Event.php:413
 msgid "June"
 msgstr "六月"
 
-#: include/text.php:1098 src/Model/Event.php:405
+#: include/text.php:976 src/Model/Event.php:414
 msgid "July"
 msgstr "七月"
 
-#: include/text.php:1098 src/Model/Event.php:406
+#: include/text.php:976 src/Model/Event.php:415
 msgid "August"
 msgstr "八月"
 
-#: include/text.php:1098 src/Model/Event.php:407
+#: include/text.php:976 src/Model/Event.php:416
 msgid "September"
 msgstr "九月"
 
-#: include/text.php:1098 src/Model/Event.php:408
+#: include/text.php:976 src/Model/Event.php:417
 msgid "October"
 msgstr "十月"
 
-#: include/text.php:1098 src/Model/Event.php:409
+#: include/text.php:976 src/Model/Event.php:418
 msgid "November"
 msgstr "十一月"
 
-#: include/text.php:1098 src/Model/Event.php:410
+#: include/text.php:976 src/Model/Event.php:419
 msgid "December"
 msgstr "十二月"
 
-#: include/text.php:1112 src/Model/Event.php:371
+#: include/text.php:990 src/Model/Event.php:380
 msgid "Mon"
 msgstr "星期一"
 
-#: include/text.php:1112 src/Model/Event.php:372
+#: include/text.php:990 src/Model/Event.php:381
 msgid "Tue"
 msgstr "星期二"
 
-#: include/text.php:1112 src/Model/Event.php:373
+#: include/text.php:990 src/Model/Event.php:382
 msgid "Wed"
 msgstr "星期三"
 
-#: include/text.php:1112 src/Model/Event.php:374
+#: include/text.php:990 src/Model/Event.php:383
 msgid "Thu"
 msgstr "星期四"
 
-#: include/text.php:1112 src/Model/Event.php:375
+#: include/text.php:990 src/Model/Event.php:384
 msgid "Fri"
 msgstr "星期五"
 
-#: include/text.php:1112 src/Model/Event.php:376
+#: include/text.php:990 src/Model/Event.php:385
 msgid "Sat"
 msgstr "星期六"
 
-#: include/text.php:1112 src/Model/Event.php:370
+#: include/text.php:990 src/Model/Event.php:379
 msgid "Sun"
 msgstr "星期日"
 
-#: include/text.php:1115 src/Model/Event.php:386
+#: include/text.php:993 src/Model/Event.php:395
 msgid "Jan"
 msgstr "一月"
 
-#: include/text.php:1115 src/Model/Event.php:387
+#: include/text.php:993 src/Model/Event.php:396
 msgid "Feb"
 msgstr "二月"
 
-#: include/text.php:1115 src/Model/Event.php:388
+#: include/text.php:993 src/Model/Event.php:397
 msgid "Mar"
 msgstr "三月"
 
-#: include/text.php:1115 src/Model/Event.php:389
+#: include/text.php:993 src/Model/Event.php:398
 msgid "Apr"
 msgstr "四月"
 
-#: include/text.php:1115 src/Model/Event.php:392
+#: include/text.php:993 src/Model/Event.php:401
 msgid "Jul"
 msgstr "七月"
 
-#: include/text.php:1115 src/Model/Event.php:393
+#: include/text.php:993 src/Model/Event.php:402
 msgid "Aug"
 msgstr "八月"
 
-#: include/text.php:1115
+#: include/text.php:993
 msgid "Sep"
 msgstr ""
 
-#: include/text.php:1115 src/Model/Event.php:395
+#: include/text.php:993 src/Model/Event.php:404
 msgid "Oct"
 msgstr "十月"
 
-#: include/text.php:1115 src/Model/Event.php:396
+#: include/text.php:993 src/Model/Event.php:405
 msgid "Nov"
 msgstr "十一月"
 
-#: include/text.php:1115 src/Model/Event.php:397
+#: include/text.php:993 src/Model/Event.php:406
 msgid "Dec"
 msgstr "十二月"
 
-#: include/text.php:1255
+#: include/text.php:1139
 #, php-format
 msgid "Content warning: %s"
 msgstr "内容警告：%s"
 
-#: include/text.php:1325 mod/videos.php:380
+#: include/text.php:1204 mod/videos.php:375
 msgid "View Video"
 msgstr "察看视频"
 
-#: include/text.php:1342
+#: include/text.php:1221
 msgid "bytes"
 msgstr "字节"
 
-#: include/text.php:1375 include/text.php:1386 include/text.php:1419
+#: include/text.php:1254 include/text.php:1265 include/text.php:1300
 msgid "Click to open/close"
 msgstr "点击为开关"
 
-#: include/text.php:1534
+#: include/text.php:1415
 msgid "View on separate page"
 msgstr "在另一页面中查看"
 
-#: include/text.php:1535
+#: include/text.php:1416
 msgid "view on separate page"
 msgstr "在另一页面中查看"
 
-#: include/text.php:1540 include/text.php:1547 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:1915
+#: 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:1062 mod/photos.php:1149 mod/photos.php:1166
-#: mod/photos.php:1659 mod/photos.php:1673 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"
@@ -1337,11 +3883,6 @@ msgid ""
 " join."
 msgstr "在你的<em>快速上手</em>页－找到一个简要的对你的简介和网络标签的介绍，创建一些新的连接，并找一些群组加入。"
 
-#: mod/newmember.php:19 mod/admin.php:1935 mod/admin.php:2204
-#: 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 "您的设置"
@@ -1361,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 "上传简历照片"
 
@@ -1451,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 "组"
 
@@ -1491,1556 +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/update_community.php:27 mod/update_display.php:27
-#: mod/update_notes.php:40 mod/update_profile.php:39 mod/update_network.php:33
-msgid "[Embedded content - reload page to view]"
-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/photos.php:1080 mod/photos.php:1160
-#: mod/photos.php:1445 mod/photos.php:1491 mod/photos.php:1530
-#: mod/photos.php:1603 mod/contacts.php:610 mod/events.php:530
-#: 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/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/search.php:98 mod/search.php:104
-#: mod/viewcontacts.php:45 mod/webfinger.php:16 mod/photos.php:932
-#: mod/videos.php:199 mod/directory.php:42 mod/community.php:27
-#: mod/dfrn_request.php:602 mod/display.php:203
-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/search.php:37 mod/network.php:194
-msgid "Remove term"
-msgstr "删除关键字"
-
-#: mod/search.php:46 mod/network.php:201 src/Content/Feature.php:100
-msgid "Saved Searches"
-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:228 mod/community.php:141
-msgid "No results."
-msgstr "没有结果。"
-
-#: mod/search.php:234
-#, php-format
-msgid "Items tagged with: %s"
-msgstr "项目标记为：%s"
-
-#: mod/search.php:236 mod/contacts.php:819
-#, php-format
-msgid "Results for: %s"
-msgstr ""
-
-#: mod/subthread.php:113
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s关注着%2$s的%3$s"
-
-#: 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/photos.php:763 mod/photos.php:766
-#: mod/photos.php:795 mod/profile_photo.php:153
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "图片超过 %s 的大小限制"
-
-#: mod/wall_upload.php:200 mod/photos.php:818 mod/profile_photo.php:162
-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/photos.php:847 mod/profile_photo.php:307
-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/notes.php:52 src/Model/Profile.php:944
-msgid "Personal Notes"
-msgstr "私人便条"
-
-#: mod/photos.php:108 src/Model/Profile.php:905
-msgid "Photo Albums"
-msgstr "相册"
-
-#: mod/photos.php:109 mod/photos.php:1713
-msgid "Recent Photos"
-msgstr "最近的照片"
-
-#: mod/photos.php:112 mod/photos.php:1210 mod/photos.php:1715
-msgid "Upload New Photos"
-msgstr "上传新照片"
-
-#: mod/photos.php:126 mod/settings.php:51
-msgid "everybody"
-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:1161
-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:310 mod/photos.php:321 mod/photos.php:1446
-msgid "Delete Photo"
-msgstr "删除照片"
-
-#: mod/photos.php:319
-msgid "Do you really want to delete this photo?"
-msgstr "您真的想删除这个照相吗？"
-
-#: mod/photos.php:667
-msgid "a photo"
-msgstr "一张照片"
-
-#: mod/photos.php:667
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
-msgstr "%1$s被%3$s标签在%2$s"
-
-#: mod/photos.php:769
-msgid "Image upload didn't complete, please try again"
-msgstr "图片上传未完成，请重试"
-
-#: mod/photos.php:772
-msgid "Image file is missing"
-msgstr "缺少图片文件"
-
-#: mod/photos.php:777
-msgid ""
-"Server can't accept new file upload at this time, please contact your "
-"administrator"
-msgstr "服务器目前无法接受新的上传文件，请联系您的管理员"
-
-#: mod/photos.php:803
-msgid "Image file is empty."
-msgstr "图片文件空的。"
-
-#: mod/photos.php:940
-msgid "No photos selected"
-msgstr "没有照片挑选了"
-
-#: mod/photos.php:1036 mod/videos.php:309
-msgid "Access to this item is restricted."
-msgstr "这个项目使用权限的。"
-
-#: mod/photos.php:1090
-msgid "Upload Photos"
-msgstr "上传照片"
-
-#: mod/photos.php:1094 mod/photos.php:1156
-msgid "New album name: "
-msgstr "新册名："
-
-#: mod/photos.php:1095
-msgid "or existing album name: "
-msgstr "或现有册名"
-
-#: mod/photos.php:1096
-msgid "Do not show a status post for this upload"
-msgstr "别显示现状报到关于这个上传"
-
-#: mod/photos.php:1098 mod/photos.php:1441 mod/events.php:533
-#: src/Core/ACL.php:318
-msgid "Permissions"
-msgstr "权限"
-
-#: mod/photos.php:1106 mod/photos.php:1449 mod/settings.php:1218
-msgid "Show to Groups"
-msgstr "给组表示"
-
-#: mod/photos.php:1107 mod/photos.php:1450 mod/settings.php:1219
-msgid "Show to Contacts"
-msgstr "展示给联系人"
-
-#: mod/photos.php:1167
-msgid "Edit Album"
-msgstr "编照片册"
-
-#: mod/photos.php:1172
-msgid "Show Newest First"
-msgstr "先表示最新的"
-
-#: mod/photos.php:1174
-msgid "Show Oldest First"
-msgstr "先表示最老的"
-
-#: mod/photos.php:1195 mod/photos.php:1698
-msgid "View Photo"
-msgstr "看照片"
-
-#: mod/photos.php:1236
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "无权利。用这个项目可能受限制。"
-
-#: mod/photos.php:1238
-msgid "Photo not available"
-msgstr "不可获得的照片"
-
-#: mod/photos.php:1301
-msgid "View photo"
-msgstr "看照片"
-
-#: mod/photos.php:1301
-msgid "Edit photo"
-msgstr "编辑照片"
-
-#: mod/photos.php:1302
-msgid "Use as profile photo"
-msgstr "用为资料图"
-
-#: mod/photos.php:1308 src/Object/Post.php:149
-msgid "Private Message"
-msgstr "私人的新闻"
-
-#: mod/photos.php:1327
-msgid "View Full Size"
-msgstr "看全尺寸"
-
-#: mod/photos.php:1414
-msgid "Tags: "
-msgstr "标签："
-
-#: mod/photos.php:1417
-msgid "[Remove any tag]"
-msgstr "[删除任何标签]"
-
-#: mod/photos.php:1432
-msgid "New album name"
-msgstr "新册名"
-
-#: mod/photos.php:1433
-msgid "Caption"
-msgstr "字幕"
-
-#: mod/photos.php:1434
-msgid "Add a Tag"
-msgstr "加标签"
-
-#: mod/photos.php:1434
-msgid ""
-"Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr "例子：@zhang, @Zhang_San, @li@example.com, #Beijing, #ktv"
-
-#: mod/photos.php:1435
-msgid "Do not rotate"
-msgstr "不要旋转"
-
-#: mod/photos.php:1436
-msgid "Rotate CW (right)"
-msgstr "顺时针地转动（左）"
-
-#: mod/photos.php:1437
-msgid "Rotate CCW (left)"
-msgstr "反顺时针地转动（右）"
-
-#: mod/photos.php:1471 src/Object/Post.php:304
-msgid "I like this (toggle)"
-msgstr "我喜欢这(交替)"
-
-#: mod/photos.php:1472 src/Object/Post.php:305
-msgid "I don't like this (toggle)"
-msgstr "我不喜欢这(交替)"
-
-#: mod/photos.php:1488 mod/photos.php:1527 mod/photos.php:1600
-#: mod/contacts.php:953 src/Object/Post.php:801
-msgid "This is you"
-msgstr "这是你"
-
-#: mod/photos.php:1490 mod/photos.php:1529 mod/photos.php:1602
-#: src/Object/Post.php:407 src/Object/Post.php:803
-msgid "Comment"
-msgstr "评论"
-
-#: mod/photos.php:1634
-msgid "Map"
-msgstr "地图"
-
-#: mod/photos.php:1704 mod/videos.php:387
-msgid "View Album"
-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 "上传新视频"
-
-#: 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/events.php:395 mod/install.php:156
-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:1288 mod/admin.php:1450
-#: mod/admin.php:1460
-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:1829
-msgid "Unblock"
-msgstr "解除屏蔽"
-
-#: mod/contacts.php:637 mod/contacts.php:827 mod/contacts.php:1011
-#: mod/admin.php:488 mod/admin.php:1828
-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/events.php:518 mod/directory.php:148
-#: 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: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/events.php:532 mod/admin.php:1363
-#: 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: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:1358
-#: mod/admin.php:1994 mod/admin.php:2247 mod/admin.php:2321 mod/admin.php:2468
-#: 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/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:506
-msgid "Event details"
-msgstr "事件细节"
-
-#: mod/events.php:507
-msgid "Starting date and Title are required."
-msgstr "需要开始日期和标题。"
-
-#: mod/events.php:508 mod/events.php:509
-msgid "Event Starts:"
-msgstr "事件开始:"
-
-#: mod/events.php:508 mod/events.php:520 mod/profiles.php:607
-msgid "Required"
-msgstr "必须的"
-
-#: mod/events.php:510 mod/events.php:526
-msgid "Finish date/time is not known or not relevant"
-msgstr "结束日期/时间未知或无关"
-
-#: mod/events.php:512 mod/events.php:513
-msgid "Event Finishes:"
-msgstr "事件结束:"
-
-#: mod/events.php:514 mod/events.php:527
-msgid "Adjust for viewer timezone"
-msgstr "调整为浏览者的时区"
-
-#: mod/events.php:516
-msgid "Description:"
-msgstr "描述："
-
-#: mod/events.php:520 mod/events.php:522
-msgid "Title:"
-msgstr "标题："
-
-#: mod/events.php:523 mod/events.php:524
-msgid "Share this event"
-msgstr "分享这个事件"
-
-#: mod/events.php:531 src/Model/Profile.php:862
-msgid "Basic"
-msgstr "基本"
-
-#: mod/events.php:552
-msgid "Failed to remove event"
-msgstr "删除事件失败"
-
-#: mod/events.php:554
-msgid "Event removed"
-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"
@@ -3056,7 +4049,7 @@ msgid ""
 "\t\tissued this request."
 msgstr ""
 
-#: mod/lostpass.php:56
+#: mod/lostpass.php:57
 #, php-format
 msgid ""
 "\n"
@@ -3073,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"
@@ -3143,7 +4136,7 @@ msgid ""
 "\t\t"
 msgstr ""
 
-#: mod/lostpass.php:155
+#: mod/lostpass.php:158
 #, php-format
 msgid ""
 "\n"
@@ -3157,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"
@@ -3238,837 +4231,165 @@ msgstr "Markdown"
 msgid "HTML"
 msgstr "HTML"
 
-#: 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: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/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/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:639 mod/group.php:216
-msgid "Group is empty"
-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:937
-msgid "Commented Order"
-msgstr "评论时间顺序"
-
-#: mod/network.php:940
-msgid "Sort by Comment Date"
-msgstr "按评论日期顺序排列"
-
-#: mod/network.php:945
-msgid "Posted Order"
-msgstr "发布时间顺序"
-
-#: mod/network.php:948
-msgid "Sort by Post Date"
-msgstr "按发布日期顺序排列"
-
-#: mod/network.php:956 mod/profiles.php:594
-#: src/Core/NotificationsManager.php:185
-msgid "Personal"
-msgstr "私人"
-
-#: mod/network.php:959
-msgid "Posts that mention or involve you"
-msgstr "提及你或你参与的文章"
-
-#: mod/network.php:967
-msgid "New"
-msgstr "新"
-
-#: mod/network.php:970
-msgid "Activity Stream - by date"
-msgstr "活动流－按日期"
-
-#: mod/network.php:978
-msgid "Shared Links"
-msgstr "共享的链接"
-
-#: mod/network.php:981
-msgid "Interesting Links"
-msgstr "有意思的超链接"
-
-#: mod/network.php:989
-msgid "Starred"
-msgstr "被星"
-
-#: mod/network.php:992
-msgid "Favourite Posts"
-msgstr "最喜欢的文章"
-
-#: 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:1811 mod/admin.php:1822
-#: mod/admin.php:1835 mod/admin.php:1851 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/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:229
-msgid "Remove contact from group"
-msgstr ""
-
-#: mod/group.php:253
-msgid "Add contact to group"
-msgstr ""
-
-#: mod/openid.php:29
-msgid "OpenID protocol error. No ID returned."
-msgstr "OpenID协议错误。没ID还。 "
-
-#: mod/openid.php:66
-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
-msgid "Login failed."
-msgstr "登录失败。"
-
-#: 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:722
+#: 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:1357
+#: mod/admin.php:186 mod/admin.php:1425
 msgid "Site"
 msgstr "网站"
 
-#: mod/admin.php:185 mod/admin.php:1289 mod/admin.php:1817 mod/admin.php:1833
+#: 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:1933 mod/admin.php:1993 mod/settings.php:87
-msgid "Addons"
-msgstr "插件"
-
-#: mod/admin.php:187 mod/admin.php:2202 mod/admin.php:2246
+#: 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:757
+#: mod/admin.php:194 mod/admin.php:766
 msgid "Inspect Queue"
+msgstr "检查队列"
+
+#: mod/admin.php:195
+msgid "Inspect worker Queue"
 msgstr ""
 
-#: mod/admin.php:193
+#: 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:2320
+#: mod/admin.php:200 mod/admin.php:201 mod/admin.php:2402
 msgid "Logs"
 msgstr "记录"
 
-#: mod/admin.php:199 mod/admin.php:2387
+#: 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:721 mod/admin.php:756 mod/admin.php:852 mod/admin.php:1356
-#: mod/admin.php:1816 mod/admin.php:1932 mod/admin.php:1992 mod/admin.php:2201
-#: mod/admin.php:2245 mod/admin.php:2319 mod/admin.php:2386
+#: 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 ""
+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 "
@@ -4076,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:1819
+#: 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:568
+#: mod/admin.php:569
 msgid "Item marked for deletion."
 msgstr "被标记为要删除的项目。"
 
-#: mod/admin.php:639
+#: mod/admin.php:640
 msgid "unknown"
 msgstr "未知"
 
-#: mod/admin.php:715
+#: 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:716
+#: 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:728
+#: 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:759
+#: mod/admin.php:768 mod/admin.php:809
 msgid "ID"
 msgstr "ID"
 
-#: mod/admin.php:760
+#: mod/admin.php:769
 msgid "Recipient Name"
 msgstr "接收者的名字"
 
-#: mod/admin.php:761
+#: mod/admin.php:770
 msgid "Recipient Profile"
 msgstr "接收者的简介"
 
-#: mod/admin.php:762 view/theme/frio/theme.php:266
-#: src/Core/NotificationsManager.php:178 src/Content/Nav.php:183
-msgid "Network"
-msgstr "网络"
-
-#: mod/admin.php:763
+#: mod/admin.php:772 mod/admin.php:811
 msgid "Created"
 msgstr "已创建"
 
-#: mod/admin.php:764
+#: mod/admin.php:773
 msgid "Last Tried"
 msgstr "上次尝试"
 
-#: mod/admin.php:765
+#: 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:789
+#: 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 "
@@ -4292,488 +4636,521 @@ msgid ""
 " an automatic conversion.<br />"
 msgstr ""
 
-#: mod/admin.php:796
+#: 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:806
+#: 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:812
+#: mod/admin.php:860
 msgid "The worker was never executed. Please check your database structure!"
 msgstr ""
 
-#: mod/admin.php:815
+#: 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:820
+#: 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:821
+#: mod/admin.php:883
 msgid "Automatic Follower Account"
 msgstr ""
 
-#: mod/admin.php:822
+#: mod/admin.php:884
 msgid "Public Forum Account"
 msgstr ""
 
-#: mod/admin.php:823
+#: mod/admin.php:885
 msgid "Automatic Friend Account"
 msgstr "自动朋友帐户"
 
-#: mod/admin.php:824
+#: mod/admin.php:886
 msgid "Blog Account"
 msgstr "博客账户"
 
-#: mod/admin.php:825
+#: mod/admin.php:887
 msgid "Private Forum Account"
 msgstr ""
 
-#: mod/admin.php:847
+#: mod/admin.php:909
 msgid "Message queues"
 msgstr "通知排队"
 
-#: mod/admin.php:853
+#: mod/admin.php:915
 msgid "Summary"
 msgstr "概要"
 
-#: mod/admin.php:855
+#: mod/admin.php:917
 msgid "Registered users"
 msgstr "注册的用户"
 
-#: mod/admin.php:857
+#: mod/admin.php:919
 msgid "Pending registrations"
 msgstr "未决的注册"
 
-#: mod/admin.php:858
+#: mod/admin.php:920
 msgid "Version"
 msgstr "版本"
 
-#: mod/admin.php:863
+#: mod/admin.php:925
 msgid "Active addons"
 msgstr "激活插件"
 
-#: mod/admin.php:894
+#: mod/admin.php:956
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr "不能分析基础URL。至少要<scheme>://<domain>"
 
-#: mod/admin.php:1224
+#: mod/admin.php:1289
 msgid "Site settings updated."
 msgstr "网站设置更新了。"
 
-#: mod/admin.php:1251 mod/settings.php:897
-msgid "No special theme for mobile devices"
-msgstr "没专门适合手机的主题"
-
-#: mod/admin.php:1280
+#: mod/admin.php:1345
 msgid "No community page for local users"
 msgstr ""
 
-#: mod/admin.php:1281
+#: mod/admin.php:1346
 msgid "No community page"
 msgstr "没有社会页"
 
-#: mod/admin.php:1282
+#: mod/admin.php:1347
 msgid "Public postings from users of this site"
 msgstr "本网站用户的公开文章"
 
-#: mod/admin.php:1283
+#: mod/admin.php:1348
 msgid "Public postings from the federated network"
 msgstr ""
 
-#: mod/admin.php:1284
+#: mod/admin.php:1349
 msgid "Public postings from local users and the federated network"
 msgstr ""
 
-#: mod/admin.php:1290
+#: 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:1291
+#: mod/admin.php:1356
 msgid "Users, Global Contacts/fallback"
 msgstr ""
 
-#: mod/admin.php:1295
+#: mod/admin.php:1360
 msgid "One month"
 msgstr "一个月"
 
-#: mod/admin.php:1296
+#: mod/admin.php:1361
 msgid "Three months"
 msgstr "三个月"
 
-#: mod/admin.php:1297
+#: mod/admin.php:1362
 msgid "Half a year"
 msgstr "半年"
 
-#: mod/admin.php:1298
+#: mod/admin.php:1363
 msgid "One year"
 msgstr "一年"
 
-#: mod/admin.php:1303
+#: mod/admin.php:1368
 msgid "Multi user instance"
 msgstr "多用户网站"
 
-#: mod/admin.php:1326
+#: mod/admin.php:1394
 msgid "Closed"
 msgstr "关闭"
 
-#: mod/admin.php:1327
+#: mod/admin.php:1395
 msgid "Requires approval"
 msgstr "要批准"
 
-#: mod/admin.php:1328
+#: mod/admin.php:1396
 msgid "Open"
 msgstr "打开"
 
-#: mod/admin.php:1332
+#: mod/admin.php:1400
 msgid "No SSL policy, links will track page SSL state"
 msgstr "没SSL方针，环节将追踪页SSL现状"
 
-#: mod/admin.php:1333
+#: mod/admin.php:1401
 msgid "Force all links to use SSL"
 msgstr "强制所有链接使用 SSL"
 
-#: mod/admin.php:1334
+#: mod/admin.php:1402
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "自签证书，只在本地链接使用 SSL（不推荐）"
 
-#: mod/admin.php:1338
+#: mod/admin.php:1406
 msgid "Don't check"
 msgstr "请勿检查"
 
-#: mod/admin.php:1339
+#: mod/admin.php:1407
 msgid "check the stable version"
 msgstr "检查稳定版"
 
-#: mod/admin.php:1340
+#: mod/admin.php:1408
 msgid "check the development version"
 msgstr "检查开发版本"
 
-#: mod/admin.php:1359
+#: mod/admin.php:1427
 msgid "Republish users to directory"
 msgstr ""
 
-#: mod/admin.php:1360 mod/register.php:267
-msgid "Registration"
-msgstr "注册"
-
-#: mod/admin.php:1361
+#: mod/admin.php:1429
 msgid "File upload"
 msgstr "文件上传"
 
-#: mod/admin.php:1362
+#: mod/admin.php:1430
 msgid "Policies"
 msgstr "政策"
 
-#: mod/admin.php:1364
+#: 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:1365
+#: mod/admin.php:1433
 msgid "Performance"
 msgstr "性能"
 
-#: mod/admin.php:1366
+#: mod/admin.php:1434
 msgid "Worker"
 msgstr ""
 
-#: mod/admin.php:1367
+#: mod/admin.php:1435
 msgid "Message Relay"
 msgstr "讯息中继"
 
-#: mod/admin.php:1368
+#: mod/admin.php:1436
 msgid ""
 "Relocate - WARNING: advanced function. Could make this server unreachable."
 msgstr "重定位 - 警告：高级功能。可能会让这个服务器不可达。"
 
-#: mod/admin.php:1371
+#: mod/admin.php:1439
 msgid "Site name"
 msgstr "网页名字"
 
-#: mod/admin.php:1372
+#: mod/admin.php:1440
 msgid "Host name"
 msgstr "服务器名"
 
-#: mod/admin.php:1373
+#: mod/admin.php:1441
 msgid "Sender Email"
 msgstr "寄主邮件"
 
-#: mod/admin.php:1373
+#: mod/admin.php:1441
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr ""
 
-#: mod/admin.php:1374
+#: mod/admin.php:1442
 msgid "Banner/Logo"
 msgstr "标题/标志"
 
-#: mod/admin.php:1375
+#: mod/admin.php:1443
 msgid "Shortcut icon"
 msgstr "捷径小图片"
 
-#: mod/admin.php:1375
+#: mod/admin.php:1443
 msgid "Link to an icon that will be used for browsers."
 msgstr ""
 
-#: mod/admin.php:1376
+#: mod/admin.php:1444
 msgid "Touch icon"
 msgstr "触摸小图片"
 
-#: mod/admin.php:1376
+#: mod/admin.php:1444
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr ""
 
-#: mod/admin.php:1377
+#: mod/admin.php:1445
 msgid "Additional Info"
 msgstr "别的消息"
 
-#: mod/admin.php:1377
+#: 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:1378
+#: mod/admin.php:1446
 msgid "System language"
 msgstr "系统语言"
 
-#: mod/admin.php:1379
+#: mod/admin.php:1447
 msgid "System theme"
 msgstr "系统主题"
 
-#: mod/admin.php:1379
+#: 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:1380
+#: mod/admin.php:1448
 msgid "Mobile system theme"
 msgstr "手机系统主题"
 
-#: mod/admin.php:1380
+#: mod/admin.php:1448
 msgid "Theme for mobile devices"
 msgstr "用于移动设备的主题"
 
-#: mod/admin.php:1381
+#: mod/admin.php:1449
 msgid "SSL link policy"
 msgstr "SSL环节方针"
 
-#: mod/admin.php:1381
+#: mod/admin.php:1449
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "决定产生的链接是否应该强制使用 SSL"
 
-#: mod/admin.php:1382
+#: mod/admin.php:1450
 msgid "Force SSL"
 msgstr "强制使用 SSL"
 
-#: mod/admin.php:1382
+#: 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:1383
+#: mod/admin.php:1451
 msgid "Hide help entry from navigation menu"
 msgstr "在导航菜单隐藏帮助条目"
 
-#: mod/admin.php:1383
+#: 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:1384
+#: mod/admin.php:1452
 msgid "Single user instance"
 msgstr "单用户网站"
 
-#: mod/admin.php:1384
+#: mod/admin.php:1452
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "弄这网站多用户或单用户为选择的用户"
 
-#: mod/admin.php:1385
+#: mod/admin.php:1453
 msgid "Maximum image size"
 msgstr "图片最大尺寸"
 
-#: mod/admin.php:1385
+#: mod/admin.php:1453
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "最多上传照相的字节。默认是零，意思是无限。"
 
-#: mod/admin.php:1386
+#: mod/admin.php:1454
 msgid "Maximum image length"
 msgstr "最大图片大小"
 
-#: mod/admin.php:1386
+#: 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:1387
+#: mod/admin.php:1455
 msgid "JPEG image quality"
 msgstr "JPEG 图片质量"
 
-#: mod/admin.php:1387
+#: 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:1389
+#: mod/admin.php:1457
 msgid "Register policy"
 msgstr "注册政策"
 
-#: mod/admin.php:1390
+#: mod/admin.php:1458
 msgid "Maximum Daily Registrations"
 msgstr "一天最多注册"
 
-#: mod/admin.php:1390
+#: 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:1391
+#: mod/admin.php:1459
 msgid "Register text"
 msgstr "注册正文"
 
-#: mod/admin.php:1391
+#: mod/admin.php:1459
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
 msgstr ""
 
-#: mod/admin.php:1392
+#: 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:1392
+#: 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:1393
+#: mod/admin.php:1462
 msgid "Allowed friend domains"
 msgstr "允许的朋友域"
 
-#: mod/admin.php:1393
+#: 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:1394
+#: mod/admin.php:1463
 msgid "Allowed email domains"
 msgstr "允许的电子邮件域"
 
-#: mod/admin.php:1394
+#: 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:1395
+#: mod/admin.php:1464
 msgid "No OEmbed rich content"
 msgstr ""
 
-#: mod/admin.php:1395
+#: 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:1396
+#: mod/admin.php:1465
 msgid "Allowed OEmbed domains"
 msgstr ""
 
-#: mod/admin.php:1396
+#: 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:1397
+#: mod/admin.php:1466
 msgid "Block public"
 msgstr ""
 
-#: mod/admin.php:1397
+#: 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:1398
+#: mod/admin.php:1467
 msgid "Force publish"
 msgstr "强行发布"
 
-#: mod/admin.php:1398
+#: mod/admin.php:1467
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "让所有这网站的的简介表明在网站目录。"
 
-#: mod/admin.php:1399
+#: mod/admin.php:1467
+msgid "Enabling this may violate privacy laws like the GDPR"
+msgstr "启用此项可能会违反隐私法律，譬如 GDPR 等"
+
+#: mod/admin.php:1468
 msgid "Global directory URL"
 msgstr ""
 
-#: mod/admin.php:1399
+#: 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:1400
+#: mod/admin.php:1469
 msgid "Private posts by default for new users"
 msgstr "新用户默认写私人文章"
 
-#: mod/admin.php:1400
+#: 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:1401
+#: mod/admin.php:1470
 msgid "Don't include post content in email notifications"
 msgstr "别包含文章内容在邮件消息"
 
-#: mod/admin.php:1401
+#: 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:1402
+#: mod/admin.php:1471
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr "不允许插件的公众使用权在应用选单。"
 
-#: mod/admin.php:1402
+#: mod/admin.php:1471
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr "复选这个框为把应用选内插件限制仅成员"
 
-#: mod/admin.php:1403
+#: mod/admin.php:1472
 msgid "Don't embed private images in posts"
 msgstr "别嵌入私人图案在文章里"
 
-#: mod/admin.php:1403
+#: 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 "
@@ -4781,210 +5158,223 @@ msgid ""
 "while."
 msgstr "别把复制嵌入的照相代替本网站的私人照相在文章里。结果是收包括私人照相的熟人要认证才卸载个张照片，会花许久。"
 
-#: mod/admin.php:1404
+#: 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:1404
+#: 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:1405
+#: mod/admin.php:1475
 msgid "Block multiple registrations"
 msgstr "阻止多次注册"
 
-#: mod/admin.php:1405
+#: mod/admin.php:1475
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "不允许用户注册别的账户为当页。"
 
-#: mod/admin.php:1406
+#: mod/admin.php:1476
 msgid "OpenID support"
 msgstr "OpenID 支持"
 
-#: mod/admin.php:1406
+#: mod/admin.php:1476
 msgid "OpenID support for registration and logins."
 msgstr "支持使用 OpenID 注册和登录。"
 
-#: mod/admin.php:1407
+#: mod/admin.php:1477
 msgid "Fullname check"
 msgstr "全名核实"
 
-#: mod/admin.php:1407
+#: 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:1408
+#: mod/admin.php:1478
 msgid "Community pages for visitors"
 msgstr ""
 
-#: mod/admin.php:1408
+#: mod/admin.php:1478
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
 msgstr ""
 
-#: mod/admin.php:1409
+#: mod/admin.php:1479
 msgid "Posts per user on community page"
 msgstr "个用户文章数量在社会页"
 
-#: mod/admin.php:1409
+#: 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:1410
+#: mod/admin.php:1480
 msgid "Enable OStatus support"
 msgstr "启用 OStatus 支持"
 
-#: mod/admin.php:1410
+#: 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:1411
+#: mod/admin.php:1481
 msgid "Only import OStatus threads from our contacts"
 msgstr ""
 
-#: mod/admin.php:1411
+#: 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:1412
+#: mod/admin.php:1482
 msgid "OStatus support can only be enabled if threading is enabled."
 msgstr ""
 
-#: mod/admin.php:1414
+#: 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:1415
+#: mod/admin.php:1485
 msgid "Enable Diaspora support"
 msgstr "启用 Diaspora 支持"
 
-#: mod/admin.php:1415
+#: mod/admin.php:1485
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "提供内置的 Diaspora 网络兼容性。"
 
-#: mod/admin.php:1416
+#: mod/admin.php:1486
 msgid "Only allow Friendica contacts"
 msgstr "只允许 Friendica 联系人"
 
-#: mod/admin.php:1416
+#: mod/admin.php:1486
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "所有联系人必须使用 Friendica 协议 。所有其他内置沟通协议都已停用。"
 
-#: mod/admin.php:1417
+#: mod/admin.php:1487
 msgid "Verify SSL"
 msgstr "验证 SSL"
 
-#: mod/admin.php:1417
+#: 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:1418
+#: mod/admin.php:1488
 msgid "Proxy user"
 msgstr "代理用户"
 
-#: mod/admin.php:1419
+#: mod/admin.php:1489
 msgid "Proxy URL"
 msgstr "代理URL"
 
-#: mod/admin.php:1420
+#: mod/admin.php:1490
 msgid "Network timeout"
 msgstr "网络超时"
 
-#: mod/admin.php:1420
+#: mod/admin.php:1490
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "输入秒数。输入零为无限（不推荐的）。"
 
-#: mod/admin.php:1421
+#: mod/admin.php:1491
 msgid "Maximum Load Average"
 msgstr "最大平均负荷"
 
-#: mod/admin.php:1421
+#: mod/admin.php:1491
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "系统负荷平均以上转播和检查行程会被耽误－默认50。"
 
-#: mod/admin.php:1422
+#: mod/admin.php:1492
 msgid "Maximum Load Average (Frontend)"
 msgstr ""
 
-#: mod/admin.php:1422
+#: mod/admin.php:1492
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr ""
 
-#: mod/admin.php:1423
+#: mod/admin.php:1493
 msgid "Minimal Memory"
 msgstr "最少内存"
 
-#: mod/admin.php:1423
+#: 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:1424
+#: mod/admin.php:1494
 msgid "Maximum table size for optimization"
 msgstr ""
 
-#: mod/admin.php:1424
+#: mod/admin.php:1494
 msgid ""
 "Maximum table size (in MB) for the automatic optimization. Enter -1 to "
 "disable it."
 msgstr ""
 
-#: mod/admin.php:1425
+#: mod/admin.php:1495
 msgid "Minimum level of fragmentation"
 msgstr ""
 
-#: mod/admin.php:1425
+#: mod/admin.php:1495
 msgid ""
 "Minimum fragmenation level to start the automatic optimization - default "
 "value is 30%."
 msgstr ""
 
-#: mod/admin.php:1427
+#: mod/admin.php:1497
 msgid "Periodical check of global contacts"
-msgstr ""
+msgstr "定期检查全球联系人"
 
-#: mod/admin.php:1427
+#: 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:1428
+#: mod/admin.php:1498
 msgid "Days between requery"
 msgstr "重新查询间隔天数"
 
-#: mod/admin.php:1428
+#: mod/admin.php:1498
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr ""
 
-#: mod/admin.php:1429
+#: mod/admin.php:1499
 msgid "Discover contacts from other servers"
 msgstr "从其他服务器上发现联系人"
 
-#: mod/admin.php:1429
+#: 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 "
@@ -4994,32 +5384,32 @@ msgid ""
 "Global Contacts'."
 msgstr ""
 
-#: mod/admin.php:1430
+#: mod/admin.php:1500
 msgid "Timeframe for fetching global contacts"
 msgstr ""
 
-#: mod/admin.php:1430
+#: 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:1431
+#: mod/admin.php:1501
 msgid "Search the local directory"
 msgstr "搜索本地目录"
 
-#: mod/admin.php:1431
+#: 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:1433
+#: mod/admin.php:1503
 msgid "Publish server information"
 msgstr "发布服务器信息"
 
-#: mod/admin.php:1433
+#: 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 "
@@ -5027,50 +5417,50 @@ msgid ""
 " href='http://the-federation.info/'>the-federation.info</a> for details."
 msgstr ""
 
-#: mod/admin.php:1435
+#: mod/admin.php:1505
 msgid "Check upstream version"
 msgstr "检查上游版本"
 
-#: mod/admin.php:1435
+#: 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:1436
+#: mod/admin.php:1506
 msgid "Suppress Tags"
 msgstr "压制标签"
 
-#: mod/admin.php:1436
+#: mod/admin.php:1506
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr "不在文章末尾显示主题标签列表。"
 
-#: mod/admin.php:1437
+#: mod/admin.php:1507
 msgid "Clean database"
-msgstr ""
+msgstr "清理数据库"
 
-#: mod/admin.php:1437
+#: mod/admin.php:1507
 msgid ""
 "Remove old remote items, orphaned database records and old content from some"
 " other helper tables."
 msgstr ""
 
-#: mod/admin.php:1438
+#: mod/admin.php:1508
 msgid "Lifespan of remote items"
 msgstr ""
 
-#: mod/admin.php:1438
+#: 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:1439
+#: mod/admin.php:1509
 msgid "Lifespan of unclaimed items"
 msgstr ""
 
-#: mod/admin.php:1439
+#: 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. "
@@ -5078,129 +5468,130 @@ msgid ""
 "items if set to 0."
 msgstr ""
 
-#: mod/admin.php:1440
+#: mod/admin.php:1510
 msgid "Path to item cache"
 msgstr "路线到项目缓存"
 
-#: mod/admin.php:1440
+#: mod/admin.php:1510
 msgid "The item caches buffers generated bbcode and external images."
 msgstr ""
 
-#: mod/admin.php:1441
+#: mod/admin.php:1511
 msgid "Cache duration in seconds"
 msgstr "缓存时间秒"
 
-#: mod/admin.php:1441
+#: 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:1442
+#: mod/admin.php:1512
 msgid "Maximum numbers of comments per post"
 msgstr "文件最多评论"
 
-#: mod/admin.php:1442
+#: mod/admin.php:1512
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr ""
 
-#: mod/admin.php:1443
+#: mod/admin.php:1513
 msgid "Temp path"
 msgstr "临时文件路线"
 
-#: mod/admin.php:1443
+#: 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:1444
+#: mod/admin.php:1514
 msgid "Base path to installation"
 msgstr "基础安装路线"
 
-#: mod/admin.php:1444
+#: 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:1445
+#: mod/admin.php:1515
 msgid "Disable picture proxy"
 msgstr "停用图片代理"
 
-#: mod/admin.php:1445
+#: mod/admin.php:1515
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
-" systems with very low bandwith."
+" systems with very low bandwidth."
 msgstr ""
 
-#: mod/admin.php:1446
+#: mod/admin.php:1516
 msgid "Only search in tags"
-msgstr ""
+msgstr "只在标签项内搜索"
 
-#: mod/admin.php:1446
+#: mod/admin.php:1516
 msgid "On large systems the text search can slow down the system extremely."
 msgstr "在大型系统中，正文搜索会极大降低系统运行速度。"
 
-#: mod/admin.php:1448
+#: mod/admin.php:1518
 msgid "New base url"
 msgstr "新基础URL"
 
-#: mod/admin.php:1448
+#: 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:1450
+#: mod/admin.php:1520
 msgid "RINO Encryption"
 msgstr "RINO 加密"
 
-#: mod/admin.php:1450
+#: mod/admin.php:1520
 msgid "Encryption layer between nodes."
 msgstr "节点之间的加密层。"
 
-#: mod/admin.php:1450
+#: mod/admin.php:1520
 msgid "Enabled"
 msgstr "已启用"
 
-#: mod/admin.php:1452
+#: mod/admin.php:1522
 msgid "Maximum number of parallel workers"
 msgstr ""
 
-#: mod/admin.php:1452
+#: 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:1453
+#: mod/admin.php:1523
 msgid "Don't use 'proc_open' with the worker"
 msgstr ""
 
-#: mod/admin.php:1453
+#: 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:1454
+#: mod/admin.php:1524
 msgid "Enable fastlane"
 msgstr "启用快车道模式"
 
-#: mod/admin.php:1454
+#: 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:1455
+#: mod/admin.php:1525
 msgid "Enable frontend worker"
 msgstr ""
 
-#: mod/admin.php:1455
+#: mod/admin.php:1525
 #, php-format
 msgid ""
 "When enabled the Worker process is triggered when backend access is "
@@ -5210,132 +5601,136 @@ msgid ""
 " on your server."
 msgstr ""
 
-#: mod/admin.php:1457
+#: mod/admin.php:1527
 msgid "Subscribe to relay"
 msgstr ""
 
-#: mod/admin.php:1457
+#: 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:1458
+#: mod/admin.php:1528
 msgid "Relay server"
 msgstr "中继服务器"
 
-#: mod/admin.php:1458
+#: 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:1459
+#: mod/admin.php:1529
 msgid "Direct relay transfer"
 msgstr ""
 
-#: mod/admin.php:1459
+#: mod/admin.php:1529
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr ""
 
-#: mod/admin.php:1460
+#: mod/admin.php:1530
 msgid "Relay scope"
 msgstr ""
 
-#: mod/admin.php:1460
+#: 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:1460
+#: mod/admin.php:1530
 msgid "all"
-msgstr ""
+msgstr "所有"
 
-#: mod/admin.php:1460
+#: mod/admin.php:1530
 msgid "tags"
 msgstr ""
 
-#: mod/admin.php:1461
+#: mod/admin.php:1531
 msgid "Server tags"
 msgstr ""
 
-#: mod/admin.php:1461
+#: mod/admin.php:1531
 msgid "Comma separated list of tags for the 'tags' subscription."
 msgstr ""
 
-#: mod/admin.php:1462
+#: mod/admin.php:1532
 msgid "Allow user tags"
 msgstr ""
 
-#: mod/admin.php:1462
+#: 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:1490
+#: mod/admin.php:1535
+msgid "Start Relocation"
+msgstr ""
+
+#: mod/admin.php:1561
 msgid "Update has been marked successful"
 msgstr "更新当成功标签了"
 
-#: mod/admin.php:1497
+#: mod/admin.php:1568
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr ""
 
-#: mod/admin.php:1500
+#: mod/admin.php:1571
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr ""
 
-#: mod/admin.php:1513
+#: mod/admin.php:1587
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr "执行 %s 失败，错误：%s"
 
-#: mod/admin.php:1515
+#: mod/admin.php:1589
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "把%s更新成功地实行。"
 
-#: mod/admin.php:1518
+#: mod/admin.php:1592
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "%s更新没回答现状。不知道是否成功。"
 
-#: mod/admin.php:1521
+#: mod/admin.php:1595
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr ""
 
-#: mod/admin.php:1541
+#: mod/admin.php:1618
 msgid "No failed updates."
 msgstr "没有不通过地更新。"
 
-#: mod/admin.php:1542
+#: mod/admin.php:1619
 msgid "Check database structure"
 msgstr "检查数据库结构"
 
-#: mod/admin.php:1547
+#: mod/admin.php:1624
 msgid "Failed Updates"
 msgstr "没通过的更新"
 
-#: mod/admin.php:1548
+#: mod/admin.php:1625
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "这个不包括1139号更新之前，它们没回答装线。"
 
-#: mod/admin.php:1549
+#: mod/admin.php:1626
 msgid "Mark success (if update was manually applied)"
 msgstr "标注成功（如果手动地把更新实行了）"
 
-#: mod/admin.php:1550
+#: mod/admin.php:1627
 msgid "Attempt to execute this update step automatically"
 msgstr "试图自动地把这步更新实行"
 
-#: mod/admin.php:1589
+#: mod/admin.php:1666
 #, php-format
 msgid ""
 "\n"
@@ -5343,7 +5738,7 @@ msgid ""
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr ""
 
-#: mod/admin.php:1592
+#: mod/admin.php:1669
 #, php-format
 msgid ""
 "\n"
@@ -5375,206 +5770,174 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr ""
 
-#: mod/admin.php:1626 src/Model/User.php:663
+#: mod/admin.php:1706 src/Model/User.php:707
 #, php-format
 msgid "Registration details for %s"
 msgstr "注册信息为%s"
 
-#: mod/admin.php:1636
+#: mod/admin.php:1716
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 
-#: mod/admin.php:1642
+#: mod/admin.php:1722
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] "%s 用户被删除了"
 
-#: mod/admin.php:1689
+#: mod/admin.php:1769
 #, php-format
 msgid "User '%s' deleted"
 msgstr "用户 '%s' 被删除了"
 
-#: mod/admin.php:1697
+#: mod/admin.php:1777
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "用户“%s”已解除屏蔽"
 
-#: mod/admin.php:1697
+#: mod/admin.php:1777
 #, php-format
 msgid "User '%s' blocked"
 msgstr "用户“%s”已屏蔽"
 
-#: mod/admin.php:1754 mod/settings.php:1058
-msgid "Normal Account Page"
-msgstr "标准账户页面"
-
-#: mod/admin.php:1755 mod/settings.php:1062
-msgid "Soapbox Page"
-msgstr "演讲台页"
-
-#: mod/admin.php:1756 mod/settings.php:1066
-msgid "Public Forum"
-msgstr "公共论坛"
-
-#: mod/admin.php:1757 mod/settings.php:1070
-msgid "Automatic Friend Page"
-msgstr "自动朋友页"
-
-#: mod/admin.php:1758
+#: mod/admin.php:1838
 msgid "Private Forum"
 msgstr ""
 
-#: mod/admin.php:1761 mod/settings.php:1042
-msgid "Personal Page"
-msgstr "个人页面"
-
-#: mod/admin.php:1762 mod/settings.php:1046
-msgid "Organisation Page"
-msgstr "组织页面"
-
-#: mod/admin.php:1763 mod/settings.php:1050
-msgid "News Page"
-msgstr "新闻页面"
-
-#: mod/admin.php:1764 mod/settings.php:1054
-msgid "Community Forum"
-msgstr "社区论坛"
-
-#: mod/admin.php:1811 mod/admin.php:1822 mod/admin.php:1835 mod/admin.php:1853
-#: 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:1811 mod/admin.php:1835
+#: mod/admin.php:1890 mod/admin.php:1915
 msgid "Register date"
 msgstr "注册日期"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1890 mod/admin.php:1915
 msgid "Last login"
 msgstr "上次登录"
 
-#: mod/admin.php:1811 mod/admin.php:1835
+#: mod/admin.php:1890 mod/admin.php:1915
 msgid "Last item"
 msgstr "上项目"
 
-#: mod/admin.php:1811
+#: mod/admin.php:1890
 msgid "Type"
 msgstr ""
 
-#: mod/admin.php:1818
+#: mod/admin.php:1897
 msgid "Add User"
 msgstr "添加用户"
 
-#: mod/admin.php:1820
+#: mod/admin.php:1899
 msgid "User registrations waiting for confirm"
 msgstr "用户注册等待确认"
 
-#: mod/admin.php:1821
+#: mod/admin.php:1900
 msgid "User waiting for permanent deletion"
 msgstr "用户等待长久删除"
 
-#: mod/admin.php:1822
+#: mod/admin.php:1901
 msgid "Request date"
 msgstr "要求日期"
 
-#: mod/admin.php:1823
+#: mod/admin.php:1902
 msgid "No registrations."
 msgstr "没有注册。"
 
-#: mod/admin.php:1824
+#: mod/admin.php:1903
 msgid "Note from the user"
 msgstr ""
 
-#: mod/admin.php:1825 mod/notifications.php:178 mod/notifications.php:262
-msgid "Approve"
-msgstr "批准"
-
-#: mod/admin.php:1826
+#: mod/admin.php:1905
 msgid "Deny"
 msgstr "否定"
 
-#: mod/admin.php:1830
+#: mod/admin.php:1908
+msgid "User blocked"
+msgstr ""
+
+#: mod/admin.php:1910
 msgid "Site admin"
 msgstr "网站管理员"
 
-#: mod/admin.php:1831
+#: mod/admin.php:1911
 msgid "Account expired"
 msgstr "帐户过期了"
 
-#: mod/admin.php:1834
+#: mod/admin.php:1914
 msgid "New User"
 msgstr "新用户"
 
-#: mod/admin.php:1835
+#: mod/admin.php:1915
 msgid "Deleted since"
 msgstr "删除从"
 
-#: mod/admin.php:1840
+#: 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:1841
+#: 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:1851
+#: mod/admin.php:1931
 msgid "Name of the new user."
 msgstr "新用户的名字。"
 
-#: mod/admin.php:1852
+#: mod/admin.php:1932
 msgid "Nickname"
 msgstr "昵称"
 
-#: mod/admin.php:1852
+#: mod/admin.php:1932
 msgid "Nickname of the new user."
 msgstr "新用户的昵称。"
 
-#: mod/admin.php:1853
+#: mod/admin.php:1933
 msgid "Email address of the new user."
 msgstr "新用户的邮件地址。"
 
-#: mod/admin.php:1895
+#: mod/admin.php:1975
 #, php-format
 msgid "Addon %s disabled."
 msgstr "插件 %s 已禁用。"
 
-#: mod/admin.php:1899
+#: mod/admin.php:1979
 #, php-format
 msgid "Addon %s enabled."
 msgstr "插件 %s 已启用。"
 
-#: mod/admin.php:1909 mod/admin.php:2158
+#: mod/admin.php:1989 mod/admin.php:2238
 msgid "Disable"
 msgstr "停用"
 
-#: mod/admin.php:1912 mod/admin.php:2161
+#: mod/admin.php:1992 mod/admin.php:2241
 msgid "Enable"
 msgstr "使能用"
 
-#: mod/admin.php:1934 mod/admin.php:2203
+#: mod/admin.php:2014 mod/admin.php:2284
 msgid "Toggle"
 msgstr "肘节"
 
-#: mod/admin.php:1942 mod/admin.php:2212
+#: mod/admin.php:2022 mod/admin.php:2293
 msgid "Author: "
 msgstr "作者："
 
-#: mod/admin.php:1943 mod/admin.php:2213
+#: mod/admin.php:2023 mod/admin.php:2294
 msgid "Maintainer: "
 msgstr "维护者："
 
-#: mod/admin.php:1995
+#: mod/admin.php:2075
 msgid "Reload active addons"
 msgstr "重新加载可用插件"
 
-#: mod/admin.php:2000
+#: mod/admin.php:2080
 #, php-format
 msgid ""
 "There are currently no addons available on your node. You can find the "
@@ -5582,596 +5945,1371 @@ msgid ""
 " the open addon registry at %2$s"
 msgstr "目前您的节点上没有可用插件。您可以在 %1$s 找到官方插件库，或者到开放的插件登记处 %2$s 也能找到其他有趣的插件"
 
-#: mod/admin.php:2120
+#: mod/admin.php:2200
 msgid "No themes found."
 msgstr "找不到主题。"
 
-#: mod/admin.php:2194
+#: mod/admin.php:2275
 msgid "Screenshot"
 msgstr "截图"
 
-#: mod/admin.php:2248
+#: mod/admin.php:2329
 msgid "Reload active themes"
 msgstr "重载活动的主题"
 
-#: mod/admin.php:2253
+#: 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:2254
+#: mod/admin.php:2335
 msgid "[Experimental]"
 msgstr "［试验］"
 
-#: mod/admin.php:2255
+#: mod/admin.php:2336
 msgid "[Unsupported]"
 msgstr "［没支持］"
 
-#: mod/admin.php:2279
+#: mod/admin.php:2360
 msgid "Log settings updated."
 msgstr "日志设置更新了。"
 
-#: mod/admin.php:2311
+#: mod/admin.php:2393
 msgid "PHP log currently enabled."
 msgstr "PHP 日志已启用。"
 
-#: mod/admin.php:2313
+#: mod/admin.php:2395
 msgid "PHP log currently disabled."
 msgstr "PHP 日志已禁用。"
 
-#: mod/admin.php:2322
+#: mod/admin.php:2404
 msgid "Clear"
 msgstr "清理出"
 
-#: mod/admin.php:2326
+#: mod/admin.php:2408
 msgid "Enable Debugging"
 msgstr "启用调试"
 
-#: mod/admin.php:2327
+#: mod/admin.php:2409
 msgid "Log file"
 msgstr "日志文件"
 
-#: mod/admin.php:2327
+#: mod/admin.php:2409
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "必要被网页服务器可写的。相对Friendica主文件夹。"
 
-#: mod/admin.php:2328
+#: mod/admin.php:2410
 msgid "Log level"
 msgstr "日志级别"
 
-#: mod/admin.php:2330
+#: mod/admin.php:2412
 msgid "PHP logging"
 msgstr "PHP 日志"
 
-#: mod/admin.php:2331
+#: 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:2362
+#: 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:2366
+#: 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:2457 mod/admin.php:2458 mod/settings.php:767
-msgid "Off"
-msgstr "关"
-
-#: mod/admin.php:2457 mod/admin.php:2458 mod/settings.php:767
-msgid "On"
-msgstr "开"
-
-#: mod/admin.php:2458
+#: mod/admin.php:2540
 #, php-format
 msgid "Lock feature %s"
 msgstr "锁定特性 %s"
 
-#: mod/admin.php:2466
+#: mod/admin.php:2548
 msgid "Manage Additional Features"
 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/openid.php:29
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID协议错误。没ID还。 "
 
-#: mod/dfrn_confirm.php:130
+#: mod/openid.php:66
 msgid ""
-"This may occasionally happen if contact was requested by both persons and it"
-" has already been approved."
-msgstr "这会偶尔地发生熟人双方都要求和已经批准的时候。"
+"Account not found and OpenID registration is not permitted on this site."
+msgstr "找不到账户和OpenID注册不允许。"
 
-#: 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/openid.php:116 src/Module/Login.php:85 src/Module/Login.php:134
+msgid "Login failed."
+msgstr "登录失败。"
 
 #: mod/dfrn_request.php:94
 msgid "This introduction has already been accepted."
 msgstr "这个介绍已经接受了。"
 
-#: mod/dfrn_request.php:112 mod/dfrn_request.php:355
+#: mod/dfrn_request.php:112 mod/dfrn_request.php:353
 msgid "Profile location is not valid or does not contain profile information."
 msgstr "简介位置失效或不包含简介信息。"
 
-#: mod/dfrn_request.php:116 mod/dfrn_request.php:359
+#: mod/dfrn_request.php:116 mod/dfrn_request.php:357
 msgid "Warning: profile location has no identifiable owner name."
 msgstr "警告：简介位置没有可设别的主名。"
 
-#: mod/dfrn_request.php:119 mod/dfrn_request.php:362
+#: mod/dfrn_request.php:119 mod/dfrn_request.php:360
 msgid "Warning: profile location has no profile photo."
 msgstr "警告：简介位置没有简介图。"
 
-#: mod/dfrn_request.php:123 mod/dfrn_request.php:366
+#: 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] "%d需要的参数没找到在输入的位置。"
 
-#: mod/dfrn_request.php:162
+#: mod/dfrn_request.php:161
 msgid "Introduction complete."
 msgstr "介绍完成的。"
 
-#: mod/dfrn_request.php:199
+#: mod/dfrn_request.php:197
 msgid "Unrecoverable protocol error."
 msgstr "不能恢复的协议错误"
 
-#: mod/dfrn_request.php:226
+#: mod/dfrn_request.php:224
 msgid "Profile unavailable."
 msgstr "简介无效"
 
-#: mod/dfrn_request.php:248
+#: mod/dfrn_request.php:246
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr "%s今天已经受到了太多联络要求"
 
-#: mod/dfrn_request.php:249
+#: mod/dfrn_request.php:247
 msgid "Spam protection measures have been invoked."
 msgstr "垃圾保护措施被用了。"
 
-#: mod/dfrn_request.php:250
+#: mod/dfrn_request.php:248
 msgid "Friends are advised to please try again in 24 hours."
 msgstr "朋友们被建议请24小时后再试。"
 
-#: mod/dfrn_request.php:276
+#: mod/dfrn_request.php:274
 msgid "Invalid locator"
 msgstr "无效找到物"
 
-#: mod/dfrn_request.php:312
+#: mod/dfrn_request.php:310
 msgid "You have already introduced yourself here."
 msgstr "您已经自我介绍这儿。"
 
-#: mod/dfrn_request.php:315
+#: mod/dfrn_request.php:313
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr "看上去您已经是%s的朋友。"
 
-#: mod/dfrn_request.php:335
+#: mod/dfrn_request.php:333
 msgid "Invalid profile URL."
 msgstr "无效的简介URL。"
 
-#: mod/dfrn_request.php:341 src/Model/Contact.php:1276
+#: mod/dfrn_request.php:339 src/Model/Contact.php:1577
 msgid "Disallowed profile URL."
 msgstr "不允许的简介地址."
 
-#: mod/dfrn_request.php:435
+#: 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:473
+#: mod/dfrn_request.php:470
 msgid ""
 "Remote subscription can't be done for your network. Please subscribe "
 "directly on your system."
 msgstr "无法为您的网络完成远程订阅。请直接在您的系统上订阅。"
 
-#: mod/dfrn_request.php:489
+#: mod/dfrn_request.php:486
 msgid "Please login to confirm introduction."
 msgstr "请登录以确认介绍。"
 
-#: mod/dfrn_request.php:497
+#: mod/dfrn_request.php:494
 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
+#: mod/dfrn_request.php:508 mod/dfrn_request.php:525
 msgid "Confirm"
 msgstr "确认"
 
-#: mod/dfrn_request.php:523
+#: mod/dfrn_request.php:520
 msgid "Hide this contact"
 msgstr "隐藏这个联系人"
 
-#: mod/dfrn_request.php:526
+#: mod/dfrn_request.php:523
 #, php-format
 msgid "Welcome home %s."
 msgstr "欢迎%s。"
 
-#: mod/dfrn_request.php:527
+#: mod/dfrn_request.php:524
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "请确认您的介绍／联络要求给%s。"
 
-#: mod/dfrn_request.php:637
+#: mod/dfrn_request.php:634
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr "请从以下支持的通信网络之一输入你的 “身份地址”："
 
-#: mod/dfrn_request.php:640
+#: 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/dfrn_request.php:645
+#: mod/dfrn_request.php:642
 msgid "Friend/Connection Request"
 msgstr "朋友/连接请求"
 
-#: mod/dfrn_request.php:646
+#: 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/dfrn_request.php:651 src/Content/ContactSelector.php:79
+#: 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:652
+#: mod/dfrn_request.php:649
 msgid "GNU Social (Pleroma, Mastodon)"
 msgstr "GNU Social (Pleroma, Mastodon)"
 
-#: mod/dfrn_request.php:653
+#: mod/dfrn_request.php:650
 msgid "Diaspora (Socialhome, Hubzilla)"
 msgstr "Diaspora (Socialhome, Hubzilla)"
 
-#: mod/dfrn_request.php:654
+#: 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/item.php:114
+#: 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:274
+#: mod/item.php:285
 msgid "Empty post discarded."
 msgstr "空帖子被丢弃了。"
 
-#: mod/item.php:804
+#: 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:806
+#: mod/item.php:811
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "你可以网上拜访他在%s"
 
-#: mod/item.php:807
+#: 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:811
+#: mod/item.php:816
 #, php-format
 msgid "%s posted an update."
 msgstr "%s贴上一个新闻。"
 
-#: mod/notifications.php:37
-msgid "Invalid request identifier."
-msgstr "无效要求身份号。"
+#: mod/help.php:49
+msgid "Help:"
+msgstr "帮助："
 
-#: mod/notifications.php:46 mod/notifications.php:182
-#: mod/notifications.php:229
-msgid "Discard"
-msgstr "丢弃"
+#: mod/uimport.php:72
+msgid "Move account"
+msgstr "把账户搬出"
 
-#: mod/notifications.php:98 src/Content/Nav.php:191
-msgid "Notifications"
-msgstr "通知"
+#: mod/uimport.php:73
+msgid "You can import an account from another Friendica server."
+msgstr "您会从别的Friendica服务器进口账户"
 
-#: 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
+#: mod/uimport.php:74
 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."
+"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/notifications.php:201
+#: 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 ""
-"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 ""
+msgid "Registration revoked for %s"
+msgstr "撤销了 %s 的注册"
 
-#: mod/notifications.php:206
+#: 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 ""
-"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 ""
+msgid "Suggest a friend for %s"
+msgstr "给 %s 推荐朋友"
 
-#: mod/notifications.php:217
-msgid "Friend"
-msgstr "朋友"
+#: mod/maintenance.php:24
+msgid "System down for maintenance"
+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/profile.php:37 src/Model/Profile.php:118
+#: 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:1251
+#: 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:1252
+#: 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:1253
+#: 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 "修改能见度"
 
@@ -6223,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 "性取向："
 
@@ -6303,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 "政治观念："
 
@@ -6331,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 "不喜欢："
 
@@ -6375,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 "给打假可见的"
 
@@ -6387,1376 +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:44
-msgid "User deleted their account"
-msgstr ""
-
-#: mod/removeme.php:45
-msgid ""
-"On your Friendica node an user deleted their account. Please ensure that "
-"their data is removed from the backups."
-msgstr ""
-
-#: mod/removeme.php:46
+#: 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:77 mod/removeme.php:80
-msgid "Remove My Account"
-msgstr "删除我的账户"
+#: src/Database/DBStructure.php:33
+msgid "There are no tables on MyISAM."
+msgstr "未在 MyISAM 中发现表。"
 
-#: mod/removeme.php:78
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
-msgstr "这要完全删除您的账户。这一做过，就不能恢复。"
-
-#: mod/removeme.php:79
-msgid "Please enter your password for verification:"
-msgstr "请输入密码为确认："
-
-#: 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:339
-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 "Bandwith 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 the global friendica directories (e.g. <a "
-"href=\"%s\">%s</a>). Your profile will be visible in public."
+"\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 this node's <a href=\"%s\">local "
-"directory</a>. Your profile details may be publicly visible depending on the"
-" system settings."
-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. Disables posting public "
-"messages to Diaspora and other networks."
-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 "把调动信息寄给熟人"
-
-#: view/theme/duepuntozero/config.php:54 src/Model/User.php:502
-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
+#: src/Database/DBStructure.php:473
 #, php-format
-msgid "User '%s' already exists on this server!"
-msgstr "用户「%s」已经存在这个服务器！"
+msgid "%s: updating %s table."
+msgstr "%s: 正在更新 %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 "
@@ -7764,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 "生日："
 
@@ -8045,363 +8483,438 @@ msgstr "秒"
 msgid "%1$d %2$s ago"
 msgstr "%1$d %2$s以前"
 
-#: src/Content/Text/BBCode.php:416
-msgid "view full size"
-msgstr "看全尺寸"
+#: src/Model/Mail.php:39 src/Model/Mail.php:171
+msgid "[no subject]"
+msgstr "[无题目]"
 
-#: src/Content/Text/BBCode.php:842 src/Content/Text/BBCode.php:1611
-#: src/Content/Text/BBCode.php:1612
-msgid "Image/photo"
-msgstr "图像／照片"
+#: src/Model/Contact.php:942
+msgid "Drop Contact"
+msgstr "删除联系人"
 
-#: src/Content/Text/BBCode.php:980
-#, 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:1538 src/Content/Text/BBCode.php:1560
-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:1620 src/Content/Text/BBCode.php:1621
-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:1740
-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:1751
-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:519
+#: 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"
@@ -8421,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 "通用特性"
@@ -8754,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 "管理／编辑简介"
@@ -8774,757 +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/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/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/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:346
-msgid "An invitation is required."
-msgstr "需要邀请。"
-
-#: src/Model/User.php:350
-msgid "Invitation could not be verified."
-msgstr "不能验证邀请。"
-
-#: src/Model/User.php:357
-msgid "Invalid OpenID url"
-msgstr "无效的OpenID url"
-
-#: src/Model/User.php:370 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:370 src/Module/Login.php:101
-msgid "The error message was:"
-msgstr "错误通知是："
-
-#: src/Model/User.php:376
-msgid "Please enter the required information."
-msgstr "请输入必要的信息。"
-
-#: src/Model/User.php:389
-msgid "Please use a shorter name."
-msgstr "请用一个短一点的名字。"
-
-#: src/Model/User.php:392
-msgid "Name too short."
-msgstr "名字太短。"
-
-#: src/Model/User.php:400
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr "这看上去不是您的全姓名。"
-
-#: src/Model/User.php:405
-msgid "Your email domain is not among those allowed on this site."
-msgstr "这网站允许的域名中没有您的"
-
-#: src/Model/User.php:409
-msgid "Not a valid email address."
-msgstr "无效的邮件地址。"
-
-#: src/Model/User.php:413 src/Model/User.php:421
-msgid "Cannot use that email."
-msgstr "无法使用此邮件地址。"
-
-#: src/Model/User.php:428
-msgid "Your nickname can only contain a-z, 0-9 and _."
-msgstr "您的昵称只能由字母、数字和下划线组成。"
-
-#: src/Model/User.php:435 src/Model/User.php:491
-msgid "Nickname is already registered. Please choose another."
-msgstr "此昵称已被注册。请选择新的昵称。"
-
-#: src/Model/User.php:445
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr "严重错误：安全密钥生成失败。"
-
-#: src/Model/User.php:478 src/Model/User.php:482
-msgid "An error occurred during registration. Please try again."
-msgstr "注册出现问题。请再次尝试。"
-
-#: src/Model/User.php:507
-msgid "An error occurred creating your default profile. Please try again."
-msgstr "创建你的默认简介的时候出现了一个错误。请再试。"
-
-#: src/Model/User.php:514
-msgid "An error occurred creating your self contact. Please try again."
-msgstr ""
-
-#: src/Model/User.php:523
-msgid ""
-"An error occurred creating your default contact group. Please try again."
-msgstr ""
-
-#: src/Model/User.php:597
-#, 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:607
-#, php-format
-msgid "Registration at %s"
-msgstr "在 %s 的注册"
-
-#: src/Model/User.php:625
-#, 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:629
-#, 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/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:1513
-#, php-format
-msgid "%s's birthday"
-msgstr "%s的生日"
-
-#: src/Model/Contact.php:1647 src/Protocol/DFRN.php:1514
-#, php-format
-msgid "Happy Birthday %s"
-msgstr "生日快乐%s"
-
-#: src/Model/Item.php:1851
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
-msgstr "%1$s 正在参加 %2$s 的 %3$s"
-
-#: src/Model/Item.php:1856
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
-msgstr "%1$s 不在参加 %2$s 的 %3$s"
-
-#: src/Model/Item.php:1861
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr "%1$s 可以参加 %2$s 的 %3$s"
-
-#: src/Protocol/OStatus.php:1799
-#, php-format
-msgid "%s is now following %s."
-msgstr "%s 正在关注 %s."
-
-#: src/Protocol/OStatus.php:1800
-msgid "following"
-msgstr "关注"
-
-#: src/Protocol/OStatus.php:1803
-#, php-format
-msgid "%s stopped following %s."
-msgstr "%s 停止关注了 %s."
-
-#: src/Protocol/OStatus.php:1804
-msgid "stopped following"
-msgstr "取消关注"
-
-#: src/Protocol/Diaspora.php:2521
-msgid "Sharing notification from Diaspora network"
-msgstr "分享通知从Diaspora网络"
-
-#: src/Protocol/Diaspora.php:3609
-msgid "Attachments:"
-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 "Remove from your stream"
-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:524
-msgid "Delete this item?"
-msgstr "删除这个项目？"
-
-#: src/App.php:526
-msgid "show fewer"
-msgstr "显示更小"
-
-#: src/App.php:1114
-msgid "No system theme config value set."
-msgstr ""
-
-#: index.php:464
-msgid "toggle mobile"
-msgstr "切换移动设备"
-
-#: update.php:193
-#, php-format
-msgid "%s: Updating author-id and owner-id in item and thread table. "
-msgstr ""
-
-#: boot.php:796
-#, php-format
-msgid "Update %s failed. See error logs."
-msgstr "更新 %s 失败。查看错误日志。"
+#: 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 77dfca427..c54845b8f 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"] = "一条私人信息";
@@ -60,135 +267,11 @@ $a->strings["'%1\$s' has chosen to accept you a fan, which restricts some forms
 $a->strings["'%1\$s' may choose to extend this into a two-way or more permissive relationship in the future."] = "";
 $a->strings["Please visit %s  if you wish to make any changes to this relationship."] = "请访问 %s  如果你希望对修改这个关系。";
 $a->strings["[Friendica System Notify]"] = "";
-$a->strings["registration request"] = "";
+$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["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["Cannot locate DNS info for database server '%s'"] = "找不到DNS信息为数据库服务器「%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["newer"] = "更新";
 $a->strings["older"] = "更旧";
 $a->strings["first"] = "首先";
@@ -208,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"] = "砰";
@@ -271,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"] = "编辑您的简介";
@@ -331,365 +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["[Embedded content - reload page to view]"] = "[嵌入内容－重新加载页为看]";
-$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["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["%1\$s is following %2\$s's %3\$s"] = "%1\$s关注着%2\$s的%3\$s";
-$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["Personal Notes"] = "私人便条";
-$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["Permissions"] = "权限";
-$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["This is you"] = "这是你";
-$a->strings["Comment"] = "评论";
-$a->strings["Map"] = "地图";
-$a->strings["View Album"] = "看照片册";
-$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["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["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["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["Event can not end before it has started."] = "事件不能在开始前结束。";
-$a->strings["Event title and start time are required."] = "项目标题和开始时间是必须的。";
-$a->strings["Create New Event"] = "创建新的事件";
-$a->strings["Event details"] = "事件细节";
-$a->strings["Starting date and Title are required."] = "需要开始日期和标题。";
-$a->strings["Event Starts:"] = "事件开始:";
-$a->strings["Required"] = "必须的";
-$a->strings["Finish date/time is not known or not relevant"] = "结束日期/时间未知或无关";
-$a->strings["Event Finishes:"] = "事件结束:";
-$a->strings["Adjust for viewer timezone"] = "调整为浏览者的时区";
-$a->strings["Description:"] = "描述：";
-$a->strings["Title:"] = "标题：";
-$a->strings["Share this event"] = "分享这个事件";
-$a->strings["Basic"] = "基本";
-$a->strings["Failed to remove event"] = "删除事件失败";
-$a->strings["Event removed"] = "事件已删除";
-$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."] = "";
@@ -729,158 +952,6 @@ $a->strings["Source text"] = "源文本";
 $a->strings["BBCode"] = "";
 $a->strings["Markdown"] = "Markdown";
 $a->strings["HTML"] = "HTML";
-$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["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["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["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["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["Remove contact from group"] = "";
-$a->strings["Add contact to group"] = "";
-$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["Theme settings updated."] = "主题设置更新了。";
 $a->strings["Information"] = "资料";
 $a->strings["Overview"] = "概览";
@@ -888,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 Queue"] = "检查队列";
+$a->strings["Inspect worker Queue"] = "";
 $a->strings["Tools"] = "工具";
 $a->strings["Contact Blocklist"] = "联系人屏蔽列表";
 $a->strings["Server Blocklist"] = "服务器屏蔽列表";
@@ -913,7 +982,7 @@ $a->strings["Display Terms of Service"] = "显示服务条款";
 $a->strings["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."] = "";
 $a->strings["Display Privacy Statement"] = "显示隐私说明";
 $a->strings["Show some informations regarding the needed information to operate the node according e.g. to <a href=\"%s\" target=\"_blank\">EU-GDPR</a>."] = "";
-$a->strings["Privacy Statement Preview"] = "";
+$a->strings["Privacy Statement Preview"] = "隐私声明预览";
 $a->strings["The Terms of Service"] = "服务条款";
 $a->strings["Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below."] = "";
 $a->strings["The blocked domain"] = "被封禁的域名";
@@ -943,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"] = "";
@@ -965,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"] = "";
@@ -988,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"] = "一个月";
@@ -1011,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"] = "";
@@ -1054,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"] = "允许的朋友域";
@@ -1068,6 +1146,7 @@ $a->strings["Block public"] = "";
 $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "";
 $a->strings["Force publish"] = "强行发布";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "让所有这网站的的简介表明在网站目录。";
+$a->strings["Enabling this may violate privacy laws like the GDPR"] = "启用此项可能会违反隐私法律，譬如 GDPR 等";
 $a->strings["Global directory URL"] = "";
 $a->strings["URL to the global directory. If this is not set, the global directory is completely unavailable to the application."] = "";
 $a->strings["Private posts by default for new users"] = "新用户默认写私人文章";
@@ -1078,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"] = "阻止多次注册";
@@ -1116,7 +1197,7 @@ $a->strings["Maximum table size for optimization"] = "";
 $a->strings["Maximum table size (in MB) for the automatic optimization. Enter -1 to disable it."] = "";
 $a->strings["Minimum level of fragmentation"] = "";
 $a->strings["Minimum fragmenation level to start the automatic optimization - default value is 30%."] = "";
-$a->strings["Periodical check of global contacts"] = "";
+$a->strings["Periodical check of global contacts"] = "定期检查全球联系人";
 $a->strings["If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers."] = "";
 $a->strings["Days between requery"] = "重新查询间隔天数";
 $a->strings["Number of days after which a server is requeried for his contacts."] = "";
@@ -1132,7 +1213,7 @@ $a->strings["Check upstream version"] = "检查上游版本";
 $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."] = "启用在 github 上检查新的 Friendica 版本。如果发现新版本，您将在管理员概要面板得到通知。";
 $a->strings["Suppress Tags"] = "压制标签";
 $a->strings["Suppress showing a list of hashtags at the end of the posting."] = "不在文章末尾显示主题标签列表。";
-$a->strings["Clean database"] = "";
+$a->strings["Clean database"] = "清理数据库";
 $a->strings["Remove old remote items, orphaned database records and old content from some other helper tables."] = "";
 $a->strings["Lifespan of remote items"] = "";
 $a->strings["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."] = "";
@@ -1149,8 +1230,8 @@ $a->strings["If you have a restricted system where the webserver can't access th
 $a->strings["Base path to installation"] = "基础安装路线";
 $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."] = "如果您的系统无法为您检测到正确的安装路径，请在这里输入正确的路径。此配置仅在您使用设有限制的系统时符号链接到网页服务器根目录使用。";
 $a->strings["Disable picture proxy"] = "停用图片代理";
-$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith."] = "";
-$a->strings["Only search in tags"] = "";
+$a->strings["The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth."] = "";
+$a->strings["Only search in tags"] = "只在标签项内搜索";
 $a->strings["On large systems the text search can slow down the system extremely."] = "在大型系统中，正文搜索会极大降低系统运行速度。";
 $a->strings["New base url"] = "新基础URL";
 $a->strings["Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users."] = "";
@@ -1158,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"] = "启用快车道模式";
@@ -1173,12 +1254,13 @@ $a->strings["Direct relay transfer"] = "";
 $a->strings["Enables the direct transfer to other servers without using the relay servers"] = "";
 $a->strings["Relay scope"] = "";
 $a->strings["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."] = "";
-$a->strings["all"] = "";
+$a->strings["all"] = "所有";
 $a->strings["tags"] = "";
 $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"] = "";
@@ -1204,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"] = "上次登录";
@@ -1224,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"] = "新用户";
@@ -1260,31 +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["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."] = "警告：简介位置没有可设别的主名。";
@@ -1303,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."] = "请登录以确认介绍。";
@@ -1315,45 +1373,243 @@ $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["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["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["Tips for New Members"] = "新人建议";
+$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"] = "创建新的事件";
+$a->strings["Event details"] = "事件细节";
+$a->strings["Starting date and Title are required."] = "需要开始日期和标题。";
+$a->strings["Event Starts:"] = "事件开始:";
+$a->strings["Required"] = "必须的";
+$a->strings["Finish date/time is not known or not relevant"] = "结束日期/时间未知或无关";
+$a->strings["Event Finishes:"] = "事件结束:";
+$a->strings["Adjust for viewer timezone"] = "调整为浏览者的时区";
+$a->strings["Description:"] = "描述：";
+$a->strings["Title:"] = "标题：";
+$a->strings["Share this event"] = "分享这个事件";
+$a->strings["Basic"] = "基本";
+$a->strings["Permissions"] = "权限";
+$a->strings["Failed to remove event"] = "删除事件失败";
+$a->strings["Event removed"] = "事件已删除";
+$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["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["Profile deleted."] = "简介删除了。";
 $a->strings["Profile-"] = "简介-";
 $a->strings["New profile created."] = "新的简介已创建。";
@@ -1378,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"] = "复制这个简介";
@@ -1433,321 +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["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["Bandwith 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 the global friendica directories (e.g. <a href=\"%s\">%s</a>). Your profile will be visible in public."] = "";
-$a->strings["Publish your default profile in the global social 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["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. Disables posting public messages to Diaspora and other networks."] = "";
-$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["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,173 +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["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["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["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["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["%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["%s is now following %s."] = "%s 正在关注 %s.";
-$a->strings["following"] = "关注";
-$a->strings["%s stopped following %s."] = "%s 停止关注了 %s.";
-$a->strings["stopped following"] = "取消关注";
-$a->strings["Sharing notification from Diaspora network"] = "分享通知从Diaspora网络";
-$a->strings["Attachments:"] = "附件：";
-$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["Remove from your stream"] = "";
-$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["%s: Updating author-id and owner-id in item and thread table. "] = "";
-$a->strings["Update %s failed. See error logs."] = "更新 %s 失败。查看错误日志。";
+$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"] = "无效的连接协议";
diff --git a/view/templates/admin/plugins_details.tpl b/view/templates/admin/addon_details.tpl
similarity index 80%
rename from view/templates/admin/plugins_details.tpl
rename to view/templates/admin/addon_details.tpl
index 05e3e8aa0..fb908b705 100644
--- a/view/templates/admin/plugins_details.tpl
+++ b/view/templates/admin/addon_details.tpl
@@ -2,7 +2,7 @@
 <div id='adminpage'>
 	<h1>{{$title}} - {{$page}}</h1>
 
-	<p><span class='toggleplugin icon {{$status}}'></span> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$addon}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
+	<p><span class='toggleaddon icon {{$status}}'></span> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$addon}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
 	<p>{{$info.description}}</p>
 
 	<p class="author">{{$str_author}}
@@ -30,7 +30,7 @@
 
 	{{if $readme}}
 	<h3>Readme</h3>
-	<div id="plugin_readme">
+	<div id="addon_readme">
 		{{$readme}}
 	</div>
 	{{/if}}
diff --git a/view/templates/admin/addons.tpl b/view/templates/admin/addons.tpl
index 297e132e0..93266bf14 100644
--- a/view/templates/admin/addons.tpl
+++ b/view/templates/admin/addons.tpl
@@ -7,10 +7,10 @@
 		    </div>
 		{{else}}
 		<a class="btn" href="{{$baseurl}}/admin/{{$function}}?a=r&amp;t={{$form_security_token}}">{{$reload}}</a>
-		<ul id='pluginslist'>
+		<ul id='addonslist'>
 		{{foreach $addons as $p}}
-			<li class='plugin {{$p.1}}'>
-				<a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><span class='icon {{$p.1}}'></span></a>
+			<li class='addon {{$p.1}}'>
+				<a class='toggleaddon' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><span class='icon {{$p.1}}'></span></a>
 				<a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>
 				{{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
 
diff --git a/view/templates/admin/settings_features.tpl b/view/templates/admin/settings_features.tpl
index d2bd35e04..1ca0708bf 100644
--- a/view/templates/admin/settings_features.tpl
+++ b/view/templates/admin/settings_features.tpl
@@ -10,8 +10,10 @@
 
 	<div class="settings-content-block">
 		{{foreach $f.1 as $fcat}}
+			<div class="settings-block">
 			{{include file="field_yesno.tpl" field=$fcat.0}}
 			{{include file="field_yesno.tpl" field=$fcat.1}}
+			</div>
 		{{/foreach}}
 
 		<div class="settings-submit-wrapper" >
diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index 0b46aa991..c2a6f73c4 100644
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -78,6 +78,7 @@
 	<h3>{{$corporate}}</h3>
 	{{include file="field_input.tpl" field=$allowed_sites}}
 	{{include file="field_input.tpl" field=$allowed_email}}
+	{{include file="field_input.tpl" field=$forbidden_nicknames}}
 	{{include file="field_checkbox.tpl" field=$no_oembed_rich_content}}
 	{{include file="field_input.tpl" field=$allowed_oembed}}
 	{{include file="field_checkbox.tpl" field=$block_public}}
@@ -104,6 +105,7 @@
 	{{include file="field_checkbox.tpl" field=$private_addons}}
 	{{include file="field_checkbox.tpl" field=$disable_embedded}}
 	{{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
+	{{include file="field_checkbox.tpl" field=$explicit_content}}
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
 
 	<h3>{{$advanced}}</h3>
@@ -150,6 +152,8 @@
 	{{include file="field_checkbox.tpl" field=$worker_fastlane}}
 	{{include file="field_checkbox.tpl" field=$worker_frontend}}
 
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+
 	<h3>{{$relay_title}}</h3>
 	{{include file="field_checkbox.tpl" field=$relay_subscribe}}
 	{{include file="field_input.tpl" field=$relay_server}}
@@ -168,7 +172,7 @@
 	<h3>{{$relocate}}</h3>
 	{{include file="field_input.tpl" field=$relocate_url}}
 	<input type="hidden" name="page_site" value="{{$submit|escape:'html'}}">
-	<div class="submit"><input type="submit" name="relocate" value="{{$submit|escape:'html'}}" /></div>
+	<div class="submit"><input type="submit" name="relocate" value="{{$relocate_button|escape:'html'}}" /></div>
 	</form>
 
 </div>
diff --git a/view/templates/admin/summary.tpl b/view/templates/admin/summary.tpl
index 6b1ebe40e..8929cfbec 100644
--- a/view/templates/admin/summary.tpl
+++ b/view/templates/admin/summary.tpl
@@ -11,7 +11,7 @@
 
 	<dl>
 		<dt>{{$queues.label}}</dt>
-		<dd><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - {{$queues.workerq}}</dd>
+		<dd><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - <a href="{{$baseurl}}/admin/workerqueue">{{$queues.workerq}}</a></dd>
 	</dl>
 	<dl>
 		<dt>{{$pending.0}}</dt>
diff --git a/view/templates/admin/users.tpl b/view/templates/admin/users.tpl
index a842d6e36..b2b0d615a 100644
--- a/view/templates/admin/users.tpl
+++ b/view/templates/admin/users.tpl
@@ -85,7 +85,7 @@
 						<td class='register_date'>{{$u.register_date}}</td>
 						<td class='login_date'>{{$u.login_date}}</td>
 						<td class='lastitem_date'>{{$u.lastitem_date}}</td>
-						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}} {{if $u.blocked}}{{$blocked}}{{/if}}</td>
 						<td class="checkbox"> 
 						{{if $u.is_deletable}}
 							<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
diff --git a/view/templates/admin/workerqueue.tpl b/view/templates/admin/workerqueue.tpl
new file mode 100644
index 000000000..5bab58a5e
--- /dev/null
+++ b/view/templates/admin/workerqueue.tpl
@@ -0,0 +1,21 @@
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}} ({{$count}})</h1>
+	
+	<p>{{$info}}</p>
+	<table>
+		<tr>
+			<th>{{$id_header}}</th>
+			<th>{{$param_header}}</th>
+			<th>{{$created_header}}</th>
+			<th>{{$prio_header}}</th>
+		</tr>
+		{{foreach $entries as $e}}
+		<tr>
+			<td>{{$e.id}}</td>
+			<td>{{$e.parameter}}</td>
+			<td>{{$e.created}}</td>
+			<td>{{$e.priority}}</td>
+		</tr>
+		{{/foreach}}
+	</table>
+</div>
diff --git a/view/templates/contact_block.tpl b/view/templates/contact_block.tpl
index 0d2461502..52e3e1e77 100644
--- a/view/templates/contact_block.tpl
+++ b/view/templates/contact_block.tpl
@@ -1,6 +1,6 @@
 
 <div id="contact-block">
-<h4 class="contact-block-h4">{{$contacts}}</h4>
+<h3 class="contact-block-h4">{{$contacts}}</h3>
 {{if $micropro}}
 		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
 		<div class='contact-block-content'>
diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index ab38a1c6c..344ee296a 100644
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -20,8 +20,8 @@
 							<li class="divider"></li>
 							<li role="menuitem"><a  href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
 							<li role="menuitem"><a  href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
-							<li role="menuitem"><a  href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li>
-							<li role="menuitem"><a  href="{{$contact_actions.delete.url}}" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li>
+							{{if $contact_actions.archive.url}}<li role="menuitem"><a  href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li>{{/if}}
+							{{if $contact_actions.delete.url}}<li role="menuitem"><a  href="{{$contact_actions.delete.url}}" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li> {{/if}}
 						</ul>
 					</div>
 
@@ -63,6 +63,7 @@
 
 			<hr />
 
+			{{if $contact_settings_label}}
 			<h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4>
 			<div id="contact-edit-settings">
 				<input type="hidden" name="contact_id" value="{{$contact_id}}">
@@ -100,7 +101,7 @@
 			</div>
 
 			<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
-
+			{{/if}}
 			<div class="contact-edit-submit-end clearfix"></div>
 
 		</form>{{* End of the form *}}
diff --git a/view/templates/group_edit.tpl b/view/templates/group_edit.tpl
index 6b72e776e..cb9f4198b 100644
--- a/view/templates/group_edit.tpl
+++ b/view/templates/group_edit.tpl
@@ -2,6 +2,7 @@
 <h2>{{$title}}</h2>
 
 
+{{if $editable == 1}}
 <div id="group-edit-wrapper" >
 	<form action="group/{{$gid}}" id="group-edit-form" method="post" >
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
@@ -14,6 +15,7 @@
 		<div id="group-edit-select-end" ></div>
 	</form>
 </div>
+{{/if}}
 
 
 {{if $groupeditor}}
@@ -21,4 +23,4 @@
 		{{include file="groupeditor.tpl"}}
 	</div>
 {{/if}}
-{{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}
+{{if $desc}}<div class="clear" id="group-edit-desc">{{$desc}}</div>{{/if}}
diff --git a/view/templates/group_side.tpl b/view/templates/group_side.tpl
index 466882370..5796bb735 100644
--- a/view/templates/group_side.tpl
+++ b/view/templates/group_side.tpl
@@ -36,7 +36,7 @@
 	<div id="sidebar-edit-groups"><a href="{{$grouppage}}">{{$editgroupstext}}</a></div>
 	{{/if}}
 
-	{{if $ungrouped}}<div id="sidebar-ungrouped"><a href="nogroup">{{$ungrouped}}</a></div>{{/if}}
+	{{if $ungrouped}}<div id="sidebar-ungrouped"><a class="{{if $ungrouped_selected}}group-selected{{/if}}" href="nogroup">{{$ungrouped}}</a></div>{{/if}}
 </div>
 
 
diff --git a/view/templates/groupeditor.tpl b/view/templates/groupeditor.tpl
index bde686040..0168a7a2d 100644
--- a/view/templates/groupeditor.tpl
+++ b/view/templates/groupeditor.tpl
@@ -1,6 +1,7 @@
 
 {{* Template for the contact group list *}}
 
+{{if $editable == 1}}
 {{* The contacts who are already members of the contact group *}}
 <div id="group">
 	<h3>{{$groupeditor.label_members}}</h3>
@@ -34,27 +35,27 @@
 	<div id="group-members-end"></div>
 		<hr id="group-separator" />
 </div>
+{{/if}}
 
 {{* The contacts who are not members of the contact group *}}
 <div id="contacts">
 	<h3>{{$groupeditor.label_contacts}}</h3>
 	<div id="group-all-contacts" class="contact_list">
 		{{foreach $groupeditor.contacts as $m}}
-			{{* If there are too many contacts we use another view mode *}}
-			{{if $shortmode}}
 			<div class="contact-block-textdiv mpall">
+				{{if $editable == 1}}
 				<a class="contact-block-link mpall  fakelink" target="redir" onclick="groupChangeMember({{$m.change_member.gid}},{{$m.change_member.cid}},'{{$m.change_member.sec_token}}'); return true;" title="{{$m.name}} [{{$m.itemurl}}]" alt="{{$m.name}}">
-					{{$m.name}}
+				{{else}}
+				<a class="contact-block-link mpall" href="{{$m.url}}" title="{{$m.name}} [{{$m.itemurl}}]" alt="{{$m.name}}">
+				{{/if}}
+					{{* If there are too many contacts we use another view mode *}}
+					{{if $shortmode}}
+						{{$m.name}}
+					{{else}}
+						<img class="contact-block-img mpall " src="{{$m.thumb}}" title="{{$m.name}} [{{$m.itemurl}}]" alt="{{$m.name}}">
+					{{/if}}
 				</a>
 			</div>
-			{{else}}
-			{{* The normal view mode *}}
-			<div class="contact-block-div mpall">
-				<a class="contact-block-link mpall  fakelink" target="redir" onclick="groupChangeMember({{$m.change_member.gid}},{{$m.change_member.cid}},'{{$m.change_member.sec_token}}'); return true;">
-					<img class="contact-block-img mpall " src="{{$m.thumb}}" title="{{$m.name}} [{{$m.itemurl}}]" alt="{{$m.name}}">
-				</a>
-			</div>
-			{{/if}}
 		{{/foreach}}
 	</div>
 	<div id="group-all-contacts-end"></div>
diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index c58b2b829..7da270d3f 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" />
 
@@ -42,8 +41,15 @@
 <script type="text/javascript" src="view/asset/jgrowl/jquery.jgrowl.min.js"></script>
 <script type="text/javascript" src="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
 <script type="text/javascript" src="view/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js" ></script>
+<script type="text/javascript" src="view/asset/imagesloaded/imagesloaded.pkgd.min.js"></script>
 <script type="text/javascript" src="view/js/acl.js" ></script>
 <script type="text/javascript" src="view/asset/base64/base64.min.js" ></script>
+<script type="text/javascript" src="view/js/addon-hooks.js" ></script>
+{{if is_array($addon_hooks)}}
+{{foreach $addon_hooks as $addon_hook}}
+<script type="text/javascript" src="addon/{{$addon_hook}}/{{$addon_hook}}.js"></script>
+{{/foreach}}
+{{/if}}
 <script type="text/javascript" src="view/js/main.js" ></script>
 <script>
 
diff --git a/view/templates/htconfig.tpl b/view/templates/htconfig.tpl
deleted file mode 100644
index dc2d4bcda..000000000
--- a/view/templates/htconfig.tpl
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/* ********************************************************************
- *  The following configuration has to be within the .htconfig.php
- *  file and will not be overruled by decisions made in the admin panel.
- *
- *  See below for variables that may be overruled by the admin panel.
- * ********************************************************************/
-
-// Set the following for your MySQL installation
-//
-// If you need to specify a port for reacing the database, you can do so by
-// adding ":portnumber" after "your.mysqlhost.com" in the $db_host config.
-
-$db_host = '{{$dbhost}}';
-$db_user = '{{$dbuser}}';
-$db_pass = '{{$dbpass}}';
-$db_data = '{{$dbdata}}';
-
-// Use environment variables for mysql if they are set beforehand
-if (!empty(getenv('MYSQL_HOST'))
-	&& !empty(getenv('MYSQL_PORT'))
-	&& (!empty(getenv('MYSQL_USERNAME')) || !empty(getenv('MYSQL_USER')))
-	&& !empty(getenv('MYSQL_PASSWORD'))
-	&& !empty(getenv('MYSQL_DATABASE'))) {
-	$db_host = getenv('MYSQL_HOST') . ':' . getenv('MYSQL_PORT');
-	if (!empty(getenv('MYSQL_USERNAME'))) {
-		$db_user = getenv('MYSQL_USERNAME');
-	} elseif (!empty(getenv('MYSQL_USER'))) {
-		$db_user = getenv('MYSQL_USER');
-	}
-	$db_pass = getenv('MYSQL_PASSWORD');
-	$db_data = getenv('MYSQL_DATABASE');
-}
-
-
-// Set the database connection charset to full Unicode (utf8mb4).
-// Changing this value will likely corrupt the special characters.
-// You have been warned.
-$a->config['system']['db_charset'] = "utf8mb4";
-
-// email adress for the system admin
-
-$a->config['admin_email'] = '{{$adminmail}}';
-
-// Location of PHP command line processor
-
-$a->config['php_path'] = '{{$phpath}}';
-
-// If you are using a subdirectory of your domain you will need to put the
-// relative path (from the root of your domain) here.
-// For instance if your URL is 'http://example.com/directory/subdirectory',
-// set path to 'directory/subdirectory'.
-
-$a->path = '{{$urlpath}}';
-
-// Allowed protocols in link URLs; HTTP protocols always are accepted
-$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher');
-
-/* *********************************************************************
- *  The configuration below will be overruled by the admin panel.
- *  Changes made below will only have an effect if the database does
- *  not contain any configuration for the friendica system.
- * *********************************************************************/
-
-// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
-// It can be changed later and only applies to timestamps for anonymous viewers.
-
-$default_timezone = '{{$timezone}}';
-
-// Default system language
-
-$a->config['system']['language'] = '{{$language}}';
-
-// What is your site name?
-
-$a->config['sitename'] = "My Friend Network";
-
-// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
-// the registration page. REGISTER_APPROVE requires you set 'admin_email'
-// to the email address of an already registered person who can authorise
-// and/or approve/deny the request.
-
-$a->config['register_policy'] = REGISTER_OPEN;
-$a->config['register_text'] = '';
-
-// Maximum size of an imported message, 0 is unlimited
-
-$a->config['max_import_size'] = 200000;
-
-// maximum size of uploaded photos
-
-$a->config['system']['maximagesize'] = 800000;
-
-// Server-to-server private message encryption (RINO) is allowed by default.
-// set to 0 to disable, 1 to enable
-
-$a->config['system']['rino_encrypt'] = {{$rino}};
-
-// default system theme
-
-$a->config['system']['theme'] = 'vier';
-$a->config['system']['allowed_themes'] = 'vier,quattro,duepuntozero,smoothly,frio';
-
-// By default allow pseudonyms
-
-$a->config['system']['no_regfullname'] = true;
-
-//Deny public access to the local directory
-//$a->config['system']['block_local_dir'] = false;
-
-// Location of the global directory
-$a->config['system']['directory'] = 'https://dir.friendica.social';
-
-// Authentication cookie lifetime, in days
-$a->config['system']['auth_cookie_lifetime'] = 7;
diff --git a/view/templates/jot.tpl b/view/templates/jot.tpl
index e4692a8bb..ca6d506ac 100644
--- a/view/templates/jot.tpl
+++ b/view/templates/jot.tpl
@@ -1,5 +1,3 @@
-
-
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
 		<div id="profile-jot-desc" >&nbsp;</div>
@@ -8,7 +6,8 @@
 	<div id="profile-jot-banner-end"></div>
 
 	<form id="profile-jot-form" action="{{$action}}" method="post" >
-		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="wall" value="{{$wall}}" />
+		<input type="hidden" name="post_type" value="{{$posttype}}" />
 		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 		<input type="hidden" name="return" value="{{$return_path|escape:'html'}}" />
 		<input type="hidden" name="location" id="jot-location" value="{{$defloc|escape:'html'}}" />
@@ -65,7 +64,7 @@
 
 
 	<div id="profile-jot-plugin-wrapper">
-  	{{$jotplugins}}
+	{{$jotplugins}}
 	</div>
 
 	<div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
diff --git a/view/templates/local.ini.tpl b/view/templates/local.ini.tpl
new file mode 100644
index 000000000..85df0734d
--- /dev/null
+++ b/view/templates/local.ini.tpl
@@ -0,0 +1,56 @@
+<?php return <<<INI
+
+; If you're unsure about what any of the config keys below do, please check the config/defaults.ini.php for detailed
+; documentation of their data type and behavior.
+
+[database]
+hostname = "{{$dbhost}}"
+username = "{{$dbuser}}"
+password = "{{$dbpass}}"
+database = "{{$dbdata}}"
+charset = utf8mb4
+
+; ****************************************************************
+; Some config values below can be overruled from the admin settings
+; ****************************************************************
+
+[config]
+php_path = "{{$phpath}}"
+
+admin_email = "{{$adminmail}}"
+
+sitename = Friendica Social Network
+
+register_policy = REGISTER_OPEN
+register_text =
+
+max_import_size = 200000
+
+[system]
+urlpath = "{{$urlpath}}"
+
+default_timezone = "{{$timezone}}"
+
+language = "{{$language}}"
+
+allowed_themes = vier,quattro,duepuntozero,smoothly,frio
+theme = vier
+
+allowed_link_protocols[0] = ftp
+allowed_link_protocols[1] = ftps
+allowed_link_protocols[2] = mailto
+allowed_link_protocols[3] = cid
+allowed_link_protocols[4] = gopher
+
+maximagesize = 800000
+
+no_regfullname = true
+
+block_local_dir = false
+
+directory = https://dir.friendica.social
+
+auth_cookie_lifetime = 7
+
+INI;
+// Keep this line
\ No newline at end of file
diff --git a/view/templates/msg-header.tpl b/view/templates/msg-header.tpl
index 653b3d566..4644b954e 100644
--- a/view/templates/msg-header.tpl
+++ b/view/templates/msg-header.tpl
@@ -49,5 +49,10 @@
 		}
 	}
 
+	function addeditortext(data) {
+		var currentText = $("#prvmail-text").val();
+		$("#prvmail-text").val(currentText + data);
+	}
+
 </script>
 
diff --git a/view/templates/profile_edit.tpl b/view/templates/profile_edit.tpl
index a25945c68..2363bd3f0 100644
--- a/view/templates/profile_edit.tpl
+++ b/view/templates/profile_edit.tpl
@@ -439,8 +439,10 @@
         <input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
         <input type="hidden" id="likes-jot-text" name="likes" value="{{$likes.2}}" />
         <input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes.2}}" />
+        <input type="hidden" name="marital" id="profile-edit-marital" value="{{$marital.2}}" />
         <input type="hidden" name="with" id="profile-edit-with" value="{{$with.2}}" />
         <input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.2}}" />
+        <input type="hidden" name="sexual" id="profile-edit-sexual" value="{{$sexual.2}}" />
         <input type="hidden" id="romance-jot-text" name="romance" value="{{$romance.2}}" />
         <input type="hidden" id="work-jot-text" name="work" value="{{$work.2}}" />
         <input type="hidden" id="education-jot-text" name="education" value="{{$education.2}}" />
diff --git a/view/templates/register.tpl b/view/templates/register.tpl
index 6be4208d3..2e5588ae7 100644
--- a/view/templates/register.tpl
+++ b/view/templates/register.tpl
@@ -7,6 +7,7 @@
 
 	{{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/if}}
 
+	{{if $explicit_content}} <p id="register-explicid-content">{{$explicit_content_note}}</p> {{/if}}
 
 	<p id="register-realpeople">{{$realpeople}}</p>
 
diff --git a/view/templates/section_title.tpl b/view/templates/section_title.tpl
index f17dcf7ad..07685d346 100644
--- a/view/templates/section_title.tpl
+++ b/view/templates/section_title.tpl
@@ -1,4 +1,8 @@
-<div class="section-title-wrapper">
-	{{if $title}}<h2>{{$title}}</h2>{{/if}}
+{{if $title}}
+<div class="section-title-wrapper{{if isset($pullright)}} pull-left{{/if}}">
+	<h2>{{$title}}</h2>
+	{{if ! isset($pullright)}}
 	<div class="clear"></div>
+	{{/if}}
 </div>
+{{/if}}
diff --git a/view/templates/settings/connectors.tpl b/view/templates/settings/connectors.tpl
index 19b7306dd..a23791768 100644
--- a/view/templates/settings/connectors.tpl
+++ b/view/templates/settings/connectors.tpl
@@ -7,13 +7,9 @@
 <form action="settings/connectors" method="post" autocomplete="off">
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-<span id="settings_general_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_general_expanded'); openClose('settings_general_inflated');">
-	<h3 class="connector">{{$general_settings}}</h3>
-</span>
+	<h3 class="settings-heading"><a onclick="openClose('settings_general_expanded'); openClose('settings_general_inflated');">{{$general_settings}}</a></h3>
+
 <div id="settings_general_expanded" class="settings-block" style="display: none;">
-	<span class="fakelink" onclick="openClose('settings_general_expanded'); openClose('settings_general_inflated');">
-		<h3 class="connector">{{$general_settings}}</h3>
-	</span>
 
 	{{include file="field_checkbox.tpl" field=$disable_cw}}
 	{{include file="field_checkbox.tpl" field=$no_intelligent_shortening}}
diff --git a/view/templates/suggestions.tpl b/view/templates/suggestions.tpl
index 9be529cf7..edc0dbdba 100644
--- a/view/templates/suggestions.tpl
+++ b/view/templates/suggestions.tpl
@@ -3,7 +3,7 @@
 <div class="intro-wrapper" >
 
 <p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
-<div class="intro-madeby">{{$madeby}}</div>
+{{if $madeby}}<div class="intro-madeby">{{$lbl_madeby}} {{$madeby}}</div>{{/if}}
 <div class="intro-fullname" >{{$fullname}}</div>
 <a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height="175" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" /></a>
 <div class="intro-note" >{{$note}}</div>
diff --git a/view/templates/xrd_person.tpl b/view/templates/xrd_person.tpl
index 360489b87..aa402b1a8 100644
--- a/view/templates/xrd_person.tpl
+++ b/view/templates/xrd_person.tpl
@@ -33,4 +33,7 @@
           template="{{$subscribe}}" />
     <Link rel="magic-public-key" 
           href="{{$modexp}}" />
+    <Link rel="http://purl.org/openwebauth/v1"
+          type="application/x-dfrn+json"
+          href="{{$openwebauth}}" />
 </XRD>
diff --git a/view/theme/duepuntozero/bbedit.png b/view/theme/duepuntozero/bbedit.png
index b89f2f7a8..4607e0729 100644
Binary files a/view/theme/duepuntozero/bbedit.png and b/view/theme/duepuntozero/bbedit.png differ
diff --git a/view/theme/duepuntozero/border.jpg b/view/theme/duepuntozero/border.jpg
index 034a1cb63..26e0a9fad 100644
Binary files a/view/theme/duepuntozero/border.jpg and b/view/theme/duepuntozero/border.jpg differ
diff --git a/view/theme/duepuntozero/deriv/imgdarkzero/border.jpg b/view/theme/duepuntozero/deriv/imgdarkzero/border.jpg
index 4967412bf..c2e57cc94 100644
Binary files a/view/theme/duepuntozero/deriv/imgdarkzero/border.jpg and b/view/theme/duepuntozero/deriv/imgdarkzero/border.jpg differ
diff --git a/view/theme/duepuntozero/deriv/imgdarkzero/head.jpg b/view/theme/duepuntozero/deriv/imgdarkzero/head.jpg
index 67e852140..e4056b74f 100644
Binary files a/view/theme/duepuntozero/deriv/imgdarkzero/head.jpg and b/view/theme/duepuntozero/deriv/imgdarkzero/head.jpg differ
diff --git a/view/theme/duepuntozero/deriv/imgdarkzero/sectionend.jpg b/view/theme/duepuntozero/deriv/imgdarkzero/sectionend.jpg
index 9d5d5c8f3..d7f9d8f2f 100644
Binary files a/view/theme/duepuntozero/deriv/imgdarkzero/sectionend.jpg and b/view/theme/duepuntozero/deriv/imgdarkzero/sectionend.jpg differ
diff --git a/view/theme/duepuntozero/deriv/imgeasterbunny/border.jpg b/view/theme/duepuntozero/deriv/imgeasterbunny/border.jpg
index 66c7a6fcc..ff10ee2e3 100644
Binary files a/view/theme/duepuntozero/deriv/imgeasterbunny/border.jpg and b/view/theme/duepuntozero/deriv/imgeasterbunny/border.jpg differ
diff --git a/view/theme/duepuntozero/deriv/imgeasterbunny/head.jpg b/view/theme/duepuntozero/deriv/imgeasterbunny/head.jpg
index 1acd2ddb8..e6b0d2ad4 100644
Binary files a/view/theme/duepuntozero/deriv/imgeasterbunny/head.jpg and b/view/theme/duepuntozero/deriv/imgeasterbunny/head.jpg differ
diff --git a/view/theme/duepuntozero/deriv/imggreenzero/border.jpg b/view/theme/duepuntozero/deriv/imggreenzero/border.jpg
index 034a1cb63..26e0a9fad 100644
Binary files a/view/theme/duepuntozero/deriv/imggreenzero/border.jpg and b/view/theme/duepuntozero/deriv/imggreenzero/border.jpg differ
diff --git a/view/theme/duepuntozero/deriv/imggreenzero/greenicons.png b/view/theme/duepuntozero/deriv/imggreenzero/greenicons.png
index 2644e4284..1e15697f4 100644
Binary files a/view/theme/duepuntozero/deriv/imggreenzero/greenicons.png and b/view/theme/duepuntozero/deriv/imggreenzero/greenicons.png differ
diff --git a/view/theme/duepuntozero/deriv/imggreenzero/head.jpg b/view/theme/duepuntozero/deriv/imggreenzero/head.jpg
index c69776214..f1c11bc92 100644
Binary files a/view/theme/duepuntozero/deriv/imggreenzero/head.jpg and b/view/theme/duepuntozero/deriv/imggreenzero/head.jpg differ
diff --git a/view/theme/duepuntozero/deriv/imgpurplezero/border.jpg b/view/theme/duepuntozero/deriv/imgpurplezero/border.jpg
index 66c7a6fcc..ff10ee2e3 100644
Binary files a/view/theme/duepuntozero/deriv/imgpurplezero/border.jpg and b/view/theme/duepuntozero/deriv/imgpurplezero/border.jpg differ
diff --git a/view/theme/duepuntozero/deriv/imgpurplezero/head.jpg b/view/theme/duepuntozero/deriv/imgpurplezero/head.jpg
index 1acd2ddb8..e6b0d2ad4 100644
Binary files a/view/theme/duepuntozero/deriv/imgpurplezero/head.jpg and b/view/theme/duepuntozero/deriv/imgpurplezero/head.jpg differ
diff --git a/view/theme/duepuntozero/editicons.png b/view/theme/duepuntozero/editicons.png
index 171a40876..67346c413 100644
Binary files a/view/theme/duepuntozero/editicons.png and b/view/theme/duepuntozero/editicons.png differ
diff --git a/view/theme/duepuntozero/head.jpg b/view/theme/duepuntozero/head.jpg
index 6210b76be..2948dc599 100644
Binary files a/view/theme/duepuntozero/head.jpg and b/view/theme/duepuntozero/head.jpg differ
diff --git a/view/theme/duepuntozero/photo-menu.jpg b/view/theme/duepuntozero/photo-menu.jpg
index fde5eb535..763a99a3f 100644
Binary files a/view/theme/duepuntozero/photo-menu.jpg and b/view/theme/duepuntozero/photo-menu.jpg differ
diff --git a/view/theme/duepuntozero/screenshot.jpg b/view/theme/duepuntozero/screenshot.jpg
index 5f00ec39e..399d1aa54 100644
Binary files a/view/theme/duepuntozero/screenshot.jpg and b/view/theme/duepuntozero/screenshot.jpg differ
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 84ea6db94..e327a1ec9 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;
@@ -2721,9 +2721,7 @@ aside input[type='text'] {
 }
 
 .settings-block {
-	border: 1px solid #AAA;
-	margin: 10px;
-	padding: 10px;
+	border-bottom: 1px solid #AAA;
 }
 
 .app-title {
diff --git a/view/theme/duepuntozero/style.php b/view/theme/duepuntozero/style.php
index 5d841f108..ff55f462f 100644
--- a/view/theme/duepuntozero/style.php
+++ b/view/theme/duepuntozero/style.php
@@ -19,6 +19,8 @@ if (!x($colorset)) {
 	$colorset = $s_colorset;
 }
 
+$setcss = '';
+
 if ($colorset) {
 	if ($colorset == 'greenzero') {
 		$setcss = file_get_contents('view/theme/duepuntozero/deriv/greenzero.css');
@@ -27,7 +29,7 @@ if ($colorset) {
 	if ($colorset == 'purplezero') {
 		$setcss = file_get_contents('view/theme/duepuntozero/deriv/purplezero.css');
 	}
-	
+
 	if ($colorset == 'easterbunny') {
 		$setcss = file_get_contents('view/theme/duepuntozero/deriv/easterbunny.css');
 	}
diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index 55a653696..8bab362ff 100644
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -15,14 +15,14 @@ function theme_post(App $a)
 	}
 
 	if (isset($_POST['frio-settings-submit'])) {
-		PConfig::set(local_user(), 'frio', 'scheme',           $_POST['frio_scheme']);
-		PConfig::set(local_user(), 'frio', 'nav_bg',           $_POST['frio_nav_bg']);
-		PConfig::set(local_user(), 'frio', 'nav_icon_color',   $_POST['frio_nav_icon_color']);
-		PConfig::set(local_user(), 'frio', 'link_color',       $_POST['frio_link_color']);
-		PConfig::set(local_user(), 'frio', 'background_color', $_POST['frio_background_color']);
-		PConfig::set(local_user(), 'frio', 'contentbg_transp', $_POST['frio_contentbg_transp']);
-		PConfig::set(local_user(), 'frio', 'background_image', $_POST['frio_background_image']);
-		PConfig::set(local_user(), 'frio', 'bg_image_option',  $_POST['frio_bg_image_option']);
+		PConfig::set(local_user(), 'frio', 'scheme',           defaults($_POST, 'frio_scheme', ''));
+		PConfig::set(local_user(), 'frio', 'nav_bg',           defaults($_POST, 'frio_nav_bg', ''));
+		PConfig::set(local_user(), 'frio', 'nav_icon_color',   defaults($_POST, 'frio_nav_icon_color', ''));
+		PConfig::set(local_user(), 'frio', 'link_color',       defaults($_POST, 'frio_link_color', ''));
+		PConfig::set(local_user(), 'frio', 'background_color', defaults($_POST, 'frio_background_color', ''));
+		PConfig::set(local_user(), 'frio', 'contentbg_transp', defaults($_POST, 'frio_contentbg_transp', ''));
+		PConfig::set(local_user(), 'frio', 'background_image', defaults($_POST, 'frio_background_image', ''));
+		PConfig::set(local_user(), 'frio', 'bg_image_option',  defaults($_POST, 'frio_bg_image_option', ''));
 		PConfig::set(local_user(), 'frio', 'css_modified',     time());
 	}
 }
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index b4bb84cca..9b4833611 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
@@ -217,7 +214,7 @@ a.btn:hover {
     font-size: 12px;
 }
 .btn-primary {
-    background: $nav_bg;
+    background: $nav_bg !important;
     color: $btn_primary_color !important;
 }
 .btn-primary:hover, .btn-primary:focus {
@@ -375,7 +372,7 @@ header #banner {
     left:49%;
     right: 49%;
     z-index: 1040;
-    margin-top: 14px;
+    margin-top: 12.5px;
     text-align: center;
     text-shadow: 1px 1px 2px rgba(0,0,0,.5);
     font-size: 14px;
@@ -479,7 +476,7 @@ nav.navbar .nav>li>a:focus{
     border-radius: 3px;
 }
 #topbar-first .nav>.account .dropdown-toggle {
-    padding: 10px 5px 0px;
+    padding: 8px 5px 0px;
     line-height: 1.1em;
     text-align: left
 }
@@ -714,7 +711,7 @@ nav.navbar a, nav.navbar .btn-link {
 /* Nav Search */
 #topbar-first #search-box .navbar-form {
     margin: 0px;
-    padding: 10px 15px;
+    padding: 12px 12px;
 }
 #search-mobile .navbar-form {
     margin: 0;
@@ -958,6 +955,10 @@ nav.navbar a, nav.navbar .btn-link {
     color: #fff!important;
     background-color: $menu_background_hover_color !important;
 }
+#photo-edit-link-wrap {
+    color: #555;
+    margin-bottom: 15px;
+}
 .nav-pills.preferences .dropdown .dropdown-toggle,
 .nav-pills.preferences > li > .btn {
     color: #bebebe;
@@ -972,6 +973,10 @@ nav.navbar a, nav.navbar .btn-link {
     padding: 2px 10px;
 }
 
+#newmember-tab > a {
+  font-size: 1.2em;
+  font-weight: 800;
+}
 
 /*
  * Aside
@@ -992,6 +997,7 @@ aside .widget,
     margin-bottom: 20px;
     padding: 10px;
     font-size: 13px;
+    overflow: auto;
 }
 aside .widget h3,
 .nav-container .widget h3 {
@@ -1017,7 +1023,7 @@ aside .widget li,
     padding-top: 2px;
     padding-bottom: 2px;
     padding-left: 20px;
-    padding-right: 20px;
+    padding-right: 10px;
 }
 aside .widget li:hover,
 aside .widget li.selected,
@@ -1101,7 +1107,7 @@ aside .vcard .tool .action{
     transition: all 0.25s ease-in-out;
 }
 aside .vcard .tool a {
-color: rgba(255,255,255,.85);
+    color: rgba(255,255,255,.85);
 }
 aside .vcard #profile-photo-wrapper:hover .tool .action {
     opacity: 1;
@@ -1110,11 +1116,11 @@ aside .vcard #profile-photo-wrapper.crop-preview {
     padding: 0;
 }
 aside .vcard .profile-header {
-    margin-bottom: 20px;
+    padding: 5px 0px 20px 0px;
 }
 aside .vcard .fn {
-    font-size: 20px;
     font-weight: bold;
+    padding: 5px 0px 5px 0px;
 }
 aside .vcard .p-addr {
     font-style: italic;
@@ -1134,9 +1140,10 @@ aside .xmpp {
 aside .vcard .icon {
     display: table-cell;
     padding-right: 10px;
+    width: 30px;
 }
 #profile-extra-links {
-    margin-bottom: 20px;
+    overflow: auto;
 }
 aside .vcard #dfrn-request-link-button,
 aside .vcard #wallmessage-link-botton {
@@ -1216,18 +1223,44 @@ aside #follow-sidebar .form-group-search .form-button-search {
     padding: 2px 8px;
 }
 
-aside #group-sidebar .group-edit-tool,
-aside #saved-search-list .savedsearchdrop {
-    opacity: 0.1;
-    transition: all 0.25s ease-in-out;
+div#sidebar-group-header h3 {
+    float: left;
 }
-aside #group-sidebar .sidebar-group-li:hover .group-edit-tool,
-aside #saved-search-list .saved-search-li:hover .savedsearchdrop {
+
+div#sidebar-group-list {
+    clear: both;
+}
+
+.group-new-form {
+    clear: both;
+}
+
+.group-edit-tool {
+    color: #555;
+}
+
+.faded-icon {
+    color: #555;
+    opacity: 0.3;
+    transition: all 0.1s ease-in-out;
+}
+.faded-icon:hover {
+    color: #555;
+    opacity: 1;
+}
+.icon-padding {
+    margin-left: 20px;
+}
+
+aside #group-sidebar .sidebar-group-li:hover .group-edit-tool.faded-icon,
+aside #saved-search-list .saved-search-li:hover .savedsearchdrop.faded-icon,
+aside .widget:hover .widget-action.faded-icon {
     opacity: 0.8;
     transition: all 0.25s ease-in-out;
 }
-aside #group-sidebar .sidebar-group-li .group-edit-tool:hover,
-aside #saved-search-list .saved-search-li .savedsearchdrop:hover {
+aside #group-sidebar .sidebar-group-li .group-edit-tool.faded-icon:hover,
+aside #saved-search-list .saved-search-li .savedsearchdrop.faded-icon:hover,
+aside .widget .widget-action.faded-icon:hover {
     opacity: 1;
 }
 aside #group-sidebar li .group-checkbox {
@@ -1386,6 +1419,15 @@ section #jotOpen {
     color: #fff;
 }
 
+.fa.lock:before {
+    font-family: FontAwesome;
+    content: "\f023";
+}
+.fa.unlock:before {
+    font-family: FontAwesome;
+    content: "\f09c";
+}
+
 /* Filebrowser */
 .fbrowser .breadcrumb {
     margin-bottom: 0px;
@@ -1491,6 +1533,9 @@ section #jotOpen {
     overflow: visible;
     word-wrap: break-word;
 }
+aside .panel-body {
+    padding: 0px;
+}
 
 /* Thread hover effects */
 .wall-item-container .wall-item-content a,
@@ -1574,11 +1619,10 @@ section #jotOpen {
     width: auto;
     height: 25px;
     font-size: 8.8px;
-    padding: 3.6px 0;
     border-radius: 2px;
     position: absolute;
-    top: 30px;
-    left: 30px;
+    top: 28px;
+    left: 28px;
     display: inline-block;
 }
 
@@ -1646,6 +1690,11 @@ section #jotOpen {
     z-index: 1000;
 }
 
+/* Space between content and head */
+.wall-spacer {
+    height: 10px;
+}
+
 /* wall items content */
 .wall-item-content {
     word-break: break-word;
@@ -1837,7 +1886,6 @@ code > .hl-main {
     border-radius: 3px;
 }
 .well hr {
-    margin: 15px 0 10px;
     border-top: 1px solid #d9d9d9;
 }
 .wall-entry .well {
@@ -2133,11 +2181,12 @@ ul.dropdown-menu li:hover {
  .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper,
 .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper,
 .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper,
-.message-content-wrapper, .apps-content-wrapper, .photos-content-wrapper,
+.message-content-wrapper, .apps-content-wrapper,
 #adminpage, .delegate-content-wrapper, .uexport-content-wrapper,
 .viewcontacts-content-wrapper, .dfrn_request-content-wrapper,
 .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper,
-.profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper {
+.profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper,
+.fsuggest-content-wrapper {
     min-height: calc(100vh - 150px);
     padding: 15px;
     padding-bottom: 20px;
@@ -2153,6 +2202,13 @@ ul.dropdown-menu li:hover {
     -webkit-box-shadow: 0 0 3px #dadada;
     -moz-box-shadow: 0 0 3px #dadada;
 }
+#content:hover .page-action.faded-icon {
+    opacity: 0.8;
+    transition: all 0.25s ease-in-out;
+}
+#content .page-action.faded-icon:hover {
+    opacity: 1;
+}
 
 .section-title-wrapper {
     overflow: hidden;
@@ -2303,7 +2359,7 @@ ul li:hover .contact-wrapper .contact-action-link:hover {
 
 /* group edit page */
 .group-actions {
-    margin-top: 20px;
+    margin-top: 4px;
     margin-bottom: 10px;
     font-size: 30px;
 }
@@ -2316,8 +2372,12 @@ ul li:hover .contact-wrapper .contact-action-link:hover {
 .contact-group-actions .fa-plus-circle { color: #008000;}
 
 #group-edit-wrapper {
+    margin-top: 14px;
     display: none;
 }
+#group-edit-header {
+    display: block;
+}
 #group-update-wrapper .contact-photo-overlay {
     display: none;
 }
@@ -2326,7 +2386,7 @@ ul li:hover .contact-wrapper .contact-action-link:hover {
     margin-top: -10px;
     display: flex;
 }
-#group-update-wrapper .viewcontact_wrapper .contact-action-link {
+#group-update-wrapper .viewcontact_wrapper .contact-group-link {
     opacity: 0.8;
     font-size: 20px;
     line-height: 50px;
@@ -2440,6 +2500,13 @@ ul li:hover .contact-wrapper .contact-action-link:hover {
 }
 
 /* photos */
+#photo-album-edit-name-label {
+    width: 100%;
+}
+.photo-album-edit-name {
+    width: 60%;
+}
+
 .photo-album-actions {
     margin-bottom: 10px;
 }
@@ -2815,7 +2882,7 @@ ul.notif-network-list > li:hover .intro-action-buttons {
 }
 .intro-desc-label, .intro-url-label, .intro-network-label,
 .intro-location-label, .intro-gender-label, .intro-keywords-label,
-.intro-about-label, .intro-knowyou-label {
+.intro-about-label, .intro-knowyou-label, .intro-madeby-label {
     font-weight: bold;
 }
 .intro-contact-info.xs .intro-url-label, .intro-contact-info.xs .intro-network-label,
@@ -2918,8 +2985,8 @@ section.help-content-wrapper li {
 #admin-summary-wrapper {
     padding-top: 10px;
 }
-#adminpage ul#pluginslist, li.plugin {
-    padding-top: 10px;
+#adminpage ul#addonslist, li.addon {
+    list-style: none;
 }
 #adminpage li .icon {
     display: inline-block;
@@ -2959,7 +3026,7 @@ section.help-content-wrapper li {
     font-size: 11px;
     color: #555555;
 }
-#adminpage .plugin .desc {
+#adminpage .addon .desc {
     padding-left: 10px;
 }
 .adminpage .admin-settings-action-link,
@@ -2978,6 +3045,14 @@ section.help-content-wrapper li {
 .adminpage .table-hover > tbody > tr:hover + tr.details {
     background-color: #f5f5f5;
 }
+.offset-anchor::before {
+    display: block;
+    content: " ";
+    margin-top: -100px;
+    height: 100px;
+    visibility: hidden;
+    pointer-events: none;
+}
 
 /* Register Page*/
 #register-openid-wrapper, #register-name-wrapper, #register-invite-wrapper, #profile-publish-wrapper {
@@ -3220,6 +3295,50 @@ section .profile-match-wrapper {
     background-color: rgba(255,255,255,.85);
 }
 
+.qq-upload-button {
+    background: $nav_bg !important;
+    color: $btn_primary_color !important;
+    float: none;
+    border: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    -moz-box-shadow: none;
+    background-image: none;
+    text-shadow: none;
+    border-radius: 3px;
+    outline: 0!important;
+    margin-bottom: 0;
+    font-size: 14px;
+    font-weight: 600;
+    padding: 8px 16px;
+    color: inherit;
+    width: 100% !important;
+}
+
+.qq-upload-drop-area {
+    background: white !important;
+    float: none;
+    border: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    -moz-box-shadow: none;
+    background-image: none;
+    text-shadow: none;
+    border-radius: 3px;
+    outline: 0!important;
+    margin-bottom: 0;
+    font-size: 14px;
+    font-weight: 600;
+    padding: 8px 16px;
+    color: inherit;
+    width: 100% !important;
+    display: block !important;
+    position: relative !important;
+    border: black 1px dashed !important;
+    margin-bottom: 5px !important;
+    margin-top: 15px !important;
+}
+
 /* Medium devices (desktops, 992px and up) */
 @media (min-width: 992px) {
     .mod-home.is-not-singleuser #content,
@@ -3272,5 +3391,71 @@ section .profile-match-wrapper {
 
 }
 
+/* Mobile display */
+@media (max-width: 600px) {
+	body {
+		padding-top: 95px;
+	}
 
+	#friendica-logo-mask {
+		display: none;
+	}
 
+	.container {
+		padding-right: 0;
+		padding-left: 0;
+	}
+
+	.panel {
+		border-radius: 0;
+		margin-bottom: 5px;
+	}
+
+	.panel .panel-body {
+		padding: 10px;
+	}
+
+	.wall-spacer {
+		height: 0px;
+	}
+
+	.wall-item-actions {
+		margin-top: 10px;
+	}
+
+	.media {
+		margin-top: 0;
+	}
+
+	.nav-pills.preferences {
+		right: 10px;
+	}
+
+	.generic-page-wrapper, .profile_photo-content-wrapper, .videos-content-wrapper, .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper, .message-content-wrapper, .apps-content-wrapper, #adminpage, .delegate-content-wrapper, .uexport-content-wrapper, .viewcontacts-content-wrapper, .dfrn_request-content-wrapper, .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper, .profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper, .fsuggest-content-wrapper {
+		border-radius: 0;
+		padding: 10px;
+	}
+
+	.row {
+		margin-right: 0;
+	}
+
+	.col-lg-1, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-md-1, .col-md-10, .col-md-11, .col-md-12, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-sm-1, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-xs-1, .col-xs-10, .col-xs-11, .col-xs-12, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9 {
+		padding-right: 0;
+	}
+
+	.wwto .contact-photo {
+		height: 19px;
+		padding: 0;
+		top: 24px;
+		left: 24px;
+	}
+
+	/*
+		Prevent automatic zoom on input focus on iOS
+		see https://stackoverflow.com/a/16255670
+	*/
+	.form-control {
+		font-size: 16px;
+	}
+}
diff --git a/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png b/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png
index d0a65c08b..1790e14da 100644
Binary files a/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png and b/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha-horizontal.png differ
diff --git a/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png b/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png
index 38043f1c8..aa7d8bc27 100644
Binary files a/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png and b/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/alpha.png differ
diff --git a/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png b/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png
index a0d9add8e..2731cd0ca 100644
Binary files a/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png and b/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/hue-horizontal.png differ
diff --git a/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png b/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png
index d89560e99..a312a777a 100644
Binary files a/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png and b/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/hue.png differ
diff --git a/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png b/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png
index 594ae50ed..a2f580c31 100644
Binary files a/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png and b/view/theme/frio/frameworks/bootstrap-colorpicker/img/bootstrap-colorpicker/saturation.png differ
diff --git a/view/theme/frio/img/friendica-32.png b/view/theme/frio/img/friendica-32.png
index 5bd39622d..6dbcdc763 100644
Binary files a/view/theme/frio/img/friendica-32.png and b/view/theme/frio/img/friendica-32.png differ
diff --git a/view/theme/frio/img/icon_search16x16.png b/view/theme/frio/img/icon_search16x16.png
index 49b6d361c..bc6d1f95b 100644
Binary files a/view/theme/frio/img/icon_search16x16.png and b/view/theme/frio/img/icon_search16x16.png differ
diff --git a/view/theme/frio/img/mime/audio.png b/view/theme/frio/img/mime/audio.png
index 8ec35f91c..958da5a52 100644
Binary files a/view/theme/frio/img/mime/audio.png and b/view/theme/frio/img/mime/audio.png differ
diff --git a/view/theme/frio/img/mime/excel.png b/view/theme/frio/img/mime/excel.png
index 5714353df..eec9d2799 100644
Binary files a/view/theme/frio/img/mime/excel.png and b/view/theme/frio/img/mime/excel.png differ
diff --git a/view/theme/frio/img/mime/file.png b/view/theme/frio/img/mime/file.png
index 59906180d..e4d9782af 100644
Binary files a/view/theme/frio/img/mime/file.png and b/view/theme/frio/img/mime/file.png differ
diff --git a/view/theme/frio/img/mime/illustrator.png b/view/theme/frio/img/mime/illustrator.png
index 7623567b7..25c97b266 100644
Binary files a/view/theme/frio/img/mime/illustrator.png and b/view/theme/frio/img/mime/illustrator.png differ
diff --git a/view/theme/frio/img/mime/image.png b/view/theme/frio/img/mime/image.png
index d85b940df..73a673b8d 100644
Binary files a/view/theme/frio/img/mime/image.png and b/view/theme/frio/img/mime/image.png differ
diff --git a/view/theme/frio/img/mime/indesign.png b/view/theme/frio/img/mime/indesign.png
index dcdce60bb..06331712d 100644
Binary files a/view/theme/frio/img/mime/indesign.png and b/view/theme/frio/img/mime/indesign.png differ
diff --git a/view/theme/frio/img/mime/pdf.png b/view/theme/frio/img/mime/pdf.png
index 9993e29b3..d5e2c425f 100644
Binary files a/view/theme/frio/img/mime/pdf.png and b/view/theme/frio/img/mime/pdf.png differ
diff --git a/view/theme/frio/img/mime/photoshop.png b/view/theme/frio/img/mime/photoshop.png
index 243179fca..59a973620 100644
Binary files a/view/theme/frio/img/mime/photoshop.png and b/view/theme/frio/img/mime/photoshop.png differ
diff --git a/view/theme/frio/img/mime/powerpoint.png b/view/theme/frio/img/mime/powerpoint.png
index 308726bb5..c52a79ecb 100644
Binary files a/view/theme/frio/img/mime/powerpoint.png and b/view/theme/frio/img/mime/powerpoint.png differ
diff --git a/view/theme/frio/img/mime/video.png b/view/theme/frio/img/mime/video.png
index d2706c8d8..4023818c4 100644
Binary files a/view/theme/frio/img/mime/video.png and b/view/theme/frio/img/mime/video.png differ
diff --git a/view/theme/frio/img/mime/word.png b/view/theme/frio/img/mime/word.png
index 5904d075a..fb5d4f59b 100644
Binary files a/view/theme/frio/img/mime/word.png and b/view/theme/frio/img/mime/word.png differ
diff --git a/view/theme/frio/img/mime/zip.png b/view/theme/frio/img/mime/zip.png
index 2ab4d72c4..91a0594e4 100644
Binary files a/view/theme/frio/img/mime/zip.png and b/view/theme/frio/img/mime/zip.png differ
diff --git a/view/theme/frio/img/placeholder-postform-arrow.png b/view/theme/frio/img/placeholder-postform-arrow.png
index d7d7a48a2..64c91ff80 100644
Binary files a/view/theme/frio/img/placeholder-postform-arrow.png and b/view/theme/frio/img/placeholder-postform-arrow.png differ
diff --git a/view/theme/frio/img/screenshots/screenshot-jot-modal.png b/view/theme/frio/img/screenshots/screenshot-jot-modal.png
index ce15f7c40..841139667 100644
Binary files a/view/theme/frio/img/screenshots/screenshot-jot-modal.png and b/view/theme/frio/img/screenshots/screenshot-jot-modal.png differ
diff --git a/view/theme/frio/img/screenshots/screenshot-mobile.png b/view/theme/frio/img/screenshots/screenshot-mobile.png
index 8850cdffe..887187f86 100644
Binary files a/view/theme/frio/img/screenshots/screenshot-mobile.png and b/view/theme/frio/img/screenshots/screenshot-mobile.png differ
diff --git a/view/theme/frio/img/screenshots/screenshot-scheme-love-music.png b/view/theme/frio/img/screenshots/screenshot-scheme-love-music.png
index 8b73e58f6..66955aec7 100644
Binary files a/view/theme/frio/img/screenshots/screenshot-scheme-love-music.png and b/view/theme/frio/img/screenshots/screenshot-scheme-love-music.png differ
diff --git a/view/theme/frio/img/screenshots/screenshot-scheme-red.png b/view/theme/frio/img/screenshots/screenshot-scheme-red.png
index c6d49f25b..5be6d8fbd 100644
Binary files a/view/theme/frio/img/screenshots/screenshot-scheme-red.png and b/view/theme/frio/img/screenshots/screenshot-scheme-red.png differ
diff --git a/view/theme/frio/img/screenshots/screenshot-settings.png b/view/theme/frio/img/screenshots/screenshot-settings.png
index 39db79be1..0c4b5dfc1 100644
Binary files a/view/theme/frio/img/screenshots/screenshot-settings.png and b/view/theme/frio/img/screenshots/screenshot-settings.png differ
diff --git a/view/theme/frio/img/screenshots/screenshot.png b/view/theme/frio/img/screenshots/screenshot.png
index c25504931..a3e123719 100644
Binary files a/view/theme/frio/img/screenshots/screenshot.png and b/view/theme/frio/img/screenshots/screenshot.png differ
diff --git a/view/theme/frio/img/select_arrow.png b/view/theme/frio/img/select_arrow.png
index fd94a45ec..66b45554d 100644
Binary files a/view/theme/frio/img/select_arrow.png and b/view/theme/frio/img/select_arrow.png differ
diff --git a/view/theme/frio/js/event_edit.js b/view/theme/frio/js/event_edit.js
index da0837223..628835a5f 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();
diff --git a/view/theme/frio/js/mod_notifications.js b/view/theme/frio/js/mod_notifications.js
new file mode 100644
index 000000000..9db3eabf0
--- /dev/null
+++ b/view/theme/frio/js/mod_notifications.js
@@ -0,0 +1,36 @@
+
+/**
+ * @brief Javascript for the notifications module
+ */
+
+// Catch the intro ID from the URL
+var introID = location.pathname.split("/").pop();
+
+$(document).ready(function(){
+	// Since only the DIV's inside the notification-list are marked
+	// with the class "unseen", we need some js to transfer this class
+	// to the parent li list-elements.
+	if($(".notif-item").hasClass("unseen")) {
+		$(".notif-item.unseen").parent("li").addClass("unseen");
+	}
+});
+
+$(window).load(function(){
+	// Scroll to the intro by its intro ID.
+	if (isIntroID()) {
+		scrollToItem('intro-' + introID);
+	}
+});
+
+// Check if it is a real introduction ID.
+function isIntroID() {
+	// Check for the correct path.
+	if (window.location.href.indexOf("/notifications/intros/") !== -1) {
+		// Make sure the introID is a positive Integer value.
+		var intVal = Number(introID);
+		if (Math.floor(intVal) !== Infinity && String(intVal) === introID && intVal > 0) {
+			return true;
+		}
+	}
+	return false;
+}
diff --git a/view/theme/frio/js/mod_photos.js b/view/theme/frio/js/mod_photos.js
index b8d03b5db..77173385b 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/js/modal.js b/view/theme/frio/js/modal.js
index 46bb1e514..9a15cab52 100644
--- a/view/theme/frio/js/modal.js
+++ b/view/theme/frio/js/modal.js
@@ -12,7 +12,7 @@ $(document).ready(function(){
 		// with AjaxUpload.
 		$(".fbrowser").remove();
 		// Remove the AjaxUpload element.
-		$("[name=userfile]").parent().remove();
+		$(".ajaxbutton-wrapper").remove();
 	});
 
 	// Clear bs modal on close.
@@ -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();
diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index 859df0161..edbe713c6 100644
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -372,11 +372,13 @@ function openClose(theID) {
 }
 
 function showHide(theID) {
-	if(document.getElementById(theID).style.display == "block") {
-		document.getElementById(theID).style.display = "none"
+	var elem = document.getElementById(theID);
+
+	if( $(elem).is(':visible') ) {
+		elem.style.display = "none";
 	}
 	else {
-		document.getElementById(theID).style.display = "block"
+		elem.style.display = "block";
 	}
 }
 
@@ -550,6 +552,10 @@ function filter_replace(item) {
 		this.attr('autocomplete','off');
 		var a = this.textcomplete([contacts], {className:'accontacts', appendTo: '#contact-list'});
 
+		if(autosubmit) {
+			a.on('textComplete:select', function(e,value,strategy) {submit_form(this);});
+		}
+
 		a.on('textComplete:select', function(e, value, strategy) {
 			$(".dropdown-menu.textcomplete-dropdown.media-list").show();
 		});
diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index 428d88788..cb6832853 100644
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -21,12 +21,12 @@ if (!isset($minimal)) {
 ?>
 <html>
 	<head>
-		<title><?php if (x($page, 'title')) echo $page['title'] ?></title>
-		<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
+		<title><?php if (!empty($page['title'])) echo $page['title'] ?></title>
+		<meta request="<?php echo htmlspecialchars(defaults($_REQUEST, 'pagename', '')) ?>">
 		<script  type="text/javascript">var baseurl = "<?php echo System::baseUrl(); ?>";</script>
 		<script type="text/javascript">var frio = "<?php echo 'view/theme/frio'; ?>";</script>
 <?php
-		$basepath = $a->path ? "/" . $a->path . "/" : "/";
+		$basepath = $a->urlpath ? "/" . $a->urlpath . "/" : "/";
 		$frio = "view/theme/frio";
 
 		// Because we use minimal for modals the header and the included js stuff should be only loaded
@@ -44,7 +44,7 @@ if (!isset($minimal)) {
 			$uid = Profile::getThemeUid();
 		}
 		$scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
-		if (($scheme) && ($scheme != '---')) {
+		if ($scheme && ($scheme != '---')) {
 			if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
 				$schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
 				require_once $schemefile;
@@ -52,7 +52,7 @@ if (!isset($minimal)) {
 		} else {
 			$nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
 		}
-		if (!$nav_bg) {
+		if (empty($nav_bg)) {
 			$nav_bg = "#708fa0";
 		}
 		echo '
diff --git a/view/theme/frio/php/scheme.php b/view/theme/frio/php/scheme.php
index 538839b2c..05829bb21 100644
--- a/view/theme/frio/php/scheme.php
+++ b/view/theme/frio/php/scheme.php
@@ -46,7 +46,11 @@ function get_scheme_info($scheme)
 		foreach ($ll as $l) {
 			$l = trim($l, "\t\n\r */");
 			if ($l != '') {
-				list($k, $v) = array_map('trim', explode(':', $l, 2));
+				$values = array_map('trim', explode(':', $l, 2));
+				if (count($values) < 2) {
+					continue;
+				}
+				list($k, $v) = $values;
 				$k = strtolower($k);
 				if ($k == 'author') {
 					$r = preg_match('|([^<]+)<([^>]+)>|', $v, $m);
diff --git a/view/theme/frio/scheme/plusminus.css b/view/theme/frio/scheme/plusminus.css
new file mode 100644
index 000000000..9d99d7984
--- /dev/null
+++ b/view/theme/frio/scheme/plusminus.css
@@ -0,0 +1,108 @@
+/*
+    Licence    : AGPL
+
+    Created on : 29.06.2018, 15:03:06
+    Author     : hoergen
+    Color picker   : https://www.w3schools.com/colors/colors_names.asp
+    CSS UTF8 icons : https://www.utf8icons.com 
+
+*/
+
+body {
+    background: url(scheme/plusminus.jpg);
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-attachment: fixed;
+    height: auto;
+}
+
+aside .widget, .form-control, .panel, .nav-container, .wall-item-content, .e-content, .p-name, .topbar, post, shiny, tread-wrapper, #topbar-second  {
+    color: #000;
+    background-color: #f5f5f5;
+}
+
+.form-control {	
+    font-family: ".SFNSText-Regular","San Francisco","Roboto","Segoe UI","Helvetica Neue","Lucida Grande",Helvetica,Arial,sans-serif;
+}
+
+#topbar-first #nav-notifications-menu li.notify-unseen {
+    border-left: 3px solid #f3fcfd;
+    background-color: antiquewhite;
+}
+
+#topbar-first #nav-notifications-menu li.notif-entry {
+    padding: 0px;
+}
+
+.birthday-notice {
+    background-color:#cc0000;
+    color: white;
+}
+
+#birthday-title {
+    background-color:#ff0000;
+    color: white;
+    text-indent: 6px;
+}
+
+.birthday-list:before {
+    content: "\1F382 ";
+}
+
+.birthday-list{
+    margin: 1px;
+    color: black;
+    background-color: yellow;
+    text-indent: 10px;
+    border-radius: 5px;
+}
+
+#event-notice{
+    color: white;
+    background-color: #004c5b;
+    text-indent: 2px;
+}
+
+#event-title{
+    color: whitesmoke;
+    background-color: #006c83;
+    text-indent: 6px;
+}
+
+.event-list:before {
+    content: "\1F5D3 ";
+}
+
+.event-list {
+    margin: 1px;
+    color: black;
+    background-color: #00c7f0;
+    text-indent: 10px;
+    border-radius: 5px;
+}
+
+.panel .panel-body {
+    padding-top: 1px;
+    padding-bottom: 1px;
+    padding-left:5px;
+    padding-right:5px;
+    border: 1px;
+}
+
+.wall-item-network {
+    font-size: 12px;
+}
+
+.wall-item-content .clearfix .post .comment-container .well .well-sm .wall-item-body .e-content .p-name .media .comment .wall-item-bottom .wall-item-links .wall-item-tags .wall-item-actions .wall-item-responses #hr {
+    box-sizing: border-box;
+    margin-top: 0px;
+    margin-bottom: 0px;
+    border:0px;
+    padding:0px;
+    color:black; 
+}
+
+.wall-spacer {
+    height: 0px;
+}
+
diff --git a/view/theme/frio/scheme/plusminus.jpg b/view/theme/frio/scheme/plusminus.jpg
new file mode 100644
index 000000000..7d333a2e1
Binary files /dev/null and b/view/theme/frio/scheme/plusminus.jpg differ
diff --git a/view/theme/frio/scheme/plusminus.php b/view/theme/frio/scheme/plusminus.php
new file mode 100644
index 000000000..a8ce7af1d
--- /dev/null
+++ b/view/theme/frio/scheme/plusminus.php
@@ -0,0 +1,17 @@
+<?php
+/*
+ * Name: Plusminus
+ * Author: hoergen
+ * 
+ * List here all variables which will get overwritten through this scheme
+ * Overwrites: nav_bg, nav_icon_color, link_color, background_color, contentbg_transp
+ */
+
+        $nav_bg = "#000b95";
+        $nav_icon_color = "#eee";
+        $link_color = "#000b95";
+        //$background_color = "#ededed";
+        //$login_bg_color = "#ededed";
+        $contentbg_transp = 100;
+
+
diff --git a/view/theme/frio/screenshot.png b/view/theme/frio/screenshot.png
index c25504931..bdfcab392 100644
Binary files a/view/theme/frio/screenshot.png and b/view/theme/frio/screenshot.png differ
diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 621f5d0cc..e0f65960f 100644
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -110,6 +110,7 @@ if (empty($login_bg_image) && empty($login_bg_color)) {
 	$login_bg_image = 'img/login_bg.jpg';
 }
 $login_bg_color   = (empty($login_bg_color)   ? '#ededed'      : $login_bg_color);
+$login_bg_image   = (empty($login_bg_image)   ? ''             : $login_bg_image);
 
 $contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != '') ? $contentbg_transp : 100);
 
@@ -224,7 +225,8 @@ header('ETag: "' . $etag . '"');
 header('Last-Modified: ' . $modified);
 
 // Only send the CSS file if it was changed.
-if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+/// @todo Check if this works at all (possibly clients are sending only the one or the other header) - compare with mod/photo.php
+if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
 	$cached_modified = gmdate('r', strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']));
 	$cached_etag = str_replace(['"', '-gzip'], ['', ''],
 				stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
diff --git a/view/theme/frio/templates/admin/addons.tpl b/view/theme/frio/templates/admin/addons.tpl
new file mode 100644
index 000000000..220abdc2c
--- /dev/null
+++ b/view/theme/frio/templates/admin/addons.tpl
@@ -0,0 +1,22 @@
+
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+		{{if $pcount eq 0}}
+		    <div class="error-message">
+		    {{$noplugshint}}
+		    </div>
+		{{else}}
+		<a class="btn" href="{{$baseurl}}/admin/{{$function}}?a=r&amp;t={{$form_security_token}}">{{$reload}}</a>
+		<ul id='addonslist'>
+		{{foreach $addons as $p}}
+			<li class="addon {{$p.1}}">
+				<span class="offset-anchor" id="{{$p.0}}"></span>
+				<a class='toggleaddon' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}#{{$p.0}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><span class='icon {{$p.1}}'></span></a>
+				<a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>
+				{{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
+				<div class='desc'>{{$p.2.description}}</div>
+			</li>
+		{{/foreach}}
+		</ul>
+		{{/if}}
+</div>
diff --git a/view/theme/frio/templates/admin/queue.tpl b/view/theme/frio/templates/admin/queue.tpl
new file mode 100644
index 000000000..dde386399
--- /dev/null
+++ b/view/theme/frio/templates/admin/queue.tpl
@@ -0,0 +1,25 @@
+<div id="adminpage">
+	<h1>{{$title}} - {{$page}} ({{$count}})</h1>
+	
+	<p>{{$info}}</p>
+	<table class="table">
+		<tr>
+			<th>{{$id_header}}</th>
+			<th>{{$to_header}}</th>
+			<th>{{$url_header}}</th>
+			<th>{{$network_header}}</th>
+			<th>{{$created_header}}</th>
+			<th>{{$last_header}}</th>
+		</tr>
+		{{foreach $entries as $e}}
+		<tr>
+			<td>{{$e.id}}</td>
+			<td>{{$e.name}}</td>
+			<td><a href="{{$e.nurl}}">{{$e.nurl}}</a></td>
+			<td>{{$e.network}}</td>
+			<td>{{$e.created}}</td>
+			<td>{{$e.last}}</td>
+		</tr>
+		{{/foreach}}
+	</table>
+</div>
diff --git a/view/theme/frio/templates/admin/summary.tpl b/view/theme/frio/templates/admin/summary.tpl
index 26c999175..30eca8dc0 100644
--- a/view/theme/frio/templates/admin/summary.tpl
+++ b/view/theme/frio/templates/admin/summary.tpl
@@ -14,7 +14,7 @@
 		{{* The work queues short statistic. *}}
 		<div id="admin-summary-queues" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 admin-summary">
 			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$queues.label}}</div>
-			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry"><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - {{$queues.workerq}}</div>
+			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry"><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - <a href="{{$baseurl}}/admin/workerqueue">{{$queues.workerq}}</a></div>
 		</div>
 
 		{{* Number of pending registrations. *}}
diff --git a/view/theme/frio/templates/admin/workerqueue.tpl b/view/theme/frio/templates/admin/workerqueue.tpl
new file mode 100644
index 000000000..ab076a0f7
--- /dev/null
+++ b/view/theme/frio/templates/admin/workerqueue.tpl
@@ -0,0 +1,21 @@
+<div id="adminpage">
+	<h1>{{$title}} - {{$page}} ({{$count}})</h1>
+	
+	<p>{{$info}}</p>
+	<table class="table">
+		<tr>
+			<th>{{$id_header}}</th>
+			<th>{{$param_header}}</th>
+			<th>{{$created_header}}</th>
+			<th>{{$prio_header}}</th>
+		</tr>
+		{{foreach $entries as $e}}
+		<tr>
+			<td>{{$e.id}}</td>
+			<td>{{$e.parameter}}</td>
+			<td>{{$e.created}}</td>
+			<td>{{$e.priority}}</td>
+		</tr>
+		{{/foreach}}
+	</table>
+</div>
diff --git a/view/theme/frio/templates/album_edit.tpl b/view/theme/frio/templates/album_edit.tpl
new file mode 100644
index 000000000..f4a60b7d0
--- /dev/null
+++ b/view/theme/frio/templates/album_edit.tpl
@@ -0,0 +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">
+		</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/common_tabs.tpl b/view/theme/frio/templates/common_tabs.tpl
index 3936e469b..76c6db039 100644
--- a/view/theme/frio/templates/common_tabs.tpl
+++ b/view/theme/frio/templates/common_tabs.tpl
@@ -6,7 +6,7 @@
 		<li>
 			<ul class="tabs  flex-nav" role="menu" >
 			{{foreach $tabs as $tab}}
-				<li id="{{$tab.id}}" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+				<li id="{{$tab.id}}" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.accesskey}}accesskey="{{$tab.accesskey}}"{{/if}} {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
 			{{/foreach}}
 			</ul>
 		</li>
diff --git a/view/theme/frio/templates/contact_block.tpl b/view/theme/frio/templates/contact_block.tpl
new file mode 100644
index 000000000..45b582a6f
--- /dev/null
+++ b/view/theme/frio/templates/contact_block.tpl
@@ -0,0 +1,18 @@
+
+<div id="contact-block">
+	<h3 class="contact-block-h4 pull-left">{{$contacts}}</h3>
+
+	{{if $micropro}}
+	<a class="pull-right widget-action faded-icon" id="contact-block-view-contacts" href="viewcontacts/{{$nickname}}">
+		<i class="fa fa-eye" aria-hidden="true"></i>
+		<span class="sr-only">{{$viewcontacts}}</span>
+	</a>
+
+	<div class='contact-block-content'>
+		{{foreach $micropro as $m}}
+			{{$m}}
+		{{/foreach}}
+	</div>
+	{{/if}}
+</div>
+<div class="clear"></div>
diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index 8dc0df38f..a72ac5c60 100644
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -26,8 +26,8 @@
 							{{/if}}
 							<li role="presentation"><a role="menuitem" href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title}}">{{$contact_actions.block.label}}</a></li>
 							<li role="presentation"><a role="menuitem" href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title}}">{{$contact_actions.ignore.label}}</a></li>
-							<li role="presentation"><a role="menuitem" href="{{$contact_actions.archive.url}}" title="{{$contact_actions.archive.title}}">{{$contact_actions.archive.label}}</a></li>
-							<li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1');">{{$contact_actions.delete.label}}</button></li>
+							{{if $contact_actions.archive.url}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.archive.url}}" title="{{$contact_actions.archive.title}}">{{$contact_actions.archive.label}}</a></li>{{/if}}
+							{{if $contact_actions.delete.url}}<li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1');">{{$contact_actions.delete.label}}</button></li>{{/if}}
 						</ul>
 					</li>
 				</ul>
@@ -119,6 +119,7 @@
 						<div class="clear"></div>
 					</div>
 
+					{{if $contact_settings_label}}
 					<div class="panel">
 						<div class="section-subtitle-wrapper" role="tab" id="contact-edit-settings">
 							<h4>
@@ -146,7 +147,9 @@
 							</div>
 						</div>
 					</div>
+					{{/if}}
 
+					{{if $lbl_info1}}
 					<div class="panel">
 						<div class="section-subtitle-wrapper" role="tab" id="contact-edit-info">
 							<h4>
@@ -172,7 +175,8 @@
 							</div>
 						</div>
 					</div>
-
+					{{/if}}
+					{{if $lbl_vis1}}
 					<div class="panel">
 						<div class="section-subtitle-wrapper" role="tab" id="contact-edit-profile-select">
 							<h4>
@@ -200,7 +204,7 @@
 							</div>
 						</div>
 					</div>
-
+					{{/if}}
 				</div>
 
 			</form>{{* End of the form *}}
diff --git a/view/theme/frio/templates/contact_template.tpl b/view/theme/frio/templates/contact_template.tpl
index 8a5296204..e1c0a7700 100644
--- a/view/theme/frio/templates/contact_template.tpl
+++ b/view/theme/frio/templates/contact_template.tpl
@@ -84,7 +84,7 @@
 			{{* The button to add or remove contacts from a contact group - group edit page *}}
 			{{if $contact.change_member}}
 			<div class="contact-group-actions pull-right nav-pills preferences">
-				<button type="button" class="contact-action-link btn-link" onclick="groupChangeMember({{$contact.change_member.gid}},{{$contact.change_member.cid}},'{{$contact.change_member.sec_token}}'); return true;" data-toggle="tooltip" title="{{$contact.change_member.title}}">
+				<button type="button" class="contact-action-link contact-group-link btn-link" onclick="groupChangeMember({{$contact.change_member.gid}},{{$contact.change_member.cid}},'{{$contact.change_member.sec_token}}'); return true;" data-toggle="tooltip" title="{{$contact.change_member.title}}">
 					{{if $contact.label == "members"}}
 					<i class="fa fa-times-circle" aria-hidden="true"></i>
 					{{elseif $contact.label == "contacts"}}
diff --git a/view/theme/frio/templates/contacts-template.tpl b/view/theme/frio/templates/contacts-template.tpl
index ee4cc9747..6f6422401 100644
--- a/view/theme/frio/templates/contacts-template.tpl
+++ b/view/theme/frio/templates/contacts-template.tpl
@@ -16,14 +16,10 @@
 	<div id="contacts-search-wrapper">
 		<form id="contacts-search-form" class="navbar-form" role="search" action="{{$cmd}}" method="get" >
 			<div class="row">
-				<div class="col-md-2"></div>
-				<div class="col-md-8 ">
-					<div class="form-group form-group-search">
-						<input type="text" name="search" id="contacts-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search|escape:'html'}}" placeholder="{{$desc}}"/>
-						<button class="btn btn-default btn-sm form-button-search" type="submit" id="contacts-search-submit">{{$submit}}</button>
-					</div>
+				<div class="form-group form-group-search">
+					<input type="text" name="search" id="contacts-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search|escape:'html'}}" placeholder="{{$desc}}"/>
+					<button class="btn btn-default btn-sm form-button-search" type="submit" id="contacts-search-submit">{{$submit}}</button>
 				</div>
-				<div class="col-md-2"></div>
 			</div>
 		</form>
 	</div>
diff --git a/view/theme/frio/templates/events_js.tpl b/view/theme/frio/templates/events_js.tpl
index 76394fe40..a4ca9004c 100644
--- a/view/theme/frio/templates/events_js.tpl
+++ b/view/theme/frio/templates/events_js.tpl
@@ -1,12 +1,18 @@
 <div class="generic-page-wrapper">
 	{{$tabs}}
-	{{include file="section_title.tpl" title=$title}}
+	{{include file="section_title.tpl" title=$title pullright=1}}
 
 	{{* The link to create a new event *}}
-	<div id="new-event-link"><button type="button" class="btn-link" onclick="addToModal('{{$new_event.0}}')" >{{$new_event.1}}</button></div>
+	{{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">
+	<div id="fc-header" class="clear">
 		<div id="fc-header-right" class="pull-right">
 			{{* The dropdown to change the callendar view *}}
 			<ul class="nav nav-pills">
diff --git a/view/theme/frio/templates/field_input.tpl b/view/theme/frio/templates/field_input.tpl
index 62a7d72e8..6ea3923b9 100644
--- a/view/theme/frio/templates/field_input.tpl
+++ b/view/theme/frio/templates/field_input.tpl
@@ -1,6 +1,8 @@
 
 <div id="id_{{$field.0}}_wrapper" class="form-group field input">
+	{{if !isset($label) || $label != false }}
 	<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
+	{{/if}}
 	<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}"{{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}} type="text"{{/if}} value="{{$field.2|escape:'html'}}"{{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
 	{{if $field.3}}
 	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
diff --git a/view/theme/frio/templates/group_edit.tpl b/view/theme/frio/templates/group_edit.tpl
index d94dd3311..174c292e0 100644
--- a/view/theme/frio/templates/group_edit.tpl
+++ b/view/theme/frio/templates/group_edit.tpl
@@ -7,54 +7,52 @@
 <script type="text/javascript" src="view/theme/frio/js/mod_group.js"></script>
 
 <div class="generic-page-wrapper">
-
+	{{if $editable == 1}}
 	{{* The buttons for editing the contact group (edit name / remove contact group) *}}
 	<div class="group-actions pull-right">
-		<button type="button" id="group-rename" class="btn btn-clear" onclick="openClose('group-edit-wrapper'); return false;" title="{{$edit_name}}" data-toggle="tooltip">
+		<button type="button" id="group-rename" class="btn btn-clear" onclick="showHide('group-edit-wrapper'); showHide('group-edit-header'); return false;" title="{{$edit_name}}" data-toggle="tooltip">
 			<i class="fa fa-pencil" aria-hidden="true"></i>
 		</button>
 		{{if $drop}}{{$drop}}{{/if}}
 	</div>
+	{{/if}}
 
-	{{include file="section_title.tpl"}}
+	<div class="section-title-wrapper">
+		<div id="group-edit-header">
+			<h2>{{$title}}</h2>
+		</div>
 
-	{{* Edit the name of the group *}}
-	<div id="group-edit-wrapper" class="panel panel-inline">
-		<form action="group/{{$gid}}" id="group-edit-form" method="post">
-			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		{{* Edit the name of the group *}}
+		<div id="group-edit-wrapper">
 
-			{{include file="field_input.tpl" field=$gname}}
-			<div id="group-edit-submit-wrapper" class="form-group pull-right">
-				<button class="btn btn-primary btn-small" type="submit" name="submit" value="{{$submit|escape:'html'}}">
-					{{$submit|escape:'html'}}
-				</button>
-			</div>
-			<div id="group-edit-select-end" class="clear"></div>
-		</form>
+			<form action="group/{{$gid}}" id="group-edit-form" method="post">
+
+				<div class="pull-left">
+				{{include file="field_input.tpl" field=$gname label=false}}
+				</div>
+				<div id="group-edit-submit-wrapper" class="form-group pull-right">
+					<button class="btn btn-primary btn-small" type="submit" name="submit" value="{{$submit|escape:'html'}}">
+						{{$submit|escape:'html'}}
+					</button>
+				</div>
+			</form>
+		</div>
+
+		<div class="clear"></div>
 	</div>
 
 	{{* The search input field to search for contacts *}}
 	<div id="contacts-search-wrapper">
-		<div id="contacts-search-form" class="navbar-form" role="search">
+		<form id="contacts-search-form" class="navbar-form" role="search" method="get" >
 			<div class="row">
-				<div class="col-md-2"></div>
-				<div class="col-md-8 ">
-					<div class="form-group form-group-search">
-						<input type="text"
-							name="filter"
-							id="contacts-search"
-							class="search-input form-control form-search"
-							onkeyup="filterList(); return false;"
-							onfocus="this.select(); return false;"
-						/>
-					</div>
+				<div class="form-group form-group-search">
+					<input type="text" name="search" id="contacts-search" class="search-input form-control form-search" onfocus="this.select();" onkeyup="filterList(); return false;" />
+					<button class="btn btn-default btn-sm form-button-search" onclick="filterList(); return false;">{{$submit_filter}}</button>
 				</div>
-				<div class="col-md-2"></div>
 			</div>
-		</div>
+		</form>
 	</div>
 
-	<hr>
 	<div id="contacts-search-end"></div>
 
 	{{if $groupeditor}}
diff --git a/view/theme/frio/templates/group_side.tpl b/view/theme/frio/templates/group_side.tpl
index 6a77a0ed9..947ae974e 100644
--- a/view/theme/frio/templates/group_side.tpl
+++ b/view/theme/frio/templates/group_side.tpl
@@ -1,6 +1,22 @@
 <div class="widget" id="group-sidebar">
-	<h3>{{$title}}</h3>
-
+	<div id="sidebar-group-header">
+		<h3>{{$title}}</h3>
+		{{if ! $newgroup}}
+		<a class="group-edit-tool pull-right widget-action faded-icon" id="sidebar-edit-group" href="{{$grouppage}}" data-toggle="tooltip" title="{{$editgroupstext}}">
+			<i class="fa fa-pencil" aria-hidden="true"></i>
+		</a>
+		{{else}}
+		<a class="group-edit-tool pull-right widget-action faded-icon" id="sidebar-new-group" onclick="javascript:$('#group-new-form').fadeIn('fast');" data-toggle="tooltip" title="{{$createtext}}">
+			<i class="fa fa-plus" aria-hidden="true"></i>
+		</a>
+		<form id="group-new-form" action="group/new" method="post" style="display:none;">
+			<div class="form-group">
+				<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+				<input name="groupname" id="id_groupname" class="form-control input-sm" placeholder="{{$creategroup}}">
+			</div>
+		</form>
+		{{/if}}
+	</div>
 	<div id="sidebar-group-list">
 		{{* The list of available groups *}}
 		<ul role="menu" id="sidebar-group-ul">
@@ -22,30 +38,17 @@
 					{{/if}}
 					{{if $group.edit}}
 						{{* if the group is editable show a little pencil for editing *}}
-						<a id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-tool pull-right" href="{{$group.edit.href}}" title="{{$edittext}}">
-							<i class="faded-icon fa fa-pencil" aria-hidden="true"></i><span class="sr-only">{{$edittext}}</span>
+						<a id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-tool pull-right faded-icon" href="{{$group.edit.href}}" data-toggle="tooltip" title="{{$edittext}}">
+							<i class="fa fa-pencil" aria-hidden="true"></i>
 						</a>
 					{{/if}}
 					<a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element" href="{{$group.href}}">{{$group.text}}</a>
 				</li>
 			{{/foreach}}
+
+			{{if $ungrouped}}<li class="{{if $ungrouped_selected}}selected{{/if}} sidebar-group-li" id="sidebar-ungrouped"><a href="nogroup">{{$ungrouped}}</a></li>{{/if}}
 		</ul>
 	</div>
 
-	{{if $newgroup}}
-	<div id="sidebar-new-group">
-		{{* show the input field by clicking "new group" *}}
-		<button type="button" class="btn-link" onclick="javascript:$('#group-new-form').fadeIn('fast');">{{$createtext}}</button>
-		<form id="group-new-form" action="group/new" method="post" style="display:none;">
-			<div class="form-group">
-				<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-				<input name="groupname" id="id_groupname" class="form-control input-sm" placeholder="{{$creategroup}}">
-			</div>
-		</form>
-	</div>
-	{{else}}
-	<div id="sidebar-edit-groups"><a href="{{$grouppage}}">{{$editgroupstext}}</a></div>
-	{{/if}}
 
-	{{if $ungrouped}}<div id="sidebar-ungrouped"><a href="nogroup">{{$ungrouped}}</a></div>{{/if}}
 </div>
diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 31b7175ba..9d26a61b4 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"/>
@@ -66,8 +65,15 @@
 <script type="text/javascript" src="view/asset/jgrowl/jquery.jgrowl.min.js"></script>
 <script type="text/javascript" src="view/asset/jquery-datetimepicker/build/jquery.datetimepicker.full.min.js"></script>
 <script type="text/javascript" src="view/asset/perfect-scrollbar/js/perfect-scrollbar.jquery.min.js"></script>
+<script type="text/javascript" src="view/asset/imagesloaded/imagesloaded.pkgd.min.js"></script>
 <script type="text/javascript" src="view/js/acl.js"></script>
 <script type="text/javascript" src="view/asset/base64/base64.min.js"></script>
+<script type="text/javascript" src="view/js/addon-hooks.js" ></script>
+{{if is_array($addon_hooks)}}
+{{foreach $addon_hooks as $addon_hook}}
+<script type="text/javascript" src="addon/{{$addon_hook}}/{{$addon_hook}}.js"></script>
+{{/foreach}}
+{{/if}}
 <script type="text/javascript" src="view/js/main.js"></script>
 
 <script type="text/javascript" src="view/theme/frio/frameworks/bootstrap/js/bootstrap.min.js"></script>
@@ -85,7 +91,9 @@
 {{* own js files *}}
 <script type="text/javascript" src="view/theme/frio/js/theme.js"></script>
 <script type="text/javascript" src="view/theme/frio/js/modal.js"></script>
+{{if ! $block_public}}
 <script type="text/javascript" src="view/theme/frio/js/hovercard.js"></script>
+{{/if}}
 <script type="text/javascript" src="view/theme/frio/js/textedit.js"></script>
 
 <script type="text/javascript">
diff --git a/view/theme/frio/templates/intros.tpl b/view/theme/frio/templates/intros.tpl
index c153fcd9f..df46e453a 100644
--- a/view/theme/frio/templates/intros.tpl
+++ b/view/theme/frio/templates/intros.tpl
@@ -1,15 +1,17 @@
 
-<div class="intro-wrapper media" id="intro-{{$contact_id}}" >
+{{* template incomming contact request and suggested contacts *}}
+
+<div class="intro-wrapper media" id="intro-{{$intro_id}}" >
 
 	{{* Contact Photo *}}
 	<div class="intro-photo-wrapper dropdown pull-left" >
-		<img id="photo-{{$contact_id}}" class="intro-photo media-object" src="{{$photo}}" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" />
+		<img id="photo-{{$intro_id}}" class="intro-photo media-object" src="{{$photo}}" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" />
 	</div>
 
 	<div class="media-body">
 		{{* The intro actions like approve, ignore, discard intro*}}
 		<div class="intro-actions pull-right nav-pills preferences">
-			<button class="btn-link intro-action-link" onclick="addElmToModal('#intro-approve-wrapper-{{$contact_id}}');" aria-label="{{$approve|escape:'html'}}" title="{{$approve|escape:'html'}}" data-toggle="tooltip"><i class="fa fa-check" aria-hidden="true"></i></button>
+			<button class="btn-link intro-action-link" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}');" aria-label="{{$approve|escape:'html'}}" title="{{$approve|escape:'html'}}" data-toggle="tooltip"><i class="fa fa-check" aria-hidden="true"></i></button>
 
 			<form class="intro-form" action="notifications/{{$intro_id}}" method="post">
 				<button class="btn-link intro-submit-ignore intro-action-link" type="submit" name="submit" value="{{$ignore|escape:'html'}}" aria-label="{{$ignore|escape:'html'}}" title="{{$ignore|escape:'html'}}" data-toggle="tooltip"><i class="fa fa-ban" aria-hidden="true"></i></button>
@@ -17,7 +19,9 @@
 			</form>
 		</div>
 		<div class='intro-enty-name'><h4 class="media-heading"><a href="{{$zrl}}">{{$fullname}}</a></h4></div>
-		<div class="intro-desc"><span class="intro-desc-label">{{$str_notifytype}}</span>{{$notify_type}}</div>
+		<div class="intro-desc"><span class="intro-desc-label">{{$str_notifytype}}</span>&nbsp;{{$notify_type}}</div>
+		{{* if the contact was suggestested by another contact, the contact who made the suggestion is displayed*}}
+		{{if $madeby}}<div class="intro-madeby"><span class="intro-madeby-label">{{$lbl_madeby}}</span>&nbsp;<a href="{{$madeby_zrl}}">{{$madeby}}</a></div>{{/if}}
 
 		{{* Additional information of the contact *}}
 		<div class="intro-contact-info hidden-xs">
@@ -28,7 +32,7 @@
 			{{if $keywords}}<div class="intro-keywords"><span class="intro-keywords-label">{{$lbl_keywords}}</span>&nbsp;{{$keywords}}</div>{{/if}}
 			{{if $about}}<div class="intro-about"><span class="intro-about-label">{{$lbl_about}}</span>&nbsp;{{$about}}</div>{{/if}}
 			<div class="intro-knowyou"><span class="intro-knowyou-label">{{$lbl_knowyou}}</span>{{$knowyou}}</div>
-			<div class="intro-note intro-note-{{$contact_id}}">{{$note}}</div>
+			<div class="intro-note intro-note-{{$intro_id}}">{{$note}}</div>
 		</div>
 
 		{{* Additional information of the contact for mobile view *}}
@@ -40,19 +44,21 @@
 			{{if $keywords}}<div class="intro-keywords"><span class="intro-keywords-label">{{$lbl_keywords}}</span>{{$keywords}}</div>{{/if}}
 			{{if $about}}<div class="intro-about"><span class="intro-about-label">{{$lbl_about}}</span>{{$about}}</div>{{/if}}
 			<div class="intro-knowyou"><span class="intro-knowyou-label">{{$lbl_knowyou}}</span>{{$knowyou}}</div>
-			<div class="intro-note intro-note-{{$contact_id}}">{{$note}}</div>
+			<div class="intro-note intro-note-{{$intro_id}}">{{$note}}</div>
 		</div>
 
 		{{* This sections contains special settings for contact approval. We hide it by default and load this section in
 		a bootstrap modal in the case of approval *}}
-		<div id="intro-approve-wrapper-{{$contact_id}}" style="display: none;">
+		<div id="intro-approve-wrapper-{{$intro_id}}" style="display: none;">
 
 			<h3 class="heading">{{$fullname}}{{if $addr}}&nbsp;({{$addr}}){{/if}}</h3>
-			<form class="intro-approve-form" action="dfrn_confirm" method="post">
+			<form class="intro-approve-form" {{if $request}}action="{{$request}}" method="get"{{else}}action="dfrn_confirm" method="post"{{/if}}>
 				{{include file="field_checkbox.tpl" field=$hidden}}
+				{{if $type != "friend_suggestion"}}
 				<input type="hidden" name="dfrn_id" value="{{$dfrn_id}}" >
 				<input type="hidden" name="intro_id" value="{{$intro_id}}" >
 				<input type="hidden" name="contact_id" value="{{$contact_id}}" >
+				{{/if}}
 
 				{{$dfrn_text}}
 
@@ -71,7 +77,7 @@
 			<button class="btn btn-small btn-default intro-submit-ignore" type="submit" name="submit" value="{{$ignore|escape:'html'}}">{{$ignore|escape:'html'}}</button>
 			{{if $discard}}<button class="btn btn-small btn-default intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}">{{$discard|escape:'html'}}</button>&nbsp;{{/if}}
 		</form>
-		<button class="btn btn-small btn-primary intro-submit-approve pull-right" onclick="addElmToModal('#intro-approve-wrapper-{{$contact_id}}')">{{$approve|escape:'html'}}</button>
+		<button class="btn btn-small btn-primary intro-submit-approve pull-right" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}')">{{$approve|escape:'html'}}</button>
 	</div>
 	<div class="clear"></div>
 	{{/if}}
diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index e1ef7110f..423be5a5d 100644
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -1,4 +1,3 @@
-
 {{* The button to open the jot - in This theme we move the button with js to the second nav bar *}}
 <button class="btn btn-sm btn-main pull-right" id="jotOpen" aria-label="{{$new_post}}" title="{{$new_post}}" onclick="jotShow();"><i class="fa fa-pencil-square-o fa-2x"></i></button>
 
@@ -70,7 +69,9 @@
 					<div id="profile-jot-banner-end"></div>
 
 					{{* The hidden input fields which submit important values with the post *}}
-					<input type="hidden" name="type" value="{{$ptyp}}" />
+					<input type="hidden" name="jot" value="{{$jot}}" />
+					<input type="hidden" name="wall" value="{{$wall}}" />
+					<input type="hidden" name="post_type" value="{{$posttype}}" />
 					<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 					<input type="hidden" name="return" value="{{$return_path}}" />
 					<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
diff --git a/view/theme/frio/templates/like_noshare.tpl b/view/theme/frio/templates/like_noshare.tpl
index d22804dcd..deb2383f4 100644
--- a/view/theme/frio/templates/like_noshare.tpl
+++ b/view/theme/frio/templates/like_noshare.tpl
@@ -1,8 +1,13 @@
 
 <div class="wall-item-actions" id="wall-item-like-buttons-{{$id}}">
-	<button type="button" class="btn-link button-likes" id="like-{{$id}}" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false;" data-toggle="button"><i class="fa fa-thumbs-up" aria-hidden="true"></i>&nbsp;</button>
+	<button type="button" class="btn-link button-likes" id="like-{{$id}}" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false;" data-toggle="button">
+		<i class="faded-icon page-action fa fa-thumbs-up" aria-hidden="true"></i>
+	</button>
 	{{if $nolike}}
-	<button type="button" class="btn-link button-likes" id="dislike-{{$id}}" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false;" data-toggle="button"><i class="fa fa-thumbs-down" aria-hidden="true"></i>&nbsp;</button>
+	<span class="icon-padding"> </span>
+	<button type="button" class="btn-link button-likes" id="dislike-{{$id}}" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false;" data-toggle="button">
+		<i class="faded-icon page-action fa fa-thumbs-down" aria-hidden="true"></i>
+	</button>
 	{{/if}}
 	<img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 </div>
diff --git a/view/theme/frio/templates/mail_head.tpl b/view/theme/frio/templates/mail_head.tpl
index d788845af..fa4f46cf8 100644
--- a/view/theme/frio/templates/mail_head.tpl
+++ b/view/theme/frio/templates/mail_head.tpl
@@ -1,4 +1,19 @@
 
-<h3 class="heading">{{$messages}}</h3>
+<div class="pull-left">
+	<h3 class="heading">{{$messages}}</h3>
+</div>
 
+<div id="message-new" class="pull-right">
+	{{if $button.sel == "new"}}
+	<a href="{{$button.url}}" accesskey="m" class="newmessage-selected faded-icon page-action" title="{{$button.label}}" data-toggle="tooltip">
+		<i class="fa fa-plus"></i>
+	</a>
+	{{else}}
+	<a href="{{$button.url}}" title="{{$button.label}}" class="faded-icon page-action" data-toggle="tooltip">
+		<i class="fa fa-close"></i>
+	</a>
+	{{/if}}
+</div>
+
+<div class="clear"></div>
 {{$tab_content}}
diff --git a/view/theme/frio/templates/mail_list.tpl b/view/theme/frio/templates/mail_list.tpl
index d5062a232..4a797d47c 100644
--- a/view/theme/frio/templates/mail_list.tpl
+++ b/view/theme/frio/templates/mail_list.tpl
@@ -13,7 +13,9 @@
 
 				<h4 class="media-heading">{{$from_name}}</h4>
 				<div class="mail-list-subject"><a href="message/{{$id}}">{{$subject}}</a></div>
-				<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="close pull-right" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >&times;</a>
+				<a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="pull-right" onmouseover="imgbright(this);" onmouseout="imgdull(this);">
+				<i class="faded-icon fa fa-trash"></i>
+				</a>
 				<p class="text-muted">{{$count}}</p>
 			</div>
 
diff --git a/view/theme/frio/templates/message_side.tpl b/view/theme/frio/templates/message_side.tpl
index 88fe8ea42..214bfd7f1 100644
--- a/view/theme/frio/templates/message_side.tpl
+++ b/view/theme/frio/templates/message_side.tpl
@@ -1,6 +1,4 @@
 <div id="message-sidebar" class="widget">
-	<div id="message-new"><a href="{{$new.url}}" accesskey="m" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div>
-
 	{{if $tabs}}
 	<div id="message-preview" class="panel panel-default">
 		<ul class="media-list">
diff --git a/view/theme/frio/templates/msg-header.tpl b/view/theme/frio/templates/msg-header.tpl
index 97aa5a64f..209010d7a 100644
--- a/view/theme/frio/templates/msg-header.tpl
+++ b/view/theme/frio/templates/msg-header.tpl
@@ -7,6 +7,9 @@
 		$('#mail-conversation').perfectScrollbar();
 		$('#message-preview').perfectScrollbar();
 		// Scroll to the bottom of the mail conversation.
-		$('#mail-conversation').scrollTop($('#mail-conversation')[0].scrollHeight);
+		var $el = $('#mail-conversation');
+		if ($el.length) {
+			$el.scrollTop($el.get(0).scrollHeight);
+		}
 	});
 </script>
diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index e7e294434..d64eae9c4 100644
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -40,15 +40,15 @@
 				<ul class="nav navbar-nav navbar-left" role="menubar">
 					<li id="nav-communication" class="nav-segment" role="presentation">
 						{{if $nav.network}}
-						<a role="menuitem" class="nav-menu {{$sel.network}}" href="{{$nav.network.0}}" data-toggle="tooltip" aria-label="{{$nav.network.3}}" title="{{$nav.network.3}}"><i class="fa fa-lg fa-th" aria-hidden="true"></i><span id="net-update" class="nav-network-badge badge nav-notify"></span></a>
+						<a accesskey="n" role="menuitem" class="nav-menu {{$sel.network}}" href="{{$nav.network.0}}" data-toggle="tooltip" aria-label="{{$nav.network.3}}" title="{{$nav.network.3}}"><i class="fa fa-lg fa-th" aria-hidden="true"></i><span id="net-update" class="nav-network-badge badge nav-notify"></span></a>
 						{{/if}}
 
 						{{if $nav.home}}
-						<a role="menuitem" class="nav-menu {{$sel.home}}" href="{{$nav.home.0}}" data-toggle="tooltip" aria-label="{{$nav.home.3}}" title="{{$nav.home.3}}"><i class="fa fa-lg fa-home" aria-hidden="true"></i><span id="home-update" class="nav-home-badge badge nav-notify"></span></a>
+						<a accesskey="p" role="menuitem" class="nav-menu {{$sel.home}}" href="{{$nav.home.0}}" data-toggle="tooltip" aria-label="{{$nav.home.3}}" title="{{$nav.home.3}}"><i class="fa fa-lg fa-home" aria-hidden="true"></i><span id="home-update" class="nav-home-badge badge nav-notify"></span></a>
 						{{/if}}
 
 						{{if $nav.community}}
-						<a role="menuitem" class="nav-menu {{$sel.community}}" href="{{$nav.community.0}}" data-toggle="tooltip" aria-label="{{$nav.community.3}}" title="{{$nav.community.3}}"><i class="fa fa-lg fa-bullseye" aria-hidden="true"></i></a>
+						<a accesskey="c" role="menuitem" class="nav-menu {{$sel.community}}" href="{{$nav.community.0}}" data-toggle="tooltip" aria-label="{{$nav.community.3}}" title="{{$nav.community.3}}"><i class="fa fa-lg fa-bullseye" aria-hidden="true"></i></a>
 						{{/if}}
 					</li>
 
@@ -58,7 +58,7 @@
 						{{/if}}
 
 						{{if $nav.events}}
-						<a role="menuitem" id="nav-events-link" href="{{$nav.events.0}}" data-toggle="tooltip" aria-label="{{$nav.events.1}}" title="{{$nav.events.1}}" class="nav-menu"><i class="fa fa-lg fa-calendar"></i></a>
+						<a accesskey="e" role="menuitem" id="nav-events-link" href="{{$nav.events.0}}" data-toggle="tooltip" aria-label="{{$nav.events.1}}" title="{{$nav.events.1}}" class="nav-menu"><i class="fa fa-lg fa-calendar"></i></a>
 						{{/if}}
 
 						{{if $nav.contacts}}
@@ -109,7 +109,7 @@
 							<form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}">
 								<!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
 								<div class="form-group form-group-search">
-									<input id="nav-search-input-field" class="form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$nav.search.1}}">
+									<input accesskey="s" id="nav-search-input-field" class="form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$nav.search.1}}">
 									<button class="btn btn-default btn-sm form-button-search" type="submit">{{$nav.search.1}}</button>
 								</div>
 							</form>
@@ -119,7 +119,7 @@
 					{{* The user dropdown menu *}}
 					{{if $nav.userinfo}}
 					<li id="nav-user-linkmenu" class="dropdown account nav-menu hidden-xs">
-						<button id="main-menu" class="btn-link dropdown-toggle nav-avatar" data-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false" aria-controls="nav-user-menu">
+						<button accesskey="u" id="main-menu" class="btn-link dropdown-toggle nav-avatar" data-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false" aria-controls="nav-user-menu">
 							<div class="user-title pull-left hidden-xs hidden-sm hidden-md">
 								<strong>{{$nav.userinfo.name}}</strong><br>
 								{{if $nav.remote}}<span class="trunctate">{{$nav.remote}}</span>{{/if}}
@@ -165,7 +165,7 @@
 							<li role="presentation"><a role="menuitem" id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> {{$nav.settings.1}}</a></li>
 							{{/if}}
 							{{if $nav.admin}}
-							<li role="presentation"><a role="menuitem" id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" ><i class="fa fa-user-secret fa-fw" aria-hidden="true"></i> {{$nav.admin.1}}</a></li>
+							<li role="presentation"><a accesskey="a" role="menuitem" id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" ><i class="fa fa-user-secret fa-fw" aria-hidden="true"></i> {{$nav.admin.1}}</a></li>
 							{{/if}}
 							{{if $nav.tos}}
 							<li role="presentation" class="divider"></li>
@@ -300,7 +300,7 @@ The result is a friendica logo in the user icon color.*}}
 <svg id="friendica-logo-mask" x="0px" y="0px" width="0px" height="0px" viewBox="0 0 250 250">
 	<defs>
 		<mask id="logo-mask" maskUnits="objectBoundingBox" maskContentUnits="objectBoundingBox">
-			<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#ffffff;" d="M0.796,0L0.172,0.004C0.068,0.008,0.008,0.068,0,0.172V0.824c0,0.076,0.06,0.16,0.168,0.172h0.652c0.072,0,0.148-0.06,0.172-0.144V0.14C1,0.06,0.908,0,0.796,0zM0.812,0.968H0.36v-0.224h0.312v-0.24H0.36V0.3h0.316l0-0.264l0.116-0c0.088,0,0.164,0.044,0.164,0.096l0,0.696C0.96,0.912,0.876,0.968,0.812,0.968z"/>
+			<path style="fill-rule:evenodd;clip-rule:evenodd;fill:#ffffff;" d="M0.796,0L0.172,0.004C0.068,0.008,0.008,0.068,0,0.172V0.824c0,0.076,0.06,0.16,0.168,0.172h0.652c0.072,0,0.148-0.06,0.172-0.144V0.14C1,0.06,0.908,0,0.796,0zM0.812,0.968H0.36v-0.224h0.312v-0.24H0.36V0.3h0.316l0-0.264l0.116-0c0.088,0,0.164,0.044,0.164,0.096l0,0.696C0.96,0.912,0.876,0.968,0.812,0.968z"></path>
 		</mask>
 	</defs>
 </svg>
diff --git a/view/theme/frio/templates/notifications.tpl b/view/theme/frio/templates/notifications.tpl
index dcea0b85f..b6b1d2da9 100644
--- a/view/theme/frio/templates/notifications.tpl
+++ b/view/theme/frio/templates/notifications.tpl
@@ -1,3 +1,5 @@
+<script type="text/javascript" src="view/theme/frio/frameworks/jquery-color/jquery.color.js"></script>
+<script type="text/javascript" src="view/theme/frio/js/mod_notifications.js"></script>
 
 <div class="generic-page-wrapper">
 	{{include file="section_title.tpl" title=$notif_header}}
@@ -26,13 +28,3 @@
 	{{* The pager *}}
 	{{$notif_paginate}}
 </div>
-
-{{* Since only the DIV's inside the notification-list are marked with the class "unseen",
-we need some js to transfer this class to the parent li list-elements *}}
-<script type="text/javascript">
-$(document).ready(function(){
-	if( $(".notif-item").hasClass("unseen")) {
-		$(".notif-item.unseen").parent("li").addClass("unseen");
-	}
-});
-</script>
\ No newline at end of file
diff --git a/view/theme/frio/templates/photo_album.tpl b/view/theme/frio/templates/photo_album.tpl
index f3dee65a4..235b9c46d 100644
--- a/view/theme/frio/templates/photo_album.tpl
+++ b/view/theme/frio/templates/photo_album.tpl
@@ -1,29 +1,43 @@
-
 <div class="generic-page-wrapper">
+	<div class="pull-left">
+		<h3 id="photo-album-title">{{$album}}</h3>
+	</div>
 
-	<h3 id="photo-album-title">{{$album}}</h3>
-
-	<div class="photo-album-actions">
-	{{if $can_post}}
-		<a class="photos-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
+	<div class="photo-album-actions pull-right">
+		{{if $can_post}}
+		<a class="photos-upload-link page-action faded-icon" href="{{$upload.1}}" title="{{$upload.0}}" data-toggle="tooltip">
+			<i class="fa fa-plus"></i>
+		</a>
 		{{/if}}
-		{{if $can_post && $edit}}<span role="presentation" class="separator">&nbsp;•&nbsp;</span>{{/if}}
+
 		{{if $edit}}
-		<a id="album-edit-link" href="{{$edit.1}}" title="{{$edit.0}}">{{$edit.0}}</a>
+		<span class="icon-padding"> </span>
+		<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>
+		</button>
+		{{/if}}
+
+		{{if ! $noorder}}
+		<span class="icon-padding"> </span>
+		<a class="photos-order-link page-action faded-icon" href="{{$order.1}}" title="{{$order.0}}" data-toggle="tooltip">
+			{{if $order.2 == "newest"}}
+			<i class="fa fa-sort-numeric-desc"></i>
+			{{else}}
+			<i class="fa fa-sort-numeric-asc"></i>
+			{{/if}}
+		</a>
 		{{/if}}
-		<a class="photos-order-link" href="{{$order.1}}" title="{{$order.0}}">{{$order.0}}</a>
 	</div>
 	<div class="clear"></div>
 
 	<div class="photo-album-wrapper" id="photo-album-contents">
-	{{foreach $photos as $photo}}
-		{{include file="photo_top.tpl"}}
-	{{/foreach}}
+		{{foreach $photos as $photo}}
+			{{include file="photo_top.tpl"}}
+		{{/foreach}}
 	</div>
-
 	<div class="photo-album-end"></div>
 
 	{{$paginate}}
 </div>
 
-<script type="text/javascript">$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script>
+<script type="text/javascript">$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
diff --git a/view/theme/frio/templates/photo_albums.tpl b/view/theme/frio/templates/photo_albums.tpl
new file mode 100644
index 000000000..f510bd976
--- /dev/null
+++ b/view/theme/frio/templates/photo_albums.tpl
@@ -0,0 +1,33 @@
+<div id="sidebar-photos-albums" class="widget">
+	<div class="pull-left">
+		<h3>{{$title}}</h3>
+	</div>
+	
+	<div class="pull-right">
+	{{if $can_post}}
+		<div class="photos-upload-link">
+			<a href="{{$upload.1}}" title="{{$upload.0}}" class="widget-action faded-icon" data-toggle="tooltip">
+				<i class="fa fa-plus"></i>
+			</a>
+		</div>
+		{{/if}}
+	</div>
+
+	<ul role="menubar" class="sidebar-photos-albums-ul clear">
+		<li role="menuitem" class="sidebar-photos-albums-li">
+			<a href="{{$baseurl}}/photos/{{$nick}}" class="sidebar-photos-albums-element" title="{{$title}}" >{{$recent}}</a>
+		</li>
+
+		{{if $albums}}
+		{{foreach $albums as $al}}
+			{{if $al.text}}
+			<li role="menuitem" class="sidebar-photos-albums-li">
+				<a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}" class="sidebar-photos-albums-element">
+					<span class="badge pull-right">{{$al.total}}</span>{{$al.text}}
+				</a>
+			</li>
+			{{/if}}
+		{{/foreach}}
+		{{/if}}
+	</ul>
+</div>
diff --git a/view/theme/frio/templates/photo_view.tpl b/view/theme/frio/templates/photo_view.tpl
index fd47097a5..e610926d4 100644
--- a/view/theme/frio/templates/photo_view.tpl
+++ b/view/theme/frio/templates/photo_view.tpl
@@ -3,17 +3,31 @@
 {{* "live-photos" is needed for js autoupdate *}}
 <div id="live-photos"></div>
 
-<div id="photo-view-{{$id}}" class="general-content-wrapper">
-	<h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
-
-	<div id="photo-edit-link-wrap">
-		{{if $tools}}
-		<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a>
-		|
-		<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
-		{{/if}}
-		{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
+<div id="photo-view-{{$id}}" class="generic-page-wrapper">
+	<div class="pull-left" id="photo-edit-link-wrap">
+		<a class="page-action faded-icon" id="photo-album-link" href="{{$album.0}}" title="{{$album.1}}" data-toggle="tooltip">
+			<i class="fa fa-folder-open"></i>&nbsp;{{$album.1}}
+		</a>
 	</div>
+	<div class="pull-right" id="photo-edit-link-wrap">
+		{{if $tools}}
+		<span class="icon-padding"> </span>
+		<a id="photo-edit-link" href="{{$tools.edit.0}}" title="{{$tools.edit.1}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-pencil"></i>
+		</a>
+		<span class="icon-padding"> </span>
+		<a id="photo-toprofile-link" href="{{$tools.profile.0}}" title="{{$tools.profile.1}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-user"></i>
+		</a>
+		{{/if}}
+		{{if $lock}}
+		<span class="icon-padding"> </span>
+		<a id="photo-lock-link" onclick="lockview(event,'photo/{{$id}}');" title="{{$lock}}" data-toggle="tooltip">
+			<i class="page-action faded-icon fa fa-lock"></i>
+		</a>
+		{{/if}}
+	</div>
+	<div class="clear"></div>
 
 	<div id="photo-view-wrapper">
 		<div id="photo-photo">
@@ -53,7 +67,7 @@
 		<div id="photo-like-div">
 			{{$likebuttons}}
 			{{$like}}
-			{{$dislike}}	
+			{{$dislike}}
 		</div>
 		{{/if}}
 		<hr>
diff --git a/view/theme/frio/templates/photos_default_uploader_box.tpl b/view/theme/frio/templates/photos_default_uploader_box.tpl
new file mode 100644
index 000000000..2f1f69a50
--- /dev/null
+++ b/view/theme/frio/templates/photos_default_uploader_box.tpl
@@ -0,0 +1 @@
+<input id="photos-upload-choose" type="file" name="userfile" />
diff --git a/view/theme/frio/templates/photos_default_uploader_submit.tpl b/view/theme/frio/templates/photos_default_uploader_submit.tpl
new file mode 100644
index 000000000..73d5e5064
--- /dev/null
+++ b/view/theme/frio/templates/photos_default_uploader_submit.tpl
@@ -0,0 +1,2 @@
+
+<button id="photos-upload-submit" class="btn btn-primary">{{$submit|escape:'html'}}</button>
diff --git a/view/theme/frio/templates/photos_recent.tpl b/view/theme/frio/templates/photos_recent.tpl
index 894121fab..62ed80431 100644
--- a/view/theme/frio/templates/photos_recent.tpl
+++ b/view/theme/frio/templates/photos_recent.tpl
@@ -1,20 +1 @@
-
-<div class="generic-page-wrapper">
-
-	<h3>{{$title}}</h3>
-
-	{{if $can_post}}
-	<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
-	{{/if}}
-
-	<div id="photo-album-contents" class="photos">
-	{{foreach $photos as $photo}}
-		{{include file="photo_top.tpl"}}
-	{{/foreach}}
-	</div>
-	<div class="photos-end"></div>
-
-	{{$paginate}}
-</div>
-
-<script type="text/javascript">$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
+{{include file="photo_album.tpl" album=$title noorder=true}}
diff --git a/view/theme/frio/templates/photos_upload.tpl b/view/theme/frio/templates/photos_upload.tpl
new file mode 100644
index 000000000..f02246c5c
--- /dev/null
+++ b/view/theme/frio/templates/photos_upload.tpl
@@ -0,0 +1,72 @@
+<div class="generic-page-wrapper">
+
+	<h3>{{$pagename}}</h3>
+
+	<div id="photos-usage-message">{{$usage}}</div>
+
+	<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
+		<div id="photos-upload-div" class="form-group">
+			<label id="photos-upload-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
+
+			<input id="photos-upload-album-select" class="form-control" placeholder="{{$existalbumtext}}" list="dl-photo-upload" type="text" name="album" size="4">
+			<datalist id="dl-photo-upload">{{$albumselect}}</datalist>
+		</div>
+		<div id="photos-upload-end" class="clearfix"></div>
+
+		<div id="photos-upload-noshare-div" class="photos-upload-noshare-div checkbox pull-left" >
+			<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked/>
+			<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+		</div>
+
+		{{if $alt_uploader}}
+			<div id="photos-upload-perms" class="pull-right">
+				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+					<i id="jot-perms-icon" class="fa {{$lockstate}}"></i> {{$permissions}}
+				</button>
+			</div>
+			<div class="clearfix"></div>
+
+			<div id="photos-upload-spacer"></div>
+
+			{{$alt_uploader}}
+		{{/if}}
+
+
+		{{if $default_upload_submit}}
+			<div class="clearfix"></div>
+
+			<div id="photos-upload-spacer"></div>
+
+			<div class="photos-upload-wrapper">
+				<div id="photos-upload-perms" class="btn-group pull-right">
+					<button class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+						<i id="jot-perms-icon" class="fa {{$lockstate}}"></i> 
+					</button>
+
+					{{$default_upload_submit}}
+				</div>
+				{{$default_upload_box}}
+			</div>
+			<div class="clearfix"></div>
+		{{/if}}
+
+		<div class="photos-upload-end" class="clearfix"></div>
+
+		{{* The modal for advanced-expire *}}
+		<div id="aclModal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+			<div class="modal-dialog">
+				<div class="modal-content">
+					<div class="modal-header" class="modal-header">
+						<button id="modal-close" type="button" class="close" data-dismiss="modal" aria-hidden="true">
+							&times;
+						</button>
+						<h4 id="modal-title" class="modal-title">{{$permissions}}</h4>
+					</div>
+					<div id="photos-upload-permissions-wrapper" class="modal-body">
+						{{$aclselect}}
+					</div>
+				</div>
+			</div>
+		</div>
+	</form>
+</div>
diff --git a/view/theme/frio/templates/profile_edit.tpl b/view/theme/frio/templates/profile_edit.tpl
index 12ec57037..cd4ed1816 100644
--- a/view/theme/frio/templates/profile_edit.tpl
+++ b/view/theme/frio/templates/profile_edit.tpl
@@ -10,14 +10,15 @@
 					<i class="fa fa-angle-down"  aria-hidden="true"></i>&nbsp;{{$profile_action}}
 				</button>
 				<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="profile-edit-links-dropdown">
-					<li role="presentation"><a role="menuitem" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
-					<li role="presentation"><button role="menuitem" type="button" class="btn-link" id="profile-photo_upload-link-new" title="{{$profpic|escape:'html'}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</button></li>
+					<li role="presentation"><a role="menuitem" href="{{$profpiclink}}" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
+					<li role="presentation"><button role="menuitem" type="button" class="btn-link" id="profile-photo_upload-link-new" title="{{$lbl_profile_photo|escape:'html'}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$lbl_profile_photo}}</button></li>
 					{{if ! $is_default}}
 					<li role="presentation" class="nav-item"><a role="menuitem" href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-pencil" aria-hidden="true"></i>&nbsp;{{$editvis}}</a>
 					</li>
 					{{/if}}
 					<li role="presentation" class="divider"></li>
 					<li role="presentation"><a role="menuitem" href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof|escape:'html'}}">{{$viewprof}}</a></li>
+					<li role="presentation"><a role="menuitem" href="profiles" id="profile-edit-view-link" title="{{$viewallprof|escape:'html'}}">{{$viewallprof}}</a></li>
 					{{if $profile_clone_link}}
 					<li role="presentation" class="divider"></li>
 					<li role="presentation"><a role="menuitem" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof|escape:'html'}}">{{$cl_prof}}</a></li>
@@ -317,8 +318,10 @@
 		<input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
 		<input type="hidden" id="likes-jot-text" name="likes" value="{{$likes.2}}" />
 		<input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes.2}}" />
+		<input type="hidden" name="marital" id="profile-edit-marital" value="{{$marital.2}}" />
 		<input type="hidden" name="with" id="profile-edit-with" value="{{$with.2}}" />
 		<input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.2}}" />
+		<input type="hidden" name="sexual" id="profile-edit-sexual" value="{{$sexual.2}}" />
 		<input type="hidden" id="romance-jot-text" name="romance" value="{{$romance.2}}" />
 		<input type="hidden" id="work-jot-text" name="work" value="{{$work.2}}" />
 		<input type="hidden" id="education-jot-text" name="education" value="{{$education.2}}" />
diff --git a/view/theme/frio/templates/profile_listing_header.tpl b/view/theme/frio/templates/profile_listing_header.tpl
index e042ff72a..1e6ae0dbf 100644
--- a/view/theme/frio/templates/profile_listing_header.tpl
+++ b/view/theme/frio/templates/profile_listing_header.tpl
@@ -1,13 +1,14 @@
 
 <div class="generic-page-wrapper">
-	<div class="section-title-wrapper">
+	<div class="section-title-wrapper pull-left">
 		<h2>{{$header}}</h2>
 	</div>
+	<div id="profile-listing-new-link-wrapper" class="pull-right" >
+		<a href="{{$cr_new_link}}" id="profile-listing-new-link" class="page-action faded-icon" title="{{$cr_new}}" data-toggle="tooltip">
+		<i class="fa fa-plus"></i></a>
+	</div>
 
 	<div class="section-content-wrapper">
-		<div id="profile-listing-new-link-wrapper" class="button" >
-			<a href="{{$cr_new_link}}" id="profile-listing-new-link" title="{{$cr_new}}" >{{$cr_new}}</a>
-		</div>
 		<div id="profile-listing-profiles" class="profile-listing-table">
 			{{$profiles}}
 		</div>
diff --git a/view/theme/frio/templates/profile_vcard.tpl b/view/theme/frio/templates/profile_vcard.tpl
index 831c47171..392adc1c4 100644
--- a/view/theme/frio/templates/profile_vcard.tpl
+++ b/view/theme/frio/templates/profile_vcard.tpl
@@ -1,25 +1,26 @@
 <div class="vcard h-card widget">
 
-	{{if $profile.picdate}}
-		<div id="profile-photo-wrapper" class="thumbnail"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></a>
-	{{else}}
-		<div id="profile-photo-wrapper" class="thumbnail"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></a>
-	{{/if}}
-			<div class="tool visible-lg visible-md">
+	<div id="profile-photo-wrapper">
+		{{if $profile.picdate}}
+		<a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></a>
+		{{else}}
+		<a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></a>
+		{{/if}}
 
+		<div class="tool visible-lg visible-md">
 			{{if $profile.edit}}
-				<div class="action">
-					<a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><i class="fa fa-pencil-square-o"></i></a>
-				</div>
+			<div class="action">
+				<a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><i class="fa fa-pencil-square-o"></i></a>
+			</div>
 			{{else}}
 				{{if $profile.menu}}
-					<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
+				<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
 				{{/if}}
 			{{/if}}
-			</div>
-
 		</div>
 
+	</div>
+
 	{{* The short information which will appended to the second navbar by scrollspy *}}
 	<div id="vcard-short-info-wrapper" style="display: none;">
 		<div id="vcard-short-info" class="media" style="display: none">
@@ -36,7 +37,7 @@
 
 	<div class="panel-body">
 		<div class="profile-header">
-			<div class="fn p-name">{{$profile.name}}</div>
+			<h3 class="fn p-name">{{$profile.name}}</h3>
 
 			{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 
@@ -44,54 +45,53 @@
 		</div>
 
 		<div id="profile-extra-links">
-				{{if $connect}}
-					<div id="dfrn-request-link-button">
-					{{if $remoteconnect}}
-						<a id="dfrn-request-link" class="btn btn-primary btn-sm" href="{{$remoteconnect}}">
-							<span class=""><i class="fa fa-user-plus"></i></span>
-							<span class="">{{$connect}}</span>
-						</a>
-					{{else}}
-						<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="dfrn_request/{{$profile.nickname}}">
-							<span class=""><i class="fa fa-user-plus"></i></span>
-							<span class="">{{$connect}}</span>
-						</a>
-					{{/if}}
-					</div>
+			{{if $connect}}
+			<div id="dfrn-request-link-button">
+				{{if $remoteconnect}}
+				<a id="dfrn-request-link" class="btn btn-primary btn-sm" href="{{$remoteconnect}}">
+					<span class=""><i class="fa fa-user-plus"></i></span>
+					<span class="">{{$connect}}</span>
+				</a>
+				{{else}}
+				<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="dfrn_request/{{$profile.nickname}}">
+					<span class=""><i class="fa fa-user-plus"></i></span>
+					<span class="">{{$connect}}</span>
+				</a>
 				{{/if}}
-				{{if $wallmessage}}
-				<div id="wallmessage-link-botton">
-					<button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
-						<span class=""><i class="fa fa-envelope"></i></span>
-						<span class="">{{$wallmessage}}</span>
-					</button>
-				</div>
-				{{/if}}
-
+			</div>
+			{{/if}}
+			{{if $wallmessage}}
+			<div id="wallmessage-link-botton">
+				<button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
+					<span class=""><i class="fa fa-envelope"></i></span>
+					<span class="">{{$wallmessage}}</span>
+				</button>
+			</div>
+			{{/if}}
 		</div>
 
 		<div class="clear"></div>
 
 		{{if $location}}
-			<div class="location detail">
-				<span class="location-label icon"><i class="fa fa-map-marker"></i></span>
-				<span class="adr">
-					{{if $profile.address}}<span class="street-address p-street-address">{{$profile.address}}</span>{{/if}}
-					<span class="city-state-zip">
-						<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-						<span class="region p-region">{{$profile.region}}</span>
-						<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
-					</span>
-					{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+		<div class="location detail">
+			<span class="location-label icon"><i class="fa fa-map-marker"></i></span>
+			<span class="adr">
+				{{if $profile.address}}<span class="street-address p-street-address">{{$profile.address}}</span>{{/if}}
+				<span class="city-state-zip">
+					<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+					<span class="region p-region">{{$profile.region}}</span>
+					<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
 				</span>
-			</div>
+				{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
+			</span>
+		</div>
 		{{/if}}
 
 		{{if $profile.xmpp}}
-			<div class="xmpp">
-				<span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
-				<span class="xmpp-data">{{$profile.xmpp}}</span>
-			</div>
+		<div class="xmpp">
+			<span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
+			<span class="xmpp-data">{{$profile.xmpp}}</span>
+		</div>
 		{{/if}}
 
 		{{if $gender}}
@@ -125,7 +125,6 @@
 
 		{{include file="diaspora_vcard.tpl"}}
 	</div>
-
 </div>
 
 {{if $contact_block}}
diff --git a/view/theme/frio/templates/prv_message.tpl b/view/theme/frio/templates/prv_message.tpl
index 4c90dcae6..9077c4d4c 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>
diff --git a/view/theme/frio/templates/register.tpl b/view/theme/frio/templates/register.tpl
index 670f5d11e..c148b6063 100644
--- a/view/theme/frio/templates/register.tpl
+++ b/view/theme/frio/templates/register.tpl
@@ -10,6 +10,8 @@
 
 		{{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/if}}
 
+		{{if $explicit_content}} <p id="register-explicid-content">{{$explicit_content_note}}</p> {{/if}}
+
 
 		{{if $oidlabel}}
 		<div id="register-openid-wrapper" class="form-group">
diff --git a/view/theme/frio/templates/saved_searches_aside.tpl b/view/theme/frio/templates/saved_searches_aside.tpl
index fea9794ad..77444f489 100644
--- a/view/theme/frio/templates/saved_searches_aside.tpl
+++ b/view/theme/frio/templates/saved_searches_aside.tpl
@@ -6,7 +6,9 @@
 	<ul role="menu" id="saved-search-ul">
 		{{foreach $saved as $search}}
 		<li role="menuitem" class="saved-search-li clear">
-			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"><i class="fa fa-trash" aria-hidden="true"></i></a>
+			<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right widget-action faded-icon" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}">
+				<i class="fa fa-trash" aria-hidden="true"></i>
+			</a>
 			<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="search?search={{$search.encodedterm}}">{{$search.term}}</a>
 		</li>
 		{{/foreach}}
diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 3ae36c782..c6aa9536e 100644
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -121,7 +121,6 @@
 
 			<hr />
 
-
 			{{* item content *}}
 			<div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
 				{{* insert some space if it's an top-level post *}}
@@ -138,8 +137,7 @@
 
 			<!-- TODO -->
 			<div class="wall-item-bottom">
-				<div class="wall-item-links">
-				</div>
+				<div class="wall-item-links"></div>
 				<div class="wall-item-tags">
 			{{if !$item.suppress_tags}}
 				{{foreach $item.hashtags as $tag}}
diff --git a/view/theme/frio/templates/suggestions.tpl b/view/theme/frio/templates/suggestions.tpl
new file mode 100644
index 000000000..e2399eb49
--- /dev/null
+++ b/view/theme/frio/templates/suggestions.tpl
@@ -0,0 +1,2 @@
+
+{{include file="intros.tpl"}}
\ No newline at end of file
diff --git a/view/theme/frio/templates/vcard-widget.tpl b/view/theme/frio/templates/vcard-widget.tpl
index 040a6aa84..0115abd88 100644
--- a/view/theme/frio/templates/vcard-widget.tpl
+++ b/view/theme/frio/templates/vcard-widget.tpl
@@ -1,10 +1,12 @@
+<div class="vcard h-card widget">
 
-<div class="vcard widget h-card">
-	{{if $url}}
-		<div id="profile-photo-wrapper" class="thumbnail"><a class="u-url" href="{{$url}}"><img class="vcard-photo photo u-photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
-	{{else}}
-		<div id="profile-photo-wrapper" class="thumbnail"><img class="vcard-photo photo u-photo" src="{{$photo}}" alt="{{$name}}" /></div>
-	{{/if}}
+	<div id="profile-photo-wrapper">
+		{{if $url}}
+		<a href="{{$url}}"><img class="photo u-photo" src="{{$photo}}" alt="{{$name}}" /></a>
+		{{else}}
+		<img class="photo u-photo" src="{{$photo}}" alt="{{$name}}" />
+		{{/if}}
+	</div>
 
 	{{* The short information which will appended to the second navbar by scrollspy *}}
 	<div id="vcard-short-info-wrapper" style="display: none;">
@@ -21,12 +23,16 @@
 	</div>
 
 	<div class="panel-body">
-		<div class="fn p-name">{{$name}}</div>
-		{{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
-		{{if $pdesc}}<div class="title">{{$pdesc}}</div>{{/if}}
+		<div class="profile-header">
+			<h3 class="fn p-name">{{$name}}</h3>
 
-		{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
-		{{if $network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_name}}</dd></dl>{{/if}}
-		<div id="profile-vcard-break"></div>
+			{{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
+
+			{{if $pdesc}}<div class="title">{{$pdesc}}</div>{{/if}}
+
+			{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
+
+			{{if $network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_name}}</dd></dl>{{/if}}
+		</div>
 	</div>
 </div>
diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 927dc9bfa..53efacda7 100644
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -248,7 +248,7 @@ as the value of $top_child_total (this is done at the end of this file)
 		<div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
 			{{* insert some space if it's an top-level post *}}
 			{{if $item.thread_level==1}}
-			<div style="height:10px;">&nbsp;</div> <!-- use padding/margin instead-->
+			<div class="wall-spacer">&nbsp;</div> <!-- use padding/margin instead-->
 			{{/if}}
 
 			{{if $item.title}}
@@ -260,8 +260,7 @@ as the value of $top_child_total (this is done at the end of this file)
 
 		<!-- TODO -->
 		<div class="wall-item-bottom">
-			<div class="wall-item-links">
-			</div>
+			<div class="wall-item-links"></div>
 			<div class="wall-item-tags">
 		{{if !$item.suppress_tags}}
 			{{foreach $item.hashtags as $tag}}
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 4f5756caf..72e5ab0b6 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>
  *
  */
@@ -15,7 +15,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Profile;
 
 $frio = 'view/theme/frio';
@@ -150,8 +150,18 @@ function frio_item_photo_menu(App $a, &$arr)
 function frio_contact_photo_menu(App $a, &$args)
 {
 	$cid = $args['contact']['id'];
-	$pokelink = $args['menu']['poke'][1];
-	$pmlink = $args['menu']['pm'][1];
+
+	if (!empty($args['menu']['poke'])) {
+		$pokelink = $args['menu']['poke'][1];
+	} else {
+		$pokelink = '';
+	}
+
+	if (!empty($args['menu']['poke'])) {
+		$pmlink = $args['menu']['pm'][1];
+	} else {
+		$pmlink = '';
+	}
 
 	// Set the the indicator for opening the status, profile and photo pages
 	// in a new tab to false if the contact a dfrn (friendica) contact
@@ -231,7 +241,7 @@ function frio_remote_nav($a, &$nav)
 		// user info
 		$r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid']));
 
-		$r[0]['photo'] = (DBM::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg');
+		$r[0]['photo'] = (DBA::isResult($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg');
 		$r[0]['name'] = $a->user['username'];
 	} elseif (!local_user() && remote_user()) {
 		$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
@@ -239,15 +249,15 @@ function frio_remote_nav($a, &$nav)
 	} elseif (Profile::getMyURL()) {
 		$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
 				WHERE `addr` = '%s' AND `network` = 'dfrn'",
-			dbesc($webbie));
+			DBA::escape($webbie));
 		$nav['remote'] = L10n::t('Visitor');
 	} else {
 		$r = false;
 	}
 
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$nav['userinfo'] = [
-			'icon' => (DBM::is_result($r) ? $r[0]['photo'] : 'images/person-48.jpg'),
+			'icon' => (DBA::isResult($r) ? $r[0]['photo'] : 'images/person-48.jpg'),
 			'name' => $r[0]['name'],
 		];
 	}
@@ -268,7 +278,7 @@ function frio_remote_nav($a, &$nav)
 		$nav['messages'] = [$server_url . '/message', L10n::t('Messages'), '', L10n::t('Private mail')];
 		$nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), '', L10n::t('Account settings')];
 		$nav['contacts'] = [$server_url . '/contacts', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
-		$nav['sitename'] = $a->config['sitename'];
+		$nav['sitename'] = Config::get('config', 'sitename');
 	}
 }
 
@@ -299,18 +309,18 @@ function frio_acl_lookup(App $a, &$results)
 
 	$sql_extra = '';
 	if ($results['search']) {
-		$search_txt = dbesc(protect_sprintf(preg_quote($results['search'])));
-		$sql_extra .= " AND (`attag` LIKE '%%" . dbesc($search_txt) . "%%' OR `name` LIKE '%%" . dbesc($search_txt) . "%%' OR `nick` LIKE '%%" . dbesc($search_txt) . "%%') ";
+		$search_txt = DBA::escape(protect_sprintf(preg_quote($results['search'])));
+		$sql_extra .= " AND (`attag` LIKE '%%" . $search_txt . "%%' OR `name` LIKE '%%" . $search_txt . "%%' OR `nick` LIKE '%%" . $search_txt . "%%') ";
 	}
 
 	if ($nets) {
-		$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
+		$sql_extra .= sprintf(" AND network = '%s' ", DBA::escape($nets));
 	}
 
 	$total = 0;
 	$r = q("SELECT COUNT(*) AS `total` FROM `contact`
 		WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra ", intval($_SESSION['uid']));
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$total = $r[0]['total'];
 	}
 
@@ -322,7 +332,7 @@ function frio_acl_lookup(App $a, &$results)
 
 	$contacts = [];
 
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
 			$contacts[] = _contact_detail_for_template($rr);
 		}
@@ -346,7 +356,12 @@ function frio_display_item(App $a, &$arr)
 {
 	// Add subthread to the item menu
 	$subthread = [];
-	if (local_user() == $arr['item']['uid'] && $arr['item']['parent'] == $arr['item']['id'] && !$arr['item']['self']) {
+	if (
+		local_user()
+		&& local_user() == $arr['item']['uid']
+		&& $arr['item']['parent'] == $arr['item']['id']
+		&& !$arr['item']['self'])
+	{
 		$subthread = [
 			'menu'   => 'follow_thread',
 			'title'  => L10n::t('Follow Thread'),
diff --git a/view/theme/quattro/dark/Makefile b/view/theme/quattro/dark/Makefile
index 989da60c7..c9b77b446 100644
--- a/view/theme/quattro/dark/Makefile
+++ b/view/theme/quattro/dark/Makefile
@@ -1,4 +1,5 @@
 ##
 
 style.css : style.less colors.less ../icons.less ../quattro.less
-	lessc style.less > style.css
+	echo "/* THIS FILE IS GENERATED FROM THE less SOURCE DO NOT EDIT MANUALLY */" > style.css
+	lessc style.less >> style.css
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index a0924c971..bfb078e56 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -1,3 +1,4 @@
+/* THIS FILE IS GENERATED FROM THE less SOURCE DO NOT EDIT MANUALLY */
 /**
  * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  **/
@@ -64,7 +65,7 @@
 .icon.unlock {
   background-image: url("../../../images/icons/22/unlock.png");
 }
-.icon.addon {
+.icon.plugin {
   background-image: url("../../../images/icons/22/plugin.png");
 }
 .icon.type-unkn {
@@ -143,7 +144,7 @@
 .icon.s10.unlock {
   background-image: url("../../../images/icons/10/unlock.png");
 }
-.icon.s10.addon {
+.icon.s10.plugin {
   background-image: url("../../../images/icons/10/plugin.png");
 }
 .icon.s10.type-unkn {
@@ -222,7 +223,7 @@
 .icon.s16.unlock {
   background-image: url("../../../images/icons/16/unlock.png");
 }
-.icon.s16.addon {
+.icon.s16.plugin {
   background-image: url("../../../images/icons/16/plugin.png");
 }
 .icon.s16.type-unkn {
@@ -301,7 +302,7 @@
 .icon.s22.unlock {
   background-image: url("../../../images/icons/22/unlock.png");
 }
-.icon.s22.addon {
+.icon.s22.plugin {
   background-image: url("../../../images/icons/22/plugin.png");
 }
 .icon.s22.type-unkn {
@@ -380,7 +381,7 @@
 .icon.s48.unlock {
   background-image: url("../../../images/icons/48/unlock.png");
 }
-.icon.s48.addon {
+.icon.s48.plugin {
   background-image: url("../../../images/icons/48/plugin.png");
 }
 .icon.s48.type-unkn {
@@ -468,7 +469,7 @@ blockquote {
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
 }
-code {
+pre code {
   font-family: Courier, monospace;
   white-space: pre;
   display: block;
@@ -2477,6 +2478,9 @@ footer {
   margin-top: 25px;
   clear: both;
 }
+.pager .disabled {
+  display: none;
+}
 /**
  * ADMIN
  */
@@ -2551,6 +2555,9 @@ footer {
 #adminpage .selectall {
   text-align: right;
 }
+#adminpage .settings-block {
+  border-bottom: 1px solid #cccccc;
+}
 /* edit buttons for comments */
 .icon.dim {
   opacity: 0.3;
diff --git a/view/theme/quattro/green/Makefile b/view/theme/quattro/green/Makefile
index 989da60c7..c9b77b446 100644
--- a/view/theme/quattro/green/Makefile
+++ b/view/theme/quattro/green/Makefile
@@ -1,4 +1,5 @@
 ##
 
 style.css : style.less colors.less ../icons.less ../quattro.less
-	lessc style.less > style.css
+	echo "/* THIS FILE IS GENERATED FROM THE less SOURCE DO NOT EDIT MANUALLY */" > style.css
+	lessc style.less >> style.css
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 904d41fb2..1dce844ac 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -1,3 +1,4 @@
+/* THIS FILE IS GENERATED FROM THE less SOURCE DO NOT EDIT MANUALLY */
 /**
  * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  **/
@@ -64,7 +65,7 @@
 .icon.unlock {
   background-image: url("../../../images/icons/22/unlock.png");
 }
-.icon.addon {
+.icon.plugin {
   background-image: url("../../../images/icons/22/plugin.png");
 }
 .icon.type-unkn {
@@ -143,7 +144,7 @@
 .icon.s10.unlock {
   background-image: url("../../../images/icons/10/unlock.png");
 }
-.icon.s10.addon {
+.icon.s10.plugin {
   background-image: url("../../../images/icons/10/plugin.png");
 }
 .icon.s10.type-unkn {
@@ -222,7 +223,7 @@
 .icon.s16.unlock {
   background-image: url("../../../images/icons/16/unlock.png");
 }
-.icon.s16.addon {
+.icon.s16.plugin {
   background-image: url("../../../images/icons/16/plugin.png");
 }
 .icon.s16.type-unkn {
@@ -301,7 +302,7 @@
 .icon.s22.unlock {
   background-image: url("../../../images/icons/22/unlock.png");
 }
-.icon.s22.addon {
+.icon.s22.plugin {
   background-image: url("../../../images/icons/22/plugin.png");
 }
 .icon.s22.type-unkn {
@@ -380,7 +381,7 @@
 .icon.s48.unlock {
   background-image: url("../../../images/icons/48/unlock.png");
 }
-.icon.s48.addon {
+.icon.s48.plugin {
   background-image: url("../../../images/icons/48/plugin.png");
 }
 .icon.s48.type-unkn {
@@ -468,7 +469,7 @@ blockquote {
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
 }
-code {
+pre code {
   font-family: Courier, monospace;
   white-space: pre;
   display: block;
@@ -2478,7 +2479,7 @@ footer {
   clear: both;
 }
 .pager .disabled {
-	display: none;
+  display: none;
 }
 /**
  * ADMIN
@@ -2554,6 +2555,9 @@ footer {
 #adminpage .selectall {
   text-align: right;
 }
+#adminpage .settings-block {
+  border-bottom: 1px solid #cccccc;
+}
 /* edit buttons for comments */
 .icon.dim {
   opacity: 0.3;
diff --git a/view/theme/quattro/icons/bbedit.png b/view/theme/quattro/icons/bbedit.png
index b89f2f7a8..83a416310 100644
Binary files a/view/theme/quattro/icons/bbedit.png and b/view/theme/quattro/icons/bbedit.png differ
diff --git a/view/theme/quattro/icons/contacts3.png b/view/theme/quattro/icons/contacts3.png
index 8a3e69ec1..837bade72 100644
Binary files a/view/theme/quattro/icons/contacts3.png and b/view/theme/quattro/icons/contacts3.png differ
diff --git a/view/theme/quattro/icons/men.png b/view/theme/quattro/icons/men.png
index e5b9c4a6f..077b4900c 100644
Binary files a/view/theme/quattro/icons/men.png and b/view/theme/quattro/icons/men.png differ
diff --git a/view/theme/quattro/lilac/Makefile b/view/theme/quattro/lilac/Makefile
index 989da60c7..c9b77b446 100644
--- a/view/theme/quattro/lilac/Makefile
+++ b/view/theme/quattro/lilac/Makefile
@@ -1,4 +1,5 @@
 ##
 
 style.css : style.less colors.less ../icons.less ../quattro.less
-	lessc style.less > style.css
+	echo "/* THIS FILE IS GENERATED FROM THE less SOURCE DO NOT EDIT MANUALLY */" > style.css
+	lessc style.less >> style.css
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 2a046a87a..870fe6ce2 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -1,3 +1,4 @@
+/* THIS FILE IS GENERATED FROM THE less SOURCE DO NOT EDIT MANUALLY */
 /**
  * Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  **/
@@ -64,7 +65,7 @@
 .icon.unlock {
   background-image: url("../../../images/icons/22/unlock.png");
 }
-.icon.addon {
+.icon.plugin {
   background-image: url("../../../images/icons/22/plugin.png");
 }
 .icon.type-unkn {
@@ -143,7 +144,7 @@
 .icon.s10.unlock {
   background-image: url("../../../images/icons/10/unlock.png");
 }
-.icon.s10.addon {
+.icon.s10.plugin {
   background-image: url("../../../images/icons/10/plugin.png");
 }
 .icon.s10.type-unkn {
@@ -222,7 +223,7 @@
 .icon.s16.unlock {
   background-image: url("../../../images/icons/16/unlock.png");
 }
-.icon.s16.addon {
+.icon.s16.plugin {
   background-image: url("../../../images/icons/16/plugin.png");
 }
 .icon.s16.type-unkn {
@@ -301,7 +302,7 @@
 .icon.s22.unlock {
   background-image: url("../../../images/icons/22/unlock.png");
 }
-.icon.s22.addon {
+.icon.s22.plugin {
   background-image: url("../../../images/icons/22/plugin.png");
 }
 .icon.s22.type-unkn {
@@ -380,7 +381,7 @@
 .icon.s48.unlock {
   background-image: url("../../../images/icons/48/unlock.png");
 }
-.icon.s48.addon {
+.icon.s48.plugin {
   background-image: url("../../../images/icons/48/plugin.png");
 }
 .icon.s48.type-unkn {
@@ -468,7 +469,7 @@ blockquote {
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
 }
-code {
+pre code {
   font-family: Courier, monospace;
   white-space: pre;
   display: block;
@@ -2478,7 +2479,7 @@ footer {
   clear: both;
 }
 .pager .disabled {
-	display: none;
+  display: none;
 }
 /**
  * ADMIN
@@ -2554,6 +2555,9 @@ footer {
 #adminpage .selectall {
   text-align: right;
 }
+#adminpage .settings-block {
+  border-bottom: 1px solid #cccccc;
+}
 /* edit buttons for comments */
 .icon.dim {
   opacity: 0.3;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 91c8074d9..415eda83c 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;
@@ -1710,10 +1710,10 @@ footer { height: 100px; display: table-row; }
 	clear:left;
 	text-align: right;
     }
-    #pluginslist {
+    #addonslist {
 	margin: 0; padding: 0;
     }
-    .plugin {
+    .addon {
 	list-style: none;
 	display: block;
 	border: 1px solid #888888;
@@ -1724,7 +1724,7 @@ footer { height: 100px; display: table-row; }
             margin-left: 2.5em;
         }
     }
-    .toggleplugin {
+    .toggleaddon {
 	float:left;
 	margin-right: 1em;
     }
@@ -1746,6 +1746,9 @@ footer { height: 100px; display: table-row; }
             width: 16px; height: 16px;
     }
     .selectall { text-align: right; }
+    .settings-block {
+      border-bottom: 1px solid #cccccc;
+    }
 }
 
 /* edit buttons for comments */
diff --git a/view/theme/quattro/screenshot.jpg b/view/theme/quattro/screenshot.jpg
index 98fbfe2ea..6ac3b20af 100644
Binary files a/view/theme/quattro/screenshot.jpg and b/view/theme/quattro/screenshot.jpg differ
diff --git a/view/theme/quattro/showmore-bg.jpg b/view/theme/quattro/showmore-bg.jpg
index e76015c68..9d9d5af2f 100644
Binary files a/view/theme/quattro/showmore-bg.jpg and b/view/theme/quattro/showmore-bg.jpg differ
diff --git a/view/theme/quattro/templates/jot.tpl b/view/theme/quattro/templates/jot.tpl
index 97fb0c24f..bdf21b8f7 100644
--- a/view/theme/quattro/templates/jot.tpl
+++ b/view/theme/quattro/templates/jot.tpl
@@ -6,10 +6,8 @@
 		<input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" title="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" />
 		{{/if}}
 		<div id="character-counter" class="grey jothidden"></div>
-
-
-
-		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="wall" value="{{$wall}}" />
+		<input type="hidden" name="post_type" value="{{$posttype}}" />
 		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 		<input type="hidden" name="return" value="{{$return_path}}" />
 		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl
index b5ae5c2d0..c021f977a 100644
--- a/view/theme/quattro/templates/nav.tpl
+++ b/view/theme/quattro/templates/nav.tpl
@@ -66,22 +66,22 @@
 					<li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="{{$nav.notifications.mark.3}}"><span class="icon s10 edit"></span></a></a><a href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.all.1}}"><span class="icon s10 plugin"></span></a></li>
 					<li class="empty">{{$emptynotifications}}</li>
 				</ul>
-			</li>		
-		{{/if}}		
-		
+			</li>
+		{{/if}}
+
 		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
-				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}				
+				{{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}
 
 				{{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
 				{{if $nav.admin}}<li><a accesskey="a" class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}}
 
 				{{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
 				{{if $nav.login}}<li><a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}}
-				{{if $nav.tos}}<li><a class="menu-sep {{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}">{{$nav.tos.1}}</a></li>{{/if}}				
-			</ul>		
+				{{if $nav.tos}}<li><a class="menu-sep {{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}">{{$nav.tos.1}}</a></li>{{/if}}
+			</ul>
 		</li>
-		
+
 		{{if $nav.help}} 
 		<li id="nav-help-link" class="nav-menu {{$sel.help}}">
 			<a class="{{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a>
diff --git a/view/theme/quattro/templates/search_item.tpl b/view/theme/quattro/templates/search_item.tpl
index 649ad341f..cf79b24c0 100644
--- a/view/theme/quattro/templates/search_item.tpl
+++ b/view/theme/quattro/templates/search_item.tpl
@@ -23,7 +23,7 @@
 		</div>
 		<div class="wall-item-content">
 			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
-			{{$item.body}}
+			<div class="wall-item-body">{{$item.body}}</div>
 		</div>
 	</div>
 	<div class="wall-item-bottom">
diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl
index 89832403f..79bf1d6b6 100644
--- a/view/theme/quattro/templates/wall_thread.tpl
+++ b/view/theme/quattro/templates/wall_thread.tpl
@@ -60,7 +60,7 @@
 		</div>
 		<div class="wall-item-content">
 			{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}
-			<span class="e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
+			<span class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
 		</div>
 	</div>
 	<div class="wall-item-bottom">
diff --git a/view/theme/smoothly/images/icons.png b/view/theme/smoothly/images/icons.png
index d21640eae..534d0b428 100644
Binary files a/view/theme/smoothly/images/icons.png and b/view/theme/smoothly/images/icons.png differ
diff --git a/view/theme/smoothly/images/menu-user-pin.jpg b/view/theme/smoothly/images/menu-user-pin.jpg
index 26449569f..5f766eb32 100644
Binary files a/view/theme/smoothly/images/menu-user-pin.jpg and b/view/theme/smoothly/images/menu-user-pin.jpg differ
diff --git a/view/theme/smoothly/images/next.png b/view/theme/smoothly/images/next.png
index 353e2e72a..2e601f7ca 100644
Binary files a/view/theme/smoothly/images/next.png and b/view/theme/smoothly/images/next.png differ
diff --git a/view/theme/smoothly/images/photo-menu.jpg b/view/theme/smoothly/images/photo-menu.jpg
index b96a96fa1..57edb2045 100644
Binary files a/view/theme/smoothly/images/photo-menu.jpg and b/view/theme/smoothly/images/photo-menu.jpg differ
diff --git a/view/theme/smoothly/images/power.png b/view/theme/smoothly/images/power.png
index 2541502c3..2134687f9 100644
Binary files a/view/theme/smoothly/images/power.png and b/view/theme/smoothly/images/power.png differ
diff --git a/view/theme/smoothly/images/prev.png b/view/theme/smoothly/images/prev.png
index 0ae6022af..62f7fb5e5 100644
Binary files a/view/theme/smoothly/images/prev.png and b/view/theme/smoothly/images/prev.png differ
diff --git a/view/theme/smoothly/images/rarrow.gif b/view/theme/smoothly/images/rarrow.gif
index 2237fc6b6..3c38041f3 100644
Binary files a/view/theme/smoothly/images/rarrow.gif and b/view/theme/smoothly/images/rarrow.gif differ
diff --git a/view/theme/smoothly/screenshot.png b/view/theme/smoothly/screenshot.png
index 09237d71a..3528739a3 100644
Binary files a/view/theme/smoothly/screenshot.png and b/view/theme/smoothly/screenshot.png differ
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 399f12e55..090723787 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/smoothly/templates/jot.tpl b/view/theme/smoothly/templates/jot.tpl
index 26578dafc..34c0b1a2b 100644
--- a/view/theme/smoothly/templates/jot.tpl
+++ b/view/theme/smoothly/templates/jot.tpl
@@ -1,5 +1,3 @@
-
-
 <div id="profile-jot-wrapper" >
 	<div id="profile-jot-banner-wrapper">
 		<div id="profile-jot-desc" >&nbsp;</div>
@@ -8,7 +6,8 @@
 	<div id="profile-jot-banner-end"></div>
 
 	<form id="profile-jot-form" action="{{$action}}" method="post" >
-		<input type="hidden" name="type" value="{{$ptyp}}" />
+		<input type="hidden" name="wall" value="{{$wall}}" />
+		<input type="hidden" name="post_type" value="{{$posttype}}" />
 		<input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
 		<input type="hidden" name="return" value="{{$return_path}}" />
 		<input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
@@ -25,8 +24,8 @@
 		</div>
 		{{/if}}
 		<div id="jot-text-wrap">
-                	<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /><br>
-                	<textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">
+			<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /><br>
+			<textarea rows="5" cols="80" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">
 			{{if $content}}{{$content}}{{/if}}
 			</textarea>
 		</div>
@@ -62,7 +61,7 @@
 	</div>
 
 	<div id="profile-jot-plugin-wrapper" style="display: none;">
-  	{{$jotplugins}}
+	{{$jotplugins}}
 	</div>
 	<div id="profile-jot-tools-end"></div>
 
diff --git a/view/theme/vier/breathe.css b/view/theme/vier/breathe.css
index ec6d91a56..3403a24b2 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/css/font2.css b/view/theme/vier/css/font2.css
index 7d40e2f6d..9a048b298 100644
--- a/view/theme/vier/css/font2.css
+++ b/view/theme/vier/css/font2.css
@@ -335,6 +335,7 @@ li.icon.icon-large:before {
 .icon.drop:before                 { content: "\f014"; }
 .icon.drophide:before             { content: "\f014"; }
 .icon.copy:before                 { content: "\f0c5"; }
+.icon.block:before                { content: "\f05e"; }
 
 .small-pencil:before, .savedsearchdrop:before { 
   font-family: FontAwesome;
diff --git a/view/theme/vier/icons.png b/view/theme/vier/icons.png
index 0e1e7662d..c3b236980 100644
Binary files a/view/theme/vier/icons.png and b/view/theme/vier/icons.png differ
diff --git a/view/theme/vier/screenshot.png b/view/theme/vier/screenshot.png
index 352b0b09f..a5ca0a5c4 100644
Binary files a/view/theme/vier/screenshot.png and b/view/theme/vier/screenshot.png differ
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 475fda035..6c4f2b20f 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -8,7 +8,7 @@
 @import url("css/font2.css") all;
 
 img {
-  border: 0px;
+	border: 0px;
 }
 
 /* ========= */
@@ -16,11 +16,11 @@ img {
 /* ========= */
 
 #adminpage {
-/*        width: 80%;*/
+	/* width: 80%; */
 }
 
 #adminpage .screenshot img {
-  width: 640px;
+	width: 640px;
 }
 
 #pending-update {
@@ -41,7 +41,7 @@ img {
 .admin.link {
 	list-style-position: inside;
 	font-size: 1em;
-/*        padding-left: 5px;
+	/* padding-left: 5px;
 	margin: 5px; */
 }
 
@@ -89,162 +89,160 @@ img {
 	margin-right: 1em;
 }
 
-#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
+#adminpage table { width:100%; border-bottom: 1px solid #000000; margin: 5px 0px; }
+#adminpage table th { text-align: left; }
+#adminpage td .icon { float: left; }
 #adminpage table#users img { width: 16px; height: 16px; }
 #adminpage table tr:hover { background-color: #eeeeee; }
 #adminpage .selectall { text-align: right; }
 /* icons */
 
 /*
-.article	{ background-position: -50px  0px;}
-.block 		{ background-position: -90px  0px;}
-.drophide 	{ background-position: -130px 0px;}
+.article	 {background-position: -50px  0px;}
+.block 		 {background-position: -90px  0px;}
+.drophide 	 {background-position: -130px 0px;}
 
-.noglobe 	{ background-position: -70px  -20px;}
-.no 		{ background-position: -90px  -20px;}
-.recycle 	{ background-position: -190px -20px;}
-.remote-link	{ background-position: -210px -20px;}
-.share 		{ background-position: -230px -20px;}
+.noglobe 	 {background-position: -70px  -20px;}
+.no 		 {background-position: -90px  -20px;}
+.recycle 	 {background-position: -190px -20px;}
+.remote-link	 {background-position: -210px -20px;}
+.share 		 {background-position: -230px -20px;}
 
-.tools 		{ background-position: -50px  -40px;}
+.tools 		 {background-position: -50px  -40px;}
 
-.youtube        { background-position: -130px -40px;}
+.youtube 	 {background-position: -130px -40px;}
 
-.language       { background-position: -210px -40px;}
+.language  	 {background-position: -210px -40px;}
 
-.prev           { background-position: -90px  -60px;}
-.next           { background-position: -110px -60px;}
-.tagged     { background-position: -130px -60px;}
+.prev 		 {background-position: -90px  -60px;}
+.next 		 {background-position: -110px -60px;}
+.tagged 	 {background-position: -130px -60px;}
 */
 
 .icon.drop, .icon.drophide {
- float: left;
+	float: left;
 }
 
 
 .icon {
-  background-color: transparent ;
-  background-repeat: no-repeat;
-  width: 20px;
-  height: 20px;
-  /* display: block; */
-  display: inline-block;
-  overflow: hidden;
-  padding: 1px;
-  color: #999;
-  vertical-align: text-top;
+	background-color: transparent ;
+	background-repeat: no-repeat;
+	width: 20px;
+	height: 20px;
+	/* display: block; */
+	display: inline-block;
+	overflow: hidden;
+	padding: 1px;
+	color: #999;
+	vertical-align: text-top;
 }
 
 .icon:hover {
-  text-decoration: none;
-  color: #000;
+	text-decoration: none;
+	color: #000;
 }
 
 .icon a:hover {
 }
 
 .icon.text {
-  text-indent: 0px;
+	text-indent: 0px;
 }
 .icon.s10 {
-/*  min-width: 10px;
-  height: 10px; */
- /* font-size: 10px; */
+	/* min-width: 10px;
+	height: 10px; */
+	/* font-size: 10px; */
 }
 .icon.s10.text {
-  padding: 2px 0px 0px 15px;
-  font-size: 10px;
+	padding: 2px 0px 0px 15px;
+	font-size: 10px;
 }
 .icon.s16 {
-  min-width: 16px;
-  height: 16px;
+	min-width: 16px;
+	height: 16px;
 }
 .icon.s16.text {
-  padding: 4px 0px 0px 20px;
-  font-size: 10px;
+	padding: 4px 0px 0px 20px;
+	font-size: 10px;
 }
 .wall-item-decor .icon.s22.lock {
-  color: #888;
+	color: #888;
 }
 .wall-item-decor .icon.s22.lock:hover {
-  color: #000;
-  text-decoration: none;
+	color: #000;
+	text-decoration: none;
 }
 .icon.s22 {
-  min-width: 22px;
-  height: 22px;
+	min-width: 22px;
+	height: 22px;
 }
 /*.icon.s22.notify {
-  color: gray;
+	color: gray;
 }*/
 .icon.s22.text {
-  padding: 10px 0px 0px 25px;
-  width: 230px;
-  font-size: 1em;
+	padding: 10px 0px 0px 25px;
+	width: 230px;
+	font-size: 1em;
 }
 .icon.s48 {
-  width: 48px;
-  height: 48px;
+	width: 48px;
+	height: 48px;
 }
 .sparkle {
 	cursor: url('lock.cur'), pointer;
 }
 
 #birthday-title, #event-title {
-  font-weight: bold;
-  margin-bottom: 5px;
+	font-weight: bold;
+	margin-bottom: 5px;
 }
 
 div.pager a {
-  margin-left: 5px;
-  margin-right: 5px;
+	margin-left: 5px;
+	margin-right: 5px;
 }
 
 span.pager_first a, span.pager_n a,
 span.pager_last a, span.pager_prev a, span.pager_next a,
 span.scroll_loader_text {
-  color: darkgray;
+	color: darkgray;
 }
 
 div.pager {
-  clear: left;
-  text-align: center;
-/*
-  height: 1.2em;
-  padding-bottom: 12px;
-  color: black;
-  background-color: #f2f2f2;
-  margin-top: 5px;
-  padding: 1%;
-  height: 1em;
-  margin-bottom: 5px;
-*/
+	clear: left;
+	text-align: center;
+	/* height: 1.2em;
+	padding-bottom: 12px;
+	color: black;
+	background-color: #f2f2f2;
+	margin-top: 5px;
+	padding: 1%;
+	height: 1em;
+	margin-bottom: 5px; */
 }
 
 .birthday-notice, .event-notice {
-  margin-top: 5px;
-  margin-bottom: 5px;
-  background-color: #F5F5F5;
+	margin-top: 5px;
+	margin-bottom: 5px;
+	background-color: #F5F5F5;
 }
 
 #live-network {
-/*  border-bottom: 1px solid #BDCDD4; */
-  border-bottom: 1px solid #D2D2D2;
-  width: 100%;
-  height: 10px;
+	/* border-bottom: 1px solid #BDCDD4; */
+	border-bottom: 1px solid #D2D2D2;
+	width: 100%;
+	height: 10px;
 }
 
 .pager a {
 }
 
 .pager a.pager_older {
-  float: right;
+	float: right;
 }
 
 .pager a.pager_newer {
-  float: left;
+	float: left;
 }
 
 .pager .disabled {
@@ -252,37 +250,36 @@ div.pager {
 }
 
 .hide-comments-outer {
-  margin-left: 80px;
-  margin-bottom: 5px;
-  width: 660px;
-  border-bottom: 1px solid #BDCDD4;
-  border-top: 1px solid #BDCDD4;
-
-  padding: 8px;
+	margin-left: 80px;
+	margin-bottom: 5px;
+	width: 660px;
+	border-bottom: 1px solid #BDCDD4;
+	border-top: 1px solid #BDCDD4;
+	padding: 8px;
 }
 
 /* global */
 body {
-/*  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; */
-  font-family: -apple-system,".SFNSText-Regular","San Francisco","Roboto","Segoe UI","Helvetica Neue","Lucida Grande",Helvetica,Arial,sans-serif;
-  font-size: 14px;
-  /* font-size: 13px;
-  line-height: 19.5px; */
-  font-weight: 400;
-  font-style: normal;
-  /* background-color: #ffffff; */
-  /* background-color: #FAFAFA; */
-  background-color: rgb(229, 229, 229);
-  color: #2d2d2d;
-  margin: 0px 0px 0px 0px;
-  display: table;
+	/* font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; */
+	font-family: -apple-system,".SFNSText-Regular","San Francisco","Roboto","Segoe UI","Helvetica Neue","Lucida Grande",Helvetica,Arial,sans-serif;
+	font-size: 14px;
+	/* font-size: 13px;
+	line-height: 19.5px; */
+	font-weight: 400;
+	font-style: normal;
+	/* background-color: #ffffff; */
+	/* background-color: #FAFAFA; */
+	background-color: rgb(229, 229, 229);
+	color: #2d2d2d;
+	margin: 0px 0px 0px 0px;
+	display: table;
 }
 
 a {
 	color: #36C;
 	/* color: #3e3e8c; */
 	/* color: #3465A4; */
-	/*color: #3E3E8C; */
+	/* color: #3E3E8C; */
 	text-decoration: none;
 }
 a:hover {
@@ -291,102 +288,102 @@ a:hover {
 }
 
 .wall-item-name-link {
-/*  float: left;*/
+	/* float: left;*/
 }
 
 .wall-item-photo {
-  width: 48px;
-  height: 48px;
-  overflow: hidden;
-  display: block;
+	width: 48px;
+	height: 48px;
+	overflow: hidden;
+	display: block;
 }
 
 .left {
-  float: left;
+	float: left;
 }
 .right {
-  float: right;
+	float: right;
 }
 .hidden {
-  display: none;
+	display: none;
 }
 .clear {
-  clear: both;
+	clear: both;
 }
 .fakelink {
-  color: #36c;
-  /* color: #3e3e8c; */
-  /* color: #3465A4; */
-  /* color: #3E3E8C; */
-  text-decoration: none;
-  cursor: pointer;
+	color: #36c;
+	/* color: #3e3e8c; */
+	/* color: #3465A4; */
+	/* color: #3E3E8C; */
+	text-decoration: none;
+	cursor: pointer;
 }
 .fakelink:hover {
-  /*color: blue;*/
-  /*color: #005c94; */
-  text-decoration: underline;
+	/* color: blue;*/
+	/* color: #005c94; */
+	text-decoration: underline;
 }
-code {
-  font-family: Courier, monospace;
-  white-space: pre;
-  display: block;
-  overflow: auto;
-  border: 1px solid #444;
-  background: #EEE;
-  color: #444;
-  padding: 10px;
-  margin-top: 20px;
-  max-width: 640px;
-  white-space: pre-wrap;
+pre code {
+	font-family: Courier, monospace;
+	white-space: pre;
+	display: block;
+	overflow: auto;
+	border: 1px solid #444;
+	background: #EEE;
+	color: #444;
+	padding: 10px;
+	margin-top: 20px;
+	max-width: 640px;
+	white-space: pre-wrap;
 }
 .badge {
-  display: inline-block;
-  min-width: 10px;
-  padding: 3px 7px;
-  font-size: 10px;
-  font-weight: 700;
-  line-height: 1;
-  color: #fff;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  /* background-color: #737373*/;
-  background-color: #36C;
-  border-radius: 4px;
-  opacity: 0.3;
+	display: inline-block;
+	min-width: 10px;
+	padding: 3px 7px;
+	font-size: 10px;
+	font-weight: 700;
+	line-height: 1;
+	color: #fff;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: baseline;
+	/* background-color: #737373*/;
+	background-color: #36C;
+	border-radius: 4px;
+	opacity: 0.3;
 }
 #panel {
-  position: absolute;
-  width: 10em;
-  background: #ffffff;
-  color: #2d2d2d;
-  margin: 0px;
-  padding: 1em;
-  list-style: none;
-  /*border: 3px solid #364e59;*/
-  z-index: 100000;
-  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+	position: absolute;
+	width: 10em;
+	background: #ffffff;
+	color: #2d2d2d;
+	margin: 0px;
+	padding: 1em;
+	list-style: none;
+	/* border: 3px solid #364e59;*/
+	z-index: 100000;
+	box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
 
 /* some settings for different form-factors */
 @media (min-width: 601px) {
-  a.mobile-view { display: none };
-  a.desktop-view { display: initial };
+	a.mobile-view { display: none };
+	a.desktop-view { display: initial };
 }
 
 /* tool */
 .tool {
-  height: auto;
-  overflow: auto;
-  padding: 0px;
+	height: auto;
+	overflow: auto;
+	padding: 0px;
 }
 .menu-popup .divider {
-  width: 90%;
-  height: 1px;
-  margin: 3px auto;
-  overflow: hidden;
-  background-color: #737373;
-  opacity: 0.4;
+	width: 90%;
+	height: 1px;
+	margin: 3px auto;
+	overflow: hidden;
+	background-color: #737373;
+	opacity: 0.4;
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
@@ -404,361 +401,363 @@ code {
 	display: none;
 }*/
 #sidebar-group-list .notify {
-  display: none;
+	display: none;
+}
+#sidebar-group-list .notify.show {
+	display: inline-block;
 }
-#sidebar-group-list .notify.show { display: inline-block; }
 .tool .label {
-/*  float: left; */
+	/* float: left; */
 }
 .tool .action {
-  float: right;
+	float: right;
 }
 .tool a {
-/*  color: #000; */
+	/* color: #000; */
 }
 .tool a:hover, .widget a:hover, #nets-sidear a:hover, #forum-widget-collapse:hover, .admin.link a:hover, aside h4 a:hover, right_aside h4 a:hover {
-  /* text-decoration: underline; */
-  text-decoration: none;
-  color: black;
+	/* text-decoration: underline; */
+	text-decoration: none;
+	color: black;
 }
 
 .groupsideedit, .savedsearchdrop {
-  float: right;
-  opacity: 0.3;
+	float: right;
+	opacity: 0.3;
 }
 .groupsideedit:hover, .savedsearchdrop:hover {
-  opacity: 1;
+	opacity: 1;
 }
 
 .sidebar-group-li:hover, #sidebar-new-group:hover, #sidebar-edit-groups:hover,#forum-widget-collapse:hover,
 #sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forumlist-sidebar li:hover, #forumlist-sidebar-right li:hover,
 .nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, right_aside h4 a:hover, #message-new:hover,
 #sidebar-photos-albums li:hover, .photos-upload-link:hover, .textcomplete-item.active {
-  /* background-color: #ddd; */
-/*  background-color: #e5e5e5; */
-  background-color: #F5F5F5;
+	/* background-color: #ddd; */
+	/* background-color: #e5e5e5; */
+	background-color: #F5F5F5;
 }
 
 #message-new a {
-  color: black;
+	color: black;
 }
 
 .sidebar-group-element {
-/*  color: #000; */
+	/* color: #000; */
 }
 
 .group-selected, .nets-selected, .fileas-selected, .forum-selected {
-  font-weight: bold;
+	font-weight: bold;
 }
 
 #forum-widget-showmore, #sidebar-new-group, #sidebar-edit-groups, #forum-widget-collapse, #forumlist-rsidebar-right, #sidebar-ungrouped,
 .side-link, #peoplefind-desc, #connect-desc, .nets-all, .admin.link, #message-new {
-  padding-left: 10px;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-right: 5px;
-  display: block;
+	padding-left: 10px;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-right: 5px;
+	display: block;
 }
 
 .photos-upload-link {
-  padding-top: 3px;
-  padding-bottom: 3px;
-  display: block;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	display: block;
 }
 
 #forumlist-sidebar {
-  padding-top: 3px;
-  padding-bottom: 3px;
-  display: block;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	display: block;
 }
 
 .forum-widget-entry {
-  padding-left: 10px;
-  padding-right: 5px;
+	padding-left: 10px;
+	padding-right: 5px;
 }
 
 #forumlist-sidebar .notify, #forumlist-sidebar-right .notify {
-  display: none;
+	display: none;
 }
 
 #forumlist-sidebar .notify.show, #forumlist-sidebar-right .notify.show {
-  display: inline-block;
+	display: inline-block;
 }
 
 a.nets-link, .side-link a, #sidebar-new-group a, #sidebar-edit-groups a, a.savedsearchterm,a.fileas-link, aside h4 a, right_aside h4 a {
-  display: block;
-  color: #737373;
+	display: block;
+	color: #737373;
 }
 
 a.sidebar-group-element {
-  color: #737373;
+	color: #737373;
 }
 
 #follow-sidebar form, #peoplefind-sidebar form, #netsearch-box form {
-  margin-left: 10px;
-  margin-top: 3px;
-  margin-bottom: 3px;
+	margin-left: 10px;
+	margin-top: 3px;
+	margin-bottom: 3px;
 }
 
 #datebrowse-sidebar .datebrowse-ul .posted-date-selector-months {
-    padding: 0;
-    margin-left: 10px;
+	padding: 0;
+	margin-left: 10px;
 }
 #sidebar-ungrouped, .side-link {
-  padding-top: 5px;
+	padding-top: 5px;
 }
 
 #sidebar-ungrouped a {
-  color: black;
+	color: black;
 }
 
 #forumlist-sidebar a, #forumlist-sidebar-right a, .tool a, .admin.link a, #sidebar-photos-albums a {
-  color: #737373;
+	color: #737373;
 }
 
 #forumlist-sidebar, #forumlist-sidebar-right {
-  margin-top: 2px;
+	margin-top: 2px;
 }
 
 /* popup notifications */
 div.jGrowl div.notice {
-  background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
-  color: #ffffff;
-  padding-left: 58px;
+	background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
+	color: #ffffff;
+	padding-left: 58px;
 }
 div.jGrowl div.info {
-  background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
-  color: #ffffff;
-  padding-left: 58px;
+	background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
+	color: #ffffff;
+	padding-left: 58px;
 }
 
 div.jGrowl.top-right {
-  top: 40px;
-  z-index: 90;
+	top: 40px;
+	z-index: 90;
 }
 
 /* header */
 header {
-  position: fixed;
-  /* left: 43%;
-  right: 43%; */
-  left: 25px;
-  top: 0px;
-  margin: 0px;
-  padding: 0px;
-  /*width: 100%; height: 12px; */
+	position: fixed;
+	/* left: 43%;
+	right: 43%; */
+	left: 25px;
+	top: 0px;
+	margin: 0px;
+	padding: 0px;
+	/*width: 100%; height: 12px; */
 
-  z-index: 110;
-  color: #ffffff;
+	z-index: 110;
+	color: #ffffff;
 }
 header #site-location {
-  display: none;
+	display: none;
 }
 header #banner {
-  overflow: hidden;
-  text-align: center;
-  width: 100%;
+	overflow: hidden;
+	text-align: center;
+	width: 100%;
 }
 header #banner a,
 header #banner a:active,
 header #banner a:visited,
 header #banner a:link,
 header #banner a:hover {
-  color: #ffffff;
-  text-decoration: none;
-  outline: none;
-  vertical-align: bottom;
+	color: #ffffff;
+	text-decoration: none;
+	outline: none;
+	vertical-align: bottom;
 }
 header #banner #logo-img {
-  height: 22px;
-  margin-top: 5px;
+	height: 22px;
+	margin-top: 5px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+	font-size: 22px;
 }
 /* nav */
 nav {
-  min-width: 1000px;
-  width: 100%;
-  height: 32px;
-  position: fixed;
-  left: 0px;
-  top: 0px;
-  padding: 0px;
-  padding-left: 0px;
-  /* background: #2d2d2d; */
-  background: rgb(36, 76, 94);
-  /*background: #364A84;
-    background: -moz-linear-gradient(top, #516499 0%, #364a84 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84));
-    background: -webkit-linear-gradient(top, #516499 0%,#364a84 100%);
-    background: -o-linear-gradient(top, #516499 0%,#364a84 100%);
-    background: -ms-linear-gradient(top, #516499 0%,#364a84 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 );
-    background: linear-gradient(top, #516499 0%,#364a84 100%); */
-  color: #ffffff;
-  z-index: 100;
-  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+	min-width: 1000px;
+	width: 100%;
+	height: 32px;
+	position: fixed;
+	left: 0px;
+	top: 0px;
+	padding: 0px;
+	padding-left: 0px;
+	/* background: #2d2d2d; */
+	background: rgb(36, 76, 94);
+	/*background: #364A84;
+	background: -moz-linear-gradient(top, #516499 0%, #364a84 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84));
+	background: -webkit-linear-gradient(top, #516499 0%,#364a84 100%);
+	background: -o-linear-gradient(top, #516499 0%,#364a84 100%);
+	background: -ms-linear-gradient(top, #516499 0%,#364a84 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 );
+	background: linear-gradient(top, #516499 0%,#364a84 100%); */
+	color: #ffffff;
+	z-index: 100;
+	box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
 }
 
 nav .icon {
-  color: #ccc;
-  padding:0;
+	color: #ccc;
+	padding:0;
 }
 
 nav a:active,
 nav a:visited,
 nav a:link,
 nav a {
-  text-decoration: none;
-  outline: none;
-  color: #ccc;
-  padding-bottom: 8px;
-  padding-top: 8px;
-  cursor: pointer;
+	text-decoration: none;
+	outline: none;
+	color: #ccc;
+	padding-bottom: 8px;
+	padding-top: 8px;
+	cursor: pointer;
 }
 
 nav a:hover .icon {
-  color: #fff;
+	color: #fff;
 }
 
 nav a:hover {
-  text-decoration: none;
-  outline: none;
-  color: #fff;
-  padding-bottom: 8px;
-  padding-top: 8px;
+	text-decoration: none;
+	outline: none;
+	color: #fff;
+	padding-bottom: 8px;
+	padding-top: 8px;
 }
 
 nav ul {
-  margin: 0px;
-  padding: 0px 10px;
+	margin: 0px;
+	padding: 0px 10px;
 }
 nav ul li {
-  list-style: none;
-  margin: 0px;
-  /* padding: 1px 1px 3px 1px; */
-  float: left;
+	list-style: none;
+	margin: 0px;
+	/* padding: 1px 1px 3px 1px; */
+	float: left;
 }
 nav ul li .menu-popup {
-  left: 0px;
-  right: auto;
+	left: 0px;
+	right: auto;
 }
 
 nav #nav-search-box #nav-search-text {
-  /*background-image:  url('icons/lupe.png');
-  background-repeat:no-repeat; */
-  padding-left:0px;
-  /*border-top-left-radius: 15px;
-  border-top-right-radius: 15px;
-  border-bottom-right-radius: 15px;
-  border-bottom-left-radius: 15px;*/
-  position: relative;
-  height: 17px;
-  margin: 4px 0px 4px 4px;
-  width: 150px;
-  max-width: 150px;
-  background-color: #eee;
+	/*background-image:  url('icons/lupe.png');
+	background-repeat:no-repeat; */
+	padding-left:0px;
+	/*border-top-left-radius: 15px;
+	border-top-right-radius: 15px;
+	border-bottom-right-radius: 15px;
+	border-bottom-left-radius: 15px;*/
+	position: relative;
+	height: 17px;
+	margin: 4px 0px 4px 4px;
+	width: 150px;
+	max-width: 150px;
+	background-color: #eee;
 }
 
 nav .nav-menu-icon {
-  position: relative;
-  height: 22px;
-  padding: 5px;
-  margin: 0px 10px;
-  -moz-border-radius: 5px 5px 0 0;
-  -webkit-border-radius: 5px 5px 0 0;
-  border-radius: 5px 5px 0 0;
+	position: relative;
+	height: 22px;
+	padding: 5px;
+	margin: 0px 10px;
+	-moz-border-radius: 5px 5px 0 0;
+	-webkit-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
 }
 nav .nav-menu-icon.selected {
-  background-color: #364e59;
+	background-color: #364e59;
 }
 nav .nav-menu img,
 nav .nav-menu-icon img {
-  width: 22px;
-  height: 22px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
+	width: 22px;
+	height: 22px;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
 }
 nav .nav-menu img {
-  margin-top: -3px;
-  margin-right: 4px;
+	margin-top: -3px;
+	margin-right: 4px;
 }
 
 nav .nav-menu-icon .nav-notify {
-  top: 3px;
+	top: 3px;
 }
 nav .nav-menu-label {
-  margin: 3px 5px 0px;
+	margin: 3px 5px 0px;
 }
 nav .nav-menu {
-  position: relative;
-  height: 16px;
-  padding: 5px;
-  padding-left: 5px;
-  padding-right: 5px;
-  margin: 3px 3px 0px;
-  font-size: 13px;
-  /* border-bottom: 3px solid #364A84; */
-  color: #ccc;
-  font-weight: bold;
+	position: relative;
+	height: 16px;
+	padding: 5px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin: 3px 3px 0px;
+	font-size: 13px;
+	/* border-bottom: 3px solid #364A84; */
+	color: #ccc;
+	font-weight: bold;
 }
 /*nav .nav-menu.selected a {
-  color: white;
+	color: white;
 }*/
 
 nav .nav-menu.selected {
-  border-bottom: 3px solid #9eabb0;
- /*  background-color: #364E59; */
+	border-bottom: 3px solid #9eabb0;
+	/* background-color: #364E59; */
 }
 
 nav .nav-menu:hover {
-    /* color: #fff !important; */
-    color: #fff;
-    /* text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); */
-/*    background: #4c619c; */
-    text-decoration: none;
+	/* color: #fff !important; */
+	color: #fff;
+	/* text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5); */
+	/* background: #4c619c; */
+	text-decoration: none;
 }
 
 .manage-notify {
-   background-color: #F80;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-  font-size: 10px;
-  padding: 1px 3px;
-  top: 0px;
-  min-width: 15px;
-  text-align: center;
-  color: white;
-  float: right;
-  margin-top: -14px;
-  margin-right: -20px;
+	 background-color: #F80;
+	-moz-border-radius: 5px 5px 5px 5px;
+	-webkit-border-radius: 5px 5px 5px 5px;
+	border-radius: 5px 5px 5px 5px;
+	font-size: 10px;
+	padding: 1px 3px;
+	top: 0px;
+	min-width: 15px;
+	text-align: center;
+	color: white;
+	float: right;
+	margin-top: -14px;
+	margin-right: -20px;
 }
 
 nav .nav-notify {
-  display: none;
-  position: absolute;
+	display: none;
+	position: absolute;
  /*  background-color: #36c; */
-   background-color: #F80;
-  /* background-color: #19aeff; */
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-  font-size: 10px;
-  padding: 1px 3px;
-  top: 0px;
-  /* right: -10px; */
-  right: -5px;
-  min-width: 15px;
-  /* text-align: right; */
-  text-align: center;
-  color: white;
+	 background-color: #F80;
+	/* background-color: #19aeff; */
+	-moz-border-radius: 5px 5px 5px 5px;
+	-webkit-border-radius: 5px 5px 5px 5px;
+	border-radius: 5px 5px 5px 5px;
+	font-size: 10px;
+	padding: 1px 3px;
+	top: 0px;
+	/* right: -10px; */
+	right: -5px;
+	min-width: 15px;
+	/* text-align: right; */
+	text-align: center;
+	color: white;
 }
 
 nav .nav-notify.show {
-  display: block;
+	display: block;
 }
 nav #nav-help-link,
 nav #nav-search-link,
@@ -770,11 +769,11 @@ nav #nav-notifications-linkmenu,
 nav #nav-site-linkmenu,
 nav #nav-contacts-linkmenu,
 nav #nav-user-linklabel {
-  float: right;
+	float: right;
 }
 nav #nav-user-linklabel {
-  padding-left: 0px;
-  margin-top: 0px;
+	padding-left: 0px;
+	margin-top: 0px;
 }
 nav #nav-help-link .menu-popup,
 nav #nav-search-link .menu-popup,
@@ -783,12 +782,12 @@ nav #nav-apps-link .menu-popup,
 nav #nav-notifications-linkmenu .menu-popup,
 nav #nav-contacts-linkmenu .menu-popup,
 nav #nav-site-linkmenu .menu-popup {
-  right: 0px;
-  left: auto;
+	right: 0px;
+	left: auto;
 }
 nav #nav-site-linkmenu {
-  margin-left: 0px;
-  margin-right: 0px;
+	margin-left: 0px;
+	margin-right: 0px;
 }
 .contact-entry-photo:hover .contact-photo-menu,
 .contact-photo-wrapper:hover .menu-popup,
@@ -798,38 +797,38 @@ nav #nav-apps-link:hover #nav-apps-menu,
 nav #nav-site-linkmenu:hover #nav-site-menu,
 nav #nav-notifications-linkmenu:hover #nav-notifications-menu,
 #contact-edit-actions:hover #contact-actions-menu {
-  display:block;
-  visibility:visible;
-  opacity:1;
+	display:block;
+	visibility:visible;
+	opacity:1;
 }
 nav #nav-notifications-linkmenu {
-  margin-left: 0px;
-  margin-right: 5px;
+	margin-left: 0px;
+	margin-right: 5px;
 }
 nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
-  color: white;
+	color: white;
 }
 nav #nav-messages-linkmenu.selected,
 nav #nav-user-linklabel.selected,
 nav #nav-apps-link.selected {
-  background-color: #364e59;
-  border-bottom-style: none;
+	background-color: #364e59;
+	border-bottom-style: none;
 }
 
-nav #nav-notifications-linkmenu.on .icon-bell:before{
-  content: "\f0f3";
+nav #nav-notifications-linkmenu.on .icon-bell:before {
+	content: "\f0f3";
 }
 
-/* nav #nav-community-link { */
+/* nav #nav-community-link {*/
 nav ul {
-  margin-left: 210px;
+	margin-left: 210px;
 }
 
 nav #nav-user-linkmenu {
-  float: right;
-  padding-left: 0px;
-  padding-right: 0px;
-  margin-right: 5px;
+	float: right;
+	padding-left: 0px;
+	padding-right: 0px;
+	margin-right: 5px;
 }
 
 #nav-notifications-mark-all {
@@ -847,116 +846,116 @@ nav #nav-user-linkmenu {
 }
 
 #mail-update {
-  top: 56px;
+	top: 56px;
 }
 
-.notify-unseen { background-color: #FFF; }
+.notify-unseen {background-color: #FFF; }
 
 .notify-seen {
-        background: none repeat scroll 0 0 #EEE;
-        }
+	background: none repeat scroll 0 0 #EEE;
+}
 
 ul.menu-popup {
-  visibility:hidden;
-  opacity:0;
-  z-index:1;
-  transition:all 0.2s ease-in-out;
-  /* display: none; */
-  position: absolute;
-  width: 11em;
-  background: #ffffff;
-  color: #2d2d2d;
-  margin: 0px;
-  padding: 0px;
-  list-style: none;
-  border: 3px solid #364e59;
-  z-index: 100000;
-  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+	visibility:hidden;
+	opacity:0;
+	z-index:1;
+	transition:all 0.2s ease-in-out;
+	/* display: none; */
+	position: absolute;
+	width: 13em;
+	background: #ffffff;
+	color: #2d2d2d;
+	margin: 0px;
+	padding: 0px;
+	list-style: none;
+	border: 3px solid #364e59;
+	z-index: 100000;
+	box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
 ul.menu-popup a {
-  display: block;
-  color: #2d2d2d;
-  padding: 5px 10px;
-  text-decoration: none;
+	display: block;
+	color: #2d2d2d;
+	padding: 5px 10px;
+	text-decoration: none;
 }
 ul.menu-popup a:hover {
-  /* background-color: #bdcdd4; */
-  background-color: #e5e5e5;
+	/* background-color: #bdcdd4; */
+	background-color: #e5e5e5;
 }
 ul.menu-popup .menu-sep {
-  border-top: 1px solid #9eabb0;
+	border-top: 1px solid #9eabb0;
 }
 ul.menu-popup li {
-  float: none;
-  overflow: auto;
-  height: auto;
-  display: block;
+	float: none;
+	overflow: auto;
+	height: auto;
+	display: block;
 }
 ul.menu-popup li img {
-  float: left;
-  width: 16px;
-  height: 16px;
-  padding-right: 5px;
+	float: left;
+	width: 16px;
+	height: 16px;
+	padding-right: 5px;
 }
 ul.menu-popup .empty {
-  padding: 5px;
-  text-align: center;
-  color: #9eabb0;
+	padding: 5px;
+	text-align: center;
+	color: #9eabb0;
 }
 /* autocomplete popup */
 
 .acpopup, .acpopup-mce {
-  background-color: #ffffff;
-  border: 1px solid #MenuBorder;
-  overflow: auto;
-  z-index: 100000;
-  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+	background-color: #ffffff;
+	border: 1px solid #MenuBorder;
+	overflow: auto;
+	z-index: 100000;
+	box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
-acpopup-mce {
-  color: #2d2d2d;
-  max-height: 150px;
+.acpopup-mce {
+	color: #2d2d2d;
+	max-height: 150px;
 }
 nav .acpopup {
-  top: 31px !important;
-  margin-left: -23px
+	top: 31px !important;
+	margin-left: -23px
 }
 .acpopupitem {
-  color: #2d2d2d;
-  padding: 4px;
-  clear: left;
+	color: #2d2d2d;
+	padding: 4px;
+	clear: left;
 }
 .acpopupitem img {
-  float: left;
-  margin-right: 4px;
+	float: left;
+	margin-right: 4px;
 }
 .acpopupitem.selected {
-  background-color: #bdcdd4;
+	background-color: #bdcdd4;
 }
 .textcomplete-item {
-  float: none;
+	float: none;
 }
 .textcomplete-item a {
-  color: #737373;
+	color: #737373;
 }
 .textcomplete-item a:hover {
-  color: #000;
-  padding: 3px 20px;
+	color: #000;
+	padding: 3px 20px;
 }
 .textcomplete-item a .forum, .forum .acpopup-sub-text {
-  color: #36C;
-  opacity: 0.8;
+	color: #36C;
+	opacity: 0.8;
 }
 .textcomplete-item a .forum:hover {
-  opacity: 1.0;
+	opacity: 1.0;
 }
 img.acpopup-img {
-  border-radius: 4px;
+	border-radius: 4px;
 }
 
 #nav-notifications-menu {
-  width: 400px;
-  max-height: 550px;
-  overflow: auto;
+	width: 400px;
+	max-height: 550px;
+	overflow: auto;
 }
 /* #nav-notifications-menu a {
 	display: inline;
@@ -964,636 +963,636 @@ img.acpopup-img {
 	margin: 0px 0px 2px 0px;
 }
 #nav-notifications-menu li:hover {
-  background-color: #bdcdd4;
+	background-color: #bdcdd4;
 }*/
 
 #nav-notifications-menu > li {
-  display: block;
-  color: #737373;
-  cursor: pointer;
+	display: block;
+	color: #737373;
+	cursor: pointer;
 }
 
 #nav-notifications-menu > li:hover {
-  background-color: #e5e5e5;
-  color: #000;
+	background-color: #e5e5e5;
+	color: #000;
 }
 #nav-notifications-mark-all a {
-  color: #737373;
+	color: #737373;
 }
 
 #nav-notifications-menu img {
-  width: 32px;
-  height: 32px;
-  border-radius: 5px;
-  margin: 0;
-  padding: 0;
+	width: 32px;
+	height: 32px;
+	border-radius: 5px;
+	margin: 0;
+	padding: 0;
 }
 
 #nav-notifications-menu .notif-desc-wrapper a {
-  display: inline;
-  padding: 0px;
+	display: inline;
+	padding: 0px;
 }
 
 #nav-notifications-menu .contactname {
-  font-weight: bold;
+	font-weight: bold;
 }
 #nav-notifications-menu .notif-when {
-  font-size: 10px;
-  color: #9eabb0;
-  display: block;
+	font-size: 10px;
+	color: #9eabb0;
+	display: block;
 }
 
 .notif-image {
-        width: 32px;
-        height: 32px;
-        padding: 7px 7px 0px 0px;
+	width: 32px;
+	height: 32px;
+	padding: 7px 7px 0px 0px;
 }
 
 .notif-entry-wrapper {
-  padding: 5px 10px;
-  min-height: 32px;
-  /*border-bottom: 1px solid #DDDDDD;*/
+	padding: 5px 10px;
+	min-height: 32px;
+	/*border-bottom: 1px solid #DDDDDD;*/
 }
 
 .notif-photo-wrapper {
-  float: left;
-  margin-right: 10px;
+	float: left;
+	margin-right: 10px;
 }
 
 .notif-photo-wrapper a {
-  padding: 0 !important;
+	padding: 0 !important;
 }
 
 .notif-desc-wrapper {
-  overflow: hidden;
+	overflow: hidden;
 }
 
 right_aside {
-  display: none;
-  vertical-align: top;
-  width: 185px;
-  padding-top: 10px;
-  padding-right: 20px;
-  padding-bottom: 0px;
-  padding-left: 10px;
-  background-color: #FFFFFF;
-  font-size: 13px;
-  overflow-y: auto;
-  z-index: 2;
-  /* line-height: 17px; */
-  color: #737373;
-  box-shadow: 1px 2px 0px 0px #D8D8D8;
-  top: 32px;
-  position: absolute;
-  margin-left: calc(100% - 215px);
+	display: none;
+	vertical-align: top;
+	width: 185px;
+	padding-top: 10px;
+	padding-right: 20px;
+	padding-bottom: 0px;
+	padding-left: 10px;
+	background-color: #FFFFFF;
+	font-size: 13px;
+	overflow-y: auto;
+	z-index: 2;
+	/* line-height: 17px; */
+	color: #737373;
+	box-shadow: 1px 2px 0px 0px #D8D8D8;
+	top: 32px;
+	position: absolute;
+	margin-left: calc(100% - 215px);
 }
 
 /* aside */
 aside {
-  /* display: table-cell; */
-  vertical-align: top;
-  width: 185px;
-  /* padding: 32px 10px 10px 20px; */
-  padding: 10px 10px 0px 20px;
-  /* border-right: 1px solid #D2D2D2; */
-  /* background-color: #ECECF2; */
-  /* background-color: #F2F2F2; */
-  background-color: #FFFFFF;
-  font-size: 13px;
-  /* background: #F1F1F1; */
-  /* top: 0px; */
-  top: 32px;
-  overflow-y: auto;
-  z-index: 2;
-  /* line-height: 17px; */
-  position: fixed;
-  /* overflow: auto; */
-  height: 100%;
-  height: calc(100% - 42px);
-  /* overflow: scroll; */
-  box-shadow: 1px 2px 0px 0px #D8D8D8;
-  color: #737373;
+	/* display: table-cell; */
+	vertical-align: top;
+	width: 185px;
+	/* padding: 32px 10px 10px 20px; */
+	padding: 10px 10px 0px 20px;
+	/* border-right: 1px solid #D2D2D2; */
+	/* background-color: #ECECF2; */
+	/* background-color: #F2F2F2; */
+	background-color: #FFFFFF;
+	font-size: 13px;
+	/* background: #F1F1F1; */
+	/* top: 0px; */
+	top: 32px;
+	overflow-y: auto;
+	z-index: 2;
+	/* line-height: 17px; */
+	position: fixed;
+	/* overflow: auto; */
+	height: 100%;
+	height: calc(100% - 42px);
+	/* overflow: scroll; */
+	box-shadow: 1px 2px 0px 0px #D8D8D8;
+	color: #737373;
 }
 aside .vcard .tool {
-  clear: both;
+	clear: both;
 }
 aside .vcard .fn {
-  font-size: 18px;
-  font-weight: bold;
-  margin-bottom: 5px;
-  float: left;
+	font-size: 18px;
+	font-weight: bold;
+	margin-bottom: 5px;
+	float: left;
 }
 aside .vcard .title {
-  margin-bottom: 5px;
+	margin-bottom: 5px;
 }
 aside .vcard dl {
-  height: auto;
-  overflow: auto;
-  word-break: break-word;
+	height: auto;
+	overflow: auto;
+	word-break: break-word;
 }
 aside .vcard .account-type {
-  margin-bottom: 13px;
-  font-size: 14px;
-  font-weight: bold;
+	margin-bottom: 13px;
+	font-size: 14px;
+	font-weight: bold;
 }
 
 aside select {
-  background-color: white;
-  width: 165px;
-  border-color: #ccc;
+	background-color: white;
+	width: 165px;
+	border-color: #ccc;
 }
 
 aside .vcard dt {
-  float: left;
-  margin-left: 0px;
-  /* width: 35%; */
-  text-align: right;
-  color: #999999;
+	float: left;
+	margin-left: 0px;
+	/* width: 35%; */
+	text-align: right;
+	color: #999999;
 }
 aside .vcard dd {
-  float: left;
-  margin-left: 4px;
-  /* width: 60%; */
+	float: left;
+	margin-left: 4px;
+	/* width: 60%; */
 }
 aside #profile-photo-wrapper img {
-  width: 175px;
+	width: 175px;
 }
 aside #profile-extra-links ul {
-  padding: 0px;
-  margin: 0px;
+	padding: 0px;
+	margin: 0px;
 }
 aside #profile-extra-links li {
-  padding: 0px;
-  padding-bottom: 4px;
-  margin: 0px;
-  list-style: none;
+	padding: 0px;
+	padding-bottom: 4px;
+	margin: 0px;
+	list-style: none;
 }
 aside #subscribe-feed-link,
 aside #dfrn-request-link,
 aside #wallmessage-link {
-  display: block;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-  color: #ffffff;
-  background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
-  font-weight: bold;
-  text-transform: uppercase;
-  padding: 4px 2px 2px 35px;
+	display: block;
+	-moz-border-radius: 5px 5px 5px 5px;
+	-webkit-border-radius: 5px 5px 5px 5px;
+	border-radius: 5px 5px 5px 5px;
+	color: #ffffff;
+	background: #005c94 url('../../../images/connect-bg.png') no-repeat left center;
+	font-weight: bold;
+	text-transform: uppercase;
+	padding: 4px 2px 2px 35px;
 }
 aside #subscribe-feed-link:hover,
 aside #dfrn-request-link:hover,
 aside #wallmessage-link:hover {
-  text-decoration: none;
-  background-color: #36c;
-  /* background-color: #19aeff; */
+	text-decoration: none;
+	background-color: #36c;
+	/* background-color: #19aeff; */
 }
 aside #profiles-menu {
-  width: 14em;
-  left: 10px;
+	width: 14em;
+	left: 10px;
 }
 
-aside #search-text, aside #side-follow-url, aside #side-peoplefind-url, right_aside #side-peoplefind-url { 
-  width: 65%;
-  float: left;
-  padding-left: 10px;
-  /*border-top-left-radius: 15px;
-  border-top-right-radius: 15px;
-  border-bottom-right-radius: 15px;
-  border-bottom-left-radius: 15px;
-  -moz-border-bottom-colors: #dbdbdb;
-  -moz-border-top-colors: #999;
-  -moz-border-left-colors: #999;
-  -moz-border-right-colors: #dbdbdb;*/
+aside #search-text, aside #side-follow-url, aside #side-peoplefind-url, right_aside #side-peoplefind-url {
+	width: 65%;
+	float: left;
+	padding-left: 10px;
+	/*border-top-left-radius: 15px;
+	border-top-right-radius: 15px;
+	border-bottom-right-radius: 15px;
+	border-bottom-left-radius: 15px;
+	-moz-border-bottom-colors: #dbdbdb;
+	-moz-border-top-colors: #999;
+	-moz-border-left-colors: #999;
+	-moz-border-right-colors: #dbdbdb;*/
 }
 
 aside #side-peoplefind-submit, right_aside #side-peoplefind-submit {
-  float: left;
+	float: left;
 }
 
 #side-match-link {
-  clear: both;
+	clear: both;
 }
 
 aside h4, right_aside h4 {
-  margin-bottom: 0px;
-  margin-top: 0px;
-  font-size: 1.17em;
+	margin-bottom: 0px;
+	margin-top: 0px;
+	font-size: 1.17em;
 }
 
 aside img {
-  max-width: 175px;
+	max-width: 175px;
 }
 
 .nets-ul {
-  margin-top: 0px;
+	margin-top: 0px;
 }
 
 #contact-block {
-  overflow: auto;
-  height: auto;
+	overflow: auto;
+	height: auto;
 }
 #contact-block .contact-block-h4 {
-  float: left;
-  margin: 5px 0px;
+	float: left;
+	margin: 5px 0px;
 }
 #contact-block .allcontact-link {
-  float: right;
-  margin: 5px 0px;
+	float: right;
+	margin: 5px 0px;
 }
 #contact-block .contact-block-content {
-  clear: both;
-  overflow: auto;
-  height: auto;
+	clear: both;
+	overflow: auto;
+	height: auto;
 }
 #contact-block .contact-block-link {
-  float: left;
-  margin: 0px 2px 2px 0px;
+	float: left;
+	margin: 0px 2px 2px 0px;
 }
 #contact-block .contact-block-link img {
-  width: 48px;
-  height: 48px;
+	width: 48px;
+	height: 48px;
 }
 .group_selected {
-  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
-  float: left;
-  height: 22px;
-  width: 22px;
+	background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
+	float: left;
+	height: 22px;
+	width: 22px;
 }
 .group_unselected {
-  background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
-  float: left;
-  height: 22px;
-  width: 22px;
+	background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center;
+	float: left;
+	height: 22px;
+	width: 22px;
 }
 /* widget */
 .widget {
-  margin-bottom: 1em;
-  /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
-	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-/*  font-size: 12px; */
+	margin-bottom: 1em;
+	/*.action .s10 {width: 10px; overflow: hidden; padding: 0px;}
+	.action .s16 {width: 16px; overflow: hidden; padding: 0px;}*/
+	/* font-size: 12px; */
 }
 .widget h3 {
-  padding: 0px;
-  margin: 2px;
+	padding: 0px;
+	margin: 2px;
 }
 .widget .action {
-  opacity: 0.1;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	opacity: 0.1;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 .widget input.action {
-  opacity: 0.5;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	opacity: 0.5;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 .widget:hover .title .action {
-  opacity: 1;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	opacity: 1;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 .widget .tool:hover .action {
-  opacity: 1;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	opacity: 1;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 .widget .tool:hover .action.ticked {
-  opacity: 1;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	opacity: 1;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 .widget ul {
-  padding: 0px;
-  margin-top: 0px;
-  margin-bottom: 0px;
+	padding: 0px;
+	margin-top: 0px;
+	margin-bottom: 0px;
 }
 .widget ul li {
-  padding-left: 10px;
-  /* min-height: 20px; */
-  list-style: none;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  margin: 0px;
+	padding-left: 10px;
+	/* min-height: 20px; */
+	list-style: none;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	margin: 0px;
 }
 .widget .tool.selected {
-  background: url('../../../images/selected.png') no-repeat left center;
+	background: url('../../../images/selected.png') no-repeat left center;
 }
 /* widget: search */
 #add-search-popup {
-  width: 200px;
-  top: 18px;
+	width: 200px;
+	top: 18px;
 }
 /* section */
 section {
-  /*font-size: 13px;
-  line-height: 19.5px;*/
-  font-size: 14.95px;
-  line-height: 21px;
-  display: table-cell;
-  vertical-align: top;
-  top: 32px;
-  width: 766px;
-  max-width: 766px;
-  padding: 10px 10px 10px 10px;
-  /* background-color: white; */
-  /* background-color: rgb(252, 252, 252); */
-  /* background-color: #FAFAFA; */
-  background-color: inherit;
-  /* border-bottom: 1px solid lightgray;
-  border-right: 1px solid lightgray;
-  border-left: 1px solid lightgray; */
-  position: absolute;
-  left: 215px;
-  left: calc(215px + (100% - (215px + 766px)) / 6);
-  /* left: calc(215px + (100% - 215px) / 10); */
+	/* font-size: 13px;
+	line-height: 19.5px; */
+	font-size: 14.95px;
+	line-height: 21px;
+	display: table-cell;
+	vertical-align: top;
+	top: 32px;
+	width: 766px;
+	max-width: 766px;
+	padding: 10px 10px 10px 10px;
+	/* background-color: white; */
+	/* background-color: rgb(252, 252, 252); */
+	/* background-color: #FAFAFA; */
+	background-color: inherit;
+	/* border-bottom: 1px solid lightgray;
+	border-right: 1px solid lightgray;
+	border-left: 1px solid lightgray; */
+	position: absolute;
+	left: 215px;
+	left: calc(215px + (100% - (215px + 766px)) / 6);
+	/* left: calc(215px + (100% - 215px) / 10); */
 }
 
 section.minimal {
-  top: 0px;
-  left: 0px;
-  position: absolute;
-  width: 100%;
-  height: 100%;
+	top: 0px;
+	left: 0px;
+	position: absolute;
+	width: 100%;
+	height: 100%;
 }
 
 /* Contact-Header for the Network Stream */
 #viewcontact_wrapper-network {
-  width: 100%;
-  min-height: 100px;
-  background-color: #FAFAFA;
-  box-shadow: 1px 2px 0px 0px #D8D8D8;
-  border-bottom: 1px solid #D2D2D2;
+	width: 100%;
+	min-height: 100px;
+	background-color: #FAFAFA;
+	box-shadow: 1px 2px 0px 0px #D8D8D8;
+	border-bottom: 1px solid #D2D2D2;
 }
 #contact-entry-wrapper-network {
-  float: none;
-  width: auto;
-  height: auto;
-  padding: 10px;
-  margin: 0;
+	float: none;
+	width: auto;
+	height: auto;
+	padding: 10px;
+	margin: 0;
 }
 #contact-entry-accounttype-network {
-  font-size: 20px;
+	font-size: 20px;
 }
 #contact-entry-name-network {
-  font-size: 24.5px;
+	font-size: 24.5px;
 }
 .contact-entry-photo img {
-  border-radius: 4px;
+	border-radius: 4px;
 }
 
 /* wall item */
 .tread-wrapper {
-/*    border-bottom: 1px solid #BDCDD4; */
-  border-bottom: 1px solid #D2D2D2;
-  position: relative;
-  padding: 5px;
-  margin-bottom: 10px;
-  box-shadow: 1px 2px 0px 0px #D8D8D8;
-  background-color: #FFFFFF;
- /* width: 755px; */
+	/* border-bottom: 1px solid #BDCDD4; */
+	border-bottom: 1px solid #D2D2D2;
+	position: relative;
+	padding: 5px;
+	margin-bottom: 10px;
+	box-shadow: 1px 2px 0px 0px #D8D8D8;
+	background-color: #FFFFFF;
+	/* width: 755px; */
 }
 .wall-item-decor {
-  position: absolute;
-  left: 755px;
-  left: calc(100% - 16px);
-/*  top: -10px; */
-  width: 16px;
+	position: absolute;
+	left: 755px;
+	left: calc(100% - 16px);
+	/* top: -10px; */
+	width: 16px;
 }
 .unstarred {
-  display: none;
+	display: none;
 }
 .wall-item-container {
-  display: table;
-  width: 745px;
-  width: calc(100% - 10px);
+	display: table;
+	width: 745px;
+	width: calc(100% - 10px);
 }
 
 .wall-item-content hr {
-  background: none repeat scroll 0% 0% rgb(221, 221, 221);
-  color: rgb(221, 221, 221);
-  clear: both;
-  float: none;
-  width: 100%;
-  height: 0.1em;
-  /* margin: 0px 0px 1.45em; */
-  border: medium none;
+	background: none repeat scroll 0% 0% rgb(221, 221, 221);
+	color: rgb(221, 221, 221);
+	clear: both;
+	float: none;
+	width: 100%;
+	height: 0.1em;
+	/* margin: 0px 0px 1.45em; */
+	border: medium none;
 }
 
 .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
-  display: table-row;
+	display: table-row;
 }
 .wall-item-bottom {
-  /* font-size: 14px; */
+	/* font-size: 14px; */
 }
 .wall-item-container .wall-item-tags,
 .wall-item-container .wall-item-links,
 .wall-item-container .wall-item-actions {
-  opacity: 0.2;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	opacity: 0.2;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 .wall-item-container:hover .wall-item-tags,
 .wall-item-container:hover .wall-item-links,
 .wall-item-container:hover .wall-item-actions {
-  opacity: 1;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	opacity: 1;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 .wall-item-container .wall-item-info {
-  display: table-cell;
-  vertical-align: top;
-  text-align: left;
-  width: 80px;
+	display: table-cell;
+	vertical-align: top;
+	text-align: left;
+	width: 80px;
 }
 .wall-item-container {
-  /* padding-right: 30px; */
-  padding-right: 0px;
+	/* padding-right: 30px; */
+	padding-right: 0px;
 }
 .wall-item-container .wall-item-ago {
-  word-wrap: break-word;
-  width: 50px;
-  margin-left: 10px;
-  color: #999;
-  font-size: 12px;
+	word-wrap: break-word;
+	width: 50px;
+	margin-left: 10px;
+	color: #999;
+	font-size: 12px;
 }
 
 .shared-time {
-  color: #999;
-  font-size: 12px;
+	color: #999;
+	font-size: 12px;
 }
 
 .shared_header {
-  line-height: 14px;
+	line-height: 14px;
 }
 
 .wall-item-network {
-  color: #999;
-  font-size: 12px;
-  text-align: right;
-  float: right;
+	color: #999;
+	font-size: 12px;
+	text-align: right;
+	float: right;
 }
 
 .wall-item-network-end {
-  clear: both;
+	clear: both;
 }
 
 .wall-item-location {
-  width: 350px;
-  float: left;
-  font-size: 12px;
+	width: 350px;
+	float: left;
+	font-size: 12px;
 }
 
 .wall-item-container .wall-item-content {
-  /* font-size: 14px; */
-  max-width: 660px;
-  word-wrap: break-word;
-  word-break: break-word;
-  /* line-height: 1.36; */
-  padding-bottom: 6px;
+	/* font-size: 14px; */
+	max-width: 660px;
+	word-wrap: break-word;
+	word-break: break-word;
+	/* line-height: 1.36; */
+	padding-bottom: 6px;
 }
 
 .wall-item-container .wall-item-content img {
-  max-width: 100%;
-  vertical-align: middle;
-  /* max-width: 650px; */
-  /* max-width: 580px; */
+	max-width: 100%;
+	vertical-align: middle;
+	/* max-width: 650px; */
+	/* max-width: 580px; */
 }
 .children .wall-item-container .wall-item-item .wall-item-content img {
-  /* max-width: 650px; */
-  max-width: 520px;
-  /* max-width: 100%; */
+	/* max-width: 650px; */
+	max-width: 520px;
+	/* max-width: 100%; */
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
-  display: table-cell;
-  vertical-align: middle;
-  /* font-size: 17px; */
+	display: table-cell;
+	vertical-align: middle;
+	/* font-size: 17px; */
 }
 .mail-list-wrapper a,
 .wall-item-container .wall-item-bottom a,
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions a,
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-links a,
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions .fakelink {
-  color: #999;
+	color: #999;
 }
 .mail-list-wrapper a:hover,
 .wall-item-container .wall-item-bottom a:hover,
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions a:hover,
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-links a:hover,
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions .fakelink:hover {
-  color: #000;
-  text-decoration: none;
+	color: #000;
+	text-decoration: none;
 }
 .wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon {
-  opacity: 0.5;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	opacity: 0.5;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 .wall-item-container .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover {
-  opacity: 1;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	opacity: 1;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 
 .wall-item-container .wall-item-name:hover {
-  color: #36c;
+	color: #36c;
 }
 
 .wall-item-container .wall-item-name,
 .wall-item-container .shared-author {
-  color: black;
-  font-weight: bold;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	color: black;
+	font-weight: bold;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 
 .toplevel_item:hover .wall-item-name,
 .wall-item-container:hover .wall-item-name,
 .toplevel_item:hover .shared-author,
 .wall-item-container:hover .shared-author {
-  color: #36c;
-  font-weight: bold;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	color: #36c;
+	font-weight: bold;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 
 .wall-item-container .wall-item-content a,
 .toplevel_item .fakelink,
 .wall-item-container .fakelink {
-  color: black;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
-  /* color: darkblue; */
-  /* color: #3E3E8C; */
-  word-break: break-word;
+	color: black;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
+	/* color: darkblue; */
+	/* color: #3E3E8C; */
+	word-break: break-word;
 }
 
 .toplevel_item:hover .fakelink,
 .wall-item-container:hover .fakelink,
 .toplevel_item:hover .wall-item-content a,
 .wall-item-container:hover .wall-item-content a {
-  color: #36c;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	color: #36c;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 
 .toplevel_item:hover .togglecomment,
 .wall-item-container:hover .togglecomment {
-  color: #999;
+	color: #999;
 }
 
 .wall-item-container .wall-item-actions-author {
-  width: 100%;
-  margin-bottom: 0.3em;
+	width: 100%;
+	margin-bottom: 0.3em;
 }
 .wall-item-container .wall-item-actions-social,
 .wall-item-container .wall-item-actions-isevent {
-  float: left;
-  margin-bottom: 1px;
+	float: left;
+	margin-bottom: 1px;
 }
 .wall-item-container .wall-item-actions-social a,
 .wall-item-container .wall-item-actions-isevent a {
-  float: left;
-  margin-right: 1em;
-  cursor: pointer;
+	float: left;
+	margin-right: 1em;
+	cursor: pointer;
 }
 .wall-item-container .wall-item-actions-social a.active,
 .wall-item-container .wall-item-actions-isevent a.active {
@@ -1601,49 +1600,49 @@ section.minimal {
 }
 
 .wall-item-container .wall-item-actions-tools {
-  float: right;
-  width: 80px;
+	float: right;
+	width: 80px;
 }
 .wall-item-container .wall-item-actions-tools a {
-  float: right;
-  margin-left: 10px;
-  cursor: pointer;
+	float: right;
+	margin-left: 10px;
+	cursor: pointer;
 }
 .wall-item-container .wall-item-actions-tools input {
-  float: right;
-  margin-left: 10px;
+	float: right;
+	margin-left: 10px;
 }
 .wall-item-container.comment {
-  margin-top: 5px;
-  margin-bottom: 5px;
-  margin-left: 80px;
-  width: 665px;
-  width: calc(100% - 90px);
-  border-bottom: 1px solid hsl(198, 21%, 79%);
+	margin-top: 5px;
+	margin-bottom: 5px;
+	margin-left: 80px;
+	width: 665px;
+	width: calc(100% - 90px);
+	border-bottom: 1px solid hsl(198, 21%, 79%);
 }
 .wall-item-container.thread_level_2 {
-  margin-left: 80px;
-  width: calc(100% - 90px);
+	margin-left: 80px;
+	width: calc(100% - 90px);
 }
 .wall-item-container.thread_level_3 {
-  margin-left: 95px;
-  width: calc(100% - 105px);
+	margin-left: 95px;
+	width: calc(100% - 105px);
 }
 .wall-item-container.thread_level_4 {
-  margin-left: 110px;
-  width: calc(100% - 120px);
+	margin-left: 110px;
+	width: calc(100% - 120px);
 }
 .wall-item-container.thread_level_5 {
-  margin-left: 125px;
-  width: calc(100% - 135px);
+	margin-left: 125px;
+	width: calc(100% - 135px);
 }
 .wall-item-container.thread_level_6 {
-  margin-left: 140px;
-  width: calc(100% - 150px);
+	margin-left: 140px;
+	width: calc(100% - 150px);
 }
 .wall-item-container.thread_level_7 {
-  margin-left: 155px;
-  width: calc(100% - 165px);
+	margin-left: 155px;
+	width: calc(100% - 165px);
 }
 
 .wall-item-container.comment .wall-item-content,
@@ -1652,7 +1651,7 @@ section.minimal {
 .wall-item-container.thread_level_5 .wall-item-content,
 .wall-item-container.thread_level_6 .wall-item-content,
 .wall-item-container.thread_level_7 .wall-item-content {
-  max-width: calc(100% - 1px);
+	max-width: calc(100% - 1px);
 }
 
 .children .wall-item-comment-wrapper textarea,
@@ -1661,7 +1660,7 @@ section.minimal {
 .wall-item-container.thread_level_5 .wall-item-comment-wrapper textarea,
 .wall-item-container.thread_level_6 .wall-item-comment-wrapper textarea,
 .wall-item-container.thread_level_7 .wall-item-comment-wrapper textarea {
-  width: calc(100% - 11px);
+	width: calc(100% - 11px);
 }
 
 .children .wall-item-bottom .comment-edit-preview,
@@ -1670,751 +1669,755 @@ section.minimal {
 .wall-item-container.thread_level_5 .wall-item-bottom .comment-edit-preview,
 .wall-item-container.thread_level_6 .wall-item-bottom .comment-edit-preview,
 .wall-item-container.thread_level_7 .wall-item-bottom .comment-edit-preview {
-  width: calc(100% - 6px);
+	width: calc(100% - 6px);
 }
 
 
 .wall-item-container.comment .contact-photo {
-  width: 32px;
-  height: 32px;
-  margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+	width: 32px;
+	height: 32px;
+	margin-left: 16px;
+	/* background: url(../../../images/icons/22/user.png) no-repeat center center; */
 
 }
 .wall-item-container.comment {
-  top: 15px !important;
-  left: 15px !important;
+	top: 15px !important;
+	left: 15px !important;
 }
 .wall-item-container.comment .wall-item-links {
-  padding-left: 12px;
+	padding-left: 12px;
 }
 .wall-item-bottom .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 0px;
+	margin: 1px 5px 1px 0px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 15px 1px 80px;
+	margin: 1px 15px 1px 80px;
 }
 .wall-item-comment-wrapper.photo {
-  margin: 1px 15px 1px 0px;
+	margin: 1px 15px 1px 0px;
 }
 .wall-item-comment-wrapper.photo .wall-item-container.comment {
-  margin-left: 0px;
-  width: 665px;
-  width: 100%;
-  border-bottom: 1px solid hsl(198, 21%, 79%);
+	margin-left: 0px;
+	width: 665px;
+	width: 100%;
+	border-bottom: 1px solid hsl(198, 21%, 79%);
 }
 
 
 .wall-item-comment-wrapper .comment-edit-photo {
-  display: none;
+	display: none;
 }
 .wall-item-comment-wrapper textarea {
-  height: 1.2em;
-  width: 100%;
-  font-size: 13px;
-  color: #999999;
-  border: 1px solid #DDD;
-  padding: 0.3em;
+	height: 1.2em;
+	width: 100%;
+	font-size: 13px;
+	color: #999999;
+	border: 1px solid #DDD;
+	padding: 0.3em;
 }
 .wall-item-comment-wrapper .comment-edit-text-full {
-  /* font-size: 14px; */
-  height: 4em;
-  color: #2d2d2d;
-  border: 1px solid #2d2d2d;
+	/* font-size: 14px; */
+	height: 4em;
+	color: #2d2d2d;
+	border: 1px solid #2d2d2d;
 }
 
 .fakelink.togglecomment {
-  float: left;
-  margin-right: 1em;
+	float: left;
+	margin-right: 1em;
 }
 
 .comment-edit-preview .contact-photo {
-  width: 32px;
-  height: 32px;
-  margin-left: 16px;
-  /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
+	width: 32px;
+	height: 32px;
+	margin-left: 16px;
+	/* background: url(../../../images/icons/22/user.png) no-repeat center center; */
 
 }
 .comment-edit-preview {
-  /* width: 660px; */
-  width: 100%;
-  border: 1px solid #2d2d2d;
-  margin-top: 10px;
-  top: 15px !important;
-  left: 15px !important;
+	/* width: 660px; */
+	width: 100%;
+	border: 1px solid #2d2d2d;
+	margin-top: 10px;
+	top: 15px !important;
+	left: 15px !important;
 }
 .comment-edit-preview .wall-item-links {
-  padding-left: 12px;
+	padding-left: 12px;
 }
 .comment-edit-preview .wall-item-container {
-  /* width: 700px; */
-  width: 100%;
+	/* width: 700px; */
+	width: 100%;
 }
 .comment-edit-preview .tread-wrapper {
-  /* width: 700px; */
-  width: 100%;
-  padding: 0;
-  margin: 10px 0px 0px 0px;
-  border-bottom: 0px;
-  box-shadow: none;
+	/* width: 700px; */
+	width: 100%;
+	padding: 0;
+	margin: 10px 0px 0px 0px;
+	border-bottom: 0px;
+	box-shadow: none;
 }
 
 .wall-item-bottom .comment-edit-preview {
-  width: 575px;
-  margin-bottom: 5px;
+	width: 575px;
+	margin-bottom: 5px;
 }
 
 .shiny {
-  /* border-right: 10px solid #fce94f; */
-/*	border-right: 1px solid #A7C7F7;
+	/* border-right: 10px solid #fce94f; */
+	/* border-right: 1px solid #A7C7F7;
 	padding-right: 12px; */
 }
 
 #profile-jot-form {
-  box-shadow: 1px 2px 0px 0px #D8D8D8;
-  background-color: #fafafa;
-  padding: 10px;
+	box-shadow: 1px 2px 0px 0px #D8D8D8;
+	background-color: #fafafa;
+	padding: 10px;
 }
 
 #profile-jot-form #profile-jot-text {
-  height: 2.0em;
-  /* width: 99%; */
-  width: 752px;
-  width: calc(100% - 10px);
-  font-size: 15px;
-  color: #999999;
-  border: 1px solid #DDD;
-  padding: 0.3em;
-  margin-bottom: 10px;
+	height: 2.0em;
+	/* width: 99%; */
+	width: 752px;
+	width: calc(100% - 10px);
+	font-size: 15px;
+	color: #999999;
+	border: 1px solid #DDD;
+	padding: 0.3em;
+	margin-bottom: 10px;
 }
 
 #profile-jot-form #jot-title, #profile-jot-form #jot-category {
-
-         border-radius: 5px 5px 5px 5px;
-    font-weight: bold;
-    height: 20px;
-    margin: 0 0 5px;
-    /* width: 60%; */
-    /* width: 762px; */
-    width: 100%;
-    border: 1px solid #d2d2d2;
+	border-radius: 5px 5px 5px 5px;
+	font-weight: bold;
+	height: 20px;
+	margin: 0 0 5px;
+	/* width: 60%; */
+	/* width: 762px; */
+	width: 100%;
+	border: 1px solid #d2d2d2;
 }
 
 #profile-jot-form #jot-title:-webkit-input-placeholder {
-  font-weight: normal;
+	font-weight: normal;
 }
 #profile-jot-form #jot-title:-moz-placeholder {
-  font-weight: normal;
+	font-weight: normal;
 }
-#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl{
+#profile-jot-form #profile-jot-text_parent #profile-jot-text_tbl {
 /*  width: 785px; */
-  width: 100%;
-  height: 100px;
+	width: 100%;
+	height: 100px;
 }
 
 #profile-jot-perms {
-  float: right;
+	float: right;
 }
 
 #jot-preview-content {
-  padding-top: 4px;
-  clear: both;
+	padding-top: 4px;
+	clear: both;
 }
 
 #jot-preview-content .tread-wrapper {
-  background-color: #fce94f;
+	background-color: #fce94f;
 }
 
 .wall-item-tags {
-  padding-top: 1px;
-  padding-bottom: 2px;
-  font-size: 12px;
-  /*display: none;*/
+	padding-top: 1px;
+	padding-bottom: 2px;
+	font-size: 12px;
+	/* display: none; */
 }
 
 .tag {
-  color: rgb(153,153,153);
-  /*padding-left: 3px;
-  font-size: 10px;*/
+	color: rgb(153,153,153);
+	/* padding-left: 3px;
+	font-size: 10px; */
 }
 .tag a {
-  /*padding-right: 8px;*/
-  color: rgb(153,153,153);
+	/* padding-right: 8px; */
+	color: rgb(153,153,153);
 }
 .wwto {
-  position: absolute !important;
-  width: 25px;
-  height: 25px;
-  background: #FFFFFF;
-  border: 2px solid #364e59;
-  height: 25px;
-  width: 25px;
-  overflow: hidden;
-  padding: 1px;
-  position: absolute !important;
-  top: 40px;
-  left: 30px;
-  box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
+	position: absolute !important;
+	width: 25px;
+	height: 25px;
+	background: #FFFFFF;
+	border: 2px solid #364e59;
+	height: 25px;
+	width: 25px;
+	overflow: hidden;
+	padding: 1px;
+	position: absolute !important;
+	top: 40px;
+	left: 30px;
+	box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7);
 }
 .wwto .contact-photo {
-  width: auto;
-  height: 25px;
+	width: auto;
+	height: 25px;
 }
 /* contacts menu */
 .contact-photo-wrapper {
-  position: relative;
-  width: 80px;
+	position: relative;
+	width: 80px;
 }
 
 .contact-photo-wrapper.wwto {
-  width: 25px;
+	width: 25px;
 }
 
 .contact-photo {
-  width: 48px;
-  height: 48px;
-  overflow: hidden;
-  display: block;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
+	width: 48px;
+	height: 48px;
+	overflow: hidden;
+	display: block;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
 }
 
 .contact-photo img {
-  width: 48px;
-  height: 48px;
+	width: 48px;
+	height: 48px;
 }
 
 .contact-wrapper {
-  float: left;
-  width: 90px;
-  height: 90px;
-  margin-bottom: 15px;
+	float: left;
+	width: 90px;
+	height: 90px;
+	margin-bottom: 15px;
 }
 .contact-wrapper .contact-photo {
-  width: 80px;
-  height: 80px;
+	width: 80px;
+	height: 80px;
 }
 .contact-wrapper .contact-photo img {
-  width: 80px;
-  height: 80px;
+	width: 80px;
+	height: 80px;
 }
 .contact-wrapper {
-  left: 0px;
-  top: 63px;
+	left: 0px;
+	top: 63px;
 }
 .contact-photo {
-  width: 48px;
-  height: 48px;
+	width: 48px;
+	height: 48px;
 }
 .contact-photo img {
-  width: 48px;
-  height: 48px;
+	width: 48px;
+	height: 48px;
 }
 .contact-name {
-  /* text-align: center; */
-  /*font-weight: bold;*/
-  font-size: 12px;
+	/* text-align: center; */
+	/*font-weight: bold;*/
+	font-size: 12px;
 }
 .contact-details {
-  color: #999999;
+	color: #999999;
 }
 /* editor */
 .jothidden {
-  display: none;
+	display: none;
 }
 #jot {
-  width: 785px;
-  margin: 0px 2em 20px 0px;
+	width: 785px;
+	margin: 0px 2em 20px 0px;
 }
 #jot .profile-jot-text {
-  height: 1.2em;
-  width: 99%;
-  font-size: 10px;
-  color: #999999;
-  border: 1px solid #DDD;
-  padding: 0.3em;
+	height: 1.2em;
+	width: 99%;
+	font-size: 10px;
+	color: #999999;
+	border: 1px solid #DDD;
+	padding: 0.3em;
 }
 #jot #jot-tools {
-  margin: 0px;
-  padding: 0px;
-  height: 40px;
-  overflow: none;
-  width: 783px;
-  background-color: #0e232e;
-  border-bottom: 2px solid #9eabb0;
+	margin: 0px;
+	padding: 0px;
+	height: 40px;
+	overflow: none;
+	width: 783px;
+	background-color: #0e232e;
+	border-bottom: 2px solid #9eabb0;
 }
 #jot #jot-tools li {
-  list-style: none;
-  float: left;
-  width: 80px;
-  height: 40px;
-  border-bottom: 2px solid #9eabb0;
+	list-style: none;
+	float: left;
+	width: 80px;
+	height: 40px;
+	border-bottom: 2px solid #9eabb0;
 }
 #jot #jot-tools li a {
-  display: block;
-  color: #cccccc;
-  width: 100%;
-  height: 40px;
-  text-align: center;
-  line-height: 40px;
-  overflow: hidden;
+	display: block;
+	color: #cccccc;
+	width: 100%;
+	height: 40px;
+	text-align: center;
+	line-height: 40px;
+	overflow: hidden;
 }
 #jot #jot-tools li:hover {
-  background-color: #364e59;
-  border-bottom: 2px solid #bdcdd4;
+	background-color: #364e59;
+	border-bottom: 2px solid #bdcdd4;
 }
 #jot #jot-tools li.perms {
-  float: right;
-  width: 40px;
+	float: right;
+	width: 40px;
 }
 #jot #jot-tools li.perms a.unlock {
-  width: 30px;
-  border-left: 10px solid #cccccc;
-  background-color: #cccccc;
-  background-position: left center;
+	width: 30px;
+	border-left: 10px solid #cccccc;
+	background-color: #cccccc;
+	background-position: left center;
 }
 #jot #jot-tools li.perms a.lock {
-  width: 30px;
-  border-left: 10px solid #666666;
-  background-color: #666666;
+	width: 30px;
+	border-left: 10px solid #666666;
+	background-color: #666666;
 }
 #jot #jot-tools li.submit {
-  float: right;
-  background-color: #cccccc;
-  border-bottom: 2px solid #cccccc;
-  border-right: 1px solid #666666;
-  border-left: 1px solid #666666;
+	float: right;
+	background-color: #cccccc;
+	border-bottom: 2px solid #cccccc;
+	border-right: 1px solid #666666;
+	border-left: 1px solid #666666;
 }
 #jot #jot-tools li.submit input {
-  border: 0px;
-  margin: 0px;
-  padding: 0px;
-  background-color: #cccccc;
-  color: #666666;
-  width: 80px;
-  height: 40px;
-  line-height: 40px;
+	border: 0px;
+	margin: 0px;
+	padding: 0px;
+	background-color: #cccccc;
+	color: #666666;
+	width: 80px;
+	height: 40px;
+	line-height: 40px;
 }
 #jot #jot-tools li.submit input:hover {
-  background-color: #bdcdd4;
-  color: #666666;
+	background-color: #bdcdd4;
+	color: #666666;
 }
 #jot #jot-tools li.loading {
-  float: right;
-  background-color: #ffffff;
-  width: 20px;
-  vertical-align: center;
-  text-align: center;
-  border-top: 2px solid #9eabb0;
-  height: 38px;
+	float: right;
+	background-color: #ffffff;
+	width: 20px;
+	vertical-align: center;
+	text-align: center;
+	border-top: 2px solid #9eabb0;
+	height: 38px;
 }
 #jot #jot-tools li.loading img {
-  margin-top: 10px;
+	margin-top: 10px;
 }
 /* #jot */
 #jot-title {
-  border: 0px;
-  margin: 0px;
-  height: 20px;
-  width: 700px;
-  font-weight: bold;
-  border: 1px solid #ffffff;
+	border: 0px;
+	margin: 0px;
+	height: 20px;
+	width: 700px;
+	font-weight: bold;
+	border: 1px solid #ffffff;
 }
 #jot #jot-title:-webkit-input-placeholder {
-  font-weight: normal;
+	font-weight: normal;
 }
 #jot #jot-title:-moz-placeholder {
-  font-weight: normal;
+	font-weight: normal;
 }
 #jot #jot-title:hover {
-  border: 1px solid #999999;
+	border: 1px solid #999999;
 }
 #jot #jot-title:focus {
-  border: 1px solid #999999;
+	border: 1px solid #999999;
 }
 #jot #character-counter {
-  width: 80px;
-  float: right;
-  text-align: right;
-  height: 20px;
-  line-height: 20px;
-  padding-right: 20px;
+	width: 80px;
+	float: right;
+	text-align: right;
+	height: 20px;
+	line-height: 20px;
+	padding-right: 20px;
 }
 
 #profile-jot-submit {
-  float: right;
-  margin-left: 15px;
+	float: right;
+	margin-left: 15px;
 }
 #profile-upload-wrapper {
-  float: left;
-  margin-left: 15px;
+	float: left;
+	margin-left: 15px;
 }
 #profile-attach-wrapper {
-  float: left;
-  margin-left: 15px;
+	float: left;
+	margin-left: 15px;
 }
 #profile-link-wrapper {
-  float: left;
-  margin-left: 15px;
-  cursor: pointer;
+	float: left;
+	margin-left: 15px;
+	cursor: pointer;
 }
 #profile-video-wrapper {
-  float: left;
-  margin-left: 15px;
-  cursor: pointer;
+	float: left;
+	margin-left: 15px;
+	cursor: pointer;
 }
 #profile-audio-wrapper {
-  float: left;
-  margin-left: 15px;
-  cursor: pointer;
+	float: left;
+	margin-left: 15px;
+	cursor: pointer;
 }
 #profile-location-wrapper {
-  float: left;
-  margin-left: 15px;
-  cursor: pointer;
+	float: left;
+	margin-left: 15px;
+	cursor: pointer;
 }
 #profile-nolocation-wrapper {
-  float: left;
-  margin-left: 15px;
-  cursor: pointer;
+	float: left;
+	margin-left: 15px;
+	cursor: pointer;
 }
 #profile-smiley-wrapper {
-  float: left;
-  margin-left: 15px;
-  cursor: pointer;
-  margin-top: 3px;
-  height: 10px;
-  display: inline-block;
+	float: left;
+	margin-left: 15px;
+	cursor: pointer;
+	margin-top: 3px;
+	height: 10px;
+	display: inline-block;
 }
 #smileybutton {
-  position: absolute;
-  z-index: 99;
+	position: absolute;
+	z-index: 99;
 }
-table.smiley-preview{
-  background-color: #FFF;
-  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
+table.smiley-preview {
+	background-color: #FFF;
+	box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
 #jot-perms-icon {
-  float: right;
-  margin-left: 15px;
+	float: right;
+	margin-left: 15px;
 }
 #jot-preview-link {
-  float: right;
+	float: right;
 }
 #profile-jot-end {
-  clear: both;
+	clear: both;
 }
 #profile-jot-text_tbl {
-  width: 780px;
+	width: 780px;
 }
 #profile-jot-wrapper {
-  margin-bottom: 10px;
+	margin-bottom: 10px;
 }
 
 /** buttons **/
 /*input[type="submit"] {
 	border: 0px;
-    background-color: @ButtonBackgroundColor;
-    color: @ButtonColor;
-    padding: 0px 10px;
+	background-color: @ButtonBackgroundColor;
+	color: @ButtonColor;
+	padding: 0px 10px;
 	.rounded(5px);
-    height: 18px;
+	height: 18px;
 }*/
 /** acl **/
 #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {
-  display: block!important;
+	display: block!important;
 }
 #acl-wrapper {
-  width: 690px;
-  float: left;
+	width: 690px;
+	float: left;
 }
 #acl-search {
-  float: right;
-  background: #ffffff url("../../../images/search_18.png") no-repeat right center;
-  padding-right: 20px;
+	float: right;
+	background: #ffffff url("../../../images/search_18.png") no-repeat right center;
+	padding-right: 20px;
 }
 #acl-showall {
-  float: left;
-  display: block;
-  width: auto;
-  height: 18px;
-  background-color: #cccccc;
-  background-image: url("../../../images/show_all_off.png");
-  background-position: 7px 7px;
-  background-repeat: no-repeat;
-  padding: 7px 5px 0px 30px;
-  color: #999999;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
+	float: left;
+	display: block;
+	width: auto;
+	height: 18px;
+	background-color: #cccccc;
+	background-image: url("../../../images/show_all_off.png");
+	background-position: 7px 7px;
+	background-repeat: no-repeat;
+	padding: 7px 5px 0px 30px;
+	color: #999999;
+	-moz-border-radius: 5px 5px 5px 5px;
+	-webkit-border-radius: 5px 5px 5px 5px;
+	border-radius: 5px 5px 5px 5px;
 }
 #acl-showall.selected {
-  color: #000000;
-  background-color: #ff9900;
-  background-image: url("../../../images/show_all_on.png");
+	color: #000000;
+	background-color: #ff9900;
+	background-image: url("../../../images/show_all_on.png");
 }
 #acl-list {
-  height: 210px;
-  border: 1px solid #cccccc;
-  clear: both;
-  margin-top: 30px;
-  overflow: auto;
+	height: 210px;
+	border: 1px solid #cccccc;
+	clear: both;
+	margin-top: 30px;
+	overflow: auto;
 }
 .acl-list-item {
-  display: block;
-  width: 150px;
-  height: 30px;
-  border: 1px solid #cccccc;
-  margin: 5px;
-  float: left;
+	display: block;
+	width: 150px;
+	height: 30px;
+	border: 1px solid #cccccc;
+	margin: 5px;
+	float: left;
 }
 .acl-list-item img {
-  width: 22px;
-  height: 22px;
-  float: left;
-  margin: 4px;
+	width: 22px;
+	height: 22px;
+	float: left;
+	margin: 4px;
 }
 .acl-list-item p {
-  height: 12px;
-  font-size: 10px;
-  margin: 0px;
-  padding: 2px 0px 1px;
-  overflow: hidden;
+	height: 12px;
+	font-size: 10px;
+	margin: 0px;
+	padding: 2px 0px 1px;
+	overflow: hidden;
 }
 .acl-list-item a {
-  font-size: 8px;
-  display: block;
-  width: 40px;
-  height: 10px;
-  float: left;
-  color: #999999;
-  background-color: #cccccc;
-  background-position: 3px 3px;
-  background-repeat: no-repeat;
-  margin-right: 5px;
-  -webkit-border-radius: 2px ;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-  padding-left: 15px;
+	font-size: 8px;
+	display: block;
+	width: 40px;
+	height: 10px;
+	float: left;
+	color: #999999;
+	background-color: #cccccc;
+	background-position: 3px 3px;
+	background-repeat: no-repeat;
+	margin-right: 5px;
+	-webkit-border-radius: 2px ;
+	-moz-border-radius: 2px;
+	border-radius: 2px;
+	padding-left: 15px;
 }
 #acl-wrapper a:hover {
-  text-decoration: none;
-  color: #000000;
+	text-decoration: none;
+	color: #000000;
 }
 .acl-button-show {
-  background-image: url("../../../images/show_off.png");
+	background-image: url("../../../images/show_off.png");
 }
 .acl-button-hide {
-  background-image: url("../../../images/hide_off.png");
+	background-image: url("../../../images/hide_off.png");
 }
 .acl-button-show.selected {
-  color: #000000;
-  background-color: #9ade00;
-  background-image: url("../../../images/show_on.png");
+	color: #000000;
+	background-color: #9ade00;
+	background-image: url("../../../images/show_on.png");
 }
 .acl-button-hide.selected {
-  color: #000000;
-  background-color: #ff4141;
-  background-image: url("../../../images/hide_on.png");
+	color: #000000;
+	background-color: #ff4141;
+	background-image: url("../../../images/hide_on.png");
 }
 .acl-list-item.groupshow {
-  border-color: #9ade00;
+	border-color: #9ade00;
 }
 .acl-list-item.grouphide {
-  border-color: #ff4141;
+	border-color: #ff4141;
 }
 /** /acl **/
 /** tab buttons **/
 div.pager, ul.tabs {
-  list-style-type: none;
-  padding-bottom: 10px;
-  padding-left: 10px;
-  padding-top: 0px;
-  margin-bottom: 5px;
-  line-height: 28px;
-  height: 20px;
+	list-style-type: none;
+	padding-bottom: 10px;
+	padding-left: 10px;
+	padding-top: 0px;
+	margin-bottom: 5px;
+	line-height: 28px;
+	height: 20px;
 /*  font-size: 11px; */
-  font-size: 13px;
-  font-weight: bold;
-  /* margin-bottom: 30px; */
-  background-color: #FAFAFA;
-  box-shadow: 1px 2px 0px 0px #D8D8D8;
-  border-bottom: 1px solid #D2D2D2;
+	font-size: 13px;
+	font-weight: bold;
+	/* margin-bottom: 30px; */
+	background-color: #FAFAFA;
+	box-shadow: 1px 2px 0px 0px #D8D8D8;
+	border-bottom: 1px solid #D2D2D2;
 }
 ul.tabs li {
-  float: left;
-  /* margin-left: 7px; */
+	float: left;
+	/* margin-left: 7px; */
 }
 /*ul.tabs li .active {
-  border-bottom: 1px solid #005c94;
+	border-bottom: 1px solid #005c94;
 }*/
 
 ul.tabs a, div.pager a {
-    /* min-width: 34px; */
-/*    display: block;
-    float: left; */
-    padding: 0px;
-    padding-bottom: 6px;
-/*    padding: 0px 12px 0px 12px; */
-/*    color: #444; */
-    color: darkgray;
+	/* min-width: 34px; */
+	/* display: block;
+	float: left; */
+	padding: 0px;
+	padding-bottom: 6px;
+	/* padding: 0px 12px 0px 12px; */
+	/* color: #444; */
+	color: darkgray;
 }
 
 ul.tabs a {
-/*    box-shadow: 1px 2px 0px 0px #D8D8D8; */
-    margin-right: 15px;
-    margin-left: 5px;
+	/* box-shadow: 1px 2px 0px 0px #D8D8D8; */
+	margin-right: 15px;
+	margin-left: 5px;
 }
 
 #birthday-notice, #event-notice {
-    box-shadow: 1px 2px 0px 0px #D8D8D8;
-    margin-bottom: 5px;
+	box-shadow: 1px 2px 0px 0px #D8D8D8;
+	margin-bottom: 5px;
 }
 
 #birthday-wrapper, #event-wrapper {
-    background-color: #FAFAFA;
-    box-shadow: 1px 2px 0px 0px #D8D8D8;
-    padding-left: 10px;
-    padding-right: 10px;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    margin-bottom: 0px;
+	background-color: #FAFAFA;
+	box-shadow: 1px 2px 0px 0px #D8D8D8;
+	padding-left: 10px;
+	padding-right: 10px;
+	padding-top: 5px;
+	padding-bottom: 5px;
+	margin-bottom: 0px;
 }
 
-.birthday-notice, .event-notice  {
-    padding: 2px 7px 2px 7px;
-    color: darkgrey;
-   font-weight: bold;
+.birthday-notice, .event-notice {
+	padding: 2px 7px 2px 7px;
+	color: darkgrey;
+	font-weight: bold;
 }
 .comment-edit-submit-wrapper .fakelink {
-    padding: 2px 7px 2px 7px;
-    color: black;
+	padding: 2px 7px 2px 7px;
+	color: black;
 }
 
 .comment-edit-submit-wrapper .fakelink {
-/*    border: 1px solid lightgray; */
-    background: #F2F2F2;
-    margin-top: 2px;
-    margin-bottom: 2px;
+	/* border: 1px solid lightgray; */
+	background: #F2F2F2;
+	margin-top: 2px;
+	margin-bottom: 2px;
 }
 
 #event-notice:hover, #birthday-notice:hover, ul.tabs li .active,
 .comment-edit-submit-wrapper .fakelink:hover {
-    color: black;
+	color: black;
 }
 
 span.pager_current, span.pager_n a:hover,
 span.pager_first a:hover, span.pager_last a:hover,
 span.pager_prev a:hover, span.pager_next a:hover,
 ul.tabs a:hover {
-  border-bottom: 2px solid #244C5E;
-  text-decoration: none;
-  color: grey;
-  padding-bottom: 6px;
+	border-bottom: 2px solid #244C5E;
+	text-decoration: none;
+	color: grey;
+	padding-bottom: 6px;
 }
 
 ul.tabs li .active, span.pager_current a {
-  border-bottom: 2px solid #244C5E;
-  text-decoration: none;
-  color: black;
+	border-bottom: 2px solid #244C5E;
+	text-decoration: none;
+	color: black;
 }
 
 #event-notice:hover, #birthday-notice:hover, .comment-edit-submit-wrapper .fakelink:hover {
 /*    background-color: #e5e5e5; */
-  color: grey;
-    text-decoration: none;
+	color: grey;
+	text-decoration: none;
 /*    border: 1px solid darkgray; */
 }
 
 .comment-edit-bb {
-  float:right;
+	float:right;
 }
 .comment-edit-bb a {
-  color: #888;
-  padding: 0px 5px 1px 5px;
+	color: #888;
+	padding: 0px 5px 1px 5px;
 }
 
 .comment-edit-bb a:hover {
-  color: #000;
-  text-decoration: none;
+	color: #000;
+	text-decoration: none;
+}
+
+#newmember-tab > a {
+	font-size: 1.2em;
+	font-weight: 800;
 }
 
 /**
  * Form fields
  */
 .field {
-  margin-bottom: 10px;
-  padding-bottom: 10px;
-  overflow: auto;
-  width: 100%;
+	margin-bottom: 10px;
+	padding-bottom: 10px;
+	overflow: auto;
+	width: 100%;
 }
 .field label {
-  float: left;
-  width: 200px;
+	float: left;
+	width: 200px;
 }
 .field input, .field textarea {
-  max-width: 400px;
+	max-width: 400px;
 }
 .field textarea {
-  height: 100px;
+	height: 100px;
 }
 .field .field_help {
-  display: block;
-  margin-left: 200px;
-  color: #666666;
+	display: block;
+	margin-left: 200px;
+	color: #666666;
 }
 .field .onoff {
-  float: left;
-  width: 80px;
-  margin-right:1em;
+	float: left;
+	width: 80px;
+	margin-right:1em;
 }
 .field .onoff a {
-  display: block;
-  border: 1px solid #666666;
-  background-image: url("../../../images/onoff.jpg");
-  background-repeat: no-repeat;
-  padding: 4px 2px 2px 2px;
-  font-size:14px;
-  height: 16px;
-  line-height:16px;
-  text-decoration: none;
-  text-align: center;
-  text-transform: uppercase;
-  border-radius:4px;
+	display: block;
+	border: 1px solid #666666;
+	background-image: url("../../../images/onoff.jpg");
+	background-repeat: no-repeat;
+	padding: 4px 2px 2px 2px;
+	font-size:14px;
+	height: 16px;
+	line-height:16px;
+	text-decoration: none;
+	text-align: center;
+	text-transform: uppercase;
+	border-radius:4px;
 }
 .field .onoff .off {
-  border-color: #B0B0B0;
-  padding-left: 36px;
-  background-position: left center;
-  background-color: #cccccc;
-  color: #9C9C9C;
+	border-color: #B0B0B0;
+	padding-left: 36px;
+	background-position: left center;
+	background-color: #cccccc;
+	color: #9C9C9C;
 }
 .field .onoff .on {
-  font-weight:bold;
-  border-color: #8EB8EE;
-  padding-right: 36px;
-  background-position: right center;
-  background-color: #D7E3F1;
-  color: #36c;
+	font-weight:bold;
+	border-color: #8EB8EE;
+	padding-right: 36px;
+	background-position: right center;
+	background-color: #D7E3F1;
+	color: #36c;
 }
 .field .hidden {
-  display: none!important;
+	display: none!important;
 }
 .field.radio .field_help {
-  margin-left: 0px;
+	margin-left: 0px;
 }
 aside form {
-  overflow-x: hidden;
+	overflow-x: hidden;
 }
 aside form fieldset {
-  margin: 0px;
-  padding: 0px;
-  border: 0px none;
+	margin: 0px;
+	padding: 0px;
+	border: 0px none;
 }
 aside form .field label {
-  float: left;
-  width: 170px;
+	float: left;
+	width: 170px;
 }
 
 aside #div_id_remember label {
@@ -2422,226 +2425,226 @@ aside #div_id_remember label {
 }
 
 #login-group {
-  overflow: hidden;
+	overflow: hidden;
 }
 
 #login-head {
-  position: unset;
-  width: unset;
-  height: unset;
-  margin-bottom: 10px;
+	position: unset;
+	width: unset;
+	height: unset;
+	margin-bottom: 10px;
 }
 
 div #wrapper_username {
-  padding: 0px;
+	padding: 0px;
 }
 
 div #wrapper_password {
-  padding: 0px;
-  margin-bottom: 0px;
+	padding: 0px;
+	margin-bottom: 0px;
 }
 
 #div_id_remember {
-  float: left;
-  width: unset;
+	float: left;
+	width: unset;
 }
 
 #remember_tip {
-  display: none;
+	display: none;
 }
 
 #login-submit-wrapper {
-  float: right;
+	float: right;
 }
 
 #login-form {
-  margin-top: 20px;
+	margin-top: 20px;
 }
 
 #login-extra-links, #login-form {
-  /* width: 341px; */
-  width: 341px;
-  clear: both;
-  border-top: 3px solid white;
-  padding-top: 20px;
+	/* width: 341px; */
+	width: 341px;
+	clear: both;
+	border-top: 3px solid white;
+	padding-top: 20px;
 }
 
 aside div #login-submit-button {
-  margin-left:0px;
+	margin-left:0px;
 }
 
 #login-lost-password-link {
-  margin-bottom: 10px;
-  float: right;
+	margin-bottom: 10px;
+	float: right;
 }
 
 aside #register-link, aside #lost-password-link {
-  display: block;
+	display: block;
 }
 
 aside #id_username,
 aside div #id_openid_url,
 aside #id_password {
-  width: 170px;
-  max-width: 170px;
+	width: 170px;
+	max-width: 170px;
 }
 
 #profile-edit-links-end {
-        clear: both;
-        margin-bottom: 15px;
+	clear: both;
+	margin-bottom: 15px;
 }
 
-#profile-edit-links ul { margin: 0; padding:0 0 20px 0; list-style: none; }
+#profile-edit-links ul {margin: 0; padding:0 0 20px 0; list-style: none; }
 
 #profile-edit-links li {
-  float: left;
-  list-style: none;
+	float: left;
+	list-style: none;
 }
 
 .profile-edit-side-div {
 /*  display: none; */
-  float: right;
+	float: right;
 }
 
 /* aside div.clear {
-  clear: none;
-  float: left;
+	clear: none;
+	float: left;
 } */
 
 #register-form label,
 #profile-edit-wrapper label {
-  width: 200px;
-  float: left;
+	width: 200px;
+	float: left;
 }
 
 #register-name-end,
 #register-email-end,
 #register-nickname-end {
-  clear: both;
+	clear: both;
 }
 
 .required {
-  display: inline;
-  color: #B20202;
+	display: inline;
+	color: #B20202;
 }
 
 /* oauth */
 .oauthapp {
-  height: auto;
-  overflow: auto;
-  border-bottom: 2px solid #cccccc;
-  padding-bottom: 1em;
-  margin-bottom: 1em;
+	height: auto;
+	overflow: auto;
+	border-bottom: 2px solid #cccccc;
+	padding-bottom: 1em;
+	margin-bottom: 1em;
 }
 .oauthapp img {
-  float: left;
-  width: 48px;
-  height: 48px;
-  margin: 10px;
+	float: left;
+	width: 48px;
+	height: 48px;
+	margin: 10px;
 }
 .oauthapp img.noicon {
-  background-image: url("../../../images/icons/48/plugin.png");
-  background-position: center center;
-  background-repeat: no-repeat;
+	background-image: url("../../../images/icons/48/plugin.png");
+	background-position: center center;
+	background-repeat: no-repeat;
 }
 .oauthapp a {
-  float: left;
+	float: left;
 }
 /* contacts */
 /*.contact-entry-wrapper {
-  width: 120px;
-  height: 130px;
-  float: left;
-  overflow: hidden;
-  margin-left: 5px;
+	width: 120px;
+	height: 130px;
+	float: left;
+	overflow: hidden;
+	margin-left: 5px;
 }*/
 
 .contact-entry-wrapper {
-  float: left;
-  width: 363px;
-  height: 100px;
-  padding-right: 10px;
-  margin: 0 10px 10px 0px;
+	float: left;
+	width: 363px;
+	height: 100px;
+	padding-right: 10px;
+	margin: 0 10px 10px 0px;
 }
 .contact-entry-wrapper .contact-entry-photo-wrapper {
-  float: left;
-  margin-right: 10px;
-  width: 80px;
-  height: 80px;
+	float: left;
+	margin-right: 10px;
+	width: 80px;
+	height: 80px;
 }
 .contact-entry-photo-wrapper {
-  position: relative;
+	position: relative;
 }
 .contact-entry-desc {
-  overflow: hidden;
+	overflow: hidden;
 }
 .contact-entry-name {
-  font-weight: bold;
+	font-weight: bold;
 }
 .contact-entry-details {
-  font-size: 13px;
-  color: #999999;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
+	font-size: 13px;
+	color: #999999;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 /* photo */
 .lframe {
-  float: left;
-  margin: 0px 10px 10px 0px;
+	float: left;
+	margin: 0px 10px 10px 0px;
 }
 .contact-entry-photo a img {
-  width: 80px;
-  height: 80px;
+	width: 80px;
+	height: 80px;
 }
 /* profile match wrapper */
 .profile-match-wrapper {
-  float: left;
-  width: 90px;
-  height: 90px;
-  margin-bottom: 20px;
+	float: left;
+	width: 90px;
+	height: 90px;
+	margin-bottom: 20px;
 }
 .profile-match-wrapper .contact-photo {
-  width: 80px;
-  height: 80px;
+	width: 80px;
+	height: 80px;
 }
 .profile-match-wrapper .contact-photo img {
-  width: 80px;
-  height: 80px;
+	width: 80px;
+	height: 80px;
 }
 .profile-match-wrapper {
-  left: 0px;
-  top: 63px;
+	left: 0px;
+	top: 63px;
 }
 
 .contact-photo-menu-button {
-        position: relative;
-        background-image: url("../../../images/icons/16/menu.png");
-        background-position: top left;
-        background-repeat: no-repeat;
-        margin: 0px 0px -16px 0px;
+	position: relative;
+	background-image: url("../../../images/icons/16/menu.png");
+	background-position: top left;
+	background-repeat: no-repeat;
+	margin: 0px 0px -16px 0px;
 	padding: 0px;
-        width: 16px;
-        height: 16px;
-        top: -20px; left:0px;
-        overflow: hidden;
-        text-indent: 40px;
-        display: none;
+	width: 16px;
+	height: 16px;
+	top: -20px; left:0px;
+	overflow: hidden;
+	text-indent: 40px;
+	display: none;
 
 }
 .contact-photo-menu {
-        width: 11em;
-        /*border: 3px solid #364e59;*/
+	width: 11em;
+	/*border: 3px solid #364e59;*/
 	color: #2d2d2d;
-        background: #FFFFFF;
-        position: absolute;
-        /*position: relative;*/
-        left: 0px; /*top: 0px;*/
-        display: none;
-        z-index: 10000;
+	background: #FFFFFF;
+	position: absolute;
+	/*position: relative;*/
+	left: 0px; /*top: 0px;*/
+	display: none;
+	z-index: 10000;
 	box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
-.contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.contact-photo-menu ul {margin:0px; padding: 0px; list-style: none }
 .contact-photo-menu li a {
 	display: block;
 	padding: 5px 10px;
@@ -2654,41 +2657,41 @@ aside #id_password {
 
 /* page footer */
 footer {
-  /* height: 100px; */
-  display: table-row;
+	/* height: 100px; */
+	display: table-row;
 }
 
 blockquote {
-    border-left: 1px solid #D2D2D2;
-    padding-left: 9px;
-    margin: 0 0 0 .8ex;
-    color: #777;
+	border-left: 1px solid #D2D2D2;
+	padding-left: 9px;
+	margin: 0 0 0 .8ex;
+	color: #777;
 }
 
 .oembed {
-    /* font-size: large; */
-    font-size: larger;
-    font-weight: bold;
-    display: block;
+	/* font-size: large; */
+	font-size: larger;
+	font-weight: bold;
+	display: block;
 }
 
 .oembed.video .embed_video > div {
-    position: absolute; top: 0px; left: 0px;
-    background-color: rgba(0,0,0,0.5);
+	position: absolute; top: 0px; left: 0px;
+	background-color: rgba(0,0,0,0.5);
 }
 .oembed.video .embed_video > div::before {
-    font-family: FontAwesome;
-    font-weight: normal;
-    font-style: normal;
-    display: inline-block;
-    text-decoration: inherit;
-    vertical-align: top;
-    font-size: 3em;
-    content: "\f01d"; /* icon-play-circle */
-    color: #fff;
-    bottom: 10px;
-    right: 10px;
-    position: absolute;
+	font-family: FontAwesome;
+	font-weight: normal;
+	font-style: normal;
+	display: inline-block;
+	text-decoration: inherit;
+	vertical-align: top;
+	font-size: 3em;
+	content: "\f01d"; /* icon-play-circle */
+	color: #fff;
+	bottom: 10px;
+	right: 10px;
+	position: absolute;
 }
 
 /* ================== */
@@ -2696,36 +2699,36 @@ blockquote {
 /* ================== */
 
 .contact-block-img {
-        width: 42px;
-        height: 42px;
-        padding-right: 2px;
+	width: 42px;
+	height: 42px;
+	padding-right: 2px;
 }
 .contact-block-div {
-        float: left;
+	float: left;
 }
 
-.contact-block-textdiv { width: 150px; height: 34px; float: left; }
-#contact-block-end { clear: both; }
+.contact-block-textdiv {width: 150px; height: 34px; float: left; }
+#contact-block-end {clear: both; }
 
 #group-edit-wrapper {
-        margin-bottom: 10px;
+	margin-bottom: 10px;
 }
 
 #group-members-end {
-        clear: both;
+	clear: both;
 }
 
 /*
 #group-separator,
-#prof-separator { display: none;}
+#prof-separator {display: none;}
 */
 
 #message-to-select {
-  height: 150px;
+	height: 150px;
 }
 
 #prvmail-upload {
-  margin-left: 10px;
+	margin-left: 10px;
 }
 
 #prvmail-to-label, #prvmail-subject-label, #prvmail-message-label {
@@ -2763,9 +2766,9 @@ blockquote {
 	margin-top: 10px;
 }
 a.mail-list-link {
-    display: block;
-    font-size: 1.3em;
-    padding: 4px 0;
+	display: block;
+	font-size: 1.3em;
+	padding: 4px 0;
 }
 
 /*
@@ -2803,8 +2806,8 @@ a.mail-list-link {
 }
 
 .mail-conv-subject {
-    font-size: 1.4em;
-    margin: 10px 0;
+	font-size: 1.4em;
+	margin: 10px 0;
 }
 
 .mail-conv-outside-wrapper-end {
@@ -2833,154 +2836,155 @@ a.mail-list-link {
 /* = Events = */
 /* ========== */
 .eventcal {
-        float: left;
-        font-size: 20px;
+	float: left;
+	font-size: 20px;
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-        max-width: 600px;
-        position: relative;
-        margin-top: 4px;
-        margin-right: 4px;
-        margin-bottom: 15px;
+	border: 1px solid #CCCCCC;
+	max-width: 600px;
+	position: relative;
+	margin-top: 4px;
+	margin-right: 4px;
+	margin-bottom: 15px;
 }
 
 .vevent .event-summary,
 .vevent .event-description,
 .vevent .event-location {
-        margin-left: 10px;
-        margin-right: 10px;
+	margin-left: 10px;
+	margin-right: 10px;
 }
 .vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+	margin-left: 10px;
+	margin-right: 10px;
 }
 
 #new-event-link {
-        margin-bottom: 10px;
+	margin-bottom: 10px;
 }
 
 .edit-event-link, .plink-event-link {
-        float: left;
-        margin-top: 4px;
-        margin-right: 4px;
-        margin-bottom: 15px;
+	float: left;
+	margin-top: 4px;
+	margin-right: 4px;
+	margin-bottom: 15px;
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
-        margin-right: 15px;
+	content: url('../../../images/calendar.png');
+	margin-right: 15px;
 }
 
 .event-start, .event-end {
-        margin-left: 10px;
-        width: 330px;
-        clear: both;
+	margin-left: 10px;
+	width: 330px;
+	clear: both;
 }
 
 .event-start .dtstart, .event-end .dtend {
-        float: right;
+	float: right;
 }
 
 .event-list-date {
-        margin-bottom: 10px;
+	margin-bottom: 10px;
 }
 
 .prevcal, .nextcal {
-        float: left;
-        margin-left: 32px;
-        margin-right: 32px;
-        margin-top: 64px;
+	float: left;
+	margin-left: 32px;
+	margin-right: 32px;
+	margin-top: 64px;
 }
 .event-calendar-end {
-        clear: both;
+	clear: both;
 }
 
 
 .calendar {
-        font-family: Courier, monospace;
+	font-family: Courier, monospace;
 }
 .today {
-        font-weight: bold;
-        color: #FF0000;
+	font-weight: bold;
+	color: #FF0000;
 }
 #event-desc-text-edit-bb, #event-location-text-edit-bb {
-  float: none;
+	float: none;
 }
 #event-start-text, #event-finish-text, #event-summary-text, #event-desc-text, #event-location-text {
-  margin-bottom: 10px;
-  margin-top: 20px;
+	margin-bottom: 10px;
+	margin-top: 20px;
 }
 
 .settings-block {
-        /* border: 1px solid #AAA; */
-        padding-left: 5px;
-        padding-right: 5px;
+	border-bottom: 1px solid #898989;
+	/* border: 1px solid #AAA; */
+	padding-left: 5px;
+	padding-right: 5px;
 }
 
 .app-title {
-  margin: 0px;
+	margin: 0px;
 }
 
 #identity-manage-desc {
-        margin-top:15px;
-        margin-bottom: 15px;
+	margin-top:15px;
+	margin-bottom: 15px;
 }
 
 #identity-manage-choose {
-        margin-bottom: 15px;
+	margin-bottom: 15px;
 }
 
 #identity-submit {
-        margin-top: 20px;
+	margin-top: 20px;
 }
 
 #photo-prev-link, #photo-next-link {
-        padding: 10px;
-        float: left;
+	padding: 10px;
+	float: left;
 }
 
 #photo-photo {
-        float: left;
+	float: left;
 }
 
 #photo-photo-end {
-        clear: both;
+	clear: both;
 }
 
 .profile-match-photo {
-        float: left;
-        text-align: center;
-        width: 120px;
+	float: left;
+	text-align: center;
+	width: 120px;
 }
 
 .profile-match-name {
-        float: left;
-        text-align: center;
-        width: 120px;
-        overflow: hidden;
+	float: left;
+	text-align: center;
+	width: 120px;
+	overflow: hidden;
 }
 
 .profile-match-break,
 .profile-match-end {
-        clear: both;
+	clear: both;
 }
 
 .profile-match-connect {
-        text-align: center;
-        font-weight: bold;
+	text-align: center;
+	font-weight: bold;
 }
 
 .profile-match-wrapper {
-        float: left;
-        padding: 10px;
-        width: 120px;
-        height: 120px;
-        scroll: auto;
+	float: left;
+	padding: 10px;
+	width: 120px;
+	height: 120px;
+	scroll: auto;
 }
 #profile-match-wrapper-end {
-        clear: both;
+	clear: both;
 }
 
 /* ============= */
@@ -2988,421 +2992,422 @@ a.mail-list-link {
 /* ============= */
 /* contacts menu */
 .contact-photo-wrapper {
-  position: relative;
+	position: relative;
 }
 .contact-photo {
-  width: 48px;
-  height: 48px;
-  overflow: hidden;
-  display: block;
+	width: 48px;
+	height: 48px;
+	overflow: hidden;
+	display: block;
 }
 .contact-photo img {
-  width: 48px;
-  height: 48px;
+	width: 48px;
+	height: 48px;
 }
 .contact-photo-menu-button {
-  display: none;
-  /* position: absolute; */
-  /* position: absolute; */
-  left: -2px;
-  top: -20px;
+	display: none;
+	/* position: absolute; */
+	/* position: absolute; */
+	left: -2px;
+	top: -20px;
 }
 .contact-wrapper {
-  float: left;
-  width: 90px;
-  height: 90px;
-  margin-bottom: 15px;
+	float: left;
+	width: 90px;
+	height: 90px;
+	margin-bottom: 15px;
 }
 .contact-wrapper .contact-photo {
-  width: 80px;
-  height: 80px;
+	width: 80px;
+	height: 80px;
 }
 .contact-wrapper .contact-photo img {
-  width: 80px;
-  height: 80px;
+	width: 80px;
+	height: 80px;
 }
 .contact-wrapper .contact-photo-menu-button {
-  left: 0px;
-  top: 63px;
+	left: 0px;
+	top: 63px;
 }
 .directory-item {
-  float: left;
-  width: 200px;
-  height: 200px;
+	float: left;
+	width: 200px;
+	height: 200px;
 }
 .directory-item .contact-photo {
-  width: 175px;
-  height: 175px;
+	width: 175px;
+	height: 175px;
 }
 .directory-item .contact-photo img {
-  width: 175px;
-  height: 175px;
+	width: 175px;
+	height: 175px;
 }
 .contact-name {
-  text-align: center;
-  font-weight: bold;
-  font-size: 12px;
+	text-align: center;
+	font-weight: bold;
+	font-size: 12px;
 }
 .contact-details {
-  color: #999999;
+	color: #999999;
 }
 
 /* contact edit page */
 #contact-edit-nav-wrapper {
-  margin-top: 24px;
+	margin-top: 24px;
 }
 #contact-edit-status-wrapper {
-  border-color: #c9d8f6;
-  background-color: #e0e8fa;
-  border-radius: 3px;
+	border-color: #c9d8f6;
+	background-color: #e0e8fa;
+	border-radius: 3px;
 }
 
 #contact-edit-contact-status {
-  font-weight: bold;
+	font-weight: bold;
 }
 
 #contact-edit-drop-link-end {
-  /* clear: both; */
+	/* clear: both; */
 }
 
 #contact-edit-links ul {
-  list-style: none;
-  list-style-type: none;
+	list-style: none;
+	list-style-type: none;
 }
 
 a.btn#contact-edit-actions-button {
-  cursor: pointer;
-  border-radius: 3px;
-  font-size: inherit;
-  font-weight: normal;
-  height: auto;
-  line-height: inherit;
-  padding: 5px 10px;
+	cursor: pointer;
+	border-radius: 3px;
+	font-size: inherit;
+	font-weight: normal;
+	height: auto;
+	line-height: inherit;
+	padding: 5px 10px;
 }
 
 #lost-contact-message, #insecure-message,
 #block-message, #ignore-message, #archive-message {
-  color: #CB4437;
+	color: #CB4437;
 }
 
 /* photo album page */
 .photo-top-image-wrapper,
 .photo-album-image-wrapper {
-  position: relative;
-  float: left;
-  margin-top: 15px;
-  margin-right: 15px;
-  width: 200px; height: 200px;
-  overflow: hidden;
+	position: relative;
+	float: left;
+	margin-top: 15px;
+	margin-right: 15px;
+	width: 200px; height: 200px;
+	overflow: hidden;
 }
 .photo-top-album-name {
-  width: 100%;
-  min-height: 2em;
-  position: absolute;
-  bottom: 0px;
-  padding: 0px 3px;
-  padding-top: 0.5em;
-  background-color: rgb(255, 255, 255);
+	width: 100%;
+	min-height: 2em;
+	position: absolute;
+	bottom: 0px;
+	padding: 0px 3px;
+	padding-top: 0.5em;
+	background-color: rgb(255, 255, 255);
 }
 #photo-top-end {
-  clear: both;
+	clear: both;
 }
 
 #photo-top-links {
-  margin-bottom: 30px;
-  margin-left: 30px;
+	margin-bottom: 30px;
+	margin-left: 30px;
 }
 
 #photos-upload-newalbum-div {
-  float: left;
-  width: 175px;
+	float: left;
+	width: 175px;
 }
 img.photo-top-photo,
 img.photo-album-photo {
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
 }
 .photo-album-photo {
-  float: none;
+	float: none;
 }
 .photo-album-image-wrapper .caption {
-  opacity: 0;
-  width: 100%;
-  position: absolute;
-  bottom: 0px;
-  padding: 3px 5px;
-  background-color: rgb(255, 255, 255);
-  margin: 0;
-  overflow: hidden;
-  -webkit-transition: all 0.5s ease-in-out;
-  -moz-transition: all 0.5s ease-in-out;
-  -o-transition: all 0.5s ease-in-out;
-  -ms-transition: all 0.5s ease-in-out;
-  transition: all 0.5s ease-in-out;
+	opacity: 0;
+	width: 100%;
+	position: absolute;
+	bottom: 0px;
+	padding: 3px 5px;
+	background-color: rgb(255, 255, 255);
+	margin: 0;
+	overflow: hidden;
+	-webkit-transition: all 0.5s ease-in-out;
+	-moz-transition: all 0.5s ease-in-out;
+	-o-transition: all 0.5s ease-in-out;
+	-ms-transition: all 0.5s ease-in-out;
+	transition: all 0.5s ease-in-out;
 }
 .photo-album-image-wrapper:hover .caption {
-  opacity: 1;
+	opacity: 1;
 }
 
-.menu-profile-list{
-  height: auto;
-  overflow: auto;
-  min-height: 16px;
-  list-style: none;
-        }
-.menu-profile-list:hover{
-        background: #E7F2F7;
-        }
-.menu-profile-list-item{
-        padding-left: 5px;
-        vertical-align: middle;
-        }
-.menu-profile-list-item:hover{
-        text-decoration: none;
-   }
+.menu-profile-list {
+	height: auto;
+	overflow: auto;
+	min-height: 16px;
+	list-style: none;
+}
+.menu-profile-list:hover {
+	background: #E7F2F7;
+}
+.menu-profile-list-item {
+	padding-left: 5px;
+	vertical-align: middle;
+}
+.menu-profile-list-item:hover {
+	text-decoration: none;
+}
 
 .autocomplete {
-  width: 350px;
-  color: black;
-  border: 1px solid rgb(210, 210, 210);
-  background-color: white;
-  cursor: pointer;
-  text-align: left;
-  max-height: 350px;
-  overflow: auto;
-  display: block;
-  background-position: initial initial;
-  background-repeat: initial initial;
+	width: 350px;
+	color: black;
+	border: 1px solid rgb(210, 210, 210);
+	background-color: white;
+	cursor: pointer;
+	text-align: left;
+	max-height: 350px;
+	overflow: auto;
+	display: block;
+	background-position: initial initial;
+	background-repeat: initial initial;
 }
 .mail-list-wrapper {
-  background-color: #f6f7f8;
-  margin-bottom: 5px;
-  width: 100%;
-  height: auto;
-  overflow: hidden;
+	background-color: #f6f7f8;
+	margin-bottom: 5px;
+	width: 100%;
+	height: auto;
+	overflow: hidden;
 }
 .mail-list-wrapper span {
-  display: block;
-  float: left;
-  width: 20%;
-  overflow: hidden;
+	display: block;
+	float: left;
+	width: 20%;
+	overflow: hidden;
 }
 .mail-list-wrapper .mail-subject {
-  width: 30%;
-  padding: 4px 0px 0px 4px;
+	width: 30%;
+	padding: 4px 0px 0px 4px;
 }
 .mail-list-wrapper .mail-subject a {
-  display: block;
+	display: block;
 }
 .mail-list-wrapper .mail-subject.unseen a {
-  font-weight: bold;
+	font-weight: bold;
 }
 .mail-list-wrapper .mail-date {
-  padding: 4px 4px 0px 4px;
+	padding: 4px 4px 0px 4px;
 }
 .mail-list-wrapper .mail-from {
-  padding: 4px 4px 0px 4px;
+	padding: 4px 4px 0px 4px;
 }
 .mail-list-wrapper .mail-count {
-  padding: 4px 4px 0px 4px;
-  text-align: right;
+	padding: 4px 4px 0px 4px;
+	text-align: right;
 }
 .mail-list-wrapper .mail-delete {
-  float: right;
+	float: right;
 }
 #mail-display-subject {
-  background-color: #f6f7f8;
-  color: #2d2d2d;
-  margin-bottom: 10px;
-  width: 100%;
-  height: auto;
-  overflow: hidden;
+	background-color: #f6f7f8;
+	color: #2d2d2d;
+	margin-bottom: 10px;
+	width: 100%;
+	height: auto;
+	overflow: hidden;
 }
 #mail-display-subject span {
-  float: left;
-  overflow: hidden;
-  padding: 4px 0px 0px 10px;
+	float: left;
+	overflow: hidden;
+	padding: 4px 0px 0px 10px;
 }
 #mail-display-subject .mail-delete {
-  float: right;
-  opacity: 0.5;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	float: right;
+	opacity: 0.5;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 #mail-display-subject:hover .mail-delete {
-  opacity: 1;
-  -webkit-transition: all 0.2s ease-in-out;
-  -moz-transition: all 0.2s ease-in-out;
-  -o-transition: all 0.2s ease-in-out;
-  -ms-transition: all 0.2s ease-in-out;
-  transition: all 0.2s ease-in-out;
+	opacity: 1;
+	-webkit-transition: all 0.2s ease-in-out;
+	-moz-transition: all 0.2s ease-in-out;
+	-o-transition: all 0.2s ease-in-out;
+	-ms-transition: all 0.2s ease-in-out;
+	transition: all 0.2s ease-in-out;
 }
 
 .mail-list-outside-wrapper-end {
-        clear: both;
+	clear: both;
 }
 .mail-list-outside-wrapper {
-        margin-top: 30px;
+	margin-top: 30px;
 }
 .mail-list-delete-wrapper {
-        float: right;
-        margin-right: 30px;
-        margin-top: 15px;
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
 }
 .mail-list-delete-icon {
-        border: none;
+	border: none;
 }
 .mail-conv-sender,
 .mail-conv-detail {
-        float: left;
+	float: left;
 }
 .mail-conv-detail {
-        margin-left: 20px;
-        width: 500px;
+	margin-left: 20px;
+	width: 500px;
 }
 .mail-conv-subject {
-    font-size: 1.4em;
-    margin: 10px 0;
+	font-size: 1.4em;
+	margin: 10px 0;
 }
 .mail-conv-outside-wrapper-end {
-        clear: both;
+	clear: both;
 }
 .mail-conv-outside-wrapper {
-        margin-top: 30px;
+	margin-top: 30px;
 }
 .mail-conv-delete-wrapper {
-        float: right;
-        margin-right: 30px;
-        margin-top: 15px;
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
 }
 .mail-conv-break {
-        clear: both;
+	clear: both;
 }
 .mail-conv-delete-icon {
-        border: none;
+	border: none;
 }
 
-.icon.tilted-icon{
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
-  -webkit-transform: rotate(-20deg);
-  -moz-transform: rotate(-20deg);
-  -ms-transform: rotate(-20deg);
-  -o-transform: rotate(-20deg);
-  transform: rotate(-20deg);
-  font-size:115%; /* 5% less than normal icons, because the tilt takes up vertical space */
-  padding-top:1px;
+.icon.tilted-icon {
+	filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+	-webkit-transform: rotate(-20deg);
+	-moz-transform: rotate(-20deg);
+	-ms-transform: rotate(-20deg);
+	-o-transform: rotate(-20deg);
+	transform: rotate(-20deg);
+	font-size:115%; /* 5% less than normal icons, because the tilt takes up vertical space */
+	padding-top:1px;
 }
 
 #profile-edit-wrapper {
-    line-height: 30px;
+	line-height: 30px;
 }
-#profile-edit-wrapper .field{
-  margin-bottom:0;
-  padding-bottom:0;
+#profile-edit-wrapper .field {
+	margin-bottom:0;
+	padding-bottom:0;
 }
 #profile-edit-wrapper input[type=text],
-#profile-edit-wrapper select{
-  width:250px;
+#profile-edit-wrapper select {
+	width:250px;
 }
-#profile-edit-wrapper #profile-edit-dob select{
-  width:auto;
+#profile-edit-wrapper #profile-edit-dob select {
+	width:auto;
 }
 #profile-edit-wrapper,
-#profile-edit-wrapper .toggle-section-content{
-  margin-bottom:15px;
+#profile-edit-wrapper .toggle-section-content {
+	margin-bottom:15px;
 }
-.profile-edit-submit-wrapper{
-  margin-top:15px;
+.profile-edit-submit-wrapper {
+	margin-top:15px;
 }
-#profile-edit-default-desc{
-  display:inline-block;
-  padding:15px;
-  width:auto;
-  border:1px solid #511919;
+#profile-edit-default-desc {
+	display:inline-block;
+	padding:15px;
+	width:auto;
+	border:1px solid #511919;
 }
-#profile-edit-wrapper .toggle-section-content{
-  background:#ededed;
-  max-width:599px;
-  padding:5px;
+#profile-edit-wrapper .toggle-section-content {
+	background:#ededed;
+	max-width:599px;
+	padding:5px;
 }
 
-.btn{
-  outline:none;
-  -moz-box-shadow:inset 0px 1px 0px 0px #ffffff;
-  -webkit-box-shadow:inset 0px 1px 0px 0px #ffffff;
-  box-shadow:inset 0px 1px 0px 0px #ffffff;
-  background-color:#ededed;
-  -webkit-border-top-left-radius:0px;
-  -moz-border-radius-topleft:0px;
-  border-top-left-radius:0px;
-  -webkit-border-top-right-radius:0px;
-  -moz-border-radius-topright:0px;
-  border-top-right-radius:0px;
-  -webkit-border-bottom-right-radius:0px;
-  -moz-border-radius-bottomright:0px;
-  border-bottom-right-radius:0px;
-  -webkit-border-bottom-left-radius:0px;
-  -moz-border-radius-bottomleft:0px;
-  border-bottom-left-radius:0px;
-  text-indent:0;
-  border:1px solid #dcdcdc;
-  display:inline-block;
-  color:#777777;
-  font-family:Arial, sans-serif;
-  font-size:15px;
-  font-weight:bold;
-  font-style:normal;
-  height:40px;
-  line-height:40px;
-  padding:0 15px;
-  text-align:center;
-  text-shadow:1px 1px 0px #ffffff;
+.btn {
+	outline:none;
+	-moz-box-shadow:inset 0px 1px 0px 0px #ffffff;
+	-webkit-box-shadow:inset 0px 1px 0px 0px #ffffff;
+	box-shadow:inset 0px 1px 0px 0px #ffffff;
+	background-color:#ededed;
+	-webkit-border-top-left-radius:0px;
+	-moz-border-radius-topleft:0px;
+	border-top-left-radius:0px;
+	-webkit-border-top-right-radius:0px;
+	-moz-border-radius-topright:0px;
+	border-top-right-radius:0px;
+	-webkit-border-bottom-right-radius:0px;
+	-moz-border-radius-bottomright:0px;
+	border-bottom-right-radius:0px;
+	-webkit-border-bottom-left-radius:0px;
+	-moz-border-radius-bottomleft:0px;
+	border-bottom-left-radius:0px;
+	text-indent:0;
+	border:1px solid #dcdcdc;
+	display:inline-block;
+	color:#777777;
+	font-family:Arial, sans-serif;
+	font-size:15px;
+	font-weight:bold;
+	font-style:normal;
+	height:40px;
+	line-height:40px;
+	padding:0 15px;
+	text-align:center;
+	text-shadow:1px 1px 0px #ffffff;
 }
-  .btn:hover{
-    background-color:#e6e6e6;
-    text-decoration:none;
-  }
-  .btn:active{
-    position:relative;
-    top:1px;
-  }
-.profile-view-actions{
-  float:right;
+.btn:hover {
+	background-color:#e6e6e6;
+	text-decoration:none;
+}
+.btn:active {
+	position:relative;
+	top:1px;
+}
+.profile-view-actions {
+	float:right;
 }
 /* videos page */
 .videos .video-top-wrapper {
-  width: 300px;
-  float: left;
-  margin: 0px 10px 10px 0px;
-  position: relative;
+	width: 300px;
+	float: left;
+	margin: 0px 10px 10px 0px;
+	position: relative;
 }
 .videos .video-top-wrapper .video-delete {
-  position: absolute;
-  opacity: 0;
-  right: 0px;
-  top: 0px;
-  transition: opacity 0.5s;
+	position: absolute;
+	opacity: 0;
+	right: 0px;
+	top: 0px;
+	transition: opacity 0.5s;
 }
 .videos .video-top-wrapper:hover .video-delete {
-  opacity: 1;
+	opacity: 1;
 }
 /* invite page */
 #invite-wrapper textarea {
-  width: 100%;
+	width: 100%;
 }
+
 /* upload/select popup */
-  fbrowser.image .photo-album-image-wrapper { margin-left: 10px; }
-  #message-preview { margin-top: 15px; }
-  #message-preview span { width: 100%; }
-  #message-preview .mail-count, #message-preview .mail-delete { display:none; }
-  #message-preview .mail-list-wrapper { padding: 3px; }
-  #message-preview .mail-date { opacity:0.6; font-size:10px; }
+fbrowser.image .photo-album-image-wrapper { margin-left: 10px; }
+#message-preview { margin-top: 15px; }
+#message-preview span { width: 100%; }
+#message-preview .mail-count, #message-preview .mail-delete { display:none; }
+#message-preview .mail-list-wrapper { padding: 3px; }
+#message-preview .mail-date { opacity:0.6; font-size:10px; }
 
 /* colorbox */
 #colorbox img {
-  max-width: 100%;
+	max-width: 100%;
 }
diff --git a/view/theme/vier/templates/contact_edit.tpl b/view/theme/vier/templates/contact_edit.tpl
index d5708bd56..63069a772 100644
--- a/view/theme/vier/templates/contact_edit.tpl
+++ b/view/theme/vier/templates/contact_edit.tpl
@@ -21,8 +21,8 @@
 							<li class="divider"></li>
 							<li role="menuitem"><a  href="#" title="{{$contact_actions.block.title}}" onclick="window.location.href='{{$contact_actions.block.url}}'; return false;">{{$contact_actions.block.label}}</a></li>
 							<li role="menuitem"><a  href="#" title="{{$contact_actions.ignore.title}}" onclick="window.location.href='{{$contact_actions.ignore.url}}'; return false;">{{$contact_actions.ignore.label}}</a></li>
-							<li role="menuitem"><a  href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li>
-							<li role="menuitem"><a  href="{{$contact_actions.delete.url}}" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li>
+							{{if $contact_actions.archive.url}}<li role="menuitem"><a  href="#" title="{{$contact_actions.archive.title}}" onclick="window.location.href='{{$contact_actions.archive.url}}'; return false;">{{$contact_actions.archive.label}}</a></li>{{/if}}
+							{{if $contact_actions.delete.url}}<li role="menuitem"><a  href="{{$contact_actions.delete.url}}" title="{{$contact_actions.delete.title}}" onclick="return confirmDelete();">{{$contact_actions.delete.label}}</a></li>{{/if}}
 						</ul>
 					</div>
 
@@ -64,6 +64,7 @@
 
 			<hr />
 
+			{{if $contact_settings_label}}
 			<h4 id="contact-edit-settings-label" class="fakelink" onclick="openClose('contact-edit-settings')">{{$contact_settings_label}}</h4>
 			<div id="contact-edit-settings">
 				<input type="hidden" name="contact_id" value="{{$contact_id}}">
@@ -99,8 +100,8 @@
 					<div id="contact-edit-profile-select-end"></div>
 				{{/if}}
 			</div>
-
 			<input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+			{{/if}}
 
 			<div class="contact-edit-submit-end clearfix"></div>
 
diff --git a/view/theme/vier/templates/profile_edit.tpl b/view/theme/vier/templates/profile_edit.tpl
index f1280f41c..0951847b0 100644
--- a/view/theme/vier/templates/profile_edit.tpl
+++ b/view/theme/vier/templates/profile_edit.tpl
@@ -434,8 +434,10 @@
         <input type="hidden" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
         <input type="hidden" id="likes-jot-text" name="likes" value="{{$likes.2}}" />
         <input type="hidden" id="dislikes-jot-text" name="dislikes" value="{{$dislikes.2}}" />
+        <input type="hidden" name="marital" id="profile-edit-marital" value="{{$marital.2}}" />
         <input type="hidden" name="with" id="profile-edit-with" value="{{$with.2}}" />
         <input type="hidden" name="howlong" id="profile-edit-howlong" value="{{$howlong.2}}" />
+        <input type="hidden" name="sexual" id="profile-edit-sexual" value="{{$sexual.2}}" />
         <input type="hidden" id="romance-jot-text" name="romance" value="{{$romance.2}}" />
         <input type="hidden" id="work-jot-text" name="work" value="{{$work.2}}" />
         <input type="hidden" id="education-jot-text" name="education" value="{{$education.2}}" />
diff --git a/view/theme/vier/templates/search_item.tpl b/view/theme/vier/templates/search_item.tpl
index f056b0f7a..c1383ba43 100644
--- a/view/theme/vier/templates/search_item.tpl
+++ b/view/theme/vier/templates/search_item.tpl
@@ -30,7 +30,7 @@
 		</div>
 		<div class="wall-item-content">
 			{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
-			{{$item.body}}
+			<div class="wall-item-body">{{$item.body}}</div>
 		</div>
 	</div>
 	<div class="wall-item-bottom">
diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
index d1588bde3..6c636d53b 100644
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -67,7 +67,7 @@
 
 		<div itemprop="description" class="wall-item-content">
 			{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}
-			<span class="e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
+			<span class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
 		</div>
 	</div>
 	<div class="wall-item-bottom">
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index c75259465..2533e50a8 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -12,15 +12,14 @@
 use Friendica\App;
 use Friendica\Content\ForumManager;
 use Friendica\Core\Addon;
-use Friendica\Core\L10n;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\GContact;
-use Friendica\Model\Profile;
-
-require_once "mod/proxy.php";
+use Friendica\Util\Proxy as ProxyUtils;
 
 function vier_init(App $a)
 {
@@ -28,7 +27,7 @@ function vier_init(App $a)
 
 	$a->set_template_engine('smarty3');
 
-	if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
+	if (!empty($a->argv[0]) && $a->argv[0] . defaults($a->argv, 1, '') === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
 		vier_community_info();
 
 		$a->page['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
@@ -103,7 +102,7 @@ EOT;
 
 	// Hide the left menu bar
 	/// @TODO maybe move this static array out where it should belong?
-	if (($a->page['aside'] == "") && in_array($a->argv[0], ["community", "events", "help", "manage", "notifications",
+	if (empty($a->page['aside']) && in_array($a->argv[0], ["community", "events", "help", "manage", "notifications",
 			"probe", "webfinger", "login", "invite", "credits"])) {
 		$a->page['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
 	}
@@ -146,16 +145,15 @@ function vier_community_info()
 		$r = GContact::suggestionQuery(local_user(), 0, 9);
 
 		$tpl = get_markup_template('ch_directory_item.tpl');
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$aside['$comunity_profiles_title'] = L10n::t('Community Profiles');
 			$aside['$comunity_profiles_items'] = [];
 
 			foreach ($r as $rr) {
 				$entry = replace_macros($tpl, [
 					'$id' => $rr['id'],
-					//'$profile_link' => Profile::zrl($rr['url']),
 					'$profile_link' => 'follow/?url='.urlencode($rr['url']),
-					'$photo' => proxy_url($rr['photo'], false, PROXY_SIZE_MICRO),
+					'$photo' => ProxyUtils::proxifyUrl($rr['photo'], false, ProxyUtils::SIZE_MICRO),
 					'$alt_text' => $rr['name'],
 				]);
 				$aside['$comunity_profiles_items'][] = $entry;
@@ -177,7 +175,7 @@ function vier_community_info()
 			9
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$aside['$lastusers_title'] = L10n::t('Last users');
 			$aside['$lastusers_items'] = [];
 
@@ -234,11 +232,11 @@ function vier_community_info()
 
 				$entry = [
 					'url'          => 'network?f=&cid=' . $contact['id'],
-					'external_url' => 'redir/' . $contact['id'],
+					'external_url' => Contact::magicLink($contact['url']),
 					'name'         => $contact['name'],
 					'cid'          => $contact['id'],
 					'selected'     => $selected,
-					'micro'        => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
+					'micro'        => System::removedBaseUrl(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
 					'id'           => ++$id,
 				];
 				$entries[] = $entry;
@@ -278,14 +276,14 @@ function vier_community_info()
 					$query .= ",";
 				}
 
-				$query .= "'".dbesc(normalise_link(trim($helper)))."'";
+				$query .= "'".DBA::escape(normalise_link(trim($helper)))."'";
 			}
 
 			$r = q("SELECT `url`, `name` FROM `gcontact` WHERE `nurl` IN (%s)", $query);
 		}
 
 		foreach ($r as $index => $helper) {
-			$r[$index]["url"] = Profile::zrl($helper["url"]);
+			$r[$index]["url"] = Contact::magicLink($helper["url"]);
 		}
 
 		$r[] = ["url" => "help/Quick-Start-guide", "name" => L10n::t("Quick Start")];
@@ -383,7 +381,7 @@ function vier_community_info()
 
 		$tpl = get_markup_template('ch_connectors.tpl');
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$con_services = [];
 			$con_services['title'] = ["", L10n::t('Connect Services'), "", ""];
 			$aside['$con_services'] = $con_services;