Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --git a/boot.php b/boot.php
index af11d84768ed918805abf82544ad55f9490f7b34..8fdccef4a5cee57de7cbed121705c4569cf9f298 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -39,7 +39,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.2-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1215      );
+define ( 'DB_UPDATE_VERSION',      1216      );
 
 /**
  * @brief Constant with a HTML line break.
@@ -441,10 +441,17 @@ define('SR_SCOPE_ALL',  'all');
 define('SR_SCOPE_TAGS', 'tags');
 /* @}*/
 
+/**
+ * Lowest possible date time value
+ */
+
+define ('NULL_DATE', '0001-01-01 00:00:00');
+
+
 // Normally this constant is defined - but not if "pcntl" isn't installed
-if (!defined("SIGTERM"))
+if (!defined("SIGTERM")) {
        define("SIGTERM", 15);
-
+}
 /**
  *
  * Reverse the effect of magic_quotes_gpc if it is enabled.
@@ -2064,7 +2071,7 @@ function proc_run($cmd){
        }
 
        // Checking number of workers
-       $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+       $workers = q("SELECT COUNT(*) AS `workers` FROM `workerqueue` WHERE `executed` > '%s'", dbesc(NULL_DATE));
 
        // Get number of allowed number of worker threads
        $queues = intval(get_config("system", "worker_queues"));

diff --git a/database.sql b/database.sql
index c7ab893d722253fb1e6b36dbe28198c3ac5a3b42..7ed19f439cb3d2b9a2da54f009dabe332b2b7f37 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -30,8 +30,8 @@ CREATE TABLE IF NOT EXISTS `attach` (
        `filetype` varchar(64) NOT NULL DEFAULT '',
        `filesize` int(11) NOT NULL DEFAULT 0,
        `data` longblob NOT NULL,
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `allow_cid` mediumtext,
        `allow_gid` mediumtext,
        `deny_cid` mediumtext,
@@ -58,7 +58,7 @@ CREATE TABLE IF NOT EXISTS `cache` (
        `k` varbinary(255) NOT NULL,
        `v` mediumtext,
        `expire_mode` int(11) NOT NULL DEFAULT 0,
-       `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`k`),
         INDEX `expire_mode_updated` (`expire_mode`,`updated`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -107,7 +107,7 @@ CREATE TABLE IF NOT EXISTS `config` (
 CREATE TABLE IF NOT EXISTS `contact` (
        `id` int(11) NOT NULL auto_increment,
        `uid` int(11) NOT NULL DEFAULT 0,
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `self` tinyint(1) NOT NULL DEFAULT 0,
        `remote_self` tinyint(1) NOT NULL DEFAULT 0,
        `rel` tinyint(1) NOT NULL DEFAULT 0,
@@ -145,14 +145,14 @@ CREATE TABLE IF NOT EXISTS `contact` (
        `usehub` tinyint(1) NOT NULL DEFAULT 0,
        `subhub` tinyint(1) NOT NULL DEFAULT 0,
        `hub-verify` varchar(255) NOT NULL DEFAULT '',
-       `last-update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `success_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `failure_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `name-date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `uri-date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `avatar-date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `term-date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `last-item` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `last-update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `success_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `failure_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `name-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `uri-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `avatar-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `term-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `last-item` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `priority` tinyint(3) NOT NULL DEFAULT 0,
        `blocked` tinyint(1) NOT NULL DEFAULT 1,
        `readonly` tinyint(1) NOT NULL DEFAULT 0,
@@ -197,8 +197,8 @@ CREATE TABLE IF NOT EXISTS `conv` (
        `recips` text,
        `uid` int(11) NOT NULL DEFAULT 0,
        `creator` varchar(255) NOT NULL DEFAULT '',
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `subject` text,
         PRIMARY KEY(`id`),
         INDEX `uid` (`uid`)
@@ -213,10 +213,10 @@ CREATE TABLE IF NOT EXISTS `event` (
        `uid` int(11) NOT NULL DEFAULT 0,
        `cid` int(11) NOT NULL DEFAULT 0,
        `uri` varchar(255) NOT NULL DEFAULT '',
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `start` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `finish` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `start` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `finish` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `summary` text,
        `desc` text,
        `location` text,
@@ -252,7 +252,7 @@ CREATE TABLE IF NOT EXISTS `fcontact` (
        `network` varchar(32) NOT NULL DEFAULT '',
        `alias` varchar(255) NOT NULL DEFAULT '',
        `pubkey` text,
-       `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`id`),
         INDEX `addr` (`addr`(32)),
         INDEX `url` (`url`)
@@ -293,7 +293,7 @@ CREATE TABLE IF NOT EXISTS `fsuggest` (
        `request` varchar(255) NOT NULL DEFAULT '',
        `photo` varchar(255) NOT NULL DEFAULT '',
        `note` text,
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`id`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -320,10 +320,10 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
        `nurl` varchar(255) NOT NULL DEFAULT '',
        `photo` varchar(255) NOT NULL DEFAULT '',
        `connect` varchar(255) NOT NULL DEFAULT '',
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `updated` datetime DEFAULT '0000-00-00 00:00:00',
-       `last_contact` datetime DEFAULT '0000-00-00 00:00:00',
-       `last_failure` datetime DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `updated` datetime DEFAULT '0001-01-01 00:00:00',
+       `last_contact` datetime DEFAULT '0001-01-01 00:00:00',
+       `last_failure` datetime DEFAULT '0001-01-01 00:00:00',
        `location` varchar(255) NOT NULL DEFAULT '',
        `about` text,
        `keywords` text,
@@ -357,7 +357,7 @@ CREATE TABLE IF NOT EXISTS `glink` (
        `uid` int(11) NOT NULL DEFAULT 0,
        `gcid` int(11) NOT NULL DEFAULT 0,
        `zcid` int(11) NOT NULL DEFAULT 0,
-       `updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`id`),
         UNIQUE INDEX `cid_uid_gcid_zcid` (`cid`,`uid`,`gcid`,`zcid`),
         INDEX `gcid` (`gcid`)
@@ -405,10 +405,10 @@ CREATE TABLE IF NOT EXISTS `gserver` (
        `noscrape` varchar(255) NOT NULL DEFAULT '',
        `network` varchar(32) NOT NULL DEFAULT '',
        `platform` varchar(255) NOT NULL DEFAULT '',
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `last_poco_query` datetime DEFAULT '0000-00-00 00:00:00',
-       `last_contact` datetime DEFAULT '0000-00-00 00:00:00',
-       `last_failure` datetime DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `last_poco_query` datetime DEFAULT '0001-01-01 00:00:00',
+       `last_contact` datetime DEFAULT '0001-01-01 00:00:00',
+       `last_failure` datetime DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`id`),
         INDEX `nurl` (`nurl`(32))
 ) DEFAULT CHARSET=utf8mb4;
@@ -438,7 +438,7 @@ CREATE TABLE IF NOT EXISTS `intro` (
        `duplex` tinyint(1) NOT NULL DEFAULT 0,
        `note` text,
        `hash` varchar(255) NOT NULL DEFAULT '',
-       `datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `datetime` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `blocked` tinyint(1) NOT NULL DEFAULT 1,
        `ignore` tinyint(1) NOT NULL DEFAULT 0,
         PRIMARY KEY(`id`)
@@ -461,11 +461,11 @@ CREATE TABLE IF NOT EXISTS `item` (
        `parent-uri` varchar(255) NOT NULL DEFAULT '',
        `extid` varchar(255) NOT NULL DEFAULT '',
        `thr-parent` varchar(255) NOT NULL DEFAULT '',
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `received` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `changed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `owner-id` int(11) NOT NULL DEFAULT 0,
        `owner-name` varchar(255) NOT NULL DEFAULT '',
        `owner-link` varchar(255) NOT NULL DEFAULT '',
@@ -564,7 +564,7 @@ CREATE TABLE IF NOT EXISTS `locks` (
        `id` int(11) NOT NULL auto_increment,
        `name` varchar(128) NOT NULL DEFAULT '',
        `locked` tinyint(1) NOT NULL DEFAULT 0,
-       `created` datetime DEFAULT '0000-00-00 00:00:00',
+       `created` datetime DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`id`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -588,7 +588,7 @@ CREATE TABLE IF NOT EXISTS `mail` (
        `unknown` tinyint(1) NOT NULL DEFAULT 0,
        `uri` varchar(255) NOT NULL DEFAULT '',
        `parent-uri` varchar(255) NOT NULL DEFAULT '',
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`id`),
         INDEX `uid_seen` (`uid`,`seen`),
         INDEX `convid` (`convid`),
@@ -612,7 +612,7 @@ CREATE TABLE IF NOT EXISTS `mailacct` (
        `action` int(11) NOT NULL DEFAULT 0,
        `movetofolder` varchar(255) NOT NULL DEFAULT '',
        `pubmail` tinyint(1) NOT NULL DEFAULT 0,
-       `last_check` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `last_check` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`id`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -637,7 +637,7 @@ CREATE TABLE IF NOT EXISTS `notify` (
        `name` varchar(255) NOT NULL DEFAULT '',
        `url` varchar(255) NOT NULL DEFAULT '',
        `photo` varchar(255) NOT NULL DEFAULT '',
-       `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `msg` mediumtext,
        `uid` int(11) NOT NULL DEFAULT 0,
        `link` varchar(255) NOT NULL DEFAULT '',
@@ -673,7 +673,7 @@ CREATE TABLE IF NOT EXISTS `notify-threads` (
 CREATE TABLE IF NOT EXISTS `oembed` (
        `url` varbinary(255) NOT NULL,
        `content` mediumtext,
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`url`),
         INDEX `created` (`created`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -686,7 +686,7 @@ CREATE TABLE IF NOT EXISTS `parsed_url` (
        `guessing` tinyint(1) NOT NULL DEFAULT 0,
        `oembed` tinyint(1) NOT NULL DEFAULT 0,
        `content` mediumtext,
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`url`,`guessing`,`oembed`),
         INDEX `created` (`created`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -713,8 +713,8 @@ CREATE TABLE IF NOT EXISTS `photo` (
        `contact-id` int(10) unsigned NOT NULL DEFAULT 0,
        `guid` varchar(64) NOT NULL DEFAULT '',
        `resource-id` varchar(255) NOT NULL DEFAULT '',
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `title` varchar(255) NOT NULL DEFAULT '',
        `desc` text,
        `album` varchar(255) NOT NULL DEFAULT '',
@@ -776,7 +776,7 @@ CREATE TABLE IF NOT EXISTS `poll_result` (
 CREATE TABLE IF NOT EXISTS `process` (
        `pid` int(10) unsigned NOT NULL,
        `command` varbinary(32) NOT NULL DEFAULT '',
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`pid`),
         INDEX `command` (`command`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -802,7 +802,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
        `gender` varchar(32) NOT NULL DEFAULT '',
        `marital` varchar(255) NOT NULL DEFAULT '',
        `with` text,
-       `howlong` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `howlong` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `sexual` varchar(255) NOT NULL DEFAULT '',
        `politic` varchar(255) NOT NULL DEFAULT '',
        `religion` varchar(255) NOT NULL DEFAULT '',
@@ -854,7 +854,7 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` (
        `topic` varchar(255) NOT NULL DEFAULT '',
        `nickname` varchar(255) NOT NULL DEFAULT '',
        `push` int(11) NOT NULL DEFAULT 0,
-       `last_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `last_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `secret` varchar(255) NOT NULL DEFAULT '',
         PRIMARY KEY(`id`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -866,8 +866,8 @@ CREATE TABLE IF NOT EXISTS `queue` (
        `id` int(11) NOT NULL auto_increment,
        `cid` int(11) NOT NULL DEFAULT 0,
        `network` varchar(32) NOT NULL DEFAULT '',
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `last` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `content` mediumtext,
        `batch` tinyint(1) NOT NULL DEFAULT 0,
         PRIMARY KEY(`id`),
@@ -884,7 +884,7 @@ CREATE TABLE IF NOT EXISTS `queue` (
 CREATE TABLE IF NOT EXISTS `register` (
        `id` int(11) unsigned NOT NULL auto_increment,
        `hash` varchar(255) NOT NULL DEFAULT '',
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `uid` int(11) unsigned NOT NULL DEFAULT 0,
        `password` varchar(255) NOT NULL DEFAULT '',
        `language` varchar(16) NOT NULL DEFAULT '',
@@ -938,7 +938,7 @@ CREATE TABLE IF NOT EXISTS `spam` (
        `spam` int(11) NOT NULL DEFAULT 0,
        `ham` int(11) NOT NULL DEFAULT 0,
        `term` varchar(255) NOT NULL DEFAULT '',
-       `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`id`),
         INDEX `uid` (`uid`),
         INDEX `spam` (`spam`),
@@ -957,8 +957,8 @@ CREATE TABLE IF NOT EXISTS `term` (
        `term` varchar(255) NOT NULL DEFAULT '',
        `url` varchar(255) NOT NULL DEFAULT '',
        `guid` varchar(255) NOT NULL DEFAULT '',
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `received` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `global` tinyint(1) NOT NULL DEFAULT 0,
        `aid` int(10) unsigned NOT NULL DEFAULT 0,
        `uid` int(10) unsigned NOT NULL DEFAULT 0,
@@ -979,11 +979,11 @@ CREATE TABLE IF NOT EXISTS `thread` (
        `gcontact-id` int(11) unsigned NOT NULL DEFAULT 0,
        `owner-id` int(11) unsigned NOT NULL DEFAULT 0,
        `author-id` int(11) unsigned NOT NULL DEFAULT 0,
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `received` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `changed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `wall` tinyint(1) NOT NULL DEFAULT 0,
        `private` tinyint(1) NOT NULL DEFAULT 0,
        `pubmail` tinyint(1) NOT NULL DEFAULT 0,
@@ -1035,8 +1035,8 @@ CREATE TABLE IF NOT EXISTS `user` (
        `openid` varchar(255) NOT NULL DEFAULT '',
        `timezone` varchar(128) NOT NULL DEFAULT '',
        `language` varchar(32) NOT NULL DEFAULT 'en',
-       `register_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `login_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `register_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `login_date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `default-location` varchar(255) NOT NULL DEFAULT '',
        `allow_location` tinyint(1) NOT NULL DEFAULT 0,
        `theme` varchar(255) NOT NULL DEFAULT '',
@@ -1060,8 +1060,8 @@ CREATE TABLE IF NOT EXISTS `user` (
        `expire` int(11) unsigned NOT NULL DEFAULT 0,
        `account_removed` tinyint(1) NOT NULL DEFAULT 0,
        `account_expired` tinyint(1) NOT NULL DEFAULT 0,
-       `account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `account_expires_on` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `expire_notification_sent` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `service_class` varchar(32) NOT NULL DEFAULT '',
        `def_gid` int(11) NOT NULL DEFAULT 0,
        `allow_cid` mediumtext,
@@ -1090,9 +1090,9 @@ CREATE TABLE IF NOT EXISTS `workerqueue` (
        `id` int(11) NOT NULL auto_increment,
        `parameter` text,
        `priority` tinyint(3) unsigned NOT NULL DEFAULT 0,
-       `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
        `pid` int(11) NOT NULL DEFAULT 0,
-       `executed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `executed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
         PRIMARY KEY(`id`)
 ) DEFAULT CHARSET=utf8mb4;
 

diff --git a/include/Contact.php b/include/Contact.php
index de76789e8c68020b826fe388f235c9153faf01db..dc29d38257a38a6cca4f0ae60c7f0df152215661 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -122,12 +122,14 @@ function terminate_friendship($user,$self,$contact) {
 // This provides for the possibility that their database is temporarily messed
 // up or some other transient event and that there's a possibility we could recover from it.
 
-function mark_for_death($contact) {
+function mark_for_death(array $contact) {
 
-       if ($contact['archive'])
+       if ($contact['archive']) {
                return;
+       }
 
-       if ($contact['term-date'] == '0000-00-00 00:00:00') {
+       /// @TODO Comparison of strings this way may lead to bugs/incompatibility, better switch to DateTime
+       if ($contact['term-date'] <= NULL_DATE) {
                q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
                                dbesc(datetime_convert()),
                                intval($contact['id'])
@@ -185,13 +187,13 @@ function unmark_for_death($contact) {
 
        // It's a miracle. Our dead contact has inexplicably come back to life.
        q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
-               dbesc('0000-00-00 00:00:00'),
+               dbesc(NULL_DATE),
                intval($contact['id'])
        );
 
        if ($contact['url'] != '') {
                q("UPDATE `contact` SET `term-date` = '%s' WHERE `nurl` = '%s'",
-                       dbesc('0000-00-00 00:00:00'),
+                       dbesc(NULL_DATE),
                        dbesc(normalise_link($contact['url']))
                );
        }

diff --git a/include/cron.php b/include/cron.php
index 1c47c949928179f032e53bd6c07ac118ce12492e..9ab56ff43551661595d3ad3327958e7df528a654 100644 (file)
--- a/include/cron.php
+++ b/include/cron.php
@@ -120,8 +120,8 @@ function cron_update_photo_albums() {
 function cron_expire_and_remove_users() {
        // expire any expired accounts
        q("UPDATE user SET `account_expired` = 1 where `account_expired` = 0
-               AND `account_expires_on` != '0000-00-00 00:00:00'
-               AND `account_expires_on` < UTC_TIMESTAMP() ");
+               AND `account_expires_on` > '%s'
+               AND `account_expires_on` < UTC_TIMESTAMP()", dbesc(NULL_DATE));
 
        // delete user and contact records for recently removed accounts
        $r = q("SELECT * FROM `user` WHERE `account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
@@ -214,11 +214,13 @@ function cron_poll_contacts($argc, $argv) {
 
                        $xml = false;
 
-                       if ($manual_id)
-                               $contact['last-update'] = '0000-00-00 00:00:00';
+                       if ($manual_id) {
+                               $contact['last-update'] = NULL_DATE;
+                       }
 
-                       if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS)))
+                       if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
                                $contact['priority'] = 2;
+                       }
 
                        if ($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) {
                                // We should be getting everything via a hub. But just to be sure, let's check once a day.

diff --git a/include/datetime.php b/include/datetime.php
index 9fdbcd0217b035127c3afadd36669a22de4a61ae..5d789fc3bbaff6e8bd82485c28430f41a4ec9293 100644 (file)
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -339,7 +339,7 @@ function relative_date($posted_date, $format = null) {
 
        $abs = strtotime($localtime);
 
-       if (is_null($posted_date) || $posted_date === '0000-00-00 00:00:00' || $abs === False) {
+       if (is_null($posted_date) || $posted_date <= NULL_DATE || $abs === False) {
                 return t('never');
        }
 

diff --git a/include/dbm.php b/include/dbm.php
index fedc2e4fdb23881e694a7b2cbb3e218f5844614d..d28d49d63b4b53647392f5d6c928fdba5b76d3bf 100644 (file)
--- a/include/dbm.php
+++ b/include/dbm.php
@@ -96,18 +96,11 @@ class dbm {
        public static function date($date = 'now') {
                $timestamp = strtotime($date);
 
-               // Workaround for 3.5.1
+               // Don't allow lower date strings as '0001-01-01 00:00:00'
                if ($timestamp < -62135596800) {
-                       return '0000-00-00 00:00:00';
+                       $timestamp = -62135596800;
                }
 
-               // The above will be removed in 3.5.2
-               // The following will then be enabled
-               // Don't allow lower date strings as '0001-01-01 00:00:00'
-               //if ($timestamp < -62135596800) {
-               //      $timestamp = -62135596800;
-               //}
-
                return date('Y-m-d H:i:s', $timestamp);
        }
 }

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 7a2a80b2852d6435691e02cd8a34d654aef6e33a..0a52a751cfb956495438854e05d4e389deaddedb 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -1,4 +1,7 @@
 <?php
+
+use \Friendica\Core\Config;
+
 require_once("boot.php");
 require_once("include/text.php");
 
@@ -144,7 +147,8 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
        global $a, $db;
 
        if ($action) {
-               set_config('system', 'maintenance', 1);
+               Config::set('system', 'maintenance', 1);
+               Config::set('system', 'maintenance_reason', 'Database update');
        }
 
        if (isset($a->config["system"]["db_charset"])) {
@@ -361,8 +365,10 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                }
        }
 
-       if ($action)
-               set_config('system', 'maintenance', 0);
+       if ($action) {
+               Config::set('system', 'maintenance', 0);
+               Config::set('system', 'maintenance_reason', '');
+       }
 
        return $errors;
 }
@@ -536,8 +542,8 @@ function db_definition($charset) {
                                        "filetype" => array("type" => "varchar(64)", "not null" => "1", "default" => ""),
                                        "filesize" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "data" => array("type" => "longblob", "not null" => "1"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "allow_cid" => array("type" => "mediumtext"),
                                        "allow_gid" => array("type" => "mediumtext"),
                                        "deny_cid" => array("type" => "mediumtext"),
@@ -564,7 +570,7 @@ function db_definition($charset) {
                                        "k" => array("type" => "varbinary(255)", "not null" => "1", "primary" => "1"),
                                        "v" => array("type" => "mediumtext"),
                                        "expire_mode" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("k"),
@@ -613,7 +619,7 @@ function db_definition($charset) {
                        "fields" => array(
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "self" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "remote_self" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "rel" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -651,14 +657,14 @@ function db_definition($charset) {
                                        "usehub" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "subhub" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "hub-verify" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "last-update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "success_update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "failure_update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "name-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "uri-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "avatar-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "term-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "last-item" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "last-update" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "success_update" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "failure_update" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "name-date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "uri-date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "avatar-date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "term-date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "last-item" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "priority" => array("type" => "tinyint(3)", "not null" => "1", "default" => "0"),
                                        "blocked" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
                                        "readonly" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -703,8 +709,8 @@ function db_definition($charset) {
                                        "recips" => array("type" => "text"),
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "creator" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "subject" => array("type" => "text"),
                                        ),
                        "indexes" => array(
@@ -719,10 +725,10 @@ function db_definition($charset) {
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "cid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "start" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "finish" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "start" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "finish" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "summary" => array("type" => "text"),
                                        "desc" => array("type" => "text"),
                                        "location" => array("type" => "text"),
@@ -758,7 +764,7 @@ function db_definition($charset) {
                                        "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "pubkey" => array("type" => "text"),
-                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -799,7 +805,7 @@ function db_definition($charset) {
                                        "request" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "note" => array("type" => "text"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -826,10 +832,10 @@ function db_definition($charset) {
                                        "nurl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "connect" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "updated" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
-                                       "last_contact" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
-                                       "last_failure" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "updated" => array("type" => "datetime", "default" => NULL_DATE),
+                                       "last_contact" => array("type" => "datetime", "default" => NULL_DATE),
+                                       "last_failure" => array("type" => "datetime", "default" => NULL_DATE),
                                        "location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "about" => array("type" => "text"),
                                        "keywords" => array("type" => "text"),
@@ -863,7 +869,7 @@ function db_definition($charset) {
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "gcid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "zcid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "updated" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -911,10 +917,10 @@ function db_definition($charset) {
                                        "noscrape" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "platform" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "last_poco_query" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
-                                       "last_contact" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
-                                       "last_failure" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "last_poco_query" => array("type" => "datetime", "default" => NULL_DATE),
+                                       "last_contact" => array("type" => "datetime", "default" => NULL_DATE),
+                                       "last_failure" => array("type" => "datetime", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -944,7 +950,7 @@ function db_definition($charset) {
                                        "duplex" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "note" => array("type" => "text"),
                                        "hash" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "datetime" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "datetime" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "blocked" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
                                        "ignore" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        ),
@@ -967,11 +973,11 @@ function db_definition($charset) {
                                        "parent-uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "extid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "thr-parent" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "commented" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "received" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "changed" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "commented" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "received" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "changed" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "owner-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "owner-name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "owner-link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1070,7 +1076,7 @@ function db_definition($charset) {
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "name" => array("type" => "varchar(128)", "not null" => "1", "default" => ""),
                                        "locked" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-                                       "created" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -1094,7 +1100,7 @@ function db_definition($charset) {
                                        "unknown" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "parent-uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -1118,7 +1124,7 @@ function db_definition($charset) {
                                        "action" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "movetofolder" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "pubmail" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-                                       "last_check" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "last_check" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -1143,7 +1149,7 @@ function db_definition($charset) {
                                        "name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "msg" => array("type" => "mediumtext"),
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1179,7 +1185,7 @@ function db_definition($charset) {
                        "fields" => array(
                                        "url" => array("type" => "varbinary(255)", "not null" => "1", "primary" => "1"),
                                        "content" => array("type" => "mediumtext"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("url"),
@@ -1192,7 +1198,7 @@ function db_definition($charset) {
                                        "guessing" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"),
                                        "oembed" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"),
                                        "content" => array("type" => "mediumtext"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("url", "guessing", "oembed"),
@@ -1219,8 +1225,8 @@ function db_definition($charset) {
                                        "contact-id" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
                                        "guid" => array("type" => "varchar(64)", "not null" => "1", "default" => ""),
                                        "resource-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "desc" => array("type" => "text"),
                                        "album" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1282,7 +1288,7 @@ function db_definition($charset) {
                        "fields" => array(
                                        "pid" => array("type" => "int(10) unsigned", "not null" => "1", "primary" => "1"),
                                        "command" => array("type" => "varbinary(32)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("pid"),
@@ -1308,7 +1314,7 @@ function db_definition($charset) {
                                        "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "marital" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "with" => array("type" => "text"),
-                                       "howlong" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "howlong" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "sexual" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "politic" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "religion" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1360,7 +1366,7 @@ function db_definition($charset) {
                                        "topic" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "nickname" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "push" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "last_update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "last_update" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "secret" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        ),
                        "indexes" => array(
@@ -1372,8 +1378,8 @@ function db_definition($charset) {
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "cid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "last" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "last" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "content" => array("type" => "mediumtext"),
                                        "batch" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        ),
@@ -1390,7 +1396,7 @@ function db_definition($charset) {
                        "fields" => array(
                                        "id" => array("type" => "int(11) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "hash" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "uid" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
                                        "password" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "language" => array("type" => "varchar(16)", "not null" => "1", "default" => ""),
@@ -1444,7 +1450,7 @@ function db_definition($charset) {
                                        "spam" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "ham" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "term" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -1463,8 +1469,8 @@ function db_definition($charset) {
                                        "term" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "guid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "received" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "received" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "global" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "aid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
                                        "uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
@@ -1485,11 +1491,11 @@ function db_definition($charset) {
                                        "gcontact-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
                                        "owner-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
                                        "author-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "commented" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "received" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "changed" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "edited" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "commented" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "received" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "changed" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "wall" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "private" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "pubmail" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -1541,8 +1547,8 @@ function db_definition($charset) {
                                        "openid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "timezone" => array("type" => "varchar(128)", "not null" => "1", "default" => ""),
                                        "language" => array("type" => "varchar(32)", "not null" => "1", "default" => "en"),
-                                       "register_date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "login_date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "register_date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "login_date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "default-location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "allow_location" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "theme" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1566,8 +1572,8 @@ function db_definition($charset) {
                                        "expire" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
                                        "account_removed" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "account_expired" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-                                       "account_expires_on" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "expire_notification_sent" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "account_expires_on" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+                                       "expire_notification_sent" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "service_class" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "def_gid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "allow_cid" => array("type" => "mediumtext"),
@@ -1596,9 +1602,9 @@ function db_definition($charset) {
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "parameter" => array("type" => "text"),
                                        "priority" => array("type" => "tinyint(3) unsigned", "not null" => "1", "default" => "0"),
-                                       "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        "pid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "executed" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+                                       "executed" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),

diff --git a/include/dfrn.php b/include/dfrn.php
index 1240228f06f19bd55d67608499c393dba606835d..9fa19bde6cf13743eb7ab78a8d81bf6c0fadaa6a 100644 (file)
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -1182,7 +1182,8 @@ class dfrn {
                        return 3;
                }
 
-               if ($contact['term-date'] != '0000-00-00 00:00:00') {
+               /// @TODO Really compare with > here? Maybe DateTime (which allows such comparison again) is much safer/correcter
+               if ($contact['term-date'] > NULL_DATE) {
                        logger("dfrn_deliver: $url back from the dead - removing mark for death");
                        require_once('include/Contact.php');
                        unmark_for_death($contact);

diff --git a/include/event.php b/include/event.php
index 44261b36910a7b81bba9acfc389cfc6437552c9e..7fffdd8a2861f9058f1a88c9cf7f6cd1385b84fd 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -4,39 +4,42 @@
  * @brief functions specific to event handling
  */
 
-require_once('include/bbcode.php');
-require_once('include/map.php');
-require_once('include/datetime.php');
+require_once 'include/bbcode.php';
+require_once 'include/map.php';
+require_once 'include/datetime.php';
 
 function format_event_html($ev, $simple = false) {
 
-       if (! ((is_array($ev)) && count($ev)))
+       if (! ((is_array($ev)) && count($ev))) {
                return '';
+       }
 
        $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
 
        $event_start = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
                        $ev['start'] , $bd_format ))
-                       :  day_translate(datetime_convert('UTC', 'UTC',
+                       : day_translate(datetime_convert('UTC', 'UTC',
                        $ev['start'] , $bd_format)));
 
        $event_end = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
                                $ev['finish'] , $bd_format ))
-                               :  day_translate(datetime_convert('UTC', 'UTC',
+                               : day_translate(datetime_convert('UTC', 'UTC',
                                $ev['finish'] , $bd_format )));
 
        if ($simple) {
-               $o = "<h3>".bbcode($ev['summary'])."</h3>";
+               $o = "<h3>" . bbcode($ev['summary']) . "</h3>";
 
-               $o .= "<p>".bbcode($ev['desc'])."</p>";
+               $o .= "<p>" . bbcode($ev['desc']) . "</p>";
 
-               $o .= "<h4>".t('Starts:')."</h4><p>".$event_start."</p>";
+               $o .= "<h4>" . t('Starts:') . "</h4><p>" . $event_start . "</p>";
 
-               if (! $ev['nofinish'])
-                       $o .= "<h4>".t('Finishes:')."</h4><p>".$event_end."</p>";
+               if (! $ev['nofinish']) {
+                       $o .= "<h4>" . t('Finishes:') . "</h4><p>" . $event_end  ."</p>";
+               }
 
-               if (strlen($ev['location']))
-                       $o .= "<h4>".t('Location:')."</h4><p>".$ev['location']."</p>";
+               if (strlen($ev['location'])) {
+                       $o .= "<h4>" . t('Location:') . "</h4><p>" . $ev['location'] . "</p>";
+               }
 
                return $o;
        }
@@ -44,31 +47,34 @@ function format_event_html($ev, $simple = false) {
        $o = '<div class="vevent">' . "\r\n";
 
 
-       $o .= '<p class="summary event-summary">' . bbcode($ev['summary']) .  '</p>' . "\r\n";
+       $o .= '<p class="summary event-summary">' . bbcode($ev['summary']) . '</p>' . "\r\n";
 
-       $o .= '<p class="description event-description">' . bbcode($ev['desc']) .  '</p>' . "\r\n";
+       $o .= '<p class="description event-description">' . bbcode($ev['desc']) . '</p>' . "\r\n";
 
        $o .= '<p class="event-start">' . t('Starts:') . ' <abbr class="dtstart" title="'
-               . datetime_convert('UTC','UTC',$ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
+               . datetime_convert('UTC', 'UTC', $ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
                . '" >'.$event_start
                . '</abbr></p>' . "\r\n";
 
-       if (! $ev['nofinish'])
+       if (! $ev['nofinish']) {
                $o .= '<p class="event-end" >' . t('Finishes:') . ' <abbr class="dtend" title="'
-                       . datetime_convert('UTC','UTC',$ev['finish'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
+                       . datetime_convert('UTC', 'UTC', $ev['finish'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
                        . '" >'.$event_end
-                       . '</abbr></p>'  . "\r\n";
+                       . '</abbr></p>' . "\r\n";
+       }
 
-       if (strlen($ev['location'])){
+       if (strlen($ev['location'])) {
                $o .= '<p class="event-location"> ' . t('Location:') . ' <span class="location">'
                        . bbcode($ev['location'])
                        . '</span></p>' . "\r\n";
 
-               if (strpos($ev['location'], "[map") !== False) {
+               // Include a map of the location if the [map] BBCode is used
+               if (strpos($ev['location'], "[map") !== false) {
                        $map = generate_named_map($ev['location']);
-                       if ($map!==$ev['location']) $o.=$map;
+                       if ($map !== $ev['location']) {
+                               $o.= $map;
+                       }
                }
-
        }
 
        $o .= '</div>' . "\r\n";
@@ -146,63 +152,81 @@ function format_event_bbcode($ev) {
 
        $o = '';
 
-       if ($ev['summary'])
+       if ($ev['summary']) {
                $o .= '[event-summary]' . $ev['summary'] . '[/event-summary]';
+       }
 
-       if ($ev['desc'])
+       if ($ev['desc']) {
                $o .= '[event-description]' . $ev['desc'] . '[/event-description]';
+       }
 
-       if ($ev['start'])
+       if ($ev['start']) {
                $o .= '[event-start]' . $ev['start'] . '[/event-start]';
+       }
 
-       if (($ev['finish']) && (! $ev['nofinish']))
+       if (($ev['finish']) && (! $ev['nofinish'])) {
                $o .= '[event-finish]' . $ev['finish'] . '[/event-finish]';
+       }
 
-       if ($ev['location'])
+       if ($ev['location']) {
                $o .= '[event-location]' . $ev['location'] . '[/event-location]';
+       }
 
-       if ($ev['adjust'])
+       if ($ev['adjust']) {
                $o .= '[event-adjust]' . $ev['adjust'] . '[/event-adjust]';
-
+       }
 
        return $o;
-
 }
 
 function bbtovcal($s) {
        $o = '';
        $ev = bbtoevent($s);
-       if ($ev['desc'])
+
+       if ($ev['desc']) {
                $o = format_event_html($ev);
+       }
+
        return $o;
 }
 
-
 function bbtoevent($s) {
 
        $ev = array();
 
        $match = '';
-       if (preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is",$s,$match))
+       if (preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is", $s, $match)) {
                $ev['summary'] = $match[1];
+       }
+
        $match = '';
-       if (preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is",$s,$match))
+       if (preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is", $s, $match)) {
                $ev['desc'] = $match[1];
+       }
+
        $match = '';
-       if (preg_match("/\[event\-start\](.*?)\[\/event\-start\]/is",$s,$match))
+       if (preg_match("/\[event\-start\](.*?)\[\/event\-start\]/is", $s, $match)) {
                $ev['start'] = $match[1];
+       }
+
        $match = '';
-       if (preg_match("/\[event\-finish\](.*?)\[\/event\-finish\]/is",$s,$match))
+       if (preg_match("/\[event\-finish\](.*?)\[\/event\-finish\]/is", $s, $match)) {
                $ev['finish'] = $match[1];
+       }
+
        $match = '';
-       if (preg_match("/\[event\-location\](.*?)\[\/event\-location\]/is",$s,$match))
+       if (preg_match("/\[event\-location\](.*?)\[\/event\-location\]/is", $s, $match)) {
                $ev['location'] = $match[1];
+       }
+
        $match = '';
-       if (preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
+       if (preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is", $s, $match)) {
                $ev['adjust'] = $match[1];
+       }
+
        $ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
-       return $ev;
 
+       return $ev;
 }
 
 
@@ -212,21 +236,22 @@ function sort_by_date($a) {
        return $a;
 }
 
-
 function ev_compare($a,$b) {
 
-       $date_a = (($a['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$a['start']) : $a['start']);
-       $date_b = (($b['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$b['start']) : $b['start']);
+       $date_a = (($a['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $a['start']) : $a['start']);
+       $date_b = (($b['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $b['start']) : $b['start']);
 
-       if ($date_a === $date_b)
-               return strcasecmp($a['desc'],$b['desc']);
+       if ($date_a === $date_b) {
+               return strcasecmp($a['desc'], $b['desc']);
+       }
 
-       return strcmp($date_a,$date_b);
+       return strcmp($date_a, $date_b);
 }
 
 function event_delete($event_id) {
-       if ($event_id == 0)
+       if ($event_id == 0) {
                return;
+       }
 
        q("DELETE FROM `event` WHERE `id` = %d", intval($event_id));
        logger("Deleted event ".$event_id, LOGGER_DEBUG);
@@ -234,32 +259,34 @@ function event_delete($event_id) {
 
 function event_store($arr) {
 
-       require_once('include/datetime.php');
-       require_once('include/items.php');
-       require_once('include/bbcode.php');
+       require_once 'include/datetime.php';
+       require_once 'include/items.php';
+       require_once 'include/bbcode.php';
 
        $a = get_app();
 
-       $arr['created'] = (($arr['created']) ? $arr['created'] : datetime_convert());
-       $arr['edited']  = (($arr['edited']) ? $arr['edited'] : datetime_convert());
-       $arr['type']    = (($arr['type']) ? $arr['type'] : 'event' );
-       $arr['cid']     = ((intval($arr['cid'])) ? intval($arr['cid']) : 0);
-       $arr['uri']     = (x($arr,'uri') ? $arr['uri'] : item_new_uri($a->get_hostname(),$arr['uid']));
-       $arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0);
+       $arr['created'] = (($arr['created'])     ? $arr['created']         : datetime_convert());
+       $arr['edited']  = (($arr['edited'])      ? $arr['edited']          : datetime_convert());
+       $arr['type']    = (($arr['type'])        ? $arr['type']            : 'event' );
+       $arr['cid']     = ((intval($arr['cid'])) ? intval($arr['cid'])     : 0);
+       $arr['uri']     = (x($arr, 'uri')        ? $arr['uri']             : item_new_uri($a->get_hostname(), $arr['uid']));
+       $arr['private'] = ((x($arr, 'private'))  ? intval($arr['private']) : 0);
        $arr['guid']    = get_guid(32);
 
-       if ($arr['cid'])
+       if ($arr['cid']) {
                $c = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($arr['cid']),
                        intval($arr['uid'])
                );
-       else
+       } else {
                $c = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
                        intval($arr['uid'])
                );
+       }
 
-       if (count($c))
+       if (dbm::is_result($c)) {
                $contact = $c[0];
+       }
 
 
        // Existing event being modified
@@ -280,7 +307,7 @@ function event_store($arr) {
                                intval($arr['id']),
                                intval($arr['uid'])
                        );
-                       return((dbm::is_result($r)) ? $r[0]['id'] : 0);
+                       return ((dbm::is_result($r)) ? $r[0]['id'] : 0);
                }
 
                // The event changed. Update it.
@@ -318,7 +345,6 @@ function event_store($arr) {
                        $object .= '<content>' . xmlify(format_event_bbcode($arr)) . '</content>';
                        $object .= '</object>' . "\n";
 
-
                        q("UPDATE `item` SET `body` = '%s', `object` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d",
                                dbesc(format_event_bbcode($arr)),
                                dbesc($object),
@@ -328,8 +354,9 @@ function event_store($arr) {
                        );
 
                        $item_id = $r[0]['id'];
-               } else
+               } else {
                        $item_id = 0;
+               }
 
                call_hooks("event_updated", $arr['id']);
 
@@ -366,8 +393,9 @@ function event_store($arr) {
                        dbesc($arr['uri']),
                        intval($arr['uid'])
                );
-               if (dbm::is_result($r))
+               if (dbm::is_result($r)) {
                        $event = $r[0];
+               }
 
                $item_arr = array();
 
@@ -399,7 +427,7 @@ function event_store($arr) {
                $item_arr['body']          = format_event_bbcode($event);
 
 
-               $item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
+               $item_arr['object']  = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
                $item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
                $item_arr['object'] .= '</object>' . "\n";
 
@@ -433,12 +461,17 @@ function event_store($arr) {
 }
 
 function get_event_strings() {
+
        // First day of the week (0 = Sunday)
-       $firstDay = get_pconfig(local_user(),'system','first_day_of_week');
-       if ($firstDay === false) $firstDay=0;
+       $firstDay = get_pconfig(local_user(), 'system', 'first_day_of_week');
+       if ($firstDay === false) {
+               $firstDay = 0;
+       }
 
        $i18n = array(
                        "firstDay" => $firstDay,
+                       "allday"   => t("all-day"),
+
                        "Sun" => t("Sun"),
                        "Mon" => t("Mon"),
                        "Tue" => t("Tue"),
@@ -446,13 +479,15 @@ function get_event_strings() {
                        "Thu" => t("Thu"),
                        "Fri" => t("Fri"),
                        "Sat" => t("Sat"),
-                       "Sunday" => t("Sunday"),
-                       "Monday" => t("Monday"),
-                       "Tuesday" => t("Tuesday"),
+
+                       "Sunday"    => t("Sunday"),
+                       "Monday"    => t("Monday"),
+                       "Tuesday"   => t("Tuesday"),
                        "Wednesday" => t("Wednesday"),
-                       "Thursday" => t("Thursday"),
-                       "Friday" => t("Friday"),
-                       "Saturday" => t("Saturday"),
+                       "Thursday"  => t("Thursday"),
+                       "Friday"    => t("Friday"),
+                       "Saturday"  => t("Saturday"),
+
                        "Jan" => t("Jan"),
                        "Feb" => t("Feb"),
                        "Mar" => t("Mar"),
@@ -465,47 +500,49 @@ function get_event_strings() {
                        "Oct" => t("Oct"),
                        "Nov" => t("Nov"),
                        "Dec" => t("Dec"),
-                       "January" => t("January"),
-                       "February" => t("February"),
-                       "March" => t("March"),
-                       "April" => t("April"),
-                       "May" => t("May"),
-                       "June" => t("June"),
-                       "July" => t("July"),
-                       "August" => t("August"),
+
+                       "January"   => t("January"),
+                       "February"  => t("February"),
+                       "March"     => t("March"),
+                       "April"     => t("April"),
+                       "May"       => t("May"),
+                       "June"      => t("June"),
+                       "July"      => t("July"),
+                       "August"    => t("August"),
                        "September" => t("September"),
-                       "October" => t("October"),
-                       "November" => t("November"),
-                       "December" => t("December"),
+                       "October"   => t("October"),
+                       "November"  => t("November"),
+                       "December"  => t("December"),
+
                        "today" => t("today"),
                        "month" => t("month"),
-                       "week" => t("week"),
-                       "day" => t("day"),
-                       "allday" => t("all-day"),
+                       "week"  => t("week"),
+                       "day"   => t("day"),
 
                        "noevent" => t("No events to display"),
 
-                       "dtstart_label" => t("Starts:"),
-                       "dtend_label" => t("Finishes:"),
+                       "dtstart_label"  => t("Starts:"),
+                       "dtend_label"    => t("Finishes:"),
                        "location_label" => t("Location:")
                );
 
        return $i18n;
 }
 
-/// @todo We should replace this with a separate update function if there is some time left
 /**
  * @brief Removes duplicated birthday events
  *
  * @param array $dates Array of possibly duplicated events
  * @return array Cleaned events
+ * 
+ * @todo We should replace this with a separate update function if there is some time left
  */
 function event_remove_duplicates($dates) {
        $dates2 = array();
 
        foreach ($dates AS $date) {
                if ($date['type'] == 'birthday') {
-                       $dates2[$date['uid']."-".$date['cid']."-".$date['start']] = $date;
+                       $dates2[$date['uid'] . "-" . $date['cid'] . "-" . $date['start']] = $date;
                } else {
                        $dates2[] = $date;
                }
@@ -524,10 +561,11 @@ function event_remove_duplicates($dates) {
  */
 function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
        // ownly allow events if there is a valid owner_id
-       if ($owner_uid == 0)
+       if ($owner_uid == 0) {
                return;
+       }
 
-       // query for the event by event id
+       // Query for the event by event id
        $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
                        `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
                LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
@@ -556,11 +594,12 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
  * @return array Query results
  */
 function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
-       // ownly allow events if there is a valid owner_id
-       if ($owner_uid == 0)
+       // Only allow events if there is a valid owner_id
+       if ($owner_uid == 0) {
                return;
+       }
 
-       // query for the event by date
+       // Query for the event by date
        $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
                                `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
                        LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
@@ -590,51 +629,59 @@ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
  * @return array Event array for the template
  */
 function process_events($arr) {
-       $events=array();
+       $events = array();
 
        $last_date = '';
        $fmt = t('l, F j');
        if (count($arr)) {
                foreach ($arr as $rr) {
 
-                       $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
-                       $d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], $fmt) : datetime_convert('UTC','UTC',$rr['start'],$fmt));
+                       $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'j') : datetime_convert('UTC', 'UTC', $rr['start'], 'j'));
+                       $d = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], $fmt) : datetime_convert('UTC', 'UTC', $rr['start'], $fmt));
                        $d = day_translate($d);
 
-                       $start = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'c') : datetime_convert('UTC','UTC',$rr['start'],'c'));
-                       if ($rr['nofinish']){
+                       $start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'c') : datetime_convert('UTC', 'UTC', $rr['start'], 'c'));
+                       if ($rr['nofinish']) {
                                $end = null;
                        } else {
-                               $end = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['finish'], 'c') : datetime_convert('UTC','UTC',$rr['finish'],'c'));
+                               $end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['finish'], 'c') : datetime_convert('UTC', 'UTC', $rr['finish'], 'c'));
                        }
 
-
                        $is_first = ($d !== $last_date);
 
                        $last_date = $d;
-                       $edit = ((! $rr['cid']) ? array(App::get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
-                       $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
+
+                       // Show edit and drop actions only if the user is the owner of the event and the event
+                       // is a real event (no bithdays)
+                       if (local_user() && local_user() == $rr['uid'] && $rr['type'] == 'event') {
+                               $edit = ((! $rr['cid']) ? array(App::get_baseurl() . '/events/event/' . $rr['id'], t('Edit event'), '', '') : null);
+                               $drop = array(App::get_baseurl() . '/events/drop/' . $rr['id'], t('Delete event'), '', '');
+                       }
+
+                       $title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
                        if (! $title) {
-                               list($title, $_trash) = explode("<br",bbcode($rr['desc']),2);
-                               $title = strip_tags(html_entity_decode($title,ENT_QUOTES,'UTF-8'));
+                               list($title, $_trash) = explode("<br", bbcode($rr['desc']), 2);
+                               $title = strip_tags(html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
                        }
 
                        $html = format_event_html($rr);
                        $rr['desc'] = bbcode($rr['desc']);
                        $rr['location'] = bbcode($rr['location']);
                        $events[] = array(
-                               'id'=>$rr['id'],
-                               'start'=> $start,
-                               'end' => $end,
+                               'id'     => $rr['id'],
+                               'start'  => $start,
+                               'end'    => $end,
                                'allDay' => false,
-                               'title' => $title,
-
-                               'j' => $j,
-                               'd' => $d,
-                               'is_first'=>$is_first,
-                               'item'=>$rr,
-                               'html'=>$html,
-                               'plink' => array($rr['plink'],t('link to source'),'',''),
+                               'title'  => $title,
+
+                               'j'        => $j,
+                               'd'        => $d,
+                               'edit'     => $edit,
+                               'drop'     => $drop,
+                               'is_first' => $is_first,
+                               'item'     => $rr,
+                               'html'     => $html,
+                               'plink'    => array($rr['plink'], t('link to source'), '', ''),
                        );
                }
        }
@@ -652,34 +699,36 @@ function process_events($arr) {
  * @return string Content according to selected export format
  */
 function event_format_export ($events, $format = 'ical', $timezone) {
-       if (! ((is_array($events)) && count($events)))
+       if (! ((is_array($events)) && count($events))) {
                return;
+       }
 
        switch ($format) {
-               // format the exported data as a CSV file
+               // Format the exported data as a CSV file
                case "csv":
                        header("Content-type: text/csv");
                        $o = '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL;
 
                        foreach ($events as $event) {
-                       /// @todo the time / date entries don't include any information about the
-                       // timezone the event is scheduled in :-/
+                               /// @todo The time / date entries don't include any information about the
+                               /// timezone the event is scheduled in :-/
                                $tmp1 = strtotime($event['start']);
                                $tmp2 = strtotime($event['finish']);
                                $time_format = "%H:%M:%S";
                                $date_format = "%Y-%m-%d";
-                               $o .= '"'.$event['summary'].'", "'.strftime($date_format, $tmp1) .
-                                       '", "'.strftime($time_format, $tmp1).'", "'.$event['desc'] .
-                                       '", "'.strftime($date_format, $tmp2) .
-                                       '", "'.strftime($time_format, $tmp2) .
-                                       '", "'.$event['location'].'"' . PHP_EOL;
+
+                               $o .= '"' . $event['summary'] . '", "' . strftime($date_format, $tmp1) .
+                                       '", "' . strftime($time_format, $tmp1) . '", "' . $event['desc'] .
+                                       '", "' . strftime($date_format, $tmp2) .
+                                       '", "' . strftime($time_format, $tmp2) .
+                                       '", "' . $event['location'] . '"' . PHP_EOL;
                        }
                        break;
 
-               // format the exported data as a ics file
+               // Format the exported data as a ics file
                case "ical":
                        header("Content-type: text/ics");
-                       $o = 'BEGIN:VCALENDAR'. PHP_EOL
+                       $o = 'BEGIN:VCALENDAR' . PHP_EOL
                                . 'VERSION:2.0' . PHP_EOL
                                . 'PRODID:-//friendica calendar export//0.1//EN' . PHP_EOL;
                        ///  @todo include timezone informations in cases were the time is not in UTC
@@ -691,35 +740,43 @@ function event_format_export ($events, $format = 'ical', $timezone) {
                        //       but test your solution against http://icalvalid.cloudapp.net/
                        //       also long lines SHOULD be split at 75 characters length
                        foreach ($events as $event) {
+
                                if ($event['adjust'] == 1) {
                                        $UTC = 'Z';
                                } else {
                                        $UTC = '';
                                }
                                $o .= 'BEGIN:VEVENT' . PHP_EOL;
-                               if ($event[start]) {
+
+                               if ($event['start']) {
                                        $tmp = strtotime($event['start']);
-                                       $dtformat = "%Y%m%dT%H%M%S".$UTC;
-                                       $o .= 'DTSTART:'.strftime($dtformat, $tmp).PHP_EOL;
+                                       $dtformat = "%Y%m%dT%H%M%S" . $UTC;
+                                       $o .= 'DTSTART:' . strftime($dtformat, $tmp) . PHP_EOL;
                                }
+
                                if (!$event['nofinish']) {
                                        $tmp = strtotime($event['finish']);
-                                       $dtformat = "%Y%m%dT%H%M%S".$UTC;
-                                       $o .= 'DTEND:'.strftime($dtformat, $tmp).PHP_EOL;
+                                       $dtformat = "%Y%m%dT%H%M%S" . $UTC;
+                                       $o .= 'DTEND:' . strftime($dtformat, $tmp) . PHP_EOL;
                                }
-                               if ($event['summary'])
+
+                               if ($event['summary']) {
                                        $tmp = $event['summary'];
-                                       $tmp = str_replace(PHP_EOL, PHP_EOL.' ',$tmp);
+                                       $tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp);
                                        $tmp = addcslashes($tmp, ',;');
                                        $o .= 'SUMMARY:' . $tmp . PHP_EOL;
-                               if ($event['desc'])
+                               }
+
+                               if ($event['desc']) {
                                        $tmp = $event['desc'];
-                                       $tmp = str_replace(PHP_EOL, PHP_EOL.' ',$tmp);
+                                       $tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp);
                                        $tmp = addcslashes($tmp, ',;');
                                        $o .= 'DESCRIPTION:' . $tmp . PHP_EOL;
+                               }
+
                                if ($event['location']) {
                                        $tmp = $event['location'];
-                                       $tmp = str_replace(PHP_EOL, PHP_EOL.' ',$tmp);
+                                       $tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp);
                                        $tmp = addcslashes($tmp, ',;');
                                        $o .= 'LOCATION:' . $tmp . PHP_EOL;
                                }
@@ -759,9 +816,9 @@ function events_by_uid($uid = 0, $sql_extra = '') {
                $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' ";
        }
 
-       //  does the user who requests happen to be the owner of the events
-       //  requested? then show all of your events, otherwise only those that
-       //  don't have limitations set in allow_cid and allow_gid
+       // Does the user who requests happen to be the owner of the events
+       // requested? then show all of your events, otherwise only those that
+       // don't have limitations set in allow_cid and allow_gid
        if (local_user() == $uid) {
                $r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`, `nofinish`
                        FROM `event` WHERE `uid`= %d AND `cid` = 0 ",
@@ -795,18 +852,18 @@ function event_export($uid, $format = 'ical') {
 
        $process = false;
 
-       // we are allowed to show events
+       // We are allowed to show events
        // get the timezone the user is in
        $r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
        if (dbm::is_result($r)) {
                $timezone = $r[0]['timezone'];
        }
 
-       // get all events which are owned by a uid (respects permissions);
+       // Get all events which are owned by a uid (respects permissions);
        $events = events_by_uid($uid);
 
-       //  we have the events that are available for the requestor
-       //  now format the output according to the requested format
+       // We have the events that are available for the requestor
+       // now format the output according to the requested format
        if (count($events)) {
                $res = event_format_export($events, $format, $timezone);
        }
@@ -816,7 +873,7 @@ function event_export($uid, $format = 'ical') {
                $process = true;
        }
 
-       // get the file extension for the format
+       // Get the file extension for the format
        switch ($format) {
                case "ical":
                        $file_ext = "ics";
@@ -831,10 +888,10 @@ function event_export($uid, $format = 'ical') {
        }
 
        $arr = array(
-               'success' => $process,
-               'format' => $format,
+               'success'   => $process,
+               'format'    => $format,
                'extension' => $file_ext,
-               'content' => $res,
+               'content'   => $res,
        );
 
        return $arr;
@@ -883,5 +940,4 @@ function widget_events() {
                '$export_csv' => t("Export calendar as csv"),
                '$user' => $user
        ));
-
 }

diff --git a/include/identity.php b/include/identity.php
index 099d8b3acc1a796c162af1aef7dfbeda0bba970e..ab38f3dc36ebead9663e74b97ca97437954cbbf4 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -652,7 +652,7 @@ function advanced_profile(App $a) {
                        $profile['marital']['with'] = $a->profile['with'];
                }
 
-               if (strlen($a->profile['howlong']) && $a->profile['howlong'] !== '0000-00-00 00:00:00') {
+               if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= NULL_DATE) {
                        $profile['howlong'] = relative_date($a->profile['howlong'], t('for %1$d %2$s'));
                }
 

diff --git a/include/lock.php b/include/lock.php
index a9cd7d6437054b4191374d2d0caaa3848c853bb3..64f6319ef1990aba4f30e2a67b75e829f84cd8a3 100644 (file)
--- a/include/lock.php
+++ b/include/lock.php
@@ -69,7 +69,8 @@ function block_on_function_lock($fn_name, $wait_sec = 2, $timeout = 30) {
 
 if (! function_exists('unlock_function')) {
 function unlock_function($fn_name) {
-       $r = q("UPDATE `locks` SET `locked` = 0, `created` = '0000-00-00 00:00:00' WHERE `name` = '%s'",
+       $r = q("UPDATE `locks` SET `locked` = 0, `created` = '%s' WHERE `name` = '%s'",
+                       dbesc(NULL_DATE),
                        dbesc($fn_name)
             );
 

diff --git a/include/onepoll.php b/include/onepoll.php
index dfb0db9e37a59ad828f7fee8315a781cf649537d..d425212819b51fe6ba66cf796f246dc83a99206e 100644 (file)
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -133,7 +133,7 @@ function onepoll_run(&$argv, &$argc){
 
        logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['name']}, CONTACT: {$contact['name']}");
 
-       $last_update = (($contact['last-update'] === '0000-00-00 00:00:00')
+       $last_update = (($contact['last-update'] <= NULL_DATE)
                ? datetime_convert('UTC','UTC','now - 7 days', ATOM_TIME)
                : datetime_convert('UTC','UTC',$contact['last-update'], ATOM_TIME)
        );
@@ -239,7 +239,7 @@ function onepoll_run(&$argv, &$argc){
                                intval($contact['id'])
                        );
                        mark_for_death($contact);
-               } elseif ($contact['term-date'] != '0000-00-00 00:00:00') {
+               } elseif ($contact['term-date'] > NULL_DATE) {
                        logger("poller: $url back from the dead - removing mark for death");
                        unmark_for_death($contact);
                }

diff --git a/include/poller.php b/include/poller.php
index 2f9e72611029fe9bb8ffa90bc488d468820594e0..27f8c7831a12657032cff3dbf8e2c91492a9a964 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -357,7 +357,7 @@ function poller_max_connections_reached() {
  *
  */
 function poller_kill_stale_workers() {
-       $r = q("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+       $r = q("SELECT `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` > '%s'", dbesc(NULL_DATE));
 
        if (!dbm::is_result($r)) {
                // No processing here needed
@@ -366,14 +366,15 @@ function poller_kill_stale_workers() {
 
        foreach ($r AS $pid)
                if (!posix_kill($pid["pid"], 0)) {
-                       q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
-                               intval($pid["pid"]));
+                       q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = 0 WHERE `pid` = %d",
+                               dbesc(NULL_DATE), intval($pid["pid"]));
                } else {
                        // Kill long running processes
 
                        // Check if the priority is in a valid range
-                       if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE)))
+                       if (!in_array($pid["priority"], array(PRIORITY_CRITICAL, PRIORITY_HIGH, PRIORITY_MEDIUM, PRIORITY_LOW, PRIORITY_NEGLIGIBLE))) {
                                $pid["priority"] = PRIORITY_MEDIUM;
+                       }
 
                        // Define the maximum durations
                        $max_duration_defaults = array(PRIORITY_CRITICAL => 360, PRIORITY_HIGH => 10, PRIORITY_MEDIUM => 60, PRIORITY_LOW => 180, PRIORITY_NEGLIGIBLE => 360);
@@ -391,8 +392,9 @@ function poller_kill_stale_workers() {
                                // We killed the stale process.
                                // To avoid a blocking situation we reschedule the process at the beginning of the queue.
                                // Additionally we are lowering the priority.
-                               q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `created` = '%s',
+                               q("UPDATE `workerqueue` SET `executed` = '%s', `created` = '%s',
                                                        `priority` = %d, `pid` = 0 WHERE `pid` = %d",
+                                       dbesc(NULL_DATE),
                                        dbesc(datetime_convert()),
                                        intval(PRIORITY_NEGLIGIBLE),
                                        intval($pid["pid"]));
@@ -400,6 +402,7 @@ function poller_kill_stale_workers() {
                                logger("Worker process ".$pid["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG);
                        }
                }
+       }
 }
 
 /**
@@ -426,15 +429,15 @@ function poller_too_much_workers() {
                $slope = $maxworkers / pow($maxsysload, $exponent);
                $queues = ceil($slope * pow(max(0, $maxsysload - $load), $exponent));
 
-               $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00'");
+               $s = q("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` <= '%s'", dbesc(NULL_DATE));
                $entries = $s[0]["total"];
 
                if (Config::get("system", "worker_fastlane", false) AND ($queues > 0) AND ($entries > 0) AND ($active >= $queues)) {
-                       $s = q("SELECT `priority` FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `priority` LIMIT 1");
+                       $s = q("SELECT `priority` FROM `workerqueue` WHERE `executed` <= '%s' ORDER BY `priority` LIMIT 1", dbesc(NULL_DATE));
                        $top_priority = $s[0]["priority"];
 
-                       $s = q("SELECT `id` FROM `workerqueue` WHERE `priority` <= %d AND `executed` != '0000-00-00 00:00:00' LIMIT 1",
-                               intval($top_priority));
+                       $s = q("SELECT `id` FROM `workerqueue` WHERE `priority` <= %d AND `executed` > '%s' LIMIT 1",
+                               intval($top_priority), dbesc(NULL_DATE));
                        $high_running = dbm::is_result($s);
 
                        if (!$high_running AND ($top_priority > PRIORITY_UNDEFINED) AND ($top_priority < PRIORITY_NEGLIGIBLE)) {
@@ -554,21 +557,25 @@ function poller_worker_process() {
        if (poller_passing_slow($highest_priority)) {
                // Are there waiting processes with a higher priority than the currently highest?
                $r = q("SELECT * FROM `workerqueue`
-                               WHERE `executed` = '0000-00-00 00:00:00' AND `priority` < %d
-                               ORDER BY `priority`, `created` LIMIT 1", dbesc($highest_priority));
-               if (dbm::is_result($r))
+                               WHERE `executed` <= '%s' AND `priority` < %d
+                               ORDER BY `priority`, `created` LIMIT 1",
+                               dbesc(NULL_DATE),
+                               intval($highest_priority));
+               if (dbm::is_result($r)) {
                        return $r;
-
+               }
                // Give slower processes some processing time
                $r = q("SELECT * FROM `workerqueue`
-                               WHERE `executed` = '0000-00-00 00:00:00' AND `priority` > %d
-                               ORDER BY `priority`, `created` LIMIT 1", dbesc($highest_priority));
+                               WHERE `executed` <= '%s' AND `priority` > %d
+                               ORDER BY `priority`, `created` LIMIT 1",
+                               dbesc(NULL_DATE),
+                               intval($highest_priority));
        }
 
        // If there is no result (or we shouldn't pass lower processes) we check without priority limit
-       if (($highest_priority == 0) OR !dbm::is_result($r))
-               $r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `priority`, `created` LIMIT 1");
-
+       if (($highest_priority == 0) OR !dbm::is_result($r)) {
+               $r = q("SELECT * FROM `workerqueue` WHERE `executed` <= '%s' ORDER BY `priority`, `created` LIMIT 1", dbesc(NULL_DATE));
+       }
        return $r;
 }
 

diff --git a/include/security.php b/include/security.php
index 63a6b9574f7d9cdc9f845725034460733354b7c3..1c7813e74bb08078e24c86ae965e1203c3205510 100644 (file)
--- a/include/security.php
+++ b/include/security.php
@@ -55,21 +55,25 @@ function authenticate_success($user_record, $login_initial = false, $interactive
        $a->user = $user_record;
 
        if ($interactive) {
-               if ($a->user['login_date'] === '0000-00-00 00:00:00') {
+               /// @TODO Comparison of strings this way may lead to bugs/incompatiblities
+               if ($a->user['login_date'] <= NULL_DATE) {
                        $_SESSION['return_url'] = 'profile_photo/new';
                        $a->module = 'profile_photo';
                        info( t("Welcome ") . $a->user['username'] . EOL);
                        info( t('Please upload a profile photo.') . EOL);
-               }
-               else
+               } else {
                        info( t("Welcome back ") . $a->user['username'] . EOL);
+               }
        }
 
        $member_since = strtotime($a->user['register_date']);
-       if (time() < ($member_since + ( 60 * 60 * 24 * 14)))
+
+       if (time() < ($member_since + ( 60 * 60 * 24 * 14))) {
                $_SESSION['new_member'] = true;
-       else
+       } else {
                $_SESSION['new_member'] = false;
+       }
+
        if (strlen($a->user['timezone'])) {
                date_default_timezone_set($a->user['timezone']);
                $a->timezone = $a->user['timezone'];

diff --git a/include/socgraph.php b/include/socgraph.php
index ec7446cdc58e580d5f24c473dd1bdf308bf2ed30..4dedd33d398f22a600c2b1112580204236c963d0 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -81,7 +81,7 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
                $connect_url = '';
                $name = '';
                $network = '';
-               $updated = '0000-00-00 00:00:00';
+               $updated = NULL_DATE;
                $location = '';
                $about = '';
                $keywords = '';
@@ -239,12 +239,12 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
        );
 
        if (count($x)) {
-               if (($network == "") AND ($x[0]["network"] != NETWORK_STATUSNET))
+               if (($network == "") AND ($x[0]["network"] != NETWORK_STATUSNET)) {
                        $network = $x[0]["network"];
-
-               if ($updated == "0000-00-00 00:00:00")
+               }
+               if ($updated <= NULL_DATE) {
                        $updated = $x[0]["updated"];
-
+               }
                $created = $x[0]["created"];
                $server_url = $x[0]["server_url"];
                $nick = $x[0]["nick"];
@@ -252,7 +252,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
                $alias =  $x[0]["alias"];
                $notify =  $x[0]["notify"];
        } else {
-               $created = "0000-00-00 00:00:00";
+               $created = NULL_DATE;
                $server_url = "";
 
                $urlparts = parse_url($profile_url);
@@ -465,10 +465,10 @@ function poco_last_updated($profile, $force = false) {
        $gcontacts = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'",
                        dbesc(normalise_link($profile)));
 
-       if ($gcontacts[0]["created"] == "0000-00-00 00:00:00")
+       if ($gcontacts[0]["created"] <= NULL_DATE) {
                q("UPDATE `gcontact` SET `created` = '%s' WHERE `nurl` = '%s'",
                        dbesc(datetime_convert()), dbesc(normalise_link($profile)));
-
+       }
        if ($gcontacts[0]["server_url"] != "") {
                $server_url = $gcontacts[0]["server_url"];
        }
@@ -664,10 +664,11 @@ function poco_last_updated($profile, $force = false) {
        }
 
        // Maybe there aren't any entries. Then check if it is a valid feed
-       if ($last_updated == "")
-               if ($xpath->query('/atom:feed')->length > 0)
-                       $last_updated = "0000-00-00 00:00:00";
-
+       if ($last_updated == "") {
+               if ($xpath->query('/atom:feed')->length > 0) {
+                       $last_updated = NULL_DATE;
+               }
+       }
        q("UPDATE `gcontact` SET `updated` = '%s', `last_contact` = '%s' WHERE `nurl` = '%s'",
                dbesc(dbm::date($last_updated)), dbesc(dbm::date()), dbesc(normalise_link($profile)));
 
@@ -946,10 +947,10 @@ function poco_check_server($server_url, $network = "", $force = false) {
        $servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
        if (dbm::is_result($servers)) {
 
-               if ($servers[0]["created"] == "0000-00-00 00:00:00")
+               if ($servers[0]["created"] <= NULL_DATE) {
                        q("UPDATE `gserver` SET `created` = '%s' WHERE `nurl` = '%s'",
                                dbesc(datetime_convert()), dbesc(normalise_link($server_url)));
-
+               }
                $poco = $servers[0]["poco"];
                $noscrape = $servers[0]["noscrape"];
 
@@ -977,8 +978,8 @@ function poco_check_server($server_url, $network = "", $force = false) {
                $info = "";
                $register_policy = -1;
 
-               $last_contact = "0000-00-00 00:00:00";
-               $last_failure = "0000-00-00 00:00:00";
+               $last_contact = NULL_DATE;
+               $last_failure = NULL_DATE;
        }
        logger("Server ".$server_url." is outdated or unknown. Start discovery. Force: ".$force." Created: ".$servers[0]["created"]." Failure: ".$last_failure." Contact: ".$last_contact, LOGGER_DEBUG);
 
@@ -1503,7 +1504,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
                where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d )
                AND NOT `gcontact`.`name` IN (SELECT `name` FROM `contact` WHERE `uid` = %d)
                AND NOT `gcontact`.`id` IN (SELECT `gcid` FROM `gcign` WHERE `uid` = %d)
-               AND `gcontact`.`updated` != '0000-00-00 00:00:00'
+               AND `gcontact`.`updated` >= '%s'
                AND `gcontact`.`last_contact` >= `gcontact`.`last_failure`
                AND `gcontact`.`network` IN (%s)
                GROUP BY `glink`.`gcid` ORDER BY `gcontact`.`updated` DESC,`total` DESC LIMIT %d, %d",
@@ -1511,6 +1512,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
                intval($uid),
                intval($uid),
                intval($uid),
+               dbesc(NULL_DATE),
                $sql_network,
                intval($start),
                intval($limit)
@@ -1529,13 +1531,14 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
                WHERE `glink`.`uid` = 0 AND `glink`.`cid` = 0 AND `glink`.`zcid` = 0 AND NOT `gcontact`.`nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` = %d)
                AND NOT `gcontact`.`name` IN (SELECT `name` FROM `contact` WHERE `uid` = %d)
                AND NOT `gcontact`.`id` IN (SELECT `gcid` FROM `gcign` WHERE `uid` = %d)
-               AND `gcontact`.`updated` != '0000-00-00 00:00:00'
+               AND `gcontact`.`updated` >= '%s'
                AND `gcontact`.`last_contact` >= `gcontact`.`last_failure`
                AND `gcontact`.`network` IN (%s)
                ORDER BY rand() LIMIT %d, %d",
                intval($uid),
                intval($uid),
                intval($uid),
+               dbesc(NULL_DATE),
                $sql_network,
                intval($start),
                intval($limit)
@@ -1784,7 +1787,7 @@ function poco_discover_server($data, $default_generation = 0) {
                $connect_url = '';
                $name = '';
                $network = '';
-               $updated = '0000-00-00 00:00:00';
+               $updated = NULL_DATE;
                $location = '';
                $about = '';
                $keywords = '';

diff --git a/include/uimport.php b/include/uimport.php
index 0d7ce5d27abbae5604a5b9cc0f2b3f1564a04c96..4cc5b6c04b3f14d17b87c6c9d254968f4bdd54fc 100644 (file)
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -183,8 +183,8 @@ function import_account(App $a, $file) {
                        }\r
                }\r
                if ($contact['uid'] == $olduid && $contact['self'] == '0') {\r
-                       // set contacts 'avatar-date' to "0000-00-00 00:00:00" to let poller to update urls\r
-                       $contact["avatar-date"] = "0000-00-00 00:00:00" ;\r
+                       // set contacts 'avatar-date' to NULL_DATE to let poller to update urls\r
+                       $contact["avatar-date"] = NULL_DATE;\r
 \r
 \r
                        switch ($contact['network']) {\r

diff --git a/library/Smarty/libs/plugins/modifier.date_format.php b/library/Smarty/libs/plugins/modifier.date_format.php
index 5ad7540b154806a131f7c94c22d6fe37481b4eec..c5992991deec37bfa538d2daa00b084d8a2cce8b 100644 (file)
--- a/library/Smarty/libs/plugins/modifier.date_format.php
+++ b/library/Smarty/libs/plugins/modifier.date_format.php
@@ -36,7 +36,7 @@ function smarty_modifier_date_format($string, $format = null, $default_date = ''
      * Include the {@link shared.make_timestamp.php} plugin
      */
     require_once(SMARTY_PLUGINS_DIR . 'shared.make_timestamp.php');
-    if ($string != '' && $string != '0000-00-00' && $string != '0000-00-00 00:00:00') {
+    if ($string != '' && $string > '0001-01-01' && $string > NULL_DATE) {
         $timestamp = smarty_make_timestamp($string);
     } elseif ($default_date != '') {
         $timestamp = smarty_make_timestamp($default_date);

diff --git a/mod/contacts.php b/mod/contacts.php
index 11a83f0a0429495ae72001886c6392a8a3b667f7..ebb355b8a3cbd089384fbc6729ef4f78f508f9b4 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -99,13 +99,22 @@ function contacts_init(App $a) {
 
 function contacts_batch_actions(App $a) {
        $contacts_id = $_POST['contact_batch'];
-       if (!is_array($contacts_id)) return;
+       if (!is_array($contacts_id)) {
+               return;
+       }
 
        $orig_records = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND `uid` = %d AND `self` = 0",
                implode(",", $contacts_id),
                intval(local_user())
        );
 
+       if (!dbm::is_result($orig_records)) {
+               /// @TODO EOL really needed?
+               notice( t('Could not access contact record(s).') . EOL);
+               goaway('contacts');
+               return; // NOTREACHED
+       }
+
        $count_actions=0;
        foreach ($orig_records as $orig_record) {
                $contact_id = $orig_record['id'];
@@ -130,7 +139,8 @@ function contacts_batch_actions(App $a) {
                        $count_actions++;
                }
        }
-       if ($count_actions>0) {
+
+       if ($count_actions > 0) {
                info ( sprintf( tt("%d contact edited.", "%d contacts edited.", $count_actions), $count_actions) );
        }
 
@@ -164,7 +174,8 @@ function contacts_post(App $a) {
                intval(local_user())
        );
 
-       if (! count($orig_record)) {
+       if (! dbm::is_result($orig_record)) {
+               /// @TODO EOL really needed?
                notice( t('Could not access contact record.') . EOL);
                goaway('contacts');
                return; // NOTREACHED
@@ -213,6 +224,7 @@ function contacts_post(App $a) {
                intval($contact_id),
                intval(local_user())
        );
+       /// @TODO Decide to use dbm::is_result() here, what does $r include?
        if ($r) {
                info( t('Contact updated.') . EOL);
        } else {
@@ -235,40 +247,47 @@ function contacts_post(App $a) {
 /*contact actions*/
 function _contact_update($contact_id) {
        $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
-       if (!$r)
+       if (!dbm::is_result($r)) {
                return;
+       }
 
        $uid = $r[0]["uid"];
 
-       if ($uid != local_user())
+       if ($uid != local_user()) {
                return;
+       }
 
        if ($r[0]["network"] == NETWORK_OSTATUS) {
                $result = new_contact($uid, $r[0]["url"], false);
 
-               if ($result['success'])
+               if ($result['success']) {
                        $r = q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d",
                                intval($contact_id));
-       } else
+               }
+       } else {
                // pull feed and consume it, which should subscribe to the hub.
                proc_run(PRIORITY_HIGH, "include/onepoll.php", $contact_id, "force");
+       }
 }
 
 function _contact_update_profile($contact_id) {
        $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
-       if (!$r)
+       if (!dbm::is_result($r)) {
                return;
+       }
 
        $uid = $r[0]["uid"];
 
-       if ($uid != local_user())
+       if ($uid != local_user()) {
                return;
+       }
 
        $data = probe_url($r[0]["url"]);
 
        // "Feed" or "Unknown" is mostly a sign of communication problems
-       if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) AND ($data["network"] != $r[0]["network"]))
+       if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) AND ($data["network"] != $r[0]["network"])) {
                return;
+       }
 
        $updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm",
                                "poco", "network", "alias");
@@ -277,30 +296,36 @@ function _contact_update_profile($contact_id) {
        if ($data["network"] == NETWORK_OSTATUS) {
                $result = new_contact($uid, $data["url"], false);
 
-               if ($result['success'])
+               if ($result['success']) {
                        $update["subhub"] = true;
+               }
        }
 
-       foreach ($updatefields AS $field)
-               if (isset($data[$field]) AND ($data[$field] != ""))
+       foreach ($updatefields AS $field) {
+               if (isset($data[$field]) AND ($data[$field] != "")) {
                        $update[$field] = $data[$field];
+               }
+       }
 
        $update["nurl"] = normalise_link($data["url"]);
 
        $query = "";
 
-       if (isset($data["priority"]) AND ($data["priority"] != 0))
+       if (isset($data["priority"]) AND ($data["priority"] != 0)) {
                $query = "`priority` = ".intval($data["priority"]);
+       }
 
        foreach ($update AS $key => $value) {
-               if ($query != "")
+               if ($query != "") {
                        $query .= ", ";
+               }
 
                $query .= "`".$key."` = '".dbesc($value)."'";
        }
 
-       if ($query == "")
+       if ($query == "") {
                return;
+       }
 
        $r = q("UPDATE `contact` SET $query WHERE `id` = %d AND `uid` = %d",
                intval($contact_id),
@@ -368,8 +393,9 @@ function contacts_content(App $a) {
        if ($a->argc == 3) {
 
                $contact_id = intval($a->argv[1]);
-               if (! $contact_id)
+               if (! $contact_id) {
                        return;
+               }
 
                $cmd = $a->argv[2];
 
@@ -378,7 +404,7 @@ function contacts_content(App $a) {
                        intval(local_user())
                );
 
-               if (! count($orig_record)) {
+               if (! dbm::is_result($orig_record)) {
                        notice( t('Could not access contact record.') . EOL);
                        goaway('contacts');
                        return; // NOTREACHED
@@ -398,6 +424,7 @@ function contacts_content(App $a) {
 
                if ($cmd === 'block') {
                        $r = _contact_block($contact_id, $orig_record[0]);
+                       /// @TODO is $r a database result?
                        if ($r) {
                                $blocked = (($orig_record[0]['blocked']) ? 0 : 1);
                                info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
@@ -409,6 +436,7 @@ function contacts_content(App $a) {
 
                if ($cmd === 'ignore') {
                        $r = _contact_ignore($contact_id, $orig_record[0]);
+                       /// @TODO is $r a database result?
                        if ($r) {
                                $readonly = (($orig_record[0]['readonly']) ? 0 : 1);
                                info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
@@ -421,6 +449,7 @@ function contacts_content(App $a) {
 
                if ($cmd === 'archive') {
                        $r = _contact_archive($contact_id, $orig_record[0]);
+                       /// @TODO is $r a database result?
                        if ($r) {
                                $archived = (($orig_record[0]['archive']) ? 0 : 1);
                                info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
@@ -463,8 +492,7 @@ function contacts_content(App $a) {
                        if ($_REQUEST['canceled']) {
                                if (x($_SESSION,'return_url')) {
                                        goaway('' . $_SESSION['return_url']);
-                               }
-                               else {
+                               } else {
                                        goaway('contacts');
                                }
                        }
@@ -473,8 +501,7 @@ function contacts_content(App $a) {
                        info( t('Contact has been removed.') . EOL );
                        if (x($_SESSION,'return_url')) {
                                goaway('' . $_SESSION['return_url']);
-                       }
-                       else {
+                       } else {
                                goaway('contacts');
                        }
                        return; // NOTREACHED
@@ -538,13 +565,13 @@ function contacts_content(App $a) {
 
                $insecure = t('Private communications are not available for this contact.');
 
-               $last_update = (($contact['last-update'] == '0000-00-00 00:00:00')
+               $last_update = (($contact['last-update'] <= NULL_DATE)
                                ? t('Never')
                                : datetime_convert('UTC',date_default_timezone_get(),$contact['last-update'],'D, j M Y, g:i A'));
 
-               if ($contact['last-update'] !== '0000-00-00 00:00:00')
+               if ($contact['last-update'] !== NULL_DATE) {
                        $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
-
+               }
                $lblsuggest = (($contact['network'] === NETWORK_DFRN) ? t('Suggest friends') : '');
 
                $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2));
@@ -562,26 +589,28 @@ function contacts_content(App $a) {
                // tabs
                $tab_str = contacts_tab($a, $contact_id, 2);
 
-               $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
+               $lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
 
-               if ($contact['network'] == NETWORK_FEED)
+               if ($contact['network'] == NETWORK_FEED) {
                        $fetch_further_information = array('fetch_further_information', t('Fetch further information for feeds'), $contact['fetch_further_information'], t('Fetch further information for feeds'),
                                                                        array('0'=>t('Disabled'), '1'=>t('Fetch information'), '2'=>t('Fetch information and keywords')));
-
-               if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2)))
+               }
+               if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2))) {
                        $poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled));
+               }
 
-               if ($contact['network'] == NETWORK_DFRN)
+               if ($contact['network'] == NETWORK_DFRN) {
                        $profile_select = contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false));
+               }
 
                if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) AND
-                       ($contact['rel'] == CONTACT_IS_FOLLOWER))
+                       ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
                        $follow = App::get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
+               }
 
                // Load contactact related actions like hide, suggest, delete and others
                $contact_actions = contact_actions($contact);
 
-
                $o .= replace_macros($tpl, array(
                        //'$header' => t('Contact Editor'),
                        '$header' => t("Contact"),
@@ -668,25 +697,21 @@ function contacts_content(App $a) {
        if (($a->argc == 2) && ($a->argv[1] === 'all')) {
                $sql_extra = '';
                $all = true;
-       }
-       elseif (($a->argc == 2) && ($a->argv[1] === 'blocked')) {
+       } elseif (($a->argc == 2) && ($a->argv[1] === 'blocked')) {
                $sql_extra = " AND `blocked` = 1 ";
                $blocked = true;
-       }
-       elseif (($a->argc == 2) && ($a->argv[1] === 'hidden')) {
+       } elseif (($a->argc == 2) && ($a->argv[1] === 'hidden')) {
                $sql_extra = " AND `hidden` = 1 ";
                $hidden = true;
-       }
-       elseif (($a->argc == 2) && ($a->argv[1] === 'ignored')) {
+       } elseif (($a->argc == 2) && ($a->argv[1] === 'ignored')) {
                $sql_extra = " AND `readonly` = 1 ";
                $ignored = true;
-       }
-       elseif (($a->argc == 2) && ($a->argv[1] === 'archived')) {
+       } elseif (($a->argc == 2) && ($a->argv[1] === 'archived')) {
                $sql_extra = " AND `archive` = 1 ";
                $archived = true;
-       }
-       else
+       } else {
                $sql_extra = " AND `blocked` = 0 ";
+       }
 
        $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
        $nets = ((x($_GET,'nets')) ? notags(trim($_GET['nets'])) : '');
@@ -758,8 +783,6 @@ function contacts_content(App $a) {
        $tab_tpl = get_markup_template('common_tabs.tpl');
        $t = replace_macros($tab_tpl, array('$tabs'=>$tabs));
 
-
-
        $searching = false;
        if ($search) {
                $search_hdr = $search;
@@ -768,12 +791,12 @@ function contacts_content(App $a) {
        }
        $sql_extra .= (($searching) ? " AND (name REGEXP '$search_txt' OR url REGEXP '$search_txt'  OR nick REGEXP '$search_txt') " : "");
 
-       if ($nets)
+       if ($nets) {
                $sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
+       }
 
        $sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : '');
 
-
        $r = q("SELECT COUNT(*) AS `total` FROM `contact`
                WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
                intval($_SESSION['uid']));
@@ -861,23 +884,25 @@ function contacts_tab($a, $contact_id, $active_tab) {
 
        // Show this tab only if there is visible friend list
        $x = count_all_friends(local_user(), $contact_id);
-       if ($x)
+       if ($x) {
                $tabs[] = array('label'=>t('Contacts'),
                                'url' => "allfriends/".$contact_id,
                                'sel' => (($active_tab == 3)?'active':''),
                                'title' => t('View all contacts'),
                                'id' => 'allfriends-tab',
                                'accesskey' => 't');
+       }
 
        // Show this tab only if there is visible common friend list
        $common = count_common_friends(local_user(),$contact_id);
-       if ($common)
+       if ($common) {
                $tabs[] = array('label'=>t('Common Friends'),
                                'url' => "common/loc/".local_user()."/".$contact_id,
                                'sel' => (($active_tab == 4)?'active':''),
                                'title' => t('View all common friends'),
                                'id' => 'common-loc-tab',
                                'accesskey' => 'd');
+       }
 
        $tabs[] = array('label' => t('Advanced'),
                        'url'   => 'crepair/' . $contact_id,
@@ -895,12 +920,13 @@ function contacts_tab($a, $contact_id, $active_tab) {
 function contact_posts($a, $contact_id) {
 
        $r = q("SELECT `url` FROM `contact` WHERE `id` = %d", intval($contact_id));
-       if ($r) {
+       if (dbm::is_result($r)) {
                $contact = $r[0];
                $a->page['aside'] = "";
                profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
-       } else
+       } else {
                $profile = "";
+       }
 
        $tab_str = contacts_tab($a, $contact_id, 1);
 
@@ -932,8 +958,7 @@ function _contact_detail_for_template($rr){
        if (($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) {
                $url = "redir/{$rr['id']}";
                $sparkle = ' class="sparkle" ';
-       }
-       else {
+       } else {
                $url = $rr['url'];
                $sparkle = '';
        }

diff --git a/mod/events.php b/mod/events.php
index 2dd79a0296a16b29f23ace0757ac3695188df61d..19078ab26a9179b899d9ac8f12e6241c282d78a5 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * @fiel mod/events.php
+ * @file mod/events.php
  * @brief The events module
  */
-require_once('include/bbcode.php');
-require_once('include/datetime.php');
-require_once('include/event.php');
-require_once('include/items.php');
+require_once 'include/bbcode.php';
+require_once 'include/datetime.php';
+require_once 'include/event.php';
+require_once 'include/items.php';
 
 function events_init(App $a) {
        if (! local_user()) {
@@ -14,10 +14,11 @@ function events_init(App $a) {
        }
 
        if ($a->argc == 1) {
-               // if it's a json request abort here becaus we don't
+               // If it's a json request abort here because we don't
                // need the widget data
-               if ($a->argv[1] === 'json')
+               if ($a->argv[1] === 'json') {
                        return;
+               }
 
                $cal_widget = widget_events();
 
@@ -33,17 +34,17 @@ function events_init(App $a) {
 
 function events_post(App $a) {
 
-       logger('post: ' . print_r($_REQUEST,true));
+       logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA);
 
        if (! local_user()) {
                return;
        }
 
-       $event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0);
-       $cid = ((x($_POST,'cid')) ? intval($_POST['cid']) : 0);
-       $uid      = local_user();
+       $event_id = ((x($_POST, 'event_id')) ? intval($_POST['event_id']) : 0);
+       $cid = ((x($_POST, 'cid')) ? intval($_POST['cid']) : 0);
+       $uid = local_user();
 
-       $start_text = escape_tags($_REQUEST['start_text']);
+       $start_text  = escape_tags($_REQUEST['start_text']);
        $finish_text = escape_tags($_REQUEST['finish_text']);
 
        $adjust   = intval($_POST['adjust']);
@@ -52,34 +53,26 @@ function events_post(App $a) {
        // The default setting for the `private` field in event_store() is false, so mirror that
        $private_event = false;
 
+       $start  = NULL_DATE;
+       $finish = NULL_DATE;
+
        if ($start_text) {
                $start = $start_text;
        }
-       else {
-               $start    = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
-       }
-
-       if ($nofinish) {
-               $finish = '0000-00-00 00:00:00';
-       }
 
        if ($finish_text) {
                $finish = $finish_text;
        }
-       else {
-               $finish    = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute);
-       }
 
        if ($adjust) {
-               $start = datetime_convert(date_default_timezone_get(),'UTC',$start);
+               $start = datetime_convert(date_default_timezone_get(), 'UTC', $start);
                if (! $nofinish) {
-                       $finish = datetime_convert(date_default_timezone_get(),'UTC',$finish);
+                       $finish = datetime_convert(date_default_timezone_get(), 'UTC', $finish);
                }
-       }
-       else {
-               $start = datetime_convert('UTC','UTC',$start);
+       } else {
+               $start = datetime_convert('UTC', 'UTC', $start);
                if (! $nofinish) {
-                       $finish = datetime_convert('UTC','UTC',$finish);
+                       $finish = datetime_convert('UTC', 'UTC', $finish);
                }
        }
 
@@ -96,19 +89,19 @@ function events_post(App $a) {
        $action = ($event_id == '') ? 'new' : "event/" . $event_id;
        $onerror_url = App::get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
 
-       if (strcmp($finish,$start) < 0 && !$nofinish) {
-               notice( t('Event can not end before it has started.') . EOL);
+       if (strcmp($finish, $start) < 0 && !$nofinish) {
+               notice(t('Event can not end before it has started.') . EOL);
                if (intval($_REQUEST['preview'])) {
-                       echo( t('Event can not end before it has started.'));
+                       echo t('Event can not end before it has started.');
                        killme();
                }
                goaway($onerror_url);
        }
 
-       if ((! $summary) || (! $start)) {
-               notice( t('Event title and start time are required.') . EOL);
+       if ((! $summary) || ($start === NULL_DATE)) {
+               notice(t('Event title and start time are required.') . EOL);
                if (intval($_REQUEST['preview'])) {
-                       echo( t('Event title and start time are required.'));
+                       echo t('Event title and start time are required.');
                        killme();
                }
                goaway($onerror_url);
@@ -116,13 +109,14 @@ function events_post(App $a) {
 
        $share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0);
 
-       $c = q("select id from contact where uid = %d and self = 1 limit 1",
+       $c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
                intval(local_user())
        );
-       if (count($c))
+       if (dbm::is_result($c)) {
                $self = $c[0]['id'];
-       else
+       } else {
                $self = 0;
+       }
 
 
        if ($share) {
@@ -132,67 +126,63 @@ function events_post(App $a) {
                $str_contact_deny  = perms2str($_POST['contact_deny']);
 
                // Undo the pseudo-contact of self, since there are real contacts now
-               if ( strpos($str_contact_allow, '<' . $self . '>') !== false )
-               {
+               if (strpos($str_contact_allow, '<' . $self . '>') !== false) {
                        $str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow);
                }
                // Make sure to set the `private` field as true. This is necessary to
                // have the posts show up correctly in Diaspora if an event is created
                // as visible only to self at first, but then edited to display to others.
-               if ( strlen($str_group_allow) or strlen($str_contact_allow) or strlen($str_group_deny) or strlen($str_contact_deny) )
-               {
+               if (strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) {
                        $private_event = true;
                }
-       }
-       else {
+       } else {
                // Note: do not set `private` field for self-only events. It will
                // keep even you from seeing them!
                $str_contact_allow = '<' . $self . '>';
                $str_group_allow = $str_contact_deny = $str_group_deny = '';
        }
 
-
+       /// @TODO One-time array initialization, one large block
        $datarray = array();
-       $datarray['guid'] = get_guid(32);
-       $datarray['start'] = $start;
-       $datarray['finish'] = $finish;
-       $datarray['summary'] = $summary;
-       $datarray['desc'] = $desc;
-       $datarray['location'] = $location;
-       $datarray['type'] = $type;
-       $datarray['adjust'] = $adjust;
-       $datarray['nofinish'] = $nofinish;
-       $datarray['uid'] = $uid;
-       $datarray['cid'] = $cid;
+       $datarray['guid']      = get_guid(32);
+       $datarray['start']     = $start;
+       $datarray['finish']    = $finish;
+       $datarray['summary']   = $summary;
+       $datarray['desc']      = $desc;
+       $datarray['location']  = $location;
+       $datarray['type']      = $type;
+       $datarray['adjust']    = $adjust;
+       $datarray['nofinish']  = $nofinish;
+       $datarray['uid']       = $uid;
+       $datarray['cid']       = $cid;
        $datarray['allow_cid'] = $str_contact_allow;
        $datarray['allow_gid'] = $str_group_allow;
-       $datarray['deny_cid'] = $str_contact_deny;
-       $datarray['deny_gid'] = $str_group_deny;
-       $datarray['private'] = (($private_event) ? 1 : 0);
-       $datarray['id'] = $event_id;
-       $datarray['created'] = $created;
-       $datarray['edited'] = $edited;
+       $datarray['deny_cid']  = $str_contact_deny;
+       $datarray['deny_gid']  = $str_group_deny;
+       $datarray['private']   = (($private_event) ? 1 : 0);
+       $datarray['id']        = $event_id;
+       $datarray['created']   = $created;
+       $datarray['edited']    = $edited;
 
        if (intval($_REQUEST['preview'])) {
                $html = format_event_html($datarray);
                echo $html;
-                       killme();
+               killme();
        }
 
        $item_id = event_store($datarray);
 
-       if (! $cid)
+       if (! $cid) {
                proc_run(PRIORITY_HIGH, "include/notifier.php", "event", $item_id);
+       }
 
        goaway($_SESSION['return_url']);
 }
 
-
-
 function events_content(App $a) {
 
        if (! local_user()) {
-               notice( t('Permission denied.') . EOL);
+               notice(t('Permission denied.') . EOL);
                return;
        }
 
@@ -201,14 +191,14 @@ function events_content(App $a) {
        }
 
        if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
-               $r = q("update event set ignore = 1 where id = %d and uid = %d",
+               $r = q("UPDATE `event` SET `ignore` = 1 WHERE `id` = %d AND `uid` = %d",
                        intval($a->argv[2]),
                        intval(local_user())
                );
        }
 
        if (($a->argc > 2) && ($a->argv[1] === 'unignore') && intval($a->argv[2])) {
-               $r = q("update event set ignore = 0 where id = %d and uid = %d",
+               $r = q("UPDATE `event` SET `ignore` = 0 WHERE `id` = %d AND `uid` = %d",
                        intval($a->argv[2]),
                        intval(local_user())
                );
@@ -224,7 +214,7 @@ function events_content(App $a) {
        $i18n = get_event_strings();
 
        $htpl = get_markup_template('event_head.tpl');
-       $a->page['htmlhead'] .= replace_macros($htpl,array(
+       $a->page['htmlhead'] .= replace_macros($htpl, array(
                '$baseurl' => App::get_baseurl(),
                '$module_url' => '/events',
                '$modparams' => 1,
@@ -232,27 +222,30 @@ function events_content(App $a) {
        ));
 
        $etpl = get_markup_template('event_end.tpl');
-       $a->page['end'] .= replace_macros($etpl,array(
+       $a->page['end'] .= replace_macros($etpl, array(
                '$baseurl' => App::get_baseurl(),
        ));
 
-       $o ="";
+       $o = '';
        // tabs
-       if ($a->theme_events_in_profile)
-               $tabs = profile_tabs($a, True);
-
-
+       if ($a->theme_events_in_profile) {
+               $tabs = profile_tabs($a, true);
+       }
 
        $mode = 'view';
        $y = 0;
        $m = 0;
-       $ignored = ((x($_REQUEST,'ignored')) ? intval($_REQUEST['ignored']) : 0);
+       $ignored = ((x($_REQUEST, 'ignored')) ? intval($_REQUEST['ignored']) : 0);
 
        if ($a->argc > 1) {
                if ($a->argc > 2 && $a->argv[1] == 'event') {
                        $mode = 'edit';
                        $event_id = intval($a->argv[2]);
                }
+               if ($a->argc > 2 && $a->argv[1] == 'drop') {
+                       $mode = 'drop';
+                       $event_id = intval($a->argv[2]);
+               }
                if ($a->argv[1] === 'new') {
                        $mode = 'new';
                        $event_id = 0;
@@ -267,9 +260,8 @@ function events_content(App $a) {
        // The view mode part is similiar to /mod/cal.php
        if ($mode == 'view') {
 
-
-               $thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
-               $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
+               $thisyear  = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
+               $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
                if (! $y) {
                        $y = intval($thisyear);
                }
@@ -290,46 +282,46 @@ function events_content(App $a) {
                $nextyear = $y;
                $nextmonth = $m + 1;
                if ($nextmonth > 12) {
-                               $nextmonth = 1;
+                       $nextmonth = 1;
                        $nextyear ++;
                }
 
                $prevyear = $y;
-               if ($m > 1)
+               if ($m > 1) {
                        $prevmonth = $m - 1;
-               else {
+               } else {
                        $prevmonth = 12;
                        $prevyear --;
                }
 
-               $dim    = get_dim($y,$m);
-               $start  = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0);
-               $finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59);
+               $dim    = get_dim($y, $m);
+               $start  = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
+               $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
 
 
-               if ($a->argv[1] === 'json'){
-                       if (x($_GET,'start'))   $start = $_GET['start'];
-                       if (x($_GET,'end'))     $finish = $_GET['end'];
+               if ($a->argv[1] === 'json') {
+                       if (x($_GET, 'start')) {$start  = $_GET['start'];}
+                       if (x($_GET, 'end'))   {$finish = $_GET['end'];}
                }
 
-               $start  = datetime_convert('UTC','UTC',$start);
-               $finish = datetime_convert('UTC','UTC',$finish);
+               $start  = datetime_convert('UTC', 'UTC', $start);
+               $finish = datetime_convert('UTC', 'UTC', $finish);
 
-               $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
+               $adjust_start  = datetime_convert('UTC', date_default_timezone_get(), $start);
                $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
 
                // put the event parametes in an array so we can better transmit them
                $event_params = array(
-                       'event_id' => (x($_GET,'id') ? $_GET["id"] : 0),
-                       'start' => $start,
-                       'finish' => $finish,
-                       'adjust_start' => $adjust_start,
+                       'event_id'      => (x($_GET, 'id') ? $_GET['id'] : 0),
+                       'start'         => $start,
+                       'finish'        => $finish,
+                       'adjust_start'  => $adjust_start,
                        'adjust_finish' => $adjust_finish,
-                       'ignored' => $ignored,
+                       'ignored'       => $ignored,
                );
 
                // get events by id or by date
-               if (x($_GET,'id')){
+               if (x($_GET, 'id')) {
                        $r = event_by_id(local_user(), $event_params);
                } else {
                        $r = events_by_date(local_user(), $event_params);
@@ -340,7 +332,7 @@ function events_content(App $a) {
                if (dbm::is_result($r)) {
                        $r = sort_by_date($r);
                        foreach ($r as $rr) {
-                               $j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
+                               $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'j') : datetime_convert('UTC', 'UTC', $rr['start'], 'j'));
                                if (! x($links,$j)) {
                                        $links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
                                }
@@ -356,53 +348,51 @@ function events_content(App $a) {
                }
 
                if ($a->argv[1] === 'json'){
-                       echo json_encode($events); killme();
+                       echo json_encode($events);
+                       killme();
                }
 
-               // links: array('href', 'text', 'extra css classes', 'title')
-               if (x($_GET,'id')){
+               if (x($_GET, 'id')) {
                        $tpl =  get_markup_template("event.tpl");
                } else {
-//                     if (get_config('experimentals','new_calendar')==1){
-                               $tpl = get_markup_template("events_js.tpl");
-//                     } else {
-//                             $tpl = get_markup_template("events.tpl");
-//                     }
+                       $tpl = get_markup_template("events_js.tpl");
                }
 
                // Get rid of dashes in key names, Smarty3 can't handle them
                foreach ($events as $key => $event) {
                        $event_item = array();
                        foreach ($event['item'] as $k => $v) {
-                               $k = str_replace('-','_',$k);
+                               $k = str_replace('-' ,'_', $k);
                                $event_item[$k] = $v;
                        }
                        $events[$key]['item'] = $event_item;
                }
 
                $o = replace_macros($tpl, array(
-                       '$baseurl'      => App::get_baseurl(),
-                       '$tabs'         => $tabs,
-                       '$title'        => t('Events'),
-                       '$view'         => t('View'),
-                       '$new_event'    => array(App::get_baseurl().'/events/new',t('Create New Event'),'',''),
-                       '$previous'     => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
-                       '$next'         => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
-                       '$calendar'     => cal($y,$m,$links, ' eventcal'),
-
-                       '$events'       => $events,
-
-                       "today" => t("today"),
-                       "month" => t("month"),
-                       "week" => t("week"),
-                       "day" => t("day"),
-                       "list" => t("list"),
+                       '$baseurl'   => App::get_baseurl(),
+                       '$tabs'      => $tabs,
+                       '$title'     => t('Events'),
+                       '$view'      => t('View'),
+                       '$new_event' => array(App::get_baseurl() . '/events/new', t('Create New Event'), '', ''),
+                       '$previous'  => array(App::get_baseurl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''),
+                       '$next'      => array(App::get_baseurl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''),
+                       '$calendar'  => cal($y, $m, $links, ' eventcal'),
+
+                       '$events'    => $events,
+
+                       '$today' => t('today'),
+                       '$month' => t('month'),
+                       '$week'  => t('week'),
+                       '$day'   => t('day'),
+                       '$list'  => t('list'),
                ));
 
-               if (x($_GET,'id')){ echo $o; killme(); }
+               if (x($_GET, 'id')) {
+                       echo $o;
+                       killme();
+               }
 
                return $o;
-
        }
 
        if ($mode === 'edit' && $event_id) {
@@ -410,46 +400,45 @@ function events_content(App $a) {
                        intval($event_id),
                        intval(local_user())
                );
-               if (dbm::is_result($r))
+               if (dbm::is_result($r)) {
                        $orig_event = $r[0];
+               }
        }
 
        // Passed parameters overrides anything found in the DB
        if ($mode === 'edit' || $mode === 'new') {
-               if (!x($orig_event)) $orig_event = array();
+               if (!x($orig_event)) {
+                       $orig_event = array();
+               }
                // In case of an error the browser is redirected back here, with these parameters filled in with the previous values
-               if (x($_REQUEST,'nofinish')) $orig_event['nofinish'] = $_REQUEST['nofinish'];
-               if (x($_REQUEST,'adjust')) $orig_event['adjust'] = $_REQUEST['adjust'];
-               if (x($_REQUEST,'summary')) $orig_event['summary'] = $_REQUEST['summary'];
-               if (x($_REQUEST,'description')) $orig_event['description'] = $_REQUEST['description'];
-               if (x($_REQUEST,'location')) $orig_event['location'] = $_REQUEST['location'];
-               if (x($_REQUEST,'start')) $orig_event['start'] = $_REQUEST['start'];
-               if (x($_REQUEST,'finish')) $orig_event['finish'] = $_REQUEST['finish'];
-       }
-
-       if ($mode === 'edit' || $mode === 'new') {
+               if (x($_REQUEST, 'nofinish'))    {$orig_event['nofinish']    = $_REQUEST['nofinish'];}
+               if (x($_REQUEST, 'adjust'))      {$orig_event['adjust']      = $_REQUEST['adjust'];}
+               if (x($_REQUEST, 'summary'))     {$orig_event['summary']     = $_REQUEST['summary'];}
+               if (x($_REQUEST, 'description')) {$orig_event['description'] = $_REQUEST['description'];}
+               if (x($_REQUEST, 'location'))    {$orig_event['location']    = $_REQUEST['location'];}
+               if (x($_REQUEST, 'start'))       {$orig_event['start']       = $_REQUEST['start'];}
+               if (x($_REQUEST, 'finish'))      {$orig_event['finish']      = $_REQUEST['finish'];}
 
                $n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
-               $a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : '');
-               $t_orig = ((x($orig_event)) ? $orig_event['summary'] : '');
-               $d_orig = ((x($orig_event)) ? $orig_event['desc'] : '');
-               $l_orig = ((x($orig_event)) ? $orig_event['location'] : '');
-               $eid = ((x($orig_event)) ? $orig_event['id'] : 0);
-               $cid = ((x($orig_event)) ? $orig_event['cid'] : 0);
-               $uri = ((x($orig_event)) ? $orig_event['uri'] : '');
+               $a_checked = ((x($orig_event) && $orig_event['adjust'])   ? ' checked="checked" ' : '');
 
+               $t_orig = ((x($orig_event)) ? $orig_event['summary']  : '');
+               $d_orig = ((x($orig_event)) ? $orig_event['desc']     : '');
+               $l_orig = ((x($orig_event)) ? $orig_event['location'] : '');
+               $eid    = ((x($orig_event)) ? $orig_event['id']       : 0);
+               $cid    = ((x($orig_event)) ? $orig_event['cid']      : 0);
+               $uri    = ((x($orig_event)) ? $orig_event['uri']      : '');
 
                if (! x($orig_event)) {
                        $sh_checked = '';
                } else {
-                       $sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ' );
+                       $sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ');
                }
 
                if ($cid OR ($mode !== 'new')) {
                        $sh_checked .= ' disabled="disabled" ';
                }
 
-
                $sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
                $fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
 
@@ -458,18 +447,18 @@ function events_content(App $a) {
                        $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
                }
 
-               $syear = datetime_convert('UTC', $tz, $sdt, 'Y');
+               $syear  = datetime_convert('UTC', $tz, $sdt, 'Y');
                $smonth = datetime_convert('UTC', $tz, $sdt, 'm');
-               $sday = datetime_convert('UTC', $tz, $sdt, 'd');
+               $sday   = datetime_convert('UTC', $tz, $sdt, 'd');
 
-               $shour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'H') : 0);
+               $shour   = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'H') : 0);
                $sminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'i') : 0);
 
-               $fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
+               $fyear  = datetime_convert('UTC', $tz, $fdt, 'Y');
                $fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
-               $fday = datetime_convert('UTC', $tz, $fdt, 'd');
+               $fday   = datetime_convert('UTC', $tz, $fdt, 'd');
 
-               $fhour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0);
+               $fhour   = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0);
                $fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0);
 
                $f = get_config('system','event_input_format');
@@ -477,10 +466,11 @@ function events_content(App $a) {
                        $f = 'ymd';
                }
 
-               require_once('include/acl_selectors.php');
+               require_once 'include/acl_selectors.php' ;
 
-               if ($mode === 'new')
+               if ($mode === 'new') {
                        $acl = (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user)));
+               }
 
                $tpl = get_markup_template('event_form.tpl');
 
@@ -493,11 +483,11 @@ function events_content(App $a) {
                        '$title' => t('Event details'),
                        '$desc' => t('Starting date and Title are required.'),
                        '$s_text' => t('Event Starts:') . ' <span class="required" title="' . t('Required') . '">*</span>',
-                       '$s_dsel' => datetimesel($f,new DateTime(),DateTime::createFromFormat('Y',$syear+5),DateTime::createFromFormat('Y-m-d H:i',"$syear-$smonth-$sday $shour:$sminute"),t('Event Starts:'),'start_text',true,true,'','',true),
+                       '$s_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), t('Event Starts:'), 'start_text', true, true, '', '', true),
                        '$n_text' => t('Finish date/time is not known or not relevant'),
                        '$n_checked' => $n_checked,
                        '$f_text' => t('Event Finishes:'),
-                       '$f_dsel' => datetimesel($f,new DateTime(),DateTime::createFromFormat('Y',$fyear+5),DateTime::createFromFormat('Y-m-d H:i',"$fyear-$fmonth-$fday $fhour:$fminute"),t('Event Finishes:'),'finish_text',true,true,'start_text'),
+                       '$f_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
                        '$a_text' => t('Adjust for viewer timezone'),
                        '$a_checked' => $a_checked,
                        '$d_text' => t('Description:'),
@@ -515,12 +505,33 @@ function events_content(App $a) {
                        '$preview' => t('Preview'),
                        '$acl' => $acl,
                        '$submit' => t('Submit'),
-                       '$basic' => t("Basic"),
-                       '$advanced' => t("Advanced"),
+                       '$basic' => t('Basic'),
+                       '$advanced' => t('Advanced'),
                        '$permissions' => t('Permissions'),
 
                ));
 
                return $o;
        }
+
+       // Remove an event from the calendar and its related items
+       if ($mode === 'drop' && $event_id) {
+               $del = 0;
+
+               $params = array('event_id' => ($event_id));
+               $ev = event_by_id(local_user(), $params);
+
+               // Delete only real events (no birthdays)
+               if (dbm::is_result($ev) && $ev[0]['type'] == 'event') {
+                       $del = drop_item($ev[0]['itemid'], false);
+               }
+
+               if ($del == 0) {
+                       notice(t('Failed to remove event' ) . EOL);
+               } else {
+                       info(t('Event removed') . EOL);
+               }
+
+               goaway(App::get_baseurl() . '/events');
+       }
 }

diff --git a/mod/maintenance.php b/mod/maintenance.php
index dcdc44194ed9cb090a29a7169c49545d33c97844..c4839de79213503490372d9881fd8900850827d2 100644 (file)
--- a/mod/maintenance.php
+++ b/mod/maintenance.php
@@ -1,11 +1,23 @@
 <?php
 
+use \Friendica\Core\Config;
+
 function maintenance_content(App $a) {
+
+       $reason = Config::get('system', 'maintenance_reason');
+
+       if (substr(normalise_link($reason), 0, 7) == 'http://') {
+               header("HTTP/1.1 307 Temporary Redirect");
+               header("Location:".$reason);
+               return;
+       }
+
        header('HTTP/1.1 503 Service Temporarily Unavailable');
        header('Status: 503 Service Temporarily Unavailable');
        header('Retry-After: 600');
 
        return replace_macros(get_markup_template('maintenance.tpl'), array(
-               '$sysdown' => t('System down for maintenance')
+               '$sysdown' => t('System down for maintenance'),
+               '$reason' => $reason
        ));
 }

diff --git a/mod/profiles.php b/mod/profiles.php
index d172febcfed8deba2208c4a50297e4a1465fd8c0..3d7e9fd96d3485f594de1e79f5c9abd7de2623fb 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -234,11 +234,11 @@ function profiles_post(App $a) {
 
                $with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
 
-               if (! strlen($howlong))
-                       $howlong = '0000-00-00 00:00:00';
-               else
+               if (! strlen($howlong)) {
+                       $howlong = NULL_DATE;
+               } else {
                        $howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong);
-
+               }
                // linkify the relationship target if applicable
 
                $withchanged = false;
@@ -248,11 +248,13 @@ function profiles_post(App $a) {
                                $withchanged = true;
                                $prf = '';
                                $lookup = $with;
-                               if (strpos($lookup,'@') === 0)
+                               if (strpos($lookup,'@') === 0) {
                                        $lookup = substr($lookup,1);
+                               }
                                $lookup = str_replace('_',' ', $lookup);
                                if (strpos($lookup,'@') || (strpos($lookup,'http://'))) {
                                        $newname = $lookup;
+                                       /// @TODO Maybe kill those error/debugging-surpressing @ characters
                                        $links = @Probe::lrdd($lookup);
                                        if (count($links)) {
                                                foreach ($links as $link) {
@@ -261,8 +263,7 @@ function profiles_post(App $a) {
                                                        }
                                                }
                                        }
-                               }
-                               else {
+                               } else {
                                        $newname = $lookup;
 /*                                     if (strstr($lookup,' ')) {
                                                $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
@@ -722,7 +723,7 @@ function profiles_content(App $a) {
                        '$gender' => gender_selector($r[0]['gender']),
                        '$marital' => marital_selector($r[0]['marital']),
                        '$with' => array('with', t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), t('Examples: cathy123, Cathy Williams, cathy@example.com')),
-                       '$howlong' => array('howlong', t('Since [date]:'), ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))),
+                       '$howlong' => array('howlong', t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong']))),
                        '$sexual' => sexpref_selector($r[0]['sexual']),
                        '$about' => array('about', t('Tell us about yourself...'), $r[0]['about']),
                        '$xmpp' => array('xmpp', t('XMPP (Jabber) address:'), $r[0]['xmpp'], t("The XMPP address will be propagated to your contacts so that they can follow you.")),

diff --git a/mod/settings.php b/mod/settings.php
index c5b798880328adb406f8181610c66b258aad54da..a626e67f5f6c6c97d041195bf5369e3aa018ec11 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -885,7 +885,7 @@ function settings_content(App $a) {
                $mail_pubmail      = ((dbm::is_result($r)) ? $r[0]['pubmail'] : 0);
                $mail_action       = ((dbm::is_result($r)) ? $r[0]['action'] : 0);
                $mail_movetofolder = ((dbm::is_result($r)) ? $r[0]['movetofolder'] : '');
-               $mail_chk          = ((dbm::is_result($r)) ? $r[0]['last_check'] : '0000-00-00 00:00:00');
+               $mail_chk          = ((dbm::is_result($r)) ? $r[0]['last_check'] : NULL_DATE);
 
 
                $tpl = get_markup_template("settings_connectors.tpl");

diff --git a/update.php b/update.php
index 754ed77fc2bdd04f80665f09cf1f92608c766988..d54063ba74f98ca4816e65bd3bff52fcb8ee8007 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1215);
+define('UPDATE_VERSION' , 1216);
 
 /**
  *
@@ -48,8 +48,8 @@ function update_1000() {
 
        q("ALTER TABLE `intro` ADD `duplex` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `knowyou` ");
        q("ALTER TABLE `contact` ADD `duplex` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `rel` ");
-       q("ALTER TABLE `contact` CHANGE `issued-pubkey` `issued-pubkey` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL");
-       q("ALTER TABLE `contact` ADD `term-date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `avatar-date`");
+       q("ALTER TABLE `contact` CHANGE `issued-pubkey` `issued-pubkey` TEXTCHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL");
+       q("ALTER TABLE `contact` ADD `term-date` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00' AFTER `avatar-date`");
 }
 
 function update_1001() {
@@ -243,8 +243,8 @@ function update_1022() {
 }
 
 function update_1023() {
-       q("ALTER TABLE `user` ADD `register_date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `timezone` ,
-       ADD `login_date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `register_date` ");
+       q("ALTER TABLE `user` ADD `register_date` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00' AFTER `timezone` ,
+       ADD `login_date` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00' AFTER `register_date` ");
 }
 
 function update_1024() {
@@ -350,7 +350,7 @@ function update_1034() {
 
 function update_1035() {
 
-       q("ALTER TABLE `contact` ADD `success_update` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `last-update` ");
+       q("ALTER TABLE `contact` ADD `success_update` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00' AFTER `last-update` ");
 
 }
 
@@ -442,7 +442,7 @@ function update_1049() {
        `user` CHAR( 255 ) NOT NULL ,
        `pass` CHAR( 255 ) NOT NULL ,
        `reply_to` CHAR( 255 ) NOT NULL ,
-       `last_check` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'
+       `last_check` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00'
        ) ENGINE = MYISAM ");
 }
 
@@ -453,8 +453,8 @@ function update_1050() {
        `filetype` CHAR( 64 ) NOT NULL ,
        `filesize` INT NOT NULL ,
        `data` LONGBLOB NOT NULL ,
-       `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-       `edited` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+       `created` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00',
+       `edited` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00',
        `allow_cid` MEDIUMTEXT NOT NULL ,
        `allow_gid` MEDIUMTEXT NOT NULL ,
        `deny_cid` MEDIUMTEXT NOT NULL ,
@@ -532,6 +532,7 @@ function update_1065() {
 function update_1066() {
        $r = q("ALTER TABLE `item` ADD `received` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `edited` ");
 
+       /// @TODO Decide to use dbm::is_result() here, what does $r include?
        if ($r) {
                q("ALTER TABLE `item` ADD INDEX ( `received` ) ");
        }
@@ -676,7 +677,7 @@ function update_1079() {
 }
 
 function update_1080() {
-       q("ALTER TABLE `fcontact` ADD `updated` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'");
+       q("ALTER TABLE `fcontact` ADD `updated` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00'");
 }
 
 function update_1081() {
@@ -736,7 +737,7 @@ function update_1086() {
 }
 
 function update_1087() {
-       q("ALTER TABLE `item` ADD `commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `edited` ");
+       q("ALTER TABLE `item` ADD `commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' AFTER `edited` ");
 
        $r = q("SELECT `id` FROM `item` WHERE `parent` = `id` ");
        if (dbm::is_result($r)) {
@@ -757,8 +758,8 @@ function update_1087() {
 
 function update_1088() {
        q("ALTER TABLE `user` ADD `account_expired` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `expire` ,
-               ADD `account_expires_on` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `account_expired` ,
-               ADD `expire_notification_sent` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `account_expires_on` ");
+               ADD `account_expires_on` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00' AFTER `account_expired` ,
+               ADD `expire_notification_sent` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00' AFTER `account_expires_on` ");
 }
 
 function update_1089() {
@@ -943,8 +944,8 @@ ADD INDEX ( `hidden` ) ");
 
 function update_1109() {
        q("ALTER TABLE `conv` ADD `creator` CHAR( 255 ) NOT NULL ,
-               ADD `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-               ADD `updated` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+               ADD `created` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00',
+               ADD `updated` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00',
                ADD `subject` MEDIUMTEXT NOT NULL,
                ADD INDEX ( `created` ), ADD INDEX ( `updated` ) ");
 }
@@ -1644,11 +1645,11 @@ function update_1169() {
                  `iid` int(10) unsigned NOT NULL DEFAULT '0',
                  `uid` int(10) unsigned NOT NULL DEFAULT '0',
                  `contact-id` int(11) unsigned NOT NULL DEFAULT '0',
-                 `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-                 `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-                 `commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-                 `received` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-                 `changed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+                 `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+                 `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+                 `commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+                 `received` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+                 `changed` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
                  `wall` tinyint(1) NOT NULL DEFAULT '0',
                  `private` tinyint(1) NOT NULL DEFAULT '0',
                  `pubmail` tinyint(1) NOT NULL DEFAULT '0',

diff --git a/util/maintenance.php b/util/maintenance.php
index 17f64ecc79ef95b4dc8b92090a87f67567fc5184..614344ab9387bbcafb99ee98c7fe2e5b6c9e23ca 100644 (file)
--- a/util/maintenance.php
+++ b/util/maintenance.php
@@ -20,7 +20,19 @@ $maint_mode = 1;
 if ($argc > 1) {
        $maint_mode = intval($argv[1]);
 }
-set_config('system', 'maintenance', $maint_mode);
+
+Config::set('system', 'maintenance', $maint_mode);
+
+if ($maint_mode AND ($argc > 2)) {
+       $reason_arr = $argv;
+       array_shift($reason_arr);
+       array_shift($reason_arr);
+
+       $reason = implode(' ', $reason_arr);
+       Config::set('system', 'maintenance_reason', $reason);
+} else {
+       Config::set('system', 'maintenance_reason', '');
+}
 
 if ($maint_mode) {
        $mode_str = "maintenance mode";
@@ -28,8 +40,23 @@ if ($maint_mode) {
        $mode_str = "normal mode";
 }
 
-echo "\n\tSystem set in $mode_str\n\n";
-echo "Usage:\n\n";
-echo "\tphp {$argv[0]} [1]\tSet the system in maintenance mode\n";
-echo "\tphp {$argv[0]} 0  \tSet the system in normal mode\n\n";
+echo "\n\tSystem set in $mode_str\n";
 
+if ($reason != '') {
+       echo "\tMaintenance reason: $reason\n\n";
+} else {
+       echo "\n";
+}
+
+echo "Usage:\n\n";
+echo "\tphp {$argv[0]} [1] [Maintenance reason|redirection url]\n";
+echo "\t\tSet the system in maintenance mode\n\n";
+echo "\t\tIf the optionally entered maintenance reason is an url\n";
+echo "\t\tthe visitor is redirected to that page.\n";
+echo "\n";
+echo "\t\tExamples:\n";
+echo "\t\t\tphp {$argv[0]} 1 System upgrade\n";
+echo "\t\t\tphp {$argv[0]} 1 http://domain.tld/downtime\n";
+echo "\n";
+echo "\tphp {$argv[0]} 0\n";
+echo "\t\tSet the system in normal mode\n\n";

diff --git a/util/messages.po b/util/messages.po
index 150e2efaa0c835e3ea6dd05c27f3f6a2641da0e8..4fcfa9b16b1832955e9791dbbfef1159d69e3b4e 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-03-03 10:29+0100\n"
+"POT-Creation-Date: 2017-03-20 08:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,238 +18,132 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 
-#: include/profile_selectors.php:6
-msgid "Male"
-msgstr ""
-
-#: include/profile_selectors.php:6
-msgid "Female"
-msgstr ""
-
-#: include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr ""
-
-#: include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr ""
-
-#: include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr ""
-
-#: include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr ""
-
-#: include/profile_selectors.php:6
-msgid "Transgender"
-msgstr ""
-
-#: include/profile_selectors.php:6
-msgid "Intersex"
-msgstr ""
-
-#: include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr ""
-
-#: include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr ""
-
-#: include/profile_selectors.php:6
-msgid "Neuter"
-msgstr ""
-
-#: include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr ""
-
-#: include/profile_selectors.php:6
-msgid "Other"
-msgstr ""
-
-#: include/profile_selectors.php:6 include/conversation.php:1478
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/profile_selectors.php:23
-msgid "Males"
-msgstr ""
-
-#: include/profile_selectors.php:23
-msgid "Females"
-msgstr ""
-
-#: include/profile_selectors.php:23
-msgid "Gay"
-msgstr ""
-
-#: include/profile_selectors.php:23
-msgid "Lesbian"
-msgstr ""
-
-#: include/profile_selectors.php:23
-msgid "No Preference"
-msgstr ""
-
-#: include/profile_selectors.php:23
-msgid "Bisexual"
-msgstr ""
-
-#: include/profile_selectors.php:23
-msgid "Autosexual"
-msgstr ""
-
-#: include/profile_selectors.php:23
-msgid "Abstinent"
-msgstr ""
-
-#: include/profile_selectors.php:23
-msgid "Virgin"
-msgstr ""
-
-#: include/profile_selectors.php:23
-msgid "Deviant"
-msgstr ""
-
-#: include/profile_selectors.php:23
-msgid "Fetish"
-msgstr ""
-
-#: include/profile_selectors.php:23
-msgid "Oodles"
-msgstr ""
-
-#: include/profile_selectors.php:23
-msgid "Nonsexual"
-msgstr ""
-
-#: include/profile_selectors.php:42
-msgid "Single"
-msgstr ""
-
-#: include/profile_selectors.php:42
-msgid "Lonely"
+#: boot.php:976
+msgid "Delete this item?"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Available"
+#: boot.php:977 include/ForumManager.php:119 include/contact_widgets.php:253
+#: include/items.php:2254 mod/content.php:624 object/Item.php:420
+#: view/theme/vier/theme.php:255
+msgid "show more"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Unavailable"
+#: boot.php:978
+msgid "show fewer"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Has crush"
+#: boot.php:1667
+#, php-format
+msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Infatuated"
+#: boot.php:1779
+msgid "Create a New Account"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Dating"
+#: boot.php:1780 include/nav.php:109 mod/register.php:289
+msgid "Register"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Unfaithful"
+#: boot.php:1804 include/nav.php:78 view/theme/frio/theme.php:243
+msgid "Logout"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Sex Addict"
+#: boot.php:1805 include/nav.php:95 mod/bookmarklet.php:12
+msgid "Login"
 msgstr ""
 
-#: include/profile_selectors.php:42 include/user.php:280 include/user.php:284
-msgid "Friends"
+#: boot.php:1807 mod/lostpass.php:161
+msgid "Nickname or Email: "
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Friends/Benefits"
+#: boot.php:1808
+msgid "Password: "
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Casual"
+#: boot.php:1809
+msgid "Remember me"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Engaged"
+#: boot.php:1812
+msgid "Or login using OpenID: "
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Married"
+#: boot.php:1818
+msgid "Forgot your password?"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Imaginarily married"
+#: boot.php:1819 mod/lostpass.php:110
+msgid "Password Reset"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Partners"
+#: boot.php:1821
+msgid "Website Terms of Service"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Cohabiting"
+#: boot.php:1822
+msgid "terms of service"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Common law"
+#: boot.php:1824
+msgid "Website Privacy Policy"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Happy"
+#: boot.php:1825
+msgid "privacy policy"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Not looking"
+#: include/Contact.php:387 include/Contact.php:400 include/Contact.php:445
+#: include/conversation.php:970 include/conversation.php:986
+#: mod/allfriends.php:68 mod/directory.php:157 mod/dirfind.php:209
+#: mod/match.php:73 mod/suggest.php:82
+msgid "View Profile"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Swinger"
+#: include/Contact.php:401 include/contact_widgets.php:32
+#: include/conversation.php:983 mod/allfriends.php:69 mod/contacts.php:610
+#: mod/dirfind.php:210 mod/follow.php:106 mod/match.php:74 mod/suggest.php:83
+msgid "Connect/Follow"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Betrayed"
+#: include/Contact.php:444 include/conversation.php:969
+msgid "View Status"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Separated"
+#: include/Contact.php:446 include/conversation.php:971
+msgid "View Photos"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Unstable"
+#: include/Contact.php:447 include/conversation.php:972
+msgid "Network Posts"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Divorced"
+#: include/Contact.php:448 include/conversation.php:973
+msgid "View Contact"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Imaginarily divorced"
+#: include/Contact.php:449
+msgid "Drop Contact"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Widowed"
+#: include/Contact.php:450 include/conversation.php:974
+msgid "Send PM"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Uncertain"
+#: include/Contact.php:451 include/conversation.php:978
+msgid "Poke"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "It's complicated"
+#: include/Contact.php:828
+msgid "Organisation"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Don't care"
+#: include/Contact.php:831
+msgid "News"
 msgstr ""
 
-#: include/profile_selectors.php:42
-msgid "Ask me"
+#: include/Contact.php:834
+msgid "Forum"
 msgstr ""
 
 #: include/ForumManager.php:114 include/nav.php:131 include/text.php:1027
@@ -261,23 +155,17 @@ msgstr ""
 msgid "External link to forum"
 msgstr ""
 
-#: include/ForumManager.php:119 include/contact_widgets.php:253
-#: include/items.php:2254 mod/content.php:624 object/Item.php:447
-#: view/theme/vier/theme.php:255 boot.php:971
-msgid "show more"
-msgstr ""
-
 #: include/NotificationsManager.php:153
 msgid "System"
 msgstr ""
 
-#: include/NotificationsManager.php:160 include/nav.php:158 mod/admin.php:412
+#: include/NotificationsManager.php:160 include/nav.php:158 mod/admin.php:421
 #: view/theme/frio/theme.php:253
 msgid "Network"
 msgstr ""
 
-#: include/NotificationsManager.php:167 mod/profiles.php:695
-#: mod/network.php:846
+#: include/NotificationsManager.php:167 mod/network.php:829
+#: mod/profiles.php:695
 msgid "Personal"
 msgstr ""
 
@@ -348,1473 +236,1375 @@ msgstr ""
 msgid "Wall Photos"
 msgstr ""
 
-#: include/auth.php:45
-msgid "Logged out."
+#: include/acl_selectors.php:341
+msgid "Post to Email"
 msgstr ""
 
-#: include/auth.php:116 include/auth.php:177 mod/openid.php:110
-msgid "Login failed."
+#: include/acl_selectors.php:346
+#, php-format
+msgid "Connectors disabled, since \"%s\" is enabled."
 msgstr ""
 
-#: include/auth.php:131 include/user.php:75
-msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
+#: include/acl_selectors.php:347 mod/settings.php:1188
+msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: include/auth.php:131 include/user.php:75
-msgid "The error message was:"
+#: include/acl_selectors.php:352
+msgid "Visible to everybody"
 msgstr ""
 
-#: include/bbcode.php:350 include/bbcode.php:1055 include/bbcode.php:1056
-msgid "Image/photo"
+#: include/acl_selectors.php:353 view/theme/vier/config.php:108
+msgid "show"
 msgstr ""
 
-#: include/bbcode.php:467
-#, php-format
-msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
+#: include/acl_selectors.php:354 view/theme/vier/config.php:108
+msgid "don't show"
 msgstr ""
 
-#: include/bbcode.php:1015 include/bbcode.php:1035
-msgid "$1 wrote:"
+#: include/acl_selectors.php:360 mod/editpost.php:123
+msgid "CC: email addresses"
 msgstr ""
 
-#: include/bbcode.php:1064 include/bbcode.php:1065
-msgid "Encrypted content"
+#: include/acl_selectors.php:361 mod/editpost.php:130
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: include/bbcode.php:1167
-msgid "Invalid source protocol"
+#: include/acl_selectors.php:363 mod/events.php:516 mod/photos.php:1176
+#: mod/photos.php:1558
+msgid "Permissions"
 msgstr ""
 
-#: include/bbcode.php:1177
-msgid "Invalid link protocol"
+#: include/acl_selectors.php:364
+msgid "Close"
 msgstr ""
 
-#: include/dba_pdo.php:72 include/dba.php:56
+#: include/api.php:1021
 #, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+msgid "Daily posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: include/enotify.php:24
-msgid "Friendica Notification"
-msgstr ""
-
-#: include/enotify.php:27
-msgid "Thank You,"
-msgstr ""
-
-#: include/enotify.php:30
+#: include/api.php:1041
 #, php-format
-msgid "%s Administrator"
+msgid "Weekly posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: include/enotify.php:32
+#: include/api.php:1062
 #, php-format
-msgid "%1$s, %2$s Administrator"
+msgid "Monthly posting limit of %d posts reached. The post was rejected."
 msgstr ""
 
-#: include/enotify.php:43 include/delivery.php:482
-msgid "noreply"
+#: include/auth.php:45
+msgid "Logged out."
 msgstr ""
 
-#: include/enotify.php:70
-#, php-format
-msgid "%s <!item_type!>"
+#: include/auth.php:116 include/auth.php:178 mod/openid.php:110
+msgid "Login failed."
 msgstr ""
 
-#: include/enotify.php:83
-#, php-format
-msgid "[Friendica:Notify] New mail received at %s"
+#: include/auth.php:132 include/user.php:75
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
 msgstr ""
 
-#: include/enotify.php:85
-#, php-format
-msgid "%1$s sent you a new private message at %2$s."
+#: include/auth.php:132 include/user.php:75
+msgid "The error message was:"
 msgstr ""
 
-#: include/enotify.php:86
-#, php-format
-msgid "%1$s sent you %2$s."
+#: include/bb2diaspora.php:199 include/event.php:16 mod/localtime.php:12
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: include/enotify.php:86
-msgid "a private message"
+#: include/bb2diaspora.php:205 include/event.php:33 include/event.php:51
+#: include/event.php:488
+msgid "Starts:"
 msgstr ""
 
-#: include/enotify.php:88
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: include/bb2diaspora.php:213 include/event.php:36 include/event.php:57
+#: include/event.php:489
+msgid "Finishes:"
 msgstr ""
 
-#: include/enotify.php:134
-#, php-format
-msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
+#: include/bb2diaspora.php:221 include/event.php:39 include/event.php:63
+#: include/event.php:490 include/identity.php:331 mod/contacts.php:636
+#: mod/directory.php:139 mod/events.php:501 mod/notifications.php:238
+msgid "Location:"
 msgstr ""
 
-#: include/enotify.php:141
-#, php-format
-msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
+#: include/bbcode.php:350 include/bbcode.php:1055 include/bbcode.php:1056
+msgid "Image/photo"
 msgstr ""
 
-#: include/enotify.php:149
+#: include/bbcode.php:467
 #, php-format
-msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
+msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
 msgstr ""
 
-#: include/enotify.php:159
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
+#: include/bbcode.php:1015 include/bbcode.php:1035
+msgid "$1 wrote:"
 msgstr ""
 
-#: include/enotify.php:161
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
+#: include/bbcode.php:1064 include/bbcode.php:1065
+msgid "Encrypted content"
 msgstr ""
 
-#: include/enotify.php:164 include/enotify.php:178 include/enotify.php:192
-#: include/enotify.php:206 include/enotify.php:224 include/enotify.php:238
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: include/bbcode.php:1169
+msgid "Invalid source protocol"
 msgstr ""
 
-#: include/enotify.php:171
-#, php-format
-msgid "[Friendica:Notify] %s posted to your profile wall"
+#: include/bbcode.php:1179
+msgid "Invalid link protocol"
 msgstr ""
 
-#: include/enotify.php:173
-#, php-format
-msgid "%1$s posted to your profile wall at %2$s"
+#: include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
 msgstr ""
 
-#: include/enotify.php:174
-#, php-format
-msgid "%1$s posted to [url=%2$s]your wall[/url]"
+#: include/contact_selectors.php:33
+msgid "Block immediately"
 msgstr ""
 
-#: include/enotify.php:185
-#, php-format
-msgid "[Friendica:Notify] %s tagged you"
+#: include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
 msgstr ""
 
-#: include/enotify.php:187
-#, php-format
-msgid "%1$s tagged you at %2$s"
+#: include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
 msgstr ""
 
-#: include/enotify.php:188
-#, php-format
-msgid "%1$s [url=%2$s]tagged you[/url]."
+#: include/contact_selectors.php:36
+msgid "OK, probably harmless"
 msgstr ""
 
-#: include/enotify.php:199
-#, php-format
-msgid "[Friendica:Notify] %s shared a new post"
+#: include/contact_selectors.php:37
+msgid "Reputable, has my trust"
 msgstr ""
 
-#: include/enotify.php:201
-#, php-format
-msgid "%1$s shared a new post at %2$s"
+#: include/contact_selectors.php:56 mod/admin.php:893
+msgid "Frequently"
 msgstr ""
 
-#: include/enotify.php:202
-#, php-format
-msgid "%1$s [url=%2$s]shared a post[/url]."
+#: include/contact_selectors.php:57 mod/admin.php:894
+msgid "Hourly"
 msgstr ""
 
-#: include/enotify.php:213
-#, php-format
-msgid "[Friendica:Notify] %1$s poked you"
+#: include/contact_selectors.php:58 mod/admin.php:895
+msgid "Twice daily"
 msgstr ""
 
-#: include/enotify.php:215
-#, php-format
-msgid "%1$s poked you at %2$s"
+#: include/contact_selectors.php:59 mod/admin.php:896
+msgid "Daily"
 msgstr ""
 
-#: include/enotify.php:216
-#, php-format
-msgid "%1$s [url=%2$s]poked you[/url]."
+#: include/contact_selectors.php:60
+msgid "Weekly"
 msgstr ""
 
-#: include/enotify.php:231
-#, php-format
-msgid "[Friendica:Notify] %s tagged your post"
+#: include/contact_selectors.php:61
+msgid "Monthly"
 msgstr ""
 
-#: include/enotify.php:233
-#, php-format
-msgid "%1$s tagged your post at %2$s"
+#: include/contact_selectors.php:76 mod/dfrn_request.php:881
+msgid "Friendica"
 msgstr ""
 
-#: include/enotify.php:234
-#, php-format
-msgid "%1$s tagged [url=%2$s]your post[/url]"
+#: include/contact_selectors.php:77
+msgid "OStatus"
 msgstr ""
 
-#: include/enotify.php:245
-msgid "[Friendica:Notify] Introduction received"
+#: include/contact_selectors.php:78
+msgid "RSS/Atom"
 msgstr ""
 
-#: include/enotify.php:247
-#, php-format
-msgid "You've received an introduction from '%1$s' at %2$s"
+#: include/contact_selectors.php:79 include/contact_selectors.php:86
+#: mod/admin.php:1405 mod/admin.php:1418 mod/admin.php:1431 mod/admin.php:1449
+msgid "Email"
 msgstr ""
 
-#: include/enotify.php:248
-#, php-format
-msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
+#: include/contact_selectors.php:80 mod/dfrn_request.php:883
+#: mod/settings.php:848
+msgid "Diaspora"
 msgstr ""
 
-#: include/enotify.php:252 include/enotify.php:295
-#, php-format
-msgid "You may visit their profile at %s"
+#: include/contact_selectors.php:81
+msgid "Facebook"
 msgstr ""
 
-#: include/enotify.php:254
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
+#: include/contact_selectors.php:82
+msgid "Zot!"
 msgstr ""
 
-#: include/enotify.php:262
-msgid "[Friendica:Notify] A new person is sharing with you"
+#: include/contact_selectors.php:83
+msgid "LinkedIn"
 msgstr ""
 
-#: include/enotify.php:264 include/enotify.php:265
-#, php-format
-msgid "%1$s is sharing with you at %2$s"
+#: include/contact_selectors.php:84
+msgid "XMPP/IM"
 msgstr ""
 
-#: include/enotify.php:271
-msgid "[Friendica:Notify] You have a new follower"
+#: include/contact_selectors.php:85
+msgid "MySpace"
 msgstr ""
 
-#: include/enotify.php:273 include/enotify.php:274
-#, php-format
-msgid "You have a new follower at %2$s : %1$s"
+#: include/contact_selectors.php:87
+msgid "Google+"
 msgstr ""
 
-#: include/enotify.php:285
-msgid "[Friendica:Notify] Friend suggestion received"
+#: include/contact_selectors.php:88
+msgid "pump.io"
 msgstr ""
 
-#: include/enotify.php:287
-#, php-format
-msgid "You've received a friend suggestion from '%1$s' at %2$s"
+#: include/contact_selectors.php:89
+msgid "Twitter"
 msgstr ""
 
-#: include/enotify.php:288
-#, php-format
-msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
+#: include/contact_selectors.php:90
+msgid "Diaspora Connector"
 msgstr ""
 
-#: include/enotify.php:293
-msgid "Name:"
+#: include/contact_selectors.php:91
+msgid "GNU Social"
 msgstr ""
 
-#: include/enotify.php:294
-msgid "Photo:"
+#: include/contact_selectors.php:92
+msgid "pnut"
 msgstr ""
 
-#: include/enotify.php:297
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: include/contact_selectors.php:93
+msgid "App.net"
 msgstr ""
 
-#: include/enotify.php:305 include/enotify.php:319
-msgid "[Friendica:Notify] Connection accepted"
+#: include/contact_selectors.php:104
+msgid "Hubzilla/Redmatrix"
 msgstr ""
 
-#: include/enotify.php:307 include/enotify.php:321
-#, php-format
-msgid "'%1$s' has accepted your connection request at %2$s"
+#: include/contact_widgets.php:6
+msgid "Add New Contact"
 msgstr ""
 
-#: include/enotify.php:308 include/enotify.php:322
-#, php-format
-msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
+#: include/contact_widgets.php:7
+msgid "Enter address or web location"
 msgstr ""
 
-#: include/enotify.php:312
-msgid ""
-"You are now mutual friends and may exchange status updates, photos, and "
-"email without restriction."
+#: include/contact_widgets.php:8
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: include/enotify.php:314
-#, php-format
-msgid "Please visit %s if you wish to make any changes to this relationship."
+#: include/contact_widgets.php:10 include/identity.php:219
+#: mod/allfriends.php:85 mod/dirfind.php:207 mod/match.php:89
+#: mod/suggest.php:101
+msgid "Connect"
 msgstr ""
 
-#: include/enotify.php:326
+#: include/contact_widgets.php:24
 #, php-format
-msgid ""
-"'%1$s' has chosen to accept you a \"fan\", which restricts some forms of "
-"communication - such as private messaging and some profile interactions. If "
-"this is a celebrity or community page, these settings were applied "
-"automatically."
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/contact_widgets.php:30
+msgid "Find People"
 msgstr ""
 
-#: include/enotify.php:328
-#, php-format
-msgid ""
-"'%1$s' may choose to extend this into a two-way or more permissive "
-"relationship in the future."
+#: include/contact_widgets.php:31
+msgid "Enter name or interest"
 msgstr ""
 
-#: include/enotify.php:330
-#, php-format
-msgid "Please visit %s  if you wish to make any changes to this relationship."
+#: include/contact_widgets.php:33
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: include/enotify.php:340
-msgid "[Friendica System:Notify] registration request"
+#: include/contact_widgets.php:34 mod/contacts.php:806 mod/directory.php:206
+msgid "Find"
 msgstr ""
 
-#: include/enotify.php:342
-#, php-format
-msgid "You've received a registration request from '%1$s' at %2$s"
+#: include/contact_widgets.php:35 mod/suggest.php:114
+#: view/theme/vier/theme.php:198
+msgid "Friend Suggestions"
 msgstr ""
 
-#: include/enotify.php:343
-#, php-format
-msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
+#: include/contact_widgets.php:36 view/theme/vier/theme.php:197
+msgid "Similar Interests"
 msgstr ""
 
-#: include/enotify.php:347
-#, php-format
-msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
+#: include/contact_widgets.php:37
+msgid "Random Profile"
 msgstr ""
 
-#: include/enotify.php:350
-#, php-format
-msgid "Please visit %s to approve or reject the request."
+#: include/contact_widgets.php:38 view/theme/vier/theme.php:199
+msgid "Invite Friends"
 msgstr ""
 
-#: include/follow.php:81 mod/dfrn_request.php:512
-msgid "Disallowed profile URL."
+#: include/contact_widgets.php:115
+msgid "Networks"
 msgstr ""
 
-#: include/follow.php:86
-msgid "Connect URL missing."
+#: include/contact_widgets.php:118
+msgid "All Networks"
 msgstr ""
 
-#: include/follow.php:114
-msgid ""
-"This site is not configured to allow communications with other networks."
+#: include/contact_widgets.php:150 include/features.php:104
+msgid "Saved Folders"
 msgstr ""
 
-#: include/follow.php:115 include/follow.php:129
-msgid "No compatible communication protocols or feeds were discovered."
+#: include/contact_widgets.php:153 include/contact_widgets.php:187
+msgid "Everything"
 msgstr ""
 
-#: include/follow.php:127
-msgid "The profile address specified does not provide adequate information."
+#: include/contact_widgets.php:184
+msgid "Categories"
 msgstr ""
 
-#: include/follow.php:132
-msgid "An author or name was not found."
-msgstr ""
+#: include/contact_widgets.php:248
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/follow.php:135
-msgid "No browser URL could be matched to this address."
+#: include/conversation.php:122 include/conversation.php:258
+#: include/like.php:180 include/text.php:1804
+msgid "event"
 msgstr ""
 
-#: include/follow.php:138
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
+#: include/conversation.php:125 include/conversation.php:134
+#: include/conversation.php:261 include/conversation.php:270
+#: include/diaspora.php:1530 include/like.php:178 mod/subthread.php:88
+#: mod/tagger.php:62
+msgid "status"
 msgstr ""
 
-#: include/follow.php:139
-msgid "Use mailto: in front of address to force email check."
+#: include/conversation.php:130 include/conversation.php:266
+#: include/like.php:178 include/text.php:1806 mod/subthread.php:88
+#: mod/tagger.php:62
+msgid "photo"
 msgstr ""
 
-#: include/follow.php:145
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
+#: include/conversation.php:141 include/diaspora.php:1526 include/like.php:27
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: include/follow.php:150
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
+#: include/conversation.php:144 include/like.php:31 include/like.php:36
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: include/follow.php:251
-msgid "Unable to retrieve contact information."
+#: include/conversation.php:147
+#, php-format
+msgid "%1$s attends %2$s's %3$s"
 msgstr ""
 
-#: include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
+#: include/conversation.php:150
+#, php-format
+msgid "%1$s doesn't attend %2$s's %3$s"
 msgstr ""
 
-#: include/group.php:210
-msgid "Default privacy group for new contacts"
+#: include/conversation.php:153
+#, php-format
+msgid "%1$s attends maybe %2$s's %3$s"
 msgstr ""
 
-#: include/group.php:243
-msgid "Everybody"
+#: include/conversation.php:185 mod/dfrn_confirm.php:478
+#, php-format
+msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: include/group.php:266
-msgid "edit"
+#: include/conversation.php:219
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: include/group.php:287 mod/newmember.php:61
-msgid "Groups"
+#: include/conversation.php:239 mod/mood.php:63
+#, php-format
+msgid "%1$s is currently %2$s"
 msgstr ""
 
-#: include/group.php:289
-msgid "Edit groups"
+#: include/conversation.php:278 mod/tagger.php:95
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: include/group.php:291
-msgid "Edit group"
+#: include/conversation.php:303
+msgid "post/item"
 msgstr ""
 
-#: include/group.php:292
-msgid "Create a new group"
+#: include/conversation.php:304
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: include/group.php:293 mod/group.php:98 mod/group.php:188
-msgid "Group Name: "
+#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1629
+#: mod/profiles.php:346
+msgid "Likes"
 msgstr ""
 
-#: include/group.php:295
-msgid "Contacts not in any group"
+#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1629
+#: mod/profiles.php:350
+msgid "Dislikes"
 msgstr ""
 
-#: include/group.php:297 mod/network.php:200
-msgid "add"
-msgstr ""
+#: include/conversation.php:588 include/conversation.php:1473
+#: mod/content.php:373 mod/photos.php:1630
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/like.php:164 include/conversation.php:130
-#: include/conversation.php:266 include/text.php:1806 mod/subthread.php:88
-#: mod/tagger.php:62
-msgid "photo"
+#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1630
+msgid "Not attending"
 msgstr ""
 
-#: include/like.php:164 include/conversation.php:125
-#: include/conversation.php:134 include/conversation.php:261
-#: include/conversation.php:270 include/diaspora.php:1530 mod/subthread.php:88
-#: mod/tagger.php:62
-msgid "status"
+#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1630
+msgid "Might attend"
 msgstr ""
 
-#: include/like.php:166 include/conversation.php:122
-#: include/conversation.php:258 include/text.php:1804
-msgid "event"
+#: include/conversation.php:710 mod/content.php:453 mod/content.php:759
+#: mod/photos.php:1703 object/Item.php:137
+msgid "Select"
 msgstr ""
 
-#: include/like.php:184 include/conversation.php:141 include/diaspora.php:1526
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: include/conversation.php:711 mod/admin.php:1423 mod/contacts.php:816
+#: mod/contacts.php:1015 mod/content.php:454 mod/content.php:760
+#: mod/group.php:181 mod/photos.php:1704 mod/settings.php:744
+#: object/Item.php:138
+msgid "Delete"
 msgstr ""
 
-#: include/like.php:187 include/conversation.php:144
+#: include/conversation.php:755 mod/content.php:487 mod/content.php:915
+#: mod/content.php:916 object/Item.php:356 object/Item.php:357
 #, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: include/like.php:190
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
+#: include/conversation.php:767 object/Item.php:344
+msgid "Categories:"
 msgstr ""
 
-#: include/like.php:193
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
+#: include/conversation.php:768 object/Item.php:345
+msgid "Filed under:"
 msgstr ""
 
-#: include/like.php:196
+#: include/conversation.php:775 mod/content.php:497 mod/content.php:928
+#: object/Item.php:370
 #, php-format
-msgid "%1$s may attend %2$s's %3$s"
+msgid "%s from %s"
 msgstr ""
 
-#: include/message.php:15 include/message.php:169
-msgid "[no subject]"
+#: include/conversation.php:791 mod/content.php:513
+msgid "View in context"
 msgstr ""
 
-#: include/nav.php:35 mod/navigation.php:19
-msgid "Nothing new here"
+#: include/conversation.php:793 include/conversation.php:1256
+#: mod/content.php:515 mod/content.php:953 mod/editpost.php:114
+#: mod/message.php:337 mod/message.php:522 mod/photos.php:1592
+#: mod/wallmessage.php:140 object/Item.php:395
+msgid "Please wait"
 msgstr ""
 
-#: include/nav.php:39 mod/navigation.php:23
-msgid "Clear notifications"
+#: include/conversation.php:872
+msgid "remove"
 msgstr ""
 
-#: include/nav.php:40 include/text.php:1017
-msgid "@name, !forum, #tags, content"
+#: include/conversation.php:876
+msgid "Delete Selected Items"
 msgstr ""
 
-#: include/nav.php:78 view/theme/frio/theme.php:243 boot.php:1833
-msgid "Logout"
+#: include/conversation.php:968
+msgid "Follow Thread"
 msgstr ""
 
-#: include/nav.php:78 view/theme/frio/theme.php:243
-msgid "End this session"
+#: include/conversation.php:1100
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: include/nav.php:81 include/identity.php:766 mod/contacts.php:645
-#: mod/contacts.php:841 view/theme/frio/theme.php:246
-msgid "Status"
+#: include/conversation.php:1103
+#, php-format
+msgid "%s doesn't like this."
 msgstr ""
 
-#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:246
-msgid "Your posts and conversations"
+#: include/conversation.php:1106
+#, php-format
+msgid "%s attends."
 msgstr ""
 
-#: include/nav.php:82 include/identity.php:617 include/identity.php:741
-#: include/identity.php:774 mod/newmember.php:32 mod/profperm.php:105
-#: mod/contacts.php:647 mod/contacts.php:849 view/theme/frio/theme.php:247
-msgid "Profile"
+#: include/conversation.php:1109
+#, php-format
+msgid "%s doesn't attend."
 msgstr ""
 
-#: include/nav.php:82 view/theme/frio/theme.php:247
-msgid "Your profile page"
+#: include/conversation.php:1112
+#, php-format
+msgid "%s attends maybe."
 msgstr ""
 
-#: include/nav.php:83 include/identity.php:782 mod/fbrowser.php:31
-#: view/theme/frio/theme.php:248
-msgid "Photos"
+#: include/conversation.php:1122
+msgid "and"
 msgstr ""
 
-#: include/nav.php:83 view/theme/frio/theme.php:248
-msgid "Your photos"
+#: include/conversation.php:1128
+#, php-format
+msgid ", and %d other people"
 msgstr ""
 
-#: include/nav.php:84 include/identity.php:790 include/identity.php:793
-#: view/theme/frio/theme.php:249
-msgid "Videos"
+#: include/conversation.php:1137
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this"
 msgstr ""
 
-#: include/nav.php:84 view/theme/frio/theme.php:249
-msgid "Your videos"
+#: include/conversation.php:1138
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: include/nav.php:85 include/nav.php:149 include/identity.php:802
-#: include/identity.php:813 mod/cal.php:270 mod/events.php:386
-#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254
-msgid "Events"
+#: include/conversation.php:1141
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this"
 msgstr ""
 
-#: include/nav.php:85 view/theme/frio/theme.php:250
-msgid "Your events"
+#: include/conversation.php:1142
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: include/nav.php:86
-msgid "Personal notes"
+#: include/conversation.php:1145
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend"
 msgstr ""
 
-#: include/nav.php:86
-msgid "Your personal notes"
+#: include/conversation.php:1146
+#, php-format
+msgid "%s attend."
 msgstr ""
 
-#: include/nav.php:95 mod/bookmarklet.php:12 boot.php:1834
-msgid "Login"
+#: include/conversation.php:1149
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't attend"
 msgstr ""
 
-#: include/nav.php:95
-msgid "Sign in"
+#: include/conversation.php:1150
+#, php-format
+msgid "%s don't attend."
 msgstr ""
 
-#: include/nav.php:105
-msgid "Home Page"
+#: include/conversation.php:1153
+#, php-format
+msgid "<span  %1$s>%2$d people</span> attend maybe"
 msgstr ""
 
-#: include/nav.php:109 mod/register.php:289 boot.php:1809
-msgid "Register"
+#: include/conversation.php:1154
+#, php-format
+msgid "%s anttend maybe."
 msgstr ""
 
-#: include/nav.php:109
-msgid "Create an account"
+#: include/conversation.php:1184 include/conversation.php:1200
+msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:293
-msgid "Help"
+#: include/conversation.php:1185 include/conversation.php:1201
+#: mod/message.php:271 mod/message.php:278 mod/message.php:418
+#: mod/message.php:425 mod/wallmessage.php:114 mod/wallmessage.php:121
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: include/nav.php:115
-msgid "Help and documentation"
+#: include/conversation.php:1186 include/conversation.php:1202
+msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: include/nav.php:119
-msgid "Apps"
+#: include/conversation.php:1187 include/conversation.php:1203
+msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: include/nav.php:119
-msgid "Addon applications, utilities, games"
+#: include/conversation.php:1188 include/conversation.php:1204
+msgid "Tag term:"
 msgstr ""
 
-#: include/nav.php:123 include/text.php:1014 mod/search.php:149
-msgid "Search"
+#: include/conversation.php:1189 include/conversation.php:1205
+#: mod/filer.php:30
+msgid "Save to Folder:"
 msgstr ""
 
-#: include/nav.php:123
-msgid "Search site content"
+#: include/conversation.php:1190 include/conversation.php:1206
+msgid "Where are you right now?"
 msgstr ""
 
-#: include/nav.php:126 include/text.php:1022
-msgid "Full Text"
+#: include/conversation.php:1191
+msgid "Delete item(s)?"
 msgstr ""
 
-#: include/nav.php:127 include/text.php:1023
-msgid "Tags"
+#: include/conversation.php:1237
+msgid "Share"
 msgstr ""
 
-#: include/nav.php:128 include/nav.php:192 include/identity.php:835
-#: include/identity.php:838 include/text.php:1024 mod/contacts.php:800
-#: mod/contacts.php:861 mod/viewcontacts.php:121 view/theme/frio/theme.php:257
-msgid "Contacts"
+#: include/conversation.php:1238 mod/editpost.php:100 mod/message.php:335
+#: mod/message.php:519 mod/wallmessage.php:138
+msgid "Upload photo"
 msgstr ""
 
-#: include/nav.php:143 include/nav.php:145 mod/community.php:36
-msgid "Community"
+#: include/conversation.php:1239 mod/editpost.php:101
+msgid "upload photo"
 msgstr ""
 
-#: include/nav.php:143
-msgid "Conversations on this site"
+#: include/conversation.php:1240 mod/editpost.php:102
+msgid "Attach file"
 msgstr ""
 
-#: include/nav.php:145
-msgid "Conversations on the network"
+#: include/conversation.php:1241 mod/editpost.php:103
+msgid "attach file"
 msgstr ""
 
-#: include/nav.php:149 include/identity.php:805 include/identity.php:816
-#: view/theme/frio/theme.php:254
-msgid "Events and Calendar"
+#: include/conversation.php:1242 mod/editpost.php:104 mod/message.php:336
+#: mod/message.php:520 mod/wallmessage.php:139
+msgid "Insert web link"
 msgstr ""
 
-#: include/nav.php:152
-msgid "Directory"
+#: include/conversation.php:1243 mod/editpost.php:105
+msgid "web link"
 msgstr ""
 
-#: include/nav.php:152
-msgid "People directory"
+#: include/conversation.php:1244 mod/editpost.php:106
+msgid "Insert video link"
 msgstr ""
 
-#: include/nav.php:154
-msgid "Information"
+#: include/conversation.php:1245 mod/editpost.php:107
+msgid "video link"
 msgstr ""
 
-#: include/nav.php:154
-msgid "Information about this friendica instance"
+#: include/conversation.php:1246 mod/editpost.php:108
+msgid "Insert audio link"
 msgstr ""
 
-#: include/nav.php:158 view/theme/frio/theme.php:253
-msgid "Conversations from your friends"
+#: include/conversation.php:1247 mod/editpost.php:109
+msgid "audio link"
 msgstr ""
 
-#: include/nav.php:159
-msgid "Network Reset"
+#: include/conversation.php:1248 mod/editpost.php:110
+msgid "Set your location"
 msgstr ""
 
-#: include/nav.php:159
-msgid "Load Network page with no filters"
+#: include/conversation.php:1249 mod/editpost.php:111
+msgid "set location"
 msgstr ""
 
-#: include/nav.php:166
-msgid "Friend Requests"
+#: include/conversation.php:1250 mod/editpost.php:112
+msgid "Clear browser location"
 msgstr ""
 
-#: include/nav.php:169 mod/notifications.php:96
-msgid "Notifications"
+#: include/conversation.php:1251 mod/editpost.php:113
+msgid "clear location"
 msgstr ""
 
-#: include/nav.php:170
-msgid "See all notifications"
+#: include/conversation.php:1253 mod/editpost.php:127
+msgid "Set title"
 msgstr ""
 
-#: include/nav.php:171 mod/settings.php:906
-msgid "Mark as seen"
+#: include/conversation.php:1255 mod/editpost.php:129
+msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: include/nav.php:171
-msgid "Mark all system notifications seen"
+#: include/conversation.php:1257 mod/editpost.php:115
+msgid "Permission settings"
 msgstr ""
 
-#: include/nav.php:175 mod/message.php:179 view/theme/frio/theme.php:255
-msgid "Messages"
+#: include/conversation.php:1258 mod/editpost.php:144
+msgid "permissions"
 msgstr ""
 
-#: include/nav.php:175 view/theme/frio/theme.php:255
-msgid "Private mail"
+#: include/conversation.php:1266 mod/editpost.php:124
+msgid "Public post"
 msgstr ""
 
-#: include/nav.php:176
-msgid "Inbox"
+#: include/conversation.php:1271 mod/content.php:737 mod/editpost.php:135
+#: mod/events.php:511 mod/photos.php:1613 mod/photos.php:1661
+#: mod/photos.php:1747 object/Item.php:714
+msgid "Preview"
 msgstr ""
 
-#: include/nav.php:177
-msgid "Outbox"
+#: include/conversation.php:1275 include/items.php:1983 mod/contacts.php:455
+#: mod/dfrn_request.php:889 mod/editpost.php:138 mod/fbrowser.php:100
+#: mod/fbrowser.php:135 mod/follow.php:124 mod/message.php:209
+#: mod/photos.php:240 mod/photos.php:331 mod/settings.php:682
+#: mod/settings.php:708 mod/suggest.php:32 mod/tagrm.php:11 mod/tagrm.php:96
+#: mod/videos.php:132
+msgid "Cancel"
 msgstr ""
 
-#: include/nav.php:178 mod/message.php:16
-msgid "New Message"
+#: include/conversation.php:1281
+msgid "Post to Groups"
 msgstr ""
 
-#: include/nav.php:181
-msgid "Manage"
+#: include/conversation.php:1282
+msgid "Post to Contacts"
 msgstr ""
 
-#: include/nav.php:181
-msgid "Manage other pages"
+#: include/conversation.php:1283
+msgid "Private post"
 msgstr ""
 
-#: include/nav.php:184 mod/settings.php:81
-msgid "Delegations"
+#: include/conversation.php:1288 include/identity.php:259 mod/editpost.php:142
+msgid "Message"
 msgstr ""
 
-#: include/nav.php:184 mod/delegate.php:130
-msgid "Delegate Page Management"
+#: include/conversation.php:1289 mod/editpost.php:143
+msgid "Browser"
 msgstr ""
 
-#: include/nav.php:186 mod/newmember.php:22 mod/settings.php:111
-#: mod/admin.php:1545 mod/admin.php:1815 view/theme/frio/theme.php:256
-msgid "Settings"
+#: include/conversation.php:1445
+msgid "View all"
 msgstr ""
 
-#: include/nav.php:186 view/theme/frio/theme.php:256
-msgid "Account settings"
-msgstr ""
+#: include/conversation.php:1467
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/nav.php:189 include/identity.php:285
-msgid "Profiles"
-msgstr ""
+#: include/conversation.php:1470
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/nav.php:189
-msgid "Manage/Edit Profiles"
-msgstr ""
+#: include/conversation.php:1476
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/nav.php:192 view/theme/frio/theme.php:257
-msgid "Manage/edit friends and contacts"
-msgstr ""
+#: include/conversation.php:1479 include/profile_selectors.php:6
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
 
-#: include/nav.php:197 mod/admin.php:187
-msgid "Admin"
+#: include/datetime.php:58 include/datetime.php:60 mod/profiles.php:697
+msgid "Miscellaneous"
 msgstr ""
 
-#: include/nav.php:197
-msgid "Site setup and configuration"
+#: include/datetime.php:184 include/identity.php:641
+msgid "Birthday:"
 msgstr ""
 
-#: include/nav.php:200
-msgid "Navigation"
+#: include/datetime.php:186 mod/profiles.php:720
+msgid "Age: "
 msgstr ""
 
-#: include/nav.php:200
-msgid "Site map"
+#: include/datetime.php:188
+msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: include/oembed.php:266
-msgid "Embedded content"
+#: include/datetime.php:343
+msgid "never"
 msgstr ""
 
-#: include/oembed.php:274
-msgid "Embedding disabled"
+#: include/datetime.php:349
+msgid "less than a second ago"
 msgstr ""
 
-#: include/ostatus.php:1832
-#, php-format
-msgid "%s is now following %s."
+#: include/datetime.php:352
+msgid "year"
 msgstr ""
 
-#: include/ostatus.php:1833
-msgid "following"
+#: include/datetime.php:352
+msgid "years"
 msgstr ""
 
-#: include/ostatus.php:1836
-#, php-format
-msgid "%s stopped following %s."
+#: include/datetime.php:353 include/event.php:481 mod/cal.php:279
+#: mod/events.php:396
+msgid "month"
 msgstr ""
 
-#: include/ostatus.php:1837
-msgid "stopped following"
+#: include/datetime.php:353
+msgid "months"
 msgstr ""
 
-#: include/plugin.php:530 include/plugin.php:532
-msgid "Click here to upgrade."
+#: include/datetime.php:354 include/event.php:482 mod/cal.php:280
+#: mod/events.php:397
+msgid "week"
 msgstr ""
 
-#: include/plugin.php:538
-msgid "This action exceeds the limits set by your subscription plan."
+#: include/datetime.php:354
+msgid "weeks"
 msgstr ""
 
-#: include/plugin.php:543
-msgid "This action is not available under your subscription plan."
+#: include/datetime.php:355 include/event.php:483 mod/cal.php:281
+#: mod/events.php:398
+msgid "day"
 msgstr ""
 
-#: include/security.php:22
-msgid "Welcome "
+#: include/datetime.php:355
+msgid "days"
 msgstr ""
 
-#: include/security.php:23
-msgid "Please upload a profile photo."
+#: include/datetime.php:356
+msgid "hour"
 msgstr ""
 
-#: include/security.php:26
-msgid "Welcome back "
+#: include/datetime.php:356
+msgid "hours"
 msgstr ""
 
-#: include/security.php:375
-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."
+#: include/datetime.php:357
+msgid "minute"
 msgstr ""
 
-#: include/uimport.php:94
-msgid "Error decoding account file"
+#: include/datetime.php:357
+msgid "minutes"
 msgstr ""
 
-#: include/uimport.php:100
-msgid "Error! No version data in file! This is not a Friendica account file?"
+#: include/datetime.php:358
+msgid "second"
 msgstr ""
 
-#: include/uimport.php:116 include/uimport.php:127
-msgid "Error! Cannot check nickname"
+#: include/datetime.php:358
+msgid "seconds"
 msgstr ""
 
-#: include/uimport.php:120 include/uimport.php:131
+#: include/datetime.php:367
 #, php-format
-msgid "User '%s' already exists on this server!"
-msgstr ""
-
-#: include/uimport.php:153
-msgid "User creation error"
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: include/uimport.php:173
-msgid "User profile creation error"
+#: include/datetime.php:585
+#, php-format
+msgid "%s's birthday"
 msgstr ""
 
-#: include/uimport.php:222
+#: include/datetime.php:586 include/dfrn.php:1131
 #, php-format
-msgid "%d contact not imported"
-msgid_plural "%d contacts not imported"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/uimport.php:292
-msgid "Done. You can now login with your username and password"
+msgid "Happy Birthday %s"
 msgstr ""
 
-#: include/user.php:39 mod/settings.php:375
-msgid "Passwords do not match. Password unchanged."
+#: include/dba.php:43 include/dba_pdo.php:72
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: include/user.php:48
-msgid "An invitation is required."
+#: include/dbstructure.php:36
+#, 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/user.php:53
-msgid "Invitation could not be verified."
+#: include/dbstructure.php:41
+#, php-format
+msgid ""
+"The error message is\n"
+"[pre]%s[/pre]"
 msgstr ""
 
-#: include/user.php:61
-msgid "Invalid OpenID url"
+#: include/dbstructure.php:199
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: include/user.php:82
-msgid "Please enter the required information."
+#: include/dbstructure.php:333 include/dbstructure.php:341
+#: include/dbstructure.php:349 include/dbstructure.php:354
+#: include/dbstructure.php:359
+msgid "Errors encountered performing database changes."
 msgstr ""
 
-#: include/user.php:96
-msgid "Please use a shorter name."
+#: include/delivery.php:427
+msgid "(no subject)"
 msgstr ""
 
-#: include/user.php:98
-msgid "Name too short."
+#: include/delivery.php:439 include/enotify.php:43
+msgid "noreply"
 msgstr ""
 
-#: include/user.php:113
-msgid "That doesn't appear to be your full (First Last) name."
+#: include/dfrn.php:1130
+#, php-format
+msgid "%s\\'s birthday"
 msgstr ""
 
-#: include/user.php:118
-msgid "Your email domain is not among those allowed on this site."
+#: include/diaspora.php:2087
+msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: include/user.php:121
-msgid "Not a valid email address."
+#: include/diaspora.php:3096
+msgid "Attachments:"
 msgstr ""
 
-#: include/user.php:134
-msgid "Cannot use that email."
+#: include/enotify.php:24
+msgid "Friendica Notification"
 msgstr ""
 
-#: include/user.php:140
-msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
+#: include/enotify.php:27
+msgid "Thank You,"
 msgstr ""
 
-#: include/user.php:147 include/user.php:245
-msgid "Nickname is already registered. Please choose another."
+#: include/enotify.php:30
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
-#: include/user.php:157
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
+#: include/enotify.php:32
+#, php-format
+msgid "%1$s, %2$s Administrator"
 msgstr ""
 
-#: include/user.php:173
-msgid "SERIOUS ERROR: Generation of security keys failed."
+#: include/enotify.php:70
+#, php-format
+msgid "%s <!item_type!>"
 msgstr ""
 
-#: include/user.php:231
-msgid "An error occurred during registration. Please try again."
+#: include/enotify.php:83
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
 msgstr ""
 
-#: include/user.php:256 view/theme/duepuntozero/config.php:43
-#: view/theme/clean/config.php:60
-msgid "default"
+#: include/enotify.php:85
+#, php-format
+msgid "%1$s sent you a new private message at %2$s."
 msgstr ""
 
-#: include/user.php:266
-msgid "An error occurred creating your default profile. Please try again."
+#: include/enotify.php:86
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: include/user.php:326 include/user.php:334 include/user.php:342
-#: mod/profile_photo.php:74 mod/profile_photo.php:82 mod/profile_photo.php:90
-#: mod/profile_photo.php:215 mod/profile_photo.php:310
-#: mod/profile_photo.php:320 mod/photos.php:68 mod/photos.php:182
-#: mod/photos.php:768 mod/photos.php:1231 mod/photos.php:1252
-#: mod/photos.php:1839
-msgid "Profile Photos"
+#: include/enotify.php:86
+msgid "a private message"
 msgstr ""
 
-#: include/user.php:417
+#: include/enotify.php:88
 #, 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"
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: include/user.php:427
+#: include/enotify.php:134
 #, php-format
-msgid "Registration at %s"
+msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
 msgstr ""
 
-#: include/user.php:437
+#: include/enotify.php:141
 #, 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"
+msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 msgstr ""
 
-#: include/user.php:441
+#: include/enotify.php:149
 #, 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."
+msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
 msgstr ""
 
-#: include/user.php:473 mod/admin.php:1234
+#: include/enotify.php:159
 #, php-format
-msgid "Registration details for %s"
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: include/acl_selectors.php:341
-msgid "Post to Email"
+#: include/enotify.php:161
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
-#: include/acl_selectors.php:346
+#: include/enotify.php:164 include/enotify.php:178 include/enotify.php:192
+#: include/enotify.php:206 include/enotify.php:224 include/enotify.php:238
 #, php-format
-msgid "Connectors disabled, since \"%s\" is enabled."
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: include/acl_selectors.php:347 mod/settings.php:1188
-msgid "Hide your profile details from unknown viewers?"
+#: include/enotify.php:171
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: include/acl_selectors.php:352
-msgid "Visible to everybody"
+#: include/enotify.php:173
+#, php-format
+msgid "%1$s posted to your profile wall at %2$s"
 msgstr ""
 
-#: include/acl_selectors.php:353 view/theme/vier/config.php:108
-msgid "show"
+#: include/enotify.php:174
+#, php-format
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
 msgstr ""
 
-#: include/acl_selectors.php:354 view/theme/vier/config.php:108
-msgid "don't show"
+#: include/enotify.php:185
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
 msgstr ""
 
-#: include/acl_selectors.php:360 mod/editpost.php:123
-msgid "CC: email addresses"
+#: include/enotify.php:187
+#, php-format
+msgid "%1$s tagged you at %2$s"
 msgstr ""
 
-#: include/acl_selectors.php:361 mod/editpost.php:130
-msgid "Example: bob@example.com, mary@example.com"
+#: include/enotify.php:188
+#, php-format
+msgid "%1$s [url=%2$s]tagged you[/url]."
 msgstr ""
 
-#: include/acl_selectors.php:363 mod/events.php:516 mod/photos.php:1176
-#: mod/photos.php:1558
-msgid "Permissions"
+#: include/enotify.php:199
+#, php-format
+msgid "[Friendica:Notify] %s shared a new post"
 msgstr ""
 
-#: include/acl_selectors.php:364
-msgid "Close"
+#: include/enotify.php:201
+#, php-format
+msgid "%1$s shared a new post at %2$s"
 msgstr ""
 
-#: include/conversation.php:147
+#: include/enotify.php:202
 #, php-format
-msgid "%1$s attends %2$s's %3$s"
+msgid "%1$s [url=%2$s]shared a post[/url]."
 msgstr ""
 
-#: include/conversation.php:150
+#: include/enotify.php:213
 #, php-format
-msgid "%1$s doesn't attend %2$s's %3$s"
+msgid "[Friendica:Notify] %1$s poked you"
 msgstr ""
 
-#: include/conversation.php:153
+#: include/enotify.php:215
 #, php-format
-msgid "%1$s attends maybe %2$s's %3$s"
+msgid "%1$s poked you at %2$s"
 msgstr ""
 
-#: include/conversation.php:185 mod/dfrn_confirm.php:478
+#: include/enotify.php:216
 #, php-format
-msgid "%1$s is now friends with %2$s"
+msgid "%1$s [url=%2$s]poked you[/url]."
 msgstr ""
 
-#: include/conversation.php:219
+#: include/enotify.php:231
 #, php-format
-msgid "%1$s poked %2$s"
+msgid "[Friendica:Notify] %s tagged your post"
 msgstr ""
 
-#: include/conversation.php:239 mod/mood.php:63
+#: include/enotify.php:233
 #, php-format
-msgid "%1$s is currently %2$s"
+msgid "%1$s tagged your post at %2$s"
 msgstr ""
 
-#: include/conversation.php:278 mod/tagger.php:95
+#: include/enotify.php:234
 #, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgid "%1$s tagged [url=%2$s]your post[/url]"
 msgstr ""
 
-#: include/conversation.php:303
-msgid "post/item"
+#: include/enotify.php:245
+msgid "[Friendica:Notify] Introduction received"
 msgstr ""
 
-#: include/conversation.php:304
+#: include/enotify.php:247
 #, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
+msgid "You've received an introduction from '%1$s' at %2$s"
 msgstr ""
 
-#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1629
-#: mod/profiles.php:346
-msgid "Likes"
+#: include/enotify.php:248
+#, php-format
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
 msgstr ""
 
-#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1629
-#: mod/profiles.php:350
-msgid "Dislikes"
+#: include/enotify.php:252 include/enotify.php:295
+#, php-format
+msgid "You may visit their profile at %s"
 msgstr ""
 
-#: include/conversation.php:588 include/conversation.php:1472
-#: mod/content.php:373 mod/photos.php:1630
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1630
-msgid "Not attending"
+#: include/enotify.php:254
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1630
-msgid "Might attend"
+#: include/enotify.php:262
+msgid "[Friendica:Notify] A new person is sharing with you"
 msgstr ""
 
-#: include/conversation.php:710 mod/content.php:453 mod/content.php:759
-#: mod/photos.php:1703 object/Item.php:137
-msgid "Select"
+#: include/enotify.php:264 include/enotify.php:265
+#, php-format
+msgid "%1$s is sharing with you at %2$s"
 msgstr ""
 
-#: include/conversation.php:711 mod/content.php:454 mod/content.php:760
-#: mod/group.php:181 mod/settings.php:744 mod/contacts.php:816
-#: mod/contacts.php:1015 mod/photos.php:1704 mod/admin.php:1435
-#: object/Item.php:138
-msgid "Delete"
+#: include/enotify.php:271
+msgid "[Friendica:Notify] You have a new follower"
 msgstr ""
 
-#: include/conversation.php:755 mod/content.php:487 mod/content.php:915
-#: mod/content.php:916 object/Item.php:382 object/Item.php:383
+#: include/enotify.php:273 include/enotify.php:274
 #, php-format
-msgid "View %s's profile @ %s"
+msgid "You have a new follower at %2$s : %1$s"
 msgstr ""
 
-#: include/conversation.php:767 object/Item.php:370
-msgid "Categories:"
+#: include/enotify.php:285
+msgid "[Friendica:Notify] Friend suggestion received"
 msgstr ""
 
-#: include/conversation.php:768 object/Item.php:371
-msgid "Filed under:"
+#: include/enotify.php:287
+#, php-format
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr ""
 
-#: include/conversation.php:775 mod/content.php:497 mod/content.php:928
-#: object/Item.php:396
+#: include/enotify.php:288
 #, php-format
-msgid "%s from %s"
+msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 msgstr ""
 
-#: include/conversation.php:791 mod/content.php:513
-msgid "View in context"
+#: include/enotify.php:293
+msgid "Name:"
 msgstr ""
 
-#: include/conversation.php:793 include/conversation.php:1255
-#: mod/content.php:515 mod/content.php:953 mod/editpost.php:114
-#: mod/message.php:337 mod/message.php:522 mod/wallmessage.php:140
-#: mod/photos.php:1592 object/Item.php:421
-msgid "Please wait"
+#: include/enotify.php:294
+msgid "Photo:"
 msgstr ""
 
-#: include/conversation.php:872
-msgid "remove"
+#: include/enotify.php:297
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: include/conversation.php:876
-msgid "Delete Selected Items"
+#: include/enotify.php:305 include/enotify.php:319
+msgid "[Friendica:Notify] Connection accepted"
 msgstr ""
 
-#: include/conversation.php:968
-msgid "Follow Thread"
+#: include/enotify.php:307 include/enotify.php:321
+#, php-format
+msgid "'%1$s' has accepted your connection request at %2$s"
 msgstr ""
 
-#: include/conversation.php:969 include/Contact.php:445
-msgid "View Status"
+#: include/enotify.php:308 include/enotify.php:322
+#, php-format
+msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
 msgstr ""
 
-#: include/conversation.php:970 include/conversation.php:986
-#: include/Contact.php:388 include/Contact.php:401 include/Contact.php:446
-#: mod/allfriends.php:68 mod/directory.php:157 mod/dirfind.php:209
-#: mod/match.php:73 mod/suggest.php:82
-msgid "View Profile"
+#: include/enotify.php:312
+msgid ""
+"You are now mutual friends and may exchange status updates, photos, and "
+"email without restriction."
 msgstr ""
 
-#: include/conversation.php:971 include/Contact.php:447
-msgid "View Photos"
+#: include/enotify.php:314
+#, php-format
+msgid "Please visit %s if you wish to make any changes to this relationship."
 msgstr ""
 
-#: include/conversation.php:972 include/Contact.php:448
-msgid "Network Posts"
+#: include/enotify.php:326
+#, php-format
+msgid ""
+"'%1$s' has chosen to accept you a \"fan\", which restricts some forms of "
+"communication - such as private messaging and some profile interactions. If "
+"this is a celebrity or community page, these settings were applied "
+"automatically."
 msgstr ""
 
-#: include/conversation.php:973 include/Contact.php:449
-msgid "View Contact"
+#: include/enotify.php:328
+#, php-format
+msgid ""
+"'%1$s' may choose to extend this into a two-way or more permissive "
+"relationship in the future."
 msgstr ""
 
-#: include/conversation.php:974 include/Contact.php:451
-msgid "Send PM"
+#: include/enotify.php:330
+#, php-format
+msgid "Please visit %s  if you wish to make any changes to this relationship."
 msgstr ""
 
-#: include/conversation.php:978 include/Contact.php:452
-msgid "Poke"
+#: include/enotify.php:340
+msgid "[Friendica System:Notify] registration request"
 msgstr ""
 
-#: include/conversation.php:983 include/contact_widgets.php:32
-#: include/Contact.php:402 mod/allfriends.php:69 mod/dirfind.php:210
-#: mod/follow.php:106 mod/match.php:74 mod/suggest.php:83 mod/contacts.php:610
-msgid "Connect/Follow"
+#: include/enotify.php:342
+#, php-format
+msgid "You've received a registration request from '%1$s' at %2$s"
 msgstr ""
 
-#: include/conversation.php:1099
+#: include/enotify.php:343
 #, php-format
-msgid "%s likes this."
+msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
 msgstr ""
 
-#: include/conversation.php:1102
+#: include/enotify.php:347
 #, php-format
-msgid "%s doesn't like this."
+msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
 msgstr ""
 
-#: include/conversation.php:1105
+#: include/enotify.php:350
 #, php-format
-msgid "%s attends."
+msgid "Please visit %s to approve or reject the request."
 msgstr ""
 
-#: include/conversation.php:1108
-#, php-format
-msgid "%s doesn't attend."
+#: include/event.php:442
+msgid "Sun"
 msgstr ""
 
-#: include/conversation.php:1111
-#, php-format
-msgid "%s attends maybe."
+#: include/event.php:443
+msgid "Mon"
 msgstr ""
 
-#: include/conversation.php:1121
-msgid "and"
+#: include/event.php:444
+msgid "Tue"
 msgstr ""
 
-#: include/conversation.php:1127
-#, php-format
-msgid ", and %d other people"
+#: include/event.php:445
+msgid "Wed"
 msgstr ""
 
-#: include/conversation.php:1136
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this"
+#: include/event.php:446
+msgid "Thu"
 msgstr ""
 
-#: include/conversation.php:1137
-#, php-format
-msgid "%s like this."
+#: include/event.php:447
+msgid "Fri"
 msgstr ""
 
-#: include/conversation.php:1140
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this"
+#: include/event.php:448
+msgid "Sat"
 msgstr ""
 
-#: include/conversation.php:1141
-#, php-format
-msgid "%s don't like this."
+#: include/event.php:449 include/text.php:1132 mod/settings.php:981
+msgid "Sunday"
 msgstr ""
 
-#: include/conversation.php:1144
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend"
+#: include/event.php:450 include/text.php:1132 mod/settings.php:981
+msgid "Monday"
 msgstr ""
 
-#: include/conversation.php:1145
-#, php-format
-msgid "%s attend."
+#: include/event.php:451 include/text.php:1132
+msgid "Tuesday"
 msgstr ""
 
-#: include/conversation.php:1148
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't attend"
+#: include/event.php:452 include/text.php:1132
+msgid "Wednesday"
 msgstr ""
 
-#: include/conversation.php:1149
-#, php-format
-msgid "%s don't attend."
+#: include/event.php:453 include/text.php:1132
+msgid "Thursday"
 msgstr ""
 
-#: include/conversation.php:1152
-#, php-format
-msgid "<span  %1$s>%2$d people</span> attend maybe"
+#: include/event.php:454 include/text.php:1132
+msgid "Friday"
 msgstr ""
 
-#: include/conversation.php:1153
-#, php-format
-msgid "%s anttend maybe."
+#: include/event.php:455 include/text.php:1132
+msgid "Saturday"
 msgstr ""
 
-#: include/conversation.php:1183 include/conversation.php:1199
-msgid "Visible to <strong>everybody</strong>"
+#: include/event.php:456
+msgid "Jan"
 msgstr ""
 
-#: include/conversation.php:1184 include/conversation.php:1200
-#: mod/message.php:271 mod/message.php:278 mod/message.php:418
-#: mod/message.php:425 mod/wallmessage.php:114 mod/wallmessage.php:121
-msgid "Please enter a link URL:"
+#: include/event.php:457
+msgid "Feb"
 msgstr ""
 
-#: include/conversation.php:1185 include/conversation.php:1201
-msgid "Please enter a video link/URL:"
+#: include/event.php:458
+msgid "Mar"
 msgstr ""
 
-#: include/conversation.php:1186 include/conversation.php:1202
-msgid "Please enter an audio link/URL:"
+#: include/event.php:459
+msgid "Apr"
 msgstr ""
 
-#: include/conversation.php:1187 include/conversation.php:1203
-msgid "Tag term:"
+#: include/event.php:460 include/event.php:472 include/text.php:1136
+msgid "May"
 msgstr ""
 
-#: include/conversation.php:1188 include/conversation.php:1204
-#: mod/filer.php:30
-msgid "Save to Folder:"
+#: include/event.php:461
+msgid "Jun"
 msgstr ""
 
-#: include/conversation.php:1189 include/conversation.php:1205
-msgid "Where are you right now?"
+#: include/event.php:462
+msgid "Jul"
 msgstr ""
 
-#: include/conversation.php:1190
-msgid "Delete item(s)?"
+#: include/event.php:463
+msgid "Aug"
 msgstr ""
 
-#: include/conversation.php:1236
-msgid "Share"
+#: include/event.php:464
+msgid "Sept"
 msgstr ""
 
-#: include/conversation.php:1237 mod/editpost.php:100 mod/message.php:335
-#: mod/message.php:519 mod/wallmessage.php:138
-msgid "Upload photo"
+#: include/event.php:465
+msgid "Oct"
 msgstr ""
 
-#: include/conversation.php:1238 mod/editpost.php:101
-msgid "upload photo"
+#: include/event.php:466
+msgid "Nov"
 msgstr ""
 
-#: include/conversation.php:1239 mod/editpost.php:102
-msgid "Attach file"
+#: include/event.php:467
+msgid "Dec"
 msgstr ""
 
-#: include/conversation.php:1240 mod/editpost.php:103
-msgid "attach file"
+#: include/event.php:468 include/text.php:1136
+msgid "January"
 msgstr ""
 
-#: include/conversation.php:1241 mod/editpost.php:104 mod/message.php:336
-#: mod/message.php:520 mod/wallmessage.php:139
-msgid "Insert web link"
+#: include/event.php:469 include/text.php:1136
+msgid "February"
 msgstr ""
 
-#: include/conversation.php:1242 mod/editpost.php:105
-msgid "web link"
+#: include/event.php:470 include/text.php:1136
+msgid "March"
 msgstr ""
 
-#: include/conversation.php:1243 mod/editpost.php:106
-msgid "Insert video link"
+#: include/event.php:471 include/text.php:1136
+msgid "April"
 msgstr ""
 
-#: include/conversation.php:1244 mod/editpost.php:107
-msgid "video link"
+#: include/event.php:473 include/text.php:1136
+msgid "June"
 msgstr ""
 
-#: include/conversation.php:1245 mod/editpost.php:108
-msgid "Insert audio link"
+#: include/event.php:474 include/text.php:1136
+msgid "July"
 msgstr ""
 
-#: include/conversation.php:1246 mod/editpost.php:109
-msgid "audio link"
+#: include/event.php:475 include/text.php:1136
+msgid "August"
 msgstr ""
 
-#: include/conversation.php:1247 mod/editpost.php:110
-msgid "Set your location"
+#: include/event.php:476 include/text.php:1136
+msgid "September"
 msgstr ""
 
-#: include/conversation.php:1248 mod/editpost.php:111
-msgid "set location"
+#: include/event.php:477 include/text.php:1136
+msgid "October"
 msgstr ""
 
-#: include/conversation.php:1249 mod/editpost.php:112
-msgid "Clear browser location"
+#: include/event.php:478 include/text.php:1136
+msgid "November"
 msgstr ""
 
-#: include/conversation.php:1250 mod/editpost.php:113
-msgid "clear location"
+#: include/event.php:479 include/text.php:1136
+msgid "December"
 msgstr ""
 
-#: include/conversation.php:1252 mod/editpost.php:127
-msgid "Set title"
+#: include/event.php:480 mod/cal.php:278 mod/events.php:395
+msgid "today"
 msgstr ""
 
-#: include/conversation.php:1254 mod/editpost.php:129
-msgid "Categories (comma-separated list)"
+#: include/event.php:484
+msgid "all-day"
 msgstr ""
 
-#: include/conversation.php:1256 mod/editpost.php:115
-msgid "Permission settings"
+#: include/event.php:486
+msgid "No events to display"
 msgstr ""
 
-#: include/conversation.php:1257 mod/editpost.php:144
-msgid "permissions"
+#: include/event.php:596
+msgid "l, F j"
 msgstr ""
 
-#: include/conversation.php:1265 mod/editpost.php:124
-msgid "Public post"
+#: include/event.php:615
+msgid "Edit event"
 msgstr ""
 
-#: include/conversation.php:1270 mod/content.php:737 mod/editpost.php:135
-#: mod/events.php:511 mod/photos.php:1613 mod/photos.php:1661
-#: mod/photos.php:1747 object/Item.php:741
-msgid "Preview"
+#: include/event.php:637 include/text.php:1534 include/text.php:1541
+msgid "link to source"
 msgstr ""
 
-#: include/conversation.php:1274 include/items.php:1983 mod/follow.php:124
-#: mod/settings.php:682 mod/settings.php:708 mod/suggest.php:32
-#: mod/tagrm.php:11 mod/tagrm.php:96 mod/videos.php:132 mod/contacts.php:455
-#: mod/editpost.php:138 mod/fbrowser.php:100 mod/fbrowser.php:135
-#: mod/message.php:209 mod/photos.php:240 mod/photos.php:331
-#: mod/dfrn_request.php:889
-msgid "Cancel"
-msgstr ""
-
-#: include/conversation.php:1280
-msgid "Post to Groups"
-msgstr ""
-
-#: include/conversation.php:1281
-msgid "Post to Contacts"
-msgstr ""
-
-#: include/conversation.php:1282
-msgid "Private post"
-msgstr ""
-
-#: include/conversation.php:1287 include/identity.php:259 mod/editpost.php:142
-msgid "Message"
-msgstr ""
-
-#: include/conversation.php:1288 mod/editpost.php:143
-msgid "Browser"
+#: include/event.php:872
+msgid "Export"
 msgstr ""
 
-#: include/conversation.php:1444
-msgid "View all"
+#: include/event.php:873
+msgid "Export calendar as ical"
 msgstr ""
 
-#: include/conversation.php:1466
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/conversation.php:1469
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/conversation.php:1475
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/delivery.php:470
-msgid "(no subject)"
+#: include/event.php:874
+msgid "Export calendar as csv"
 msgstr ""
 
 #: include/features.php:65
@@ -1976,10 +1766,6 @@ msgstr ""
 msgid "Add categories to your posts"
 msgstr ""
 
-#: include/features.php:104 include/contact_widgets.php:150
-msgid "Saved Folders"
-msgstr ""
-
 #: include/features.php:104
 msgid "Ability to file posts under folders"
 msgstr ""
@@ -2016,787 +1802,972 @@ msgstr ""
 msgid "Show visitors public community forums at the Advanced Profile Page"
 msgstr ""
 
-#: include/photos.php:57 include/photos.php:67 mod/fbrowser.php:40
-#: mod/fbrowser.php:61 mod/photos.php:182 mod/photos.php:1106
-#: mod/photos.php:1231 mod/photos.php:1252 mod/photos.php:1817
-#: mod/photos.php:1829
-msgid "Contact Photos"
+#: include/follow.php:81 mod/dfrn_request.php:512
+msgid "Disallowed profile URL."
 msgstr ""
 
-#: include/datetime.php:58 include/datetime.php:60 mod/profiles.php:697
-msgid "Miscellaneous"
+#: include/follow.php:86
+msgid "Connect URL missing."
 msgstr ""
 
-#: include/datetime.php:184 include/identity.php:641
-msgid "Birthday:"
+#: include/follow.php:114
+msgid ""
+"This site is not configured to allow communications with other networks."
 msgstr ""
 
-#: include/datetime.php:186 mod/profiles.php:720
-msgid "Age: "
+#: include/follow.php:115 include/follow.php:129
+msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: include/datetime.php:188
-msgid "YYYY-MM-DD or MM-DD"
+#: include/follow.php:127
+msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: include/datetime.php:343
-msgid "never"
+#: include/follow.php:132
+msgid "An author or name was not found."
 msgstr ""
 
-#: include/datetime.php:349
-msgid "less than a second ago"
+#: include/follow.php:135
+msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: include/datetime.php:352
-msgid "year"
+#: include/follow.php:138
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
 msgstr ""
 
-#: include/datetime.php:352
-msgid "years"
+#: include/follow.php:139
+msgid "Use mailto: in front of address to force email check."
 msgstr ""
 
-#: include/datetime.php:353 include/event.php:481 mod/cal.php:279
-#: mod/events.php:396
-msgid "month"
+#: include/follow.php:145
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
 msgstr ""
 
-#: include/datetime.php:353
-msgid "months"
+#: include/follow.php:150
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
 msgstr ""
 
-#: include/datetime.php:354 include/event.php:482 mod/cal.php:280
-#: mod/events.php:397
-msgid "week"
+#: include/follow.php:251
+msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: include/datetime.php:354
-msgid "weeks"
+#: include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
 msgstr ""
 
-#: include/datetime.php:355 include/event.php:483 mod/cal.php:281
-#: mod/events.php:398
-msgid "day"
+#: include/group.php:210
+msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: include/datetime.php:355
-msgid "days"
+#: include/group.php:243
+msgid "Everybody"
 msgstr ""
 
-#: include/datetime.php:356
-msgid "hour"
+#: include/group.php:266
+msgid "edit"
 msgstr ""
 
-#: include/datetime.php:356
-msgid "hours"
+#: include/group.php:287 mod/newmember.php:61
+msgid "Groups"
 msgstr ""
 
-#: include/datetime.php:357
-msgid "minute"
+#: include/group.php:289
+msgid "Edit groups"
 msgstr ""
 
-#: include/datetime.php:357
-msgid "minutes"
+#: include/group.php:291
+msgid "Edit group"
 msgstr ""
 
-#: include/datetime.php:358
-msgid "second"
+#: include/group.php:292
+msgid "Create a new group"
 msgstr ""
 
-#: include/datetime.php:358
-msgid "seconds"
+#: include/group.php:293 mod/group.php:98 mod/group.php:188
+msgid "Group Name: "
 msgstr ""
 
-#: include/datetime.php:367
-#, php-format
-msgid "%1$d %2$s ago"
+#: include/group.php:295
+msgid "Contacts not in any group"
 msgstr ""
 
-#: include/datetime.php:585
-#, php-format
-msgid "%s's birthday"
+#: include/group.php:297 mod/network.php:200
+msgid "add"
 msgstr ""
 
-#: include/datetime.php:586 include/dfrn.php:1122
-#, php-format
-msgid "Happy Birthday %s"
+#: include/identity.php:43
+msgid "Requested account is not available."
 msgstr ""
 
-#: include/event.php:16 include/bb2diaspora.php:199 mod/localtime.php:12
-msgid "l F d, Y \\@ g:i A"
+#: include/identity.php:52 mod/profile.php:21
+msgid "Requested profile is not available."
 msgstr ""
 
-#: include/event.php:33 include/event.php:51 include/event.php:488
-#: include/bb2diaspora.php:205
-msgid "Starts:"
+#: include/identity.php:96 include/identity.php:314 include/identity.php:737
+msgid "Edit profile"
 msgstr ""
 
-#: include/event.php:36 include/event.php:57 include/event.php:489
-#: include/bb2diaspora.php:213
-msgid "Finishes:"
+#: include/identity.php:254
+msgid "Atom feed"
 msgstr ""
 
-#: include/event.php:39 include/event.php:63 include/event.php:490
-#: include/bb2diaspora.php:221 include/identity.php:331 mod/directory.php:139
-#: mod/contacts.php:636 mod/events.php:501 mod/notifications.php:238
-msgid "Location:"
+#: include/identity.php:285 include/nav.php:189
+msgid "Profiles"
 msgstr ""
 
-#: include/event.php:442
-msgid "Sun"
+#: include/identity.php:285
+msgid "Manage/edit profiles"
 msgstr ""
 
-#: include/event.php:443
-msgid "Mon"
+#: include/identity.php:290 include/identity.php:316 mod/profiles.php:789
+msgid "Change profile photo"
 msgstr ""
 
-#: include/event.php:444
-msgid "Tue"
+#: include/identity.php:291 mod/profiles.php:790
+msgid "Create New Profile"
 msgstr ""
 
-#: include/event.php:445
-msgid "Wed"
+#: include/identity.php:301 mod/profiles.php:779
+msgid "Profile Image"
 msgstr ""
 
-#: include/event.php:446
-msgid "Thu"
+#: include/identity.php:304 mod/profiles.php:781
+msgid "visible to everybody"
 msgstr ""
 
-#: include/event.php:447
-msgid "Fri"
+#: include/identity.php:305 mod/profiles.php:683 mod/profiles.php:782
+msgid "Edit visibility"
 msgstr ""
 
-#: include/event.php:448
-msgid "Sat"
+#: include/identity.php:333 include/identity.php:628 mod/directory.php:141
+#: mod/notifications.php:244
+msgid "Gender:"
 msgstr ""
 
-#: include/event.php:449 include/text.php:1132 mod/settings.php:981
-msgid "Sunday"
+#: include/identity.php:336 include/identity.php:648 mod/directory.php:143
+msgid "Status:"
 msgstr ""
 
-#: include/event.php:450 include/text.php:1132 mod/settings.php:981
-msgid "Monday"
+#: include/identity.php:338 include/identity.php:664 mod/directory.php:145
+msgid "Homepage:"
 msgstr ""
 
-#: include/event.php:451 include/text.php:1132
-msgid "Tuesday"
+#: include/identity.php:340 include/identity.php:684 mod/contacts.php:640
+#: mod/directory.php:147 mod/notifications.php:240
+msgid "About:"
 msgstr ""
 
-#: include/event.php:452 include/text.php:1132
-msgid "Wednesday"
+#: include/identity.php:342 mod/contacts.php:638
+msgid "XMPP:"
 msgstr ""
 
-#: include/event.php:453 include/text.php:1132
-msgid "Thursday"
+#: include/identity.php:428 mod/contacts.php:55 mod/notifications.php:252
+msgid "Network:"
 msgstr ""
 
-#: include/event.php:454 include/text.php:1132
-msgid "Friday"
+#: include/identity.php:457 include/identity.php:547
+msgid "g A l F d"
 msgstr ""
 
-#: include/event.php:455 include/text.php:1132
-msgid "Saturday"
+#: include/identity.php:458 include/identity.php:548
+msgid "F d"
 msgstr ""
 
-#: include/event.php:456
-msgid "Jan"
+#: include/identity.php:509 include/identity.php:594
+msgid "[today]"
 msgstr ""
 
-#: include/event.php:457
-msgid "Feb"
+#: include/identity.php:521
+msgid "Birthday Reminders"
 msgstr ""
 
-#: include/event.php:458
-msgid "Mar"
+#: include/identity.php:522
+msgid "Birthdays this week:"
 msgstr ""
 
-#: include/event.php:459
-msgid "Apr"
+#: include/identity.php:581
+msgid "[No description]"
 msgstr ""
 
-#: include/event.php:460 include/event.php:472 include/text.php:1136
-msgid "May"
+#: include/identity.php:605
+msgid "Event Reminders"
 msgstr ""
 
-#: include/event.php:461
-msgid "Jun"
+#: include/identity.php:606
+msgid "Events this week:"
 msgstr ""
 
-#: include/event.php:462
-msgid "Jul"
+#: include/identity.php:617 include/identity.php:741 include/identity.php:774
+#: include/nav.php:82 mod/contacts.php:647 mod/contacts.php:849
+#: mod/newmember.php:32 mod/profperm.php:105 view/theme/frio/theme.php:247
+msgid "Profile"
 msgstr ""
 
-#: include/event.php:463
-msgid "Aug"
+#: include/identity.php:626 mod/settings.php:1286
+msgid "Full Name:"
 msgstr ""
 
-#: include/event.php:464
-msgid "Sept"
+#: include/identity.php:633
+msgid "j F, Y"
 msgstr ""
 
-#: include/event.php:465
-msgid "Oct"
+#: include/identity.php:634
+msgid "j F"
 msgstr ""
 
-#: include/event.php:466
-msgid "Nov"
+#: include/identity.php:645
+msgid "Age:"
 msgstr ""
 
-#: include/event.php:467
-msgid "Dec"
+#: include/identity.php:656
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: include/event.php:468 include/text.php:1136
-msgid "January"
+#: include/identity.php:660 mod/profiles.php:702
+msgid "Sexual Preference:"
 msgstr ""
 
-#: include/event.php:469 include/text.php:1136
-msgid "February"
+#: include/identity.php:668 mod/profiles.php:729
+msgid "Hometown:"
 msgstr ""
 
-#: include/event.php:470 include/text.php:1136
-msgid "March"
+#: include/identity.php:672 mod/contacts.php:642 mod/follow.php:137
+#: mod/notifications.php:242
+msgid "Tags:"
 msgstr ""
 
-#: include/event.php:471 include/text.php:1136
-msgid "April"
+#: include/identity.php:676 mod/profiles.php:730
+msgid "Political Views:"
 msgstr ""
 
-#: include/event.php:473 include/text.php:1136
-msgid "June"
+#: include/identity.php:680
+msgid "Religion:"
 msgstr ""
 
-#: include/event.php:474 include/text.php:1136
-msgid "July"
+#: include/identity.php:688
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: include/event.php:475 include/text.php:1136
-msgid "August"
+#: include/identity.php:692 mod/profiles.php:734
+msgid "Likes:"
 msgstr ""
 
-#: include/event.php:476 include/text.php:1136
-msgid "September"
+#: include/identity.php:696 mod/profiles.php:735
+msgid "Dislikes:"
 msgstr ""
 
-#: include/event.php:477 include/text.php:1136
-msgid "October"
+#: include/identity.php:700
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: include/event.php:478 include/text.php:1136
-msgid "November"
+#: include/identity.php:704
+msgid "Musical interests:"
 msgstr ""
 
-#: include/event.php:479 include/text.php:1136
-msgid "December"
+#: include/identity.php:708
+msgid "Books, literature:"
 msgstr ""
 
-#: include/event.php:480 mod/cal.php:278 mod/events.php:395
-msgid "today"
+#: include/identity.php:712
+msgid "Television:"
 msgstr ""
 
-#: include/event.php:484
-msgid "all-day"
+#: include/identity.php:716
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: include/event.php:486
-msgid "No events to display"
+#: include/identity.php:720
+msgid "Love/Romance:"
 msgstr ""
 
-#: include/event.php:596
-msgid "l, F j"
+#: include/identity.php:724
+msgid "Work/employment:"
 msgstr ""
 
-#: include/event.php:615
-msgid "Edit event"
+#: include/identity.php:728
+msgid "School/education:"
 msgstr ""
 
-#: include/event.php:637 include/text.php:1534 include/text.php:1541
-msgid "link to source"
+#: include/identity.php:733
+msgid "Forums:"
 msgstr ""
 
-#: include/event.php:872
-msgid "Export"
+#: include/identity.php:742 mod/events.php:514
+msgid "Basic"
 msgstr ""
 
-#: include/event.php:873
-msgid "Export calendar as ical"
+#: include/identity.php:743 mod/admin.php:972 mod/contacts.php:878
+#: mod/events.php:515
+msgid "Advanced"
 msgstr ""
 
-#: include/event.php:874
-msgid "Export calendar as csv"
+#: include/identity.php:766 include/nav.php:81 mod/contacts.php:645
+#: mod/contacts.php:841 view/theme/frio/theme.php:246
+msgid "Status"
 msgstr ""
 
-#: include/dfrn.php:1121
-#, php-format
-msgid "%s\\'s birthday"
+#: include/identity.php:769 mod/contacts.php:844 mod/follow.php:145
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: include/contact_selectors.php:32
-msgid "Unknown | Not categorised"
+#: include/identity.php:777 mod/contacts.php:852
+msgid "Profile Details"
 msgstr ""
 
-#: include/contact_selectors.php:33
-msgid "Block immediately"
+#: include/identity.php:782 include/nav.php:83 mod/fbrowser.php:31
+#: view/theme/frio/theme.php:248
+msgid "Photos"
 msgstr ""
 
-#: include/contact_selectors.php:34
-msgid "Shady, spammer, self-marketer"
+#: include/identity.php:785 mod/photos.php:89
+msgid "Photo Albums"
 msgstr ""
 
-#: include/contact_selectors.php:35
-msgid "Known to me, but no opinion"
+#: include/identity.php:790 include/identity.php:793 include/nav.php:84
+#: view/theme/frio/theme.php:249
+msgid "Videos"
 msgstr ""
 
-#: include/contact_selectors.php:36
-msgid "OK, probably harmless"
+#: include/identity.php:802 include/identity.php:813 include/nav.php:85
+#: include/nav.php:149 mod/cal.php:270 mod/events.php:386
+#: view/theme/frio/theme.php:250 view/theme/frio/theme.php:254
+msgid "Events"
 msgstr ""
 
-#: include/contact_selectors.php:37
-msgid "Reputable, has my trust"
+#: include/identity.php:805 include/identity.php:816 include/nav.php:149
+#: view/theme/frio/theme.php:254
+msgid "Events and Calendar"
 msgstr ""
 
-#: include/contact_selectors.php:56 mod/admin.php:901
-msgid "Frequently"
+#: include/identity.php:824 mod/notes.php:47
+msgid "Personal Notes"
 msgstr ""
 
-#: include/contact_selectors.php:57 mod/admin.php:902
-msgid "Hourly"
+#: include/identity.php:827
+msgid "Only You Can See This"
 msgstr ""
 
-#: include/contact_selectors.php:58 mod/admin.php:903
-msgid "Twice daily"
+#: include/identity.php:835 include/identity.php:838 include/nav.php:128
+#: include/nav.php:192 include/text.php:1024 mod/contacts.php:800
+#: mod/contacts.php:861 mod/viewcontacts.php:121 view/theme/frio/theme.php:257
+msgid "Contacts"
 msgstr ""
 
-#: include/contact_selectors.php:59 mod/admin.php:904
-msgid "Daily"
+#: include/items.php:1584 mod/dfrn_confirm.php:735 mod/dfrn_request.php:754
+msgid "[Name Withheld]"
 msgstr ""
 
-#: include/contact_selectors.php:60
-msgid "Weekly"
+#: include/items.php:1939 mod/admin.php:240 mod/admin.php:1480
+#: mod/admin.php:1731 mod/display.php:103 mod/display.php:279
+#: mod/display.php:484 mod/notice.php:15 mod/viewsrc.php:15
+msgid "Item not found."
 msgstr ""
 
-#: include/contact_selectors.php:61
-msgid "Monthly"
+#: include/items.php:1978
+msgid "Do you really want to delete this item?"
 msgstr ""
 
-#: include/contact_selectors.php:76 mod/dfrn_request.php:881
-msgid "Friendica"
+#: include/items.php:1980 mod/api.php:105 mod/contacts.php:452
+#: mod/dfrn_request.php:875 mod/follow.php:113 mod/message.php:206
+#: mod/profiles.php:640 mod/profiles.php:643 mod/profiles.php:669
+#: mod/register.php:245 mod/settings.php:1171 mod/settings.php:1177
+#: mod/settings.php:1184 mod/settings.php:1188 mod/settings.php:1193
+#: mod/settings.php:1198 mod/settings.php:1203 mod/settings.php:1208
+#: mod/settings.php:1234 mod/settings.php:1235 mod/settings.php:1236
+#: mod/settings.php:1237 mod/settings.php:1238 mod/suggest.php:29
+msgid "Yes"
 msgstr ""
 
-#: include/contact_selectors.php:77
-msgid "OStatus"
+#: include/items.php:2143 index.php:407 mod/allfriends.php:12 mod/api.php:26
+#: mod/api.php:31 mod/attach.php:33 mod/cal.php:299 mod/common.php:18
+#: mod/contacts.php:360 mod/crepair.php:102 mod/delegate.php:12
+#: mod/dfrn_confirm.php:61 mod/dirfind.php:11 mod/display.php:481
+#: mod/editpost.php:10 mod/events.php:195 mod/follow.php:11 mod/follow.php:74
+#: mod/follow.php:158 mod/fsuggest.php:79 mod/group.php:19 mod/invite.php:15
+#: mod/invite.php:103 mod/item.php:193 mod/item.php:205 mod/manage.php:98
+#: mod/message.php:46 mod/message.php:171 mod/mood.php:115 mod/network.php:4
+#: mod/nogroup.php:27 mod/notes.php:23 mod/notifications.php:71
+#: mod/ostatus_subscribe.php:9 mod/photos.php:161 mod/photos.php:1092
+#: mod/poke.php:154 mod/profile_photo.php:19 mod/profile_photo.php:180
+#: mod/profile_photo.php:191 mod/profile_photo.php:204 mod/profiles.php:166
+#: mod/profiles.php:607 mod/register.php:42 mod/regmod.php:113
+#: mod/repair_ostatus.php:9 mod/settings.php:22 mod/settings.php:130
+#: mod/settings.php:668 mod/suggest.php:58 mod/uimport.php:24
+#: mod/viewcontacts.php:46 mod/wall_attach.php:67 mod/wall_attach.php:70
+#: mod/wall_upload.php:77 mod/wall_upload.php:80 mod/wallmessage.php:9
+#: mod/wallmessage.php:33 mod/wallmessage.php:73 mod/wallmessage.php:97
+msgid "Permission denied."
 msgstr ""
 
-#: include/contact_selectors.php:78
-msgid "RSS/Atom"
+#: include/items.php:2248
+msgid "Archives"
 msgstr ""
 
-#: include/contact_selectors.php:79 include/contact_selectors.php:86
-#: mod/admin.php:1417 mod/admin.php:1430 mod/admin.php:1443 mod/admin.php:1461
-msgid "Email"
+#: include/like.php:41
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
 msgstr ""
 
-#: include/contact_selectors.php:80 mod/settings.php:848
-#: mod/dfrn_request.php:883
-msgid "Diaspora"
+#: include/like.php:46
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
 msgstr ""
 
-#: include/contact_selectors.php:81
-msgid "Facebook"
+#: include/like.php:51
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
 
-#: include/contact_selectors.php:82
-msgid "Zot!"
+#: include/message.php:15 include/message.php:169
+msgid "[no subject]"
 msgstr ""
 
-#: include/contact_selectors.php:83
-msgid "LinkedIn"
+#: include/nav.php:35 mod/navigation.php:19
+msgid "Nothing new here"
 msgstr ""
 
-#: include/contact_selectors.php:84
-msgid "XMPP/IM"
+#: include/nav.php:39 mod/navigation.php:23
+msgid "Clear notifications"
 msgstr ""
 
-#: include/contact_selectors.php:85
-msgid "MySpace"
+#: include/nav.php:40 include/text.php:1017
+msgid "@name, !forum, #tags, content"
 msgstr ""
 
-#: include/contact_selectors.php:87
-msgid "Google+"
+#: include/nav.php:78 view/theme/frio/theme.php:243
+msgid "End this session"
 msgstr ""
 
-#: include/contact_selectors.php:88
-msgid "pump.io"
+#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:246
+msgid "Your posts and conversations"
 msgstr ""
 
-#: include/contact_selectors.php:89
-msgid "Twitter"
+#: include/nav.php:82 view/theme/frio/theme.php:247
+msgid "Your profile page"
 msgstr ""
 
-#: include/contact_selectors.php:90
-msgid "Diaspora Connector"
+#: include/nav.php:83 view/theme/frio/theme.php:248
+msgid "Your photos"
 msgstr ""
 
-#: include/contact_selectors.php:91
-msgid "GNU Social"
+#: include/nav.php:84 view/theme/frio/theme.php:249
+msgid "Your videos"
 msgstr ""
 
-#: include/contact_selectors.php:92
-msgid "pnut"
+#: include/nav.php:85 view/theme/frio/theme.php:250
+msgid "Your events"
 msgstr ""
 
-#: include/contact_selectors.php:93
-msgid "App.net"
+#: include/nav.php:86
+msgid "Personal notes"
 msgstr ""
 
-#: include/contact_selectors.php:104
-msgid "Hubzilla/Redmatrix"
+#: include/nav.php:86
+msgid "Your personal notes"
 msgstr ""
 
-#: include/contact_widgets.php:6
-msgid "Add New Contact"
+#: include/nav.php:95
+msgid "Sign in"
 msgstr ""
 
-#: include/contact_widgets.php:7
-msgid "Enter address or web location"
+#: include/nav.php:105
+msgid "Home Page"
 msgstr ""
 
-#: include/contact_widgets.php:8
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: include/nav.php:109
+msgid "Create an account"
 msgstr ""
 
-#: include/contact_widgets.php:10 include/identity.php:219
-#: mod/allfriends.php:85 mod/dirfind.php:207 mod/match.php:89
-#: mod/suggest.php:101
-msgid "Connect"
+#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:293
+msgid "Help"
 msgstr ""
 
-#: include/contact_widgets.php:24
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/contact_widgets.php:30
-msgid "Find People"
+#: include/nav.php:115
+msgid "Help and documentation"
 msgstr ""
 
-#: include/contact_widgets.php:31
-msgid "Enter name or interest"
+#: include/nav.php:119
+msgid "Apps"
 msgstr ""
 
-#: include/contact_widgets.php:33
-msgid "Examples: Robert Morgenstein, Fishing"
+#: include/nav.php:119
+msgid "Addon applications, utilities, games"
 msgstr ""
 
-#: include/contact_widgets.php:34 mod/directory.php:206 mod/contacts.php:806
-msgid "Find"
-msgstr ""
-
-#: include/contact_widgets.php:35 mod/suggest.php:114
-#: view/theme/vier/theme.php:198
-msgid "Friend Suggestions"
+#: include/nav.php:123 include/text.php:1014 mod/search.php:149
+msgid "Search"
 msgstr ""
 
-#: include/contact_widgets.php:36 view/theme/vier/theme.php:197
-msgid "Similar Interests"
+#: include/nav.php:123
+msgid "Search site content"
 msgstr ""
 
-#: include/contact_widgets.php:37
-msgid "Random Profile"
+#: include/nav.php:126 include/text.php:1022
+msgid "Full Text"
 msgstr ""
 
-#: include/contact_widgets.php:38 view/theme/vier/theme.php:199
-msgid "Invite Friends"
+#: include/nav.php:127 include/text.php:1023
+msgid "Tags"
 msgstr ""
 
-#: include/contact_widgets.php:115
-msgid "Networks"
+#: include/nav.php:143 include/nav.php:145 mod/community.php:36
+msgid "Community"
 msgstr ""
 
-#: include/contact_widgets.php:118
-msgid "All Networks"
+#: include/nav.php:143
+msgid "Conversations on this site"
 msgstr ""
 
-#: include/contact_widgets.php:153 include/contact_widgets.php:187
-msgid "Everything"
+#: include/nav.php:145
+msgid "Conversations on the network"
 msgstr ""
 
-#: include/contact_widgets.php:184
-msgid "Categories"
+#: include/nav.php:152
+msgid "Directory"
 msgstr ""
 
-#: include/contact_widgets.php:248
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] ""
-msgstr[1] ""
-
-#: include/api.php:1021
-#, php-format
-msgid "Daily posting limit of %d posts reached. The post was rejected."
+#: include/nav.php:152
+msgid "People directory"
 msgstr ""
 
-#: include/api.php:1041
-#, php-format
-msgid "Weekly posting limit of %d posts reached. The post was rejected."
+#: include/nav.php:154
+msgid "Information"
 msgstr ""
 
-#: include/api.php:1062
-#, php-format
-msgid "Monthly posting limit of %d posts reached. The post was rejected."
+#: include/nav.php:154
+msgid "Information about this friendica instance"
 msgstr ""
 
-#: include/diaspora.php:2087
-msgid "Sharing notification from Diaspora network"
+#: include/nav.php:158 view/theme/frio/theme.php:253
+msgid "Conversations from your friends"
 msgstr ""
 
-#: include/diaspora.php:3096
-msgid "Attachments:"
+#: include/nav.php:159
+msgid "Network Reset"
 msgstr ""
 
-#: include/identity.php:43
-msgid "Requested account is not available."
+#: include/nav.php:159
+msgid "Load Network page with no filters"
 msgstr ""
 
-#: include/identity.php:52 mod/profile.php:21
-msgid "Requested profile is not available."
+#: include/nav.php:166
+msgid "Friend Requests"
 msgstr ""
 
-#: include/identity.php:96 include/identity.php:314 include/identity.php:737
-msgid "Edit profile"
+#: include/nav.php:169 mod/notifications.php:96
+msgid "Notifications"
 msgstr ""
 
-#: include/identity.php:254
-msgid "Atom feed"
+#: include/nav.php:170
+msgid "See all notifications"
 msgstr ""
 
-#: include/identity.php:285
-msgid "Manage/edit profiles"
+#: include/nav.php:171 mod/settings.php:906
+msgid "Mark as seen"
 msgstr ""
 
-#: include/identity.php:290 include/identity.php:316 mod/profiles.php:789
-msgid "Change profile photo"
+#: include/nav.php:171
+msgid "Mark all system notifications seen"
 msgstr ""
 
-#: include/identity.php:291 mod/profiles.php:790
-msgid "Create New Profile"
+#: include/nav.php:175 mod/message.php:179 view/theme/frio/theme.php:255
+msgid "Messages"
 msgstr ""
 
-#: include/identity.php:301 mod/profiles.php:779
-msgid "Profile Image"
+#: include/nav.php:175 view/theme/frio/theme.php:255
+msgid "Private mail"
 msgstr ""
 
-#: include/identity.php:304 mod/profiles.php:781
-msgid "visible to everybody"
+#: include/nav.php:176
+msgid "Inbox"
 msgstr ""
 
-#: include/identity.php:305 mod/profiles.php:683 mod/profiles.php:782
-msgid "Edit visibility"
+#: include/nav.php:177
+msgid "Outbox"
 msgstr ""
 
-#: include/identity.php:333 include/identity.php:628 mod/directory.php:141
-#: mod/notifications.php:244
-msgid "Gender:"
+#: include/nav.php:178 mod/message.php:16
+msgid "New Message"
 msgstr ""
 
-#: include/identity.php:336 include/identity.php:648 mod/directory.php:143
-msgid "Status:"
+#: include/nav.php:181
+msgid "Manage"
 msgstr ""
 
-#: include/identity.php:338 include/identity.php:664 mod/directory.php:145
-msgid "Homepage:"
+#: include/nav.php:181
+msgid "Manage other pages"
 msgstr ""
 
-#: include/identity.php:340 include/identity.php:684 mod/directory.php:147
-#: mod/contacts.php:640 mod/notifications.php:240
-msgid "About:"
+#: include/nav.php:184 mod/settings.php:81
+msgid "Delegations"
 msgstr ""
 
-#: include/identity.php:342 mod/contacts.php:638
-msgid "XMPP:"
+#: include/nav.php:184 mod/delegate.php:130
+msgid "Delegate Page Management"
 msgstr ""
 
-#: include/identity.php:428 mod/contacts.php:55 mod/notifications.php:252
-msgid "Network:"
+#: include/nav.php:186 mod/admin.php:1533 mod/admin.php:1809
+#: mod/newmember.php:22 mod/settings.php:111 view/theme/frio/theme.php:256
+msgid "Settings"
 msgstr ""
 
-#: include/identity.php:457 include/identity.php:547
-msgid "g A l F d"
+#: include/nav.php:186 view/theme/frio/theme.php:256
+msgid "Account settings"
 msgstr ""
 
-#: include/identity.php:458 include/identity.php:548
-msgid "F d"
+#: include/nav.php:189
+msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: include/identity.php:509 include/identity.php:594
-msgid "[today]"
+#: include/nav.php:192 view/theme/frio/theme.php:257
+msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: include/identity.php:521
-msgid "Birthday Reminders"
+#: include/nav.php:197 mod/admin.php:192
+msgid "Admin"
 msgstr ""
 
-#: include/identity.php:522
-msgid "Birthdays this week:"
+#: include/nav.php:197
+msgid "Site setup and configuration"
 msgstr ""
 
-#: include/identity.php:581
-msgid "[No description]"
+#: include/nav.php:200
+msgid "Navigation"
 msgstr ""
 
-#: include/identity.php:605
-msgid "Event Reminders"
+#: include/nav.php:200
+msgid "Site map"
 msgstr ""
 
-#: include/identity.php:606
-msgid "Events this week:"
+#: include/network.php:622
+msgid "view full size"
 msgstr ""
 
-#: include/identity.php:626 mod/settings.php:1286
-msgid "Full Name:"
+#: include/oembed.php:266
+msgid "Embedded content"
 msgstr ""
 
-#: include/identity.php:633
-msgid "j F, Y"
+#: include/oembed.php:274
+msgid "Embedding disabled"
 msgstr ""
 
-#: include/identity.php:634
-msgid "j F"
+#: include/ostatus.php:1832
+#, php-format
+msgid "%s is now following %s."
 msgstr ""
 
-#: include/identity.php:645
-msgid "Age:"
+#: include/ostatus.php:1833
+msgid "following"
 msgstr ""
 
-#: include/identity.php:656
+#: include/ostatus.php:1836
 #, php-format
-msgid "for %1$d %2$s"
+msgid "%s stopped following %s."
 msgstr ""
 
-#: include/identity.php:660 mod/profiles.php:702
-msgid "Sexual Preference:"
+#: include/ostatus.php:1837
+msgid "stopped following"
 msgstr ""
 
-#: include/identity.php:668 mod/profiles.php:729
-msgid "Hometown:"
+#: include/photos.php:57 include/photos.php:67 mod/fbrowser.php:40
+#: mod/fbrowser.php:61 mod/photos.php:182 mod/photos.php:1106
+#: mod/photos.php:1231 mod/photos.php:1252 mod/photos.php:1817
+#: mod/photos.php:1829
+msgid "Contact Photos"
 msgstr ""
 
-#: include/identity.php:672 mod/follow.php:137 mod/contacts.php:642
-#: mod/notifications.php:242
-msgid "Tags:"
+#: include/plugin.php:530 include/plugin.php:532
+msgid "Click here to upgrade."
 msgstr ""
 
-#: include/identity.php:676 mod/profiles.php:730
-msgid "Political Views:"
+#: include/plugin.php:538
+msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: include/identity.php:680
-msgid "Religion:"
+#: include/plugin.php:543
+msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: include/identity.php:688
-msgid "Hobbies/Interests:"
+#: include/profile_selectors.php:6
+msgid "Male"
 msgstr ""
 
-#: include/identity.php:692 mod/profiles.php:734
-msgid "Likes:"
+#: include/profile_selectors.php:6
+msgid "Female"
 msgstr ""
 
-#: include/identity.php:696 mod/profiles.php:735
-msgid "Dislikes:"
+#: include/profile_selectors.php:6
+msgid "Currently Male"
 msgstr ""
 
-#: include/identity.php:700
-msgid "Contact information and Social Networks:"
+#: include/profile_selectors.php:6
+msgid "Currently Female"
 msgstr ""
 
-#: include/identity.php:704
-msgid "Musical interests:"
+#: include/profile_selectors.php:6
+msgid "Mostly Male"
 msgstr ""
 
-#: include/identity.php:708
-msgid "Books, literature:"
+#: include/profile_selectors.php:6
+msgid "Mostly Female"
 msgstr ""
 
-#: include/identity.php:712
-msgid "Television:"
+#: include/profile_selectors.php:6
+msgid "Transgender"
 msgstr ""
 
-#: include/identity.php:716
-msgid "Film/dance/culture/entertainment:"
+#: include/profile_selectors.php:6
+msgid "Intersex"
 msgstr ""
 
-#: include/identity.php:720
-msgid "Love/Romance:"
+#: include/profile_selectors.php:6
+msgid "Transsexual"
 msgstr ""
 
-#: include/identity.php:724
-msgid "Work/employment:"
+#: include/profile_selectors.php:6
+msgid "Hermaphrodite"
 msgstr ""
 
-#: include/identity.php:728
-msgid "School/education:"
+#: include/profile_selectors.php:6
+msgid "Neuter"
 msgstr ""
 
-#: include/identity.php:733
-msgid "Forums:"
+#: include/profile_selectors.php:6
+msgid "Non-specific"
 msgstr ""
 
-#: include/identity.php:742 mod/events.php:514
-msgid "Basic"
+#: include/profile_selectors.php:6
+msgid "Other"
 msgstr ""
 
-#: include/identity.php:743 mod/contacts.php:878 mod/events.php:515
-#: mod/admin.php:980
-msgid "Advanced"
+#: include/profile_selectors.php:23
+msgid "Males"
 msgstr ""
 
-#: include/identity.php:769 mod/follow.php:145 mod/contacts.php:844
-msgid "Status Messages and Posts"
+#: include/profile_selectors.php:23
+msgid "Females"
 msgstr ""
 
-#: include/identity.php:777 mod/contacts.php:852
-msgid "Profile Details"
+#: include/profile_selectors.php:23
+msgid "Gay"
 msgstr ""
 
-#: include/identity.php:785 mod/photos.php:89
-msgid "Photo Albums"
+#: include/profile_selectors.php:23
+msgid "Lesbian"
 msgstr ""
 
-#: include/identity.php:824 mod/notes.php:47
-msgid "Personal Notes"
+#: include/profile_selectors.php:23
+msgid "No Preference"
 msgstr ""
 
-#: include/identity.php:827
-msgid "Only You Can See This"
+#: include/profile_selectors.php:23
+msgid "Bisexual"
 msgstr ""
 
-#: include/text.php:304
-msgid "newer"
+#: include/profile_selectors.php:23
+msgid "Autosexual"
 msgstr ""
 
-#: include/text.php:306
-msgid "older"
+#: include/profile_selectors.php:23
+msgid "Abstinent"
 msgstr ""
 
-#: include/text.php:311
-msgid "prev"
+#: include/profile_selectors.php:23
+msgid "Virgin"
+msgstr ""
+
+#: include/profile_selectors.php:23
+msgid "Deviant"
+msgstr ""
+
+#: include/profile_selectors.php:23
+msgid "Fetish"
+msgstr ""
+
+#: include/profile_selectors.php:23
+msgid "Oodles"
+msgstr ""
+
+#: include/profile_selectors.php:23
+msgid "Nonsexual"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Single"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Lonely"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Available"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Unavailable"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Has crush"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Infatuated"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Dating"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Unfaithful"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Sex Addict"
+msgstr ""
+
+#: include/profile_selectors.php:42 include/user.php:280 include/user.php:284
+msgid "Friends"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Friends/Benefits"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Casual"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Engaged"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Married"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Imaginarily married"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Partners"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Cohabiting"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Common law"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Happy"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Not looking"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Swinger"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Betrayed"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Separated"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Unstable"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Divorced"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Imaginarily divorced"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Widowed"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Uncertain"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "It's complicated"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Don't care"
+msgstr ""
+
+#: include/profile_selectors.php:42
+msgid "Ask me"
+msgstr ""
+
+#: include/security.php:61
+msgid "Welcome "
+msgstr ""
+
+#: include/security.php:62
+msgid "Please upload a profile photo."
+msgstr ""
+
+#: include/security.php:65
+msgid "Welcome back "
+msgstr ""
+
+#: include/security.php:429
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr ""
+
+#: include/text.php:307
+msgid "newer"
+msgstr ""
+
+#: include/text.php:308
+msgid "older"
 msgstr ""
 
 #: include/text.php:313
 msgid "first"
 msgstr ""
 
-#: include/text.php:345
-msgid "last"
+#: include/text.php:314
+msgid "prev"
 msgstr ""
 
 #: include/text.php:348
 msgid "next"
 msgstr ""
 
+#: include/text.php:349
+msgid "last"
+msgstr ""
+
 #: include/text.php:403
 msgid "Loading more entries..."
 msgstr ""
@@ -2820,7 +2791,7 @@ msgstr[1] ""
 msgid "View Contacts"
 msgstr ""
 
-#: include/text.php:1015 mod/filer.php:31 mod/notes.php:62 mod/editpost.php:99
+#: include/text.php:1015 mod/editpost.php:99 mod/filer.php:31 mod/notes.php:62
 msgid "Save"
 msgstr ""
 
@@ -2976,8 +2947,8 @@ msgstr ""
 msgid "activity"
 msgstr ""
 
-#: include/text.php:1810 mod/content.php:623 object/Item.php:446
-#: object/Item.php:458
+#: include/text.php:1810 mod/content.php:623 object/Item.php:419
+#: object/Item.php:431
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
@@ -2991,5774 +2962,5718 @@ msgstr ""
 msgid "Item filed"
 msgstr ""
 
-#: include/Contact.php:450
-msgid "Drop Contact"
+#: include/uimport.php:91
+msgid "Error decoding account file"
 msgstr ""
 
-#: include/Contact.php:827
-msgid "Organisation"
+#: include/uimport.php:97
+msgid "Error! No version data in file! This is not a Friendica account file?"
 msgstr ""
 
-#: include/Contact.php:830
-msgid "News"
+#: include/uimport.php:113 include/uimport.php:124
+msgid "Error! Cannot check nickname"
 msgstr ""
 
-#: include/Contact.php:833
-msgid "Forum"
+#: include/uimport.php:117 include/uimport.php:128
+#, php-format
+msgid "User '%s' already exists on this server!"
 msgstr ""
 
-#: include/items.php:1584 mod/dfrn_confirm.php:735 mod/dfrn_request.php:754
-msgid "[Name Withheld]"
+#: include/uimport.php:150
+msgid "User creation error"
 msgstr ""
 
-#: include/items.php:1939 mod/notice.php:15 mod/viewsrc.php:15
-#: mod/display.php:103 mod/display.php:279 mod/display.php:484
-#: mod/admin.php:235 mod/admin.php:1492 mod/admin.php:1738
-msgid "Item not found."
+#: include/uimport.php:170
+msgid "User profile creation error"
 msgstr ""
 
-#: include/items.php:1978
-msgid "Do you really want to delete this item?"
+#: include/uimport.php:219
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] ""
+msgstr[1] ""
+
+#: include/uimport.php:289
+msgid "Done. You can now login with your username and password"
 msgstr ""
 
-#: include/items.php:1980 mod/api.php:105 mod/follow.php:113
-#: mod/register.php:245 mod/settings.php:1171 mod/settings.php:1177
-#: mod/settings.php:1184 mod/settings.php:1188 mod/settings.php:1193
-#: mod/settings.php:1198 mod/settings.php:1203 mod/settings.php:1208
-#: mod/settings.php:1234 mod/settings.php:1235 mod/settings.php:1236
-#: mod/settings.php:1237 mod/settings.php:1238 mod/suggest.php:29
-#: mod/contacts.php:452 mod/message.php:206 mod/dfrn_request.php:875
-#: mod/profiles.php:640 mod/profiles.php:643 mod/profiles.php:669
-msgid "Yes"
+#: include/user.php:39 mod/settings.php:375
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: include/items.php:2143 mod/allfriends.php:12 mod/api.php:26 mod/api.php:31
-#: mod/attach.php:33 mod/common.php:18 mod/crepair.php:102 mod/delegate.php:12
-#: mod/dirfind.php:11 mod/follow.php:11 mod/follow.php:74 mod/follow.php:158
-#: mod/fsuggest.php:79 mod/group.php:19 mod/invite.php:15 mod/invite.php:103
-#: mod/manage.php:98 mod/mood.php:115 mod/nogroup.php:27 mod/notes.php:23
-#: mod/ostatus_subscribe.php:9 mod/poke.php:154 mod/profile_photo.php:19
-#: mod/profile_photo.php:180 mod/profile_photo.php:191
-#: mod/profile_photo.php:204 mod/register.php:42 mod/regmod.php:113
-#: mod/repair_ostatus.php:9 mod/settings.php:22 mod/settings.php:130
-#: mod/settings.php:668 mod/suggest.php:58 mod/uimport.php:24
-#: mod/wall_attach.php:67 mod/wall_attach.php:70 mod/cal.php:299
-#: mod/contacts.php:360 mod/dfrn_confirm.php:61 mod/editpost.php:10
-#: mod/events.php:195 mod/item.php:193 mod/item.php:205 mod/message.php:46
-#: mod/message.php:171 mod/wall_upload.php:77 mod/wall_upload.php:80
-#: mod/wallmessage.php:9 mod/wallmessage.php:33 mod/wallmessage.php:73
-#: mod/wallmessage.php:97 mod/photos.php:161 mod/photos.php:1092
-#: mod/profiles.php:166 mod/profiles.php:607 mod/display.php:481
-#: mod/viewcontacts.php:46 mod/network.php:4 mod/notifications.php:71
-#: index.php:407
-msgid "Permission denied."
+#: include/user.php:48
+msgid "An invitation is required."
 msgstr ""
 
-#: include/items.php:2248
-msgid "Archives"
+#: include/user.php:53
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: include/dbstructure.php:33
-#, 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."
+#: include/user.php:61
+msgid "Invalid OpenID url"
 msgstr ""
 
-#: include/dbstructure.php:38
-#, php-format
-msgid ""
-"The error message is\n"
-"[pre]%s[/pre]"
+#: include/user.php:82
+msgid "Please enter the required information."
 msgstr ""
 
-#: include/dbstructure.php:195
-msgid "Errors encountered creating database tables."
+#: include/user.php:96
+msgid "Please use a shorter name."
 msgstr ""
 
-#: include/dbstructure.php:329 include/dbstructure.php:337
-#: include/dbstructure.php:345 include/dbstructure.php:350
-#: include/dbstructure.php:355
-msgid "Errors encountered performing database changes."
+#: include/user.php:98
+msgid "Name too short."
 msgstr ""
 
-#: include/network.php:619
-msgid "view full size"
+#: include/user.php:113
+msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: mod/allfriends.php:46
-msgid "No friends to display."
+#: include/user.php:118
+msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: mod/api.php:76 mod/api.php:102
-msgid "Authorize application connection"
+#: include/user.php:121
+msgid "Not a valid email address."
 msgstr ""
 
-#: mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
+#: include/user.php:134
+msgid "Cannot use that email."
 msgstr ""
 
-#: mod/api.php:89
-msgid "Please login to continue."
+#: include/user.php:140
+msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"."
 msgstr ""
 
-#: mod/api.php:104
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+#: include/user.php:147 include/user.php:245
+msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: mod/api.php:106 mod/follow.php:113 mod/register.php:246
-#: mod/settings.php:1171 mod/settings.php:1177 mod/settings.php:1184
-#: mod/settings.php:1188 mod/settings.php:1193 mod/settings.php:1198
-#: mod/settings.php:1203 mod/settings.php:1208 mod/settings.php:1234
-#: mod/settings.php:1235 mod/settings.php:1236 mod/settings.php:1237
-#: mod/settings.php:1238 mod/dfrn_request.php:875 mod/profiles.php:640
-#: mod/profiles.php:644 mod/profiles.php:669
-msgid "No"
+#: include/user.php:157
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
 msgstr ""
 
-#: mod/apps.php:7 index.php:248
-msgid "You must be logged in to use addons. "
+#: include/user.php:173
+msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: mod/apps.php:11
-msgid "Applications"
+#: include/user.php:231
+msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: mod/apps.php:14
-msgid "No installed applications."
+#: include/user.php:256 view/theme/duepuntozero/config.php:43
+msgid "default"
 msgstr ""
 
-#: mod/attach.php:8
-msgid "Item not available."
+#: include/user.php:266
+msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: mod/attach.php:20
-msgid "Item was not found."
+#: include/user.php:326 include/user.php:334 include/user.php:342
+#: mod/photos.php:68 mod/photos.php:182 mod/photos.php:768 mod/photos.php:1231
+#: mod/photos.php:1252 mod/photos.php:1839 mod/profile_photo.php:74
+#: mod/profile_photo.php:82 mod/profile_photo.php:90 mod/profile_photo.php:215
+#: mod/profile_photo.php:310 mod/profile_photo.php:320
+msgid "Profile Photos"
 msgstr ""
 
-#: mod/babel.php:17
-msgid "Source (bbcode) text:"
+#: include/user.php:417
+#, 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 ""
 
-#: mod/babel.php:23
-msgid "Source (Diaspora) text to convert to BBcode:"
+#: include/user.php:427
+#, php-format
+msgid "Registration at %s"
 msgstr ""
 
-#: mod/babel.php:31
-msgid "Source input: "
+#: include/user.php:437
+#, 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 ""
 
-#: mod/babel.php:35
-msgid "bb2html (raw HTML): "
+#: include/user.php:441
+#, 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 ""
 
-#: mod/babel.php:39
-msgid "bb2html: "
+#: include/user.php:473 mod/admin.php:1223
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: mod/babel.php:43
-msgid "bb2html2bb: "
+#: index.php:248 mod/apps.php:7
+msgid "You must be logged in to use addons. "
 msgstr ""
 
-#: mod/babel.php:47
-msgid "bb2md: "
+#: index.php:292 mod/fetch.php:12 mod/fetch.php:39 mod/fetch.php:48
+#: mod/help.php:53 mod/p.php:16 mod/p.php:43 mod/p.php:52
+msgid "Not Found"
 msgstr ""
 
-#: mod/babel.php:51
-msgid "bb2md2html: "
+#: index.php:295 mod/help.php:56
+msgid "Page not found."
 msgstr ""
 
-#: mod/babel.php:55
-msgid "bb2dia2bb: "
+#: index.php:406 mod/group.php:76 mod/profperm.php:20
+msgid "Permission denied"
 msgstr ""
 
-#: mod/babel.php:59
-msgid "bb2md2html2bb: "
+#: index.php:457
+msgid "toggle mobile"
 msgstr ""
 
-#: mod/babel.php:69
-msgid "Source input (Diaspora format): "
+#: mod/admin.php:96
+msgid "Theme settings updated."
 msgstr ""
 
-#: mod/babel.php:74
-msgid "diaspora2bb: "
+#: mod/admin.php:162 mod/admin.php:967
+msgid "Site"
 msgstr ""
 
-#: mod/bookmarklet.php:41
-msgid "The post was created"
+#: mod/admin.php:163 mod/admin.php:901 mod/admin.php:1413 mod/admin.php:1429
+msgid "Users"
 msgstr ""
 
-#: mod/common.php:91
-msgid "No contacts in common."
+#: mod/admin.php:164 mod/admin.php:1531 mod/admin.php:1594 mod/settings.php:74
+msgid "Plugins"
 msgstr ""
 
-#: mod/common.php:141 mod/contacts.php:871
-msgid "Common Friends"
+#: mod/admin.php:165 mod/admin.php:1807 mod/admin.php:1857
+msgid "Themes"
 msgstr ""
 
-#: mod/community.php:22 mod/directory.php:37 mod/videos.php:198
-#: mod/photos.php:964 mod/dfrn_request.php:799 mod/display.php:200
-#: mod/viewcontacts.php:36 mod/search.php:93 mod/search.php:99
-msgid "Public access denied."
+#: mod/admin.php:166 mod/settings.php:52
+msgid "Additional features"
 msgstr ""
 
-#: mod/community.php:27
-msgid "Not available."
+#: mod/admin.php:167
+msgid "DB updates"
 msgstr ""
 
-#: mod/community.php:66 mod/community.php:75 mod/search.php:224
-msgid "No results."
+#: mod/admin.php:168 mod/admin.php:416
+msgid "Inspect Queue"
 msgstr ""
 
-#: mod/content.php:119 mod/network.php:468
-msgid "No such group"
+#: mod/admin.php:169 mod/admin.php:382
+msgid "Federation Statistics"
 msgstr ""
 
-#: mod/content.php:130 mod/group.php:203 mod/network.php:495
-msgid "Group is empty"
+#: mod/admin.php:183 mod/admin.php:194 mod/admin.php:1931
+msgid "Logs"
 msgstr ""
 
-#: mod/content.php:135 mod/network.php:499
-#, php-format
-msgid "Group: %s"
+#: mod/admin.php:184 mod/admin.php:1999
+msgid "View Logs"
 msgstr ""
 
-#: mod/content.php:325 object/Item.php:96
-msgid "This entry was edited"
+#: mod/admin.php:185
+msgid "probe address"
 msgstr ""
 
-#: mod/content.php:621 object/Item.php:444
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
+#: mod/admin.php:186
+msgid "check webfinger"
+msgstr ""
 
-#: mod/content.php:638 mod/photos.php:1402 object/Item.php:117
-msgid "Private Message"
+#: mod/admin.php:193
+msgid "Plugin Features"
 msgstr ""
 
-#: mod/content.php:702 mod/photos.php:1590 object/Item.php:274
-msgid "I like this (toggle)"
+#: mod/admin.php:195
+msgid "diagnostics"
 msgstr ""
 
-#: mod/content.php:702 object/Item.php:274
-msgid "like"
+#: mod/admin.php:196
+msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: mod/content.php:703 mod/photos.php:1591 object/Item.php:275
-msgid "I don't like this (toggle)"
+#: mod/admin.php:312
+msgid "unknown"
 msgstr ""
 
-#: mod/content.php:703 object/Item.php:275
-msgid "dislike"
+#: mod/admin.php:375
+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/content.php:705 object/Item.php:278
-msgid "Share this"
+#: mod/admin.php:376
+msgid ""
+"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
+"will improve the data displayed here."
 msgstr ""
 
-#: mod/content.php:705 object/Item.php:278
-msgid "share"
+#: mod/admin.php:381 mod/admin.php:415 mod/admin.php:493 mod/admin.php:966
+#: mod/admin.php:1412 mod/admin.php:1530 mod/admin.php:1593 mod/admin.php:1806
+#: mod/admin.php:1856 mod/admin.php:1930 mod/admin.php:1998
+msgid "Administration"
 msgstr ""
 
-#: mod/content.php:725 mod/photos.php:1609 mod/photos.php:1657
-#: mod/photos.php:1743 object/Item.php:729
-msgid "This is you"
+#: mod/admin.php:388
+#, php-format
+msgid "Currently this node is aware of %d nodes from the following platforms:"
 msgstr ""
 
-#: mod/content.php:727 mod/content.php:950 mod/photos.php:1611
-#: mod/photos.php:1659 mod/photos.php:1745 object/Item.php:418
-#: object/Item.php:731
-msgid "Comment"
+#: mod/admin.php:418
+msgid "ID"
 msgstr ""
 
-#: mod/content.php:728 mod/crepair.php:156 mod/fsuggest.php:108
-#: mod/invite.php:142 mod/localtime.php:45 mod/manage.php:145 mod/mood.php:138
-#: mod/poke.php:203 mod/contacts.php:585 mod/events.php:513
-#: mod/message.php:338 mod/message.php:521 mod/photos.php:1124
-#: mod/photos.php:1246 mod/photos.php:1562 mod/photos.php:1612
-#: mod/photos.php:1660 mod/photos.php:1746 mod/install.php:276
-#: mod/install.php:316 mod/profiles.php:680 object/Item.php:732
-#: view/theme/quattro/config.php:67 view/theme/vier/config.php:112
-#: view/theme/duepuntozero/config.php:61 view/theme/clean/config.php:87
-#: view/theme/frio/config.php:64
-msgid "Submit"
+#: mod/admin.php:419
+msgid "Recipient Name"
 msgstr ""
 
-#: mod/content.php:729 object/Item.php:733
-msgid "Bold"
+#: mod/admin.php:420
+msgid "Recipient Profile"
 msgstr ""
 
-#: mod/content.php:730 object/Item.php:734
-msgid "Italic"
+#: mod/admin.php:422
+msgid "Created"
 msgstr ""
 
-#: mod/content.php:731 object/Item.php:735
-msgid "Underline"
+#: mod/admin.php:423
+msgid "Last Tried"
 msgstr ""
 
-#: mod/content.php:732 object/Item.php:736
-msgid "Quote"
+#: mod/admin.php:424
+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/content.php:733 object/Item.php:737
-msgid "Code"
+#: mod/admin.php:449
+#, php-format
+msgid ""
+"Your DB still runs with MyISAM tables. You should change the engine type to "
+"InnoDB. As Friendica will use InnoDB only features in the future, you should "
+"change this! See <a href=\"%s\">here</a> for a guide that may be helpful "
+"converting the table engines. You may also use the <tt>convert_innodb.sql</"
+"tt> in the <tt>/util</tt> directory of your Friendica installation.<br />"
 msgstr ""
 
-#: mod/content.php:734 object/Item.php:738
-msgid "Image"
+#: mod/admin.php:454
+msgid ""
+"You are using a MySQL version which does not support all features that "
+"Friendica uses. You should consider switching to MariaDB."
 msgstr ""
 
-#: mod/content.php:735 object/Item.php:739
-msgid "Link"
+#: mod/admin.php:458 mod/admin.php:1362
+msgid "Normal Account"
 msgstr ""
 
-#: mod/content.php:736 object/Item.php:740
-msgid "Video"
+#: mod/admin.php:459 mod/admin.php:1363
+msgid "Soapbox Account"
 msgstr ""
 
-#: mod/content.php:746 mod/settings.php:743 object/Item.php:122
-#: object/Item.php:124
-msgid "Edit"
+#: mod/admin.php:460 mod/admin.php:1364
+msgid "Community/Celebrity Account"
 msgstr ""
 
-#: mod/content.php:772 object/Item.php:238
-msgid "add star"
+#: mod/admin.php:461 mod/admin.php:1365
+msgid "Automatic Friend Account"
 msgstr ""
 
-#: mod/content.php:773 object/Item.php:239
-msgid "remove star"
+#: mod/admin.php:462
+msgid "Blog Account"
 msgstr ""
 
-#: mod/content.php:774 object/Item.php:240
-msgid "toggle star status"
+#: mod/admin.php:463
+msgid "Private Forum"
 msgstr ""
 
-#: mod/content.php:777 object/Item.php:243
-msgid "starred"
+#: mod/admin.php:488
+msgid "Message queues"
 msgstr ""
 
-#: mod/content.php:778 mod/content.php:800 object/Item.php:263
-msgid "add tag"
+#: mod/admin.php:494
+msgid "Summary"
 msgstr ""
 
-#: mod/content.php:789 object/Item.php:251
-msgid "ignore thread"
+#: mod/admin.php:496
+msgid "Registered users"
 msgstr ""
 
-#: mod/content.php:790 object/Item.php:252
-msgid "unignore thread"
+#: mod/admin.php:498
+msgid "Pending registrations"
 msgstr ""
 
-#: mod/content.php:791 object/Item.php:253
-msgid "toggle ignore status"
+#: mod/admin.php:499
+msgid "Version"
 msgstr ""
 
-#: mod/content.php:794 mod/ostatus_subscribe.php:73 object/Item.php:256
-msgid "ignored"
+#: mod/admin.php:504
+msgid "Active plugins"
 msgstr ""
 
-#: mod/content.php:805 object/Item.php:141
-msgid "save to folder"
+#: mod/admin.php:529
+msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr ""
 
-#: mod/content.php:853 object/Item.php:212
-msgid "I will attend"
+#: mod/admin.php:819
+msgid "RINO2 needs mcrypt php extension to work."
 msgstr ""
 
-#: mod/content.php:853 object/Item.php:212
-msgid "I will not attend"
+#: mod/admin.php:827
+msgid "Site settings updated."
 msgstr ""
 
-#: mod/content.php:853 object/Item.php:212
-msgid "I might attend"
+#: mod/admin.php:855 mod/settings.php:943
+msgid "No special theme for mobile devices"
 msgstr ""
 
-#: mod/content.php:917 object/Item.php:384
-msgid "to"
+#: mod/admin.php:884
+msgid "No community page"
 msgstr ""
 
-#: mod/content.php:918 object/Item.php:386
-msgid "Wall-to-Wall"
+#: mod/admin.php:885
+msgid "Public postings from users of this site"
 msgstr ""
 
-#: mod/content.php:919 object/Item.php:387
-msgid "via Wall-To-Wall:"
+#: mod/admin.php:886
+msgid "Global community page"
 msgstr ""
 
-#: mod/credits.php:16
-msgid "Credits"
+#: mod/admin.php:891 mod/contacts.php:538
+msgid "Never"
 msgstr ""
 
-#: mod/credits.php:17
-msgid ""
-"Friendica is a community project, that would not be possible without the "
-"help of many people. Here is a list of those who have contributed to the "
-"code or the translation of Friendica. Thank you all!"
+#: mod/admin.php:892
+msgid "At post arrival"
 msgstr ""
 
-#: mod/crepair.php:89
-msgid "Contact settings applied."
+#: mod/admin.php:900 mod/contacts.php:565
+msgid "Disabled"
 msgstr ""
 
-#: mod/crepair.php:91
-msgid "Contact update failed."
+#: mod/admin.php:902
+msgid "Users, Global Contacts"
 msgstr ""
 
-#: mod/crepair.php:116 mod/fsuggest.php:21 mod/fsuggest.php:93
-#: mod/dfrn_confirm.php:126
-msgid "Contact not found."
+#: mod/admin.php:903
+msgid "Users, Global Contacts/fallback"
 msgstr ""
 
-#: mod/crepair.php:122
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
-"information your communications with this contact may stop working."
+#: mod/admin.php:907
+msgid "One month"
 msgstr ""
 
-#: mod/crepair.php:123
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
+#: mod/admin.php:908
+msgid "Three months"
 msgstr ""
 
-#: mod/crepair.php:136 mod/crepair.php:138
-msgid "No mirroring"
+#: mod/admin.php:909
+msgid "Half a year"
 msgstr ""
 
-#: mod/crepair.php:136
-msgid "Mirror as forwarded posting"
+#: mod/admin.php:910
+msgid "One year"
 msgstr ""
 
-#: mod/crepair.php:136 mod/crepair.php:138
-msgid "Mirror as my own posting"
+#: mod/admin.php:915
+msgid "Multi user instance"
 msgstr ""
 
-#: mod/crepair.php:152
-msgid "Return to contact editor"
+#: mod/admin.php:938
+msgid "Closed"
 msgstr ""
 
-#: mod/crepair.php:154
-msgid "Refetch contact data"
+#: mod/admin.php:939
+msgid "Requires approval"
 msgstr ""
 
-#: mod/crepair.php:158
-msgid "Remote Self"
+#: mod/admin.php:940
+msgid "Open"
 msgstr ""
 
-#: mod/crepair.php:161
-msgid "Mirror postings from this contact"
+#: mod/admin.php:944
+msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: mod/crepair.php:163
-msgid ""
-"Mark this contact as remote_self, this will cause friendica to repost new "
-"entries from this contact."
+#: mod/admin.php:945
+msgid "Force all links to use SSL"
 msgstr ""
 
-#: mod/crepair.php:167 mod/settings.php:683 mod/settings.php:709
-#: mod/admin.php:1417 mod/admin.php:1430 mod/admin.php:1443 mod/admin.php:1459
-msgid "Name"
+#: mod/admin.php:946
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: mod/crepair.php:168
-msgid "Account Nickname"
+#: mod/admin.php:968 mod/admin.php:1595 mod/admin.php:1858 mod/admin.php:1932
+#: mod/admin.php:2085 mod/settings.php:681 mod/settings.php:792
+#: mod/settings.php:841 mod/settings.php:908 mod/settings.php:1005
+#: mod/settings.php:1271
+msgid "Save Settings"
 msgstr ""
 
-#: mod/crepair.php:169
-msgid "@Tagname - overrides Name/Nickname"
+#: mod/admin.php:969 mod/register.php:272
+msgid "Registration"
 msgstr ""
 
-#: mod/crepair.php:170
-msgid "Account URL"
+#: mod/admin.php:970
+msgid "File upload"
 msgstr ""
 
-#: mod/crepair.php:171
-msgid "Friend Request URL"
+#: mod/admin.php:971
+msgid "Policies"
 msgstr ""
 
-#: mod/crepair.php:172
-msgid "Friend Confirm URL"
+#: mod/admin.php:973
+msgid "Auto Discovered Contact Directory"
 msgstr ""
 
-#: mod/crepair.php:173
-msgid "Notification Endpoint URL"
+#: mod/admin.php:974
+msgid "Performance"
 msgstr ""
 
-#: mod/crepair.php:174
-msgid "Poll/Feed URL"
+#: mod/admin.php:975
+msgid "Worker"
 msgstr ""
 
-#: mod/crepair.php:175
-msgid "New photo from this URL"
+#: mod/admin.php:976
+msgid ""
+"Relocate - WARNING: advanced function. Could make this server unreachable."
 msgstr ""
 
-#: mod/delegate.php:101
-msgid "No potential page delegates located."
+#: mod/admin.php:979
+msgid "Site name"
 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/admin.php:980
+msgid "Host name"
 msgstr ""
 
-#: mod/delegate.php:133
-msgid "Existing Page Managers"
+#: mod/admin.php:981
+msgid "Sender Email"
 msgstr ""
 
-#: mod/delegate.php:135
-msgid "Existing Page Delegates"
+#: mod/admin.php:981
+msgid ""
+"The email address your server shall use to send notification emails from."
 msgstr ""
 
-#: mod/delegate.php:137
-msgid "Potential Delegates"
+#: mod/admin.php:982
+msgid "Banner/Logo"
 msgstr ""
 
-#: mod/delegate.php:139 mod/tagrm.php:95
-msgid "Remove"
+#: mod/admin.php:983
+msgid "Shortcut icon"
 msgstr ""
 
-#: mod/delegate.php:140
-msgid "Add"
+#: mod/admin.php:983
+msgid "Link to an icon that will be used for browsers."
 msgstr ""
 
-#: mod/delegate.php:141
-msgid "No entries."
+#: mod/admin.php:984
+msgid "Touch icon"
 msgstr ""
 
-#: mod/dfrn_poll.php:104 mod/dfrn_poll.php:539
-#, php-format
-msgid "%1$s welcomes %2$s"
+#: mod/admin.php:984
+msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr ""
 
-#: mod/directory.php:199 view/theme/vier/theme.php:196
-msgid "Global Directory"
+#: mod/admin.php:985
+msgid "Additional Info"
 msgstr ""
 
-#: mod/directory.php:201
-msgid "Find on this site"
+#: mod/admin.php:985
+#, php-format
+msgid ""
+"For public servers: you can add additional information here that will be "
+"listed at %s/siteinfo."
 msgstr ""
 
-#: mod/directory.php:203
-msgid "Results for:"
+#: mod/admin.php:986
+msgid "System language"
 msgstr ""
 
-#: mod/directory.php:205
-msgid "Site Directory"
+#: mod/admin.php:987
+msgid "System theme"
 msgstr ""
 
-#: mod/directory.php:212
-msgid "No entries (some entries may be hidden)."
+#: mod/admin.php:987
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: mod/dirfind.php:37
-#, php-format
-msgid "People Search - %s"
+#: mod/admin.php:988
+msgid "Mobile system theme"
 msgstr ""
 
-#: mod/dirfind.php:48
-#, php-format
-msgid "Forum Search - %s"
+#: mod/admin.php:988
+msgid "Theme for mobile devices"
 msgstr ""
 
-#: mod/dirfind.php:245 mod/match.php:109
-msgid "No matches"
+#: mod/admin.php:989
+msgid "SSL link policy"
 msgstr ""
 
-#: mod/filer.php:30
-msgid "- select -"
+#: mod/admin.php:989
+msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: mod/follow.php:19 mod/dfrn_request.php:888
-msgid "Submit Request"
+#: mod/admin.php:990
+msgid "Force SSL"
 msgstr ""
 
-#: mod/follow.php:30
-msgid "You already added this contact."
+#: mod/admin.php:990
+msgid ""
+"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
+"to endless loops."
 msgstr ""
 
-#: mod/follow.php:39
-msgid "Diaspora support isn't enabled. Contact can't be added."
+#: mod/admin.php:991
+msgid "Hide help entry from navigation menu"
 msgstr ""
 
-#: mod/follow.php:46
-msgid "OStatus support is disabled. Contact can't be added."
+#: mod/admin.php:991
+msgid ""
+"Hides the menu entry for the Help pages from the navigation menu. You can "
+"still access it calling /help directly."
 msgstr ""
 
-#: mod/follow.php:53
-msgid "The network type couldn't be detected. Contact can't be added."
+#: mod/admin.php:992
+msgid "Single user instance"
 msgstr ""
 
-#: mod/follow.php:112 mod/dfrn_request.php:874
-msgid "Please answer the following:"
+#: mod/admin.php:992
+msgid "Make this instance multi-user or single-user for the named user"
 msgstr ""
 
-#: mod/follow.php:113 mod/dfrn_request.php:875
-#, php-format
-msgid "Does %s know you?"
+#: mod/admin.php:993
+msgid "Maximum image size"
 msgstr ""
 
-#: mod/follow.php:114 mod/dfrn_request.php:879
-msgid "Add a personal note:"
+#: mod/admin.php:993
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
 msgstr ""
 
-#: mod/follow.php:120 mod/dfrn_request.php:885
-msgid "Your Identity Address:"
+#: mod/admin.php:994
+msgid "Maximum image length"
 msgstr ""
 
-#: mod/follow.php:129 mod/contacts.php:632 mod/notifications.php:249
-msgid "Profile URL"
+#: mod/admin.php:994
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is "
+"-1, which means no limits."
 msgstr ""
 
-#: mod/follow.php:186
-msgid "Contact added"
+#: mod/admin.php:995
+msgid "JPEG image quality"
 msgstr ""
 
-#: mod/fsuggest.php:64
-msgid "Friend suggestion sent."
+#: mod/admin.php:995
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
 msgstr ""
 
-#: mod/fsuggest.php:98
-msgid "Suggest Friends"
+#: mod/admin.php:997
+msgid "Register policy"
 msgstr ""
 
-#: mod/fsuggest.php:100
-#, php-format
-msgid "Suggest a friend for %s"
+#: mod/admin.php:998
+msgid "Maximum Daily Registrations"
 msgstr ""
 
-#: mod/group.php:29
-msgid "Group created."
+#: mod/admin.php:998
+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/group.php:35
-msgid "Could not create group."
+#: mod/admin.php:999
+msgid "Register text"
 msgstr ""
 
-#: mod/group.php:49 mod/group.php:150
-msgid "Group not found."
+#: mod/admin.php:999
+msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: mod/group.php:63
-msgid "Group name changed."
+#: mod/admin.php:1000
+msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: mod/group.php:76 mod/profperm.php:20 index.php:406
-msgid "Permission denied"
+#: mod/admin.php:1000
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: mod/group.php:91
-msgid "Save Group"
+#: mod/admin.php:1001
+msgid "Allowed friend domains"
 msgstr ""
 
-#: mod/group.php:97
-msgid "Create a group of contacts/friends."
+#: mod/admin.php:1001
+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/group.php:122
-msgid "Group removed."
+#: mod/admin.php:1002
+msgid "Allowed email domains"
 msgstr ""
 
-#: mod/group.php:124
-msgid "Unable to remove group."
+#: mod/admin.php:1002
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
 msgstr ""
 
-#: mod/group.php:187
-msgid "Group Editor"
+#: mod/admin.php:1003
+msgid "Block public"
 msgstr ""
 
-#: mod/group.php:200
-msgid "Members"
+#: mod/admin.php:1003
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
 msgstr ""
 
-#: mod/group.php:202 mod/contacts.php:700
-msgid "All Contacts"
+#: mod/admin.php:1004
+msgid "Force publish"
 msgstr ""
 
-#: mod/group.php:233 mod/profperm.php:107
-msgid "Click on a contact to add or remove."
+#: mod/admin.php:1004
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: mod/hcard.php:11
-msgid "No profile"
+#: mod/admin.php:1005
+msgid "Global directory URL"
 msgstr ""
 
-#: mod/help.php:41
-msgid "Help:"
+#: mod/admin.php:1005
+msgid ""
+"URL to the global directory. If this is not set, the global directory is "
+"completely unavailable to the application."
 msgstr ""
 
-#: mod/help.php:53 mod/fetch.php:12 mod/fetch.php:39 mod/fetch.php:48
-#: mod/p.php:16 mod/p.php:43 mod/p.php:52 index.php:292
-msgid "Not Found"
+#: mod/admin.php:1006
+msgid "Allow threaded items"
 msgstr ""
 
-#: mod/help.php:56 index.php:295
-msgid "Page not found."
+#: mod/admin.php:1006
+msgid "Allow infinite level threading for items on this site."
 msgstr ""
 
-#: mod/home.php:39
-#, php-format
-msgid "Welcome to %s"
+#: mod/admin.php:1007
+msgid "Private posts by default for new users"
 msgstr ""
 
-#: mod/invite.php:28
-msgid "Total invitation limit exceeded."
+#: mod/admin.php:1007
+msgid ""
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."
 msgstr ""
 
-#: mod/invite.php:51
-#, php-format
-msgid "%s : Not a valid email address."
+#: mod/admin.php:1008
+msgid "Don't include post content in email notifications"
 msgstr ""
 
-#: mod/invite.php:76
-msgid "Please join us on Friendica"
+#: mod/admin.php:1008
+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/invite.php:87
-msgid "Invitation limit exceeded. Please contact your site administrator."
+#: mod/admin.php:1009
+msgid "Disallow public access to addons listed in the apps menu."
 msgstr ""
 
-#: mod/invite.php:91
-#, php-format
-msgid "%s : Message delivery failed."
+#: mod/admin.php:1009
+msgid ""
+"Checking this box will restrict addons listed in the apps menu to members "
+"only."
 msgstr ""
 
-#: mod/invite.php:95
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/invite.php:114
-msgid "You have no more invitations available"
+#: mod/admin.php:1010
+msgid "Don't embed private images in posts"
 msgstr ""
 
-#: mod/invite.php:122
-#, php-format
+#: mod/admin.php:1010
 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."
+"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/invite.php:124
-#, php-format
-msgid ""
-"To accept this invitation, please visit and register at %s or any other "
-"public Friendica website."
+#: mod/admin.php:1011
+msgid "Allow Users to set remote_self"
 msgstr ""
 
-#: mod/invite.php:125
-#, php-format
+#: mod/admin.php:1011
 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."
+"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/invite.php:128
-msgid ""
-"Our apologies. This system is not currently configured to connect with other "
-"public sites or invite members."
+#: mod/admin.php:1012
+msgid "Block multiple registrations"
 msgstr ""
 
-#: mod/invite.php:134
-msgid "Send invitations"
+#: mod/admin.php:1012
+msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: mod/invite.php:135
-msgid "Enter email addresses, one per line:"
+#: mod/admin.php:1013
+msgid "OpenID support"
 msgstr ""
 
-#: mod/invite.php:136 mod/message.php:332 mod/message.php:515
-#: mod/wallmessage.php:135
-msgid "Your message:"
+#: mod/admin.php:1013
+msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: mod/invite.php:137
+#: mod/admin.php:1014
+msgid "Fullname check"
+msgstr ""
+
+#: mod/admin.php:1014
 msgid ""
-"You are cordially invited to join me and other close friends on Friendica - "
-"and help us to create a better social web."
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
 msgstr ""
 
-#: mod/invite.php:139
-msgid "You will need to supply this invitation code: $invite_code"
+#: mod/admin.php:1015
+msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: mod/invite.php:139
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
+#: mod/admin.php:1015
+msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: mod/invite.php:141
+#: mod/admin.php:1016
+msgid "Community Page Style"
+msgstr ""
+
+#: mod/admin.php:1016
 msgid ""
-"For more information about the Friendica project and why we feel it is "
-"important, please visit http://friendica.com"
+"Type of community page to show. 'Global community' shows every public "
+"posting from an open distributed network that arrived on this server."
 msgstr ""
 
-#: mod/localtime.php:24
-msgid "Time Conversion"
+#: mod/admin.php:1017
+msgid "Posts per user on community page"
 msgstr ""
 
-#: mod/localtime.php:26
+#: mod/admin.php:1017
 msgid ""
-"Friendica provides this service for sharing events with other networks and "
-"friends in unknown timezones."
+"The maximum number of posts per user on the community page. (Not valid for "
+"'Global Community')"
 msgstr ""
 
-#: mod/localtime.php:30
-#, php-format
-msgid "UTC time: %s"
+#: mod/admin.php:1018
+msgid "Enable OStatus support"
 msgstr ""
 
-#: mod/localtime.php:33
-#, php-format
-msgid "Current timezone: %s"
+#: mod/admin.php:1018
+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/localtime.php:36
-#, php-format
-msgid "Converted localtime: %s"
+#: mod/admin.php:1019
+msgid "OStatus conversation completion interval"
 msgstr ""
 
-#: mod/localtime.php:41
-msgid "Please select your timezone:"
+#: mod/admin.php:1019
+msgid ""
+"How often shall the poller check for new entries in OStatus conversations? "
+"This can be a very ressource task."
 msgstr ""
 
-#: mod/lockview.php:32 mod/lockview.php:40
-msgid "Remote privacy information not available."
+#: mod/admin.php:1020
+msgid "Only import OStatus threads from our contacts"
 msgstr ""
 
-#: mod/lockview.php:49
-msgid "Visible to:"
+#: mod/admin.php:1020
+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/lostpass.php:19
-msgid "No valid account found."
+#: mod/admin.php:1021
+msgid "OStatus support can only be enabled if threading is enabled."
 msgstr ""
 
-#: mod/lostpass.php:35
-msgid "Password reset request issued. Check your email."
+#: mod/admin.php:1023
+msgid ""
+"Diaspora support can't be enabled because Friendica was installed into a sub "
+"directory."
 msgstr ""
 
-#: mod/lostpass.php:41
-#, 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."
-msgstr ""
-
-#: mod/lostpass.php:52
-#, 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"
-msgstr ""
-
-#: mod/lostpass.php:71
-#, php-format
-msgid "Password reset requested at %s"
-msgstr ""
-
-#: mod/lostpass.php:91
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr ""
-
-#: mod/lostpass.php:110 boot.php:1848
-msgid "Password Reset"
-msgstr ""
-
-#: mod/lostpass.php:111
-msgid "Your password has been reset as requested."
-msgstr ""
-
-#: mod/lostpass.php:112
-msgid "Your new password is"
-msgstr ""
-
-#: mod/lostpass.php:113
-msgid "Save or copy your new password - and then"
-msgstr ""
-
-#: mod/lostpass.php:114
-msgid "click here to login"
-msgstr ""
-
-#: mod/lostpass.php:115
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr ""
-
-#: mod/lostpass.php:125
-#, 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/lostpass.php:131
-#, php-format
-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"
-msgstr ""
-
-#: mod/lostpass.php:147
-#, php-format
-msgid "Your password has been changed at %s"
-msgstr ""
-
-#: mod/lostpass.php:159
-msgid "Forgot your Password?"
-msgstr ""
-
-#: mod/lostpass.php:160
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr ""
-
-#: mod/lostpass.php:161 boot.php:1836
-msgid "Nickname or Email: "
-msgstr ""
-
-#: mod/lostpass.php:162
-msgid "Reset"
+#: mod/admin.php:1024
+msgid "Enable Diaspora support"
 msgstr ""
 
-#: mod/maintenance.php:9
-msgid "System down for maintenance"
+#: mod/admin.php:1024
+msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: mod/manage.php:141
-msgid "Manage Identities and/or Pages"
+#: mod/admin.php:1025
+msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: mod/manage.php:142
+#: mod/admin.php:1025
 msgid ""
-"Toggle between different identities or community/group pages which share "
-"your account details or which you have been granted \"manage\" permissions"
-msgstr ""
-
-#: mod/manage.php:143
-msgid "Select an identity to manage: "
-msgstr ""
-
-#: mod/match.php:35
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr ""
-
-#: mod/match.php:88
-msgid "is interested in:"
-msgstr ""
-
-#: mod/match.php:102
-msgid "Profile Match"
-msgstr ""
-
-#: mod/mood.php:134
-msgid "Mood"
-msgstr ""
-
-#: mod/mood.php:135
-msgid "Set your current mood and tell your friends"
-msgstr ""
-
-#: mod/newmember.php:6
-msgid "Welcome to Friendica"
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
 msgstr ""
 
-#: mod/newmember.php:8
-msgid "New Member Checklist"
+#: mod/admin.php:1026
+msgid "Verify SSL"
 msgstr ""
 
-#: mod/newmember.php:12
+#: mod/admin.php:1026
 msgid ""
-"We would like to offer some tips and links to help make your experience "
-"enjoyable. Click any item to visit the relevant page. A link to this page "
-"will be visible from your home page for two weeks after your initial "
-"registration and then will quietly disappear."
-msgstr ""
-
-#: mod/newmember.php:14
-msgid "Getting Started"
-msgstr ""
-
-#: mod/newmember.php:18
-msgid "Friendica Walk-Through"
+"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/newmember.php:18
-msgid ""
-"On your <em>Quick Start</em> page - find a brief introduction to your "
-"profile and network tabs, make some new connections, and find some groups to "
-"join."
+#: mod/admin.php:1027
+msgid "Proxy user"
 msgstr ""
 
-#: mod/newmember.php:26
-msgid "Go to Your Settings"
+#: mod/admin.php:1028
+msgid "Proxy URL"
 msgstr ""
 
-#: mod/newmember.php:26
-msgid ""
-"On your <em>Settings</em> page -  change your initial password. Also make a "
-"note of your Identity Address. This looks just like an email address - and "
-"will be useful in making friends on the free social web."
+#: mod/admin.php:1029
+msgid "Network timeout"
 msgstr ""
 
-#: mod/newmember.php:28
-msgid ""
-"Review the other settings, particularly the privacy settings. An unpublished "
-"directory listing is like having an unlisted phone number. In general, you "
-"should probably publish your listing - unless all of your friends and "
-"potential friends know exactly how to find you."
+#: mod/admin.php:1029
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: mod/newmember.php:36 mod/profile_photo.php:256 mod/profiles.php:699
-msgid "Upload Profile Photo"
+#: mod/admin.php:1030
+msgid "Maximum Load Average"
 msgstr ""
 
-#: mod/newmember.php:36
+#: mod/admin.php:1030
 msgid ""
-"Upload a profile photo if you have not done so already. Studies have shown "
-"that people with real photos of themselves are ten times more likely to make "
-"friends than people who do not."
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
 msgstr ""
 
-#: mod/newmember.php:38
-msgid "Edit Your Profile"
+#: mod/admin.php:1031
+msgid "Maximum Load Average (Frontend)"
 msgstr ""
 
-#: mod/newmember.php:38
-msgid ""
-"Edit your <strong>default</strong> profile to your liking. Review the "
-"settings for hiding your list of friends and hiding the profile from unknown "
-"visitors."
+#: mod/admin.php:1031
+msgid "Maximum system load before the frontend quits service - default 50."
 msgstr ""
 
-#: mod/newmember.php:40
-msgid "Profile Keywords"
+#: mod/admin.php:1032
+msgid "Maximum table size for optimization"
 msgstr ""
 
-#: mod/newmember.php:40
+#: mod/admin.php:1032
 msgid ""
-"Set some public keywords for your default profile which describe your "
-"interests. We may be able to find other people with similar interests and "
-"suggest friendships."
-msgstr ""
-
-#: mod/newmember.php:44
-msgid "Connecting"
+"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
+"Enter -1 to disable it."
 msgstr ""
 
-#: mod/newmember.php:51
-msgid "Importing Emails"
+#: mod/admin.php:1033
+msgid "Minimum level of fragmentation"
 msgstr ""
 
-#: mod/newmember.php:51
+#: mod/admin.php:1033
 msgid ""
-"Enter your email access information on your Connector Settings page if you "
-"wish to import and interact with friends or mailing lists from your email "
-"INBOX"
+"Minimum fragmenation level to start the automatic optimization - default "
+"value is 30%."
 msgstr ""
 
-#: mod/newmember.php:53
-msgid "Go to Your Contacts Page"
+#: mod/admin.php:1035
+msgid "Periodical check of global contacts"
 msgstr ""
 
-#: mod/newmember.php:53
+#: mod/admin.php:1035
 msgid ""
-"Your Contacts page is your gateway to managing friendships and connecting "
-"with friends on other networks. Typically you enter their address or site "
-"URL in the <em>Add New Contact</em> dialog."
+"If enabled, the global contacts are checked periodically for missing or "
+"outdated data and the vitality of the contacts and servers."
 msgstr ""
 
-#: mod/newmember.php:55
-msgid "Go to Your Site's Directory"
+#: mod/admin.php:1036
+msgid "Days between requery"
 msgstr ""
 
-#: mod/newmember.php:55
-msgid ""
-"The Directory page lets you find other people in this network or other "
-"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
-"their profile page. Provide your own Identity Address if requested."
+#: mod/admin.php:1036
+msgid "Number of days after which a server is requeried for his contacts."
 msgstr ""
 
-#: mod/newmember.php:57
-msgid "Finding New People"
+#: mod/admin.php:1037
+msgid "Discover contacts from other servers"
 msgstr ""
 
-#: mod/newmember.php:57
+#: mod/admin.php:1037
 msgid ""
-"On the side panel of the Contacts page are several tools to find new "
-"friends. We can match people by interest, look up people by name or "
-"interest, and provide suggestions based on network relationships. On a brand "
-"new site, friend suggestions will usually begin to be populated within 24 "
-"hours."
+"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/newmember.php:65
-msgid "Group Your Contacts"
+#: mod/admin.php:1038
+msgid "Timeframe for fetching global contacts"
 msgstr ""
 
-#: mod/newmember.php:65
+#: mod/admin.php:1038
 msgid ""
-"Once you have made some friends, organize them into private conversation "
-"groups from the sidebar of your Contacts page and then you can interact with "
-"each group privately on your Network page."
+"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/newmember.php:68
-msgid "Why Aren't My Posts Public?"
+#: mod/admin.php:1039
+msgid "Search the local directory"
 msgstr ""
 
-#: mod/newmember.php:68
+#: mod/admin.php:1039
 msgid ""
-"Friendica respects your privacy. By default, your posts will only show up to "
-"people you've added as friends. For more information, see the help section "
-"from the link above."
-msgstr ""
-
-#: mod/newmember.php:73
-msgid "Getting Help"
+"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/newmember.php:77
-msgid "Go to the Help Section"
+#: mod/admin.php:1041
+msgid "Publish server information"
 msgstr ""
 
-#: mod/newmember.php:77
+#: mod/admin.php:1041
 msgid ""
-"Our <strong>help</strong> pages may be consulted for detail on other program "
-"features and resources."
+"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/nogroup.php:43 mod/contacts.php:594 mod/contacts.php:938
-#: mod/viewcontacts.php:102
-#, php-format
-msgid "Visit %s's profile [%s]"
+#: mod/admin.php:1043
+msgid "Use MySQL full text engine"
 msgstr ""
 
-#: mod/nogroup.php:44 mod/contacts.php:939
-msgid "Edit contact"
+#: mod/admin.php:1043
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
 msgstr ""
 
-#: mod/nogroup.php:65
-msgid "Contacts who are not members of a group"
+#: mod/admin.php:1044
+msgid "Suppress Tags"
 msgstr ""
 
-#: mod/notify.php:65
-msgid "No more system notifications."
+#: mod/admin.php:1044
+msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr ""
 
-#: mod/notify.php:69 mod/notifications.php:111
-msgid "System Notifications"
+#: mod/admin.php:1045
+msgid "Path to item cache"
 msgstr ""
 
-#: mod/oexchange.php:21
-msgid "Post successful."
+#: mod/admin.php:1045
+msgid "The item caches buffers generated bbcode and external images."
 msgstr ""
 
-#: mod/openid.php:24
-msgid "OpenID protocol error. No ID returned."
+#: mod/admin.php:1046
+msgid "Cache duration in seconds"
 msgstr ""
 
-#: mod/openid.php:60
+#: mod/admin.php:1046
 msgid ""
-"Account not found and OpenID registration is not permitted on this site."
+"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/ostatus_subscribe.php:14
-msgid "Subscribing to OStatus contacts"
+#: mod/admin.php:1047
+msgid "Maximum numbers of comments per post"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:25
-msgid "No contact provided."
+#: mod/admin.php:1047
+msgid "How much comments should be shown for each post? Default value is 100."
 msgstr ""
 
-#: mod/ostatus_subscribe.php:31
-msgid "Couldn't fetch information for contact."
+#: mod/admin.php:1048
+msgid "Temp path"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:40
-msgid "Couldn't fetch friends for contact."
+#: mod/admin.php:1048
+msgid ""
+"If you have a restricted system where the webserver can't access the system "
+"temp path, enter another path here."
 msgstr ""
 
-#: mod/ostatus_subscribe.php:54 mod/repair_ostatus.php:44
-msgid "Done"
+#: mod/admin.php:1049
+msgid "Base path to installation"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:68
-msgid "success"
+#: mod/admin.php:1049
+msgid ""
+"If the system cannot detect the correct path to your installation, enter the "
+"correct path here. This setting should only be set if you are using a "
+"restricted system and symbolic links to your webroot."
 msgstr ""
 
-#: mod/ostatus_subscribe.php:70
-msgid "failed"
+#: mod/admin.php:1050
+msgid "Disable picture proxy"
 msgstr ""
 
-#: mod/ostatus_subscribe.php:78 mod/repair_ostatus.php:50
-msgid "Keep this window open until done."
+#: mod/admin.php:1050
+msgid ""
+"The picture proxy increases performance and privacy. It shouldn't be used on "
+"systems with very low bandwith."
 msgstr ""
 
-#: mod/poke.php:196
-msgid "Poke/Prod"
+#: mod/admin.php:1051
+msgid "Only search in tags"
 msgstr ""
 
-#: mod/poke.php:197
-msgid "poke, prod or do other things to somebody"
+#: mod/admin.php:1051
+msgid "On large systems the text search can slow down the system extremely."
 msgstr ""
 
-#: mod/poke.php:198
-msgid "Recipient"
+#: mod/admin.php:1053
+msgid "New base url"
 msgstr ""
 
-#: mod/poke.php:199
-msgid "Choose what you wish to do to recipient"
+#: mod/admin.php:1053
+msgid ""
+"Change base url for this server. Sends relocate message to all DFRN contacts "
+"of all users."
 msgstr ""
 
-#: mod/poke.php:202
-msgid "Make this post private"
+#: mod/admin.php:1055
+msgid "RINO Encryption"
 msgstr ""
 
-#: mod/profile.php:154 mod/cal.php:143 mod/display.php:328
-msgid "Access to this profile has been restricted."
+#: mod/admin.php:1055
+msgid "Encryption layer between nodes."
 msgstr ""
 
-#: mod/profile.php:174
-msgid "Tips for New Members"
+#: mod/admin.php:1056
+msgid "Embedly API key"
 msgstr ""
 
-#: mod/profile_photo.php:44
-msgid "Image uploaded but image cropping failed."
+#: mod/admin.php:1056
+msgid ""
+"<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
+"web pages. This is an optional parameter."
 msgstr ""
 
-#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93
-#: mod/profile_photo.php:323
-#, php-format
-msgid "Image size reduction [%s] failed."
+#: mod/admin.php:1058
+msgid "Maximum number of parallel workers"
 msgstr ""
 
-#: mod/profile_photo.php:127
+#: mod/admin.php:1058
 msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
+"On shared hosters set this to 2. On larger systems, values of 10 are great. "
+"Default value is 4."
 msgstr ""
 
-#: mod/profile_photo.php:137
-msgid "Unable to process image"
+#: mod/admin.php:1059
+msgid "Don't use 'proc_open' with the worker"
 msgstr ""
 
-#: mod/profile_photo.php:156 mod/wall_upload.php:151 mod/photos.php:803
-#, php-format
-msgid "Image exceeds size limit of %s"
+#: mod/admin.php:1059
+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/profile_photo.php:165 mod/wall_upload.php:186 mod/photos.php:844
-msgid "Unable to process image."
+#: mod/admin.php:1060
+msgid "Enable fastlane"
 msgstr ""
 
-#: mod/profile_photo.php:254
-msgid "Upload File:"
+#: mod/admin.php:1060
+msgid ""
+"When enabed, the fastlane mechanism starts an additional worker if processes "
+"with higher priority are blocked by processes of lower priority."
 msgstr ""
 
-#: mod/profile_photo.php:255
-msgid "Select a profile:"
+#: mod/admin.php:1061
+msgid "Enable frontend worker"
 msgstr ""
 
-#: mod/profile_photo.php:257
-msgid "Upload"
+#: mod/admin.php:1061
+msgid ""
+"When enabled the Worker process is triggered when backend access is "
+"performed (e.g. messages being delivered). On smaller sites you might want "
+"to call yourdomain.tld/worker on a regular basis via an external cron job. "
+"You should only enable this option if you cannot utilize cron/scheduled jobs "
+"on your server. The worker background process needs to be activated for this."
 msgstr ""
 
-#: mod/profile_photo.php:260
-msgid "or"
+#: mod/admin.php:1091
+msgid "Update has been marked successful"
 msgstr ""
 
-#: mod/profile_photo.php:260
-msgid "skip this step"
+#: mod/admin.php:1099
+#, php-format
+msgid "Database structure update %s was successfully applied."
 msgstr ""
 
-#: mod/profile_photo.php:260
-msgid "select a photo from your photo albums"
+#: mod/admin.php:1102
+#, php-format
+msgid "Executing of database structure update %s failed with error: %s"
 msgstr ""
 
-#: mod/profile_photo.php:274
-msgid "Crop Image"
+#: mod/admin.php:1116
+#, php-format
+msgid "Executing %s failed with error: %s"
 msgstr ""
 
-#: mod/profile_photo.php:275
-msgid "Please adjust the image cropping for optimum viewing."
+#: mod/admin.php:1119
+#, php-format
+msgid "Update %s was successfully applied."
 msgstr ""
 
-#: mod/profile_photo.php:277
-msgid "Done Editing"
+#: mod/admin.php:1122
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: mod/profile_photo.php:313
-msgid "Image uploaded successfully."
+#: mod/admin.php:1125
+#, php-format
+msgid "There was no additional update function %s that needed to be called."
 msgstr ""
 
-#: mod/profile_photo.php:315 mod/wall_upload.php:219 mod/photos.php:871
-msgid "Image upload failed."
+#: mod/admin.php:1145
+msgid "No failed updates."
 msgstr ""
 
-#: mod/profperm.php:26 mod/profperm.php:57
-msgid "Invalid profile identifier."
+#: mod/admin.php:1146
+msgid "Check database structure"
 msgstr ""
 
-#: mod/profperm.php:103
-msgid "Profile Visibility Editor"
+#: mod/admin.php:1151
+msgid "Failed Updates"
 msgstr ""
 
-#: mod/profperm.php:116
-msgid "Visible To"
+#: mod/admin.php:1152
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: mod/profperm.php:132
-msgid "All Contacts (with secure profile access)"
+#: mod/admin.php:1153
+msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: mod/register.php:93
-msgid ""
-"Registration successful. Please check your email for further instructions."
+#: mod/admin.php:1154
+msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: mod/register.php:98
+#: mod/admin.php:1188
 #, 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."
+"\n"
+"\t\t\tDear %1$s,\n"
+"\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr ""
 
-#: mod/register.php:105
-msgid "Registration successful."
+#: mod/admin.php:1191
+#, 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."
 msgstr ""
 
-#: mod/register.php:111
-msgid "Your registration can not be processed."
-msgstr ""
+#: mod/admin.php:1235
+#, php-format
+msgid "%s user blocked/unblocked"
+msgid_plural "%s users blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mod/register.php:160
-msgid "Your registration is pending approval by the site owner."
-msgstr ""
+#: mod/admin.php:1242
+#, php-format
+msgid "%s user deleted"
+msgid_plural "%s users deleted"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mod/register.php:198 mod/uimport.php:51
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
+#: mod/admin.php:1289
+#, php-format
+msgid "User '%s' deleted"
 msgstr ""
 
-#: mod/register.php:226
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
+#: mod/admin.php:1297
+#, php-format
+msgid "User '%s' unblocked"
 msgstr ""
 
-#: mod/register.php:227
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
+#: mod/admin.php:1297
+#, php-format
+msgid "User '%s' blocked"
 msgstr ""
 
-#: mod/register.php:228
-msgid "Your OpenID (optional): "
+#: mod/admin.php:1405 mod/admin.php:1418 mod/admin.php:1431 mod/admin.php:1447
+#: mod/crepair.php:167 mod/settings.php:683 mod/settings.php:709
+msgid "Name"
 msgstr ""
 
-#: mod/register.php:242
-msgid "Include your profile in member directory?"
+#: mod/admin.php:1405 mod/admin.php:1431
+msgid "Register date"
 msgstr ""
 
-#: mod/register.php:267
-msgid "Note for the admin"
+#: mod/admin.php:1405 mod/admin.php:1431
+msgid "Last login"
 msgstr ""
 
-#: mod/register.php:267
-msgid "Leave a message for the admin, why you want to join this node"
+#: mod/admin.php:1405 mod/admin.php:1431
+msgid "Last item"
 msgstr ""
 
-#: mod/register.php:268
-msgid "Membership on this site is by invitation only."
+#: mod/admin.php:1405 mod/settings.php:43
+msgid "Account"
 msgstr ""
 
-#: mod/register.php:269
-msgid "Your invitation ID: "
+#: mod/admin.php:1414
+msgid "Add User"
 msgstr ""
 
-#: mod/register.php:272 mod/admin.php:977
-msgid "Registration"
+#: mod/admin.php:1415
+msgid "select all"
 msgstr ""
 
-#: mod/register.php:280
-msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
+#: mod/admin.php:1416
+msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: mod/register.php:281
-msgid "Your Email Address: "
+#: mod/admin.php:1417
+msgid "User waiting for permanent deletion"
 msgstr ""
 
-#: mod/register.php:283 mod/settings.php:1278
-msgid "New Password:"
+#: mod/admin.php:1418
+msgid "Request date"
 msgstr ""
 
-#: mod/register.php:283
-msgid "Leave empty for an auto generated password."
+#: mod/admin.php:1419
+msgid "No registrations."
 msgstr ""
 
-#: mod/register.php:284 mod/settings.php:1279
-msgid "Confirm:"
+#: mod/admin.php:1420
+msgid "Note from the user"
 msgstr ""
 
-#: mod/register.php:285
-msgid ""
-"Choose a profile nickname. This must begin with a text character. Your "
-"profile address on this site will then be '<strong>nickname@$sitename</"
-"strong>'."
+#: mod/admin.php:1421 mod/notifications.php:176 mod/notifications.php:255
+msgid "Approve"
 msgstr ""
 
-#: mod/register.php:286
-msgid "Choose a nickname: "
+#: mod/admin.php:1422
+msgid "Deny"
 msgstr ""
 
-#: mod/register.php:295 mod/uimport.php:66
-msgid "Import"
+#: mod/admin.php:1424 mod/contacts.php:613 mod/contacts.php:813
+#: mod/contacts.php:991
+msgid "Block"
 msgstr ""
 
-#: mod/register.php:296
-msgid "Import your profile to this friendica instance"
+#: mod/admin.php:1425 mod/contacts.php:613 mod/contacts.php:813
+#: mod/contacts.php:991
+msgid "Unblock"
 msgstr ""
 
-#: mod/regmod.php:58
-msgid "Account approved."
+#: mod/admin.php:1426
+msgid "Site admin"
 msgstr ""
 
-#: mod/regmod.php:95
-#, php-format
-msgid "Registration revoked for %s"
+#: mod/admin.php:1427
+msgid "Account expired"
 msgstr ""
 
-#: mod/regmod.php:107
-msgid "Please login."
+#: mod/admin.php:1430
+msgid "New User"
 msgstr ""
 
-#: mod/removeme.php:52 mod/removeme.php:55
-msgid "Remove My Account"
+#: mod/admin.php:1431
+msgid "Deleted since"
 msgstr ""
 
-#: mod/removeme.php:53
+#: mod/admin.php:1436
 msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
+"Selected users will be deleted!\\n\\nEverything these users had posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: mod/removeme.php:54
-msgid "Please enter your password for verification:"
+#: mod/admin.php:1437
+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/repair_ostatus.php:14
-msgid "Resubscribing to OStatus contacts"
+#: mod/admin.php:1447
+msgid "Name of the new user."
 msgstr ""
 
-#: mod/repair_ostatus.php:30
-msgid "Error"
+#: mod/admin.php:1448
+msgid "Nickname"
 msgstr ""
 
-#: mod/settings.php:36 mod/photos.php:107
-msgid "everybody"
+#: mod/admin.php:1448
+msgid "Nickname of the new user."
 msgstr ""
 
-#: mod/settings.php:43 mod/admin.php:1417
-msgid "Account"
+#: mod/admin.php:1449
+msgid "Email address of the new user."
 msgstr ""
 
-#: mod/settings.php:52 mod/admin.php:161
-msgid "Additional features"
+#: mod/admin.php:1492
+#, php-format
+msgid "Plugin %s disabled."
 msgstr ""
 
-#: mod/settings.php:60
-msgid "Display"
+#: mod/admin.php:1496
+#, php-format
+msgid "Plugin %s enabled."
 msgstr ""
 
-#: mod/settings.php:67 mod/settings.php:890
-msgid "Social Networks"
+#: mod/admin.php:1507 mod/admin.php:1759
+msgid "Disable"
 msgstr ""
 
-#: mod/settings.php:74 mod/admin.php:159 mod/admin.php:1543 mod/admin.php:1606
-msgid "Plugins"
+#: mod/admin.php:1509 mod/admin.php:1761
+msgid "Enable"
 msgstr ""
 
-#: mod/settings.php:88
-msgid "Connected apps"
+#: mod/admin.php:1532 mod/admin.php:1808
+msgid "Toggle"
 msgstr ""
 
-#: mod/settings.php:95 mod/uexport.php:45
-msgid "Export personal data"
+#: mod/admin.php:1540 mod/admin.php:1817
+msgid "Author: "
 msgstr ""
 
-#: mod/settings.php:102
-msgid "Remove account"
+#: mod/admin.php:1541 mod/admin.php:1818
+msgid "Maintainer: "
 msgstr ""
 
-#: mod/settings.php:157
-msgid "Missing some important data!"
+#: mod/admin.php:1596
+msgid "Reload active plugins"
 msgstr ""
 
-#: mod/settings.php:160 mod/settings.php:707 mod/contacts.php:812
-msgid "Update"
+#: mod/admin.php:1601
+#, php-format
+msgid ""
+"There are currently no plugins available on your node. You can find the "
+"official plugin repository at %1$s and might find other interesting plugins "
+"in the open plugin registry at %2$s"
 msgstr ""
 
-#: mod/settings.php:271
-msgid "Failed to connect with email account using the settings provided."
+#: mod/admin.php:1720
+msgid "No themes found."
 msgstr ""
 
-#: mod/settings.php:276
-msgid "Email settings updated."
+#: mod/admin.php:1799
+msgid "Screenshot"
 msgstr ""
 
-#: mod/settings.php:291
-msgid "Features updated"
+#: mod/admin.php:1859
+msgid "Reload active themes"
 msgstr ""
 
-#: mod/settings.php:361
-msgid "Relocate message has been send to your contacts"
+#: mod/admin.php:1864
+#, php-format
+msgid "No themes found on the system. They should be paced in %1$s"
 msgstr ""
 
-#: mod/settings.php:380
-msgid "Empty passwords are not allowed. Password unchanged."
+#: mod/admin.php:1865
+msgid "[Experimental]"
 msgstr ""
 
-#: mod/settings.php:388
-msgid "Wrong password."
+#: mod/admin.php:1866
+msgid "[Unsupported]"
 msgstr ""
 
-#: mod/settings.php:399
-msgid "Password changed."
+#: mod/admin.php:1890
+msgid "Log settings updated."
 msgstr ""
 
-#: mod/settings.php:401
-msgid "Password update failed. Please try again."
+#: mod/admin.php:1922
+msgid "PHP log currently enabled."
 msgstr ""
 
-#: mod/settings.php:481
-msgid " Please use a shorter name."
+#: mod/admin.php:1924
+msgid "PHP log currently disabled."
 msgstr ""
 
-#: mod/settings.php:483
-msgid " Name too short."
+#: mod/admin.php:1933
+msgid "Clear"
 msgstr ""
 
-#: mod/settings.php:492
-msgid "Wrong Password"
+#: mod/admin.php:1938
+msgid "Enable Debugging"
 msgstr ""
 
-#: mod/settings.php:497
-msgid " Not valid email."
+#: mod/admin.php:1939
+msgid "Log file"
 msgstr ""
 
-#: mod/settings.php:503
-msgid " Cannot change to that email."
+#: mod/admin.php:1939
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
 msgstr ""
 
-#: mod/settings.php:559
-msgid "Private forum has no privacy permissions. Using default privacy group."
+#: mod/admin.php:1940
+msgid "Log level"
 msgstr ""
 
-#: mod/settings.php:563
-msgid "Private forum has no privacy permissions and no default privacy group."
+#: mod/admin.php:1943
+msgid "PHP logging"
 msgstr ""
 
-#: mod/settings.php:603
-msgid "Settings updated."
+#: mod/admin.php:1944
+msgid ""
+"To enable logging of PHP errors and warnings you can add the following to "
+"the .htconfig.php file of your installation. The filename set in the "
+"'error_log' line is relative to the friendica top-level directory and must "
+"be writeable by the web server. The option '1' for 'log_errors' and "
+"'display_errors' is to enable these options, set to '0' to disable them."
 msgstr ""
 
-#: mod/settings.php:680 mod/settings.php:706 mod/settings.php:742
-msgid "Add application"
+#: mod/admin.php:2074 mod/admin.php:2075 mod/settings.php:782
+msgid "Off"
 msgstr ""
 
-#: mod/settings.php:681 mod/settings.php:792 mod/settings.php:841
-#: mod/settings.php:908 mod/settings.php:1005 mod/settings.php:1271
-#: mod/admin.php:976 mod/admin.php:1607 mod/admin.php:1864 mod/admin.php:1938
-#: mod/admin.php:2088
-msgid "Save Settings"
+#: mod/admin.php:2074 mod/admin.php:2075 mod/settings.php:782
+msgid "On"
 msgstr ""
 
-#: mod/settings.php:684 mod/settings.php:710
-msgid "Consumer Key"
+#: mod/admin.php:2075
+#, php-format
+msgid "Lock feature %s"
 msgstr ""
 
-#: mod/settings.php:685 mod/settings.php:711
-msgid "Consumer Secret"
+#: mod/admin.php:2083
+msgid "Manage Additional Features"
 msgstr ""
 
-#: mod/settings.php:686 mod/settings.php:712
-msgid "Redirect"
+#: mod/allfriends.php:46
+msgid "No friends to display."
 msgstr ""
 
-#: mod/settings.php:687 mod/settings.php:713
-msgid "Icon url"
+#: mod/api.php:76 mod/api.php:102
+msgid "Authorize application connection"
 msgstr ""
 
-#: mod/settings.php:698
-msgid "You can't edit this application."
+#: mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: mod/settings.php:741
-msgid "Connected Apps"
+#: mod/api.php:89
+msgid "Please login to continue."
 msgstr ""
 
-#: mod/settings.php:745
-msgid "Client key starts with"
+#: mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
 
-#: mod/settings.php:746
-msgid "No name"
+#: mod/api.php:106 mod/dfrn_request.php:875 mod/follow.php:113
+#: mod/profiles.php:640 mod/profiles.php:644 mod/profiles.php:669
+#: mod/register.php:246 mod/settings.php:1171 mod/settings.php:1177
+#: mod/settings.php:1184 mod/settings.php:1188 mod/settings.php:1193
+#: mod/settings.php:1198 mod/settings.php:1203 mod/settings.php:1208
+#: mod/settings.php:1234 mod/settings.php:1235 mod/settings.php:1236
+#: mod/settings.php:1237 mod/settings.php:1238
+msgid "No"
 msgstr ""
 
-#: mod/settings.php:747
-msgid "Remove authorization"
+#: mod/apps.php:11
+msgid "Applications"
 msgstr ""
 
-#: mod/settings.php:759
-msgid "No Plugin settings configured"
+#: mod/apps.php:14
+msgid "No installed applications."
 msgstr ""
 
-#: mod/settings.php:768
-msgid "Plugin Settings"
+#: mod/attach.php:8
+msgid "Item not available."
 msgstr ""
 
-#: mod/settings.php:782 mod/admin.php:2077 mod/admin.php:2078
-msgid "Off"
+#: mod/attach.php:20
+msgid "Item was not found."
 msgstr ""
 
-#: mod/settings.php:782 mod/admin.php:2077 mod/admin.php:2078
-msgid "On"
+#: mod/babel.php:17
+msgid "Source (bbcode) text:"
 msgstr ""
 
-#: mod/settings.php:790
-msgid "Additional Features"
+#: mod/babel.php:23
+msgid "Source (Diaspora) text to convert to BBcode:"
 msgstr ""
 
-#: mod/settings.php:800 mod/settings.php:804
-msgid "General Social Media Settings"
+#: mod/babel.php:31
+msgid "Source input: "
 msgstr ""
 
-#: mod/settings.php:810
-msgid "Disable intelligent shortening"
+#: mod/babel.php:35
+msgid "bb2html (raw HTML): "
 msgstr ""
 
-#: mod/settings.php:812
-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/babel.php:39
+msgid "bb2html: "
 msgstr ""
 
-#: mod/settings.php:818
-msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
+#: mod/babel.php:43
+msgid "bb2html2bb: "
 msgstr ""
 
-#: mod/settings.php:820
-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/babel.php:47
+msgid "bb2md: "
 msgstr ""
 
-#: mod/settings.php:826
-msgid "Default group for OStatus contacts"
+#: mod/babel.php:51
+msgid "bb2md2html: "
 msgstr ""
 
-#: mod/settings.php:834
-msgid "Your legacy GNU Social account"
+#: mod/babel.php:55
+msgid "bb2dia2bb: "
 msgstr ""
 
-#: mod/settings.php:836
-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/babel.php:59
+msgid "bb2md2html2bb: "
 msgstr ""
 
-#: mod/settings.php:839
-msgid "Repair OStatus subscriptions"
+#: mod/babel.php:69
+msgid "Source input (Diaspora format): "
 msgstr ""
 
-#: mod/settings.php:848 mod/settings.php:849
-#, php-format
-msgid "Built-in support for %s connectivity is %s"
+#: mod/babel.php:74
+msgid "diaspora2bb: "
 msgstr ""
 
-#: mod/settings.php:848 mod/settings.php:849
-msgid "enabled"
+#: mod/bookmarklet.php:41
+msgid "The post was created"
 msgstr ""
 
-#: mod/settings.php:848 mod/settings.php:849
-msgid "disabled"
+#: mod/cal.php:143 mod/display.php:328 mod/profile.php:154
+msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: mod/settings.php:849
-msgid "GNU Social (OStatus)"
+#: mod/cal.php:271 mod/events.php:387
+msgid "View"
 msgstr ""
 
-#: mod/settings.php:883
-msgid "Email access is disabled on this site."
+#: mod/cal.php:272 mod/events.php:389
+msgid "Previous"
 msgstr ""
 
-#: mod/settings.php:895
-msgid "Email/Mailbox Setup"
+#: mod/cal.php:273 mod/events.php:390 mod/install.php:235
+msgid "Next"
 msgstr ""
 
-#: mod/settings.php:896
-msgid ""
-"If you wish to communicate with email contacts using this service "
-"(optional), please specify how to connect to your mailbox."
+#: mod/cal.php:282 mod/events.php:399
+msgid "list"
 msgstr ""
 
-#: mod/settings.php:897
-msgid "Last successful email check:"
+#: mod/cal.php:292
+msgid "User not found"
 msgstr ""
 
-#: mod/settings.php:899
-msgid "IMAP server name:"
+#: mod/cal.php:308
+msgid "This calendar format is not supported"
 msgstr ""
 
-#: mod/settings.php:900
-msgid "IMAP port:"
+#: mod/cal.php:310
+msgid "No exportable data found"
 msgstr ""
 
-#: mod/settings.php:901
-msgid "Security:"
+#: mod/cal.php:325
+msgid "calendar"
 msgstr ""
 
-#: mod/settings.php:901 mod/settings.php:906
-msgid "None"
+#: mod/common.php:91
+msgid "No contacts in common."
 msgstr ""
 
-#: mod/settings.php:902
-msgid "Email login name:"
+#: mod/common.php:141 mod/contacts.php:871
+msgid "Common Friends"
 msgstr ""
 
-#: mod/settings.php:903
-msgid "Email password:"
+#: mod/community.php:22 mod/dfrn_request.php:799 mod/directory.php:37
+#: mod/display.php:200 mod/photos.php:964 mod/search.php:93 mod/search.php:99
+#: mod/videos.php:198 mod/viewcontacts.php:36
+msgid "Public access denied."
 msgstr ""
 
-#: mod/settings.php:904
-msgid "Reply-to address:"
+#: mod/community.php:27
+msgid "Not available."
 msgstr ""
 
-#: mod/settings.php:905
-msgid "Send public posts to all email contacts:"
+#: mod/community.php:54 mod/search.php:224
+msgid "No results."
 msgstr ""
 
-#: mod/settings.php:906
-msgid "Action after import:"
+#: mod/contacts.php:134
+#, php-format
+msgid "%d contact edited."
+msgid_plural "%d contacts edited."
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/contacts.php:169 mod/contacts.php:378
+msgid "Could not access contact record."
 msgstr ""
 
-#: mod/settings.php:906
-msgid "Move to folder"
+#: mod/contacts.php:183
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: mod/settings.php:907
-msgid "Move to folder:"
+#: mod/contacts.php:216
+msgid "Contact updated."
 msgstr ""
 
-#: mod/settings.php:943 mod/admin.php:863
-msgid "No special theme for mobile devices"
+#: mod/contacts.php:218 mod/dfrn_request.php:588
+msgid "Failed to update contact record."
 msgstr ""
 
-#: mod/settings.php:1003
-msgid "Display Settings"
+#: mod/contacts.php:399
+msgid "Contact has been blocked"
 msgstr ""
 
-#: mod/settings.php:1009 mod/settings.php:1032
-msgid "Display Theme:"
+#: mod/contacts.php:399
+msgid "Contact has been unblocked"
 msgstr ""
 
-#: mod/settings.php:1010
-msgid "Mobile Theme:"
+#: mod/contacts.php:410
+msgid "Contact has been ignored"
 msgstr ""
 
-#: mod/settings.php:1011
-msgid "Suppress warning of insecure networks"
+#: mod/contacts.php:410
+msgid "Contact has been unignored"
 msgstr ""
 
-#: mod/settings.php:1011
-msgid ""
-"Should the system suppress the warning that the current group contains "
-"members of networks that can't receive non public postings."
+#: mod/contacts.php:422
+msgid "Contact has been archived"
 msgstr ""
 
-#: mod/settings.php:1012
-msgid "Update browser every xx seconds"
+#: mod/contacts.php:422
+msgid "Contact has been unarchived"
 msgstr ""
 
-#: mod/settings.php:1012
-msgid "Minimum of 10 seconds. Enter -1 to disable it."
+#: mod/contacts.php:447
+msgid "Drop contact"
 msgstr ""
 
-#: mod/settings.php:1013
-msgid "Number of items to display per page:"
+#: mod/contacts.php:450 mod/contacts.php:809
+msgid "Do you really want to delete this contact?"
 msgstr ""
 
-#: mod/settings.php:1013 mod/settings.php:1014
-msgid "Maximum of 100 items"
+#: mod/contacts.php:469
+msgid "Contact has been removed."
 msgstr ""
 
-#: mod/settings.php:1014
-msgid "Number of items to display per page when viewed from mobile device:"
+#: mod/contacts.php:506
+#, php-format
+msgid "You are mutual friends with %s"
 msgstr ""
 
-#: mod/settings.php:1015
-msgid "Don't show emoticons"
+#: mod/contacts.php:510
+#, php-format
+msgid "You are sharing with %s"
 msgstr ""
 
-#: mod/settings.php:1016
-msgid "Calendar"
+#: mod/contacts.php:515
+#, php-format
+msgid "%s is sharing with you"
 msgstr ""
 
-#: mod/settings.php:1017
-msgid "Beginning of week:"
+#: mod/contacts.php:535
+msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: mod/settings.php:1018
-msgid "Don't show notices"
+#: mod/contacts.php:542
+msgid "(Update was successful)"
 msgstr ""
 
-#: mod/settings.php:1019
-msgid "Infinite scroll"
+#: mod/contacts.php:542
+msgid "(Update was not successful)"
+msgstr ""
+
+#: mod/contacts.php:544 mod/contacts.php:972
+msgid "Suggest friends"
 msgstr ""
 
-#: mod/settings.php:1020
-msgid "Automatic updates only at the top of the network page"
+#: mod/contacts.php:548
+#, php-format
+msgid "Network type: %s"
 msgstr ""
 
-#: mod/settings.php:1021
-msgid "Bandwith Saver Mode"
+#: mod/contacts.php:561
+msgid "Communications lost with this contact!"
 msgstr ""
 
-#: mod/settings.php:1021
-msgid ""
-"When enabled, embedded content is not displayed on automatic updates, they "
-"only show on page reload."
+#: mod/contacts.php:564
+msgid "Fetch further information for feeds"
 msgstr ""
 
-#: mod/settings.php:1023
-msgid "General Theme Settings"
+#: mod/contacts.php:565
+msgid "Fetch information"
 msgstr ""
 
-#: mod/settings.php:1024
-msgid "Custom Theme Settings"
+#: mod/contacts.php:565
+msgid "Fetch information and keywords"
 msgstr ""
 
-#: mod/settings.php:1025
-msgid "Content Settings"
+#: mod/contacts.php:583
+msgid "Contact"
 msgstr ""
 
-#: mod/settings.php:1026 view/theme/quattro/config.php:69
-#: view/theme/vier/config.php:114 view/theme/duepuntozero/config.php:63
-#: view/theme/clean/config.php:89 view/theme/frio/config.php:66
-msgid "Theme settings"
+#: mod/contacts.php:585 mod/content.php:728 mod/crepair.php:156
+#: mod/events.php:513 mod/fsuggest.php:108 mod/install.php:276
+#: mod/install.php:316 mod/invite.php:142 mod/localtime.php:45
+#: mod/manage.php:145 mod/message.php:338 mod/message.php:521 mod/mood.php:138
+#: mod/photos.php:1124 mod/photos.php:1246 mod/photos.php:1562
+#: mod/photos.php:1612 mod/photos.php:1660 mod/photos.php:1746
+#: mod/poke.php:203 mod/profiles.php:680 object/Item.php:705
+#: view/theme/duepuntozero/config.php:61 view/theme/frio/config.php:64
+#: view/theme/quattro/config.php:67 view/theme/vier/config.php:112
+msgid "Submit"
 msgstr ""
 
-#: mod/settings.php:1110
-msgid "Account Types"
+#: mod/contacts.php:586
+msgid "Profile Visibility"
 msgstr ""
 
-#: mod/settings.php:1111
-msgid "Personal Page Subtypes"
+#: mod/contacts.php:587
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: mod/settings.php:1112
-msgid "Community Forum Subtypes"
+#: mod/contacts.php:588
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: mod/settings.php:1119
-msgid "Personal Page"
+#: mod/contacts.php:589
+msgid "Edit contact notes"
 msgstr ""
 
-#: mod/settings.php:1120
-msgid "This account is a regular personal profile"
+#: mod/contacts.php:594 mod/contacts.php:938 mod/nogroup.php:43
+#: mod/viewcontacts.php:102
+#, php-format
+msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: mod/settings.php:1123
-msgid "Organisation Page"
+#: mod/contacts.php:595
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: mod/settings.php:1124
-msgid "This account is a profile for an organisation"
+#: mod/contacts.php:596
+msgid "Ignore contact"
 msgstr ""
 
-#: mod/settings.php:1127
-msgid "News Page"
+#: mod/contacts.php:597
+msgid "Repair URL settings"
 msgstr ""
 
-#: mod/settings.php:1128
-msgid "This account is a news account/reflector"
+#: mod/contacts.php:598
+msgid "View conversations"
 msgstr ""
 
-#: mod/settings.php:1131
-msgid "Community Forum"
+#: mod/contacts.php:604
+msgid "Last update:"
 msgstr ""
 
-#: mod/settings.php:1132
-msgid ""
-"This account is a community forum where people can discuss with each other"
+#: mod/contacts.php:606
+msgid "Update public posts"
 msgstr ""
 
-#: mod/settings.php:1135
-msgid "Normal Account Page"
+#: mod/contacts.php:608 mod/contacts.php:982
+msgid "Update now"
 msgstr ""
 
-#: mod/settings.php:1136
-msgid "This account is a normal personal profile"
+#: mod/contacts.php:614 mod/contacts.php:814 mod/contacts.php:999
+msgid "Unignore"
 msgstr ""
 
-#: mod/settings.php:1139
-msgid "Soapbox Page"
+#: mod/contacts.php:614 mod/contacts.php:814 mod/contacts.php:999
+#: mod/notifications.php:60 mod/notifications.php:179
+#: mod/notifications.php:257
+msgid "Ignore"
 msgstr ""
 
-#: mod/settings.php:1140
-msgid "Automatically approve all connection/friend requests as read-only fans"
+#: mod/contacts.php:618
+msgid "Currently blocked"
 msgstr ""
 
-#: mod/settings.php:1143
-msgid "Public Forum"
+#: mod/contacts.php:619
+msgid "Currently ignored"
 msgstr ""
 
-#: mod/settings.php:1144
-msgid "Automatically approve all contact requests"
+#: mod/contacts.php:620
+msgid "Currently archived"
 msgstr ""
 
-#: mod/settings.php:1147
-msgid "Automatic Friend Page"
+#: mod/contacts.php:621 mod/notifications.php:172 mod/notifications.php:245
+msgid "Hide this contact from others"
 msgstr ""
 
-#: mod/settings.php:1148
-msgid "Automatically approve all connection/friend requests as friends"
+#: mod/contacts.php:621
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: mod/settings.php:1151
-msgid "Private Forum [Experimental]"
+#: mod/contacts.php:622
+msgid "Notification for new posts"
 msgstr ""
 
-#: mod/settings.php:1152
-msgid "Private forum - approved members only"
+#: mod/contacts.php:622
+msgid "Send a notification of every new post of this contact"
 msgstr ""
 
-#: mod/settings.php:1163
-msgid "OpenID:"
+#: mod/contacts.php:625
+msgid "Blacklisted keywords"
 msgstr ""
 
-#: mod/settings.php:1163
-msgid "(Optional) Allow this OpenID to login to this account."
+#: mod/contacts.php:625
+msgid ""
+"Comma separated list of keywords that should not be converted to hashtags, "
+"when \"Fetch information and keywords\" is selected"
 msgstr ""
 
-#: mod/settings.php:1171
-msgid "Publish your default profile in your local site directory?"
+#: mod/contacts.php:632 mod/follow.php:129 mod/notifications.php:249
+msgid "Profile URL"
 msgstr ""
 
-#: mod/settings.php:1177
-msgid "Publish your default profile in the global social directory?"
+#: mod/contacts.php:643
+msgid "Actions"
 msgstr ""
 
-#: mod/settings.php:1184
-msgid "Hide your contact/friend list from viewers of your default profile?"
+#: mod/contacts.php:646
+msgid "Contact Settings"
 msgstr ""
 
-#: mod/settings.php:1188
-msgid ""
-"If enabled, posting public messages to Diaspora and other networks isn't "
-"possible."
+#: mod/contacts.php:692
+msgid "Suggestions"
 msgstr ""
 
-#: mod/settings.php:1193
-msgid "Allow friends to post to your profile page?"
+#: mod/contacts.php:695
+msgid "Suggest potential friends"
 msgstr ""
 
-#: mod/settings.php:1198
-msgid "Allow friends to tag your posts?"
+#: mod/contacts.php:700 mod/group.php:202
+msgid "All Contacts"
 msgstr ""
 
-#: mod/settings.php:1203
-msgid "Allow us to suggest you as a potential friend to new members?"
+#: mod/contacts.php:703
+msgid "Show all contacts"
 msgstr ""
 
-#: mod/settings.php:1208
-msgid "Permit unknown people to send you private mail?"
+#: mod/contacts.php:708
+msgid "Unblocked"
 msgstr ""
 
-#: mod/settings.php:1216
-msgid "Profile is <strong>not published</strong>."
+#: mod/contacts.php:711
+msgid "Only show unblocked contacts"
 msgstr ""
 
-#: mod/settings.php:1224
-#, php-format
-msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
+#: mod/contacts.php:717
+msgid "Blocked"
 msgstr ""
 
-#: mod/settings.php:1231
-msgid "Automatically expire posts after this many days:"
+#: mod/contacts.php:720
+msgid "Only show blocked contacts"
 msgstr ""
 
-#: mod/settings.php:1231
-msgid "If empty, posts will not expire. Expired posts will be deleted"
+#: mod/contacts.php:726
+msgid "Ignored"
 msgstr ""
 
-#: mod/settings.php:1232
-msgid "Advanced expiration settings"
+#: mod/contacts.php:729
+msgid "Only show ignored contacts"
 msgstr ""
 
-#: mod/settings.php:1233
-msgid "Advanced Expiration"
+#: mod/contacts.php:735
+msgid "Archived"
 msgstr ""
 
-#: mod/settings.php:1234
-msgid "Expire posts:"
+#: mod/contacts.php:738
+msgid "Only show archived contacts"
 msgstr ""
 
-#: mod/settings.php:1235
-msgid "Expire personal notes:"
+#: mod/contacts.php:744
+msgid "Hidden"
 msgstr ""
 
-#: mod/settings.php:1236
-msgid "Expire starred posts:"
+#: mod/contacts.php:747
+msgid "Only show hidden contacts"
 msgstr ""
 
-#: mod/settings.php:1237
-msgid "Expire photos:"
+#: mod/contacts.php:804
+msgid "Search your contacts"
 msgstr ""
 
-#: mod/settings.php:1238
-msgid "Only expire posts by others:"
+#: mod/contacts.php:805 mod/network.php:145 mod/search.php:232
+#, php-format
+msgid "Results for: %s"
 msgstr ""
 
-#: mod/settings.php:1269
-msgid "Account Settings"
+#: mod/contacts.php:812 mod/settings.php:160 mod/settings.php:707
+msgid "Update"
 msgstr ""
 
-#: mod/settings.php:1277
-msgid "Password Settings"
+#: mod/contacts.php:815 mod/contacts.php:1007
+msgid "Archive"
 msgstr ""
 
-#: mod/settings.php:1279
-msgid "Leave password fields blank unless changing"
+#: mod/contacts.php:815 mod/contacts.php:1007
+msgid "Unarchive"
 msgstr ""
 
-#: mod/settings.php:1280
-msgid "Current Password:"
+#: mod/contacts.php:818
+msgid "Batch Actions"
 msgstr ""
 
-#: mod/settings.php:1280 mod/settings.php:1281
-msgid "Your current password to confirm the changes"
+#: mod/contacts.php:864
+msgid "View all contacts"
 msgstr ""
 
-#: mod/settings.php:1281
-msgid "Password:"
+#: mod/contacts.php:874
+msgid "View all common friends"
 msgstr ""
 
-#: mod/settings.php:1285
-msgid "Basic Settings"
+#: mod/contacts.php:881
+msgid "Advanced Contact Settings"
 msgstr ""
 
-#: mod/settings.php:1287
-msgid "Email Address:"
+#: mod/contacts.php:915
+msgid "Mutual Friendship"
 msgstr ""
 
-#: mod/settings.php:1288
-msgid "Your Timezone:"
+#: mod/contacts.php:919
+msgid "is a fan of yours"
 msgstr ""
 
-#: mod/settings.php:1289
-msgid "Your Language:"
+#: mod/contacts.php:923
+msgid "you are a fan of"
 msgstr ""
 
-#: mod/settings.php:1289
-msgid ""
-"Set the language we use to show you friendica interface and to send you "
-"emails"
+#: mod/contacts.php:939 mod/nogroup.php:44
+msgid "Edit contact"
 msgstr ""
 
-#: mod/settings.php:1290
-msgid "Default Post Location:"
+#: mod/contacts.php:993
+msgid "Toggle Blocked status"
 msgstr ""
 
-#: mod/settings.php:1291
-msgid "Use Browser Location:"
+#: mod/contacts.php:1001
+msgid "Toggle Ignored status"
 msgstr ""
 
-#: mod/settings.php:1294
-msgid "Security and Privacy Settings"
+#: mod/contacts.php:1009
+msgid "Toggle Archive status"
 msgstr ""
 
-#: mod/settings.php:1296
-msgid "Maximum Friend Requests/Day:"
+#: mod/contacts.php:1017
+msgid "Delete contact"
 msgstr ""
 
-#: mod/settings.php:1296 mod/settings.php:1326
-msgid "(to prevent spam abuse)"
+#: mod/content.php:119 mod/network.php:468
+msgid "No such group"
 msgstr ""
 
-#: mod/settings.php:1297
-msgid "Default Post Permissions"
+#: mod/content.php:130 mod/group.php:203 mod/network.php:495
+msgid "Group is empty"
 msgstr ""
 
-#: mod/settings.php:1298
-msgid "(click to open/close)"
+#: mod/content.php:135 mod/network.php:499
+#, php-format
+msgid "Group: %s"
 msgstr ""
 
-#: mod/settings.php:1307 mod/photos.php:1185 mod/photos.php:1567
-msgid "Show to Groups"
+#: mod/content.php:325 object/Item.php:96
+msgid "This entry was edited"
 msgstr ""
 
-#: mod/settings.php:1308 mod/photos.php:1186 mod/photos.php:1568
-msgid "Show to Contacts"
+#: mod/content.php:621 object/Item.php:417
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/content.php:638 mod/photos.php:1402 object/Item.php:117
+msgid "Private Message"
 msgstr ""
 
-#: mod/settings.php:1309
-msgid "Default Private Post"
+#: mod/content.php:702 mod/photos.php:1590 object/Item.php:274
+msgid "I like this (toggle)"
 msgstr ""
 
-#: mod/settings.php:1310
-msgid "Default Public Post"
+#: mod/content.php:702 object/Item.php:274
+msgid "like"
 msgstr ""
 
-#: mod/settings.php:1314
-msgid "Default Permissions for New Posts"
+#: mod/content.php:703 mod/photos.php:1591 object/Item.php:275
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: mod/settings.php:1326
-msgid "Maximum private messages per day from unknown people:"
+#: mod/content.php:703 object/Item.php:275
+msgid "dislike"
 msgstr ""
 
-#: mod/settings.php:1329
-msgid "Notification Settings"
+#: mod/content.php:705 object/Item.php:278
+msgid "Share this"
 msgstr ""
 
-#: mod/settings.php:1330
-msgid "By default post a status message when:"
+#: mod/content.php:705 object/Item.php:278
+msgid "share"
 msgstr ""
 
-#: mod/settings.php:1331
-msgid "accepting a friend request"
+#: mod/content.php:725 mod/photos.php:1609 mod/photos.php:1657
+#: mod/photos.php:1743 object/Item.php:702
+msgid "This is you"
 msgstr ""
 
-#: mod/settings.php:1332
-msgid "joining a forum/community"
+#: mod/content.php:727 mod/content.php:950 mod/photos.php:1611
+#: mod/photos.php:1659 mod/photos.php:1745 object/Item.php:392
+#: object/Item.php:704
+msgid "Comment"
 msgstr ""
 
-#: mod/settings.php:1333
-msgid "making an <em>interesting</em> profile change"
+#: mod/content.php:729 object/Item.php:706
+msgid "Bold"
 msgstr ""
 
-#: mod/settings.php:1334
-msgid "Send a notification email when:"
+#: mod/content.php:730 object/Item.php:707
+msgid "Italic"
 msgstr ""
 
-#: mod/settings.php:1335
-msgid "You receive an introduction"
+#: mod/content.php:731 object/Item.php:708
+msgid "Underline"
 msgstr ""
 
-#: mod/settings.php:1336
-msgid "Your introductions are confirmed"
+#: mod/content.php:732 object/Item.php:709
+msgid "Quote"
 msgstr ""
 
-#: mod/settings.php:1337
-msgid "Someone writes on your profile wall"
+#: mod/content.php:733 object/Item.php:710
+msgid "Code"
 msgstr ""
 
-#: mod/settings.php:1338
-msgid "Someone writes a followup comment"
+#: mod/content.php:734 object/Item.php:711
+msgid "Image"
 msgstr ""
 
-#: mod/settings.php:1339
-msgid "You receive a private message"
+#: mod/content.php:735 object/Item.php:712
+msgid "Link"
 msgstr ""
 
-#: mod/settings.php:1340
-msgid "You receive a friend suggestion"
+#: mod/content.php:736 object/Item.php:713
+msgid "Video"
 msgstr ""
 
-#: mod/settings.php:1341
-msgid "You are tagged in a post"
+#: mod/content.php:746 mod/settings.php:743 object/Item.php:122
+#: object/Item.php:124
+msgid "Edit"
 msgstr ""
 
-#: mod/settings.php:1342
-msgid "You are poked/prodded/etc. in a post"
+#: mod/content.php:772 object/Item.php:238
+msgid "add star"
 msgstr ""
 
-#: mod/settings.php:1344
-msgid "Activate desktop notifications"
+#: mod/content.php:773 object/Item.php:239
+msgid "remove star"
 msgstr ""
 
-#: mod/settings.php:1344
-msgid "Show desktop popup on new notifications"
+#: mod/content.php:774 object/Item.php:240
+msgid "toggle star status"
 msgstr ""
 
-#: mod/settings.php:1346
-msgid "Text-only notification emails"
+#: mod/content.php:777 object/Item.php:243
+msgid "starred"
 msgstr ""
 
-#: mod/settings.php:1348
-msgid "Send text only notification emails, without the html part"
+#: mod/content.php:778 mod/content.php:800 object/Item.php:263
+msgid "add tag"
 msgstr ""
 
-#: mod/settings.php:1350
-msgid "Advanced Account/Page Type Settings"
+#: mod/content.php:789 object/Item.php:251
+msgid "ignore thread"
 msgstr ""
 
-#: mod/settings.php:1351
-msgid "Change the behaviour of this account for special situations"
+#: mod/content.php:790 object/Item.php:252
+msgid "unignore thread"
 msgstr ""
 
-#: mod/settings.php:1354
-msgid "Relocate"
+#: mod/content.php:791 object/Item.php:253
+msgid "toggle ignore status"
 msgstr ""
 
-#: mod/settings.php:1355
-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/content.php:794 mod/ostatus_subscribe.php:73 object/Item.php:256
+msgid "ignored"
 msgstr ""
 
-#: mod/settings.php:1356
-msgid "Resend relocate message to contacts"
+#: mod/content.php:805 object/Item.php:141
+msgid "save to folder"
 msgstr ""
 
-#: mod/share.php:38
-msgid "link"
+#: mod/content.php:853 object/Item.php:212
+msgid "I will attend"
 msgstr ""
 
-#: mod/subthread.php:104
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
+#: mod/content.php:853 object/Item.php:212
+msgid "I will not attend"
 msgstr ""
 
-#: mod/suggest.php:27
-msgid "Do you really want to delete this suggestion?"
+#: mod/content.php:853 object/Item.php:212
+msgid "I might attend"
 msgstr ""
 
-#: mod/suggest.php:71
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
+#: mod/content.php:917 object/Item.php:358
+msgid "to"
 msgstr ""
 
-#: mod/suggest.php:84 mod/suggest.php:104
-msgid "Ignore/Hide"
+#: mod/content.php:918 object/Item.php:360
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: mod/tagrm.php:43
-msgid "Tag removed"
+#: mod/content.php:919 object/Item.php:361
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: mod/tagrm.php:82
-msgid "Remove Item Tag"
+#: mod/credits.php:16
+msgid "Credits"
 msgstr ""
 
-#: mod/tagrm.php:84
-msgid "Select a tag to remove: "
+#: mod/credits.php:17
+msgid ""
+"Friendica is a community project, that would not be possible without the "
+"help of many people. Here is a list of those who have contributed to the "
+"code or the translation of Friendica. Thank you all!"
 msgstr ""
 
-#: mod/uexport.php:37
-msgid "Export account"
+#: mod/crepair.php:89
+msgid "Contact settings applied."
 msgstr ""
 
-#: mod/uexport.php:37
-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/crepair.php:91
+msgid "Contact update failed."
 msgstr ""
 
-#: mod/uexport.php:38
-msgid "Export all"
+#: mod/crepair.php:116 mod/dfrn_confirm.php:126 mod/fsuggest.php:21
+#: mod/fsuggest.php:93
+msgid "Contact not found."
 msgstr ""
 
-#: mod/uexport.php:38
+#: mod/crepair.php:122
 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)"
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
+"information your communications with this contact may stop working."
 msgstr ""
 
-#: mod/uimport.php:68
-msgid "Move account"
+#: mod/crepair.php:123
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
 msgstr ""
 
-#: mod/uimport.php:69
-msgid "You can import an account from another Friendica server."
+#: mod/crepair.php:136 mod/crepair.php:138
+msgid "No mirroring"
 msgstr ""
 
-#: mod/uimport.php:70
-msgid ""
-"You need to export your account from the old server and upload it here. We "
-"will recreate your old account here with all your contacts. We will try also "
-"to inform your friends that you moved here."
+#: mod/crepair.php:136
+msgid "Mirror as forwarded posting"
 msgstr ""
 
-#: mod/uimport.php:71
-msgid ""
-"This feature is experimental. We can't import contacts from the OStatus "
-"network (GNU Social/Statusnet) or from Diaspora"
+#: mod/crepair.php:136 mod/crepair.php:138
+msgid "Mirror as my own posting"
 msgstr ""
 
-#: mod/uimport.php:72
-msgid "Account file"
+#: mod/crepair.php:152
+msgid "Return to contact editor"
 msgstr ""
 
-#: mod/uimport.php:72
-msgid ""
-"To export your account, go to \"Settings->Export your personal data\" and "
-"select \"Export account\""
+#: mod/crepair.php:154
+msgid "Refetch contact data"
 msgstr ""
 
-#: mod/update_community.php:19 mod/update_display.php:23
-#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
-msgid "[Embedded content - reload page to view]"
+#: mod/crepair.php:158
+msgid "Remote Self"
 msgstr ""
 
-#: mod/videos.php:124
-msgid "Do you really want to delete this video?"
+#: mod/crepair.php:161
+msgid "Mirror postings from this contact"
 msgstr ""
 
-#: mod/videos.php:129
-msgid "Delete Video"
+#: mod/crepair.php:163
+msgid ""
+"Mark this contact as remote_self, this will cause friendica to repost new "
+"entries from this contact."
 msgstr ""
 
-#: mod/videos.php:208
-msgid "No videos selected"
+#: mod/crepair.php:168
+msgid "Account Nickname"
 msgstr ""
 
-#: mod/videos.php:309 mod/photos.php:1074
-msgid "Access to this item is restricted."
+#: mod/crepair.php:169
+msgid "@Tagname - overrides Name/Nickname"
 msgstr ""
 
-#: mod/videos.php:391 mod/photos.php:1867
-msgid "View Album"
+#: mod/crepair.php:170
+msgid "Account URL"
 msgstr ""
 
-#: mod/videos.php:400
-msgid "Recent Videos"
+#: mod/crepair.php:171
+msgid "Friend Request URL"
 msgstr ""
 
-#: mod/videos.php:402
-msgid "Upload New Videos"
+#: mod/crepair.php:172
+msgid "Friend Confirm URL"
 msgstr ""
 
-#: mod/viewsrc.php:7
-msgid "Access denied."
+#: mod/crepair.php:173
+msgid "Notification Endpoint URL"
 msgstr ""
 
-#: mod/wall_attach.php:17 mod/wall_attach.php:25 mod/wall_attach.php:76
-#: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86
-#: mod/wall_upload.php:122 mod/wall_upload.php:125
-msgid "Invalid request."
+#: mod/crepair.php:174
+msgid "Poll/Feed URL"
 msgstr ""
 
-#: mod/wall_attach.php:94
-msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
+#: mod/crepair.php:175
+msgid "New photo from this URL"
 msgstr ""
 
-#: mod/wall_attach.php:94
-msgid "Or - did you try to upload an empty file?"
+#: mod/delegate.php:101
+msgid "No potential page delegates located."
 msgstr ""
 
-#: mod/wall_attach.php:105
-#, php-format
-msgid "File exceeds size limit of %s"
+#: 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/wall_attach.php:158 mod/wall_attach.php:174
-msgid "File upload failed."
+#: mod/delegate.php:133
+msgid "Existing Page Managers"
 msgstr ""
 
-#: mod/cal.php:271 mod/events.php:387
-msgid "View"
+#: mod/delegate.php:135
+msgid "Existing Page Delegates"
 msgstr ""
 
-#: mod/cal.php:272 mod/events.php:389
-msgid "Previous"
+#: mod/delegate.php:137
+msgid "Potential Delegates"
 msgstr ""
 
-#: mod/cal.php:273 mod/events.php:390 mod/install.php:235
-msgid "Next"
+#: mod/delegate.php:139 mod/tagrm.php:95
+msgid "Remove"
 msgstr ""
 
-#: mod/cal.php:282 mod/events.php:399
-msgid "list"
+#: mod/delegate.php:140
+msgid "Add"
 msgstr ""
 
-#: mod/cal.php:292
-msgid "User not found"
+#: mod/delegate.php:141
+msgid "No entries."
 msgstr ""
 
-#: mod/cal.php:308
-msgid "This calendar format is not supported"
+#: mod/dfrn_confirm.php:70 mod/profiles.php:19 mod/profiles.php:134
+#: mod/profiles.php:180 mod/profiles.php:619
+msgid "Profile not found."
 msgstr ""
 
-#: mod/cal.php:310
-msgid "No exportable data found"
+#: mod/dfrn_confirm.php:127
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it "
+"has already been approved."
 msgstr ""
 
-#: mod/cal.php:325
-msgid "calendar"
+#: mod/dfrn_confirm.php:244
+msgid "Response from remote site was not understood."
 msgstr ""
 
-#: mod/contacts.php:134
-#, php-format
-msgid "%d contact edited."
-msgid_plural "%d contacts edited."
-msgstr[0] ""
-msgstr[1] ""
+#: mod/dfrn_confirm.php:253 mod/dfrn_confirm.php:258
+msgid "Unexpected response from remote site: "
+msgstr ""
 
-#: mod/contacts.php:169 mod/contacts.php:378
-msgid "Could not access contact record."
+#: mod/dfrn_confirm.php:267
+msgid "Confirmation completed successfully."
 msgstr ""
 
-#: mod/contacts.php:183
-msgid "Could not locate selected profile."
+#: mod/dfrn_confirm.php:269 mod/dfrn_confirm.php:283 mod/dfrn_confirm.php:290
+msgid "Remote site reported: "
 msgstr ""
 
-#: mod/contacts.php:216
-msgid "Contact updated."
+#: mod/dfrn_confirm.php:281
+msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
-#: mod/contacts.php:218 mod/dfrn_request.php:588
-msgid "Failed to update contact record."
+#: mod/dfrn_confirm.php:288
+msgid "Introduction failed or was revoked."
 msgstr ""
 
-#: mod/contacts.php:399
-msgid "Contact has been blocked"
+#: mod/dfrn_confirm.php:418
+msgid "Unable to set contact photo."
 msgstr ""
 
-#: mod/contacts.php:399
-msgid "Contact has been unblocked"
+#: mod/dfrn_confirm.php:559
+#, php-format
+msgid "No user record found for '%s' "
 msgstr ""
 
-#: mod/contacts.php:410
-msgid "Contact has been ignored"
+#: mod/dfrn_confirm.php:569
+msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: mod/contacts.php:410
-msgid "Contact has been unignored"
+#: mod/dfrn_confirm.php:580
+msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
-#: mod/contacts.php:422
-msgid "Contact has been archived"
+#: mod/dfrn_confirm.php:601
+msgid "Contact record was not found for you on our site."
 msgstr ""
 
-#: mod/contacts.php:422
-msgid "Contact has been unarchived"
+#: mod/dfrn_confirm.php:615
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
 msgstr ""
 
-#: mod/contacts.php:447
-msgid "Drop contact"
+#: mod/dfrn_confirm.php:635
+msgid ""
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
 msgstr ""
 
-#: mod/contacts.php:450 mod/contacts.php:809
-msgid "Do you really want to delete this contact?"
+#: mod/dfrn_confirm.php:646
+msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
-#: mod/contacts.php:469
-msgid "Contact has been removed."
+#: mod/dfrn_confirm.php:708
+msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: mod/contacts.php:506
+#: mod/dfrn_confirm.php:780
 #, php-format
-msgid "You are mutual friends with %s"
+msgid "%1$s has joined %2$s"
 msgstr ""
 
-#: mod/contacts.php:510
+#: mod/dfrn_poll.php:104 mod/dfrn_poll.php:539
 #, php-format
-msgid "You are sharing with %s"
+msgid "%1$s welcomes %2$s"
 msgstr ""
 
-#: mod/contacts.php:515
-#, php-format
-msgid "%s is sharing with you"
+#: mod/dfrn_request.php:101
+msgid "This introduction has already been accepted."
 msgstr ""
 
-#: mod/contacts.php:535
-msgid "Private communications are not available for this contact."
+#: mod/dfrn_request.php:124 mod/dfrn_request.php:523
+msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: mod/contacts.php:538 mod/admin.php:899
-msgid "Never"
+#: mod/dfrn_request.php:129 mod/dfrn_request.php:528
+msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: mod/contacts.php:542
-msgid "(Update was successful)"
+#: mod/dfrn_request.php:132 mod/dfrn_request.php:531
+msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: mod/contacts.php:542
-msgid "(Update was not successful)"
+#: mod/dfrn_request.php:136 mod/dfrn_request.php:535
+#, php-format
+msgid "%d required parameter was not found at the given location"
+msgid_plural "%d required parameters were not found at the given location"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/dfrn_request.php:180
+msgid "Introduction complete."
 msgstr ""
 
-#: mod/contacts.php:544 mod/contacts.php:972
-msgid "Suggest friends"
+#: mod/dfrn_request.php:225
+msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: mod/contacts.php:548
-#, php-format
-msgid "Network type: %s"
+#: mod/dfrn_request.php:253
+msgid "Profile unavailable."
 msgstr ""
 
-#: mod/contacts.php:561
-msgid "Communications lost with this contact!"
+#: mod/dfrn_request.php:280
+#, php-format
+msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: mod/contacts.php:564
-msgid "Fetch further information for feeds"
+#: mod/dfrn_request.php:281
+msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: mod/contacts.php:565 mod/admin.php:908
-msgid "Disabled"
+#: mod/dfrn_request.php:282
+msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: mod/contacts.php:565
-msgid "Fetch information"
+#: mod/dfrn_request.php:344
+msgid "Invalid locator"
 msgstr ""
 
-#: mod/contacts.php:565
-msgid "Fetch information and keywords"
+#: mod/dfrn_request.php:353
+msgid "Invalid email address."
 msgstr ""
 
-#: mod/contacts.php:583
-msgid "Contact"
+#: mod/dfrn_request.php:378
+msgid "This account has not been configured for email. Request failed."
 msgstr ""
 
-#: mod/contacts.php:586
-msgid "Profile Visibility"
+#: mod/dfrn_request.php:481
+msgid "You have already introduced yourself here."
 msgstr ""
 
-#: mod/contacts.php:587
+#: mod/dfrn_request.php:485
 #, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: mod/contacts.php:588
-msgid "Contact Information / Notes"
+#: mod/dfrn_request.php:506
+msgid "Invalid profile URL."
 msgstr ""
 
-#: mod/contacts.php:589
-msgid "Edit contact notes"
+#: mod/dfrn_request.php:609
+msgid "Your introduction has been sent."
 msgstr ""
 
-#: mod/contacts.php:595
-msgid "Block/Unblock contact"
+#: mod/dfrn_request.php:651
+msgid ""
+"Remote subscription can't be done for your network. Please subscribe "
+"directly on your system."
 msgstr ""
 
-#: mod/contacts.php:596
-msgid "Ignore contact"
+#: mod/dfrn_request.php:672
+msgid "Please login to confirm introduction."
 msgstr ""
 
-#: mod/contacts.php:597
-msgid "Repair URL settings"
+#: mod/dfrn_request.php:682
+msgid ""
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
 msgstr ""
 
-#: mod/contacts.php:598
-msgid "View conversations"
+#: mod/dfrn_request.php:696 mod/dfrn_request.php:713
+msgid "Confirm"
 msgstr ""
 
-#: mod/contacts.php:604
-msgid "Last update:"
+#: mod/dfrn_request.php:708
+msgid "Hide this contact"
 msgstr ""
 
-#: mod/contacts.php:606
-msgid "Update public posts"
+#: mod/dfrn_request.php:711
+#, php-format
+msgid "Welcome home %s."
 msgstr ""
-
-#: mod/contacts.php:608 mod/contacts.php:982
-msgid "Update now"
+
+#: mod/dfrn_request.php:712
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: mod/contacts.php:613 mod/contacts.php:813 mod/contacts.php:991
-#: mod/admin.php:1437
-msgid "Unblock"
+#: mod/dfrn_request.php:843
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
 msgstr ""
 
-#: mod/contacts.php:613 mod/contacts.php:813 mod/contacts.php:991
-#: mod/admin.php:1436
-msgid "Block"
+#: mod/dfrn_request.php:867
+#, php-format
+msgid ""
+"If you are not yet a member of the free social web, <a href=\"%s/siteinfo"
+"\">follow this link to find a public Friendica site and join us today</a>."
 msgstr ""
 
-#: mod/contacts.php:614 mod/contacts.php:814 mod/contacts.php:999
-msgid "Unignore"
+#: mod/dfrn_request.php:872
+msgid "Friend/Connection Request"
 msgstr ""
 
-#: mod/contacts.php:614 mod/contacts.php:814 mod/contacts.php:999
-#: mod/notifications.php:60 mod/notifications.php:179
-#: mod/notifications.php:257
-msgid "Ignore"
+#: mod/dfrn_request.php:873
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@identi.ca"
 msgstr ""
 
-#: mod/contacts.php:618
-msgid "Currently blocked"
+#: mod/dfrn_request.php:874 mod/follow.php:112
+msgid "Please answer the following:"
 msgstr ""
 
-#: mod/contacts.php:619
-msgid "Currently ignored"
+#: mod/dfrn_request.php:875 mod/follow.php:113
+#, php-format
+msgid "Does %s know you?"
 msgstr ""
 
-#: mod/contacts.php:620
-msgid "Currently archived"
+#: mod/dfrn_request.php:879 mod/follow.php:114
+msgid "Add a personal note:"
 msgstr ""
 
-#: mod/contacts.php:621 mod/notifications.php:172 mod/notifications.php:245
-msgid "Hide this contact from others"
+#: mod/dfrn_request.php:882
+msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: mod/contacts.php:621
+#: mod/dfrn_request.php:884
+#, php-format
 msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
+" - please do not use this form.  Instead, enter %s into your Diaspora search "
+"bar."
 msgstr ""
 
-#: mod/contacts.php:622
-msgid "Notification for new posts"
+#: mod/dfrn_request.php:885 mod/follow.php:120
+msgid "Your Identity Address:"
 msgstr ""
 
-#: mod/contacts.php:622
-msgid "Send a notification of every new post of this contact"
+#: mod/dfrn_request.php:888 mod/follow.php:19
+msgid "Submit Request"
 msgstr ""
 
-#: mod/contacts.php:625
-msgid "Blacklisted keywords"
+#: mod/directory.php:199 view/theme/vier/theme.php:196
+msgid "Global Directory"
 msgstr ""
 
-#: mod/contacts.php:625
-msgid ""
-"Comma separated list of keywords that should not be converted to hashtags, "
-"when \"Fetch information and keywords\" is selected"
+#: mod/directory.php:201
+msgid "Find on this site"
 msgstr ""
 
-#: mod/contacts.php:643
-msgid "Actions"
+#: mod/directory.php:203
+msgid "Results for:"
 msgstr ""
 
-#: mod/contacts.php:646
-msgid "Contact Settings"
+#: mod/directory.php:205
+msgid "Site Directory"
 msgstr ""
 
-#: mod/contacts.php:692
-msgid "Suggestions"
+#: mod/directory.php:212
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: mod/contacts.php:695
-msgid "Suggest potential friends"
+#: mod/dirfind.php:37
+#, php-format
+msgid "People Search - %s"
 msgstr ""
 
-#: mod/contacts.php:703
-msgid "Show all contacts"
+#: mod/dirfind.php:48
+#, php-format
+msgid "Forum Search - %s"
 msgstr ""
 
-#: mod/contacts.php:708
-msgid "Unblocked"
+#: mod/dirfind.php:245 mod/match.php:109
+msgid "No matches"
 msgstr ""
 
-#: mod/contacts.php:711
-msgid "Only show unblocked contacts"
+#: mod/display.php:479
+msgid "Item has been removed."
 msgstr ""
 
-#: mod/contacts.php:717
-msgid "Blocked"
+#: mod/editpost.php:17 mod/editpost.php:27
+msgid "Item not found"
 msgstr ""
 
-#: mod/contacts.php:720
-msgid "Only show blocked contacts"
+#: mod/editpost.php:32
+msgid "Edit post"
 msgstr ""
 
-#: mod/contacts.php:726
-msgid "Ignored"
+#: mod/events.php:100 mod/events.php:102
+msgid "Event can not end before it has started."
 msgstr ""
 
-#: mod/contacts.php:729
-msgid "Only show ignored contacts"
+#: mod/events.php:109 mod/events.php:111
+msgid "Event title and start time are required."
 msgstr ""
 
-#: mod/contacts.php:735
-msgid "Archived"
+#: mod/events.php:388
+msgid "Create New Event"
 msgstr ""
 
-#: mod/contacts.php:738
-msgid "Only show archived contacts"
+#: mod/events.php:489
+msgid "Event details"
 msgstr ""
 
-#: mod/contacts.php:744
-msgid "Hidden"
+#: mod/events.php:490
+msgid "Starting date and Title are required."
 msgstr ""
 
-#: mod/contacts.php:747
-msgid "Only show hidden contacts"
+#: mod/events.php:491 mod/events.php:492
+msgid "Event Starts:"
 msgstr ""
 
-#: mod/contacts.php:804
-msgid "Search your contacts"
+#: mod/events.php:491 mod/events.php:503 mod/profiles.php:708
+msgid "Required"
 msgstr ""
 
-#: mod/contacts.php:805 mod/network.php:145 mod/search.php:232
-#, php-format
-msgid "Results for: %s"
+#: mod/events.php:493 mod/events.php:509
+msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: mod/contacts.php:815 mod/contacts.php:1007
-msgid "Archive"
+#: mod/events.php:495 mod/events.php:496
+msgid "Event Finishes:"
 msgstr ""
 
-#: mod/contacts.php:815 mod/contacts.php:1007
-msgid "Unarchive"
+#: mod/events.php:497 mod/events.php:510
+msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: mod/contacts.php:818
-msgid "Batch Actions"
+#: mod/events.php:499
+msgid "Description:"
 msgstr ""
 
-#: mod/contacts.php:864
-msgid "View all contacts"
+#: mod/events.php:503 mod/events.php:505
+msgid "Title:"
 msgstr ""
 
-#: mod/contacts.php:874
-msgid "View all common friends"
+#: mod/events.php:506 mod/events.php:507
+msgid "Share this event"
 msgstr ""
 
-#: mod/contacts.php:881
-msgid "Advanced Contact Settings"
+#: mod/fbrowser.php:132
+msgid "Files"
 msgstr ""
 
-#: mod/contacts.php:915
-msgid "Mutual Friendship"
+#: mod/filer.php:30
+msgid "- select -"
 msgstr ""
 
-#: mod/contacts.php:919
-msgid "is a fan of yours"
+#: mod/follow.php:30
+msgid "You already added this contact."
 msgstr ""
 
-#: mod/contacts.php:923
-msgid "you are a fan of"
+#: mod/follow.php:39
+msgid "Diaspora support isn't enabled. Contact can't be added."
 msgstr ""
 
-#: mod/contacts.php:993
-msgid "Toggle Blocked status"
+#: mod/follow.php:46
+msgid "OStatus support is disabled. Contact can't be added."
 msgstr ""
 
-#: mod/contacts.php:1001
-msgid "Toggle Ignored status"
+#: mod/follow.php:53
+msgid "The network type couldn't be detected. Contact can't be added."
 msgstr ""
 
-#: mod/contacts.php:1009
-msgid "Toggle Archive status"
+#: mod/follow.php:186
+msgid "Contact added"
 msgstr ""
 
-#: mod/contacts.php:1017
-msgid "Delete contact"
+#: mod/friendica.php:72
+msgid "This is Friendica, version"
 msgstr ""
 
-#: mod/dfrn_confirm.php:70 mod/profiles.php:19 mod/profiles.php:134
-#: mod/profiles.php:180 mod/profiles.php:619
-msgid "Profile not found."
+#: mod/friendica.php:73
+msgid "running at web location"
 msgstr ""
 
-#: mod/dfrn_confirm.php:127
+#: mod/friendica.php:75
 msgid ""
-"This may occasionally happen if contact was requested by both persons and it "
-"has already been approved."
+"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
+"more about the Friendica project."
 msgstr ""
 
-#: mod/dfrn_confirm.php:244
-msgid "Response from remote site was not understood."
+#: mod/friendica.php:77
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: mod/dfrn_confirm.php:253 mod/dfrn_confirm.php:258
-msgid "Unexpected response from remote site: "
+#: mod/friendica.php:77
+msgid "the bugtracker at github"
 msgstr ""
 
-#: mod/dfrn_confirm.php:267
-msgid "Confirmation completed successfully."
+#: mod/friendica.php:78
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
+"dot com"
 msgstr ""
 
-#: mod/dfrn_confirm.php:269 mod/dfrn_confirm.php:283 mod/dfrn_confirm.php:290
-msgid "Remote site reported: "
+#: mod/friendica.php:92
+msgid "Installed plugins/addons/apps:"
 msgstr ""
 
-#: mod/dfrn_confirm.php:281
-msgid "Temporary failure. Please wait and try again."
+#: mod/friendica.php:105
+msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: mod/dfrn_confirm.php:288
-msgid "Introduction failed or was revoked."
+#: mod/fsuggest.php:64
+msgid "Friend suggestion sent."
 msgstr ""
 
-#: mod/dfrn_confirm.php:418
-msgid "Unable to set contact photo."
+#: mod/fsuggest.php:98
+msgid "Suggest Friends"
 msgstr ""
 
-#: mod/dfrn_confirm.php:559
+#: mod/fsuggest.php:100
 #, php-format
-msgid "No user record found for '%s' "
+msgid "Suggest a friend for %s"
 msgstr ""
 
-#: mod/dfrn_confirm.php:569
-msgid "Our site encryption key is apparently messed up."
+#: mod/group.php:29
+msgid "Group created."
 msgstr ""
 
-#: mod/dfrn_confirm.php:580
-msgid "Empty site URL was provided or URL could not be decrypted by us."
+#: mod/group.php:35
+msgid "Could not create group."
 msgstr ""
 
-#: mod/dfrn_confirm.php:601
-msgid "Contact record was not found for you on our site."
+#: mod/group.php:49 mod/group.php:150
+msgid "Group not found."
 msgstr ""
 
-#: mod/dfrn_confirm.php:615
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
+#: mod/group.php:63
+msgid "Group name changed."
+msgstr ""
+
+#: mod/group.php:91
+msgid "Save Group"
+msgstr ""
+
+#: mod/group.php:97
+msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: mod/dfrn_confirm.php:635
-msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
+#: mod/group.php:122
+msgid "Group removed."
 msgstr ""
 
-#: mod/dfrn_confirm.php:646
-msgid "Unable to set your contact credentials on our system."
+#: mod/group.php:124
+msgid "Unable to remove group."
 msgstr ""
 
-#: mod/dfrn_confirm.php:708
-msgid "Unable to update your contact profile details on our system"
+#: mod/group.php:187
+msgid "Group Editor"
 msgstr ""
 
-#: mod/dfrn_confirm.php:780
-#, php-format
-msgid "%1$s has joined %2$s"
+#: mod/group.php:200
+msgid "Members"
 msgstr ""
 
-#: mod/editpost.php:17 mod/editpost.php:27
-msgid "Item not found"
+#: mod/group.php:233 mod/profperm.php:107
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: mod/editpost.php:32
-msgid "Edit post"
+#: mod/hcard.php:11
+msgid "No profile"
 msgstr ""
 
-#: mod/events.php:100 mod/events.php:102
-msgid "Event can not end before it has started."
+#: mod/help.php:41
+msgid "Help:"
 msgstr ""
 
-#: mod/events.php:109 mod/events.php:111
-msgid "Event title and start time are required."
+#: mod/home.php:39
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: mod/events.php:388
-msgid "Create New Event"
+#: mod/install.php:140
+msgid "Friendica Communications Server - Setup"
 msgstr ""
 
-#: mod/events.php:489
-msgid "Event details"
+#: mod/install.php:146
+msgid "Could not connect to database."
 msgstr ""
 
-#: mod/events.php:490
-msgid "Starting date and Title are required."
+#: mod/install.php:150
+msgid "Could not create table."
 msgstr ""
 
-#: mod/events.php:491 mod/events.php:492
-msgid "Event Starts:"
+#: mod/install.php:156
+msgid "Your Friendica site database has been installed."
 msgstr ""
 
-#: mod/events.php:491 mod/events.php:503 mod/profiles.php:708
-msgid "Required"
+#: mod/install.php:161
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
 msgstr ""
 
-#: mod/events.php:493 mod/events.php:509
-msgid "Finish date/time is not known or not relevant"
+#: mod/install.php:162 mod/install.php:234 mod/install.php:609
+msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: mod/events.php:495 mod/events.php:496
-msgid "Event Finishes:"
+#: mod/install.php:174
+msgid "Database already in use."
 msgstr ""
 
-#: mod/events.php:497 mod/events.php:510
-msgid "Adjust for viewer timezone"
+#: mod/install.php:231
+msgid "System check"
 msgstr ""
 
-#: mod/events.php:499
-msgid "Description:"
+#: mod/install.php:236
+msgid "Check again"
 msgstr ""
 
-#: mod/events.php:503 mod/events.php:505
-msgid "Title:"
+#: mod/install.php:255
+msgid "Database connection"
 msgstr ""
 
-#: mod/events.php:506 mod/events.php:507
-msgid "Share this event"
+#: mod/install.php:256
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
 msgstr ""
 
-#: mod/fbrowser.php:132
-msgid "Files"
+#: mod/install.php:257
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: mod/friendica.php:72
-msgid "This is Friendica, version"
+#: mod/install.php:258
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: mod/friendica.php:73
-msgid "running at web location"
+#: mod/install.php:262
+msgid "Database Server Name"
 msgstr ""
 
-#: mod/friendica.php:75
-msgid ""
-"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
-"more about the Friendica project."
+#: mod/install.php:263
+msgid "Database Login Name"
 msgstr ""
 
-#: mod/friendica.php:77
-msgid "Bug reports and issues: please visit"
+#: mod/install.php:264
+msgid "Database Login Password"
 msgstr ""
 
-#: mod/friendica.php:77
-msgid "the bugtracker at github"
+#: mod/install.php:264
+msgid "For security reasons the password must not be empty"
 msgstr ""
 
-#: mod/friendica.php:78
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
-"dot com"
+#: mod/install.php:265
+msgid "Database Name"
 msgstr ""
 
-#: mod/friendica.php:92
-msgid "Installed plugins/addons/apps:"
+#: mod/install.php:266 mod/install.php:307
+msgid "Site administrator email address"
 msgstr ""
 
-#: mod/friendica.php:105
-msgid "No installed plugins/addons/apps"
+#: mod/install.php:266 mod/install.php:307
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
 msgstr ""
 
-#: mod/item.php:118
-msgid "Unable to locate original post."
+#: mod/install.php:270 mod/install.php:310
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: mod/item.php:336
-msgid "Empty post discarded."
+#: mod/install.php:297
+msgid "Site settings"
 msgstr ""
 
-#: mod/item.php:889
-msgid "System error. Post not saved."
+#: mod/install.php:311
+msgid "System Language:"
 msgstr ""
 
-#: mod/item.php:979
-#, php-format
+#: mod/install.php:311
 msgid ""
-"This message was sent to you by %s, a member of the Friendica social network."
+"Set the default language for your Friendica installation interface and to "
+"send emails."
 msgstr ""
 
-#: mod/item.php:981
-#, php-format
-msgid "You may visit them online at %s"
+#: mod/install.php:351
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: mod/item.php:982
+#: mod/install.php:352
 msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron. See <a href='https://"
+"github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-"
+"poller'>'Setup the poller'</a>"
 msgstr ""
 
-#: mod/item.php:986
-#, php-format
-msgid "%s posted an update."
+#: mod/install.php:356
+msgid "PHP executable path"
 msgstr ""
 
-#: mod/message.php:60 mod/wallmessage.php:50
-msgid "No recipient selected."
+#: mod/install.php:356
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: mod/message.php:64
-msgid "Unable to locate contact information."
+#: mod/install.php:361
+msgid "Command line PHP"
 msgstr ""
 
-#: mod/message.php:67 mod/wallmessage.php:56
-msgid "Message could not be sent."
+#: mod/install.php:370
+msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
 msgstr ""
 
-#: mod/message.php:70 mod/wallmessage.php:59
-msgid "Message collection failure."
+#: mod/install.php:371
+msgid "Found PHP version: "
 msgstr ""
 
-#: mod/message.php:73 mod/wallmessage.php:62
-msgid "Message sent."
+#: mod/install.php:373
+msgid "PHP cli binary"
 msgstr ""
 
-#: mod/message.php:204
-msgid "Do you really want to delete this message?"
+#: mod/install.php:384
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: mod/message.php:224
-msgid "Message deleted."
+#: mod/install.php:385
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: mod/message.php:255
-msgid "Conversation removed."
+#: mod/install.php:387
+msgid "PHP register_argc_argv"
 msgstr ""
 
-#: mod/message.php:322 mod/wallmessage.php:126
-msgid "Send Private Message"
+#: mod/install.php:410
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: mod/message.php:323 mod/message.php:510 mod/wallmessage.php:128
-msgid "To:"
+#: mod/install.php:411
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: mod/message.php:328 mod/message.php:512 mod/wallmessage.php:129
-msgid "Subject:"
+#: mod/install.php:413
+msgid "Generate encryption keys"
 msgstr ""
 
-#: mod/message.php:364
-msgid "No messages."
+#: mod/install.php:420
+msgid "libCurl PHP module"
 msgstr ""
 
-#: mod/message.php:403
-msgid "Message not available."
+#: mod/install.php:421
+msgid "GD graphics PHP module"
 msgstr ""
 
-#: mod/message.php:477
-msgid "Delete message"
+#: mod/install.php:422
+msgid "OpenSSL PHP module"
 msgstr ""
 
-#: mod/message.php:503 mod/message.php:583
-msgid "Delete conversation"
+#: mod/install.php:423
+msgid "mysqli PHP module"
 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/install.php:424
+msgid "mb_string PHP module"
 msgstr ""
 
-#: mod/message.php:509
-msgid "Send Reply"
+#: mod/install.php:425
+msgid "mcrypt PHP module"
 msgstr ""
 
-#: mod/message.php:553
-#, php-format
-msgid "Unknown sender - %s"
+#: mod/install.php:426
+msgid "XML PHP module"
 msgstr ""
 
-#: mod/message.php:555
-#, php-format
-msgid "You and %s"
+#: mod/install.php:427
+msgid "iconv module"
 msgstr ""
 
-#: mod/message.php:557
-#, php-format
-msgid "%s and You"
+#: mod/install.php:431 mod/install.php:433
+msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: mod/message.php:586
-msgid "D, d M Y - g:i A"
+#: mod/install.php:431
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: mod/message.php:589
-#, php-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mod/p.php:9
-msgid "Not Extended"
+#: mod/install.php:439
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: mod/ping.php:270
-msgid "{0} wants to be your friend"
+#: mod/install.php:443
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: mod/ping.php:285
-msgid "{0} sent you a message"
+#: mod/install.php:447
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: mod/ping.php:300
-msgid "{0} requested registration"
+#: mod/install.php:451
+msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: mod/wallmessage.php:42 mod/wallmessage.php:106
-#, php-format
-msgid "Number of daily wall messages for %s exceeded. Message failed."
+#: mod/install.php:455
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: mod/wallmessage.php:53
-msgid "Unable to check your home location."
+#: mod/install.php:459
+msgid "Error: mcrypt PHP module required but not installed."
 msgstr ""
 
-#: mod/wallmessage.php:80 mod/wallmessage.php:89
-msgid "No recipient."
+#: mod/install.php:463
+msgid "Error: iconv PHP module required but not installed."
 msgstr ""
 
-#: mod/wallmessage.php:127
-#, php-format
+#: mod/install.php:472
 msgid ""
-"If you wish for %s to respond, please check that the privacy settings on "
-"your site allow private mail from unknown senders."
+"If you are using php_cli, please make sure that mcrypt module is enabled in "
+"its config file"
 msgstr ""
 
-#: mod/photos.php:90 mod/photos.php:1876
-msgid "Recent Photos"
+#: mod/install.php:475
+msgid ""
+"Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 "
+"encryption layer."
 msgstr ""
 
-#: mod/photos.php:93 mod/photos.php:1303 mod/photos.php:1878
-msgid "Upload New Photos"
+#: mod/install.php:477
+msgid "mcrypt_create_iv() function"
 msgstr ""
 
-#: mod/photos.php:171
-msgid "Contact information unavailable"
+#: mod/install.php:485
+msgid "Error, XML PHP module required but not installed."
 msgstr ""
 
-#: mod/photos.php:192
-msgid "Album not found."
+#: mod/install.php:500
+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/photos.php:225 mod/photos.php:237 mod/photos.php:1247
-msgid "Delete Album"
+#: mod/install.php:501
+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/photos.php:235
-msgid "Do you really want to delete this photo album and all its photos?"
+#: mod/install.php:502
+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/photos.php:317 mod/photos.php:328 mod/photos.php:1563
-msgid "Delete Photo"
+#: mod/install.php:503
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: mod/photos.php:326
-msgid "Do you really want to delete this photo?"
+#: mod/install.php:506
+msgid ".htconfig.php is writable"
 msgstr ""
 
-#: mod/photos.php:705
-#, php-format
-msgid "%1$s was tagged in %2$s by %3$s"
+#: mod/install.php:516
+msgid ""
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: mod/photos.php:705
-msgid "a photo"
+#: mod/install.php:517
+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/photos.php:811
-msgid "Image file is empty."
+#: mod/install.php:518
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
 msgstr ""
 
-#: mod/photos.php:974
-msgid "No photos selected"
+#: mod/install.php:519
+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/photos.php:1134
-#, php-format
-msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+#: mod/install.php:522
+msgid "view/smarty3 is writable"
 msgstr ""
 
-#: mod/photos.php:1168
-msgid "Upload Photos"
+#: mod/install.php:538
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
 msgstr ""
 
-#: mod/photos.php:1172 mod/photos.php:1242
-msgid "New album name: "
+#: mod/install.php:540
+msgid "Url rewrite is working"
 msgstr ""
 
-#: mod/photos.php:1173
-msgid "or existing album name: "
+#: mod/install.php:559
+msgid "ImageMagick PHP extension is not installed"
 msgstr ""
 
-#: mod/photos.php:1174
-msgid "Do not show a status post for this upload"
+#: mod/install.php:561
+msgid "ImageMagick PHP extension is installed"
 msgstr ""
 
-#: mod/photos.php:1187
-msgid "Private Photo"
+#: mod/install.php:563
+msgid "ImageMagick supports GIF"
 msgstr ""
 
-#: mod/photos.php:1188
-msgid "Public Photo"
+#: mod/install.php:570
+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/photos.php:1254
-msgid "Edit Album"
+#: mod/install.php:607
+msgid "<h1>What next</h1>"
 msgstr ""
 
-#: mod/photos.php:1260
-msgid "Show Newest First"
+#: mod/install.php:608
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: mod/photos.php:1262
-msgid "Show Oldest First"
+#: mod/invite.php:28
+msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: mod/photos.php:1289 mod/photos.php:1861
-msgid "View Photo"
+#: mod/invite.php:51
+#, php-format
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: mod/photos.php:1335
-msgid "Permission denied. Access to this item may be restricted."
+#: mod/invite.php:76
+msgid "Please join us on Friendica"
 msgstr ""
 
-#: mod/photos.php:1337
-msgid "Photo not available"
+#: mod/invite.php:87
+msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: mod/photos.php:1395
-msgid "View photo"
+#: mod/invite.php:91
+#, php-format
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: mod/photos.php:1395
-msgid "Edit photo"
-msgstr ""
+#: mod/invite.php:95
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
 
-#: mod/photos.php:1396
-msgid "Use as profile photo"
+#: mod/invite.php:114
+msgid "You have no more invitations available"
 msgstr ""
 
-#: mod/photos.php:1421
-msgid "View Full Size"
+#: mod/invite.php:122
+#, 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/photos.php:1507
-msgid "Tags: "
+#: mod/invite.php:124
+#, php-format
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
 msgstr ""
 
-#: mod/photos.php:1510
-msgid "[Remove any tag]"
+#: mod/invite.php:125
+#, php-format
+msgid ""
+"Friendica sites all inter-connect to create a huge privacy-enhanced social "
+"web that is owned and controlled by its members. They can also connect with "
+"many traditional social networks. See %s for a list of alternate Friendica "
+"sites you can join."
 msgstr ""
 
-#: mod/photos.php:1549
-msgid "New album name"
+#: mod/invite.php:128
+msgid ""
+"Our apologies. This system is not currently configured to connect with other "
+"public sites or invite members."
 msgstr ""
 
-#: mod/photos.php:1550
-msgid "Caption"
+#: mod/invite.php:134
+msgid "Send invitations"
 msgstr ""
 
-#: mod/photos.php:1551
-msgid "Add a Tag"
+#: mod/invite.php:135
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: mod/photos.php:1551
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+#: mod/invite.php:136 mod/message.php:332 mod/message.php:515
+#: mod/wallmessage.php:135
+msgid "Your message:"
 msgstr ""
 
-#: mod/photos.php:1552
-msgid "Do not rotate"
+#: mod/invite.php:137
+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/photos.php:1553
-msgid "Rotate CW (right)"
+#: mod/invite.php:139
+msgid "You will need to supply this invitation code: $invite_code"
 msgstr ""
 
-#: mod/photos.php:1554
-msgid "Rotate CCW (left)"
+#: mod/invite.php:139
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: mod/photos.php:1569
-msgid "Private photo"
+#: mod/invite.php:141
+msgid ""
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendica.com"
 msgstr ""
 
-#: mod/photos.php:1570
-msgid "Public photo"
+#: mod/item.php:118
+msgid "Unable to locate original post."
 msgstr ""
 
-#: mod/photos.php:1792
-msgid "Map"
+#: mod/item.php:336
+msgid "Empty post discarded."
 msgstr ""
 
-#: mod/dfrn_request.php:101
-msgid "This introduction has already been accepted."
+#: mod/item.php:889
+msgid "System error. Post not saved."
 msgstr ""
 
-#: mod/dfrn_request.php:124 mod/dfrn_request.php:523
-msgid "Profile location is not valid or does not contain profile information."
+#: mod/item.php:979
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: mod/dfrn_request.php:129 mod/dfrn_request.php:528
-msgid "Warning: profile location has no identifiable owner name."
+#: mod/item.php:981
+#, php-format
+msgid "You may visit them online at %s"
 msgstr ""
 
-#: mod/dfrn_request.php:132 mod/dfrn_request.php:531
-msgid "Warning: profile location has no profile photo."
+#: mod/item.php:982
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
 msgstr ""
 
-#: mod/dfrn_request.php:136 mod/dfrn_request.php:535
+#: mod/item.php:986
 #, php-format
-msgid "%d required parameter was not found at the given location"
-msgid_plural "%d required parameters were not found at the given location"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%s posted an update."
+msgstr ""
 
-#: mod/dfrn_request.php:180
-msgid "Introduction complete."
+#: mod/localtime.php:24
+msgid "Time Conversion"
 msgstr ""
 
-#: mod/dfrn_request.php:225
-msgid "Unrecoverable protocol error."
+#: mod/localtime.php:26
+msgid ""
+"Friendica provides this service for sharing events with other networks and "
+"friends in unknown timezones."
 msgstr ""
 
-#: mod/dfrn_request.php:253
-msgid "Profile unavailable."
+#: mod/localtime.php:30
+#, php-format
+msgid "UTC time: %s"
 msgstr ""
 
-#: mod/dfrn_request.php:280
+#: mod/localtime.php:33
 #, php-format
-msgid "%s has received too many connection requests today."
+msgid "Current timezone: %s"
 msgstr ""
 
-#: mod/dfrn_request.php:281
-msgid "Spam protection measures have been invoked."
+#: mod/localtime.php:36
+#, php-format
+msgid "Converted localtime: %s"
 msgstr ""
 
-#: mod/dfrn_request.php:282
-msgid "Friends are advised to please try again in 24 hours."
+#: mod/localtime.php:41
+msgid "Please select your timezone:"
 msgstr ""
 
-#: mod/dfrn_request.php:344
-msgid "Invalid locator"
+#: mod/lockview.php:32 mod/lockview.php:40
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: mod/dfrn_request.php:353
-msgid "Invalid email address."
+#: mod/lockview.php:49
+msgid "Visible to:"
 msgstr ""
 
-#: mod/dfrn_request.php:378
-msgid "This account has not been configured for email. Request failed."
+#: mod/lostpass.php:19
+msgid "No valid account found."
 msgstr ""
 
-#: mod/dfrn_request.php:481
-msgid "You have already introduced yourself here."
+#: mod/lostpass.php:35
+msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: mod/dfrn_request.php:485
+#: mod/lostpass.php:41
 #, php-format
-msgid "Apparently you are already friends with %s."
+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."
 msgstr ""
 
-#: mod/dfrn_request.php:506
-msgid "Invalid profile URL."
+#: mod/lostpass.php:52
+#, 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"
 msgstr ""
 
-#: mod/dfrn_request.php:609
-msgid "Your introduction has been sent."
+#: mod/lostpass.php:71
+#, php-format
+msgid "Password reset requested at %s"
 msgstr ""
 
-#: mod/dfrn_request.php:651
+#: mod/lostpass.php:91
 msgid ""
-"Remote subscription can't be done for your network. Please subscribe "
-"directly on your system."
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
 msgstr ""
 
-#: mod/dfrn_request.php:672
-msgid "Please login to confirm introduction."
+#: mod/lostpass.php:111
+msgid "Your password has been reset as requested."
 msgstr ""
 
-#: mod/dfrn_request.php:682
-msgid ""
-"Incorrect identity currently logged in. Please login to <strong>this</"
-"strong> profile."
+#: mod/lostpass.php:112
+msgid "Your new password is"
 msgstr ""
 
-#: mod/dfrn_request.php:696 mod/dfrn_request.php:713
-msgid "Confirm"
+#: mod/lostpass.php:113
+msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: mod/dfrn_request.php:708
-msgid "Hide this contact"
+#: mod/lostpass.php:114
+msgid "click here to login"
 msgstr ""
 
-#: mod/dfrn_request.php:711
-#, php-format
-msgid "Welcome home %s."
+#: mod/lostpass.php:115
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
 msgstr ""
 
-#: mod/dfrn_request.php:712
+#: mod/lostpass.php:125
 #, php-format
-msgid "Please confirm your introduction/connection request to %s."
+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/dfrn_request.php:843
+#: mod/lostpass.php:131
+#, php-format
 msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"communications networks:"
+"\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/dfrn_request.php:867
+#: mod/lostpass.php:147
 #, php-format
-msgid ""
-"If you are not yet a member of the free social web, <a href=\"%s/siteinfo"
-"\">follow this link to find a public Friendica site and join us today</a>."
+msgid "Your password has been changed at %s"
 msgstr ""
 
-#: mod/dfrn_request.php:872
-msgid "Friend/Connection Request"
+#: mod/lostpass.php:159
+msgid "Forgot your Password?"
 msgstr ""
 
-#: mod/dfrn_request.php:873
+#: mod/lostpass.php:160
 msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
 
-#: mod/dfrn_request.php:882
-msgid "StatusNet/Federated Social Web"
+#: mod/lostpass.php:162
+msgid "Reset"
 msgstr ""
 
-#: mod/dfrn_request.php:884
-#, php-format
+#: mod/maintenance.php:20
+msgid "System down for maintenance"
+msgstr ""
+
+#: mod/manage.php:141
+msgid "Manage Identities and/or Pages"
+msgstr ""
+
+#: mod/manage.php:142
 msgid ""
-" - please do not use this form.  Instead, enter %s into your Diaspora search "
-"bar."
+"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:140
-msgid "Friendica Communications Server - Setup"
+#: mod/manage.php:143
+msgid "Select an identity to manage: "
 msgstr ""
 
-#: mod/install.php:146
-msgid "Could not connect to database."
+#: mod/match.php:35
+msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: mod/install.php:150
-msgid "Could not create table."
+#: mod/match.php:88
+msgid "is interested in:"
 msgstr ""
 
-#: mod/install.php:156
-msgid "Your Friendica site database has been installed."
+#: mod/match.php:102
+msgid "Profile Match"
 msgstr ""
 
-#: mod/install.php:161
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
+#: mod/message.php:60 mod/wallmessage.php:50
+msgid "No recipient selected."
 msgstr ""
 
-#: mod/install.php:162 mod/install.php:234 mod/install.php:609
-msgid "Please see the file \"INSTALL.txt\"."
+#: mod/message.php:64
+msgid "Unable to locate contact information."
 msgstr ""
 
-#: mod/install.php:174
-msgid "Database already in use."
+#: mod/message.php:67 mod/wallmessage.php:56
+msgid "Message could not be sent."
 msgstr ""
 
-#: mod/install.php:231
-msgid "System check"
+#: mod/message.php:70 mod/wallmessage.php:59
+msgid "Message collection failure."
+msgstr ""
+
+#: mod/message.php:73 mod/wallmessage.php:62
+msgid "Message sent."
 msgstr ""
 
-#: mod/install.php:236
-msgid "Check again"
+#: mod/message.php:204
+msgid "Do you really want to delete this message?"
 msgstr ""
 
-#: mod/install.php:255
-msgid "Database connection"
+#: mod/message.php:224
+msgid "Message deleted."
 msgstr ""
 
-#: mod/install.php:256
-msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
+#: mod/message.php:255
+msgid "Conversation removed."
 msgstr ""
 
-#: mod/install.php:257
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+#: mod/message.php:322 mod/wallmessage.php:126
+msgid "Send Private Message"
 msgstr ""
 
-#: mod/install.php:258
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+#: mod/message.php:323 mod/message.php:510 mod/wallmessage.php:128
+msgid "To:"
 msgstr ""
 
-#: mod/install.php:262
-msgid "Database Server Name"
+#: mod/message.php:328 mod/message.php:512 mod/wallmessage.php:129
+msgid "Subject:"
 msgstr ""
 
-#: mod/install.php:263
-msgid "Database Login Name"
+#: mod/message.php:364
+msgid "No messages."
 msgstr ""
 
-#: mod/install.php:264
-msgid "Database Login Password"
+#: mod/message.php:403
+msgid "Message not available."
 msgstr ""
 
-#: mod/install.php:264
-msgid "For security reasons the password must not be empty"
+#: mod/message.php:477
+msgid "Delete message"
 msgstr ""
 
-#: mod/install.php:265
-msgid "Database Name"
+#: mod/message.php:503 mod/message.php:583
+msgid "Delete conversation"
 msgstr ""
 
-#: mod/install.php:266 mod/install.php:307
-msgid "Site administrator email address"
+#: mod/message.php:505
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
 msgstr ""
 
-#: mod/install.php:266 mod/install.php:307
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
+#: mod/message.php:509
+msgid "Send Reply"
 msgstr ""
 
-#: mod/install.php:270 mod/install.php:310
-msgid "Please select a default timezone for your website"
+#: mod/message.php:553
+#, php-format
+msgid "Unknown sender - %s"
 msgstr ""
 
-#: mod/install.php:297
-msgid "Site settings"
+#: mod/message.php:555
+#, php-format
+msgid "You and %s"
 msgstr ""
 
-#: mod/install.php:311
-msgid "System Language:"
+#: mod/message.php:557
+#, php-format
+msgid "%s and You"
 msgstr ""
 
-#: mod/install.php:311
-msgid ""
-"Set the default language for your Friendica installation interface and to "
-"send emails."
+#: mod/message.php:586
+msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: mod/install.php:351
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: mod/message.php:589
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mod/mood.php:134
+msgid "Mood"
 msgstr ""
 
-#: mod/install.php:352
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron. See <a href='https://"
-"github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-"
-"poller'>'Setup the poller'</a>"
+#: mod/mood.php:135
+msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: mod/install.php:356
-msgid "PHP executable path"
+#: mod/network.php:190 mod/search.php:25
+msgid "Remove term"
 msgstr ""
 
-#: mod/install.php:356
+#: mod/network.php:397
+#, php-format
 msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
-msgstr ""
+"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/install.php:361
-msgid "Command line PHP"
+#: mod/network.php:400
+msgid "Messages in this group won't be send to these receivers."
 msgstr ""
 
-#: mod/install.php:370
-msgid "PHP executable is not the php cli binary (could be cgi-fgci version)"
+#: mod/network.php:528
+msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: mod/install.php:371
-msgid "Found PHP version: "
+#: mod/network.php:533
+msgid "Invalid contact."
 msgstr ""
 
-#: mod/install.php:373
-msgid "PHP cli binary"
+#: mod/network.php:810
+msgid "Commented Order"
 msgstr ""
 
-#: mod/install.php:384
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: mod/network.php:813
+msgid "Sort by Comment Date"
 msgstr ""
 
-#: mod/install.php:385
-msgid "This is required for message delivery to work."
+#: mod/network.php:818
+msgid "Posted Order"
 msgstr ""
 
-#: mod/install.php:387
-msgid "PHP register_argc_argv"
+#: mod/network.php:821
+msgid "Sort by Post Date"
 msgstr ""
 
-#: mod/install.php:410
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: mod/network.php:832
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: mod/install.php:411
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: mod/network.php:840
+msgid "New"
 msgstr ""
 
-#: mod/install.php:413
-msgid "Generate encryption keys"
+#: mod/network.php:843
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: mod/install.php:420
-msgid "libCurl PHP module"
+#: mod/network.php:851
+msgid "Shared Links"
 msgstr ""
 
-#: mod/install.php:421
-msgid "GD graphics PHP module"
+#: mod/network.php:854
+msgid "Interesting Links"
 msgstr ""
 
-#: mod/install.php:422
-msgid "OpenSSL PHP module"
+#: mod/network.php:862
+msgid "Starred"
 msgstr ""
 
-#: mod/install.php:423
-msgid "mysqli PHP module"
+#: mod/network.php:865
+msgid "Favourite Posts"
 msgstr ""
 
-#: mod/install.php:424
-msgid "mb_string PHP module"
+#: mod/newmember.php:6
+msgid "Welcome to Friendica"
 msgstr ""
 
-#: mod/install.php:425
-msgid "mcrypt PHP module"
+#: mod/newmember.php:8
+msgid "New Member Checklist"
 msgstr ""
 
-#: mod/install.php:426
-msgid "XML PHP module"
+#: mod/newmember.php:12
+msgid ""
+"We would like to offer some tips and links to help make your experience "
+"enjoyable. Click any item to visit the relevant page. A link to this page "
+"will be visible from your home page for two weeks after your initial "
+"registration and then will quietly disappear."
 msgstr ""
 
-#: mod/install.php:427
-msgid "iconv module"
+#: mod/newmember.php:14
+msgid "Getting Started"
 msgstr ""
 
-#: mod/install.php:431 mod/install.php:433
-msgid "Apache mod_rewrite module"
+#: mod/newmember.php:18
+msgid "Friendica Walk-Through"
 msgstr ""
 
-#: mod/install.php:431
+#: mod/newmember.php:18
 msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+"On your <em>Quick Start</em> page - find a brief introduction to your "
+"profile and network tabs, make some new connections, and find some groups to "
+"join."
 msgstr ""
 
-#: mod/install.php:439
-msgid "Error: libCURL PHP module required but not installed."
+#: mod/newmember.php:26
+msgid "Go to Your Settings"
 msgstr ""
 
-#: mod/install.php:443
+#: mod/newmember.php:26
 msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+"On your <em>Settings</em> page -  change your initial password. Also make a "
+"note of your Identity Address. This looks just like an email address - and "
+"will be useful in making friends on the free social web."
 msgstr ""
 
-#: mod/install.php:447
-msgid "Error: openssl PHP module required but not installed."
+#: mod/newmember.php:28
+msgid ""
+"Review the other settings, particularly the privacy settings. An unpublished "
+"directory listing is like having an unlisted phone number. In general, you "
+"should probably publish your listing - unless all of your friends and "
+"potential friends know exactly how to find you."
 msgstr ""
 
-#: mod/install.php:451
-msgid "Error: mysqli PHP module required but not installed."
+#: mod/newmember.php:36 mod/profile_photo.php:256 mod/profiles.php:699
+msgid "Upload Profile Photo"
 msgstr ""
 
-#: mod/install.php:455
-msgid "Error: mb_string PHP module required but not installed."
+#: mod/newmember.php:36
+msgid ""
+"Upload a profile photo if you have not done so already. Studies have shown "
+"that people with real photos of themselves are ten times more likely to make "
+"friends than people who do not."
 msgstr ""
 
-#: mod/install.php:459
-msgid "Error: mcrypt PHP module required but not installed."
+#: mod/newmember.php:38
+msgid "Edit Your Profile"
 msgstr ""
 
-#: mod/install.php:463
-msgid "Error: iconv PHP module required but not installed."
+#: mod/newmember.php:38
+msgid ""
+"Edit your <strong>default</strong> profile to your liking. Review the "
+"settings for hiding your list of friends and hiding the profile from unknown "
+"visitors."
 msgstr ""
 
-#: mod/install.php:472
-msgid ""
-"If you are using php_cli, please make sure that mcrypt module is enabled in "
-"its config file"
+#: mod/newmember.php:40
+msgid "Profile Keywords"
 msgstr ""
 
-#: mod/install.php:475
+#: mod/newmember.php:40
 msgid ""
-"Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 "
-"encryption layer."
+"Set some public keywords for your default profile which describe your "
+"interests. We may be able to find other people with similar interests and "
+"suggest friendships."
 msgstr ""
 
-#: mod/install.php:477
-msgid "mcrypt_create_iv() function"
+#: mod/newmember.php:44
+msgid "Connecting"
 msgstr ""
 
-#: mod/install.php:485
-msgid "Error, XML PHP module required but not installed."
+#: mod/newmember.php:51
+msgid "Importing Emails"
 msgstr ""
 
-#: mod/install.php:500
+#: mod/newmember.php:51
 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."
+"Enter your email access information on your Connector Settings page if you "
+"wish to import and interact with friends or mailing lists from your email "
+"INBOX"
 msgstr ""
 
-#: mod/install.php:501
-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/newmember.php:53
+msgid "Go to Your Contacts Page"
 msgstr ""
 
-#: mod/install.php:502
+#: mod/newmember.php:53
 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."
+"Your Contacts page is your gateway to managing friendships and connecting "
+"with friends on other networks. Typically you enter their address or site "
+"URL in the <em>Add New Contact</em> dialog."
 msgstr ""
 
-#: mod/install.php:503
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"INSTALL.txt\" for instructions."
+#: mod/newmember.php:55
+msgid "Go to Your Site's Directory"
 msgstr ""
 
-#: mod/install.php:506
-msgid ".htconfig.php is writable"
+#: mod/newmember.php:55
+msgid ""
+"The Directory page lets you find other people in this network or other "
+"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
+"their profile page. Provide your own Identity Address if requested."
 msgstr ""
 
-#: mod/install.php:516
-msgid ""
-"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
+#: mod/newmember.php:57
+msgid "Finding New People"
 msgstr ""
 
-#: mod/install.php:517
+#: mod/newmember.php:57
 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."
+"On the side panel of the Contacts page are several tools to find new "
+"friends. We can match people by interest, look up people by name or "
+"interest, and provide suggestions based on network relationships. On a brand "
+"new site, friend suggestions will usually begin to be populated within 24 "
+"hours."
 msgstr ""
 
-#: mod/install.php:518
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
+#: mod/newmember.php:65
+msgid "Group Your Contacts"
 msgstr ""
 
-#: mod/install.php:519
+#: mod/newmember.php:65
 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."
+"Once you have made some friends, organize them into private conversation "
+"groups from the sidebar of your Contacts page and then you can interact with "
+"each group privately on your Network page."
 msgstr ""
 
-#: mod/install.php:522
-msgid "view/smarty3 is writable"
+#: mod/newmember.php:68
+msgid "Why Aren't My Posts Public?"
 msgstr ""
 
-#: mod/install.php:538
+#: mod/newmember.php:68
 msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
+"Friendica respects your privacy. By default, your posts will only show up to "
+"people you've added as friends. For more information, see the help section "
+"from the link above."
 msgstr ""
 
-#: mod/install.php:540
-msgid "Url rewrite is working"
+#: mod/newmember.php:73
+msgid "Getting Help"
 msgstr ""
 
-#: mod/install.php:559
-msgid "ImageMagick PHP extension is not installed"
+#: mod/newmember.php:77
+msgid "Go to the Help Section"
 msgstr ""
 
-#: mod/install.php:561
-msgid "ImageMagick PHP extension is installed"
+#: mod/newmember.php:77
+msgid ""
+"Our <strong>help</strong> pages may be consulted for detail on other program "
+"features and resources."
 msgstr ""
 
-#: mod/install.php:563
-msgid "ImageMagick supports GIF"
+#: mod/nogroup.php:65
+msgid "Contacts who are not members of a group"
 msgstr ""
 
-#: mod/install.php:570
-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/notifications.php:35
+msgid "Invalid request identifier."
 msgstr ""
 
-#: mod/install.php:607
-msgid "<h1>What next</h1>"
+#: mod/notifications.php:44 mod/notifications.php:180
+#: mod/notifications.php:258
+msgid "Discard"
 msgstr ""
 
-#: mod/install.php:608
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: mod/notifications.php:105
+msgid "Network Notifications"
 msgstr ""
 
-#: mod/profiles.php:38
-msgid "Profile deleted."
+#: mod/notifications.php:111 mod/notify.php:69
+msgid "System Notifications"
 msgstr ""
 
-#: mod/profiles.php:56 mod/profiles.php:90
-msgid "Profile-"
+#: mod/notifications.php:117
+msgid "Personal Notifications"
 msgstr ""
 
-#: mod/profiles.php:75 mod/profiles.php:118
-msgid "New profile created."
+#: mod/notifications.php:123
+msgid "Home Notifications"
 msgstr ""
 
-#: mod/profiles.php:96
-msgid "Profile unavailable to clone."
+#: mod/notifications.php:152
+msgid "Show Ignored Requests"
 msgstr ""
 
-#: mod/profiles.php:190
-msgid "Profile Name is required."
+#: mod/notifications.php:152
+msgid "Hide Ignored Requests"
 msgstr ""
 
-#: mod/profiles.php:338
-msgid "Marital Status"
+#: mod/notifications.php:164 mod/notifications.php:228
+msgid "Notification type: "
 msgstr ""
 
-#: mod/profiles.php:342
-msgid "Romantic Partner"
+#: mod/notifications.php:167
+#, php-format
+msgid "suggested by %s"
 msgstr ""
 
-#: mod/profiles.php:354
-msgid "Work/Employment"
+#: mod/notifications.php:173 mod/notifications.php:246
+msgid "Post a new friend activity"
 msgstr ""
 
-#: mod/profiles.php:357
-msgid "Religion"
+#: mod/notifications.php:173 mod/notifications.php:246
+msgid "if applicable"
 msgstr ""
 
-#: mod/profiles.php:361
-msgid "Political Views"
+#: mod/notifications.php:195
+msgid "Claims to be known to you: "
 msgstr ""
 
-#: mod/profiles.php:365
-msgid "Gender"
+#: mod/notifications.php:196
+msgid "yes"
 msgstr ""
 
-#: mod/profiles.php:369
-msgid "Sexual Preference"
+#: mod/notifications.php:196
+msgid "no"
 msgstr ""
 
-#: mod/profiles.php:373
-msgid "XMPP"
+#: mod/notifications.php:197 mod/notifications.php:202
+msgid "Shall your connection be bidirectional or not?"
 msgstr ""
 
-#: mod/profiles.php:377
-msgid "Homepage"
+#: mod/notifications.php:198 mod/notifications.php:203
+#, 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/profiles.php:381 mod/profiles.php:694
-msgid "Interests"
+#: mod/notifications.php:199
+#, php-format
+msgid ""
+"Accepting %s as a subscriber allows them to subscribe to your posts, but you "
+"will not receive updates from them in your news feed."
 msgstr ""
 
-#: mod/profiles.php:385
-msgid "Address"
+#: mod/notifications.php:204
+#, php-format
+msgid ""
+"Accepting %s as a sharer allows them to subscribe to your posts, but you "
+"will not receive updates from them in your news feed."
 msgstr ""
 
-#: mod/profiles.php:392 mod/profiles.php:690
-msgid "Location"
+#: mod/notifications.php:215
+msgid "Friend"
 msgstr ""
 
-#: mod/profiles.php:477
-msgid "Profile updated."
+#: mod/notifications.php:216
+msgid "Sharer"
 msgstr ""
 
-#: mod/profiles.php:565
-msgid " and "
+#: mod/notifications.php:216
+msgid "Subscriber"
 msgstr ""
 
-#: mod/profiles.php:573
-msgid "public profile"
+#: mod/notifications.php:266
+msgid "No introductions."
 msgstr ""
 
-#: mod/profiles.php:576
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+#: mod/notifications.php:307
+msgid "Show unread"
 msgstr ""
 
-#: mod/profiles.php:577
-#, php-format
-msgid " - Visit %1$s's %2$s"
+#: mod/notifications.php:307
+msgid "Show all"
 msgstr ""
 
-#: mod/profiles.php:580
+#: mod/notifications.php:313
 #, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr ""
-
-#: mod/profiles.php:637
-msgid "Hide contacts and friends:"
+msgid "No more %s notifications."
 msgstr ""
 
-#: mod/profiles.php:642
-msgid "Hide your contact/friend list from viewers of this profile?"
+#: mod/notify.php:65
+msgid "No more system notifications."
 msgstr ""
 
-#: mod/profiles.php:666
-msgid "Show more profile fields:"
+#: mod/oexchange.php:21
+msgid "Post successful."
 msgstr ""
 
-#: mod/profiles.php:678
-msgid "Profile Actions"
+#: mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
 msgstr ""
 
-#: mod/profiles.php:679
-msgid "Edit Profile Details"
+#: mod/openid.php:60
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: mod/profiles.php:681
-msgid "Change Profile Photo"
+#: mod/ostatus_subscribe.php:14
+msgid "Subscribing to OStatus contacts"
 msgstr ""
 
-#: mod/profiles.php:682
-msgid "View this profile"
+#: mod/ostatus_subscribe.php:25
+msgid "No contact provided."
 msgstr ""
 
-#: mod/profiles.php:684
-msgid "Create a new profile using these settings"
+#: mod/ostatus_subscribe.php:31
+msgid "Couldn't fetch information for contact."
 msgstr ""
 
-#: mod/profiles.php:685
-msgid "Clone this profile"
+#: mod/ostatus_subscribe.php:40
+msgid "Couldn't fetch friends for contact."
 msgstr ""
 
-#: mod/profiles.php:686
-msgid "Delete this profile"
+#: mod/ostatus_subscribe.php:54 mod/repair_ostatus.php:44
+msgid "Done"
 msgstr ""
 
-#: mod/profiles.php:688
-msgid "Basic information"
+#: mod/ostatus_subscribe.php:68
+msgid "success"
 msgstr ""
 
-#: mod/profiles.php:689
-msgid "Profile picture"
+#: mod/ostatus_subscribe.php:70
+msgid "failed"
 msgstr ""
 
-#: mod/profiles.php:691
-msgid "Preferences"
+#: mod/ostatus_subscribe.php:78 mod/repair_ostatus.php:50
+msgid "Keep this window open until done."
 msgstr ""
 
-#: mod/profiles.php:692
-msgid "Status information"
+#: mod/p.php:9
+msgid "Not Extended"
 msgstr ""
 
-#: mod/profiles.php:693
-msgid "Additional information"
+#: mod/photos.php:90 mod/photos.php:1876
+msgid "Recent Photos"
 msgstr ""
 
-#: mod/profiles.php:696
-msgid "Relation"
+#: mod/photos.php:93 mod/photos.php:1303 mod/photos.php:1878
+msgid "Upload New Photos"
 msgstr ""
 
-#: mod/profiles.php:700
-msgid "Your Gender:"
+#: mod/photos.php:107 mod/settings.php:36
+msgid "everybody"
 msgstr ""
 
-#: mod/profiles.php:701
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+#: mod/photos.php:171
+msgid "Contact information unavailable"
 msgstr ""
 
-#: mod/profiles.php:703
-msgid "Example: fishing photography software"
+#: mod/photos.php:192
+msgid "Album not found."
 msgstr ""
 
-#: mod/profiles.php:708
-msgid "Profile Name:"
+#: mod/photos.php:225 mod/photos.php:237 mod/photos.php:1247
+msgid "Delete Album"
 msgstr ""
 
-#: mod/profiles.php:710
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
+#: mod/photos.php:235
+msgid "Do you really want to delete this photo album and all its photos?"
 msgstr ""
 
-#: mod/profiles.php:711
-msgid "Your Full Name:"
+#: mod/photos.php:317 mod/photos.php:328 mod/photos.php:1563
+msgid "Delete Photo"
 msgstr ""
 
-#: mod/profiles.php:712
-msgid "Title/Description:"
+#: mod/photos.php:326
+msgid "Do you really want to delete this photo?"
 msgstr ""
 
-#: mod/profiles.php:715
-msgid "Street Address:"
+#: mod/photos.php:705
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: mod/profiles.php:716
-msgid "Locality/City:"
+#: mod/photos.php:705
+msgid "a photo"
 msgstr ""
 
-#: mod/profiles.php:717
-msgid "Region/State:"
+#: mod/photos.php:803 mod/profile_photo.php:156 mod/wall_upload.php:151
+#, php-format
+msgid "Image exceeds size limit of %s"
 msgstr ""
 
-#: mod/profiles.php:718
-msgid "Postal/Zip Code:"
+#: mod/photos.php:811
+msgid "Image file is empty."
 msgstr ""
 
-#: mod/profiles.php:719
-msgid "Country:"
+#: mod/photos.php:844 mod/profile_photo.php:165 mod/wall_upload.php:186
+msgid "Unable to process image."
 msgstr ""
 
-#: mod/profiles.php:723
-msgid "Who: (if applicable)"
+#: mod/photos.php:871 mod/profile_photo.php:315 mod/wall_upload.php:219
+msgid "Image upload failed."
 msgstr ""
 
-#: mod/profiles.php:723
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: mod/photos.php:974
+msgid "No photos selected"
 msgstr ""
 
-#: mod/profiles.php:724
-msgid "Since [date]:"
+#: mod/photos.php:1074 mod/videos.php:309
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: mod/profiles.php:726
-msgid "Tell us about yourself..."
+#: mod/photos.php:1134
+#, php-format
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: mod/profiles.php:727
-msgid "XMPP (Jabber) address:"
+#: mod/photos.php:1168
+msgid "Upload Photos"
 msgstr ""
 
-#: mod/profiles.php:727
-msgid ""
-"The XMPP address will be propagated to your contacts so that they can follow "
-"you."
+#: mod/photos.php:1172 mod/photos.php:1242
+msgid "New album name: "
 msgstr ""
 
-#: mod/profiles.php:728
-msgid "Homepage URL:"
+#: mod/photos.php:1173
+msgid "or existing album name: "
 msgstr ""
 
-#: mod/profiles.php:731
-msgid "Religious Views:"
+#: mod/photos.php:1174
+msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: mod/profiles.php:732
-msgid "Public Keywords:"
+#: mod/photos.php:1185 mod/photos.php:1567 mod/settings.php:1307
+msgid "Show to Groups"
 msgstr ""
 
-#: mod/profiles.php:732
-msgid "(Used for suggesting potential friends, can be seen by others)"
+#: mod/photos.php:1186 mod/photos.php:1568 mod/settings.php:1308
+msgid "Show to Contacts"
 msgstr ""
 
-#: mod/profiles.php:733
-msgid "Private Keywords:"
+#: mod/photos.php:1187
+msgid "Private Photo"
 msgstr ""
 
-#: mod/profiles.php:733
-msgid "(Used for searching profiles, never shown to others)"
+#: mod/photos.php:1188
+msgid "Public Photo"
 msgstr ""
 
-#: mod/profiles.php:736
-msgid "Musical interests"
+#: mod/photos.php:1254
+msgid "Edit Album"
 msgstr ""
 
-#: mod/profiles.php:737
-msgid "Books, literature"
+#: mod/photos.php:1260
+msgid "Show Newest First"
 msgstr ""
 
-#: mod/profiles.php:738
-msgid "Television"
+#: mod/photos.php:1262
+msgid "Show Oldest First"
 msgstr ""
 
-#: mod/profiles.php:739
-msgid "Film/dance/culture/entertainment"
+#: mod/photos.php:1289 mod/photos.php:1861
+msgid "View Photo"
 msgstr ""
 
-#: mod/profiles.php:740
-msgid "Hobbies/Interests"
+#: mod/photos.php:1335
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: mod/profiles.php:741
-msgid "Love/romance"
+#: mod/photos.php:1337
+msgid "Photo not available"
 msgstr ""
 
-#: mod/profiles.php:742
-msgid "Work/employment"
+#: mod/photos.php:1395
+msgid "View photo"
 msgstr ""
 
-#: mod/profiles.php:743
-msgid "School/education"
+#: mod/photos.php:1395
+msgid "Edit photo"
 msgstr ""
 
-#: mod/profiles.php:744
-msgid "Contact information and Social Networks"
+#: mod/photos.php:1396
+msgid "Use as profile photo"
 msgstr ""
 
-#: mod/profiles.php:788
-msgid "Edit/Manage Profiles"
+#: mod/photos.php:1421
+msgid "View Full Size"
 msgstr ""
 
-#: mod/display.php:479
-msgid "Item has been removed."
+#: mod/photos.php:1507
+msgid "Tags: "
 msgstr ""
 
-#: mod/admin.php:92
-msgid "Theme settings updated."
+#: mod/photos.php:1510
+msgid "[Remove any tag]"
 msgstr ""
 
-#: mod/admin.php:157 mod/admin.php:975
-msgid "Site"
+#: mod/photos.php:1549
+msgid "New album name"
 msgstr ""
 
-#: mod/admin.php:158 mod/admin.php:909 mod/admin.php:1425 mod/admin.php:1441
-msgid "Users"
+#: mod/photos.php:1550
+msgid "Caption"
 msgstr ""
 
-#: mod/admin.php:160 mod/admin.php:1813 mod/admin.php:1863
-msgid "Themes"
+#: mod/photos.php:1551
+msgid "Add a Tag"
 msgstr ""
 
-#: mod/admin.php:162
-msgid "DB updates"
+#: mod/photos.php:1551
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: mod/admin.php:163 mod/admin.php:407
-msgid "Inspect Queue"
+#: mod/photos.php:1552
+msgid "Do not rotate"
 msgstr ""
 
-#: mod/admin.php:164 mod/admin.php:373
-msgid "Federation Statistics"
+#: mod/photos.php:1553
+msgid "Rotate CW (right)"
 msgstr ""
 
-#: mod/admin.php:178 mod/admin.php:189 mod/admin.php:1937
-msgid "Logs"
+#: mod/photos.php:1554
+msgid "Rotate CCW (left)"
 msgstr ""
 
-#: mod/admin.php:179 mod/admin.php:2005
-msgid "View Logs"
+#: mod/photos.php:1569
+msgid "Private photo"
 msgstr ""
 
-#: mod/admin.php:180
-msgid "probe address"
+#: mod/photos.php:1570
+msgid "Public photo"
 msgstr ""
 
-#: mod/admin.php:181
-msgid "check webfinger"
+#: mod/photos.php:1792
+msgid "Map"
 msgstr ""
 
-#: mod/admin.php:188
-msgid "Plugin Features"
+#: mod/photos.php:1867 mod/videos.php:391
+msgid "View Album"
 msgstr ""
 
-#: mod/admin.php:190
-msgid "diagnostics"
+#: mod/ping.php:270
+msgid "{0} wants to be your friend"
 msgstr ""
 
-#: mod/admin.php:191
-msgid "User registrations waiting for confirmation"
+#: mod/ping.php:285
+msgid "{0} sent you a message"
 msgstr ""
 
-#: mod/admin.php:307
-msgid "unknown"
+#: mod/ping.php:300
+msgid "{0} requested registration"
 msgstr ""
 
-#: mod/admin.php:366
-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."
+#: mod/poke.php:196
+msgid "Poke/Prod"
 msgstr ""
 
-#: mod/admin.php:367
-msgid ""
-"The <em>Auto Discovered Contact Directory</em> feature is not enabled, it "
-"will improve the data displayed here."
+#: mod/poke.php:197
+msgid "poke, prod or do other things to somebody"
 msgstr ""
 
-#: mod/admin.php:372 mod/admin.php:406 mod/admin.php:485 mod/admin.php:974
-#: mod/admin.php:1424 mod/admin.php:1542 mod/admin.php:1605 mod/admin.php:1812
-#: mod/admin.php:1862 mod/admin.php:1936 mod/admin.php:2004
-msgid "Administration"
+#: mod/poke.php:198
+msgid "Recipient"
 msgstr ""
 
-#: mod/admin.php:379
-#, php-format
-msgid "Currently this node is aware of %d nodes from the following platforms:"
+#: mod/poke.php:199
+msgid "Choose what you wish to do to recipient"
 msgstr ""
 
-#: mod/admin.php:409
-msgid "ID"
+#: mod/poke.php:202
+msgid "Make this post private"
 msgstr ""
 
-#: mod/admin.php:410
-msgid "Recipient Name"
+#: mod/profile.php:174
+msgid "Tips for New Members"
 msgstr ""
 
-#: mod/admin.php:411
-msgid "Recipient Profile"
+#: mod/profile_photo.php:44
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: mod/admin.php:413
-msgid "Created"
+#: mod/profile_photo.php:77 mod/profile_photo.php:85 mod/profile_photo.php:93
+#: mod/profile_photo.php:323
+#, php-format
+msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: mod/admin.php:414
-msgid "Last Tried"
+#: mod/profile_photo.php:127
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
 
-#: mod/admin.php:415
-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."
+#: mod/profile_photo.php:137
+msgid "Unable to process image"
 msgstr ""
 
-#: mod/admin.php:440
-#, php-format
-msgid ""
-"Your DB still runs with MyISAM tables. You should change the engine type to "
-"InnoDB. As Friendica will use InnoDB only features in the future, you should "
-"change this! See <a href=\"%s\">here</a> for a guide that may be helpful "
-"converting the table engines. You may also use the <tt>convert_innodb.sql</"
-"tt> in the <tt>/util</tt> directory of your Friendica installation.<br />"
+#: mod/profile_photo.php:254
+msgid "Upload File:"
 msgstr ""
 
-#: mod/admin.php:445
-msgid ""
-"You are using a MySQL version which does not support all features that "
-"Friendica uses. You should consider switching to MariaDB."
+#: mod/profile_photo.php:255
+msgid "Select a profile:"
 msgstr ""
 
-#: mod/admin.php:449 mod/admin.php:1373
-msgid "Normal Account"
+#: mod/profile_photo.php:257
+msgid "Upload"
 msgstr ""
 
-#: mod/admin.php:450 mod/admin.php:1374
-msgid "Soapbox Account"
+#: mod/profile_photo.php:260
+msgid "or"
 msgstr ""
 
-#: mod/admin.php:451 mod/admin.php:1375
-msgid "Community/Celebrity Account"
+#: mod/profile_photo.php:260
+msgid "skip this step"
 msgstr ""
 
-#: mod/admin.php:452 mod/admin.php:1376
-msgid "Automatic Friend Account"
+#: mod/profile_photo.php:260
+msgid "select a photo from your photo albums"
 msgstr ""
 
-#: mod/admin.php:453
-msgid "Blog Account"
+#: mod/profile_photo.php:274
+msgid "Crop Image"
 msgstr ""
 
-#: mod/admin.php:454
-msgid "Private Forum"
+#: mod/profile_photo.php:275
+msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: mod/admin.php:480
-msgid "Message queues"
+#: mod/profile_photo.php:277
+msgid "Done Editing"
 msgstr ""
 
-#: mod/admin.php:486
-msgid "Summary"
+#: mod/profile_photo.php:313
+msgid "Image uploaded successfully."
 msgstr ""
 
-#: mod/admin.php:489
-msgid "Registered users"
+#: mod/profiles.php:38
+msgid "Profile deleted."
 msgstr ""
 
-#: mod/admin.php:491
-msgid "Pending registrations"
+#: mod/profiles.php:56 mod/profiles.php:90
+msgid "Profile-"
 msgstr ""
 
-#: mod/admin.php:492
-msgid "Version"
+#: mod/profiles.php:75 mod/profiles.php:118
+msgid "New profile created."
 msgstr ""
 
-#: mod/admin.php:497
-msgid "Active plugins"
+#: mod/profiles.php:96
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: mod/admin.php:522
-msgid "Can not parse base url. Must have at least <scheme>://<domain>"
+#: mod/profiles.php:190
+msgid "Profile Name is required."
 msgstr ""
 
-#: mod/admin.php:827
-msgid "RINO2 needs mcrypt php extension to work."
+#: mod/profiles.php:338
+msgid "Marital Status"
 msgstr ""
 
-#: mod/admin.php:835
-msgid "Site settings updated."
+#: mod/profiles.php:342
+msgid "Romantic Partner"
 msgstr ""
 
-#: mod/admin.php:892
-msgid "No community page"
+#: mod/profiles.php:354
+msgid "Work/Employment"
 msgstr ""
 
-#: mod/admin.php:893
-msgid "Public postings from users of this site"
+#: mod/profiles.php:357
+msgid "Religion"
 msgstr ""
 
-#: mod/admin.php:894
-msgid "Global community page"
+#: mod/profiles.php:361
+msgid "Political Views"
 msgstr ""
 
-#: mod/admin.php:900
-msgid "At post arrival"
+#: mod/profiles.php:365
+msgid "Gender"
 msgstr ""
 
-#: mod/admin.php:910
-msgid "Users, Global Contacts"
+#: mod/profiles.php:369
+msgid "Sexual Preference"
 msgstr ""
 
-#: mod/admin.php:911
-msgid "Users, Global Contacts/fallback"
+#: mod/profiles.php:373
+msgid "XMPP"
 msgstr ""
 
-#: mod/admin.php:915
-msgid "One month"
+#: mod/profiles.php:377
+msgid "Homepage"
 msgstr ""
 
-#: mod/admin.php:916
-msgid "Three months"
+#: mod/profiles.php:381 mod/profiles.php:694
+msgid "Interests"
 msgstr ""
 
-#: mod/admin.php:917
-msgid "Half a year"
+#: mod/profiles.php:385
+msgid "Address"
 msgstr ""
 
-#: mod/admin.php:918
-msgid "One year"
+#: mod/profiles.php:392 mod/profiles.php:690
+msgid "Location"
 msgstr ""
 
-#: mod/admin.php:923
-msgid "Multi user instance"
+#: mod/profiles.php:477
+msgid "Profile updated."
 msgstr ""
 
-#: mod/admin.php:946
-msgid "Closed"
+#: mod/profiles.php:565
+msgid " and "
 msgstr ""
 
-#: mod/admin.php:947
-msgid "Requires approval"
+#: mod/profiles.php:573
+msgid "public profile"
 msgstr ""
 
-#: mod/admin.php:948
-msgid "Open"
+#: mod/profiles.php:576
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: mod/admin.php:952
-msgid "No SSL policy, links will track page SSL state"
+#: mod/profiles.php:577
+#, php-format
+msgid " - Visit %1$s's %2$s"
 msgstr ""
 
-#: mod/admin.php:953
-msgid "Force all links to use SSL"
+#: mod/profiles.php:580
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: mod/admin.php:954
-msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+#: mod/profiles.php:637
+msgid "Hide contacts and friends:"
 msgstr ""
 
-#: mod/admin.php:978
-msgid "File upload"
+#: mod/profiles.php:642
+msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: mod/admin.php:979
-msgid "Policies"
+#: mod/profiles.php:666
+msgid "Show more profile fields:"
 msgstr ""
 
-#: mod/admin.php:981
-msgid "Auto Discovered Contact Directory"
+#: mod/profiles.php:678
+msgid "Profile Actions"
 msgstr ""
 
-#: mod/admin.php:982
-msgid "Performance"
+#: mod/profiles.php:679
+msgid "Edit Profile Details"
 msgstr ""
 
-#: mod/admin.php:983
-msgid "Worker"
+#: mod/profiles.php:681
+msgid "Change Profile Photo"
 msgstr ""
 
-#: mod/admin.php:984
-msgid ""
-"Relocate - WARNING: advanced function. Could make this server unreachable."
+#: mod/profiles.php:682
+msgid "View this profile"
 msgstr ""
 
-#: mod/admin.php:987
-msgid "Site name"
+#: mod/profiles.php:684
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: mod/admin.php:988
-msgid "Host name"
+#: mod/profiles.php:685
+msgid "Clone this profile"
 msgstr ""
 
-#: mod/admin.php:989
-msgid "Sender Email"
+#: mod/profiles.php:686
+msgid "Delete this profile"
 msgstr ""
 
-#: mod/admin.php:989
-msgid ""
-"The email address your server shall use to send notification emails from."
+#: mod/profiles.php:688
+msgid "Basic information"
 msgstr ""
 
-#: mod/admin.php:990
-msgid "Banner/Logo"
+#: mod/profiles.php:689
+msgid "Profile picture"
 msgstr ""
 
-#: mod/admin.php:991
-msgid "Shortcut icon"
+#: mod/profiles.php:691
+msgid "Preferences"
 msgstr ""
 
-#: mod/admin.php:991
-msgid "Link to an icon that will be used for browsers."
+#: mod/profiles.php:692
+msgid "Status information"
 msgstr ""
 
-#: mod/admin.php:992
-msgid "Touch icon"
+#: mod/profiles.php:693
+msgid "Additional information"
 msgstr ""
 
-#: mod/admin.php:992
-msgid "Link to an icon that will be used for tablets and mobiles."
+#: mod/profiles.php:696
+msgid "Relation"
 msgstr ""
 
-#: mod/admin.php:993
-msgid "Additional Info"
+#: mod/profiles.php:700
+msgid "Your Gender:"
 msgstr ""
 
-#: mod/admin.php:993
-#, php-format
-msgid ""
-"For public servers: you can add additional information here that will be "
-"listed at %s/siteinfo."
+#: mod/profiles.php:701
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: mod/admin.php:994
-msgid "System language"
+#: mod/profiles.php:703
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: mod/admin.php:995
-msgid "System theme"
+#: mod/profiles.php:708
+msgid "Profile Name:"
 msgstr ""
 
-#: mod/admin.php:995
+#: mod/profiles.php:710
 msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
 msgstr ""
 
-#: mod/admin.php:996
-msgid "Mobile system theme"
+#: mod/profiles.php:711
+msgid "Your Full Name:"
 msgstr ""
 
-#: mod/admin.php:996
-msgid "Theme for mobile devices"
+#: mod/profiles.php:712
+msgid "Title/Description:"
 msgstr ""
 
-#: mod/admin.php:997
-msgid "SSL link policy"
+#: mod/profiles.php:715
+msgid "Street Address:"
 msgstr ""
 
-#: mod/admin.php:997
-msgid "Determines whether generated links should be forced to use SSL"
+#: mod/profiles.php:716
+msgid "Locality/City:"
 msgstr ""
 
-#: mod/admin.php:998
-msgid "Force SSL"
+#: mod/profiles.php:717
+msgid "Region/State:"
 msgstr ""
 
-#: mod/admin.php:998
-msgid ""
-"Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
-"to endless loops."
+#: mod/profiles.php:718
+msgid "Postal/Zip Code:"
 msgstr ""
 
-#: mod/admin.php:999
-msgid "Old style 'Share'"
+#: mod/profiles.php:719
+msgid "Country:"
 msgstr ""
 
-#: mod/admin.php:999
-msgid "Deactivates the bbcode element 'share' for repeating items."
+#: mod/profiles.php:723
+msgid "Who: (if applicable)"
 msgstr ""
 
-#: mod/admin.php:1000
-msgid "Hide help entry from navigation menu"
+#: mod/profiles.php:723
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: mod/admin.php:1000
-msgid ""
-"Hides the menu entry for the Help pages from the navigation menu. You can "
-"still access it calling /help directly."
+#: mod/profiles.php:724
+msgid "Since [date]:"
 msgstr ""
 
-#: mod/admin.php:1001
-msgid "Single user instance"
+#: mod/profiles.php:726
+msgid "Tell us about yourself..."
 msgstr ""
 
-#: mod/admin.php:1001
-msgid "Make this instance multi-user or single-user for the named user"
+#: mod/profiles.php:727
+msgid "XMPP (Jabber) address:"
 msgstr ""
 
-#: mod/admin.php:1002
-msgid "Maximum image size"
+#: mod/profiles.php:727
+msgid ""
+"The XMPP address will be propagated to your contacts so that they can follow "
+"you."
 msgstr ""
 
-#: mod/admin.php:1002
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
+#: mod/profiles.php:728
+msgid "Homepage URL:"
 msgstr ""
 
-#: mod/admin.php:1003
-msgid "Maximum image length"
+#: mod/profiles.php:731
+msgid "Religious Views:"
 msgstr ""
 
-#: mod/admin.php:1003
-msgid ""
-"Maximum length in pixels of the longest side of uploaded images. Default is "
-"-1, which means no limits."
+#: mod/profiles.php:732
+msgid "Public Keywords:"
 msgstr ""
 
-#: mod/admin.php:1004
-msgid "JPEG image quality"
+#: mod/profiles.php:732
+msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: mod/admin.php:1004
-msgid ""
-"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
-"100, which is full quality."
+#: mod/profiles.php:733
+msgid "Private Keywords:"
 msgstr ""
 
-#: mod/admin.php:1006
-msgid "Register policy"
+#: mod/profiles.php:733
+msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: mod/admin.php:1007
-msgid "Maximum Daily Registrations"
+#: mod/profiles.php:736
+msgid "Musical interests"
 msgstr ""
 
-#: mod/admin.php:1007
-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/profiles.php:737
+msgid "Books, literature"
 msgstr ""
 
-#: mod/admin.php:1008
-msgid "Register text"
+#: mod/profiles.php:738
+msgid "Television"
 msgstr ""
 
-#: mod/admin.php:1008
-msgid "Will be displayed prominently on the registration page."
+#: mod/profiles.php:739
+msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: mod/admin.php:1009
-msgid "Accounts abandoned after x days"
+#: mod/profiles.php:740
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: mod/admin.php:1009
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
+#: mod/profiles.php:741
+msgid "Love/romance"
 msgstr ""
 
-#: mod/admin.php:1010
-msgid "Allowed friend domains"
+#: mod/profiles.php:742
+msgid "Work/employment"
 msgstr ""
 
-#: mod/admin.php:1010
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
+#: mod/profiles.php:743
+msgid "School/education"
 msgstr ""
 
-#: mod/admin.php:1011
-msgid "Allowed email domains"
+#: mod/profiles.php:744
+msgid "Contact information and Social Networks"
 msgstr ""
 
-#: mod/admin.php:1011
-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/profiles.php:788
+msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: mod/admin.php:1012
-msgid "Block public"
+#: mod/profperm.php:26 mod/profperm.php:57
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: mod/admin.php:1012
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently logged in."
+#: mod/profperm.php:103
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: mod/admin.php:1013
-msgid "Force publish"
+#: mod/profperm.php:116
+msgid "Visible To"
 msgstr ""
 
-#: mod/admin.php:1013
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
+#: mod/profperm.php:132
+msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: mod/admin.php:1014
-msgid "Global directory URL"
+#: mod/register.php:93
+msgid ""
+"Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: mod/admin.php:1014
+#: mod/register.php:98
+#, php-format
 msgid ""
-"URL to the global directory. If this is not set, the global directory is "
-"completely unavailable to the application."
+"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/admin.php:1015
-msgid "Allow threaded items"
+#: mod/register.php:105
+msgid "Registration successful."
 msgstr ""
 
-#: mod/admin.php:1015
-msgid "Allow infinite level threading for items on this site."
+#: mod/register.php:111
+msgid "Your registration can not be processed."
 msgstr ""
 
-#: mod/admin.php:1016
-msgid "Private posts by default for new users"
+#: mod/register.php:160
+msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: mod/admin.php:1016
+#: mod/register.php:198 mod/uimport.php:51
 msgid ""
-"Set default post permissions for all new members to the default privacy "
-"group rather than public."
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
 msgstr ""
 
-#: mod/admin.php:1017
-msgid "Don't include post content in email notifications"
+#: mod/register.php:226
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
 msgstr ""
 
-#: mod/admin.php:1017
+#: mod/register.php:227
 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."
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
 msgstr ""
 
-#: mod/admin.php:1018
-msgid "Disallow public access to addons listed in the apps menu."
+#: mod/register.php:228
+msgid "Your OpenID (optional): "
 msgstr ""
 
-#: mod/admin.php:1018
-msgid ""
-"Checking this box will restrict addons listed in the apps menu to members "
-"only."
+#: mod/register.php:242
+msgid "Include your profile in member directory?"
 msgstr ""
 
-#: mod/admin.php:1019
-msgid "Don't embed private images in posts"
+#: mod/register.php:267
+msgid "Note for the admin"
 msgstr ""
 
-#: mod/admin.php:1019
-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/register.php:267
+msgid "Leave a message for the admin, why you want to join this node"
 msgstr ""
 
-#: mod/admin.php:1020
-msgid "Allow Users to set remote_self"
+#: mod/register.php:268
+msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: mod/admin.php:1020
-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/register.php:269
+msgid "Your invitation ID: "
 msgstr ""
 
-#: mod/admin.php:1021
-msgid "Block multiple registrations"
+#: mod/register.php:280
+msgid "Your Full Name (e.g. Joe Smith, real or real-looking): "
 msgstr ""
 
-#: mod/admin.php:1021
-msgid "Disallow users to register additional accounts for use as pages."
+#: mod/register.php:281
+msgid "Your Email Address: "
 msgstr ""
 
-#: mod/admin.php:1022
-msgid "OpenID support"
+#: mod/register.php:283 mod/settings.php:1278
+msgid "New Password:"
 msgstr ""
 
-#: mod/admin.php:1022
-msgid "OpenID support for registration and logins."
+#: mod/register.php:283
+msgid "Leave empty for an auto generated password."
 msgstr ""
 
-#: mod/admin.php:1023
-msgid "Fullname check"
+#: mod/register.php:284 mod/settings.php:1279
+msgid "Confirm:"
 msgstr ""
 
-#: mod/admin.php:1023
+#: mod/register.php:285
 msgid ""
-"Force users to register with a space between firstname and lastname in Full "
-"name, as an antispam measure"
+"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/admin.php:1024
-msgid "UTF-8 Regular expressions"
+#: mod/register.php:286
+msgid "Choose a nickname: "
 msgstr ""
 
-#: mod/admin.php:1024
-msgid "Use PHP UTF8 regular expressions"
+#: mod/register.php:295 mod/uimport.php:66
+msgid "Import"
 msgstr ""
 
-#: mod/admin.php:1025
-msgid "Community Page Style"
+#: mod/register.php:296
+msgid "Import your profile to this friendica instance"
 msgstr ""
 
-#: mod/admin.php:1025
-msgid ""
-"Type of community page to show. 'Global community' shows every public "
-"posting from an open distributed network that arrived on this server."
+#: mod/regmod.php:58
+msgid "Account approved."
 msgstr ""
 
-#: mod/admin.php:1026
-msgid "Posts per user on community page"
+#: mod/regmod.php:95
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: mod/admin.php:1026
-msgid ""
-"The maximum number of posts per user on the community page. (Not valid for "
-"'Global Community')"
+#: mod/regmod.php:107
+msgid "Please login."
 msgstr ""
 
-#: mod/admin.php:1027
-msgid "Enable OStatus support"
+#: mod/removeme.php:52 mod/removeme.php:55
+msgid "Remove My Account"
 msgstr ""
 
-#: mod/admin.php:1027
+#: mod/removeme.php:53
 msgid ""
-"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
-"communications in OStatus are public, so privacy warnings will be "
-"occasionally displayed."
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
 msgstr ""
 
-#: mod/admin.php:1028
-msgid "OStatus conversation completion interval"
+#: mod/removeme.php:54
+msgid "Please enter your password for verification:"
 msgstr ""
 
-#: mod/admin.php:1028
-msgid ""
-"How often shall the poller check for new entries in OStatus conversations? "
-"This can be a very ressource task."
+#: mod/repair_ostatus.php:14
+msgid "Resubscribing to OStatus contacts"
 msgstr ""
 
-#: mod/admin.php:1029
-msgid "Only import OStatus threads from our contacts"
+#: mod/repair_ostatus.php:30
+msgid "Error"
 msgstr ""
 
-#: mod/admin.php:1029
-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/search.php:100
+msgid "Only logged in users are permitted to perform a search."
 msgstr ""
-
-#: mod/admin.php:1030
-msgid "OStatus support can only be enabled if threading is enabled."
+
+#: mod/search.php:124
+msgid "Too Many Requests"
 msgstr ""
 
-#: mod/admin.php:1032
-msgid ""
-"Diaspora support can't be enabled because Friendica was installed into a sub "
-"directory."
+#: mod/search.php:125
+msgid "Only one search per minute is permitted for not logged in users."
 msgstr ""
 
-#: mod/admin.php:1033
-msgid "Enable Diaspora support"
+#: mod/search.php:230
+#, php-format
+msgid "Items tagged with: %s"
 msgstr ""
 
-#: mod/admin.php:1033
-msgid "Provide built-in Diaspora network compatibility."
+#: mod/settings.php:60
+msgid "Display"
 msgstr ""
 
-#: mod/admin.php:1034
-msgid "Only allow Friendica contacts"
+#: mod/settings.php:67 mod/settings.php:890
+msgid "Social Networks"
 msgstr ""
 
-#: mod/admin.php:1034
-msgid ""
-"All contacts must use Friendica protocols. All other built-in communication "
-"protocols disabled."
+#: mod/settings.php:88
+msgid "Connected apps"
 msgstr ""
 
-#: mod/admin.php:1035
-msgid "Verify SSL"
+#: mod/settings.php:95 mod/uexport.php:45
+msgid "Export personal data"
 msgstr ""
 
-#: mod/admin.php:1035
-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/settings.php:102
+msgid "Remove account"
 msgstr ""
 
-#: mod/admin.php:1036
-msgid "Proxy user"
+#: mod/settings.php:157
+msgid "Missing some important data!"
 msgstr ""
 
-#: mod/admin.php:1037
-msgid "Proxy URL"
+#: mod/settings.php:271
+msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: mod/admin.php:1038
-msgid "Network timeout"
+#: mod/settings.php:276
+msgid "Email settings updated."
 msgstr ""
 
-#: mod/admin.php:1038
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+#: mod/settings.php:291
+msgid "Features updated"
 msgstr ""
 
-#: mod/admin.php:1039
-msgid "Delivery interval"
+#: mod/settings.php:361
+msgid "Relocate message has been send to your contacts"
 msgstr ""
 
-#: mod/admin.php:1039
-msgid ""
-"Delay background delivery processes by this many seconds to reduce system "
-"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
-"for large dedicated servers."
+#: mod/settings.php:380
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: mod/admin.php:1040
-msgid "Poll interval"
+#: mod/settings.php:388
+msgid "Wrong password."
 msgstr ""
 
-#: mod/admin.php:1040
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
+#: mod/settings.php:399
+msgid "Password changed."
 msgstr ""
 
-#: mod/admin.php:1041
-msgid "Maximum Load Average"
+#: mod/settings.php:401
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: mod/admin.php:1041
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
+#: mod/settings.php:481
+msgid " Please use a shorter name."
 msgstr ""
 
-#: mod/admin.php:1042
-msgid "Maximum Load Average (Frontend)"
+#: mod/settings.php:483
+msgid " Name too short."
 msgstr ""
 
-#: mod/admin.php:1042
-msgid "Maximum system load before the frontend quits service - default 50."
+#: mod/settings.php:492
+msgid "Wrong Password"
 msgstr ""
 
-#: mod/admin.php:1043
-msgid "Maximum table size for optimization"
+#: mod/settings.php:497
+msgid " Not valid email."
 msgstr ""
 
-#: mod/admin.php:1043
-msgid ""
-"Maximum table size (in MB) for the automatic optimization - default 100 MB. "
-"Enter -1 to disable it."
+#: mod/settings.php:503
+msgid " Cannot change to that email."
 msgstr ""
 
-#: mod/admin.php:1044
-msgid "Minimum level of fragmentation"
+#: mod/settings.php:559
+msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: mod/admin.php:1044
-msgid ""
-"Minimum fragmenation level to start the automatic optimization - default "
-"value is 30%."
+#: mod/settings.php:563
+msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: mod/admin.php:1046
-msgid "Periodical check of global contacts"
+#: mod/settings.php:603
+msgid "Settings updated."
 msgstr ""
 
-#: mod/admin.php:1046
-msgid ""
-"If enabled, the global contacts are checked periodically for missing or "
-"outdated data and the vitality of the contacts and servers."
+#: mod/settings.php:680 mod/settings.php:706 mod/settings.php:742
+msgid "Add application"
 msgstr ""
 
-#: mod/admin.php:1047
-msgid "Days between requery"
+#: mod/settings.php:684 mod/settings.php:710
+msgid "Consumer Key"
 msgstr ""
 
-#: mod/admin.php:1047
-msgid "Number of days after which a server is requeried for his contacts."
+#: mod/settings.php:685 mod/settings.php:711
+msgid "Consumer Secret"
 msgstr ""
 
-#: mod/admin.php:1048
-msgid "Discover contacts from other servers"
+#: mod/settings.php:686 mod/settings.php:712
+msgid "Redirect"
 msgstr ""
 
-#: mod/admin.php:1048
-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/settings.php:687 mod/settings.php:713
+msgid "Icon url"
 msgstr ""
 
-#: mod/admin.php:1049
-msgid "Timeframe for fetching global contacts"
+#: mod/settings.php:698
+msgid "You can't edit this application."
 msgstr ""
 
-#: mod/admin.php:1049
-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/settings.php:741
+msgid "Connected Apps"
 msgstr ""
 
-#: mod/admin.php:1050
-msgid "Search the local directory"
+#: mod/settings.php:745
+msgid "Client key starts with"
 msgstr ""
 
-#: mod/admin.php:1050
-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/settings.php:746
+msgid "No name"
 msgstr ""
 
-#: mod/admin.php:1052
-msgid "Publish server information"
+#: mod/settings.php:747
+msgid "Remove authorization"
 msgstr ""
 
-#: mod/admin.php:1052
-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/settings.php:759
+msgid "No Plugin settings configured"
 msgstr ""
 
-#: mod/admin.php:1054
-msgid "Use MySQL full text engine"
+#: mod/settings.php:768
+msgid "Plugin Settings"
 msgstr ""
 
-#: mod/admin.php:1054
-msgid ""
-"Activates the full text engine. Speeds up search - but can only search for "
-"four and more characters."
+#: mod/settings.php:790
+msgid "Additional Features"
 msgstr ""
 
-#: mod/admin.php:1055
-msgid "Suppress Language"
+#: mod/settings.php:800 mod/settings.php:804
+msgid "General Social Media Settings"
 msgstr ""
 
-#: mod/admin.php:1055
-msgid "Suppress language information in meta information about a posting."
+#: mod/settings.php:810
+msgid "Disable intelligent shortening"
 msgstr ""
 
-#: mod/admin.php:1056
-msgid "Suppress Tags"
+#: mod/settings.php:812
+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/admin.php:1056
-msgid "Suppress showing a list of hashtags at the end of the posting."
+#: mod/settings.php:818
+msgid "Automatically follow any GNU Social (OStatus) followers/mentioners"
 msgstr ""
 
-#: mod/admin.php:1057
-msgid "Path to item cache"
+#: mod/settings.php:820
+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/admin.php:1057
-msgid "The item caches buffers generated bbcode and external images."
+#: mod/settings.php:826
+msgid "Default group for OStatus contacts"
 msgstr ""
 
-#: mod/admin.php:1058
-msgid "Cache duration in seconds"
+#: mod/settings.php:834
+msgid "Your legacy GNU Social account"
 msgstr ""
 
-#: mod/admin.php:1058
+#: mod/settings.php:836
 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."
+"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/admin.php:1059
-msgid "Maximum numbers of comments per post"
+#: mod/settings.php:839
+msgid "Repair OStatus subscriptions"
 msgstr ""
 
-#: mod/admin.php:1059
-msgid "How much comments should be shown for each post? Default value is 100."
+#: mod/settings.php:848 mod/settings.php:849
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: mod/admin.php:1060
-msgid "Path for lock file"
+#: mod/settings.php:848 mod/settings.php:849
+msgid "enabled"
 msgstr ""
 
-#: mod/admin.php:1060
-msgid ""
-"The lock file is used to avoid multiple pollers at one time. Only define a "
-"folder here."
+#: mod/settings.php:848 mod/settings.php:849
+msgid "disabled"
 msgstr ""
 
-#: mod/admin.php:1061
-msgid "Temp path"
+#: mod/settings.php:849
+msgid "GNU Social (OStatus)"
 msgstr ""
 
-#: mod/admin.php:1061
-msgid ""
-"If you have a restricted system where the webserver can't access the system "
-"temp path, enter another path here."
+#: mod/settings.php:883
+msgid "Email access is disabled on this site."
 msgstr ""
 
-#: mod/admin.php:1062
-msgid "Base path to installation"
+#: mod/settings.php:895
+msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: mod/admin.php:1062
+#: mod/settings.php:896
 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."
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: mod/admin.php:1063
-msgid "Disable picture proxy"
+#: mod/settings.php:897
+msgid "Last successful email check:"
 msgstr ""
 
-#: mod/admin.php:1063
-msgid ""
-"The picture proxy increases performance and privacy. It shouldn't be used on "
-"systems with very low bandwith."
+#: mod/settings.php:899
+msgid "IMAP server name:"
+msgstr ""
+
+#: mod/settings.php:900
+msgid "IMAP port:"
 msgstr ""
 
-#: mod/admin.php:1064
-msgid "Enable old style pager"
+#: mod/settings.php:901
+msgid "Security:"
 msgstr ""
 
-#: mod/admin.php:1064
-msgid ""
-"The old style pager has page numbers but slows down massively the page speed."
+#: mod/settings.php:901 mod/settings.php:906
+msgid "None"
 msgstr ""
 
-#: mod/admin.php:1065
-msgid "Only search in tags"
+#: mod/settings.php:902
+msgid "Email login name:"
 msgstr ""
 
-#: mod/admin.php:1065
-msgid "On large systems the text search can slow down the system extremely."
+#: mod/settings.php:903
+msgid "Email password:"
 msgstr ""
 
-#: mod/admin.php:1067
-msgid "New base url"
+#: mod/settings.php:904
+msgid "Reply-to address:"
 msgstr ""
 
-#: mod/admin.php:1067
-msgid ""
-"Change base url for this server. Sends relocate message to all DFRN contacts "
-"of all users."
+#: mod/settings.php:905
+msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: mod/admin.php:1069
-msgid "RINO Encryption"
+#: mod/settings.php:906
+msgid "Action after import:"
 msgstr ""
 
-#: mod/admin.php:1069
-msgid "Encryption layer between nodes."
+#: mod/settings.php:906
+msgid "Move to folder"
 msgstr ""
 
-#: mod/admin.php:1070
-msgid "Embedly API key"
+#: mod/settings.php:907
+msgid "Move to folder:"
 msgstr ""
 
-#: mod/admin.php:1070
-msgid ""
-"<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for "
-"web pages. This is an optional parameter."
+#: mod/settings.php:1003
+msgid "Display Settings"
 msgstr ""
 
-#: mod/admin.php:1072
-msgid "Enable 'worker' background processing"
+#: mod/settings.php:1009 mod/settings.php:1032
+msgid "Display Theme:"
 msgstr ""
 
-#: mod/admin.php:1072
-msgid ""
-"The worker background processing limits the number of parallel background "
-"jobs to a maximum number and respects the system load."
+#: mod/settings.php:1010
+msgid "Mobile Theme:"
 msgstr ""
 
-#: mod/admin.php:1073
-msgid "Maximum number of parallel workers"
+#: mod/settings.php:1011
+msgid "Suppress warning of insecure networks"
 msgstr ""
 
-#: mod/admin.php:1073
+#: mod/settings.php:1011
 msgid ""
-"On shared hosters set this to 2. On larger systems, values of 10 are great. "
-"Default value is 4."
+"Should the system suppress the warning that the current group contains "
+"members of networks that can't receive non public postings."
 msgstr ""
 
-#: mod/admin.php:1074
-msgid "Don't use 'proc_open' with the worker"
+#: mod/settings.php:1012
+msgid "Update browser every xx seconds"
 msgstr ""
 
-#: mod/admin.php:1074
-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/settings.php:1012
+msgid "Minimum of 10 seconds. Enter -1 to disable it."
 msgstr ""
 
-#: mod/admin.php:1075
-msgid "Enable fastlane"
+#: mod/settings.php:1013
+msgid "Number of items to display per page:"
 msgstr ""
 
-#: mod/admin.php:1075
-msgid ""
-"When enabed, the fastlane mechanism starts an additional worker if processes "
-"with higher priority are blocked by processes of lower priority."
+#: mod/settings.php:1013 mod/settings.php:1014
+msgid "Maximum of 100 items"
 msgstr ""
 
-#: mod/admin.php:1076
-msgid "Enable frontend worker"
+#: mod/settings.php:1014
+msgid "Number of items to display per page when viewed from mobile device:"
 msgstr ""
 
-#: mod/admin.php:1076
-msgid ""
-"When enabled the Worker process is triggered when backend access is "
-"performed (e.g. messages being delivered). On smaller sites you might want "
-"to call yourdomain.tld/worker on a regular basis via an external cron job. "
-"You should only enable this option if you cannot utilize cron/scheduled jobs "
-"on your server. The worker background process needs to be activated for this."
+#: mod/settings.php:1015
+msgid "Don't show emoticons"
 msgstr ""
 
-#: mod/admin.php:1105
-msgid "Update has been marked successful"
+#: mod/settings.php:1016
+msgid "Calendar"
 msgstr ""
 
-#: mod/admin.php:1113
-#, php-format
-msgid "Database structure update %s was successfully applied."
+#: mod/settings.php:1017
+msgid "Beginning of week:"
 msgstr ""
 
-#: mod/admin.php:1116
-#, php-format
-msgid "Executing of database structure update %s failed with error: %s"
+#: mod/settings.php:1018
+msgid "Don't show notices"
 msgstr ""
 
-#: mod/admin.php:1128
-#, php-format
-msgid "Executing %s failed with error: %s"
+#: mod/settings.php:1019
+msgid "Infinite scroll"
 msgstr ""
 
-#: mod/admin.php:1131
-#, php-format
-msgid "Update %s was successfully applied."
+#: mod/settings.php:1020
+msgid "Automatic updates only at the top of the network page"
 msgstr ""
 
-#: mod/admin.php:1135
-#, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
+#: mod/settings.php:1021
+msgid "Bandwith Saver Mode"
 msgstr ""
 
-#: mod/admin.php:1137
-#, php-format
-msgid "There was no additional update function %s that needed to be called."
+#: mod/settings.php:1021
+msgid ""
+"When enabled, embedded content is not displayed on automatic updates, they "
+"only show on page reload."
 msgstr ""
 
-#: mod/admin.php:1156
-msgid "No failed updates."
+#: mod/settings.php:1023
+msgid "General Theme Settings"
 msgstr ""
 
-#: mod/admin.php:1157
-msgid "Check database structure"
+#: mod/settings.php:1024
+msgid "Custom Theme Settings"
 msgstr ""
 
-#: mod/admin.php:1162
-msgid "Failed Updates"
+#: mod/settings.php:1025
+msgid "Content Settings"
 msgstr ""
 
-#: mod/admin.php:1163
-msgid ""
-"This does not include updates prior to 1139, which did not return a status."
+#: mod/settings.php:1026 view/theme/duepuntozero/config.php:63
+#: view/theme/frio/config.php:66 view/theme/quattro/config.php:69
+#: view/theme/vier/config.php:114
+msgid "Theme settings"
 msgstr ""
 
-#: mod/admin.php:1164
-msgid "Mark success (if update was manually applied)"
+#: mod/settings.php:1110
+msgid "Account Types"
 msgstr ""
 
-#: mod/admin.php:1165
-msgid "Attempt to execute this update step automatically"
+#: mod/settings.php:1111
+msgid "Personal Page Subtypes"
 msgstr ""
 
-#: mod/admin.php:1199
-#, 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/settings.php:1112
+msgid "Community Forum Subtypes"
 msgstr ""
 
-#: mod/admin.php:1202
-#, 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/settings.php:1119
+msgid "Personal Page"
 msgstr ""
 
-#: mod/admin.php:1246
-#, php-format
-msgid "%s user blocked/unblocked"
-msgid_plural "%s users blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
+#: mod/settings.php:1120
+msgid "This account is a regular personal profile"
+msgstr ""
 
-#: mod/admin.php:1253
-#, php-format
-msgid "%s user deleted"
-msgid_plural "%s users deleted"
-msgstr[0] ""
-msgstr[1] ""
+#: mod/settings.php:1123
+msgid "Organisation Page"
+msgstr ""
 
-#: mod/admin.php:1300
-#, php-format
-msgid "User '%s' deleted"
+#: mod/settings.php:1124
+msgid "This account is a profile for an organisation"
 msgstr ""
 
-#: mod/admin.php:1308
-#, php-format
-msgid "User '%s' unblocked"
+#: mod/settings.php:1127
+msgid "News Page"
 msgstr ""
 
-#: mod/admin.php:1308
-#, php-format
-msgid "User '%s' blocked"
+#: mod/settings.php:1128
+msgid "This account is a news account/reflector"
 msgstr ""
 
-#: mod/admin.php:1417 mod/admin.php:1443
-msgid "Register date"
+#: mod/settings.php:1131
+msgid "Community Forum"
 msgstr ""
 
-#: mod/admin.php:1417 mod/admin.php:1443
-msgid "Last login"
+#: mod/settings.php:1132
+msgid ""
+"This account is a community forum where people can discuss with each other"
 msgstr ""
 
-#: mod/admin.php:1417 mod/admin.php:1443
-msgid "Last item"
+#: mod/settings.php:1135
+msgid "Normal Account Page"
 msgstr ""
 
-#: mod/admin.php:1426
-msgid "Add User"
+#: mod/settings.php:1136
+msgid "This account is a normal personal profile"
 msgstr ""
 
-#: mod/admin.php:1427
-msgid "select all"
+#: mod/settings.php:1139
+msgid "Soapbox Page"
 msgstr ""
 
-#: mod/admin.php:1428
-msgid "User registrations waiting for confirm"
+#: mod/settings.php:1140
+msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: mod/admin.php:1429
-msgid "User waiting for permanent deletion"
+#: mod/settings.php:1143
+msgid "Public Forum"
 msgstr ""
 
-#: mod/admin.php:1430
-msgid "Request date"
+#: mod/settings.php:1144
+msgid "Automatically approve all contact requests"
 msgstr ""
 
-#: mod/admin.php:1431
-msgid "No registrations."
+#: mod/settings.php:1147
+msgid "Automatic Friend Page"
 msgstr ""
 
-#: mod/admin.php:1432
-msgid "Note from the user"
+#: mod/settings.php:1148
+msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: mod/admin.php:1433 mod/notifications.php:176 mod/notifications.php:255
-msgid "Approve"
+#: mod/settings.php:1151
+msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: mod/admin.php:1434
-msgid "Deny"
+#: mod/settings.php:1152
+msgid "Private forum - approved members only"
 msgstr ""
 
-#: mod/admin.php:1438
-msgid "Site admin"
+#: mod/settings.php:1163
+msgid "OpenID:"
 msgstr ""
 
-#: mod/admin.php:1439
-msgid "Account expired"
+#: mod/settings.php:1163
+msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: mod/admin.php:1442
-msgid "New User"
+#: mod/settings.php:1171
+msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: mod/admin.php:1443
-msgid "Deleted since"
+#: mod/settings.php:1177
+msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: mod/admin.php:1448
-msgid ""
-"Selected users will be deleted!\\n\\nEverything these users had posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
+#: mod/settings.php:1184
+msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: mod/admin.php:1449
+#: mod/settings.php:1188
 msgid ""
-"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
-"site will be permanently deleted!\\n\\nAre you sure?"
+"If enabled, posting public messages to Diaspora and other networks isn't "
+"possible."
 msgstr ""
 
-#: mod/admin.php:1459
-msgid "Name of the new user."
+#: mod/settings.php:1193
+msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: mod/admin.php:1460
-msgid "Nickname"
+#: mod/settings.php:1198
+msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: mod/admin.php:1460
-msgid "Nickname of the new user."
+#: mod/settings.php:1203
+msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: mod/admin.php:1461
-msgid "Email address of the new user."
+#: mod/settings.php:1208
+msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: mod/admin.php:1504
-#, php-format
-msgid "Plugin %s disabled."
+#: mod/settings.php:1216
+msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: mod/admin.php:1508
+#: mod/settings.php:1224
 #, php-format
-msgid "Plugin %s enabled."
+msgid "Your Identity Address is <strong>'%s'</strong> or '%s'."
 msgstr ""
 
-#: mod/admin.php:1519 mod/admin.php:1767
-msgid "Disable"
+#: mod/settings.php:1231
+msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: mod/admin.php:1521 mod/admin.php:1769
-msgid "Enable"
+#: mod/settings.php:1231
+msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: mod/admin.php:1544 mod/admin.php:1814
-msgid "Toggle"
+#: mod/settings.php:1232
+msgid "Advanced expiration settings"
 msgstr ""
 
-#: mod/admin.php:1552 mod/admin.php:1823
-msgid "Author: "
+#: mod/settings.php:1233
+msgid "Advanced Expiration"
 msgstr ""
 
-#: mod/admin.php:1553 mod/admin.php:1824
-msgid "Maintainer: "
+#: mod/settings.php:1234
+msgid "Expire posts:"
 msgstr ""
 
-#: mod/admin.php:1608
-msgid "Reload active plugins"
+#: mod/settings.php:1235
+msgid "Expire personal notes:"
 msgstr ""
 
-#: mod/admin.php:1613
-#, php-format
-msgid ""
-"There are currently no plugins available on your node. You can find the "
-"official plugin repository at %1$s and might find other interesting plugins "
-"in the open plugin registry at %2$s"
+#: mod/settings.php:1236
+msgid "Expire starred posts:"
 msgstr ""
 
-#: mod/admin.php:1727
-msgid "No themes found."
+#: mod/settings.php:1237
+msgid "Expire photos:"
 msgstr ""
 
-#: mod/admin.php:1805
-msgid "Screenshot"
+#: mod/settings.php:1238
+msgid "Only expire posts by others:"
 msgstr ""
 
-#: mod/admin.php:1865
-msgid "Reload active themes"
+#: mod/settings.php:1269
+msgid "Account Settings"
 msgstr ""
 
-#: mod/admin.php:1870
-#, php-format
-msgid "No themes found on the system. They should be paced in %1$s"
+#: mod/settings.php:1277
+msgid "Password Settings"
 msgstr ""
 
-#: mod/admin.php:1871
-msgid "[Experimental]"
+#: mod/settings.php:1279
+msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: mod/admin.php:1872
-msgid "[Unsupported]"
+#: mod/settings.php:1280
+msgid "Current Password:"
 msgstr ""
 
-#: mod/admin.php:1896
-msgid "Log settings updated."
+#: mod/settings.php:1280 mod/settings.php:1281
+msgid "Your current password to confirm the changes"
 msgstr ""
 
-#: mod/admin.php:1928
-msgid "PHP log currently enabled."
+#: mod/settings.php:1281
+msgid "Password:"
 msgstr ""
 
-#: mod/admin.php:1930
-msgid "PHP log currently disabled."
+#: mod/settings.php:1285
+msgid "Basic Settings"
 msgstr ""
 
-#: mod/admin.php:1939
-msgid "Clear"
+#: mod/settings.php:1287
+msgid "Email Address:"
 msgstr ""
 
-#: mod/admin.php:1944
-msgid "Enable Debugging"
+#: mod/settings.php:1288
+msgid "Your Timezone:"
 msgstr ""
 
-#: mod/admin.php:1945
-msgid "Log file"
+#: mod/settings.php:1289
+msgid "Your Language:"
 msgstr ""
 
-#: mod/admin.php:1945
+#: mod/settings.php:1289
 msgid ""
-"Must be writable by web server. Relative to your Friendica top-level "
-"directory."
+"Set the language we use to show you friendica interface and to send you "
+"emails"
 msgstr ""
 
-#: mod/admin.php:1946
-msgid "Log level"
+#: mod/settings.php:1290
+msgid "Default Post Location:"
 msgstr ""
 
-#: mod/admin.php:1949
-msgid "PHP logging"
+#: mod/settings.php:1291
+msgid "Use Browser Location:"
 msgstr ""
 
-#: mod/admin.php:1950
-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."
+#: mod/settings.php:1294
+msgid "Security and Privacy Settings"
 msgstr ""
 
-#: mod/admin.php:2078
-#, php-format
-msgid "Lock feature %s"
+#: mod/settings.php:1296
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: mod/admin.php:2086
-msgid "Manage Additional Features"
+#: mod/settings.php:1296 mod/settings.php:1326
+msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: mod/viewcontacts.php:75
-msgid "No contacts."
+#: mod/settings.php:1297
+msgid "Default Post Permissions"
 msgstr ""
 
-#: mod/network.php:190 mod/search.php:25
-msgid "Remove term"
+#: mod/settings.php:1298
+msgid "(click to open/close)"
 msgstr ""
 
-#: mod/network.php:397
-#, 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/settings.php:1309
+msgid "Default Private Post"
+msgstr ""
 
-#: mod/network.php:400
-msgid "Messages in this group won't be send to these receivers."
+#: mod/settings.php:1310
+msgid "Default Public Post"
 msgstr ""
 
-#: mod/network.php:528
-msgid "Private messages to this person are at risk of public disclosure."
+#: mod/settings.php:1314
+msgid "Default Permissions for New Posts"
 msgstr ""
 
-#: mod/network.php:533
-msgid "Invalid contact."
+#: mod/settings.php:1326
+msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: mod/network.php:827
-msgid "Commented Order"
+#: mod/settings.php:1329
+msgid "Notification Settings"
 msgstr ""
 
-#: mod/network.php:830
-msgid "Sort by Comment Date"
+#: mod/settings.php:1330
+msgid "By default post a status message when:"
 msgstr ""
 
-#: mod/network.php:835
-msgid "Posted Order"
+#: mod/settings.php:1331
+msgid "accepting a friend request"
 msgstr ""
 
-#: mod/network.php:838
-msgid "Sort by Post Date"
+#: mod/settings.php:1332
+msgid "joining a forum/community"
 msgstr ""
 
-#: mod/network.php:849
-msgid "Posts that mention or involve you"
+#: mod/settings.php:1333
+msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: mod/network.php:857
-msgid "New"
+#: mod/settings.php:1334
+msgid "Send a notification email when:"
 msgstr ""
 
-#: mod/network.php:860
-msgid "Activity Stream - by date"
+#: mod/settings.php:1335
+msgid "You receive an introduction"
 msgstr ""
 
-#: mod/network.php:868
-msgid "Shared Links"
+#: mod/settings.php:1336
+msgid "Your introductions are confirmed"
 msgstr ""
 
-#: mod/network.php:871
-msgid "Interesting Links"
+#: mod/settings.php:1337
+msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: mod/network.php:879
-msgid "Starred"
+#: mod/settings.php:1338
+msgid "Someone writes a followup comment"
 msgstr ""
 
-#: mod/network.php:882
-msgid "Favourite Posts"
+#: mod/settings.php:1339
+msgid "You receive a private message"
 msgstr ""
 
-#: mod/search.php:100
-msgid "Only logged in users are permitted to perform a search."
+#: mod/settings.php:1340
+msgid "You receive a friend suggestion"
 msgstr ""
 
-#: mod/search.php:124
-msgid "Too Many Requests"
+#: mod/settings.php:1341
+msgid "You are tagged in a post"
 msgstr ""
 
-#: mod/search.php:125
-msgid "Only one search per minute is permitted for not logged in users."
+#: mod/settings.php:1342
+msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: mod/search.php:230
-#, php-format
-msgid "Items tagged with: %s"
+#: mod/settings.php:1344
+msgid "Activate desktop notifications"
 msgstr ""
 
-#: mod/notifications.php:35
-msgid "Invalid request identifier."
+#: mod/settings.php:1344
+msgid "Show desktop popup on new notifications"
 msgstr ""
 
-#: mod/notifications.php:44 mod/notifications.php:180
-#: mod/notifications.php:258
-msgid "Discard"
+#: mod/settings.php:1346
+msgid "Text-only notification emails"
 msgstr ""
 
-#: mod/notifications.php:105
-msgid "Network Notifications"
+#: mod/settings.php:1348
+msgid "Send text only notification emails, without the html part"
 msgstr ""
 
-#: mod/notifications.php:117
-msgid "Personal Notifications"
+#: mod/settings.php:1350
+msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: mod/notifications.php:123
-msgid "Home Notifications"
+#: mod/settings.php:1351
+msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: mod/notifications.php:152
-msgid "Show Ignored Requests"
+#: mod/settings.php:1354
+msgid "Relocate"
 msgstr ""
 
-#: mod/notifications.php:152
-msgid "Hide Ignored Requests"
+#: mod/settings.php:1355
+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/notifications.php:164 mod/notifications.php:228
-msgid "Notification type: "
+#: mod/settings.php:1356
+msgid "Resend relocate message to contacts"
 msgstr ""
 
-#: mod/notifications.php:167
+#: mod/subthread.php:104
 #, php-format
-msgid "suggested by %s"
+msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: mod/notifications.php:173 mod/notifications.php:246
-msgid "Post a new friend activity"
+#: mod/suggest.php:27
+msgid "Do you really want to delete this suggestion?"
 msgstr ""
 
-#: mod/notifications.php:173 mod/notifications.php:246
-msgid "if applicable"
+#: mod/suggest.php:71
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
 msgstr ""
 
-#: mod/notifications.php:195
-msgid "Claims to be known to you: "
+#: mod/suggest.php:84 mod/suggest.php:104
+msgid "Ignore/Hide"
 msgstr ""
 
-#: mod/notifications.php:196
-msgid "yes"
+#: mod/tagrm.php:43
+msgid "Tag removed"
 msgstr ""
 
-#: mod/notifications.php:196
-msgid "no"
+#: mod/tagrm.php:82
+msgid "Remove Item Tag"
+msgstr ""
+
+#: mod/tagrm.php:84
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: mod/notifications.php:197 mod/notifications.php:202
-msgid "Shall your connection be bidirectional or not?"
+#: mod/uexport.php:37
+msgid "Export account"
 msgstr ""
 
-#: mod/notifications.php:198 mod/notifications.php:203
-#, php-format
+#: mod/uexport.php:37
 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."
+"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/notifications.php:199
-#, 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/uexport.php:38
+msgid "Export all"
 msgstr ""
 
-#: mod/notifications.php:204
-#, php-format
+#: mod/uexport.php:38
 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."
+"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:215
-msgid "Friend"
+#: mod/uimport.php:68
+msgid "Move account"
 msgstr ""
 
-#: mod/notifications.php:216
-msgid "Sharer"
+#: mod/uimport.php:69
+msgid "You can import an account from another Friendica server."
 msgstr ""
 
-#: mod/notifications.php:216
-msgid "Subscriber"
+#: mod/uimport.php:70
+msgid ""
+"You need to export your account from the old server and upload it here. We "
+"will recreate your old account here with all your contacts. We will try also "
+"to inform your friends that you moved here."
 msgstr ""
 
-#: mod/notifications.php:266
-msgid "No introductions."
+#: mod/uimport.php:71
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (GNU Social/Statusnet) or from Diaspora"
 msgstr ""
 
-#: mod/notifications.php:307
-msgid "Show unread"
+#: mod/uimport.php:72
+msgid "Account file"
 msgstr ""
 
-#: mod/notifications.php:307
-msgid "Show all"
+#: mod/uimport.php:72
+msgid ""
+"To export your account, go to \"Settings->Export your personal data\" and "
+"select \"Export account\""
 msgstr ""
 
-#: mod/notifications.php:313
-#, php-format
-msgid "No more %s notifications."
+#: mod/update_community.php:19 mod/update_display.php:23
+#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
+msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: object/Item.php:385
-msgid "via"
+#: mod/videos.php:124
+msgid "Do you really want to delete this video?"
 msgstr ""
 
-#: view/theme/quattro/config.php:70
-msgid "Alignment"
+#: mod/videos.php:129
+msgid "Delete Video"
 msgstr ""
 
-#: view/theme/quattro/config.php:70
-msgid "Left"
+#: mod/videos.php:208
+msgid "No videos selected"
 msgstr ""
 
-#: view/theme/quattro/config.php:70
-msgid "Center"
+#: mod/videos.php:400
+msgid "Recent Videos"
 msgstr ""
 
-#: view/theme/quattro/config.php:71 view/theme/clean/config.php:108
-msgid "Color scheme"
+#: mod/videos.php:402
+msgid "Upload New Videos"
 msgstr ""
 
-#: view/theme/quattro/config.php:72
-msgid "Posts font size"
+#: mod/viewcontacts.php:75
+msgid "No contacts."
 msgstr ""
 
-#: view/theme/quattro/config.php:73
-msgid "Textareas font size"
+#: mod/viewsrc.php:7
+msgid "Access denied."
 msgstr ""
 
-#: view/theme/vier/config.php:69
-msgid "Comma separated list of helper forums"
+#: mod/wall_attach.php:17 mod/wall_attach.php:25 mod/wall_attach.php:76
+#: mod/wall_upload.php:20 mod/wall_upload.php:33 mod/wall_upload.php:86
+#: mod/wall_upload.php:122 mod/wall_upload.php:125
+msgid "Invalid request."
 msgstr ""
 
-#: view/theme/vier/config.php:115
-msgid "Set style"
+#: mod/wall_attach.php:94
+msgid "Sorry, maybe your upload is bigger than the PHP configuration allows"
 msgstr ""
 
-#: view/theme/vier/config.php:116
-msgid "Community Pages"
+#: mod/wall_attach.php:94
+msgid "Or - did you try to upload an empty file?"
 msgstr ""
 
-#: view/theme/vier/config.php:117 view/theme/vier/theme.php:146
-msgid "Community Profiles"
+#: mod/wall_attach.php:105
+#, php-format
+msgid "File exceeds size limit of %s"
 msgstr ""
 
-#: view/theme/vier/config.php:118
-msgid "Help or @NewHere ?"
+#: mod/wall_attach.php:158 mod/wall_attach.php:174
+msgid "File upload failed."
 msgstr ""
 
-#: view/theme/vier/config.php:119 view/theme/vier/theme.php:385
-msgid "Connect Services"
+#: mod/wallmessage.php:42 mod/wallmessage.php:106
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr ""
 
-#: view/theme/vier/config.php:120 view/theme/vier/theme.php:194
-msgid "Find Friends"
+#: mod/wallmessage.php:53
+msgid "Unable to check your home location."
 msgstr ""
 
-#: view/theme/vier/config.php:121 view/theme/vier/theme.php:176
-msgid "Last users"
+#: mod/wallmessage.php:80 mod/wallmessage.php:89
+msgid "No recipient."
 msgstr ""
 
-#: view/theme/vier/theme.php:195
-msgid "Local Directory"
+#: mod/wallmessage.php:127
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
 msgstr ""
 
-#: view/theme/vier/theme.php:286
-msgid "Quick Start"
+#: object/Item.php:359
+msgid "via"
 msgstr ""
 
 #: view/theme/duepuntozero/config.php:44
@@ -8789,63 +8704,44 @@ msgstr ""
 msgid "Variations"
 msgstr ""
 
-#: view/theme/clean/config.php:61
-msgid "Midnight"
-msgstr ""
-
-#: view/theme/clean/config.php:62
-msgid "Zenburn"
-msgstr ""
-
-#: view/theme/clean/config.php:63
-msgid "Bootstrap"
-msgstr ""
-
-#: view/theme/clean/config.php:64
-msgid "Shades of Pink"
-msgstr ""
-
-#: view/theme/clean/config.php:65
-msgid "Lime and Orange"
+#: view/theme/frio/config.php:47
+msgid "Default"
 msgstr ""
 
-#: view/theme/clean/config.php:66
-msgid "GeoCities Retro"
+#: view/theme/frio/config.php:59
+msgid "Note: "
 msgstr ""
 
-#: view/theme/clean/config.php:92
-msgid "Background Image"
+#: view/theme/frio/config.php:59
+msgid "Check image permissions if all users are allowed to visit the image"
 msgstr ""
 
-#: view/theme/clean/config.php:94
-msgid ""
-"The URL to a picture (e.g. from your photo album) that should be used as "
-"background image."
+#: view/theme/frio/config.php:67
+msgid "Select scheme"
 msgstr ""
 
-#: view/theme/clean/config.php:99
-msgid "Background Color"
+#: view/theme/frio/config.php:68
+msgid "Navigation bar background color"
 msgstr ""
 
-#: view/theme/clean/config.php:101
-msgid "HEX value for the background color. Don't include the #"
+#: view/theme/frio/config.php:69
+msgid "Navigation bar icon color "
 msgstr ""
 
-#: view/theme/clean/config.php:115
-msgid "font size"
+#: view/theme/frio/config.php:70
+msgid "Link color"
 msgstr ""
 
-#: view/theme/clean/config.php:117
-msgid "base font size for your interface"
+#: view/theme/frio/config.php:71
+msgid "Set the background color"
 msgstr ""
 
-#: view/theme/clean/config.php:122
-msgid "Display Accesskeys"
+#: view/theme/frio/config.php:72
+msgid "Content background transparency"
 msgstr ""
 
-#: view/theme/clean/config.php:124
-msgid ""
-"Diaplay the access keys assigned to some menu element in the web interface."
+#: view/theme/frio/config.php:73
+msgid "Set the background image"
 msgstr ""
 
 #: view/theme/frio/php/Image.php:23
@@ -8880,103 +8776,74 @@ msgstr ""
 msgid "Resize to best fit and retain aspect ratio."
 msgstr ""
 
-#: view/theme/frio/config.php:47
-msgid "Default"
-msgstr ""
-
-#: view/theme/frio/config.php:59
-msgid "Note: "
-msgstr ""
-
-#: view/theme/frio/config.php:59
-msgid "Check image permissions if all users are allowed to visit the image"
-msgstr ""
-
-#: view/theme/frio/config.php:67
-msgid "Select scheme"
-msgstr ""
-
-#: view/theme/frio/config.php:68
-msgid "Navigation bar background color"
-msgstr ""
-
-#: view/theme/frio/config.php:69
-msgid "Navigation bar icon color "
-msgstr ""
-
-#: view/theme/frio/config.php:70
-msgid "Link color"
-msgstr ""
-
-#: view/theme/frio/config.php:71
-msgid "Set the background color"
+#: view/theme/frio/theme.php:226
+msgid "Guest"
 msgstr ""
 
-#: view/theme/frio/config.php:72
-msgid "Content background transparency"
+#: view/theme/frio/theme.php:232
+msgid "Visitor"
 msgstr ""
 
-#: view/theme/frio/config.php:73
-msgid "Set the background image"
+#: view/theme/quattro/config.php:70
+msgid "Alignment"
 msgstr ""
 
-#: view/theme/frio/theme.php:226
-msgid "Guest"
+#: view/theme/quattro/config.php:70
+msgid "Left"
 msgstr ""
 
-#: view/theme/frio/theme.php:232
-msgid "Visitor"
+#: view/theme/quattro/config.php:70
+msgid "Center"
 msgstr ""
 
-#: index.php:457
-msgid "toggle mobile"
+#: view/theme/quattro/config.php:71
+msgid "Color scheme"
 msgstr ""
 
-#: boot.php:970
-msgid "Delete this item?"
+#: view/theme/quattro/config.php:72
+msgid "Posts font size"
 msgstr ""
 
-#: boot.php:972
-msgid "show fewer"
+#: view/theme/quattro/config.php:73
+msgid "Textareas font size"
 msgstr ""
 
-#: boot.php:1696
-#, php-format
-msgid "Update %s failed. See error logs."
+#: view/theme/vier/config.php:69
+msgid "Comma separated list of helper forums"
 msgstr ""
 
-#: boot.php:1808
-msgid "Create a New Account"
+#: view/theme/vier/config.php:115
+msgid "Set style"
 msgstr ""
 
-#: boot.php:1837
-msgid "Password: "
+#: view/theme/vier/config.php:116
+msgid "Community Pages"
 msgstr ""
 
-#: boot.php:1838
-msgid "Remember me"
+#: view/theme/vier/config.php:117 view/theme/vier/theme.php:146
+msgid "Community Profiles"
 msgstr ""
 
-#: boot.php:1841
-msgid "Or login using OpenID: "
+#: view/theme/vier/config.php:118
+msgid "Help or @NewHere ?"
 msgstr ""
 
-#: boot.php:1847
-msgid "Forgot your password?"
+#: view/theme/vier/config.php:119 view/theme/vier/theme.php:385
+msgid "Connect Services"
 msgstr ""
 
-#: boot.php:1850
-msgid "Website Terms of Service"
+#: view/theme/vier/config.php:120 view/theme/vier/theme.php:194
+msgid "Find Friends"
 msgstr ""
 
-#: boot.php:1851
-msgid "terms of service"
+#: view/theme/vier/config.php:121 view/theme/vier/theme.php:176
+msgid "Last users"
 msgstr ""
 
-#: boot.php:1853
-msgid "Website Privacy Policy"
+#: view/theme/vier/theme.php:195
+msgid "Local Directory"
 msgstr ""
 
-#: boot.php:1854
-msgid "privacy policy"
+#: view/theme/vier/theme.php:286
+msgid "Quick Start"
 msgstr ""

diff --git a/view/templates/event.tpl b/view/templates/event.tpl
index 9cad2444cebbc004e56331101c17d062fbb2739a..328e0e8a1318b56c50c56ad7b92e998e22c3e95c 100644 (file)
--- a/view/templates/event.tpl
+++ b/view/templates/event.tpl
@@ -6,6 +6,7 @@
        {{$event.html}}
        {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="_blank" class="plink-event-link icon s22 remote-link"></a>{{/if}}
        {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
+       {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link icon s22 delete"></a>{{/if}}
        </div>
        <div class="clear"></div>
 {{/foreach}}

diff --git a/view/templates/maintenance.tpl b/view/templates/maintenance.tpl
index f43da542f8a764d7f942c994b98fdb5bb4b35ffa..e26af299f8725c2070749aa5ebdeeea4d38335dd 100644 (file)
--- a/view/templates/maintenance.tpl
+++ b/view/templates/maintenance.tpl
@@ -1,2 +1,3 @@
 
-<div id="maintenance-message">{{$sysdown}}</div>
+<h1 id="maintenance-message">{{$sysdown}}</h1>
+<div id="maintenance-reason">{{$reason}}</div>

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 8d7a5f7696a015173fa02203fed3a08c32b58947..47973ed448bd0156787d87a468af1ccf72d14140 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2193,6 +2193,9 @@ ul li:hover .contact-wrapper a.contact-action-link:hover {
 #event-edit-form-wrapper #event-edit-time {
     padding: 10px 0;
 }
+.event-buttons .plink-event-link {
+    margin-left: 20px;
+}
 /* Profiles Page */
 .profile-listing-table {
     display: table;

diff --git a/view/theme/frio/templates/event.tpl b/view/theme/frio/templates/event.tpl
index ee2875686635ffcfdc4c6c2b0acf7f1d0641506c..dc37f19269d9ab6d9ded805ea2f7b68caecff88d 100644 (file)
--- a/view/theme/frio/templates/event.tpl
+++ b/view/theme/frio/templates/event.tpl
@@ -17,8 +17,9 @@
                        </div>
 
                        <div class="event-buttons pull-right">
-                               {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="btn "><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
-                               {{if $event.edit}}<a onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}" class="btn"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
+                               {{if $event.edit}}<a onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}" class="edit-event-link btn"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
+                               {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
+                               {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link btn "><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
                        </div>
                        <div class="clear"></div>
                </div>