From 0afb0c2ea407a9dbde217d2d88edb75f7402a810 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 27 Feb 2017 23:37:15 +0000 Subject: [PATCH 01/21] NULL_DATE is now a constant --- boot.php | 10 +- include/Contact.php | 12 +- include/cron.php | 6 +- include/datetime.php | 8 +- include/dbm.php | 2 +- include/dbstructure.php | 126 +++++++++--------- include/diaspora.php | 2 +- include/identity.php | 4 +- include/lock.php | 3 +- include/onepoll.php | 4 +- include/poller.php | 31 +++-- include/security.php | 2 +- include/socgraph.php | 24 ++-- include/uimport.php | 4 +- .../libs/plugins/modifier.date_format.php | 2 +- mod/contacts.php | 6 +- mod/events.php | 2 +- mod/hovercard.php | 2 +- mod/profiles.php | 12 +- mod/settings.php | 2 +- update.php | 44 +++--- 21 files changed, 162 insertions(+), 146 deletions(-) diff --git a/boot.php b/boot.php index 1e0c300e19..af542e09ad 100644 --- a/boot.php +++ b/boot.php @@ -442,6 +442,14 @@ define('SR_SCOPE_ALL', 'all'); define('SR_SCOPE_TAGS', 'tags'); /* @}*/ +/** + * Lowest possible date time value + */ + +//define ('NULL_DATE', '0001-01-01 00:00:00'); +define ('NULL_DATE', '0000-00-00 00:00:00'); + + // Normally this constant is defined - but not if "pcntl" isn't installed if (!defined("SIGTERM")) define("SIGTERM", 15); @@ -2039,7 +2047,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/include/Contact.php b/include/Contact.php index 2aab828f8a..7e8de65131 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -129,7 +129,7 @@ function mark_for_death($contact) { if($contact['archive']) return; - if($contact['term-date'] == '0000-00-00 00:00:00') { + if($contact['term-date'] <= NULL_DATE) { q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($contact['id']) @@ -187,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'])) ); } @@ -256,7 +256,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) { // "bd" always contains the upcoming birthday of a contact. // "birthday" might contain the birthday including the year of birth. - if ($profile["birthday"] != "0000-00-00") { + if ($profile["birthday"] >= "0001-01-01") { $bd_timestamp = strtotime($profile["birthday"]); $month = date("m", $bd_timestamp); $day = date("d", $bd_timestamp); @@ -273,7 +273,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) { $profile["bd"] = (++$current_year)."-".$month."-".$day; } } else { - $profile["bd"] = "0000-00-00"; + $profile["bd"] = "0001-01-01"; } } else { $profile = $default; @@ -309,7 +309,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) { $profile["location"] = ""; $profile["about"] = ""; $profile["gender"] = ""; - $profile["birthday"] = "0000-00-00"; + $profile["birthday"] = "0001-01-01"; } $cache[$url][$uid] = $profile; diff --git a/include/cron.php b/include/cron.php index 2fc8de51c5..26ff728f4d 100644 --- a/include/cron.php +++ b/include/cron.php @@ -173,8 +173,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"); @@ -276,7 +276,7 @@ function cron_poll_contacts($argc, $argv) { $xml = false; if($manual_id) - $contact['last-update'] = '0000-00-00 00:00:00'; + $contact['last-update'] = NULL_DATE; if(in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) $contact['priority'] = 2; diff --git a/include/datetime.php b/include/datetime.php index 8d4961cd7c..601b4decf4 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -126,7 +126,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d // add 32 days so that we at least get year 00, and then hack around the fact that // months and days always start with 1. - if(substr($s,0,10) == '0000-00-00') { + if(substr($s,0,10) <= '0001-01-01') { $d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC')); return str_replace('1','0',$d->format($fmt)); } @@ -171,7 +171,7 @@ function dob($dob) { $f = get_config('system','birthday_input_format'); if(! $f) $f = 'ymd'; - if($dob === '0000-00-00') + if($dob <= '0001-01-01') $value = ''; else $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d')); @@ -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'); } @@ -553,7 +553,7 @@ function update_contact_birthdays() { // This only handles foreign or alien networks where a birthday has been provided. // In-network birthdays are handled within local_delivery - $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` != '0000-00-00' AND SUBSTRING(`bd`,1,4) != `bdyear` "); + $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` >= '0001-01-01' AND SUBSTRING(`bd`,1,4) != `bdyear` "); if (dbm::is_result($r)) { foreach ($r as $rr) { diff --git a/include/dbm.php b/include/dbm.php index fedc2e4fdb..eb3e2d0382 100644 --- a/include/dbm.php +++ b/include/dbm.php @@ -98,7 +98,7 @@ class dbm { // Workaround for 3.5.1 if ($timestamp < -62135596800) { - return '0000-00-00 00:00:00'; + return NULL_DATE; } // The above will be removed in 3.5.2 diff --git a/include/dbstructure.php b/include/dbstructure.php index 1e4790de2e..99057a9c00 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -536,8 +536,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 +564,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 +613,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 +651,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 +703,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( @@ -731,10 +731,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"), @@ -770,7 +770,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"), @@ -811,7 +811,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"), @@ -838,10 +838,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"), @@ -875,7 +875,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"), @@ -923,10 +923,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"), @@ -956,7 +956,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"), ), @@ -979,11 +979,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" => ""), @@ -1082,7 +1082,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"), @@ -1106,7 +1106,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"), @@ -1130,7 +1130,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"), @@ -1155,7 +1155,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" => ""), @@ -1191,7 +1191,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"), @@ -1204,7 +1204,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"), @@ -1231,8 +1231,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" => ""), @@ -1294,7 +1294,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"), @@ -1320,7 +1320,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" => ""), @@ -1372,7 +1372,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( @@ -1384,8 +1384,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"), ), @@ -1402,7 +1402,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" => ""), @@ -1456,7 +1456,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"), @@ -1475,8 +1475,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"), @@ -1497,11 +1497,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"), @@ -1552,8 +1552,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" => ""), @@ -1577,8 +1577,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"), @@ -1607,9 +1607,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/diaspora.php b/include/diaspora.php index eca22092d8..302492efea 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -3574,7 +3574,7 @@ class Diaspora { if ($searchable === 'true') { $dob = '1000-00-00'; - if (($profile['dob']) && ($profile['dob'] != '0000-00-00')) + if (($profile['dob']) && ($profile['dob'] > '0001-01-01')) $dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC','UTC',$profile['dob'],'m-d'); $about = $profile['about']; diff --git a/include/identity.php b/include/identity.php index ab80c71cea..670337e087 100644 --- a/include/identity.php +++ b/include/identity.php @@ -628,7 +628,7 @@ function advanced_profile(App $a) { if($a->profile['gender']) $profile['gender'] = array( t('Gender:'), $a->profile['gender'] ); - if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { + if(($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) { $year_bd_format = t('j F, Y'); $short_bd_format = t('j F'); @@ -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 b3d488a357..a48b0ad342 100644 --- a/include/lock.php +++ b/include/lock.php @@ -68,7 +68,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 5219d9f3bd..90ca639dd1 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -152,7 +152,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) ); @@ -250,7 +250,7 @@ function onepoll_run(&$argv, &$argc){ mark_for_death($contact); } else { - if($contact['term-date'] != '0000-00-00 00:00:00') { + if ($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 8be4c1835c..a82d265880 100644 --- a/include/poller.php +++ b/include/poller.php @@ -343,7 +343,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 @@ -352,8 +352,8 @@ 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 @@ -377,8 +377,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"])); @@ -411,15 +412,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)) { @@ -539,20 +540,24 @@ 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)); + 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"); + $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 c379518562..11a2955b4c 100644 --- a/include/security.php +++ b/include/security.php @@ -16,7 +16,7 @@ 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') { + if($a->user['login_date'] <= NULL_DATE) { $_SESSION['return_url'] = 'profile_photo/new'; $a->module = 'profile_photo'; info( t("Welcome ") . $a->user['username'] . EOL); diff --git a/include/socgraph.php b/include/socgraph.php index a0dd88df2d..0421f3f219 100644 --- 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 = ''; @@ -242,7 +242,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca 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"]; @@ -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); @@ -420,7 +420,7 @@ 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))); @@ -619,7 +619,7 @@ 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"; + $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))); @@ -692,7 +692,7 @@ function poco_check_server($server_url, $network = "", $force = false) { $servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url))); if ($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))); @@ -723,8 +723,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); @@ -1128,7 +1128,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", @@ -1136,6 +1136,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) { intval($uid), intval($uid), intval($uid), + dbesc(NULL_DATE), $sql_network, intval($start), intval($limit) @@ -1154,13 +1155,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) @@ -1374,7 +1376,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 b774d78c6d..c6eeb6fc73 100644 --- a/include/uimport.php +++ b/include/uimport.php @@ -186,8 +186,8 @@ function import_account(App $a, $file) { } } if ($contact['uid'] == $olduid && $contact['self'] == '0') { - // set contacts 'avatar-date' to "0000-00-00 00:00:00" to let poller to update urls - $contact["avatar-date"] = "0000-00-00 00:00:00" ; + // set contacts 'avatar-date' to NULL_DATE to let poller to update urls + $contact["avatar-date"] = NULL_DATE; switch ($contact['network']) { diff --git a/library/Smarty/libs/plugins/modifier.date_format.php b/library/Smarty/libs/plugins/modifier.date_format.php index 5ad7540b15..c5992991de 100644 --- 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 a2a77e2a5c..5fdcb7036d 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -534,11 +534,11 @@ 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') : ''); @@ -558,7 +558,7 @@ 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) $fetch_further_information = array('fetch_further_information', t('Fetch further information for feeds'), $contact['fetch_further_information'], t('Fetch further information for feeds'), diff --git a/mod/events.php b/mod/events.php index ac0c444cb5..2b84d903e1 100644 --- a/mod/events.php +++ b/mod/events.php @@ -60,7 +60,7 @@ function events_post(App $a) { } if ($nofinish) { - $finish = '0000-00-00 00:00:00'; + $finish = NULL_DATE; } if ($finish_text) { diff --git a/mod/hovercard.php b/mod/hovercard.php index ec749db208..ea1036b898 100644 --- a/mod/hovercard.php +++ b/mod/hovercard.php @@ -75,7 +75,7 @@ function hovercard_content() { 'tags' => $contact["keywords"], // 'nsfw' => intval($contact["nsfw"]), // 'server_url' => $contact["server_url"], - 'bd' => (($contact["birthday"] == "0000-00-00") ? "" : $contact["birthday"]), + 'bd' => (($contact["birthday"] <= "0001-01-01") ? "" : $contact["birthday"]), // 'generation' => $contact["generation"], 'account_type' => account_type($contact), 'actions' => $actions, diff --git a/mod/profiles.php b/mod/profiles.php index 4c6ff926b6..4ec4538389 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -191,21 +191,21 @@ function profiles_post(App $a) { return; } - $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated? + $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0001-01-01'; // FIXME: Needs to be validated? $y = substr($dob,0,4); if((! ctype_digit($y)) || ($y < 1900)) $ignore_year = true; else $ignore_year = false; - if($dob != '0000-00-00') { - if(strpos($dob,'0000-') === 0) { + if($dob > '0001-01-01') { + if(strpos($dob,'000') === 0) { $ignore_year = true; $dob = substr($dob,5); } $dob = datetime_convert('UTC','UTC',(($ignore_year) ? '1900-' . $dob : $dob),(($ignore_year) ? 'm-d' : 'Y-m-d')); if($ignore_year) - $dob = '0000-' . $dob; + $dob = '0001-' . $dob; } $name = notags(trim($_POST['name'])); @@ -234,7 +234,7 @@ function profiles_post(App $a) { $with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : ''); if(! strlen($howlong)) - $howlong = '0000-00-00 00:00:00'; + $howlong = NULL_DATE; else $howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong); @@ -721,7 +721,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 32ccaf541a..5c9c439e0a 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -872,7 +872,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 041de9cfff..1696bb3a04 100644 --- a/update.php +++ b/update.php @@ -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() { @@ -242,8 +242,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() { @@ -349,7 +349,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` "); } @@ -443,7 +443,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 "); } @@ -454,8 +454,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 , @@ -531,7 +531,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` "); + $r = q("ALTER TABLE `item` ADD `received` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00' AFTER `edited` "); if($r) q("ALTER TABLE `item` ADD INDEX ( `received` ) "); @@ -673,7 +673,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() { @@ -728,7 +728,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)) { @@ -747,8 +747,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() { @@ -932,8 +932,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` ) "); } @@ -1112,7 +1112,7 @@ function update_1127() { function update_1128() { - q("alter table spam add `date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `term` "); + q("alter table spam add `date` DATETIME NOT NULL DEFAULT '0001-01-01 00:00:00' AFTER `term` "); } function update_1129() { @@ -1262,7 +1262,7 @@ function update_1144() { } function update_1145() { - $r = q("alter table profile add howlong datetime not null default '0000-00-00 00:00:00' after `with`"); + $r = q("alter table profile add howlong datetime not null default '0001-01-01 00:00:00' after `with`"); if(! $r) return UPDATE_FAILED ; return UPDATE_SUCCESS ; @@ -1562,11 +1562,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', From 8ae8465d48996b9d4ad557c744f9483b7da8abd1 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 16 Mar 2017 20:15:25 +0100 Subject: [PATCH 02/21] add dop event & fix event edit --- include/event.php | 11 +- mod/events.php | 211 ++++++++++++++++------------ view/templates/event.tpl | 1 + view/theme/frio/css/style.css | 3 + view/theme/frio/templates/event.tpl | 5 +- 5 files changed, 136 insertions(+), 95 deletions(-) diff --git a/include/event.php b/include/event.php index 9e5bafbdb0..87fae4f8e1 100644 --- a/include/event.php +++ b/include/event.php @@ -612,7 +612,14 @@ function process_events($arr) { $is_first = ($d !== $last_date); $last_date = $d; - $edit = ((! $rr['cid']) ? array(App::get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null); + + // 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(" $j, 'd' => $d, + 'edit' => $edit, + 'drop' => $drop, 'is_first'=>$is_first, 'item'=>$rr, 'html'=>$html, diff --git a/mod/events.php b/mod/events.php index ac0c444cb5..5d80e86094 100644 --- a/mod/events.php +++ b/mod/events.php @@ -33,7 +33,7 @@ function events_init(App $a) { function events_post(App $a) { - logger('post: ' . print_r($_REQUEST,true)); + logger('post: ' . print_r($_REQUEST, true)); if (! local_user()) { return; @@ -41,7 +41,7 @@ function events_post(App $a) { $event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0); $cid = ((x($_POST,'cid')) ? intval($_POST['cid']) : 0); - $uid = local_user(); + $uid = local_user(); $start_text = escape_tags($_REQUEST['start_text']); $finish_text = escape_tags($_REQUEST['finish_text']); @@ -54,9 +54,8 @@ function events_post(App $a) { if ($start_text) { $start = $start_text; - } - else { - $start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute); + } else { + $start = sprintf('%d-%d-%d %d:%d:0', $startyear, $startmonth, $startday, $starthour, $startminute); } if ($nofinish) { @@ -65,21 +64,19 @@ function events_post(App $a) { if ($finish_text) { $finish = $finish_text; - } - else { - $finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute); + } 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,7 +93,7 @@ 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) { + 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.')); @@ -105,9 +102,9 @@ function events_post(App $a) { goaway($onerror_url); } - if((! $summary) || (! $start)) { + if ((! $summary) || (! $start)) { notice( t('Event title and start time are required.') . EOL); - if(intval($_REQUEST['preview'])) { + if (intval($_REQUEST['preview'])) { echo( t('Event title and start time are required.')); killme(); } @@ -116,35 +113,33 @@ 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 (count($c)) { $self = $c[0]['id']; - else + } else { $self = 0; + } - if($share) { + if ($share) { $str_group_allow = perms2str($_POST['group_allow']); $str_contact_allow = perms2str($_POST['contact_allow']); $str_group_deny = perms2str($_POST['group_deny']); $str_contact_deny = perms2str($_POST['contact_deny']); // 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 . '>'; @@ -173,16 +168,17 @@ function events_post(App $a) { $datarray['created'] = $created; $datarray['edited'] = $edited; - if(intval($_REQUEST['preview'])) { + 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']); } @@ -201,14 +197,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 +220,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,14 +228,15 @@ 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); + } @@ -253,6 +250,10 @@ function events_content(App $a) { $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 +268,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); } @@ -289,22 +289,22 @@ function events_content(App $a) { $nextyear = $y; $nextmonth = $m + 1; - if($nextmonth > 12) { - $nextmonth = 1; + if ($nextmonth > 12) { + $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'){ @@ -312,20 +312,20 @@ function events_content(App $a) { 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_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 @@ -340,7 +340,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,18 +356,14 @@ 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')){ $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 @@ -385,27 +381,31 @@ function events_content(App $a) { '$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'), + '$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"), + '$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) { + if ($mode === 'edit' && $event_id) { $r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($event_id), intval(local_user()) @@ -415,16 +415,16 @@ function events_content(App $a) { } // Passed parameters overrides anything found in the DB - if($mode === 'edit' || $mode === 'new') { - if(!x($orig_event)) $orig_event = array(); + if ($mode === 'edit' || $mode === 'new') { + 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 (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') { @@ -439,21 +439,24 @@ function events_content(App $a) { $uri = ((x($orig_event)) ? $orig_event['uri'] : ''); - if(! x($orig_event)) + if (! x($orig_event)) { $sh_checked = ''; - else + } else { $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')) + 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'); $tz = date_default_timezone_get(); - if(x($orig_event)) + if (x($orig_event)) { $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC'); + } $syear = datetime_convert('UTC', $tz, $sdt, 'Y'); $smonth = datetime_convert('UTC', $tz, $sdt, 'm'); @@ -470,13 +473,15 @@ function events_content(App $a) { $fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0); $f = get_config('system','event_input_format'); - if(! $f) + if (! $f) { $f = 'ymd'; + } 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'); @@ -489,11 +494,11 @@ function events_content(App $a) { '$title' => t('Event details'), '$desc' => t('Starting date and Title are required.'), '$s_text' => t('Event Starts:') . ' *', - '$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:'), @@ -511,12 +516,34 @@ 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; + + $event_params = array('event_id' => ($event_id)); + $ev = event_by_id(local_user(), $event_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/view/templates/event.tpl b/view/templates/event.tpl index 9cad2444ce..328e0e8a13 100644 --- a/view/templates/event.tpl +++ b/view/templates/event.tpl @@ -6,6 +6,7 @@ {{$event.html}} {{if $event.item.plink}}{{/if}} {{if $event.edit}}{{/if}} + {{if $event.drop}}{{/if}}
{{/foreach}} diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 8d7a5f7696..47973ed448 100644 --- 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 ee28756866..dc37f19269 100644 --- a/view/theme/frio/templates/event.tpl +++ b/view/theme/frio/templates/event.tpl @@ -17,8 +17,9 @@
- {{if $event.item.plink}}{{/if}} - {{if $event.edit}}{{/if}} + {{if $event.edit}}{{/if}} + {{if $event.drop}}{{/if}} + {{if $event.item.plink}}{{/if}}
From c785eb29c67d0bf4e1cb6d2c252348305bc0fcfe Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 17 Mar 2017 17:57:57 +0100 Subject: [PATCH 03/21] more work on standards compliance --- include/event.php | 24 +++---- mod/events.php | 176 +++++++++++++++++++++++----------------------- 2 files changed, 100 insertions(+), 100 deletions(-) diff --git a/include/event.php b/include/event.php index 87fae4f8e1..d9b89a7c63 100644 --- a/include/event.php +++ b/include/event.php @@ -595,17 +595,17 @@ function process_events($arr) { $last_date = ''; $fmt = t('l, F j'); if (count($arr)) { - foreach($arr as $rr) { + 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')); + $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')); } @@ -616,14 +616,14 @@ function process_events($arr) { // 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'),'',''); + $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("$is_first, 'item'=>$rr, 'html'=>$html, - 'plink' => array($rr['plink'],t('link to source'),'',''), + 'plink' => array($rr['plink'], t('link to source'), '', ''), ); } } diff --git a/mod/events.php b/mod/events.php index 5d80e86094..d66ae764cf 100644 --- a/mod/events.php +++ b/mod/events.php @@ -1,12 +1,12 @@ argc == 1) { // if it's a json request abort here becaus we don't // need the widget data - if ($a->argv[1] === 'json') + if ($a->argv[1] === 'json') { return; + } $cal_widget = widget_events(); @@ -39,11 +40,11 @@ function events_post(App $a) { return; } - $event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0); - $cid = ((x($_POST,'cid')) ? intval($_POST['cid']) : 0); + $event_id = ((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']); @@ -69,9 +70,9 @@ function events_post(App $a) { } 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); @@ -94,18 +95,18 @@ function events_post(App $a) { $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); + 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); + 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); @@ -130,7 +131,7 @@ 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 @@ -148,25 +149,25 @@ function events_post(App $a) { $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); @@ -188,7 +189,7 @@ function events_post(App $a) { function events_content(App $a) { if (! local_user()) { - notice( t('Permission denied.') . EOL); + notice(t('Permission denied.') . EOL); return; } @@ -232,7 +233,7 @@ function events_content(App $a) { '$baseurl' => App::get_baseurl(), )); - $o =''; + $o = ''; // tabs if ($a->theme_events_in_profile) { $tabs = profile_tabs($a, true); @@ -243,7 +244,7 @@ function events_content(App $a) { $mode = 'view'; $y = 0; $m = 0; - $ignored = ((x($_REQUEST,'ignored')) ? intval($_REQUEST['ignored']) : 0); + $ignored = ((x($_REQUEST, 'ignored')) ? intval($_REQUEST['ignored']) : 0); if($a->argc > 1) { if ($a->argc > 2 && $a->argv[1] == 'event') { @@ -268,7 +269,7 @@ 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'); + $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); @@ -307,20 +308,20 @@ function events_content(App $a) { $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); - $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), + 'event_id' => (x($_GET, 'id') ? $_GET['id'] : 0), 'start' => $start, 'finish' => $finish, 'adjust_start' => $adjust_start, @@ -329,7 +330,7 @@ function events_content(App $a) { ); // 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); @@ -360,33 +361,33 @@ function events_content(App $a) { killme(); } - if (x($_GET,'id')){ + if (x($_GET, 'id')){ $tpl = get_markup_template("event.tpl"); } else { $tpl = get_markup_template("events_js.tpl"); } // Get rid of dashes in key names, Smarty3 can't handle them - foreach($events as $key => $event) { + foreach ($events as $key => $event) { $event_item = array(); - foreach($event['item'] as $k => $v) { - $k = str_replace('-','_',$k); + foreach ($event['item'] as $k => $v) { + $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'), + '$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, + '$events' => $events, '$today' => t('today'), '$month' => t('month'), @@ -395,14 +396,12 @@ function events_content(App $a) { '$list' => t('list'), )); - if (x($_GET,'id')) { + if (x($_GET, 'id')) { echo $o; killme(); - } return $o; - } if ($mode === 'edit' && $event_id) { @@ -410,39 +409,41 @@ 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 (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 ($mode === 'edit' || $mode === 'new') { $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'] : ''); + $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'] : ''); + $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')) { @@ -458,18 +459,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,7 +478,7 @@ function events_content(App $a) { $f = 'ymd'; } - require_once('include/acl_selectors.php'); + require_once 'include/acl_selectors.php' ; if ($mode === 'new') { $acl = (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user))); @@ -529,8 +530,8 @@ function events_content(App $a) { if ($mode === 'drop' && $event_id) { $del = 0; - $event_params = array('event_id' => ($event_id)); - $ev = event_by_id(local_user(), $event_params); + $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') { @@ -538,12 +539,11 @@ function events_content(App $a) { } if ($del == 0) { - notice( t('Failed to remove event' ) . EOL); + notice(t('Failed to remove event' ) . EOL); } else { - info( t('Event removed') . EOL); + info(t('Event removed') . EOL); } goaway(App::get_baseurl() . '/events'); - } } From e1d22ef5d4333cff860079c92fea92d82fe58fda Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 17 Mar 2017 19:10:48 +0100 Subject: [PATCH 04/21] some code cleanup --- mod/events.php | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/mod/events.php b/mod/events.php index d66ae764cf..8e34b15681 100644 --- a/mod/events.php +++ b/mod/events.php @@ -14,7 +14,7 @@ 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') { return; @@ -34,7 +34,7 @@ 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; @@ -53,20 +53,15 @@ function events_post(App $a) { // The default setting for the `private` field in event_store() is false, so mirror that $private_event = false; + $start = '0000-00-00 00:00:00'; + $finish = '0000-00-00 00:00:00'; + 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) { @@ -103,7 +98,7 @@ function events_post(App $a) { goaway($onerror_url); } - if ((! $summary) || (! $start)) { + if ((! $summary) || ($start === '0000-00-00 00:00:00')) { notice(t('Event title and start time are required.') . EOL); if (intval($_REQUEST['preview'])) { echo t('Event title and start time are required.'); @@ -184,8 +179,6 @@ function events_post(App $a) { goaway($_SESSION['return_url']); } - - function events_content(App $a) { if (! local_user()) { @@ -239,8 +232,6 @@ function events_content(App $a) { $tabs = profile_tabs($a, true); } - - $mode = 'view'; $y = 0; $m = 0; @@ -425,9 +416,6 @@ function events_content(App $a) { 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') { $n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : ''); $a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : ''); @@ -439,7 +427,6 @@ function events_content(App $a) { $cid = ((x($orig_event)) ? $orig_event['cid'] : 0); $uri = ((x($orig_event)) ? $orig_event['uri'] : ''); - if (! x($orig_event)) { $sh_checked = ''; } else { @@ -450,7 +437,6 @@ function events_content(App $a) { $sh_checked .= ' disabled="disabled" '; } - $sdt = ((x($orig_event)) ? $orig_event['start'] : 'now'); $fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now'); From 497df57ef7581855e3d813e6a07a3d584b91f1d9 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 18 Mar 2017 04:41:54 +0100 Subject: [PATCH 05/21] more standards work --- include/event.php | 385 ++++++++++++++++++++++++++-------------------- mod/events.php | 8 +- 2 files changed, 225 insertions(+), 168 deletions(-) diff --git a/include/event.php b/include/event.php index d9b89a7c63..82d5a1ec58 100644 --- 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 = "

".bbcode($ev['summary'])."

"; + $o = "

" . bbcode($ev['summary']) . "

"; - $o .= "

".bbcode($ev['desc'])."

"; + $o .= "

" . bbcode($ev['desc']) . "

"; - $o .= "

".t('Starts:')."

".$event_start."

"; + $o .= "

" . t('Starts:') . "

" . $event_start . "

"; - if(! $ev['nofinish']) - $o .= "

".t('Finishes:')."

".$event_end."

"; + if (! $ev['nofinish']) { + $o .= "

" . t('Finishes:') . "

" . $event_end ."

"; + } - if(strlen($ev['location'])) - $o .= "

".t('Location:')."

".$ev['location']."

"; + if (strlen($ev['location'])) { + $o .= "

" . t('Location:') . "

" . $ev['location'] . "

"; + } return $o; } @@ -44,31 +47,34 @@ function format_event_html($ev, $simple = false) { $o = '
' . "\r\n"; - $o .= '

' . bbcode($ev['summary']) . '

' . "\r\n"; + $o .= '

' . bbcode($ev['summary']) . '

' . "\r\n"; - $o .= '

' . bbcode($ev['desc']) . '

' . "\r\n"; + $o .= '

' . bbcode($ev['desc']) . '

' . "\r\n"; $o .= '

' . t('Starts:') . ' '.$event_start . '

' . "\r\n"; - if(! $ev['nofinish']) + if (! $ev['nofinish']) { $o .= '

' . t('Finishes:') . ' '.$event_end - . '

' . "\r\n"; + . '

' . "\r\n"; + } - if(strlen($ev['location'])){ + if (strlen($ev['location'])) { $o .= '

' . t('Location:') . ' ' . bbcode($ev['location']) . '

' . "\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 .= '
' . "\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)) - $ev['desc'] = $match[1]; - $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)) - $ev['finish'] = $match[1]; - $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)) - $ev['adjust'] = $match[1]; - $ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0); - return $ev; + } + $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)) { + $ev['start'] = $match[1]; + } + + $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)) { + $ev['location'] = $match[1]; + } + + $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; } @@ -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,37 +259,39 @@ 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 - if($arr['id']) { + if ($arr['id']) { // has the event actually changed? @@ -272,7 +299,7 @@ function event_store($arr) { intval($arr['id']), intval($arr['uid']) ); - if((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) { + if ((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) { // Nothing has changed. Grab the item id to return. @@ -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 .= '' . xmlify(format_event_bbcode($arr)) . ''; $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'] = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($arr['uri']) . ''; + $item_arr['object'] = '' . xmlify(ACTIVITY_OBJ_EVENT) . '' . xmlify($arr['uri']) . ''; $item_arr['object'] .= '' . xmlify(format_event_bbcode($event)) . ''; $item_arr['object'] .= '' . "\n"; @@ -412,7 +440,7 @@ function event_store($arr) { // $plink = App::get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id; - if($item_id) { + if ($item_id) { //q("UPDATE `item` SET `plink` = '%s', `event-id` = %d WHERE `uid` = %d AND `id` = %d", // dbesc($plink), // intval($event['id']), @@ -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` @@ -602,13 +641,12 @@ function process_events($arr) { $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']){ + 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')); } - $is_first = ($d !== $last_date); $last_date = $d; @@ -630,20 +668,20 @@ function process_events($arr) { $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, + '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'), '', ''), + 'j' => $j, + 'd' => $d, + 'edit' => $edit, + 'drop' => $drop, + 'is_first' => $is_first, + 'item' => $rr, + 'html' => $html, + 'plink' => array($rr['plink'], t('link to source'), '', ''), ); } } @@ -661,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 @@ -700,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,16 +807,18 @@ function event_format_export ($events, $format = 'ical', $timezone) { * @return array Query results */ function events_by_uid($uid = 0, $sql_extra = '') { - if($uid == 0) + if ($uid == 0) { return; + } // The permission condition if no condition was transmitted - if($sql_extra == '') + if($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 ", @@ -781,8 +831,9 @@ function events_by_uid($uid = 0, $sql_extra = '') { ); } - if (dbm::is_result($r)) + if (dbm::is_result($r)) { return $r; + } } /** @@ -801,25 +852,28 @@ 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)) + 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 - if(count($events)) + // 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); + } // If there are results the precess was successfull - if(x($res)) + if (x($res)) { $process = true; + } - // get the file extension for the format + // Get the file extension for the format switch ($format) { case "ical": $file_ext = "ics"; @@ -834,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; @@ -860,8 +914,9 @@ function widget_events() { // The permission testing is a little bit tricky because we have to respect many cases // It's not the private events page (we don't get the $owner_uid for /events) - if(! local_user() && ! $owner_uid) + if (! local_user() && ! $owner_uid) { return; + } // Cal logged in user (test permission at foreign profile page) // If the $owner uid is available we know it is part of one of the profile pages (like /cal) @@ -869,13 +924,15 @@ function widget_events() { // or a foreign one. For foreign profile pages we need to check if the feature // for exporting the cal is enabled (otherwise the widget would appear for logged in users // on foreigen profile pages even if the widget is disabled) - if(intval($owner_uid) && local_user() !== $owner_uid && ! feature_enabled($owner_uid, "export_calendar")) + if (intval($owner_uid) && local_user() !== $owner_uid && ! feature_enabled($owner_uid, "export_calendar")) { return; + } // If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and // export feature isn't enabled - if(intval($owner_uid) && ! local_user() && ! feature_enabled($owner_uid, "export_calendar")) + if (intval($owner_uid) && ! local_user() && ! feature_enabled($owner_uid, "export_calendar")) { return; + } return replace_macros(get_markup_template("events_aside.tpl"), array( '$etitle' => t("Export"), diff --git a/mod/events.php b/mod/events.php index 8e34b15681..bcf80dd1c7 100644 --- a/mod/events.php +++ b/mod/events.php @@ -237,12 +237,12 @@ function events_content(App $a) { $m = 0; $ignored = ((x($_REQUEST, 'ignored')) ? intval($_REQUEST['ignored']) : 0); - if($a->argc > 1) { + 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') { + if ($a->argc > 2 && $a->argv[1] == 'drop') { $mode = 'drop'; $event_id = intval($a->argv[2]); } @@ -321,7 +321,7 @@ function events_content(App $a) { ); // 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); @@ -352,7 +352,7 @@ function events_content(App $a) { killme(); } - if (x($_GET, 'id')){ + if (x($_GET, 'id')) { $tpl = get_markup_template("event.tpl"); } else { $tpl = get_markup_template("events_js.tpl"); From a2a171af06f5cdaa37623dff9bb714bf2a05d22d Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 18 Mar 2017 08:50:27 +0000 Subject: [PATCH 06/21] "dob" is not a date field, so the changes are reverted --- include/datetime.php | 6 +++--- include/dfrn.php | 2 +- include/diaspora.php | 2 +- include/identity.php | 2 +- mod/profiles.php | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/datetime.php b/include/datetime.php index 601b4decf4..fd60f5fd96 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -126,7 +126,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d // add 32 days so that we at least get year 00, and then hack around the fact that // months and days always start with 1. - if(substr($s,0,10) <= '0001-01-01') { + if(substr($s,0,10) == '0000-00-00') { $d = new DateTime($s . ' + 32 days', new DateTimeZone('UTC')); return str_replace('1','0',$d->format($fmt)); } @@ -171,7 +171,7 @@ function dob($dob) { $f = get_config('system','birthday_input_format'); if(! $f) $f = 'ymd'; - if($dob <= '0001-01-01') + if($dob == '0000-00-00') $value = ''; else $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d')); @@ -553,7 +553,7 @@ function update_contact_birthdays() { // This only handles foreign or alien networks where a birthday has been provided. // In-network birthdays are handled within local_delivery - $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` >= '0001-01-01' AND SUBSTRING(`bd`,1,4) != `bdyear` "); + $r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` != '0000-00-00' AND SUBSTRING(`bd`,1,4) != `bdyear` "); if (dbm::is_result($r)) { foreach ($r as $rr) { diff --git a/include/dfrn.php b/include/dfrn.php index 39372aef14..de64c37d67 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -1094,7 +1094,7 @@ class dfrn { return 3; } - if($contact['term-date'] != '0000-00-00 00:00:00') { + 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/diaspora.php b/include/diaspora.php index 302492efea..eca22092d8 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -3574,7 +3574,7 @@ class Diaspora { if ($searchable === 'true') { $dob = '1000-00-00'; - if (($profile['dob']) && ($profile['dob'] > '0001-01-01')) + if (($profile['dob']) && ($profile['dob'] != '0000-00-00')) $dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC','UTC',$profile['dob'],'m-d'); $about = $profile['about']; diff --git a/include/identity.php b/include/identity.php index 670337e087..8138e9b046 100644 --- a/include/identity.php +++ b/include/identity.php @@ -628,7 +628,7 @@ function advanced_profile(App $a) { if($a->profile['gender']) $profile['gender'] = array( t('Gender:'), $a->profile['gender'] ); - if(($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) { + if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { $year_bd_format = t('j F, Y'); $short_bd_format = t('j F'); diff --git a/mod/profiles.php b/mod/profiles.php index 4ec4538389..bf6e828b61 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -191,21 +191,21 @@ function profiles_post(App $a) { return; } - $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0001-01-01'; // FIXME: Needs to be validated? + $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated? $y = substr($dob,0,4); if((! ctype_digit($y)) || ($y < 1900)) $ignore_year = true; else $ignore_year = false; - if($dob > '0001-01-01') { - if(strpos($dob,'000') === 0) { + if($dob != '0000-00-00') { + if(strpos($dob,'0000-') === 0) { $ignore_year = true; $dob = substr($dob,5); } $dob = datetime_convert('UTC','UTC',(($ignore_year) ? '1900-' . $dob : $dob),(($ignore_year) ? 'm-d' : 'Y-m-d')); if($ignore_year) - $dob = '0001-' . $dob; + $dob = '0000-' . $dob; } $name = notags(trim($_POST['name'])); From 62ccb4499a06205910d954a97f0ef9913f6a93af Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 18 Mar 2017 08:54:25 +0000 Subject: [PATCH 07/21] Some more unneeded changes reverted --- include/Contact.php | 6 +++--- mod/hovercard.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 3d4040317f..1e393895fb 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -254,7 +254,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) { // "bd" always contains the upcoming birthday of a contact. // "birthday" might contain the birthday including the year of birth. - if ($profile["birthday"] >= "0001-01-01") { + if ($profile["birthday"] != "0000-00-00") { $bd_timestamp = strtotime($profile["birthday"]); $month = date("m", $bd_timestamp); $day = date("d", $bd_timestamp); @@ -271,7 +271,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) { $profile["bd"] = (++$current_year)."-".$month."-".$day; } } else { - $profile["bd"] = "0001-01-01"; + $profile["bd"] = "0000-00-00"; } } else { $profile = $default; @@ -307,7 +307,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) { $profile["location"] = ""; $profile["about"] = ""; $profile["gender"] = ""; - $profile["birthday"] = "0001-01-01"; + $profile["birthday"] = "0000-00-00"; } $cache[$url][$uid] = $profile; diff --git a/mod/hovercard.php b/mod/hovercard.php index ea1036b898..ec749db208 100644 --- a/mod/hovercard.php +++ b/mod/hovercard.php @@ -75,7 +75,7 @@ function hovercard_content() { 'tags' => $contact["keywords"], // 'nsfw' => intval($contact["nsfw"]), // 'server_url' => $contact["server_url"], - 'bd' => (($contact["birthday"] <= "0001-01-01") ? "" : $contact["birthday"]), + 'bd' => (($contact["birthday"] == "0000-00-00") ? "" : $contact["birthday"]), // 'generation' => $contact["generation"], 'account_type' => account_type($contact), 'actions' => $actions, From 222550e784fdcea6c3133cc4754b1fd469e9fef6 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 18 Mar 2017 11:42:54 +0000 Subject: [PATCH 08/21] From now on we are using 0001-01-01 as lowest date --- boot.php | 5 +- database.sql | 126 ++++++++++++++++++++++++------------------------ include/dbm.php | 13 ++--- update.php | 2 +- 4 files changed, 69 insertions(+), 77 deletions(-) diff --git a/boot.php b/boot.php index d17e984b12..7628e40741 100644 --- 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. @@ -445,8 +445,7 @@ define('SR_SCOPE_TAGS', 'tags'); * Lowest possible date time value */ -//define ('NULL_DATE', '0001-01-01 00:00:00'); -define ('NULL_DATE', '0000-00-00 00:00:00'); +define ('NULL_DATE', '0001-01-01 00:00:00'); // Normally this constant is defined - but not if "pcntl" isn't installed diff --git a/database.sql b/database.sql index c7ab893d72..7ed19f439c 100644 --- 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/dbm.php b/include/dbm.php index eb3e2d0382..d28d49d63b 100644 --- a/include/dbm.php +++ b/include/dbm.php @@ -96,17 +96,10 @@ class dbm { public static function date($date = 'now') { $timestamp = strtotime($date); - // Workaround for 3.5.1 - if ($timestamp < -62135596800) { - return NULL_DATE; - } - - // 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; - //} + if ($timestamp < -62135596800) { + $timestamp = -62135596800; + } return date('Y-m-d H:i:s', $timestamp); } diff --git a/update.php b/update.php index b15f7b099f..3bce492682 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ Date: Sat, 18 Mar 2017 12:13:43 +0000 Subject: [PATCH 09/21] Some standards --- include/Contact.php | 2 +- include/datetime.php | 2 +- include/dfrn.php | 2 +- include/security.php | 2 +- mod/contacts.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index 1e393895fb..fc9f660f13 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -127,7 +127,7 @@ function mark_for_death($contact) { if($contact['archive']) return; - if($contact['term-date'] <= NULL_DATE) { + if ($contact['term-date'] <= NULL_DATE) { q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d", dbesc(datetime_convert()), intval($contact['id']) diff --git a/include/datetime.php b/include/datetime.php index fd60f5fd96..9e1d4b55c9 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -171,7 +171,7 @@ function dob($dob) { $f = get_config('system','birthday_input_format'); if(! $f) $f = 'ymd'; - if($dob == '0000-00-00') + if($dob === '0000-00-00') $value = ''; else $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d')); diff --git a/include/dfrn.php b/include/dfrn.php index de64c37d67..25f8c9358e 100644 --- a/include/dfrn.php +++ b/include/dfrn.php @@ -1094,7 +1094,7 @@ class dfrn { return 3; } - if($contact['term-date'] > NULL_DATE) { + 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/security.php b/include/security.php index a9d2f83de8..05371f71ca 100644 --- a/include/security.php +++ b/include/security.php @@ -55,7 +55,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive $a->user = $user_record; if($interactive) { - if($a->user['login_date'] <= NULL_DATE) { + if ($a->user['login_date'] <= NULL_DATE) { $_SESSION['return_url'] = 'profile_photo/new'; $a->module = 'profile_photo'; info( t("Welcome ") . $a->user['username'] . EOL); diff --git a/mod/contacts.php b/mod/contacts.php index 5fdcb7036d..0569c8ca4e 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -538,7 +538,7 @@ function contacts_content(App $a) { ? t('Never') : datetime_convert('UTC',date_default_timezone_get(),$contact['last-update'],'D, j M Y, g:i A')); - if($contact['last-update'] > NULL_DATE) + 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') : ''); From fb5f1f61fc0939666c0d1c0d6e0ca6e14eeca416 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 18 Mar 2017 23:32:59 +0000 Subject: [PATCH 10/21] You shoudln't use a text variable like an array. --- include/text.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/text.php b/include/text.php index 6619dec93a..4a23b7ac37 100644 --- a/include/text.php +++ b/include/text.php @@ -903,10 +903,10 @@ function contact_block() { intval($shown) ); if (dbm::is_result($r)) { - $contacts = ""; - foreach ($r AS $contact) + $contacts = array(); + foreach ($r AS $contact) { $contacts[] = $contact["id"]; - + } $r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)", dbesc(implode(",", $contacts))); From 132688d6635c5a3971944506c0596fff193f40df Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 19 Mar 2017 08:04:04 +0000 Subject: [PATCH 11/21] Standards, what else? --- boot.php | 4 ++-- include/cron.php | 6 ++++-- include/poller.php | 15 ++++++++------- include/socgraph.php | 23 ++++++++++++----------- mod/contacts.php | 8 ++++---- mod/profiles.php | 6 +++--- 6 files changed, 33 insertions(+), 29 deletions(-) diff --git a/boot.php b/boot.php index 7628e40741..6f036d846e 100644 --- a/boot.php +++ b/boot.php @@ -449,9 +449,9 @@ 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. diff --git a/include/cron.php b/include/cron.php index 7b261aabff..93ea167c38 100644 --- a/include/cron.php +++ b/include/cron.php @@ -214,11 +214,13 @@ function cron_poll_contacts($argc, $argv) { $xml = false; - if($manual_id) + 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/poller.php b/include/poller.php index 487c86ab30..3124c40a7a 100644 --- a/include/poller.php +++ b/include/poller.php @@ -364,11 +364,11 @@ function poller_kill_stale_workers() { return; } - foreach($r AS $pid) - if (!posix_kill($pid["pid"], 0)) + foreach ($r AS $pid) { + if (!posix_kill($pid["pid"], 0)) { q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = 0 WHERE `pid` = %d", dbesc(NULL_DATE), intval($pid["pid"])); - else { + } else { // Kill long running processes // Check if the priority is in a valid range @@ -400,6 +400,7 @@ function poller_kill_stale_workers() { } else logger("Worker process ".$pid["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG); } + } } /** @@ -558,9 +559,9 @@ function poller_worker_process() { ORDER BY `priority`, `created` LIMIT 1", dbesc(NULL_DATE), intval($highest_priority)); - if (dbm::is_result($r)) + if (dbm::is_result($r)) { return $r; - + } // Give slower processes some processing time $r = q("SELECT * FROM `workerqueue` WHERE `executed` <= '%s' AND `priority` > %d @@ -570,9 +571,9 @@ function poller_worker_process() { } // 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)) + 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/socgraph.php b/include/socgraph.php index e0d6b156a3..d9fd6f8be8 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -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 <= NULL_DATE) + } + if ($updated <= NULL_DATE) { $updated = $x[0]["updated"]; - + } $created = $x[0]["created"]; $server_url = $x[0]["server_url"]; $nick = $x[0]["nick"]; @@ -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"] <= NULL_DATE) + 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) + 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"] <= NULL_DATE) + 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"]; diff --git a/mod/contacts.php b/mod/contacts.php index 0569c8ca4e..f2500099c3 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -538,9 +538,9 @@ function contacts_content(App $a) { ? t('Never') : datetime_convert('UTC',date_default_timezone_get(),$contact['last-update'],'D, j M Y, g:i A')); - if ($contact['last-update'] > NULL_DATE) + 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)); @@ -560,10 +560,10 @@ function contacts_content(App $a) { $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))) $poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled)); diff --git a/mod/profiles.php b/mod/profiles.php index bf6e828b61..4e82ceaacd 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -233,11 +233,11 @@ function profiles_post(App $a) { $with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : ''); - if(! strlen($howlong)) + if(! strlen($howlong)) { $howlong = NULL_DATE; - else + } else { $howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong); - + } // linkify the relationship target if applicable $withchanged = false; From 8dd732a89695c33952130780d4b646798ba3fde2 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 19 Mar 2017 13:24:07 +0000 Subject: [PATCH 12/21] Issue 3242: Define a maintenance reason --- include/dbstructure.php | 9 ++++++--- mod/maintenance.php | 5 ++++- util/maintenance.php | 34 +++++++++++++++++++++++++++------- view/templates/maintenance.tpl | 3 ++- 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/include/dbstructure.php b/include/dbstructure.php index c1ed4bb986..732d3577e9 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -144,7 +144,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 +362,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; } diff --git a/mod/maintenance.php b/mod/maintenance.php index dcdc44194e..98155b93ad 100644 --- a/mod/maintenance.php +++ b/mod/maintenance.php @@ -1,11 +1,14 @@ t('System down for maintenance') + '$sysdown' => t('System down for maintenance'), + '$reason' => Config::get('system', 'maintenance_reason') )); } diff --git a/util/maintenance.php b/util/maintenance.php index 28f3a503ad..a49bf01ac6 100644 --- a/util/maintenance.php +++ b/util/maintenance.php @@ -17,17 +17,37 @@ unset($db_host, $db_user, $db_pass, $db_data); Config::load(); $maint_mode = 1; -if($argc > 1) +if($argc > 1) { $maint_mode = intval($argv[1]); -set_config('system', 'maintenance', $maint_mode); +} -if($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"; -else +} else { $mode_str = "normal mode"; +} + +echo "\n\tSystem set in $mode_str\n"; + +if ($reason != '') { + echo "\tMaintenance reason: $reason\n\n"; +} else { + echo "\n"; +} -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]} [1] [Maintenance reason]\tSet the system in maintenance mode\n"; echo "\tphp {$argv[0]} 0 \tSet the system in normal mode\n\n"; - diff --git a/view/templates/maintenance.tpl b/view/templates/maintenance.tpl index f43da542f8..e26af299f8 100644 --- a/view/templates/maintenance.tpl +++ b/view/templates/maintenance.tpl @@ -1,2 +1,3 @@ -
{{$sysdown}}
+

{{$sysdown}}

+
{{$reason}}
From e93825b9f024f9c5ee43739b10b876c57c80011a Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 19 Mar 2017 14:43:24 +0000 Subject: [PATCH 13/21] Some more standards --- include/cron.php | 2 +- include/poller.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/cron.php b/include/cron.php index 93ea167c38..ca9b5dff25 100644 --- a/include/cron.php +++ b/include/cron.php @@ -222,7 +222,7 @@ function cron_poll_contacts($argc, $argv) { $contact['priority'] = 2; } - if($contact['subhub'] AND in_array($contact['network'], array(NETWORK_DFRN, NETWORK_ZOT, NETWORK_OSTATUS))) { + 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. // (You can make this more or less frequent if desired by setting 'pushpoll_frequency' appropriately) // This also lets us update our subscription to the hub, and add or replace hubs in case it diff --git a/include/poller.php b/include/poller.php index 3124c40a7a..5560b3340e 100644 --- a/include/poller.php +++ b/include/poller.php @@ -397,8 +397,9 @@ function poller_kill_stale_workers() { dbesc(datetime_convert()), intval(PRIORITY_NEGLIGIBLE), intval($pid["pid"])); - } else + } else { logger("Worker process ".$pid["pid"]." (".implode(" ", $argv).") now runs for ".round($duration)." of ".$max_duration." allowed minutes. That's okay.", LOGGER_DEBUG); + } } } } From 51f93346d6927603c04a52611045c8388ad9279f Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 19 Mar 2017 14:57:36 +0000 Subject: [PATCH 14/21] Standards, like always --- util/maintenance.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/maintenance.php b/util/maintenance.php index a49bf01ac6..b313783a7d 100644 --- a/util/maintenance.php +++ b/util/maintenance.php @@ -17,13 +17,13 @@ unset($db_host, $db_user, $db_pass, $db_data); Config::load(); $maint_mode = 1; -if($argc > 1) { +if ($argc > 1) { $maint_mode = intval($argv[1]); } Config::set('system', 'maintenance', $maint_mode); -if($maint_mode AND ($argc > 2)) { +if ($maint_mode AND ($argc > 2)) { $reason_arr = $argv; array_shift($reason_arr); array_shift($reason_arr); @@ -34,7 +34,7 @@ if($maint_mode AND ($argc > 2)) { Config::set('system', 'maintenance_reason', ''); } -if($maint_mode) { +if ($maint_mode) { $mode_str = "maintenance mode"; } else { $mode_str = "normal mode"; From 24ee60492b21b85c9bf1288e43c774d5cfa8243e Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 19 Mar 2017 19:03:09 +0000 Subject: [PATCH 15/21] If the maintenance reason is a url, then redirect to this address --- mod/maintenance.php | 11 ++++++++++- util/maintenance.php | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mod/maintenance.php b/mod/maintenance.php index 98155b93ad..c4839de792 100644 --- a/mod/maintenance.php +++ b/mod/maintenance.php @@ -3,12 +3,21 @@ 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'), - '$reason' => Config::get('system', 'maintenance_reason') + '$reason' => $reason )); } diff --git a/util/maintenance.php b/util/maintenance.php index b313783a7d..650dade700 100644 --- a/util/maintenance.php +++ b/util/maintenance.php @@ -49,5 +49,5 @@ if ($reason != '') { } echo "Usage:\n\n"; -echo "\tphp {$argv[0]} [1] [Maintenance reason]\tSet the system in maintenance mode\n"; +echo "\tphp {$argv[0]} [1] [Maintenance reason|redirection url]\tSet the system in maintenance mode\n"; echo "\tphp {$argv[0]} 0 \tSet the system in normal mode\n\n"; From b42a977894a111b5f96bc8659f1d7f81f94a996c Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 19 Mar 2017 22:58:35 +0000 Subject: [PATCH 16/21] Bugfix for issue 3242 - forgotten "use" --- include/dbstructure.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dbstructure.php b/include/dbstructure.php index 146baff549..48cc02d2d1 100644 --- a/include/dbstructure.php +++ b/include/dbstructure.php @@ -1,4 +1,7 @@ Date: Mon, 20 Mar 2017 04:37:13 +0000 Subject: [PATCH 17/21] Enhanced explanation --- util/maintenance.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/util/maintenance.php b/util/maintenance.php index 650dade700..5d0c62196c 100644 --- a/util/maintenance.php +++ b/util/maintenance.php @@ -21,7 +21,7 @@ if ($argc > 1) { $maint_mode = intval($argv[1]); } -Config::set('system', 'maintenance', $maint_mode); +//Config::set('system', 'maintenance', $maint_mode); if ($maint_mode AND ($argc > 2)) { $reason_arr = $argv; @@ -49,5 +49,14 @@ if ($reason != '') { } echo "Usage:\n\n"; -echo "\tphp {$argv[0]} [1] [Maintenance reason|redirection url]\tSet the system in maintenance mode\n"; -echo "\tphp {$argv[0]} 0 \tSet the system in normal mode\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"; From 62915007c6871c1376935fa1a7751d751170b00d Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 20 Mar 2017 04:37:59 +0000 Subject: [PATCH 18/21] Test code removed --- util/maintenance.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/maintenance.php b/util/maintenance.php index 5d0c62196c..614344ab93 100644 --- a/util/maintenance.php +++ b/util/maintenance.php @@ -21,7 +21,7 @@ if ($argc > 1) { $maint_mode = intval($argv[1]); } -//Config::set('system', 'maintenance', $maint_mode); +Config::set('system', 'maintenance', $maint_mode); if ($maint_mode AND ($argc > 2)) { $reason_arr = $argv; From 8bd8e858d06bd68c1125c7182e423429650f0c79 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 20 Mar 2017 08:27:10 +0100 Subject: [PATCH 19/21] regenerated master messages.po file --- util/messages.po | 12329 ++++++++++++++++++++++----------------------- 1 file changed, 6098 insertions(+), 6231 deletions(-) diff --git a/util/messages.po b/util/messages.po index 150e2efaa0..4fcfa9b16b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 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 \n" "Language-Team: LANGUAGE \n" @@ -18,238 +18,132 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" -#: include/profile_selectors.php:6 -msgid "Male" +#: boot.php:976 +msgid "Delete this item?" msgstr "" -#: include/profile_selectors.php:6 -msgid "Female" +#: 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:6 -msgid "Currently Male" +#: boot.php:978 +msgid "show fewer" msgstr "" -#: include/profile_selectors.php:6 -msgid "Currently Female" +#: boot.php:1667 +#, php-format +msgid "Update %s failed. See error logs." msgstr "" -#: include/profile_selectors.php:6 -msgid "Mostly Male" +#: boot.php:1779 +msgid "Create a New Account" msgstr "" -#: include/profile_selectors.php:6 -msgid "Mostly Female" +#: boot.php:1780 include/nav.php:109 mod/register.php:289 +msgid "Register" msgstr "" -#: include/profile_selectors.php:6 -msgid "Transgender" +#: boot.php:1804 include/nav.php:78 view/theme/frio/theme.php:243 +msgid "Logout" msgstr "" -#: include/profile_selectors.php:6 -msgid "Intersex" +#: boot.php:1805 include/nav.php:95 mod/bookmarklet.php:12 +msgid "Login" msgstr "" -#: include/profile_selectors.php:6 -msgid "Transsexual" +#: boot.php:1807 mod/lostpass.php:161 +msgid "Nickname or Email: " msgstr "" -#: include/profile_selectors.php:6 -msgid "Hermaphrodite" +#: boot.php:1808 +msgid "Password: " msgstr "" -#: include/profile_selectors.php:6 -msgid "Neuter" +#: boot.php:1809 +msgid "Remember me" msgstr "" -#: include/profile_selectors.php:6 -msgid "Non-specific" +#: boot.php:1812 +msgid "Or login using OpenID: " msgstr "" -#: include/profile_selectors.php:6 -msgid "Other" +#: boot.php:1818 +msgid "Forgot your password?" 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" +#: boot.php:1819 mod/lostpass.php:110 +msgid "Password Reset" msgstr "" -#: include/profile_selectors.php:23 -msgid "Females" +#: boot.php:1821 +msgid "Website Terms of Service" msgstr "" -#: include/profile_selectors.php:23 -msgid "Gay" +#: boot.php:1822 +msgid "terms of service" msgstr "" -#: include/profile_selectors.php:23 -msgid "Lesbian" +#: boot.php:1824 +msgid "Website Privacy Policy" msgstr "" -#: include/profile_selectors.php:23 -msgid "No Preference" +#: boot.php:1825 +msgid "privacy policy" msgstr "" -#: include/profile_selectors.php:23 -msgid "Bisexual" +#: 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:23 -msgid "Autosexual" +#: 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:23 -msgid "Abstinent" +#: include/Contact.php:444 include/conversation.php:969 +msgid "View Status" msgstr "" -#: include/profile_selectors.php:23 -msgid "Virgin" +#: include/Contact.php:446 include/conversation.php:971 +msgid "View Photos" msgstr "" -#: include/profile_selectors.php:23 -msgid "Deviant" +#: include/Contact.php:447 include/conversation.php:972 +msgid "Network Posts" msgstr "" -#: include/profile_selectors.php:23 -msgid "Fetish" +#: include/Contact.php:448 include/conversation.php:973 +msgid "View Contact" msgstr "" -#: include/profile_selectors.php:23 -msgid "Oodles" +#: include/Contact.php:449 +msgid "Drop Contact" msgstr "" -#: include/profile_selectors.php:23 -msgid "Nonsexual" +#: include/Contact.php:450 include/conversation.php:974 +msgid "Send PM" msgstr "" -#: include/profile_selectors.php:42 -msgid "Single" +#: include/Contact.php:451 include/conversation.php:978 +msgid "Poke" msgstr "" -#: include/profile_selectors.php:42 -msgid "Lonely" +#: include/Contact.php:828 +msgid "Organisation" msgstr "" -#: include/profile_selectors.php:42 -msgid "Available" +#: include/Contact.php:831 +msgid "News" 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" +#: 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,24 +236,101 @@ msgstr "" msgid "Wall Photos" msgstr "" +#: include/acl_selectors.php:341 +msgid "Post to Email" +msgstr "" + +#: include/acl_selectors.php:346 +#, php-format +msgid "Connectors disabled, since \"%s\" is enabled." +msgstr "" + +#: include/acl_selectors.php:347 mod/settings.php:1188 +msgid "Hide your profile details from unknown viewers?" +msgstr "" + +#: include/acl_selectors.php:352 +msgid "Visible to everybody" +msgstr "" + +#: include/acl_selectors.php:353 view/theme/vier/config.php:108 +msgid "show" +msgstr "" + +#: include/acl_selectors.php:354 view/theme/vier/config.php:108 +msgid "don't show" +msgstr "" + +#: include/acl_selectors.php:360 mod/editpost.php:123 +msgid "CC: email addresses" +msgstr "" + +#: include/acl_selectors.php:361 mod/editpost.php:130 +msgid "Example: bob@example.com, mary@example.com" +msgstr "" + +#: include/acl_selectors.php:363 mod/events.php:516 mod/photos.php:1176 +#: mod/photos.php:1558 +msgid "Permissions" +msgstr "" + +#: include/acl_selectors.php:364 +msgid "Close" +msgstr "" + +#: include/api.php:1021 +#, php-format +msgid "Daily posting limit of %d posts reached. The post was rejected." +msgstr "" + +#: include/api.php:1041 +#, php-format +msgid "Weekly posting limit of %d posts reached. The post was rejected." +msgstr "" + +#: include/api.php:1062 +#, php-format +msgid "Monthly posting limit of %d posts reached. The post was rejected." +msgstr "" + #: include/auth.php:45 msgid "Logged out." msgstr "" -#: include/auth.php:116 include/auth.php:177 mod/openid.php:110 +#: include/auth.php:116 include/auth.php:178 mod/openid.php:110 msgid "Login failed." msgstr "" -#: include/auth.php:131 include/user.php:75 +#: 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/auth.php:131 include/user.php:75 +#: include/auth.php:132 include/user.php:75 msgid "The error message was:" msgstr "" +#: include/bb2diaspora.php:199 include/event.php:16 mod/localtime.php:12 +msgid "l F d, Y \\@ g:i A" +msgstr "" + +#: include/bb2diaspora.php:205 include/event.php:33 include/event.php:51 +#: include/event.php:488 +msgid "Starts:" +msgstr "" + +#: include/bb2diaspora.php:213 include/event.php:36 include/event.php:57 +#: include/event.php:489 +msgid "Finishes:" +msgstr "" + +#: 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/bbcode.php:350 include/bbcode.php:1055 include/bbcode.php:1056 msgid "Image/photo" msgstr "" @@ -383,19 +348,789 @@ msgstr "" msgid "Encrypted content" msgstr "" -#: include/bbcode.php:1167 +#: include/bbcode.php:1169 msgid "Invalid source protocol" msgstr "" -#: include/bbcode.php:1177 +#: include/bbcode.php:1179 msgid "Invalid link protocol" msgstr "" -#: include/dba_pdo.php:72 include/dba.php:56 +#: include/contact_selectors.php:32 +msgid "Unknown | Not categorised" +msgstr "" + +#: include/contact_selectors.php:33 +msgid "Block immediately" +msgstr "" + +#: include/contact_selectors.php:34 +msgid "Shady, spammer, self-marketer" +msgstr "" + +#: include/contact_selectors.php:35 +msgid "Known to me, but no opinion" +msgstr "" + +#: include/contact_selectors.php:36 +msgid "OK, probably harmless" +msgstr "" + +#: include/contact_selectors.php:37 +msgid "Reputable, has my trust" +msgstr "" + +#: include/contact_selectors.php:56 mod/admin.php:893 +msgid "Frequently" +msgstr "" + +#: include/contact_selectors.php:57 mod/admin.php:894 +msgid "Hourly" +msgstr "" + +#: include/contact_selectors.php:58 mod/admin.php:895 +msgid "Twice daily" +msgstr "" + +#: include/contact_selectors.php:59 mod/admin.php:896 +msgid "Daily" +msgstr "" + +#: include/contact_selectors.php:60 +msgid "Weekly" +msgstr "" + +#: include/contact_selectors.php:61 +msgid "Monthly" +msgstr "" + +#: include/contact_selectors.php:76 mod/dfrn_request.php:881 +msgid "Friendica" +msgstr "" + +#: include/contact_selectors.php:77 +msgid "OStatus" +msgstr "" + +#: include/contact_selectors.php:78 +msgid "RSS/Atom" +msgstr "" + +#: 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/contact_selectors.php:80 mod/dfrn_request.php:883 +#: mod/settings.php:848 +msgid "Diaspora" +msgstr "" + +#: include/contact_selectors.php:81 +msgid "Facebook" +msgstr "" + +#: include/contact_selectors.php:82 +msgid "Zot!" +msgstr "" + +#: include/contact_selectors.php:83 +msgid "LinkedIn" +msgstr "" + +#: include/contact_selectors.php:84 +msgid "XMPP/IM" +msgstr "" + +#: include/contact_selectors.php:85 +msgid "MySpace" +msgstr "" + +#: include/contact_selectors.php:87 +msgid "Google+" +msgstr "" + +#: include/contact_selectors.php:88 +msgid "pump.io" +msgstr "" + +#: include/contact_selectors.php:89 +msgid "Twitter" +msgstr "" + +#: include/contact_selectors.php:90 +msgid "Diaspora Connector" +msgstr "" + +#: include/contact_selectors.php:91 +msgid "GNU Social" +msgstr "" + +#: include/contact_selectors.php:92 +msgid "pnut" +msgstr "" + +#: include/contact_selectors.php:93 +msgid "App.net" +msgstr "" + +#: include/contact_selectors.php:104 +msgid "Hubzilla/Redmatrix" +msgstr "" + +#: include/contact_widgets.php:6 +msgid "Add New Contact" +msgstr "" + +#: include/contact_widgets.php:7 +msgid "Enter address or web location" +msgstr "" + +#: include/contact_widgets.php:8 +msgid "Example: bob@example.com, http://example.com/barbara" +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" +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" +msgstr "" + +#: include/contact_widgets.php:31 +msgid "Enter name or interest" +msgstr "" + +#: include/contact_widgets.php:33 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "" + +#: include/contact_widgets.php:34 mod/contacts.php:806 mod/directory.php:206 +msgid "Find" +msgstr "" + +#: include/contact_widgets.php:35 mod/suggest.php:114 +#: view/theme/vier/theme.php:198 +msgid "Friend Suggestions" +msgstr "" + +#: include/contact_widgets.php:36 view/theme/vier/theme.php:197 +msgid "Similar Interests" +msgstr "" + +#: include/contact_widgets.php:37 +msgid "Random Profile" +msgstr "" + +#: include/contact_widgets.php:38 view/theme/vier/theme.php:199 +msgid "Invite Friends" +msgstr "" + +#: include/contact_widgets.php:115 +msgid "Networks" +msgstr "" + +#: include/contact_widgets.php:118 +msgid "All Networks" +msgstr "" + +#: include/contact_widgets.php:150 include/features.php:104 +msgid "Saved Folders" +msgstr "" + +#: include/contact_widgets.php:153 include/contact_widgets.php:187 +msgid "Everything" +msgstr "" + +#: include/contact_widgets.php:184 +msgid "Categories" +msgstr "" + +#: include/contact_widgets.php:248 +#, php-format +msgid "%d contact in common" +msgid_plural "%d contacts in common" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:122 include/conversation.php:258 +#: include/like.php:180 include/text.php:1804 +msgid "event" +msgstr "" + +#: 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/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/conversation.php:141 include/diaspora.php:1526 include/like.php:27 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: 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/conversation.php:147 +#, php-format +msgid "%1$s attends %2$s's %3$s" +msgstr "" + +#: include/conversation.php:150 +#, php-format +msgid "%1$s doesn't attend %2$s's %3$s" +msgstr "" + +#: include/conversation.php:153 +#, php-format +msgid "%1$s attends maybe %2$s's %3$s" +msgstr "" + +#: include/conversation.php:185 mod/dfrn_confirm.php:478 +#, php-format +msgid "%1$s is now friends with %2$s" +msgstr "" + +#: include/conversation.php:219 +#, php-format +msgid "%1$s poked %2$s" +msgstr "" + +#: include/conversation.php:239 mod/mood.php:63 +#, php-format +msgid "%1$s is currently %2$s" +msgstr "" + +#: include/conversation.php:278 mod/tagger.php:95 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "" + +#: include/conversation.php:303 +msgid "post/item" +msgstr "" + +#: include/conversation.php:304 +#, php-format +msgid "%1$s marked %2$s's %3$s as favorite" +msgstr "" + +#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1629 +#: mod/profiles.php:346 +msgid "Likes" +msgstr "" + +#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1629 +#: mod/profiles.php:350 +msgid "Dislikes" +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/conversation.php:588 mod/content.php:373 mod/photos.php:1630 +msgid "Not attending" +msgstr "" + +#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1630 +msgid "Might attend" +msgstr "" + +#: include/conversation.php:710 mod/content.php:453 mod/content.php:759 +#: mod/photos.php:1703 object/Item.php:137 +msgid "Select" +msgstr "" + +#: 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/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 "View %s's profile @ %s" +msgstr "" + +#: include/conversation.php:767 object/Item.php:344 +msgid "Categories:" +msgstr "" + +#: include/conversation.php:768 object/Item.php:345 +msgid "Filed under:" +msgstr "" + +#: include/conversation.php:775 mod/content.php:497 mod/content.php:928 +#: object/Item.php:370 +#, php-format +msgid "%s from %s" +msgstr "" + +#: include/conversation.php:791 mod/content.php:513 +msgid "View in context" +msgstr "" + +#: 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/conversation.php:872 +msgid "remove" +msgstr "" + +#: include/conversation.php:876 +msgid "Delete Selected Items" +msgstr "" + +#: include/conversation.php:968 +msgid "Follow Thread" +msgstr "" + +#: include/conversation.php:1100 +#, php-format +msgid "%s likes this." +msgstr "" + +#: include/conversation.php:1103 +#, php-format +msgid "%s doesn't like this." +msgstr "" + +#: include/conversation.php:1106 +#, php-format +msgid "%s attends." +msgstr "" + +#: include/conversation.php:1109 +#, php-format +msgid "%s doesn't attend." +msgstr "" + +#: include/conversation.php:1112 +#, php-format +msgid "%s attends maybe." +msgstr "" + +#: include/conversation.php:1122 +msgid "and" +msgstr "" + +#: include/conversation.php:1128 +#, php-format +msgid ", and %d other people" +msgstr "" + +#: include/conversation.php:1137 +#, php-format +msgid "%2$d people like this" +msgstr "" + +#: include/conversation.php:1138 +#, php-format +msgid "%s like this." +msgstr "" + +#: include/conversation.php:1141 +#, php-format +msgid "%2$d people don't like this" +msgstr "" + +#: include/conversation.php:1142 +#, php-format +msgid "%s don't like this." +msgstr "" + +#: include/conversation.php:1145 +#, php-format +msgid "%2$d people attend" +msgstr "" + +#: include/conversation.php:1146 +#, php-format +msgid "%s attend." +msgstr "" + +#: include/conversation.php:1149 +#, php-format +msgid "%2$d people don't attend" +msgstr "" + +#: include/conversation.php:1150 +#, php-format +msgid "%s don't attend." +msgstr "" + +#: include/conversation.php:1153 +#, php-format +msgid "%2$d people attend maybe" +msgstr "" + +#: include/conversation.php:1154 +#, php-format +msgid "%s anttend maybe." +msgstr "" + +#: include/conversation.php:1184 include/conversation.php:1200 +msgid "Visible to everybody" +msgstr "" + +#: 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/conversation.php:1186 include/conversation.php:1202 +msgid "Please enter a video link/URL:" +msgstr "" + +#: include/conversation.php:1187 include/conversation.php:1203 +msgid "Please enter an audio link/URL:" +msgstr "" + +#: include/conversation.php:1188 include/conversation.php:1204 +msgid "Tag term:" +msgstr "" + +#: include/conversation.php:1189 include/conversation.php:1205 +#: mod/filer.php:30 +msgid "Save to Folder:" +msgstr "" + +#: include/conversation.php:1190 include/conversation.php:1206 +msgid "Where are you right now?" +msgstr "" + +#: include/conversation.php:1191 +msgid "Delete item(s)?" +msgstr "" + +#: include/conversation.php:1237 +msgid "Share" +msgstr "" + +#: 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/conversation.php:1239 mod/editpost.php:101 +msgid "upload photo" +msgstr "" + +#: include/conversation.php:1240 mod/editpost.php:102 +msgid "Attach file" +msgstr "" + +#: include/conversation.php:1241 mod/editpost.php:103 +msgid "attach file" +msgstr "" + +#: 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/conversation.php:1243 mod/editpost.php:105 +msgid "web link" +msgstr "" + +#: include/conversation.php:1244 mod/editpost.php:106 +msgid "Insert video link" +msgstr "" + +#: include/conversation.php:1245 mod/editpost.php:107 +msgid "video link" +msgstr "" + +#: include/conversation.php:1246 mod/editpost.php:108 +msgid "Insert audio link" +msgstr "" + +#: include/conversation.php:1247 mod/editpost.php:109 +msgid "audio link" +msgstr "" + +#: include/conversation.php:1248 mod/editpost.php:110 +msgid "Set your location" +msgstr "" + +#: include/conversation.php:1249 mod/editpost.php:111 +msgid "set location" +msgstr "" + +#: include/conversation.php:1250 mod/editpost.php:112 +msgid "Clear browser location" +msgstr "" + +#: include/conversation.php:1251 mod/editpost.php:113 +msgid "clear location" +msgstr "" + +#: include/conversation.php:1253 mod/editpost.php:127 +msgid "Set title" +msgstr "" + +#: include/conversation.php:1255 mod/editpost.php:129 +msgid "Categories (comma-separated list)" +msgstr "" + +#: include/conversation.php:1257 mod/editpost.php:115 +msgid "Permission settings" +msgstr "" + +#: include/conversation.php:1258 mod/editpost.php:144 +msgid "permissions" +msgstr "" + +#: include/conversation.php:1266 mod/editpost.php:124 +msgid "Public post" +msgstr "" + +#: 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/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/conversation.php:1281 +msgid "Post to Groups" +msgstr "" + +#: include/conversation.php:1282 +msgid "Post to Contacts" +msgstr "" + +#: include/conversation.php:1283 +msgid "Private post" +msgstr "" + +#: include/conversation.php:1288 include/identity.php:259 mod/editpost.php:142 +msgid "Message" +msgstr "" + +#: include/conversation.php:1289 mod/editpost.php:143 +msgid "Browser" +msgstr "" + +#: include/conversation.php:1445 +msgid "View all" +msgstr "" + +#: include/conversation.php:1467 +msgid "Like" +msgid_plural "Likes" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1470 +msgid "Dislike" +msgid_plural "Dislikes" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1476 +msgid "Not Attending" +msgid_plural "Not Attending" +msgstr[0] "" +msgstr[1] "" + +#: include/conversation.php:1479 include/profile_selectors.php:6 +msgid "Undecided" +msgid_plural "Undecided" +msgstr[0] "" +msgstr[1] "" + +#: include/datetime.php:58 include/datetime.php:60 mod/profiles.php:697 +msgid "Miscellaneous" +msgstr "" + +#: include/datetime.php:184 include/identity.php:641 +msgid "Birthday:" +msgstr "" + +#: include/datetime.php:186 mod/profiles.php:720 +msgid "Age: " +msgstr "" + +#: include/datetime.php:188 +msgid "YYYY-MM-DD or MM-DD" +msgstr "" + +#: include/datetime.php:343 +msgid "never" +msgstr "" + +#: include/datetime.php:349 +msgid "less than a second ago" +msgstr "" + +#: include/datetime.php:352 +msgid "year" +msgstr "" + +#: include/datetime.php:352 +msgid "years" +msgstr "" + +#: include/datetime.php:353 include/event.php:481 mod/cal.php:279 +#: mod/events.php:396 +msgid "month" +msgstr "" + +#: include/datetime.php:353 +msgid "months" +msgstr "" + +#: include/datetime.php:354 include/event.php:482 mod/cal.php:280 +#: mod/events.php:397 +msgid "week" +msgstr "" + +#: include/datetime.php:354 +msgid "weeks" +msgstr "" + +#: include/datetime.php:355 include/event.php:483 mod/cal.php:281 +#: mod/events.php:398 +msgid "day" +msgstr "" + +#: include/datetime.php:355 +msgid "days" +msgstr "" + +#: include/datetime.php:356 +msgid "hour" +msgstr "" + +#: include/datetime.php:356 +msgid "hours" +msgstr "" + +#: include/datetime.php:357 +msgid "minute" +msgstr "" + +#: include/datetime.php:357 +msgid "minutes" +msgstr "" + +#: include/datetime.php:358 +msgid "second" +msgstr "" + +#: include/datetime.php:358 +msgid "seconds" +msgstr "" + +#: include/datetime.php:367 +#, php-format +msgid "%1$d %2$s ago" +msgstr "" + +#: include/datetime.php:585 +#, php-format +msgid "%s's birthday" +msgstr "" + +#: include/datetime.php:586 include/dfrn.php:1131 +#, php-format +msgid "Happy Birthday %s" +msgstr "" + +#: include/dba.php:43 include/dba_pdo.php:72 #, php-format msgid "Cannot locate DNS info for database server '%s'" msgstr "" +#: 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/dbstructure.php:41 +#, php-format +msgid "" +"The error message is\n" +"[pre]%s[/pre]" +msgstr "" + +#: include/dbstructure.php:199 +msgid "Errors encountered creating database tables." +msgstr "" + +#: 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/delivery.php:427 +msgid "(no subject)" +msgstr "" + +#: include/delivery.php:439 include/enotify.php:43 +msgid "noreply" +msgstr "" + +#: include/dfrn.php:1130 +#, php-format +msgid "%s\\'s birthday" +msgstr "" + +#: include/diaspora.php:2087 +msgid "Sharing notification from Diaspora network" +msgstr "" + +#: include/diaspora.php:3096 +msgid "Attachments:" +msgstr "" + #: include/enotify.php:24 msgid "Friendica Notification" msgstr "" @@ -414,10 +1149,6 @@ msgstr "" msgid "%1$s, %2$s Administrator" msgstr "" -#: include/enotify.php:43 include/delivery.php:482 -msgid "noreply" -msgstr "" - #: include/enotify.php:70 #, php-format msgid "%s " @@ -692,1455 +1423,6 @@ msgstr "" msgid "Please visit %s to approve or reject the request." msgstr "" -#: include/follow.php:81 mod/dfrn_request.php:512 -msgid "Disallowed profile URL." -msgstr "" - -#: include/follow.php:86 -msgid "Connect URL missing." -msgstr "" - -#: include/follow.php:114 -msgid "" -"This site is not configured to allow communications with other networks." -msgstr "" - -#: include/follow.php:115 include/follow.php:129 -msgid "No compatible communication protocols or feeds were discovered." -msgstr "" - -#: include/follow.php:127 -msgid "The profile address specified does not provide adequate information." -msgstr "" - -#: include/follow.php:132 -msgid "An author or name was not found." -msgstr "" - -#: include/follow.php:135 -msgid "No browser URL could be matched to this address." -msgstr "" - -#: include/follow.php:138 -msgid "" -"Unable to match @-style Identity Address with a known protocol or email " -"contact." -msgstr "" - -#: include/follow.php:139 -msgid "Use mailto: in front of address to force email check." -msgstr "" - -#: include/follow.php:145 -msgid "" -"The profile address specified belongs to a network which has been disabled " -"on this site." -msgstr "" - -#: include/follow.php:150 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." -msgstr "" - -#: include/follow.php:251 -msgid "Unable to retrieve contact information." -msgstr "" - -#: include/group.php:25 -msgid "" -"A deleted group with this name was revived. Existing item permissions " -"may 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/group.php:210 -msgid "Default privacy group for new contacts" -msgstr "" - -#: include/group.php:243 -msgid "Everybody" -msgstr "" - -#: include/group.php:266 -msgid "edit" -msgstr "" - -#: include/group.php:287 mod/newmember.php:61 -msgid "Groups" -msgstr "" - -#: include/group.php:289 -msgid "Edit groups" -msgstr "" - -#: include/group.php:291 -msgid "Edit group" -msgstr "" - -#: include/group.php:292 -msgid "Create a new group" -msgstr "" - -#: include/group.php:293 mod/group.php:98 mod/group.php:188 -msgid "Group Name: " -msgstr "" - -#: include/group.php:295 -msgid "Contacts not in any group" -msgstr "" - -#: include/group.php:297 mod/network.php:200 -msgid "add" -msgstr "" - -#: 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" -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" -msgstr "" - -#: include/like.php:166 include/conversation.php:122 -#: include/conversation.php:258 include/text.php:1804 -msgid "event" -msgstr "" - -#: include/like.php:184 include/conversation.php:141 include/diaspora.php:1526 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "" - -#: include/like.php:187 include/conversation.php:144 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "" - -#: include/like.php:190 -#, php-format -msgid "%1$s is attending %2$s's %3$s" -msgstr "" - -#: include/like.php:193 -#, php-format -msgid "%1$s is not attending %2$s's %3$s" -msgstr "" - -#: include/like.php:196 -#, php-format -msgid "%1$s may attend %2$s's %3$s" -msgstr "" - -#: include/message.php:15 include/message.php:169 -msgid "[no subject]" -msgstr "" - -#: include/nav.php:35 mod/navigation.php:19 -msgid "Nothing new here" -msgstr "" - -#: include/nav.php:39 mod/navigation.php:23 -msgid "Clear notifications" -msgstr "" - -#: include/nav.php:40 include/text.php:1017 -msgid "@name, !forum, #tags, content" -msgstr "" - -#: include/nav.php:78 view/theme/frio/theme.php:243 boot.php:1833 -msgid "Logout" -msgstr "" - -#: include/nav.php:78 view/theme/frio/theme.php:243 -msgid "End this session" -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" -msgstr "" - -#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:246 -msgid "Your posts and conversations" -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" -msgstr "" - -#: include/nav.php:82 view/theme/frio/theme.php:247 -msgid "Your profile page" -msgstr "" - -#: include/nav.php:83 include/identity.php:782 mod/fbrowser.php:31 -#: view/theme/frio/theme.php:248 -msgid "Photos" -msgstr "" - -#: include/nav.php:83 view/theme/frio/theme.php:248 -msgid "Your photos" -msgstr "" - -#: include/nav.php:84 include/identity.php:790 include/identity.php:793 -#: view/theme/frio/theme.php:249 -msgid "Videos" -msgstr "" - -#: include/nav.php:84 view/theme/frio/theme.php:249 -msgid "Your videos" -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" -msgstr "" - -#: include/nav.php:85 view/theme/frio/theme.php:250 -msgid "Your events" -msgstr "" - -#: include/nav.php:86 -msgid "Personal notes" -msgstr "" - -#: include/nav.php:86 -msgid "Your personal notes" -msgstr "" - -#: include/nav.php:95 mod/bookmarklet.php:12 boot.php:1834 -msgid "Login" -msgstr "" - -#: include/nav.php:95 -msgid "Sign in" -msgstr "" - -#: include/nav.php:105 -msgid "Home Page" -msgstr "" - -#: include/nav.php:109 mod/register.php:289 boot.php:1809 -msgid "Register" -msgstr "" - -#: include/nav.php:109 -msgid "Create an account" -msgstr "" - -#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:293 -msgid "Help" -msgstr "" - -#: include/nav.php:115 -msgid "Help and documentation" -msgstr "" - -#: include/nav.php:119 -msgid "Apps" -msgstr "" - -#: include/nav.php:119 -msgid "Addon applications, utilities, games" -msgstr "" - -#: include/nav.php:123 include/text.php:1014 mod/search.php:149 -msgid "Search" -msgstr "" - -#: include/nav.php:123 -msgid "Search site content" -msgstr "" - -#: include/nav.php:126 include/text.php:1022 -msgid "Full Text" -msgstr "" - -#: include/nav.php:127 include/text.php:1023 -msgid "Tags" -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" -msgstr "" - -#: include/nav.php:143 include/nav.php:145 mod/community.php:36 -msgid "Community" -msgstr "" - -#: include/nav.php:143 -msgid "Conversations on this site" -msgstr "" - -#: include/nav.php:145 -msgid "Conversations on the network" -msgstr "" - -#: include/nav.php:149 include/identity.php:805 include/identity.php:816 -#: view/theme/frio/theme.php:254 -msgid "Events and Calendar" -msgstr "" - -#: include/nav.php:152 -msgid "Directory" -msgstr "" - -#: include/nav.php:152 -msgid "People directory" -msgstr "" - -#: include/nav.php:154 -msgid "Information" -msgstr "" - -#: include/nav.php:154 -msgid "Information about this friendica instance" -msgstr "" - -#: include/nav.php:158 view/theme/frio/theme.php:253 -msgid "Conversations from your friends" -msgstr "" - -#: include/nav.php:159 -msgid "Network Reset" -msgstr "" - -#: include/nav.php:159 -msgid "Load Network page with no filters" -msgstr "" - -#: include/nav.php:166 -msgid "Friend Requests" -msgstr "" - -#: include/nav.php:169 mod/notifications.php:96 -msgid "Notifications" -msgstr "" - -#: include/nav.php:170 -msgid "See all notifications" -msgstr "" - -#: include/nav.php:171 mod/settings.php:906 -msgid "Mark as seen" -msgstr "" - -#: include/nav.php:171 -msgid "Mark all system notifications seen" -msgstr "" - -#: include/nav.php:175 mod/message.php:179 view/theme/frio/theme.php:255 -msgid "Messages" -msgstr "" - -#: include/nav.php:175 view/theme/frio/theme.php:255 -msgid "Private mail" -msgstr "" - -#: include/nav.php:176 -msgid "Inbox" -msgstr "" - -#: include/nav.php:177 -msgid "Outbox" -msgstr "" - -#: include/nav.php:178 mod/message.php:16 -msgid "New Message" -msgstr "" - -#: include/nav.php:181 -msgid "Manage" -msgstr "" - -#: include/nav.php:181 -msgid "Manage other pages" -msgstr "" - -#: include/nav.php:184 mod/settings.php:81 -msgid "Delegations" -msgstr "" - -#: include/nav.php:184 mod/delegate.php:130 -msgid "Delegate Page Management" -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" -msgstr "" - -#: include/nav.php:186 view/theme/frio/theme.php:256 -msgid "Account settings" -msgstr "" - -#: include/nav.php:189 include/identity.php:285 -msgid "Profiles" -msgstr "" - -#: include/nav.php:189 -msgid "Manage/Edit Profiles" -msgstr "" - -#: include/nav.php:192 view/theme/frio/theme.php:257 -msgid "Manage/edit friends and contacts" -msgstr "" - -#: include/nav.php:197 mod/admin.php:187 -msgid "Admin" -msgstr "" - -#: include/nav.php:197 -msgid "Site setup and configuration" -msgstr "" - -#: include/nav.php:200 -msgid "Navigation" -msgstr "" - -#: include/nav.php:200 -msgid "Site map" -msgstr "" - -#: include/oembed.php:266 -msgid "Embedded content" -msgstr "" - -#: include/oembed.php:274 -msgid "Embedding disabled" -msgstr "" - -#: include/ostatus.php:1832 -#, php-format -msgid "%s is now following %s." -msgstr "" - -#: include/ostatus.php:1833 -msgid "following" -msgstr "" - -#: include/ostatus.php:1836 -#, php-format -msgid "%s stopped following %s." -msgstr "" - -#: include/ostatus.php:1837 -msgid "stopped following" -msgstr "" - -#: include/plugin.php:530 include/plugin.php:532 -msgid "Click here to upgrade." -msgstr "" - -#: include/plugin.php:538 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: include/plugin.php:543 -msgid "This action is not available under your subscription plan." -msgstr "" - -#: include/security.php:22 -msgid "Welcome " -msgstr "" - -#: include/security.php:23 -msgid "Please upload a profile photo." -msgstr "" - -#: include/security.php:26 -msgid "Welcome back " -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." -msgstr "" - -#: include/uimport.php:94 -msgid "Error decoding account file" -msgstr "" - -#: include/uimport.php:100 -msgid "Error! No version data in file! This is not a Friendica account file?" -msgstr "" - -#: include/uimport.php:116 include/uimport.php:127 -msgid "Error! Cannot check nickname" -msgstr "" - -#: include/uimport.php:120 include/uimport.php:131 -#, php-format -msgid "User '%s' already exists on this server!" -msgstr "" - -#: include/uimport.php:153 -msgid "User creation error" -msgstr "" - -#: include/uimport.php:173 -msgid "User profile creation error" -msgstr "" - -#: include/uimport.php:222 -#, 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" -msgstr "" - -#: include/user.php:39 mod/settings.php:375 -msgid "Passwords do not match. Password unchanged." -msgstr "" - -#: include/user.php:48 -msgid "An invitation is required." -msgstr "" - -#: include/user.php:53 -msgid "Invitation could not be verified." -msgstr "" - -#: include/user.php:61 -msgid "Invalid OpenID url" -msgstr "" - -#: include/user.php:82 -msgid "Please enter the required information." -msgstr "" - -#: include/user.php:96 -msgid "Please use a shorter name." -msgstr "" - -#: include/user.php:98 -msgid "Name too short." -msgstr "" - -#: include/user.php:113 -msgid "That doesn't appear to be your full (First Last) name." -msgstr "" - -#: include/user.php:118 -msgid "Your email domain is not among those allowed on this site." -msgstr "" - -#: include/user.php:121 -msgid "Not a valid email address." -msgstr "" - -#: include/user.php:134 -msgid "Cannot use that email." -msgstr "" - -#: include/user.php:140 -msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." -msgstr "" - -#: include/user.php:147 include/user.php:245 -msgid "Nickname is already registered. Please choose another." -msgstr "" - -#: include/user.php:157 -msgid "" -"Nickname was once registered here and may not be re-used. Please choose " -"another." -msgstr "" - -#: include/user.php:173 -msgid "SERIOUS ERROR: Generation of security keys failed." -msgstr "" - -#: include/user.php:231 -msgid "An error occurred during registration. Please try again." -msgstr "" - -#: include/user.php:256 view/theme/duepuntozero/config.php:43 -#: view/theme/clean/config.php:60 -msgid "default" -msgstr "" - -#: include/user.php:266 -msgid "An error occurred creating your default profile. Please try again." -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" -msgstr "" - -#: 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 "" - -#: include/user.php:427 -#, php-format -msgid "Registration at %s" -msgstr "" - -#: 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 "" - -#: 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 "" - -#: include/user.php:473 mod/admin.php:1234 -#, php-format -msgid "Registration details for %s" -msgstr "" - -#: include/acl_selectors.php:341 -msgid "Post to Email" -msgstr "" - -#: include/acl_selectors.php:346 -#, php-format -msgid "Connectors disabled, since \"%s\" is enabled." -msgstr "" - -#: include/acl_selectors.php:347 mod/settings.php:1188 -msgid "Hide your profile details from unknown viewers?" -msgstr "" - -#: include/acl_selectors.php:352 -msgid "Visible to everybody" -msgstr "" - -#: include/acl_selectors.php:353 view/theme/vier/config.php:108 -msgid "show" -msgstr "" - -#: include/acl_selectors.php:354 view/theme/vier/config.php:108 -msgid "don't show" -msgstr "" - -#: include/acl_selectors.php:360 mod/editpost.php:123 -msgid "CC: email addresses" -msgstr "" - -#: include/acl_selectors.php:361 mod/editpost.php:130 -msgid "Example: bob@example.com, mary@example.com" -msgstr "" - -#: include/acl_selectors.php:363 mod/events.php:516 mod/photos.php:1176 -#: mod/photos.php:1558 -msgid "Permissions" -msgstr "" - -#: include/acl_selectors.php:364 -msgid "Close" -msgstr "" - -#: include/conversation.php:147 -#, php-format -msgid "%1$s attends %2$s's %3$s" -msgstr "" - -#: include/conversation.php:150 -#, php-format -msgid "%1$s doesn't attend %2$s's %3$s" -msgstr "" - -#: include/conversation.php:153 -#, php-format -msgid "%1$s attends maybe %2$s's %3$s" -msgstr "" - -#: include/conversation.php:185 mod/dfrn_confirm.php:478 -#, php-format -msgid "%1$s is now friends with %2$s" -msgstr "" - -#: include/conversation.php:219 -#, php-format -msgid "%1$s poked %2$s" -msgstr "" - -#: include/conversation.php:239 mod/mood.php:63 -#, php-format -msgid "%1$s is currently %2$s" -msgstr "" - -#: include/conversation.php:278 mod/tagger.php:95 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" -msgstr "" - -#: include/conversation.php:303 -msgid "post/item" -msgstr "" - -#: include/conversation.php:304 -#, php-format -msgid "%1$s marked %2$s's %3$s as favorite" -msgstr "" - -#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1629 -#: mod/profiles.php:346 -msgid "Likes" -msgstr "" - -#: include/conversation.php:587 mod/content.php:372 mod/photos.php:1629 -#: mod/profiles.php:350 -msgid "Dislikes" -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" -msgstr "" - -#: include/conversation.php:588 mod/content.php:373 mod/photos.php:1630 -msgid "Might attend" -msgstr "" - -#: include/conversation.php:710 mod/content.php:453 mod/content.php:759 -#: mod/photos.php:1703 object/Item.php:137 -msgid "Select" -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" -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 -#, php-format -msgid "View %s's profile @ %s" -msgstr "" - -#: include/conversation.php:767 object/Item.php:370 -msgid "Categories:" -msgstr "" - -#: include/conversation.php:768 object/Item.php:371 -msgid "Filed under:" -msgstr "" - -#: include/conversation.php:775 mod/content.php:497 mod/content.php:928 -#: object/Item.php:396 -#, php-format -msgid "%s from %s" -msgstr "" - -#: include/conversation.php:791 mod/content.php:513 -msgid "View in context" -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" -msgstr "" - -#: include/conversation.php:872 -msgid "remove" -msgstr "" - -#: include/conversation.php:876 -msgid "Delete Selected Items" -msgstr "" - -#: include/conversation.php:968 -msgid "Follow Thread" -msgstr "" - -#: include/conversation.php:969 include/Contact.php:445 -msgid "View Status" -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" -msgstr "" - -#: include/conversation.php:971 include/Contact.php:447 -msgid "View Photos" -msgstr "" - -#: include/conversation.php:972 include/Contact.php:448 -msgid "Network Posts" -msgstr "" - -#: include/conversation.php:973 include/Contact.php:449 -msgid "View Contact" -msgstr "" - -#: include/conversation.php:974 include/Contact.php:451 -msgid "Send PM" -msgstr "" - -#: include/conversation.php:978 include/Contact.php:452 -msgid "Poke" -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" -msgstr "" - -#: include/conversation.php:1099 -#, php-format -msgid "%s likes this." -msgstr "" - -#: include/conversation.php:1102 -#, php-format -msgid "%s doesn't like this." -msgstr "" - -#: include/conversation.php:1105 -#, php-format -msgid "%s attends." -msgstr "" - -#: include/conversation.php:1108 -#, php-format -msgid "%s doesn't attend." -msgstr "" - -#: include/conversation.php:1111 -#, php-format -msgid "%s attends maybe." -msgstr "" - -#: include/conversation.php:1121 -msgid "and" -msgstr "" - -#: include/conversation.php:1127 -#, php-format -msgid ", and %d other people" -msgstr "" - -#: include/conversation.php:1136 -#, php-format -msgid "%2$d people like this" -msgstr "" - -#: include/conversation.php:1137 -#, php-format -msgid "%s like this." -msgstr "" - -#: include/conversation.php:1140 -#, php-format -msgid "%2$d people don't like this" -msgstr "" - -#: include/conversation.php:1141 -#, php-format -msgid "%s don't like this." -msgstr "" - -#: include/conversation.php:1144 -#, php-format -msgid "%2$d people attend" -msgstr "" - -#: include/conversation.php:1145 -#, php-format -msgid "%s attend." -msgstr "" - -#: include/conversation.php:1148 -#, php-format -msgid "%2$d people don't attend" -msgstr "" - -#: include/conversation.php:1149 -#, php-format -msgid "%s don't attend." -msgstr "" - -#: include/conversation.php:1152 -#, php-format -msgid "%2$d people attend maybe" -msgstr "" - -#: include/conversation.php:1153 -#, php-format -msgid "%s anttend maybe." -msgstr "" - -#: include/conversation.php:1183 include/conversation.php:1199 -msgid "Visible to everybody" -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:" -msgstr "" - -#: include/conversation.php:1185 include/conversation.php:1201 -msgid "Please enter a video link/URL:" -msgstr "" - -#: include/conversation.php:1186 include/conversation.php:1202 -msgid "Please enter an audio link/URL:" -msgstr "" - -#: include/conversation.php:1187 include/conversation.php:1203 -msgid "Tag term:" -msgstr "" - -#: include/conversation.php:1188 include/conversation.php:1204 -#: mod/filer.php:30 -msgid "Save to Folder:" -msgstr "" - -#: include/conversation.php:1189 include/conversation.php:1205 -msgid "Where are you right now?" -msgstr "" - -#: include/conversation.php:1190 -msgid "Delete item(s)?" -msgstr "" - -#: include/conversation.php:1236 -msgid "Share" -msgstr "" - -#: include/conversation.php:1237 mod/editpost.php:100 mod/message.php:335 -#: mod/message.php:519 mod/wallmessage.php:138 -msgid "Upload photo" -msgstr "" - -#: include/conversation.php:1238 mod/editpost.php:101 -msgid "upload photo" -msgstr "" - -#: include/conversation.php:1239 mod/editpost.php:102 -msgid "Attach file" -msgstr "" - -#: include/conversation.php:1240 mod/editpost.php:103 -msgid "attach file" -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" -msgstr "" - -#: include/conversation.php:1242 mod/editpost.php:105 -msgid "web link" -msgstr "" - -#: include/conversation.php:1243 mod/editpost.php:106 -msgid "Insert video link" -msgstr "" - -#: include/conversation.php:1244 mod/editpost.php:107 -msgid "video link" -msgstr "" - -#: include/conversation.php:1245 mod/editpost.php:108 -msgid "Insert audio link" -msgstr "" - -#: include/conversation.php:1246 mod/editpost.php:109 -msgid "audio link" -msgstr "" - -#: include/conversation.php:1247 mod/editpost.php:110 -msgid "Set your location" -msgstr "" - -#: include/conversation.php:1248 mod/editpost.php:111 -msgid "set location" -msgstr "" - -#: include/conversation.php:1249 mod/editpost.php:112 -msgid "Clear browser location" -msgstr "" - -#: include/conversation.php:1250 mod/editpost.php:113 -msgid "clear location" -msgstr "" - -#: include/conversation.php:1252 mod/editpost.php:127 -msgid "Set title" -msgstr "" - -#: include/conversation.php:1254 mod/editpost.php:129 -msgid "Categories (comma-separated list)" -msgstr "" - -#: include/conversation.php:1256 mod/editpost.php:115 -msgid "Permission settings" -msgstr "" - -#: include/conversation.php:1257 mod/editpost.php:144 -msgid "permissions" -msgstr "" - -#: include/conversation.php:1265 mod/editpost.php:124 -msgid "Public post" -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" -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" -msgstr "" - -#: include/conversation.php:1444 -msgid "View all" -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)" -msgstr "" - -#: include/features.php:65 -msgid "General Features" -msgstr "" - -#: include/features.php:67 -msgid "Multiple Profiles" -msgstr "" - -#: include/features.php:67 -msgid "Ability to create multiple profiles" -msgstr "" - -#: include/features.php:68 -msgid "Photo Location" -msgstr "" - -#: include/features.php:68 -msgid "" -"Photo metadata is normally stripped. This extracts the location (if present) " -"prior to stripping metadata and links it to a map." -msgstr "" - -#: include/features.php:69 -msgid "Export Public Calendar" -msgstr "" - -#: include/features.php:69 -msgid "Ability for visitors to download the public calendar" -msgstr "" - -#: include/features.php:74 -msgid "Post Composition Features" -msgstr "" - -#: include/features.php:75 -msgid "Post Preview" -msgstr "" - -#: include/features.php:75 -msgid "Allow previewing posts and comments before publishing them" -msgstr "" - -#: include/features.php:76 -msgid "Auto-mention Forums" -msgstr "" - -#: include/features.php:76 -msgid "" -"Add/remove mention when a forum page is selected/deselected in ACL window." -msgstr "" - -#: include/features.php:81 -msgid "Network Sidebar Widgets" -msgstr "" - -#: include/features.php:82 -msgid "Search by Date" -msgstr "" - -#: include/features.php:82 -msgid "Ability to select posts by date ranges" -msgstr "" - -#: include/features.php:83 include/features.php:113 -msgid "List Forums" -msgstr "" - -#: include/features.php:83 -msgid "Enable widget to display the forums your are connected with" -msgstr "" - -#: include/features.php:84 -msgid "Group Filter" -msgstr "" - -#: include/features.php:84 -msgid "Enable widget to display Network posts only from selected group" -msgstr "" - -#: include/features.php:85 -msgid "Network Filter" -msgstr "" - -#: include/features.php:85 -msgid "Enable widget to display Network posts only from selected network" -msgstr "" - -#: include/features.php:86 mod/network.php:199 mod/search.php:34 -msgid "Saved Searches" -msgstr "" - -#: include/features.php:86 -msgid "Save search terms for re-use" -msgstr "" - -#: include/features.php:91 -msgid "Network Tabs" -msgstr "" - -#: include/features.php:92 -msgid "Network Personal Tab" -msgstr "" - -#: include/features.php:92 -msgid "Enable tab to display only Network posts that you've interacted on" -msgstr "" - -#: include/features.php:93 -msgid "Network New Tab" -msgstr "" - -#: include/features.php:93 -msgid "Enable tab to display only new Network posts (from the last 12 hours)" -msgstr "" - -#: include/features.php:94 -msgid "Network Shared Links Tab" -msgstr "" - -#: include/features.php:94 -msgid "Enable tab to display only Network posts with links in them" -msgstr "" - -#: include/features.php:99 -msgid "Post/Comment Tools" -msgstr "" - -#: include/features.php:100 -msgid "Multiple Deletion" -msgstr "" - -#: include/features.php:100 -msgid "Select and delete multiple posts/comments at once" -msgstr "" - -#: include/features.php:101 -msgid "Edit Sent Posts" -msgstr "" - -#: include/features.php:101 -msgid "Edit and correct posts and comments after sending" -msgstr "" - -#: include/features.php:102 -msgid "Tagging" -msgstr "" - -#: include/features.php:102 -msgid "Ability to tag existing posts" -msgstr "" - -#: include/features.php:103 -msgid "Post Categories" -msgstr "" - -#: include/features.php:103 -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 "" - -#: include/features.php:105 -msgid "Dislike Posts" -msgstr "" - -#: include/features.php:105 -msgid "Ability to dislike posts/comments" -msgstr "" - -#: include/features.php:106 -msgid "Star Posts" -msgstr "" - -#: include/features.php:106 -msgid "Ability to mark special posts with a star indicator" -msgstr "" - -#: include/features.php:107 -msgid "Mute Post Notifications" -msgstr "" - -#: include/features.php:107 -msgid "Ability to mute notifications for a thread" -msgstr "" - -#: include/features.php:112 -msgid "Advanced Profile Settings" -msgstr "" - -#: include/features.php:113 -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" -msgstr "" - -#: include/datetime.php:58 include/datetime.php:60 mod/profiles.php:697 -msgid "Miscellaneous" -msgstr "" - -#: include/datetime.php:184 include/identity.php:641 -msgid "Birthday:" -msgstr "" - -#: include/datetime.php:186 mod/profiles.php:720 -msgid "Age: " -msgstr "" - -#: include/datetime.php:188 -msgid "YYYY-MM-DD or MM-DD" -msgstr "" - -#: include/datetime.php:343 -msgid "never" -msgstr "" - -#: include/datetime.php:349 -msgid "less than a second ago" -msgstr "" - -#: include/datetime.php:352 -msgid "year" -msgstr "" - -#: include/datetime.php:352 -msgid "years" -msgstr "" - -#: include/datetime.php:353 include/event.php:481 mod/cal.php:279 -#: mod/events.php:396 -msgid "month" -msgstr "" - -#: include/datetime.php:353 -msgid "months" -msgstr "" - -#: include/datetime.php:354 include/event.php:482 mod/cal.php:280 -#: mod/events.php:397 -msgid "week" -msgstr "" - -#: include/datetime.php:354 -msgid "weeks" -msgstr "" - -#: include/datetime.php:355 include/event.php:483 mod/cal.php:281 -#: mod/events.php:398 -msgid "day" -msgstr "" - -#: include/datetime.php:355 -msgid "days" -msgstr "" - -#: include/datetime.php:356 -msgid "hour" -msgstr "" - -#: include/datetime.php:356 -msgid "hours" -msgstr "" - -#: include/datetime.php:357 -msgid "minute" -msgstr "" - -#: include/datetime.php:357 -msgid "minutes" -msgstr "" - -#: include/datetime.php:358 -msgid "second" -msgstr "" - -#: include/datetime.php:358 -msgid "seconds" -msgstr "" - -#: include/datetime.php:367 -#, php-format -msgid "%1$d %2$s ago" -msgstr "" - -#: include/datetime.php:585 -#, php-format -msgid "%s's birthday" -msgstr "" - -#: include/datetime.php:586 include/dfrn.php:1122 -#, php-format -msgid "Happy Birthday %s" -msgstr "" - -#: include/event.php:16 include/bb2diaspora.php:199 mod/localtime.php:12 -msgid "l F d, Y \\@ g:i A" -msgstr "" - -#: include/event.php:33 include/event.php:51 include/event.php:488 -#: include/bb2diaspora.php:205 -msgid "Starts:" -msgstr "" - -#: include/event.php:36 include/event.php:57 include/event.php:489 -#: include/bb2diaspora.php:213 -msgid "Finishes:" -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:" -msgstr "" - #: include/event.php:442 msgid "Sun" msgstr "" @@ -2325,235 +1607,301 @@ msgstr "" msgid "Export calendar as csv" msgstr "" -#: include/dfrn.php:1121 -#, php-format -msgid "%s\\'s birthday" +#: include/features.php:65 +msgid "General Features" msgstr "" -#: include/contact_selectors.php:32 -msgid "Unknown | Not categorised" +#: include/features.php:67 +msgid "Multiple Profiles" msgstr "" -#: include/contact_selectors.php:33 -msgid "Block immediately" +#: include/features.php:67 +msgid "Ability to create multiple profiles" msgstr "" -#: include/contact_selectors.php:34 -msgid "Shady, spammer, self-marketer" +#: include/features.php:68 +msgid "Photo Location" msgstr "" -#: include/contact_selectors.php:35 -msgid "Known to me, but no opinion" +#: include/features.php:68 +msgid "" +"Photo metadata is normally stripped. This extracts the location (if present) " +"prior to stripping metadata and links it to a map." msgstr "" -#: include/contact_selectors.php:36 -msgid "OK, probably harmless" +#: include/features.php:69 +msgid "Export Public Calendar" msgstr "" -#: include/contact_selectors.php:37 -msgid "Reputable, has my trust" +#: include/features.php:69 +msgid "Ability for visitors to download the public calendar" msgstr "" -#: include/contact_selectors.php:56 mod/admin.php:901 -msgid "Frequently" +#: include/features.php:74 +msgid "Post Composition Features" msgstr "" -#: include/contact_selectors.php:57 mod/admin.php:902 -msgid "Hourly" +#: include/features.php:75 +msgid "Post Preview" msgstr "" -#: include/contact_selectors.php:58 mod/admin.php:903 -msgid "Twice daily" +#: include/features.php:75 +msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: include/contact_selectors.php:59 mod/admin.php:904 -msgid "Daily" +#: include/features.php:76 +msgid "Auto-mention Forums" msgstr "" -#: include/contact_selectors.php:60 -msgid "Weekly" +#: include/features.php:76 +msgid "" +"Add/remove mention when a forum page is selected/deselected in ACL window." msgstr "" -#: include/contact_selectors.php:61 -msgid "Monthly" +#: include/features.php:81 +msgid "Network Sidebar Widgets" msgstr "" -#: include/contact_selectors.php:76 mod/dfrn_request.php:881 -msgid "Friendica" +#: include/features.php:82 +msgid "Search by Date" msgstr "" -#: include/contact_selectors.php:77 -msgid "OStatus" +#: include/features.php:82 +msgid "Ability to select posts by date ranges" msgstr "" -#: include/contact_selectors.php:78 -msgid "RSS/Atom" +#: include/features.php:83 include/features.php:113 +msgid "List Forums" 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/features.php:83 +msgid "Enable widget to display the forums your are connected with" msgstr "" -#: include/contact_selectors.php:80 mod/settings.php:848 -#: mod/dfrn_request.php:883 -msgid "Diaspora" +#: include/features.php:84 +msgid "Group Filter" msgstr "" -#: include/contact_selectors.php:81 -msgid "Facebook" +#: include/features.php:84 +msgid "Enable widget to display Network posts only from selected group" msgstr "" -#: include/contact_selectors.php:82 -msgid "Zot!" +#: include/features.php:85 +msgid "Network Filter" msgstr "" -#: include/contact_selectors.php:83 -msgid "LinkedIn" +#: include/features.php:85 +msgid "Enable widget to display Network posts only from selected network" msgstr "" -#: include/contact_selectors.php:84 -msgid "XMPP/IM" +#: include/features.php:86 mod/network.php:199 mod/search.php:34 +msgid "Saved Searches" msgstr "" -#: include/contact_selectors.php:85 -msgid "MySpace" +#: include/features.php:86 +msgid "Save search terms for re-use" msgstr "" -#: include/contact_selectors.php:87 -msgid "Google+" +#: include/features.php:91 +msgid "Network Tabs" msgstr "" -#: include/contact_selectors.php:88 -msgid "pump.io" +#: include/features.php:92 +msgid "Network Personal Tab" msgstr "" -#: include/contact_selectors.php:89 -msgid "Twitter" +#: include/features.php:92 +msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: include/contact_selectors.php:90 -msgid "Diaspora Connector" +#: include/features.php:93 +msgid "Network New Tab" msgstr "" -#: include/contact_selectors.php:91 -msgid "GNU Social" +#: include/features.php:93 +msgid "Enable tab to display only new Network posts (from the last 12 hours)" msgstr "" -#: include/contact_selectors.php:92 -msgid "pnut" +#: include/features.php:94 +msgid "Network Shared Links Tab" msgstr "" -#: include/contact_selectors.php:93 -msgid "App.net" +#: include/features.php:94 +msgid "Enable tab to display only Network posts with links in them" msgstr "" -#: include/contact_selectors.php:104 -msgid "Hubzilla/Redmatrix" +#: include/features.php:99 +msgid "Post/Comment Tools" msgstr "" -#: include/contact_widgets.php:6 -msgid "Add New Contact" +#: include/features.php:100 +msgid "Multiple Deletion" msgstr "" -#: include/contact_widgets.php:7 -msgid "Enter address or web location" +#: include/features.php:100 +msgid "Select and delete multiple posts/comments at once" msgstr "" -#: include/contact_widgets.php:8 -msgid "Example: bob@example.com, http://example.com/barbara" +#: include/features.php:101 +msgid "Edit Sent Posts" 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/features.php:101 +msgid "Edit and correct posts and comments after sending" 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/features.php:102 +msgid "Tagging" msgstr "" -#: include/contact_widgets.php:31 -msgid "Enter name or interest" +#: include/features.php:102 +msgid "Ability to tag existing posts" msgstr "" -#: include/contact_widgets.php:33 -msgid "Examples: Robert Morgenstein, Fishing" +#: include/features.php:103 +msgid "Post Categories" msgstr "" -#: include/contact_widgets.php:34 mod/directory.php:206 mod/contacts.php:806 -msgid "Find" +#: include/features.php:103 +msgid "Add categories to your posts" msgstr "" -#: include/contact_widgets.php:35 mod/suggest.php:114 -#: view/theme/vier/theme.php:198 -msgid "Friend Suggestions" +#: include/features.php:104 +msgid "Ability to file posts under folders" msgstr "" -#: include/contact_widgets.php:36 view/theme/vier/theme.php:197 -msgid "Similar Interests" +#: include/features.php:105 +msgid "Dislike Posts" msgstr "" -#: include/contact_widgets.php:37 -msgid "Random Profile" +#: include/features.php:105 +msgid "Ability to dislike posts/comments" msgstr "" -#: include/contact_widgets.php:38 view/theme/vier/theme.php:199 -msgid "Invite Friends" +#: include/features.php:106 +msgid "Star Posts" msgstr "" -#: include/contact_widgets.php:115 -msgid "Networks" +#: include/features.php:106 +msgid "Ability to mark special posts with a star indicator" msgstr "" -#: include/contact_widgets.php:118 -msgid "All Networks" +#: include/features.php:107 +msgid "Mute Post Notifications" msgstr "" -#: include/contact_widgets.php:153 include/contact_widgets.php:187 -msgid "Everything" +#: include/features.php:107 +msgid "Ability to mute notifications for a thread" msgstr "" -#: include/contact_widgets.php:184 -msgid "Categories" +#: include/features.php:112 +msgid "Advanced Profile Settings" 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/features.php:113 +msgid "Show visitors public community forums at the Advanced Profile Page" msgstr "" -#: include/api.php:1041 -#, php-format -msgid "Weekly posting limit of %d posts reached. The post was rejected." +#: include/follow.php:81 mod/dfrn_request.php:512 +msgid "Disallowed profile URL." msgstr "" -#: include/api.php:1062 -#, php-format -msgid "Monthly posting limit of %d posts reached. The post was rejected." +#: include/follow.php:86 +msgid "Connect URL missing." msgstr "" -#: include/diaspora.php:2087 -msgid "Sharing notification from Diaspora network" +#: include/follow.php:114 +msgid "" +"This site is not configured to allow communications with other networks." msgstr "" -#: include/diaspora.php:3096 -msgid "Attachments:" +#: include/follow.php:115 include/follow.php:129 +msgid "No compatible communication protocols or feeds were discovered." +msgstr "" + +#: include/follow.php:127 +msgid "The profile address specified does not provide adequate information." +msgstr "" + +#: include/follow.php:132 +msgid "An author or name was not found." +msgstr "" + +#: include/follow.php:135 +msgid "No browser URL could be matched to this address." +msgstr "" + +#: include/follow.php:138 +msgid "" +"Unable to match @-style Identity Address with a known protocol or email " +"contact." +msgstr "" + +#: include/follow.php:139 +msgid "Use mailto: in front of address to force email check." +msgstr "" + +#: include/follow.php:145 +msgid "" +"The profile address specified belongs to a network which has been disabled " +"on this site." +msgstr "" + +#: include/follow.php:150 +msgid "" +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." +msgstr "" + +#: include/follow.php:251 +msgid "Unable to retrieve contact information." +msgstr "" + +#: include/group.php:25 +msgid "" +"A deleted group with this name was revived. Existing item permissions " +"may 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/group.php:210 +msgid "Default privacy group for new contacts" +msgstr "" + +#: include/group.php:243 +msgid "Everybody" +msgstr "" + +#: include/group.php:266 +msgid "edit" +msgstr "" + +#: include/group.php:287 mod/newmember.php:61 +msgid "Groups" +msgstr "" + +#: include/group.php:289 +msgid "Edit groups" +msgstr "" + +#: include/group.php:291 +msgid "Edit group" +msgstr "" + +#: include/group.php:292 +msgid "Create a new group" +msgstr "" + +#: include/group.php:293 mod/group.php:98 mod/group.php:188 +msgid "Group Name: " +msgstr "" + +#: include/group.php:295 +msgid "Contacts not in any group" +msgstr "" + +#: include/group.php:297 mod/network.php:200 +msgid "add" msgstr "" #: include/identity.php:43 @@ -2572,6 +1920,10 @@ msgstr "" msgid "Atom feed" msgstr "" +#: include/identity.php:285 include/nav.php:189 +msgid "Profiles" +msgstr "" + #: include/identity.php:285 msgid "Manage/edit profiles" msgstr "" @@ -2609,8 +1961,8 @@ msgstr "" msgid "Homepage:" msgstr "" -#: include/identity.php:340 include/identity.php:684 mod/directory.php:147 -#: mod/contacts.php:640 mod/notifications.php:240 +#: include/identity.php:340 include/identity.php:684 mod/contacts.php:640 +#: mod/directory.php:147 mod/notifications.php:240 msgid "About:" msgstr "" @@ -2654,6 +2006,12 @@ msgstr "" msgid "Events this week:" msgstr "" +#: 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/identity.php:626 mod/settings.php:1286 msgid "Full Name:" msgstr "" @@ -2683,7 +2041,7 @@ msgstr "" msgid "Hometown:" msgstr "" -#: include/identity.php:672 mod/follow.php:137 mod/contacts.php:642 +#: include/identity.php:672 mod/contacts.php:642 mod/follow.php:137 #: mod/notifications.php:242 msgid "Tags:" msgstr "" @@ -2748,12 +2106,17 @@ msgstr "" msgid "Basic" msgstr "" -#: include/identity.php:743 mod/contacts.php:878 mod/events.php:515 -#: mod/admin.php:980 +#: include/identity.php:743 mod/admin.php:972 mod/contacts.php:878 +#: mod/events.php:515 msgid "Advanced" msgstr "" -#: include/identity.php:769 mod/follow.php:145 mod/contacts.php:844 +#: 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/identity.php:769 mod/contacts.php:844 mod/follow.php:145 msgid "Status Messages and Posts" msgstr "" @@ -2761,10 +2124,31 @@ msgstr "" msgid "Profile Details" msgstr "" +#: include/identity.php:782 include/nav.php:83 mod/fbrowser.php:31 +#: view/theme/frio/theme.php:248 +msgid "Photos" +msgstr "" + #: include/identity.php:785 mod/photos.php:89 msgid "Photo Albums" msgstr "" +#: include/identity.php:790 include/identity.php:793 include/nav.php:84 +#: view/theme/frio/theme.php:249 +msgid "Videos" +msgstr "" + +#: 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/identity.php:805 include/identity.php:816 include/nav.php:149 +#: view/theme/frio/theme.php:254 +msgid "Events and Calendar" +msgstr "" + #: include/identity.php:824 mod/notes.php:47 msgid "Personal Notes" msgstr "" @@ -2773,30 +2157,617 @@ msgstr "" msgid "Only You Can See This" msgstr "" -#: include/text.php:304 +#: 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/items.php:1584 mod/dfrn_confirm.php:735 mod/dfrn_request.php:754 +msgid "[Name Withheld]" +msgstr "" + +#: 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/items.php:1978 +msgid "Do you really want to delete this item?" +msgstr "" + +#: 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/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/items.php:2248 +msgid "Archives" +msgstr "" + +#: include/like.php:41 +#, php-format +msgid "%1$s is attending %2$s's %3$s" +msgstr "" + +#: include/like.php:46 +#, php-format +msgid "%1$s is not attending %2$s's %3$s" +msgstr "" + +#: include/like.php:51 +#, php-format +msgid "%1$s may attend %2$s's %3$s" +msgstr "" + +#: include/message.php:15 include/message.php:169 +msgid "[no subject]" +msgstr "" + +#: include/nav.php:35 mod/navigation.php:19 +msgid "Nothing new here" +msgstr "" + +#: include/nav.php:39 mod/navigation.php:23 +msgid "Clear notifications" +msgstr "" + +#: include/nav.php:40 include/text.php:1017 +msgid "@name, !forum, #tags, content" +msgstr "" + +#: include/nav.php:78 view/theme/frio/theme.php:243 +msgid "End this session" +msgstr "" + +#: include/nav.php:81 include/nav.php:161 view/theme/frio/theme.php:246 +msgid "Your posts and conversations" +msgstr "" + +#: include/nav.php:82 view/theme/frio/theme.php:247 +msgid "Your profile page" +msgstr "" + +#: include/nav.php:83 view/theme/frio/theme.php:248 +msgid "Your photos" +msgstr "" + +#: include/nav.php:84 view/theme/frio/theme.php:249 +msgid "Your videos" +msgstr "" + +#: include/nav.php:85 view/theme/frio/theme.php:250 +msgid "Your events" +msgstr "" + +#: include/nav.php:86 +msgid "Personal notes" +msgstr "" + +#: include/nav.php:86 +msgid "Your personal notes" +msgstr "" + +#: include/nav.php:95 +msgid "Sign in" +msgstr "" + +#: include/nav.php:105 +msgid "Home Page" +msgstr "" + +#: include/nav.php:109 +msgid "Create an account" +msgstr "" + +#: include/nav.php:115 mod/help.php:47 view/theme/vier/theme.php:293 +msgid "Help" +msgstr "" + +#: include/nav.php:115 +msgid "Help and documentation" +msgstr "" + +#: include/nav.php:119 +msgid "Apps" +msgstr "" + +#: include/nav.php:119 +msgid "Addon applications, utilities, games" +msgstr "" + +#: include/nav.php:123 include/text.php:1014 mod/search.php:149 +msgid "Search" +msgstr "" + +#: include/nav.php:123 +msgid "Search site content" +msgstr "" + +#: include/nav.php:126 include/text.php:1022 +msgid "Full Text" +msgstr "" + +#: include/nav.php:127 include/text.php:1023 +msgid "Tags" +msgstr "" + +#: include/nav.php:143 include/nav.php:145 mod/community.php:36 +msgid "Community" +msgstr "" + +#: include/nav.php:143 +msgid "Conversations on this site" +msgstr "" + +#: include/nav.php:145 +msgid "Conversations on the network" +msgstr "" + +#: include/nav.php:152 +msgid "Directory" +msgstr "" + +#: include/nav.php:152 +msgid "People directory" +msgstr "" + +#: include/nav.php:154 +msgid "Information" +msgstr "" + +#: include/nav.php:154 +msgid "Information about this friendica instance" +msgstr "" + +#: include/nav.php:158 view/theme/frio/theme.php:253 +msgid "Conversations from your friends" +msgstr "" + +#: include/nav.php:159 +msgid "Network Reset" +msgstr "" + +#: include/nav.php:159 +msgid "Load Network page with no filters" +msgstr "" + +#: include/nav.php:166 +msgid "Friend Requests" +msgstr "" + +#: include/nav.php:169 mod/notifications.php:96 +msgid "Notifications" +msgstr "" + +#: include/nav.php:170 +msgid "See all notifications" +msgstr "" + +#: include/nav.php:171 mod/settings.php:906 +msgid "Mark as seen" +msgstr "" + +#: include/nav.php:171 +msgid "Mark all system notifications seen" +msgstr "" + +#: include/nav.php:175 mod/message.php:179 view/theme/frio/theme.php:255 +msgid "Messages" +msgstr "" + +#: include/nav.php:175 view/theme/frio/theme.php:255 +msgid "Private mail" +msgstr "" + +#: include/nav.php:176 +msgid "Inbox" +msgstr "" + +#: include/nav.php:177 +msgid "Outbox" +msgstr "" + +#: include/nav.php:178 mod/message.php:16 +msgid "New Message" +msgstr "" + +#: include/nav.php:181 +msgid "Manage" +msgstr "" + +#: include/nav.php:181 +msgid "Manage other pages" +msgstr "" + +#: include/nav.php:184 mod/settings.php:81 +msgid "Delegations" +msgstr "" + +#: include/nav.php:184 mod/delegate.php:130 +msgid "Delegate Page Management" +msgstr "" + +#: 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/nav.php:186 view/theme/frio/theme.php:256 +msgid "Account settings" +msgstr "" + +#: include/nav.php:189 +msgid "Manage/Edit Profiles" +msgstr "" + +#: include/nav.php:192 view/theme/frio/theme.php:257 +msgid "Manage/edit friends and contacts" +msgstr "" + +#: include/nav.php:197 mod/admin.php:192 +msgid "Admin" +msgstr "" + +#: include/nav.php:197 +msgid "Site setup and configuration" +msgstr "" + +#: include/nav.php:200 +msgid "Navigation" +msgstr "" + +#: include/nav.php:200 +msgid "Site map" +msgstr "" + +#: include/network.php:622 +msgid "view full size" +msgstr "" + +#: include/oembed.php:266 +msgid "Embedded content" +msgstr "" + +#: include/oembed.php:274 +msgid "Embedding disabled" +msgstr "" + +#: include/ostatus.php:1832 +#, php-format +msgid "%s is now following %s." +msgstr "" + +#: include/ostatus.php:1833 +msgid "following" +msgstr "" + +#: include/ostatus.php:1836 +#, php-format +msgid "%s stopped following %s." +msgstr "" + +#: include/ostatus.php:1837 +msgid "stopped following" +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" +msgstr "" + +#: include/plugin.php:530 include/plugin.php:532 +msgid "Click here to upgrade." +msgstr "" + +#: include/plugin.php:538 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "" + +#: include/plugin.php:543 +msgid "This action is not available under your subscription plan." +msgstr "" + +#: 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: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" +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:306 +#: include/text.php:308 msgid "older" msgstr "" -#: include/text.php:311 -msgid "prev" -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,103 +2962,1569 @@ 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 +#: include/user.php:61 +msgid "Invalid OpenID url" +msgstr "" + +#: include/user.php:82 +msgid "Please enter the required information." +msgstr "" + +#: include/user.php:96 +msgid "Please use a shorter name." +msgstr "" + +#: include/user.php:98 +msgid "Name too short." +msgstr "" + +#: include/user.php:113 +msgid "That doesn't appear to be your full (First Last) name." +msgstr "" + +#: include/user.php:118 +msgid "Your email domain is not among those allowed on this site." +msgstr "" + +#: include/user.php:121 +msgid "Not a valid email address." +msgstr "" + +#: include/user.php:134 +msgid "Cannot use that email." +msgstr "" + +#: include/user.php:140 +msgid "Your \"nickname\" can only contain \"a-z\", \"0-9\" and \"_\"." +msgstr "" + +#: include/user.php:147 include/user.php:245 +msgid "Nickname is already registered. Please choose another." +msgstr "" + +#: include/user.php:157 +msgid "" +"Nickname was once registered here and may not be re-used. Please choose " +"another." +msgstr "" + +#: include/user.php:173 +msgid "SERIOUS ERROR: Generation of security keys failed." +msgstr "" + +#: include/user.php:231 +msgid "An error occurred during registration. Please try again." +msgstr "" + +#: include/user.php:256 view/theme/duepuntozero/config.php:43 +msgid "default" +msgstr "" + +#: include/user.php:266 +msgid "An error occurred creating your default profile. Please try again." +msgstr "" + +#: 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 "" + +#: include/user.php:417 #, 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." +"\t\tDear %1$s,\n" +"\t\t\tThank you for registering at %2$s. Your account is pending for " +"approval by the administrator.\n" +"\t" msgstr "" -#: include/dbstructure.php:38 +#: include/user.php:427 +#, php-format +msgid "Registration at %s" +msgstr "" + +#: include/user.php:437 #, php-format msgid "" -"The error message is\n" -"[pre]%s[/pre]" +"\n" +"\t\tDear %1$s,\n" +"\t\t\tThank you for registering at %2$s. Your account has been created.\n" +"\t" msgstr "" -#: include/dbstructure.php:195 -msgid "Errors encountered creating database tables." +#: 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 "" -#: 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:473 mod/admin.php:1223 +#, php-format +msgid "Registration details for %s" msgstr "" -#: include/network.php:619 -msgid "view full size" +#: index.php:248 mod/apps.php:7 +msgid "You must be logged in to use addons. " +msgstr "" + +#: 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 "" + +#: index.php:295 mod/help.php:56 +msgid "Page not found." +msgstr "" + +#: index.php:406 mod/group.php:76 mod/profperm.php:20 +msgid "Permission denied" +msgstr "" + +#: index.php:457 +msgid "toggle mobile" +msgstr "" + +#: mod/admin.php:96 +msgid "Theme settings updated." +msgstr "" + +#: mod/admin.php:162 mod/admin.php:967 +msgid "Site" +msgstr "" + +#: mod/admin.php:163 mod/admin.php:901 mod/admin.php:1413 mod/admin.php:1429 +msgid "Users" +msgstr "" + +#: mod/admin.php:164 mod/admin.php:1531 mod/admin.php:1594 mod/settings.php:74 +msgid "Plugins" +msgstr "" + +#: mod/admin.php:165 mod/admin.php:1807 mod/admin.php:1857 +msgid "Themes" +msgstr "" + +#: mod/admin.php:166 mod/settings.php:52 +msgid "Additional features" +msgstr "" + +#: mod/admin.php:167 +msgid "DB updates" +msgstr "" + +#: mod/admin.php:168 mod/admin.php:416 +msgid "Inspect Queue" +msgstr "" + +#: mod/admin.php:169 mod/admin.php:382 +msgid "Federation Statistics" +msgstr "" + +#: mod/admin.php:183 mod/admin.php:194 mod/admin.php:1931 +msgid "Logs" +msgstr "" + +#: mod/admin.php:184 mod/admin.php:1999 +msgid "View Logs" +msgstr "" + +#: mod/admin.php:185 +msgid "probe address" +msgstr "" + +#: mod/admin.php:186 +msgid "check webfinger" +msgstr "" + +#: mod/admin.php:193 +msgid "Plugin Features" +msgstr "" + +#: mod/admin.php:195 +msgid "diagnostics" +msgstr "" + +#: mod/admin.php:196 +msgid "User registrations waiting for confirmation" +msgstr "" + +#: mod/admin.php:312 +msgid "unknown" +msgstr "" + +#: 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/admin.php:376 +msgid "" +"The Auto Discovered Contact Directory feature is not enabled, it " +"will improve the data displayed here." +msgstr "" + +#: 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/admin.php:388 +#, php-format +msgid "Currently this node is aware of %d nodes from the following platforms:" +msgstr "" + +#: mod/admin.php:418 +msgid "ID" +msgstr "" + +#: mod/admin.php:419 +msgid "Recipient Name" +msgstr "" + +#: mod/admin.php:420 +msgid "Recipient Profile" +msgstr "" + +#: mod/admin.php:422 +msgid "Created" +msgstr "" + +#: mod/admin.php:423 +msgid "Last Tried" +msgstr "" + +#: 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/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 here for a guide that may be helpful " +"converting the table engines. You may also use the convert_innodb.sql in the /util directory of your Friendica installation.
" +msgstr "" + +#: 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/admin.php:458 mod/admin.php:1362 +msgid "Normal Account" +msgstr "" + +#: mod/admin.php:459 mod/admin.php:1363 +msgid "Soapbox Account" +msgstr "" + +#: mod/admin.php:460 mod/admin.php:1364 +msgid "Community/Celebrity Account" +msgstr "" + +#: mod/admin.php:461 mod/admin.php:1365 +msgid "Automatic Friend Account" +msgstr "" + +#: mod/admin.php:462 +msgid "Blog Account" +msgstr "" + +#: mod/admin.php:463 +msgid "Private Forum" +msgstr "" + +#: mod/admin.php:488 +msgid "Message queues" +msgstr "" + +#: mod/admin.php:494 +msgid "Summary" +msgstr "" + +#: mod/admin.php:496 +msgid "Registered users" +msgstr "" + +#: mod/admin.php:498 +msgid "Pending registrations" +msgstr "" + +#: mod/admin.php:499 +msgid "Version" +msgstr "" + +#: mod/admin.php:504 +msgid "Active plugins" +msgstr "" + +#: mod/admin.php:529 +msgid "Can not parse base url. Must have at least ://" +msgstr "" + +#: mod/admin.php:819 +msgid "RINO2 needs mcrypt php extension to work." +msgstr "" + +#: mod/admin.php:827 +msgid "Site settings updated." +msgstr "" + +#: mod/admin.php:855 mod/settings.php:943 +msgid "No special theme for mobile devices" +msgstr "" + +#: mod/admin.php:884 +msgid "No community page" +msgstr "" + +#: mod/admin.php:885 +msgid "Public postings from users of this site" +msgstr "" + +#: mod/admin.php:886 +msgid "Global community page" +msgstr "" + +#: mod/admin.php:891 mod/contacts.php:538 +msgid "Never" +msgstr "" + +#: mod/admin.php:892 +msgid "At post arrival" +msgstr "" + +#: mod/admin.php:900 mod/contacts.php:565 +msgid "Disabled" +msgstr "" + +#: mod/admin.php:902 +msgid "Users, Global Contacts" +msgstr "" + +#: mod/admin.php:903 +msgid "Users, Global Contacts/fallback" +msgstr "" + +#: mod/admin.php:907 +msgid "One month" +msgstr "" + +#: mod/admin.php:908 +msgid "Three months" +msgstr "" + +#: mod/admin.php:909 +msgid "Half a year" +msgstr "" + +#: mod/admin.php:910 +msgid "One year" +msgstr "" + +#: mod/admin.php:915 +msgid "Multi user instance" +msgstr "" + +#: mod/admin.php:938 +msgid "Closed" +msgstr "" + +#: mod/admin.php:939 +msgid "Requires approval" +msgstr "" + +#: mod/admin.php:940 +msgid "Open" +msgstr "" + +#: mod/admin.php:944 +msgid "No SSL policy, links will track page SSL state" +msgstr "" + +#: mod/admin.php:945 +msgid "Force all links to use SSL" +msgstr "" + +#: mod/admin.php:946 +msgid "Self-signed certificate, use SSL for local links only (discouraged)" +msgstr "" + +#: 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/admin.php:969 mod/register.php:272 +msgid "Registration" +msgstr "" + +#: mod/admin.php:970 +msgid "File upload" +msgstr "" + +#: mod/admin.php:971 +msgid "Policies" +msgstr "" + +#: mod/admin.php:973 +msgid "Auto Discovered Contact Directory" +msgstr "" + +#: mod/admin.php:974 +msgid "Performance" +msgstr "" + +#: mod/admin.php:975 +msgid "Worker" +msgstr "" + +#: mod/admin.php:976 +msgid "" +"Relocate - WARNING: advanced function. Could make this server unreachable." +msgstr "" + +#: mod/admin.php:979 +msgid "Site name" +msgstr "" + +#: mod/admin.php:980 +msgid "Host name" +msgstr "" + +#: mod/admin.php:981 +msgid "Sender Email" +msgstr "" + +#: mod/admin.php:981 +msgid "" +"The email address your server shall use to send notification emails from." +msgstr "" + +#: mod/admin.php:982 +msgid "Banner/Logo" +msgstr "" + +#: mod/admin.php:983 +msgid "Shortcut icon" +msgstr "" + +#: mod/admin.php:983 +msgid "Link to an icon that will be used for browsers." +msgstr "" + +#: mod/admin.php:984 +msgid "Touch icon" +msgstr "" + +#: mod/admin.php:984 +msgid "Link to an icon that will be used for tablets and mobiles." +msgstr "" + +#: mod/admin.php:985 +msgid "Additional Info" +msgstr "" + +#: 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/admin.php:986 +msgid "System language" +msgstr "" + +#: mod/admin.php:987 +msgid "System theme" +msgstr "" + +#: mod/admin.php:987 +msgid "" +"Default system theme - may be over-ridden by user profiles - change theme settings" +msgstr "" + +#: mod/admin.php:988 +msgid "Mobile system theme" +msgstr "" + +#: mod/admin.php:988 +msgid "Theme for mobile devices" +msgstr "" + +#: mod/admin.php:989 +msgid "SSL link policy" +msgstr "" + +#: mod/admin.php:989 +msgid "Determines whether generated links should be forced to use SSL" +msgstr "" + +#: mod/admin.php:990 +msgid "Force SSL" +msgstr "" + +#: mod/admin.php:990 +msgid "" +"Force all Non-SSL requests to SSL - Attention: on some systems it could lead " +"to endless loops." +msgstr "" + +#: mod/admin.php:991 +msgid "Hide help entry from navigation menu" +msgstr "" + +#: 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/admin.php:992 +msgid "Single user instance" +msgstr "" + +#: mod/admin.php:992 +msgid "Make this instance multi-user or single-user for the named user" +msgstr "" + +#: mod/admin.php:993 +msgid "Maximum image size" +msgstr "" + +#: mod/admin.php:993 +msgid "" +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." +msgstr "" + +#: mod/admin.php:994 +msgid "Maximum image length" +msgstr "" + +#: 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/admin.php:995 +msgid "JPEG image quality" +msgstr "" + +#: 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/admin.php:997 +msgid "Register policy" +msgstr "" + +#: mod/admin.php:998 +msgid "Maximum Daily Registrations" +msgstr "" + +#: 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/admin.php:999 +msgid "Register text" +msgstr "" + +#: mod/admin.php:999 +msgid "Will be displayed prominently on the registration page." +msgstr "" + +#: mod/admin.php:1000 +msgid "Accounts abandoned after x days" +msgstr "" + +#: mod/admin.php:1000 +msgid "" +"Will not waste system resources polling external sites for abandonded " +"accounts. Enter 0 for no time limit." +msgstr "" + +#: mod/admin.php:1001 +msgid "Allowed friend domains" +msgstr "" + +#: 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/admin.php:1002 +msgid "Allowed email domains" +msgstr "" + +#: 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/admin.php:1003 +msgid "Block public" +msgstr "" + +#: 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/admin.php:1004 +msgid "Force publish" +msgstr "" + +#: mod/admin.php:1004 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "" + +#: mod/admin.php:1005 +msgid "Global directory URL" +msgstr "" + +#: 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/admin.php:1006 +msgid "Allow threaded items" +msgstr "" + +#: mod/admin.php:1006 +msgid "Allow infinite level threading for items on this site." +msgstr "" + +#: mod/admin.php:1007 +msgid "Private posts by default for new users" +msgstr "" + +#: mod/admin.php:1007 +msgid "" +"Set default post permissions for all new members to the default privacy " +"group rather than public." +msgstr "" + +#: mod/admin.php:1008 +msgid "Don't include post content in email notifications" +msgstr "" + +#: 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/admin.php:1009 +msgid "Disallow public access to addons listed in the apps menu." +msgstr "" + +#: mod/admin.php:1009 +msgid "" +"Checking this box will restrict addons listed in the apps menu to members " +"only." +msgstr "" + +#: mod/admin.php:1010 +msgid "Don't embed private images in posts" +msgstr "" + +#: mod/admin.php:1010 +msgid "" +"Don't replace locally-hosted private photos in posts with an embedded copy " +"of the image. This means that contacts who receive posts containing private " +"photos will have to authenticate and load each image, which may take a while." +msgstr "" + +#: mod/admin.php:1011 +msgid "Allow Users to set remote_self" +msgstr "" + +#: mod/admin.php:1011 +msgid "" +"With checking this, every user is allowed to mark every contact as a " +"remote_self in the repair contact dialog. Setting this flag on a contact " +"causes mirroring every posting of that contact in the users stream." +msgstr "" + +#: mod/admin.php:1012 +msgid "Block multiple registrations" +msgstr "" + +#: mod/admin.php:1012 +msgid "Disallow users to register additional accounts for use as pages." +msgstr "" + +#: mod/admin.php:1013 +msgid "OpenID support" +msgstr "" + +#: mod/admin.php:1013 +msgid "OpenID support for registration and logins." +msgstr "" + +#: mod/admin.php:1014 +msgid "Fullname check" +msgstr "" + +#: mod/admin.php:1014 +msgid "" +"Force users to register with a space between firstname and lastname in Full " +"name, as an antispam measure" +msgstr "" + +#: mod/admin.php:1015 +msgid "UTF-8 Regular expressions" +msgstr "" + +#: mod/admin.php:1015 +msgid "Use PHP UTF8 regular expressions" +msgstr "" + +#: mod/admin.php:1016 +msgid "Community Page Style" +msgstr "" + +#: mod/admin.php:1016 +msgid "" +"Type of community page to show. 'Global community' shows every public " +"posting from an open distributed network that arrived on this server." +msgstr "" + +#: mod/admin.php:1017 +msgid "Posts per user on community page" +msgstr "" + +#: mod/admin.php:1017 +msgid "" +"The maximum number of posts per user on the community page. (Not valid for " +"'Global Community')" +msgstr "" + +#: mod/admin.php:1018 +msgid "Enable OStatus support" +msgstr "" + +#: 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/admin.php:1019 +msgid "OStatus conversation completion interval" +msgstr "" + +#: 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/admin.php:1020 +msgid "Only import OStatus threads from our contacts" +msgstr "" + +#: 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/admin.php:1021 +msgid "OStatus support can only be enabled if threading is enabled." +msgstr "" + +#: mod/admin.php:1023 +msgid "" +"Diaspora support can't be enabled because Friendica was installed into a sub " +"directory." +msgstr "" + +#: mod/admin.php:1024 +msgid "Enable Diaspora support" +msgstr "" + +#: mod/admin.php:1024 +msgid "Provide built-in Diaspora network compatibility." +msgstr "" + +#: mod/admin.php:1025 +msgid "Only allow Friendica contacts" +msgstr "" + +#: mod/admin.php:1025 +msgid "" +"All contacts must use Friendica protocols. All other built-in communication " +"protocols disabled." +msgstr "" + +#: mod/admin.php:1026 +msgid "Verify SSL" +msgstr "" + +#: mod/admin.php:1026 +msgid "" +"If you wish, you can turn on strict certificate checking. This will mean you " +"cannot connect (at all) to self-signed SSL sites." +msgstr "" + +#: mod/admin.php:1027 +msgid "Proxy user" +msgstr "" + +#: mod/admin.php:1028 +msgid "Proxy URL" +msgstr "" + +#: mod/admin.php:1029 +msgid "Network timeout" +msgstr "" + +#: mod/admin.php:1029 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "" + +#: mod/admin.php:1030 +msgid "Maximum Load Average" +msgstr "" + +#: mod/admin.php:1030 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "" + +#: mod/admin.php:1031 +msgid "Maximum Load Average (Frontend)" +msgstr "" + +#: mod/admin.php:1031 +msgid "Maximum system load before the frontend quits service - default 50." +msgstr "" + +#: mod/admin.php:1032 +msgid "Maximum table size for optimization" +msgstr "" + +#: mod/admin.php:1032 +msgid "" +"Maximum table size (in MB) for the automatic optimization - default 100 MB. " +"Enter -1 to disable it." +msgstr "" + +#: mod/admin.php:1033 +msgid "Minimum level of fragmentation" +msgstr "" + +#: mod/admin.php:1033 +msgid "" +"Minimum fragmenation level to start the automatic optimization - default " +"value is 30%." +msgstr "" + +#: mod/admin.php:1035 +msgid "Periodical check of global contacts" +msgstr "" + +#: mod/admin.php:1035 +msgid "" +"If enabled, the global contacts are checked periodically for missing or " +"outdated data and the vitality of the contacts and servers." +msgstr "" + +#: mod/admin.php:1036 +msgid "Days between requery" +msgstr "" + +#: mod/admin.php:1036 +msgid "Number of days after which a server is requeried for his contacts." +msgstr "" + +#: mod/admin.php:1037 +msgid "Discover contacts from other servers" +msgstr "" + +#: mod/admin.php:1037 +msgid "" +"Periodically query other servers for contacts. You can choose between " +"'users': the users on the remote system, 'Global Contacts': active contacts " +"that are known on the system. The fallback is meant for Redmatrix servers " +"and older friendica servers, where global contacts weren't available. The " +"fallback increases the server load, so the recommened setting is 'Users, " +"Global Contacts'." +msgstr "" + +#: mod/admin.php:1038 +msgid "Timeframe for fetching global contacts" +msgstr "" + +#: mod/admin.php:1038 +msgid "" +"When the discovery is activated, this value defines the timeframe for the " +"activity of the global contacts that are fetched from other servers." +msgstr "" + +#: mod/admin.php:1039 +msgid "Search the local directory" +msgstr "" + +#: mod/admin.php:1039 +msgid "" +"Search the local directory instead of the global directory. When searching " +"locally, every search will be executed on the global directory in the " +"background. This improves the search results when the search is repeated." +msgstr "" + +#: mod/admin.php:1041 +msgid "Publish server information" +msgstr "" + +#: mod/admin.php:1041 +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 the-federation.info for details." +msgstr "" + +#: mod/admin.php:1043 +msgid "Use MySQL full text engine" +msgstr "" + +#: mod/admin.php:1043 +msgid "" +"Activates the full text engine. Speeds up search - but can only search for " +"four and more characters." +msgstr "" + +#: mod/admin.php:1044 +msgid "Suppress Tags" +msgstr "" + +#: mod/admin.php:1044 +msgid "Suppress showing a list of hashtags at the end of the posting." +msgstr "" + +#: mod/admin.php:1045 +msgid "Path to item cache" +msgstr "" + +#: mod/admin.php:1045 +msgid "The item caches buffers generated bbcode and external images." +msgstr "" + +#: mod/admin.php:1046 +msgid "Cache duration in seconds" +msgstr "" + +#: mod/admin.php:1046 +msgid "" +"How long should the cache files be hold? Default value is 86400 seconds (One " +"day). To disable the item cache, set the value to -1." +msgstr "" + +#: mod/admin.php:1047 +msgid "Maximum numbers of comments per post" +msgstr "" + +#: mod/admin.php:1047 +msgid "How much comments should be shown for each post? Default value is 100." +msgstr "" + +#: mod/admin.php:1048 +msgid "Temp path" +msgstr "" + +#: 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/admin.php:1049 +msgid "Base path to installation" +msgstr "" + +#: 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/admin.php:1050 +msgid "Disable picture proxy" +msgstr "" + +#: 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/admin.php:1051 +msgid "Only search in tags" +msgstr "" + +#: mod/admin.php:1051 +msgid "On large systems the text search can slow down the system extremely." +msgstr "" + +#: mod/admin.php:1053 +msgid "New base url" +msgstr "" + +#: mod/admin.php:1053 +msgid "" +"Change base url for this server. Sends relocate message to all DFRN contacts " +"of all users." +msgstr "" + +#: mod/admin.php:1055 +msgid "RINO Encryption" +msgstr "" + +#: mod/admin.php:1055 +msgid "Encryption layer between nodes." +msgstr "" + +#: mod/admin.php:1056 +msgid "Embedly API key" +msgstr "" + +#: mod/admin.php:1056 +msgid "" +"Embedly is used to fetch additional data for " +"web pages. This is an optional parameter." +msgstr "" + +#: mod/admin.php:1058 +msgid "Maximum number of parallel workers" +msgstr "" + +#: mod/admin.php:1058 +msgid "" +"On shared hosters set this to 2. On larger systems, values of 10 are great. " +"Default value is 4." +msgstr "" + +#: mod/admin.php:1059 +msgid "Don't use 'proc_open' with the worker" +msgstr "" + +#: 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/admin.php:1060 +msgid "Enable fastlane" +msgstr "" + +#: 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/admin.php:1061 +msgid "Enable frontend worker" +msgstr "" + +#: 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/admin.php:1091 +msgid "Update has been marked successful" +msgstr "" + +#: mod/admin.php:1099 +#, php-format +msgid "Database structure update %s was successfully applied." +msgstr "" + +#: mod/admin.php:1102 +#, php-format +msgid "Executing of database structure update %s failed with error: %s" +msgstr "" + +#: mod/admin.php:1116 +#, php-format +msgid "Executing %s failed with error: %s" +msgstr "" + +#: mod/admin.php:1119 +#, php-format +msgid "Update %s was successfully applied." +msgstr "" + +#: mod/admin.php:1122 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: mod/admin.php:1125 +#, php-format +msgid "There was no additional update function %s that needed to be called." +msgstr "" + +#: mod/admin.php:1145 +msgid "No failed updates." +msgstr "" + +#: mod/admin.php:1146 +msgid "Check database structure" +msgstr "" + +#: mod/admin.php:1151 +msgid "Failed Updates" +msgstr "" + +#: mod/admin.php:1152 +msgid "" +"This does not include updates prior to 1139, which did not return a status." +msgstr "" + +#: mod/admin.php:1153 +msgid "Mark success (if update was manually applied)" +msgstr "" + +#: mod/admin.php:1154 +msgid "Attempt to execute this update step automatically" +msgstr "" + +#: mod/admin.php:1188 +#, php-format +msgid "" +"\n" +"\t\t\tDear %1$s,\n" +"\t\t\t\tthe administrator of %2$s has set up an account for you." +msgstr "" + +#: mod/admin.php: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/admin.php:1235 +#, php-format +msgid "%s user blocked/unblocked" +msgid_plural "%s users blocked/unblocked" +msgstr[0] "" +msgstr[1] "" + +#: mod/admin.php:1242 +#, php-format +msgid "%s user deleted" +msgid_plural "%s users deleted" +msgstr[0] "" +msgstr[1] "" + +#: mod/admin.php:1289 +#, php-format +msgid "User '%s' deleted" +msgstr "" + +#: mod/admin.php:1297 +#, php-format +msgid "User '%s' unblocked" +msgstr "" + +#: mod/admin.php:1297 +#, php-format +msgid "User '%s' blocked" +msgstr "" + +#: 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/admin.php:1405 mod/admin.php:1431 +msgid "Register date" +msgstr "" + +#: mod/admin.php:1405 mod/admin.php:1431 +msgid "Last login" +msgstr "" + +#: mod/admin.php:1405 mod/admin.php:1431 +msgid "Last item" +msgstr "" + +#: mod/admin.php:1405 mod/settings.php:43 +msgid "Account" +msgstr "" + +#: mod/admin.php:1414 +msgid "Add User" +msgstr "" + +#: mod/admin.php:1415 +msgid "select all" +msgstr "" + +#: mod/admin.php:1416 +msgid "User registrations waiting for confirm" +msgstr "" + +#: mod/admin.php:1417 +msgid "User waiting for permanent deletion" +msgstr "" + +#: mod/admin.php:1418 +msgid "Request date" +msgstr "" + +#: mod/admin.php:1419 +msgid "No registrations." +msgstr "" + +#: mod/admin.php:1420 +msgid "Note from the user" +msgstr "" + +#: mod/admin.php:1421 mod/notifications.php:176 mod/notifications.php:255 +msgid "Approve" +msgstr "" + +#: mod/admin.php:1422 +msgid "Deny" +msgstr "" + +#: mod/admin.php:1424 mod/contacts.php:613 mod/contacts.php:813 +#: mod/contacts.php:991 +msgid "Block" +msgstr "" + +#: mod/admin.php:1425 mod/contacts.php:613 mod/contacts.php:813 +#: mod/contacts.php:991 +msgid "Unblock" +msgstr "" + +#: mod/admin.php:1426 +msgid "Site admin" +msgstr "" + +#: mod/admin.php:1427 +msgid "Account expired" +msgstr "" + +#: mod/admin.php:1430 +msgid "New User" +msgstr "" + +#: mod/admin.php:1431 +msgid "Deleted since" +msgstr "" + +#: mod/admin.php:1436 +msgid "" +"Selected users will be deleted!\\n\\nEverything these users had posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" +msgstr "" + +#: mod/admin.php: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/admin.php:1447 +msgid "Name of the new user." +msgstr "" + +#: mod/admin.php:1448 +msgid "Nickname" +msgstr "" + +#: mod/admin.php:1448 +msgid "Nickname of the new user." +msgstr "" + +#: mod/admin.php:1449 +msgid "Email address of the new user." +msgstr "" + +#: mod/admin.php:1492 +#, php-format +msgid "Plugin %s disabled." +msgstr "" + +#: mod/admin.php:1496 +#, php-format +msgid "Plugin %s enabled." +msgstr "" + +#: mod/admin.php:1507 mod/admin.php:1759 +msgid "Disable" +msgstr "" + +#: mod/admin.php:1509 mod/admin.php:1761 +msgid "Enable" +msgstr "" + +#: mod/admin.php:1532 mod/admin.php:1808 +msgid "Toggle" +msgstr "" + +#: mod/admin.php:1540 mod/admin.php:1817 +msgid "Author: " +msgstr "" + +#: mod/admin.php:1541 mod/admin.php:1818 +msgid "Maintainer: " +msgstr "" + +#: mod/admin.php:1596 +msgid "Reload active plugins" +msgstr "" + +#: 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/admin.php:1720 +msgid "No themes found." +msgstr "" + +#: mod/admin.php:1799 +msgid "Screenshot" +msgstr "" + +#: mod/admin.php:1859 +msgid "Reload active themes" +msgstr "" + +#: mod/admin.php:1864 +#, php-format +msgid "No themes found on the system. They should be paced in %1$s" +msgstr "" + +#: mod/admin.php:1865 +msgid "[Experimental]" +msgstr "" + +#: mod/admin.php:1866 +msgid "[Unsupported]" +msgstr "" + +#: mod/admin.php:1890 +msgid "Log settings updated." +msgstr "" + +#: mod/admin.php:1922 +msgid "PHP log currently enabled." +msgstr "" + +#: mod/admin.php:1924 +msgid "PHP log currently disabled." +msgstr "" + +#: mod/admin.php:1933 +msgid "Clear" +msgstr "" + +#: mod/admin.php:1938 +msgid "Enable Debugging" +msgstr "" + +#: mod/admin.php:1939 +msgid "Log file" +msgstr "" + +#: mod/admin.php:1939 +msgid "" +"Must be writable by web server. Relative to your Friendica top-level " +"directory." +msgstr "" + +#: mod/admin.php:1940 +msgid "Log level" +msgstr "" + +#: mod/admin.php:1943 +msgid "PHP logging" +msgstr "" + +#: 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/admin.php:2074 mod/admin.php:2075 mod/settings.php:782 +msgid "Off" +msgstr "" + +#: mod/admin.php:2074 mod/admin.php:2075 mod/settings.php:782 +msgid "On" +msgstr "" + +#: mod/admin.php:2075 +#, php-format +msgid "Lock feature %s" +msgstr "" + +#: mod/admin.php:2083 +msgid "Manage Additional Features" msgstr "" #: mod/allfriends.php:46 @@ -3112,20 +4549,16 @@ msgid "" "and/or create new posts for you?" 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 +#: 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/apps.php:7 index.php:248 -msgid "You must be logged in to use addons. " -msgstr "" - #: mod/apps.php:11 msgid "Applications" msgstr "" @@ -3194,2229 +4627,10 @@ msgstr "" msgid "The post was created" msgstr "" -#: mod/common.php:91 -msgid "No contacts in common." -msgstr "" - -#: mod/common.php:141 mod/contacts.php:871 -msgid "Common Friends" -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." -msgstr "" - -#: mod/community.php:27 -msgid "Not available." -msgstr "" - -#: mod/community.php:66 mod/community.php:75 mod/search.php:224 -msgid "No results." -msgstr "" - -#: mod/content.php:119 mod/network.php:468 -msgid "No such group" -msgstr "" - -#: mod/content.php:130 mod/group.php:203 mod/network.php:495 -msgid "Group is empty" -msgstr "" - -#: mod/content.php:135 mod/network.php:499 -#, php-format -msgid "Group: %s" -msgstr "" - -#: mod/content.php:325 object/Item.php:96 -msgid "This entry was edited" -msgstr "" - -#: mod/content.php:621 object/Item.php:444 -#, 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/content.php:702 mod/photos.php:1590 object/Item.php:274 -msgid "I like this (toggle)" -msgstr "" - -#: mod/content.php:702 object/Item.php:274 -msgid "like" -msgstr "" - -#: mod/content.php:703 mod/photos.php:1591 object/Item.php:275 -msgid "I don't like this (toggle)" -msgstr "" - -#: mod/content.php:703 object/Item.php:275 -msgid "dislike" -msgstr "" - -#: mod/content.php:705 object/Item.php:278 -msgid "Share this" -msgstr "" - -#: mod/content.php:705 object/Item.php:278 -msgid "share" -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" -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" -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" -msgstr "" - -#: mod/content.php:729 object/Item.php:733 -msgid "Bold" -msgstr "" - -#: mod/content.php:730 object/Item.php:734 -msgid "Italic" -msgstr "" - -#: mod/content.php:731 object/Item.php:735 -msgid "Underline" -msgstr "" - -#: mod/content.php:732 object/Item.php:736 -msgid "Quote" -msgstr "" - -#: mod/content.php:733 object/Item.php:737 -msgid "Code" -msgstr "" - -#: mod/content.php:734 object/Item.php:738 -msgid "Image" -msgstr "" - -#: mod/content.php:735 object/Item.php:739 -msgid "Link" -msgstr "" - -#: mod/content.php:736 object/Item.php:740 -msgid "Video" -msgstr "" - -#: mod/content.php:746 mod/settings.php:743 object/Item.php:122 -#: object/Item.php:124 -msgid "Edit" -msgstr "" - -#: mod/content.php:772 object/Item.php:238 -msgid "add star" -msgstr "" - -#: mod/content.php:773 object/Item.php:239 -msgid "remove star" -msgstr "" - -#: mod/content.php:774 object/Item.php:240 -msgid "toggle star status" -msgstr "" - -#: mod/content.php:777 object/Item.php:243 -msgid "starred" -msgstr "" - -#: mod/content.php:778 mod/content.php:800 object/Item.php:263 -msgid "add tag" -msgstr "" - -#: mod/content.php:789 object/Item.php:251 -msgid "ignore thread" -msgstr "" - -#: mod/content.php:790 object/Item.php:252 -msgid "unignore thread" -msgstr "" - -#: mod/content.php:791 object/Item.php:253 -msgid "toggle ignore status" -msgstr "" - -#: mod/content.php:794 mod/ostatus_subscribe.php:73 object/Item.php:256 -msgid "ignored" -msgstr "" - -#: mod/content.php:805 object/Item.php:141 -msgid "save to folder" -msgstr "" - -#: mod/content.php:853 object/Item.php:212 -msgid "I will attend" -msgstr "" - -#: mod/content.php:853 object/Item.php:212 -msgid "I will not attend" -msgstr "" - -#: mod/content.php:853 object/Item.php:212 -msgid "I might attend" -msgstr "" - -#: mod/content.php:917 object/Item.php:384 -msgid "to" -msgstr "" - -#: mod/content.php:918 object/Item.php:386 -msgid "Wall-to-Wall" -msgstr "" - -#: mod/content.php:919 object/Item.php:387 -msgid "via Wall-To-Wall:" -msgstr "" - -#: mod/credits.php:16 -msgid "Credits" -msgstr "" - -#: mod/credits.php:17 -msgid "" -"Friendica is a community project, that would not be possible without the " -"help of many people. Here is a list of those who have contributed to the " -"code or the translation of Friendica. Thank you all!" -msgstr "" - -#: mod/crepair.php:89 -msgid "Contact settings applied." -msgstr "" - -#: mod/crepair.php:91 -msgid "Contact update failed." -msgstr "" - -#: mod/crepair.php:116 mod/fsuggest.php:21 mod/fsuggest.php:93 -#: mod/dfrn_confirm.php:126 -msgid "Contact not found." -msgstr "" - -#: mod/crepair.php:122 -msgid "" -"WARNING: This is highly advanced and if you enter incorrect " -"information your communications with this contact may stop working." -msgstr "" - -#: mod/crepair.php:123 -msgid "" -"Please use your browser 'Back' button now if you are " -"uncertain what to do on this page." -msgstr "" - -#: mod/crepair.php:136 mod/crepair.php:138 -msgid "No mirroring" -msgstr "" - -#: mod/crepair.php:136 -msgid "Mirror as forwarded posting" -msgstr "" - -#: mod/crepair.php:136 mod/crepair.php:138 -msgid "Mirror as my own posting" -msgstr "" - -#: mod/crepair.php:152 -msgid "Return to contact editor" -msgstr "" - -#: mod/crepair.php:154 -msgid "Refetch contact data" -msgstr "" - -#: mod/crepair.php:158 -msgid "Remote Self" -msgstr "" - -#: mod/crepair.php:161 -msgid "Mirror postings from this contact" -msgstr "" - -#: mod/crepair.php:163 -msgid "" -"Mark this contact as remote_self, this will cause friendica to repost new " -"entries from this contact." -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" -msgstr "" - -#: mod/crepair.php:168 -msgid "Account Nickname" -msgstr "" - -#: mod/crepair.php:169 -msgid "@Tagname - overrides Name/Nickname" -msgstr "" - -#: mod/crepair.php:170 -msgid "Account URL" -msgstr "" - -#: mod/crepair.php:171 -msgid "Friend Request URL" -msgstr "" - -#: mod/crepair.php:172 -msgid "Friend Confirm URL" -msgstr "" - -#: mod/crepair.php:173 -msgid "Notification Endpoint URL" -msgstr "" - -#: mod/crepair.php:174 -msgid "Poll/Feed URL" -msgstr "" - -#: mod/crepair.php:175 -msgid "New photo from this URL" -msgstr "" - -#: mod/delegate.php:101 -msgid "No potential page delegates located." -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." -msgstr "" - -#: mod/delegate.php:133 -msgid "Existing Page Managers" -msgstr "" - -#: mod/delegate.php:135 -msgid "Existing Page Delegates" -msgstr "" - -#: mod/delegate.php:137 -msgid "Potential Delegates" -msgstr "" - -#: mod/delegate.php:139 mod/tagrm.php:95 -msgid "Remove" -msgstr "" - -#: mod/delegate.php:140 -msgid "Add" -msgstr "" - -#: mod/delegate.php:141 -msgid "No entries." -msgstr "" - -#: mod/dfrn_poll.php:104 mod/dfrn_poll.php:539 -#, php-format -msgid "%1$s welcomes %2$s" -msgstr "" - -#: mod/directory.php:199 view/theme/vier/theme.php:196 -msgid "Global Directory" -msgstr "" - -#: mod/directory.php:201 -msgid "Find on this site" -msgstr "" - -#: mod/directory.php:203 -msgid "Results for:" -msgstr "" - -#: mod/directory.php:205 -msgid "Site Directory" -msgstr "" - -#: mod/directory.php:212 -msgid "No entries (some entries may be hidden)." -msgstr "" - -#: mod/dirfind.php:37 -#, php-format -msgid "People Search - %s" -msgstr "" - -#: mod/dirfind.php:48 -#, php-format -msgid "Forum Search - %s" -msgstr "" - -#: mod/dirfind.php:245 mod/match.php:109 -msgid "No matches" -msgstr "" - -#: mod/filer.php:30 -msgid "- select -" -msgstr "" - -#: mod/follow.php:19 mod/dfrn_request.php:888 -msgid "Submit Request" -msgstr "" - -#: mod/follow.php:30 -msgid "You already added this contact." -msgstr "" - -#: mod/follow.php:39 -msgid "Diaspora support isn't enabled. Contact can't be added." -msgstr "" - -#: mod/follow.php:46 -msgid "OStatus support is disabled. Contact can't be added." -msgstr "" - -#: mod/follow.php:53 -msgid "The network type couldn't be detected. Contact can't be added." -msgstr "" - -#: mod/follow.php:112 mod/dfrn_request.php:874 -msgid "Please answer the following:" -msgstr "" - -#: mod/follow.php:113 mod/dfrn_request.php:875 -#, php-format -msgid "Does %s know you?" -msgstr "" - -#: mod/follow.php:114 mod/dfrn_request.php:879 -msgid "Add a personal note:" -msgstr "" - -#: mod/follow.php:120 mod/dfrn_request.php:885 -msgid "Your Identity Address:" -msgstr "" - -#: mod/follow.php:129 mod/contacts.php:632 mod/notifications.php:249 -msgid "Profile URL" -msgstr "" - -#: mod/follow.php:186 -msgid "Contact added" -msgstr "" - -#: mod/fsuggest.php:64 -msgid "Friend suggestion sent." -msgstr "" - -#: mod/fsuggest.php:98 -msgid "Suggest Friends" -msgstr "" - -#: mod/fsuggest.php:100 -#, php-format -msgid "Suggest a friend for %s" -msgstr "" - -#: mod/group.php:29 -msgid "Group created." -msgstr "" - -#: mod/group.php:35 -msgid "Could not create group." -msgstr "" - -#: mod/group.php:49 mod/group.php:150 -msgid "Group not found." -msgstr "" - -#: mod/group.php:63 -msgid "Group name changed." -msgstr "" - -#: mod/group.php:76 mod/profperm.php:20 index.php:406 -msgid "Permission denied" -msgstr "" - -#: mod/group.php:91 -msgid "Save Group" -msgstr "" - -#: mod/group.php:97 -msgid "Create a group of contacts/friends." -msgstr "" - -#: mod/group.php:122 -msgid "Group removed." -msgstr "" - -#: mod/group.php:124 -msgid "Unable to remove group." -msgstr "" - -#: mod/group.php:187 -msgid "Group Editor" -msgstr "" - -#: mod/group.php:200 -msgid "Members" -msgstr "" - -#: mod/group.php:202 mod/contacts.php:700 -msgid "All Contacts" -msgstr "" - -#: mod/group.php:233 mod/profperm.php:107 -msgid "Click on a contact to add or remove." -msgstr "" - -#: mod/hcard.php:11 -msgid "No profile" -msgstr "" - -#: mod/help.php:41 -msgid "Help:" -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" -msgstr "" - -#: mod/help.php:56 index.php:295 -msgid "Page not found." -msgstr "" - -#: mod/home.php:39 -#, php-format -msgid "Welcome to %s" -msgstr "" - -#: mod/invite.php:28 -msgid "Total invitation limit exceeded." -msgstr "" - -#: mod/invite.php:51 -#, php-format -msgid "%s : Not a valid email address." -msgstr "" - -#: mod/invite.php:76 -msgid "Please join us on Friendica" -msgstr "" - -#: mod/invite.php:87 -msgid "Invitation limit exceeded. Please contact your site administrator." -msgstr "" - -#: mod/invite.php:91 -#, php-format -msgid "%s : Message delivery failed." -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" -msgstr "" - -#: 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/invite.php:124 -#, php-format -msgid "" -"To accept this invitation, please visit and register at %s or any other " -"public Friendica website." -msgstr "" - -#: 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/invite.php:128 -msgid "" -"Our apologies. This system is not currently configured to connect with other " -"public sites or invite members." -msgstr "" - -#: mod/invite.php:134 -msgid "Send invitations" -msgstr "" - -#: mod/invite.php:135 -msgid "Enter email addresses, one per line:" -msgstr "" - -#: mod/invite.php:136 mod/message.php:332 mod/message.php:515 -#: mod/wallmessage.php:135 -msgid "Your message:" -msgstr "" - -#: 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/invite.php:139 -msgid "You will need to supply this invitation code: $invite_code" -msgstr "" - -#: mod/invite.php:139 -msgid "" -"Once you have registered, please connect with me via my profile page at:" -msgstr "" - -#: 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/localtime.php:24 -msgid "Time Conversion" -msgstr "" - -#: mod/localtime.php:26 -msgid "" -"Friendica provides this service for sharing events with other networks and " -"friends in unknown timezones." -msgstr "" - -#: mod/localtime.php:30 -#, php-format -msgid "UTC time: %s" -msgstr "" - -#: mod/localtime.php:33 -#, php-format -msgid "Current timezone: %s" -msgstr "" - -#: mod/localtime.php:36 -#, php-format -msgid "Converted localtime: %s" -msgstr "" - -#: mod/localtime.php:41 -msgid "Please select your timezone:" -msgstr "" - -#: mod/lockview.php:32 mod/lockview.php:40 -msgid "Remote privacy information not available." -msgstr "" - -#: mod/lockview.php:49 -msgid "Visible to:" -msgstr "" - -#: mod/lostpass.php:19 -msgid "No valid account found." -msgstr "" - -#: mod/lostpass.php:35 -msgid "Password reset request issued. Check your email." -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 Settings 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" -msgstr "" - -#: mod/maintenance.php:9 -msgid "System down for maintenance" -msgstr "" - -#: mod/manage.php:141 -msgid "Manage Identities and/or Pages" -msgstr "" - -#: mod/manage.php:142 -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" -msgstr "" - -#: mod/newmember.php:8 -msgid "New Member Checklist" -msgstr "" - -#: 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/newmember.php:14 -msgid "Getting Started" -msgstr "" - -#: mod/newmember.php:18 -msgid "Friendica Walk-Through" -msgstr "" - -#: mod/newmember.php:18 -msgid "" -"On your Quick Start page - find a brief introduction to your " -"profile and network tabs, make some new connections, and find some groups to " -"join." -msgstr "" - -#: mod/newmember.php:26 -msgid "Go to Your Settings" -msgstr "" - -#: mod/newmember.php:26 -msgid "" -"On your Settings 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/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/newmember.php:36 mod/profile_photo.php:256 mod/profiles.php:699 -msgid "Upload Profile Photo" -msgstr "" - -#: 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/newmember.php:38 -msgid "Edit Your Profile" -msgstr "" - -#: mod/newmember.php:38 -msgid "" -"Edit your default profile to your liking. Review the " -"settings for hiding your list of friends and hiding the profile from unknown " -"visitors." -msgstr "" - -#: mod/newmember.php:40 -msgid "Profile Keywords" -msgstr "" - -#: mod/newmember.php:40 -msgid "" -"Set some public keywords for your default profile which describe your " -"interests. We may be able to find other people with similar interests and " -"suggest friendships." -msgstr "" - -#: mod/newmember.php:44 -msgid "Connecting" -msgstr "" - -#: mod/newmember.php:51 -msgid "Importing Emails" -msgstr "" - -#: mod/newmember.php:51 -msgid "" -"Enter your email access information on your Connector Settings page if you " -"wish to import and interact with friends or mailing lists from your email " -"INBOX" -msgstr "" - -#: mod/newmember.php:53 -msgid "Go to Your Contacts Page" -msgstr "" - -#: mod/newmember.php:53 -msgid "" -"Your Contacts page is your gateway to managing friendships and connecting " -"with friends on other networks. Typically you enter their address or site " -"URL in the Add New Contact dialog." -msgstr "" - -#: mod/newmember.php:55 -msgid "Go to Your Site's Directory" -msgstr "" - -#: mod/newmember.php:55 -msgid "" -"The Directory page lets you find other people in this network or other " -"federated sites. Look for a Connect or Follow link on " -"their profile page. Provide your own Identity Address if requested." -msgstr "" - -#: mod/newmember.php:57 -msgid "Finding New People" -msgstr "" - -#: mod/newmember.php:57 -msgid "" -"On the side panel of the Contacts page are several tools to find new " -"friends. We can match people by interest, look up people by name or " -"interest, and provide suggestions based on network relationships. On a brand " -"new site, friend suggestions will usually begin to be populated within 24 " -"hours." -msgstr "" - -#: mod/newmember.php:65 -msgid "Group Your Contacts" -msgstr "" - -#: mod/newmember.php:65 -msgid "" -"Once you have made some friends, organize them into private conversation " -"groups from the sidebar of your Contacts page and then you can interact with " -"each group privately on your Network page." -msgstr "" - -#: mod/newmember.php:68 -msgid "Why Aren't My Posts Public?" -msgstr "" - -#: mod/newmember.php:68 -msgid "" -"Friendica respects your privacy. By default, your posts will only show up to " -"people you've added as friends. For more information, see the help section " -"from the link above." -msgstr "" - -#: mod/newmember.php:73 -msgid "Getting Help" -msgstr "" - -#: mod/newmember.php:77 -msgid "Go to the Help Section" -msgstr "" - -#: mod/newmember.php:77 -msgid "" -"Our help pages may be consulted for detail on other program " -"features and resources." -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]" -msgstr "" - -#: mod/nogroup.php:44 mod/contacts.php:939 -msgid "Edit contact" -msgstr "" - -#: mod/nogroup.php:65 -msgid "Contacts who are not members of a group" -msgstr "" - -#: mod/notify.php:65 -msgid "No more system notifications." -msgstr "" - -#: mod/notify.php:69 mod/notifications.php:111 -msgid "System Notifications" -msgstr "" - -#: mod/oexchange.php:21 -msgid "Post successful." -msgstr "" - -#: mod/openid.php:24 -msgid "OpenID protocol error. No ID returned." -msgstr "" - -#: mod/openid.php:60 -msgid "" -"Account not found and OpenID registration is not permitted on this site." -msgstr "" - -#: mod/ostatus_subscribe.php:14 -msgid "Subscribing to OStatus contacts" -msgstr "" - -#: mod/ostatus_subscribe.php:25 -msgid "No contact provided." -msgstr "" - -#: mod/ostatus_subscribe.php:31 -msgid "Couldn't fetch information for contact." -msgstr "" - -#: mod/ostatus_subscribe.php:40 -msgid "Couldn't fetch friends for contact." -msgstr "" - -#: mod/ostatus_subscribe.php:54 mod/repair_ostatus.php:44 -msgid "Done" -msgstr "" - -#: mod/ostatus_subscribe.php:68 -msgid "success" -msgstr "" - -#: mod/ostatus_subscribe.php:70 -msgid "failed" -msgstr "" - -#: mod/ostatus_subscribe.php:78 mod/repair_ostatus.php:50 -msgid "Keep this window open until done." -msgstr "" - -#: mod/poke.php:196 -msgid "Poke/Prod" -msgstr "" - -#: mod/poke.php:197 -msgid "poke, prod or do other things to somebody" -msgstr "" - -#: mod/poke.php:198 -msgid "Recipient" -msgstr "" - -#: mod/poke.php:199 -msgid "Choose what you wish to do to recipient" -msgstr "" - -#: mod/poke.php:202 -msgid "Make this post private" -msgstr "" - -#: mod/profile.php:154 mod/cal.php:143 mod/display.php:328 +#: mod/cal.php:143 mod/display.php:328 mod/profile.php:154 msgid "Access to this profile has been restricted." msgstr "" -#: mod/profile.php:174 -msgid "Tips for New Members" -msgstr "" - -#: mod/profile_photo.php:44 -msgid "Image uploaded but image cropping failed." -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." -msgstr "" - -#: mod/profile_photo.php:127 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." -msgstr "" - -#: mod/profile_photo.php:137 -msgid "Unable to process image" -msgstr "" - -#: mod/profile_photo.php:156 mod/wall_upload.php:151 mod/photos.php:803 -#, php-format -msgid "Image exceeds size limit of %s" -msgstr "" - -#: mod/profile_photo.php:165 mod/wall_upload.php:186 mod/photos.php:844 -msgid "Unable to process image." -msgstr "" - -#: mod/profile_photo.php:254 -msgid "Upload File:" -msgstr "" - -#: mod/profile_photo.php:255 -msgid "Select a profile:" -msgstr "" - -#: mod/profile_photo.php:257 -msgid "Upload" -msgstr "" - -#: mod/profile_photo.php:260 -msgid "or" -msgstr "" - -#: mod/profile_photo.php:260 -msgid "skip this step" -msgstr "" - -#: mod/profile_photo.php:260 -msgid "select a photo from your photo albums" -msgstr "" - -#: mod/profile_photo.php:274 -msgid "Crop Image" -msgstr "" - -#: mod/profile_photo.php:275 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "" - -#: mod/profile_photo.php:277 -msgid "Done Editing" -msgstr "" - -#: mod/profile_photo.php:313 -msgid "Image uploaded successfully." -msgstr "" - -#: mod/profile_photo.php:315 mod/wall_upload.php:219 mod/photos.php:871 -msgid "Image upload failed." -msgstr "" - -#: mod/profperm.php:26 mod/profperm.php:57 -msgid "Invalid profile identifier." -msgstr "" - -#: mod/profperm.php:103 -msgid "Profile Visibility Editor" -msgstr "" - -#: mod/profperm.php:116 -msgid "Visible To" -msgstr "" - -#: mod/profperm.php:132 -msgid "All Contacts (with secure profile access)" -msgstr "" - -#: mod/register.php:93 -msgid "" -"Registration successful. Please check your email for further instructions." -msgstr "" - -#: mod/register.php:98 -#, php-format -msgid "" -"Failed to send email message. Here your accout details:
login: %s
" -"password: %s

You can change your password after login." -msgstr "" - -#: mod/register.php:105 -msgid "Registration successful." -msgstr "" - -#: mod/register.php:111 -msgid "Your registration can not be processed." -msgstr "" - -#: mod/register.php:160 -msgid "Your registration is pending approval by the site owner." -msgstr "" - -#: mod/register.php:198 mod/uimport.php:51 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." -msgstr "" - -#: mod/register.php:226 -msgid "" -"You may (optionally) fill in this form via OpenID by supplying your OpenID " -"and clicking 'Register'." -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." -msgstr "" - -#: mod/register.php:228 -msgid "Your OpenID (optional): " -msgstr "" - -#: mod/register.php:242 -msgid "Include your profile in member directory?" -msgstr "" - -#: mod/register.php:267 -msgid "Note for the admin" -msgstr "" - -#: mod/register.php:267 -msgid "Leave a message for the admin, why you want to join this node" -msgstr "" - -#: mod/register.php:268 -msgid "Membership on this site is by invitation only." -msgstr "" - -#: mod/register.php:269 -msgid "Your invitation ID: " -msgstr "" - -#: mod/register.php:272 mod/admin.php:977 -msgid "Registration" -msgstr "" - -#: mod/register.php:280 -msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " -msgstr "" - -#: mod/register.php:281 -msgid "Your Email Address: " -msgstr "" - -#: mod/register.php:283 mod/settings.php:1278 -msgid "New Password:" -msgstr "" - -#: mod/register.php:283 -msgid "Leave empty for an auto generated password." -msgstr "" - -#: mod/register.php:284 mod/settings.php:1279 -msgid "Confirm:" -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 'nickname@$sitename'." -msgstr "" - -#: mod/register.php:286 -msgid "Choose a nickname: " -msgstr "" - -#: mod/register.php:295 mod/uimport.php:66 -msgid "Import" -msgstr "" - -#: mod/register.php:296 -msgid "Import your profile to this friendica instance" -msgstr "" - -#: mod/regmod.php:58 -msgid "Account approved." -msgstr "" - -#: mod/regmod.php:95 -#, php-format -msgid "Registration revoked for %s" -msgstr "" - -#: mod/regmod.php:107 -msgid "Please login." -msgstr "" - -#: mod/removeme.php:52 mod/removeme.php:55 -msgid "Remove My Account" -msgstr "" - -#: mod/removeme.php:53 -msgid "" -"This will completely remove your account. Once this has been done it is not " -"recoverable." -msgstr "" - -#: mod/removeme.php:54 -msgid "Please enter your password for verification:" -msgstr "" - -#: mod/repair_ostatus.php:14 -msgid "Resubscribing to OStatus contacts" -msgstr "" - -#: mod/repair_ostatus.php:30 -msgid "Error" -msgstr "" - -#: mod/settings.php:36 mod/photos.php:107 -msgid "everybody" -msgstr "" - -#: mod/settings.php:43 mod/admin.php:1417 -msgid "Account" -msgstr "" - -#: mod/settings.php:52 mod/admin.php:161 -msgid "Additional features" -msgstr "" - -#: mod/settings.php:60 -msgid "Display" -msgstr "" - -#: mod/settings.php:67 mod/settings.php:890 -msgid "Social Networks" -msgstr "" - -#: mod/settings.php:74 mod/admin.php:159 mod/admin.php:1543 mod/admin.php:1606 -msgid "Plugins" -msgstr "" - -#: mod/settings.php:88 -msgid "Connected apps" -msgstr "" - -#: mod/settings.php:95 mod/uexport.php:45 -msgid "Export personal data" -msgstr "" - -#: mod/settings.php:102 -msgid "Remove account" -msgstr "" - -#: mod/settings.php:157 -msgid "Missing some important data!" -msgstr "" - -#: mod/settings.php:160 mod/settings.php:707 mod/contacts.php:812 -msgid "Update" -msgstr "" - -#: mod/settings.php:271 -msgid "Failed to connect with email account using the settings provided." -msgstr "" - -#: mod/settings.php:276 -msgid "Email settings updated." -msgstr "" - -#: mod/settings.php:291 -msgid "Features updated" -msgstr "" - -#: mod/settings.php:361 -msgid "Relocate message has been send to your contacts" -msgstr "" - -#: mod/settings.php:380 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "" - -#: mod/settings.php:388 -msgid "Wrong password." -msgstr "" - -#: mod/settings.php:399 -msgid "Password changed." -msgstr "" - -#: mod/settings.php:401 -msgid "Password update failed. Please try again." -msgstr "" - -#: mod/settings.php:481 -msgid " Please use a shorter name." -msgstr "" - -#: mod/settings.php:483 -msgid " Name too short." -msgstr "" - -#: mod/settings.php:492 -msgid "Wrong Password" -msgstr "" - -#: mod/settings.php:497 -msgid " Not valid email." -msgstr "" - -#: mod/settings.php:503 -msgid " Cannot change to that email." -msgstr "" - -#: mod/settings.php:559 -msgid "Private forum has no privacy permissions. Using default privacy group." -msgstr "" - -#: mod/settings.php:563 -msgid "Private forum has no privacy permissions and no default privacy group." -msgstr "" - -#: mod/settings.php:603 -msgid "Settings updated." -msgstr "" - -#: mod/settings.php:680 mod/settings.php:706 mod/settings.php:742 -msgid "Add application" -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" -msgstr "" - -#: mod/settings.php:684 mod/settings.php:710 -msgid "Consumer Key" -msgstr "" - -#: mod/settings.php:685 mod/settings.php:711 -msgid "Consumer Secret" -msgstr "" - -#: mod/settings.php:686 mod/settings.php:712 -msgid "Redirect" -msgstr "" - -#: mod/settings.php:687 mod/settings.php:713 -msgid "Icon url" -msgstr "" - -#: mod/settings.php:698 -msgid "You can't edit this application." -msgstr "" - -#: mod/settings.php:741 -msgid "Connected Apps" -msgstr "" - -#: mod/settings.php:745 -msgid "Client key starts with" -msgstr "" - -#: mod/settings.php:746 -msgid "No name" -msgstr "" - -#: mod/settings.php:747 -msgid "Remove authorization" -msgstr "" - -#: mod/settings.php:759 -msgid "No Plugin settings configured" -msgstr "" - -#: mod/settings.php:768 -msgid "Plugin Settings" -msgstr "" - -#: mod/settings.php:782 mod/admin.php:2077 mod/admin.php:2078 -msgid "Off" -msgstr "" - -#: mod/settings.php:782 mod/admin.php:2077 mod/admin.php:2078 -msgid "On" -msgstr "" - -#: mod/settings.php:790 -msgid "Additional Features" -msgstr "" - -#: mod/settings.php:800 mod/settings.php:804 -msgid "General Social Media Settings" -msgstr "" - -#: mod/settings.php:810 -msgid "Disable intelligent shortening" -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." -msgstr "" - -#: mod/settings.php:818 -msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" -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." -msgstr "" - -#: mod/settings.php:826 -msgid "Default group for OStatus contacts" -msgstr "" - -#: mod/settings.php:834 -msgid "Your legacy GNU Social account" -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." -msgstr "" - -#: mod/settings.php:839 -msgid "Repair OStatus subscriptions" -msgstr "" - -#: mod/settings.php:848 mod/settings.php:849 -#, php-format -msgid "Built-in support for %s connectivity is %s" -msgstr "" - -#: mod/settings.php:848 mod/settings.php:849 -msgid "enabled" -msgstr "" - -#: mod/settings.php:848 mod/settings.php:849 -msgid "disabled" -msgstr "" - -#: mod/settings.php:849 -msgid "GNU Social (OStatus)" -msgstr "" - -#: mod/settings.php:883 -msgid "Email access is disabled on this site." -msgstr "" - -#: mod/settings.php:895 -msgid "Email/Mailbox Setup" -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." -msgstr "" - -#: mod/settings.php:897 -msgid "Last successful email check:" -msgstr "" - -#: mod/settings.php:899 -msgid "IMAP server name:" -msgstr "" - -#: mod/settings.php:900 -msgid "IMAP port:" -msgstr "" - -#: mod/settings.php:901 -msgid "Security:" -msgstr "" - -#: mod/settings.php:901 mod/settings.php:906 -msgid "None" -msgstr "" - -#: mod/settings.php:902 -msgid "Email login name:" -msgstr "" - -#: mod/settings.php:903 -msgid "Email password:" -msgstr "" - -#: mod/settings.php:904 -msgid "Reply-to address:" -msgstr "" - -#: mod/settings.php:905 -msgid "Send public posts to all email contacts:" -msgstr "" - -#: mod/settings.php:906 -msgid "Action after import:" -msgstr "" - -#: mod/settings.php:906 -msgid "Move to folder" -msgstr "" - -#: mod/settings.php:907 -msgid "Move to folder:" -msgstr "" - -#: mod/settings.php:943 mod/admin.php:863 -msgid "No special theme for mobile devices" -msgstr "" - -#: mod/settings.php:1003 -msgid "Display Settings" -msgstr "" - -#: mod/settings.php:1009 mod/settings.php:1032 -msgid "Display Theme:" -msgstr "" - -#: mod/settings.php:1010 -msgid "Mobile Theme:" -msgstr "" - -#: mod/settings.php:1011 -msgid "Suppress warning of insecure networks" -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." -msgstr "" - -#: mod/settings.php:1012 -msgid "Update browser every xx seconds" -msgstr "" - -#: mod/settings.php:1012 -msgid "Minimum of 10 seconds. Enter -1 to disable it." -msgstr "" - -#: mod/settings.php:1013 -msgid "Number of items to display per page:" -msgstr "" - -#: mod/settings.php:1013 mod/settings.php:1014 -msgid "Maximum of 100 items" -msgstr "" - -#: mod/settings.php:1014 -msgid "Number of items to display per page when viewed from mobile device:" -msgstr "" - -#: mod/settings.php:1015 -msgid "Don't show emoticons" -msgstr "" - -#: mod/settings.php:1016 -msgid "Calendar" -msgstr "" - -#: mod/settings.php:1017 -msgid "Beginning of week:" -msgstr "" - -#: mod/settings.php:1018 -msgid "Don't show notices" -msgstr "" - -#: mod/settings.php:1019 -msgid "Infinite scroll" -msgstr "" - -#: mod/settings.php:1020 -msgid "Automatic updates only at the top of the network page" -msgstr "" - -#: mod/settings.php:1021 -msgid "Bandwith Saver Mode" -msgstr "" - -#: mod/settings.php:1021 -msgid "" -"When enabled, embedded content is not displayed on automatic updates, they " -"only show on page reload." -msgstr "" - -#: mod/settings.php:1023 -msgid "General Theme Settings" -msgstr "" - -#: mod/settings.php:1024 -msgid "Custom Theme Settings" -msgstr "" - -#: mod/settings.php:1025 -msgid "Content Settings" -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" -msgstr "" - -#: mod/settings.php:1110 -msgid "Account Types" -msgstr "" - -#: mod/settings.php:1111 -msgid "Personal Page Subtypes" -msgstr "" - -#: mod/settings.php:1112 -msgid "Community Forum Subtypes" -msgstr "" - -#: mod/settings.php:1119 -msgid "Personal Page" -msgstr "" - -#: mod/settings.php:1120 -msgid "This account is a regular personal profile" -msgstr "" - -#: mod/settings.php:1123 -msgid "Organisation Page" -msgstr "" - -#: mod/settings.php:1124 -msgid "This account is a profile for an organisation" -msgstr "" - -#: mod/settings.php:1127 -msgid "News Page" -msgstr "" - -#: mod/settings.php:1128 -msgid "This account is a news account/reflector" -msgstr "" - -#: mod/settings.php:1131 -msgid "Community Forum" -msgstr "" - -#: mod/settings.php:1132 -msgid "" -"This account is a community forum where people can discuss with each other" -msgstr "" - -#: mod/settings.php:1135 -msgid "Normal Account Page" -msgstr "" - -#: mod/settings.php:1136 -msgid "This account is a normal personal profile" -msgstr "" - -#: mod/settings.php:1139 -msgid "Soapbox Page" -msgstr "" - -#: mod/settings.php:1140 -msgid "Automatically approve all connection/friend requests as read-only fans" -msgstr "" - -#: mod/settings.php:1143 -msgid "Public Forum" -msgstr "" - -#: mod/settings.php:1144 -msgid "Automatically approve all contact requests" -msgstr "" - -#: mod/settings.php:1147 -msgid "Automatic Friend Page" -msgstr "" - -#: mod/settings.php:1148 -msgid "Automatically approve all connection/friend requests as friends" -msgstr "" - -#: mod/settings.php:1151 -msgid "Private Forum [Experimental]" -msgstr "" - -#: mod/settings.php:1152 -msgid "Private forum - approved members only" -msgstr "" - -#: mod/settings.php:1163 -msgid "OpenID:" -msgstr "" - -#: mod/settings.php:1163 -msgid "(Optional) Allow this OpenID to login to this account." -msgstr "" - -#: mod/settings.php:1171 -msgid "Publish your default profile in your local site directory?" -msgstr "" - -#: mod/settings.php:1177 -msgid "Publish your default profile in the global social directory?" -msgstr "" - -#: mod/settings.php:1184 -msgid "Hide your contact/friend list from viewers of your default profile?" -msgstr "" - -#: mod/settings.php:1188 -msgid "" -"If enabled, posting public messages to Diaspora and other networks isn't " -"possible." -msgstr "" - -#: mod/settings.php:1193 -msgid "Allow friends to post to your profile page?" -msgstr "" - -#: mod/settings.php:1198 -msgid "Allow friends to tag your posts?" -msgstr "" - -#: mod/settings.php:1203 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "" - -#: mod/settings.php:1208 -msgid "Permit unknown people to send you private mail?" -msgstr "" - -#: mod/settings.php:1216 -msgid "Profile is not published." -msgstr "" - -#: mod/settings.php:1224 -#, php-format -msgid "Your Identity Address is '%s' or '%s'." -msgstr "" - -#: mod/settings.php:1231 -msgid "Automatically expire posts after this many days:" -msgstr "" - -#: mod/settings.php:1231 -msgid "If empty, posts will not expire. Expired posts will be deleted" -msgstr "" - -#: mod/settings.php:1232 -msgid "Advanced expiration settings" -msgstr "" - -#: mod/settings.php:1233 -msgid "Advanced Expiration" -msgstr "" - -#: mod/settings.php:1234 -msgid "Expire posts:" -msgstr "" - -#: mod/settings.php:1235 -msgid "Expire personal notes:" -msgstr "" - -#: mod/settings.php:1236 -msgid "Expire starred posts:" -msgstr "" - -#: mod/settings.php:1237 -msgid "Expire photos:" -msgstr "" - -#: mod/settings.php:1238 -msgid "Only expire posts by others:" -msgstr "" - -#: mod/settings.php:1269 -msgid "Account Settings" -msgstr "" - -#: mod/settings.php:1277 -msgid "Password Settings" -msgstr "" - -#: mod/settings.php:1279 -msgid "Leave password fields blank unless changing" -msgstr "" - -#: mod/settings.php:1280 -msgid "Current Password:" -msgstr "" - -#: mod/settings.php:1280 mod/settings.php:1281 -msgid "Your current password to confirm the changes" -msgstr "" - -#: mod/settings.php:1281 -msgid "Password:" -msgstr "" - -#: mod/settings.php:1285 -msgid "Basic Settings" -msgstr "" - -#: mod/settings.php:1287 -msgid "Email Address:" -msgstr "" - -#: mod/settings.php:1288 -msgid "Your Timezone:" -msgstr "" - -#: mod/settings.php:1289 -msgid "Your Language:" -msgstr "" - -#: mod/settings.php:1289 -msgid "" -"Set the language we use to show you friendica interface and to send you " -"emails" -msgstr "" - -#: mod/settings.php:1290 -msgid "Default Post Location:" -msgstr "" - -#: mod/settings.php:1291 -msgid "Use Browser Location:" -msgstr "" - -#: mod/settings.php:1294 -msgid "Security and Privacy Settings" -msgstr "" - -#: mod/settings.php:1296 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: mod/settings.php:1296 mod/settings.php:1326 -msgid "(to prevent spam abuse)" -msgstr "" - -#: mod/settings.php:1297 -msgid "Default Post Permissions" -msgstr "" - -#: mod/settings.php:1298 -msgid "(click to open/close)" -msgstr "" - -#: mod/settings.php:1307 mod/photos.php:1185 mod/photos.php:1567 -msgid "Show to Groups" -msgstr "" - -#: mod/settings.php:1308 mod/photos.php:1186 mod/photos.php:1568 -msgid "Show to Contacts" -msgstr "" - -#: mod/settings.php:1309 -msgid "Default Private Post" -msgstr "" - -#: mod/settings.php:1310 -msgid "Default Public Post" -msgstr "" - -#: mod/settings.php:1314 -msgid "Default Permissions for New Posts" -msgstr "" - -#: mod/settings.php:1326 -msgid "Maximum private messages per day from unknown people:" -msgstr "" - -#: mod/settings.php:1329 -msgid "Notification Settings" -msgstr "" - -#: mod/settings.php:1330 -msgid "By default post a status message when:" -msgstr "" - -#: mod/settings.php:1331 -msgid "accepting a friend request" -msgstr "" - -#: mod/settings.php:1332 -msgid "joining a forum/community" -msgstr "" - -#: mod/settings.php:1333 -msgid "making an interesting profile change" -msgstr "" - -#: mod/settings.php:1334 -msgid "Send a notification email when:" -msgstr "" - -#: mod/settings.php:1335 -msgid "You receive an introduction" -msgstr "" - -#: mod/settings.php:1336 -msgid "Your introductions are confirmed" -msgstr "" - -#: mod/settings.php:1337 -msgid "Someone writes on your profile wall" -msgstr "" - -#: mod/settings.php:1338 -msgid "Someone writes a followup comment" -msgstr "" - -#: mod/settings.php:1339 -msgid "You receive a private message" -msgstr "" - -#: mod/settings.php:1340 -msgid "You receive a friend suggestion" -msgstr "" - -#: mod/settings.php:1341 -msgid "You are tagged in a post" -msgstr "" - -#: mod/settings.php:1342 -msgid "You are poked/prodded/etc. in a post" -msgstr "" - -#: mod/settings.php:1344 -msgid "Activate desktop notifications" -msgstr "" - -#: mod/settings.php:1344 -msgid "Show desktop popup on new notifications" -msgstr "" - -#: mod/settings.php:1346 -msgid "Text-only notification emails" -msgstr "" - -#: mod/settings.php:1348 -msgid "Send text only notification emails, without the html part" -msgstr "" - -#: mod/settings.php:1350 -msgid "Advanced Account/Page Type Settings" -msgstr "" - -#: mod/settings.php:1351 -msgid "Change the behaviour of this account for special situations" -msgstr "" - -#: mod/settings.php:1354 -msgid "Relocate" -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." -msgstr "" - -#: mod/settings.php:1356 -msgid "Resend relocate message to contacts" -msgstr "" - -#: mod/share.php:38 -msgid "link" -msgstr "" - -#: mod/subthread.php:104 -#, php-format -msgid "%1$s is following %2$s's %3$s" -msgstr "" - -#: mod/suggest.php:27 -msgid "Do you really want to delete this suggestion?" -msgstr "" - -#: mod/suggest.php:71 -msgid "" -"No suggestions available. If this is a new site, please try again in 24 " -"hours." -msgstr "" - -#: mod/suggest.php:84 mod/suggest.php:104 -msgid "Ignore/Hide" -msgstr "" - -#: mod/tagrm.php:43 -msgid "Tag removed" -msgstr "" - -#: mod/tagrm.php:82 -msgid "Remove Item Tag" -msgstr "" - -#: mod/tagrm.php:84 -msgid "Select a tag to remove: " -msgstr "" - -#: mod/uexport.php:37 -msgid "Export account" -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." -msgstr "" - -#: mod/uexport.php:38 -msgid "Export all" -msgstr "" - -#: mod/uexport.php:38 -msgid "" -"Export your accout info, contacts and all your items as json. Could be a " -"very big file, and could take a lot of time. Use this to make a full backup " -"of your account (photos are not exported)" -msgstr "" - -#: mod/uimport.php:68 -msgid "Move account" -msgstr "" - -#: mod/uimport.php:69 -msgid "You can import an account from another Friendica server." -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." -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" -msgstr "" - -#: mod/uimport.php:72 -msgid "Account file" -msgstr "" - -#: mod/uimport.php:72 -msgid "" -"To export your account, go to \"Settings->Export your personal data\" and " -"select \"Export account\"" -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]" -msgstr "" - -#: mod/videos.php:124 -msgid "Do you really want to delete this video?" -msgstr "" - -#: mod/videos.php:129 -msgid "Delete Video" -msgstr "" - -#: mod/videos.php:208 -msgid "No videos selected" -msgstr "" - -#: mod/videos.php:309 mod/photos.php:1074 -msgid "Access to this item is restricted." -msgstr "" - -#: mod/videos.php:391 mod/photos.php:1867 -msgid "View Album" -msgstr "" - -#: mod/videos.php:400 -msgid "Recent Videos" -msgstr "" - -#: mod/videos.php:402 -msgid "Upload New Videos" -msgstr "" - -#: mod/viewsrc.php:7 -msgid "Access denied." -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." -msgstr "" - -#: mod/wall_attach.php:94 -msgid "Sorry, maybe your upload is bigger than the PHP configuration allows" -msgstr "" - -#: mod/wall_attach.php:94 -msgid "Or - did you try to upload an empty file?" -msgstr "" - -#: mod/wall_attach.php:105 -#, php-format -msgid "File exceeds size limit of %s" -msgstr "" - -#: mod/wall_attach.php:158 mod/wall_attach.php:174 -msgid "File upload failed." -msgstr "" - #: mod/cal.php:271 mod/events.php:387 msgid "View" msgstr "" @@ -5449,6 +4663,28 @@ msgstr "" msgid "calendar" msgstr "" +#: mod/common.php:91 +msgid "No contacts in common." +msgstr "" + +#: mod/common.php:141 mod/contacts.php:871 +msgid "Common Friends" +msgstr "" + +#: 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/community.php:27 +msgid "Not available." +msgstr "" + +#: mod/community.php:54 mod/search.php:224 +msgid "No results." +msgstr "" + #: mod/contacts.php:134 #, php-format msgid "%d contact edited." @@ -5527,10 +4763,6 @@ msgstr "" msgid "Private communications are not available for this contact." msgstr "" -#: mod/contacts.php:538 mod/admin.php:899 -msgid "Never" -msgstr "" - #: mod/contacts.php:542 msgid "(Update was successful)" msgstr "" @@ -5556,10 +4788,6 @@ msgstr "" msgid "Fetch further information for feeds" msgstr "" -#: mod/contacts.php:565 mod/admin.php:908 -msgid "Disabled" -msgstr "" - #: mod/contacts.php:565 msgid "Fetch information" msgstr "" @@ -5572,6 +4800,18 @@ msgstr "" msgid "Contact" msgstr "" +#: 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/contacts.php:586 msgid "Profile Visibility" msgstr "" @@ -5591,6 +4831,12 @@ msgstr "" msgid "Edit contact notes" msgstr "" +#: 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/contacts.php:595 msgid "Block/Unblock contact" msgstr "" @@ -5619,16 +4865,6 @@ msgstr "" msgid "Update now" msgstr "" -#: mod/contacts.php:613 mod/contacts.php:813 mod/contacts.php:991 -#: mod/admin.php:1437 -msgid "Unblock" -msgstr "" - -#: mod/contacts.php:613 mod/contacts.php:813 mod/contacts.php:991 -#: mod/admin.php:1436 -msgid "Block" -msgstr "" - #: mod/contacts.php:614 mod/contacts.php:814 mod/contacts.php:999 msgid "Unignore" msgstr "" @@ -5678,6 +4914,10 @@ msgid "" "when \"Fetch information and keywords\" is selected" msgstr "" +#: mod/contacts.php:632 mod/follow.php:129 mod/notifications.php:249 +msgid "Profile URL" +msgstr "" + #: mod/contacts.php:643 msgid "Actions" msgstr "" @@ -5694,6 +4934,10 @@ msgstr "" msgid "Suggest potential friends" msgstr "" +#: mod/contacts.php:700 mod/group.php:202 +msgid "All Contacts" +msgstr "" + #: mod/contacts.php:703 msgid "Show all contacts" msgstr "" @@ -5747,6 +4991,10 @@ msgstr "" msgid "Results for: %s" msgstr "" +#: mod/contacts.php:812 mod/settings.php:160 mod/settings.php:707 +msgid "Update" +msgstr "" + #: mod/contacts.php:815 mod/contacts.php:1007 msgid "Archive" msgstr "" @@ -5783,6 +5031,10 @@ msgstr "" msgid "you are a fan of" msgstr "" +#: mod/contacts.php:939 mod/nogroup.php:44 +msgid "Edit contact" +msgstr "" + #: mod/contacts.php:993 msgid "Toggle Blocked status" msgstr "" @@ -5799,6 +5051,307 @@ msgstr "" msgid "Delete contact" msgstr "" +#: mod/content.php:119 mod/network.php:468 +msgid "No such group" +msgstr "" + +#: mod/content.php:130 mod/group.php:203 mod/network.php:495 +msgid "Group is empty" +msgstr "" + +#: mod/content.php:135 mod/network.php:499 +#, php-format +msgid "Group: %s" +msgstr "" + +#: mod/content.php:325 object/Item.php:96 +msgid "This entry was edited" +msgstr "" + +#: 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/content.php:702 mod/photos.php:1590 object/Item.php:274 +msgid "I like this (toggle)" +msgstr "" + +#: mod/content.php:702 object/Item.php:274 +msgid "like" +msgstr "" + +#: mod/content.php:703 mod/photos.php:1591 object/Item.php:275 +msgid "I don't like this (toggle)" +msgstr "" + +#: mod/content.php:703 object/Item.php:275 +msgid "dislike" +msgstr "" + +#: mod/content.php:705 object/Item.php:278 +msgid "Share this" +msgstr "" + +#: mod/content.php:705 object/Item.php:278 +msgid "share" +msgstr "" + +#: 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/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/content.php:729 object/Item.php:706 +msgid "Bold" +msgstr "" + +#: mod/content.php:730 object/Item.php:707 +msgid "Italic" +msgstr "" + +#: mod/content.php:731 object/Item.php:708 +msgid "Underline" +msgstr "" + +#: mod/content.php:732 object/Item.php:709 +msgid "Quote" +msgstr "" + +#: mod/content.php:733 object/Item.php:710 +msgid "Code" +msgstr "" + +#: mod/content.php:734 object/Item.php:711 +msgid "Image" +msgstr "" + +#: mod/content.php:735 object/Item.php:712 +msgid "Link" +msgstr "" + +#: mod/content.php:736 object/Item.php:713 +msgid "Video" +msgstr "" + +#: mod/content.php:746 mod/settings.php:743 object/Item.php:122 +#: object/Item.php:124 +msgid "Edit" +msgstr "" + +#: mod/content.php:772 object/Item.php:238 +msgid "add star" +msgstr "" + +#: mod/content.php:773 object/Item.php:239 +msgid "remove star" +msgstr "" + +#: mod/content.php:774 object/Item.php:240 +msgid "toggle star status" +msgstr "" + +#: mod/content.php:777 object/Item.php:243 +msgid "starred" +msgstr "" + +#: mod/content.php:778 mod/content.php:800 object/Item.php:263 +msgid "add tag" +msgstr "" + +#: mod/content.php:789 object/Item.php:251 +msgid "ignore thread" +msgstr "" + +#: mod/content.php:790 object/Item.php:252 +msgid "unignore thread" +msgstr "" + +#: mod/content.php:791 object/Item.php:253 +msgid "toggle ignore status" +msgstr "" + +#: mod/content.php:794 mod/ostatus_subscribe.php:73 object/Item.php:256 +msgid "ignored" +msgstr "" + +#: mod/content.php:805 object/Item.php:141 +msgid "save to folder" +msgstr "" + +#: mod/content.php:853 object/Item.php:212 +msgid "I will attend" +msgstr "" + +#: mod/content.php:853 object/Item.php:212 +msgid "I will not attend" +msgstr "" + +#: mod/content.php:853 object/Item.php:212 +msgid "I might attend" +msgstr "" + +#: mod/content.php:917 object/Item.php:358 +msgid "to" +msgstr "" + +#: mod/content.php:918 object/Item.php:360 +msgid "Wall-to-Wall" +msgstr "" + +#: mod/content.php:919 object/Item.php:361 +msgid "via Wall-To-Wall:" +msgstr "" + +#: mod/credits.php:16 +msgid "Credits" +msgstr "" + +#: mod/credits.php:17 +msgid "" +"Friendica is a community project, that would not be possible without the " +"help of many people. Here is a list of those who have contributed to the " +"code or the translation of Friendica. Thank you all!" +msgstr "" + +#: mod/crepair.php:89 +msgid "Contact settings applied." +msgstr "" + +#: mod/crepair.php:91 +msgid "Contact update failed." +msgstr "" + +#: mod/crepair.php:116 mod/dfrn_confirm.php:126 mod/fsuggest.php:21 +#: mod/fsuggest.php:93 +msgid "Contact not found." +msgstr "" + +#: mod/crepair.php:122 +msgid "" +"WARNING: This is highly advanced and if you enter incorrect " +"information your communications with this contact may stop working." +msgstr "" + +#: mod/crepair.php:123 +msgid "" +"Please use your browser 'Back' button now if you are " +"uncertain what to do on this page." +msgstr "" + +#: mod/crepair.php:136 mod/crepair.php:138 +msgid "No mirroring" +msgstr "" + +#: mod/crepair.php:136 +msgid "Mirror as forwarded posting" +msgstr "" + +#: mod/crepair.php:136 mod/crepair.php:138 +msgid "Mirror as my own posting" +msgstr "" + +#: mod/crepair.php:152 +msgid "Return to contact editor" +msgstr "" + +#: mod/crepair.php:154 +msgid "Refetch contact data" +msgstr "" + +#: mod/crepair.php:158 +msgid "Remote Self" +msgstr "" + +#: mod/crepair.php:161 +msgid "Mirror postings from this contact" +msgstr "" + +#: mod/crepair.php:163 +msgid "" +"Mark this contact as remote_self, this will cause friendica to repost new " +"entries from this contact." +msgstr "" + +#: mod/crepair.php:168 +msgid "Account Nickname" +msgstr "" + +#: mod/crepair.php:169 +msgid "@Tagname - overrides Name/Nickname" +msgstr "" + +#: mod/crepair.php:170 +msgid "Account URL" +msgstr "" + +#: mod/crepair.php:171 +msgid "Friend Request URL" +msgstr "" + +#: mod/crepair.php:172 +msgid "Friend Confirm URL" +msgstr "" + +#: mod/crepair.php:173 +msgid "Notification Endpoint URL" +msgstr "" + +#: mod/crepair.php:174 +msgid "Poll/Feed URL" +msgstr "" + +#: mod/crepair.php:175 +msgid "New photo from this URL" +msgstr "" + +#: mod/delegate.php:101 +msgid "No potential page delegates located." +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." +msgstr "" + +#: mod/delegate.php:133 +msgid "Existing Page Managers" +msgstr "" + +#: mod/delegate.php:135 +msgid "Existing Page Delegates" +msgstr "" + +#: mod/delegate.php:137 +msgid "Potential Delegates" +msgstr "" + +#: mod/delegate.php:139 mod/tagrm.php:95 +msgid "Remove" +msgstr "" + +#: mod/delegate.php:140 +msgid "Add" +msgstr "" + +#: mod/delegate.php:141 +msgid "No entries." +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." @@ -5879,436 +5432,9 @@ msgstr "" msgid "%1$s has joined %2$s" msgstr "" -#: mod/editpost.php:17 mod/editpost.php:27 -msgid "Item not found" -msgstr "" - -#: mod/editpost.php:32 -msgid "Edit post" -msgstr "" - -#: mod/events.php:100 mod/events.php:102 -msgid "Event can not end before it has started." -msgstr "" - -#: mod/events.php:109 mod/events.php:111 -msgid "Event title and start time are required." -msgstr "" - -#: mod/events.php:388 -msgid "Create New Event" -msgstr "" - -#: mod/events.php:489 -msgid "Event details" -msgstr "" - -#: mod/events.php:490 -msgid "Starting date and Title are required." -msgstr "" - -#: mod/events.php:491 mod/events.php:492 -msgid "Event Starts:" -msgstr "" - -#: mod/events.php:491 mod/events.php:503 mod/profiles.php:708 -msgid "Required" -msgstr "" - -#: mod/events.php:493 mod/events.php:509 -msgid "Finish date/time is not known or not relevant" -msgstr "" - -#: mod/events.php:495 mod/events.php:496 -msgid "Event Finishes:" -msgstr "" - -#: mod/events.php:497 mod/events.php:510 -msgid "Adjust for viewer timezone" -msgstr "" - -#: mod/events.php:499 -msgid "Description:" -msgstr "" - -#: mod/events.php:503 mod/events.php:505 -msgid "Title:" -msgstr "" - -#: mod/events.php:506 mod/events.php:507 -msgid "Share this event" -msgstr "" - -#: mod/fbrowser.php:132 -msgid "Files" -msgstr "" - -#: mod/friendica.php:72 -msgid "This is Friendica, version" -msgstr "" - -#: mod/friendica.php:73 -msgid "running at web location" -msgstr "" - -#: mod/friendica.php:75 -msgid "" -"Please visit Friendica.com to learn " -"more about the Friendica project." -msgstr "" - -#: mod/friendica.php:77 -msgid "Bug reports and issues: please visit" -msgstr "" - -#: mod/friendica.php:77 -msgid "the bugtracker at github" -msgstr "" - -#: mod/friendica.php:78 -msgid "" -"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " -"dot com" -msgstr "" - -#: mod/friendica.php:92 -msgid "Installed plugins/addons/apps:" -msgstr "" - -#: mod/friendica.php:105 -msgid "No installed plugins/addons/apps" -msgstr "" - -#: mod/item.php:118 -msgid "Unable to locate original post." -msgstr "" - -#: mod/item.php:336 -msgid "Empty post discarded." -msgstr "" - -#: mod/item.php:889 -msgid "System error. Post not saved." -msgstr "" - -#: mod/item.php:979 +#: mod/dfrn_poll.php:104 mod/dfrn_poll.php:539 #, php-format -msgid "" -"This message was sent to you by %s, a member of the Friendica social network." -msgstr "" - -#: mod/item.php:981 -#, php-format -msgid "You may visit them online at %s" -msgstr "" - -#: 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/item.php:986 -#, php-format -msgid "%s posted an update." -msgstr "" - -#: mod/message.php:60 mod/wallmessage.php:50 -msgid "No recipient selected." -msgstr "" - -#: mod/message.php:64 -msgid "Unable to locate contact information." -msgstr "" - -#: mod/message.php:67 mod/wallmessage.php:56 -msgid "Message could not be sent." -msgstr "" - -#: 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/message.php:204 -msgid "Do you really want to delete this message?" -msgstr "" - -#: mod/message.php:224 -msgid "Message deleted." -msgstr "" - -#: mod/message.php:255 -msgid "Conversation removed." -msgstr "" - -#: mod/message.php:322 mod/wallmessage.php:126 -msgid "Send Private Message" -msgstr "" - -#: mod/message.php:323 mod/message.php:510 mod/wallmessage.php:128 -msgid "To:" -msgstr "" - -#: mod/message.php:328 mod/message.php:512 mod/wallmessage.php:129 -msgid "Subject:" -msgstr "" - -#: mod/message.php:364 -msgid "No messages." -msgstr "" - -#: mod/message.php:403 -msgid "Message not available." -msgstr "" - -#: mod/message.php:477 -msgid "Delete message" -msgstr "" - -#: mod/message.php:503 mod/message.php:583 -msgid "Delete conversation" -msgstr "" - -#: mod/message.php:505 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." -msgstr "" - -#: mod/message.php:509 -msgid "Send Reply" -msgstr "" - -#: mod/message.php:553 -#, php-format -msgid "Unknown sender - %s" -msgstr "" - -#: mod/message.php:555 -#, php-format -msgid "You and %s" -msgstr "" - -#: mod/message.php:557 -#, php-format -msgid "%s and You" -msgstr "" - -#: mod/message.php:586 -msgid "D, d M Y - g:i A" -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" -msgstr "" - -#: mod/ping.php:270 -msgid "{0} wants to be your friend" -msgstr "" - -#: mod/ping.php:285 -msgid "{0} sent you a message" -msgstr "" - -#: mod/ping.php:300 -msgid "{0} requested registration" -msgstr "" - -#: mod/wallmessage.php:42 mod/wallmessage.php:106 -#, php-format -msgid "Number of daily wall messages for %s exceeded. Message failed." -msgstr "" - -#: mod/wallmessage.php:53 -msgid "Unable to check your home location." -msgstr "" - -#: mod/wallmessage.php:80 mod/wallmessage.php:89 -msgid "No recipient." -msgstr "" - -#: 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 "" - -#: mod/photos.php:90 mod/photos.php:1876 -msgid "Recent Photos" -msgstr "" - -#: mod/photos.php:93 mod/photos.php:1303 mod/photos.php:1878 -msgid "Upload New Photos" -msgstr "" - -#: mod/photos.php:171 -msgid "Contact information unavailable" -msgstr "" - -#: mod/photos.php:192 -msgid "Album not found." -msgstr "" - -#: mod/photos.php:225 mod/photos.php:237 mod/photos.php:1247 -msgid "Delete Album" -msgstr "" - -#: mod/photos.php:235 -msgid "Do you really want to delete this photo album and all its photos?" -msgstr "" - -#: mod/photos.php:317 mod/photos.php:328 mod/photos.php:1563 -msgid "Delete Photo" -msgstr "" - -#: mod/photos.php:326 -msgid "Do you really want to delete this photo?" -msgstr "" - -#: mod/photos.php:705 -#, php-format -msgid "%1$s was tagged in %2$s by %3$s" -msgstr "" - -#: mod/photos.php:705 -msgid "a photo" -msgstr "" - -#: mod/photos.php:811 -msgid "Image file is empty." -msgstr "" - -#: mod/photos.php:974 -msgid "No photos selected" -msgstr "" - -#: mod/photos.php:1134 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." -msgstr "" - -#: mod/photos.php:1168 -msgid "Upload Photos" -msgstr "" - -#: mod/photos.php:1172 mod/photos.php:1242 -msgid "New album name: " -msgstr "" - -#: mod/photos.php:1173 -msgid "or existing album name: " -msgstr "" - -#: mod/photos.php:1174 -msgid "Do not show a status post for this upload" -msgstr "" - -#: mod/photos.php:1187 -msgid "Private Photo" -msgstr "" - -#: mod/photos.php:1188 -msgid "Public Photo" -msgstr "" - -#: mod/photos.php:1254 -msgid "Edit Album" -msgstr "" - -#: mod/photos.php:1260 -msgid "Show Newest First" -msgstr "" - -#: mod/photos.php:1262 -msgid "Show Oldest First" -msgstr "" - -#: mod/photos.php:1289 mod/photos.php:1861 -msgid "View Photo" -msgstr "" - -#: mod/photos.php:1335 -msgid "Permission denied. Access to this item may be restricted." -msgstr "" - -#: mod/photos.php:1337 -msgid "Photo not available" -msgstr "" - -#: mod/photos.php:1395 -msgid "View photo" -msgstr "" - -#: mod/photos.php:1395 -msgid "Edit photo" -msgstr "" - -#: mod/photos.php:1396 -msgid "Use as profile photo" -msgstr "" - -#: mod/photos.php:1421 -msgid "View Full Size" -msgstr "" - -#: mod/photos.php:1507 -msgid "Tags: " -msgstr "" - -#: mod/photos.php:1510 -msgid "[Remove any tag]" -msgstr "" - -#: mod/photos.php:1549 -msgid "New album name" -msgstr "" - -#: mod/photos.php:1550 -msgid "Caption" -msgstr "" - -#: mod/photos.php:1551 -msgid "Add a Tag" -msgstr "" - -#: mod/photos.php:1551 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "" - -#: mod/photos.php:1552 -msgid "Do not rotate" -msgstr "" - -#: mod/photos.php:1553 -msgid "Rotate CW (right)" -msgstr "" - -#: mod/photos.php:1554 -msgid "Rotate CCW (left)" -msgstr "" - -#: mod/photos.php:1569 -msgid "Private photo" -msgstr "" - -#: mod/photos.php:1570 -msgid "Public photo" -msgstr "" - -#: mod/photos.php:1792 -msgid "Map" +msgid "%1$s welcomes %2$s" msgstr "" #: mod/dfrn_request.php:101 @@ -6445,6 +5571,19 @@ msgid "" "testuser@identi.ca" msgstr "" +#: mod/dfrn_request.php:874 mod/follow.php:112 +msgid "Please answer the following:" +msgstr "" + +#: mod/dfrn_request.php:875 mod/follow.php:113 +#, php-format +msgid "Does %s know you?" +msgstr "" + +#: mod/dfrn_request.php:879 mod/follow.php:114 +msgid "Add a personal note:" +msgstr "" + #: mod/dfrn_request.php:882 msgid "StatusNet/Federated Social Web" msgstr "" @@ -6456,6 +5595,246 @@ msgid "" "bar." msgstr "" +#: mod/dfrn_request.php:885 mod/follow.php:120 +msgid "Your Identity Address:" +msgstr "" + +#: mod/dfrn_request.php:888 mod/follow.php:19 +msgid "Submit Request" +msgstr "" + +#: mod/directory.php:199 view/theme/vier/theme.php:196 +msgid "Global Directory" +msgstr "" + +#: mod/directory.php:201 +msgid "Find on this site" +msgstr "" + +#: mod/directory.php:203 +msgid "Results for:" +msgstr "" + +#: mod/directory.php:205 +msgid "Site Directory" +msgstr "" + +#: mod/directory.php:212 +msgid "No entries (some entries may be hidden)." +msgstr "" + +#: mod/dirfind.php:37 +#, php-format +msgid "People Search - %s" +msgstr "" + +#: mod/dirfind.php:48 +#, php-format +msgid "Forum Search - %s" +msgstr "" + +#: mod/dirfind.php:245 mod/match.php:109 +msgid "No matches" +msgstr "" + +#: mod/display.php:479 +msgid "Item has been removed." +msgstr "" + +#: mod/editpost.php:17 mod/editpost.php:27 +msgid "Item not found" +msgstr "" + +#: mod/editpost.php:32 +msgid "Edit post" +msgstr "" + +#: mod/events.php:100 mod/events.php:102 +msgid "Event can not end before it has started." +msgstr "" + +#: mod/events.php:109 mod/events.php:111 +msgid "Event title and start time are required." +msgstr "" + +#: mod/events.php:388 +msgid "Create New Event" +msgstr "" + +#: mod/events.php:489 +msgid "Event details" +msgstr "" + +#: mod/events.php:490 +msgid "Starting date and Title are required." +msgstr "" + +#: mod/events.php:491 mod/events.php:492 +msgid "Event Starts:" +msgstr "" + +#: mod/events.php:491 mod/events.php:503 mod/profiles.php:708 +msgid "Required" +msgstr "" + +#: mod/events.php:493 mod/events.php:509 +msgid "Finish date/time is not known or not relevant" +msgstr "" + +#: mod/events.php:495 mod/events.php:496 +msgid "Event Finishes:" +msgstr "" + +#: mod/events.php:497 mod/events.php:510 +msgid "Adjust for viewer timezone" +msgstr "" + +#: mod/events.php:499 +msgid "Description:" +msgstr "" + +#: mod/events.php:503 mod/events.php:505 +msgid "Title:" +msgstr "" + +#: mod/events.php:506 mod/events.php:507 +msgid "Share this event" +msgstr "" + +#: mod/fbrowser.php:132 +msgid "Files" +msgstr "" + +#: mod/filer.php:30 +msgid "- select -" +msgstr "" + +#: mod/follow.php:30 +msgid "You already added this contact." +msgstr "" + +#: mod/follow.php:39 +msgid "Diaspora support isn't enabled. Contact can't be added." +msgstr "" + +#: mod/follow.php:46 +msgid "OStatus support is disabled. Contact can't be added." +msgstr "" + +#: mod/follow.php:53 +msgid "The network type couldn't be detected. Contact can't be added." +msgstr "" + +#: mod/follow.php:186 +msgid "Contact added" +msgstr "" + +#: mod/friendica.php:72 +msgid "This is Friendica, version" +msgstr "" + +#: mod/friendica.php:73 +msgid "running at web location" +msgstr "" + +#: mod/friendica.php:75 +msgid "" +"Please visit Friendica.com to learn " +"more about the Friendica project." +msgstr "" + +#: mod/friendica.php:77 +msgid "Bug reports and issues: please visit" +msgstr "" + +#: mod/friendica.php:77 +msgid "the bugtracker at github" +msgstr "" + +#: mod/friendica.php:78 +msgid "" +"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " +"dot com" +msgstr "" + +#: mod/friendica.php:92 +msgid "Installed plugins/addons/apps:" +msgstr "" + +#: mod/friendica.php:105 +msgid "No installed plugins/addons/apps" +msgstr "" + +#: mod/fsuggest.php:64 +msgid "Friend suggestion sent." +msgstr "" + +#: mod/fsuggest.php:98 +msgid "Suggest Friends" +msgstr "" + +#: mod/fsuggest.php:100 +#, php-format +msgid "Suggest a friend for %s" +msgstr "" + +#: mod/group.php:29 +msgid "Group created." +msgstr "" + +#: mod/group.php:35 +msgid "Could not create group." +msgstr "" + +#: mod/group.php:49 mod/group.php:150 +msgid "Group not found." +msgstr "" + +#: 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/group.php:122 +msgid "Group removed." +msgstr "" + +#: mod/group.php:124 +msgid "Unable to remove group." +msgstr "" + +#: mod/group.php:187 +msgid "Group Editor" +msgstr "" + +#: mod/group.php:200 +msgid "Members" +msgstr "" + +#: mod/group.php:233 mod/profperm.php:107 +msgid "Click on a contact to add or remove." +msgstr "" + +#: mod/hcard.php:11 +msgid "No profile" +msgstr "" + +#: mod/help.php:41 +msgid "Help:" +msgstr "" + +#: mod/home.php:39 +#, php-format +msgid "Welcome to %s" +msgstr "" + #: mod/install.php:140 msgid "Friendica Communications Server - Setup" msgstr "" @@ -6816,6 +6195,1138 @@ msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" +#: mod/invite.php:28 +msgid "Total invitation limit exceeded." +msgstr "" + +#: mod/invite.php:51 +#, php-format +msgid "%s : Not a valid email address." +msgstr "" + +#: mod/invite.php:76 +msgid "Please join us on Friendica" +msgstr "" + +#: mod/invite.php:87 +msgid "Invitation limit exceeded. Please contact your site administrator." +msgstr "" + +#: mod/invite.php:91 +#, php-format +msgid "%s : Message delivery failed." +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" +msgstr "" + +#: 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/invite.php:124 +#, php-format +msgid "" +"To accept this invitation, please visit and register at %s or any other " +"public Friendica website." +msgstr "" + +#: 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/invite.php:128 +msgid "" +"Our apologies. This system is not currently configured to connect with other " +"public sites or invite members." +msgstr "" + +#: mod/invite.php:134 +msgid "Send invitations" +msgstr "" + +#: mod/invite.php:135 +msgid "Enter email addresses, one per line:" +msgstr "" + +#: mod/invite.php:136 mod/message.php:332 mod/message.php:515 +#: mod/wallmessage.php:135 +msgid "Your message:" +msgstr "" + +#: 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/invite.php:139 +msgid "You will need to supply this invitation code: $invite_code" +msgstr "" + +#: mod/invite.php:139 +msgid "" +"Once you have registered, please connect with me via my profile page at:" +msgstr "" + +#: 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/item.php:118 +msgid "Unable to locate original post." +msgstr "" + +#: mod/item.php:336 +msgid "Empty post discarded." +msgstr "" + +#: mod/item.php:889 +msgid "System error. Post not saved." +msgstr "" + +#: mod/item.php:979 +#, php-format +msgid "" +"This message was sent to you by %s, a member of the Friendica social network." +msgstr "" + +#: mod/item.php:981 +#, php-format +msgid "You may visit them online at %s" +msgstr "" + +#: 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/item.php:986 +#, php-format +msgid "%s posted an update." +msgstr "" + +#: mod/localtime.php:24 +msgid "Time Conversion" +msgstr "" + +#: mod/localtime.php:26 +msgid "" +"Friendica provides this service for sharing events with other networks and " +"friends in unknown timezones." +msgstr "" + +#: mod/localtime.php:30 +#, php-format +msgid "UTC time: %s" +msgstr "" + +#: mod/localtime.php:33 +#, php-format +msgid "Current timezone: %s" +msgstr "" + +#: mod/localtime.php:36 +#, php-format +msgid "Converted localtime: %s" +msgstr "" + +#: mod/localtime.php:41 +msgid "Please select your timezone:" +msgstr "" + +#: mod/lockview.php:32 mod/lockview.php:40 +msgid "Remote privacy information not available." +msgstr "" + +#: mod/lockview.php:49 +msgid "Visible to:" +msgstr "" + +#: mod/lostpass.php:19 +msgid "No valid account found." +msgstr "" + +#: mod/lostpass.php:35 +msgid "Password reset request issued. Check your email." +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: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 Settings 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:162 +msgid "Reset" +msgstr "" + +#: 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 "" +"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/message.php:60 mod/wallmessage.php:50 +msgid "No recipient selected." +msgstr "" + +#: mod/message.php:64 +msgid "Unable to locate contact information." +msgstr "" + +#: mod/message.php:67 mod/wallmessage.php:56 +msgid "Message could not be sent." +msgstr "" + +#: 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/message.php:204 +msgid "Do you really want to delete this message?" +msgstr "" + +#: mod/message.php:224 +msgid "Message deleted." +msgstr "" + +#: mod/message.php:255 +msgid "Conversation removed." +msgstr "" + +#: mod/message.php:322 mod/wallmessage.php:126 +msgid "Send Private Message" +msgstr "" + +#: mod/message.php:323 mod/message.php:510 mod/wallmessage.php:128 +msgid "To:" +msgstr "" + +#: mod/message.php:328 mod/message.php:512 mod/wallmessage.php:129 +msgid "Subject:" +msgstr "" + +#: mod/message.php:364 +msgid "No messages." +msgstr "" + +#: mod/message.php:403 +msgid "Message not available." +msgstr "" + +#: mod/message.php:477 +msgid "Delete message" +msgstr "" + +#: mod/message.php:503 mod/message.php:583 +msgid "Delete conversation" +msgstr "" + +#: mod/message.php:505 +msgid "" +"No secure communications available. You may be able to " +"respond from the sender's profile page." +msgstr "" + +#: mod/message.php:509 +msgid "Send Reply" +msgstr "" + +#: mod/message.php:553 +#, php-format +msgid "Unknown sender - %s" +msgstr "" + +#: mod/message.php:555 +#, php-format +msgid "You and %s" +msgstr "" + +#: mod/message.php:557 +#, php-format +msgid "%s and You" +msgstr "" + +#: mod/message.php:586 +msgid "D, d M Y - g:i A" +msgstr "" + +#: 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/mood.php:135 +msgid "Set your current mood and tell your friends" +msgstr "" + +#: mod/network.php:190 mod/search.php:25 +msgid "Remove term" +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/network.php:400 +msgid "Messages in this group won't be send to these receivers." +msgstr "" + +#: mod/network.php:528 +msgid "Private messages to this person are at risk of public disclosure." +msgstr "" + +#: mod/network.php:533 +msgid "Invalid contact." +msgstr "" + +#: mod/network.php:810 +msgid "Commented Order" +msgstr "" + +#: mod/network.php:813 +msgid "Sort by Comment Date" +msgstr "" + +#: mod/network.php:818 +msgid "Posted Order" +msgstr "" + +#: mod/network.php:821 +msgid "Sort by Post Date" +msgstr "" + +#: mod/network.php:832 +msgid "Posts that mention or involve you" +msgstr "" + +#: mod/network.php:840 +msgid "New" +msgstr "" + +#: mod/network.php:843 +msgid "Activity Stream - by date" +msgstr "" + +#: mod/network.php:851 +msgid "Shared Links" +msgstr "" + +#: mod/network.php:854 +msgid "Interesting Links" +msgstr "" + +#: mod/network.php:862 +msgid "Starred" +msgstr "" + +#: mod/network.php:865 +msgid "Favourite Posts" +msgstr "" + +#: mod/newmember.php:6 +msgid "Welcome to Friendica" +msgstr "" + +#: mod/newmember.php:8 +msgid "New Member Checklist" +msgstr "" + +#: 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/newmember.php:14 +msgid "Getting Started" +msgstr "" + +#: mod/newmember.php:18 +msgid "Friendica Walk-Through" +msgstr "" + +#: mod/newmember.php:18 +msgid "" +"On your Quick Start page - find a brief introduction to your " +"profile and network tabs, make some new connections, and find some groups to " +"join." +msgstr "" + +#: mod/newmember.php:26 +msgid "Go to Your Settings" +msgstr "" + +#: mod/newmember.php:26 +msgid "" +"On your Settings 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/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/newmember.php:36 mod/profile_photo.php:256 mod/profiles.php:699 +msgid "Upload Profile Photo" +msgstr "" + +#: 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/newmember.php:38 +msgid "Edit Your Profile" +msgstr "" + +#: mod/newmember.php:38 +msgid "" +"Edit your default profile to your liking. Review the " +"settings for hiding your list of friends and hiding the profile from unknown " +"visitors." +msgstr "" + +#: mod/newmember.php:40 +msgid "Profile Keywords" +msgstr "" + +#: mod/newmember.php:40 +msgid "" +"Set some public keywords for your default profile which describe your " +"interests. We may be able to find other people with similar interests and " +"suggest friendships." +msgstr "" + +#: mod/newmember.php:44 +msgid "Connecting" +msgstr "" + +#: mod/newmember.php:51 +msgid "Importing Emails" +msgstr "" + +#: mod/newmember.php:51 +msgid "" +"Enter your email access information on your Connector Settings page if you " +"wish to import and interact with friends or mailing lists from your email " +"INBOX" +msgstr "" + +#: mod/newmember.php:53 +msgid "Go to Your Contacts Page" +msgstr "" + +#: mod/newmember.php:53 +msgid "" +"Your Contacts page is your gateway to managing friendships and connecting " +"with friends on other networks. Typically you enter their address or site " +"URL in the Add New Contact dialog." +msgstr "" + +#: mod/newmember.php:55 +msgid "Go to Your Site's Directory" +msgstr "" + +#: mod/newmember.php:55 +msgid "" +"The Directory page lets you find other people in this network or other " +"federated sites. Look for a Connect or Follow link on " +"their profile page. Provide your own Identity Address if requested." +msgstr "" + +#: mod/newmember.php:57 +msgid "Finding New People" +msgstr "" + +#: mod/newmember.php:57 +msgid "" +"On the side panel of the Contacts page are several tools to find new " +"friends. We can match people by interest, look up people by name or " +"interest, and provide suggestions based on network relationships. On a brand " +"new site, friend suggestions will usually begin to be populated within 24 " +"hours." +msgstr "" + +#: mod/newmember.php:65 +msgid "Group Your Contacts" +msgstr "" + +#: mod/newmember.php:65 +msgid "" +"Once you have made some friends, organize them into private conversation " +"groups from the sidebar of your Contacts page and then you can interact with " +"each group privately on your Network page." +msgstr "" + +#: mod/newmember.php:68 +msgid "Why Aren't My Posts Public?" +msgstr "" + +#: mod/newmember.php:68 +msgid "" +"Friendica respects your privacy. By default, your posts will only show up to " +"people you've added as friends. For more information, see the help section " +"from the link above." +msgstr "" + +#: mod/newmember.php:73 +msgid "Getting Help" +msgstr "" + +#: mod/newmember.php:77 +msgid "Go to the Help Section" +msgstr "" + +#: mod/newmember.php:77 +msgid "" +"Our help pages may be consulted for detail on other program " +"features and resources." +msgstr "" + +#: mod/nogroup.php:65 +msgid "Contacts who are not members of a group" +msgstr "" + +#: mod/notifications.php:35 +msgid "Invalid request identifier." +msgstr "" + +#: mod/notifications.php:44 mod/notifications.php:180 +#: mod/notifications.php:258 +msgid "Discard" +msgstr "" + +#: mod/notifications.php:105 +msgid "Network Notifications" +msgstr "" + +#: mod/notifications.php:111 mod/notify.php:69 +msgid "System Notifications" +msgstr "" + +#: mod/notifications.php:117 +msgid "Personal Notifications" +msgstr "" + +#: mod/notifications.php:123 +msgid "Home Notifications" +msgstr "" + +#: mod/notifications.php:152 +msgid "Show Ignored Requests" +msgstr "" + +#: mod/notifications.php:152 +msgid "Hide Ignored Requests" +msgstr "" + +#: mod/notifications.php:164 mod/notifications.php:228 +msgid "Notification type: " +msgstr "" + +#: mod/notifications.php:167 +#, php-format +msgid "suggested by %s" +msgstr "" + +#: mod/notifications.php:173 mod/notifications.php:246 +msgid "Post a new friend activity" +msgstr "" + +#: mod/notifications.php:173 mod/notifications.php:246 +msgid "if applicable" +msgstr "" + +#: mod/notifications.php:195 +msgid "Claims to be known to you: " +msgstr "" + +#: mod/notifications.php:196 +msgid "yes" +msgstr "" + +#: mod/notifications.php:196 +msgid "no" +msgstr "" + +#: mod/notifications.php:197 mod/notifications.php:202 +msgid "Shall your connection be bidirectional or not?" +msgstr "" + +#: 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/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/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/notifications.php:215 +msgid "Friend" +msgstr "" + +#: mod/notifications.php:216 +msgid "Sharer" +msgstr "" + +#: mod/notifications.php:216 +msgid "Subscriber" +msgstr "" + +#: mod/notifications.php:266 +msgid "No introductions." +msgstr "" + +#: mod/notifications.php:307 +msgid "Show unread" +msgstr "" + +#: mod/notifications.php:307 +msgid "Show all" +msgstr "" + +#: mod/notifications.php:313 +#, php-format +msgid "No more %s notifications." +msgstr "" + +#: mod/notify.php:65 +msgid "No more system notifications." +msgstr "" + +#: mod/oexchange.php:21 +msgid "Post successful." +msgstr "" + +#: mod/openid.php:24 +msgid "OpenID protocol error. No ID returned." +msgstr "" + +#: mod/openid.php:60 +msgid "" +"Account not found and OpenID registration is not permitted on this site." +msgstr "" + +#: mod/ostatus_subscribe.php:14 +msgid "Subscribing to OStatus contacts" +msgstr "" + +#: mod/ostatus_subscribe.php:25 +msgid "No contact provided." +msgstr "" + +#: mod/ostatus_subscribe.php:31 +msgid "Couldn't fetch information for contact." +msgstr "" + +#: mod/ostatus_subscribe.php:40 +msgid "Couldn't fetch friends for contact." +msgstr "" + +#: mod/ostatus_subscribe.php:54 mod/repair_ostatus.php:44 +msgid "Done" +msgstr "" + +#: mod/ostatus_subscribe.php:68 +msgid "success" +msgstr "" + +#: mod/ostatus_subscribe.php:70 +msgid "failed" +msgstr "" + +#: mod/ostatus_subscribe.php:78 mod/repair_ostatus.php:50 +msgid "Keep this window open until done." +msgstr "" + +#: mod/p.php:9 +msgid "Not Extended" +msgstr "" + +#: mod/photos.php:90 mod/photos.php:1876 +msgid "Recent Photos" +msgstr "" + +#: mod/photos.php:93 mod/photos.php:1303 mod/photos.php:1878 +msgid "Upload New Photos" +msgstr "" + +#: mod/photos.php:107 mod/settings.php:36 +msgid "everybody" +msgstr "" + +#: mod/photos.php:171 +msgid "Contact information unavailable" +msgstr "" + +#: mod/photos.php:192 +msgid "Album not found." +msgstr "" + +#: mod/photos.php:225 mod/photos.php:237 mod/photos.php:1247 +msgid "Delete Album" +msgstr "" + +#: mod/photos.php:235 +msgid "Do you really want to delete this photo album and all its photos?" +msgstr "" + +#: mod/photos.php:317 mod/photos.php:328 mod/photos.php:1563 +msgid "Delete Photo" +msgstr "" + +#: mod/photos.php:326 +msgid "Do you really want to delete this photo?" +msgstr "" + +#: mod/photos.php:705 +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" +msgstr "" + +#: mod/photos.php:705 +msgid "a photo" +msgstr "" + +#: 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/photos.php:811 +msgid "Image file is empty." +msgstr "" + +#: mod/photos.php:844 mod/profile_photo.php:165 mod/wall_upload.php:186 +msgid "Unable to process image." +msgstr "" + +#: mod/photos.php:871 mod/profile_photo.php:315 mod/wall_upload.php:219 +msgid "Image upload failed." +msgstr "" + +#: mod/photos.php:974 +msgid "No photos selected" +msgstr "" + +#: mod/photos.php:1074 mod/videos.php:309 +msgid "Access to this item is restricted." +msgstr "" + +#: mod/photos.php:1134 +#, php-format +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." +msgstr "" + +#: mod/photos.php:1168 +msgid "Upload Photos" +msgstr "" + +#: mod/photos.php:1172 mod/photos.php:1242 +msgid "New album name: " +msgstr "" + +#: mod/photos.php:1173 +msgid "or existing album name: " +msgstr "" + +#: mod/photos.php:1174 +msgid "Do not show a status post for this upload" +msgstr "" + +#: mod/photos.php:1185 mod/photos.php:1567 mod/settings.php:1307 +msgid "Show to Groups" +msgstr "" + +#: mod/photos.php:1186 mod/photos.php:1568 mod/settings.php:1308 +msgid "Show to Contacts" +msgstr "" + +#: mod/photos.php:1187 +msgid "Private Photo" +msgstr "" + +#: mod/photos.php:1188 +msgid "Public Photo" +msgstr "" + +#: mod/photos.php:1254 +msgid "Edit Album" +msgstr "" + +#: mod/photos.php:1260 +msgid "Show Newest First" +msgstr "" + +#: mod/photos.php:1262 +msgid "Show Oldest First" +msgstr "" + +#: mod/photos.php:1289 mod/photos.php:1861 +msgid "View Photo" +msgstr "" + +#: mod/photos.php:1335 +msgid "Permission denied. Access to this item may be restricted." +msgstr "" + +#: mod/photos.php:1337 +msgid "Photo not available" +msgstr "" + +#: mod/photos.php:1395 +msgid "View photo" +msgstr "" + +#: mod/photos.php:1395 +msgid "Edit photo" +msgstr "" + +#: mod/photos.php:1396 +msgid "Use as profile photo" +msgstr "" + +#: mod/photos.php:1421 +msgid "View Full Size" +msgstr "" + +#: mod/photos.php:1507 +msgid "Tags: " +msgstr "" + +#: mod/photos.php:1510 +msgid "[Remove any tag]" +msgstr "" + +#: mod/photos.php:1549 +msgid "New album name" +msgstr "" + +#: mod/photos.php:1550 +msgid "Caption" +msgstr "" + +#: mod/photos.php:1551 +msgid "Add a Tag" +msgstr "" + +#: mod/photos.php:1551 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "" + +#: mod/photos.php:1552 +msgid "Do not rotate" +msgstr "" + +#: mod/photos.php:1553 +msgid "Rotate CW (right)" +msgstr "" + +#: mod/photos.php:1554 +msgid "Rotate CCW (left)" +msgstr "" + +#: mod/photos.php:1569 +msgid "Private photo" +msgstr "" + +#: mod/photos.php:1570 +msgid "Public photo" +msgstr "" + +#: mod/photos.php:1792 +msgid "Map" +msgstr "" + +#: mod/photos.php:1867 mod/videos.php:391 +msgid "View Album" +msgstr "" + +#: mod/ping.php:270 +msgid "{0} wants to be your friend" +msgstr "" + +#: mod/ping.php:285 +msgid "{0} sent you a message" +msgstr "" + +#: mod/ping.php:300 +msgid "{0} requested registration" +msgstr "" + +#: mod/poke.php:196 +msgid "Poke/Prod" +msgstr "" + +#: mod/poke.php:197 +msgid "poke, prod or do other things to somebody" +msgstr "" + +#: mod/poke.php:198 +msgid "Recipient" +msgstr "" + +#: mod/poke.php:199 +msgid "Choose what you wish to do to recipient" +msgstr "" + +#: mod/poke.php:202 +msgid "Make this post private" +msgstr "" + +#: mod/profile.php:174 +msgid "Tips for New Members" +msgstr "" + +#: mod/profile_photo.php:44 +msgid "Image uploaded but image cropping failed." +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." +msgstr "" + +#: mod/profile_photo.php:127 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "" + +#: mod/profile_photo.php:137 +msgid "Unable to process image" +msgstr "" + +#: mod/profile_photo.php:254 +msgid "Upload File:" +msgstr "" + +#: mod/profile_photo.php:255 +msgid "Select a profile:" +msgstr "" + +#: mod/profile_photo.php:257 +msgid "Upload" +msgstr "" + +#: mod/profile_photo.php:260 +msgid "or" +msgstr "" + +#: mod/profile_photo.php:260 +msgid "skip this step" +msgstr "" + +#: mod/profile_photo.php:260 +msgid "select a photo from your photo albums" +msgstr "" + +#: mod/profile_photo.php:274 +msgid "Crop Image" +msgstr "" + +#: mod/profile_photo.php:275 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "" + +#: mod/profile_photo.php:277 +msgid "Done Editing" +msgstr "" + +#: mod/profile_photo.php:313 +msgid "Image uploaded successfully." +msgstr "" + #: mod/profiles.php:38 msgid "Profile deleted." msgstr "" @@ -7115,1453 +7626,160 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: mod/display.php:479 -msgid "Item has been removed." +#: mod/profperm.php:26 mod/profperm.php:57 +msgid "Invalid profile identifier." msgstr "" -#: mod/admin.php:92 -msgid "Theme settings updated." +#: mod/profperm.php:103 +msgid "Profile Visibility Editor" msgstr "" -#: mod/admin.php:157 mod/admin.php:975 -msgid "Site" +#: mod/profperm.php:116 +msgid "Visible To" msgstr "" -#: mod/admin.php:158 mod/admin.php:909 mod/admin.php:1425 mod/admin.php:1441 -msgid "Users" +#: mod/profperm.php:132 +msgid "All Contacts (with secure profile access)" msgstr "" -#: mod/admin.php:160 mod/admin.php:1813 mod/admin.php:1863 -msgid "Themes" -msgstr "" - -#: mod/admin.php:162 -msgid "DB updates" -msgstr "" - -#: mod/admin.php:163 mod/admin.php:407 -msgid "Inspect Queue" -msgstr "" - -#: mod/admin.php:164 mod/admin.php:373 -msgid "Federation Statistics" -msgstr "" - -#: mod/admin.php:178 mod/admin.php:189 mod/admin.php:1937 -msgid "Logs" -msgstr "" - -#: mod/admin.php:179 mod/admin.php:2005 -msgid "View Logs" -msgstr "" - -#: mod/admin.php:180 -msgid "probe address" -msgstr "" - -#: mod/admin.php:181 -msgid "check webfinger" -msgstr "" - -#: mod/admin.php:188 -msgid "Plugin Features" -msgstr "" - -#: mod/admin.php:190 -msgid "diagnostics" -msgstr "" - -#: mod/admin.php:191 -msgid "User registrations waiting for confirmation" -msgstr "" - -#: mod/admin.php:307 -msgid "unknown" -msgstr "" - -#: mod/admin.php:366 +#: mod/register.php:93 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." +"Registration successful. Please check your email for further instructions." msgstr "" -#: mod/admin.php:367 -msgid "" -"The Auto Discovered Contact Directory feature is not enabled, it " -"will improve the data displayed here." -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" -msgstr "" - -#: mod/admin.php:379 -#, php-format -msgid "Currently this node is aware of %d nodes from the following platforms:" -msgstr "" - -#: mod/admin.php:409 -msgid "ID" -msgstr "" - -#: mod/admin.php:410 -msgid "Recipient Name" -msgstr "" - -#: mod/admin.php:411 -msgid "Recipient Profile" -msgstr "" - -#: mod/admin.php:413 -msgid "Created" -msgstr "" - -#: mod/admin.php:414 -msgid "Last Tried" -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." -msgstr "" - -#: mod/admin.php:440 +#: mod/register.php:98 #, 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 here for a guide that may be helpful " -"converting the table engines. You may also use the convert_innodb.sql in the /util directory of your Friendica installation.
" +"Failed to send email message. Here your accout details:
login: %s
" +"password: %s

You can change your password after login." msgstr "" -#: mod/admin.php:445 +#: mod/register.php:105 +msgid "Registration successful." +msgstr "" + +#: mod/register.php:111 +msgid "Your registration can not be processed." +msgstr "" + +#: mod/register.php:160 +msgid "Your registration is pending approval by the site owner." +msgstr "" + +#: mod/register.php:198 mod/uimport.php:51 msgid "" -"You are using a MySQL version which does not support all features that " -"Friendica uses. You should consider switching to MariaDB." +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." msgstr "" -#: mod/admin.php:449 mod/admin.php:1373 -msgid "Normal Account" -msgstr "" - -#: mod/admin.php:450 mod/admin.php:1374 -msgid "Soapbox Account" -msgstr "" - -#: mod/admin.php:451 mod/admin.php:1375 -msgid "Community/Celebrity Account" -msgstr "" - -#: mod/admin.php:452 mod/admin.php:1376 -msgid "Automatic Friend Account" -msgstr "" - -#: mod/admin.php:453 -msgid "Blog Account" -msgstr "" - -#: mod/admin.php:454 -msgid "Private Forum" -msgstr "" - -#: mod/admin.php:480 -msgid "Message queues" -msgstr "" - -#: mod/admin.php:486 -msgid "Summary" -msgstr "" - -#: mod/admin.php:489 -msgid "Registered users" -msgstr "" - -#: mod/admin.php:491 -msgid "Pending registrations" -msgstr "" - -#: mod/admin.php:492 -msgid "Version" -msgstr "" - -#: mod/admin.php:497 -msgid "Active plugins" -msgstr "" - -#: mod/admin.php:522 -msgid "Can not parse base url. Must have at least ://" -msgstr "" - -#: mod/admin.php:827 -msgid "RINO2 needs mcrypt php extension to work." -msgstr "" - -#: mod/admin.php:835 -msgid "Site settings updated." -msgstr "" - -#: mod/admin.php:892 -msgid "No community page" -msgstr "" - -#: mod/admin.php:893 -msgid "Public postings from users of this site" -msgstr "" - -#: mod/admin.php:894 -msgid "Global community page" -msgstr "" - -#: mod/admin.php:900 -msgid "At post arrival" -msgstr "" - -#: mod/admin.php:910 -msgid "Users, Global Contacts" -msgstr "" - -#: mod/admin.php:911 -msgid "Users, Global Contacts/fallback" -msgstr "" - -#: mod/admin.php:915 -msgid "One month" -msgstr "" - -#: mod/admin.php:916 -msgid "Three months" -msgstr "" - -#: mod/admin.php:917 -msgid "Half a year" -msgstr "" - -#: mod/admin.php:918 -msgid "One year" -msgstr "" - -#: mod/admin.php:923 -msgid "Multi user instance" -msgstr "" - -#: mod/admin.php:946 -msgid "Closed" -msgstr "" - -#: mod/admin.php:947 -msgid "Requires approval" -msgstr "" - -#: mod/admin.php:948 -msgid "Open" -msgstr "" - -#: mod/admin.php:952 -msgid "No SSL policy, links will track page SSL state" -msgstr "" - -#: mod/admin.php:953 -msgid "Force all links to use SSL" -msgstr "" - -#: mod/admin.php:954 -msgid "Self-signed certificate, use SSL for local links only (discouraged)" -msgstr "" - -#: mod/admin.php:978 -msgid "File upload" -msgstr "" - -#: mod/admin.php:979 -msgid "Policies" -msgstr "" - -#: mod/admin.php:981 -msgid "Auto Discovered Contact Directory" -msgstr "" - -#: mod/admin.php:982 -msgid "Performance" -msgstr "" - -#: mod/admin.php:983 -msgid "Worker" -msgstr "" - -#: mod/admin.php:984 +#: mod/register.php:226 msgid "" -"Relocate - WARNING: advanced function. Could make this server unreachable." +"You may (optionally) fill in this form via OpenID by supplying your OpenID " +"and clicking 'Register'." msgstr "" -#: mod/admin.php:987 -msgid "Site name" -msgstr "" - -#: mod/admin.php:988 -msgid "Host name" -msgstr "" - -#: mod/admin.php:989 -msgid "Sender Email" -msgstr "" - -#: mod/admin.php:989 +#: mod/register.php:227 msgid "" -"The email address your server shall use to send notification emails from." +"If you are not familiar with OpenID, please leave that field blank and fill " +"in the rest of the items." msgstr "" -#: mod/admin.php:990 -msgid "Banner/Logo" +#: mod/register.php:228 +msgid "Your OpenID (optional): " msgstr "" -#: mod/admin.php:991 -msgid "Shortcut icon" +#: mod/register.php:242 +msgid "Include your profile in member directory?" msgstr "" -#: mod/admin.php:991 -msgid "Link to an icon that will be used for browsers." +#: mod/register.php:267 +msgid "Note for the admin" msgstr "" -#: mod/admin.php:992 -msgid "Touch icon" +#: mod/register.php:267 +msgid "Leave a message for the admin, why you want to join this node" msgstr "" -#: mod/admin.php:992 -msgid "Link to an icon that will be used for tablets and mobiles." +#: mod/register.php:268 +msgid "Membership on this site is by invitation only." msgstr "" -#: mod/admin.php:993 -msgid "Additional Info" +#: mod/register.php:269 +msgid "Your invitation ID: " msgstr "" -#: mod/admin.php:993 +#: mod/register.php:280 +msgid "Your Full Name (e.g. Joe Smith, real or real-looking): " +msgstr "" + +#: mod/register.php:281 +msgid "Your Email Address: " +msgstr "" + +#: mod/register.php:283 mod/settings.php:1278 +msgid "New Password:" +msgstr "" + +#: mod/register.php:283 +msgid "Leave empty for an auto generated password." +msgstr "" + +#: mod/register.php:284 mod/settings.php:1279 +msgid "Confirm:" +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 'nickname@$sitename'." +msgstr "" + +#: mod/register.php:286 +msgid "Choose a nickname: " +msgstr "" + +#: mod/register.php:295 mod/uimport.php:66 +msgid "Import" +msgstr "" + +#: mod/register.php:296 +msgid "Import your profile to this friendica instance" +msgstr "" + +#: mod/regmod.php:58 +msgid "Account approved." +msgstr "" + +#: mod/regmod.php:95 #, php-format +msgid "Registration revoked for %s" +msgstr "" + +#: mod/regmod.php:107 +msgid "Please login." +msgstr "" + +#: mod/removeme.php:52 mod/removeme.php:55 +msgid "Remove My Account" +msgstr "" + +#: mod/removeme.php:53 msgid "" -"For public servers: you can add additional information here that will be " -"listed at %s/siteinfo." +"This will completely remove your account. Once this has been done it is not " +"recoverable." msgstr "" -#: mod/admin.php:994 -msgid "System language" +#: mod/removeme.php:54 +msgid "Please enter your password for verification:" msgstr "" -#: mod/admin.php:995 -msgid "System theme" +#: mod/repair_ostatus.php:14 +msgid "Resubscribing to OStatus contacts" msgstr "" -#: mod/admin.php:995 -msgid "" -"Default system theme - may be over-ridden by user profiles - change theme settings" -msgstr "" - -#: mod/admin.php:996 -msgid "Mobile system theme" -msgstr "" - -#: mod/admin.php:996 -msgid "Theme for mobile devices" -msgstr "" - -#: mod/admin.php:997 -msgid "SSL link policy" -msgstr "" - -#: mod/admin.php:997 -msgid "Determines whether generated links should be forced to use SSL" -msgstr "" - -#: mod/admin.php:998 -msgid "Force SSL" -msgstr "" - -#: mod/admin.php:998 -msgid "" -"Force all Non-SSL requests to SSL - Attention: on some systems it could lead " -"to endless loops." -msgstr "" - -#: mod/admin.php:999 -msgid "Old style 'Share'" -msgstr "" - -#: mod/admin.php:999 -msgid "Deactivates the bbcode element 'share' for repeating items." -msgstr "" - -#: mod/admin.php:1000 -msgid "Hide help entry from navigation menu" -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." -msgstr "" - -#: mod/admin.php:1001 -msgid "Single user instance" -msgstr "" - -#: mod/admin.php:1001 -msgid "Make this instance multi-user or single-user for the named user" -msgstr "" - -#: mod/admin.php:1002 -msgid "Maximum image size" -msgstr "" - -#: mod/admin.php:1002 -msgid "" -"Maximum size in bytes of uploaded images. Default is 0, which means no " -"limits." -msgstr "" - -#: mod/admin.php:1003 -msgid "Maximum image length" -msgstr "" - -#: mod/admin.php:1003 -msgid "" -"Maximum length in pixels of the longest side of uploaded images. Default is " -"-1, which means no limits." -msgstr "" - -#: mod/admin.php:1004 -msgid "JPEG image quality" -msgstr "" - -#: mod/admin.php:1004 -msgid "" -"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " -"100, which is full quality." -msgstr "" - -#: mod/admin.php:1006 -msgid "Register policy" -msgstr "" - -#: mod/admin.php:1007 -msgid "Maximum Daily Registrations" -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." -msgstr "" - -#: mod/admin.php:1008 -msgid "Register text" -msgstr "" - -#: mod/admin.php:1008 -msgid "Will be displayed prominently on the registration page." -msgstr "" - -#: mod/admin.php:1009 -msgid "Accounts abandoned after x days" -msgstr "" - -#: mod/admin.php:1009 -msgid "" -"Will not waste system resources polling external sites for abandonded " -"accounts. Enter 0 for no time limit." -msgstr "" - -#: mod/admin.php:1010 -msgid "Allowed friend domains" -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" -msgstr "" - -#: mod/admin.php:1011 -msgid "Allowed email domains" -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" -msgstr "" - -#: mod/admin.php:1012 -msgid "Block public" -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." -msgstr "" - -#: mod/admin.php:1013 -msgid "Force publish" -msgstr "" - -#: mod/admin.php:1013 -msgid "" -"Check to force all profiles on this site to be listed in the site directory." -msgstr "" - -#: mod/admin.php:1014 -msgid "Global directory URL" -msgstr "" - -#: mod/admin.php:1014 -msgid "" -"URL to the global directory. If this is not set, the global directory is " -"completely unavailable to the application." -msgstr "" - -#: mod/admin.php:1015 -msgid "Allow threaded items" -msgstr "" - -#: mod/admin.php:1015 -msgid "Allow infinite level threading for items on this site." -msgstr "" - -#: mod/admin.php:1016 -msgid "Private posts by default for new users" -msgstr "" - -#: mod/admin.php:1016 -msgid "" -"Set default post permissions for all new members to the default privacy " -"group rather than public." -msgstr "" - -#: mod/admin.php:1017 -msgid "Don't include post content in email notifications" -msgstr "" - -#: mod/admin.php:1017 -msgid "" -"Don't include the content of a post/comment/private message/etc. in the " -"email notifications that are sent out from this site, as a privacy measure." -msgstr "" - -#: mod/admin.php:1018 -msgid "Disallow public access to addons listed in the apps menu." -msgstr "" - -#: mod/admin.php:1018 -msgid "" -"Checking this box will restrict addons listed in the apps menu to members " -"only." -msgstr "" - -#: mod/admin.php:1019 -msgid "Don't embed private images in posts" -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." -msgstr "" - -#: mod/admin.php:1020 -msgid "Allow Users to set remote_self" -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." -msgstr "" - -#: mod/admin.php:1021 -msgid "Block multiple registrations" -msgstr "" - -#: mod/admin.php:1021 -msgid "Disallow users to register additional accounts for use as pages." -msgstr "" - -#: mod/admin.php:1022 -msgid "OpenID support" -msgstr "" - -#: mod/admin.php:1022 -msgid "OpenID support for registration and logins." -msgstr "" - -#: mod/admin.php:1023 -msgid "Fullname check" -msgstr "" - -#: mod/admin.php:1023 -msgid "" -"Force users to register with a space between firstname and lastname in Full " -"name, as an antispam measure" -msgstr "" - -#: mod/admin.php:1024 -msgid "UTF-8 Regular expressions" -msgstr "" - -#: mod/admin.php:1024 -msgid "Use PHP UTF8 regular expressions" -msgstr "" - -#: mod/admin.php:1025 -msgid "Community Page Style" -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." -msgstr "" - -#: mod/admin.php:1026 -msgid "Posts per user on community page" -msgstr "" - -#: mod/admin.php:1026 -msgid "" -"The maximum number of posts per user on the community page. (Not valid for " -"'Global Community')" -msgstr "" - -#: mod/admin.php:1027 -msgid "Enable OStatus support" -msgstr "" - -#: mod/admin.php:1027 -msgid "" -"Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All " -"communications in OStatus are public, so privacy warnings will be " -"occasionally displayed." -msgstr "" - -#: mod/admin.php:1028 -msgid "OStatus conversation completion interval" -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." -msgstr "" - -#: mod/admin.php:1029 -msgid "Only import OStatus threads from our contacts" -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." -msgstr "" - -#: mod/admin.php:1030 -msgid "OStatus support can only be enabled if threading is enabled." -msgstr "" - -#: mod/admin.php:1032 -msgid "" -"Diaspora support can't be enabled because Friendica was installed into a sub " -"directory." -msgstr "" - -#: mod/admin.php:1033 -msgid "Enable Diaspora support" -msgstr "" - -#: mod/admin.php:1033 -msgid "Provide built-in Diaspora network compatibility." -msgstr "" - -#: mod/admin.php:1034 -msgid "Only allow Friendica contacts" -msgstr "" - -#: mod/admin.php:1034 -msgid "" -"All contacts must use Friendica protocols. All other built-in communication " -"protocols disabled." -msgstr "" - -#: mod/admin.php:1035 -msgid "Verify SSL" -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." -msgstr "" - -#: mod/admin.php:1036 -msgid "Proxy user" -msgstr "" - -#: mod/admin.php:1037 -msgid "Proxy URL" -msgstr "" - -#: mod/admin.php:1038 -msgid "Network timeout" -msgstr "" - -#: mod/admin.php:1038 -msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." -msgstr "" - -#: mod/admin.php:1039 -msgid "Delivery interval" -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." -msgstr "" - -#: mod/admin.php:1040 -msgid "Poll interval" -msgstr "" - -#: mod/admin.php:1040 -msgid "" -"Delay background polling processes by this many seconds to reduce system " -"load. If 0, use delivery interval." -msgstr "" - -#: mod/admin.php:1041 -msgid "Maximum Load Average" -msgstr "" - -#: mod/admin.php:1041 -msgid "" -"Maximum system load before delivery and poll processes are deferred - " -"default 50." -msgstr "" - -#: mod/admin.php:1042 -msgid "Maximum Load Average (Frontend)" -msgstr "" - -#: mod/admin.php:1042 -msgid "Maximum system load before the frontend quits service - default 50." -msgstr "" - -#: mod/admin.php:1043 -msgid "Maximum table size for optimization" -msgstr "" - -#: mod/admin.php:1043 -msgid "" -"Maximum table size (in MB) for the automatic optimization - default 100 MB. " -"Enter -1 to disable it." -msgstr "" - -#: mod/admin.php:1044 -msgid "Minimum level of fragmentation" -msgstr "" - -#: mod/admin.php:1044 -msgid "" -"Minimum fragmenation level to start the automatic optimization - default " -"value is 30%." -msgstr "" - -#: mod/admin.php:1046 -msgid "Periodical check of global contacts" -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." -msgstr "" - -#: mod/admin.php:1047 -msgid "Days between requery" -msgstr "" - -#: mod/admin.php:1047 -msgid "Number of days after which a server is requeried for his contacts." -msgstr "" - -#: mod/admin.php:1048 -msgid "Discover contacts from other servers" -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'." -msgstr "" - -#: mod/admin.php:1049 -msgid "Timeframe for fetching global contacts" -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." -msgstr "" - -#: mod/admin.php:1050 -msgid "Search the local directory" -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." -msgstr "" - -#: mod/admin.php:1052 -msgid "Publish server information" -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 the-federation.info for details." -msgstr "" - -#: mod/admin.php:1054 -msgid "Use MySQL full text engine" -msgstr "" - -#: mod/admin.php:1054 -msgid "" -"Activates the full text engine. Speeds up search - but can only search for " -"four and more characters." -msgstr "" - -#: mod/admin.php:1055 -msgid "Suppress Language" -msgstr "" - -#: mod/admin.php:1055 -msgid "Suppress language information in meta information about a posting." -msgstr "" - -#: mod/admin.php:1056 -msgid "Suppress Tags" -msgstr "" - -#: mod/admin.php:1056 -msgid "Suppress showing a list of hashtags at the end of the posting." -msgstr "" - -#: mod/admin.php:1057 -msgid "Path to item cache" -msgstr "" - -#: mod/admin.php:1057 -msgid "The item caches buffers generated bbcode and external images." -msgstr "" - -#: mod/admin.php:1058 -msgid "Cache duration in seconds" -msgstr "" - -#: mod/admin.php:1058 -msgid "" -"How long should the cache files be hold? Default value is 86400 seconds (One " -"day). To disable the item cache, set the value to -1." -msgstr "" - -#: mod/admin.php:1059 -msgid "Maximum numbers of comments per post" -msgstr "" - -#: mod/admin.php:1059 -msgid "How much comments should be shown for each post? Default value is 100." -msgstr "" - -#: mod/admin.php:1060 -msgid "Path for lock file" -msgstr "" - -#: mod/admin.php:1060 -msgid "" -"The lock file is used to avoid multiple pollers at one time. Only define a " -"folder here." -msgstr "" - -#: mod/admin.php:1061 -msgid "Temp path" -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." -msgstr "" - -#: mod/admin.php:1062 -msgid "Base path to installation" -msgstr "" - -#: mod/admin.php:1062 -msgid "" -"If the system cannot detect the correct path to your installation, enter the " -"correct path here. This setting should only be set if you are using a " -"restricted system and symbolic links to your webroot." -msgstr "" - -#: mod/admin.php:1063 -msgid "Disable picture proxy" -msgstr "" - -#: mod/admin.php:1063 -msgid "" -"The picture proxy increases performance and privacy. It shouldn't be used on " -"systems with very low bandwith." -msgstr "" - -#: mod/admin.php:1064 -msgid "Enable old style pager" -msgstr "" - -#: mod/admin.php:1064 -msgid "" -"The old style pager has page numbers but slows down massively the page speed." -msgstr "" - -#: mod/admin.php:1065 -msgid "Only search in tags" -msgstr "" - -#: mod/admin.php:1065 -msgid "On large systems the text search can slow down the system extremely." -msgstr "" - -#: mod/admin.php:1067 -msgid "New base url" -msgstr "" - -#: mod/admin.php:1067 -msgid "" -"Change base url for this server. Sends relocate message to all DFRN contacts " -"of all users." -msgstr "" - -#: mod/admin.php:1069 -msgid "RINO Encryption" -msgstr "" - -#: mod/admin.php:1069 -msgid "Encryption layer between nodes." -msgstr "" - -#: mod/admin.php:1070 -msgid "Embedly API key" -msgstr "" - -#: mod/admin.php:1070 -msgid "" -"Embedly is used to fetch additional data for " -"web pages. This is an optional parameter." -msgstr "" - -#: mod/admin.php:1072 -msgid "Enable 'worker' background processing" -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." -msgstr "" - -#: mod/admin.php:1073 -msgid "Maximum number of parallel workers" -msgstr "" - -#: mod/admin.php:1073 -msgid "" -"On shared hosters set this to 2. On larger systems, values of 10 are great. " -"Default value is 4." -msgstr "" - -#: mod/admin.php:1074 -msgid "Don't use 'proc_open' with the worker" -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." -msgstr "" - -#: mod/admin.php:1075 -msgid "Enable fastlane" -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." -msgstr "" - -#: mod/admin.php:1076 -msgid "Enable frontend worker" -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." -msgstr "" - -#: mod/admin.php:1105 -msgid "Update has been marked successful" -msgstr "" - -#: mod/admin.php:1113 -#, php-format -msgid "Database structure update %s was successfully applied." -msgstr "" - -#: mod/admin.php:1116 -#, php-format -msgid "Executing of database structure update %s failed with error: %s" -msgstr "" - -#: mod/admin.php:1128 -#, php-format -msgid "Executing %s failed with error: %s" -msgstr "" - -#: mod/admin.php:1131 -#, php-format -msgid "Update %s was successfully applied." -msgstr "" - -#: mod/admin.php:1135 -#, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." -msgstr "" - -#: mod/admin.php:1137 -#, php-format -msgid "There was no additional update function %s that needed to be called." -msgstr "" - -#: mod/admin.php:1156 -msgid "No failed updates." -msgstr "" - -#: mod/admin.php:1157 -msgid "Check database structure" -msgstr "" - -#: mod/admin.php:1162 -msgid "Failed Updates" -msgstr "" - -#: mod/admin.php:1163 -msgid "" -"This does not include updates prior to 1139, which did not return a status." -msgstr "" - -#: mod/admin.php:1164 -msgid "Mark success (if update was manually applied)" -msgstr "" - -#: mod/admin.php:1165 -msgid "Attempt to execute this update step automatically" -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." -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." -msgstr "" - -#: mod/admin.php:1246 -#, php-format -msgid "%s user blocked/unblocked" -msgid_plural "%s users blocked/unblocked" -msgstr[0] "" -msgstr[1] "" - -#: mod/admin.php:1253 -#, php-format -msgid "%s user deleted" -msgid_plural "%s users deleted" -msgstr[0] "" -msgstr[1] "" - -#: mod/admin.php:1300 -#, php-format -msgid "User '%s' deleted" -msgstr "" - -#: mod/admin.php:1308 -#, php-format -msgid "User '%s' unblocked" -msgstr "" - -#: mod/admin.php:1308 -#, php-format -msgid "User '%s' blocked" -msgstr "" - -#: mod/admin.php:1417 mod/admin.php:1443 -msgid "Register date" -msgstr "" - -#: mod/admin.php:1417 mod/admin.php:1443 -msgid "Last login" -msgstr "" - -#: mod/admin.php:1417 mod/admin.php:1443 -msgid "Last item" -msgstr "" - -#: mod/admin.php:1426 -msgid "Add User" -msgstr "" - -#: mod/admin.php:1427 -msgid "select all" -msgstr "" - -#: mod/admin.php:1428 -msgid "User registrations waiting for confirm" -msgstr "" - -#: mod/admin.php:1429 -msgid "User waiting for permanent deletion" -msgstr "" - -#: mod/admin.php:1430 -msgid "Request date" -msgstr "" - -#: mod/admin.php:1431 -msgid "No registrations." -msgstr "" - -#: mod/admin.php:1432 -msgid "Note from the user" -msgstr "" - -#: mod/admin.php:1433 mod/notifications.php:176 mod/notifications.php:255 -msgid "Approve" -msgstr "" - -#: mod/admin.php:1434 -msgid "Deny" -msgstr "" - -#: mod/admin.php:1438 -msgid "Site admin" -msgstr "" - -#: mod/admin.php:1439 -msgid "Account expired" -msgstr "" - -#: mod/admin.php:1442 -msgid "New User" -msgstr "" - -#: mod/admin.php:1443 -msgid "Deleted since" -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?" -msgstr "" - -#: mod/admin.php:1449 -msgid "" -"The user {0} will be deleted!\\n\\nEverything this user has posted on this " -"site will be permanently deleted!\\n\\nAre you sure?" -msgstr "" - -#: mod/admin.php:1459 -msgid "Name of the new user." -msgstr "" - -#: mod/admin.php:1460 -msgid "Nickname" -msgstr "" - -#: mod/admin.php:1460 -msgid "Nickname of the new user." -msgstr "" - -#: mod/admin.php:1461 -msgid "Email address of the new user." -msgstr "" - -#: mod/admin.php:1504 -#, php-format -msgid "Plugin %s disabled." -msgstr "" - -#: mod/admin.php:1508 -#, php-format -msgid "Plugin %s enabled." -msgstr "" - -#: mod/admin.php:1519 mod/admin.php:1767 -msgid "Disable" -msgstr "" - -#: mod/admin.php:1521 mod/admin.php:1769 -msgid "Enable" -msgstr "" - -#: mod/admin.php:1544 mod/admin.php:1814 -msgid "Toggle" -msgstr "" - -#: mod/admin.php:1552 mod/admin.php:1823 -msgid "Author: " -msgstr "" - -#: mod/admin.php:1553 mod/admin.php:1824 -msgid "Maintainer: " -msgstr "" - -#: mod/admin.php:1608 -msgid "Reload active plugins" -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" -msgstr "" - -#: mod/admin.php:1727 -msgid "No themes found." -msgstr "" - -#: mod/admin.php:1805 -msgid "Screenshot" -msgstr "" - -#: mod/admin.php:1865 -msgid "Reload active themes" -msgstr "" - -#: mod/admin.php:1870 -#, php-format -msgid "No themes found on the system. They should be paced in %1$s" -msgstr "" - -#: mod/admin.php:1871 -msgid "[Experimental]" -msgstr "" - -#: mod/admin.php:1872 -msgid "[Unsupported]" -msgstr "" - -#: mod/admin.php:1896 -msgid "Log settings updated." -msgstr "" - -#: mod/admin.php:1928 -msgid "PHP log currently enabled." -msgstr "" - -#: mod/admin.php:1930 -msgid "PHP log currently disabled." -msgstr "" - -#: mod/admin.php:1939 -msgid "Clear" -msgstr "" - -#: mod/admin.php:1944 -msgid "Enable Debugging" -msgstr "" - -#: mod/admin.php:1945 -msgid "Log file" -msgstr "" - -#: mod/admin.php:1945 -msgid "" -"Must be writable by web server. Relative to your Friendica top-level " -"directory." -msgstr "" - -#: mod/admin.php:1946 -msgid "Log level" -msgstr "" - -#: mod/admin.php:1949 -msgid "PHP logging" -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." -msgstr "" - -#: mod/admin.php:2078 -#, php-format -msgid "Lock feature %s" -msgstr "" - -#: mod/admin.php:2086 -msgid "Manage Additional Features" -msgstr "" - -#: mod/viewcontacts.php:75 -msgid "No contacts." -msgstr "" - -#: mod/network.php:190 mod/search.php:25 -msgid "Remove term" -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/network.php:400 -msgid "Messages in this group won't be send to these receivers." -msgstr "" - -#: mod/network.php:528 -msgid "Private messages to this person are at risk of public disclosure." -msgstr "" - -#: mod/network.php:533 -msgid "Invalid contact." -msgstr "" - -#: mod/network.php:827 -msgid "Commented Order" -msgstr "" - -#: mod/network.php:830 -msgid "Sort by Comment Date" -msgstr "" - -#: mod/network.php:835 -msgid "Posted Order" -msgstr "" - -#: mod/network.php:838 -msgid "Sort by Post Date" -msgstr "" - -#: mod/network.php:849 -msgid "Posts that mention or involve you" -msgstr "" - -#: mod/network.php:857 -msgid "New" -msgstr "" - -#: mod/network.php:860 -msgid "Activity Stream - by date" -msgstr "" - -#: mod/network.php:868 -msgid "Shared Links" -msgstr "" - -#: mod/network.php:871 -msgid "Interesting Links" -msgstr "" - -#: mod/network.php:879 -msgid "Starred" -msgstr "" - -#: mod/network.php:882 -msgid "Favourite Posts" +#: mod/repair_ostatus.php:30 +msgid "Error" msgstr "" #: mod/search.php:100 @@ -8581,122 +7799,991 @@ msgstr "" msgid "Items tagged with: %s" msgstr "" -#: mod/notifications.php:35 -msgid "Invalid request identifier." +#: mod/settings.php:60 +msgid "Display" msgstr "" -#: mod/notifications.php:44 mod/notifications.php:180 -#: mod/notifications.php:258 -msgid "Discard" +#: mod/settings.php:67 mod/settings.php:890 +msgid "Social Networks" msgstr "" -#: mod/notifications.php:105 -msgid "Network Notifications" +#: mod/settings.php:88 +msgid "Connected apps" msgstr "" -#: mod/notifications.php:117 -msgid "Personal Notifications" +#: mod/settings.php:95 mod/uexport.php:45 +msgid "Export personal data" msgstr "" -#: mod/notifications.php:123 -msgid "Home Notifications" +#: mod/settings.php:102 +msgid "Remove account" msgstr "" -#: mod/notifications.php:152 -msgid "Show Ignored Requests" +#: mod/settings.php:157 +msgid "Missing some important data!" msgstr "" -#: mod/notifications.php:152 -msgid "Hide Ignored Requests" +#: mod/settings.php:271 +msgid "Failed to connect with email account using the settings provided." msgstr "" -#: mod/notifications.php:164 mod/notifications.php:228 -msgid "Notification type: " +#: mod/settings.php:276 +msgid "Email settings updated." msgstr "" -#: mod/notifications.php:167 +#: mod/settings.php:291 +msgid "Features updated" +msgstr "" + +#: mod/settings.php:361 +msgid "Relocate message has been send to your contacts" +msgstr "" + +#: mod/settings.php:380 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "" + +#: mod/settings.php:388 +msgid "Wrong password." +msgstr "" + +#: mod/settings.php:399 +msgid "Password changed." +msgstr "" + +#: mod/settings.php:401 +msgid "Password update failed. Please try again." +msgstr "" + +#: mod/settings.php:481 +msgid " Please use a shorter name." +msgstr "" + +#: mod/settings.php:483 +msgid " Name too short." +msgstr "" + +#: mod/settings.php:492 +msgid "Wrong Password" +msgstr "" + +#: mod/settings.php:497 +msgid " Not valid email." +msgstr "" + +#: mod/settings.php:503 +msgid " Cannot change to that email." +msgstr "" + +#: mod/settings.php:559 +msgid "Private forum has no privacy permissions. Using default privacy group." +msgstr "" + +#: mod/settings.php:563 +msgid "Private forum has no privacy permissions and no default privacy group." +msgstr "" + +#: mod/settings.php:603 +msgid "Settings updated." +msgstr "" + +#: mod/settings.php:680 mod/settings.php:706 mod/settings.php:742 +msgid "Add application" +msgstr "" + +#: mod/settings.php:684 mod/settings.php:710 +msgid "Consumer Key" +msgstr "" + +#: mod/settings.php:685 mod/settings.php:711 +msgid "Consumer Secret" +msgstr "" + +#: mod/settings.php:686 mod/settings.php:712 +msgid "Redirect" +msgstr "" + +#: mod/settings.php:687 mod/settings.php:713 +msgid "Icon url" +msgstr "" + +#: mod/settings.php:698 +msgid "You can't edit this application." +msgstr "" + +#: mod/settings.php:741 +msgid "Connected Apps" +msgstr "" + +#: mod/settings.php:745 +msgid "Client key starts with" +msgstr "" + +#: mod/settings.php:746 +msgid "No name" +msgstr "" + +#: mod/settings.php:747 +msgid "Remove authorization" +msgstr "" + +#: mod/settings.php:759 +msgid "No Plugin settings configured" +msgstr "" + +#: mod/settings.php:768 +msgid "Plugin Settings" +msgstr "" + +#: mod/settings.php:790 +msgid "Additional Features" +msgstr "" + +#: mod/settings.php:800 mod/settings.php:804 +msgid "General Social Media Settings" +msgstr "" + +#: mod/settings.php:810 +msgid "Disable intelligent shortening" +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." +msgstr "" + +#: mod/settings.php:818 +msgid "Automatically follow any GNU Social (OStatus) followers/mentioners" +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." +msgstr "" + +#: mod/settings.php:826 +msgid "Default group for OStatus contacts" +msgstr "" + +#: mod/settings.php:834 +msgid "Your legacy GNU Social account" +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." +msgstr "" + +#: mod/settings.php:839 +msgid "Repair OStatus subscriptions" +msgstr "" + +#: mod/settings.php:848 mod/settings.php:849 #, php-format -msgid "suggested by %s" +msgid "Built-in support for %s connectivity is %s" msgstr "" -#: mod/notifications.php:173 mod/notifications.php:246 -msgid "Post a new friend activity" +#: mod/settings.php:848 mod/settings.php:849 +msgid "enabled" msgstr "" -#: mod/notifications.php:173 mod/notifications.php:246 -msgid "if applicable" +#: mod/settings.php:848 mod/settings.php:849 +msgid "disabled" msgstr "" -#: mod/notifications.php:195 -msgid "Claims to be known to you: " +#: mod/settings.php:849 +msgid "GNU Social (OStatus)" msgstr "" -#: mod/notifications.php:196 -msgid "yes" +#: mod/settings.php:883 +msgid "Email access is disabled on this site." msgstr "" -#: mod/notifications.php:196 -msgid "no" +#: mod/settings.php:895 +msgid "Email/Mailbox Setup" msgstr "" -#: mod/notifications.php:197 mod/notifications.php:202 -msgid "Shall your connection be bidirectional or not?" +#: 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." msgstr "" -#: mod/notifications.php:198 mod/notifications.php:203 +#: mod/settings.php:897 +msgid "Last successful email check:" +msgstr "" + +#: mod/settings.php:899 +msgid "IMAP server name:" +msgstr "" + +#: mod/settings.php:900 +msgid "IMAP port:" +msgstr "" + +#: mod/settings.php:901 +msgid "Security:" +msgstr "" + +#: mod/settings.php:901 mod/settings.php:906 +msgid "None" +msgstr "" + +#: mod/settings.php:902 +msgid "Email login name:" +msgstr "" + +#: mod/settings.php:903 +msgid "Email password:" +msgstr "" + +#: mod/settings.php:904 +msgid "Reply-to address:" +msgstr "" + +#: mod/settings.php:905 +msgid "Send public posts to all email contacts:" +msgstr "" + +#: mod/settings.php:906 +msgid "Action after import:" +msgstr "" + +#: mod/settings.php:906 +msgid "Move to folder" +msgstr "" + +#: mod/settings.php:907 +msgid "Move to folder:" +msgstr "" + +#: mod/settings.php:1003 +msgid "Display Settings" +msgstr "" + +#: mod/settings.php:1009 mod/settings.php:1032 +msgid "Display Theme:" +msgstr "" + +#: mod/settings.php:1010 +msgid "Mobile Theme:" +msgstr "" + +#: mod/settings.php:1011 +msgid "Suppress warning of insecure networks" +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." +msgstr "" + +#: mod/settings.php:1012 +msgid "Update browser every xx seconds" +msgstr "" + +#: mod/settings.php:1012 +msgid "Minimum of 10 seconds. Enter -1 to disable it." +msgstr "" + +#: mod/settings.php:1013 +msgid "Number of items to display per page:" +msgstr "" + +#: mod/settings.php:1013 mod/settings.php:1014 +msgid "Maximum of 100 items" +msgstr "" + +#: mod/settings.php:1014 +msgid "Number of items to display per page when viewed from mobile device:" +msgstr "" + +#: mod/settings.php:1015 +msgid "Don't show emoticons" +msgstr "" + +#: mod/settings.php:1016 +msgid "Calendar" +msgstr "" + +#: mod/settings.php:1017 +msgid "Beginning of week:" +msgstr "" + +#: mod/settings.php:1018 +msgid "Don't show notices" +msgstr "" + +#: mod/settings.php:1019 +msgid "Infinite scroll" +msgstr "" + +#: mod/settings.php:1020 +msgid "Automatic updates only at the top of the network page" +msgstr "" + +#: mod/settings.php:1021 +msgid "Bandwith Saver Mode" +msgstr "" + +#: mod/settings.php:1021 +msgid "" +"When enabled, embedded content is not displayed on automatic updates, they " +"only show on page reload." +msgstr "" + +#: mod/settings.php:1023 +msgid "General Theme Settings" +msgstr "" + +#: mod/settings.php:1024 +msgid "Custom Theme Settings" +msgstr "" + +#: mod/settings.php:1025 +msgid "Content Settings" +msgstr "" + +#: 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/settings.php:1110 +msgid "Account Types" +msgstr "" + +#: mod/settings.php:1111 +msgid "Personal Page Subtypes" +msgstr "" + +#: mod/settings.php:1112 +msgid "Community Forum Subtypes" +msgstr "" + +#: mod/settings.php:1119 +msgid "Personal Page" +msgstr "" + +#: mod/settings.php:1120 +msgid "This account is a regular personal profile" +msgstr "" + +#: mod/settings.php:1123 +msgid "Organisation Page" +msgstr "" + +#: mod/settings.php:1124 +msgid "This account is a profile for an organisation" +msgstr "" + +#: mod/settings.php:1127 +msgid "News Page" +msgstr "" + +#: mod/settings.php:1128 +msgid "This account is a news account/reflector" +msgstr "" + +#: mod/settings.php:1131 +msgid "Community Forum" +msgstr "" + +#: mod/settings.php:1132 +msgid "" +"This account is a community forum where people can discuss with each other" +msgstr "" + +#: mod/settings.php:1135 +msgid "Normal Account Page" +msgstr "" + +#: mod/settings.php:1136 +msgid "This account is a normal personal profile" +msgstr "" + +#: mod/settings.php:1139 +msgid "Soapbox Page" +msgstr "" + +#: mod/settings.php:1140 +msgid "Automatically approve all connection/friend requests as read-only fans" +msgstr "" + +#: mod/settings.php:1143 +msgid "Public Forum" +msgstr "" + +#: mod/settings.php:1144 +msgid "Automatically approve all contact requests" +msgstr "" + +#: mod/settings.php:1147 +msgid "Automatic Friend Page" +msgstr "" + +#: mod/settings.php:1148 +msgid "Automatically approve all connection/friend requests as friends" +msgstr "" + +#: mod/settings.php:1151 +msgid "Private Forum [Experimental]" +msgstr "" + +#: mod/settings.php:1152 +msgid "Private forum - approved members only" +msgstr "" + +#: mod/settings.php:1163 +msgid "OpenID:" +msgstr "" + +#: mod/settings.php:1163 +msgid "(Optional) Allow this OpenID to login to this account." +msgstr "" + +#: mod/settings.php:1171 +msgid "Publish your default profile in your local site directory?" +msgstr "" + +#: mod/settings.php:1177 +msgid "Publish your default profile in the global social directory?" +msgstr "" + +#: mod/settings.php:1184 +msgid "Hide your contact/friend list from viewers of your default profile?" +msgstr "" + +#: mod/settings.php:1188 +msgid "" +"If enabled, posting public messages to Diaspora and other networks isn't " +"possible." +msgstr "" + +#: mod/settings.php:1193 +msgid "Allow friends to post to your profile page?" +msgstr "" + +#: mod/settings.php:1198 +msgid "Allow friends to tag your posts?" +msgstr "" + +#: mod/settings.php:1203 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "" + +#: mod/settings.php:1208 +msgid "Permit unknown people to send you private mail?" +msgstr "" + +#: mod/settings.php:1216 +msgid "Profile is not published." +msgstr "" + +#: mod/settings.php:1224 +#, php-format +msgid "Your Identity Address is '%s' or '%s'." +msgstr "" + +#: mod/settings.php:1231 +msgid "Automatically expire posts after this many days:" +msgstr "" + +#: mod/settings.php:1231 +msgid "If empty, posts will not expire. Expired posts will be deleted" +msgstr "" + +#: mod/settings.php:1232 +msgid "Advanced expiration settings" +msgstr "" + +#: mod/settings.php:1233 +msgid "Advanced Expiration" +msgstr "" + +#: mod/settings.php:1234 +msgid "Expire posts:" +msgstr "" + +#: mod/settings.php:1235 +msgid "Expire personal notes:" +msgstr "" + +#: mod/settings.php:1236 +msgid "Expire starred posts:" +msgstr "" + +#: mod/settings.php:1237 +msgid "Expire photos:" +msgstr "" + +#: mod/settings.php:1238 +msgid "Only expire posts by others:" +msgstr "" + +#: mod/settings.php:1269 +msgid "Account Settings" +msgstr "" + +#: mod/settings.php:1277 +msgid "Password Settings" +msgstr "" + +#: mod/settings.php:1279 +msgid "Leave password fields blank unless changing" +msgstr "" + +#: mod/settings.php:1280 +msgid "Current Password:" +msgstr "" + +#: mod/settings.php:1280 mod/settings.php:1281 +msgid "Your current password to confirm the changes" +msgstr "" + +#: mod/settings.php:1281 +msgid "Password:" +msgstr "" + +#: mod/settings.php:1285 +msgid "Basic Settings" +msgstr "" + +#: mod/settings.php:1287 +msgid "Email Address:" +msgstr "" + +#: mod/settings.php:1288 +msgid "Your Timezone:" +msgstr "" + +#: mod/settings.php:1289 +msgid "Your Language:" +msgstr "" + +#: mod/settings.php:1289 +msgid "" +"Set the language we use to show you friendica interface and to send you " +"emails" +msgstr "" + +#: mod/settings.php:1290 +msgid "Default Post Location:" +msgstr "" + +#: mod/settings.php:1291 +msgid "Use Browser Location:" +msgstr "" + +#: mod/settings.php:1294 +msgid "Security and Privacy Settings" +msgstr "" + +#: mod/settings.php:1296 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: mod/settings.php:1296 mod/settings.php:1326 +msgid "(to prevent spam abuse)" +msgstr "" + +#: mod/settings.php:1297 +msgid "Default Post Permissions" +msgstr "" + +#: mod/settings.php:1298 +msgid "(click to open/close)" +msgstr "" + +#: mod/settings.php:1309 +msgid "Default Private Post" +msgstr "" + +#: mod/settings.php:1310 +msgid "Default Public Post" +msgstr "" + +#: mod/settings.php:1314 +msgid "Default Permissions for New Posts" +msgstr "" + +#: mod/settings.php:1326 +msgid "Maximum private messages per day from unknown people:" +msgstr "" + +#: mod/settings.php:1329 +msgid "Notification Settings" +msgstr "" + +#: mod/settings.php:1330 +msgid "By default post a status message when:" +msgstr "" + +#: mod/settings.php:1331 +msgid "accepting a friend request" +msgstr "" + +#: mod/settings.php:1332 +msgid "joining a forum/community" +msgstr "" + +#: mod/settings.php:1333 +msgid "making an interesting profile change" +msgstr "" + +#: mod/settings.php:1334 +msgid "Send a notification email when:" +msgstr "" + +#: mod/settings.php:1335 +msgid "You receive an introduction" +msgstr "" + +#: mod/settings.php:1336 +msgid "Your introductions are confirmed" +msgstr "" + +#: mod/settings.php:1337 +msgid "Someone writes on your profile wall" +msgstr "" + +#: mod/settings.php:1338 +msgid "Someone writes a followup comment" +msgstr "" + +#: mod/settings.php:1339 +msgid "You receive a private message" +msgstr "" + +#: mod/settings.php:1340 +msgid "You receive a friend suggestion" +msgstr "" + +#: mod/settings.php:1341 +msgid "You are tagged in a post" +msgstr "" + +#: mod/settings.php:1342 +msgid "You are poked/prodded/etc. in a post" +msgstr "" + +#: mod/settings.php:1344 +msgid "Activate desktop notifications" +msgstr "" + +#: mod/settings.php:1344 +msgid "Show desktop popup on new notifications" +msgstr "" + +#: mod/settings.php:1346 +msgid "Text-only notification emails" +msgstr "" + +#: mod/settings.php:1348 +msgid "Send text only notification emails, without the html part" +msgstr "" + +#: mod/settings.php:1350 +msgid "Advanced Account/Page Type Settings" +msgstr "" + +#: mod/settings.php:1351 +msgid "Change the behaviour of this account for special situations" +msgstr "" + +#: mod/settings.php:1354 +msgid "Relocate" +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." +msgstr "" + +#: mod/settings.php:1356 +msgid "Resend relocate message to contacts" +msgstr "" + +#: mod/subthread.php:104 +#, php-format +msgid "%1$s is following %2$s's %3$s" +msgstr "" + +#: mod/suggest.php:27 +msgid "Do you really want to delete this suggestion?" +msgstr "" + +#: mod/suggest.php:71 +msgid "" +"No suggestions available. If this is a new site, please try again in 24 " +"hours." +msgstr "" + +#: mod/suggest.php:84 mod/suggest.php:104 +msgid "Ignore/Hide" +msgstr "" + +#: mod/tagrm.php:43 +msgid "Tag removed" +msgstr "" + +#: mod/tagrm.php:82 +msgid "Remove Item Tag" +msgstr "" + +#: mod/tagrm.php:84 +msgid "Select a tag to remove: " +msgstr "" + +#: mod/uexport.php:37 +msgid "Export account" +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." +msgstr "" + +#: mod/uexport.php:38 +msgid "Export all" +msgstr "" + +#: mod/uexport.php:38 +msgid "" +"Export your accout info, contacts and all your items as json. Could be a " +"very big file, and could take a lot of time. Use this to make a full backup " +"of your account (photos are not exported)" +msgstr "" + +#: mod/uimport.php:68 +msgid "Move account" +msgstr "" + +#: mod/uimport.php:69 +msgid "You can import an account from another Friendica server." +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." +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" +msgstr "" + +#: mod/uimport.php:72 +msgid "Account file" +msgstr "" + +#: mod/uimport.php:72 +msgid "" +"To export your account, go to \"Settings->Export your personal data\" and " +"select \"Export account\"" +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]" +msgstr "" + +#: mod/videos.php:124 +msgid "Do you really want to delete this video?" +msgstr "" + +#: mod/videos.php:129 +msgid "Delete Video" +msgstr "" + +#: mod/videos.php:208 +msgid "No videos selected" +msgstr "" + +#: mod/videos.php:400 +msgid "Recent Videos" +msgstr "" + +#: mod/videos.php:402 +msgid "Upload New Videos" +msgstr "" + +#: mod/viewcontacts.php:75 +msgid "No contacts." +msgstr "" + +#: mod/viewsrc.php:7 +msgid "Access denied." +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." +msgstr "" + +#: mod/wall_attach.php:94 +msgid "Sorry, maybe your upload is bigger than the PHP configuration allows" +msgstr "" + +#: mod/wall_attach.php:94 +msgid "Or - did you try to upload an empty file?" +msgstr "" + +#: mod/wall_attach.php:105 +#, php-format +msgid "File exceeds size limit of %s" +msgstr "" + +#: mod/wall_attach.php:158 mod/wall_attach.php:174 +msgid "File upload failed." +msgstr "" + +#: mod/wallmessage.php:42 mod/wallmessage.php:106 +#, php-format +msgid "Number of daily wall messages for %s exceeded. Message failed." +msgstr "" + +#: mod/wallmessage.php:53 +msgid "Unable to check your home location." +msgstr "" + +#: mod/wallmessage.php:80 mod/wallmessage.php:89 +msgid "No recipient." +msgstr "" + +#: mod/wallmessage.php:127 #, 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." +"If you wish for %s to respond, please check that the privacy settings on " +"your site allow private mail from unknown senders." msgstr "" -#: mod/notifications.php: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/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/notifications.php:215 -msgid "Friend" -msgstr "" - -#: mod/notifications.php:216 -msgid "Sharer" -msgstr "" - -#: mod/notifications.php:216 -msgid "Subscriber" -msgstr "" - -#: mod/notifications.php:266 -msgid "No introductions." -msgstr "" - -#: mod/notifications.php:307 -msgid "Show unread" -msgstr "" - -#: mod/notifications.php:307 -msgid "Show all" -msgstr "" - -#: mod/notifications.php:313 -#, php-format -msgid "No more %s notifications." -msgstr "" - -#: object/Item.php:385 +#: object/Item.php:359 msgid "via" msgstr "" +#: view/theme/duepuntozero/config.php:44 +msgid "greenzero" +msgstr "" + +#: view/theme/duepuntozero/config.php:45 +msgid "purplezero" +msgstr "" + +#: view/theme/duepuntozero/config.php:46 +msgid "easterbunny" +msgstr "" + +#: view/theme/duepuntozero/config.php:47 +msgid "darkzero" +msgstr "" + +#: view/theme/duepuntozero/config.php:48 +msgid "comix" +msgstr "" + +#: view/theme/duepuntozero/config.php:49 +msgid "slackr" +msgstr "" + +#: view/theme/duepuntozero/config.php:64 +msgid "Variations" +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" +msgstr "" + +#: view/theme/frio/config.php:72 +msgid "Content background transparency" +msgstr "" + +#: view/theme/frio/config.php:73 +msgid "Set the background image" +msgstr "" + +#: view/theme/frio/php/Image.php:23 +msgid "Repeat the image" +msgstr "" + +#: view/theme/frio/php/Image.php:23 +msgid "Will repeat your image to fill the background." +msgstr "" + +#: view/theme/frio/php/Image.php:25 +msgid "Stretch" +msgstr "" + +#: view/theme/frio/php/Image.php:25 +msgid "Will stretch to width/height of the image." +msgstr "" + +#: view/theme/frio/php/Image.php:27 +msgid "Resize fill and-clip" +msgstr "" + +#: view/theme/frio/php/Image.php:27 +msgid "Resize to fill and retain aspect ratio." +msgstr "" + +#: view/theme/frio/php/Image.php:29 +msgid "Resize best fit" +msgstr "" + +#: view/theme/frio/php/Image.php:29 +msgid "Resize to best fit and retain aspect ratio." +msgstr "" + +#: view/theme/frio/theme.php:226 +msgid "Guest" +msgstr "" + +#: view/theme/frio/theme.php:232 +msgid "Visitor" +msgstr "" + #: view/theme/quattro/config.php:70 msgid "Alignment" msgstr "" @@ -8709,7 +8796,7 @@ msgstr "" msgid "Center" msgstr "" -#: view/theme/quattro/config.php:71 view/theme/clean/config.php:108 +#: view/theme/quattro/config.php:71 msgid "Color scheme" msgstr "" @@ -8760,223 +8847,3 @@ msgstr "" #: view/theme/vier/theme.php:286 msgid "Quick Start" msgstr "" - -#: view/theme/duepuntozero/config.php:44 -msgid "greenzero" -msgstr "" - -#: view/theme/duepuntozero/config.php:45 -msgid "purplezero" -msgstr "" - -#: view/theme/duepuntozero/config.php:46 -msgid "easterbunny" -msgstr "" - -#: view/theme/duepuntozero/config.php:47 -msgid "darkzero" -msgstr "" - -#: view/theme/duepuntozero/config.php:48 -msgid "comix" -msgstr "" - -#: view/theme/duepuntozero/config.php:49 -msgid "slackr" -msgstr "" - -#: view/theme/duepuntozero/config.php:64 -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" -msgstr "" - -#: view/theme/clean/config.php:66 -msgid "GeoCities Retro" -msgstr "" - -#: view/theme/clean/config.php:92 -msgid "Background 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." -msgstr "" - -#: view/theme/clean/config.php:99 -msgid "Background Color" -msgstr "" - -#: view/theme/clean/config.php:101 -msgid "HEX value for the background color. Don't include the #" -msgstr "" - -#: view/theme/clean/config.php:115 -msgid "font size" -msgstr "" - -#: view/theme/clean/config.php:117 -msgid "base font size for your interface" -msgstr "" - -#: view/theme/clean/config.php:122 -msgid "Display Accesskeys" -msgstr "" - -#: view/theme/clean/config.php:124 -msgid "" -"Diaplay the access keys assigned to some menu element in the web interface." -msgstr "" - -#: view/theme/frio/php/Image.php:23 -msgid "Repeat the image" -msgstr "" - -#: view/theme/frio/php/Image.php:23 -msgid "Will repeat your image to fill the background." -msgstr "" - -#: view/theme/frio/php/Image.php:25 -msgid "Stretch" -msgstr "" - -#: view/theme/frio/php/Image.php:25 -msgid "Will stretch to width/height of the image." -msgstr "" - -#: view/theme/frio/php/Image.php:27 -msgid "Resize fill and-clip" -msgstr "" - -#: view/theme/frio/php/Image.php:27 -msgid "Resize to fill and retain aspect ratio." -msgstr "" - -#: view/theme/frio/php/Image.php:29 -msgid "Resize best fit" -msgstr "" - -#: view/theme/frio/php/Image.php:29 -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" -msgstr "" - -#: view/theme/frio/config.php:72 -msgid "Content background transparency" -msgstr "" - -#: view/theme/frio/config.php:73 -msgid "Set the background image" -msgstr "" - -#: view/theme/frio/theme.php:226 -msgid "Guest" -msgstr "" - -#: view/theme/frio/theme.php:232 -msgid "Visitor" -msgstr "" - -#: index.php:457 -msgid "toggle mobile" -msgstr "" - -#: boot.php:970 -msgid "Delete this item?" -msgstr "" - -#: boot.php:972 -msgid "show fewer" -msgstr "" - -#: boot.php:1696 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "" - -#: boot.php:1808 -msgid "Create a New Account" -msgstr "" - -#: boot.php:1837 -msgid "Password: " -msgstr "" - -#: boot.php:1838 -msgid "Remember me" -msgstr "" - -#: boot.php:1841 -msgid "Or login using OpenID: " -msgstr "" - -#: boot.php:1847 -msgid "Forgot your password?" -msgstr "" - -#: boot.php:1850 -msgid "Website Terms of Service" -msgstr "" - -#: boot.php:1851 -msgid "terms of service" -msgstr "" - -#: boot.php:1853 -msgid "Website Privacy Policy" -msgstr "" - -#: boot.php:1854 -msgid "privacy policy" -msgstr "" From 0879b46125fe5be9a1c33e4b0881846d2ed136c1 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Mon, 20 Mar 2017 16:59:21 +0100 Subject: [PATCH 20/21] add NULL_DATE & coding standard work --- include/event.php | 25 ++++++++++++------------- mod/events.php | 4 ++-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/include/event.php b/include/event.php index 82d5a1ec58..ebd4885c91 100644 --- a/include/event.php +++ b/include/event.php @@ -195,32 +195,32 @@ 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]; } @@ -269,11 +269,11 @@ function event_store($arr) { $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['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']) @@ -463,7 +463,7 @@ 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'); + $firstDay = get_pconfig(local_user(), 'system', 'first_day_of_week'); if ($firstDay === false) { $firstDay = 0; } @@ -699,7 +699,7 @@ 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; } @@ -812,7 +812,7 @@ function events_by_uid($uid = 0, $sql_extra = '') { } // The permission condition if no condition was transmitted - if($sql_extra == '') { + if ($sql_extra == '') { $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' "; } @@ -940,5 +940,4 @@ function widget_events() { '$export_csv' => t("Export calendar as csv"), '$user' => $user )); - } diff --git a/mod/events.php b/mod/events.php index bcf80dd1c7..a2f3ec39a4 100644 --- a/mod/events.php +++ b/mod/events.php @@ -53,8 +53,8 @@ function events_post(App $a) { // The default setting for the `private` field in event_store() is false, so mirror that $private_event = false; - $start = '0000-00-00 00:00:00'; - $finish = '0000-00-00 00:00:00'; + $start = NULL_DATE; + $finish = NULL_DATE; if ($start_text) { $start = $start_text; From 0557a42e2f6fa18d4a3a3b9be07d10d02501f296 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Mon, 20 Mar 2017 17:19:24 +0100 Subject: [PATCH 21/21] add missed NULL_DATE --- mod/events.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/events.php b/mod/events.php index a2f3ec39a4..60e7b9f390 100644 --- a/mod/events.php +++ b/mod/events.php @@ -98,7 +98,7 @@ function events_post(App $a) { goaway($onerror_url); } - if ((! $summary) || ($start === '0000-00-00 00:00:00')) { + 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.');