Merge pull request #3779 from annando/event-data

export event data for display purposes

diff --git a/boot.php b/boot.php
index 5b82c8b8f28d43cf0f2d7bf224375e9f6d2c2d3b..899a6bd119ca4b8cbbb2bd9b13a95c49ea723892 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -510,6 +510,11 @@ function startup() {
  */
 function get_app() {
        global $a;
+
+       if (empty($a)) {
+               $a = new App(dirname(__DIR__));
+       }
+
        return $a;
 }
 

diff --git a/doc/Move-Account.md b/doc/Move-Account.md
index ef8509d8c10833e1034f084bb7920abdf16f37a5..c34a93e94950135b6c1b6f0f5f92cc164e62de53 100644 (file)
--- a/doc/Move-Account.md
+++ b/doc/Move-Account.md
@@ -21,9 +21,11 @@ Friendica will recreate your account on the new server, with your contacts and g
 A message is sent to Friendica contacts, to inform them about your move:\r
 If your contacts are runnning on an updated server, your details on their side will be automatically updated.\r
 \r
-GNU Social/Diaspora contacts\r
+GNU Social contacts\r
 ---\r
-Contacts on GNU Social or Diaspora will be archived, as we can't inform them about your move.\r
+Contacts on GNU Social will be archived, as we can't inform them about your move.\r
 You should ask them to remove your contact from their lists and re-add you, and you should do the same with their contact.\r
 \r
-Support for the Diaspora account moving is scheduled for the 3.6 release of Friendica. \r
+Diaspora contacts\r
+---\r
+Newer Diaspora servers are able to process "account migration" messages.\r

diff --git a/doc/de/Move-Account.md b/doc/de/Move-Account.md
index 14de05438cd93267526967e01308ddd47e52a509..1b0c7eb8fbd8bdcf23203f1fc7cae98f43ab032c 100644 (file)
--- a/doc/de/Move-Account.md
+++ b/doc/de/Move-Account.md
@@ -26,7 +26,9 @@ Friendica wird nun deinen Account auf dem neuen Server wiederherstellen, mit all
 An deine Friendica Kontakte wird außerdem eine Nachricht gesendet um sie über deine neue Adresse zu informieren.\r
 Wenn deine Kontakte ihren Account auf einem aktuellen Server haben werden deine Kontaktdetails automatisch aktualisiert.\r
 \r
-Kontakte auf GNU Social oder Diaspora werden archiviert, da wir ihnen keine Information über deinen Umzug zukommen lassen können.\r
+Neuere Diaspora Server unterstützen ebenfalls eine Umzugsbenachrichtigung.\r
+\r
+Kontakte auf GNU Social werden archiviert, da wir ihnen keine Information über deinen Umzug zukommen lassen können.\r
 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.\r
 \r
 Nach dem Umzug wird dein Account auf dem alten Server nicht mehr zuverlässig funktionieren und sollte deshalb gelöscht werden.\r

diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php
index 490ea0d1cb8e44982100690be9a92d229d456abb..14f5dcfe0c797271ab5d09720223c2a8675d82a8 100755 (executable)
--- a/include/auth_ejabberd.php
+++ b/include/auth_ejabberd.php
@@ -47,18 +47,16 @@ $directory = realpath($directory."/..");
 chdir($directory);
 require_once("boot.php");
 
-global $a, $db;
+global $a;
 
-if (is_null($a)) {
+if (empty($a)) {
        $a = new App(dirname(__DIR__));
 }
 
-if (is_null($db)) {
-       @include(".htconfig.php");
-       require_once("include/dba.php");
-       $db = new dba($db_host, $db_user, $db_pass, $db_data);
-       unset($db_host, $db_user, $db_pass, $db_data);
-};
+@include(".htconfig.php");
+require_once("include/dba.php");
+dba::connect($db_host, $db_user, $db_pass, $db_data);
+unset($db_host, $db_user, $db_pass, $db_data);
 
 // the logfile to which to write, should be writeable by the user which is running the server
 $sLogFile = get_config('jabber','logfile');
@@ -81,8 +79,6 @@ class exAuth {
         * @param boolean $bDebug Debug mode
         */
        public function __construct($sLogFile, $bDebug) {
-               global $db;
-
                // setter
                $this->sLogFile         = $sLogFile;
                $this->bDebug           = $bDebug;
@@ -96,7 +92,7 @@ class exAuth {
                // We are connected to the SQL server and are having a log file.
                do {
                        // Quit if the database connection went down
-                       if (!$db->connected()) {
+                       if (!dba::connected()) {
                                $this->writeDebugLog("[debug] the database connection went down");
                                return;
                        }

diff --git a/include/cli_startup.php b/include/cli_startup.php
index 01ee90f421b538a9e3231e57c67e7f8f38087965..645e5eddd8544e8c29b50478834ec1de34dee874 100644 (file)
--- a/include/cli_startup.php
+++ b/include/cli_startup.php
@@ -8,19 +8,16 @@ require_once('boot.php');
 // Everything we need to boot standalone 'background' processes
 
 function cli_startup() {
+       global $a;
 
-       global $a, $db;
-
-       if (is_null($a)) {
+       if (empty($a)) {
                $a = new App(dirname(__DIR__));
        }
 
-       if (is_null($db)) {
-               @include(".htconfig.php");
-               require_once("dba.php");
-               $db = new dba($db_host, $db_user, $db_pass, $db_data);
-               unset($db_host, $db_user, $db_pass, $db_data);
-       };
+       @include(".htconfig.php");
+       require_once("dba.php");
+       dba::connect($db_host, $db_user, $db_pass, $db_data);
+       unset($db_host, $db_user, $db_pass, $db_data);
 
        require_once('include/session.php');
 
@@ -29,5 +26,4 @@ function cli_startup() {
        $a->set_baseurl(get_config('system','url'));
 
        load_hooks();
-
 }

diff --git a/include/dba.php b/include/dba.php
index a10f18aba794e51a6544480692c319d79c1f9f42..42f0614c80a23fecb82233a106eaffdac77ff133 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -11,21 +11,22 @@ require_once('include/datetime.php');
  */
 
 class dba {
-
-       private $debug = 0;
-       private $db;
-       private $result;
-       private $driver;
-       public  $connected = false;
-       public  $error = false;
-       public  $errorno = 0;
-       public  $affected_rows = 0;
-       private $_server_info = '';
+       public static $connected = true;
+
+       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 $dbo;
        private static $relation = array();
 
-       function __construct($serveraddr, $user, $pass, $db, $install = false) {
+       public static function connect($serveraddr, $user, $pass, $db, $install = false) {
+               if (!is_null(self::$db)) {
+                       return true;
+               }
+
                $a = get_app();
 
                $stamp1 = microtime(true);
@@ -45,24 +46,24 @@ class dba {
                $db = trim($db);
 
                if (!(strlen($server) && strlen($user))) {
-                       $this->connected = false;
-                       $this->db = null;
-                       return;
+                       self::$connected = false;
+                       self::$db = null;
+                       return false;
                }
 
                if ($install) {
                        if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
                                if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
-                                       $this->error = sprintf(t('Cannot locate DNS info for database server \'%s\''), $server);
-                                       $this->connected = false;
-                                       $this->db = null;
-                                       return;
+                                       self::$error = sprintf(t('Cannot locate DNS info for database server \'%s\''), $server);
+                                       self::$connected = false;
+                                       self::$db = null;
+                                       return false;
                                }
                        }
                }
 
                if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
-                       $this->driver = 'pdo';
+                       self::$driver = 'pdo';
                        $connect = "mysql:host=".$server.";dbname=".$db;
 
                        if (isset($port)) {
@@ -73,47 +74,47 @@ class dba {
                                $connect .= ";charset=".$a->config["system"]["db_charset"];
                        }
                        try {
-                               $this->db = @new PDO($connect, $user, $pass);
-                               $this->connected = true;
+                               self::$db = @new PDO($connect, $user, $pass);
+                               self::$connected = true;
                        } catch (PDOException $e) {
-                               $this->connected = false;
+                               self::$connected = false;
                        }
                }
 
-               if (!$this->connected && class_exists('mysqli')) {
-                       $this->driver = 'mysqli';
-                       $this->db = @new mysqli($server, $user, $pass, $db, $port);
+               if (!self::$connected && class_exists('mysqli')) {
+                       self::$driver = 'mysqli';
+                       self::$db = @new mysqli($server, $user, $pass, $db, $port);
                        if (!mysqli_connect_errno()) {
-                               $this->connected = true;
+                               self::$connected = true;
 
                                if (isset($a->config["system"]["db_charset"])) {
-                                       $this->db->set_charset($a->config["system"]["db_charset"]);
+                                       self::$db->set_charset($a->config["system"]["db_charset"]);
                                }
                        }
                }
 
-               if (!$this->connected && function_exists('mysql_connect')) {
-                       $this->driver = 'mysql';
-                       $this->db = mysql_connect($serveraddr, $user, $pass);
-                       if ($this->db && mysql_select_db($db, $this->db)) {
-                               $this->connected = true;
+               if (!self::$connected && function_exists('mysql_connect')) {
+                       self::$driver = 'mysql';
+                       self::$db = mysql_connect($serveraddr, $user, $pass);
+                       if (self::$db && mysql_select_db($db, self::$db)) {
+                               self::$connected = true;
 
                                if (isset($a->config["system"]["db_charset"])) {
-                                       mysql_set_charset($a->config["system"]["db_charset"], $this->db);
+                                       mysql_set_charset($a->config["system"]["db_charset"], self::$db);
                                }
                        }
                }
 
                // No suitable SQL driver was found.
-               if (!$this->connected) {
-                       $this->db = null;
+               if (!self::$connected) {
+                       self::$db = null;
                        if (!$install) {
                                system_unavailable();
                        }
                }
                $a->save_timestamp($stamp1, "network");
 
-               self::$dbo = $this;
+               return true;
        }
 
        /**
@@ -124,21 +125,21 @@ class dba {
         *
         * @return string
         */
-       public function server_info() {
-               if ($this->_server_info == '') {
-                       switch ($this->driver) {
+       public static function server_info() {
+               if (self::$_server_info == '') {
+                       switch (self::$driver) {
                                case 'pdo':
-                                       $this->_server_info = $this->db->getAttribute(PDO::ATTR_SERVER_VERSION);
+                                       self::$_server_info = self::$db->getAttribute(PDO::ATTR_SERVER_VERSION);
                                        break;
                                case 'mysqli':
-                                       $this->_server_info = $this->db->server_info;
+                                       self::$_server_info = self::$db->server_info;
                                        break;
                                case 'mysql':
-                                       $this->_server_info = mysql_get_server_info($this->db);
+                                       self::$_server_info = mysql_get_server_info(self::$db);
                                        break;
                        }
                }
-               return $this->_server_info;
+               return self::$_server_info;
        }
 
        /**
@@ -146,10 +147,10 @@ class dba {
         *
         * @return string
         */
-       public function database_name() {
-               $r = $this->q("SELECT DATABASE() AS `db`");
-
-               return $r[0]['db'];
+       public static function database_name() {
+               $ret = self::p("SELECT DATABASE() AS `db`");
+                $data = self::inArray($ret);
+               return $data[0]['db'];
        }
 
        /**
@@ -157,7 +158,7 @@ class dba {
         *
         * @param string $query The database query that will be analyzed
         */
-       public function log_index($query) {
+       private static function log_index($query) {
                $a = get_app();
 
                if (empty($a->config["system"]["db_log_index"])) {
@@ -174,7 +175,7 @@ class dba {
                        return;
                }
 
-               $r = $this->q("EXPLAIN ".$query);
+               $r = self::p("EXPLAIN ".$query);
                if (!dbm::is_result($r)) {
                        return;
                }
@@ -182,7 +183,7 @@ class dba {
                $watchlist = explode(',', $a->config["system"]["db_log_index_watch"]);
                $blacklist = explode(',', $a->config["system"]["db_log_index_blacklist"]);
 
-               foreach ($r AS $row) {
+               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"])));
@@ -209,79 +210,33 @@ class dba {
                }
        }
 
-       /**
-        * @brief execute SQL query - deprecated
-        *
-        * Please use the dba:: functions instead:
-        * dba::select, dba::exists, dba::insert
-        * dba::delete, dba::update, dba::p, dba::e
-        *
-        * @param string $sql SQL query
-        * @return array Query array
-        */
-       public function q($sql) {
-               $ret = self::p($sql);
-
-               if (is_bool($ret)) {
-                       return $ret;
-               }
-
-               $columns = self::columnCount($ret);
-
-               $data = self::inArray($ret);
-
-               if ((count($data) == 0) && ($columns == 0)) {
-                       return true;
-               }
-
-               return $data;
-       }
-
-       public function escape($str) {
-               if ($this->db && $this->connected) {
-                       switch ($this->driver) {
-                               case 'pdo':
-                                       return substr(@$this->db->quote($str, PDO::PARAM_STR), 1, -1);
-                               case 'mysqli':
-                                       return @$this->db->real_escape_string($str);
-                               case 'mysql':
-                                       return @mysql_real_escape_string($str,$this->db);
-                       }
+       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);
+                       case 'mysql':
+                               return @mysql_real_escape_string($str,self::$db);
                }
        }
 
-       function connected() {
-               switch ($this->driver) {
+       public static function connected() {
+               switch (self::$driver) {
                        case 'pdo':
                                // Not sure if this really is working like expected
-                               $connected = ($this->db->getAttribute(PDO::ATTR_CONNECTION_STATUS) != "");
+                               $connected = (self::$db->getAttribute(PDO::ATTR_CONNECTION_STATUS) != "");
                                break;
                        case 'mysqli':
-                               $connected = $this->db->ping();
+                               $connected = self::$db->ping();
                                break;
                        case 'mysql':
-                               $connected = mysql_ping($this->db);
+                               $connected = mysql_ping(self::$db);
                                break;
                }
                return $connected;
        }
 
-       function __destruct() {
-               if ($this->db) {
-                       switch ($this->driver) {
-                               case 'pdo':
-                                       $this->db = null;
-                                       break;
-                               case 'mysqli':
-                                       $this->db->close();
-                                       break;
-                               case 'mysql':
-                                       mysql_close($this->db);
-                                       break;
-                       }
-               }
-       }
-
        /**
         * @brief Replaces ANY_VALUE() function by MIN() function,
         *  if the database server does not support ANY_VALUE().
@@ -293,8 +248,8 @@ class dba {
         * @param string $sql An SQL string without the values
         * @return string The input SQL string modified if necessary.
         */
-       public function any_value_fallback($sql) {
-               $server_info = $this->server_info();
+       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);
@@ -311,7 +266,7 @@ class dba {
         * @param string $sql An SQL string without the values
         * @return string The input SQL string modified if necessary.
         */
-       public function clean_query($sql) {
+       public static function clean_query($sql) {
                $search = array("\t", "\n", "\r", "  ");
                $replace = array(' ', ' ', ' ', ' ');
                do {
@@ -336,7 +291,7 @@ class dba {
                        if (is_int($args[$param]) || is_float($args[$param])) {
                                $replace = intval($args[$param]);
                        } else {
-                               $replace = "'".self::$dbo->escape($args[$param])."'";
+                               $replace = "'".self::escape($args[$param])."'";
                        }
 
                        $pos = strpos($sql, '?', $offset);
@@ -392,7 +347,7 @@ class dba {
                        $args[++$i] = $param;
                }
 
-               if (!self::$dbo || !self::$dbo->connected) {
+               if (!self::$connected) {
                        return false;
                }
 
@@ -401,8 +356,8 @@ class dba {
                        logger('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), LOGGER_DEBUG);
                }
 
-               $sql = self::$dbo->clean_query($sql);
-               $sql = self::$dbo->any_value_fallback($sql);
+               $sql = self::clean_query($sql);
+               $sql = self::any_value_fallback($sql);
 
                $orig_sql = $sql;
 
@@ -410,9 +365,9 @@ class dba {
                        $sql = "/*".System::callstack()." */ ".$sql;
                }
 
-               self::$dbo->error = '';
-               self::$dbo->errorno = 0;
-               self::$dbo->affected_rows = 0;
+               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);
@@ -426,25 +381,25 @@ class dba {
                // We are having an own error logging in the function "e"
                $called_from_e = ($called_from['function'] == 'e');
 
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
                                // If there are no arguments we use "query"
                                if (count($args) == 0) {
-                                       if (!$retval = self::$dbo->db->query($sql)) {
-                                               $errorInfo = self::$dbo->db->errorInfo();
-                                               self::$dbo->error = $errorInfo[2];
-                                               self::$dbo->errorno = $errorInfo[1];
+                                       if (!$retval = self::$db->query($sql)) {
+                                               $errorInfo = self::$db->errorInfo();
+                                               self::$error = $errorInfo[2];
+                                               self::$errorno = $errorInfo[1];
                                                $retval = false;
                                                break;
                                        }
-                                       self::$dbo->affected_rows = $retval->rowCount();
+                                       self::$affected_rows = $retval->rowCount();
                                        break;
                                }
 
-                               if (!$stmt = self::$dbo->db->prepare($sql)) {
-                                       $errorInfo = self::$dbo->db->errorInfo();
-                                       self::$dbo->error = $errorInfo[2];
-                                       self::$dbo->errorno = $errorInfo[1];
+                               if (!$stmt = self::$db->prepare($sql)) {
+                                       $errorInfo = self::$db->errorInfo();
+                                       self::$error = $errorInfo[2];
+                                       self::$errorno = $errorInfo[1];
                                        $retval = false;
                                        break;
                                }
@@ -455,12 +410,12 @@ class dba {
 
                                if (!$stmt->execute()) {
                                        $errorInfo = $stmt->errorInfo();
-                                       self::$dbo->error = $errorInfo[2];
-                                       self::$dbo->errorno = $errorInfo[1];
+                                       self::$error = $errorInfo[2];
+                                       self::$errorno = $errorInfo[1];
                                        $retval = false;
                                } else {
                                        $retval = $stmt;
-                                       self::$dbo->affected_rows = $retval->rowCount();
+                                       self::$affected_rows = $retval->rowCount();
                                }
                                break;
                        case 'mysqli':
@@ -471,26 +426,26 @@ class dba {
 
                                // The fallback routine is called as well when there are no arguments
                                if (!$can_be_prepared || (count($args) == 0)) {
-                                       $retval = self::$dbo->db->query(self::replace_parameters($sql, $args));
-                                       if (self::$dbo->db->errno) {
-                                               self::$dbo->error = self::$dbo->db->error;
-                                               self::$dbo->errorno = self::$dbo->db->errno;
+                                       $retval = self::$db->query(self::replace_parameters($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::$dbo->affected_rows = $retval->num_rows;
+                                                       self::$affected_rows = $retval->num_rows;
                                                } else {
-                                                       self::$dbo->affected_rows = self::$dbo->db->affected_rows;
+                                                       self::$affected_rows = self::$db->affected_rows;
                                                }
                                        }
                                        break;
                                }
 
-                               $stmt = self::$dbo->db->stmt_init();
+                               $stmt = self::$db->stmt_init();
 
                                if (!$stmt->prepare($sql)) {
-                                       self::$dbo->error = $stmt->error;
-                                       self::$dbo->errorno = $stmt->errno;
+                                       self::$error = $stmt->error;
+                                       self::$errorno = $stmt->errno;
                                        $retval = false;
                                        break;
                                }
@@ -516,44 +471,44 @@ class dba {
                                }
 
                                if (!$stmt->execute()) {
-                                       self::$dbo->error = self::$dbo->db->error;
-                                       self::$dbo->errorno = self::$dbo->db->errno;
+                                       self::$error = self::$db->error;
+                                       self::$errorno = self::$db->errno;
                                        $retval = false;
                                } else {
                                        $stmt->store_result();
                                        $retval = $stmt;
-                                       self::$dbo->affected_rows = $retval->affected_rows;
+                                       self::$affected_rows = $retval->affected_rows;
                                }
                                break;
                        case 'mysql':
                                // For the old "mysql" functions we cannot use prepared statements
-                               $retval = mysql_query(self::replace_parameters($sql, $args), self::$dbo->db);
-                               if (mysql_errno(self::$dbo->db)) {
-                                       self::$dbo->error = mysql_error(self::$dbo->db);
-                                       self::$dbo->errorno = mysql_errno(self::$dbo->db);
+                               $retval = mysql_query(self::replace_parameters($sql, $args), self::$db);
+                               if (mysql_errno(self::$db)) {
+                                       self::$error = mysql_error(self::$db);
+                                       self::$errorno = mysql_errno(self::$db);
                                } else {
-                                       self::$dbo->affected_rows = mysql_affected_rows($retval);
+                                       self::$affected_rows = mysql_affected_rows($retval);
 
                                        // Due to missing mysql_* support this here wasn't tested at all
                                        // See here: http://php.net/manual/en/function.mysql-num-rows.php
-                                       if (self::$dbo->affected_rows <= 0) {
-                                               self::$dbo->affected_rows = mysql_num_rows($retval);
+                                       if (self::$affected_rows <= 0) {
+                                               self::$affected_rows = mysql_num_rows($retval);
                                        }
                                }
                                break;
                }
 
                // We are having an own error logging in the function "e"
-               if ((self::$dbo->errorno != 0) && !$called_from_e) {
+               if ((self::$errorno != 0) && !$called_from_e) {
                        // We have to preserve the error code, somewhere in the logging it get lost
-                       $error = self::$dbo->error;
-                       $errorno = self::$dbo->errorno;
+                       $error = self::$error;
+                       $errorno = self::$errorno;
 
-                       logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n".
+                       logger('DB Error '.self::$errorno.': '.self::$error."\n".
                                System::callstack(8)."\n".self::replace_parameters($sql, $params));
 
-                       self::$dbo->error = $error;
-                       self::$dbo->errorno = $errorno;
+                       self::$error = $error;
+                       self::$errorno = $errorno;
                }
 
                $a->save_timestamp($stamp1, 'database');
@@ -607,18 +562,18 @@ class dba {
 
                        self::close($stmt);
 
-               } while ((self::$dbo->errorno == 1213) && (--$timeout > 0));
+               } while ((self::$errorno == 1213) && (--$timeout > 0));
 
-               if (self::$dbo->errorno != 0) {
+               if (self::$errorno != 0) {
                        // We have to preserve the error code, somewhere in the logging it get lost
-                       $error = self::$dbo->error;
-                       $errorno = self::$dbo->errorno;
+                       $error = self::$error;
+                       $errorno = self::$errorno;
 
-                       logger('DB Error '.self::$dbo->errorno.': '.self::$dbo->error."\n".
+                       logger('DB Error '.self::$errorno.': '.self::$error."\n".
                                System::callstack(8)."\n".self::replace_parameters($sql, $params));
 
-                       self::$dbo->error = $error;
-                       self::$dbo->errorno = $errorno;
+                       self::$error = $error;
+                       self::$errorno = $errorno;
                }
 
                $a->save_timestamp($stamp, "database_write");
@@ -690,7 +645,7 @@ class dba {
         * @return int Number of rows
         */
        public static function affected_rows() {
-               return self::$dbo->affected_rows;
+               return self::$affected_rows;
        }
 
        /**
@@ -703,7 +658,7 @@ class dba {
                if (!is_object($stmt)) {
                        return 0;
                }
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
                                return $stmt->columnCount();
                        case 'mysqli':
@@ -723,7 +678,7 @@ class dba {
                if (!is_object($stmt)) {
                        return 0;
                }
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
                                return $stmt->rowCount();
                        case 'mysqli':
@@ -745,7 +700,7 @@ class dba {
                        return false;
                }
 
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
                                return $stmt->fetch(PDO::FETCH_ASSOC);
                        case 'mysqli':
@@ -781,7 +736,7 @@ class dba {
                                }
                                return $columns;
                        case 'mysql':
-                               return mysql_fetch_array(self::$dbo->result, MYSQL_ASSOC);
+                               return mysql_fetch_array($stmt, MYSQL_ASSOC);
                }
        }
 
@@ -795,7 +750,7 @@ class dba {
         * @return boolean was the insert successfull?
         */
        public static function insert($table, $param, $on_duplicate_update = false) {
-               $sql = "INSERT INTO `".self::$dbo->escape($table)."` (`".implode("`, `", array_keys($param))."`) VALUES (".
+               $sql = "INSERT INTO `".self::escape($table)."` (`".implode("`, `", array_keys($param))."`) VALUES (".
                        substr(str_repeat("?, ", count($param)), 0, -2).")";
 
                if ($on_duplicate_update) {
@@ -814,15 +769,15 @@ class dba {
         * @return integer Last inserted id
         */
        public static function lastInsertId() {
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
-                               $id = self::$dbo->db->lastInsertId();
+                               $id = self::$db->lastInsertId();
                                break;
                        case 'mysqli':
-                               $id = self::$dbo->db->insert_id;
+                               $id = self::$db->insert_id;
                                break;
                        case 'mysql':
-                               $id = mysql_insert_id(self::$dbo);
+                               $id = mysql_insert_id(self::$db);
                                break;
                }
                return $id;
@@ -840,7 +795,7 @@ class dba {
        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::$dbo->escape($table)."` WRITE");
+               $success = self::e("LOCK TABLES `".self::escape($table)."` WRITE");
                if (!$success) {
                        self::e("SET autocommit=1");
                } else {
@@ -937,7 +892,6 @@ class dba {
         * @return boolean|array was the delete successfull? When $in_process is set: deletion data
         */
        public static function delete($table, $param, $in_process = false, &$callstack = array()) {
-
                $commands = array();
 
                // Create a key for the loop prevention
@@ -950,7 +904,7 @@ class dba {
 
                $callstack[$key] = true;
 
-               $table = self::$dbo->escape($table);
+               $table = self::escape($table);
 
                $commands[$key] = array('table' => $table, 'param' => $param);
 
@@ -1100,8 +1054,7 @@ class dba {
         * @return boolean was the update successfull?
         */
        public static function update($table, $fields, $condition, $old_fields = array()) {
-
-               $table = self::$dbo->escape($table);
+               $table = self::escape($table);
 
                if (count($condition) > 0) {
                        $array_element = each($condition);
@@ -1265,7 +1218,7 @@ class dba {
         * @return string Error number (0 if no error)
         */
        public static function errorNo() {
-               return self::$dbo->errorno;
+               return self::$errorno;
        }
 
        /**
@@ -1274,7 +1227,7 @@ class dba {
         * @return string Error message ('' if no error)
         */
        public static function errorMessage() {
-               return self::$dbo->error;
+               return self::$error;
        }
 
        /**
@@ -1288,7 +1241,7 @@ class dba {
                        return false;
                }
 
-               switch (self::$dbo->driver) {
+               switch (self::$driver) {
                        case 'pdo':
                                return $stmt->closeCursor();
                        case 'mysqli':
@@ -1301,10 +1254,8 @@ class dba {
 }
 
 function dbesc($str) {
-       global $db;
-
-       if ($db && $db->connected) {
-               return($db->escape($str));
+       if (dba::$connected) {
+               return(dba::escape($str));
        } else {
                return(str_replace("'","\\'",$str));
        }
@@ -1321,17 +1272,15 @@ function dbesc($str) {
  * @return array Query array
  */
 function q($sql) {
-       global $db;
-
        $args = func_get_args();
        unset($args[0]);
 
-       if (!$db || !$db->connected) {
+       if (!dba::$connected) {
                return false;
        }
 
-       $sql = $db->clean_query($sql);
-       $sql = $db->any_value_fallback($sql);
+       $sql = dba::clean_query($sql);
+       $sql = dba::any_value_fallback($sql);
 
        $stmt = @vsprintf($sql, $args);
 

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 4d615a2f14ba16dcd8929cb3da4fac6c8507de45..b8cf8e57ac4881f846cc03a4ec9f94c5c5cc1edf 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -17,10 +17,8 @@ const DB_UPDATE_FAILED = 2;      // Database check failed
  * Converts all tables from MyISAM to InnoDB
  */
 function convert_to_innodb() {
-       global $db;
-
        $r = q("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `engine` = 'MyISAM' AND `table_schema` = '%s'",
-               dbesc($db->database_name()));
+               dbesc(dba::database_name()));
 
        if (!dbm::is_result($r)) {
                echo t('There are no tables on MyISAM.')."\n";
@@ -33,7 +31,7 @@ function convert_to_innodb() {
 
                $result = dba::e($sql);
                if (!dbm::is_result($result)) {
-                       print_update_error($db, $sql);
+                       print_update_error($sql);
                }
        }
 }
@@ -188,20 +186,19 @@ function print_structure($database) {
 /**
  * @brief Print out database error messages
  *
- * @param object $db Database object
  * @param string $message Message to be added to the error message
  *
  * @return string Error message
  */
-function print_update_error($db, $message) {
+function print_update_error($message) {
        echo sprintf(t("\nError %d occurred during database update:\n%s\n"),
-               $db->errorno, $db->error);
+               dba::errorNo(), dba::errorMessage());
 
        return t('Errors encountered performing database changes: ').$message.EOL;
 }
 
 function update_structure($verbose, $action, $tables=null, $definition=null) {
-       global $a, $db;
+       global $a;
 
        if ($action) {
                Config::set('system', 'maintenance', 1);
@@ -234,8 +231,8 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
        }
 
        // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
-       if ((version_compare($db->server_info(), '5.7.4') >= 0) &&
-               !(strpos($db->server_info(), 'MariaDB') !== false)) {
+       if ((version_compare(dba::server_info(), '5.7.4') >= 0) &&
+               !(strpos(dba::server_info(), 'MariaDB') !== false)) {
                $ignore = '';
        } else {
                $ignore = ' IGNORE';
@@ -249,7 +246,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                if (!isset($database[$name])) {
                        $r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']);
                        if (!dbm::is_result($r)) {
-                               $errors .= print_update_error($db, $name);
+                               $errors .= print_update_error($name);
                        }
                        $is_new_table = True;
                } else {
@@ -446,7 +443,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                        } else {
                                                $r = dba::e("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
                                                if (!dbm::is_result($r)) {
-                                                       $errors .= print_update_error($db, $sql3);
+                                                       $errors .= print_update_error($sql3);
                                                        return $errors;
                                                }
                                        }
@@ -454,7 +451,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 
                                $r = @dba::e($sql3);
                                if (!dbm::is_result($r)) {
-                                       $errors .= print_update_error($db, $sql3);
+                                       $errors .= print_update_error($sql3);
                                }
                                if ($is_unique) {
                                        if ($ignore != "") {
@@ -462,17 +459,17 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                        } else {
                                                $r = dba::e("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
                                                if (!dbm::is_result($r)) {
-                                                       $errors .= print_update_error($db, $sql3);
+                                                       $errors .= print_update_error($sql3);
                                                        return $errors;
                                                }
                                                $r = dba::e("DROP TABLE `".$name."`;");
                                                if (!dbm::is_result($r)) {
-                                                       $errors .= print_update_error($db, $sql3);
+                                                       $errors .= print_update_error($sql3);
                                                        return $errors;
                                                }
                                                $r = dba::e("RENAME TABLE `".$temp_name."` TO `".$name."`;");
                                                if (!dbm::is_result($r)) {
-                                                       $errors .= print_update_error($db, $sql3);
+                                                       $errors .= print_update_error($sql3);
                                                        return $errors;
                                                }
                                        }
@@ -522,7 +519,7 @@ function db_field_command($parameters, $create = true) {
 }
 
 function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
-       global $a, $db;
+       global $a;
 
        $r = true;
 
@@ -1761,18 +1758,16 @@ function db_definition() {
  * run from command line
  */
 function dbstructure_run(&$argv, &$argc) {
-       global $a, $db;
+       global $a;
 
-       if (is_null($a)) {
+       if (empty($a)) {
                $a = new App(dirname(__DIR__));
        }
 
-       if (is_null($db)) {
-               @include ".htconfig.php";
-               require_once "include/dba.php";
-               $db = new dba($db_host, $db_user, $db_pass, $db_data);
-               unset($db_host, $db_user, $db_pass, $db_data);
-       }
+       @include ".htconfig.php";
+       require_once "include/dba.php";
+       dba::connect($db_host, $db_user, $db_pass, $db_data);
+       unset($db_host, $db_user, $db_pass, $db_data);
 
        if ($argc == 2) {
                switch ($argv[1]) {

diff --git a/include/delivery.php b/include/delivery.php
index f95caed295f8bef2820cd8356675ee9fd913b53f..cddc9cb004006eb15d17c3bc0241734de6e1315a 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -508,6 +508,9 @@ function delivery_run(&$argv, &$argc){
                                        logger('diaspora retract: '.$loc);
                                        Diaspora::send_retraction($target_item,$owner,$contact,$public_message);
                                        break;
+                               } elseif ($relocate) {
+                                       Diaspora::sendAccountMigration($owner, $contact, $uid);
+                                       break;
                                } elseif ($followup) {
                                        // send comments and likes to owner to relay
                                        logger('diaspora followup: '.$loc);

diff --git a/include/diaspora.php b/include/diaspora.php
index 16bce93e11de08a4b57c95ba7c0a871a781b613a..2e165a05b5d43038767a3493ab9e27668d3c7635 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -11,6 +11,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 
 require_once 'include/items.php';
 require_once 'include/bb2diaspora.php';
@@ -2958,6 +2959,32 @@ class Diaspora {
                return $return_code;
        }
 
+       /**
+        * @brief sends an account migration
+        *
+        * @param array $owner the array of the item owner
+        * @param array $contact Target of the communication
+        * @param int $uid User ID
+        *
+        * @return int The result of the transmission
+        */
+       public static function sendAccountMigration($owner, $contact, $uid) {
+
+               $old_handle = PConfig::get($uid, 'system', 'previous_addr');
+               $profile = self::createProfileData($uid);
+
+               $signed_text = 'AccountMigration:'.$old_handle.':'.$profile['author'];
+               $signature = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
+
+               $message = array("author" => $old_handle,
+                               "profile" => $profile,
+                               "signature" => $signature);
+
+               logger("Send account migration ".print_r($message, true), LOGGER_DEBUG);
+
+               return self::build_and_transmit($owner, $contact, "account_migration", $message);
+       }
+
        /**
         * @brief Sends a "share" message
         *
@@ -3648,25 +3675,13 @@ class Diaspora {
        }
 
        /**
-        * @brief Sends profile data
+        * @brief Create profile data
         *
         * @param int $uid The user id
+        *
+        * @return array The profile data
         */
-       public static function send_profile($uid, $recips = false) {
-
-               if (!$uid)
-                       return;
-
-               if (!$recips)
-                       $recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
-                               AND `uid` = %d AND `rel` != %d",
-                               dbesc(NETWORK_DIASPORA),
-                               intval($uid),
-                               intval(CONTACT_IS_SHARING)
-                       );
-               if (!$recips)
-                       return;
-
+       private static function createProfileData($uid) {
                $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.*, `user`.`prvkey` AS `uprvkey`, `contact`.`addr`
                        FROM `profile`
                        INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
@@ -3675,8 +3690,9 @@ class Diaspora {
                        intval($uid)
                );
 
-               if (!$r)
-                       return;
+               if (!$r) {
+                       return array();
+               }
 
                $profile = $r[0];
 
@@ -3714,7 +3730,7 @@ class Diaspora {
                        $tags = trim($tags);
                }
 
-               $message = array("author" => $handle,
+               return array("author" => $handle,
                                "first_name" => $first,
                                "last_name" => $last,
                                "image_url" => $large,
@@ -3727,6 +3743,29 @@ class Diaspora {
                                "searchable" => $searchable,
                                "nsfw" => "false",
                                "tag_string" => $tags);
+       }
+
+       /**
+        * @brief Sends profile data
+        *
+        * @param int $uid The user id
+        */
+       public static function send_profile($uid, $recips = false) {
+
+               if (!$uid)
+                       return;
+
+               if (!$recips)
+                       $recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
+                               AND `uid` = %d AND `rel` != %d",
+                               dbesc(NETWORK_DIASPORA),
+                               intval($uid),
+                               intval(CONTACT_IS_SHARING)
+                       );
+               if (!$recips)
+                       return;
+
+               $message = self::createProfileData($uid);
 
                foreach ($recips as $recip) {
                        logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG);

diff --git a/include/notifier.php b/include/notifier.php
index e5e49cf3005fd23d0687b2a6b0fdf2933f059fed..e5ead46e36296e0c74a6cb9c55348c0cb324b8d7 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -149,7 +149,8 @@ function notifier_run(&$argv, &$argc){
                $relocate = true;
                $uid = $item_id;
 
-               $recipients_relocate = q("SELECT * FROM contact WHERE uid = %d  AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
+               $recipients_relocate = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND `network` IN ('%s', '%s')",
+                                       intval($uid), NETWORK_DFRN, NETWORK_DIASPORA);
        } else {
                // find ancestors
                $r = q("SELECT * FROM `item` WHERE `id` = %d AND visible = 1 AND moderated = 0 LIMIT 1",

diff --git a/include/poller.php b/include/poller.php
index d3150421143a5521de4ab0f4960b61a163b7a96f..b8f0d7189fdf76f761966c255e79d6e3ef800956 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -19,15 +19,17 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 require_once("boot.php");
 
 function poller_run($argv, $argc){
-       global $a, $db, $poller_up_start, $poller_db_duration;
+       global $a, $poller_up_start, $poller_db_duration;
 
        $poller_up_start = microtime(true);
 
-       $a = new App(dirname(__DIR__));
+       if (empty($a)) {
+               $a = new App(dirname(__DIR__));
+       }
 
-       @include(".htconfig.php");
-       require_once("include/dba.php");
-       $db = new dba($db_host, $db_user, $db_pass, $db_data);
+       require_once ".htconfig.php";
+       require_once "include/dba.php";
+       dba::connect($db_host, $db_user, $db_pass, $db_data);
        unset($db_host, $db_user, $db_pass, $db_data);
 
        Config::load();

diff --git a/include/shadowupdate.php b/include/shadowupdate.php
index 756f220ec823d67a4265738b2b624fb6baec6d34..c41b2312214bb1eed9e019c7ac266b9f412e9793 100644 (file)
--- a/include/shadowupdate.php
+++ b/include/shadowupdate.php
@@ -7,18 +7,16 @@ require_once("boot.php");
 require_once("include/threads.php");
 
 function shadowupdate_run(&$argv, &$argc){
-       global $a, $db;
+       global $a;
 
-       if (is_null($a)) {
+       if (empty($a)) {
                $a = new App(dirname(__DIR__));
        }
 
-       if (is_null($db)) {
-               @include(".htconfig.php");
-               require_once("include/dba.php");
-               $db = new dba($db_host, $db_user, $db_pass, $db_data);
-               unset($db_host, $db_user, $db_pass, $db_data);
-       }
+       @include(".htconfig.php");
+       require_once("include/dba.php");
+       dba::connect($db_host, $db_user, $db_pass, $db_data);
+       unset($db_host, $db_user, $db_pass, $db_data);
 
        Config::load();
 

diff --git a/include/text.php b/include/text.php
index 66d4f17ea66ac5b20ef9c486f207d23dfa65e68a..dc34edcd22b2024685e425bbd27551dff3cf2b42 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -702,20 +702,18 @@ $LOGGER_LEVELS = array();
  * LOGGER_ALL
  *
  * @global App $a
- * @global dba $db
  * @global array $LOGGER_LEVELS
  * @param string $msg
  * @param int $level
  */
 function logger($msg, $level = 0) {
        $a = get_app();
-       global $db;
        global $LOGGER_LEVELS;
 
        // turn off logger in install mode
        if (
                $a->module == 'install'
-               || ! ($db && $db->connected)
+               || !dba::$connected
        ) {
                return;
        }
@@ -776,7 +774,6 @@ function logger($msg, $level = 0) {
  * LOGGER_ALL
  *
  * @global App $a
- * @global dba $db
  * @global array $LOGGER_LEVELS
  * @param string $msg
  * @param int $level
@@ -784,12 +781,11 @@ function logger($msg, $level = 0) {
 
 function dlogger($msg, $level = 0) {
        $a = get_app();
-       global $db;
 
        // turn off logger in install mode
        if (
                $a->module == 'install'
-               || ! ($db && $db->connected)
+               || !dba::$connected
        ) {
                return;
        }

diff --git a/include/uimport.php b/include/uimport.php
index 57c5375ef1a8bbfa5365b3ec55f1d5cd66a6b6d6..442df94460777cb5ef555982929d4c80786ed9bc 100644 (file)
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Core\PConfig;
 
 require_once("include/Photo.php");
 define("IMPORT_DEBUG", False);
@@ -14,11 +15,6 @@ function last_insert_id() {
        return dba::lastInsertId();
 }
 
-function last_error() {
-       global $db;
-       return $db->error;
-}
-
 /**
  * Remove columns from array $arr that aren't in table $table
  *
@@ -103,7 +99,7 @@ function import_account(App $a, $file) {
        // check for username
        $r = q("SELECT uid FROM user WHERE nickname='%s'", $account['user']['nickname']);
        if ($r === false) {
-               logger("uimport:check nickname : ERROR : " . last_error(), LOGGER_NORMAL);
+               logger("uimport:check nickname : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                notice(t('Error! Cannot check nickname'));
                return;
        }
@@ -114,7 +110,7 @@ function import_account(App $a, $file) {
        // check if username matches deleted account
        $r = q("SELECT id FROM userd WHERE username='%s'", $account['user']['nickname']);
        if ($r === false) {
-               logger("uimport:check nickname : ERROR : " . last_error(), LOGGER_NORMAL);
+               logger("uimport:check nickname : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                notice(t('Error! Cannot check nickname'));
                return;
        }
@@ -129,6 +125,12 @@ function import_account(App $a, $file) {
        $oldaddr = str_replace('http://', '@', normalise_link($oldbaseurl));
        $newaddr = str_replace('http://', '@', normalise_link($newbaseurl));
 
+       if (!empty($account['profile']['addr'])) {
+               $old_handle = $account['profile']['addr'];
+       } else {
+               $old_handle = $account['user']['nickname'].$oldaddr;
+       }
+
        $olduid = $account['user']['uid'];
 
        unset($account['user']['uid']);
@@ -144,13 +146,15 @@ function import_account(App $a, $file) {
        $r = db_import_assoc('user', $account['user']);
        if ($r === false) {
                //echo "<pre>"; var_dump($r, $query, mysql_error()); killme();
-               logger("uimport:insert user : ERROR : " . last_error(), LOGGER_NORMAL);
+               logger("uimport:insert user : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                notice(t("User creation error"));
                return;
        }
        $newuid = last_insert_id();
        //~ $newuid = 1;
 
+       PConfig::set($newuid, 'system', 'previous_addr', $old_handle);
+
        // Generate a new guid for the account. Otherwise there will be problems with diaspora
        q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d",
                dbesc(generate_user_guid()), intval($newuid));
@@ -165,7 +169,7 @@ function import_account(App $a, $file) {
                $profile['uid'] = $newuid;
                $r = db_import_assoc('profile', $profile);
                if ($r === false) {
-                       logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+                       logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                        info(t("User profile creation error"));
                        dba::delete('user', array('uid' => $newuid));
                        return;
@@ -188,6 +192,7 @@ function import_account(App $a, $file) {
 
                        switch ($contact['network']) {
                                case NETWORK_DFRN:
+                               case NETWORK_DIASPORA:
                                        //  send relocate message (below)
                                        break;
                                case NETWORK_ZOT:
@@ -208,7 +213,7 @@ function import_account(App $a, $file) {
                $contact['uid'] = $newuid;
                $r = db_import_assoc('contact', $contact);
                if ($r === false) {
-                       logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+                       logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                        $errorcount++;
                } else {
                        $contact['newid'] = last_insert_id();
@@ -222,7 +227,7 @@ function import_account(App $a, $file) {
                $group['uid'] = $newuid;
                $r = db_import_assoc('group', $group);
                if ($r === false) {
-                       logger("uimport:insert group " . $group['name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+                       logger("uimport:insert group " . $group['name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                } else {
                        $group['newid'] = last_insert_id();
                }
@@ -249,7 +254,7 @@ function import_account(App $a, $file) {
                if ($import == 2) {
                        $r = db_import_assoc('group_member', $group_member);
                        if ($r === false) {
-                               logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+                               logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                        }
                }
        }
@@ -266,7 +271,7 @@ function import_account(App $a, $file) {
                );
 
                if ($r === false) {
-                       logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+                       logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                }
        }
 
@@ -274,7 +279,7 @@ function import_account(App $a, $file) {
                $pconfig['uid'] = $newuid;
                $r = db_import_assoc('pconfig', $pconfig);
                if ($r === false) {
-                       logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+                       logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
                }
        }
 

diff --git a/index.php b/index.php
index 49a3b216da6624fe4623c80cc43adf2bcd813835..c94675a59ae65a887fe181c1350f714555d3e8d4 100644 (file)
--- a/index.php
+++ b/index.php
@@ -20,7 +20,9 @@ use Friendica\Core\Config;
 require_once 'boot.php';
 require_once 'object/BaseObject.php';
 
-$a = new App(__DIR__);
+if (empty($a)) {
+       $a = new App(__DIR__);
+}
 BaseObject::set_app($a);
 
 // We assume that the index.php is called by a frontend process
@@ -51,7 +53,7 @@ if (!$install) {
 require_once "include/dba.php";
 
 if (!$install) {
-       $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
+       dba::connect($db_host, $db_user, $db_pass, $db_data, $install);
        unset($db_host, $db_user, $db_pass, $db_data);
 
        /**

diff --git a/mod/admin.php b/mod/admin.php
index 78f12a4820476cb14c2a1ce4a645bcdf416e1302..7c7ee51d53060228a2f21d87d14185090fa5cdc4 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -606,10 +606,9 @@ function admin_page_queue(App $a) {
  * @return string
  */
 function admin_page_summary(App $a) {
-       global $db;
        // 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($db->database_name()));
+               dbesc(dba::database_name()));
        $showwarning = false;
        $warningtext = array();
        if (dbm::is_result($r)) {
@@ -726,7 +725,7 @@ function admin_page_site_post(App $a) {
                $old_host = str_replace("http://", "@", normalise_link($old_url));
 
                function update_table($table_name, $fields, $old_url, $new_url) {
-                       global $db, $a;
+                       global $a;
 
                        $dbold = dbesc($old_url);
                        $dbnew = dbesc($new_url);
@@ -743,7 +742,7 @@ function admin_page_site_post(App $a) {
                        $q = sprintf("UPDATE %s SET %s;", $table_name, $upds);
                        $r = q($q);
                        if (!$r) {
-                               notice("Failed updating '$table_name': ".$db->error);
+                               notice("Failed updating '$table_name': ".dba::errorMessage());
                                goaway('admin/site');
                        }
                }

diff --git a/mod/directory.php b/mod/directory.php
index 9e004ab5d8b41c1e2a28bb630aa95618f7585998..c83b7b4116167c3b33218297f5fc44c78dfa073a 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -24,8 +24,6 @@ function directory_post(App $a) {
 }
 
 function directory_content(App $a) {
-       global $db;
-
        require_once("mod/proxy.php");
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) ||

diff --git a/mod/display.php b/mod/display.php
index 37d3a123a88d5ba3f0f172bc238475e217515ac1..1ecff36182197a0e4b9392638c48e86912cbb924 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -25,11 +25,13 @@ function display_init(App $a) {
        if ($a->argc == 2) {
                $nick = "";
                $itemuid = 0;
+               $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 `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
+                       $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)) {
                                $nick = $a->user["nickname"];
@@ -37,32 +39,29 @@ function display_init(App $a) {
                        }
                }
 
+               // 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 `allow_cid` = ''  AND `allow_gid` = ''
+                                       AND `deny_cid`  = '' AND `deny_gid`  = ''
+                                       AND NOT `private` AND `uid` = 0
+                                       AND `guid` = ? LIMIT 1", $a->argv[1]);
+               }
+
                // Or is it anywhere on the server?
-               if ($nick == "") {
-                       $r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent`, `item`.`author-name`,
-                               `item`.`author-link`, `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body`
+               if (!dbm::is_result($r)) {
+                       $r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`,
+                               `item`.`author-avatar`, `item`.`network`, `item`.`body`, `item`.`uid`, `item`.`owner-link`
                                FROM `item` STRAIGHT_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 NOT `user`.`hidewall`
                                        AND `item`.`guid` = ? LIMIT 1", $a->argv[1]);
-                       if (dbm::is_result($r)) {
-                               $nick = $r["nickname"];
-                               $itemuid = $r["uid"];
-                       }
                }
 
-               // Is it an item with uid=0?
-               if ($nick == "") {
-                       $r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`,
-                               `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body`
-                               FROM `item` 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`.`uid` = 0
-                                       AND `item`.`guid` = ? LIMIT 1", $a->argv[1]);
-               }
                if (dbm::is_result($r)) {
 
                        if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
@@ -75,28 +74,6 @@ function display_init(App $a) {
                                        WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
                                                AND `id` = ?", $r["parent"]);
                        }
-                       if (($itemuid != local_user()) && local_user()) {
-                               // Do we know this contact but we haven't got this item?
-                               // Copy the wohle thread to our local storage so that we can interact.
-                               // We really should change this need for the future since it scales very bad.
-                               $contactid = get_contact($r['owner-link'], local_user());
-                               if ($contactid) {
-                                       $items = dba::select('item', array(), array('parent' => $r["id"]), array('order' => array('id')));
-                                       while ($item = dba::fetch($items)) {
-                                               $itemcontactid = get_contact($item['owner-link'], local_user());
-                                               if (!$itemcontactid) {
-                                                       $itemcontactid = $contactid;
-                                               }
-                                               unset($item['id']);
-                                               $item['uid'] = local_user();
-                                               $item['origin'] = 0;
-                                               $item['contact-id'] = $itemcontactid;
-                                               $local_copy = item_store($item, false, false, true);
-                                               logger("Stored local copy for post ".$item['guid']." under id ".$local_copy, LOGGER_DEBUG);
-                                       }
-                                       dba::close($items);
-                               }
-                       }
 
                        $profiledata = display_fetchauthor($a, $r);
 

diff --git a/mod/install.php b/mod/install.php
index ae462914c84389ac8ee5ab65301183eff91dbff5..ed75e624b58c97a894ec9c92ce4b2bd875e47d49 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -28,7 +28,7 @@ function install_init(App $a) {
 }
 
 function install_post(App $a) {
-       global $install_wizard_pass, $db;
+       global $install_wizard_pass;
 
        switch($install_wizard_pass) {
                case 1:
@@ -44,9 +44,7 @@ function install_post(App $a) {
                        $phpath = notags(trim($_POST['phpath']));
 
                        require_once("include/dba.php");
-                       unset($db);
-                       $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
-                       if (!$db->connected) {
+                       if (!dba::connect($dbhost, $dbuser, $dbpass, $dbdata, true)) {
                                $a->data['db_conn_failed'] = true;
                        }
 
@@ -65,7 +63,7 @@ function install_post(App $a) {
                        $rino = 2;
 
                        // connect to db
-                       $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
+                       dba::connect($dbhost, $dbuser, $dbpass, $dbdata, true);
 
                        $tpl = get_markup_template('htconfig.tpl');
                        $txt = replace_macros($tpl,array(
@@ -87,7 +85,7 @@ function install_post(App $a) {
                                $a->data['txt'] = $txt;
                        }
 
-                       $errors = load_database($db);
+                       $errors = load_database();
 
 
                        if ($errors) {
@@ -103,7 +101,7 @@ function install_post(App $a) {
 
 function install_content(App $a) {
 
-       global $install_wizard_pass, $db;
+       global $install_wizard_pass;
        $o = '';
        $wizard_status = "";
        $install_title = t('Friendica Communications Server - Setup');
@@ -133,7 +131,7 @@ function install_content(App $a) {
                $db_return_text .= $txt;
        }
 
-       if ($db && $db->connected) {
+       if (dba::$connected) {
                $r = q("SELECT COUNT(*) as `total` FROM `user`");
                if (dbm::is_result($r) && $r[0]['total']) {
                        $tpl = get_markup_template('install.tpl');
@@ -534,7 +532,7 @@ function load_database_rem($v, $i) {
        }
 }
 
-function load_database($db) {
+function load_database() {
 
        require_once("include/dbstructure.php");
        $errors = update_structure(false, true);

diff --git a/src/App.php b/src/App.php
index 67dfacf7a3fb891d0409da759b1768703cbe9c28..30d66dd2d50d5421a63e4165d1667c7aa208eb52 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -132,8 +132,14 @@ class App {
 
                $hostname = '';
 
-               if (file_exists('.htpreconfig.php')) {
-                       include '.htpreconfig.php';
+               if (! static::directory_usable($basepath, false)) {
+                       throw new Exception('Basepath ' . $basepath . ' isn\'t usable.');
+               }
+
+               $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');
@@ -201,12 +207,6 @@ class App {
                        $this->hostname = $hostname;
                }
 
-               if (! static::directory_usable($basepath, false)) {
-                       throw new Exception('Basepath ' . $basepath . ' isn\'t usable.');
-               }
-
-               $this->basepath = rtrim($basepath, DIRECTORY_SEPARATOR);
-
                set_include_path(
                        get_include_path() . PATH_SEPARATOR
                        . $this->basepath . DIRECTORY_SEPARATOR . 'include' . PATH_SEPARATOR
@@ -416,8 +416,8 @@ class App {
                                $this->path = trim($parsed['path'], '\\/');
                        }
 
-                       if (file_exists('.htpreconfig.php')) {
-                               include '.htpreconfig.php';
+                       if (file_exists($this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php')) {
+                               include $this->basepath.DIRECTORY_SEPARATOR.'.htpreconfig.php';
                        }
 
                        if (Config::get('config', 'hostname') != '') {

diff --git a/util/db_update.php b/util/db_update.php
index 5b31080506ed7093bdab14b4e754e1ee8032b6d4..d9bb0abf2ec577b5cdfc8db91a308ace31631cbf 100644 (file)
--- a/util/db_update.php
+++ b/util/db_update.php
@@ -11,14 +11,16 @@ use Friendica\App;
  */
 require_once("boot.php");
 
-$a = new App(dirname(__DIR__));
+if (empty($a)) {
+       $a = new App(dirname(__DIR__));
+}
 @include(".htconfig.php");
 
 $lang = get_browser_language();
 load_translation_table($lang);
 
 require_once("include/dba.php");
-$db = new dba($db_host, $db_user, $db_pass, $db_data, false);
+dba::connect($db_host, $db_user, $db_pass, $db_data, false);
 unset($db_host, $db_user, $db_pass, $db_data);
 
 $build = get_config('system', 'build');

diff --git a/util/maintenance.php b/util/maintenance.php
index 9c9fc4f19d95404569c10e751fa6173f31a6f257..39c2acb0e1f13a304d0c966ce7ec10bafb064992 100644 (file)
--- a/util/maintenance.php
+++ b/util/maintenance.php
@@ -5,14 +5,17 @@ use Friendica\Core\Config;
 
 require_once("boot.php");
 
-$a = new App(dirname(__DIR__));
+if (empty($a)) {
+       $a = new App(dirname(__DIR__));
+}
+
 @include(".htconfig.php");
 
 $lang = get_browser_language();
 load_translation_table($lang);
 
 require_once("include/dba.php");
-$db = new dba($db_host, $db_user, $db_pass, $db_data, false);
+dba::connect($db_host, $db_user, $db_pass, $db_data, false);
 unset($db_host, $db_user, $db_pass, $db_data);
 
 Config::load();

diff --git a/util/messages.po b/util/messages.po
index b702b68e804220de023301cd09598332040952a4..fc6a935b79ff3a91d88dd4ab2f5fa1417a504164 100644 (file)
--- 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: 2017-10-01 08:52+0200\n"
+"POT-Creation-Date: 2017-10-13 07:26+0200\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"
@@ -549,7 +549,7 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: include/dba_pdo.php:75 include/dba.php:56
+#: include/dba_pdo.php:75 include/dba.php:57
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
@@ -620,19 +620,19 @@ msgstr ""
 msgid "Reputable, has my trust"
 msgstr ""
 
-#: include/contact_selectors.php:56 mod/admin.php:1079
+#: include/contact_selectors.php:56 mod/admin.php:1083
 msgid "Frequently"
 msgstr ""
 
-#: include/contact_selectors.php:57 mod/admin.php:1080
+#: include/contact_selectors.php:57 mod/admin.php:1084
 msgid "Hourly"
 msgstr ""
 
-#: include/contact_selectors.php:58 mod/admin.php:1081
+#: include/contact_selectors.php:58 mod/admin.php:1085
 msgid "Twice daily"
 msgstr ""
 
-#: include/contact_selectors.php:59 mod/admin.php:1082
+#: include/contact_selectors.php:59 mod/admin.php:1086
 msgid "Daily"
 msgstr ""
 
@@ -657,7 +657,7 @@ msgid "RSS/Atom"
 msgstr ""
 
 #: include/contact_selectors.php:79 include/contact_selectors.php:86
-#: mod/admin.php:1588 mod/admin.php:1601 mod/admin.php:1614 mod/admin.php:1632
+#: mod/admin.php:1593 mod/admin.php:1606 mod/admin.php:1619 mod/admin.php:1637
 msgid "Email"
 msgstr ""
 
@@ -761,7 +761,7 @@ msgstr ""
 msgid "add"
 msgstr ""
 
-#: include/ForumManager.php:119 include/nav.php:134 include/text.php:1104
+#: include/ForumManager.php:119 include/nav.php:134 include/text.php:1100
 #: view/theme/vier/theme.php:249
 msgid "Forums"
 msgstr ""
@@ -771,7 +771,7 @@ msgid "External link to forum"
 msgstr ""
 
 #: include/ForumManager.php:124 include/contact_widgets.php:272
-#: include/items.php:2407 mod/content.php:626 object/Item.php:417
+#: include/items.php:2417 mod/content.php:626 object/Item.php:417
 #: view/theme/vier/theme.php:254 src/App.php:524
 msgid "show more"
 msgstr ""
@@ -785,8 +785,8 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: include/NotificationsManager.php:171 mod/network.php:911
-#: mod/profiles.php:694
+#: include/NotificationsManager.php:171 mod/profiles.php:694
+#: mod/network.php:912
 msgid "Personal"
 msgstr ""
 
@@ -883,8 +883,8 @@ msgid "Finishes:"
 msgstr ""
 
 #: include/bb2diaspora.php:257 include/event.php:44 include/event.php:70
-#: include/event.php:462 include/identity.php:339 mod/directory.php:135
-#: mod/events.php:497 mod/notifications.php:247 mod/contacts.php:657
+#: include/event.php:462 include/identity.php:339 mod/events.php:497
+#: mod/notifications.php:247 mod/contacts.php:657 mod/directory.php:133
 msgid "Location:"
 msgstr ""
 
@@ -956,7 +956,7 @@ msgstr ""
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: include/contact_widgets.php:41 mod/directory.php:202 mod/contacts.php:827
+#: include/contact_widgets.php:41 mod/contacts.php:827 mod/directory.php:200
 msgid "Find"
 msgstr ""
 
@@ -1005,7 +1005,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: include/conversation.php:135 include/conversation.php:287
-#: include/like.php:184 include/text.php:1885
+#: include/like.php:184 include/text.php:1881
 msgid "event"
 msgstr ""
 
@@ -1017,7 +1017,7 @@ msgid "status"
 msgstr ""
 
 #: include/conversation.php:143 include/conversation.php:295
-#: include/like.php:182 include/text.php:1887 mod/subthread.php:90
+#: include/like.php:182 include/text.php:1883 mod/subthread.php:90
 #: mod/tagger.php:64
 msgid "photo"
 msgstr ""
@@ -1107,7 +1107,7 @@ msgid "Select"
 msgstr ""
 
 #: include/conversation.php:754 mod/content.php:456 mod/content.php:762
-#: mod/photos.php:1732 mod/settings.php:741 mod/admin.php:1606
+#: mod/photos.php:1732 mod/settings.php:741 mod/admin.php:1611
 #: mod/contacts.php:837 mod/contacts.php:1036 object/Item.php:148
 msgid "Delete"
 msgstr ""
@@ -1161,8 +1161,8 @@ msgstr ""
 
 #: include/conversation.php:1013 include/conversation.php:1029
 #: include/Contact.php:401 include/Contact.php:414 include/Contact.php:459
-#: mod/allfriends.php:71 mod/directory.php:153 mod/dirfind.php:212
-#: mod/match.php:77 mod/suggest.php:82
+#: mod/allfriends.php:71 mod/dirfind.php:212 mod/match.php:77
+#: mod/suggest.php:82 mod/directory.php:151
 msgid "View Profile"
 msgstr ""
 
@@ -1392,7 +1392,7 @@ msgstr ""
 msgid "Preview"
 msgstr ""
 
-#: include/conversation.php:1326 include/items.php:2148
+#: include/conversation.php:1326 include/items.php:2158
 #: mod/dfrn_request.php:895 mod/editpost.php:141 mod/follow.php:161
 #: mod/message.php:210 mod/tagrm.php:14 mod/tagrm.php:99 mod/videos.php:135
 #: mod/photos.php:248 mod/photos.php:340 mod/settings.php:679
@@ -1443,49 +1443,6 @@ msgid_plural "Not Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/dbstructure.php:26
-msgid "There are no tables on MyISAM."
-msgstr ""
-
-#: include/dbstructure.php:67
-#, 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 ""
-
-#: include/dbstructure.php:72
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
-msgstr ""
-
-#: include/dbstructure.php:197
-#, php-format
-msgid ""
-"\n"
-"Error %d occurred during database update:\n"
-"%s\n"
-msgstr ""
-
-#: include/dbstructure.php:200
-msgid "Errors encountered performing database changes: "
-msgstr ""
-
-#: include/dbstructure.php:208
-msgid ": Database update"
-msgstr ""
-
-#: include/dbstructure.php:440
-#, php-format
-msgid "%s: updating %s table."
-msgstr ""
-
 #: include/delivery.php:429
 msgid "(no subject)"
 msgstr ""
@@ -1818,31 +1775,31 @@ msgstr ""
 msgid "Sat"
 msgstr ""
 
-#: include/event.php:419 include/text.php:1207 mod/settings.php:978
+#: include/event.php:419 include/text.php:1203 mod/settings.php:978
 msgid "Sunday"
 msgstr ""
 
-#: include/event.php:420 include/text.php:1207 mod/settings.php:978
+#: include/event.php:420 include/text.php:1203 mod/settings.php:978
 msgid "Monday"
 msgstr ""
 
-#: include/event.php:421 include/text.php:1207
+#: include/event.php:421 include/text.php:1203
 msgid "Tuesday"
 msgstr ""
 
-#: include/event.php:422 include/text.php:1207
+#: include/event.php:422 include/text.php:1203
 msgid "Wednesday"
 msgstr ""
 
-#: include/event.php:423 include/text.php:1207
+#: include/event.php:423 include/text.php:1203
 msgid "Thursday"
 msgstr ""
 
-#: include/event.php:424 include/text.php:1207
+#: include/event.php:424 include/text.php:1203
 msgid "Friday"
 msgstr ""
 
-#: include/event.php:425 include/text.php:1207
+#: include/event.php:425 include/text.php:1203
 msgid "Saturday"
 msgstr ""
 
@@ -1862,7 +1819,7 @@ msgstr ""
 msgid "Apr"
 msgstr ""
 
-#: include/event.php:431 include/event.php:444 include/text.php:1211
+#: include/event.php:431 include/event.php:444 include/text.php:1207
 msgid "May"
 msgstr ""
 
@@ -1894,47 +1851,47 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: include/event.php:440 include/text.php:1211
+#: include/event.php:440 include/text.php:1207
 msgid "January"
 msgstr ""
 
-#: include/event.php:441 include/text.php:1211
+#: include/event.php:441 include/text.php:1207
 msgid "February"
 msgstr ""
 
-#: include/event.php:442 include/text.php:1211
+#: include/event.php:442 include/text.php:1207
 msgid "March"
 msgstr ""
 
-#: include/event.php:443 include/text.php:1211
+#: include/event.php:443 include/text.php:1207
 msgid "April"
 msgstr ""
 
-#: include/event.php:445 include/text.php:1211
+#: include/event.php:445 include/text.php:1207
 msgid "June"
 msgstr ""
 
-#: include/event.php:446 include/text.php:1211
+#: include/event.php:446 include/text.php:1207
 msgid "July"
 msgstr ""
 
-#: include/event.php:447 include/text.php:1211
+#: include/event.php:447 include/text.php:1207
 msgid "August"
 msgstr ""
 
-#: include/event.php:448 include/text.php:1211
+#: include/event.php:448 include/text.php:1207
 msgid "September"
 msgstr ""
 
-#: include/event.php:449 include/text.php:1211
+#: include/event.php:449 include/text.php:1207
 msgid "October"
 msgstr ""
 
-#: include/event.php:450 include/text.php:1211
+#: include/event.php:450 include/text.php:1207
 msgid "November"
 msgstr ""
 
-#: include/event.php:451 include/text.php:1211
+#: include/event.php:451 include/text.php:1207
 msgid "December"
 msgstr ""
 
@@ -1958,7 +1915,7 @@ msgstr ""
 msgid "Delete event"
 msgstr ""
 
-#: include/event.php:620 include/text.php:1609 include/text.php:1616
+#: include/event.php:620 include/text.php:1605 include/text.php:1612
 msgid "link to source"
 msgstr ""
 
@@ -2018,21 +1975,21 @@ msgstr ""
 msgid "Edit visibility"
 msgstr ""
 
-#: include/identity.php:341 include/identity.php:642 mod/directory.php:137
-#: mod/notifications.php:253
+#: include/identity.php:341 include/identity.php:642 mod/notifications.php:253
+#: mod/directory.php:135
 msgid "Gender:"
 msgstr ""
 
-#: include/identity.php:344 include/identity.php:665 mod/directory.php:139
+#: include/identity.php:344 include/identity.php:665 mod/directory.php:137
 msgid "Status:"
 msgstr ""
 
-#: include/identity.php:346 include/identity.php:682 mod/directory.php:141
+#: include/identity.php:346 include/identity.php:682 mod/directory.php:139
 msgid "Homepage:"
 msgstr ""
 
-#: include/identity.php:348 include/identity.php:702 mod/directory.php:143
-#: mod/notifications.php:249 mod/contacts.php:661
+#: include/identity.php:348 include/identity.php:702 mod/notifications.php:249
+#: mod/contacts.php:661 mod/directory.php:141
 msgid "About:"
 msgstr ""
 
@@ -2176,7 +2133,7 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: include/identity.php:761 mod/events.php:511 mod/admin.php:1158
+#: include/identity.php:761 mod/events.php:511 mod/admin.php:1163
 #: mod/contacts.php:899
 msgid "Advanced"
 msgstr ""
@@ -2229,7 +2186,7 @@ msgid "Only You Can See This"
 msgstr ""
 
 #: include/identity.php:853 include/identity.php:856 include/nav.php:131
-#: include/nav.php:195 include/text.php:1101 mod/viewcontacts.php:124
+#: include/nav.php:195 include/text.php:1097 mod/viewcontacts.php:124
 #: mod/contacts.php:821 mod/contacts.php:882 view/theme/frio/theme.php:264
 msgid "Contacts"
 msgstr ""
@@ -2249,866 +2206,909 @@ msgstr ""
 msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
 
-#: include/nav.php:38 mod/navigation.php:22
-msgid "Nothing new here"
+#: include/oembed.php:254
+msgid "Embedded content"
 msgstr ""
 
-#: include/nav.php:42 mod/navigation.php:26
-msgid "Clear notifications"
+#: include/oembed.php:262
+msgid "Embedding disabled"
 msgstr ""
 
-#: include/nav.php:43 include/text.php:1094
-msgid "@name, !forum, #tags, content"
+#: include/plugin.php:519 include/plugin.php:521
+msgid "Click here to upgrade."
 msgstr ""
 
-#: include/nav.php:81 view/theme/frio/theme.php:250 boot.php:869
-msgid "Logout"
+#: include/plugin.php:528
+msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: include/nav.php:81 view/theme/frio/theme.php:250
-msgid "End this session"
+#: include/plugin.php:533
+msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: include/nav.php:84 include/nav.php:164 view/theme/frio/theme.php:253
-msgid "Your posts and conversations"
+#: include/security.php:64
+msgid "Welcome "
 msgstr ""
 
-#: include/nav.php:85 view/theme/frio/theme.php:254
-msgid "Your profile page"
+#: include/security.php:65
+msgid "Please upload a profile photo."
 msgstr ""
 
-#: include/nav.php:86 view/theme/frio/theme.php:255
-msgid "Your photos"
+#: include/security.php:67
+msgid "Welcome back "
 msgstr ""
 
-#: include/nav.php:87 view/theme/frio/theme.php:256
-msgid "Your videos"
+#: 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/nav.php:88 view/theme/frio/theme.php:257
-msgid "Your events"
+#: include/user.php:41 mod/settings.php:373
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: include/nav.php:89
-msgid "Personal notes"
+#: include/user.php:50
+msgid "An invitation is required."
 msgstr ""
 
-#: include/nav.php:89
-msgid "Your personal notes"
+#: include/user.php:55
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: include/nav.php:98 mod/bookmarklet.php:15 boot.php:870
-msgid "Login"
+#: include/user.php:63
+msgid "Invalid OpenID url"
 msgstr ""
 
-#: include/nav.php:98
-msgid "Sign in"
+#: include/user.php:84
+msgid "Please enter the required information."
 msgstr ""
 
-#: include/nav.php:108
-msgid "Home Page"
+#: include/user.php:98
+msgid "Please use a shorter name."
 msgstr ""
 
-#: include/nav.php:112 mod/register.php:293 boot.php:846
-msgid "Register"
+#: include/user.php:100
+msgid "Name too short."
 msgstr ""
 
-#: include/nav.php:112
-msgid "Create an account"
+#: include/user.php:108
+msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: include/nav.php:118 mod/help.php:51 view/theme/vier/theme.php:292
-msgid "Help"
+#: include/user.php:113
+msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: include/nav.php:118
-msgid "Help and documentation"
+#: include/user.php:116
+msgid "Not a valid email address."
 msgstr ""
 
-#: include/nav.php:122
-msgid "Apps"
+#: include/user.php:129
+msgid "Cannot use that email."
 msgstr ""
 
-#: include/nav.php:122
-msgid "Addon applications, utilities, games"
+#: include/user.php:135
+msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
 msgstr ""
 
-#: include/nav.php:126 include/text.php:1091 mod/search.php:145
-msgid "Search"
+#: include/user.php:142 include/user.php:230
+msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: include/nav.php:126
-msgid "Search site content"
+#: include/user.php:152
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
 msgstr ""
 
-#: include/nav.php:129 include/text.php:1099
-msgid "Full Text"
+#: include/user.php:168
+msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: include/nav.php:130 include/text.php:1100
-msgid "Tags"
+#: include/user.php:216
+msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: include/nav.php:146 include/nav.php:148 mod/community.php:31
-msgid "Community"
+#: include/user.php:239 view/theme/duepuntozero/config.php:47
+msgid "default"
 msgstr ""
 
-#: include/nav.php:146
-msgid "Conversations on this site"
+#: include/user.php:249
+msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: include/nav.php:148
-msgid "Conversations on the network"
+#: include/user.php:308 include/user.php:316 include/user.php:324
+#: include/api.php:3717 mod/profile_photo.php:75 mod/profile_photo.php:83
+#: mod/profile_photo.php:91 mod/profile_photo.php:215 mod/profile_photo.php:310
+#: mod/profile_photo.php:320 mod/photos.php:74 mod/photos.php:190
+#: mod/photos.php:777 mod/photos.php:1259 mod/photos.php:1280
+#: mod/photos.php:1866
+msgid "Profile Photos"
 msgstr ""
 
-#: include/nav.php:155
-msgid "Directory"
+#: include/user.php:399
+#, 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 ""
 
-#: include/nav.php:155
-msgid "People directory"
+#: include/user.php:409
+#, php-format
+msgid "Registration at %s"
 msgstr ""
 
-#: include/nav.php:157
-msgid "Information"
+#: include/user.php:419
+#, 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 ""
 
-#: include/nav.php:157
-msgid "Information about this friendica instance"
+#: include/user.php:423
+#, php-format
+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 ""
 
-#: include/nav.php:161 view/theme/frio/theme.php:260
-msgid "Conversations from your friends"
+#: include/user.php:455 mod/admin.php:1411
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: include/nav.php:162
-msgid "Network Reset"
+#: include/Photo.php:1008 include/Photo.php:1024 include/Photo.php:1032
+#: include/Photo.php:1057 include/message.php:138 mod/item.php:469
+#: mod/wall_upload.php:250
+msgid "Wall Photos"
 msgstr ""
 
-#: include/nav.php:162
-msgid "Load Network page with no filters"
+#: include/message.php:15 include/message.php:161
+msgid "[no subject]"
 msgstr ""
 
-#: include/nav.php:169
-msgid "Friend Requests"
+#: include/photos.php:57 include/photos.php:66 mod/photos.php:190
+#: mod/photos.php:1126 mod/photos.php:1259 mod/photos.php:1280
+#: mod/photos.php:1842 mod/photos.php:1856 mod/fbrowser.php:43
+#: mod/fbrowser.php:65
+msgid "Contact Photos"
 msgstr ""
 
-#: include/nav.php:172 mod/notifications.php:99
-msgid "Notifications"
+#: include/Contact.php:463
+msgid "Drop Contact"
 msgstr ""
 
-#: include/nav.php:173
-msgid "See all notifications"
+#: include/Contact.php:888
+msgid "Organisation"
 msgstr ""
 
-#: include/nav.php:174 mod/settings.php:903
-msgid "Mark as seen"
+#: include/Contact.php:891
+msgid "News"
 msgstr ""
 
-#: include/nav.php:174
-msgid "Mark all system notifications seen"
+#: include/Contact.php:894
+msgid "Forum"
 msgstr ""
 
-#: include/nav.php:178 mod/message.php:180 view/theme/frio/theme.php:262
-msgid "Messages"
+#: include/api.php:1103
+#, php-format
+msgid "Daily posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: include/nav.php:178 view/theme/frio/theme.php:262
-msgid "Private mail"
+#: include/api.php:1124
+#, php-format
+msgid "Weekly posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: include/nav.php:179
-msgid "Inbox"
-msgstr ""
-
-#: include/nav.php:180
-msgid "Outbox"
+#: include/api.php:1145
+#, php-format
+msgid "Monthly posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: include/nav.php:181 mod/message.php:19
-msgid "New Message"
+#: include/dbstructure.php:24
+msgid "There are no tables on MyISAM."
 msgstr ""
 
-#: include/nav.php:184
-msgid "Manage"
+#: include/dbstructure.php:65
+#, 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 ""
 
-#: include/nav.php:184
-msgid "Manage other pages"
+#: include/dbstructure.php:70
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
 msgstr ""
 
-#: include/nav.php:187 mod/settings.php:84
-msgid "Delegations"
+#: include/dbstructure.php:194
+#, php-format
+msgid ""
+"\n"
+"Error %d occurred during database update:\n"
+"%s\n"
 msgstr ""
 
-#: include/nav.php:187 mod/delegate.php:130
-msgid "Delegate Page Management"
+#: include/dbstructure.php:197
+msgid "Errors encountered performing database changes: "
 msgstr ""
 
-#: include/nav.php:189 mod/newmember.php:15 mod/settings.php:114
-#: mod/admin.php:1716 mod/admin.php:1992 view/theme/frio/theme.php:263
-msgid "Settings"
+#: include/dbstructure.php:205
+msgid ": Database update"
 msgstr ""
 
-#: include/nav.php:189 view/theme/frio/theme.php:263
-msgid "Account settings"
+#: include/dbstructure.php:437
+#, php-format
+msgid "%s: updating %s table."
 msgstr ""
 
-#: include/nav.php:192
-msgid "Manage/Edit Profiles"
+#: include/dfrn.php:1331
+#, php-format
+msgid "%s\\'s birthday"
 msgstr ""
 
-#: include/nav.php:195 view/theme/frio/theme.php:264
-msgid "Manage/edit friends and contacts"
+#: include/diaspora.php:2259
+msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: include/nav.php:200 mod/admin.php:203
-msgid "Admin"
+#: include/diaspora.php:3226
+msgid "Attachments:"
 msgstr ""
 
-#: include/nav.php:200
-msgid "Site setup and configuration"
+#: include/follow.php:85 mod/dfrn_request.php:515
+msgid "Disallowed profile URL."
 msgstr ""
 
-#: include/nav.php:203
-msgid "Navigation"
+#: include/follow.php:90 mod/dfrn_request.php:521 mod/admin.php:289
+#: mod/admin.php:307 mod/friendica.php:116
+msgid "Blocked domain"
 msgstr ""
 
-#: include/nav.php:203
-msgid "Site map"
+#: include/follow.php:95
+msgid "Connect URL missing."
 msgstr ""
 
-#: include/oembed.php:254
-msgid "Embedded content"
+#: include/follow.php:123
+msgid ""
+"This site is not configured to allow communications with other networks."
 msgstr ""
 
-#: include/oembed.php:262
-msgid "Embedding disabled"
+#: include/follow.php:124 include/follow.php:138
+msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: include/plugin.php:519 include/plugin.php:521
-msgid "Click here to upgrade."
+#: include/follow.php:136
+msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: include/plugin.php:528
-msgid "This action exceeds the limits set by your subscription plan."
+#: include/follow.php:141
+msgid "An author or name was not found."
 msgstr ""
 
-#: include/plugin.php:533
-msgid "This action is not available under your subscription plan."
+#: include/follow.php:144
+msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: include/security.php:64
-msgid "Welcome "
+#: include/follow.php:147
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
 msgstr ""
 
-#: include/security.php:65
-msgid "Please upload a profile photo."
+#: include/follow.php:148
+msgid "Use mailto: in front of address to force email check."
 msgstr ""
 
-#: include/security.php:67
-msgid "Welcome back "
+#: include/follow.php:154
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
 msgstr ""
 
-#: include/security.php:424
+#: include/follow.php:159
 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."
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
 msgstr ""
 
-#: include/text.php:315
-msgid "newer"
+#: include/follow.php:256
+msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: include/text.php:316
-msgid "older"
+#: include/items.php:1734 mod/dfrn_confirm.php:738 mod/dfrn_request.php:760
+msgid "[Name Withheld]"
 msgstr ""
 
-#: include/text.php:321
-msgid "first"
+#: include/items.php:2110 mod/viewsrc.php:16 mod/notice.php:18
+#: mod/admin.php:257 mod/admin.php:1668 mod/admin.php:1919 mod/display.php:99
+#: mod/display.php:268 mod/display.php:473
+msgid "Item not found."
 msgstr ""
 
-#: include/text.php:322
-msgid "prev"
+#: include/items.php:2153
+msgid "Do you really want to delete this item?"
 msgstr ""
 
-#: include/text.php:356
-msgid "next"
+#: include/items.php:2155 mod/api.php:107 mod/dfrn_request.php:881
+#: mod/follow.php:150 mod/message.php:207 mod/register.php:249
+#: mod/profiles.php:638 mod/profiles.php:641 mod/profiles.php:668
+#: mod/settings.php:1168 mod/settings.php:1174 mod/settings.php:1181
+#: mod/settings.php:1185 mod/settings.php:1190 mod/settings.php:1195
+#: mod/settings.php:1200 mod/settings.php:1205 mod/settings.php:1231
+#: mod/settings.php:1232 mod/settings.php:1233 mod/settings.php:1234
+#: mod/settings.php:1235 mod/suggest.php:32 mod/contacts.php:465
+msgid "Yes"
 msgstr ""
 
-#: include/text.php:357
-msgid "last"
+#: include/items.php:2294 mod/api.php:28 mod/api.php:33 mod/attach.php:35
+#: mod/common.php:20 mod/crepair.php:105 mod/fsuggest.php:80 mod/nogroup.php:29
+#: mod/notes.php:25 mod/viewcontacts.php:49 mod/uimport.php:26
+#: mod/allfriends.php:15 mod/cal.php:302 mod/dfrn_confirm.php:64
+#: mod/dirfind.php:16 mod/editpost.php:13 mod/events.php:189 mod/follow.php:14
+#: mod/follow.php:55 mod/follow.php:118 mod/group.php:21 mod/invite.php:18
+#: mod/invite.php:106 mod/item.php:198 mod/item.php:210 mod/manage.php:104
+#: mod/message.php:49 mod/message.php:172 mod/mood.php:117
+#: mod/notifications.php:74 mod/ostatus_subscribe.php:12 mod/poke.php:156
+#: mod/profile_photo.php:20 mod/profile_photo.php:180 mod/profile_photo.php:191
+#: mod/profile_photo.php:204 mod/register.php:46 mod/regmod.php:107
+#: mod/repair_ostatus.php:12 mod/wall_upload.php:102 mod/wall_upload.php:105
+#: mod/wallmessage.php:12 mod/wallmessage.php:36 mod/wallmessage.php:76
+#: mod/wallmessage.php:100 mod/delegate.php:15 mod/photos.php:169
+#: mod/photos.php:1112 mod/profiles.php:167 mod/profiles.php:605
+#: mod/settings.php:25 mod/settings.php:133 mod/settings.php:665
+#: mod/suggest.php:58 mod/wall_attach.php:69 mod/wall_attach.php:72
+#: mod/contacts.php:373 mod/display.php:470 mod/network.php:17
+#: mod/unfollow.php:14 mod/unfollow.php:57 mod/unfollow.php:90 index.php:413
+msgid "Permission denied."
 msgstr ""
 
-#: include/text.php:411
-msgid "Loading more entries..."
+#: include/items.php:2411
+msgid "Archives"
 msgstr ""
 
-#: include/text.php:412
-msgid "The end"
+#: include/nav.php:38 mod/navigation.php:22
+msgid "Nothing new here"
 msgstr ""
 
-#: include/text.php:965
-msgid "No contacts"
+#: include/nav.php:42 mod/navigation.php:26
+msgid "Clear notifications"
 msgstr ""
 
-#: include/text.php:989
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/text.php:1002
-msgid "View Contacts"
+#: include/nav.php:43 include/text.php:1090
+msgid "@name, !forum, #tags, content"
 msgstr ""
 
-#: include/text.php:1092 mod/filer.php:32 mod/notes.php:64 mod/editpost.php:102
-msgid "Save"
+#: include/nav.php:81 view/theme/frio/theme.php:250 boot.php:874
+msgid "Logout"
 msgstr ""
 
-#: include/text.php:1153
-msgid "poke"
+#: include/nav.php:81 view/theme/frio/theme.php:250
+msgid "End this session"
 msgstr ""
 
-#: include/text.php:1153
-msgid "poked"
+#: include/nav.php:84 include/nav.php:164 view/theme/frio/theme.php:253
+msgid "Your posts and conversations"
 msgstr ""
 
-#: include/text.php:1154
-msgid "ping"
+#: include/nav.php:85 view/theme/frio/theme.php:254
+msgid "Your profile page"
 msgstr ""
 
-#: include/text.php:1154
-msgid "pinged"
+#: include/nav.php:86 view/theme/frio/theme.php:255
+msgid "Your photos"
 msgstr ""
 
-#: include/text.php:1155
-msgid "prod"
+#: include/nav.php:87 view/theme/frio/theme.php:256
+msgid "Your videos"
 msgstr ""
 
-#: include/text.php:1155
-msgid "prodded"
+#: include/nav.php:88 view/theme/frio/theme.php:257
+msgid "Your events"
 msgstr ""
 
-#: include/text.php:1156
-msgid "slap"
+#: include/nav.php:89
+msgid "Personal notes"
 msgstr ""
 
-#: include/text.php:1156
-msgid "slapped"
+#: include/nav.php:89
+msgid "Your personal notes"
 msgstr ""
 
-#: include/text.php:1157
-msgid "finger"
+#: include/nav.php:98 mod/bookmarklet.php:15 boot.php:875
+msgid "Login"
 msgstr ""
 
-#: include/text.php:1157
-msgid "fingered"
+#: include/nav.php:98
+msgid "Sign in"
 msgstr ""
 
-#: include/text.php:1158
-msgid "rebuff"
+#: include/nav.php:108
+msgid "Home Page"
 msgstr ""
 
-#: include/text.php:1158
-msgid "rebuffed"
+#: include/nav.php:112 mod/register.php:293 boot.php:851
+msgid "Register"
 msgstr ""
 
-#: include/text.php:1172
-msgid "happy"
+#: include/nav.php:112
+msgid "Create an account"
 msgstr ""
 
-#: include/text.php:1173
-msgid "sad"
+#: include/nav.php:118 mod/help.php:51 view/theme/vier/theme.php:292
+msgid "Help"
 msgstr ""
 
-#: include/text.php:1174
-msgid "mellow"
+#: include/nav.php:118
+msgid "Help and documentation"
 msgstr ""
 
-#: include/text.php:1175
-msgid "tired"
+#: include/nav.php:122
+msgid "Apps"
 msgstr ""
 
-#: include/text.php:1176
-msgid "perky"
+#: include/nav.php:122
+msgid "Addon applications, utilities, games"
 msgstr ""
 
-#: include/text.php:1177
-msgid "angry"
+#: include/nav.php:126 include/text.php:1087 mod/search.php:145
+msgid "Search"
 msgstr ""
 
-#: include/text.php:1178
-msgid "stupified"
+#: include/nav.php:126
+msgid "Search site content"
 msgstr ""
 
-#: include/text.php:1179
-msgid "puzzled"
+#: include/nav.php:129 include/text.php:1095
+msgid "Full Text"
 msgstr ""
 
-#: include/text.php:1180
-msgid "interested"
+#: include/nav.php:130 include/text.php:1096
+msgid "Tags"
 msgstr ""
 
-#: include/text.php:1181
-msgid "bitter"
+#: include/nav.php:146 include/nav.php:148 mod/community.php:31
+msgid "Community"
 msgstr ""
 
-#: include/text.php:1182
-msgid "cheerful"
+#: include/nav.php:146
+msgid "Conversations on this site"
 msgstr ""
 
-#: include/text.php:1183
-msgid "alive"
+#: include/nav.php:148
+msgid "Conversations on the network"
 msgstr ""
 
-#: include/text.php:1184
-msgid "annoyed"
+#: include/nav.php:155
+msgid "Directory"
 msgstr ""
 
-#: include/text.php:1185
-msgid "anxious"
+#: include/nav.php:155
+msgid "People directory"
 msgstr ""
 
-#: include/text.php:1186
-msgid "cranky"
+#: include/nav.php:157
+msgid "Information"
 msgstr ""
 
-#: include/text.php:1187
-msgid "disturbed"
+#: include/nav.php:157
+msgid "Information about this friendica instance"
 msgstr ""
 
-#: include/text.php:1188
-msgid "frustrated"
+#: include/nav.php:161 view/theme/frio/theme.php:260
+msgid "Conversations from your friends"
 msgstr ""
 
-#: include/text.php:1189
-msgid "motivated"
+#: include/nav.php:162
+msgid "Network Reset"
 msgstr ""
 
-#: include/text.php:1190
-msgid "relaxed"
+#: include/nav.php:162
+msgid "Load Network page with no filters"
 msgstr ""
 
-#: include/text.php:1191
-msgid "surprised"
+#: include/nav.php:169
+msgid "Friend Requests"
 msgstr ""
 
-#: include/text.php:1408 mod/videos.php:389
-msgid "View Video"
+#: include/nav.php:172 mod/notifications.php:99
+msgid "Notifications"
 msgstr ""
 
-#: include/text.php:1425
-msgid "bytes"
+#: include/nav.php:173
+msgid "See all notifications"
 msgstr ""
 
-#: include/text.php:1460 include/text.php:1471
-msgid "Click to open/close"
+#: include/nav.php:174 mod/settings.php:903
+msgid "Mark as seen"
 msgstr ""
 
-#: include/text.php:1603
-msgid "View on separate page"
+#: include/nav.php:174
+msgid "Mark all system notifications seen"
 msgstr ""
 
-#: include/text.php:1604
-msgid "view on separate page"
+#: include/nav.php:178 mod/message.php:180 view/theme/frio/theme.php:262
+msgid "Messages"
 msgstr ""
 
-#: include/text.php:1889
-msgid "activity"
+#: include/nav.php:178 view/theme/frio/theme.php:262
+msgid "Private mail"
 msgstr ""
 
-#: include/text.php:1891 mod/content.php:625 object/Item.php:416
-#: object/Item.php:428
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/text.php:1894
-msgid "post"
+#: include/nav.php:179
+msgid "Inbox"
 msgstr ""
 
-#: include/text.php:2060
-msgid "Item filed"
+#: include/nav.php:180
+msgid "Outbox"
 msgstr ""
 
-#: include/uimport.php:84
-msgid "Error decoding account file"
+#: include/nav.php:181 mod/message.php:19
+msgid "New Message"
 msgstr ""
 
-#: include/uimport.php:90
-msgid "Error! No version data in file! This is not a Friendica account file?"
+#: include/nav.php:184
+msgid "Manage"
 msgstr ""
 
-#: include/uimport.php:107 include/uimport.php:118
-msgid "Error! Cannot check nickname"
+#: include/nav.php:184
+msgid "Manage other pages"
 msgstr ""
 
-#: include/uimport.php:111 include/uimport.php:122
-#, php-format
-msgid "User '%s' already exists on this server!"
+#: include/nav.php:187 mod/settings.php:84
+msgid "Delegations"
 msgstr ""
 
-#: include/uimport.php:144
-msgid "User creation error"
+#: include/nav.php:187 mod/delegate.php:130
+msgid "Delegate Page Management"
 msgstr ""
 
-#: include/uimport.php:165
-msgid "User profile creation error"
+#: include/nav.php:189 mod/newmember.php:15 mod/settings.php:114
+#: mod/admin.php:1721 mod/admin.php:1997 view/theme/frio/theme.php:263
+msgid "Settings"
 msgstr ""
 
-#: include/uimport.php:214
-#, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/uimport.php:280
-msgid "Done. You can now login with your username and password"
+#: include/nav.php:189 view/theme/frio/theme.php:263
+msgid "Account settings"
 msgstr ""
 
-#: include/user.php:41 mod/settings.php:373
-msgid "Passwords do not match. Password unchanged."
+#: include/nav.php:192
+msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: include/user.php:50
-msgid "An invitation is required."
+#: include/nav.php:195 view/theme/frio/theme.php:264
+msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: include/user.php:55
-msgid "Invitation could not be verified."
+#: include/nav.php:200 mod/admin.php:203
+msgid "Admin"
 msgstr ""
 
-#: include/user.php:63
-msgid "Invalid OpenID url"
+#: include/nav.php:200
+msgid "Site setup and configuration"
 msgstr ""
 
-#: include/user.php:84
-msgid "Please enter the required information."
+#: include/nav.php:203
+msgid "Navigation"
 msgstr ""
 
-#: include/user.php:98
-msgid "Please use a shorter name."
+#: include/nav.php:203
+msgid "Site map"
 msgstr ""
 
-#: include/user.php:100
-msgid "Name too short."
+#: include/network.php:704
+msgid "view full size"
 msgstr ""
 
-#: include/user.php:108
-msgid "That doesn't appear to be your full (First Last) name."
+#: include/ostatus.php:1710
+#, php-format
+msgid "%s is now following %s."
 msgstr ""
 
-#: include/user.php:113
-msgid "Your email domain is not among those allowed on this site."
+#: include/ostatus.php:1711
+msgid "following"
 msgstr ""
 
-#: include/user.php:116
-msgid "Not a valid email address."
+#: include/ostatus.php:1714
+#, php-format
+msgid "%s stopped following %s."
 msgstr ""
 
-#: include/user.php:129
-msgid "Cannot use that email."
+#: include/ostatus.php:1715
+msgid "stopped following"
 msgstr ""
 
-#: include/user.php:135
-msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
+#: include/text.php:315
+msgid "newer"
 msgstr ""
 
-#: include/user.php:142 include/user.php:230
-msgid "Nickname is already registered. Please choose another."
+#: include/text.php:316
+msgid "older"
 msgstr ""
 
-#: include/user.php:152
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
+#: include/text.php:321
+msgid "first"
 msgstr ""
 
-#: include/user.php:168
-msgid "SERIOUS ERROR: Generation of security keys failed."
+#: include/text.php:322
+msgid "prev"
 msgstr ""
 
-#: include/user.php:216
-msgid "An error occurred during registration. Please try again."
+#: include/text.php:356
+msgid "next"
 msgstr ""
 
-#: include/user.php:239 view/theme/duepuntozero/config.php:47
-msgid "default"
+#: include/text.php:357
+msgid "last"
 msgstr ""
 
-#: include/user.php:249
-msgid "An error occurred creating your default profile. Please try again."
+#: include/text.php:411
+msgid "Loading more entries..."
 msgstr ""
 
-#: include/user.php:308 include/user.php:316 include/user.php:324
-#: include/api.php:3717 mod/profile_photo.php:75 mod/profile_photo.php:83
-#: mod/profile_photo.php:91 mod/profile_photo.php:215 mod/profile_photo.php:310
-#: mod/profile_photo.php:320 mod/photos.php:74 mod/photos.php:190
-#: mod/photos.php:777 mod/photos.php:1259 mod/photos.php:1280
-#: mod/photos.php:1866
-msgid "Profile Photos"
+#: include/text.php:412
+msgid "The end"
 msgstr ""
 
-#: include/user.php:399
-#, 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"
+#: include/text.php:961
+msgid "No contacts"
 msgstr ""
 
-#: include/user.php:409
+#: include/text.php:985
 #, php-format
-msgid "Registration at %s"
-msgstr ""
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/user.php:419
-#, 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"
+#: include/text.php:998
+msgid "View Contacts"
 msgstr ""
 
-#: include/user.php:423
-#, php-format
-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."
+#: include/text.php:1088 mod/filer.php:32 mod/notes.php:64 mod/editpost.php:102
+msgid "Save"
 msgstr ""
 
-#: include/user.php:455 mod/admin.php:1406
-#, php-format
-msgid "Registration details for %s"
+#: include/text.php:1149
+msgid "poke"
 msgstr ""
 
-#: include/Photo.php:1008 include/Photo.php:1024 include/Photo.php:1032
-#: include/Photo.php:1057 include/message.php:138 mod/item.php:469
-#: mod/wall_upload.php:250
-msgid "Wall Photos"
+#: include/text.php:1149
+msgid "poked"
 msgstr ""
 
-#: include/dfrn.php:1331
-#, php-format
-msgid "%s\\'s birthday"
+#: include/text.php:1150
+msgid "ping"
 msgstr ""
 
-#: include/message.php:15 include/message.php:161
-msgid "[no subject]"
+#: include/text.php:1150
+msgid "pinged"
 msgstr ""
 
-#: include/photos.php:57 include/photos.php:66 mod/photos.php:190
-#: mod/photos.php:1126 mod/photos.php:1259 mod/photos.php:1280
-#: mod/photos.php:1842 mod/photos.php:1856 mod/fbrowser.php:43
-#: mod/fbrowser.php:65
-msgid "Contact Photos"
+#: include/text.php:1151
+msgid "prod"
 msgstr ""
 
-#: include/Contact.php:463
-msgid "Drop Contact"
+#: include/text.php:1151
+msgid "prodded"
 msgstr ""
 
-#: include/Contact.php:841
-msgid "Organisation"
+#: include/text.php:1152
+msgid "slap"
 msgstr ""
 
-#: include/Contact.php:844
-msgid "News"
+#: include/text.php:1152
+msgid "slapped"
 msgstr ""
 
-#: include/Contact.php:847
-msgid "Forum"
+#: include/text.php:1153
+msgid "finger"
 msgstr ""
 
-#: include/api.php:1103
-#, php-format
-msgid "Daily posting limit of %d posts reached. The post was rejected."
+#: include/text.php:1153
+msgid "fingered"
 msgstr ""
 
-#: include/api.php:1124
-#, php-format
-msgid "Weekly posting limit of %d posts reached. The post was rejected."
+#: include/text.php:1154
+msgid "rebuff"
 msgstr ""
 
-#: include/api.php:1145
-#, php-format
-msgid "Monthly posting limit of %d posts reached. The post was rejected."
+#: include/text.php:1154
+msgid "rebuffed"
 msgstr ""
 
-#: include/diaspora.php:2259
-msgid "Sharing notification from Diaspora network"
+#: include/text.php:1168
+msgid "happy"
 msgstr ""
 
-#: include/diaspora.php:3226
-msgid "Attachments:"
+#: include/text.php:1169
+msgid "sad"
 msgstr ""
 
-#: include/follow.php:85 mod/dfrn_request.php:515
-msgid "Disallowed profile URL."
+#: include/text.php:1170
+msgid "mellow"
 msgstr ""
 
-#: include/follow.php:90 mod/dfrn_request.php:521 mod/friendica.php:116
-#: mod/admin.php:289 mod/admin.php:307
-msgid "Blocked domain"
+#: include/text.php:1171
+msgid "tired"
 msgstr ""
 
-#: include/follow.php:95
-msgid "Connect URL missing."
+#: include/text.php:1172
+msgid "perky"
 msgstr ""
 
-#: include/follow.php:123
-msgid ""
-"This site is not configured to allow communications with other networks."
+#: include/text.php:1173
+msgid "angry"
 msgstr ""
 
-#: include/follow.php:124 include/follow.php:138
-msgid "No compatible communication protocols or feeds were discovered."
+#: include/text.php:1174
+msgid "stupified"
 msgstr ""
 
-#: include/follow.php:136
-msgid "The profile address specified does not provide adequate information."
+#: include/text.php:1175
+msgid "puzzled"
 msgstr ""
 
-#: include/follow.php:141
-msgid "An author or name was not found."
+#: include/text.php:1176
+msgid "interested"
 msgstr ""
 
-#: include/follow.php:144
-msgid "No browser URL could be matched to this address."
+#: include/text.php:1177
+msgid "bitter"
 msgstr ""
 
-#: include/follow.php:147
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
+#: include/text.php:1178
+msgid "cheerful"
 msgstr ""
 
-#: include/follow.php:148
-msgid "Use mailto: in front of address to force email check."
+#: include/text.php:1179
+msgid "alive"
 msgstr ""
 
-#: include/follow.php:154
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
+#: include/text.php:1180
+msgid "annoyed"
 msgstr ""
 
-#: include/follow.php:159
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
+#: include/text.php:1181
+msgid "anxious"
 msgstr ""
 
-#: include/follow.php:256
-msgid "Unable to retrieve contact information."
+#: include/text.php:1182
+msgid "cranky"
 msgstr ""
 
-#: include/items.php:1724 mod/dfrn_confirm.php:738 mod/dfrn_request.php:760
-msgid "[Name Withheld]"
+#: include/text.php:1183
+msgid "disturbed"
 msgstr ""
 
-#: include/items.php:2100 mod/viewsrc.php:16 mod/notice.php:18
-#: mod/display.php:122 mod/display.php:291 mod/display.php:496
-#: mod/admin.php:257 mod/admin.php:1663 mod/admin.php:1914
-msgid "Item not found."
+#: include/text.php:1184
+msgid "frustrated"
 msgstr ""
 
-#: include/items.php:2143
-msgid "Do you really want to delete this item?"
+#: include/text.php:1185
+msgid "motivated"
 msgstr ""
 
-#: include/items.php:2145 mod/api.php:107 mod/dfrn_request.php:881
-#: mod/follow.php:150 mod/message.php:207 mod/register.php:249
-#: mod/profiles.php:638 mod/profiles.php:641 mod/profiles.php:668
-#: mod/settings.php:1168 mod/settings.php:1174 mod/settings.php:1181
-#: mod/settings.php:1185 mod/settings.php:1190 mod/settings.php:1195
-#: mod/settings.php:1200 mod/settings.php:1205 mod/settings.php:1231
-#: mod/settings.php:1232 mod/settings.php:1233 mod/settings.php:1234
-#: mod/settings.php:1235 mod/suggest.php:32 mod/contacts.php:465
-msgid "Yes"
+#: include/text.php:1186
+msgid "relaxed"
 msgstr ""
 
-#: include/items.php:2284 mod/api.php:28 mod/api.php:33 mod/attach.php:35
-#: mod/common.php:20 mod/crepair.php:105 mod/fsuggest.php:80 mod/nogroup.php:29
-#: mod/notes.php:25 mod/viewcontacts.php:49 mod/uimport.php:26
-#: mod/allfriends.php:15 mod/cal.php:302 mod/dfrn_confirm.php:64
-#: mod/dirfind.php:16 mod/editpost.php:13 mod/events.php:189 mod/follow.php:14
-#: mod/follow.php:55 mod/follow.php:118 mod/group.php:21 mod/invite.php:18
-#: mod/invite.php:106 mod/item.php:198 mod/item.php:210 mod/manage.php:104
-#: mod/message.php:49 mod/message.php:172 mod/mood.php:117 mod/network.php:17
-#: mod/notifications.php:74 mod/ostatus_subscribe.php:12 mod/poke.php:156
-#: mod/profile_photo.php:20 mod/profile_photo.php:180 mod/profile_photo.php:191
-#: mod/profile_photo.php:204 mod/register.php:46 mod/regmod.php:107
-#: mod/repair_ostatus.php:12 mod/wall_upload.php:102 mod/wall_upload.php:105
-#: mod/wallmessage.php:12 mod/wallmessage.php:36 mod/wallmessage.php:76
-#: mod/wallmessage.php:100 mod/delegate.php:15 mod/display.php:493
-#: mod/photos.php:169 mod/photos.php:1112 mod/profiles.php:167
-#: mod/profiles.php:605 mod/settings.php:25 mod/settings.php:133
-#: mod/settings.php:665 mod/suggest.php:58 mod/wall_attach.php:69
-#: mod/wall_attach.php:72 mod/contacts.php:373 mod/unfollow.php:14
-#: mod/unfollow.php:57 mod/unfollow.php:90 index.php:411
-msgid "Permission denied."
+#: include/text.php:1187
+msgid "surprised"
 msgstr ""
 
-#: include/items.php:2401
-msgid "Archives"
+#: include/text.php:1404 mod/videos.php:389
+msgid "View Video"
 msgstr ""
 
-#: include/network.php:704
-msgid "view full size"
+#: include/text.php:1421
+msgid "bytes"
 msgstr ""
 
-#: include/ostatus.php:1690
-#, php-format
-msgid "%s is now following %s."
+#: include/text.php:1456 include/text.php:1467
+msgid "Click to open/close"
 msgstr ""
 
-#: include/ostatus.php:1691
-msgid "following"
+#: include/text.php:1599
+msgid "View on separate page"
+msgstr ""
+
+#: include/text.php:1600
+msgid "view on separate page"
+msgstr ""
+
+#: include/text.php:1885
+msgid "activity"
+msgstr ""
+
+#: include/text.php:1887 mod/content.php:625 object/Item.php:416
+#: object/Item.php:428
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/text.php:1890
+msgid "post"
+msgstr ""
+
+#: include/text.php:2056
+msgid "Item filed"
+msgstr ""
+
+#: include/uimport.php:79
+msgid "Error decoding account file"
 msgstr ""
 
-#: include/ostatus.php:1694
+#: include/uimport.php:85
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr ""
+
+#: include/uimport.php:102 include/uimport.php:113
+msgid "Error! Cannot check nickname"
+msgstr ""
+
+#: include/uimport.php:106 include/uimport.php:117
 #, php-format
-msgid "%s stopped following %s."
+msgid "User '%s' already exists on this server!"
 msgstr ""
 
-#: include/ostatus.php:1695
-msgid "stopped following"
+#: include/uimport.php:143
+msgid "User creation error"
+msgstr ""
+
+#: include/uimport.php:164
+msgid "User profile creation error"
+msgstr ""
+
+#: include/uimport.php:213
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/uimport.php:279
+msgid "Done. You can now login with your username and password"
 msgstr ""
 
 #: mod/api.php:78 mod/api.php:104
@@ -3139,7 +3139,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: mod/apps.php:9 index.php:258
+#: mod/apps.php:9 index.php:260
 msgid "You must be logged in to use addons. "
 msgstr ""
 
@@ -3272,12 +3272,12 @@ msgid "Refetch contact data"
 msgstr ""
 
 #: mod/crepair.php:159 mod/fsuggest.php:109 mod/content.php:730
-#: mod/events.php:509 mod/install.php:245 mod/install.php:285
-#: mod/invite.php:150 mod/localtime.php:47 mod/manage.php:157
-#: mod/message.php:338 mod/message.php:521 mod/mood.php:140 mod/poke.php:205
-#: mod/photos.php:1144 mod/photos.php:1274 mod/photos.php:1600
+#: mod/events.php:509 mod/invite.php:150 mod/localtime.php:47
+#: mod/manage.php:157 mod/message.php:338 mod/message.php:521 mod/mood.php:140
+#: mod/poke.php:205 mod/photos.php:1144 mod/photos.php:1274 mod/photos.php:1600
 #: mod/photos.php:1649 mod/photos.php:1691 mod/photos.php:1771
-#: mod/profiles.php:679 mod/contacts.php:604 object/Item.php:702
+#: mod/profiles.php:679 mod/contacts.php:604 mod/install.php:243
+#: mod/install.php:283 object/Item.php:702
 #: view/theme/duepuntozero/config.php:65 view/theme/frio/config.php:68
 #: view/theme/quattro/config.php:71 view/theme/vier/config.php:114
 msgid "Submit"
@@ -3298,7 +3298,7 @@ msgid ""
 msgstr ""
 
 #: mod/crepair.php:170 mod/settings.php:680 mod/settings.php:706
-#: mod/admin.php:1588 mod/admin.php:1601 mod/admin.php:1614 mod/admin.php:1630
+#: mod/admin.php:1593 mod/admin.php:1606 mod/admin.php:1619 mod/admin.php:1635
 msgid "Name"
 msgstr ""
 
@@ -3546,7 +3546,7 @@ msgstr ""
 msgid "Contacts who are not members of a group"
 msgstr ""
 
-#: mod/profperm.php:22 mod/group.php:78 index.php:410
+#: mod/profperm.php:22 mod/group.php:78 index.php:412
 msgid "Permission denied"
 msgstr ""
 
@@ -3576,9 +3576,9 @@ msgid "[Embedded content - reload page to view]"
 msgstr ""
 
 #: mod/viewcontacts.php:39 mod/webfinger.php:10 mod/probe.php:9
-#: mod/community.php:17 mod/dfrn_request.php:805 mod/directory.php:33
-#: mod/videos.php:201 mod/display.php:218 mod/photos.php:982 mod/search.php:89
-#: mod/search.php:95
+#: mod/community.php:17 mod/dfrn_request.php:805 mod/videos.php:201
+#: mod/photos.php:982 mod/directory.php:31 mod/display.php:195
+#: mod/search.php:89 mod/search.php:95
 msgid "Public access denied."
 msgstr ""
 
@@ -3651,7 +3651,7 @@ msgstr ""
 msgid "The post was created"
 msgstr ""
 
-#: mod/cal.php:146 mod/profile.php:157 mod/display.php:348
+#: mod/cal.php:146 mod/profile.php:157 mod/display.php:325
 msgid "Access to this profile has been restricted."
 msgstr ""
 
@@ -3663,7 +3663,7 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: mod/cal.php:276 mod/events.php:382 mod/install.php:204
+#: mod/cal.php:276 mod/events.php:382 mod/install.php:202
 msgid "Next"
 msgstr ""
 
@@ -4106,26 +4106,6 @@ msgstr ""
 msgid "Submit Request"
 msgstr ""
 
-#: mod/directory.php:195 view/theme/vier/theme.php:194
-msgid "Global Directory"
-msgstr ""
-
-#: mod/directory.php:197
-msgid "Find on this site"
-msgstr ""
-
-#: mod/directory.php:199
-msgid "Results for:"
-msgstr ""
-
-#: mod/directory.php:201
-msgid "Site Directory"
-msgstr ""
-
-#: mod/directory.php:208
-msgid "No entries (some entries may be hidden)."
-msgstr ""
-
 #: mod/dirfind.php:40
 #, php-format
 msgid "People Search - %s"
@@ -4209,7 +4189,7 @@ msgid "Event removed"
 msgstr ""
 
 #: mod/fetch.php:16 mod/fetch.php:43 mod/fetch.php:52 mod/help.php:57
-#: mod/p.php:20 mod/p.php:47 mod/p.php:56 index.php:302
+#: mod/p.php:20 mod/p.php:47 mod/p.php:56 index.php:304
 msgid "Not Found"
 msgstr ""
 
@@ -4238,50 +4218,6 @@ msgstr ""
 msgid "Profile URL"
 msgstr ""
 
-#: mod/friendica.php:70
-msgid "This is Friendica, version"
-msgstr ""
-
-#: mod/friendica.php:71
-msgid "running at web location"
-msgstr ""
-
-#: mod/friendica.php:75
-msgid ""
-"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
-"more about the Friendica project."
-msgstr ""
-
-#: mod/friendica.php:79
-msgid "Bug reports and issues: please visit"
-msgstr ""
-
-#: mod/friendica.php:79
-msgid "the bugtracker at github"
-msgstr ""
-
-#: mod/friendica.php:82
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
-"dot com"
-msgstr ""
-
-#: mod/friendica.php:96
-msgid "Installed plugins/addons/apps:"
-msgstr ""
-
-#: mod/friendica.php:110
-msgid "No installed plugins/addons/apps"
-msgstr ""
-
-#: mod/friendica.php:115
-msgid "On this server the following remote servers are blocked."
-msgstr ""
-
-#: mod/friendica.php:116 mod/admin.php:290 mod/admin.php:308
-msgid "Reason for the block"
-msgstr ""
-
 #: mod/group.php:31
 msgid "Group created."
 msgstr ""
@@ -4350,7 +4286,7 @@ msgstr ""
 msgid "Help:"
 msgstr ""
 
-#: mod/help.php:60 index.php:305
+#: mod/help.php:60 index.php:307
 msgid "Page not found."
 msgstr ""
 
@@ -4359,4438 +4295,4506 @@ msgstr ""
 msgid "Welcome to %s"
 msgstr ""
 
-#: mod/install.php:109
-msgid "Friendica Communications Server - Setup"
-msgstr ""
-
-#: mod/install.php:115
-msgid "Could not connect to database."
+#: mod/invite.php:31
+msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: mod/install.php:119
-msgid "Could not create table."
+#: mod/invite.php:54
+#, php-format
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: mod/install.php:125
-msgid "Your Friendica site database has been installed."
+#: mod/invite.php:79
+msgid "Please join us on Friendica"
 msgstr ""
 
-#: mod/install.php:130
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
+#: mod/invite.php:90
+msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: mod/install.php:131 mod/install.php:203 mod/install.php:550
-msgid "Please see the file \"INSTALL.txt\"."
+#: mod/invite.php:94
+#, php-format
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: mod/install.php:143
-msgid "Database already in use."
-msgstr ""
+#: mod/invite.php:98
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
 
-#: mod/install.php:200
-msgid "System check"
+#: mod/invite.php:117
+msgid "You have no more invitations available"
 msgstr ""
 
-#: mod/install.php:205
-msgid "Check again"
+#: mod/invite.php:125
+#, 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/install.php:224
-msgid "Database connection"
+#: mod/invite.php:127
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
 msgstr ""
 
-#: mod/install.php:225
+#: mod/invite.php:128
+#, php-format
 msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
+"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/install.php:226
+#: mod/invite.php:132
 msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+"Our apologies. This system is not currently configured to connect with other "
+"public sites or invite members."
+msgstr ""
+
+#: mod/invite.php:135
+#, php-format
+msgid "To accept this invitation, please visit and register at %s."
 msgstr ""
 
-#: mod/install.php:227
+#: mod/invite.php:136
 msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+"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/install.php:231
-msgid "Database Server Name"
+#: mod/invite.php:142
+msgid "Send invitations"
 msgstr ""
 
-#: mod/install.php:232
-msgid "Database Login Name"
+#: mod/invite.php:143
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: mod/install.php:233
-msgid "Database Login Password"
+#: mod/invite.php:144 mod/message.php:332 mod/message.php:515
+#: mod/wallmessage.php:138
+msgid "Your message:"
 msgstr ""
 
-#: mod/install.php:233
-msgid "For security reasons the password must not be empty"
+#: mod/invite.php:145
+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/install.php:234
-msgid "Database Name"
+#: mod/invite.php:147
+msgid "You will need to supply this invitation code: $invite_code"
 msgstr ""
 
-#: mod/install.php:235 mod/install.php:276
-msgid "Site administrator email address"
+#: mod/invite.php:147
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: mod/install.php:235 mod/install.php:276
+#: mod/invite.php:149
 msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendi.ca"
 msgstr ""
 
-#: mod/install.php:239 mod/install.php:279
-msgid "Please select a default timezone for your website"
+#: mod/item.php:119
+msgid "Unable to locate original post."
 msgstr ""
 
-#: mod/install.php:266
-msgid "Site settings"
+#: mod/item.php:346
+msgid "Empty post discarded."
 msgstr ""
 
-#: mod/install.php:280
-msgid "System Language:"
+#: mod/item.php:903
+msgid "System error. Post not saved."
 msgstr ""
 
-#: mod/install.php:280
+#: mod/item.php:994
+#, php-format
 msgid ""
-"Set the default language for your Friendica installation interface and to "
-"send emails."
+"This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: mod/install.php:320
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: mod/item.php:996
+#, php-format
+msgid "You may visit them online at %s"
 msgstr ""
 
-#: mod/install.php:321
+#: mod/item.php:997
 msgid ""
-"If you don't have a command line version of PHP installed on 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>"
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
 msgstr ""
 
-#: mod/install.php:325
-msgid "PHP executable path"
+#: mod/item.php:1001
+#, php-format
+msgid "%s posted an update."
 msgstr ""
 
-#: mod/install.php:325
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
+#: mod/localtime.php:26
+msgid "Time Conversion"
 msgstr ""
 
-#: mod/install.php:330
-msgid "Command line PHP"
+#: mod/localtime.php:28
+msgid ""
+"Friendica provides this service for sharing events with other networks and "
+"friends in unknown timezones."
 msgstr ""
 
-#: mod/install.php:339
-msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
+#: mod/localtime.php:32
+#, php-format
+msgid "UTC time: %s"
 msgstr ""
 
-#: mod/install.php:340
-msgid "Found PHP version: "
+#: mod/localtime.php:35
+#, php-format
+msgid "Current timezone: %s"
 msgstr ""
 
-#: mod/install.php:342
-msgid "PHP cli binary"
+#: mod/localtime.php:38
+#, php-format
+msgid "Converted localtime: %s"
 msgstr ""
 
-#: mod/install.php:353
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: mod/localtime.php:43
+msgid "Please select your timezone:"
 msgstr ""
 
-#: mod/install.php:354
-msgid "This is required for message delivery to work."
+#: mod/lostpass.php:22
+msgid "No valid account found."
 msgstr ""
 
-#: mod/install.php:356
-msgid "PHP register_argc_argv"
+#: mod/lostpass.php:38
+msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: mod/install.php:379
+#: mod/lostpass.php:44
+#, php-format
 msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+"\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."
 msgstr ""
 
-#: mod/install.php:380
+#: mod/lostpass.php:55
+#, php-format
 msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+"\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"
 msgstr ""
 
-#: mod/install.php:382
-msgid "Generate encryption keys"
+#: mod/lostpass.php:74
+#, php-format
+msgid "Password reset requested at %s"
 msgstr ""
 
-#: mod/install.php:389
-msgid "libCurl PHP module"
+#: mod/lostpass.php:94
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
 msgstr ""
 
-#: mod/install.php:390
-msgid "GD graphics PHP module"
+#: mod/lostpass.php:113 boot.php:889
+msgid "Password Reset"
 msgstr ""
 
-#: mod/install.php:391
-msgid "OpenSSL PHP module"
+#: mod/lostpass.php:114
+msgid "Your password has been reset as requested."
 msgstr ""
 
-#: mod/install.php:392
-msgid "PDO or MySQLi PHP module"
+#: mod/lostpass.php:115
+msgid "Your new password is"
 msgstr ""
 
-#: mod/install.php:393
-msgid "mb_string PHP module"
+#: mod/lostpass.php:116
+msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: mod/install.php:394
-msgid "XML PHP module"
+#: mod/lostpass.php:117
+msgid "click here to login"
 msgstr ""
 
-#: mod/install.php:395
-msgid "iconv module"
+#: mod/lostpass.php:118
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
 msgstr ""
 
-#: mod/install.php:399 mod/install.php:401
-msgid "Apache mod_rewrite module"
+#: mod/lostpass.php:128
+#, 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 ""
 
-#: mod/install.php:399
+#: mod/lostpass.php:134
+#, php-format
 msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+"\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"
 msgstr ""
 
-#: mod/install.php:407
-msgid "Error: libCURL PHP module required but not installed."
+#: mod/lostpass.php:150
+#, php-format
+msgid "Your password has been changed at %s"
+msgstr ""
+
+#: mod/lostpass.php:162
+msgid "Forgot your Password?"
 msgstr ""
 
-#: mod/install.php:411
+#: mod/lostpass.php:163
 msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
 
-#: mod/install.php:415
-msgid "Error: openssl PHP module required but not installed."
+#: mod/lostpass.php:164 boot.php:877
+msgid "Nickname or Email: "
 msgstr ""
 
-#: mod/install.php:419
-msgid "Error: PDO or MySQLi PHP module required but not installed."
+#: mod/lostpass.php:165
+msgid "Reset"
 msgstr ""
 
-#: mod/install.php:423
-msgid "Error: The MySQL driver for PDO is not installed."
+#: mod/manage.php:153
+msgid "Manage Identities and/or Pages"
 msgstr ""
 
-#: mod/install.php:427
-msgid "Error: mb_string PHP module required but not installed."
+#: mod/manage.php:154
+msgid ""
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
 msgstr ""
 
-#: mod/install.php:431
-msgid "Error: iconv PHP module required but not installed."
+#: mod/manage.php:155
+msgid "Select an identity to manage: "
 msgstr ""
 
-#: mod/install.php:441
-msgid "Error, XML PHP module required but not installed."
+#: mod/match.php:39
+msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: mod/install.php:453
-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."
+#: mod/match.php:92
+msgid "is interested in:"
 msgstr ""
 
-#: mod/install.php:454
-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."
+#: mod/match.php:106
+msgid "Profile Match"
 msgstr ""
 
-#: mod/install.php:455
-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."
+#: mod/message.php:63 mod/wallmessage.php:53
+msgid "No recipient selected."
 msgstr ""
 
-#: mod/install.php:456
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"INSTALL.txt\" for instructions."
+#: mod/message.php:67
+msgid "Unable to locate contact information."
 msgstr ""
 
-#: mod/install.php:459
-msgid ".htconfig.php is writable"
+#: mod/message.php:70 mod/wallmessage.php:59
+msgid "Message could not be sent."
 msgstr ""
 
-#: mod/install.php:469
-msgid ""
-"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
+#: mod/message.php:73 mod/wallmessage.php:62
+msgid "Message collection failure."
 msgstr ""
 
-#: mod/install.php:470
-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."
+#: mod/message.php:76 mod/wallmessage.php:65
+msgid "Message sent."
 msgstr ""
 
-#: mod/install.php:471
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
+#: mod/message.php:205
+msgid "Do you really want to delete this message?"
 msgstr ""
 
-#: mod/install.php:472
-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."
+#: mod/message.php:225
+msgid "Message deleted."
 msgstr ""
 
-#: mod/install.php:475
-msgid "view/smarty3 is writable"
+#: mod/message.php:255
+msgid "Conversation removed."
 msgstr ""
 
-#: mod/install.php:491
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
+#: mod/message.php:322 mod/wallmessage.php:129
+msgid "Send Private Message"
 msgstr ""
 
-#: mod/install.php:493
-msgid "Url rewrite is working"
+#: mod/message.php:323 mod/message.php:510 mod/wallmessage.php:131
+msgid "To:"
 msgstr ""
 
-#: mod/install.php:512
-msgid "ImageMagick PHP extension is not installed"
+#: mod/message.php:328 mod/message.php:512 mod/wallmessage.php:132
+msgid "Subject:"
 msgstr ""
 
-#: mod/install.php:514
-msgid "ImageMagick PHP extension is installed"
+#: mod/message.php:364
+msgid "No messages."
 msgstr ""
 
-#: mod/install.php:516
-msgid "ImageMagick supports GIF"
+#: mod/message.php:403
+msgid "Message not available."
 msgstr ""
 
-#: mod/install.php:523
-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."
+#: mod/message.php:478
+msgid "Delete message"
 msgstr ""
 
-#: mod/install.php:548
-msgid "<h1>What next</h1>"
+#: mod/message.php:503 mod/message.php:591
+msgid "Delete conversation"
 msgstr ""
 
-#: mod/install.php:549
+#: mod/message.php:505
 msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
 msgstr ""
 
-#: mod/invite.php:31
-msgid "Total invitation limit exceeded."
+#: mod/message.php:509
+msgid "Send Reply"
 msgstr ""
 
-#: mod/invite.php:54
+#: mod/message.php:561
 #, php-format
-msgid "%s : Not a valid email address."
+msgid "Unknown sender - %s"
 msgstr ""
 
-#: mod/invite.php:79
-msgid "Please join us on Friendica"
+#: mod/message.php:563
+#, php-format
+msgid "You and %s"
 msgstr ""
 
-#: mod/invite.php:90
-msgid "Invitation limit exceeded. Please contact your site administrator."
+#: mod/message.php:565
+#, php-format
+msgid "%s and You"
 msgstr ""
 
-#: mod/invite.php:94
-#, php-format
-msgid "%s : Message delivery failed."
+#: mod/message.php:594
+msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: mod/invite.php:98
+#: mod/message.php:597
 #, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
+msgid "%d message"
+msgid_plural "%d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod/invite.php:117
-msgid "You have no more invitations available"
+#: mod/mood.php:136
+msgid "Mood"
 msgstr ""
 
-#: mod/invite.php:125
-#, 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."
+#: mod/mood.php:137
+msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: mod/invite.php:127
-#, php-format
-msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
+#: mod/notifications.php:38
+msgid "Invalid request identifier."
 msgstr ""
 
-#: mod/invite.php:128
-#, 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."
+#: mod/notifications.php:47 mod/notifications.php:183 mod/notifications.php:230
+msgid "Discard"
 msgstr ""
 
-#: mod/invite.php:132
-msgid ""
-"Our apologies. This system is not currently configured to connect with other "
-"public sites or invite members."
+#: mod/notifications.php:63 mod/notifications.php:182 mod/notifications.php:266
+#: mod/contacts.php:635 mod/contacts.php:835 mod/contacts.php:1020
+msgid "Ignore"
 msgstr ""
 
-#: mod/invite.php:135
-#, php-format
-msgid "To accept this invitation, please visit and register at %s."
+#: mod/notifications.php:108
+msgid "Network Notifications"
 msgstr ""
 
-#: mod/invite.php:136
-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."
+#: mod/notifications.php:114 mod/notify.php:73
+msgid "System Notifications"
 msgstr ""
 
-#: mod/invite.php:142
-msgid "Send invitations"
+#: mod/notifications.php:120
+msgid "Personal Notifications"
 msgstr ""
 
-#: mod/invite.php:143
-msgid "Enter email addresses, one per line:"
+#: mod/notifications.php:126
+msgid "Home Notifications"
 msgstr ""
 
-#: mod/invite.php:144 mod/message.php:332 mod/message.php:515
-#: mod/wallmessage.php:138
-msgid "Your message:"
+#: mod/notifications.php:155
+msgid "Show Ignored Requests"
 msgstr ""
 
-#: mod/invite.php:145
-msgid ""
-"You are cordially invited to join me and other close friends on Friendica - "
-"and help us to create a better social web."
+#: mod/notifications.php:155
+msgid "Hide Ignored Requests"
 msgstr ""
 
-#: mod/invite.php:147
-msgid "You will need to supply this invitation code: $invite_code"
+#: mod/notifications.php:167 mod/notifications.php:237
+msgid "Notification type: "
 msgstr ""
 
-#: mod/invite.php:147
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
+#: mod/notifications.php:170
+#, php-format
+msgid "suggested by %s"
 msgstr ""
 
-#: mod/invite.php:149
-msgid ""
-"For more information about the Friendica project and why we feel it is "
-"important, please visit http://friendi.ca"
+#: mod/notifications.php:175 mod/notifications.php:254 mod/contacts.php:642
+msgid "Hide this contact from others"
 msgstr ""
 
-#: mod/item.php:119
-msgid "Unable to locate original post."
+#: mod/notifications.php:176 mod/notifications.php:255
+msgid "Post a new friend activity"
 msgstr ""
 
-#: mod/item.php:346
-msgid "Empty post discarded."
+#: mod/notifications.php:176 mod/notifications.php:255
+msgid "if applicable"
 msgstr ""
 
-#: mod/item.php:903
-msgid "System error. Post not saved."
+#: mod/notifications.php:179 mod/notifications.php:264 mod/admin.php:1609
+msgid "Approve"
 msgstr ""
 
-#: mod/item.php:994
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social network."
+#: mod/notifications.php:198
+msgid "Claims to be known to you: "
 msgstr ""
 
-#: mod/item.php:996
-#, php-format
-msgid "You may visit them online at %s"
+#: mod/notifications.php:199
+msgid "yes"
 msgstr ""
 
-#: mod/item.php:997
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
+#: mod/notifications.php:199
+msgid "no"
 msgstr ""
 
-#: mod/item.php:1001
-#, php-format
-msgid "%s posted an update."
+#: mod/notifications.php:200 mod/notifications.php:205
+msgid "Shall your connection be bidirectional or not?"
 msgstr ""
 
-#: mod/localtime.php:26
-msgid "Time Conversion"
+#: mod/notifications.php:201 mod/notifications.php:206
+#, 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/localtime.php:28
+#: mod/notifications.php:202
+#, php-format
 msgid ""
-"Friendica provides this service for sharing events with other networks and "
-"friends in unknown timezones."
+"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/localtime.php:32
+#: mod/notifications.php:207
 #, php-format
-msgid "UTC time: %s"
+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/localtime.php:35
-#, php-format
-msgid "Current timezone: %s"
+#: mod/notifications.php:218
+msgid "Friend"
 msgstr ""
 
-#: mod/localtime.php:38
-#, php-format
-msgid "Converted localtime: %s"
+#: mod/notifications.php:219
+msgid "Sharer"
 msgstr ""
 
-#: mod/localtime.php:43
-msgid "Please select your timezone:"
+#: mod/notifications.php:219
+msgid "Subscriber"
 msgstr ""
 
-#: mod/lostpass.php:22
-msgid "No valid account found."
+#: mod/notifications.php:275
+msgid "No introductions."
 msgstr ""
 
-#: mod/lostpass.php:38
-msgid "Password reset request issued. Check your email."
+#: mod/notifications.php:316
+msgid "Show unread"
 msgstr ""
 
-#: mod/lostpass.php:44
-#, 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.\n"
-"\n"
-"\t\tYour password will not be changed unless we can verify that you\n"
-"\t\tissued this request."
+#: mod/notifications.php:316
+msgid "Show all"
 msgstr ""
 
-#: mod/lostpass.php:55
+#: mod/notifications.php:322
 #, php-format
-msgid ""
-"\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"
+msgid "No more %s notifications."
 msgstr ""
 
-#: mod/lostpass.php:74
-#, php-format
-msgid "Password reset requested at %s"
+#: mod/notify.php:69
+msgid "No more system notifications."
 msgstr ""
 
-#: mod/lostpass.php:94
+#: mod/oexchange.php:25
+msgid "Post successful."
+msgstr ""
+
+#: mod/openid.php:25
+msgid "OpenID protocol error. No ID returned."
+msgstr ""
+
+#: mod/openid.php:61
 msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
+"Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: mod/lostpass.php:113 boot.php:884
-msgid "Password Reset"
+#: mod/ostatus_subscribe.php:17
+msgid "Subscribing to OStatus contacts"
 msgstr ""
 
-#: mod/lostpass.php:114
-msgid "Your password has been reset as requested."
+#: mod/ostatus_subscribe.php:28
+msgid "No contact provided."
 msgstr ""
 
-#: mod/lostpass.php:115
-msgid "Your new password is"
+#: mod/ostatus_subscribe.php:34
+msgid "Couldn't fetch information for contact."
 msgstr ""
 
-#: mod/lostpass.php:116
-msgid "Save or copy your new password - and then"
+#: mod/ostatus_subscribe.php:43
+msgid "Couldn't fetch friends for contact."
 msgstr ""
 
-#: mod/lostpass.php:117
-msgid "click here to login"
+#: mod/ostatus_subscribe.php:57 mod/repair_ostatus.php:47
+msgid "Done"
 msgstr ""
 
-#: mod/lostpass.php:118
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
+#: mod/ostatus_subscribe.php:71
+msgid "success"
 msgstr ""
 
-#: mod/lostpass.php:128
-#, 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"
+#: mod/ostatus_subscribe.php:73
+msgid "failed"
 msgstr ""
 
-#: mod/lostpass.php:134
+#: mod/ostatus_subscribe.php:81 mod/repair_ostatus.php:53
+msgid "Keep this window open until done."
+msgstr ""
+
+#: mod/p.php:13
+msgid "Not Extended"
+msgstr ""
+
+#: mod/poke.php:198
+msgid "Poke/Prod"
+msgstr ""
+
+#: mod/poke.php:199
+msgid "poke, prod or do other things to somebody"
+msgstr ""
+
+#: mod/poke.php:200
+msgid "Recipient"
+msgstr ""
+
+#: mod/poke.php:201
+msgid "Choose what you wish to do to recipient"
+msgstr ""
+
+#: mod/poke.php:204
+msgid "Make this post private"
+msgstr ""
+
+#: mod/profile.php:177
+msgid "Tips for New Members"
+msgstr ""
+
+#: mod/profile_photo.php:45
+msgid "Image uploaded but image cropping failed."
+msgstr ""
+
+#: mod/profile_photo.php:78 mod/profile_photo.php:86 mod/profile_photo.php:94
+#: mod/profile_photo.php:323
 #, php-format
+msgid "Image size reduction [%s] failed."
+msgstr ""
+
+#: mod/profile_photo.php:128
 msgid ""
-"\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"
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
 
-#: mod/lostpass.php:150
+#: mod/profile_photo.php:137
+msgid "Unable to process image"
+msgstr ""
+
+#: mod/profile_photo.php:156 mod/wall_upload.php:182 mod/photos.php:816
 #, php-format
-msgid "Your password has been changed at %s"
+msgid "Image exceeds size limit of %s"
 msgstr ""
 
-#: mod/lostpass.php:162
-msgid "Forgot your Password?"
+#: mod/profile_photo.php:165 mod/wall_upload.php:219 mod/photos.php:857
+msgid "Unable to process image."
 msgstr ""
 
-#: mod/lostpass.php:163
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+#: mod/profile_photo.php:254
+msgid "Upload File:"
 msgstr ""
 
-#: mod/lostpass.php:164 boot.php:872
-msgid "Nickname or Email: "
+#: mod/profile_photo.php:255
+msgid "Select a profile:"
 msgstr ""
 
-#: mod/lostpass.php:165
-msgid "Reset"
+#: mod/profile_photo.php:257
+msgid "Upload"
 msgstr ""
 
-#: mod/manage.php:153
-msgid "Manage Identities and/or Pages"
+#: mod/profile_photo.php:260
+msgid "or"
 msgstr ""
 
-#: mod/manage.php:154
-msgid ""
-"Toggle between different identities or community/group pages which share "
-"your account details or which you have been granted \"manage\" permissions"
+#: mod/profile_photo.php:260
+msgid "skip this step"
 msgstr ""
 
-#: mod/manage.php:155
-msgid "Select an identity to manage: "
+#: mod/profile_photo.php:260
+msgid "select a photo from your photo albums"
 msgstr ""
 
-#: mod/match.php:39
-msgid "No keywords to match. Please add keywords to your default profile."
+#: mod/profile_photo.php:274
+msgid "Crop Image"
 msgstr ""
 
-#: mod/match.php:92
-msgid "is interested in:"
+#: mod/profile_photo.php:275
+msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: mod/match.php:106
-msgid "Profile Match"
+#: mod/profile_photo.php:277
+msgid "Done Editing"
 msgstr ""
 
-#: mod/message.php:63 mod/wallmessage.php:53
-msgid "No recipient selected."
+#: mod/profile_photo.php:313
+msgid "Image uploaded successfully."
 msgstr ""
 
-#: mod/message.php:67
-msgid "Unable to locate contact information."
+#: mod/profile_photo.php:315 mod/wall_upload.php:258 mod/photos.php:886
+msgid "Image upload failed."
 msgstr ""
 
-#: mod/message.php:70 mod/wallmessage.php:59
-msgid "Message could not be sent."
+#: mod/register.php:97
+msgid ""
+"Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: mod/message.php:73 mod/wallmessage.php:62
-msgid "Message collection failure."
+#: mod/register.php:102
+#, 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/message.php:76 mod/wallmessage.php:65
-msgid "Message sent."
+#: mod/register.php:109
+msgid "Registration successful."
 msgstr ""
 
-#: mod/message.php:205
-msgid "Do you really want to delete this message?"
+#: mod/register.php:115
+msgid "Your registration can not be processed."
 msgstr ""
 
-#: mod/message.php:225
-msgid "Message deleted."
+#: mod/register.php:164
+msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: mod/message.php:255
-msgid "Conversation removed."
+#: mod/register.php:230
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
 msgstr ""
 
-#: mod/message.php:322 mod/wallmessage.php:129
-msgid "Send Private Message"
+#: mod/register.php:231
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
 msgstr ""
 
-#: mod/message.php:323 mod/message.php:510 mod/wallmessage.php:131
-msgid "To:"
+#: mod/register.php:232
+msgid "Your OpenID (optional): "
 msgstr ""
 
-#: mod/message.php:328 mod/message.php:512 mod/wallmessage.php:132
-msgid "Subject:"
+#: mod/register.php:246
+msgid "Include your profile in member directory?"
 msgstr ""
 
-#: mod/message.php:364
-msgid "No messages."
+#: mod/register.php:271
+msgid "Note for the admin"
 msgstr ""
 
-#: mod/message.php:403
-msgid "Message not available."
+#: mod/register.php:271
+msgid "Leave a message for the admin, why you want to join this node"
 msgstr ""
 
-#: mod/message.php:478
-msgid "Delete message"
+#: mod/register.php:272
+msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: mod/message.php:503 mod/message.php:591
-msgid "Delete conversation"
+#: mod/register.php:273
+msgid "Your invitation ID: "
 msgstr ""
 
-#: mod/message.php:505
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
+#: mod/register.php:276 mod/admin.php:1160
+msgid "Registration"
 msgstr ""
 
-#: mod/message.php:509
-msgid "Send Reply"
+#: mod/register.php:284
+msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
 msgstr ""
 
-#: mod/message.php:561
-#, php-format
-msgid "Unknown sender - %s"
+#: mod/register.php:285
+msgid "Your Email Address: "
 msgstr ""
 
-#: mod/message.php:563
-#, php-format
-msgid "You and %s"
+#: mod/register.php:287 mod/settings.php:1275
+msgid "New Password:"
 msgstr ""
 
-#: mod/message.php:565
-#, php-format
-msgid "%s and You"
+#: mod/register.php:287
+msgid "Leave empty for an auto generated password."
 msgstr ""
 
-#: mod/message.php:594
-msgid "D, d M Y - g:i A"
+#: mod/register.php:288 mod/settings.php:1276
+msgid "Confirm:"
 msgstr ""
 
-#: mod/message.php:597
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
-msgstr[1] ""
+#: mod/register.php:289
+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 ""
 
-#: mod/mood.php:136
-msgid "Mood"
+#: mod/register.php:290
+msgid "Choose a nickname: "
 msgstr ""
 
-#: mod/mood.php:137
-msgid "Set your current mood and tell your friends"
+#: mod/register.php:300
+msgid "Import your profile to this friendica instance"
 msgstr ""
 
-#: mod/network.php:187 mod/search.php:28
-msgid "Remove term"
+#: mod/regmod.php:61
+msgid "Account approved."
 msgstr ""
 
-#: mod/network.php:561
+#: mod/regmod.php:89
 #, 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] ""
+msgid "Registration revoked for %s"
+msgstr ""
 
-#: mod/network.php:564
-msgid "Messages in this group won't be send to these receivers."
+#: mod/regmod.php:101
+msgid "Please login."
 msgstr ""
 
-#: mod/network.php:684
-msgid "Private messages to this person are at risk of public disclosure."
+#: mod/removeme.php:55 mod/removeme.php:58
+msgid "Remove My Account"
 msgstr ""
 
-#: mod/network.php:688
-msgid "Invalid contact."
+#: mod/removeme.php:56
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
 msgstr ""
 
-#: mod/network.php:892
-msgid "Commented Order"
+#: mod/removeme.php:57
+msgid "Please enter your password for verification:"
 msgstr ""
 
-#: mod/network.php:895
-msgid "Sort by Comment Date"
+#: mod/repair_ostatus.php:17
+msgid "Resubscribing to OStatus contacts"
 msgstr ""
 
-#: mod/network.php:900
-msgid "Posted Order"
+#: mod/repair_ostatus.php:33
+msgid "Error"
 msgstr ""
 
-#: mod/network.php:903
-msgid "Sort by Post Date"
+#: mod/subthread.php:106
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: mod/network.php:914
-msgid "Posts that mention or involve you"
+#: mod/tagrm.php:46
+msgid "Tag removed"
 msgstr ""
 
-#: mod/network.php:922
-msgid "New"
+#: mod/tagrm.php:85
+msgid "Remove Item Tag"
 msgstr ""
 
-#: mod/network.php:925
-msgid "Activity Stream - by date"
+#: mod/tagrm.php:87
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: mod/network.php:933
-msgid "Shared Links"
+#: mod/tagrm.php:98 mod/delegate.php:139
+msgid "Remove"
 msgstr ""
 
-#: mod/network.php:936
-msgid "Interesting Links"
+#: mod/uexport.php:39
+msgid "Export account"
 msgstr ""
 
-#: mod/network.php:944
-msgid "Starred"
+#: mod/uexport.php:39
+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/network.php:947
-msgid "Favourite Posts"
+#: mod/uexport.php:40
+msgid "Export all"
 msgstr ""
 
-#: mod/notifications.php:38
-msgid "Invalid request identifier."
+#: mod/uexport.php:40
+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/notifications.php:47 mod/notifications.php:183 mod/notifications.php:230
-msgid "Discard"
+#: mod/uexport.php:47 mod/settings.php:98
+msgid "Export personal data"
 msgstr ""
 
-#: mod/notifications.php:63 mod/notifications.php:182 mod/notifications.php:266
-#: mod/contacts.php:635 mod/contacts.php:835 mod/contacts.php:1020
-msgid "Ignore"
+#: mod/videos.php:127
+msgid "Do you really want to delete this video?"
 msgstr ""
 
-#: mod/notifications.php:108
-msgid "Network Notifications"
+#: mod/videos.php:132
+msgid "Delete Video"
 msgstr ""
 
-#: mod/notifications.php:114 mod/notify.php:73
-msgid "System Notifications"
+#: mod/videos.php:211
+msgid "No videos selected"
 msgstr ""
 
-#: mod/notifications.php:120
-msgid "Personal Notifications"
+#: mod/videos.php:312 mod/photos.php:1094
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: mod/notifications.php:126
-msgid "Home Notifications"
+#: mod/videos.php:396 mod/photos.php:1894
+msgid "View Album"
 msgstr ""
 
-#: mod/notifications.php:155
-msgid "Show Ignored Requests"
+#: mod/videos.php:405
+msgid "Recent Videos"
 msgstr ""
 
-#: mod/notifications.php:155
-msgid "Hide Ignored Requests"
+#: mod/videos.php:407
+msgid "Upload New Videos"
 msgstr ""
 
-#: mod/notifications.php:167 mod/notifications.php:237
-msgid "Notification type: "
+#: mod/wall_upload.php:37 mod/wall_upload.php:53 mod/wall_upload.php:111
+#: mod/wall_upload.php:151 mod/wall_upload.php:154 mod/wall_attach.php:19
+#: mod/wall_attach.php:27 mod/wall_attach.php:78
+msgid "Invalid request."
 msgstr ""
 
-#: mod/notifications.php:170
+#: mod/wallmessage.php:45 mod/wallmessage.php:109
 #, php-format
-msgid "suggested by %s"
+msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr ""
 
-#: mod/notifications.php:175 mod/notifications.php:254 mod/contacts.php:642
-msgid "Hide this contact from others"
+#: mod/wallmessage.php:56
+msgid "Unable to check your home location."
 msgstr ""
 
-#: mod/notifications.php:176 mod/notifications.php:255
-msgid "Post a new friend activity"
+#: mod/wallmessage.php:83 mod/wallmessage.php:92
+msgid "No recipient."
 msgstr ""
 
-#: mod/notifications.php:176 mod/notifications.php:255
-msgid "if applicable"
+#: mod/wallmessage.php:130
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
 msgstr ""
 
-#: mod/notifications.php:179 mod/notifications.php:264 mod/admin.php:1604
-msgid "Approve"
+#: mod/delegate.php:101
+msgid "No potential page delegates located."
 msgstr ""
 
-#: mod/notifications.php:198
-msgid "Claims to be known to you: "
+#: 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 ""
 
-#: mod/notifications.php:199
-msgid "yes"
+#: mod/delegate.php:133
+msgid "Existing Page Managers"
 msgstr ""
 
-#: mod/notifications.php:199
-msgid "no"
+#: mod/delegate.php:135
+msgid "Existing Page Delegates"
 msgstr ""
 
-#: mod/notifications.php:200 mod/notifications.php:205
-msgid "Shall your connection be bidirectional or not?"
+#: mod/delegate.php:137
+msgid "Potential Delegates"
 msgstr ""
 
-#: mod/notifications.php:201 mod/notifications.php:206
-#, 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."
+#: mod/delegate.php:140
+msgid "Add"
 msgstr ""
 
-#: mod/notifications.php:202
-#, 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."
+#: mod/delegate.php:141
+msgid "No entries."
 msgstr ""
 
-#: mod/notifications.php:207
-#, 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."
+#: mod/photos.php:97 mod/photos.php:1903
+msgid "Recent Photos"
 msgstr ""
 
-#: mod/notifications.php:218
-msgid "Friend"
+#: mod/photos.php:100 mod/photos.php:1331 mod/photos.php:1905
+msgid "Upload New Photos"
 msgstr ""
 
-#: mod/notifications.php:219
-msgid "Sharer"
+#: mod/photos.php:115 mod/settings.php:39
+msgid "everybody"
 msgstr ""
 
-#: mod/notifications.php:219
-msgid "Subscriber"
+#: mod/photos.php:179
+msgid "Contact information unavailable"
 msgstr ""
 
-#: mod/notifications.php:275
-msgid "No introductions."
+#: mod/photos.php:200
+msgid "Album not found."
 msgstr ""
 
-#: mod/notifications.php:316
-msgid "Show unread"
+#: mod/photos.php:233 mod/photos.php:245 mod/photos.php:1275
+msgid "Delete Album"
 msgstr ""
 
-#: mod/notifications.php:316
-msgid "Show all"
+#: mod/photos.php:243
+msgid "Do you really want to delete this photo album and all its photos?"
 msgstr ""
 
-#: mod/notifications.php:322
-#, php-format
-msgid "No more %s notifications."
+#: mod/photos.php:326 mod/photos.php:337 mod/photos.php:1601
+msgid "Delete Photo"
 msgstr ""
 
-#: mod/notify.php:69
-msgid "No more system notifications."
+#: mod/photos.php:335
+msgid "Do you really want to delete this photo?"
 msgstr ""
 
-#: mod/oexchange.php:25
-msgid "Post successful."
+#: mod/photos.php:716
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: mod/openid.php:25
-msgid "OpenID protocol error. No ID returned."
+#: mod/photos.php:716
+msgid "a photo"
 msgstr ""
 
-#: mod/openid.php:61
-msgid ""
-"Account not found and OpenID registration is not permitted on this site."
+#: mod/photos.php:824
+msgid "Image file is empty."
 msgstr ""
 
-#: mod/ostatus_subscribe.php:17
-msgid "Subscribing to OStatus contacts"
+#: mod/photos.php:991
+msgid "No photos selected"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:28
-msgid "No contact provided."
+#: mod/photos.php:1154
+#, php-format
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: mod/ostatus_subscribe.php:34
-msgid "Couldn't fetch information for contact."
+#: mod/photos.php:1191
+msgid "Upload Photos"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:43
-msgid "Couldn't fetch friends for contact."
+#: mod/photos.php:1195 mod/photos.php:1270
+msgid "New album name: "
 msgstr ""
 
-#: mod/ostatus_subscribe.php:57 mod/repair_ostatus.php:47
-msgid "Done"
+#: mod/photos.php:1196
+msgid "or existing album name: "
 msgstr ""
 
-#: mod/ostatus_subscribe.php:71
-msgid "success"
+#: mod/photos.php:1197
+msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:73
-msgid "failed"
+#: mod/photos.php:1208 mod/photos.php:1605 mod/settings.php:1304
+msgid "Show to Groups"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:81 mod/repair_ostatus.php:53
-msgid "Keep this window open until done."
+#: mod/photos.php:1209 mod/photos.php:1606 mod/settings.php:1305
+msgid "Show to Contacts"
 msgstr ""
 
-#: mod/p.php:13
-msgid "Not Extended"
+#: mod/photos.php:1210
+msgid "Private Photo"
 msgstr ""
 
-#: mod/poke.php:198
-msgid "Poke/Prod"
+#: mod/photos.php:1211
+msgid "Public Photo"
 msgstr ""
 
-#: mod/poke.php:199
-msgid "poke, prod or do other things to somebody"
+#: mod/photos.php:1281
+msgid "Edit Album"
 msgstr ""
 
-#: mod/poke.php:200
-msgid "Recipient"
+#: mod/photos.php:1286
+msgid "Show Newest First"
 msgstr ""
 
-#: mod/poke.php:201
-msgid "Choose what you wish to do to recipient"
+#: mod/photos.php:1288
+msgid "Show Oldest First"
 msgstr ""
 
-#: mod/poke.php:204
-msgid "Make this post private"
+#: mod/photos.php:1317 mod/photos.php:1888
+msgid "View Photo"
 msgstr ""
 
-#: mod/profile.php:177
-msgid "Tips for New Members"
+#: mod/photos.php:1362
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: mod/profile_photo.php:45
-msgid "Image uploaded but image cropping failed."
+#: mod/photos.php:1364
+msgid "Photo not available"
 msgstr ""
 
-#: mod/profile_photo.php:78 mod/profile_photo.php:86 mod/profile_photo.php:94
-#: mod/profile_photo.php:323
-#, php-format
-msgid "Image size reduction [%s] failed."
+#: mod/photos.php:1425
+msgid "View photo"
 msgstr ""
 
-#: mod/profile_photo.php:128
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
+#: mod/photos.php:1425
+msgid "Edit photo"
 msgstr ""
 
-#: mod/profile_photo.php:137
-msgid "Unable to process image"
+#: mod/photos.php:1426
+msgid "Use as profile photo"
 msgstr ""
 
-#: mod/profile_photo.php:156 mod/wall_upload.php:182 mod/photos.php:816
-#, php-format
-msgid "Image exceeds size limit of %s"
+#: mod/photos.php:1451
+msgid "View Full Size"
 msgstr ""
 
-#: mod/profile_photo.php:165 mod/wall_upload.php:219 mod/photos.php:857
-msgid "Unable to process image."
+#: mod/photos.php:1541
+msgid "Tags: "
 msgstr ""
 
-#: mod/profile_photo.php:254
-msgid "Upload File:"
+#: mod/photos.php:1544
+msgid "[Remove any tag]"
 msgstr ""
 
-#: mod/profile_photo.php:255
-msgid "Select a profile:"
+#: mod/photos.php:1587
+msgid "New album name"
 msgstr ""
 
-#: mod/profile_photo.php:257
-msgid "Upload"
+#: mod/photos.php:1588
+msgid "Caption"
 msgstr ""
 
-#: mod/profile_photo.php:260
-msgid "or"
+#: mod/photos.php:1589
+msgid "Add a Tag"
 msgstr ""
 
-#: mod/profile_photo.php:260
-msgid "skip this step"
+#: mod/photos.php:1589
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: mod/profile_photo.php:260
-msgid "select a photo from your photo albums"
+#: mod/photos.php:1590
+msgid "Do not rotate"
 msgstr ""
 
-#: mod/profile_photo.php:274
-msgid "Crop Image"
+#: mod/photos.php:1591
+msgid "Rotate CW (right)"
 msgstr ""
 
-#: mod/profile_photo.php:275
-msgid "Please adjust the image cropping for optimum viewing."
+#: mod/photos.php:1592
+msgid "Rotate CCW (left)"
 msgstr ""
 
-#: mod/profile_photo.php:277
-msgid "Done Editing"
+#: mod/photos.php:1607
+msgid "Private photo"
 msgstr ""
 
-#: mod/profile_photo.php:313
-msgid "Image uploaded successfully."
+#: mod/photos.php:1608
+msgid "Public photo"
 msgstr ""
 
-#: mod/profile_photo.php:315 mod/wall_upload.php:258 mod/photos.php:886
-msgid "Image upload failed."
+#: mod/photos.php:1817
+msgid "Map"
 msgstr ""
 
-#: mod/register.php:97
-msgid ""
-"Registration successful. Please check your email for further instructions."
+#: mod/ping.php:275
+msgid "{0} wants to be your friend"
 msgstr ""
 
-#: mod/register.php:102
-#, 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."
+#: mod/ping.php:290
+msgid "{0} sent you a message"
 msgstr ""
 
-#: mod/register.php:109
-msgid "Registration successful."
+#: mod/ping.php:305
+msgid "{0} requested registration"
 msgstr ""
 
-#: mod/register.php:115
-msgid "Your registration can not be processed."
+#: mod/profiles.php:43
+msgid "Profile deleted."
 msgstr ""
 
-#: mod/register.php:164
-msgid "Your registration is pending approval by the site owner."
+#: mod/profiles.php:59 mod/profiles.php:95
+msgid "Profile-"
 msgstr ""
 
-#: mod/register.php:230
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
+#: mod/profiles.php:78 mod/profiles.php:117
+msgid "New profile created."
 msgstr ""
 
-#: mod/register.php:231
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
+#: mod/profiles.php:101
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: mod/register.php:232
-msgid "Your OpenID (optional): "
+#: mod/profiles.php:191
+msgid "Profile Name is required."
 msgstr ""
 
-#: mod/register.php:246
-msgid "Include your profile in member directory?"
+#: mod/profiles.php:331
+msgid "Marital Status"
 msgstr ""
 
-#: mod/register.php:271
-msgid "Note for the admin"
+#: mod/profiles.php:335
+msgid "Romantic Partner"
 msgstr ""
 
-#: mod/register.php:271
-msgid "Leave a message for the admin, why you want to join this node"
+#: mod/profiles.php:347
+msgid "Work/Employment"
 msgstr ""
 
-#: mod/register.php:272
-msgid "Membership on this site is by invitation only."
+#: mod/profiles.php:350
+msgid "Religion"
 msgstr ""
 
-#: mod/register.php:273
-msgid "Your invitation ID: "
+#: mod/profiles.php:354
+msgid "Political Views"
 msgstr ""
 
-#: mod/register.php:276 mod/admin.php:1155
-msgid "Registration"
+#: mod/profiles.php:358
+msgid "Gender"
 msgstr ""
 
-#: mod/register.php:284
-msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
+#: mod/profiles.php:362
+msgid "Sexual Preference"
 msgstr ""
 
-#: mod/register.php:285
-msgid "Your Email Address: "
+#: mod/profiles.php:366
+msgid "XMPP"
 msgstr ""
 
-#: mod/register.php:287 mod/settings.php:1275
-msgid "New Password:"
+#: mod/profiles.php:370
+msgid "Homepage"
 msgstr ""
 
-#: mod/register.php:287
-msgid "Leave empty for an auto generated password."
+#: mod/profiles.php:374 mod/profiles.php:693
+msgid "Interests"
 msgstr ""
 
-#: mod/register.php:288 mod/settings.php:1276
-msgid "Confirm:"
+#: mod/profiles.php:378
+msgid "Address"
 msgstr ""
 
-#: mod/register.php:289
-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>'."
+#: mod/profiles.php:385 mod/profiles.php:689
+msgid "Location"
 msgstr ""
 
-#: mod/register.php:290
-msgid "Choose a nickname: "
+#: mod/profiles.php:470
+msgid "Profile updated."
 msgstr ""
 
-#: mod/register.php:300
-msgid "Import your profile to this friendica instance"
+#: mod/profiles.php:562
+msgid " and "
 msgstr ""
 
-#: mod/regmod.php:61
-msgid "Account approved."
+#: mod/profiles.php:571
+msgid "public profile"
 msgstr ""
 
-#: mod/regmod.php:89
+#: mod/profiles.php:574
 #, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: mod/regmod.php:101
-msgid "Please login."
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: mod/removeme.php:55 mod/removeme.php:58
-msgid "Remove My Account"
+#: mod/profiles.php:575
+#, php-format
+msgid " - Visit %1$s's %2$s"
 msgstr ""
 
-#: mod/removeme.php:56
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
+#: mod/profiles.php:577
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: mod/removeme.php:57
-msgid "Please enter your password for verification:"
+#: mod/profiles.php:635
+msgid "Hide contacts and friends:"
 msgstr ""
 
-#: mod/repair_ostatus.php:17
-msgid "Resubscribing to OStatus contacts"
+#: mod/profiles.php:640
+msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: mod/repair_ostatus.php:33
-msgid "Error"
+#: mod/profiles.php:665
+msgid "Show more profile fields:"
 msgstr ""
 
-#: mod/subthread.php:106
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
+#: mod/profiles.php:677
+msgid "Profile Actions"
 msgstr ""
 
-#: mod/tagrm.php:46
-msgid "Tag removed"
+#: mod/profiles.php:678
+msgid "Edit Profile Details"
 msgstr ""
 
-#: mod/tagrm.php:85
-msgid "Remove Item Tag"
+#: mod/profiles.php:680
+msgid "Change Profile Photo"
 msgstr ""
 
-#: mod/tagrm.php:87
-msgid "Select a tag to remove: "
+#: mod/profiles.php:681
+msgid "View this profile"
 msgstr ""
 
-#: mod/tagrm.php:98 mod/delegate.php:139
-msgid "Remove"
+#: mod/profiles.php:683
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: mod/uexport.php:39
-msgid "Export account"
+#: mod/profiles.php:684
+msgid "Clone this profile"
 msgstr ""
 
-#: mod/uexport.php:39
-msgid ""
-"Export your account info and contacts. Use this to make a backup of your "
-"account and/or to move it to another server."
+#: mod/profiles.php:685
+msgid "Delete this profile"
 msgstr ""
 
-#: mod/uexport.php:40
-msgid "Export all"
+#: mod/profiles.php:687
+msgid "Basic information"
 msgstr ""
 
-#: mod/uexport.php:40
-msgid ""
-"Export your accout info, contacts and all your items as json. Could be a "
-"very big file, and could take a lot of time. Use this to make a full backup "
-"of your account (photos are not exported)"
+#: mod/profiles.php:688
+msgid "Profile picture"
 msgstr ""
 
-#: mod/uexport.php:47 mod/settings.php:98
-msgid "Export personal data"
+#: mod/profiles.php:690
+msgid "Preferences"
 msgstr ""
 
-#: mod/videos.php:127
-msgid "Do you really want to delete this video?"
+#: mod/profiles.php:691
+msgid "Status information"
 msgstr ""
 
-#: mod/videos.php:132
-msgid "Delete Video"
+#: mod/profiles.php:692
+msgid "Additional information"
 msgstr ""
 
-#: mod/videos.php:211
-msgid "No videos selected"
+#: mod/profiles.php:695
+msgid "Relation"
 msgstr ""
 
-#: mod/videos.php:312 mod/photos.php:1094
-msgid "Access to this item is restricted."
+#: mod/profiles.php:699
+msgid "Your Gender:"
 msgstr ""
 
-#: mod/videos.php:396 mod/photos.php:1894
-msgid "View Album"
+#: mod/profiles.php:700
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: mod/videos.php:405
-msgid "Recent Videos"
+#: mod/profiles.php:702
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: mod/videos.php:407
-msgid "Upload New Videos"
+#: mod/profiles.php:707
+msgid "Profile Name:"
 msgstr ""
 
-#: mod/wall_upload.php:37 mod/wall_upload.php:53 mod/wall_upload.php:111
-#: mod/wall_upload.php:151 mod/wall_upload.php:154 mod/wall_attach.php:19
-#: mod/wall_attach.php:27 mod/wall_attach.php:78
-msgid "Invalid request."
+#: mod/profiles.php:709
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
 msgstr ""
 
-#: mod/wallmessage.php:45 mod/wallmessage.php:109
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
+#: mod/profiles.php:710
+msgid "Your Full Name:"
 msgstr ""
 
-#: mod/wallmessage.php:56
-msgid "Unable to check your home location."
+#: mod/profiles.php:711
+msgid "Title/Description:"
 msgstr ""
 
-#: mod/wallmessage.php:83 mod/wallmessage.php:92
-msgid "No recipient."
+#: mod/profiles.php:714
+msgid "Street Address:"
 msgstr ""
 
-#: mod/wallmessage.php:130
-#, php-format
-msgid ""
-"If you wish for %s to respond, please check that the privacy settings on "
-"your site allow private mail from unknown senders."
+#: mod/profiles.php:715
+msgid "Locality/City:"
 msgstr ""
 
-#: mod/delegate.php:101
-msgid "No potential page delegates located."
+#: mod/profiles.php:716
+msgid "Region/State:"
 msgstr ""
 
-#: 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."
+#: mod/profiles.php:717
+msgid "Postal/Zip Code:"
 msgstr ""
 
-#: mod/delegate.php:133
-msgid "Existing Page Managers"
+#: mod/profiles.php:718
+msgid "Country:"
 msgstr ""
 
-#: mod/delegate.php:135
-msgid "Existing Page Delegates"
+#: mod/profiles.php:722
+msgid "Who: (if applicable)"
 msgstr ""
 
-#: mod/delegate.php:137
-msgid "Potential Delegates"
+#: mod/profiles.php:722
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: mod/delegate.php:140
-msgid "Add"
+#: mod/profiles.php:723
+msgid "Since [date]:"
 msgstr ""
 
-#: mod/delegate.php:141
-msgid "No entries."
+#: mod/profiles.php:725
+msgid "Tell us about yourself..."
 msgstr ""
 
-#: mod/display.php:491
-msgid "Item has been removed."
+#: mod/profiles.php:726
+msgid "XMPP (Jabber) address:"
 msgstr ""
 
-#: mod/photos.php:97 mod/photos.php:1903
-msgid "Recent Photos"
+#: mod/profiles.php:726
+msgid ""
+"The XMPP address will be propagated to your contacts so that they can follow "
+"you."
 msgstr ""
 
-#: mod/photos.php:100 mod/photos.php:1331 mod/photos.php:1905
-msgid "Upload New Photos"
+#: mod/profiles.php:727
+msgid "Homepage URL:"
 msgstr ""
 
-#: mod/photos.php:115 mod/settings.php:39
-msgid "everybody"
+#: mod/profiles.php:730
+msgid "Religious Views:"
 msgstr ""
 
-#: mod/photos.php:179
-msgid "Contact information unavailable"
+#: mod/profiles.php:731
+msgid "Public Keywords:"
 msgstr ""
 
-#: mod/photos.php:200
-msgid "Album not found."
+#: mod/profiles.php:731
+msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: mod/photos.php:233 mod/photos.php:245 mod/photos.php:1275
-msgid "Delete Album"
+#: mod/profiles.php:732
+msgid "Private Keywords:"
 msgstr ""
 
-#: mod/photos.php:243
-msgid "Do you really want to delete this photo album and all its photos?"
+#: mod/profiles.php:732
+msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: mod/photos.php:326 mod/photos.php:337 mod/photos.php:1601
-msgid "Delete Photo"
+#: mod/profiles.php:735
+msgid "Musical interests"
 msgstr ""
 
-#: mod/photos.php:335
-msgid "Do you really want to delete this photo?"
+#: mod/profiles.php:736
+msgid "Books, literature"
 msgstr ""
 
-#: mod/photos.php:716
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
+#: mod/profiles.php:737
+msgid "Television"
 msgstr ""
 
-#: mod/photos.php:716
-msgid "a photo"
+#: mod/profiles.php:738
+msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: mod/photos.php:824
-msgid "Image file is empty."
+#: mod/profiles.php:739
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: mod/photos.php:991
-msgid "No photos selected"
+#: mod/profiles.php:740
+msgid "Love/romance"
 msgstr ""
 
-#: mod/photos.php:1154
-#, php-format
-msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+#: mod/profiles.php:741
+msgid "Work/employment"
 msgstr ""
 
-#: mod/photos.php:1191
-msgid "Upload Photos"
+#: mod/profiles.php:742
+msgid "School/education"
 msgstr ""
 
-#: mod/photos.php:1195 mod/photos.php:1270
-msgid "New album name: "
+#: mod/profiles.php:743
+msgid "Contact information and Social Networks"
 msgstr ""
 
-#: mod/photos.php:1196
-msgid "or existing album name: "
+#: mod/profiles.php:784
+msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: mod/photos.php:1197
-msgid "Do not show a status post for this upload"
+#: mod/settings.php:46 mod/admin.php:1593
+msgid "Account"
 msgstr ""
 
-#: mod/photos.php:1208 mod/photos.php:1605 mod/settings.php:1304
-msgid "Show to Groups"
+#: mod/settings.php:55 mod/admin.php:175
+msgid "Additional features"
 msgstr ""
 
-#: mod/photos.php:1209 mod/photos.php:1606 mod/settings.php:1305
-msgid "Show to Contacts"
+#: mod/settings.php:63
+msgid "Display"
 msgstr ""
 
-#: mod/photos.php:1210
-msgid "Private Photo"
+#: mod/settings.php:70 mod/settings.php:887
+msgid "Social Networks"
 msgstr ""
 
-#: mod/photos.php:1211
-msgid "Public Photo"
+#: mod/settings.php:77 mod/admin.php:173 mod/admin.php:1719 mod/admin.php:1782
+msgid "Plugins"
 msgstr ""
 
-#: mod/photos.php:1281
-msgid "Edit Album"
+#: mod/settings.php:91
+msgid "Connected apps"
 msgstr ""
 
-#: mod/photos.php:1286
-msgid "Show Newest First"
+#: mod/settings.php:105
+msgid "Remove account"
 msgstr ""
 
-#: mod/photos.php:1288
-msgid "Show Oldest First"
+#: mod/settings.php:160
+msgid "Missing some important data!"
 msgstr ""
 
-#: mod/photos.php:1317 mod/photos.php:1888
-msgid "View Photo"
+#: mod/settings.php:163 mod/settings.php:704 mod/contacts.php:833
+msgid "Update"
 msgstr ""
 
-#: mod/photos.php:1362
-msgid "Permission denied. Access to this item may be restricted."
+#: mod/settings.php:269
+msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: mod/photos.php:1364
-msgid "Photo not available"
+#: mod/settings.php:274
+msgid "Email settings updated."
 msgstr ""
 
-#: mod/photos.php:1425
-msgid "View photo"
+#: mod/settings.php:289
+msgid "Features updated"
 msgstr ""
 
-#: mod/photos.php:1425
-msgid "Edit photo"
+#: mod/settings.php:359
+msgid "Relocate message has been send to your contacts"
 msgstr ""
 
-#: mod/photos.php:1426
-msgid "Use as profile photo"
+#: mod/settings.php:378
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: mod/photos.php:1451
-msgid "View Full Size"
+#: mod/settings.php:386
+msgid "Wrong password."
 msgstr ""
 
-#: mod/photos.php:1541
-msgid "Tags: "
+#: mod/settings.php:397
+msgid "Password changed."
 msgstr ""
 
-#: mod/photos.php:1544
-msgid "[Remove any tag]"
+#: mod/settings.php:399
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: mod/photos.php:1587
-msgid "New album name"
+#: mod/settings.php:479
+msgid " Please use a shorter name."
 msgstr ""
 
-#: mod/photos.php:1588
-msgid "Caption"
+#: mod/settings.php:481
+msgid " Name too short."
 msgstr ""
 
-#: mod/photos.php:1589
-msgid "Add a Tag"
+#: mod/settings.php:490
+msgid "Wrong Password"
 msgstr ""
 
-#: mod/photos.php:1589
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+#: mod/settings.php:495
+msgid " Not valid email."
 msgstr ""
 
-#: mod/photos.php:1590
-msgid "Do not rotate"
+#: mod/settings.php:501
+msgid " Cannot change to that email."
 msgstr ""
 
-#: mod/photos.php:1591
-msgid "Rotate CW (right)"
+#: mod/settings.php:557
+msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: mod/photos.php:1592
-msgid "Rotate CCW (left)"
+#: mod/settings.php:561
+msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: mod/photos.php:1607
-msgid "Private photo"
+#: mod/settings.php:601
+msgid "Settings updated."
 msgstr ""
 
-#: mod/photos.php:1608
-msgid "Public photo"
+#: mod/settings.php:677 mod/settings.php:703 mod/settings.php:739
+msgid "Add application"
 msgstr ""
 
-#: mod/photos.php:1817
-msgid "Map"
+#: mod/settings.php:678 mod/settings.php:789 mod/settings.php:838
+#: mod/settings.php:905 mod/settings.php:1002 mod/settings.php:1268
+#: mod/admin.php:1158 mod/admin.php:1783 mod/admin.php:2046 mod/admin.php:2120
+#: mod/admin.php:2273
+msgid "Save Settings"
 msgstr ""
 
-#: mod/ping.php:275
-msgid "{0} wants to be your friend"
+#: mod/settings.php:681 mod/settings.php:707
+msgid "Consumer Key"
 msgstr ""
 
-#: mod/ping.php:290
-msgid "{0} sent you a message"
+#: mod/settings.php:682 mod/settings.php:708
+msgid "Consumer Secret"
 msgstr ""
 
-#: mod/ping.php:305
-msgid "{0} requested registration"
+#: mod/settings.php:683 mod/settings.php:709
+msgid "Redirect"
 msgstr ""
 
-#: mod/profiles.php:43
-msgid "Profile deleted."
+#: mod/settings.php:684 mod/settings.php:710
+msgid "Icon url"
 msgstr ""
 
-#: mod/profiles.php:59 mod/profiles.php:95
-msgid "Profile-"
+#: mod/settings.php:695
+msgid "You can't edit this application."
 msgstr ""
 
-#: mod/profiles.php:78 mod/profiles.php:117
-msgid "New profile created."
+#: mod/settings.php:738
+msgid "Connected Apps"
 msgstr ""
 
-#: mod/profiles.php:101
-msgid "Profile unavailable to clone."
+#: mod/settings.php:742
+msgid "Client key starts with"
 msgstr ""
 
-#: mod/profiles.php:191
-msgid "Profile Name is required."
+#: mod/settings.php:743
+msgid "No name"
 msgstr ""
 
-#: mod/profiles.php:331
-msgid "Marital Status"
+#: mod/settings.php:744
+msgid "Remove authorization"
 msgstr ""
 
-#: mod/profiles.php:335
-msgid "Romantic Partner"
+#: mod/settings.php:756
+msgid "No Plugin settings configured"
 msgstr ""
 
-#: mod/profiles.php:347
-msgid "Work/Employment"
+#: mod/settings.php:765
+msgid "Plugin Settings"
 msgstr ""
 
-#: mod/profiles.php:350
-msgid "Religion"
+#: mod/settings.php:779 mod/admin.php:2262 mod/admin.php:2263
+msgid "Off"
 msgstr ""
 
-#: mod/profiles.php:354
-msgid "Political Views"
+#: mod/settings.php:779 mod/admin.php:2262 mod/admin.php:2263
+msgid "On"
 msgstr ""
 
-#: mod/profiles.php:358
-msgid "Gender"
+#: mod/settings.php:787
+msgid "Additional Features"
 msgstr ""
 
-#: mod/profiles.php:362
-msgid "Sexual Preference"
+#: mod/settings.php:797 mod/settings.php:801
+msgid "General Social Media Settings"
 msgstr ""
 
-#: mod/profiles.php:366
-msgid "XMPP"
+#: mod/settings.php:807
+msgid "Disable intelligent shortening"
 msgstr ""
 
-#: mod/profiles.php:370
-msgid "Homepage"
+#: mod/settings.php:809
+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/profiles.php:374 mod/profiles.php:693
-msgid "Interests"
+#: mod/settings.php:815
+msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
 msgstr ""
 
-#: mod/profiles.php:378
-msgid "Address"
+#: mod/settings.php:817
+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/profiles.php:385 mod/profiles.php:689
-msgid "Location"
+#: mod/settings.php:823
+msgid "Default group for OStatus contacts"
 msgstr ""
 
-#: mod/profiles.php:470
-msgid "Profile updated."
+#: mod/settings.php:831
+msgid "Your legacy GNU Social account"
 msgstr ""
 
-#: mod/profiles.php:562
-msgid " and "
+#: mod/settings.php:833
+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/profiles.php:571
-msgid "public profile"
+#: mod/settings.php:836
+msgid "Repair OStatus subscriptions"
 msgstr ""
 
-#: mod/profiles.php:574
+#: mod/settings.php:845 mod/settings.php:846
 #, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: mod/profiles.php:575
-#, php-format
-msgid " - Visit %1$s's %2$s"
+#: mod/settings.php:845 mod/settings.php:846
+msgid "enabled"
 msgstr ""
 
-#: mod/profiles.php:577
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
+#: mod/settings.php:845 mod/settings.php:846
+msgid "disabled"
 msgstr ""
 
-#: mod/profiles.php:635
-msgid "Hide contacts and friends:"
+#: mod/settings.php:846
+msgid "GNU Social (OStatus)"
 msgstr ""
 
-#: mod/profiles.php:640
-msgid "Hide your contact/friend list from viewers of this profile?"
+#: mod/settings.php:880
+msgid "Email access is disabled on this site."
 msgstr ""
 
-#: mod/profiles.php:665
-msgid "Show more profile fields:"
+#: mod/settings.php:892
+msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: mod/profiles.php:677
-msgid "Profile Actions"
+#: mod/settings.php:893
+msgid ""
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: mod/profiles.php:678
-msgid "Edit Profile Details"
+#: mod/settings.php:894
+msgid "Last successful email check:"
 msgstr ""
 
-#: mod/profiles.php:680
-msgid "Change Profile Photo"
+#: mod/settings.php:896
+msgid "IMAP server name:"
 msgstr ""
 
-#: mod/profiles.php:681
-msgid "View this profile"
+#: mod/settings.php:897
+msgid "IMAP port:"
 msgstr ""
 
-#: mod/profiles.php:683
-msgid "Create a new profile using these settings"
+#: mod/settings.php:898
+msgid "Security:"
 msgstr ""
 
-#: mod/profiles.php:684
-msgid "Clone this profile"
+#: mod/settings.php:898 mod/settings.php:903
+msgid "None"
 msgstr ""
 
-#: mod/profiles.php:685
-msgid "Delete this profile"
+#: mod/settings.php:899
+msgid "Email login name:"
 msgstr ""
 
-#: mod/profiles.php:687
-msgid "Basic information"
+#: mod/settings.php:900
+msgid "Email password:"
 msgstr ""
 
-#: mod/profiles.php:688
-msgid "Profile picture"
+#: mod/settings.php:901
+msgid "Reply-to address:"
 msgstr ""
 
-#: mod/profiles.php:690
-msgid "Preferences"
+#: mod/settings.php:902
+msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: mod/profiles.php:691
-msgid "Status information"
+#: mod/settings.php:903
+msgid "Action after import:"
 msgstr ""
 
-#: mod/profiles.php:692
-msgid "Additional information"
+#: mod/settings.php:903
+msgid "Move to folder"
 msgstr ""
 
-#: mod/profiles.php:695
-msgid "Relation"
+#: mod/settings.php:904
+msgid "Move to folder:"
 msgstr ""
 
-#: mod/profiles.php:699
-msgid "Your Gender:"
+#: mod/settings.php:940 mod/admin.php:1045
+msgid "No special theme for mobile devices"
 msgstr ""
 
-#: mod/profiles.php:700
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+#: mod/settings.php:1000
+msgid "Display Settings"
 msgstr ""
 
-#: mod/profiles.php:702
-msgid "Example: fishing photography software"
+#: mod/settings.php:1006 mod/settings.php:1029
+msgid "Display Theme:"
 msgstr ""
 
-#: mod/profiles.php:707
-msgid "Profile Name:"
+#: mod/settings.php:1007
+msgid "Mobile Theme:"
 msgstr ""
 
-#: mod/profiles.php:709
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
+#: mod/settings.php:1008
+msgid "Suppress warning of insecure networks"
 msgstr ""
 
-#: mod/profiles.php:710
-msgid "Your Full Name:"
+#: mod/settings.php:1008
+msgid ""
+"Should the system suppress the warning that the current group contains "
+"members of networks that can't receive non public postings."
 msgstr ""
 
-#: mod/profiles.php:711
-msgid "Title/Description:"
+#: mod/settings.php:1009
+msgid "Update browser every xx seconds"
 msgstr ""
 
-#: mod/profiles.php:714
-msgid "Street Address:"
+#: mod/settings.php:1009
+msgid "Minimum of 10 seconds. Enter -1 to disable it."
 msgstr ""
 
-#: mod/profiles.php:715
-msgid "Locality/City:"
+#: mod/settings.php:1010
+msgid "Number of items to display per page:"
 msgstr ""
 
-#: mod/profiles.php:716
-msgid "Region/State:"
+#: mod/settings.php:1010 mod/settings.php:1011
+msgid "Maximum of 100 items"
 msgstr ""
 
-#: mod/profiles.php:717
-msgid "Postal/Zip Code:"
+#: mod/settings.php:1011
+msgid "Number of items to display per page when viewed from mobile device:"
 msgstr ""
 
-#: mod/profiles.php:718
-msgid "Country:"
+#: mod/settings.php:1012
+msgid "Don't show emoticons"
 msgstr ""
 
-#: mod/profiles.php:722
-msgid "Who: (if applicable)"
+#: mod/settings.php:1013
+msgid "Calendar"
 msgstr ""
 
-#: mod/profiles.php:722
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: mod/settings.php:1014
+msgid "Beginning of week:"
 msgstr ""
 
-#: mod/profiles.php:723
-msgid "Since [date]:"
+#: mod/settings.php:1015
+msgid "Don't show notices"
 msgstr ""
 
-#: mod/profiles.php:725
-msgid "Tell us about yourself..."
+#: mod/settings.php:1016
+msgid "Infinite scroll"
 msgstr ""
 
-#: mod/profiles.php:726
-msgid "XMPP (Jabber) address:"
+#: mod/settings.php:1017
+msgid "Automatic updates only at the top of the network page"
 msgstr ""
 
-#: mod/profiles.php:726
+#: mod/settings.php:1017
 msgid ""
-"The XMPP address will be propagated to your contacts so that they can follow "
-"you."
+"When disabled, the network page is updated all the time, which could be "
+"confusing while reading."
 msgstr ""
 
-#: mod/profiles.php:727
-msgid "Homepage URL:"
+#: mod/settings.php:1018
+msgid "Bandwith Saver Mode"
 msgstr ""
 
-#: mod/profiles.php:730
-msgid "Religious Views:"
+#: mod/settings.php:1018
+msgid ""
+"When enabled, embedded content is not displayed on automatic updates, they "
+"only show on page reload."
 msgstr ""
 
-#: mod/profiles.php:731
-msgid "Public Keywords:"
+#: mod/settings.php:1020
+msgid "General Theme Settings"
 msgstr ""
 
-#: mod/profiles.php:731
-msgid "(Used for suggesting potential friends, can be seen by others)"
+#: mod/settings.php:1021
+msgid "Custom Theme Settings"
 msgstr ""
 
-#: mod/profiles.php:732
-msgid "Private Keywords:"
+#: mod/settings.php:1022
+msgid "Content Settings"
 msgstr ""
 
-#: mod/profiles.php:732
-msgid "(Used for searching profiles, never shown to others)"
+#: mod/settings.php:1023 view/theme/duepuntozero/config.php:67
+#: view/theme/frio/config.php:70 view/theme/quattro/config.php:73
+#: view/theme/vier/config.php:116
+msgid "Theme settings"
 msgstr ""
 
-#: mod/profiles.php:735
-msgid "Musical interests"
+#: mod/settings.php:1107
+msgid "Account Types"
 msgstr ""
 
-#: mod/profiles.php:736
-msgid "Books, literature"
+#: mod/settings.php:1108
+msgid "Personal Page Subtypes"
 msgstr ""
 
-#: mod/profiles.php:737
-msgid "Television"
+#: mod/settings.php:1109
+msgid "Community Forum Subtypes"
 msgstr ""
 
-#: mod/profiles.php:738
-msgid "Film/dance/culture/entertainment"
+#: mod/settings.php:1116
+msgid "Personal Page"
 msgstr ""
 
-#: mod/profiles.php:739
-msgid "Hobbies/Interests"
+#: mod/settings.php:1117
+msgid "Account for a personal profile."
 msgstr ""
 
-#: mod/profiles.php:740
-msgid "Love/romance"
+#: mod/settings.php:1120
+msgid "Organisation Page"
 msgstr ""
 
-#: mod/profiles.php:741
-msgid "Work/employment"
+#: mod/settings.php:1121
+msgid ""
+"Account for an organisation that automatically approves contact requests as "
+"\"Followers\"."
 msgstr ""
 
-#: mod/profiles.php:742
-msgid "School/education"
+#: mod/settings.php:1124
+msgid "News Page"
 msgstr ""
 
-#: mod/profiles.php:743
-msgid "Contact information and Social Networks"
+#: mod/settings.php:1125
+msgid ""
+"Account for a news reflector that automatically approves contact requests as "
+"\"Followers\"."
 msgstr ""
 
-#: mod/profiles.php:784
-msgid "Edit/Manage Profiles"
+#: mod/settings.php:1128
+msgid "Community Forum"
 msgstr ""
 
-#: mod/search.php:96
-msgid "Only logged in users are permitted to perform a search."
+#: mod/settings.php:1129
+msgid "Account for community discussions."
 msgstr ""
 
-#: mod/search.php:120
-msgid "Too Many Requests"
+#: mod/settings.php:1132
+msgid "Normal Account Page"
 msgstr ""
 
-#: mod/search.php:121
-msgid "Only one search per minute is permitted for not logged in users."
+#: mod/settings.php:1133
+msgid ""
+"Account for a regular personal profile that requires manual approval of "
+"\"Friends\" and \"Followers\"."
 msgstr ""
 
-#: mod/search.php:221
-#, php-format
-msgid "Items tagged with: %s"
+#: mod/settings.php:1136
+msgid "Soapbox Page"
 msgstr ""
 
-#: mod/search.php:223 mod/contacts.php:826
-#, php-format
-msgid "Results for: %s"
+#: mod/settings.php:1137
+msgid ""
+"Account for a public profile that automatically approves contact requests as "
+"\"Followers\"."
 msgstr ""
 
-#: mod/settings.php:46 mod/admin.php:1588
-msgid "Account"
+#: mod/settings.php:1140
+msgid "Public Forum"
 msgstr ""
 
-#: mod/settings.php:55 mod/admin.php:175
-msgid "Additional features"
+#: mod/settings.php:1141
+msgid "Automatically approves all contact requests."
 msgstr ""
 
-#: mod/settings.php:63
-msgid "Display"
+#: mod/settings.php:1144
+msgid "Automatic Friend Page"
 msgstr ""
 
-#: mod/settings.php:70 mod/settings.php:887
-msgid "Social Networks"
+#: mod/settings.php:1145
+msgid ""
+"Account for a popular profile that automatically approves contact requests "
+"as \"Friends\"."
 msgstr ""
 
-#: mod/settings.php:77 mod/admin.php:173 mod/admin.php:1714 mod/admin.php:1777
-msgid "Plugins"
+#: mod/settings.php:1148
+msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: mod/settings.php:91
-msgid "Connected apps"
+#: mod/settings.php:1149
+msgid "Requires manual approval of contact requests."
 msgstr ""
 
-#: mod/settings.php:105
-msgid "Remove account"
+#: mod/settings.php:1160
+msgid "OpenID:"
 msgstr ""
 
-#: mod/settings.php:160
-msgid "Missing some important data!"
+#: mod/settings.php:1160
+msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: mod/settings.php:163 mod/settings.php:704 mod/contacts.php:833
-msgid "Update"
+#: mod/settings.php:1168
+msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: mod/settings.php:269
-msgid "Failed to connect with email account using the settings provided."
+#: mod/settings.php:1168
+msgid "Your profile may be visible in public."
 msgstr ""
 
-#: mod/settings.php:274
-msgid "Email settings updated."
+#: mod/settings.php:1174
+msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: mod/settings.php:289
-msgid "Features updated"
+#: mod/settings.php:1181
+msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: mod/settings.php:359
-msgid "Relocate message has been send to your contacts"
+#: mod/settings.php:1185
+msgid ""
+"If enabled, posting public messages to Diaspora and other networks isn't "
+"possible."
 msgstr ""
 
-#: mod/settings.php:378
-msgid "Empty passwords are not allowed. Password unchanged."
+#: mod/settings.php:1190
+msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: mod/settings.php:386
-msgid "Wrong password."
+#: mod/settings.php:1195
+msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: mod/settings.php:397
-msgid "Password changed."
+#: mod/settings.php:1200
+msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: mod/settings.php:399
-msgid "Password update failed. Please try again."
+#: mod/settings.php:1205
+msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: mod/settings.php:479
-msgid " Please use a shorter name."
+#: mod/settings.php:1213
+msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: mod/settings.php:481
-msgid " Name too short."
+#: mod/settings.php:1221
+#, php-format
+msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
 msgstr ""
 
-#: mod/settings.php:490
-msgid "Wrong Password"
+#: mod/settings.php:1228
+msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: mod/settings.php:495
-msgid " Not valid email."
+#: mod/settings.php:1228
+msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: mod/settings.php:501
-msgid " Cannot change to that email."
+#: mod/settings.php:1229
+msgid "Advanced expiration settings"
 msgstr ""
 
-#: mod/settings.php:557
-msgid "Private forum has no privacy permissions. Using default privacy group."
+#: mod/settings.php:1230
+msgid "Advanced Expiration"
 msgstr ""
 
-#: mod/settings.php:561
-msgid "Private forum has no privacy permissions and no default privacy group."
+#: mod/settings.php:1231
+msgid "Expire posts:"
 msgstr ""
 
-#: mod/settings.php:601
-msgid "Settings updated."
+#: mod/settings.php:1232
+msgid "Expire personal notes:"
 msgstr ""
 
-#: mod/settings.php:677 mod/settings.php:703 mod/settings.php:739
-msgid "Add application"
+#: mod/settings.php:1233
+msgid "Expire starred posts:"
 msgstr ""
 
-#: mod/settings.php:678 mod/settings.php:789 mod/settings.php:838
-#: mod/settings.php:905 mod/settings.php:1002 mod/settings.php:1268
-#: mod/admin.php:1154 mod/admin.php:1778 mod/admin.php:2041 mod/admin.php:2115
-#: mod/admin.php:2268
-msgid "Save Settings"
+#: mod/settings.php:1234
+msgid "Expire photos:"
 msgstr ""
 
-#: mod/settings.php:681 mod/settings.php:707
-msgid "Consumer Key"
+#: mod/settings.php:1235
+msgid "Only expire posts by others:"
 msgstr ""
 
-#: mod/settings.php:682 mod/settings.php:708
-msgid "Consumer Secret"
+#: mod/settings.php:1266
+msgid "Account Settings"
 msgstr ""
 
-#: mod/settings.php:683 mod/settings.php:709
-msgid "Redirect"
+#: mod/settings.php:1274
+msgid "Password Settings"
 msgstr ""
 
-#: mod/settings.php:684 mod/settings.php:710
-msgid "Icon url"
+#: mod/settings.php:1276
+msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: mod/settings.php:695
-msgid "You can't edit this application."
+#: mod/settings.php:1277
+msgid "Current Password:"
 msgstr ""
 
-#: mod/settings.php:738
-msgid "Connected Apps"
+#: mod/settings.php:1277 mod/settings.php:1278
+msgid "Your current password to confirm the changes"
 msgstr ""
 
-#: mod/settings.php:742
-msgid "Client key starts with"
+#: mod/settings.php:1278
+msgid "Password:"
 msgstr ""
 
-#: mod/settings.php:743
-msgid "No name"
+#: mod/settings.php:1282
+msgid "Basic Settings"
 msgstr ""
 
-#: mod/settings.php:744
-msgid "Remove authorization"
+#: mod/settings.php:1284
+msgid "Email Address:"
 msgstr ""
 
-#: mod/settings.php:756
-msgid "No Plugin settings configured"
+#: mod/settings.php:1285
+msgid "Your Timezone:"
 msgstr ""
 
-#: mod/settings.php:765
-msgid "Plugin Settings"
+#: mod/settings.php:1286
+msgid "Your Language:"
 msgstr ""
 
-#: mod/settings.php:779 mod/admin.php:2257 mod/admin.php:2258
-msgid "Off"
+#: mod/settings.php:1286
+msgid ""
+"Set the language we use to show you friendica interface and to send you "
+"emails"
 msgstr ""
 
-#: mod/settings.php:779 mod/admin.php:2257 mod/admin.php:2258
-msgid "On"
+#: mod/settings.php:1287
+msgid "Default Post Location:"
 msgstr ""
 
-#: mod/settings.php:787
-msgid "Additional Features"
+#: mod/settings.php:1288
+msgid "Use Browser Location:"
 msgstr ""
 
-#: mod/settings.php:797 mod/settings.php:801
-msgid "General Social Media Settings"
+#: mod/settings.php:1291
+msgid "Security and Privacy Settings"
 msgstr ""
 
-#: mod/settings.php:807
-msgid "Disable intelligent shortening"
+#: mod/settings.php:1293
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: mod/settings.php:809
-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."
+#: mod/settings.php:1293 mod/settings.php:1323
+msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: mod/settings.php:815
-msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
+#: mod/settings.php:1294
+msgid "Default Post Permissions"
 msgstr ""
 
-#: mod/settings.php:817
-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."
+#: mod/settings.php:1295
+msgid "(click to open/close)"
 msgstr ""
 
-#: mod/settings.php:823
-msgid "Default group for OStatus contacts"
+#: mod/settings.php:1306
+msgid "Default Private Post"
 msgstr ""
 
-#: mod/settings.php:831
-msgid "Your legacy GNU Social account"
+#: mod/settings.php:1307
+msgid "Default Public Post"
 msgstr ""
 
-#: mod/settings.php:833
-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."
+#: mod/settings.php:1311
+msgid "Default Permissions for New Posts"
 msgstr ""
 
-#: mod/settings.php:836
-msgid "Repair OStatus subscriptions"
+#: mod/settings.php:1323
+msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: mod/settings.php:845 mod/settings.php:846
-#, php-format
-msgid "Built-in support for %s connectivity is %s"
+#: mod/settings.php:1326
+msgid "Notification Settings"
 msgstr ""
 
-#: mod/settings.php:845 mod/settings.php:846
-msgid "enabled"
+#: mod/settings.php:1327
+msgid "By default post a status message when:"
 msgstr ""
 
-#: mod/settings.php:845 mod/settings.php:846
-msgid "disabled"
+#: mod/settings.php:1328
+msgid "accepting a friend request"
 msgstr ""
 
-#: mod/settings.php:846
-msgid "GNU Social (OStatus)"
+#: mod/settings.php:1329
+msgid "joining a forum/community"
 msgstr ""
 
-#: mod/settings.php:880
-msgid "Email access is disabled on this site."
+#: mod/settings.php:1330
+msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: mod/settings.php:892
-msgid "Email/Mailbox Setup"
+#: mod/settings.php:1331
+msgid "Send a notification email when:"
 msgstr ""
 
-#: mod/settings.php:893
-msgid ""
-"If you wish to communicate with email contacts using this service "
-"(optional), please specify how to connect to your mailbox."
+#: mod/settings.php:1332
+msgid "You receive an introduction"
 msgstr ""
 
-#: mod/settings.php:894
-msgid "Last successful email check:"
+#: mod/settings.php:1333
+msgid "Your introductions are confirmed"
 msgstr ""
 
-#: mod/settings.php:896
-msgid "IMAP server name:"
+#: mod/settings.php:1334
+msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: mod/settings.php:897
-msgid "IMAP port:"
+#: mod/settings.php:1335
+msgid "Someone writes a followup comment"
 msgstr ""
 
-#: mod/settings.php:898
-msgid "Security:"
+#: mod/settings.php:1336
+msgid "You receive a private message"
 msgstr ""
 
-#: mod/settings.php:898 mod/settings.php:903
-msgid "None"
+#: mod/settings.php:1337
+msgid "You receive a friend suggestion"
 msgstr ""
 
-#: mod/settings.php:899
-msgid "Email login name:"
+#: mod/settings.php:1338
+msgid "You are tagged in a post"
 msgstr ""
 
-#: mod/settings.php:900
-msgid "Email password:"
+#: mod/settings.php:1339
+msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: mod/settings.php:901
-msgid "Reply-to address:"
+#: mod/settings.php:1341
+msgid "Activate desktop notifications"
 msgstr ""
 
-#: mod/settings.php:902
-msgid "Send public posts to all email contacts:"
+#: mod/settings.php:1341
+msgid "Show desktop popup on new notifications"
 msgstr ""
 
-#: mod/settings.php:903
-msgid "Action after import:"
+#: mod/settings.php:1343
+msgid "Text-only notification emails"
 msgstr ""
 
-#: mod/settings.php:903
-msgid "Move to folder"
+#: mod/settings.php:1345
+msgid "Send text only notification emails, without the html part"
 msgstr ""
 
-#: mod/settings.php:904
-msgid "Move to folder:"
+#: mod/settings.php:1347
+msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: mod/settings.php:940 mod/admin.php:1041
-msgid "No special theme for mobile devices"
+#: mod/settings.php:1348
+msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: mod/settings.php:1000
-msgid "Display Settings"
+#: mod/settings.php:1351
+msgid "Relocate"
 msgstr ""
 
-#: mod/settings.php:1006 mod/settings.php:1029
-msgid "Display Theme:"
+#: mod/settings.php:1352
+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:1007
-msgid "Mobile Theme:"
+#: mod/settings.php:1353
+msgid "Resend relocate message to contacts"
 msgstr ""
 
-#: mod/settings.php:1008
-msgid "Suppress warning of insecure networks"
+#: mod/suggest.php:30
+msgid "Do you really want to delete this suggestion?"
 msgstr ""
 
-#: mod/settings.php:1008
+#: mod/suggest.php:71
 msgid ""
-"Should the system suppress the warning that the current group contains "
-"members of networks that can't receive non public postings."
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
 msgstr ""
 
-#: mod/settings.php:1009
-msgid "Update browser every xx seconds"
+#: mod/suggest.php:84 mod/suggest.php:104
+msgid "Ignore/Hide"
 msgstr ""
 
-#: mod/settings.php:1009
-msgid "Minimum of 10 seconds. Enter -1 to disable it."
+#: mod/wall_attach.php:96
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
 msgstr ""
 
-#: mod/settings.php:1010
-msgid "Number of items to display per page:"
+#: mod/wall_attach.php:96
+msgid "Or - did you try to upload an empty file?"
 msgstr ""
 
-#: mod/settings.php:1010 mod/settings.php:1011
-msgid "Maximum of 100 items"
+#: mod/wall_attach.php:107
+#, php-format
+msgid "File exceeds size limit of %s"
 msgstr ""
 
-#: mod/settings.php:1011
-msgid "Number of items to display per page when viewed from mobile device:"
+#: mod/wall_attach.php:151 mod/wall_attach.php:167
+msgid "File upload failed."
 msgstr ""
 
-#: mod/settings.php:1012
-msgid "Don't show emoticons"
+#: mod/admin.php:99
+msgid "Theme settings updated."
 msgstr ""
 
-#: mod/settings.php:1013
-msgid "Calendar"
+#: mod/admin.php:171 mod/admin.php:1157
+msgid "Site"
 msgstr ""
 
-#: mod/settings.php:1014
-msgid "Beginning of week:"
+#: mod/admin.php:172 mod/admin.php:1091 mod/admin.php:1601 mod/admin.php:1617
+msgid "Users"
 msgstr ""
 
-#: mod/settings.php:1015
-msgid "Don't show notices"
+#: mod/admin.php:174 mod/admin.php:1995 mod/admin.php:2045
+msgid "Themes"
 msgstr ""
 
-#: mod/settings.php:1016
-msgid "Infinite scroll"
+#: mod/admin.php:176
+msgid "DB updates"
 msgstr ""
 
-#: mod/settings.php:1017
-msgid "Automatic updates only at the top of the network page"
+#: mod/admin.php:177 mod/admin.php:584
+msgid "Inspect Queue"
 msgstr ""
 
-#: mod/settings.php:1017
-msgid ""
-"When disabled, the network page is updated all the time, which could be "
-"confusing while reading."
+#: mod/admin.php:178 mod/admin.php:298
+msgid "Server Blocklist"
 msgstr ""
 
-#: mod/settings.php:1018
-msgid "Bandwith Saver Mode"
+#: mod/admin.php:179 mod/admin.php:550
+msgid "Federation Statistics"
 msgstr ""
 
-#: mod/settings.php:1018
-msgid ""
-"When enabled, embedded content is not displayed on automatic updates, they "
-"only show on page reload."
+#: mod/admin.php:180 mod/admin.php:375
+msgid "Delete Item"
 msgstr ""
 
-#: mod/settings.php:1020
-msgid "General Theme Settings"
+#: mod/admin.php:194 mod/admin.php:205 mod/admin.php:2119
+msgid "Logs"
 msgstr ""
 
-#: mod/settings.php:1021
-msgid "Custom Theme Settings"
+#: mod/admin.php:195 mod/admin.php:2187
+msgid "View Logs"
 msgstr ""
 
-#: mod/settings.php:1022
-msgid "Content Settings"
+#: mod/admin.php:196
+msgid "probe address"
 msgstr ""
 
-#: mod/settings.php:1023 view/theme/duepuntozero/config.php:67
-#: view/theme/frio/config.php:70 view/theme/quattro/config.php:73
-#: view/theme/vier/config.php:116
-msgid "Theme settings"
+#: mod/admin.php:197
+msgid "check webfinger"
 msgstr ""
 
-#: mod/settings.php:1107
-msgid "Account Types"
+#: mod/admin.php:204
+msgid "Plugin Features"
 msgstr ""
 
-#: mod/settings.php:1108
-msgid "Personal Page Subtypes"
+#: mod/admin.php:206
+msgid "diagnostics"
 msgstr ""
 
-#: mod/settings.php:1109
-msgid "Community Forum Subtypes"
+#: mod/admin.php:207
+msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: mod/settings.php:1116
-msgid "Personal Page"
+#: mod/admin.php:289
+msgid "The blocked domain"
 msgstr ""
 
-#: mod/settings.php:1117
-msgid "Account for a personal profile."
+#: mod/admin.php:290 mod/admin.php:308 mod/friendica.php:116
+msgid "Reason for the block"
 msgstr ""
 
-#: mod/settings.php:1120
-msgid "Organisation Page"
+#: mod/admin.php:290 mod/admin.php:303
+msgid "The reason why you blocked this domain."
 msgstr ""
 
-#: mod/settings.php:1121
-msgid ""
-"Account for an organisation that automatically approves contact requests as "
-"\"Followers\"."
+#: mod/admin.php:291
+msgid "Delete domain"
 msgstr ""
 
-#: mod/settings.php:1124
-msgid "News Page"
+#: mod/admin.php:291
+msgid "Check to delete this entry from the blocklist"
 msgstr ""
 
-#: mod/settings.php:1125
+#: mod/admin.php:297 mod/admin.php:374 mod/admin.php:549 mod/admin.php:583
+#: mod/admin.php:671 mod/admin.php:1156 mod/admin.php:1600 mod/admin.php:1718
+#: mod/admin.php:1781 mod/admin.php:1994 mod/admin.php:2044 mod/admin.php:2118
+#: mod/admin.php:2186
+msgid "Administration"
+msgstr ""
+
+#: mod/admin.php:299
 msgid ""
-"Account for a news reflector that automatically approves contact requests as "
-"\"Followers\"."
+"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/settings.php:1128
-msgid "Community Forum"
+#: mod/admin.php:300
+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/settings.php:1129
-msgid "Account for community discussions."
+#: mod/admin.php:301
+msgid "Add new entry to block list"
 msgstr ""
 
-#: mod/settings.php:1132
-msgid "Normal Account Page"
+#: mod/admin.php:302
+msgid "Server Domain"
 msgstr ""
 
-#: mod/settings.php:1133
+#: mod/admin.php:302
 msgid ""
-"Account for a regular personal profile that requires manual approval of "
-"\"Friends\" and \"Followers\"."
+"The domain of the new server to add to the block list. Do not include the "
+"protocol."
 msgstr ""
 
-#: mod/settings.php:1136
-msgid "Soapbox Page"
+#: mod/admin.php:303
+msgid "Block reason"
 msgstr ""
 
-#: mod/settings.php:1137
-msgid ""
-"Account for a public profile that automatically approves contact requests as "
-"\"Followers\"."
+#: mod/admin.php:304
+msgid "Add Entry"
 msgstr ""
 
-#: mod/settings.php:1140
-msgid "Public Forum"
+#: mod/admin.php:305
+msgid "Save changes to the blocklist"
+msgstr ""
+
+#: mod/admin.php:306
+msgid "Current Entries in the Blocklist"
+msgstr ""
+
+#: mod/admin.php:309
+msgid "Delete entry from blocklist"
 msgstr ""
 
-#: mod/settings.php:1141
-msgid "Automatically approves all contact requests."
+#: mod/admin.php:312
+msgid "Delete entry from blocklist?"
 msgstr ""
 
-#: mod/settings.php:1144
-msgid "Automatic Friend Page"
+#: mod/admin.php:337
+msgid "Server added to blocklist."
 msgstr ""
 
-#: mod/settings.php:1145
-msgid ""
-"Account for a popular profile that automatically approves contact requests "
-"as \"Friends\"."
+#: mod/admin.php:353
+msgid "Site blocklist updated."
 msgstr ""
 
-#: mod/settings.php:1148
-msgid "Private Forum [Experimental]"
+#: mod/admin.php:376
+msgid "Delete this Item"
 msgstr ""
 
-#: mod/settings.php:1149
-msgid "Requires manual approval of contact requests."
+#: mod/admin.php:377
+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/settings.php:1160
-msgid "OpenID:"
+#: mod/admin.php:378
+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/settings.php:1160
-msgid "(Optional) Allow this OpenID to login to this account."
+#: mod/admin.php:379
+msgid "GUID"
 msgstr ""
 
-#: mod/settings.php:1168
-msgid "Publish your default profile in your local site directory?"
+#: mod/admin.php:379
+msgid "The GUID of the item you want to delete."
 msgstr ""
 
-#: mod/settings.php:1168
-msgid "Your profile may be visible in public."
+#: mod/admin.php:416
+msgid "Item marked for deletion."
 msgstr ""
 
-#: mod/settings.php:1174
-msgid "Publish your default profile in the global social directory?"
+#: mod/admin.php:480
+msgid "unknown"
 msgstr ""
 
-#: mod/settings.php:1181
-msgid "Hide your contact/friend list from viewers of your default profile?"
+#: mod/admin.php:543
+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/settings.php:1185
+#: mod/admin.php:544
 msgid ""
-"If enabled, posting public messages to Diaspora and other networks isn't "
-"possible."
+"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
+"will improve the data displayed here."
 msgstr ""
 
-#: mod/settings.php:1190
-msgid "Allow friends to post to your profile page?"
+#: mod/admin.php:556
+#, php-format
+msgid "Currently this node is aware of %d nodes from the following platforms:"
 msgstr ""
 
-#: mod/settings.php:1195
-msgid "Allow friends to tag your posts?"
+#: mod/admin.php:586
+msgid "ID"
 msgstr ""
 
-#: mod/settings.php:1200
-msgid "Allow us to suggest you as a potential friend to new members?"
+#: mod/admin.php:587
+msgid "Recipient Name"
 msgstr ""
 
-#: mod/settings.php:1205
-msgid "Permit unknown people to send you private mail?"
+#: mod/admin.php:588
+msgid "Recipient Profile"
 msgstr ""
 
-#: mod/settings.php:1213
-msgid "Profile is <strong>not published</strong>."
+#: mod/admin.php:590
+msgid "Created"
 msgstr ""
 
-#: mod/settings.php:1221
-#, php-format
-msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
+#: mod/admin.php:591
+msgid "Last Tried"
 msgstr ""
 
-#: mod/settings.php:1228
-msgid "Automatically expire posts after this many days:"
+#: mod/admin.php:592
+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/settings.php:1228
-msgid "If empty, posts will not expire. Expired posts will be deleted"
+#: mod/admin.php:616
+#, 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 include/"
+"dbstructure.php toinnodb</tt> of your Friendica installation for an "
+"automatic conversion.<br />"
 msgstr ""
 
-#: mod/settings.php:1229
-msgid "Advanced expiration settings"
+#: mod/admin.php:625
+msgid ""
+"The database update failed. Please run \"php include/dbstructure.php update"
+"\" from the command line and have a look at the errors that might appear."
 msgstr ""
 
-#: mod/settings.php:1230
-msgid "Advanced Expiration"
+#: mod/admin.php:631
+msgid "The worker was never executed. Please check your database structure!"
 msgstr ""
 
-#: mod/settings.php:1231
-msgid "Expire posts:"
+#: mod/admin.php:634
+#, php-format
+msgid ""
+"The last worker execution was on %s UTC. This is older than one hour. Please "
+"check your crontab settings."
 msgstr ""
 
-#: mod/settings.php:1232
-msgid "Expire personal notes:"
+#: mod/admin.php:639 mod/admin.php:1550
+msgid "Normal Account"
 msgstr ""
 
-#: mod/settings.php:1233
-msgid "Expire starred posts:"
+#: mod/admin.php:640 mod/admin.php:1551
+msgid "Automatic Follower Account"
 msgstr ""
 
-#: mod/settings.php:1234
-msgid "Expire photos:"
+#: mod/admin.php:641 mod/admin.php:1552
+msgid "Public Forum Account"
 msgstr ""
 
-#: mod/settings.php:1235
-msgid "Only expire posts by others:"
+#: mod/admin.php:642 mod/admin.php:1553
+msgid "Automatic Friend Account"
 msgstr ""
 
-#: mod/settings.php:1266
-msgid "Account Settings"
+#: mod/admin.php:643
+msgid "Blog Account"
 msgstr ""
 
-#: mod/settings.php:1274
-msgid "Password Settings"
+#: mod/admin.php:644
+msgid "Private Forum Account"
 msgstr ""
 
-#: mod/settings.php:1276
-msgid "Leave password fields blank unless changing"
+#: mod/admin.php:666
+msgid "Message queues"
 msgstr ""
 
-#: mod/settings.php:1277
-msgid "Current Password:"
+#: mod/admin.php:672
+msgid "Summary"
 msgstr ""
 
-#: mod/settings.php:1277 mod/settings.php:1278
-msgid "Your current password to confirm the changes"
+#: mod/admin.php:674
+msgid "Registered users"
 msgstr ""
 
-#: mod/settings.php:1278
-msgid "Password:"
+#: mod/admin.php:676
+msgid "Pending registrations"
 msgstr ""
 
-#: mod/settings.php:1282
-msgid "Basic Settings"
+#: mod/admin.php:677
+msgid "Version"
 msgstr ""
 
-#: mod/settings.php:1284
-msgid "Email Address:"
+#: mod/admin.php:682
+msgid "Active plugins"
 msgstr ""
 
-#: mod/settings.php:1285
-msgid "Your Timezone:"
+#: mod/admin.php:712
+msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr ""
 
-#: mod/settings.php:1286
-msgid "Your Language:"
+#: mod/admin.php:1017
+msgid "Site settings updated."
 msgstr ""
 
-#: mod/settings.php:1286
-msgid ""
-"Set the language we use to show you friendica interface and to send you "
-"emails"
+#: mod/admin.php:1074
+msgid "No community page"
 msgstr ""
 
-#: mod/settings.php:1287
-msgid "Default Post Location:"
+#: mod/admin.php:1075
+msgid "Public postings from users of this site"
 msgstr ""
 
-#: mod/settings.php:1288
-msgid "Use Browser Location:"
+#: mod/admin.php:1076
+msgid "Global community page"
 msgstr ""
 
-#: mod/settings.php:1291
-msgid "Security and Privacy Settings"
+#: mod/admin.php:1081 mod/contacts.php:551
+msgid "Never"
 msgstr ""
 
-#: mod/settings.php:1293
-msgid "Maximum Friend Requests/Day:"
+#: mod/admin.php:1082
+msgid "At post arrival"
 msgstr ""
 
-#: mod/settings.php:1293 mod/settings.php:1323
-msgid "(to prevent spam abuse)"
+#: mod/admin.php:1090 mod/contacts.php:578
+msgid "Disabled"
 msgstr ""
 
-#: mod/settings.php:1294
-msgid "Default Post Permissions"
+#: mod/admin.php:1092
+msgid "Users, Global Contacts"
 msgstr ""
 
-#: mod/settings.php:1295
-msgid "(click to open/close)"
+#: mod/admin.php:1093
+msgid "Users, Global Contacts/fallback"
 msgstr ""
 
-#: mod/settings.php:1306
-msgid "Default Private Post"
+#: mod/admin.php:1097
+msgid "One month"
 msgstr ""
 
-#: mod/settings.php:1307
-msgid "Default Public Post"
+#: mod/admin.php:1098
+msgid "Three months"
 msgstr ""
 
-#: mod/settings.php:1311
-msgid "Default Permissions for New Posts"
+#: mod/admin.php:1099
+msgid "Half a year"
 msgstr ""
 
-#: mod/settings.php:1323
-msgid "Maximum private messages per day from unknown people:"
+#: mod/admin.php:1100
+msgid "One year"
 msgstr ""
 
-#: mod/settings.php:1326
-msgid "Notification Settings"
+#: mod/admin.php:1105
+msgid "Multi user instance"
 msgstr ""
 
-#: mod/settings.php:1327
-msgid "By default post a status message when:"
+#: mod/admin.php:1128
+msgid "Closed"
 msgstr ""
 
-#: mod/settings.php:1328
-msgid "accepting a friend request"
+#: mod/admin.php:1129
+msgid "Requires approval"
 msgstr ""
 
-#: mod/settings.php:1329
-msgid "joining a forum/community"
+#: mod/admin.php:1130
+msgid "Open"
 msgstr ""
 
-#: mod/settings.php:1330
-msgid "making an <em>interesting</em> profile change"
+#: mod/admin.php:1134
+msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: mod/settings.php:1331
-msgid "Send a notification email when:"
+#: mod/admin.php:1135
+msgid "Force all links to use SSL"
 msgstr ""
 
-#: mod/settings.php:1332
-msgid "You receive an introduction"
+#: mod/admin.php:1136
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: mod/settings.php:1333
-msgid "Your introductions are confirmed"
+#: mod/admin.php:1159
+msgid "Republish users to directory"
 msgstr ""
 
-#: mod/settings.php:1334
-msgid "Someone writes on your profile wall"
+#: mod/admin.php:1161
+msgid "File upload"
 msgstr ""
 
-#: mod/settings.php:1335
-msgid "Someone writes a followup comment"
+#: mod/admin.php:1162
+msgid "Policies"
 msgstr ""
 
-#: mod/settings.php:1336
-msgid "You receive a private message"
+#: mod/admin.php:1164
+msgid "Auto Discovered Contact Directory"
 msgstr ""
 
-#: mod/settings.php:1337
-msgid "You receive a friend suggestion"
+#: mod/admin.php:1165
+msgid "Performance"
 msgstr ""
 
-#: mod/settings.php:1338
-msgid "You are tagged in a post"
+#: mod/admin.php:1166
+msgid "Worker"
 msgstr ""
 
-#: mod/settings.php:1339
-msgid "You are poked/prodded/etc. in a post"
+#: mod/admin.php:1167
+msgid ""
+"Relocate - WARNING: advanced function. Could make this server unreachable."
 msgstr ""
 
-#: mod/settings.php:1341
-msgid "Activate desktop notifications"
+#: mod/admin.php:1170
+msgid "Site name"
 msgstr ""
 
-#: mod/settings.php:1341
-msgid "Show desktop popup on new notifications"
+#: mod/admin.php:1171
+msgid "Host name"
 msgstr ""
 
-#: mod/settings.php:1343
-msgid "Text-only notification emails"
+#: mod/admin.php:1172
+msgid "Sender Email"
 msgstr ""
 
-#: mod/settings.php:1345
-msgid "Send text only notification emails, without the html part"
+#: mod/admin.php:1172
+msgid ""
+"The email address your server shall use to send notification emails from."
 msgstr ""
 
-#: mod/settings.php:1347
-msgid "Advanced Account/Page Type Settings"
+#: mod/admin.php:1173
+msgid "Banner/Logo"
 msgstr ""
 
-#: mod/settings.php:1348
-msgid "Change the behaviour of this account for special situations"
+#: mod/admin.php:1174
+msgid "Shortcut icon"
 msgstr ""
 
-#: mod/settings.php:1351
-msgid "Relocate"
+#: mod/admin.php:1174
+msgid "Link to an icon that will be used for browsers."
 msgstr ""
 
-#: mod/settings.php:1352
-msgid ""
-"If you have moved this profile from another server, and some of your "
-"contacts don't receive your updates, try pushing this button."
+#: mod/admin.php:1175
+msgid "Touch icon"
 msgstr ""
 
-#: mod/settings.php:1353
-msgid "Resend relocate message to contacts"
+#: mod/admin.php:1175
+msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr ""
 
-#: mod/suggest.php:30
-msgid "Do you really want to delete this suggestion?"
+#: mod/admin.php:1176
+msgid "Additional Info"
 msgstr ""
 
-#: mod/suggest.php:71
+#: mod/admin.php:1176
+#, php-format
 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"
+"For public servers: you can add additional information here that will be "
+"listed at %s/siteinfo."
 msgstr ""
 
-#: mod/wall_attach.php:96
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+#: mod/admin.php:1177
+msgid "System language"
 msgstr ""
 
-#: mod/wall_attach.php:96
-msgid "Or - did you try to upload an empty file?"
+#: mod/admin.php:1178
+msgid "System theme"
 msgstr ""
 
-#: mod/wall_attach.php:107
-#, php-format
-msgid "File exceeds size limit of %s"
+#: mod/admin.php:1178
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: mod/wall_attach.php:151 mod/wall_attach.php:167
-msgid "File upload failed."
+#: mod/admin.php:1179
+msgid "Mobile system theme"
 msgstr ""
 
-#: mod/admin.php:99
-msgid "Theme settings updated."
+#: mod/admin.php:1179
+msgid "Theme for mobile devices"
 msgstr ""
 
-#: mod/admin.php:171 mod/admin.php:1153
-msgid "Site"
+#: mod/admin.php:1180
+msgid "SSL link policy"
 msgstr ""
 
-#: mod/admin.php:172 mod/admin.php:1087 mod/admin.php:1596 mod/admin.php:1612
-msgid "Users"
+#: mod/admin.php:1180
+msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: mod/admin.php:174 mod/admin.php:1990 mod/admin.php:2040
-msgid "Themes"
+#: mod/admin.php:1181
+msgid "Force SSL"
 msgstr ""
 
-#: mod/admin.php:176
-msgid "DB updates"
+#: mod/admin.php:1181
+msgid ""
+"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
+"to endless loops."
 msgstr ""
 
-#: mod/admin.php:177 mod/admin.php:584
-msgid "Inspect Queue"
+#: mod/admin.php:1182
+msgid "Hide help entry from navigation menu"
 msgstr ""
 
-#: mod/admin.php:178 mod/admin.php:298
-msgid "Server Blocklist"
+#: mod/admin.php:1182
+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:179 mod/admin.php:550
-msgid "Federation Statistics"
+#: mod/admin.php:1183
+msgid "Single user instance"
 msgstr ""
 
-#: mod/admin.php:180 mod/admin.php:375
-msgid "Delete Item"
+#: mod/admin.php:1183
+msgid "Make this instance multi-user or single-user for the named user"
 msgstr ""
 
-#: mod/admin.php:194 mod/admin.php:205 mod/admin.php:2114
-msgid "Logs"
+#: mod/admin.php:1184
+msgid "Maximum image size"
 msgstr ""
 
-#: mod/admin.php:195 mod/admin.php:2182
-msgid "View Logs"
+#: mod/admin.php:1184
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
 msgstr ""
 
-#: mod/admin.php:196
-msgid "probe address"
+#: mod/admin.php:1185
+msgid "Maximum image length"
 msgstr ""
 
-#: mod/admin.php:197
-msgid "check webfinger"
+#: mod/admin.php:1185
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
 msgstr ""
 
-#: mod/admin.php:204
-msgid "Plugin Features"
+#: mod/admin.php:1186
+msgid "JPEG image quality"
 msgstr ""
 
-#: mod/admin.php:206
-msgid "diagnostics"
+#: mod/admin.php:1186
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
 msgstr ""
 
-#: mod/admin.php:207
-msgid "User registrations waiting for confirmation"
+#: mod/admin.php:1188
+msgid "Register policy"
 msgstr ""
 
-#: mod/admin.php:289
-msgid "The blocked domain"
+#: mod/admin.php:1189
+msgid "Maximum Daily Registrations"
 msgstr ""
 
-#: mod/admin.php:290 mod/admin.php:303
-msgid "The reason why you blocked this domain."
+#: mod/admin.php:1189
+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:291
-msgid "Delete domain"
+#: mod/admin.php:1190
+msgid "Register text"
 msgstr ""
 
-#: mod/admin.php:291
-msgid "Check to delete this entry from the blocklist"
+#: mod/admin.php:1190
+msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: mod/admin.php:297 mod/admin.php:374 mod/admin.php:549 mod/admin.php:583
-#: mod/admin.php:672 mod/admin.php:1152 mod/admin.php:1595 mod/admin.php:1713
-#: mod/admin.php:1776 mod/admin.php:1989 mod/admin.php:2039 mod/admin.php:2113
-#: mod/admin.php:2181
-msgid "Administration"
+#: mod/admin.php:1191
+msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: mod/admin.php:299
+#: mod/admin.php:1191
 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."
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: mod/admin.php:300
-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."
+#: mod/admin.php:1192
+msgid "Allowed friend domains"
 msgstr ""
 
-#: mod/admin.php:301
-msgid "Add new entry to block list"
+#: mod/admin.php:1192
+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:302
-msgid "Server Domain"
+#: mod/admin.php:1193
+msgid "Allowed email domains"
 msgstr ""
 
-#: mod/admin.php:302
+#: mod/admin.php:1193
 msgid ""
-"The domain of the new server to add to the block list. Do not include the "
-"protocol."
+"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:303
-msgid "Block reason"
+#: mod/admin.php:1194
+msgid "Block public"
 msgstr ""
 
-#: mod/admin.php:304
-msgid "Add Entry"
+#: mod/admin.php:1194
+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:305
-msgid "Save changes to the blocklist"
+#: mod/admin.php:1195
+msgid "Force publish"
 msgstr ""
 
-#: mod/admin.php:306
-msgid "Current Entries in the Blocklist"
+#: mod/admin.php:1195
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: mod/admin.php:309
-msgid "Delete entry from blocklist"
+#: mod/admin.php:1196
+msgid "Global directory URL"
 msgstr ""
 
-#: mod/admin.php:312
-msgid "Delete entry from blocklist?"
+#: mod/admin.php:1196
+msgid ""
+"URL to the global directory. If this is not set, the global directory is "
+"completely unavailable to the application."
 msgstr ""
 
-#: mod/admin.php:337
-msgid "Server added to blocklist."
+#: mod/admin.php:1197
+msgid "Allow threaded items"
 msgstr ""
 
-#: mod/admin.php:353
-msgid "Site blocklist updated."
+#: mod/admin.php:1197
+msgid "Allow infinite level threading for items on this site."
 msgstr ""
 
-#: mod/admin.php:376
-msgid "Delete this Item"
+#: mod/admin.php:1198
+msgid "Private posts by default for new users"
 msgstr ""
 
-#: mod/admin.php:377
+#: mod/admin.php:1198
 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."
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
 msgstr ""
 
-#: mod/admin.php:378
-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."
+#: mod/admin.php:1199
+msgid "Don't include post content in email notifications"
 msgstr ""
 
-#: mod/admin.php:379
-msgid "GUID"
+#: mod/admin.php:1199
+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:379
-msgid "The GUID of the item you want to delete."
+#: mod/admin.php:1200
+msgid "Disallow public access to addons listed in the apps menu."
 msgstr ""
 
-#: mod/admin.php:416
-msgid "Item marked for deletion."
+#: mod/admin.php:1200
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
 msgstr ""
 
-#: mod/admin.php:480
-msgid "unknown"
+#: mod/admin.php:1201
+msgid "Don't embed private images in posts"
 msgstr ""
 
-#: mod/admin.php:543
+#: mod/admin.php:1201
 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."
+"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:544
-msgid ""
-"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
-"will improve the data displayed here."
+#: mod/admin.php:1202
+msgid "Allow Users to set remote_self"
 msgstr ""
 
-#: mod/admin.php:556
-#, php-format
-msgid "Currently this node is aware of %d nodes from the following platforms:"
+#: mod/admin.php:1202
+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:586
-msgid "ID"
+#: mod/admin.php:1203
+msgid "Block multiple registrations"
 msgstr ""
 
-#: mod/admin.php:587
-msgid "Recipient Name"
+#: mod/admin.php:1203
+msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: mod/admin.php:588
-msgid "Recipient Profile"
+#: mod/admin.php:1204
+msgid "OpenID support"
 msgstr ""
 
-#: mod/admin.php:590
-msgid "Created"
+#: mod/admin.php:1204
+msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: mod/admin.php:591
-msgid "Last Tried"
+#: mod/admin.php:1205
+msgid "Fullname check"
 msgstr ""
 
-#: mod/admin.php:592
+#: mod/admin.php:1205
 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."
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
 msgstr ""
 
-#: mod/admin.php:617
-#, 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 include/"
-"dbstructure.php toinnodb</tt> of your Friendica installation for an "
-"automatic conversion.<br />"
+#: mod/admin.php:1206
+msgid "Community Page Style"
 msgstr ""
 
-#: mod/admin.php:626
+#: mod/admin.php:1206
 msgid ""
-"The database update failed. Please run \"php include/dbstructure.php update"
-"\" from the command line and have a look at the errors that might appear."
+"Type of community page to show. 'Global community' shows every public "
+"posting from an open distributed network that arrived on this server."
 msgstr ""
 
-#: mod/admin.php:632
-msgid "The worker was never executed. Please check your database structure!"
+#: mod/admin.php:1207
+msgid "Posts per user on community page"
 msgstr ""
 
-#: mod/admin.php:635
-#, php-format
+#: mod/admin.php:1207
 msgid ""
-"The last worker execution was on %s UTC. This is older than one hour. Please "
-"check your crontab settings."
+"The maximum number of posts per user on the community page. (Not valid for "
+"'Global Community')"
 msgstr ""
 
-#: mod/admin.php:640 mod/admin.php:1545
-msgid "Normal Account"
+#: mod/admin.php:1208
+msgid "Enable OStatus support"
 msgstr ""
 
-#: mod/admin.php:641 mod/admin.php:1546
-msgid "Automatic Follower Account"
+#: mod/admin.php:1208
+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:642 mod/admin.php:1547
-msgid "Public Forum Account"
+#: mod/admin.php:1209
+msgid "Only import OStatus threads from our contacts"
 msgstr ""
 
-#: mod/admin.php:643 mod/admin.php:1548
-msgid "Automatic Friend Account"
+#: mod/admin.php:1209
+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:644
-msgid "Blog Account"
+#: mod/admin.php:1210
+msgid "OStatus support can only be enabled if threading is enabled."
 msgstr ""
 
-#: mod/admin.php:645
-msgid "Private Forum Account"
+#: mod/admin.php:1212
+msgid ""
+"Diaspora support can't be enabled because Friendica was installed into a sub "
+"directory."
 msgstr ""
 
-#: mod/admin.php:667
-msgid "Message queues"
+#: mod/admin.php:1213
+msgid "Enable Diaspora support"
 msgstr ""
 
-#: mod/admin.php:673
-msgid "Summary"
+#: mod/admin.php:1213
+msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: mod/admin.php:675
-msgid "Registered users"
+#: mod/admin.php:1214
+msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: mod/admin.php:677
-msgid "Pending registrations"
+#: mod/admin.php:1214
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
 msgstr ""
 
-#: mod/admin.php:678
-msgid "Version"
+#: mod/admin.php:1215
+msgid "Verify SSL"
 msgstr ""
 
-#: mod/admin.php:683
-msgid "Active plugins"
+#: mod/admin.php:1215
+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:708
-msgid "Can not parse base url. Must have at least <scheme>://<domain>"
+#: mod/admin.php:1216
+msgid "Proxy user"
 msgstr ""
 
-#: mod/admin.php:1013
-msgid "Site settings updated."
+#: mod/admin.php:1217
+msgid "Proxy URL"
 msgstr ""
 
-#: mod/admin.php:1070
-msgid "No community page"
+#: mod/admin.php:1218
+msgid "Network timeout"
 msgstr ""
 
-#: mod/admin.php:1071
-msgid "Public postings from users of this site"
+#: mod/admin.php:1218
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: mod/admin.php:1072
-msgid "Global community page"
+#: mod/admin.php:1219
+msgid "Maximum Load Average"
 msgstr ""
 
-#: mod/admin.php:1077 mod/contacts.php:551
-msgid "Never"
+#: mod/admin.php:1219
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
 msgstr ""
 
-#: mod/admin.php:1078
-msgid "At post arrival"
+#: mod/admin.php:1220
+msgid "Maximum Load Average (Frontend)"
 msgstr ""
 
-#: mod/admin.php:1086 mod/contacts.php:578
-msgid "Disabled"
+#: mod/admin.php:1220
+msgid "Maximum system load before the frontend quits service - default 50."
 msgstr ""
 
-#: mod/admin.php:1088
-msgid "Users, Global Contacts"
+#: mod/admin.php:1221
+msgid "Minimal Memory"
 msgstr ""
 
-#: mod/admin.php:1089
-msgid "Users, Global Contacts/fallback"
+#: mod/admin.php:1221
+msgid ""
+"Minimal free memory in MB for the poller. Needs access to /proc/meminfo - "
+"default 0 (deactivated)."
 msgstr ""
 
-#: mod/admin.php:1093
-msgid "One month"
+#: mod/admin.php:1222
+msgid "Maximum table size for optimization"
 msgstr ""
 
-#: mod/admin.php:1094
-msgid "Three months"
+#: mod/admin.php:1222
+msgid ""
+"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
+"Enter -1 to disable it."
 msgstr ""
 
-#: mod/admin.php:1095
-msgid "Half a year"
+#: mod/admin.php:1223
+msgid "Minimum level of fragmentation"
 msgstr ""
 
-#: mod/admin.php:1096
-msgid "One year"
+#: mod/admin.php:1223
+msgid ""
+"Minimum fragmenation level to start the automatic optimization - default "
+"value is 30%."
 msgstr ""
 
-#: mod/admin.php:1101
-msgid "Multi user instance"
+#: mod/admin.php:1225
+msgid "Periodical check of global contacts"
 msgstr ""
 
-#: mod/admin.php:1124
-msgid "Closed"
+#: mod/admin.php:1225
+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:1125
-msgid "Requires approval"
+#: mod/admin.php:1226
+msgid "Days between requery"
 msgstr ""
 
-#: mod/admin.php:1126
-msgid "Open"
+#: mod/admin.php:1226
+msgid "Number of days after which a server is requeried for his contacts."
 msgstr ""
 
-#: mod/admin.php:1130
-msgid "No SSL policy, links will track page SSL state"
+#: mod/admin.php:1227
+msgid "Discover contacts from other servers"
 msgstr ""
 
-#: mod/admin.php:1131
-msgid "Force all links to use SSL"
+#: mod/admin.php:1227
+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:1132
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+#: mod/admin.php:1228
+msgid "Timeframe for fetching global contacts"
 msgstr ""
 
-#: mod/admin.php:1156
-msgid "File upload"
+#: mod/admin.php:1228
+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:1157
-msgid "Policies"
+#: mod/admin.php:1229
+msgid "Search the local directory"
 msgstr ""
 
-#: mod/admin.php:1159
-msgid "Auto Discovered Contact Directory"
+#: mod/admin.php:1229
+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:1160
-msgid "Performance"
+#: mod/admin.php:1231
+msgid "Publish server information"
 msgstr ""
 
-#: mod/admin.php:1161
-msgid "Worker"
+#: mod/admin.php:1231
+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:1162
-msgid ""
-"Relocate - WARNING: advanced function. Could make this server unreachable."
+#: mod/admin.php:1233
+msgid "Suppress Tags"
 msgstr ""
 
-#: mod/admin.php:1165
-msgid "Site name"
+#: mod/admin.php:1233
+msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr ""
 
-#: mod/admin.php:1166
-msgid "Host name"
+#: mod/admin.php:1234
+msgid "Path to item cache"
 msgstr ""
 
-#: mod/admin.php:1167
-msgid "Sender Email"
+#: mod/admin.php:1234
+msgid "The item caches buffers generated bbcode and external images."
 msgstr ""
 
-#: mod/admin.php:1167
-msgid ""
-"The email address your server shall use to send notification emails from."
+#: mod/admin.php:1235
+msgid "Cache duration in seconds"
 msgstr ""
 
-#: mod/admin.php:1168
-msgid "Banner/Logo"
+#: mod/admin.php:1235
+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:1169
-msgid "Shortcut icon"
+#: mod/admin.php:1236
+msgid "Maximum numbers of comments per post"
 msgstr ""
 
-#: mod/admin.php:1169
-msgid "Link to an icon that will be used for browsers."
+#: mod/admin.php:1236
+msgid "How much comments should be shown for each post? Default value is 100."
 msgstr ""
 
-#: mod/admin.php:1170
-msgid "Touch icon"
+#: mod/admin.php:1237
+msgid "Temp path"
 msgstr ""
 
-#: mod/admin.php:1170
-msgid "Link to an icon that will be used for tablets and mobiles."
+#: mod/admin.php:1237
+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:1171
-msgid "Additional Info"
+#: mod/admin.php:1238
+msgid "Base path to installation"
 msgstr ""
 
-#: mod/admin.php:1171
-#, php-format
+#: mod/admin.php:1238
 msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at %s/siteinfo."
-msgstr ""
-
-#: mod/admin.php:1172
-msgid "System language"
+"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:1173
-msgid "System theme"
+#: mod/admin.php:1239
+msgid "Disable picture proxy"
 msgstr ""
 
-#: mod/admin.php:1173
+#: mod/admin.php:1239
 msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
+"The picture proxy increases performance and privacy. It shouldn't be used on "
+"systems with very low bandwith."
 msgstr ""
 
-#: mod/admin.php:1174
-msgid "Mobile system theme"
+#: mod/admin.php:1240
+msgid "Only search in tags"
 msgstr ""
 
-#: mod/admin.php:1174
-msgid "Theme for mobile devices"
+#: mod/admin.php:1240
+msgid "On large systems the text search can slow down the system extremely."
 msgstr ""
 
-#: mod/admin.php:1175
-msgid "SSL link policy"
+#: mod/admin.php:1242
+msgid "New base url"
 msgstr ""
 
-#: mod/admin.php:1175
-msgid "Determines whether generated links should be forced to use SSL"
+#: mod/admin.php:1242
+msgid ""
+"Change base url for this server. Sends relocate message to all DFRN contacts "
+"of all users."
 msgstr ""
 
-#: mod/admin.php:1176
-msgid "Force SSL"
+#: mod/admin.php:1244
+msgid "RINO Encryption"
 msgstr ""
 
-#: mod/admin.php:1176
-msgid ""
-"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
-"to endless loops."
+#: mod/admin.php:1244
+msgid "Encryption layer between nodes."
 msgstr ""
 
-#: mod/admin.php:1177
-msgid "Hide help entry from navigation menu"
+#: mod/admin.php:1246
+msgid "Maximum number of parallel workers"
 msgstr ""
 
-#: mod/admin.php:1177
+#: mod/admin.php:1246
 msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
+"On shared hosters set this to 2. On larger systems, values of 10 are great. "
+"Default value is 4."
 msgstr ""
 
-#: mod/admin.php:1178
-msgid "Single user instance"
+#: mod/admin.php:1247
+msgid "Don't use 'proc_open' with the worker"
 msgstr ""
 
-#: mod/admin.php:1178
-msgid "Make this instance multi-user or single-user for the named user"
+#: mod/admin.php:1247
+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 ""
 
-#: mod/admin.php:1179
-msgid "Maximum image size"
+#: mod/admin.php:1248
+msgid "Enable fastlane"
 msgstr ""
 
-#: mod/admin.php:1179
+#: mod/admin.php:1248
 msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
+"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:1180
-msgid "Maximum image length"
+#: mod/admin.php:1249
+msgid "Enable frontend worker"
 msgstr ""
 
-#: mod/admin.php:1180
+#: mod/admin.php:1249
+#, php-format
 msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
+"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 %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:1181
-msgid "JPEG image quality"
+#: mod/admin.php:1279
+msgid "Update has been marked successful"
 msgstr ""
 
-#: mod/admin.php:1181
-msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
+#: mod/admin.php:1287
+#, php-format
+msgid "Database structure update %s was successfully applied."
 msgstr ""
 
-#: mod/admin.php:1183
-msgid "Register policy"
+#: mod/admin.php:1290
+#, php-format
+msgid "Executing of database structure update %s failed with error: %s"
 msgstr ""
 
-#: mod/admin.php:1184
-msgid "Maximum Daily Registrations"
+#: mod/admin.php:1304
+#, php-format
+msgid "Executing %s failed with error: %s"
 msgstr ""
 
-#: mod/admin.php:1184
-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."
+#: mod/admin.php:1307
+#, php-format
+msgid "Update %s was successfully applied."
 msgstr ""
 
-#: mod/admin.php:1185
-msgid "Register text"
+#: mod/admin.php:1310
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: mod/admin.php:1185
-msgid "Will be displayed prominently on the registration page."
+#: mod/admin.php:1313
+#, php-format
+msgid "There was no additional update function %s that needed to be called."
 msgstr ""
 
-#: mod/admin.php:1186
-msgid "Accounts abandoned after x days"
+#: mod/admin.php:1333
+msgid "No failed updates."
 msgstr ""
 
-#: mod/admin.php:1186
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
+#: mod/admin.php:1334
+msgid "Check database structure"
 msgstr ""
 
-#: mod/admin.php:1187
-msgid "Allowed friend domains"
+#: mod/admin.php:1339
+msgid "Failed Updates"
 msgstr ""
 
-#: mod/admin.php:1187
+#: mod/admin.php:1340
 msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
+"This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: mod/admin.php:1188
-msgid "Allowed email domains"
+#: mod/admin.php:1341
+msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: mod/admin.php:1188
-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"
+#: mod/admin.php:1342
+msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: mod/admin.php:1189
-msgid "Block public"
+#: mod/admin.php:1376
+#, 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:1189
+#: mod/admin.php:1379
+#, php-format
 msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
+"\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."
 msgstr ""
 
-#: mod/admin.php:1190
-msgid "Force publish"
-msgstr ""
+#: mod/admin.php:1423
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mod/admin.php:1190
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
+#: mod/admin.php:1430
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/admin.php:1477
+#, php-format
+msgid "User '%s' deleted"
 msgstr ""
 
-#: mod/admin.php:1191
-msgid "Global directory URL"
+#: mod/admin.php:1485
+#, php-format
+msgid "User '%s' unblocked"
 msgstr ""
 
-#: mod/admin.php:1191
-msgid ""
-"URL to the global directory. If this is not set, the global directory is "
-"completely unavailable to the application."
+#: mod/admin.php:1485
+#, php-format
+msgid "User '%s' blocked"
 msgstr ""
 
-#: mod/admin.php:1192
-msgid "Allow threaded items"
+#: mod/admin.php:1593 mod/admin.php:1619
+msgid "Register date"
 msgstr ""
 
-#: mod/admin.php:1192
-msgid "Allow infinite level threading for items on this site."
+#: mod/admin.php:1593 mod/admin.php:1619
+msgid "Last login"
 msgstr ""
 
-#: mod/admin.php:1193
-msgid "Private posts by default for new users"
+#: mod/admin.php:1593 mod/admin.php:1619
+msgid "Last item"
 msgstr ""
 
-#: mod/admin.php:1193
-msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
+#: mod/admin.php:1602
+msgid "Add User"
 msgstr ""
 
-#: mod/admin.php:1194
-msgid "Don't include post content in email notifications"
+#: mod/admin.php:1603
+msgid "select all"
 msgstr ""
 
-#: mod/admin.php:1194
-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."
+#: mod/admin.php:1604
+msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: mod/admin.php:1195
-msgid "Disallow public access to addons listed in the apps menu."
+#: mod/admin.php:1605
+msgid "User waiting for permanent deletion"
 msgstr ""
 
-#: mod/admin.php:1195
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
+#: mod/admin.php:1606
+msgid "Request date"
 msgstr ""
 
-#: mod/admin.php:1196
-msgid "Don't embed private images in posts"
+#: mod/admin.php:1607
+msgid "No registrations."
 msgstr ""
 
-#: mod/admin.php:1196
-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."
+#: mod/admin.php:1608
+msgid "Note from the user"
 msgstr ""
 
-#: mod/admin.php:1197
-msgid "Allow Users to set remote_self"
+#: mod/admin.php:1610
+msgid "Deny"
 msgstr ""
 
-#: mod/admin.php:1197
-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."
+#: mod/admin.php:1612 mod/contacts.php:634 mod/contacts.php:834
+#: mod/contacts.php:1012
+msgid "Block"
 msgstr ""
 
-#: mod/admin.php:1198
-msgid "Block multiple registrations"
+#: mod/admin.php:1613 mod/contacts.php:634 mod/contacts.php:834
+#: mod/contacts.php:1012
+msgid "Unblock"
 msgstr ""
 
-#: mod/admin.php:1198
-msgid "Disallow users to register additional accounts for use as pages."
+#: mod/admin.php:1614
+msgid "Site admin"
 msgstr ""
 
-#: mod/admin.php:1199
-msgid "OpenID support"
+#: mod/admin.php:1615
+msgid "Account expired"
 msgstr ""
 
-#: mod/admin.php:1199
-msgid "OpenID support for registration and logins."
+#: mod/admin.php:1618
+msgid "New User"
 msgstr ""
 
-#: mod/admin.php:1200
-msgid "Fullname check"
+#: mod/admin.php:1619
+msgid "Deleted since"
 msgstr ""
 
-#: mod/admin.php:1200
+#: mod/admin.php:1624
 msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
+"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:1201
-msgid "Community Page Style"
+#: mod/admin.php:1625
+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:1201
-msgid ""
-"Type of community page to show. 'Global community' shows every public "
-"posting from an open distributed network that arrived on this server."
+#: mod/admin.php:1635
+msgid "Name of the new user."
 msgstr ""
 
-#: mod/admin.php:1202
-msgid "Posts per user on community page"
+#: mod/admin.php:1636
+msgid "Nickname"
 msgstr ""
 
-#: mod/admin.php:1202
-msgid ""
-"The maximum number of posts per user on the community page. (Not valid for "
-"'Global Community')"
+#: mod/admin.php:1636
+msgid "Nickname of the new user."
 msgstr ""
 
-#: mod/admin.php:1203
-msgid "Enable OStatus support"
+#: mod/admin.php:1637
+msgid "Email address of the new user."
 msgstr ""
 
-#: mod/admin.php:1203
-msgid ""
-"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:1680
+#, php-format
+msgid "Plugin %s disabled."
 msgstr ""
 
-#: mod/admin.php:1204
-msgid "Only import OStatus threads from our contacts"
+#: mod/admin.php:1684
+#, php-format
+msgid "Plugin %s enabled."
 msgstr ""
 
-#: mod/admin.php:1204
-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."
+#: mod/admin.php:1695 mod/admin.php:1947
+msgid "Disable"
 msgstr ""
 
-#: mod/admin.php:1205
-msgid "OStatus support can only be enabled if threading is enabled."
+#: mod/admin.php:1697 mod/admin.php:1949
+msgid "Enable"
 msgstr ""
 
-#: mod/admin.php:1207
-msgid ""
-"Diaspora support can't be enabled because Friendica was installed into a sub "
-"directory."
+#: mod/admin.php:1720 mod/admin.php:1996
+msgid "Toggle"
 msgstr ""
 
-#: mod/admin.php:1208
-msgid "Enable Diaspora support"
+#: mod/admin.php:1728 mod/admin.php:2005
+msgid "Author: "
 msgstr ""
 
-#: mod/admin.php:1208
-msgid "Provide built-in Diaspora network compatibility."
+#: mod/admin.php:1729 mod/admin.php:2006
+msgid "Maintainer: "
 msgstr ""
 
-#: mod/admin.php:1209
-msgid "Only allow Friendica contacts"
+#: mod/admin.php:1784
+msgid "Reload active plugins"
 msgstr ""
 
-#: mod/admin.php:1209
+#: mod/admin.php:1789
+#, php-format
 msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
+"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 ""
 
-#: mod/admin.php:1210
-msgid "Verify SSL"
+#: mod/admin.php:1908
+msgid "No themes found."
 msgstr ""
 
-#: mod/admin.php:1210
-msgid ""
-"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:1987
+msgid "Screenshot"
 msgstr ""
 
-#: mod/admin.php:1211
-msgid "Proxy user"
+#: mod/admin.php:2047
+msgid "Reload active themes"
 msgstr ""
 
-#: mod/admin.php:1212
-msgid "Proxy URL"
+#: mod/admin.php:2052
+#, php-format
+msgid "No themes found on the system. They should be paced in %1$s"
 msgstr ""
 
-#: mod/admin.php:1213
-msgid "Network timeout"
+#: mod/admin.php:2053
+msgid "[Experimental]"
 msgstr ""
 
-#: mod/admin.php:1213
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+#: mod/admin.php:2054
+msgid "[Unsupported]"
 msgstr ""
 
-#: mod/admin.php:1214
-msgid "Maximum Load Average"
+#: mod/admin.php:2078
+msgid "Log settings updated."
 msgstr ""
 
-#: mod/admin.php:1214
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
+#: mod/admin.php:2110
+msgid "PHP log currently enabled."
 msgstr ""
 
-#: mod/admin.php:1215
-msgid "Maximum Load Average (Frontend)"
+#: mod/admin.php:2112
+msgid "PHP log currently disabled."
 msgstr ""
 
-#: mod/admin.php:1215
-msgid "Maximum system load before the frontend quits service - default 50."
+#: mod/admin.php:2121
+msgid "Clear"
 msgstr ""
 
-#: mod/admin.php:1216
-msgid "Minimal Memory"
+#: mod/admin.php:2126
+msgid "Enable Debugging"
 msgstr ""
 
-#: mod/admin.php:1216
-msgid ""
-"Minimal free memory in MB for the poller. Needs access to /proc/meminfo - "
-"default 0 (deactivated)."
+#: mod/admin.php:2127
+msgid "Log file"
 msgstr ""
 
-#: mod/admin.php:1217
-msgid "Maximum table size for optimization"
+#: mod/admin.php:2127
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
 msgstr ""
 
-#: mod/admin.php:1217
-msgid ""
-"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
-"Enter -1 to disable it."
+#: mod/admin.php:2128
+msgid "Log level"
 msgstr ""
 
-#: mod/admin.php:1218
-msgid "Minimum level of fragmentation"
+#: mod/admin.php:2131
+msgid "PHP logging"
 msgstr ""
 
-#: mod/admin.php:1218
+#: mod/admin.php:2132
 msgid ""
-"Minimum fragmenation level to start the automatic optimization - default "
-"value is 30%."
+"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:1220
-msgid "Periodical check of global contacts"
+#: mod/admin.php:2263
+#, php-format
+msgid "Lock feature %s"
 msgstr ""
 
-#: mod/admin.php:1220
-msgid ""
-"If enabled, the global contacts are checked periodically for missing or "
-"outdated data and the vitality of the contacts and servers."
+#: mod/admin.php:2271
+msgid "Manage Additional Features"
 msgstr ""
 
-#: mod/admin.php:1221
-msgid "Days between requery"
+#: mod/contacts.php:138
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/contacts.php:173 mod/contacts.php:391
+msgid "Could not access contact record."
 msgstr ""
 
-#: mod/admin.php:1221
-msgid "Number of days after which a server is requeried for his contacts."
+#: mod/contacts.php:187
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: mod/admin.php:1222
-msgid "Discover contacts from other servers"
+#: mod/contacts.php:220
+msgid "Contact updated."
 msgstr ""
 
-#: mod/admin.php:1222
-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'."
+#: mod/contacts.php:412
+msgid "Contact has been blocked"
 msgstr ""
 
-#: mod/admin.php:1223
-msgid "Timeframe for fetching global contacts"
+#: mod/contacts.php:412
+msgid "Contact has been unblocked"
 msgstr ""
 
-#: mod/admin.php:1223
-msgid ""
-"When the discovery is activated, this value defines the timeframe for the "
-"activity of the global contacts that are fetched from other servers."
+#: mod/contacts.php:423
+msgid "Contact has been ignored"
 msgstr ""
 
-#: mod/admin.php:1224
-msgid "Search the local directory"
+#: mod/contacts.php:423
+msgid "Contact has been unignored"
 msgstr ""
 
-#: mod/admin.php:1224
-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."
+#: mod/contacts.php:435
+msgid "Contact has been archived"
 msgstr ""
 
-#: mod/admin.php:1226
-msgid "Publish server information"
+#: mod/contacts.php:435
+msgid "Contact has been unarchived"
 msgstr ""
 
-#: mod/admin.php:1226
-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."
+#: mod/contacts.php:460
+msgid "Drop contact"
 msgstr ""
 
-#: mod/admin.php:1228
-msgid "Suppress Tags"
+#: mod/contacts.php:463 mod/contacts.php:830
+msgid "Do you really want to delete this contact?"
 msgstr ""
 
-#: mod/admin.php:1228
-msgid "Suppress showing a list of hashtags at the end of the posting."
+#: mod/contacts.php:482
+msgid "Contact has been removed."
 msgstr ""
 
-#: mod/admin.php:1229
-msgid "Path to item cache"
+#: mod/contacts.php:519
+#, php-format
+msgid "You are mutual friends with %s"
 msgstr ""
 
-#: mod/admin.php:1229
-msgid "The item caches buffers generated bbcode and external images."
+#: mod/contacts.php:523
+#, php-format
+msgid "You are sharing with %s"
 msgstr ""
 
-#: mod/admin.php:1230
-msgid "Cache duration in seconds"
+#: mod/contacts.php:528
+#, php-format
+msgid "%s is sharing with you"
 msgstr ""
 
-#: mod/admin.php:1230
-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."
+#: mod/contacts.php:548
+msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: mod/admin.php:1231
-msgid "Maximum numbers of comments per post"
+#: mod/contacts.php:555
+msgid "(Update was successful)"
 msgstr ""
 
-#: mod/admin.php:1231
-msgid "How much comments should be shown for each post? Default value is 100."
+#: mod/contacts.php:555
+msgid "(Update was not successful)"
 msgstr ""
 
-#: mod/admin.php:1232
-msgid "Temp path"
+#: mod/contacts.php:557 mod/contacts.php:993
+msgid "Suggest friends"
 msgstr ""
 
-#: mod/admin.php:1232
-msgid ""
-"If you have a restricted system where the webserver can't access the system "
-"temp path, enter another path here."
+#: mod/contacts.php:561
+#, php-format
+msgid "Network type: %s"
 msgstr ""
 
-#: mod/admin.php:1233
-msgid "Base path to installation"
+#: mod/contacts.php:574
+msgid "Communications lost with this contact!"
 msgstr ""
 
-#: mod/admin.php:1233
-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."
+#: mod/contacts.php:577
+msgid "Fetch further information for feeds"
 msgstr ""
 
-#: mod/admin.php:1234
-msgid "Disable picture proxy"
+#: mod/contacts.php:578
+msgid "Fetch information"
 msgstr ""
 
-#: mod/admin.php:1234
-msgid ""
-"The picture proxy increases performance and privacy. It shouldn't be used on "
-"systems with very low bandwith."
+#: mod/contacts.php:578
+msgid "Fetch information and keywords"
 msgstr ""
 
-#: mod/admin.php:1235
-msgid "Only search in tags"
+#: mod/contacts.php:592 mod/unfollow.php:100
+msgid "Disconnect/Unfollow"
 msgstr ""
 
-#: mod/admin.php:1235
-msgid "On large systems the text search can slow down the system extremely."
+#: mod/contacts.php:602
+msgid "Contact"
 msgstr ""
 
-#: mod/admin.php:1237
-msgid "New base url"
+#: mod/contacts.php:605
+msgid "Profile Visibility"
 msgstr ""
 
-#: mod/admin.php:1237
+#: mod/contacts.php:606
+#, php-format
 msgid ""
-"Change base url for this server. Sends relocate message to all DFRN contacts "
-"of all users."
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: mod/admin.php:1239
-msgid "RINO Encryption"
+#: mod/contacts.php:607
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: mod/admin.php:1239
-msgid "Encryption layer between nodes."
+#: mod/contacts.php:608
+msgid "Their personal note"
 msgstr ""
 
-#: mod/admin.php:1241
-msgid "Maximum number of parallel workers"
+#: mod/contacts.php:610
+msgid "Edit contact notes"
 msgstr ""
 
-#: mod/admin.php:1241
-msgid ""
-"On shared hosters set this to 2. On larger systems, values of 10 are great. "
-"Default value is 4."
+#: mod/contacts.php:616
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: mod/admin.php:1242
-msgid "Don't use 'proc_open' with the worker"
+#: mod/contacts.php:617
+msgid "Ignore contact"
 msgstr ""
 
-#: mod/admin.php:1242
-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."
+#: mod/contacts.php:618
+msgid "Repair URL settings"
 msgstr ""
 
-#: mod/admin.php:1243
-msgid "Enable fastlane"
+#: mod/contacts.php:619
+msgid "View conversations"
 msgstr ""
 
-#: mod/admin.php:1243
-msgid ""
-"When enabed, the fastlane mechanism starts an additional worker if processes "
-"with higher priority are blocked by processes of lower priority."
+#: mod/contacts.php:625
+msgid "Last update:"
 msgstr ""
 
-#: mod/admin.php:1244
-msgid "Enable frontend worker"
+#: mod/contacts.php:627
+msgid "Update public posts"
 msgstr ""
 
-#: mod/admin.php:1244
-#, 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 %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/contacts.php:629 mod/contacts.php:1003
+msgid "Update now"
 msgstr ""
 
-#: mod/admin.php:1274
-msgid "Update has been marked successful"
+#: mod/contacts.php:635 mod/contacts.php:835 mod/contacts.php:1020
+msgid "Unignore"
 msgstr ""
 
-#: mod/admin.php:1282
-#, php-format
-msgid "Database structure update %s was successfully applied."
+#: mod/contacts.php:639
+msgid "Currently blocked"
 msgstr ""
 
-#: mod/admin.php:1285
-#, php-format
-msgid "Executing of database structure update %s failed with error: %s"
+#: mod/contacts.php:640
+msgid "Currently ignored"
 msgstr ""
 
-#: mod/admin.php:1299
-#, php-format
-msgid "Executing %s failed with error: %s"
+#: mod/contacts.php:641
+msgid "Currently archived"
 msgstr ""
 
-#: mod/admin.php:1302
-#, php-format
-msgid "Update %s was successfully applied."
+#: mod/contacts.php:642
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: mod/admin.php:1305
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
+#: mod/contacts.php:643
+msgid "Notification for new posts"
 msgstr ""
 
-#: mod/admin.php:1308
-#, php-format
-msgid "There was no additional update function %s that needed to be called."
+#: mod/contacts.php:643
+msgid "Send a notification of every new post of this contact"
 msgstr ""
 
-#: mod/admin.php:1328
-msgid "No failed updates."
+#: mod/contacts.php:646
+msgid "Blacklisted keywords"
 msgstr ""
 
-#: mod/admin.php:1329
-msgid "Check database structure"
+#: mod/contacts.php:646
+msgid ""
+"Comma separated list of keywords that should not be converted to hashtags, "
+"when \"Fetch information and keywords\" is selected"
 msgstr ""
 
-#: mod/admin.php:1334
-msgid "Failed Updates"
+#: mod/contacts.php:664
+msgid "Actions"
 msgstr ""
 
-#: mod/admin.php:1335
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
+#: mod/contacts.php:667
+msgid "Contact Settings"
 msgstr ""
 
-#: mod/admin.php:1336
-msgid "Mark success (if update was manually applied)"
+#: mod/contacts.php:713
+msgid "Suggestions"
 msgstr ""
 
-#: mod/admin.php:1337
-msgid "Attempt to execute this update step automatically"
+#: mod/contacts.php:716
+msgid "Suggest potential friends"
 msgstr ""
 
-#: mod/admin.php:1371
-#, 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."
+#: mod/contacts.php:724
+msgid "Show all contacts"
 msgstr ""
 
-#: mod/admin.php:1374
-#, 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\tThank you and welcome to %4$s."
+#: mod/contacts.php:729
+msgid "Unblocked"
 msgstr ""
 
-#: mod/admin.php:1418
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
+#: mod/contacts.php:732
+msgid "Only show unblocked contacts"
+msgstr ""
 
-#: mod/admin.php:1425
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] ""
-msgstr[1] ""
+#: mod/contacts.php:738
+msgid "Blocked"
+msgstr ""
 
-#: mod/admin.php:1472
-#, php-format
-msgid "User '%s' deleted"
+#: mod/contacts.php:741
+msgid "Only show blocked contacts"
 msgstr ""
 
-#: mod/admin.php:1480
-#, php-format
-msgid "User '%s' unblocked"
+#: mod/contacts.php:747
+msgid "Ignored"
 msgstr ""
 
-#: mod/admin.php:1480
-#, php-format
-msgid "User '%s' blocked"
+#: mod/contacts.php:750
+msgid "Only show ignored contacts"
 msgstr ""
 
-#: mod/admin.php:1588 mod/admin.php:1614
-msgid "Register date"
+#: mod/contacts.php:756
+msgid "Archived"
 msgstr ""
 
-#: mod/admin.php:1588 mod/admin.php:1614
-msgid "Last login"
+#: mod/contacts.php:759
+msgid "Only show archived contacts"
 msgstr ""
 
-#: mod/admin.php:1588 mod/admin.php:1614
-msgid "Last item"
+#: mod/contacts.php:765
+msgid "Hidden"
 msgstr ""
 
-#: mod/admin.php:1597
-msgid "Add User"
+#: mod/contacts.php:768
+msgid "Only show hidden contacts"
 msgstr ""
 
-#: mod/admin.php:1598
-msgid "select all"
+#: mod/contacts.php:825
+msgid "Search your contacts"
 msgstr ""
 
-#: mod/admin.php:1599
-msgid "User registrations waiting for confirm"
+#: mod/contacts.php:826 mod/search.php:223
+#, php-format
+msgid "Results for: %s"
 msgstr ""
 
-#: mod/admin.php:1600
-msgid "User waiting for permanent deletion"
+#: mod/contacts.php:836 mod/contacts.php:1028
+msgid "Archive"
 msgstr ""
 
-#: mod/admin.php:1601
-msgid "Request date"
+#: mod/contacts.php:836 mod/contacts.php:1028
+msgid "Unarchive"
 msgstr ""
 
-#: mod/admin.php:1602
-msgid "No registrations."
+#: mod/contacts.php:839
+msgid "Batch Actions"
 msgstr ""
 
-#: mod/admin.php:1603
-msgid "Note from the user"
+#: mod/contacts.php:885
+msgid "View all contacts"
 msgstr ""
 
-#: mod/admin.php:1605
-msgid "Deny"
+#: mod/contacts.php:895
+msgid "View all common friends"
 msgstr ""
 
-#: mod/admin.php:1607 mod/contacts.php:634 mod/contacts.php:834
-#: mod/contacts.php:1012
-msgid "Block"
+#: mod/contacts.php:902
+msgid "Advanced Contact Settings"
 msgstr ""
 
-#: mod/admin.php:1608 mod/contacts.php:634 mod/contacts.php:834
-#: mod/contacts.php:1012
-msgid "Unblock"
+#: mod/contacts.php:936
+msgid "Mutual Friendship"
 msgstr ""
 
-#: mod/admin.php:1609
-msgid "Site admin"
+#: mod/contacts.php:940
+msgid "is a fan of yours"
 msgstr ""
 
-#: mod/admin.php:1610
-msgid "Account expired"
+#: mod/contacts.php:944
+msgid "you are a fan of"
 msgstr ""
 
-#: mod/admin.php:1613
-msgid "New User"
+#: mod/contacts.php:1014
+msgid "Toggle Blocked status"
 msgstr ""
 
-#: mod/admin.php:1614
-msgid "Deleted since"
+#: mod/contacts.php:1022
+msgid "Toggle Ignored status"
 msgstr ""
 
-#: mod/admin.php:1619
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
+#: mod/contacts.php:1030
+msgid "Toggle Archive status"
 msgstr ""
 
-#: mod/admin.php:1620
-msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
+#: mod/contacts.php:1038
+msgid "Delete contact"
 msgstr ""
 
-#: mod/admin.php:1630
-msgid "Name of the new user."
+#: mod/directory.php:193 view/theme/vier/theme.php:194
+msgid "Global Directory"
 msgstr ""
 
-#: mod/admin.php:1631
-msgid "Nickname"
+#: mod/directory.php:195
+msgid "Find on this site"
 msgstr ""
 
-#: mod/admin.php:1631
-msgid "Nickname of the new user."
+#: mod/directory.php:197
+msgid "Results for:"
 msgstr ""
 
-#: mod/admin.php:1632
-msgid "Email address of the new user."
+#: mod/directory.php:199
+msgid "Site Directory"
 msgstr ""
 
-#: mod/admin.php:1675
-#, php-format
-msgid "Plugin %s disabled."
+#: mod/directory.php:206
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: mod/admin.php:1679
-#, php-format
-msgid "Plugin %s enabled."
+#: mod/display.php:468
+msgid "Item has been removed."
 msgstr ""
 
-#: mod/admin.php:1690 mod/admin.php:1942
-msgid "Disable"
+#: mod/fbrowser.php:136
+msgid "Files"
 msgstr ""
 
-#: mod/admin.php:1692 mod/admin.php:1944
-msgid "Enable"
+#: mod/friendica.php:70
+msgid "This is Friendica, version"
 msgstr ""
 
-#: mod/admin.php:1715 mod/admin.php:1991
-msgid "Toggle"
+#: mod/friendica.php:71
+msgid "running at web location"
 msgstr ""
 
-#: mod/admin.php:1723 mod/admin.php:2000
-msgid "Author: "
+#: mod/friendica.php:75
+msgid ""
+"Please visit <a href=\"https://friendi.ca\">Friendi.ca</a> to learn more "
+"about the Friendica project."
 msgstr ""
 
-#: mod/admin.php:1724 mod/admin.php:2001
-msgid "Maintainer: "
+#: mod/friendica.php:79
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: mod/admin.php:1779
-msgid "Reload active plugins"
+#: mod/friendica.php:79
+msgid "the bugtracker at github"
 msgstr ""
 
-#: mod/admin.php:1784
-#, php-format
+#: mod/friendica.php:82
 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"
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
+"dot com"
 msgstr ""
 
-#: mod/admin.php:1903
-msgid "No themes found."
+#: mod/friendica.php:96
+msgid "Installed plugins/addons/apps:"
 msgstr ""
 
-#: mod/admin.php:1982
-msgid "Screenshot"
+#: mod/friendica.php:110
+msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: mod/admin.php:2042
-msgid "Reload active themes"
+#: mod/friendica.php:115
+msgid "On this server the following remote servers are blocked."
 msgstr ""
 
-#: mod/admin.php:2047
-#, php-format
-msgid "No themes found on the system. They should be paced in %1$s"
+#: mod/install.php:107
+msgid "Friendica Communications Server - Setup"
 msgstr ""
 
-#: mod/admin.php:2048
-msgid "[Experimental]"
+#: mod/install.php:113
+msgid "Could not connect to database."
 msgstr ""
 
-#: mod/admin.php:2049
-msgid "[Unsupported]"
+#: mod/install.php:117
+msgid "Could not create table."
 msgstr ""
 
-#: mod/admin.php:2073
-msgid "Log settings updated."
+#: mod/install.php:123
+msgid "Your Friendica site database has been installed."
 msgstr ""
 
-#: mod/admin.php:2105
-msgid "PHP log currently enabled."
+#: mod/install.php:128
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
 msgstr ""
 
-#: mod/admin.php:2107
-msgid "PHP log currently disabled."
+#: mod/install.php:129 mod/install.php:201 mod/install.php:548
+msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: mod/admin.php:2116
-msgid "Clear"
+#: mod/install.php:141
+msgid "Database already in use."
 msgstr ""
 
-#: mod/admin.php:2121
-msgid "Enable Debugging"
+#: mod/install.php:198
+msgid "System check"
 msgstr ""
 
-#: mod/admin.php:2122
-msgid "Log file"
+#: mod/install.php:203
+msgid "Check again"
 msgstr ""
 
-#: mod/admin.php:2122
-msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
+#: mod/install.php:222
+msgid "Database connection"
 msgstr ""
 
-#: mod/admin.php:2123
-msgid "Log level"
+#: mod/install.php:223
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
 msgstr ""
 
-#: mod/admin.php:2126
-msgid "PHP logging"
+#: mod/install.php:224
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: mod/admin.php:2127
+#: mod/install.php:225
 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."
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: mod/admin.php:2258
-#, php-format
-msgid "Lock feature %s"
+#: mod/install.php:229
+msgid "Database Server Name"
 msgstr ""
 
-#: mod/admin.php:2266
-msgid "Manage Additional Features"
+#: mod/install.php:230
+msgid "Database Login Name"
 msgstr ""
 
-#: mod/contacts.php:138
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] ""
-msgstr[1] ""
+#: mod/install.php:231
+msgid "Database Login Password"
+msgstr ""
 
-#: mod/contacts.php:173 mod/contacts.php:391
-msgid "Could not access contact record."
+#: mod/install.php:231
+msgid "For security reasons the password must not be empty"
 msgstr ""
 
-#: mod/contacts.php:187
-msgid "Could not locate selected profile."
+#: mod/install.php:232
+msgid "Database Name"
 msgstr ""
 
-#: mod/contacts.php:220
-msgid "Contact updated."
+#: mod/install.php:233 mod/install.php:274
+msgid "Site administrator email address"
 msgstr ""
 
-#: mod/contacts.php:412
-msgid "Contact has been blocked"
+#: mod/install.php:233 mod/install.php:274
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
 msgstr ""
 
-#: mod/contacts.php:412
-msgid "Contact has been unblocked"
+#: mod/install.php:237 mod/install.php:277
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: mod/contacts.php:423
-msgid "Contact has been ignored"
+#: mod/install.php:264
+msgid "Site settings"
 msgstr ""
 
-#: mod/contacts.php:423
-msgid "Contact has been unignored"
+#: mod/install.php:278
+msgid "System Language:"
 msgstr ""
 
-#: mod/contacts.php:435
-msgid "Contact has been archived"
+#: mod/install.php:278
+msgid ""
+"Set the default language for your Friendica installation interface and to "
+"send emails."
 msgstr ""
 
-#: mod/contacts.php:435
-msgid "Contact has been unarchived"
+#: mod/install.php:318
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: mod/contacts.php:460
-msgid "Drop contact"
+#: mod/install.php:319
+msgid ""
+"If you don't have a command line version of PHP installed on 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 ""
 
-#: mod/contacts.php:463 mod/contacts.php:830
-msgid "Do you really want to delete this contact?"
+#: mod/install.php:323
+msgid "PHP executable path"
 msgstr ""
 
-#: mod/contacts.php:482
-msgid "Contact has been removed."
+#: mod/install.php:323
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: mod/contacts.php:519
-#, php-format
-msgid "You are mutual friends with %s"
+#: mod/install.php:328
+msgid "Command line PHP"
 msgstr ""
 
-#: mod/contacts.php:523
-#, php-format
-msgid "You are sharing with %s"
+#: mod/install.php:337
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
 msgstr ""
 
-#: mod/contacts.php:528
-#, php-format
-msgid "%s is sharing with you"
+#: mod/install.php:338
+msgid "Found PHP version: "
 msgstr ""
 
-#: mod/contacts.php:548
-msgid "Private communications are not available for this contact."
+#: mod/install.php:340
+msgid "PHP cli binary"
 msgstr ""
 
-#: mod/contacts.php:555
-msgid "(Update was successful)"
+#: mod/install.php:351
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: mod/contacts.php:555
-msgid "(Update was not successful)"
+#: mod/install.php:352
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: mod/contacts.php:557 mod/contacts.php:993
-msgid "Suggest friends"
+#: mod/install.php:354
+msgid "PHP register_argc_argv"
 msgstr ""
 
-#: mod/contacts.php:561
-#, php-format
-msgid "Network type: %s"
+#: mod/install.php:377
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: mod/contacts.php:574
-msgid "Communications lost with this contact!"
+#: mod/install.php:378
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: mod/contacts.php:577
-msgid "Fetch further information for feeds"
+#: mod/install.php:380
+msgid "Generate encryption keys"
 msgstr ""
 
-#: mod/contacts.php:578
-msgid "Fetch information"
+#: mod/install.php:387
+msgid "libCurl PHP module"
 msgstr ""
 
-#: mod/contacts.php:578
-msgid "Fetch information and keywords"
+#: mod/install.php:388
+msgid "GD graphics PHP module"
 msgstr ""
 
-#: mod/contacts.php:592 mod/unfollow.php:100
-msgid "Disconnect/Unfollow"
+#: mod/install.php:389
+msgid "OpenSSL PHP module"
 msgstr ""
 
-#: mod/contacts.php:602
-msgid "Contact"
+#: mod/install.php:390
+msgid "PDO or MySQLi PHP module"
 msgstr ""
 
-#: mod/contacts.php:605
-msgid "Profile Visibility"
+#: mod/install.php:391
+msgid "mb_string PHP module"
 msgstr ""
 
-#: mod/contacts.php:606
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+#: mod/install.php:392
+msgid "XML PHP module"
 msgstr ""
 
-#: mod/contacts.php:607
-msgid "Contact Information / Notes"
+#: mod/install.php:393
+msgid "iconv module"
 msgstr ""
 
-#: mod/contacts.php:608
-msgid "Their personal note"
+#: mod/install.php:397 mod/install.php:399
+msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: mod/contacts.php:610
-msgid "Edit contact notes"
+#: mod/install.php:397
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: mod/contacts.php:616
-msgid "Block/Unblock contact"
+#: mod/install.php:405
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: mod/contacts.php:617
-msgid "Ignore contact"
+#: mod/install.php:409
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: mod/contacts.php:618
-msgid "Repair URL settings"
+#: mod/install.php:413
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: mod/contacts.php:619
-msgid "View conversations"
+#: mod/install.php:417
+msgid "Error: PDO or MySQLi PHP module required but not installed."
 msgstr ""
 
-#: mod/contacts.php:625
-msgid "Last update:"
+#: mod/install.php:421
+msgid "Error: The MySQL driver for PDO is not installed."
 msgstr ""
 
-#: mod/contacts.php:627
-msgid "Update public posts"
+#: mod/install.php:425
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: mod/contacts.php:629 mod/contacts.php:1003
-msgid "Update now"
+#: mod/install.php:429
+msgid "Error: iconv PHP module required but not installed."
 msgstr ""
 
-#: mod/contacts.php:635 mod/contacts.php:835 mod/contacts.php:1020
-msgid "Unignore"
+#: mod/install.php:439
+msgid "Error, XML PHP module required but not installed."
 msgstr ""
 
-#: mod/contacts.php:639
-msgid "Currently blocked"
+#: mod/install.php:451
+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 ""
 
-#: mod/contacts.php:640
-msgid "Currently ignored"
+#: mod/install.php:452
+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 ""
 
-#: mod/contacts.php:641
-msgid "Currently archived"
+#: mod/install.php:453
+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 ""
 
-#: mod/contacts.php:642
+#: mod/install.php:454
 msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: mod/contacts.php:643
-msgid "Notification for new posts"
+#: mod/install.php:457
+msgid ".htconfig.php is writable"
 msgstr ""
 
-#: mod/contacts.php:643
-msgid "Send a notification of every new post of this contact"
+#: mod/install.php:467
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: mod/contacts.php:646
-msgid "Blacklisted keywords"
+#: mod/install.php:468
+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 ""
 
-#: mod/contacts.php:646
+#: mod/install.php:469
 msgid ""
-"Comma separated list of keywords that should not be converted to hashtags, "
-"when \"Fetch information and keywords\" is selected"
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
 msgstr ""
 
-#: mod/contacts.php:664
-msgid "Actions"
+#: mod/install.php:470
+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 ""
 
-#: mod/contacts.php:667
-msgid "Contact Settings"
+#: mod/install.php:473
+msgid "view/smarty3 is writable"
 msgstr ""
 
-#: mod/contacts.php:713
-msgid "Suggestions"
+#: mod/install.php:489
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr ""
 
-#: mod/contacts.php:716
-msgid "Suggest potential friends"
+#: mod/install.php:491
+msgid "Url rewrite is working"
 msgstr ""
 
-#: mod/contacts.php:724
-msgid "Show all contacts"
+#: mod/install.php:510
+msgid "ImageMagick PHP extension is not installed"
 msgstr ""
 
-#: mod/contacts.php:729
-msgid "Unblocked"
+#: mod/install.php:512
+msgid "ImageMagick PHP extension is installed"
 msgstr ""
 
-#: mod/contacts.php:732
-msgid "Only show unblocked contacts"
+#: mod/install.php:514
+msgid "ImageMagick supports GIF"
 msgstr ""
 
-#: mod/contacts.php:738
-msgid "Blocked"
+#: mod/install.php:521
+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/contacts.php:741
-msgid "Only show blocked contacts"
+#: mod/install.php:546
+msgid "<h1>What next</h1>"
 msgstr ""
 
-#: mod/contacts.php:747
-msgid "Ignored"
+#: mod/install.php:547
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: mod/contacts.php:750
-msgid "Only show ignored contacts"
+#: mod/network.php:187 mod/search.php:28
+msgid "Remove term"
 msgstr ""
 
-#: mod/contacts.php:756
-msgid "Archived"
-msgstr ""
+#: mod/network.php:561
+#, 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/contacts.php:759
-msgid "Only show archived contacts"
+#: mod/network.php:564
+msgid "Messages in this group won't be send to these receivers."
 msgstr ""
 
-#: mod/contacts.php:765
-msgid "Hidden"
+#: mod/network.php:684
+msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: mod/contacts.php:768
-msgid "Only show hidden contacts"
+#: mod/network.php:688
+msgid "Invalid contact."
 msgstr ""
 
-#: mod/contacts.php:825
-msgid "Search your contacts"
+#: mod/network.php:893
+msgid "Commented Order"
 msgstr ""
 
-#: mod/contacts.php:836 mod/contacts.php:1028
-msgid "Archive"
+#: mod/network.php:896
+msgid "Sort by Comment Date"
 msgstr ""
 
-#: mod/contacts.php:836 mod/contacts.php:1028
-msgid "Unarchive"
+#: mod/network.php:901
+msgid "Posted Order"
 msgstr ""
 
-#: mod/contacts.php:839
-msgid "Batch Actions"
+#: mod/network.php:904
+msgid "Sort by Post Date"
 msgstr ""
 
-#: mod/contacts.php:885
-msgid "View all contacts"
+#: mod/network.php:915
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: mod/contacts.php:895
-msgid "View all common friends"
+#: mod/network.php:923
+msgid "New"
 msgstr ""
 
-#: mod/contacts.php:902
-msgid "Advanced Contact Settings"
+#: mod/network.php:926
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: mod/contacts.php:936
-msgid "Mutual Friendship"
+#: mod/network.php:934
+msgid "Shared Links"
 msgstr ""
 
-#: mod/contacts.php:940
-msgid "is a fan of yours"
+#: mod/network.php:937
+msgid "Interesting Links"
 msgstr ""
 
-#: mod/contacts.php:944
-msgid "you are a fan of"
+#: mod/network.php:945
+msgid "Starred"
 msgstr ""
 
-#: mod/contacts.php:1014
-msgid "Toggle Blocked status"
+#: mod/network.php:948
+msgid "Favourite Posts"
 msgstr ""
 
-#: mod/contacts.php:1022
-msgid "Toggle Ignored status"
+#: mod/search.php:96
+msgid "Only logged in users are permitted to perform a search."
 msgstr ""
 
-#: mod/contacts.php:1030
-msgid "Toggle Archive status"
+#: mod/search.php:120
+msgid "Too Many Requests"
 msgstr ""
 
-#: mod/contacts.php:1038
-msgid "Delete contact"
+#: mod/search.php:121
+msgid "Only one search per minute is permitted for not logged in users."
 msgstr ""
 
-#: mod/fbrowser.php:136
-msgid "Files"
+#: mod/search.php:221
+#, php-format
+msgid "Items tagged with: %s"
 msgstr ""
 
 #: mod/unfollow.php:33
@@ -8945,44 +8949,44 @@ msgstr ""
 msgid "Textareas font size"
 msgstr ""
 
-#: view/theme/vier/config.php:71
-msgid "Comma separated list of helper forums"
+#: view/theme/vier/theme.php:144 view/theme/vier/config.php:119
+msgid "Community Profiles"
 msgstr ""
 
-#: view/theme/vier/config.php:117
-msgid "Set style"
+#: view/theme/vier/theme.php:174 view/theme/vier/config.php:123
+msgid "Last users"
 msgstr ""
 
-#: view/theme/vier/config.php:118
-msgid "Community Pages"
+#: view/theme/vier/theme.php:192 view/theme/vier/config.php:122
+msgid "Find Friends"
 msgstr ""
 
-#: view/theme/vier/config.php:119 view/theme/vier/theme.php:144
-msgid "Community Profiles"
+#: view/theme/vier/theme.php:193
+msgid "Local Directory"
 msgstr ""
 
-#: view/theme/vier/config.php:120
-msgid "Help or @NewHere ?"
+#: view/theme/vier/theme.php:285
+msgid "Quick Start"
 msgstr ""
 
-#: view/theme/vier/config.php:121 view/theme/vier/theme.php:385
+#: view/theme/vier/theme.php:385 view/theme/vier/config.php:121
 msgid "Connect Services"
 msgstr ""
 
-#: view/theme/vier/config.php:122 view/theme/vier/theme.php:192
-msgid "Find Friends"
+#: view/theme/vier/config.php:71
+msgid "Comma separated list of helper forums"
 msgstr ""
 
-#: view/theme/vier/config.php:123 view/theme/vier/theme.php:174
-msgid "Last users"
+#: view/theme/vier/config.php:117
+msgid "Set style"
 msgstr ""
 
-#: view/theme/vier/theme.php:193
-msgid "Local Directory"
+#: view/theme/vier/config.php:118
+msgid "Community Pages"
 msgstr ""
 
-#: view/theme/vier/theme.php:285
-msgid "Quick Start"
+#: view/theme/vier/config.php:120
+msgid "Help or @NewHere ?"
 msgstr ""
 
 #: src/App.php:523
@@ -8993,47 +8997,47 @@ msgstr ""
 msgid "show fewer"
 msgstr ""
 
-#: boot.php:733
+#: boot.php:738
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: boot.php:845
+#: boot.php:850
 msgid "Create a New Account"
 msgstr ""
 
-#: boot.php:873
+#: boot.php:878
 msgid "Password: "
 msgstr ""
 
-#: boot.php:874
+#: boot.php:879
 msgid "Remember me"
 msgstr ""
 
-#: boot.php:877
+#: boot.php:882
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: boot.php:883
+#: boot.php:888
 msgid "Forgot your password?"
 msgstr ""
 
-#: boot.php:886
+#: boot.php:891
 msgid "Website Terms of Service"
 msgstr ""
 
-#: boot.php:887
+#: boot.php:892
 msgid "terms of service"
 msgstr ""
 
-#: boot.php:889
+#: boot.php:894
 msgid "Website Privacy Policy"
 msgstr ""
 
-#: boot.php:890
+#: boot.php:895
 msgid "privacy policy"
 msgstr ""
 
-#: index.php:437
+#: index.php:439
 msgid "toggle mobile"
 msgstr ""

diff --git a/util/typo.php b/util/typo.php
index d837bcefc981cb7f257504417fa7c98a572b0dfd..313033f3e5a1885ac740790dda476504ccb1ee12 100755 (executable)
--- a/util/typo.php
+++ b/util/typo.php
@@ -13,7 +13,9 @@ ini_set('log_errors', '0');
 
 include 'boot.php';
 
-$a = new App(dirname(__DIR__));
+if (empty($a)) {
+       $a = new App(dirname(__DIR__));
+}
 
 if (x($a->config, 'php_path')) {
        $phpath = $a->config['php_path'];

diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php
index ad1686769b95cc32e56923b17dd0d8ea1cbb7600..0cc5c9af0dc1c406a0849a55f1b8fdfa9da87f37 100644 (file)
--- a/view/theme/vier/config.php
+++ b/view/theme/vier/config.php
@@ -64,7 +64,7 @@ function theme_admin(App $a) {
        $helperlist = get_config('vier', 'helperlist');
 
        if ($helperlist == "")
-               $helperlist = "https://helpers.pyxis.uberspace.de/profile/helpers";
+               $helperlist = "https://forum.friendi.ca/profile/helpers";
 
        $t = get_markup_template("theme_admin_settings.tpl");
        $o .= replace_macros($t, array(